Merge
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index a9a38f9..8814acc 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -233,3 +233,4 @@
91f47e8da5c60de58ed195e9b57f3bf192a18f83 jdk8-b109
4faa09c7fe555de086dd9048d3c5cc92317d6f45 jdk8-b110
d086227bfc45d124f09b3bd72a07956b4073bf71 jdk8-b111
+547316ea137d83d9c63083a9b83db64198fe0c81 jdk8-b112
diff --git a/NewMakefile.gmk b/NewMakefile.gmk
index 366a3b9..a3389ff 100644
--- a/NewMakefile.gmk
+++ b/NewMakefile.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, 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,10 +36,8 @@
TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1
# Assume we have GNU make, but check version.
-ifeq (,$(findstring 3.81,$(MAKE_VERSION)))
- ifeq (,$(findstring 3.82,$(MAKE_VERSION)))
- $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
- endif
+ifeq ($(strip $(foreach v, 3.81% 3.82% 4.%, $(filter $v, $(MAKE_VERSION)))), )
+ $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
endif
# Locate this Makefile
diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4
index 464f68f..74eb88a 100644
--- a/common/autoconf/basics.m4
+++ b/common/autoconf/basics.m4
@@ -212,6 +212,18 @@
[AC_MSG_WARN([Option --with-$1 is deprecated and will be ignored.])])
])
+# Register a --enable argument but mark it as deprecated
+# $1: The name of the with argument to deprecate, not including --enable-
+# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -)
+AC_DEFUN([BASIC_DEPRECATED_ARG_ENABLE],
+[
+ AC_ARG_ENABLE($1, [AS_HELP_STRING([--enable-$1],
+ [Deprecated. Option is kept for backwards compatibility and is ignored])])
+ if test "x$enable_$2" != x; then
+ AC_MSG_WARN([Option --enable-$1 is deprecated and will be ignored.])
+ fi
+])
+
AC_DEFUN_ONCE([BASIC_INIT],
[
# Save the original command line. This is passed to us by the wrapper configure script.
@@ -502,7 +514,7 @@
if test "x$IS_GNU_MAKE" = x; then
AC_MSG_NOTICE([Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring.])
else
- IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[[12346789]]'`
+ IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[[12]]\)\|\(4\.\)'`
if test "x$IS_MODERN_MAKE" = x; then
AC_MSG_NOTICE([Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring.])
else
@@ -644,6 +656,7 @@
fi
if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
+ BASIC_REQUIRE_PROG(DSYMUTIL, dsymutil)
BASIC_REQUIRE_PROG(XATTR, xattr)
AC_PATH_PROG(CODESIGN, codesign)
if test "x$CODESIGN" != "x"; then
diff --git a/common/autoconf/configure.ac b/common/autoconf/configure.ac
index 22f917b..238e4a4 100644
--- a/common/autoconf/configure.ac
+++ b/common/autoconf/configure.ac
@@ -177,6 +177,9 @@
#
###############################################################################
+# After we have toolchain, we can compile fixpath. It's needed by the lib checks.
+BASIC_COMPILE_FIXPATH
+
LIB_SETUP_INIT
LIB_SETUP_X11
LIB_SETUP_CUPS
@@ -185,8 +188,6 @@
LIB_SETUP_MISC_LIBS
LIB_SETUP_STATIC_LINK_LIBSTDCPP
-# After we have toolchain and the paths to all libraries (needed by msys), we can compile the fixpath helper
-BASIC_COMPILE_FIXPATH
###############################################################################
#
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 325cd79..0c43de6 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -634,7 +634,6 @@
ENABLE_INTREE_EC
SALIB_NAME
HOTSPOT_MAKE_ARGS
-FIXPATH
LIBCXX
LLVM_LIBS
LLVM_LDFLAGS
@@ -651,10 +650,9 @@
USE_EXTERNAL_LIBJPEG
ALSA_LIBS
ALSA_CFLAGS
-FREETYPE2_LIB_PATH
-USING_SYSTEM_FT_LIB
-FREETYPE2_LIBS
-FREETYPE2_CFLAGS
+FREETYPE_BUNDLE_LIB_PATH
+FREETYPE_LIBS
+FREETYPE_CFLAGS
CUPS_CFLAGS
OPENWIN_HOME
X_EXTRA_LIBS
@@ -662,6 +660,7 @@
X_PRE_LIBS
X_CFLAGS
XMKMF
+FIXPATH
CXXFLAGS_DEBUG_SYMBOLS
CFLAGS_DEBUG_SYMBOLS
ZIP_DEBUGINFO_FILES
@@ -825,6 +824,7 @@
PKG_CONFIG
CODESIGN
XATTR
+DSYMUTIL
IS_GNU_TIME
TIME
STAT
@@ -1046,6 +1046,9 @@
with_cups
with_cups_include
with_freetype
+with_freetype_include
+with_freetype_lib
+enable_freetype_bundling
with_alsa
with_alsa_include
with_alsa_lib
@@ -1078,8 +1081,8 @@
CPP
CXXCPP
XMKMF
-FREETYPE2_CFLAGS
-FREETYPE2_LIBS
+FREETYPE_CFLAGS
+FREETYPE_LIBS
ALSA_CFLAGS
ALSA_LIBS
LIBFFI_CFLAGS
@@ -1715,9 +1718,13 @@
--disable-debug-symbols disable generation of debug symbols [enabled]
--disable-zip-debug-info
disable zipping of debug-info files [enabled]
- --disable-macosx-runtime-support
- disable the use of MacOSX Java runtime support
- framework [enabled]
+ --enable-macosx-runtime-support
+ Deprecated. Option is kept for backwards
+ compatibility and is ignored
+ --disable-freetype-bundling
+ disable bundling of the freetype library with the
+ build result [enabled on Windows or when using
+ --with-freetype, disabled otherwise]
--enable-sjavac use sjavac to do fast incremental compiles
[disabled]
--disable-precompiled-headers
@@ -1803,9 +1810,11 @@
--with-cups specify prefix directory for the cups package
(expecting the headers under PATH/include)
--with-cups-include specify directory for the cups include files
- --with-freetype specify prefix directory for the freetype2 package
+ --with-freetype specify prefix directory for the freetype package
(expecting the libraries under PATH/lib and the
headers under PATH/include)
+ --with-freetype-include specify directory for the freetype include files
+ --with-freetype-lib specify directory for the freetype library
--with-alsa specify prefix directory for the alsa package
(expecting the libraries under PATH/lib and the
headers under PATH/include)
@@ -1846,10 +1855,10 @@
CPP C preprocessor
CXXCPP C++ preprocessor
XMKMF Path to xmkmf, Makefile generator for X Window System
- FREETYPE2_CFLAGS
- C compiler flags for FREETYPE2, overriding pkg-config
- FREETYPE2_LIBS
- linker flags for FREETYPE2, overriding pkg-config
+ FREETYPE_CFLAGS
+ C compiler flags for FREETYPE, overriding pkg-config
+ FREETYPE_LIBS
+ linker flags for FREETYPE, overriding pkg-config
ALSA_CFLAGS C compiler flags for ALSA, overriding pkg-config
ALSA_LIBS linker flags for ALSA, overriding pkg-config
LIBFFI_CFLAGS
@@ -3148,6 +3157,11 @@
# $1: The name of the with argument to deprecate, not including --with-
+# Register a --enable argument but mark it as deprecated
+# $1: The name of the with argument to deprecate, not including --enable-
+# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -)
+
+
# Test that variable $1 denoting a program is not empty. If empty, exit with an error.
@@ -3443,16 +3457,42 @@
cygwin_help() {
case $1 in
unzip)
- PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;;
+ PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip )"
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ ;;
zip)
- PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;;
+ PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P zip )"
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ ;;
make)
- PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;;
+ PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P make )"
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ ;;
+ freetype)
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ HELP_MSG="To install freetype, run:
+wget \"http://gnuwin32.sourceforge.net/downlinks/freetype.php\" -O /tmp/freetype-setup.exe
+chmod +x /tmp/freetype-setup.exe
+/tmp/freetype-setup.exe
+Follow GUI prompts, and install to default directory \"C:\Program Files (x86)\GnuWin32\".
+After installation, locate lib/libfreetype.dll.a and make a copy with the name freetype.dll."
+ else
+ HELP_MSG="You need to build a 64-bit version of freetype.
+This is not readily available.
+You can find source code and build instructions on
+http://www.freetype.org/
+If you put the resulting build in \"C:\Program Files\GnuWin32\", it will be found automatically."
+ fi
+ ;;
* )
break ;;
esac
}
+msys_help() {
+ PKGHANDLER_COMMAND=""
+}
+
apt_help() {
case $1 in
devkit)
@@ -3463,7 +3503,7 @@
PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
cups)
PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;;
- freetype2)
+ freetype)
PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;;
pulse)
PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
@@ -3486,7 +3526,7 @@
PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
cups)
PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
- freetype2)
+ freetype)
PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
pulse)
PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
@@ -3614,6 +3654,8 @@
+
+
#
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -3812,13 +3854,17 @@
+
+
+
+
# This line needs to be here, verbatim, after all includes and the dummy hook
# definitions. It is replaced with custom functionality when building
# custom sources.
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1381407169
+DATE_WHEN_GENERATED=1382540536
###############################################################################
#
@@ -8269,7 +8315,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
else
- IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
+ IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
if test "x$IS_MODERN_MAKE" = x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
@@ -8626,7 +8672,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
else
- IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
+ IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
if test "x$IS_MODERN_MAKE" = x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
@@ -8980,7 +9026,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
else
- IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
+ IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
if test "x$IS_MODERN_MAKE" = x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
@@ -9339,7 +9385,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
else
- IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
+ IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
if test "x$IS_MODERN_MAKE" = x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
@@ -9692,7 +9738,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
$as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
else
- IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
+ IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
if test "x$IS_MODERN_MAKE" = x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
$as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
@@ -10478,6 +10524,65 @@
if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
+ for ac_prog in dsymutil
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DSYMUTIL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $DSYMUTIL in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_DSYMUTIL="$DSYMUTIL" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_DSYMUTIL="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+DSYMUTIL=$ac_cv_path_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$DSYMUTIL" && break
+done
+
+
+ if test "x$DSYMUTIL" = x; then
+ if test "xdsymutil" = x; then
+ PROG_NAME=dsymutil
+ else
+ PROG_NAME=dsymutil
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
+$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
+ as_fn_error $? "Cannot continue" "$LINENO" 5
+ fi
+
+
+
for ac_prog in xattr
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -15717,27 +15822,34 @@
if test "x$BOOT_JDK_FOUND" = xno; then
# Print a helpful message on how to acquire the necessary build dependency.
- # openjdk is the help tag: freetyp2, cups, pulse, alsa etc
+ # openjdk is the help tag: freetype, cups, pulse, alsa etc
MISSING_DEPENDENCY=openjdk
- PKGHANDLER_COMMAND=
- case $PKGHANDLER in
- apt-get)
- apt_help $MISSING_DEPENDENCY ;;
- yum)
- yum_help $MISSING_DEPENDENCY ;;
- port)
- port_help $MISSING_DEPENDENCY ;;
- pkgutil)
- pkgutil_help $MISSING_DEPENDENCY ;;
- pkgadd)
- pkgadd_help $MISSING_DEPENDENCY ;;
- * )
- break ;;
- esac
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ cygwin_help $MISSING_DEPENDENCY
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ msys_help $MISSING_DEPENDENCY
+ else
+ PKGHANDLER_COMMAND=
- if test "x$PKGHANDLER_COMMAND" != x; then
- HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ case $PKGHANDLER in
+ apt-get)
+ apt_help $MISSING_DEPENDENCY ;;
+ yum)
+ yum_help $MISSING_DEPENDENCY ;;
+ port)
+ port_help $MISSING_DEPENDENCY ;;
+ pkgutil)
+ pkgutil_help $MISSING_DEPENDENCY ;;
+ pkgadd)
+ pkgadd_help $MISSING_DEPENDENCY ;;
+ * )
+ break ;;
+ esac
+
+ if test "x$PKGHANDLER_COMMAND" != x; then
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: Could not find a valid Boot JDK. $HELP_MSG" >&5
@@ -17415,63 +17527,303 @@
as_fn_error $? "Cannot continue" "$LINENO" 5
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
-$as_echo_n "checking for msvcr100.dll... " >&6; }
+
# Check whether --with-msvcr-dll was given.
if test "${with_msvcr_dll+set}" = set; then :
withval=$with_msvcr_dll;
fi
+
if test "x$with_msvcr_dll" != x; then
- MSVCR_DLL="$with_msvcr_dll"
- else
- if test "x$VCINSTALLDIR" != x; then
- if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
- MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | grep x64 | head --lines 1`
- else
- MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | grep x86 | grep -v ia64 | grep -v x64 | head --lines 1`
- if test "x$MSVCR_DLL" = x; then
- MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | head --lines 1`
- fi
- fi
- if test "x$MSVCR_DLL" != x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: msvcr100.dll found in VCINSTALLDIR: $VCINSTALLDIR" >&5
-$as_echo "$as_me: msvcr100.dll found in VCINSTALLDIR: $VCINSTALLDIR" >&6;}
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: msvcr100.dll not found in VCINSTALLDIR: $VCINSTALLDIR" >&5
-$as_echo "$as_me: Warning: msvcr100.dll not found in VCINSTALLDIR: $VCINSTALLDIR" >&6;}
- fi
+ # If given explicitely by user, do not probe. If not present, fail directly.
+
+ POSSIBLE_MSVCR_DLL="$with_msvcr_dll"
+ METHOD="--with-msvcr-dll"
+ if test -e "$POSSIBLE_MSVCR_DLL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
+$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
+
+ # Need to check if the found msvcr is correct architecture
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
+$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
+ MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH=386
+ else
+ CORRECT_MSVCR_ARCH=x86-64
fi
- # Try some fallback alternatives
- if test "x$MSVCR_DLL" = x; then
- # If visual studio express is installed, there is usually one with the debugger
- if test "x$VS100COMNTOOLS" != x; then
- if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
- MSVCR_DLL=`find "$VS100COMNTOOLS/.." -name msvcr100.dll | grep -i x64 | head --lines 1`
- { $as_echo "$as_me:${as_lineno-$LINENO}: msvcr100.dll found in $VS100COMNTOOLS..: $VS100COMNTOOLS.." >&5
-$as_echo "$as_me: msvcr100.dll found in $VS100COMNTOOLS..: $VS100COMNTOOLS.." >&6;}
- fi
- fi
- fi
- if test "x$MSVCR_DLL" = x; then
- if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
- # Fallback for 32bit builds, look in the windows directory.
- if test -f "$SYSTEMROOT/system32/msvcr100.dll"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: msvcr100.dll found in $SYSTEMROOT/system32" >&5
-$as_echo "$as_me: msvcr100.dll found in $SYSTEMROOT/system32" >&6;}
- MSVCR_DLL="$SYSTEMROOT/system32/msvcr100.dll"
- fi
- fi
+ if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+ MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
+$as_echo_n "checking for msvcr100.dll... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
+$as_echo "$MSVCR_DLL" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
+$as_echo "incorrect, ignoring" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
+$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
fi
fi
+
+ if test "x$MSVCR_DLL" = x; then
+ as_fn_error $? "Could not find a proper msvcr100.dll as specified by --with-msvcr-dll" "$LINENO" 5
+ fi
+ fi
+
if test "x$MSVCR_DLL" = x; then
+ # Probe: Using well-known location from Visual Studio 10.0
+ if test "x$VCINSTALLDIR" != x; then
+ CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
+
+ windows_path="$CYGWIN_VC_INSTALL_DIR"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ CYGWIN_VC_INSTALL_DIR="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ CYGWIN_VC_INSTALL_DIR="$unix_path"
+ fi
+
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+ POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC100.CRT/msvcr100.dll"
+ else
+ POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC100.CRT/msvcr100.dll"
+ fi
+
+ POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
+ METHOD="well-known location in VCINSTALLDIR"
+ if test -e "$POSSIBLE_MSVCR_DLL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
+$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
+
+ # Need to check if the found msvcr is correct architecture
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
+$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
+ MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH=386
+ else
+ CORRECT_MSVCR_ARCH=x86-64
+ fi
+ if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+ MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
+$as_echo_n "checking for msvcr100.dll... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
+$as_echo "$MSVCR_DLL" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
+$as_echo "incorrect, ignoring" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
+$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
+ fi
+ fi
+
+ fi
+ fi
+
+ if test "x$MSVCR_DLL" = x; then
+ # Probe: Check in the Boot JDK directory.
+ POSSIBLE_MSVCR_DLL="$BOOT_JDK/bin/msvcr100.dll"
+
+ POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
+ METHOD="well-known location in Boot JDK"
+ if test -e "$POSSIBLE_MSVCR_DLL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
+$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
+
+ # Need to check if the found msvcr is correct architecture
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
+$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
+ MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH=386
+ else
+ CORRECT_MSVCR_ARCH=x86-64
+ fi
+ if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+ MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
+$as_echo_n "checking for msvcr100.dll... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
+$as_echo "$MSVCR_DLL" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
+$as_echo "incorrect, ignoring" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
+$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
+ fi
+ fi
+
+ fi
+
+ if test "x$MSVCR_DLL" = x; then
+ # Probe: Look in the Windows system32 directory
+ CYGWIN_SYSTEMROOT="$SYSTEMROOT"
+
+ windows_path="$CYGWIN_SYSTEMROOT"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ CYGWIN_SYSTEMROOT="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ CYGWIN_SYSTEMROOT="$unix_path"
+ fi
+
+ POSSIBLE_MSVCR_DLL="$CYGWIN_SYSTEMROOT/system32/msvcr100.dll"
+
+ POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
+ METHOD="well-known location in SYSTEMROOT"
+ if test -e "$POSSIBLE_MSVCR_DLL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
+$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
+
+ # Need to check if the found msvcr is correct architecture
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
+$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
+ MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH=386
+ else
+ CORRECT_MSVCR_ARCH=x86-64
+ fi
+ if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+ MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
+$as_echo_n "checking for msvcr100.dll... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
+$as_echo "$MSVCR_DLL" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
+$as_echo "incorrect, ignoring" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
+$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
+ fi
+ fi
+
+ fi
+
+ if test "x$MSVCR_DLL" = x; then
+ # Probe: If Visual Studio Express is installed, there is usually one with the debugger
+ if test "x$VS100COMNTOOLS" != x; then
+ CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
+
+ windows_path="$CYGWIN_VS_TOOLS_DIR"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ CYGWIN_VS_TOOLS_DIR="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ CYGWIN_VS_TOOLS_DIR="$unix_path"
+ fi
+
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+ POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x64/ | $HEAD --lines 1`
+ else
+ POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x86/ | $HEAD --lines 1`
+ fi
+
+ POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
+ METHOD="search of VS100COMNTOOLS"
+ if test -e "$POSSIBLE_MSVCR_DLL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
+$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
+
+ # Need to check if the found msvcr is correct architecture
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
+$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
+ MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH=386
+ else
+ CORRECT_MSVCR_ARCH=x86-64
+ fi
+ if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+ MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
+$as_echo_n "checking for msvcr100.dll... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
+$as_echo "$MSVCR_DLL" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
+$as_echo "incorrect, ignoring" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
+$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
+ fi
+ fi
+
+ fi
+ fi
+
+ if test "x$MSVCR_DLL" = x; then
+ # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now.
+ # (This was the original behaviour; kept since it might turn up something)
+ if test "x$CYGWIN_VC_INSTALL_DIR" != x; then
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+ POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x64 | $HEAD --lines 1`
+ else
+ POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
+ if test "x$POSSIBLE_MSVCR_DLL" = x; then
+ # We're grasping at straws now...
+ POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $HEAD --lines 1`
+ fi
+ fi
+
+
+ POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
+ METHOD="search of VCINSTALLDIR"
+ if test -e "$POSSIBLE_MSVCR_DLL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
+$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
+
+ # Need to check if the found msvcr is correct architecture
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
+$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
+ MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH=386
+ else
+ CORRECT_MSVCR_ARCH=x86-64
+ fi
+ if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+ MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
+$as_echo_n "checking for msvcr100.dll... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
+$as_echo "$MSVCR_DLL" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
+$as_echo "incorrect, ignoring" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
+$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
+ fi
+ fi
+
+ fi
+ fi
+
+ if test "x$MSVCR_DLL" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
+$as_echo_n "checking for msvcr100.dll... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- as_fn_error $? "Could not find msvcr100.dll !" "$LINENO" 5
+ as_fn_error $? "Could not find msvcr100.dll. Please specify using --with-msvcr-dll." "$LINENO" 5
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
-$as_echo "$MSVCR_DLL" >&6; }
+
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
@@ -18874,27 +19226,34 @@
if test "x$CC" = x; then
# Print a helpful message on how to acquire the necessary build dependency.
- # devkit is the help tag: freetyp2, cups, pulse, alsa etc
+ # devkit is the help tag: freetype, cups, pulse, alsa etc
MISSING_DEPENDENCY=devkit
- PKGHANDLER_COMMAND=
- case $PKGHANDLER in
- apt-get)
- apt_help $MISSING_DEPENDENCY ;;
- yum)
- yum_help $MISSING_DEPENDENCY ;;
- port)
- port_help $MISSING_DEPENDENCY ;;
- pkgutil)
- pkgutil_help $MISSING_DEPENDENCY ;;
- pkgadd)
- pkgadd_help $MISSING_DEPENDENCY ;;
- * )
- break ;;
- esac
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ cygwin_help $MISSING_DEPENDENCY
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ msys_help $MISSING_DEPENDENCY
+ else
+ PKGHANDLER_COMMAND=
- if test "x$PKGHANDLER_COMMAND" != x; then
- HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ case $PKGHANDLER in
+ apt-get)
+ apt_help $MISSING_DEPENDENCY ;;
+ yum)
+ yum_help $MISSING_DEPENDENCY ;;
+ port)
+ port_help $MISSING_DEPENDENCY ;;
+ pkgutil)
+ pkgutil_help $MISSING_DEPENDENCY ;;
+ pkgadd)
+ pkgadd_help $MISSING_DEPENDENCY ;;
+ * )
+ break ;;
+ esac
+
+ if test "x$PKGHANDLER_COMMAND" != x; then
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ fi
fi
as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5
@@ -20446,27 +20805,34 @@
if test "x$CXX" = x; then
# Print a helpful message on how to acquire the necessary build dependency.
- # devkit is the help tag: freetyp2, cups, pulse, alsa etc
+ # devkit is the help tag: freetype, cups, pulse, alsa etc
MISSING_DEPENDENCY=devkit
- PKGHANDLER_COMMAND=
- case $PKGHANDLER in
- apt-get)
- apt_help $MISSING_DEPENDENCY ;;
- yum)
- yum_help $MISSING_DEPENDENCY ;;
- port)
- port_help $MISSING_DEPENDENCY ;;
- pkgutil)
- pkgutil_help $MISSING_DEPENDENCY ;;
- pkgadd)
- pkgadd_help $MISSING_DEPENDENCY ;;
- * )
- break ;;
- esac
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ cygwin_help $MISSING_DEPENDENCY
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ msys_help $MISSING_DEPENDENCY
+ else
+ PKGHANDLER_COMMAND=
- if test "x$PKGHANDLER_COMMAND" != x; then
- HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ case $PKGHANDLER in
+ apt-get)
+ apt_help $MISSING_DEPENDENCY ;;
+ yum)
+ yum_help $MISSING_DEPENDENCY ;;
+ port)
+ port_help $MISSING_DEPENDENCY ;;
+ pkgutil)
+ pkgutil_help $MISSING_DEPENDENCY ;;
+ pkgadd)
+ pkgadd_help $MISSING_DEPENDENCY ;;
+ * )
+ break ;;
+ esac
+
+ if test "x$PKGHANDLER_COMMAND" != x; then
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ fi
fi
as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5
@@ -29539,11 +29905,11 @@
elif test "x$enable_debug_symbols" = "xno"; then
ENABLE_DEBUG_SYMBOLS=false
else
- # default on macosx is false
- if test "x$OPENJDK_TARGET_OS" = xmacosx; then
- ENABLE_DEBUG_SYMBOLS=false
- # Default is on if objcopy is found, otherwise off
- elif test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then
+ # Default is on if objcopy is found
+ if test "x$OBJCOPY" != x; then
+ ENABLE_DEBUG_SYMBOLS=true
+ # MacOS X and Windows don't use objcopy but default is on for those OSes
+ elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
ENABLE_DEBUG_SYMBOLS=true
else
ENABLE_DEBUG_SYMBOLS=false
@@ -29586,6 +29952,66 @@
#
###############################################################################
+# After we have toolchain, we can compile fixpath. It's needed by the lib checks.
+
+ # When using cygwin or msys, we need a wrapper binary that renames
+ # /cygdrive/c/ arguments into c:/ arguments and peeks into
+ # @files and rewrites these too! This wrapper binary is
+ # called fixpath.
+ FIXPATH=
+ if test "x$OPENJDK_BUILD_OS" = xwindows; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath can be created" >&5
+$as_echo_n "checking if fixpath can be created... " >&6; }
+ FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
+ FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe"
+ if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
+ FIXPATH_SRC=`$CYGPATH -m $FIXPATH_SRC`
+ FIXPATH_BIN=`$CYGPATH -m $FIXPATH_BIN`
+ # Important to keep the .exe suffix on Cygwin for Hotspot makefiles
+ FIXPATH="$OUTPUT_ROOT/fixpath.exe -c"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then
+ FIXPATH_SRC=`cmd //c echo $FIXPATH_SRC`
+ FIXPATH_BIN=`cmd //c echo $FIXPATH_BIN`
+
+ # Take all collected prefixes and turn them into a -m/c/foo@/c/bar@... command line
+ # @ was chosen as separator to minimize risk of other tools messing around with it
+ all_unique_prefixes=`echo "${all_fixpath_prefixes[@]}" | tr ' ' '\n' | grep '^/./' | sort | uniq`
+ fixpath_argument_list=`echo $all_unique_prefixes | tr ' ' '@'`
+
+ FIXPATH="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list"
+ fi
+ rm -f $OUTPUT_ROOT/fixpath*
+ cd $OUTPUT_ROOT
+ $CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1
+ cd $CURDIR
+
+ if test ! -x $OUTPUT_ROOT/fixpath.exe; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ cat $OUTPUT_ROOT/fixpath1.log
+ as_fn_error $? "Could not create $OUTPUT_ROOT/fixpath.exe" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath.exe works" >&5
+$as_echo_n "checking if fixpath.exe works... " >&6; }
+ cd $OUTPUT_ROOT
+ $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1
+ cd $CURDIR
+ if test ! -x $OUTPUT_ROOT/fixpath2.exe; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ cat $OUTPUT_ROOT/fixpath2.log
+ as_fn_error $? "fixpath did not work!" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj
+ fi
+
+
+
+
###############################################################################
@@ -29626,7 +30052,6 @@
ALSA_NOT_NEEDED=yes
PULSE_NOT_NEEDED=yes
X11_NOT_NEEDED=yes
- FREETYPE2_NOT_NEEDED=yes
# If the java runtime framework is disabled, then we need X11.
# This will be adjusted below.
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11" >&5
@@ -29642,7 +30067,7 @@
fi
if test "x$OPENJDK" = "xfalse"; then
- FREETYPE2_NOT_NEEDED=yes
+ FREETYPE_NOT_NEEDED=yes
fi
if test "x$SUPPORT_HEADFUL" = xno; then
@@ -29651,44 +30076,31 @@
###############################################################################
#
- # Check for MacOSX support for OpenJDK. If this exists, try to build a JVM
- # that uses this API.
+ # Check for MacOSX support for OpenJDK.
#
+
+
# Check whether --enable-macosx-runtime-support was given.
if test "${enable_macosx_runtime_support+set}" = set; then :
- enableval=$enable_macosx_runtime_support; MACOSX_RUNTIME_SUPPORT="${enableval}"
-else
- MACOSX_RUNTIME_SUPPORT="no"
+ enableval=$enable_macosx_runtime_support;
fi
+ if test "x$enable_macosx_runtime_support" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --enable-macosx-runtime-support is deprecated and will be ignored." >&5
+$as_echo "$as_me: WARNING: Option --enable-macosx-runtime-support is deprecated and will be ignored." >&2;}
+ fi
- USE_MACOSX_RUNTIME_SUPPORT=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for explicit Java runtime support in the OS" >&5
-$as_echo_n "checking for explicit Java runtime support in the OS... " >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mac OS X Java Framework" >&5
+$as_echo_n "checking for Mac OS X Java Framework... " >&6; }
if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then
- if test "x$MACOSX_RUNTIME_SUPPORT" != xno; then
- MACOSX_RUNTIME_SUPPORT=yes
- USE_MACOSX_RUNTIME_SUPPORT=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, does not need alsa freetype2 pulse and X11" >&5
-$as_echo "yes, does not need alsa freetype2 pulse and X11" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, but explicitly disabled." >&5
-$as_echo "yes, but explicitly disabled." >&6; }
- fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: /System/Library/Frameworks/JavaVM.framework" >&5
+$as_echo "/System/Library/Frameworks/JavaVM.framework" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$USE_MACOSX_RUNTIME_SUPPORT" = xno; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on an X11 build on MacOSX?" >&5
-$as_echo_n "checking what is not needed on an X11 build on MacOSX?... " >&6; }
- X11_NOT_NEEDED=
- FREETYPE2_NOT_NEEDED=
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
-$as_echo "alsa pulse" >&6; }
- fi
-
###############################################################################
@@ -30412,42 +30824,39 @@
if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
# Print a helpful message on how to acquire the necessary build dependency.
- # x11 is the help tag: freetyp2, cups, pulse, alsa etc
+ # x11 is the help tag: freetype, cups, pulse, alsa etc
MISSING_DEPENDENCY=x11
- PKGHANDLER_COMMAND=
- case $PKGHANDLER in
- apt-get)
- apt_help $MISSING_DEPENDENCY ;;
- yum)
- yum_help $MISSING_DEPENDENCY ;;
- port)
- port_help $MISSING_DEPENDENCY ;;
- pkgutil)
- pkgutil_help $MISSING_DEPENDENCY ;;
- pkgadd)
- pkgadd_help $MISSING_DEPENDENCY ;;
- * )
- break ;;
- esac
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ cygwin_help $MISSING_DEPENDENCY
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ msys_help $MISSING_DEPENDENCY
+ else
+ PKGHANDLER_COMMAND=
- if test "x$PKGHANDLER_COMMAND" != x; then
- HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ case $PKGHANDLER in
+ apt-get)
+ apt_help $MISSING_DEPENDENCY ;;
+ yum)
+ yum_help $MISSING_DEPENDENCY ;;
+ port)
+ port_help $MISSING_DEPENDENCY ;;
+ pkgutil)
+ pkgutil_help $MISSING_DEPENDENCY ;;
+ pkgadd)
+ pkgadd_help $MISSING_DEPENDENCY ;;
+ * )
+ break ;;
+ esac
+
+ if test "x$PKGHANDLER_COMMAND" != x; then
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ fi
fi
as_fn_error $? "Could not find X11 libraries. $HELP_MSG" "$LINENO" 5
fi
- # Some of the old makefiles require a setting of OPENWIN_HOME
- # Since the X11R6 directory has disappeared on later Linuxes,
- # we need to probe for it.
- if test "x$OPENJDK_TARGET_OS" = xlinux; then
- if test -d "$SYS_ROOT/usr/X11R6"; then
- OPENWIN_HOME="$SYS_ROOT/usr/X11R6"
- elif test -d "$SYS_ROOT/usr/include/X11"; then
- OPENWIN_HOME="$SYS_ROOT/usr"
- fi
- fi
if test "x$OPENJDK_TARGET_OS" = xsolaris; then
OPENWIN_HOME="/usr/openwin"
fi
@@ -30507,27 +30916,34 @@
if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then
# Print a helpful message on how to acquire the necessary build dependency.
- # x11 is the help tag: freetyp2, cups, pulse, alsa etc
+ # x11 is the help tag: freetype, cups, pulse, alsa etc
MISSING_DEPENDENCY=x11
- PKGHANDLER_COMMAND=
- case $PKGHANDLER in
- apt-get)
- apt_help $MISSING_DEPENDENCY ;;
- yum)
- yum_help $MISSING_DEPENDENCY ;;
- port)
- port_help $MISSING_DEPENDENCY ;;
- pkgutil)
- pkgutil_help $MISSING_DEPENDENCY ;;
- pkgadd)
- pkgadd_help $MISSING_DEPENDENCY ;;
- * )
- break ;;
- esac
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ cygwin_help $MISSING_DEPENDENCY
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ msys_help $MISSING_DEPENDENCY
+ else
+ PKGHANDLER_COMMAND=
- if test "x$PKGHANDLER_COMMAND" != x; then
- HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ case $PKGHANDLER in
+ apt-get)
+ apt_help $MISSING_DEPENDENCY ;;
+ yum)
+ yum_help $MISSING_DEPENDENCY ;;
+ port)
+ port_help $MISSING_DEPENDENCY ;;
+ pkgutil)
+ pkgutil_help $MISSING_DEPENDENCY ;;
+ pkgadd)
+ pkgadd_help $MISSING_DEPENDENCY ;;
+ * )
+ break ;;
+ esac
+
+ if test "x$PKGHANDLER_COMMAND" != x; then
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ fi
fi
as_fn_error $? "Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG" "$LINENO" 5
@@ -30762,27 +31178,34 @@
if test "x$CUPS_FOUND" = xno; then
# Print a helpful message on how to acquire the necessary build dependency.
- # cups is the help tag: freetyp2, cups, pulse, alsa etc
+ # cups is the help tag: freetype, cups, pulse, alsa etc
MISSING_DEPENDENCY=cups
- PKGHANDLER_COMMAND=
- case $PKGHANDLER in
- apt-get)
- apt_help $MISSING_DEPENDENCY ;;
- yum)
- yum_help $MISSING_DEPENDENCY ;;
- port)
- port_help $MISSING_DEPENDENCY ;;
- pkgutil)
- pkgutil_help $MISSING_DEPENDENCY ;;
- pkgadd)
- pkgadd_help $MISSING_DEPENDENCY ;;
- * )
- break ;;
- esac
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ cygwin_help $MISSING_DEPENDENCY
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ msys_help $MISSING_DEPENDENCY
+ else
+ PKGHANDLER_COMMAND=
- if test "x$PKGHANDLER_COMMAND" != x; then
- HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ case $PKGHANDLER in
+ apt-get)
+ apt_help $MISSING_DEPENDENCY ;;
+ yum)
+ yum_help $MISSING_DEPENDENCY ;;
+ port)
+ port_help $MISSING_DEPENDENCY ;;
+ pkgutil)
+ pkgutil_help $MISSING_DEPENDENCY ;;
+ pkgadd)
+ pkgadd_help $MISSING_DEPENDENCY ;;
+ * )
+ break ;;
+ esac
+
+ if test "x$PKGHANDLER_COMMAND" != x; then
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ fi
fi
as_fn_error $? "Could not find cups! $HELP_MSG " "$LINENO" 5
@@ -30796,7 +31219,7 @@
###############################################################################
#
- # The ubiquitous freetype2 library is used to render fonts.
+ # The ubiquitous freetype library is used to render fonts.
#
# Check whether --with-freetype was given.
@@ -30805,27 +31228,103 @@
fi
- # If we are using the OS installed system lib for freetype, then we do not need to copy it to the build tree
- USING_SYSTEM_FT_LIB=false
+# Check whether --with-freetype-include was given.
+if test "${with_freetype_include+set}" = set; then :
+ withval=$with_freetype_include;
+fi
- if test "x$FREETYPE2_NOT_NEEDED" = xyes; then
+
+# Check whether --with-freetype-lib was given.
+if test "${with_freetype_lib+set}" = set; then :
+ withval=$with_freetype_lib;
+fi
+
+ # Check whether --enable-freetype-bundling was given.
+if test "${enable_freetype_bundling+set}" = set; then :
+ enableval=$enable_freetype_bundling;
+fi
+
+
+ FREETYPE_CFLAGS=
+ FREETYPE_LIBS=
+ FREETYPE_BUNDLE_LIB_PATH=
+
+ if test "x$FREETYPE_NOT_NEEDED" = xyes; then
if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: freetype not used, so --with-freetype is ignored" >&5
$as_echo "$as_me: WARNING: freetype not used, so --with-freetype is ignored" >&2;}
fi
- FREETYPE2_CFLAGS=
- FREETYPE2_LIBS=
- FREETYPE2_LIB_PATH=
+ if test "x$enable_freetype_bundling" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: freetype not used, so --enable-freetype-bundling is ignored" >&5
+$as_echo "$as_me: WARNING: freetype not used, so --enable-freetype-bundling is ignored" >&2;}
+ fi
else
- FREETYPE2_FOUND=no
+ # freetype is needed to build; go get it!
- if test "x$with_freetype" != x; then
+ BUNDLE_FREETYPE="$enable_freetype_bundling"
+
+ if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then
+ # User has specified settings
+
+ if test "x$BUNDLE_FREETYPE" = x; then
+ # If not specified, default is to bundle freetype
+ BUNDLE_FREETYPE=yes
+ fi
+
+ if test "x$with_freetype" != x; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype/include"
+ POTENTIAL_FREETYPE_LIB_PATH="$with_freetype/lib"
+ fi
+
+ # Allow --with-freetype-lib and --with-freetype-include to override
+ if test "x$with_freetype_include" != x; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"
+ fi
+ if test "x$with_freetype_lib" != x; then
+ POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
+ fi
+
+ if test "x$POTENTIAL_FREETYPE_INCLUDE_PATH" != x && test "x$POTENTIAL_FREETYPE_LIB_PATH" != x; then
+ # Okay, we got it. Check that it works.
+
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
+ METHOD="--with-freetype"
+
+ # First check if the files exists.
+ if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
+ # We found an arbitrary include file. That's a good sign.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&5
+$as_echo "$as_me: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&6;}
+ FOUND_FREETYPE=yes
+
+ FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&5
+$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&6;}
+ FOUND_FREETYPE=no
+ else
+ if test "x$OPENJDK_TARGET_OS" = xwindows; then
+ # On Windows, we will need both .lib and .dll file.
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&5
+$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&6;}
+ FOUND_FREETYPE=no
+ fi
+ elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
+ # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
+ POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
+ fi
+ fi
+ fi
+
+ if test "x$FOUND_FREETYPE" = xyes; then
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
# Input might be given as Windows format, start by converting to
# unix format.
- path="$with_freetype"
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
new_path=`$CYGPATH -u "$path"`
# Cygwin tries to hide some aspects of the Windows file system, such that binaries are
@@ -30837,9 +31336,9 @@
# It is also a way to make sure we got the proper file name for the real test later on.
test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
if test "x$test_shortpath" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: The path of with_freetype, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of with_freetype, which resolves as \"$path\", is invalid." >&6;}
- as_fn_error $? "Cannot locate the the path of with_freetype" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_INCLUDE_PATH" "$LINENO" 5
fi
# Call helper function which possibly converts this using DOS-style short mode.
@@ -30877,14 +31376,14 @@
if test "x$path" != "x$new_path"; then
- with_freetype="$new_path"
- { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting with_freetype to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting with_freetype to \"$new_path\"" >&6;}
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
fi
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
- path="$with_freetype"
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
has_colon=`$ECHO $path | $GREP ^.:`
new_path="$path"
if test "x$has_colon" = x; then
@@ -30915,9 +31414,9 @@
fi
if test "x$path" != "x$new_path"; then
- with_freetype="$new_path"
- { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting with_freetype to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting with_freetype to \"$new_path\"" >&6;}
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
fi
# Save the first 10 bytes of this path to the storage, so fixpath can work.
@@ -30925,54 +31424,187 @@
else
# We're on a posix platform. Hooray! :)
- path="$with_freetype"
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: The path of with_freetype, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of with_freetype, which resolves as \"$path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
fi
# Use eval to expand a potential ~
eval path="$path"
if test ! -f "$path" && test ! -d "$path"; then
- as_fn_error $? "The path of with_freetype, which resolves as \"$path\", is not found." "$LINENO" 5
+ as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- with_freetype="`cd "$path"; $THEPWDCMD -L`"
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
fi
- FREETYPE2_LIBS="-L$with_freetype/lib -lfreetype"
- FREETYPE2_LIB_PATH="$with_freetype/lib"
- if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -d "$with_freetype/lib/amd64"; then
- FREETYPE2_LIBS="-L$with_freetype/lib/amd64 -lfreetype"
- FREETYPE2_LIB_PATH="$with_freetype/lib/amd64"
- fi
- if test "x$OPENJDK_TARGET_OS" = xwindows; then
- FREETYPE2_LIBS="$with_freetype/lib/freetype.lib"
- fi
- FREETYPE2_CFLAGS="-I$with_freetype/include"
- if test -s $with_freetype/include/ft2build.h && test -d $with_freetype/include/freetype2/freetype; then
- FREETYPE2_CFLAGS="-I$with_freetype/include/freetype2 -I$with_freetype/include"
- fi
- FREETYPE2_FOUND=yes
- if test "x$FREETYPE2_FOUND" = xyes; then
- # Verify that the directories exist
- if ! test -d "$with_freetype/lib" || ! test -d "$with_freetype/include"; then
- as_fn_error $? "Could not find the expected directories $with_freetype/lib and $with_freetype/include" "$LINENO" 5
- fi
- # List the contents of the lib.
- FREETYPELIB=`ls $with_freetype/lib/libfreetype.so $with_freetype/lib/freetype.dll 2> /dev/null`
- if test "x$FREETYPELIB" = x; then
- as_fn_error $? "Could not find libfreetype.so nor freetype.dll in $with_freetype/lib" "$LINENO" 5
- fi
- # Check one h-file
- if ! test -s "$with_freetype/include/ft2build.h"; then
- as_fn_error $? "Could not find $with_freetype/include/ft2build.h" "$LINENO" 5
- fi
- fi
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_LIB_PATH" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
- if test "x$FREETYPE2_FOUND" = xno; then
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+
+ # Use eval to expand a potential ~
+ eval path="$path"
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ fi
+
+
+ FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype includes" >&5
+$as_echo_n "checking for freetype includes... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_INCLUDE_PATH" >&5
+$as_echo "$FREETYPE_INCLUDE_PATH" >&6; }
+ FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
+$as_echo_n "checking for freetype libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
+$as_echo "$FREETYPE_LIB_PATH" >&6; }
+ fi
+
+ if test "x$FOUND_FREETYPE" != xyes; then
+ as_fn_error $? "Can not find or use freetype at location given by --with-freetype" "$LINENO" 5
+ fi
+ else
+ # User specified only one of lib or include. This is an error.
+ if test "x$POTENTIAL_FREETYPE_INCLUDE_PATH" = x ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: User specified --with-freetype-lib but not --with-freetype-include" >&5
+$as_echo "$as_me: User specified --with-freetype-lib but not --with-freetype-include" >&6;}
+ as_fn_error $? "Need both freetype lib and include paths. Consider using --with-freetype instead." "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: User specified --with-freetype-include but not --with-freetype-lib" >&5
+$as_echo "$as_me: User specified --with-freetype-include but not --with-freetype-lib" >&6;}
+ as_fn_error $? "Need both freetype lib and include paths. Consider using --with-freetype instead." "$LINENO" 5
+ fi
+ fi
+ else
+ # User did not specify settings, but we need freetype. Try to locate it.
+
+ if test "x$BUNDLE_FREETYPE" = x; then
+ # If not specified, default is to bundle freetype only on windows
+ if test "x$OPENJDK_TARGET_OS" = xwindows; then
+ BUNDLE_FREETYPE=yes
+ else
+ BUNDLE_FREETYPE=no
+ fi
+ fi
+
+ if test "x$FOUND_FREETYPE" != xyes; then
+ # Check builddeps
if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
@@ -31100,34 +31732,184 @@
if test "x$depdir" = x; then
as_fn_error $? "Could not download build dependency freetype2" "$LINENO" 5
fi
- FREETYPE2=$depdir
+ FREETYPE=$depdir
if test "x$theroot" != x; then
- FREETYPE2="$theroot"
+ FREETYPE="$theroot"
fi
if test "x$thecflags" != x; then
- FREETYPE2_CFLAGS="$thecflags"
+ FREETYPE_CFLAGS="$thecflags"
fi
if test "x$thelibs" != x; then
- FREETYPE2_LIBS="$thelibs"
+ FREETYPE_LIBS="$thelibs"
fi
- FREETYPE2_FOUND=yes
- else FREETYPE2_FOUND=no
+ FOUND_FREETYPE=yes
+ else FOUND_FREETYPE=no
fi
- else FREETYPE2_FOUND=no
+ else FOUND_FREETYPE=no
fi
- USING_SYSTEM_FT_LIB=true
+ # BDEPS_CHECK_MODULE will set FREETYPE_CFLAGS and _LIBS, but we don't get a lib path for bundling.
+ if test "x$FOUND_FREETYPE" = xyes; then
+ if test "x$BUNDLE_FREETYPE" = xyes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype using builddeps, but ignoring since we can not bundle that" >&5
+$as_echo "$as_me: Found freetype using builddeps, but ignoring since we can not bundle that" >&6;}
+ FOUND_FREETYPE=no
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype" >&5
+$as_echo_n "checking for freetype... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (using builddeps)" >&5
+$as_echo "yes (using builddeps)" >&6; }
+ fi
+ fi
+ fi
+
+ if test "x$FOUND_FREETYPE" != xyes; then
+ # Check modules using pkg-config, but only if we have it (ugly output results otherwise)
+ if test "x$PKG_CONFIG" != x; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5
+$as_echo_n "checking for FREETYPE... " >&6; }
+
+if test -n "$FREETYPE_CFLAGS"; then
+ pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$FREETYPE_LIBS"; then
+ pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "freetype2" 2>&1`
+ else
+ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "freetype2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$FREETYPE_PKG_ERRORS" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ FOUND_FREETYPE=no
+elif test $pkg_failed = untried; then
+ FOUND_FREETYPE=no
+else
+ FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS
+ FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ FOUND_FREETYPE=yes
+fi
+ if test "x$FOUND_FREETYPE" = xyes; then
+ # On solaris, pkg_check adds -lz to freetype libs, which isn't necessary for us.
+ FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's/-lz//g'`
+ # 64-bit libs for Solaris x86 are installed in the amd64 subdirectory, change lib to lib/amd64
+ if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+ FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's?/lib?/lib/amd64?g'`
+ fi
+ # BDEPS_CHECK_MODULE will set FREETYPE_CFLAGS and _LIBS, but we don't get a lib path for bundling.
+ if test "x$BUNDLE_FREETYPE" = xyes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype using pkg-config, but ignoring since we can not bundle that" >&5
+$as_echo "$as_me: Found freetype using pkg-config, but ignoring since we can not bundle that" >&6;}
+ FOUND_FREETYPE=no
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype" >&5
+$as_echo_n "checking for freetype... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (using pkg-config)" >&5
+$as_echo "yes (using pkg-config)" >&6; }
+ fi
+ fi
+ fi
+ fi
+
+ if test "x$FOUND_FREETYPE" != xyes; then
+ # Check in well-known locations
+ if test "x$OPENJDK_TARGET_OS" = xwindows; then
+ FREETYPE_BASE_DIR="$PROGRAMFILES/GnuWin32"
+
+ windows_path="$FREETYPE_BASE_DIR"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ FREETYPE_BASE_DIR="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ FREETYPE_BASE_DIR="$unix_path"
+ fi
+
+
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include"
+ POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib"
+ METHOD="well-known location"
+
+ # First check if the files exists.
+ if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
+ # We found an arbitrary include file. That's a good sign.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&5
+$as_echo "$as_me: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&6;}
+ FOUND_FREETYPE=yes
+
+ FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&5
+$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&6;}
+ FOUND_FREETYPE=no
+ else
+ if test "x$OPENJDK_TARGET_OS" = xwindows; then
+ # On Windows, we will need both .lib and .dll file.
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&5
+$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&6;}
+ FOUND_FREETYPE=no
+ fi
+ elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
+ # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
+ POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
+ fi
fi
- if test "x$FREETYPE2_FOUND" = xno && test "x$OPENJDK_TARGET_OS" = xwindows; then
- FREETYPELOCATION="$PROGRAMFILES/GnuWin32"
+ fi
+
+ if test "x$FOUND_FREETYPE" = xyes; then
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
# Input might be given as Windows format, start by converting to
# unix format.
- path="$FREETYPELOCATION"
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
new_path=`$CYGPATH -u "$path"`
# Cygwin tries to hide some aspects of the Windows file system, such that binaries are
@@ -31139,9 +31921,9 @@
# It is also a way to make sure we got the proper file name for the real test later on.
test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
if test "x$test_shortpath" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FREETYPELOCATION, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of FREETYPELOCATION, which resolves as \"$path\", is invalid." >&6;}
- as_fn_error $? "Cannot locate the the path of FREETYPELOCATION" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_INCLUDE_PATH" "$LINENO" 5
fi
# Call helper function which possibly converts this using DOS-style short mode.
@@ -31179,14 +31961,14 @@
if test "x$path" != "x$new_path"; then
- FREETYPELOCATION="$new_path"
- { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FREETYPELOCATION to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting FREETYPELOCATION to \"$new_path\"" >&6;}
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
fi
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
- path="$FREETYPELOCATION"
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
has_colon=`$ECHO $path | $GREP ^.:`
new_path="$path"
if test "x$has_colon" = x; then
@@ -31217,9 +31999,9 @@
fi
if test "x$path" != "x$new_path"; then
- FREETYPELOCATION="$new_path"
- { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FREETYPELOCATION to \"$new_path\"" >&5
-$as_echo "$as_me: Rewriting FREETYPELOCATION to \"$new_path\"" >&6;}
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
fi
# Save the first 10 bytes of this path to the storage, so fixpath can work.
@@ -31227,242 +32009,2330 @@
else
# We're on a posix platform. Hooray! :)
- path="$FREETYPELOCATION"
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
has_space=`$ECHO "$path" | $GREP " "`
if test "x$has_space" != x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FREETYPELOCATION, which resolves as \"$path\", is invalid." >&5
-$as_echo "$as_me: The path of FREETYPELOCATION, which resolves as \"$path\", is invalid." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
fi
# Use eval to expand a potential ~
eval path="$path"
if test ! -f "$path" && test ! -d "$path"; then
- as_fn_error $? "The path of FREETYPELOCATION, which resolves as \"$path\", is not found." "$LINENO" 5
+ as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- FREETYPELOCATION="`cd "$path"; $THEPWDCMD -L`"
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard windows locations" >&5
-$as_echo_n "checking for freetype in some standard windows locations... " >&6; }
- if test -s "$FREETYPELOCATION/include/ft2build.h" && test -d "$FREETYPELOCATION/include/freetype2/freetype"; then
- FREETYPE2_CFLAGS="-I$FREETYPELOCATION/include/freetype2 -I$FREETYPELOCATION/include"
- FREETYPE2_LIBS="$FREETYPELOCATION/lib/freetype.lib"
- FREETYPE2_LIB_PATH="$FREETYPELOCATION/lib"
- if ! test -s "$FREETYPE2_LIBS"; then
- as_fn_error $? "Could not find $FREETYPE2_LIBS" "$LINENO" 5
- fi
- if ! test -s "$FREETYPE2_LIB_PATH/freetype.dll"; then
- as_fn_error $? "Could not find $FREETYPE2_LIB_PATH/freetype.dll" "$LINENO" 5
- fi
- USING_SYSTEM_FT_LIB=true
- FREETYPE2_FOUND=yes
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE2_FOUND" >&5
-$as_echo "$FREETYPE2_FOUND" >&6; }
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_LIB_PATH" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
- if test "x$FREETYPE2_FOUND" = xno; then
+ fi
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE2" >&5
-$as_echo_n "checking for FREETYPE2... " >&6; }
-
-if test -n "$FREETYPE2_CFLAGS"; then
- pkg_cv_FREETYPE2_CFLAGS="$FREETYPE2_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$FREETYPE2_LIBS"; then
- pkg_cv_FREETYPE2_LIBS="$FREETYPE2_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_FREETYPE2_LIBS=`$PKG_CONFIG --libs "freetype2" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
-if test $pkg_failed = yes; then
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- FREETYPE2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "freetype2" 2>&1`
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+
+ # Use eval to expand a potential ~
+ eval path="$path"
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ fi
+
+
+ FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype includes" >&5
+$as_echo_n "checking for freetype includes... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_INCLUDE_PATH" >&5
+$as_echo "$FREETYPE_INCLUDE_PATH" >&6; }
+ FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
+$as_echo_n "checking for freetype libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
+$as_echo "$FREETYPE_LIB_PATH" >&6; }
+ fi
+
+ if test "x$FOUND_FREETYPE" != xyes; then
+ FREETYPE_BASE_DIR="$ProgramW6432/GnuWin32"
+
+ windows_path="$FREETYPE_BASE_DIR"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ FREETYPE_BASE_DIR="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ FREETYPE_BASE_DIR="$unix_path"
+ fi
+
+
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include"
+ POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib"
+ METHOD="well-known location"
+
+ # First check if the files exists.
+ if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
+ # We found an arbitrary include file. That's a good sign.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&5
+$as_echo "$as_me: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&6;}
+ FOUND_FREETYPE=yes
+
+ FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&5
+$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&6;}
+ FOUND_FREETYPE=no
+ else
+ if test "x$OPENJDK_TARGET_OS" = xwindows; then
+ # On Windows, we will need both .lib and .dll file.
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&5
+$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&6;}
+ FOUND_FREETYPE=no
+ fi
+ elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
+ # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
+ POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
+ fi
+ fi
+ fi
+
+ if test "x$FOUND_FREETYPE" = xyes; then
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_INCLUDE_PATH" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+
+ # Use eval to expand a potential ~
+ eval path="$path"
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ fi
+
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_LIB_PATH" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+
+ # Use eval to expand a potential ~
+ eval path="$path"
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ fi
+
+
+ FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype includes" >&5
+$as_echo_n "checking for freetype includes... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_INCLUDE_PATH" >&5
+$as_echo "$FREETYPE_INCLUDE_PATH" >&6; }
+ FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
+$as_echo_n "checking for freetype libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
+$as_echo "$FREETYPE_LIB_PATH" >&6; }
+ fi
+
+ fi
else
- FREETYPE2_PKG_ERRORS=`$PKG_CONFIG --print-errors "freetype2" 2>&1`
+ if test "x$SYS_ROOT" = "x/"; then
+ FREETYPE_ROOT=
+ else
+ FREETYPE_ROOT="$SYS_ROOT"
+ fi
+ FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr"
+
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include"
+ POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib"
+ METHOD="well-known location"
+
+ # First check if the files exists.
+ if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
+ # We found an arbitrary include file. That's a good sign.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&5
+$as_echo "$as_me: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&6;}
+ FOUND_FREETYPE=yes
+
+ FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&5
+$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&6;}
+ FOUND_FREETYPE=no
+ else
+ if test "x$OPENJDK_TARGET_OS" = xwindows; then
+ # On Windows, we will need both .lib and .dll file.
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&5
+$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&6;}
+ FOUND_FREETYPE=no
fi
- # Put the nasty error message in config.log where it belongs
- echo "$FREETYPE2_PKG_ERRORS" >&5
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- FREETYPE2_FOUND=no
-elif test $pkg_failed = untried; then
- FREETYPE2_FOUND=no
-else
- FREETYPE2_CFLAGS=$pkg_cv_FREETYPE2_CFLAGS
- FREETYPE2_LIBS=$pkg_cv_FREETYPE2_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- FREETYPE2_FOUND=yes
-fi
- # On solaris, pkg_check adds -lz to freetype libs, which isn't necessary for us.
- FREETYPE2_LIBS=`$ECHO $FREETYPE2_LIBS | $SED 's/-lz//g'`
- USING_SYSTEM_FT_LIB=true
- # 64-bit libs for Solaris x86 are installed in the amd64 subdirectory, change lib to lib/amd64
- if test "x$FREETYPE2_FOUND" = xyes && test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
- FREETYPE2_LIBS=`$ECHO $FREETYPE2_LIBS | $SED 's?/lib?/lib/amd64?g'`
+ elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
+ # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
+ POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
fi
fi
- if test "x$FREETYPE2_FOUND" = xno; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard locations" >&5
-$as_echo_n "checking for freetype in some standard locations... " >&6; }
+ fi
- if test -s $SYS_ROOT/usr/X11/include/ft2build.h && test -d $SYS_ROOT/usr/X11/include/freetype2/freetype; then
- DEFAULT_FREETYPE_CFLAGS="-I$SYS_ROOT/usr/X11/include/freetype2 -I$SYS_ROOT/usr/X11/include"
- DEFAULT_FREETYPE_LIBS="-L$SYS_ROOT/usr/X11/lib -lfreetype"
- fi
- if test -s $SYS_ROOT/usr/include/ft2build.h && test -d $SYS_ROOT/usr/include/freetype2/freetype; then
- DEFAULT_FREETYPE_CFLAGS="-I$SYS_ROOT/usr/include/freetype2"
- DEFAULT_FREETYPE_LIBS="-lfreetype"
- fi
+ if test "x$FOUND_FREETYPE" = xyes; then
- PREV_CXXCFLAGS="$CXXFLAGS"
- PREV_LDFLAGS="$LDFLAGS"
- CXXFLAGS="$CXXFLAGS $DEFAULT_FREETYPE_CFLAGS"
- LDFLAGS="$LDFLAGS $DEFAULT_FREETYPE_LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- #include<ft2build.h>
- #include FT_FREETYPE_H
- int main() { return 0; }
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ new_path=`$CYGPATH -u "$path"`
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_INCLUDE_PATH" "$LINENO" 5
+ fi
- # Yes, the default cflags and libs did the trick.
- FREETYPE2_FOUND=yes
- FREETYPE2_CFLAGS="$DEFAULT_FREETYPE_CFLAGS"
- FREETYPE2_LIBS="$DEFAULT_FREETYPE_LIBS"
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
-else
-
- FREETYPE2_FOUND=no
-
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CXXCFLAGS="$PREV_CXXFLAGS"
- LDFLAGS="$PREV_LDFLAGS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE2_FOUND" >&5
-$as_echo "$FREETYPE2_FOUND" >&6; }
- USING_SYSTEM_FT_LIB=true
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
fi
- if test "x$FREETYPE2_FOUND" = xno; then
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+
+ # Use eval to expand a potential ~
+ eval path="$path"
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ fi
+
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_LIB_PATH" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+
+ # Use eval to expand a potential ~
+ eval path="$path"
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ fi
+
+
+ FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype includes" >&5
+$as_echo_n "checking for freetype includes... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_INCLUDE_PATH" >&5
+$as_echo "$FREETYPE_INCLUDE_PATH" >&6; }
+ FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
+$as_echo_n "checking for freetype libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
+$as_echo "$FREETYPE_LIB_PATH" >&6; }
+ fi
+
+
+ if test "x$FOUND_FREETYPE" != xyes; then
+ FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr/X11"
+
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include"
+ POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib"
+ METHOD="well-known location"
+
+ # First check if the files exists.
+ if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
+ # We found an arbitrary include file. That's a good sign.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&5
+$as_echo "$as_me: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&6;}
+ FOUND_FREETYPE=yes
+
+ FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&5
+$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&6;}
+ FOUND_FREETYPE=no
+ else
+ if test "x$OPENJDK_TARGET_OS" = xwindows; then
+ # On Windows, we will need both .lib and .dll file.
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&5
+$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&6;}
+ FOUND_FREETYPE=no
+ fi
+ elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
+ # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
+ POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
+ fi
+ fi
+ fi
+
+ if test "x$FOUND_FREETYPE" = xyes; then
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_INCLUDE_PATH" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+
+ # Use eval to expand a potential ~
+ eval path="$path"
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ fi
+
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_LIB_PATH" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+
+ # Use eval to expand a potential ~
+ eval path="$path"
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ fi
+
+
+ FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype includes" >&5
+$as_echo_n "checking for freetype includes... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_INCLUDE_PATH" >&5
+$as_echo "$FREETYPE_INCLUDE_PATH" >&6; }
+ FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
+$as_echo_n "checking for freetype libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
+$as_echo "$FREETYPE_LIB_PATH" >&6; }
+ fi
+
+ fi
+
+ if test "x$FOUND_FREETYPE" != xyes; then
+ FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr"
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include"
+ POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib/x86_64-linux-gnu"
+ METHOD="well-known location"
+
+ # First check if the files exists.
+ if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
+ # We found an arbitrary include file. That's a good sign.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&5
+$as_echo "$as_me: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&6;}
+ FOUND_FREETYPE=yes
+
+ FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&5
+$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&6;}
+ FOUND_FREETYPE=no
+ else
+ if test "x$OPENJDK_TARGET_OS" = xwindows; then
+ # On Windows, we will need both .lib and .dll file.
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&5
+$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&6;}
+ FOUND_FREETYPE=no
+ fi
+ elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
+ # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
+ POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
+ fi
+ fi
+ fi
+
+ if test "x$FOUND_FREETYPE" = xyes; then
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_INCLUDE_PATH" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+
+ # Use eval to expand a potential ~
+ eval path="$path"
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ fi
+
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_LIB_PATH" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+
+ # Use eval to expand a potential ~
+ eval path="$path"
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ fi
+
+
+ FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype includes" >&5
+$as_echo_n "checking for freetype includes... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_INCLUDE_PATH" >&5
+$as_echo "$FREETYPE_INCLUDE_PATH" >&6; }
+ FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
+$as_echo_n "checking for freetype libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
+$as_echo "$FREETYPE_LIB_PATH" >&6; }
+ fi
+
+ else
+
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include"
+ POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib/i386-linux-gnu"
+ METHOD="well-known location"
+
+ # First check if the files exists.
+ if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
+ # We found an arbitrary include file. That's a good sign.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&5
+$as_echo "$as_me: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&6;}
+ FOUND_FREETYPE=yes
+
+ FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&5
+$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&6;}
+ FOUND_FREETYPE=no
+ else
+ if test "x$OPENJDK_TARGET_OS" = xwindows; then
+ # On Windows, we will need both .lib and .dll file.
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&5
+$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&6;}
+ FOUND_FREETYPE=no
+ fi
+ elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
+ # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
+ POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
+ fi
+ fi
+ fi
+
+ if test "x$FOUND_FREETYPE" = xyes; then
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_INCLUDE_PATH" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+
+ # Use eval to expand a potential ~
+ eval path="$path"
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ fi
+
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_LIB_PATH" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+
+ # Use eval to expand a potential ~
+ eval path="$path"
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ fi
+
+
+ FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype includes" >&5
+$as_echo_n "checking for freetype includes... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_INCLUDE_PATH" >&5
+$as_echo "$FREETYPE_INCLUDE_PATH" >&6; }
+ FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
+$as_echo_n "checking for freetype libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
+$as_echo "$FREETYPE_LIB_PATH" >&6; }
+ fi
+
+ if test "x$FOUND_FREETYPE" != xyes; then
+
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include"
+ POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib32"
+ METHOD="well-known location"
+
+ # First check if the files exists.
+ if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
+ # We found an arbitrary include file. That's a good sign.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&5
+$as_echo "$as_me: Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD" >&6;}
+ FOUND_FREETYPE=yes
+
+ FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&5
+$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location." >&6;}
+ FOUND_FREETYPE=no
+ else
+ if test "x$OPENJDK_TARGET_OS" = xwindows; then
+ # On Windows, we will need both .lib and .dll file.
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&5
+$as_echo "$as_me: Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location." >&6;}
+ FOUND_FREETYPE=no
+ fi
+ elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
+ # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
+ POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
+ fi
+ fi
+ fi
+
+ if test "x$FOUND_FREETYPE" = xyes; then
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_INCLUDE_PATH" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+
+ # Use eval to expand a potential ~
+ eval path="$path"
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ fi
+
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of POTENTIAL_FREETYPE_LIB_PATH" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting POTENTIAL_FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$POTENTIAL_FREETYPE_LIB_PATH"
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+
+ # Use eval to expand a potential ~
+ eval path="$path"
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ fi
+
+
+ FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype includes" >&5
+$as_echo_n "checking for freetype includes... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_INCLUDE_PATH" >&5
+$as_echo "$FREETYPE_INCLUDE_PATH" >&6; }
+ FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype libraries" >&5
+$as_echo_n "checking for freetype libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIB_PATH" >&5
+$as_echo "$FREETYPE_LIB_PATH" >&6; }
+ fi
+
+ fi
+ fi
+ fi
+ fi
+ fi # end check in well-known locations
+
+ if test "x$FOUND_FREETYPE" != xyes; then
# Print a helpful message on how to acquire the necessary build dependency.
- # freetype2 is the help tag: freetyp2, cups, pulse, alsa etc
- MISSING_DEPENDENCY=freetype2
- PKGHANDLER_COMMAND=
+ # freetype is the help tag: freetype, cups, pulse, alsa etc
+ MISSING_DEPENDENCY=freetype
- case $PKGHANDLER in
- apt-get)
- apt_help $MISSING_DEPENDENCY ;;
- yum)
- yum_help $MISSING_DEPENDENCY ;;
- port)
- port_help $MISSING_DEPENDENCY ;;
- pkgutil)
- pkgutil_help $MISSING_DEPENDENCY ;;
- pkgadd)
- pkgadd_help $MISSING_DEPENDENCY ;;
- * )
- break ;;
- esac
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ cygwin_help $MISSING_DEPENDENCY
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ msys_help $MISSING_DEPENDENCY
+ else
+ PKGHANDLER_COMMAND=
- if test "x$PKGHANDLER_COMMAND" != x; then
- HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ case $PKGHANDLER in
+ apt-get)
+ apt_help $MISSING_DEPENDENCY ;;
+ yum)
+ yum_help $MISSING_DEPENDENCY ;;
+ port)
+ port_help $MISSING_DEPENDENCY ;;
+ pkgutil)
+ pkgutil_help $MISSING_DEPENDENCY ;;
+ pkgadd)
+ pkgadd_help $MISSING_DEPENDENCY ;;
+ * )
+ break ;;
+ esac
+
+ if test "x$PKGHANDLER_COMMAND" != x; then
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ fi
fi
- as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
+ as_fn_error $? "Could not find freetype! $HELP_MSG " "$LINENO" 5
+ fi
+ fi # end user specified settings
+
+ # Set FREETYPE_CFLAGS, _LIBS and _LIB_PATH from include and lib dir.
+ if test "x$FREETYPE_CFLAGS" = x; then
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$FREETYPE_INCLUDE_PATH"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of FREETYPE_INCLUDE_PATH" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$FREETYPE_INCLUDE_PATH"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ FREETYPE_INCLUDE_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FREETYPE_INCLUDE_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting FREETYPE_INCLUDE_PATH to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$FREETYPE_INCLUDE_PATH"
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
fi
- if test "x$OPENJDK_TARGET_OS" != xwindows; then
- # AC_CHECK_LIB does not support use of cl.exe
- PREV_LDFLAGS="$LDFLAGS"
- LDFLAGS="$FREETYPE2_LIBS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5
-$as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; }
-if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfreetype $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ # Use eval to expand a potential ~
+ eval path="$path"
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ fi
+
+ if test -d $FREETYPE_INCLUDE_PATH/freetype2/freetype; then
+ FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
+ else
+ FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
+ fi
+ fi
+
+ if test "x$FREETYPE_LIBS" = x; then
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$FREETYPE_LIB_PATH"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of FREETYPE_LIB_PATH" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-stile (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$FREETYPE_LIB_PATH"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ FREETYPE_LIB_PATH="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FREETYPE_LIB_PATH to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting FREETYPE_LIB_PATH to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a posix platform. Hooray! :)
+ path="$FREETYPE_LIB_PATH"
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of FREETYPE_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+
+ # Use eval to expand a potential ~
+ eval path="$path"
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ fi
+
+ if test "x$OPENJDK_TARGET_OS" = xwindows; then
+ FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
+ else
+ FREETYPE_LIBS="-L$FREETYPE_LIB_PATH -lfreetype"
+ fi
+ fi
+
+ # Try to compile it
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can compile and link with freetype" >&5
+$as_echo_n "checking if we can compile and link with freetype... " >&6; }
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ PREV_CXXCFLAGS="$CXXFLAGS"
+ PREV_LDFLAGS="$LDFLAGS"
+ PREV_CXX="$CXX"
+ CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS"
+ LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
+ CXX="$FIXPATH $CXX"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char FT_Init_FreeType ();
-int
-main ()
-{
-return FT_Init_FreeType ();
- ;
- return 0;
-}
+ #include<ft2build.h>
+ #include FT_FREETYPE_H
+ int main () {
+ FT_Init_FreeType(NULL);
+ return 0;
+ }
+
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
- ac_cv_lib_freetype_FT_Init_FreeType=yes
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
else
- ac_cv_lib_freetype_FT_Init_FreeType=no
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not compile and link with freetype. This might be a 32/64-bit mismatch." >&5
+$as_echo "$as_me: Could not compile and link with freetype. This might be a 32/64-bit mismatch." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using FREETYPE_CFLAGS=$FREETYPE_CFLAGS and FREETYPE_LIBS=$FREETYPE_LIBS" >&5
+$as_echo "$as_me: Using FREETYPE_CFLAGS=$FREETYPE_CFLAGS and FREETYPE_LIBS=$FREETYPE_LIBS" >&6;}
+
+
+ # Print a helpful message on how to acquire the necessary build dependency.
+ # freetype is the help tag: freetype, cups, pulse, alsa etc
+ MISSING_DEPENDENCY=freetype
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ cygwin_help $MISSING_DEPENDENCY
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ msys_help $MISSING_DEPENDENCY
+ else
+ PKGHANDLER_COMMAND=
+
+ case $PKGHANDLER in
+ apt-get)
+ apt_help $MISSING_DEPENDENCY ;;
+ yum)
+ yum_help $MISSING_DEPENDENCY ;;
+ port)
+ port_help $MISSING_DEPENDENCY ;;
+ pkgutil)
+ pkgutil_help $MISSING_DEPENDENCY ;;
+ pkgadd)
+ pkgadd_help $MISSING_DEPENDENCY ;;
+ * )
+ break ;;
+ esac
+
+ if test "x$PKGHANDLER_COMMAND" != x; then
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ fi
+ fi
+
+
+ as_fn_error $? "Can not continue without freetype. $HELP_MSG" "$LINENO" 5
+
+
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5
-$as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; }
-if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then :
- FREETYPE2_FOUND=true
-else
- as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
-fi
+ CXXCFLAGS="$PREV_CXXFLAGS"
+ LDFLAGS="$PREV_LDFLAGS"
+ CXX="$PREV_CXX"
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- LDFLAGS="$PREV_LDFLAGS"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should bundle freetype" >&5
+$as_echo_n "checking if we should bundle freetype... " >&6; }
+ if test "x$BUNDLE_FREETYPE" = xyes; then
+ FREETYPE_BUNDLE_LIB_PATH="$FREETYPE_LIB_PATH"
fi
- fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUNDLE_FREETYPE" >&5
+$as_echo "$BUNDLE_FREETYPE" >&6; }
+ fi # end freetype needed
@@ -31760,27 +34630,34 @@
if test "x$ALSA_FOUND" = xno; then
# Print a helpful message on how to acquire the necessary build dependency.
- # alsa is the help tag: freetyp2, cups, pulse, alsa etc
+ # alsa is the help tag: freetype, cups, pulse, alsa etc
MISSING_DEPENDENCY=alsa
- PKGHANDLER_COMMAND=
- case $PKGHANDLER in
- apt-get)
- apt_help $MISSING_DEPENDENCY ;;
- yum)
- yum_help $MISSING_DEPENDENCY ;;
- port)
- port_help $MISSING_DEPENDENCY ;;
- pkgutil)
- pkgutil_help $MISSING_DEPENDENCY ;;
- pkgadd)
- pkgadd_help $MISSING_DEPENDENCY ;;
- * )
- break ;;
- esac
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ cygwin_help $MISSING_DEPENDENCY
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ msys_help $MISSING_DEPENDENCY
+ else
+ PKGHANDLER_COMMAND=
- if test "x$PKGHANDLER_COMMAND" != x; then
- HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ case $PKGHANDLER in
+ apt-get)
+ apt_help $MISSING_DEPENDENCY ;;
+ yum)
+ yum_help $MISSING_DEPENDENCY ;;
+ port)
+ port_help $MISSING_DEPENDENCY ;;
+ pkgutil)
+ pkgutil_help $MISSING_DEPENDENCY ;;
+ pkgadd)
+ pkgadd_help $MISSING_DEPENDENCY ;;
+ * )
+ break ;;
+ esac
+
+ if test "x$PKGHANDLER_COMMAND" != x; then
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ fi
fi
as_fn_error $? "Could not find alsa! $HELP_MSG " "$LINENO" 5
@@ -32508,65 +35385,6 @@
-# After we have toolchain and the paths to all libraries (needed by msys), we can compile the fixpath helper
-
- # When using cygwin or msys, we need a wrapper binary that renames
- # /cygdrive/c/ arguments into c:/ arguments and peeks into
- # @files and rewrites these too! This wrapper binary is
- # called fixpath.
- FIXPATH=
- if test "x$OPENJDK_BUILD_OS" = xwindows; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath can be created" >&5
-$as_echo_n "checking if fixpath can be created... " >&6; }
- FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
- FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe"
- if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
- FIXPATH_SRC=`$CYGPATH -m $FIXPATH_SRC`
- FIXPATH_BIN=`$CYGPATH -m $FIXPATH_BIN`
- # Important to keep the .exe suffix on Cygwin for Hotspot makefiles
- FIXPATH="$OUTPUT_ROOT/fixpath.exe -c"
- elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then
- FIXPATH_SRC=`cmd //c echo $FIXPATH_SRC`
- FIXPATH_BIN=`cmd //c echo $FIXPATH_BIN`
-
- # Take all collected prefixes and turn them into a -m/c/foo@/c/bar@... command line
- # @ was chosen as separator to minimize risk of other tools messing around with it
- all_unique_prefixes=`echo "${all_fixpath_prefixes[@]}" | tr ' ' '\n' | grep '^/./' | sort | uniq`
- fixpath_argument_list=`echo $all_unique_prefixes | tr ' ' '@'`
-
- FIXPATH="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list"
- fi
- rm -f $OUTPUT_ROOT/fixpath*
- cd $OUTPUT_ROOT
- $CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1
- cd $CURDIR
-
- if test ! -x $OUTPUT_ROOT/fixpath.exe; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- cat $OUTPUT_ROOT/fixpath1.log
- as_fn_error $? "Could not create $OUTPUT_ROOT/fixpath.exe" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath.exe works" >&5
-$as_echo_n "checking if fixpath.exe works... " >&6; }
- cd $OUTPUT_ROOT
- $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1
- cd $CURDIR
- if test ! -x $OUTPUT_ROOT/fixpath2.exe; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- cat $OUTPUT_ROOT/fixpath2.log
- as_fn_error $? "fixpath did not work!" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj
- fi
-
-
-
###############################################################################
#
@@ -34572,27 +37390,34 @@
printf "$CCACHE_HELP_MSG\n"
# Print a helpful message on how to acquire the necessary build dependency.
- # ccache is the help tag: freetyp2, cups, pulse, alsa etc
+ # ccache is the help tag: freetype, cups, pulse, alsa etc
MISSING_DEPENDENCY=ccache
- PKGHANDLER_COMMAND=
- case $PKGHANDLER in
- apt-get)
- apt_help $MISSING_DEPENDENCY ;;
- yum)
- yum_help $MISSING_DEPENDENCY ;;
- port)
- port_help $MISSING_DEPENDENCY ;;
- pkgutil)
- pkgutil_help $MISSING_DEPENDENCY ;;
- pkgadd)
- pkgadd_help $MISSING_DEPENDENCY ;;
- * )
- break ;;
- esac
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ cygwin_help $MISSING_DEPENDENCY
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ msys_help $MISSING_DEPENDENCY
+ else
+ PKGHANDLER_COMMAND=
- if test "x$PKGHANDLER_COMMAND" != x; then
- HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ case $PKGHANDLER in
+ apt-get)
+ apt_help $MISSING_DEPENDENCY ;;
+ yum)
+ yum_help $MISSING_DEPENDENCY ;;
+ port)
+ port_help $MISSING_DEPENDENCY ;;
+ pkgutil)
+ pkgutil_help $MISSING_DEPENDENCY ;;
+ pkgadd)
+ pkgadd_help $MISSING_DEPENDENCY ;;
+ * )
+ break ;;
+ esac
+
+ if test "x$PKGHANDLER_COMMAND" != x; then
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ fi
fi
printf "$HELP_MSG\n"
diff --git a/common/autoconf/help.m4 b/common/autoconf/help.m4
index c287af3..5cfcc6f 100644
--- a/common/autoconf/help.m4
+++ b/common/autoconf/help.m4
@@ -31,43 +31,76 @@
AC_DEFUN([HELP_MSG_MISSING_DEPENDENCY],
[
# Print a helpful message on how to acquire the necessary build dependency.
- # $1 is the help tag: freetyp2, cups, pulse, alsa etc
+ # $1 is the help tag: freetype, cups, pulse, alsa etc
MISSING_DEPENDENCY=$1
- PKGHANDLER_COMMAND=
- case $PKGHANDLER in
- apt-get)
- apt_help $MISSING_DEPENDENCY ;;
- yum)
- yum_help $MISSING_DEPENDENCY ;;
- port)
- port_help $MISSING_DEPENDENCY ;;
- pkgutil)
- pkgutil_help $MISSING_DEPENDENCY ;;
- pkgadd)
- pkgadd_help $MISSING_DEPENDENCY ;;
- * )
- break ;;
- esac
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ cygwin_help $MISSING_DEPENDENCY
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ msys_help $MISSING_DEPENDENCY
+ else
+ PKGHANDLER_COMMAND=
- if test "x$PKGHANDLER_COMMAND" != x; then
- HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ case $PKGHANDLER in
+ apt-get)
+ apt_help $MISSING_DEPENDENCY ;;
+ yum)
+ yum_help $MISSING_DEPENDENCY ;;
+ port)
+ port_help $MISSING_DEPENDENCY ;;
+ pkgutil)
+ pkgutil_help $MISSING_DEPENDENCY ;;
+ pkgadd)
+ pkgadd_help $MISSING_DEPENDENCY ;;
+ * )
+ break ;;
+ esac
+
+ if test "x$PKGHANDLER_COMMAND" != x; then
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ fi
fi
])
cygwin_help() {
case $1 in
unzip)
- PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;;
+ PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip )"
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ ;;
zip)
- PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;;
+ PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P zip )"
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ ;;
make)
- PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;;
+ PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P make )"
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ ;;
+ freetype)
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ HELP_MSG="To install freetype, run:
+wget \"http://gnuwin32.sourceforge.net/downlinks/freetype.php\" -O /tmp/freetype-setup.exe
+chmod +x /tmp/freetype-setup.exe
+/tmp/freetype-setup.exe
+Follow GUI prompts, and install to default directory \"C:\Program Files (x86)\GnuWin32\".
+After installation, locate lib/libfreetype.dll.a and make a copy with the name freetype.dll."
+ else
+ HELP_MSG="You need to build a 64-bit version of freetype.
+This is not readily available.
+You can find source code and build instructions on
+http://www.freetype.org/
+If you put the resulting build in \"C:\Program Files\GnuWin32\", it will be found automatically."
+ fi
+ ;;
* )
break ;;
esac
}
+msys_help() {
+ PKGHANDLER_COMMAND=""
+}
+
apt_help() {
case $1 in
devkit)
@@ -78,7 +111,7 @@
PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
cups)
PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;;
- freetype2)
+ freetype)
PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;;
pulse)
PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
@@ -101,7 +134,7 @@
PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
cups)
PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
- freetype2)
+ freetype)
PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
pulse)
PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
diff --git a/common/autoconf/hotspot-spec.gmk.in b/common/autoconf/hotspot-spec.gmk.in
index ffacc97..b5a38d2 100644
--- a/common/autoconf/hotspot-spec.gmk.in
+++ b/common/autoconf/hotspot-spec.gmk.in
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, 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
@@ -123,8 +123,7 @@
# Hotspot expects the variable ZIP_DEBUGINFO_FILES=1/0 and not true/false.
ifeq ($(ZIP_DEBUGINFO_FILES)$(ENABLE_DEBUG_SYMBOLS), truetrue)
ZIP_DEBUGINFO_FILES:=1
-endif
-ifeq ($(ZIP_DEBUGINFO_FILES), false)
+else
ZIP_DEBUGINFO_FILES:=0
endif
diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4
index 07e548c..126ab49 100644
--- a/common/autoconf/jdk-options.m4
+++ b/common/autoconf/jdk-options.m4
@@ -516,11 +516,11 @@
elif test "x$enable_debug_symbols" = "xno"; then
ENABLE_DEBUG_SYMBOLS=false
else
- # default on macosx is false
- if test "x$OPENJDK_TARGET_OS" = xmacosx; then
- ENABLE_DEBUG_SYMBOLS=false
- # Default is on if objcopy is found, otherwise off
- elif test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then
+ # Default is on if objcopy is found
+ if test "x$OBJCOPY" != x; then
+ ENABLE_DEBUG_SYMBOLS=true
+ # MacOS X and Windows don't use objcopy but default is on for those OSes
+ elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
ENABLE_DEBUG_SYMBOLS=true
else
ENABLE_DEBUG_SYMBOLS=false
diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
index 941d842..c41da30 100644
--- a/common/autoconf/libraries.m4
+++ b/common/autoconf/libraries.m4
@@ -57,7 +57,6 @@
ALSA_NOT_NEEDED=yes
PULSE_NOT_NEEDED=yes
X11_NOT_NEEDED=yes
- FREETYPE2_NOT_NEEDED=yes
# If the java runtime framework is disabled, then we need X11.
# This will be adjusted below.
AC_MSG_RESULT([alsa pulse x11])
@@ -70,7 +69,7 @@
fi
if test "x$OPENJDK" = "xfalse"; then
- FREETYPE2_NOT_NEEDED=yes
+ FREETYPE_NOT_NEEDED=yes
fi
if test "x$SUPPORT_HEADFUL" = xno; then
@@ -79,33 +78,17 @@
###############################################################################
#
- # Check for MacOSX support for OpenJDK. If this exists, try to build a JVM
- # that uses this API.
+ # Check for MacOSX support for OpenJDK.
#
- AC_ARG_ENABLE([macosx-runtime-support], [AS_HELP_STRING([--disable-macosx-runtime-support],
- [disable the use of MacOSX Java runtime support framework @<:@enabled@:>@])],
- [MACOSX_RUNTIME_SUPPORT="${enableval}"],[MACOSX_RUNTIME_SUPPORT="no"])
- USE_MACOSX_RUNTIME_SUPPORT=no
- AC_MSG_CHECKING([for explicit Java runtime support in the OS])
+ BASIC_DEPRECATED_ARG_ENABLE(macosx-runtime-support, macosx_runtime_support)
+
+ AC_MSG_CHECKING([for Mac OS X Java Framework])
if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then
- if test "x$MACOSX_RUNTIME_SUPPORT" != xno; then
- MACOSX_RUNTIME_SUPPORT=yes
- USE_MACOSX_RUNTIME_SUPPORT=yes
- AC_MSG_RESULT([yes, does not need alsa freetype2 pulse and X11])
- else
- AC_MSG_RESULT([yes, but explicitly disabled.])
- fi
+ AC_MSG_RESULT([/System/Library/Frameworks/JavaVM.framework])
else
AC_MSG_RESULT([no])
fi
-
- if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$USE_MACOSX_RUNTIME_SUPPORT" = xno; then
- AC_MSG_CHECKING([what is not needed on an X11 build on MacOSX?])
- X11_NOT_NEEDED=
- FREETYPE2_NOT_NEEDED=
- AC_MSG_RESULT([alsa pulse])
- fi
])
AC_DEFUN_ONCE([LIB_SETUP_X11],
@@ -153,16 +136,6 @@
AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
fi
- # Some of the old makefiles require a setting of OPENWIN_HOME
- # Since the X11R6 directory has disappeared on later Linuxes,
- # we need to probe for it.
- if test "x$OPENJDK_TARGET_OS" = xlinux; then
- if test -d "$SYS_ROOT/usr/X11R6"; then
- OPENWIN_HOME="$SYS_ROOT/usr/X11R6"
- elif test -d "$SYS_ROOT/usr/include/X11"; then
- OPENWIN_HOME="$SYS_ROOT/usr"
- fi
- fi
if test "x$OPENJDK_TARGET_OS" = xsolaris; then
OPENWIN_HOME="/usr/openwin"
fi
@@ -277,151 +250,279 @@
])
+AC_DEFUN([LIB_CHECK_POTENTIAL_FREETYPE],
+[
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$1"
+ POTENTIAL_FREETYPE_LIB_PATH="$2"
+ METHOD="$3"
+
+ # First check if the files exists.
+ if test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
+ # We found an arbitrary include file. That's a good sign.
+ AC_MSG_NOTICE([Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD])
+ FOUND_FREETYPE=yes
+
+ FREETYPE_LIB_NAME="${LIBRARY_PREFIX}freetype${SHARED_LIBRARY_SUFFIX}"
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
+ AC_MSG_NOTICE([Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location.])
+ FOUND_FREETYPE=no
+ else
+ if test "x$OPENJDK_TARGET_OS" = xwindows; then
+ # On Windows, we will need both .lib and .dll file.
+ if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/freetype.lib"; then
+ AC_MSG_NOTICE([Could not find $POTENTIAL_FREETYPE_LIB_PATH/freetype.lib. Ignoring location.])
+ FOUND_FREETYPE=no
+ fi
+ elif test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -s "$POTENTIAL_FREETYPE_LIB_PATH/amd64/$FREETYPE_LIB_NAME"; then
+ # On solaris-x86_86, default is (normally) PATH/lib/amd64. Update our guess!
+ POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH/amd64"
+ fi
+ fi
+ fi
+
+ if test "x$FOUND_FREETYPE" = xyes; then
+ BASIC_FIXUP_PATH(POTENTIAL_FREETYPE_INCLUDE_PATH)
+ BASIC_FIXUP_PATH(POTENTIAL_FREETYPE_LIB_PATH)
+
+ FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+ AC_MSG_CHECKING([for freetype includes])
+ AC_MSG_RESULT([$FREETYPE_INCLUDE_PATH])
+ FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
+ AC_MSG_CHECKING([for freetype libraries])
+ AC_MSG_RESULT([$FREETYPE_LIB_PATH])
+ fi
+])
+
AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
[
###############################################################################
#
- # The ubiquitous freetype2 library is used to render fonts.
+ # The ubiquitous freetype library is used to render fonts.
#
AC_ARG_WITH(freetype, [AS_HELP_STRING([--with-freetype],
- [specify prefix directory for the freetype2 package
+ [specify prefix directory for the freetype package
(expecting the libraries under PATH/lib and the headers under PATH/include)])])
+ AC_ARG_WITH(freetype-include, [AS_HELP_STRING([--with-freetype-include],
+ [specify directory for the freetype include files])])
+ AC_ARG_WITH(freetype-lib, [AS_HELP_STRING([--with-freetype-lib],
+ [specify directory for the freetype library])])
+ AC_ARG_ENABLE(freetype-bundling, [AS_HELP_STRING([--disable-freetype-bundling],
+ [disable bundling of the freetype library with the build result @<:@enabled on Windows or when using --with-freetype, disabled otherwise@:>@])])
- # If we are using the OS installed system lib for freetype, then we do not need to copy it to the build tree
- USING_SYSTEM_FT_LIB=false
+ FREETYPE_CFLAGS=
+ FREETYPE_LIBS=
+ FREETYPE_BUNDLE_LIB_PATH=
- if test "x$FREETYPE2_NOT_NEEDED" = xyes; then
+ if test "x$FREETYPE_NOT_NEEDED" = xyes; then
if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then
AC_MSG_WARN([freetype not used, so --with-freetype is ignored])
fi
- FREETYPE2_CFLAGS=
- FREETYPE2_LIBS=
- FREETYPE2_LIB_PATH=
+ if test "x$enable_freetype_bundling" != x; then
+ AC_MSG_WARN([freetype not used, so --enable-freetype-bundling is ignored])
+ fi
else
- FREETYPE2_FOUND=no
+ # freetype is needed to build; go get it!
- if test "x$with_freetype" != x; then
- BASIC_FIXUP_PATH(with_freetype)
- FREETYPE2_LIBS="-L$with_freetype/lib -lfreetype"
- FREETYPE2_LIB_PATH="$with_freetype/lib"
- if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64 && test -d "$with_freetype/lib/amd64"; then
- FREETYPE2_LIBS="-L$with_freetype/lib/amd64 -lfreetype"
- FREETYPE2_LIB_PATH="$with_freetype/lib/amd64"
+ BUNDLE_FREETYPE="$enable_freetype_bundling"
+
+ if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then
+ # User has specified settings
+
+ if test "x$BUNDLE_FREETYPE" = x; then
+ # If not specified, default is to bundle freetype
+ BUNDLE_FREETYPE=yes
fi
+
+ if test "x$with_freetype" != x; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype/include"
+ POTENTIAL_FREETYPE_LIB_PATH="$with_freetype/lib"
+ fi
+
+ # Allow --with-freetype-lib and --with-freetype-include to override
+ if test "x$with_freetype_include" != x; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"
+ fi
+ if test "x$with_freetype_lib" != x; then
+ POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
+ fi
+
+ if test "x$POTENTIAL_FREETYPE_INCLUDE_PATH" != x && test "x$POTENTIAL_FREETYPE_LIB_PATH" != x; then
+ # Okay, we got it. Check that it works.
+ LIB_CHECK_POTENTIAL_FREETYPE($POTENTIAL_FREETYPE_INCLUDE_PATH, $POTENTIAL_FREETYPE_LIB_PATH, [--with-freetype])
+ if test "x$FOUND_FREETYPE" != xyes; then
+ AC_MSG_ERROR([Can not find or use freetype at location given by --with-freetype])
+ fi
+ else
+ # User specified only one of lib or include. This is an error.
+ if test "x$POTENTIAL_FREETYPE_INCLUDE_PATH" = x ; then
+ AC_MSG_NOTICE([User specified --with-freetype-lib but not --with-freetype-include])
+ AC_MSG_ERROR([Need both freetype lib and include paths. Consider using --with-freetype instead.])
+ else
+ AC_MSG_NOTICE([User specified --with-freetype-include but not --with-freetype-lib])
+ AC_MSG_ERROR([Need both freetype lib and include paths. Consider using --with-freetype instead.])
+ fi
+ fi
+ else
+ # User did not specify settings, but we need freetype. Try to locate it.
+
+ if test "x$BUNDLE_FREETYPE" = x; then
+ # If not specified, default is to bundle freetype only on windows
+ if test "x$OPENJDK_TARGET_OS" = xwindows; then
+ BUNDLE_FREETYPE=yes
+ else
+ BUNDLE_FREETYPE=no
+ fi
+ fi
+
+ if test "x$FOUND_FREETYPE" != xyes; then
+ # Check builddeps
+ BDEPS_CHECK_MODULE(FREETYPE, freetype2, xxx, [FOUND_FREETYPE=yes], [FOUND_FREETYPE=no])
+ # BDEPS_CHECK_MODULE will set FREETYPE_CFLAGS and _LIBS, but we don't get a lib path for bundling.
+ if test "x$FOUND_FREETYPE" = xyes; then
+ if test "x$BUNDLE_FREETYPE" = xyes; then
+ AC_MSG_NOTICE([Found freetype using builddeps, but ignoring since we can not bundle that])
+ FOUND_FREETYPE=no
+ else
+ AC_MSG_CHECKING([for freetype])
+ AC_MSG_RESULT([yes (using builddeps)])
+ fi
+ fi
+ fi
+
+ if test "x$FOUND_FREETYPE" != xyes; then
+ # Check modules using pkg-config, but only if we have it (ugly output results otherwise)
+ if test "x$PKG_CONFIG" != x; then
+ PKG_CHECK_MODULES(FREETYPE, freetype2, [FOUND_FREETYPE=yes], [FOUND_FREETYPE=no])
+ if test "x$FOUND_FREETYPE" = xyes; then
+ # On solaris, pkg_check adds -lz to freetype libs, which isn't necessary for us.
+ FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's/-lz//g'`
+ # 64-bit libs for Solaris x86 are installed in the amd64 subdirectory, change lib to lib/amd64
+ if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+ FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's?/lib?/lib/amd64?g'`
+ fi
+ # BDEPS_CHECK_MODULE will set FREETYPE_CFLAGS and _LIBS, but we don't get a lib path for bundling.
+ if test "x$BUNDLE_FREETYPE" = xyes; then
+ AC_MSG_NOTICE([Found freetype using pkg-config, but ignoring since we can not bundle that])
+ FOUND_FREETYPE=no
+ else
+ AC_MSG_CHECKING([for freetype])
+ AC_MSG_RESULT([yes (using pkg-config)])
+ fi
+ fi
+ fi
+ fi
+
+ if test "x$FOUND_FREETYPE" != xyes; then
+ # Check in well-known locations
+ if test "x$OPENJDK_TARGET_OS" = xwindows; then
+ FREETYPE_BASE_DIR="$PROGRAMFILES/GnuWin32"
+ BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(FREETYPE_BASE_DIR)
+ LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
+ if test "x$FOUND_FREETYPE" != xyes; then
+ FREETYPE_BASE_DIR="$ProgramW6432/GnuWin32"
+ BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(FREETYPE_BASE_DIR)
+ LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
+ fi
+ else
+ if test "x$SYS_ROOT" = "x/"; then
+ FREETYPE_ROOT=
+ else
+ FREETYPE_ROOT="$SYS_ROOT"
+ fi
+ FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr"
+ LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
+
+ if test "x$FOUND_FREETYPE" != xyes; then
+ FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr/X11"
+ LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
+ fi
+
+ if test "x$FOUND_FREETYPE" != xyes; then
+ FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr"
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+ LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/x86_64-linux-gnu], [well-known location])
+ else
+ LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/i386-linux-gnu], [well-known location])
+ if test "x$FOUND_FREETYPE" != xyes; then
+ LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib32], [well-known location])
+ fi
+ fi
+ fi
+ fi
+ fi # end check in well-known locations
+
+ if test "x$FOUND_FREETYPE" != xyes; then
+ HELP_MSG_MISSING_DEPENDENCY([freetype])
+ AC_MSG_ERROR([Could not find freetype! $HELP_MSG ])
+ fi
+ fi # end user specified settings
+
+ # Set FREETYPE_CFLAGS, _LIBS and _LIB_PATH from include and lib dir.
+ if test "x$FREETYPE_CFLAGS" = x; then
+ BASIC_FIXUP_PATH(FREETYPE_INCLUDE_PATH)
+ if test -d $FREETYPE_INCLUDE_PATH/freetype2/freetype; then
+ FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
+ else
+ FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
+ fi
+ fi
+
+ if test "x$FREETYPE_LIBS" = x; then
+ BASIC_FIXUP_PATH(FREETYPE_LIB_PATH)
if test "x$OPENJDK_TARGET_OS" = xwindows; then
- FREETYPE2_LIBS="$with_freetype/lib/freetype.lib"
+ FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
+ else
+ FREETYPE_LIBS="-L$FREETYPE_LIB_PATH -lfreetype"
fi
- FREETYPE2_CFLAGS="-I$with_freetype/include"
- if test -s $with_freetype/include/ft2build.h && test -d $with_freetype/include/freetype2/freetype; then
- FREETYPE2_CFLAGS="-I$with_freetype/include/freetype2 -I$with_freetype/include"
- fi
- FREETYPE2_FOUND=yes
- if test "x$FREETYPE2_FOUND" = xyes; then
- # Verify that the directories exist
- if ! test -d "$with_freetype/lib" || ! test -d "$with_freetype/include"; then
- AC_MSG_ERROR([Could not find the expected directories $with_freetype/lib and $with_freetype/include])
- fi
- # List the contents of the lib.
- FREETYPELIB=`ls $with_freetype/lib/libfreetype.so $with_freetype/lib/freetype.dll 2> /dev/null`
- if test "x$FREETYPELIB" = x; then
- AC_MSG_ERROR([Could not find libfreetype.so nor freetype.dll in $with_freetype/lib])
- fi
- # Check one h-file
- if ! test -s "$with_freetype/include/ft2build.h"; then
- AC_MSG_ERROR([Could not find $with_freetype/include/ft2build.h])
- fi
- fi
- fi
- if test "x$FREETYPE2_FOUND" = xno; then
- BDEPS_CHECK_MODULE(FREETYPE2, freetype2, xxx, [FREETYPE2_FOUND=yes], [FREETYPE2_FOUND=no])
- USING_SYSTEM_FT_LIB=true
- fi
- if test "x$FREETYPE2_FOUND" = xno && test "x$OPENJDK_TARGET_OS" = xwindows; then
- FREETYPELOCATION="$PROGRAMFILES/GnuWin32"
- BASIC_FIXUP_PATH(FREETYPELOCATION)
- AC_MSG_CHECKING([for freetype in some standard windows locations])
- if test -s "$FREETYPELOCATION/include/ft2build.h" && test -d "$FREETYPELOCATION/include/freetype2/freetype"; then
- FREETYPE2_CFLAGS="-I$FREETYPELOCATION/include/freetype2 -I$FREETYPELOCATION/include"
- FREETYPE2_LIBS="$FREETYPELOCATION/lib/freetype.lib"
- FREETYPE2_LIB_PATH="$FREETYPELOCATION/lib"
- if ! test -s "$FREETYPE2_LIBS"; then
- AC_MSG_ERROR([Could not find $FREETYPE2_LIBS])
- fi
- if ! test -s "$FREETYPE2_LIB_PATH/freetype.dll"; then
- AC_MSG_ERROR([Could not find $FREETYPE2_LIB_PATH/freetype.dll])
- fi
- USING_SYSTEM_FT_LIB=true
- FREETYPE2_FOUND=yes
- fi
- AC_MSG_RESULT([$FREETYPE2_FOUND])
- fi
- if test "x$FREETYPE2_FOUND" = xno; then
- PKG_CHECK_MODULES(FREETYPE2, freetype2, [FREETYPE2_FOUND=yes], [FREETYPE2_FOUND=no])
- # On solaris, pkg_check adds -lz to freetype libs, which isn't necessary for us.
- FREETYPE2_LIBS=`$ECHO $FREETYPE2_LIBS | $SED 's/-lz//g'`
- USING_SYSTEM_FT_LIB=true
- # 64-bit libs for Solaris x86 are installed in the amd64 subdirectory, change lib to lib/amd64
- if test "x$FREETYPE2_FOUND" = xyes && test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
- FREETYPE2_LIBS=`$ECHO $FREETYPE2_LIBS | $SED 's?/lib?/lib/amd64?g'`
- fi
- fi
- if test "x$FREETYPE2_FOUND" = xno; then
- AC_MSG_CHECKING([for freetype in some standard locations])
-
- if test -s $SYS_ROOT/usr/X11/include/ft2build.h && test -d $SYS_ROOT/usr/X11/include/freetype2/freetype; then
- DEFAULT_FREETYPE_CFLAGS="-I$SYS_ROOT/usr/X11/include/freetype2 -I$SYS_ROOT/usr/X11/include"
- DEFAULT_FREETYPE_LIBS="-L$SYS_ROOT/usr/X11/lib -lfreetype"
- fi
- if test -s $SYS_ROOT/usr/include/ft2build.h && test -d $SYS_ROOT/usr/include/freetype2/freetype; then
- DEFAULT_FREETYPE_CFLAGS="-I$SYS_ROOT/usr/include/freetype2"
- DEFAULT_FREETYPE_LIBS="-lfreetype"
- fi
-
- PREV_CXXCFLAGS="$CXXFLAGS"
- PREV_LDFLAGS="$LDFLAGS"
- CXXFLAGS="$CXXFLAGS $DEFAULT_FREETYPE_CFLAGS"
- LDFLAGS="$LDFLAGS $DEFAULT_FREETYPE_LIBS"
- AC_LINK_IFELSE([AC_LANG_SOURCE([[
- #include<ft2build.h>
- #include FT_FREETYPE_H
- int main() { return 0; }
- ]])],
- [
- # Yes, the default cflags and libs did the trick.
- FREETYPE2_FOUND=yes
- FREETYPE2_CFLAGS="$DEFAULT_FREETYPE_CFLAGS"
- FREETYPE2_LIBS="$DEFAULT_FREETYPE_LIBS"
- ],
- [
- FREETYPE2_FOUND=no
- ]
- )
- CXXCFLAGS="$PREV_CXXFLAGS"
- LDFLAGS="$PREV_LDFLAGS"
- AC_MSG_RESULT([$FREETYPE2_FOUND])
- USING_SYSTEM_FT_LIB=true
- fi
- if test "x$FREETYPE2_FOUND" = xno; then
- HELP_MSG_MISSING_DEPENDENCY([freetype2])
- AC_MSG_ERROR([Could not find freetype2! $HELP_MSG ])
fi
- if test "x$OPENJDK_TARGET_OS" != xwindows; then
- # AC_CHECK_LIB does not support use of cl.exe
- PREV_LDFLAGS="$LDFLAGS"
- LDFLAGS="$FREETYPE2_LIBS"
- AC_CHECK_LIB(freetype, FT_Init_FreeType,
- FREETYPE2_FOUND=true,
- AC_MSG_ERROR([Could not find freetype2! $HELP_MSG ]))
- LDFLAGS="$PREV_LDFLAGS"
- fi
- fi
+ # Try to compile it
+ AC_MSG_CHECKING([if we can compile and link with freetype])
+ AC_LANG_PUSH(C++)
+ PREV_CXXCFLAGS="$CXXFLAGS"
+ PREV_LDFLAGS="$LDFLAGS"
+ PREV_CXX="$CXX"
+ CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS"
+ LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
+ CXX="$FIXPATH $CXX"
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[
+ #include<ft2build.h>
+ #include FT_FREETYPE_H
+ int main () {
+ FT_Init_FreeType(NULL);
+ return 0;
+ }
+ ]])],
+ [
+ AC_MSG_RESULT([yes])
+ ],
+ [
+ AC_MSG_RESULT([no])
+ AC_MSG_NOTICE([Could not compile and link with freetype. This might be a 32/64-bit mismatch.])
+ AC_MSG_NOTICE([Using FREETYPE_CFLAGS=$FREETYPE_CFLAGS and FREETYPE_LIBS=$FREETYPE_LIBS])
+
+ HELP_MSG_MISSING_DEPENDENCY([freetype])
+
+ AC_MSG_ERROR([Can not continue without freetype. $HELP_MSG])
+ ]
+ )
+ CXXCFLAGS="$PREV_CXXFLAGS"
+ LDFLAGS="$PREV_LDFLAGS"
+ CXX="$PREV_CXX"
+ AC_LANG_POP(C++)
- AC_SUBST(USING_SYSTEM_FT_LIB)
- AC_SUBST(FREETYPE2_LIB_PATH)
- AC_SUBST(FREETYPE2_CFLAGS)
- AC_SUBST(FREETYPE2_LIBS)
+ AC_MSG_CHECKING([if we should bundle freetype])
+ if test "x$BUNDLE_FREETYPE" = xyes; then
+ FREETYPE_BUNDLE_LIB_PATH="$FREETYPE_LIB_PATH"
+ fi
+ AC_MSG_RESULT([$BUNDLE_FREETYPE])
+
+ fi # end freetype needed
+
+ AC_SUBST(FREETYPE_BUNDLE_LIB_PATH)
+ AC_SUBST(FREETYPE_CFLAGS)
+ AC_SUBST(FREETYPE_LIBS)
])
AC_DEFUN_ONCE([LIB_SETUP_ALSA],
diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in
index 82f5197..a8cc664 100644
--- a/common/autoconf/spec.gmk.in
+++ b/common/autoconf/spec.gmk.in
@@ -268,13 +268,9 @@
# Number of parallel jobs to use for compilation
JOBS?=@JOBS@
-# The OpenJDK makefiles should be changed to using the standard
-# configure output ..._CFLAGS and ..._LIBS. In the meantime we
-# extract the information here.
-FREETYPE2_LIB_PATH:=@FREETYPE2_LIB_PATH@
-FREETYPE2_LIBS:=@FREETYPE2_LIBS@
-FREETYPE2_CFLAGS:=@FREETYPE2_CFLAGS@
-USING_SYSTEM_FT_LIB=@USING_SYSTEM_FT_LIB@
+FREETYPE_LIBS:=@FREETYPE_LIBS@
+FREETYPE_CFLAGS:=@FREETYPE_CFLAGS@
+FREETYPE_BUNDLE_LIB_PATH=@FREETYPE_BUNDLE_LIB_PATH@
CUPS_CFLAGS:=@CUPS_CFLAGS@
ALSA_LIBS:=@ALSA_LIBS@
ALSA_CFLAGS:=@ALSA_CFLAGS@
@@ -485,6 +481,7 @@
DATE:=@DATE@
DIFF:=@DIFF@
DIRNAME:=@DIRNAME@
+DSYMUTIL:=@DSYMUTIL@
FIND:=@FIND@
FIND_DELETE:=@FIND_DELETE@
ECHO:=@ECHO@
diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
index abddf99..5ad404d 100644
--- a/common/autoconf/toolchain.m4
+++ b/common/autoconf/toolchain.m4
@@ -176,6 +176,7 @@
[
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV
+ TOOLCHAIN_SETUP_MSVCR_DLL
BASIC_DEPRECATED_ARG_WITH([dxsdk])
BASIC_DEPRECATED_ARG_WITH([dxsdk-lib])
BASIC_DEPRECATED_ARG_WITH([dxsdk-include])
diff --git a/common/autoconf/toolchain_windows.m4 b/common/autoconf/toolchain_windows.m4
index 814b429..37da555 100644
--- a/common/autoconf/toolchain_windows.m4
+++ b/common/autoconf/toolchain_windows.m4
@@ -228,52 +228,113 @@
AC_MSG_NOTICE([or run "bash.exe -l" from a VS command prompt and then run configure from there.])
AC_MSG_ERROR([Cannot continue])
fi
+])
- AC_MSG_CHECKING([for msvcr100.dll])
+AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL],
+[
+ POSSIBLE_MSVCR_DLL="$1"
+ METHOD="$2"
+ if test -e "$POSSIBLE_MSVCR_DLL"; then
+ AC_MSG_NOTICE([Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD])
+
+ # Need to check if the found msvcr is correct architecture
+ AC_MSG_CHECKING([found msvcr100.dll architecture])
+ MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
+ CORRECT_MSVCR_ARCH=386
+ else
+ CORRECT_MSVCR_ARCH=x86-64
+ fi
+ if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
+ AC_MSG_RESULT([ok])
+ MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
+ AC_MSG_CHECKING([for msvcr100.dll])
+ AC_MSG_RESULT([$MSVCR_DLL])
+ else
+ AC_MSG_RESULT([incorrect, ignoring])
+ AC_MSG_NOTICE([The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE])
+ fi
+ fi
+])
+
+AC_DEFUN([TOOLCHAIN_SETUP_MSVCR_DLL],
+[
AC_ARG_WITH(msvcr-dll, [AS_HELP_STRING([--with-msvcr-dll],
[copy this msvcr100.dll into the built JDK (Windows only) @<:@probed@:>@])])
+
if test "x$with_msvcr_dll" != x; then
- MSVCR_DLL="$with_msvcr_dll"
- else
- if test "x$VCINSTALLDIR" != x; then
- if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
- MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | grep x64 | head --lines 1`
- else
- MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | grep x86 | grep -v ia64 | grep -v x64 | head --lines 1`
- if test "x$MSVCR_DLL" = x; then
- MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | head --lines 1`
- fi
- fi
- if test "x$MSVCR_DLL" != x; then
- AC_MSG_NOTICE([msvcr100.dll found in VCINSTALLDIR: $VCINSTALLDIR])
- else
- AC_MSG_NOTICE([Warning: msvcr100.dll not found in VCINSTALLDIR: $VCINSTALLDIR])
- fi
- fi
- # Try some fallback alternatives
+ # If given explicitely by user, do not probe. If not present, fail directly.
+ TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$with_msvcr_dll], [--with-msvcr-dll])
if test "x$MSVCR_DLL" = x; then
- # If visual studio express is installed, there is usually one with the debugger
- if test "x$VS100COMNTOOLS" != x; then
- if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
- MSVCR_DLL=`find "$VS100COMNTOOLS/.." -name msvcr100.dll | grep -i x64 | head --lines 1`
- AC_MSG_NOTICE([msvcr100.dll found in $VS100COMNTOOLS..: $VS100COMNTOOLS..])
- fi
- fi
- fi
- if test "x$MSVCR_DLL" = x; then
- if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
- # Fallback for 32bit builds, look in the windows directory.
- if test -f "$SYSTEMROOT/system32/msvcr100.dll"; then
- AC_MSG_NOTICE([msvcr100.dll found in $SYSTEMROOT/system32])
- MSVCR_DLL="$SYSTEMROOT/system32/msvcr100.dll"
- fi
- fi
+ AC_MSG_ERROR([Could not find a proper msvcr100.dll as specified by --with-msvcr-dll])
fi
fi
+
if test "x$MSVCR_DLL" = x; then
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([Could not find msvcr100.dll !])
+ # Probe: Using well-known location from Visual Studio 10.0
+ if test "x$VCINSTALLDIR" != x; then
+ CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
+ BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VC_INSTALL_DIR)
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+ POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC100.CRT/msvcr100.dll"
+ else
+ POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC100.CRT/msvcr100.dll"
+ fi
+ TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [well-known location in VCINSTALLDIR])
+ fi
fi
- AC_MSG_RESULT([$MSVCR_DLL])
+
+ if test "x$MSVCR_DLL" = x; then
+ # Probe: Check in the Boot JDK directory.
+ POSSIBLE_MSVCR_DLL="$BOOT_JDK/bin/msvcr100.dll"
+ TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [well-known location in Boot JDK])
+ fi
+
+ if test "x$MSVCR_DLL" = x; then
+ # Probe: Look in the Windows system32 directory
+ CYGWIN_SYSTEMROOT="$SYSTEMROOT"
+ BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_SYSTEMROOT)
+ POSSIBLE_MSVCR_DLL="$CYGWIN_SYSTEMROOT/system32/msvcr100.dll"
+ TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [well-known location in SYSTEMROOT])
+ fi
+
+ if test "x$MSVCR_DLL" = x; then
+ # Probe: If Visual Studio Express is installed, there is usually one with the debugger
+ if test "x$VS100COMNTOOLS" != x; then
+ CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
+ BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VS_TOOLS_DIR)
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+ POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x64/ | $HEAD --lines 1`
+ else
+ POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x86/ | $HEAD --lines 1`
+ fi
+ TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [search of VS100COMNTOOLS])
+ fi
+ fi
+
+ if test "x$MSVCR_DLL" = x; then
+ # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now.
+ # (This was the original behaviour; kept since it might turn up something)
+ if test "x$CYGWIN_VC_INSTALL_DIR" != x; then
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+ POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x64 | $HEAD --lines 1`
+ else
+ POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
+ if test "x$POSSIBLE_MSVCR_DLL" = x; then
+ # We're grasping at straws now...
+ POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $HEAD --lines 1`
+ fi
+ fi
+
+ TOOLCHAIN_CHECK_POSSIBLE_MSVCR_DLL([$POSSIBLE_MSVCR_DLL], [search of VCINSTALLDIR])
+ fi
+ fi
+
+ if test "x$MSVCR_DLL" = x; then
+ AC_MSG_CHECKING([for msvcr100.dll])
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Could not find msvcr100.dll. Please specify using --with-msvcr-dll.])
+ fi
+
BASIC_FIXUP_PATH(MSVCR_DLL)
])
diff --git a/common/bin/hgforest.sh b/common/bin/hgforest.sh
index 1dc50390..2282c32 100644
--- a/common/bin/hgforest.sh
+++ b/common/bin/hgforest.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -27,37 +27,11 @@
command="$1"
pull_extra_base="$2"
-# Python always buffers stdout significantly, thus we will not see any output from hg clone jdk,
-# until a lot of time has passed! By passing -u to python, we get incremental updates
-# on stdout. Much nicer.
-whichhg="`which hg 2> /dev/null | grep -v '^no hg in'`"
-
-if [ "${whichhg}" = "" ] ; then
- echo Cannot find hg!
- exit 1
-fi
-
if [ "" = "$command" ] ; then
echo No command to hg supplied!
exit 1
fi
-has_hash_bang="`head -n 1 "${whichhg}" | cut -b 1-2`"
-python=""
-bpython=""
-
-if [ "#!" = "$has_hash_bang" ] ; then
- python="`head -n 1 ${whichhg} | cut -b 3- | sed -e 's/^[ \t]*//;s/[ \t]*$//'`"
- bpython="`basename "$python"`"
-fi
-
-if [ -x "$python" -a ! -d "$python" -a "`${python} -V 2>&1 | cut -f 1 -d ' '`" = "Python" ] ; then
- hg="${python} -u ${whichhg}"
-else
- echo Cannot find python from hg launcher. Running plain hg, which probably has buffered stdout.
- hg="hg"
-fi
-
# Clean out the temporary directory that stores the pid files.
tmp=/tmp/forest.$$
rm -f -r ${tmp}
@@ -171,7 +145,7 @@
(
if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then
pull_newrepo="`echo ${pull_base}/${i} | sed -e 's@\([^:]/\)//*@\1@g'`"
- echo ${hg} clone ${pull_newrepo} ${i}
+ echo hg clone ${pull_newrepo} ${i}
path="`dirname ${i}`"
if [ "${path}" != "." ] ; then
times=0
@@ -184,10 +158,10 @@
sleep 5
done
fi
- (${hg} clone ${pull_newrepo} ${i}; echo "$?" > ${tmp}/${repopidfile}.pid.rc )&
+ (PYTHONUNBUFFERED=true hg clone ${pull_newrepo} ${i}; echo "$?" > ${tmp}/${repopidfile}.pid.rc )&
else
- echo "cd ${i} && ${hg} $*"
- cd ${i} && (${hg} "$@"; echo "$?" > ${tmp}/${repopidfile}.pid.rc )&
+ echo "cd ${i} && hg $*"
+ cd ${i} && (PYTHONUNBUFFERED=true hg "$@"; echo "$?" > ${tmp}/${repopidfile}.pid.rc )&
fi
echo $! > ${tmp}/${repopidfile}.pid
) 2>&1 | sed -e "s@^@${reponame}: @") &
diff --git a/common/makefiles/JavaCompilation.gmk b/common/makefiles/JavaCompilation.gmk
index 69006c8..009aba8 100644
--- a/common/makefiles/JavaCompilation.gmk
+++ b/common/makefiles/JavaCompilation.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, 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
@@ -266,8 +266,12 @@
endif
# Find all files in the source tree.
- $1_ALL_SRCS := $$(call not-containing,_the., \
- $$(filter $$(addprefix %,$$($1_SUFFIXES)),$$(call CacheFind,$$($1_FIND_LIST))))
+ $1_ALL_SRCS := $$(call not-containing,_the.,$$(call CacheFind,$$($1_FIND_LIST)))
+
+ # Filter on suffixes if set
+ ifneq ($$($1_SUFFIXES),)
+ $1_ALL_SRCS := $$(filter $$(addprefix %, $$($1_SUFFIXES)), $$($1_ALL_SRCS))
+ endif
ifneq ($$($1_INCLUDES),)
ifneq ($$($1_SUFFIXES),)
@@ -371,8 +375,8 @@
# INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file!
# EXCLUDE_FILES:="com/sun/SolarisFoobar.java" means do not compile this particular file!
# "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
- # JAVAC_SOURCE_PATH_UGLY_OVERRIDE:=Don't use this. This forces an explicit -sourcepath to javac.
- # Its only here until we cleanup some nasty source code pasta in the jdk.
+ # JAVAC_SOURCE_PATH_OVERRIDE:=This forces an explicit -sourcepath to javac instead of the complete
+ # source roots from SRC. This is sometimes needed when compiling specific subsets of the source.
# HEADERS:=path to directory where all generated c-headers are written.
# DEPENDS:=Extra dependecy
$(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
@@ -474,8 +478,8 @@
endif
# Prep the source paths.
- ifneq ($$($1_JAVAC_SOURCE_PATH_UGLY_OVERRIDE),)
- $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_JAVAC_SOURCE_PATH_UGLY_OVERRIDE)))
+ ifneq ($$($1_JAVAC_SOURCE_PATH_OVERRIDE),)
+ $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_JAVAC_SOURCE_PATH_OVERRIDE)))
else
$$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_SRC)))
endif
diff --git a/common/makefiles/NativeCompilation.gmk b/common/makefiles/NativeCompilation.gmk
index 94612fb..3c9a0a1 100644
--- a/common/makefiles/NativeCompilation.gmk
+++ b/common/makefiles/NativeCompilation.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, 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
@@ -435,31 +435,36 @@
$(CP) $$< $$@
endif
- ifeq ($(OPENJDK_TARGET_OS), solaris)
- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
- # empty section headers until a fixed $(OBJCOPY) is available.
- # An empty section header has sh_addr == 0 and sh_size == 0.
- # This problem has only been seen on Solaris X64, but we call this tool
- # on all Solaris builds just in case.
- #
- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
- $(RM) $$@
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
- else # not solaris
- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
- $(RM) $$@
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
- endif # Touch to not retrigger rule on rebuild
+ ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X
+ ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows
+ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
+ # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
+ # empty section headers until a fixed $(OBJCOPY) is available.
+ # An empty section header has sh_addr == 0 and sh_size == 0.
+ # This problem has only been seen on Solaris X64, but we call this tool
+ # on all Solaris builds just in case.
+ #
+ # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
+ # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
+ $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
+ $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
+ $(RM) $$@
+ $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
+ $(OBJCOPY) --only-keep-debug $$< $$@
+ $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
+ else # not solaris
+ $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
+ $(RM) $$@
+ $(OBJCOPY) --only-keep-debug $$< $$@
+ $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
+ endif # Touch to not retrigger rule on rebuild
$(TOUCH) $$@
+ endif # !windows
+ endif # !macosx
ifeq ($(ZIP_DEBUGINFO_FILES), true)
+ ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
$1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz
ifeq ($(OPENJDK_TARGET_OS), windows)
@@ -472,11 +477,12 @@
$(CD) $$($1_OBJECT_DIR) \
&& $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
endif
+ endif # no MacOS X support yet
else
ifeq ($(OPENJDK_TARGET_OS), windows)
$1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \
$$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb
- else
+ else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
$1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
endif
endif
@@ -513,31 +519,36 @@
$(CP) $$< $$@
endif
- ifeq ($(OPENJDK_TARGET_OS), solaris)
- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
- # empty section headers until a fixed $(OBJCOPY) is available.
- # An empty section header has sh_addr == 0 and sh_size == 0.
- # This problem has only been seen on Solaris X64, but we call this tool
- # on all Solaris builds just in case.
- #
- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
- $(RM) $$@
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
- else # not solaris
- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
- $(RM) $$@
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
- endif
- $(TOUCH) $$@
+ ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X
+ ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows
+ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
+ # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
+ # empty section headers until a fixed $(OBJCOPY) is available.
+ # An empty section header has sh_addr == 0 and sh_size == 0.
+ # This problem has only been seen on Solaris X64, but we call this tool
+ # on all Solaris builds just in case.
+ #
+ # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
+ # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
+ $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
+ $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
+ $(RM) $$@
+ $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
+ $(OBJCOPY) --only-keep-debug $$< $$@
+ $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
+ else # not solaris
+ $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
+ $(RM) $$@
+ $(OBJCOPY) --only-keep-debug $$< $$@
+ $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
+ endif
+ $(TOUCH) $$@
+ endif # !windows
+ endif # !macosx
ifeq ($(ZIP_DEBUGINFO_FILES), true)
+ ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
$1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz
ifeq ($(OPENJDK_TARGET_OS), windows)
@@ -550,11 +561,12 @@
$(CD) $$($1_OBJECT_DIR) \
&& $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo
endif
+ endif # no MacOS X support yet
else
ifeq ($(OPENJDK_TARGET_OS), windows)
$1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \
$$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb
- else
+ else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
$1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
endif
endif
diff --git a/common/makefiles/RMICompilation.gmk b/common/makefiles/RMICompilation.gmk
index f994a7d..2c87b70 100644
--- a/common/makefiles/RMICompilation.gmk
+++ b/common/makefiles/RMICompilation.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, 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
@@ -38,7 +38,7 @@
$(call LogSetupMacroEntry,SetupRMICompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
$(if $(16),$(error Internal makefile error: Too many arguments to SetupRMICompilation, please update RMICompilation.gmk))
- $1_DEP_FILE := $$($1_STUB_CLASSES_DIR)/$1_rmic
+ $1_DEP_FILE := $$($1_STUB_CLASSES_DIR)/_the.$1_rmic.generated
$1_CLASSES_SLASH := $$(subst .,/,$$($1_CLASSES))
$1_CLASS_FILES := $$(addprefix $$($1_CLASSES_DIR)/,$$(addsuffix .class,$$($1_CLASSES_SLASH)))
@@ -60,11 +60,11 @@
ifneq (,$$($1_RUN_IIOP))
$1_TARGETS += $$($1_TIE_FILES)
- $1_ARGS += -iiop
+ $1_ARGS += -iiop -emitPermissionCheck
endif
ifneq (,$$($1_RUN_IIOP_STDPKG))
$1_TARGETS += $$($1_TIE_STDPKG_FILES)
- $1_ARGS2 := -iiop -standardPackage
+ $1_ARGS2 := -iiop -emitPermissionCheck -standardPackage
endif
ifneq (,$$($1_KEEP_GENERATED))
@@ -88,10 +88,9 @@
$(RMIC) $$($1_ARGS2) -classpath "$$($1_CLASSES_DIR)" \
-d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES); \
fi;
+ $(TOUCH) $$@
- $1 := $$($1_TARGETS)
+ $1 := $$($1_TARGETS) $$($1_DEP_FILE)
- # By marking as secondary, this "touch" file doesn't need to be touched and will never exist.
- .SECONDARY: $$($1_DEP_FILE)
endef
diff --git a/corba/.hgtags b/corba/.hgtags
index 8db6245..3b35200 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -233,3 +233,4 @@
428428cf5e06163322144cfb5367e1faa86acf20 jdk8-b109
3d2b7ce93c5c2e3db748f29c3d29620a8b3b748a jdk8-b110
85c1c94e723582f9a1dd0251502c42b73d6deea7 jdk8-b111
+43cec76d1d62587a07af07e2d9bec93aba2a506b jdk8-b112
diff --git a/corba/make/jprt.properties b/corba/make/jprt.properties
index b03c53c..5dfce3c 100644
--- a/corba/make/jprt.properties
+++ b/corba/make/jprt.properties
@@ -33,9 +33,7 @@
# Standard list of jprt build targets for this source tree
jprt.build.targets= \
- solaris_sparc_5.10-{product|fastdebug}, \
solaris_sparcv9_5.10-{product|fastdebug}, \
- solaris_i586_5.10-{product|fastdebug}, \
solaris_x64_5.10-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \
diff --git a/corba/makefiles/BuildCorba.gmk b/corba/makefiles/BuildCorba.gmk
index 5f2d625..3190ce8 100644
--- a/corba/makefiles/BuildCorba.gmk
+++ b/corba/makefiles/BuildCorba.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2013, 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
@@ -45,7 +45,9 @@
$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \
JVM := $(JAVA), \
JAVAC := $(NEW_JAVAC), \
- FLAGS := $(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_CORBA_WARNINGS), \
+ FLAGS := $(BOOT_JDK_SOURCETARGET) \
+ -bootclasspath "$(BOOT_RTJAR)$(PATH_SEP)$(BOOT_TOOLSJAR)" \
+ $(DISABLE_CORBA_WARNINGS), \
SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
@@ -183,6 +185,15 @@
COPY := .prp LogStrings.properties, \
BIN := $(CORBA_OUTPUTDIR)/classes))
+ $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_CORBA, \
+ SETUP := GENERATE_OLDBYTECODE, \
+ SRC := $(BUILD_CORBA_SRC), \
+ EXCLUDES := $(BUILD_CORBA_EXCLUDES), \
+ EXCLUDE_FILES := $(BUILD_CORBA_EXCLUDE_FILES), \
+ COPY := $(BUILD_CORBA_COPY), \
+ BIN := $(CORBA_OUTPUTDIR)/btclasses/corba_classes, \
+ JAR := $(CORBA_OUTPUTDIR)/btjars/btcorba.jar))
+
# Separate src.zip call to include sources that were excluded in the build to
# mimic behavior in old build system.
$(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA, \
@@ -241,6 +252,7 @@
all: $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \
$(CORBA_OUTPUTDIR)/btjars/idlj.jar \
$(CORBA_OUTPUTDIR)/btjars/logutil.jar \
+ $(CORBA_OUTPUTDIR)/btjars/btcorba.jar \
$(CORBA_OUTPUTDIR)/dist/lib/classes.jar \
$(CORBA_OUTPUTDIR)/dist/lib/src.zip \
$(CORBA_OUTPUTDIR)/dist/lib/bin.zip
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java b/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java
index dfe6581..86a4799 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java
@@ -905,28 +905,4 @@
return contents.toString();
}
-
- public static void main(String[] args) {
-
- Class remoteInterface = java.rmi.Remote.class;
-
- if( args.length > 0 ) {
- String className = args[0];
- try {
- remoteInterface = Class.forName(className);
- } catch(Exception e) {
- e.printStackTrace();
- System.exit(-1);
- }
- }
-
- System.out.println("Building name translation for " + remoteInterface);
- try {
- IDLNameTranslator nameTranslator =
- IDLNameTranslatorImpl.get(remoteInterface);
- System.out.println(nameTranslator);
- } catch(IllegalStateException ise) {
- ise.printStackTrace();
- }
- }
}
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java b/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java
index 37a5968..076ed19 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java
@@ -43,6 +43,8 @@
import com.sun.corba.se.spi.orbutil.proxy.DelegateInvocationHandlerImpl ;
import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandler ;
import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandlerImpl ;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
public class InvocationHandlerFactoryImpl implements InvocationHandlerFactory
{
@@ -114,24 +116,32 @@
// which extends org.omg.CORBA.Object. This handler delegates all
// calls directly to a DynamicStubImpl, which extends
// org.omg.CORBA.portable.ObjectImpl.
- InvocationHandler dynamicStubHandler =
+ final InvocationHandler dynamicStubHandler =
DelegateInvocationHandlerImpl.create( stub ) ;
// Create an invocation handler that handles any remote interface
// methods.
- InvocationHandler stubMethodHandler = new StubInvocationHandlerImpl(
+ final InvocationHandler stubMethodHandler = new StubInvocationHandlerImpl(
pm, classData, stub ) ;
// Create a composite handler that handles the DynamicStub interface
// as well as the remote interfaces.
final CompositeInvocationHandler handler =
new CustomCompositeInvocationHandlerImpl( stub ) ;
+
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ @Override
+ public Void run() {
handler.addInvocationHandler( DynamicStub.class,
dynamicStubHandler ) ;
handler.addInvocationHandler( org.omg.CORBA.Object.class,
dynamicStubHandler ) ;
handler.addInvocationHandler( Object.class,
dynamicStubHandler ) ;
+ return null;
+ }
+ });
+
// If the method passed to invoke is not from DynamicStub or its superclasses,
// it must be from an implemented interface, so we just handle
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java b/corba/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java
index 7bd9880..054071b 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -55,7 +55,7 @@
/**
* @author Harold Carr
*/
-public class SelectorImpl
+class SelectorImpl
extends
Thread
implements
diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java b/corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java
index fb81cee..91aacd5 100644
--- a/corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java
+++ b/corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java
@@ -36,6 +36,7 @@
import com.sun.corba.se.spi.logging.CORBALogDomains ;
import com.sun.corba.se.impl.logging.ORBUtilSystemException ;
+import com.sun.corba.se.impl.presentation.rmi.DynamicAccessPermission;
public class CompositeInvocationHandlerImpl implements
CompositeInvocationHandler
@@ -46,11 +47,13 @@
public void addInvocationHandler( Class interf,
InvocationHandler handler )
{
+ checkAccess();
classToInvocationHandler.put( interf, handler ) ;
}
public void setDefaultHandler( InvocationHandler handler )
{
+ checkAccess();
defaultHandler = handler ;
}
@@ -78,4 +81,12 @@
return handler.invoke( proxy, method, args ) ;
}
+
+ private static final DynamicAccessPermission perm = new DynamicAccessPermission("access");
+ private void checkAccess() {
+ final SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(perm);
+}
+ }
}
diff --git a/corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java b/corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java
index aa3c6be..0d41c1e 100644
--- a/corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java
+++ b/corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, 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 java.io.File;
import java.io.IOException;
+import java.io.SerializablePermission;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.Vector;
import java.util.Hashtable;
import java.util.Enumeration;
@@ -49,6 +52,7 @@
import com.sun.corba.se.impl.util.PackagePrefixChecker;
import sun.rmi.rmic.Main;
+
/**
* An IIOP stub/tie generator for rmic.
*
@@ -78,6 +82,7 @@
protected boolean castArray = false;
protected Hashtable transactionalObjects = new Hashtable() ;
protected boolean POATie = false ;
+ protected boolean emitPermissionCheck = false;
/**
* Default constructor for Main to use.
@@ -193,6 +198,9 @@
} else if (argv[i].equals("-standardPackage")) {
standardPackage = true;
argv[i] = null;
+ } else if (argv[i].equals("-emitPermissionCheck")) {
+ emitPermissionCheck = true;
+ argv[i] = null;
} else if (arg.equals("-xstubbase")) {
argv[i] = null;
if (++i < argv.length && argv[i] != null && !argv[i].startsWith("-")) {
@@ -390,9 +398,22 @@
writePackageAndImports(p);
+// generate
+// import java.security.AccessController;
+// import java.security.PrivilegedAction;
+// import java.io.SerializablePermission;
+ if (emitPermissionCheck) {
+ p.pln("import java.security.AccessController;");
+ p.pln("import java.security.PrivilegedAction;");
+ p.pln("import java.io.SerializablePermission;");
+ p.pln();
+ p.pln();
+ }
+
// Declare the stub class; implement all remote interfaces.
p.p("public class " + currentClass);
+
p.p(" extends " + getName(stubBaseClass));
p.p(" implements ");
if (remoteInterfaces.length > 0) {
@@ -422,6 +443,57 @@
writeIds( p, theType, false );
p.pln();
+ if (emitPermissionCheck) {
+
+ // produce the following generated code for example
+ // private static Void checkPermission() {
+ // SecurityManager sm = System.getSecurityManager();
+ // if (sm != null) {
+ // sm.checkPermission(new SerializablePermission(
+ // "enableSubclassImplementation")); // testing
+ // }
+ // return null;
+ // }
+ //
+ // private _XXXXX_Stub(Void ignore) {
+ // }
+ //
+ // public _XXXXX_Stub() {
+ // this(checkPermission());
+ // }
+ //
+ // where XXXXX is the name of the remote interface
+
+ p.pln();
+ p.plnI("private static Void checkPermission() {");
+ p.plnI("SecurityManager sm = System.getSecurityManager();");
+ p.pln("if (sm != null) {");
+ p.pI();
+ p.plnI("sm.checkPermission(new SerializablePermission(");
+ p.plnI("\"enableSubclassImplementation\"));");
+ p.pO();
+ p.pO();
+ p.pOln("}");
+ p.pln("return null;");
+ p.pO();
+ p.pOln("}");
+ p.pln();
+ p.pO();
+
+ p.pI();
+ p.pln("private " + currentClass + "(Void ignore) { }");
+ p.pln();
+
+ p.plnI("public " + currentClass + "() { ");
+ p.pln("this(checkPermission());");
+ p.pOln("}");
+ p.pln();
+ }
+
+ if (!emitPermissionCheck) {
+ p.pI();
+ }
+
// Write the _ids() method...
p.plnI("public String[] _ids() { ");
@@ -815,7 +887,6 @@
CompoundType theType) throws IOException {
// Wtite the method declaration and opening brace...
-
String methodName = method.getName();
String methodIDLName = method.getIDLName();
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index 472bde7..75a05fd 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -385,3 +385,5 @@
562a3d356de67670b4172b82aca2d30743449e04 hs25-b53
f6962730bbde82f279a0ae3a1c14bc5e58096c6e jdk8-b111
4a845c7a463844cead9e1e1641d6bcfb8a77f1c7 hs25-b54
+0ed9a90f45e1b392c671005f9ee22ce1acf02984 jdk8-b112
+23b8db5ea31d3079f1326afde4cd5c67b1dac49c hs25-b55
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1HeapRegionTable.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1HeapRegionTable.java
new file mode 100644
index 0000000..11657ce
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1HeapRegionTable.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2013, 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 sun.jvm.hotspot.gc_implementation.g1;
+
+import java.util.Iterator;
+import java.util.Observable;
+import java.util.Observer;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VMObject;
+import sun.jvm.hotspot.runtime.VMObjectFactory;
+import sun.jvm.hotspot.types.AddressField;
+import sun.jvm.hotspot.types.CIntegerField;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+// Mirror class for G1HeapRegionTable. It's essentially an index -> HeapRegion map.
+
+public class G1HeapRegionTable extends VMObject {
+ // HeapRegion** _base;
+ static private AddressField baseField;
+ // uint _length;
+ static private CIntegerField lengthField;
+ // HeapRegion** _biased_base
+ static private AddressField biasedBaseField;
+ // size_t _bias
+ static private CIntegerField biasField;
+ // uint _shift_by
+ static private CIntegerField shiftByField;
+
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ static private synchronized void initialize(TypeDataBase db) {
+ Type type = db.lookupType("G1HeapRegionTable");
+
+ baseField = type.getAddressField("_base");
+ lengthField = type.getCIntegerField("_length");
+ biasedBaseField = type.getAddressField("_biased_base");
+ biasField = type.getCIntegerField("_bias");
+ shiftByField = type.getCIntegerField("_shift_by");
+ }
+
+ private HeapRegion at(long index) {
+ Address arrayAddr = baseField.getValue(addr);
+ // Offset of &_base[index]
+ long offset = index * VM.getVM().getAddressSize();
+ Address regionAddr = arrayAddr.getAddressAt(offset);
+ return (HeapRegion) VMObjectFactory.newObject(HeapRegion.class,
+ regionAddr);
+ }
+
+ public long length() {
+ return lengthField.getValue(addr);
+ }
+
+ public long bias() {
+ return biasField.getValue(addr);
+ }
+
+ public long shiftBy() {
+ return shiftByField.getValue(addr);
+ }
+
+ private class HeapRegionIterator implements Iterator<HeapRegion> {
+ private long index;
+ private long length;
+
+ @Override
+ public boolean hasNext() { return index < length; }
+
+ @Override
+ public HeapRegion next() { return at(index++); }
+
+ @Override
+ public void remove() { /* not supported */ }
+
+ HeapRegionIterator(Address addr) {
+ index = 0;
+ length = length();
+ }
+ }
+
+ public Iterator<HeapRegion> heapRegionIterator() {
+ return new HeapRegionIterator(addr);
+ }
+
+ public G1HeapRegionTable(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSeq.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSeq.java
index 5bd7f44..f8b47ab 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSeq.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSeq.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, 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,13 +37,11 @@
import sun.jvm.hotspot.types.Type;
import sun.jvm.hotspot.types.TypeDataBase;
-// Mirror class for HeapRegionSeq. It's essentially an index -> HeapRegion map.
+// Mirror class for HeapRegionSeq. It essentially encapsulates the G1HeapRegionTable.
public class HeapRegionSeq extends VMObject {
- // HeapRegion** _regions;
- static private AddressField regionsField;
- // uint _length;
- static private CIntegerField lengthField;
+ // G1HeapRegionTable _regions
+ static private long regionsFieldOffset;
static {
VM.registerVMInitializedObserver(new Observer() {
@@ -56,44 +54,21 @@
static private synchronized void initialize(TypeDataBase db) {
Type type = db.lookupType("HeapRegionSeq");
- regionsField = type.getAddressField("_regions");
- lengthField = type.getCIntegerField("_length");
+ regionsFieldOffset = type.getField("_regions").getOffset();
}
- private HeapRegion at(long index) {
- Address arrayAddr = regionsField.getValue(addr);
- // Offset of &_region[index]
- long offset = index * VM.getVM().getAddressSize();
- Address regionAddr = arrayAddr.getAddressAt(offset);
- return (HeapRegion) VMObjectFactory.newObject(HeapRegion.class,
- regionAddr);
+ private G1HeapRegionTable regions() {
+ Address regionsAddr = addr.addOffsetTo(regionsFieldOffset);
+ return (G1HeapRegionTable) VMObjectFactory.newObject(G1HeapRegionTable.class,
+ regionsAddr);
}
public long length() {
- return lengthField.getValue(addr);
- }
-
- private class HeapRegionIterator implements Iterator<HeapRegion> {
- private long index;
- private long length;
-
- @Override
- public boolean hasNext() { return index < length; }
-
- @Override
- public HeapRegion next() { return at(index++); }
-
- @Override
- public void remove() { /* not supported */ }
-
- HeapRegionIterator(Address addr) {
- index = 0;
- length = length();
- }
+ return regions().length();
}
public Iterator<HeapRegion> heapRegionIterator() {
- return new HeapRegionIterator(addr);
+ return regions().heapRegionIterator();
}
public HeapRegionSeq(Address addr) {
diff --git a/hotspot/make/Makefile b/hotspot/make/Makefile
index 2975088..581a5da 100644
--- a/hotspot/make/Makefile
+++ b/hotspot/make/Makefile
@@ -334,6 +334,11 @@
$(install-file)
$(EXPORT_SERVER_DIR)/64/%.diz: $(C2_BUILD_DIR)/%.diz
$(install-file)
+# MacOS X
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(C2_BUILD_DIR)/%.dSYM
+ $(install-dir)
+$(EXPORT_SERVER_DIR)/%.dSYM: $(C2_BUILD_DIR)/%.dSYM
+ $(install-dir)
endif
# Client (C1)
@@ -379,6 +384,11 @@
$(install-file)
$(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_BUILD_DIR)/%.diz
$(install-file)
+# MacOS X
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(C1_BUILD_DIR)/%.dSYM
+ $(install-dir)
+$(EXPORT_CLIENT_DIR)/%.dSYM: $(C1_BUILD_DIR)/%.dSYM
+ $(install-dir)
endif
# Minimal1
@@ -424,6 +434,7 @@
$(install-file)
$(EXPORT_MINIMAL_DIR)/64/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz
$(install-file)
+# MacOS X does not support Minimal1 config
endif
# Zero
@@ -446,6 +457,11 @@
$(install-file)
$(EXPORT_SERVER_DIR)/%.diz: $(ZERO_BUILD_DIR)/%.diz
$(install-file)
+# MacOS X
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(ZERO_BUILD_DIR)/%.dSYM
+ $(install-dir)
+$(EXPORT_SERVER_DIR)/%.dSYM: $(ZERO_BUILD_DIR)/%.dSYM
+ $(install-dir)
endif
# Shark
@@ -468,6 +484,11 @@
$(install-file)
$(EXPORT_SERVER_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz
$(install-file)
+# MacOS X
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(SHARK_BUILD_DIR)/%.dSYM
+ $(install-dir)
+$(EXPORT_SERVER_DIR)/%.dSYM: $(SHARK_BUILD_DIR)/%.dSYM
+ $(install-dir)
endif
$(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/%
diff --git a/hotspot/make/bsd/Makefile b/hotspot/make/bsd/Makefile
index d9058c2..2bec290 100644
--- a/hotspot/make/bsd/Makefile
+++ b/hotspot/make/bsd/Makefile
@@ -204,6 +204,7 @@
BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) LIBRARY_SUFFIX=$(LIBRARY_SUFFIX)
BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
+BUILDTREE_VARS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE)
BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS)
@@ -337,9 +338,11 @@
# Doc target. This is the same for all build options.
# Hence create a docs directory beside ...$(ARCH)_[...]
+# We specify 'BUILD_FLAVOR=product' so that the proper
+# ENABLE_FULL_DEBUG_SYMBOLS value is used.
docs: checks
$(QUIETLY) mkdir -p $(SUBDIR_DOCS)
- $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) jvmtidocs
+ $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) BUILD_FLAVOR=product jvmtidocs
# Synonyms for win32-like targets.
compiler2: debug product
diff --git a/hotspot/make/bsd/makefiles/buildtree.make b/hotspot/make/bsd/makefiles/buildtree.make
index ca9d19e..88b141e 100644
--- a/hotspot/make/bsd/makefiles/buildtree.make
+++ b/hotspot/make/bsd/makefiles/buildtree.make
@@ -261,6 +261,16 @@
echo "$(call gamma-path,commonsrc,os/posix/vm)"; \
[ -n "$(CFLAGS_BROWSE)" ] && \
echo && echo "CFLAGS_BROWSE = $(CFLAGS_BROWSE)"; \
+ [ -n "$(ENABLE_FULL_DEBUG_SYMBOLS)" ] && \
+ echo && echo "ENABLE_FULL_DEBUG_SYMBOLS = $(ENABLE_FULL_DEBUG_SYMBOLS)"; \
+ [ -n "$(OBJCOPY)" ] && \
+ echo && echo "OBJCOPY = $(OBJCOPY)"; \
+ [ -n "$(STRIP_POLICY)" ] && \
+ echo && echo "STRIP_POLICY = $(STRIP_POLICY)"; \
+ [ -n "$(ZIP_DEBUGINFO_FILES)" ] && \
+ echo && echo "ZIP_DEBUGINFO_FILES = $(ZIP_DEBUGINFO_FILES)"; \
+ [ -n "$(ZIPEXE)" ] && \
+ echo && echo "ZIPEXE = $(ZIPEXE)"; \
[ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \
echo && \
echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
diff --git a/hotspot/make/bsd/makefiles/defs.make b/hotspot/make/bsd/makefiles/defs.make
index 14d3d4a..7cd21cc 100644
--- a/hotspot/make/bsd/makefiles/defs.make
+++ b/hotspot/make/bsd/makefiles/defs.make
@@ -136,10 +136,127 @@
endif
endif
+OS_VENDOR:=$(shell uname -s)
+
+# determine if HotSpot is being built in JDK6 or earlier version
+JDK6_OR_EARLIER=0
+ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1"
+ # if the longer variable names (newer build style) are set, then check those
+ ifeq "$(shell expr \( $(JDK_MAJOR_VERSION) = 1 \& $(JDK_MINOR_VERSION) \< 7 \))" "1"
+ JDK6_OR_EARLIER=1
+ endif
+else
+ # the longer variables aren't set so check the shorter variable names
+ ifeq "$(shell expr \( '$(JDK_MAJOR_VER)' = 1 \& '$(JDK_MINOR_VER)' \< 7 \))" "1"
+ JDK6_OR_EARLIER=1
+ endif
+endif
+
+ifeq ($(JDK6_OR_EARLIER),0)
+ # Full Debug Symbols is supported on JDK7 or newer.
+ # The Full Debug Symbols (FDS) default for BUILD_FLAVOR == product
+ # builds is enabled with debug info files ZIP'ed to save space. For
+ # BUILD_FLAVOR != product builds, FDS is always enabled, after all a
+ # debug build without debug info isn't very useful.
+ # The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled.
+ #
+ # If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
+ # disabled for a BUILD_FLAVOR == product build.
+ #
+ # Note: Use of a different variable name for the FDS override option
+ # versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
+ # versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
+ # in options via environment variables, use of distinct variables
+ # prevents strange behaviours. For example, in a BUILD_FLAVOR !=
+ # product build, the FULL_DEBUG_SYMBOLS environment variable will be
+ # 0, but the ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If
+ # the same variable name is used, then different values can be picked
+ # up by different parts of the build. Just to be clear, we only need
+ # two variable names because the incoming option value can be
+ # overridden in some situations, e.g., a BUILD_FLAVOR != product
+ # build.
+
+ # Due to the multiple sub-make processes that occur this logic gets
+ # executed multiple times. We reduce the noise by at least checking that
+ # BUILD_FLAVOR has been set.
+ ifneq ($(BUILD_FLAVOR),)
+ ifeq ($(BUILD_FLAVOR), product)
+ FULL_DEBUG_SYMBOLS ?= 1
+ ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
+ else
+ # debug variants always get Full Debug Symbols (if available)
+ ENABLE_FULL_DEBUG_SYMBOLS = 1
+ endif
+ _JUNK_ := $(shell \
+ echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
+ # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
+
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(OS_VENDOR), Darwin)
+ # MacOS X doesn't use OBJCOPY or STRIP_POLICY
+ OBJCOPY=
+ STRIP_POLICY=
+ ZIP_DEBUGINFO_FILES ?= 1
+ else
+ # Default OBJCOPY comes from GNU Binutils on BSD
+ ifeq ($(CROSS_COMPILE_ARCH),)
+ DEF_OBJCOPY=/usr/bin/objcopy
+ else
+ # Assume objcopy is part of the cross-compilation toolset
+ ifneq ($(ALT_COMPILER_PATH),)
+ DEF_OBJCOPY=$(ALT_COMPILER_PATH)/objcopy
+ endif
+ endif
+ OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
+ ifneq ($(ALT_OBJCOPY),)
+ _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
+ OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
+ endif
+
+ ifeq ($(OBJCOPY),)
+ _JUNK_ := $(shell \
+ echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo" \
+ "files. You may need to set ALT_OBJCOPY.")
+ ENABLE_FULL_DEBUG_SYMBOLS=0
+ _JUNK_ := $(shell \
+ echo >&2 "INFO:" \
+ "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
+ else
+ _JUNK_ := $(shell \
+ echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo" \
+ "files.")
+
+ # Library stripping policies for .debuginfo configs:
+ # all_strip - strips everything from the library
+ # min_strip - strips most stuff from the library; leaves
+ # minimum symbols
+ # no_strip - does not strip the library at all
+ #
+ # Oracle security policy requires "all_strip". A waiver was
+ # granted on 2011.09.01 that permits using "min_strip" in the
+ # Java JDK and Java JRE.
+ #
+ # Currently, STRIP_POLICY is only used when Full Debug Symbols
+ # is enabled.
+ #
+ STRIP_POLICY ?= min_strip
+
+ _JUNK_ := $(shell \
+ echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
+
+ ZIP_DEBUGINFO_FILES ?= 1
+ endif
+
+ _JUNK_ := $(shell \
+ echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
+ endif
+ endif # ENABLE_FULL_DEBUG_SYMBOLS=1
+ endif # BUILD_FLAVOR
+endif # JDK_6_OR_EARLIER
+
JDK_INCLUDE_SUBDIR=bsd
# Library suffix
-OS_VENDOR:=$(shell uname -s)
ifeq ($(OS_VENDOR),Darwin)
LIBRARY_SUFFIX=dylib
else
@@ -150,6 +267,19 @@
# client and server subdirectories have symbolic links to ../libjsig.so
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
+
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz
+ else
+ ifeq ($(OS_VENDOR), Darwin)
+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX).dSYM
+ else
+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
+ endif
+ endif
+endif
+
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal
@@ -157,34 +287,76 @@
ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
+
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
+ else
+ ifeq ($(OS_VENDOR), Darwin)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX).dSYM
+ else
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
+ endif
+ endif
+ endif
endif
ifeq ($(JVM_VARIANT_CLIENT),true)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
+
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
+ else
+ ifeq ($(OS_VENDOR), Darwin)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX).dSYM
+ else
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
+ endif
+ endif
+ endif
endif
ifeq ($(JVM_VARIANT_MINIMAL1),true)
EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.$(LIBRARY_SUFFIX)
-
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.diz
- else
- EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.debuginfo
- endif
- endif
endif
# Serviceability Binaries
# No SA Support for PPC, IA64, ARM or zero
ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
$(EXPORT_LIB_DIR)/sa-jdi.jar
+
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz
+ else
+ ifeq ($(OS_VENDOR), Darwin)
+ ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX).dSYM
+ else
+ ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+ endif
+ endif
+endif
+
ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
$(EXPORT_LIB_DIR)/sa-jdi.jar
ADD_SA_BINARIES/universal = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
$(EXPORT_LIB_DIR)/sa-jdi.jar
+
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ ADD_SA_BINARIES/universal += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz
+ else
+ ifeq ($(OS_VENDOR), Darwin)
+ ADD_SA_BINARIES/universal += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX).dSYM
+ else
+ ADD_SA_BINARIES/universal += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+ endif
+ endif
+endif
+
ADD_SA_BINARIES/ppc =
ADD_SA_BINARIES/ia64 =
ADD_SA_BINARIES/arm =
@@ -225,6 +397,19 @@
# Files to simply copy in place
UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/Xusage.txt
UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/Xusage.txt
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.diz
+ UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.diz
+ UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.diz
+ UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.diz
+ else
+ UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX).dSYM
+ UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX).dSYM
+ UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX).dSYM
+ UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX).dSYM
+ endif
+ endif
endif
endif
diff --git a/hotspot/make/bsd/makefiles/dtrace.make b/hotspot/make/bsd/makefiles/dtrace.make
index 1c53841..9374062 100644
--- a/hotspot/make/bsd/makefiles/dtrace.make
+++ b/hotspot/make/bsd/makefiles/dtrace.make
@@ -39,9 +39,15 @@
JVM_DB = libjvm_db
LIBJVM_DB = libjvm_db.dylib
+LIBJVM_DB_DEBUGINFO = libjvm_db.dylib.dSYM
+LIBJVM_DB_DIZ = libjvm_db.diz
+
JVM_DTRACE = jvm_dtrace
LIBJVM_DTRACE = libjvm_dtrace.dylib
+LIBJVM_DTRACE_DEBUGINFO = libjvm_dtrace.dylib.dSYM
+LIBJVM_DTRACE_DIZ = libjvm_dtrace.diz
+
JVMOFFS = JvmOffsets
JVMOFFS.o = $(JVMOFFS).o
GENOFFS = generate$(JVMOFFS)
@@ -76,21 +82,87 @@
# Making 64/libjvm_db.so: 64-bit version of libjvm_db.so which handles 32-bit libjvm.so
ifneq ("${ISA}","${BUILDARCH}")
-XLIBJVM_DB = 64/$(LIBJVM_DB)
-XLIBJVM_DTRACE = 64/$(LIBJVM_DTRACE)
+XLIBJVM_DIR = 64
+XLIBJVM_DB = $(XLIBJVM_DIR)/$(LIBJVM_DB)
+XLIBJVM_DTRACE = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE)
XARCH = $(subst sparcv9,v9,$(shell echo $(ISA)))
+XLIBJVM_DB_DEBUGINFO = $(XLIBJVM_DIR)/$(LIBJVM_DB_DEBUGINFO)
+XLIBJVM_DB_DIZ = $(XLIBJVM_DIR)/$(LIBJVM_DB_DIZ)
+XLIBJVM_DTRACE_DEBUGINFO = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DEBUGINFO)
+XLIBJVM_DTRACE_DIZ = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DIZ)
+
$(XLIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE)
@echo Making $@
- $(QUIETLY) mkdir -p 64/ ; \
+ $(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \
$(CC) $(SYMFLAG) -xarch=$(XARCH) -D$(TYPE) -I. -I$(GENERATED) \
$(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c #-lc
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(OS_VENDOR), Darwin)
+ $(DSYMUTIL) $@
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR)
+ # is not in the archived name:
+ ( cd $(XLIBJVM_DIR) && $(ZIPEXE) -q -r -y $(LIBJVM_DB_DIZ) $(LIBJVM_DB_DEBUGINFO) )
+ $(RM) -r $(XLIBJVM_DB_DEBUGINFO)
+ endif
+ else
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DB_DEBUGINFO)
+ # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR)
+ # is not in the link name:
+ $(QUIETLY) ( cd $(XLIBJVM_DIR) && $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) )
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
+ $(QUIETLY) $(STRIP) -x $@
+ # implied else here is no stripping at all
+ endif
+ endif
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR)
+ # is not in the archived name:
+ ( cd $(XLIBJVM_DIR) && $(ZIPEXE) -q -y $(LIBJVM_DB_DIZ) $(LIBJVM_DB_DEBUGINFO) )
+ $(RM) $(XLIBJVM_DB_DEBUGINFO)
+ endif
+ endif
+endif
$(XLIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
@echo Making $@
- $(QUIETLY) mkdir -p 64/ ; \
+ $(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \
$(CC) $(SYMFLAG) -xarch=$(XARCH) -D$(TYPE) -I. \
$(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c #-lc -lthread -ldoor
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(OS_VENDOR), Darwin)
+ $(DSYMUTIL) $@
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR)
+ # is not in the archived name:
+ ( cd $(XLIBJVM_DIR) && $(ZIPEXE) -q -r -y $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_DEBUGINFO) )
+ $(RM) -r $(XLIBJVM_DTRACE_DEBUGINFO)
+ endif
+ else
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DTRACE_DEBUGINFO)
+ # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR)
+ # is not in the link name:
+ ( cd $(XLIBJVM_DIR) && $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE) )
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
+ $(QUIETLY) $(STRIP) -x $@
+ # implied else here is no stripping at all
+ endif
+ endif
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR)
+ # is not in the archived name:
+ ( cd $(XLIBJVM_DIR) && $(ZIPEXE) -q -y $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_DEBUGINFO) )
+ $(RM) $(XLIBJVM_DTRACE_DEBUGINFO)
+ endif
+ endif
+endif
endif # ifneq ("${ISA}","${BUILDARCH}")
@@ -134,11 +206,59 @@
@echo Making $@
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \
$(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -Wall # -lc
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(OS_VENDOR), Darwin)
+ $(DSYMUTIL) $@
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ $(ZIPEXE) -q -r -y $(LIBJVM_DB_DIZ) $(LIBJVM_DB_DEBUGINFO)
+ $(RM) -r $(LIBJVM_DB_DEBUGINFO)
+ endif
+ else
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DB_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DB_DEBUGINFO) $@
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
+ $(QUIETLY) $(STRIP) -x $@
+ # implied else here is no stripping at all
+ endif
+ endif
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ $(ZIPEXE) -q -y $(LIBJVM_DB_DIZ) $(LIBJVM_DB_DEBUGINFO)
+ $(RM) $(LIBJVM_DB_DEBUGINFO)
+ endif
+ endif
+endif
$(LIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(XLIBJVM_DTRACE) $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
@echo Making $@
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. \
$(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c #-lc -lthread -ldoor
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(OS_VENDOR), Darwin)
+ $(DSYMUTIL) $@
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ $(ZIPEXE) -q -r -y $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_DEBUGINFO)
+ $(RM) -r $(LIBJVM_DTRACE_DEBUGINFO)
+ endif
+ else
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DTRACE_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $@
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
+ $(QUIETLY) $(STRIP) -x $@
+ # implied else here is no stripping at all
+ endif
+ endif
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ $(ZIPEXE) -q -y $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_DEBUGINFO)
+ $(RM) $(LIBJVM_DTRACE_DEBUGINFO)
+ endif
+ endif
+endif
#$(DTRACE).d: $(DTRACE_SRCDIR)/hotspot.d $(DTRACE_SRCDIR)/hotspot_jni.d \
# $(DTRACE_SRCDIR)/hs_private.d $(DTRACE_SRCDIR)/jhelper.d
diff --git a/hotspot/make/bsd/makefiles/gcc.make b/hotspot/make/bsd/makefiles/gcc.make
index 37c0268..840148e 100644
--- a/hotspot/make/bsd/makefiles/gcc.make
+++ b/hotspot/make/bsd/makefiles/gcc.make
@@ -83,6 +83,11 @@
AS = $(CC) -c
endif
+ifeq ($(OS_VENDOR), Darwin)
+ ifeq ($(DSYMUTIL),)
+ DSYMUTIL=dsymutil
+ endif
+endif
ifeq ($(USE_CLANG), true)
CC_VER_MAJOR := $(shell $(CC) -v 2>&1 | grep version | sed "s/.*version \([0-9]*\.[0-9]*\).*/\1/" | cut -d'.' -f1)
@@ -434,6 +439,36 @@
ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),)
DEBUG_CFLAGS += -gstabs
endif
+
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ FASTDEBUG_CFLAGS/ia64 = -g
+ FASTDEBUG_CFLAGS/amd64 = -g
+ FASTDEBUG_CFLAGS/arm = -g
+ FASTDEBUG_CFLAGS/ppc = -g
+ FASTDEBUG_CFLAGS += $(FASTDEBUG_CFLAGS/$(BUILDARCH))
+ ifeq ($(FASTDEBUG_CFLAGS/$(BUILDARCH)),)
+ ifeq ($(USE_CLANG), true)
+ # Clang doesn't understand -gstabs
+ FASTDEBUG_CFLAGS += -g
+ else
+ FASTDEBUG_CFLAGS += -gstabs
+ endif
+ endif
+
+ OPT_CFLAGS/ia64 = -g
+ OPT_CFLAGS/amd64 = -g
+ OPT_CFLAGS/arm = -g
+ OPT_CFLAGS/ppc = -g
+ OPT_CFLAGS += $(OPT_CFLAGS/$(BUILDARCH))
+ ifeq ($(OPT_CFLAGS/$(BUILDARCH)),)
+ ifeq ($(USE_CLANG), true)
+ # Clang doesn't understand -gstabs
+ OPT_CFLAGS += -g
+ else
+ OPT_CFLAGS += -gstabs
+ endif
+ endif
+ endif
endif
# If we are building HEADLESS, pass on to VM
diff --git a/hotspot/make/bsd/makefiles/jsig.make b/hotspot/make/bsd/makefiles/jsig.make
index 481ff72..b4802fb 100644
--- a/hotspot/make/bsd/makefiles/jsig.make
+++ b/hotspot/make/bsd/makefiles/jsig.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2013, 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
@@ -29,13 +29,21 @@
ifeq ($(OS_VENDOR), Darwin)
LIBJSIG = lib$(JSIG).dylib
+
+ LIBJSIG_DEBUGINFO = lib$(JSIG).dylib.dSYM
+ LIBJSIG_DIZ = lib$(JSIG).diz
else
LIBJSIG = lib$(JSIG).so
+
+ LIBJSIG_DEBUGINFO = lib$(JSIG).debuginfo
+ LIBJSIG_DIZ = lib$(JSIG).diz
endif
JSIGSRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/vm
-DEST_JSIG = $(JDK_LIBDIR)/$(LIBJSIG)
+DEST_JSIG = $(JDK_LIBDIR)/$(LIBJSIG)
+DEST_JSIG_DEBUGINFO = $(JDK_LIBDIR)/$(LIBJSIG_DEBUGINFO)
+DEST_JSIG_DIZ = $(JDK_LIBDIR)/$(LIBJSIG_DIZ)
LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
@@ -55,9 +63,42 @@
@echo Making signal interposition lib...
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
$(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $<
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(OS_VENDOR), Darwin)
+ $(DSYMUTIL) $@
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ $(ZIPEXE) -q -r -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
+ $(RM) -r $(LIBJSIG_DEBUGINFO)
+ endif
+ else
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
+ $(QUIETLY) $(STRIP) -g $@
+ # implied else here is no stripping at all
+ endif
+ endif
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ $(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
+ $(RM) $(LIBJSIG_DEBUGINFO)
+ endif
+ endif
+endif
install_jsig: $(LIBJSIG)
@echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
+ifeq ($(OS_VENDOR), Darwin)
+ $(QUIETLY) test -d $(LIBJSIG_DEBUGINFO) && \
+ cp -f -r $(LIBJSIG_DEBUGINFO) $(DEST_JSIG_DEBUGINFO)
+else
+ $(QUIETLY) test -f $(LIBJSIG_DEBUGINFO) && \
+ cp -f $(LIBJSIG_DEBUGINFO) $(DEST_JSIG_DEBUGINFO)
+endif
+ $(QUIETLY) test -f $(LIBJSIG_DIZ) && \
+ cp -f $(LIBJSIG_DIZ) $(DEST_JSIG_DIZ)
$(QUIETLY) cp -f $(LIBJSIG) $(DEST_JSIG) && echo "Done"
.PHONY: install_jsig
diff --git a/hotspot/make/bsd/makefiles/product.make b/hotspot/make/bsd/makefiles/product.make
index 0d6fb0e..5551546 100644
--- a/hotspot/make/bsd/makefiles/product.make
+++ b/hotspot/make/bsd/makefiles/product.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2013, 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,15 +43,17 @@
SYSDEFS += -DPRODUCT
VERSION = optimized
-# use -g to strip library as -x will discard its symbol table; -x is fine for
-# executables.
-ifdef CROSS_COMPILE_ARCH
- STRIP = $(ALT_COMPILER_PATH)/strip
-else
- STRIP = strip
-endif
-STRIP_LIBJVM = $(STRIP) -g $@ || exit 1;
-STRIP_AOUT = $(STRIP) -x $@ || exit 1;
+ifneq ($(OS_VENDOR), Darwin)
+ # use -g to strip library as -x will discard its symbol table; -x is fine for
+ # executables.
+ ifdef CROSS_COMPILE_ARCH
+ STRIP = $(ALT_COMPILER_PATH)/strip
+ else
+ STRIP = strip
+ endif
+ STRIP_LIBJVM = $(STRIP) -g $@ || exit 1;
+ STRIP_AOUT = $(STRIP) -x $@ || exit 1;
-# Don't strip in VM build; JDK build will strip libraries later
-# LINK_LIB.CXX/POST_HOOK += $(STRIP_$(LINK_INTO))
+ # Don't strip in VM build; JDK build will strip libraries later
+ # LINK_LIB.CXX/POST_HOOK += $(STRIP_$(LINK_INTO))
+endif
diff --git a/hotspot/make/bsd/makefiles/saproc.make b/hotspot/make/bsd/makefiles/saproc.make
index 62e31a6..8cb38db 100644
--- a/hotspot/make/bsd/makefiles/saproc.make
+++ b/hotspot/make/bsd/makefiles/saproc.make
@@ -28,9 +28,15 @@
SAPROC = saproc
ifeq ($(OS_VENDOR), Darwin)
- LIBSAPROC = lib$(SAPROC).dylib
+ LIBSAPROC = lib$(SAPROC).dylib
+
+ LIBSAPROC_DEBUGINFO = lib$(SAPROC).dylib.dSYM
+ LIBSAPROC_DIZ = lib$(SAPROC).diz
else
- LIBSAPROC = lib$(SAPROC).so
+ LIBSAPROC = lib$(SAPROC).so
+
+ LIBSAPROC_DEBUGINFO = lib$(SAPROC).debuginfo
+ LIBSAPROC_DIZ = lib$(SAPROC).diz
endif
AGENT_DIR = $(GAMMADIR)/agent
@@ -70,7 +76,9 @@
SAMAPFILE = $(SASRCDIR)/mapfile
-DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
+DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
+DEST_SAPROC_DEBUGINFO = $(JDK_LIBDIR)/$(LIBSAPROC_DEBUGINFO)
+DEST_SAPROC_DIZ = $(JDK_LIBDIR)/$(LIBSAPROC_DIZ)
# DEBUG_BINARIES overrides everything, use full -g debug information
ifeq ($(DEBUG_BINARIES), true)
@@ -117,11 +125,42 @@
$(SA_DEBUG_CFLAGS) \
-o $@ \
$(SALIBS)
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(OS_VENDOR), Darwin)
+ $(DSYMUTIL) $@
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ $(ZIPEXE) -q -r -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO)
+ $(RM) -r $(LIBSAPROC_DEBUGINFO)
+ endif
+ else
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
+ $(QUIETLY) $(STRIP) -g $@
+ # implied else here is no stripping at all
+ endif
+ endif
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ $(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO)
+ $(RM) $(LIBSAPROC_DEBUGINFO)
+ endif
+ endif
+endif
install_saproc: $(BUILDLIBSAPROC)
- $(QUIETLY) if [ -e $(LIBSAPROC) ] ; then \
- echo "Copying $(LIBSAPROC) to $(DEST_SAPROC)"; \
- cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"; \
- fi
+ @echo "Copying $(LIBSAPROC) to $(DEST_SAPROC)"
+ifeq ($(OS_VENDOR), Darwin)
+ $(QUIETLY) test -d $(LIBSAPROC_DEBUGINFO) && \
+ cp -f -r $(LIBSAPROC_DEBUGINFO) $(DEST_SAPROC_DEBUGINFO)
+else
+ $(QUIETLY) test -f $(LIBSAPROC_DEBUGINFO) && \
+ cp -f $(LIBSAPROC_DEBUGINFO) $(DEST_SAPROC_DEBUGINFO)
+endif
+ $(QUIETLY) test -f $(LIBSAPROC_DIZ) && \
+ cp -f $(LIBSAPROC_DIZ) $(DEST_SAPROC_DIZ)
+ $(QUIETLY) cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"
.PHONY: install_saproc
diff --git a/hotspot/make/bsd/makefiles/universal.gmk b/hotspot/make/bsd/makefiles/universal.gmk
index 0cc9275..d1136a8 100644
--- a/hotspot/make/bsd/makefiles/universal.gmk
+++ b/hotspot/make/bsd/makefiles/universal.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, 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
@@ -19,7 +19,7 @@
# 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.
-#
+#
#
# macosx universal builds
@@ -35,15 +35,15 @@
all_product_universal:
# $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 $(COMMON_VM_PRODUCT_TARGETS)
$(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 $(COMMON_VM_PRODUCT_TARGETS)
- $(QUIETLY) $(MAKE) EXPORT_SUBDIR= universalize
+ $(QUIETLY) $(MAKE) BUILD_FLAVOR=product EXPORT_SUBDIR= universalize
all_fastdebug_universal:
# $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 $(COMMON_VM_FASTDEBUG_TARGETS)
$(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 $(COMMON_VM_FASTDEBUG_TARGETS)
- $(QUIETLY) $(MAKE) EXPORT_SUBDIR=/fastdebug universalize
+ $(QUIETLY) $(MAKE) BUILD_FLAVOR=fastdebug EXPORT_SUBDIR=/fastdebug universalize
all_debug_universal:
# $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 $(COMMON_VM_DEBUG_TARGETS)
$(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 $(COMMON_VM_DEBUG_TARGETS)
- $(QUIETLY) $(MAKE) EXPORT_SUBDIR=/debug universalize
+ $(QUIETLY) $(MAKE) BUILD_FLAVOR=debug EXPORT_SUBDIR=/debug universalize
# Consolidate architecture builds into a single Universal binary
@@ -57,18 +57,18 @@
if [ -n "$${BUILT_LIPO_FILES}" ]; then \
$(MKDIR) -p $(shell dirname $@); \
lipo -create -output $@ $${BUILT_LIPO_FILES}; \
- fi
+ fi
# Copy built non-universal binaries in place
+# - copies directories; including empty dirs
+# - copies files, symlinks, other non-directory files
$(UNIVERSAL_COPY_LIST):
- BUILT_COPY_FILES="`find $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) 2>/dev/null`"; \
+ BUILT_COPY_FILES="`find $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) -prune 2>/dev/null`"; \
if [ -n "$${BUILT_COPY_FILES}" ]; then \
for i in $${BUILT_COPY_FILES}; do \
- if [ -f $${i} ]; then \
- $(MKDIR) -p $(shell dirname $@); \
- $(CP) $${i} $@; \
- fi; \
+ $(MKDIR) -p $(shell dirname $@); \
+ $(CP) -R $${i} $@; \
done; \
fi
diff --git a/hotspot/make/bsd/makefiles/vm.make b/hotspot/make/bsd/makefiles/vm.make
index ba2eb07..3e8ea76 100644
--- a/hotspot/make/bsd/makefiles/vm.make
+++ b/hotspot/make/bsd/makefiles/vm.make
@@ -60,10 +60,16 @@
# The order is important for the precompiled headers to work.
INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%)
-ifeq (${VERSION}, debug)
+# SYMFLAG is used by {jsig,saproc}.make
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ # always build with debug info when we can create .dSYM/.debuginfo files
SYMFLAG = -g
else
- SYMFLAG =
+ ifeq (${VERSION}, debug)
+ SYMFLAG = -g
+ else
+ SYMFLAG =
+ endif
endif
# HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
@@ -147,8 +153,14 @@
ifeq (${VERSION}, $(filter ${VERSION}, debug fastdebug))
CFLAGS += -DALLOW_OPERATOR_NEW_USAGE
endif
+
+ LIBJVM_DEBUGINFO = lib$(JVM).dylib.dSYM
+ LIBJVM_DIZ = lib$(JVM).diz
else
LIBJVM = lib$(JVM).so
+
+ LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
+ LIBJVM_DIZ = lib$(JVM).diz
endif
SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
@@ -322,10 +334,47 @@
rm -f $@.1; ln -s $@ $@.1; \
}
-DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(OS_VENDOR), Darwin)
+ $(DSYMUTIL) $@
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ $(ZIPEXE) -q -r -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
+ $(RM) -r $(LIBJVM_DEBUGINFO)
+ endif
+ else
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
+ $(QUIETLY) $(STRIP) -g $@
+ # implied else here is no stripping at all
+ endif
+ endif
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
+ $(RM) $(LIBJVM_DEBUGINFO)
+ endif
+ endif
+endif
+
+DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR)
+DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM)
+DEST_JVM_DEBUGINFO = $(DEST_SUBDIR)/$(LIBJVM_DEBUGINFO)
+DEST_JVM_DIZ = $(DEST_SUBDIR)/$(LIBJVM_DIZ)
install_jvm: $(LIBJVM)
@echo "Copying $(LIBJVM) to $(DEST_JVM)"
+ifeq ($(OS_VENDOR), Darwin)
+ $(QUIETLY) test -d $(LIBJVM_DEBUGINFO) && \
+ cp -f -r $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO)
+else
+ $(QUIETLY) test -f $(LIBJVM_DEBUGINFO) && \
+ cp -f $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO)
+endif
+ $(QUIETLY) test -f $(LIBJVM_DIZ) && \
+ cp -f $(LIBJVM_DIZ) $(DEST_JVM_DIZ)
$(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done"
#----------------------------------------------------------------------
@@ -340,11 +389,8 @@
#----------------------------------------------------------------------
ifeq ($(OS_VENDOR), Darwin)
-$(LIBJVM).dSYM: $(LIBJVM)
- dsymutil $(LIBJVM)
-
# no libjvm_db for macosx
-build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(BUILDLIBSAPROC) dtraceCheck $(LIBJVM).dSYM
+build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(BUILDLIBSAPROC) dtraceCheck
echo "Doing vm.make build:"
else
build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC)
diff --git a/hotspot/make/defs.make b/hotspot/make/defs.make
index 5ebf167..ede0425 100644
--- a/hotspot/make/defs.make
+++ b/hotspot/make/defs.make
@@ -77,6 +77,16 @@
@$(RM) $@
$(CP) $< $@
endef
+
+# MacOS X strongly discourages 'cp -r' and provides 'cp -R' instead.
+# May need to have a MacOS X specific definition of install-dir
+# sometime in the future.
+define install-dir
+@$(MKDIR) -p $(@D)
+@$(RM) -r $@
+$(CP) -r $< $@
+endef
+
define prep-target
@$(MKDIR) -p $(@D)
@$(RM) $@
diff --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version
index b310fbc..51d77f8 100644
--- a/hotspot/make/hotspot_version
+++ b/hotspot/make/hotspot_version
@@ -35,7 +35,7 @@
HS_MAJOR_VER=25
HS_MINOR_VER=0
-HS_BUILD_NUMBER=54
+HS_BUILD_NUMBER=55
JDK_MAJOR_VER=1
JDK_MINOR_VER=8
diff --git a/hotspot/make/windows/makefiles/compile.make b/hotspot/make/windows/makefiles/compile.make
index 80d84c6b..9da2742 100644
--- a/hotspot/make/windows/makefiles/compile.make
+++ b/hotspot/make/windows/makefiles/compile.make
@@ -181,6 +181,7 @@
PRODUCT_OPT_OPTION = /O2 /Oy-
FASTDEBUG_OPT_OPTION = /O2 /Oy-
DEBUG_OPT_OPTION = /Od
+SAFESEH_FLAG = /SAFESEH
!endif
!if "$(COMPILER_NAME)" == "VS2005"
@@ -199,6 +200,7 @@
!if "x$(MT)" == "x"
MT=mt.exe
!endif
+SAFESEH_FLAG = /SAFESEH
!endif
!if "$(COMPILER_NAME)" == "VS2008"
@@ -213,6 +215,7 @@
!if "x$(MT)" == "x"
MT=mt.exe
!endif
+SAFESEH_FLAG = /SAFESEH
!endif
!if "$(COMPILER_NAME)" == "VS2010"
@@ -244,9 +247,11 @@
!if "x$(MT)" == "x"
MT=mt.exe
!endif
-!if "$(BUILDARCH)" == "i486"
-LD_FLAGS = /SAFESEH $(LD_FLAGS)
+SAFESEH_FLAG = /SAFESEH
!endif
+
+!if "$(BUILDARCH)" == "i486"
+LD_FLAGS = $(SAFESEH_FLAG) $(LD_FLAGS)
!endif
CXX_FLAGS = $(CXX_FLAGS) $(MP_FLAG)
diff --git a/hotspot/make/windows/makefiles/sa.make b/hotspot/make/windows/makefiles/sa.make
index c04e363..5b5cc2d 100644
--- a/hotspot/make/windows/makefiles/sa.make
+++ b/hotspot/make/windows/makefiles/sa.make
@@ -110,6 +110,9 @@
!if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
SA_LFLAGS = $(SA_LFLAGS) -map -debug
!endif
+!if "$(BUILDARCH)" == "i486"
+SA_LFLAGS = $(SAFESEH_FLAG) $(SA_LFLAGS)
+!endif
SA_CFLAGS = $(SA_CFLAGS) $(MP_FLAG)
diff --git a/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
index cb4c04a..115302c 100644
--- a/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
@@ -3100,6 +3100,10 @@
}
}
+void LIR_Assembler::emit_profile_type(LIR_OpProfileType* op) {
+ fatal("Type profiling not implemented on this platform");
+}
+
void LIR_Assembler::align_backward_branch_target() {
__ align(OptoLoopAlignment);
}
diff --git a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp
index 5934f78..97c38cd 100644
--- a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp
@@ -1076,6 +1076,25 @@
__ verify_not_null_oop(Oexception);
+#ifdef ASSERT
+ // check that fields in JavaThread for exception oop and issuing pc are
+ // empty before writing to them
+ Label oop_empty;
+ Register scratch = I7; // We can use I7 here because it's overwritten later anyway.
+ __ ld_ptr(Address(G2_thread, JavaThread::exception_oop_offset()), scratch);
+ __ br_null(scratch, false, Assembler::pt, oop_empty);
+ __ delayed()->nop();
+ __ stop("exception oop already set");
+ __ bind(oop_empty);
+
+ Label pc_empty;
+ __ ld_ptr(Address(G2_thread, JavaThread::exception_pc_offset()), scratch);
+ __ br_null(scratch, false, Assembler::pt, pc_empty);
+ __ delayed()->nop();
+ __ stop("exception pc already set");
+ __ bind(pc_empty);
+#endif
+
// save the exception and issuing pc in the thread
__ st_ptr(Oexception, G2_thread, in_bytes(JavaThread::exception_oop_offset()));
__ st_ptr(Oissuing_pc, G2_thread, in_bytes(JavaThread::exception_pc_offset()));
diff --git a/hotspot/src/cpu/sparc/vm/globals_sparc.hpp b/hotspot/src/cpu/sparc/vm/globals_sparc.hpp
index acffc90..ecc6eb6 100644
--- a/hotspot/src/cpu/sparc/vm/globals_sparc.hpp
+++ b/hotspot/src/cpu/sparc/vm/globals_sparc.hpp
@@ -76,6 +76,8 @@
// GC Ergo Flags
define_pd_global(uintx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread
+define_pd_global(uintx, TypeProfileLevel, 0);
+
#define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct) \
\
product(intx, UseVIS, 99, \
diff --git a/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp b/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp
index 3149dbd..62ff0f2 100644
--- a/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp
@@ -3581,6 +3581,7 @@
// the pending exception will be picked up the interpreter.
__ ld_ptr(G2_thread, in_bytes(JavaThread::exception_oop_offset()), Oexception);
__ st_ptr(G0, G2_thread, in_bytes(JavaThread::exception_oop_offset()));
+ __ st_ptr(G0, G2_thread, in_bytes(JavaThread::exception_pc_offset()));
__ bind(noException);
// deallocate the deoptimization frame taking care to preserve the return values
diff --git a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
index 94c2c39..5ed890c 100644
--- a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
@@ -3632,6 +3632,161 @@
}
}
+void LIR_Assembler::emit_profile_type(LIR_OpProfileType* op) {
+ Register obj = op->obj()->as_register();
+ Register tmp = op->tmp()->as_pointer_register();
+ Address mdo_addr = as_Address(op->mdp()->as_address_ptr());
+ ciKlass* exact_klass = op->exact_klass();
+ intptr_t current_klass = op->current_klass();
+ bool not_null = op->not_null();
+ bool no_conflict = op->no_conflict();
+
+ Label update, next, none;
+
+ bool do_null = !not_null;
+ bool exact_klass_set = exact_klass != NULL && ciTypeEntries::valid_ciklass(current_klass) == exact_klass;
+ bool do_update = !TypeEntries::is_type_unknown(current_klass) && !exact_klass_set;
+
+ assert(do_null || do_update, "why are we here?");
+ assert(!TypeEntries::was_null_seen(current_klass) || do_update, "why are we here?");
+
+ __ verify_oop(obj);
+
+ if (tmp != obj) {
+ __ mov(tmp, obj);
+ }
+ if (do_null) {
+ __ testptr(tmp, tmp);
+ __ jccb(Assembler::notZero, update);
+ if (!TypeEntries::was_null_seen(current_klass)) {
+ __ orptr(mdo_addr, TypeEntries::null_seen);
+ }
+ if (do_update) {
+#ifndef ASSERT
+ __ jmpb(next);
+ }
+#else
+ __ jmp(next);
+ }
+ } else {
+ __ testptr(tmp, tmp);
+ __ jccb(Assembler::notZero, update);
+ __ stop("unexpect null obj");
+#endif
+ }
+
+ __ bind(update);
+
+ if (do_update) {
+#ifdef ASSERT
+ if (exact_klass != NULL) {
+ Label ok;
+ __ load_klass(tmp, tmp);
+ __ push(tmp);
+ __ mov_metadata(tmp, exact_klass->constant_encoding());
+ __ cmpptr(tmp, Address(rsp, 0));
+ __ jccb(Assembler::equal, ok);
+ __ stop("exact klass and actual klass differ");
+ __ bind(ok);
+ __ pop(tmp);
+ }
+#endif
+ if (!no_conflict) {
+ if (exact_klass == NULL || TypeEntries::is_type_none(current_klass)) {
+ if (exact_klass != NULL) {
+ __ mov_metadata(tmp, exact_klass->constant_encoding());
+ } else {
+ __ load_klass(tmp, tmp);
+ }
+
+ __ xorptr(tmp, mdo_addr);
+ __ testptr(tmp, TypeEntries::type_klass_mask);
+ // klass seen before, nothing to do. The unknown bit may have been
+ // set already but no need to check.
+ __ jccb(Assembler::zero, next);
+
+ __ testptr(tmp, TypeEntries::type_unknown);
+ __ jccb(Assembler::notZero, next); // already unknown. Nothing to do anymore.
+
+ if (TypeEntries::is_type_none(current_klass)) {
+ __ cmpptr(mdo_addr, 0);
+ __ jccb(Assembler::equal, none);
+ __ cmpptr(mdo_addr, TypeEntries::null_seen);
+ __ jccb(Assembler::equal, none);
+ // There is a chance that the checks above (re-reading profiling
+ // data from memory) fail if another thread has just set the
+ // profiling to this obj's klass
+ __ xorptr(tmp, mdo_addr);
+ __ testptr(tmp, TypeEntries::type_klass_mask);
+ __ jccb(Assembler::zero, next);
+ }
+ } else {
+ assert(ciTypeEntries::valid_ciklass(current_klass) != NULL &&
+ ciTypeEntries::valid_ciklass(current_klass) != exact_klass, "conflict only");
+
+ __ movptr(tmp, mdo_addr);
+ __ testptr(tmp, TypeEntries::type_unknown);
+ __ jccb(Assembler::notZero, next); // already unknown. Nothing to do anymore.
+ }
+
+ // different than before. Cannot keep accurate profile.
+ __ orptr(mdo_addr, TypeEntries::type_unknown);
+
+ if (TypeEntries::is_type_none(current_klass)) {
+ __ jmpb(next);
+
+ __ bind(none);
+ // first time here. Set profile type.
+ __ movptr(mdo_addr, tmp);
+ }
+ } else {
+ // There's a single possible klass at this profile point
+ assert(exact_klass != NULL, "should be");
+ if (TypeEntries::is_type_none(current_klass)) {
+ __ mov_metadata(tmp, exact_klass->constant_encoding());
+ __ xorptr(tmp, mdo_addr);
+ __ testptr(tmp, TypeEntries::type_klass_mask);
+#ifdef ASSERT
+ __ jcc(Assembler::zero, next);
+
+ {
+ Label ok;
+ __ push(tmp);
+ __ cmpptr(mdo_addr, 0);
+ __ jcc(Assembler::equal, ok);
+ __ cmpptr(mdo_addr, TypeEntries::null_seen);
+ __ jcc(Assembler::equal, ok);
+ // may have been set by another thread
+ __ mov_metadata(tmp, exact_klass->constant_encoding());
+ __ xorptr(tmp, mdo_addr);
+ __ testptr(tmp, TypeEntries::type_mask);
+ __ jcc(Assembler::zero, ok);
+
+ __ stop("unexpected profiling mismatch");
+ __ bind(ok);
+ __ pop(tmp);
+ }
+#else
+ __ jccb(Assembler::zero, next);
+#endif
+ // first time here. Set profile type.
+ __ movptr(mdo_addr, tmp);
+ } else {
+ assert(ciTypeEntries::valid_ciklass(current_klass) != NULL &&
+ ciTypeEntries::valid_ciklass(current_klass) != exact_klass, "inconsistent");
+
+ __ movptr(tmp, mdo_addr);
+ __ testptr(tmp, TypeEntries::type_unknown);
+ __ jccb(Assembler::notZero, next); // already unknown. Nothing to do anymore.
+
+ __ orptr(mdo_addr, TypeEntries::type_unknown);
+ }
+ }
+
+ __ bind(next);
+ }
+}
+
void LIR_Assembler::emit_delay(LIR_OpDelay*) {
Unimplemented();
}
diff --git a/hotspot/src/cpu/x86/vm/globals_x86.hpp b/hotspot/src/cpu/x86/vm/globals_x86.hpp
index c47f7d1..a727e07 100644
--- a/hotspot/src/cpu/x86/vm/globals_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/globals_x86.hpp
@@ -79,6 +79,8 @@
// GC Ergo Flags
define_pd_global(uintx, CMSYoungGenPerWorker, 64*M); // default max size of CMS young gen, per GC worker thread
+define_pd_global(uintx, TypeProfileLevel, 11);
+
#define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct) \
\
develop(bool, IEEEPrecision, true, \
diff --git a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp
index 0e7f483..183defa 100644
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp
@@ -1046,6 +1046,158 @@
}
}
+void InterpreterMacroAssembler::profile_obj_type(Register obj, const Address& mdo_addr) {
+ Label update, next, none;
+
+ verify_oop(obj);
+
+ testptr(obj, obj);
+ jccb(Assembler::notZero, update);
+ orptr(mdo_addr, TypeEntries::null_seen);
+ jmpb(next);
+
+ bind(update);
+ load_klass(obj, obj);
+
+ xorptr(obj, mdo_addr);
+ testptr(obj, TypeEntries::type_klass_mask);
+ jccb(Assembler::zero, next); // klass seen before, nothing to
+ // do. The unknown bit may have been
+ // set already but no need to check.
+
+ testptr(obj, TypeEntries::type_unknown);
+ jccb(Assembler::notZero, next); // already unknown. Nothing to do anymore.
+
+ cmpptr(mdo_addr, 0);
+ jccb(Assembler::equal, none);
+ cmpptr(mdo_addr, TypeEntries::null_seen);
+ jccb(Assembler::equal, none);
+ // There is a chance that the checks above (re-reading profiling
+ // data from memory) fail if another thread has just set the
+ // profiling to this obj's klass
+ xorptr(obj, mdo_addr);
+ testptr(obj, TypeEntries::type_klass_mask);
+ jccb(Assembler::zero, next);
+
+ // different than before. Cannot keep accurate profile.
+ orptr(mdo_addr, TypeEntries::type_unknown);
+ jmpb(next);
+
+ bind(none);
+ // first time here. Set profile type.
+ movptr(mdo_addr, obj);
+
+ bind(next);
+}
+
+void InterpreterMacroAssembler::profile_arguments_type(Register mdp, Register callee, Register tmp, bool is_virtual) {
+ if (!ProfileInterpreter) {
+ return;
+ }
+
+ if (MethodData::profile_arguments() || MethodData::profile_return()) {
+ Label profile_continue;
+
+ test_method_data_pointer(mdp, profile_continue);
+
+ int off_to_start = is_virtual ? in_bytes(VirtualCallData::virtual_call_data_size()) : in_bytes(CounterData::counter_data_size());
+
+ cmpb(Address(mdp, in_bytes(DataLayout::tag_offset()) - off_to_start), is_virtual ? DataLayout::virtual_call_type_data_tag : DataLayout::call_type_data_tag);
+ jcc(Assembler::notEqual, profile_continue);
+
+ if (MethodData::profile_arguments()) {
+ Label done;
+ int off_to_args = in_bytes(TypeEntriesAtCall::args_data_offset());
+ addptr(mdp, off_to_args);
+
+ for (int i = 0; i < TypeProfileArgsLimit; i++) {
+ if (i > 0 || MethodData::profile_return()) {
+ // If return value type is profiled we may have no argument to profile
+ movl(tmp, Address(mdp, in_bytes(TypeEntriesAtCall::cell_count_offset())-off_to_args));
+ subl(tmp, i*TypeStackSlotEntries::per_arg_count());
+ cmpl(tmp, TypeStackSlotEntries::per_arg_count());
+ jcc(Assembler::less, done);
+ }
+ movptr(tmp, Address(callee, Method::const_offset()));
+ load_unsigned_short(tmp, Address(tmp, ConstMethod::size_of_parameters_offset()));
+ // stack offset o (zero based) from the start of the argument
+ // list, for n arguments translates into offset n - o - 1 from
+ // the end of the argument list
+ subl(tmp, Address(mdp, in_bytes(TypeEntriesAtCall::stack_slot_offset(i))-off_to_args));
+ subl(tmp, 1);
+ Address arg_addr = argument_address(tmp);
+ movptr(tmp, arg_addr);
+
+ Address mdo_arg_addr(mdp, in_bytes(TypeEntriesAtCall::argument_type_offset(i))-off_to_args);
+ profile_obj_type(tmp, mdo_arg_addr);
+
+ int to_add = in_bytes(TypeStackSlotEntries::per_arg_size());
+ addptr(mdp, to_add);
+ off_to_args += to_add;
+ }
+
+ if (MethodData::profile_return()) {
+ movl(tmp, Address(mdp, in_bytes(TypeEntriesAtCall::cell_count_offset())-off_to_args));
+ subl(tmp, TypeProfileArgsLimit*TypeStackSlotEntries::per_arg_count());
+ }
+
+ bind(done);
+
+ if (MethodData::profile_return()) {
+ // We're right after the type profile for the last
+ // argument. tmp is the number of cell left in the
+ // CallTypeData/VirtualCallTypeData to reach its end. Non null
+ // if there's a return to profile.
+ assert(ReturnTypeEntry::static_cell_count() < TypeStackSlotEntries::per_arg_count(), "can't move past ret type");
+ shll(tmp, exact_log2(DataLayout::cell_size));
+ addptr(mdp, tmp);
+ }
+ movptr(Address(rbp, frame::interpreter_frame_mdx_offset * wordSize), mdp);
+ } else {
+ assert(MethodData::profile_return(), "either profile call args or call ret");
+ update_mdp_by_constant(mdp, in_bytes(ReturnTypeEntry::size()));
+ }
+
+ // mdp points right after the end of the
+ // CallTypeData/VirtualCallTypeData, right after the cells for the
+ // return value type if there's one
+
+ bind(profile_continue);
+ }
+}
+
+void InterpreterMacroAssembler::profile_return_type(Register mdp, Register ret, Register tmp) {
+ assert_different_registers(mdp, ret, tmp, rsi);
+ if (ProfileInterpreter && MethodData::profile_return()) {
+ Label profile_continue, done;
+
+ test_method_data_pointer(mdp, profile_continue);
+
+ if (MethodData::profile_return_jsr292_only()) {
+ // If we don't profile all invoke bytecodes we must make sure
+ // it's a bytecode we indeed profile. We can't go back to the
+ // begining of the ProfileData we intend to update to check its
+ // type because we're right after it and we don't known its
+ // length
+ Label do_profile;
+ cmpb(Address(rsi, 0), Bytecodes::_invokedynamic);
+ jcc(Assembler::equal, do_profile);
+ cmpb(Address(rsi, 0), Bytecodes::_invokehandle);
+ jcc(Assembler::equal, do_profile);
+ get_method(tmp);
+ cmpb(Address(tmp, Method::intrinsic_id_offset_in_bytes()), vmIntrinsics::_compiledLambdaForm);
+ jcc(Assembler::notEqual, profile_continue);
+
+ bind(do_profile);
+ }
+
+ Address mdo_ret_addr(mdp, -in_bytes(ReturnTypeEntry::size()));
+ mov(tmp, ret);
+ profile_obj_type(tmp, mdo_ret_addr);
+
+ bind(profile_continue);
+ }
+}
void InterpreterMacroAssembler::profile_call(Register mdp) {
if (ProfileInterpreter) {
diff --git a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp
index 49a41f6..91f0aa1 100644
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp
@@ -215,6 +215,9 @@
void profile_taken_branch(Register mdp, Register bumped_count);
void profile_not_taken_branch(Register mdp);
+ void profile_obj_type(Register obj, const Address& mdo_addr);
+ void profile_arguments_type(Register mdp, Register callee, Register tmp, bool is_virtual);
+ void profile_return_type(Register mdp, Register ret, Register tmp);
void profile_call(Register mdp);
void profile_final_call(Register mdp);
void profile_virtual_call(Register receiver, Register mdp, Register scratch2,
diff --git a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp
index 88d57d0..8495f0d 100644
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp
@@ -1067,6 +1067,159 @@
}
}
+void InterpreterMacroAssembler::profile_obj_type(Register obj, const Address& mdo_addr) {
+ Label update, next, none;
+
+ verify_oop(obj);
+
+ testptr(obj, obj);
+ jccb(Assembler::notZero, update);
+ orptr(mdo_addr, TypeEntries::null_seen);
+ jmpb(next);
+
+ bind(update);
+ load_klass(obj, obj);
+
+ xorptr(obj, mdo_addr);
+ testptr(obj, TypeEntries::type_klass_mask);
+ jccb(Assembler::zero, next); // klass seen before, nothing to
+ // do. The unknown bit may have been
+ // set already but no need to check.
+
+ testptr(obj, TypeEntries::type_unknown);
+ jccb(Assembler::notZero, next); // already unknown. Nothing to do anymore.
+
+ // There is a chance that by the time we do these checks (re-reading
+ // profiling data from memory) another thread has set the profling
+ // to this obj's klass and we set the profiling as unknow
+ // erroneously
+ cmpptr(mdo_addr, 0);
+ jccb(Assembler::equal, none);
+ cmpptr(mdo_addr, TypeEntries::null_seen);
+ jccb(Assembler::equal, none);
+ // There is a chance that the checks above (re-reading profiling
+ // data from memory) fail if another thread has just set the
+ // profiling to this obj's klass
+ xorptr(obj, mdo_addr);
+ testptr(obj, TypeEntries::type_klass_mask);
+ jccb(Assembler::zero, next);
+
+ // different than before. Cannot keep accurate profile.
+ orptr(mdo_addr, TypeEntries::type_unknown);
+ jmpb(next);
+
+ bind(none);
+ // first time here. Set profile type.
+ movptr(mdo_addr, obj);
+
+ bind(next);
+}
+
+void InterpreterMacroAssembler::profile_arguments_type(Register mdp, Register callee, Register tmp, bool is_virtual) {
+ if (!ProfileInterpreter) {
+ return;
+ }
+
+ if (MethodData::profile_arguments() || MethodData::profile_return()) {
+ Label profile_continue;
+
+ test_method_data_pointer(mdp, profile_continue);
+
+ int off_to_start = is_virtual ? in_bytes(VirtualCallData::virtual_call_data_size()) : in_bytes(CounterData::counter_data_size());
+
+ cmpb(Address(mdp, in_bytes(DataLayout::tag_offset()) - off_to_start), is_virtual ? DataLayout::virtual_call_type_data_tag : DataLayout::call_type_data_tag);
+ jcc(Assembler::notEqual, profile_continue);
+
+ if (MethodData::profile_arguments()) {
+ Label done;
+ int off_to_args = in_bytes(TypeEntriesAtCall::args_data_offset());
+ addptr(mdp, off_to_args);
+
+ for (int i = 0; i < TypeProfileArgsLimit; i++) {
+ if (i > 0 || MethodData::profile_return()) {
+ // If return value type is profiled we may have no argument to profile
+ movq(tmp, Address(mdp, in_bytes(TypeEntriesAtCall::cell_count_offset())-off_to_args));
+ subl(tmp, i*TypeStackSlotEntries::per_arg_count());
+ cmpl(tmp, TypeStackSlotEntries::per_arg_count());
+ jcc(Assembler::less, done);
+ }
+ movptr(tmp, Address(callee, Method::const_offset()));
+ load_unsigned_short(tmp, Address(tmp, ConstMethod::size_of_parameters_offset()));
+ subq(tmp, Address(mdp, in_bytes(TypeEntriesAtCall::stack_slot_offset(i))-off_to_args));
+ subl(tmp, 1);
+ Address arg_addr = argument_address(tmp);
+ movptr(tmp, arg_addr);
+
+ Address mdo_arg_addr(mdp, in_bytes(TypeEntriesAtCall::argument_type_offset(i))-off_to_args);
+ profile_obj_type(tmp, mdo_arg_addr);
+
+ int to_add = in_bytes(TypeStackSlotEntries::per_arg_size());
+ addptr(mdp, to_add);
+ off_to_args += to_add;
+ }
+
+ if (MethodData::profile_return()) {
+ movq(tmp, Address(mdp, in_bytes(TypeEntriesAtCall::cell_count_offset())-off_to_args));
+ subl(tmp, TypeProfileArgsLimit*TypeStackSlotEntries::per_arg_count());
+ }
+
+ bind(done);
+
+ if (MethodData::profile_return()) {
+ // We're right after the type profile for the last
+ // argument. tmp is the number of cell left in the
+ // CallTypeData/VirtualCallTypeData to reach its end. Non null
+ // if there's a return to profile.
+ assert(ReturnTypeEntry::static_cell_count() < TypeStackSlotEntries::per_arg_count(), "can't move past ret type");
+ shll(tmp, exact_log2(DataLayout::cell_size));
+ addptr(mdp, tmp);
+ }
+ movptr(Address(rbp, frame::interpreter_frame_mdx_offset * wordSize), mdp);
+ } else {
+ assert(MethodData::profile_return(), "either profile call args or call ret");
+ update_mdp_by_constant(mdp, in_bytes(ReturnTypeEntry::size()));
+ }
+
+ // mdp points right after the end of the
+ // CallTypeData/VirtualCallTypeData, right after the cells for the
+ // return value type if there's one
+
+ bind(profile_continue);
+ }
+}
+
+void InterpreterMacroAssembler::profile_return_type(Register mdp, Register ret, Register tmp) {
+ assert_different_registers(mdp, ret, tmp, r13);
+ if (ProfileInterpreter && MethodData::profile_return()) {
+ Label profile_continue, done;
+
+ test_method_data_pointer(mdp, profile_continue);
+
+ if (MethodData::profile_return_jsr292_only()) {
+ // If we don't profile all invoke bytecodes we must make sure
+ // it's a bytecode we indeed profile. We can't go back to the
+ // begining of the ProfileData we intend to update to check its
+ // type because we're right after it and we don't known its
+ // length
+ Label do_profile;
+ cmpb(Address(r13, 0), Bytecodes::_invokedynamic);
+ jcc(Assembler::equal, do_profile);
+ cmpb(Address(r13, 0), Bytecodes::_invokehandle);
+ jcc(Assembler::equal, do_profile);
+ get_method(tmp);
+ cmpb(Address(tmp, Method::intrinsic_id_offset_in_bytes()), vmIntrinsics::_compiledLambdaForm);
+ jcc(Assembler::notEqual, profile_continue);
+
+ bind(do_profile);
+ }
+
+ Address mdo_ret_addr(mdp, -in_bytes(ReturnTypeEntry::size()));
+ mov(tmp, ret);
+ profile_obj_type(tmp, mdo_ret_addr);
+
+ bind(profile_continue);
+ }
+}
void InterpreterMacroAssembler::profile_call(Register mdp) {
if (ProfileInterpreter) {
diff --git a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp
index 8bfc44f..fe7b760 100644
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp
@@ -224,6 +224,9 @@
void profile_taken_branch(Register mdp, Register bumped_count);
void profile_not_taken_branch(Register mdp);
+ void profile_obj_type(Register obj, const Address& mdo_addr);
+ void profile_arguments_type(Register mdp, Register callee, Register tmp, bool is_virtual);
+ void profile_return_type(Register mdp, Register ret, Register tmp);
void profile_call(Register mdp);
void profile_final_call(Register mdp);
void profile_virtual_call(Register receiver, Register mdp,
diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp b/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp
index 293b3b7..198fc98 100644
--- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp
@@ -773,6 +773,7 @@
void orptr(Register dst, Address src) { LP64_ONLY(orq(dst, src)) NOT_LP64(orl(dst, src)); }
void orptr(Register dst, Register src) { LP64_ONLY(orq(dst, src)) NOT_LP64(orl(dst, src)); }
void orptr(Register dst, int32_t src) { LP64_ONLY(orq(dst, src)) NOT_LP64(orl(dst, src)); }
+ void orptr(Address dst, int32_t imm32) { LP64_ONLY(orq(dst, imm32)) NOT_LP64(orl(dst, imm32)); }
void testptr(Register src, int32_t imm32) { LP64_ONLY(testq(src, imm32)) NOT_LP64(testl(src, imm32)); }
void testptr(Register src1, Register src2);
diff --git a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp
index 52e4599..7d9af3e 100644
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp
@@ -194,6 +194,12 @@
__ restore_bcp();
__ restore_locals();
+ if (incoming_state == atos) {
+ Register mdp = rbx;
+ Register tmp = rcx;
+ __ profile_return_type(mdp, rax, tmp);
+ }
+
Label L_got_cache, L_giant_index;
if (EnableInvokeDynamic) {
__ cmpb(Address(rsi, 0), Bytecodes::_invokedynamic);
diff --git a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp
index 6648bcd..d7e0d77 100644
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp
@@ -177,6 +177,12 @@
__ restore_bcp();
__ restore_locals();
+ if (state == atos) {
+ Register mdp = rbx;
+ Register tmp = rcx;
+ __ profile_return_type(mdp, rax, tmp);
+ }
+
Label L_got_cache, L_giant_index;
if (EnableInvokeDynamic) {
__ cmpb(Address(r13, 0), Bytecodes::_invokedynamic);
diff --git a/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp b/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp
index 6c6cc4f..6e6033b 100644
--- a/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp
@@ -2970,6 +2970,7 @@
// profile this call
__ profile_final_call(rax);
+ __ profile_arguments_type(rax, method, rsi, true);
__ jump_from_interpreted(method, rax);
@@ -2984,6 +2985,7 @@
// get target Method* & entry point
__ lookup_virtual_method(rax, index, method);
+ __ profile_arguments_type(rdx, method, rsi, true);
__ jump_from_interpreted(method, rdx);
}
@@ -3013,6 +3015,7 @@
__ null_check(rcx);
// do the call
__ profile_call(rax);
+ __ profile_arguments_type(rax, rbx, rsi, false);
__ jump_from_interpreted(rbx, rax);
}
@@ -3023,6 +3026,7 @@
prepare_invoke(byte_no, rbx); // get f1 Method*
// do the call
__ profile_call(rax);
+ __ profile_arguments_type(rax, rbx, rsi, false);
__ jump_from_interpreted(rbx, rax);
}
@@ -3082,6 +3086,8 @@
__ testptr(rbx, rbx);
__ jcc(Assembler::zero, no_such_method);
+ __ profile_arguments_type(rdx, rbx, rsi, true);
+
// do the call
// rcx: receiver
// rbx,: Method*
@@ -3138,6 +3144,7 @@
// FIXME: profile the LambdaForm also
__ profile_final_call(rax);
+ __ profile_arguments_type(rdx, rbx_method, rsi, true);
__ jump_from_interpreted(rbx_method, rdx);
}
@@ -3171,6 +3178,7 @@
// %%% should make a type profile for any invokedynamic that takes a ref argument
// profile this call
__ profile_call(rsi);
+ __ profile_arguments_type(rdx, rbx, rsi, false);
__ verify_oop(rax_callsite);
diff --git a/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp b/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp
index e97c538..8c49726 100644
--- a/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp
@@ -3026,6 +3026,7 @@
// profile this call
__ profile_final_call(rax);
+ __ profile_arguments_type(rax, method, r13, true);
__ jump_from_interpreted(method, rax);
@@ -3040,6 +3041,7 @@
// get target Method* & entry point
__ lookup_virtual_method(rax, index, method);
+ __ profile_arguments_type(rdx, method, r13, true);
__ jump_from_interpreted(method, rdx);
}
@@ -3069,6 +3071,7 @@
__ null_check(rcx);
// do the call
__ profile_call(rax);
+ __ profile_arguments_type(rax, rbx, r13, false);
__ jump_from_interpreted(rbx, rax);
}
@@ -3079,6 +3082,7 @@
prepare_invoke(byte_no, rbx); // get f1 Method*
// do the call
__ profile_call(rax);
+ __ profile_arguments_type(rax, rbx, r13, false);
__ jump_from_interpreted(rbx, rax);
}
@@ -3136,6 +3140,8 @@
__ testptr(rbx, rbx);
__ jcc(Assembler::zero, no_such_method);
+ __ profile_arguments_type(rdx, rbx, r13, true);
+
// do the call
// rcx: receiver
// rbx,: Method*
@@ -3193,6 +3199,7 @@
// FIXME: profile the LambdaForm also
__ profile_final_call(rax);
+ __ profile_arguments_type(rdx, rbx_method, r13, true);
__ jump_from_interpreted(rbx_method, rdx);
}
@@ -3226,6 +3233,7 @@
// %%% should make a type profile for any invokedynamic that takes a ref argument
// profile this call
__ profile_call(r13);
+ __ profile_arguments_type(rdx, rbx_method, r13, false);
__ verify_oop(rax_callsite);
diff --git a/hotspot/src/os/bsd/vm/os_bsd.cpp b/hotspot/src/os/bsd/vm/os_bsd.cpp
index fe0ef89..f182b2a 100644
--- a/hotspot/src/os/bsd/vm/os_bsd.cpp
+++ b/hotspot/src/os/bsd/vm/os_bsd.cpp
@@ -159,9 +159,21 @@
return Bsd::available_memory();
}
+// available here means free
julong os::Bsd::available_memory() {
- // XXXBSD: this is just a stopgap implementation
- return physical_memory() >> 2;
+ uint64_t available = physical_memory() >> 2;
+#ifdef __APPLE__
+ mach_msg_type_number_t count = HOST_VM_INFO64_COUNT;
+ vm_statistics64_data_t vmstat;
+ kern_return_t kerr = host_statistics64(mach_host_self(), HOST_VM_INFO64,
+ (host_info64_t)&vmstat, &count);
+ assert(kerr == KERN_SUCCESS,
+ "host_statistics64 failed - check mach_host_self() and count");
+ if (kerr == KERN_SUCCESS) {
+ available = vmstat.free_count * os::vm_page_size();
+ }
+#endif
+ return available;
}
julong os::physical_memory() {
diff --git a/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp b/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp
index b80b199..f98edc6 100644
--- a/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp
+++ b/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp
@@ -935,6 +935,7 @@
void Canonicalizer::do_UnsafePrefetchRead (UnsafePrefetchRead* x) {}
void Canonicalizer::do_UnsafePrefetchWrite(UnsafePrefetchWrite* x) {}
void Canonicalizer::do_ProfileCall(ProfileCall* x) {}
+void Canonicalizer::do_ProfileReturnType(ProfileReturnType* x) {}
void Canonicalizer::do_ProfileInvoke(ProfileInvoke* x) {}
void Canonicalizer::do_RuntimeCall(RuntimeCall* x) {}
void Canonicalizer::do_RangeCheckPredicate(RangeCheckPredicate* x) {}
diff --git a/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp b/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp
index 9e34ac7..43ce4a4 100644
--- a/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp
+++ b/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp
@@ -104,6 +104,7 @@
virtual void do_UnsafePrefetchRead (UnsafePrefetchRead* x);
virtual void do_UnsafePrefetchWrite(UnsafePrefetchWrite* x);
virtual void do_ProfileCall (ProfileCall* x);
+ virtual void do_ProfileReturnType (ProfileReturnType* x);
virtual void do_ProfileInvoke (ProfileInvoke* x);
virtual void do_RuntimeCall (RuntimeCall* x);
virtual void do_MemBar (MemBar* x);
diff --git a/hotspot/src/share/vm/c1/c1_Compilation.cpp b/hotspot/src/share/vm/c1/c1_Compilation.cpp
index 1cdcab5..574fda1 100644
--- a/hotspot/src/share/vm/c1/c1_Compilation.cpp
+++ b/hotspot/src/share/vm/c1/c1_Compilation.cpp
@@ -601,6 +601,17 @@
}
}
+ciKlass* Compilation::cha_exact_type(ciType* type) {
+ if (type != NULL && type->is_loaded() && type->is_instance_klass()) {
+ ciInstanceKlass* ik = type->as_instance_klass();
+ assert(ik->exact_klass() == NULL, "no cha for final klass");
+ if (DeoptC1 && UseCHA && !(ik->has_subklass() || ik->is_interface())) {
+ dependency_recorder()->assert_leaf_type(ik);
+ return ik;
+ }
+ }
+ return NULL;
+}
void Compilation::print_timers() {
// tty->print_cr(" Native methods : %6.3f s, Average : %2.3f", CompileBroker::_t_native_compilation.seconds(), CompileBroker::_t_native_compilation.seconds() / CompileBroker::_total_native_compile_count);
diff --git a/hotspot/src/share/vm/c1/c1_Compilation.hpp b/hotspot/src/share/vm/c1/c1_Compilation.hpp
index f98ae97..7386dc4 100644
--- a/hotspot/src/share/vm/c1/c1_Compilation.hpp
+++ b/hotspot/src/share/vm/c1/c1_Compilation.hpp
@@ -246,6 +246,8 @@
(RangeCheckElimination || UseLoopInvariantCodeMotion) &&
method()->method_data()->trap_count(Deoptimization::Reason_none) == 0;
}
+
+ ciKlass* cha_exact_type(ciType* type);
};
diff --git a/hotspot/src/share/vm/c1/c1_Compiler.cpp b/hotspot/src/share/vm/c1/c1_Compiler.cpp
index ecace4d..0fb723c 100644
--- a/hotspot/src/share/vm/c1/c1_Compiler.cpp
+++ b/hotspot/src/share/vm/c1/c1_Compiler.cpp
@@ -42,26 +42,16 @@
#include "runtime/interfaceSupport.hpp"
#include "runtime/sharedRuntime.hpp"
-volatile int Compiler::_runtimes = uninitialized;
-Compiler::Compiler() {
-}
+Compiler::Compiler () {}
-
-Compiler::~Compiler() {
- Unimplemented();
-}
-
-
-void Compiler::initialize_all() {
+void Compiler::init_c1_runtime() {
BufferBlob* buffer_blob = CompilerThread::current()->get_buffer_blob();
Arena* arena = new (mtCompiler) Arena();
Runtime1::initialize(buffer_blob);
FrameMap::initialize();
// initialize data structures
ValueType::initialize(arena);
- // Instruction::initialize();
- // BlockBegin::initialize();
GraphBuilder::initialize();
// note: to use more than one instance of LinearScan at a time this function call has to
// be moved somewhere outside of this constructor:
@@ -70,32 +60,33 @@
void Compiler::initialize() {
- if (_runtimes != initialized) {
- initialize_runtimes( initialize_all, &_runtimes);
+ // Buffer blob must be allocated per C1 compiler thread at startup
+ BufferBlob* buffer_blob = init_buffer_blob();
+
+ if (should_perform_init()) {
+ if (buffer_blob == NULL) {
+ // When we come here we are in state 'initializing'; entire C1 compilation
+ // can be shut down.
+ set_state(failed);
+ } else {
+ init_c1_runtime();
+ set_state(initialized);
+ }
}
- mark_initialized();
}
-
-BufferBlob* Compiler::get_buffer_blob(ciEnv* env) {
+BufferBlob* Compiler::init_buffer_blob() {
// Allocate buffer blob once at startup since allocation for each
// compilation seems to be too expensive (at least on Intel win32).
- BufferBlob* buffer_blob = CompilerThread::current()->get_buffer_blob();
- if (buffer_blob != NULL) {
- return buffer_blob;
- }
+ assert (CompilerThread::current()->get_buffer_blob() == NULL, "Should initialize only once");
// setup CodeBuffer. Preallocate a BufferBlob of size
// NMethodSizeLimit plus some extra space for constants.
int code_buffer_size = Compilation::desired_max_code_buffer_size() +
Compilation::desired_max_constant_size();
- buffer_blob = BufferBlob::create("Compiler1 temporary CodeBuffer",
- code_buffer_size);
- if (buffer_blob == NULL) {
- CompileBroker::handle_full_code_cache();
- env->record_failure("CodeCache is full");
- } else {
+ BufferBlob* buffer_blob = BufferBlob::create("C1 temporary CodeBuffer", code_buffer_size);
+ if (buffer_blob != NULL) {
CompilerThread::current()->set_buffer_blob(buffer_blob);
}
@@ -104,15 +95,8 @@
void Compiler::compile_method(ciEnv* env, ciMethod* method, int entry_bci) {
- BufferBlob* buffer_blob = Compiler::get_buffer_blob(env);
- if (buffer_blob == NULL) {
- return;
- }
-
- if (!is_initialized()) {
- initialize();
- }
-
+ BufferBlob* buffer_blob = CompilerThread::current()->get_buffer_blob();
+ assert(buffer_blob != NULL, "Must exist");
// invoke compilation
{
// We are nested here because we need for the destructor
diff --git a/hotspot/src/share/vm/c1/c1_Compiler.hpp b/hotspot/src/share/vm/c1/c1_Compiler.hpp
index 6e209d0..fe95c8c 100644
--- a/hotspot/src/share/vm/c1/c1_Compiler.hpp
+++ b/hotspot/src/share/vm/c1/c1_Compiler.hpp
@@ -30,11 +30,9 @@
// There is one instance of the Compiler per CompilerThread.
class Compiler: public AbstractCompiler {
-
private:
-
- // Tracks whether runtime has been initialized
- static volatile int _runtimes;
+ static void init_c1_runtime();
+ BufferBlob* init_buffer_blob();
public:
// Creation
@@ -46,19 +44,12 @@
virtual bool is_c1() { return true; };
- BufferBlob* get_buffer_blob(ciEnv* env);
-
// Missing feature tests
virtual bool supports_native() { return true; }
virtual bool supports_osr () { return true; }
- // Customization
- virtual bool needs_adapters () { return false; }
- virtual bool needs_stubs () { return false; }
-
// Initialization
virtual void initialize();
- static void initialize_all();
// Compilation entry point for methods
virtual void compile_method(ciEnv* env, ciMethod* target, int entry_bci);
diff --git a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
index 03d0d75..23d8005 100644
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
+++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
@@ -1466,9 +1466,22 @@
// State at end of inlined method is the state of the caller
// without the method parameters on stack, including the
// return value, if any, of the inlined method on operand stack.
+ int invoke_bci = state()->caller_state()->bci();
set_state(state()->caller_state()->copy_for_parsing());
if (x != NULL) {
state()->push(x->type(), x);
+ if (profile_calls() && MethodData::profile_return() && x->type()->is_object_kind()) {
+ ciMethod* caller = state()->scope()->method();
+ ciMethodData* md = caller->method_data_or_null();
+ ciProfileData* data = md->bci_to_data(invoke_bci);
+ if (data->is_CallTypeData() || data->is_VirtualCallTypeData()) {
+ bool has_return = data->is_CallTypeData() ? ((ciCallTypeData*)data)->has_return() : ((ciVirtualCallTypeData*)data)->has_return();
+ // May not be true in case of an inlined call through a method handle intrinsic.
+ if (has_return) {
+ profile_return_type(x, method(), caller, invoke_bci);
+ }
+ }
+ }
}
Goto* goto_callee = new Goto(continuation(), false);
@@ -1658,6 +1671,42 @@
return compilation()->dependency_recorder();
}
+// How many arguments do we want to profile?
+Values* GraphBuilder::args_list_for_profiling(int& start, bool may_have_receiver) {
+ int n = 0;
+ assert(start == 0, "should be initialized");
+ if (MethodData::profile_arguments()) {
+ ciProfileData* data = method()->method_data()->bci_to_data(bci());
+ if (data->is_CallTypeData() || data->is_VirtualCallTypeData()) {
+ n = data->is_CallTypeData() ? data->as_CallTypeData()->number_of_arguments() : data->as_VirtualCallTypeData()->number_of_arguments();
+ bool has_receiver = may_have_receiver && Bytecodes::has_receiver(method()->java_code_at_bci(bci()));
+ start = has_receiver ? 1 : 0;
+ }
+ }
+ if (n > 0) {
+ return new Values(n);
+ }
+ return NULL;
+}
+
+// Collect arguments that we want to profile in a list
+Values* GraphBuilder::collect_args_for_profiling(Values* args, bool may_have_receiver) {
+ int start = 0;
+ Values* obj_args = args_list_for_profiling(start, may_have_receiver);
+ if (obj_args == NULL) {
+ return NULL;
+ }
+ int s = obj_args->size();
+ for (int i = start, j = 0; j < s; i++) {
+ if (args->at(i)->type()->is_object_kind()) {
+ obj_args->push(args->at(i));
+ j++;
+ }
+ }
+ assert(s == obj_args->length(), "missed on arg?");
+ return obj_args;
+}
+
void GraphBuilder::invoke(Bytecodes::Code code) {
bool will_link;
@@ -1957,7 +2006,7 @@
} else if (exact_target != NULL) {
target_klass = exact_target->holder();
}
- profile_call(target, recv, target_klass);
+ profile_call(target, recv, target_klass, collect_args_for_profiling(args, false), false);
}
}
@@ -1972,6 +2021,9 @@
push(result_type, result);
}
}
+ if (profile_calls() && MethodData::profile_return() && result_type->is_object_kind()) {
+ profile_return_type(result, target);
+ }
}
@@ -3509,7 +3561,7 @@
recv = args->at(0);
null_check(recv);
}
- profile_call(callee, recv, NULL);
+ profile_call(callee, recv, NULL, collect_args_for_profiling(args, true), true);
}
}
}
@@ -3520,6 +3572,10 @@
Value value = append_split(result);
if (result_type != voidType) push(result_type, value);
+ if (callee != method() && profile_calls() && MethodData::profile_return() && result_type->is_object_kind()) {
+ profile_return_type(result, callee);
+ }
+
// done
return true;
}
@@ -3763,7 +3819,28 @@
compilation()->set_would_profile(true);
if (profile_calls()) {
- profile_call(callee, recv, holder_known ? callee->holder() : NULL);
+ int start = 0;
+ Values* obj_args = args_list_for_profiling(start, has_receiver);
+ if (obj_args != NULL) {
+ int s = obj_args->size();
+ // if called through method handle invoke, some arguments may have been popped
+ for (int i = args_base+start, j = 0; j < obj_args->size() && i < state()->stack_size(); ) {
+ Value v = state()->stack_at_inc(i);
+ if (v->type()->is_object_kind()) {
+ obj_args->push(v);
+ j++;
+ }
+ }
+#ifdef ASSERT
+ {
+ bool ignored_will_link;
+ ciSignature* declared_signature = NULL;
+ ciMethod* real_target = method()->get_method_at_bci(bci(), ignored_will_link, &declared_signature);
+ assert(s == obj_args->length() || real_target->is_method_handle_intrinsic(), "missed on arg?");
+ }
+#endif
+ }
+ profile_call(callee, recv, holder_known ? callee->holder() : NULL, obj_args, true);
}
}
@@ -4251,8 +4328,23 @@
}
#endif // PRODUCT
-void GraphBuilder::profile_call(ciMethod* callee, Value recv, ciKlass* known_holder) {
- append(new ProfileCall(method(), bci(), callee, recv, known_holder));
+void GraphBuilder::profile_call(ciMethod* callee, Value recv, ciKlass* known_holder, Values* obj_args, bool inlined) {
+ append(new ProfileCall(method(), bci(), callee, recv, known_holder, obj_args, inlined));
+}
+
+void GraphBuilder::profile_return_type(Value ret, ciMethod* callee, ciMethod* m, int invoke_bci) {
+ assert((m == NULL) == (invoke_bci < 0), "invalid method and invalid bci together");
+ if (m == NULL) {
+ m = method();
+ }
+ if (invoke_bci < 0) {
+ invoke_bci = bci();
+ }
+ ciMethodData* md = m->method_data_or_null();
+ ciProfileData* data = md->bci_to_data(invoke_bci);
+ if (data->is_CallTypeData() || data->is_VirtualCallTypeData()) {
+ append(new ProfileReturnType(m , invoke_bci, callee, ret));
+ }
}
void GraphBuilder::profile_invocation(ciMethod* callee, ValueStack* state) {
diff --git a/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp b/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp
index ae5afd4..7945674 100644
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp
+++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp
@@ -374,7 +374,8 @@
void print_inlining(ciMethod* callee, const char* msg = NULL, bool success = true);
- void profile_call(ciMethod* callee, Value recv, ciKlass* predicted_holder);
+ void profile_call(ciMethod* callee, Value recv, ciKlass* predicted_holder, Values* obj_args, bool inlined);
+ void profile_return_type(Value ret, ciMethod* callee, ciMethod* m = NULL, int bci = -1);
void profile_invocation(ciMethod* inlinee, ValueStack* state);
// Shortcuts to profiling control.
@@ -386,6 +387,9 @@
bool profile_inlined_calls() { return _compilation->profile_inlined_calls(); }
bool profile_checkcasts() { return _compilation->profile_checkcasts(); }
+ Values* args_list_for_profiling(int& start, bool may_have_receiver);
+ Values* collect_args_for_profiling(Values* args, bool may_have_receiver);
+
public:
NOT_PRODUCT(void print_stats();)
diff --git a/hotspot/src/share/vm/c1/c1_Instruction.cpp b/hotspot/src/share/vm/c1/c1_Instruction.cpp
index a026b4c..e582961 100644
--- a/hotspot/src/share/vm/c1/c1_Instruction.cpp
+++ b/hotspot/src/share/vm/c1/c1_Instruction.cpp
@@ -104,6 +104,14 @@
}
}
+ciType* Instruction::exact_type() const {
+ ciType* t = declared_type();
+ if (t != NULL && t->is_klass()) {
+ return t->as_klass()->exact_klass();
+ }
+ return NULL;
+}
+
#ifndef PRODUCT
void Instruction::check_state(ValueStack* state) {
@@ -135,9 +143,7 @@
// perform constant and interval tests on index value
bool AccessIndexed::compute_needs_range_check() {
-
if (length()) {
-
Constant* clength = length()->as_Constant();
Constant* cindex = index()->as_Constant();
if (clength && cindex) {
@@ -157,34 +163,8 @@
}
-ciType* Local::exact_type() const {
- ciType* type = declared_type();
-
- // for primitive arrays, the declared type is the exact type
- if (type->is_type_array_klass()) {
- return type;
- } else if (type->is_instance_klass()) {
- ciInstanceKlass* ik = (ciInstanceKlass*)type;
- if (ik->is_loaded() && ik->is_final() && !ik->is_interface()) {
- return type;
- }
- } else if (type->is_obj_array_klass()) {
- ciObjArrayKlass* oak = (ciObjArrayKlass*)type;
- ciType* base = oak->base_element_type();
- if (base->is_instance_klass()) {
- ciInstanceKlass* ik = base->as_instance_klass();
- if (ik->is_loaded() && ik->is_final()) {
- return type;
- }
- } else if (base->is_primitive_type()) {
- return type;
- }
- }
- return NULL;
-}
-
ciType* Constant::exact_type() const {
- if (type()->is_object()) {
+ if (type()->is_object() && type()->as_ObjectType()->is_loaded()) {
return type()->as_ObjectType()->exact_type();
}
return NULL;
@@ -192,19 +172,18 @@
ciType* LoadIndexed::exact_type() const {
ciType* array_type = array()->exact_type();
- if (array_type == NULL) {
- return NULL;
- }
- assert(array_type->is_array_klass(), "what else?");
- ciArrayKlass* ak = (ciArrayKlass*)array_type;
+ if (array_type != NULL) {
+ assert(array_type->is_array_klass(), "what else?");
+ ciArrayKlass* ak = (ciArrayKlass*)array_type;
- if (ak->element_type()->is_instance_klass()) {
- ciInstanceKlass* ik = (ciInstanceKlass*)ak->element_type();
- if (ik->is_loaded() && ik->is_final()) {
- return ik;
+ if (ak->element_type()->is_instance_klass()) {
+ ciInstanceKlass* ik = (ciInstanceKlass*)ak->element_type();
+ if (ik->is_loaded() && ik->is_final()) {
+ return ik;
+ }
}
}
- return NULL;
+ return Instruction::exact_type();
}
@@ -224,22 +203,6 @@
}
-ciType* LoadField::exact_type() const {
- ciType* type = declared_type();
- // for primitive arrays, the declared type is the exact type
- if (type->is_type_array_klass()) {
- return type;
- }
- if (type->is_instance_klass()) {
- ciInstanceKlass* ik = (ciInstanceKlass*)type;
- if (ik->is_loaded() && ik->is_final()) {
- return type;
- }
- }
- return NULL;
-}
-
-
ciType* NewTypeArray::exact_type() const {
return ciTypeArrayKlass::make(elt_type());
}
@@ -264,16 +227,6 @@
return klass();
}
-ciType* CheckCast::exact_type() const {
- if (klass()->is_instance_klass()) {
- ciInstanceKlass* ik = (ciInstanceKlass*)klass();
- if (ik->is_loaded() && ik->is_final()) {
- return ik;
- }
- }
- return NULL;
-}
-
// Implementation of ArithmeticOp
bool ArithmeticOp::is_commutative() const {
diff --git a/hotspot/src/share/vm/c1/c1_Instruction.hpp b/hotspot/src/share/vm/c1/c1_Instruction.hpp
index 9563b72..19490bb 100644
--- a/hotspot/src/share/vm/c1/c1_Instruction.hpp
+++ b/hotspot/src/share/vm/c1/c1_Instruction.hpp
@@ -107,6 +107,7 @@
class UnsafePrefetchRead;
class UnsafePrefetchWrite;
class ProfileCall;
+class ProfileReturnType;
class ProfileInvoke;
class RuntimeCall;
class MemBar;
@@ -211,6 +212,7 @@
virtual void do_UnsafePrefetchRead (UnsafePrefetchRead* x) = 0;
virtual void do_UnsafePrefetchWrite(UnsafePrefetchWrite* x) = 0;
virtual void do_ProfileCall (ProfileCall* x) = 0;
+ virtual void do_ProfileReturnType (ProfileReturnType* x) = 0;
virtual void do_ProfileInvoke (ProfileInvoke* x) = 0;
virtual void do_RuntimeCall (RuntimeCall* x) = 0;
virtual void do_MemBar (MemBar* x) = 0;
@@ -322,6 +324,36 @@
_type = type;
}
+ // Helper class to keep track of which arguments need a null check
+ class ArgsNonNullState {
+ private:
+ int _nonnull_state; // mask identifying which args are nonnull
+ public:
+ ArgsNonNullState()
+ : _nonnull_state(AllBits) {}
+
+ // Does argument number i needs a null check?
+ bool arg_needs_null_check(int i) const {
+ // No data is kept for arguments starting at position 33 so
+ // conservatively assume that they need a null check.
+ if (i >= 0 && i < (int)sizeof(_nonnull_state) * BitsPerByte) {
+ return is_set_nth_bit(_nonnull_state, i);
+ }
+ return true;
+ }
+
+ // Set whether argument number i needs a null check or not
+ void set_arg_needs_null_check(int i, bool check) {
+ if (i >= 0 && i < (int)sizeof(_nonnull_state) * BitsPerByte) {
+ if (check) {
+ _nonnull_state |= nth_bit(i);
+ } else {
+ _nonnull_state &= ~(nth_bit(i));
+ }
+ }
+ }
+ };
+
public:
void* operator new(size_t size) throw() {
Compilation* c = Compilation::current();
@@ -566,7 +598,7 @@
virtual void other_values_do(ValueVisitor* f) { /* usually no other - override on demand */ }
void values_do(ValueVisitor* f) { input_values_do(f); state_values_do(f); other_values_do(f); }
- virtual ciType* exact_type() const { return NULL; }
+ virtual ciType* exact_type() const;
virtual ciType* declared_type() const { return NULL; }
// hashing
@@ -689,7 +721,6 @@
int java_index() const { return _java_index; }
virtual ciType* declared_type() const { return _declared_type; }
- virtual ciType* exact_type() const;
// generic
virtual void input_values_do(ValueVisitor* f) { /* no values */ }
@@ -806,7 +837,6 @@
{}
ciType* declared_type() const;
- ciType* exact_type() const;
// generic
HASHING2(LoadField, !needs_patching() && !field()->is_volatile(), obj()->subst(), offset()) // cannot be eliminated if needs patching or if volatile
@@ -1299,6 +1329,7 @@
virtual bool needs_exception_state() const { return false; }
+ ciType* exact_type() const { return NULL; }
ciType* declared_type() const;
// generic
@@ -1422,7 +1453,6 @@
}
ciType* declared_type() const;
- ciType* exact_type() const;
};
@@ -1490,7 +1520,7 @@
vmIntrinsics::ID _id;
Values* _args;
Value _recv;
- int _nonnull_state; // mask identifying which args are nonnull
+ ArgsNonNullState _nonnull_state;
public:
// preserves_state can be set to true for Intrinsics
@@ -1511,7 +1541,6 @@
, _id(id)
, _args(args)
, _recv(NULL)
- , _nonnull_state(AllBits)
{
assert(args != NULL, "args must exist");
ASSERT_VALUES
@@ -1537,21 +1566,12 @@
Value receiver() const { assert(has_receiver(), "must have receiver"); return _recv; }
bool preserves_state() const { return check_flag(PreservesStateFlag); }
- bool arg_needs_null_check(int i) {
- if (i >= 0 && i < (int)sizeof(_nonnull_state) * BitsPerByte) {
- return is_set_nth_bit(_nonnull_state, i);
- }
- return true;
+ bool arg_needs_null_check(int i) const {
+ return _nonnull_state.arg_needs_null_check(i);
}
void set_arg_needs_null_check(int i, bool check) {
- if (i >= 0 && i < (int)sizeof(_nonnull_state) * BitsPerByte) {
- if (check) {
- _nonnull_state |= nth_bit(i);
- } else {
- _nonnull_state &= ~(nth_bit(i));
- }
- }
+ _nonnull_state.set_arg_needs_null_check(i, check);
}
// generic
@@ -2450,34 +2470,87 @@
LEAF(ProfileCall, Instruction)
private:
- ciMethod* _method;
- int _bci_of_invoke;
- ciMethod* _callee; // the method that is called at the given bci
- Value _recv;
- ciKlass* _known_holder;
+ ciMethod* _method;
+ int _bci_of_invoke;
+ ciMethod* _callee; // the method that is called at the given bci
+ Value _recv;
+ ciKlass* _known_holder;
+ Values* _obj_args; // arguments for type profiling
+ ArgsNonNullState _nonnull_state; // Do we know whether some arguments are never null?
+ bool _inlined; // Are we profiling a call that is inlined
public:
- ProfileCall(ciMethod* method, int bci, ciMethod* callee, Value recv, ciKlass* known_holder)
+ ProfileCall(ciMethod* method, int bci, ciMethod* callee, Value recv, ciKlass* known_holder, Values* obj_args, bool inlined)
: Instruction(voidType)
, _method(method)
, _bci_of_invoke(bci)
, _callee(callee)
, _recv(recv)
, _known_holder(known_holder)
+ , _obj_args(obj_args)
+ , _inlined(inlined)
{
// The ProfileCall has side-effects and must occur precisely where located
pin();
}
- ciMethod* method() { return _method; }
- int bci_of_invoke() { return _bci_of_invoke; }
- ciMethod* callee() { return _callee; }
- Value recv() { return _recv; }
- ciKlass* known_holder() { return _known_holder; }
+ ciMethod* method() const { return _method; }
+ int bci_of_invoke() const { return _bci_of_invoke; }
+ ciMethod* callee() const { return _callee; }
+ Value recv() const { return _recv; }
+ ciKlass* known_holder() const { return _known_holder; }
+ int nb_profiled_args() const { return _obj_args == NULL ? 0 : _obj_args->length(); }
+ Value profiled_arg_at(int i) const { return _obj_args->at(i); }
+ bool arg_needs_null_check(int i) const {
+ return _nonnull_state.arg_needs_null_check(i);
+ }
+ bool inlined() const { return _inlined; }
- virtual void input_values_do(ValueVisitor* f) { if (_recv != NULL) f->visit(&_recv); }
+ void set_arg_needs_null_check(int i, bool check) {
+ _nonnull_state.set_arg_needs_null_check(i, check);
+ }
+
+ virtual void input_values_do(ValueVisitor* f) {
+ if (_recv != NULL) {
+ f->visit(&_recv);
+ }
+ for (int i = 0; i < nb_profiled_args(); i++) {
+ f->visit(_obj_args->adr_at(i));
+ }
+ }
};
+LEAF(ProfileReturnType, Instruction)
+ private:
+ ciMethod* _method;
+ ciMethod* _callee;
+ int _bci_of_invoke;
+ Value _ret;
+
+ public:
+ ProfileReturnType(ciMethod* method, int bci, ciMethod* callee, Value ret)
+ : Instruction(voidType)
+ , _method(method)
+ , _callee(callee)
+ , _bci_of_invoke(bci)
+ , _ret(ret)
+ {
+ set_needs_null_check(true);
+ // The ProfileType has side-effects and must occur precisely where located
+ pin();
+ }
+
+ ciMethod* method() const { return _method; }
+ ciMethod* callee() const { return _callee; }
+ int bci_of_invoke() const { return _bci_of_invoke; }
+ Value ret() const { return _ret; }
+
+ virtual void input_values_do(ValueVisitor* f) {
+ if (_ret != NULL) {
+ f->visit(&_ret);
+ }
+ }
+};
// Call some C runtime function that doesn't safepoint,
// optionally passing the current thread as the first argument.
diff --git a/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp b/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp
index cfca00a..7f87e11 100644
--- a/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp
+++ b/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp
@@ -892,10 +892,24 @@
if (x->known_holder() != NULL) {
output()->print(", ");
print_klass(x->known_holder());
+ output()->print(" ");
+ }
+ for (int i = 0; i < x->nb_profiled_args(); i++) {
+ if (i > 0) output()->print(", ");
+ print_value(x->profiled_arg_at(i));
+ if (x->arg_needs_null_check(i)) {
+ output()->print(" [NC]");
+ }
}
output()->put(')');
}
+void InstructionPrinter::do_ProfileReturnType(ProfileReturnType* x) {
+ output()->print("profile ret type ");
+ print_value(x->ret());
+ output()->print(" %s.%s", x->method()->holder()->name()->as_utf8(), x->method()->name()->as_utf8());
+ output()->put(')');
+}
void InstructionPrinter::do_ProfileInvoke(ProfileInvoke* x) {
output()->print("profile_invoke ");
output()->print(" %s.%s", x->inlinee()->holder()->name()->as_utf8(), x->inlinee()->name()->as_utf8());
diff --git a/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp b/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp
index 8c80b6c..2ad20d3 100644
--- a/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp
+++ b/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp
@@ -132,6 +132,7 @@
virtual void do_UnsafePrefetchRead (UnsafePrefetchRead* x);
virtual void do_UnsafePrefetchWrite(UnsafePrefetchWrite* x);
virtual void do_ProfileCall (ProfileCall* x);
+ virtual void do_ProfileReturnType (ProfileReturnType* x);
virtual void do_ProfileInvoke (ProfileInvoke* x);
virtual void do_RuntimeCall (RuntimeCall* x);
virtual void do_MemBar (MemBar* x);
diff --git a/hotspot/src/share/vm/c1/c1_LIR.cpp b/hotspot/src/share/vm/c1/c1_LIR.cpp
index cb0ceab..f40d913 100644
--- a/hotspot/src/share/vm/c1/c1_LIR.cpp
+++ b/hotspot/src/share/vm/c1/c1_LIR.cpp
@@ -1001,6 +1001,17 @@
assert(opProfileCall->_tmp1->is_valid(), "used"); do_temp(opProfileCall->_tmp1);
break;
}
+
+// LIR_OpProfileType:
+ case lir_profile_type: {
+ assert(op->as_OpProfileType() != NULL, "must be");
+ LIR_OpProfileType* opProfileType = (LIR_OpProfileType*)op;
+
+ do_input(opProfileType->_mdp); do_temp(opProfileType->_mdp);
+ do_input(opProfileType->_obj);
+ do_temp(opProfileType->_tmp);
+ break;
+ }
default:
ShouldNotReachHere();
}
@@ -1151,6 +1162,10 @@
masm->emit_profile_call(this);
}
+void LIR_OpProfileType::emit_code(LIR_Assembler* masm) {
+ masm->emit_profile_type(this);
+}
+
// LIR_List
LIR_List::LIR_List(Compilation* compilation, BlockBegin* block)
: _operations(8)
@@ -1803,6 +1818,8 @@
case lir_cas_int: s = "cas_int"; break;
// LIR_OpProfileCall
case lir_profile_call: s = "profile_call"; break;
+ // LIR_OpProfileType
+ case lir_profile_type: s = "profile_type"; break;
// LIR_OpAssert
#ifdef ASSERT
case lir_assert: s = "assert"; break;
@@ -2086,6 +2103,15 @@
tmp1()->print(out); out->print(" ");
}
+// LIR_OpProfileType
+void LIR_OpProfileType::print_instr(outputStream* out) const {
+ out->print("exact = "); exact_klass()->print_name_on(out);
+ out->print("current = "); ciTypeEntries::print_ciklass(out, current_klass());
+ mdp()->print(out); out->print(" ");
+ obj()->print(out); out->print(" ");
+ tmp()->print(out); out->print(" ");
+}
+
#endif // PRODUCT
// Implementation of LIR_InsertionBuffer
diff --git a/hotspot/src/share/vm/c1/c1_LIR.hpp b/hotspot/src/share/vm/c1/c1_LIR.hpp
index d0dca72..a339af5 100644
--- a/hotspot/src/share/vm/c1/c1_LIR.hpp
+++ b/hotspot/src/share/vm/c1/c1_LIR.hpp
@@ -882,6 +882,7 @@
class LIR_OpTypeCheck;
class LIR_OpCompareAndSwap;
class LIR_OpProfileCall;
+class LIR_OpProfileType;
#ifdef ASSERT
class LIR_OpAssert;
#endif
@@ -1005,6 +1006,7 @@
, end_opCompareAndSwap
, begin_opMDOProfile
, lir_profile_call
+ , lir_profile_type
, end_opMDOProfile
, begin_opAssert
, lir_assert
@@ -1145,6 +1147,7 @@
virtual LIR_OpTypeCheck* as_OpTypeCheck() { return NULL; }
virtual LIR_OpCompareAndSwap* as_OpCompareAndSwap() { return NULL; }
virtual LIR_OpProfileCall* as_OpProfileCall() { return NULL; }
+ virtual LIR_OpProfileType* as_OpProfileType() { return NULL; }
#ifdef ASSERT
virtual LIR_OpAssert* as_OpAssert() { return NULL; }
#endif
@@ -1925,8 +1928,8 @@
public:
// Destroys recv
- LIR_OpProfileCall(LIR_Code code, ciMethod* profiled_method, int profiled_bci, ciMethod* profiled_callee, LIR_Opr mdo, LIR_Opr recv, LIR_Opr t1, ciKlass* known_holder)
- : LIR_Op(code, LIR_OprFact::illegalOpr, NULL) // no result, no info
+ LIR_OpProfileCall(ciMethod* profiled_method, int profiled_bci, ciMethod* profiled_callee, LIR_Opr mdo, LIR_Opr recv, LIR_Opr t1, ciKlass* known_holder)
+ : LIR_Op(lir_profile_call, LIR_OprFact::illegalOpr, NULL) // no result, no info
, _profiled_method(profiled_method)
, _profiled_bci(profiled_bci)
, _profiled_callee(profiled_callee)
@@ -1948,6 +1951,45 @@
virtual void print_instr(outputStream* out) const PRODUCT_RETURN;
};
+// LIR_OpProfileType
+class LIR_OpProfileType : public LIR_Op {
+ friend class LIR_OpVisitState;
+
+ private:
+ LIR_Opr _mdp;
+ LIR_Opr _obj;
+ LIR_Opr _tmp;
+ ciKlass* _exact_klass; // non NULL if we know the klass statically (no need to load it from _obj)
+ intptr_t _current_klass; // what the profiling currently reports
+ bool _not_null; // true if we know statically that _obj cannot be null
+ bool _no_conflict; // true if we're profling parameters, _exact_klass is not NULL and we know
+ // _exact_klass it the only possible type for this parameter in any context.
+
+ public:
+ // Destroys recv
+ LIR_OpProfileType(LIR_Opr mdp, LIR_Opr obj, ciKlass* exact_klass, intptr_t current_klass, LIR_Opr tmp, bool not_null, bool no_conflict)
+ : LIR_Op(lir_profile_type, LIR_OprFact::illegalOpr, NULL) // no result, no info
+ , _mdp(mdp)
+ , _obj(obj)
+ , _exact_klass(exact_klass)
+ , _current_klass(current_klass)
+ , _tmp(tmp)
+ , _not_null(not_null)
+ , _no_conflict(no_conflict) { }
+
+ LIR_Opr mdp() const { return _mdp; }
+ LIR_Opr obj() const { return _obj; }
+ LIR_Opr tmp() const { return _tmp; }
+ ciKlass* exact_klass() const { return _exact_klass; }
+ intptr_t current_klass() const { return _current_klass; }
+ bool not_null() const { return _not_null; }
+ bool no_conflict() const { return _no_conflict; }
+
+ virtual void emit_code(LIR_Assembler* masm);
+ virtual LIR_OpProfileType* as_OpProfileType() { return this; }
+ virtual void print_instr(outputStream* out) const PRODUCT_RETURN;
+};
+
class LIR_InsertionBuffer;
//--------------------------------LIR_List---------------------------------------------------
@@ -2247,7 +2289,10 @@
ciMethod* profiled_method, int profiled_bci);
// MethodData* profiling
void profile_call(ciMethod* method, int bci, ciMethod* callee, LIR_Opr mdo, LIR_Opr recv, LIR_Opr t1, ciKlass* cha_klass) {
- append(new LIR_OpProfileCall(lir_profile_call, method, bci, callee, mdo, recv, t1, cha_klass));
+ append(new LIR_OpProfileCall(method, bci, callee, mdo, recv, t1, cha_klass));
+ }
+ void profile_type(LIR_Address* mdp, LIR_Opr obj, ciKlass* exact_klass, intptr_t current_klass, LIR_Opr tmp, bool not_null, bool no_conflict) {
+ append(new LIR_OpProfileType(LIR_OprFact::address(mdp), obj, exact_klass, current_klass, tmp, not_null, no_conflict));
}
void xadd(LIR_Opr src, LIR_Opr add, LIR_Opr res, LIR_Opr tmp) { append(new LIR_Op2(lir_xadd, src, add, res, tmp)); }
diff --git a/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp b/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp
index 57df272..68f249a 100644
--- a/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp
+++ b/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp
@@ -208,6 +208,7 @@
void emit_call(LIR_OpJavaCall* op);
void emit_rtcall(LIR_OpRTCall* op);
void emit_profile_call(LIR_OpProfileCall* op);
+ void emit_profile_type(LIR_OpProfileType* op);
void emit_delay(LIR_OpDelay* op);
void arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest, CodeEmitInfo* info, bool pop_fpu_stack);
diff --git a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
index dbe3476..40bccf8 100644
--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
@@ -2571,6 +2571,78 @@
}
+ciKlass* LIRGenerator::profile_arg_type(ciMethodData* md, int md_base_offset, int md_offset, intptr_t profiled_k, Value arg, LIR_Opr& mdp, bool not_null, ciKlass* signature_k) {
+ ciKlass* result = NULL;
+ bool do_null = !not_null && !TypeEntries::was_null_seen(profiled_k);
+ bool do_update = !TypeEntries::is_type_unknown(profiled_k);
+ // known not to be null or null bit already set and already set to
+ // unknown: nothing we can do to improve profiling
+ if (!do_null && !do_update) {
+ return result;
+ }
+
+ ciKlass* exact_klass = NULL;
+ Compilation* comp = Compilation::current();
+ if (do_update) {
+ // try to find exact type, using CHA if possible, so that loading
+ // the klass from the object can be avoided
+ ciType* type = arg->exact_type();
+ if (type == NULL) {
+ type = arg->declared_type();
+ type = comp->cha_exact_type(type);
+ }
+ assert(type == NULL || type->is_klass(), "type should be class");
+ exact_klass = (type != NULL && type->is_loaded()) ? (ciKlass*)type : NULL;
+
+ do_update = exact_klass == NULL || ciTypeEntries::valid_ciklass(profiled_k) != exact_klass;
+ }
+
+ if (!do_null && !do_update) {
+ return result;
+ }
+
+ ciKlass* exact_signature_k = NULL;
+ if (do_update) {
+ // Is the type from the signature exact (the only one possible)?
+ exact_signature_k = signature_k->exact_klass();
+ if (exact_signature_k == NULL) {
+ exact_signature_k = comp->cha_exact_type(signature_k);
+ } else {
+ result = exact_signature_k;
+ do_update = false;
+ // Known statically. No need to emit any code: prevent
+ // LIR_Assembler::emit_profile_type() from emitting useless code
+ profiled_k = ciTypeEntries::with_status(result, profiled_k);
+ }
+ if (exact_signature_k != NULL && exact_klass != exact_signature_k) {
+ assert(exact_klass == NULL, "arg and signature disagree?");
+ // sometimes the type of the signature is better than the best type
+ // the compiler has
+ exact_klass = exact_signature_k;
+ do_update = exact_klass == NULL || ciTypeEntries::valid_ciklass(profiled_k) != exact_klass;
+ }
+ }
+
+ if (!do_null && !do_update) {
+ return result;
+ }
+
+ if (mdp == LIR_OprFact::illegalOpr) {
+ mdp = new_register(T_METADATA);
+ __ metadata2reg(md->constant_encoding(), mdp);
+ if (md_base_offset != 0) {
+ LIR_Address* base_type_address = new LIR_Address(mdp, md_base_offset, T_ADDRESS);
+ mdp = new_pointer_register();
+ __ leal(LIR_OprFact::address(base_type_address), mdp);
+ }
+ }
+ LIRItem value(arg, this);
+ value.load_item();
+ __ profile_type(new LIR_Address(mdp, md_offset, T_METADATA),
+ value.result(), exact_klass, profiled_k, new_pointer_register(), not_null, exact_signature_k != NULL);
+ return result;
+}
+
void LIRGenerator::do_Base(Base* x) {
__ std_entry(LIR_OprFact::illegalOpr);
// Emit moves from physical registers / stack slots to virtual registers
@@ -3004,12 +3076,52 @@
}
}
+void LIRGenerator::profile_arguments(ProfileCall* x) {
+ if (MethodData::profile_arguments()) {
+ int bci = x->bci_of_invoke();
+ ciMethodData* md = x->method()->method_data_or_null();
+ ciProfileData* data = md->bci_to_data(bci);
+ if (data->is_CallTypeData() || data->is_VirtualCallTypeData()) {
+ ByteSize extra = data->is_CallTypeData() ? CallTypeData::args_data_offset() : VirtualCallTypeData::args_data_offset();
+ int base_offset = md->byte_offset_of_slot(data, extra);
+ LIR_Opr mdp = LIR_OprFact::illegalOpr;
+ ciTypeStackSlotEntries* args = data->is_CallTypeData() ? ((ciCallTypeData*)data)->args() : ((ciVirtualCallTypeData*)data)->args();
+
+ Bytecodes::Code bc = x->method()->java_code_at_bci(bci);
+ int start = 0;
+ int stop = data->is_CallTypeData() ? ((ciCallTypeData*)data)->number_of_arguments() : ((ciVirtualCallTypeData*)data)->number_of_arguments();
+ if (x->nb_profiled_args() < stop) {
+ // if called through method handle invoke, some arguments may have been popped
+ stop = x->nb_profiled_args();
+ }
+ ciSignature* sig = x->callee()->signature();
+ // method handle call to virtual method
+ bool has_receiver = x->inlined() && !x->callee()->is_static() && !Bytecodes::has_receiver(bc);
+ ciSignatureStream sig_stream(sig, has_receiver ? x->callee()->holder() : NULL);
+ for (int i = 0; i < stop; i++) {
+ int off = in_bytes(TypeEntriesAtCall::argument_type_offset(i)) - in_bytes(TypeEntriesAtCall::args_data_offset());
+ ciKlass* exact = profile_arg_type(md, base_offset, off,
+ args->type(i), x->profiled_arg_at(i+start), mdp,
+ !x->arg_needs_null_check(i+start), sig_stream.next_klass());
+ if (exact != NULL) {
+ md->set_argument_type(bci, i, exact);
+ }
+ }
+ }
+ }
+}
+
void LIRGenerator::do_ProfileCall(ProfileCall* x) {
// Need recv in a temporary register so it interferes with the other temporaries
LIR_Opr recv = LIR_OprFact::illegalOpr;
LIR_Opr mdo = new_register(T_OBJECT);
// tmp is used to hold the counters on SPARC
LIR_Opr tmp = new_pointer_register();
+
+ if (x->nb_profiled_args() > 0) {
+ profile_arguments(x);
+ }
+
if (x->recv() != NULL) {
LIRItem value(x->recv(), this);
value.load_item();
@@ -3019,6 +3131,21 @@
__ profile_call(x->method(), x->bci_of_invoke(), x->callee(), mdo, recv, tmp, x->known_holder());
}
+void LIRGenerator::do_ProfileReturnType(ProfileReturnType* x) {
+ int bci = x->bci_of_invoke();
+ ciMethodData* md = x->method()->method_data_or_null();
+ ciProfileData* data = md->bci_to_data(bci);
+ assert(data->is_CallTypeData() || data->is_VirtualCallTypeData(), "wrong profile data type");
+ ciReturnTypeEntry* ret = data->is_CallTypeData() ? ((ciCallTypeData*)data)->ret() : ((ciVirtualCallTypeData*)data)->ret();
+ LIR_Opr mdp = LIR_OprFact::illegalOpr;
+ ciKlass* exact = profile_arg_type(md, 0, md->byte_offset_of_slot(data, ret->type_offset()),
+ ret->type(), x->ret(), mdp,
+ !x->needs_null_check(), x->callee()->signature()->return_type()->as_klass());
+ if (exact != NULL) {
+ md->set_return_type(bci, exact);
+ }
+}
+
void LIRGenerator::do_ProfileInvoke(ProfileInvoke* x) {
// We can safely ignore accessors here, since c2 will inline them anyway,
// accessors are also always mature.
@@ -3053,7 +3180,11 @@
int offset = -1;
LIR_Opr counter_holder;
if (level == CompLevel_limited_profile) {
- address counters_adr = method->ensure_method_counters();
+ MethodCounters* counters_adr = method->ensure_method_counters();
+ if (counters_adr == NULL) {
+ bailout("method counters allocation failed");
+ return;
+ }
counter_holder = new_pointer_register();
__ move(LIR_OprFact::intptrConst(counters_adr), counter_holder);
offset = in_bytes(backedge ? MethodCounters::backedge_counter_offset() :
diff --git a/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp b/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp
index 0a02920..05399e5 100644
--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp
@@ -434,6 +434,8 @@
void do_ThreadIDIntrinsic(Intrinsic* x);
void do_ClassIDIntrinsic(Intrinsic* x);
#endif
+ ciKlass* profile_arg_type(ciMethodData* md, int md_first_offset, int md_offset, intptr_t profiled_k, Value arg, LIR_Opr& mdp, bool not_null, ciKlass* signature_k);
+ void profile_arguments(ProfileCall* x);
public:
Compilation* compilation() const { return _compilation; }
@@ -534,6 +536,7 @@
virtual void do_UnsafePrefetchRead (UnsafePrefetchRead* x);
virtual void do_UnsafePrefetchWrite(UnsafePrefetchWrite* x);
virtual void do_ProfileCall (ProfileCall* x);
+ virtual void do_ProfileReturnType (ProfileReturnType* x);
virtual void do_ProfileInvoke (ProfileInvoke* x);
virtual void do_RuntimeCall (RuntimeCall* x);
virtual void do_MemBar (MemBar* x);
diff --git a/hotspot/src/share/vm/c1/c1_Optimizer.cpp b/hotspot/src/share/vm/c1/c1_Optimizer.cpp
index 90dc279..90667b4 100644
--- a/hotspot/src/share/vm/c1/c1_Optimizer.cpp
+++ b/hotspot/src/share/vm/c1/c1_Optimizer.cpp
@@ -531,6 +531,7 @@
void do_UnsafePrefetchRead (UnsafePrefetchRead* x);
void do_UnsafePrefetchWrite(UnsafePrefetchWrite* x);
void do_ProfileCall (ProfileCall* x);
+ void do_ProfileReturnType (ProfileReturnType* x);
void do_ProfileInvoke (ProfileInvoke* x);
void do_RuntimeCall (RuntimeCall* x);
void do_MemBar (MemBar* x);
@@ -657,6 +658,8 @@
void handle_Intrinsic (Intrinsic* x);
void handle_ExceptionObject (ExceptionObject* x);
void handle_Phi (Phi* x);
+ void handle_ProfileCall (ProfileCall* x);
+ void handle_ProfileReturnType (ProfileReturnType* x);
};
@@ -715,7 +718,9 @@
void NullCheckVisitor::do_UnsafeGetAndSetObject(UnsafeGetAndSetObject* x) {}
void NullCheckVisitor::do_UnsafePrefetchRead (UnsafePrefetchRead* x) {}
void NullCheckVisitor::do_UnsafePrefetchWrite(UnsafePrefetchWrite* x) {}
-void NullCheckVisitor::do_ProfileCall (ProfileCall* x) { nce()->clear_last_explicit_null_check(); }
+void NullCheckVisitor::do_ProfileCall (ProfileCall* x) { nce()->clear_last_explicit_null_check();
+ nce()->handle_ProfileCall(x); }
+void NullCheckVisitor::do_ProfileReturnType (ProfileReturnType* x) { nce()->handle_ProfileReturnType(x); }
void NullCheckVisitor::do_ProfileInvoke (ProfileInvoke* x) {}
void NullCheckVisitor::do_RuntimeCall (RuntimeCall* x) {}
void NullCheckVisitor::do_MemBar (MemBar* x) {}
@@ -1134,6 +1139,15 @@
}
}
+void NullCheckEliminator::handle_ProfileCall(ProfileCall* x) {
+ for (int i = 0; i < x->nb_profiled_args(); i++) {
+ x->set_arg_needs_null_check(i, !set_contains(x->profiled_arg_at(i)));
+ }
+}
+
+void NullCheckEliminator::handle_ProfileReturnType(ProfileReturnType* x) {
+ x->set_needs_null_check(!set_contains(x->ret()));
+}
void Optimizer::eliminate_null_checks() {
ResourceMark rm;
diff --git a/hotspot/src/share/vm/c1/c1_RangeCheckElimination.hpp b/hotspot/src/share/vm/c1/c1_RangeCheckElimination.hpp
index ae1a255..b022a81 100644
--- a/hotspot/src/share/vm/c1/c1_RangeCheckElimination.hpp
+++ b/hotspot/src/share/vm/c1/c1_RangeCheckElimination.hpp
@@ -162,7 +162,8 @@
void do_UnsafePrefetchRead (UnsafePrefetchRead* x) { /* nothing to do */ };
void do_UnsafePrefetchWrite(UnsafePrefetchWrite* x) { /* nothing to do */ };
void do_ProfileCall (ProfileCall* x) { /* nothing to do */ };
- void do_ProfileInvoke (ProfileInvoke* x) { /* nothing to do */ };
+ void do_ProfileReturnType (ProfileReturnType* x) { /* nothing to do */ };
+ void do_ProfileInvoke (ProfileInvoke* x) { /* nothing to do */ };
void do_RuntimeCall (RuntimeCall* x) { /* nothing to do */ };
void do_MemBar (MemBar* x) { /* nothing to do */ };
void do_RangeCheckPredicate(RangeCheckPredicate* x) { /* nothing to do */ };
diff --git a/hotspot/src/share/vm/c1/c1_Runtime1.cpp b/hotspot/src/share/vm/c1/c1_Runtime1.cpp
index 8c48c8b..e3bac09 100644
--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp
@@ -542,8 +542,7 @@
// exception handler can cause class loading, which might throw an
// exception and those fields are expected to be clear during
// normal bytecode execution.
- thread->set_exception_oop(NULL);
- thread->set_exception_pc(NULL);
+ thread->clear_exception_oop_and_pc();
continuation = SharedRuntime::compute_compiled_exc_handler(nm, pc, exception, false, false);
// If an exception was thrown during exception dispatch, the exception oop may have changed
diff --git a/hotspot/src/share/vm/c1/c1_ValueMap.hpp b/hotspot/src/share/vm/c1/c1_ValueMap.hpp
index 820d190..1404aa0 100644
--- a/hotspot/src/share/vm/c1/c1_ValueMap.hpp
+++ b/hotspot/src/share/vm/c1/c1_ValueMap.hpp
@@ -203,6 +203,7 @@
void do_UnsafePrefetchRead (UnsafePrefetchRead* x) { /* nothing to do */ }
void do_UnsafePrefetchWrite(UnsafePrefetchWrite* x) { /* nothing to do */ }
void do_ProfileCall (ProfileCall* x) { /* nothing to do */ }
+ void do_ProfileReturnType (ProfileReturnType* x) { /* nothing to do */ }
void do_ProfileInvoke (ProfileInvoke* x) { /* nothing to do */ };
void do_RuntimeCall (RuntimeCall* x) { /* nothing to do */ };
void do_MemBar (MemBar* x) { /* nothing to do */ };
diff --git a/hotspot/src/share/vm/ci/ciClassList.hpp b/hotspot/src/share/vm/ci/ciClassList.hpp
index 71e5dd1..c3131f5 100644
--- a/hotspot/src/share/vm/ci/ciClassList.hpp
+++ b/hotspot/src/share/vm/ci/ciClassList.hpp
@@ -102,6 +102,7 @@
friend class ciMethodHandle; \
friend class ciMethodType; \
friend class ciReceiverTypeData; \
+friend class ciTypeEntries; \
friend class ciSymbol; \
friend class ciArray; \
friend class ciObjArray; \
diff --git a/hotspot/src/share/vm/ci/ciEnv.cpp b/hotspot/src/share/vm/ci/ciEnv.cpp
index 0102b2b..9cdd475 100644
--- a/hotspot/src/share/vm/ci/ciEnv.cpp
+++ b/hotspot/src/share/vm/ci/ciEnv.cpp
@@ -1154,9 +1154,12 @@
GUARDED_VM_ENTRY(return _factory->get_unloaded_object_constant();)
}
-void ciEnv::dump_replay_data(outputStream* out) {
- VM_ENTRY_MARK;
- MutexLocker ml(Compile_lock);
+// ------------------------------------------------------------------
+// ciEnv::dump_replay_data*
+
+// Don't change thread state and acquire any locks.
+// Safe to call from VM error reporter.
+void ciEnv::dump_replay_data_unsafe(outputStream* out) {
ResourceMark rm;
#if INCLUDE_JVMTI
out->print_cr("JvmtiExport can_access_local_variables %d", _jvmti_can_access_local_variables);
@@ -1181,3 +1184,10 @@
entry_bci, comp_level);
out->flush();
}
+
+void ciEnv::dump_replay_data(outputStream* out) {
+ GUARDED_VM_ENTRY(
+ MutexLocker ml(Compile_lock);
+ dump_replay_data_unsafe(out);
+ )
+}
diff --git a/hotspot/src/share/vm/ci/ciEnv.hpp b/hotspot/src/share/vm/ci/ciEnv.hpp
index 01f417d..b235f3b 100644
--- a/hotspot/src/share/vm/ci/ciEnv.hpp
+++ b/hotspot/src/share/vm/ci/ciEnv.hpp
@@ -452,6 +452,7 @@
// Dump the compilation replay data for the ciEnv to the stream.
void dump_replay_data(outputStream* out);
+ void dump_replay_data_unsafe(outputStream* out);
};
#endif // SHARE_VM_CI_CIENV_HPP
diff --git a/hotspot/src/share/vm/ci/ciInstanceKlass.cpp b/hotspot/src/share/vm/ci/ciInstanceKlass.cpp
index c689efa..d40e460 100644
--- a/hotspot/src/share/vm/ci/ciInstanceKlass.cpp
+++ b/hotspot/src/share/vm/ci/ciInstanceKlass.cpp
@@ -671,7 +671,6 @@
void ciInstanceKlass::dump_replay_data(outputStream* out) {
- ASSERT_IN_VM;
ResourceMark rm;
InstanceKlass* ik = get_instanceKlass();
diff --git a/hotspot/src/share/vm/ci/ciInstanceKlass.hpp b/hotspot/src/share/vm/ci/ciInstanceKlass.hpp
index 0b244a2..fdd93dd 100644
--- a/hotspot/src/share/vm/ci/ciInstanceKlass.hpp
+++ b/hotspot/src/share/vm/ci/ciInstanceKlass.hpp
@@ -235,6 +235,13 @@
bool is_instance_klass() const { return true; }
bool is_java_klass() const { return true; }
+ virtual ciKlass* exact_klass() {
+ if (is_loaded() && is_final() && !is_interface()) {
+ return this;
+ }
+ return NULL;
+ }
+
// Dump the current state of this klass for compilation replay.
virtual void dump_replay_data(outputStream* out);
};
diff --git a/hotspot/src/share/vm/ci/ciKlass.cpp b/hotspot/src/share/vm/ci/ciKlass.cpp
index ee5e270..2a4a25a 100644
--- a/hotspot/src/share/vm/ci/ciKlass.cpp
+++ b/hotspot/src/share/vm/ci/ciKlass.cpp
@@ -66,7 +66,9 @@
// ------------------------------------------------------------------
// ciKlass::is_subtype_of
bool ciKlass::is_subtype_of(ciKlass* that) {
- assert(is_loaded() && that->is_loaded(), "must be loaded");
+ assert(this->is_loaded(), err_msg("must be loaded: %s", this->name()->as_quoted_ascii()));
+ assert(that->is_loaded(), err_msg("must be loaded: %s", that->name()->as_quoted_ascii()));
+
// Check to see if the klasses are identical.
if (this == that) {
return true;
@@ -83,8 +85,8 @@
// ------------------------------------------------------------------
// ciKlass::is_subclass_of
bool ciKlass::is_subclass_of(ciKlass* that) {
- assert(is_loaded() && that->is_loaded(), "must be loaded");
- // Check to see if the klasses are identical.
+ assert(this->is_loaded(), err_msg("must be loaded: %s", this->name()->as_quoted_ascii()));
+ assert(that->is_loaded(), err_msg("must be loaded: %s", that->name()->as_quoted_ascii()));
VM_ENTRY_MARK;
Klass* this_klass = get_Klass();
diff --git a/hotspot/src/share/vm/ci/ciKlass.hpp b/hotspot/src/share/vm/ci/ciKlass.hpp
index d378059..7e03c1e 100644
--- a/hotspot/src/share/vm/ci/ciKlass.hpp
+++ b/hotspot/src/share/vm/ci/ciKlass.hpp
@@ -41,6 +41,7 @@
friend class ciEnv;
friend class ciField;
friend class ciMethod;
+ friend class ciMethodData;
friend class ciObjArrayKlass;
private:
@@ -121,6 +122,8 @@
// What kind of ciObject is this?
bool is_klass() const { return true; }
+ virtual ciKlass* exact_klass() = 0;
+
void print_name_on(outputStream* st);
};
diff --git a/hotspot/src/share/vm/ci/ciMethod.cpp b/hotspot/src/share/vm/ci/ciMethod.cpp
index 486d8c4..a554970 100644
--- a/hotspot/src/share/vm/ci/ciMethod.cpp
+++ b/hotspot/src/share/vm/ci/ciMethod.cpp
@@ -846,7 +846,9 @@
// Return true if allocation was successful or no MDO is required.
bool ciMethod::ensure_method_data(methodHandle h_m) {
EXCEPTION_CONTEXT;
- if (is_native() || is_abstract() || h_m()->is_accessor()) return true;
+ if (is_native() || is_abstract() || h_m()->is_accessor()) {
+ return true;
+ }
if (h_m()->method_data() == NULL) {
Method::build_interpreter_method_data(h_m, THREAD);
if (HAS_PENDING_EXCEPTION) {
@@ -903,22 +905,21 @@
// NULL otherwise.
ciMethodData* ciMethod::method_data_or_null() {
ciMethodData *md = method_data();
- if (md->is_empty()) return NULL;
+ if (md->is_empty()) {
+ return NULL;
+ }
return md;
}
// ------------------------------------------------------------------
// ciMethod::ensure_method_counters
//
-address ciMethod::ensure_method_counters() {
+MethodCounters* ciMethod::ensure_method_counters() {
check_is_loaded();
VM_ENTRY_MARK;
methodHandle mh(THREAD, get_Method());
- MethodCounters *counter = mh->method_counters();
- if (counter == NULL) {
- counter = Method::build_method_counters(mh(), CHECK_AND_CLEAR_NULL);
- }
- return (address)counter;
+ MethodCounters* method_counters = mh->get_method_counters(CHECK_NULL);
+ return method_counters;
}
// ------------------------------------------------------------------
@@ -1247,7 +1248,6 @@
#undef FETCH_FLAG_FROM_VM
void ciMethod::dump_replay_data(outputStream* st) {
- ASSERT_IN_VM;
ResourceMark rm;
Method* method = get_Method();
MethodCounters* mcs = method->method_counters();
diff --git a/hotspot/src/share/vm/ci/ciMethod.hpp b/hotspot/src/share/vm/ci/ciMethod.hpp
index ddff0ac..ecbbfef 100644
--- a/hotspot/src/share/vm/ci/ciMethod.hpp
+++ b/hotspot/src/share/vm/ci/ciMethod.hpp
@@ -265,7 +265,7 @@
bool is_klass_loaded(int refinfo_index, bool must_be_resolved) const;
bool check_call(int refinfo_index, bool is_static) const;
bool ensure_method_data(); // make sure it exists in the VM also
- address ensure_method_counters();
+ MethodCounters* ensure_method_counters();
int instructions_size();
int scale_count(int count, float prof_factor = 1.); // make MDO count commensurate with IIC
diff --git a/hotspot/src/share/vm/ci/ciMethodData.cpp b/hotspot/src/share/vm/ci/ciMethodData.cpp
index c30c6c3..aae7d92 100644
--- a/hotspot/src/share/vm/ci/ciMethodData.cpp
+++ b/hotspot/src/share/vm/ci/ciMethodData.cpp
@@ -78,7 +78,9 @@
void ciMethodData::load_data() {
MethodData* mdo = get_MethodData();
- if (mdo == NULL) return;
+ if (mdo == NULL) {
+ return;
+ }
// To do: don't copy the data if it is not "ripe" -- require a minimum #
// of invocations.
@@ -123,7 +125,7 @@
#endif
}
-void ciReceiverTypeData::translate_receiver_data_from(ProfileData* data) {
+void ciReceiverTypeData::translate_receiver_data_from(const ProfileData* data) {
for (uint row = 0; row < row_limit(); row++) {
Klass* k = data->as_ReceiverTypeData()->receiver(row);
if (k != NULL) {
@@ -134,6 +136,18 @@
}
+void ciTypeStackSlotEntries::translate_type_data_from(const TypeStackSlotEntries* entries) {
+ for (int i = 0; i < _number_of_entries; i++) {
+ intptr_t k = entries->type(i);
+ TypeStackSlotEntries::set_type(i, translate_klass(k));
+ }
+}
+
+void ciReturnTypeEntry::translate_type_data_from(const ReturnTypeEntry* ret) {
+ intptr_t k = ret->type();
+ set_type(translate_klass(k));
+}
+
// Get the data at an arbitrary (sort of) data index.
ciProfileData* ciMethodData::data_at(int data_index) {
if (out_of_bounds(data_index)) {
@@ -164,6 +178,10 @@
return new ciMultiBranchData(data_layout);
case DataLayout::arg_info_data_tag:
return new ciArgInfoData(data_layout);
+ case DataLayout::call_type_data_tag:
+ return new ciCallTypeData(data_layout);
+ case DataLayout::virtual_call_type_data_tag:
+ return new ciVirtualCallTypeData(data_layout);
};
}
@@ -286,6 +304,34 @@
}
}
+void ciMethodData::set_argument_type(int bci, int i, ciKlass* k) {
+ VM_ENTRY_MARK;
+ MethodData* mdo = get_MethodData();
+ if (mdo != NULL) {
+ ProfileData* data = mdo->bci_to_data(bci);
+ if (data->is_CallTypeData()) {
+ data->as_CallTypeData()->set_argument_type(i, k->get_Klass());
+ } else {
+ assert(data->is_VirtualCallTypeData(), "no arguments!");
+ data->as_VirtualCallTypeData()->set_argument_type(i, k->get_Klass());
+ }
+ }
+}
+
+void ciMethodData::set_return_type(int bci, ciKlass* k) {
+ VM_ENTRY_MARK;
+ MethodData* mdo = get_MethodData();
+ if (mdo != NULL) {
+ ProfileData* data = mdo->bci_to_data(bci);
+ if (data->is_CallTypeData()) {
+ data->as_CallTypeData()->set_return_type(k->get_Klass());
+ } else {
+ assert(data->is_VirtualCallTypeData(), "no arguments!");
+ data->as_VirtualCallTypeData()->set_return_type(k->get_Klass());
+ }
+ }
+}
+
bool ciMethodData::has_escape_info() {
return eflag_set(MethodData::estimated);
}
@@ -373,7 +419,6 @@
}
void ciMethodData::dump_replay_data(outputStream* out) {
- ASSERT_IN_VM;
ResourceMark rm;
MethodData* mdo = get_MethodData();
Method* method = mdo->method();
@@ -477,7 +522,50 @@
}
}
-void ciReceiverTypeData::print_receiver_data_on(outputStream* st) {
+void ciTypeEntries::print_ciklass(outputStream* st, intptr_t k) {
+ if (TypeEntries::is_type_none(k)) {
+ st->print("none");
+ } else if (TypeEntries::is_type_unknown(k)) {
+ st->print("unknown");
+ } else {
+ valid_ciklass(k)->print_name_on(st);
+ }
+ if (TypeEntries::was_null_seen(k)) {
+ st->print(" (null seen)");
+ }
+}
+
+void ciTypeStackSlotEntries::print_data_on(outputStream* st) const {
+ for (int i = 0; i < _number_of_entries; i++) {
+ _pd->tab(st);
+ st->print("%d: stack (%u) ", i, stack_slot(i));
+ print_ciklass(st, type(i));
+ st->cr();
+ }
+}
+
+void ciReturnTypeEntry::print_data_on(outputStream* st) const {
+ _pd->tab(st);
+ st->print("ret ");
+ print_ciklass(st, type());
+ st->cr();
+}
+
+void ciCallTypeData::print_data_on(outputStream* st) const {
+ print_shared(st, "ciCallTypeData");
+ if (has_arguments()) {
+ tab(st, true);
+ st->print("argument types");
+ args()->print_data_on(st);
+ }
+ if (has_return()) {
+ tab(st, true);
+ st->print("return type");
+ ret()->print_data_on(st);
+ }
+}
+
+void ciReceiverTypeData::print_receiver_data_on(outputStream* st) const {
uint row;
int entries = 0;
for (row = 0; row < row_limit(); row++) {
@@ -493,13 +581,28 @@
}
}
-void ciReceiverTypeData::print_data_on(outputStream* st) {
+void ciReceiverTypeData::print_data_on(outputStream* st) const {
print_shared(st, "ciReceiverTypeData");
print_receiver_data_on(st);
}
-void ciVirtualCallData::print_data_on(outputStream* st) {
+void ciVirtualCallData::print_data_on(outputStream* st) const {
print_shared(st, "ciVirtualCallData");
rtd_super()->print_receiver_data_on(st);
}
+
+void ciVirtualCallTypeData::print_data_on(outputStream* st) const {
+ print_shared(st, "ciVirtualCallTypeData");
+ rtd_super()->print_receiver_data_on(st);
+ if (has_arguments()) {
+ tab(st, true);
+ st->print("argument types");
+ args()->print_data_on(st);
+ }
+ if (has_return()) {
+ tab(st, true);
+ st->print("return type");
+ ret()->print_data_on(st);
+ }
+}
#endif
diff --git a/hotspot/src/share/vm/ci/ciMethodData.hpp b/hotspot/src/share/vm/ci/ciMethodData.hpp
index ea650cb..b57ab6d 100644
--- a/hotspot/src/share/vm/ci/ciMethodData.hpp
+++ b/hotspot/src/share/vm/ci/ciMethodData.hpp
@@ -41,6 +41,8 @@
class ciArrayData;
class ciMultiBranchData;
class ciArgInfoData;
+class ciCallTypeData;
+class ciVirtualCallTypeData;
typedef ProfileData ciProfileData;
@@ -59,6 +61,103 @@
ciJumpData(DataLayout* layout) : JumpData(layout) {};
};
+class ciTypeEntries {
+protected:
+ static intptr_t translate_klass(intptr_t k) {
+ Klass* v = TypeEntries::valid_klass(k);
+ if (v != NULL) {
+ ciKlass* klass = CURRENT_ENV->get_klass(v);
+ return with_status(klass, k);
+ }
+ return with_status(NULL, k);
+ }
+
+public:
+ static ciKlass* valid_ciklass(intptr_t k) {
+ if (!TypeEntries::is_type_none(k) &&
+ !TypeEntries::is_type_unknown(k)) {
+ return (ciKlass*)TypeEntries::klass_part(k);
+ } else {
+ return NULL;
+ }
+ }
+
+ static intptr_t with_status(ciKlass* k, intptr_t in) {
+ return TypeEntries::with_status((intptr_t)k, in);
+ }
+
+#ifndef PRODUCT
+ static void print_ciklass(outputStream* st, intptr_t k);
+#endif
+};
+
+class ciTypeStackSlotEntries : public TypeStackSlotEntries, ciTypeEntries {
+public:
+ void translate_type_data_from(const TypeStackSlotEntries* args);
+
+ ciKlass* valid_type(int i) const {
+ return valid_ciklass(type(i));
+ }
+
+#ifndef PRODUCT
+ void print_data_on(outputStream* st) const;
+#endif
+};
+
+class ciReturnTypeEntry : public ReturnTypeEntry, ciTypeEntries {
+public:
+ void translate_type_data_from(const ReturnTypeEntry* ret);
+
+ ciKlass* valid_type() const {
+ return valid_ciklass(type());
+ }
+
+#ifndef PRODUCT
+ void print_data_on(outputStream* st) const;
+#endif
+};
+
+class ciCallTypeData : public CallTypeData {
+public:
+ ciCallTypeData(DataLayout* layout) : CallTypeData(layout) {}
+
+ ciTypeStackSlotEntries* args() const { return (ciTypeStackSlotEntries*)CallTypeData::args(); }
+ ciReturnTypeEntry* ret() const { return (ciReturnTypeEntry*)CallTypeData::ret(); }
+
+ void translate_type_data_from(const ProfileData* data) {
+ if (has_arguments()) {
+ args()->translate_type_data_from(data->as_CallTypeData()->args());
+ }
+ if (has_return()) {
+ ret()->translate_type_data_from(data->as_CallTypeData()->ret());
+ }
+ }
+
+ intptr_t argument_type(int i) const {
+ assert(has_arguments(), "no arg type profiling data");
+ return args()->type(i);
+ }
+
+ ciKlass* valid_argument_type(int i) const {
+ assert(has_arguments(), "no arg type profiling data");
+ return args()->valid_type(i);
+ }
+
+ intptr_t return_type() const {
+ assert(has_return(), "no ret type profiling data");
+ return ret()->type();
+ }
+
+ ciKlass* valid_return_type() const {
+ assert(has_return(), "no ret type profiling data");
+ return ret()->valid_type();
+ }
+
+#ifndef PRODUCT
+ void print_data_on(outputStream* st) const;
+#endif
+};
+
class ciReceiverTypeData : public ReceiverTypeData {
public:
ciReceiverTypeData(DataLayout* layout) : ReceiverTypeData(layout) {};
@@ -69,7 +168,7 @@
(intptr_t) recv);
}
- ciKlass* receiver(uint row) {
+ ciKlass* receiver(uint row) const {
assert((uint)row < row_limit(), "oob");
ciKlass* recv = (ciKlass*)intptr_at(receiver0_offset + row * receiver_type_row_cell_count);
assert(recv == NULL || recv->is_klass(), "wrong type");
@@ -77,19 +176,19 @@
}
// Copy & translate from oop based ReceiverTypeData
- virtual void translate_from(ProfileData* data) {
+ virtual void translate_from(const ProfileData* data) {
translate_receiver_data_from(data);
}
- void translate_receiver_data_from(ProfileData* data);
+ void translate_receiver_data_from(const ProfileData* data);
#ifndef PRODUCT
- void print_data_on(outputStream* st);
- void print_receiver_data_on(outputStream* st);
+ void print_data_on(outputStream* st) const;
+ void print_receiver_data_on(outputStream* st) const;
#endif
};
class ciVirtualCallData : public VirtualCallData {
// Fake multiple inheritance... It's a ciReceiverTypeData also.
- ciReceiverTypeData* rtd_super() { return (ciReceiverTypeData*) this; }
+ ciReceiverTypeData* rtd_super() const { return (ciReceiverTypeData*) this; }
public:
ciVirtualCallData(DataLayout* layout) : VirtualCallData(layout) {};
@@ -103,11 +202,65 @@
}
// Copy & translate from oop based VirtualCallData
- virtual void translate_from(ProfileData* data) {
+ virtual void translate_from(const ProfileData* data) {
rtd_super()->translate_receiver_data_from(data);
}
#ifndef PRODUCT
- void print_data_on(outputStream* st);
+ void print_data_on(outputStream* st) const;
+#endif
+};
+
+class ciVirtualCallTypeData : public VirtualCallTypeData {
+private:
+ // Fake multiple inheritance... It's a ciReceiverTypeData also.
+ ciReceiverTypeData* rtd_super() const { return (ciReceiverTypeData*) this; }
+public:
+ ciVirtualCallTypeData(DataLayout* layout) : VirtualCallTypeData(layout) {}
+
+ void set_receiver(uint row, ciKlass* recv) {
+ rtd_super()->set_receiver(row, recv);
+ }
+
+ ciKlass* receiver(uint row) const {
+ return rtd_super()->receiver(row);
+ }
+
+ ciTypeStackSlotEntries* args() const { return (ciTypeStackSlotEntries*)VirtualCallTypeData::args(); }
+ ciReturnTypeEntry* ret() const { return (ciReturnTypeEntry*)VirtualCallTypeData::ret(); }
+
+ // Copy & translate from oop based VirtualCallData
+ virtual void translate_from(const ProfileData* data) {
+ rtd_super()->translate_receiver_data_from(data);
+ if (has_arguments()) {
+ args()->translate_type_data_from(data->as_VirtualCallTypeData()->args());
+ }
+ if (has_return()) {
+ ret()->translate_type_data_from(data->as_VirtualCallTypeData()->ret());
+ }
+ }
+
+ intptr_t argument_type(int i) const {
+ assert(has_arguments(), "no arg type profiling data");
+ return args()->type(i);
+ }
+
+ ciKlass* valid_argument_type(int i) const {
+ assert(has_arguments(), "no arg type profiling data");
+ return args()->valid_type(i);
+ }
+
+ intptr_t return_type() const {
+ assert(has_return(), "no ret type profiling data");
+ return ret()->type();
+ }
+
+ ciKlass* valid_return_type() const {
+ assert(has_return(), "no ret type profiling data");
+ return ret()->valid_type();
+ }
+
+#ifndef PRODUCT
+ void print_data_on(outputStream* st) const;
#endif
};
@@ -232,8 +385,6 @@
public:
bool is_method_data() const { return true; }
- void set_mature() { _state = mature_state; }
-
bool is_empty() { return _state == empty_state; }
bool is_mature() { return _state == mature_state; }
@@ -249,6 +400,10 @@
// Also set the numer of loops and blocks in the method.
// Again, this is used to determine if a method is trivial.
void set_compilation_stats(short loops, short blocks);
+ // If the compiler finds a profiled type that is known statically
+ // for sure, set it in the MethodData
+ void set_argument_type(int bci, int i, ciKlass* k);
+ void set_return_type(int bci, ciKlass* k);
void load_data();
diff --git a/hotspot/src/share/vm/ci/ciObjArrayKlass.cpp b/hotspot/src/share/vm/ci/ciObjArrayKlass.cpp
index 3ccb54e..91f2ebc 100644
--- a/hotspot/src/share/vm/ci/ciObjArrayKlass.cpp
+++ b/hotspot/src/share/vm/ci/ciObjArrayKlass.cpp
@@ -179,3 +179,16 @@
ciObjArrayKlass* ciObjArrayKlass::make(ciKlass* element_klass) {
GUARDED_VM_ENTRY(return make_impl(element_klass);)
}
+
+ciKlass* ciObjArrayKlass::exact_klass() {
+ ciType* base = base_element_type();
+ if (base->is_instance_klass()) {
+ ciInstanceKlass* ik = base->as_instance_klass();
+ if (ik->exact_klass() != NULL) {
+ return this;
+ }
+ } else if (base->is_primitive_type()) {
+ return this;
+ }
+ return NULL;
+}
diff --git a/hotspot/src/share/vm/ci/ciObjArrayKlass.hpp b/hotspot/src/share/vm/ci/ciObjArrayKlass.hpp
index ffbf850..7a45e86 100644
--- a/hotspot/src/share/vm/ci/ciObjArrayKlass.hpp
+++ b/hotspot/src/share/vm/ci/ciObjArrayKlass.hpp
@@ -73,6 +73,8 @@
bool is_obj_array_klass() const { return true; }
static ciObjArrayKlass* make(ciKlass* element_klass);
+
+ virtual ciKlass* exact_klass();
};
#endif // SHARE_VM_CI_CIOBJARRAYKLASS_HPP
diff --git a/hotspot/src/share/vm/ci/ciReplay.cpp b/hotspot/src/share/vm/ci/ciReplay.cpp
index 837d529..3c8ccf9 100644
--- a/hotspot/src/share/vm/ci/ciReplay.cpp
+++ b/hotspot/src/share/vm/ci/ciReplay.cpp
@@ -965,14 +965,12 @@
tty->cr();
} else {
EXCEPTION_CONTEXT;
- MethodCounters* mcs = method->method_counters();
// m->_instructions_size = rec->instructions_size;
m->_instructions_size = -1;
m->_interpreter_invocation_count = rec->interpreter_invocation_count;
m->_interpreter_throwout_count = rec->interpreter_throwout_count;
- if (mcs == NULL) {
- mcs = Method::build_method_counters(method, CHECK_AND_CLEAR);
- }
+ MethodCounters* mcs = method->get_method_counters(CHECK_AND_CLEAR);
+ guarantee(mcs != NULL, "method counters allocation failed");
mcs->invocation_counter()->_counter = rec->invocation_counter;
mcs->backedge_counter()->_counter = rec->backedge_counter;
}
diff --git a/hotspot/src/share/vm/ci/ciStreams.hpp b/hotspot/src/share/vm/ci/ciStreams.hpp
index db46a4a..92a1a4a 100644
--- a/hotspot/src/share/vm/ci/ciStreams.hpp
+++ b/hotspot/src/share/vm/ci/ciStreams.hpp
@@ -277,11 +277,14 @@
class ciSignatureStream : public StackObj {
private:
ciSignature* _sig;
- int _pos;
+ int _pos;
+ // holder is a method's holder
+ ciKlass* _holder;
public:
- ciSignatureStream(ciSignature* signature) {
+ ciSignatureStream(ciSignature* signature, ciKlass* holder = NULL) {
_sig = signature;
_pos = 0;
+ _holder = holder;
}
bool at_return_type() { return _pos == _sig->count(); }
@@ -301,6 +304,23 @@
return _sig->type_at(_pos);
}
}
+
+ // next klass in the signature
+ ciKlass* next_klass() {
+ ciKlass* sig_k;
+ if (_holder != NULL) {
+ sig_k = _holder;
+ _holder = NULL;
+ } else {
+ while (!type()->is_klass()) {
+ next();
+ }
+ assert(!at_return_type(), "passed end of signature");
+ sig_k = type()->as_klass();
+ next();
+ }
+ return sig_k;
+ }
};
diff --git a/hotspot/src/share/vm/ci/ciTypeArrayKlass.hpp b/hotspot/src/share/vm/ci/ciTypeArrayKlass.hpp
index 5a57f74..b88aecb 100644
--- a/hotspot/src/share/vm/ci/ciTypeArrayKlass.hpp
+++ b/hotspot/src/share/vm/ci/ciTypeArrayKlass.hpp
@@ -57,6 +57,10 @@
// Make an array klass corresponding to the specified primitive type.
static ciTypeArrayKlass* make(BasicType type);
+
+ virtual ciKlass* exact_klass() {
+ return this;
+ }
};
#endif // SHARE_VM_CI_CITYPEARRAYKLASS_HPP
diff --git a/hotspot/src/share/vm/classfile/classFileParser.cpp b/hotspot/src/share/vm/classfile/classFileParser.cpp
index 6817f57..1774ac1 100644
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp
@@ -2197,8 +2197,8 @@
}
if (lvt_cnt == max_lvt_cnt) {
max_lvt_cnt <<= 1;
- REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt);
- REALLOC_RESOURCE_ARRAY(u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt);
+ localvariable_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt);
+ localvariable_table_start = REALLOC_RESOURCE_ARRAY(u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt);
}
localvariable_table_start[lvt_cnt] =
parse_localvariable_table(code_length,
@@ -2226,8 +2226,8 @@
// Parse local variable type table
if (lvtt_cnt == max_lvtt_cnt) {
max_lvtt_cnt <<= 1;
- REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt);
- REALLOC_RESOURCE_ARRAY(u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt);
+ localvariable_type_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt);
+ localvariable_type_table_start = REALLOC_RESOURCE_ARRAY(u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt);
}
localvariable_type_table_start[lvtt_cnt] =
parse_localvariable_table(code_length,
@@ -4483,9 +4483,8 @@
for (int index = 0; index < num_methods; index++) {
Method* m = methods->at(index);
- // skip private, static and <init> methods
- if ((!m->is_private()) &&
- (!m->is_static()) &&
+ // skip static and <init> methods
+ if ((!m->is_static()) &&
(m->name() != vmSymbols::object_initializer_name())) {
Symbol* name = m->name();
diff --git a/hotspot/src/share/vm/classfile/defaultMethods.cpp b/hotspot/src/share/vm/classfile/defaultMethods.cpp
index e4e05c5..6b3c910 100644
--- a/hotspot/src/share/vm/classfile/defaultMethods.cpp
+++ b/hotspot/src/share/vm/classfile/defaultMethods.cpp
@@ -857,7 +857,6 @@
m->set_max_locals(params);
m->constMethod()->set_stackmap_data(NULL);
m->set_code(code_start);
- m->set_force_inline(true);
return m;
}
diff --git a/hotspot/src/share/vm/classfile/verifier.cpp b/hotspot/src/share/vm/classfile/verifier.cpp
index d645e27..4dda936 100644
--- a/hotspot/src/share/vm/classfile/verifier.cpp
+++ b/hotspot/src/share/vm/classfile/verifier.cpp
@@ -2439,19 +2439,19 @@
&& !ref_class_type.equals(current_type())
&& !ref_class_type.equals(VerificationType::reference_type(
current_class()->super()->name()))) {
- bool subtype = ref_class_type.is_assignable_from(
- current_type(), this, CHECK_VERIFY(this));
+ bool subtype = false;
+ if (!current_class()->is_anonymous()) {
+ subtype = ref_class_type.is_assignable_from(
+ current_type(), this, CHECK_VERIFY(this));
+ } else {
+ subtype = ref_class_type.is_assignable_from(VerificationType::reference_type(
+ current_class()->host_klass()->name()), this, CHECK_VERIFY(this));
+ }
if (!subtype) {
- if (current_class()->is_anonymous()) {
- subtype = ref_class_type.is_assignable_from(VerificationType::reference_type(
- current_class()->host_klass()->name()), this, CHECK_VERIFY(this));
- }
- if (!subtype) {
- verify_error(ErrorContext::bad_code(bci),
- "Bad invokespecial instruction: "
- "current class isn't assignable to reference class.");
- return;
- }
+ verify_error(ErrorContext::bad_code(bci),
+ "Bad invokespecial instruction: "
+ "current class isn't assignable to reference class.");
+ return;
}
}
// Match method descriptor with operand stack
@@ -2470,17 +2470,13 @@
if (!current_class()->is_anonymous()) {
current_frame->pop_stack(current_type(), CHECK_VERIFY(this));
} else {
- // anonymous class invokespecial calls: either the
- // operand stack/objectref is a subtype of the current class OR
- // the objectref is a subtype of the host_klass of the current class
+ // anonymous class invokespecial calls: check if the
+ // objectref is a subtype of the host_klass of the current class
// to allow an anonymous class to reference methods in the host_klass
VerificationType top = current_frame->pop_stack(CHECK_VERIFY(this));
- bool subtype = current_type().is_assignable_from(top, this, CHECK_VERIFY(this));
- if (!subtype) {
- VerificationType hosttype =
- VerificationType::reference_type(current_class()->host_klass()->name());
- subtype = hosttype.is_assignable_from(top, this, CHECK_VERIFY(this));
- }
+ VerificationType hosttype =
+ VerificationType::reference_type(current_class()->host_klass()->name());
+ bool subtype = hosttype.is_assignable_from(top, this, CHECK_VERIFY(this));
if (!subtype) {
verify_error( ErrorContext::bad_type(current_frame->offset(),
current_frame->stack_top_ctx(),
diff --git a/hotspot/src/share/vm/code/codeBlob.cpp b/hotspot/src/share/vm/code/codeBlob.cpp
index e377f89..141bbae 100644
--- a/hotspot/src/share/vm/code/codeBlob.cpp
+++ b/hotspot/src/share/vm/code/codeBlob.cpp
@@ -245,8 +245,8 @@
}
-void* BufferBlob::operator new(size_t s, unsigned size) throw() {
- void* p = CodeCache::allocate(size);
+void* BufferBlob::operator new(size_t s, unsigned size, bool is_critical) throw() {
+ void* p = CodeCache::allocate(size, is_critical);
return p;
}
@@ -277,7 +277,10 @@
unsigned int size = allocation_size(cb, sizeof(AdapterBlob));
{
MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
- blob = new (size) AdapterBlob(size, cb);
+ // The parameter 'true' indicates a critical memory allocation.
+ // This means that CodeCacheMinimumFreeSpace is used, if necessary
+ const bool is_critical = true;
+ blob = new (size, is_critical) AdapterBlob(size, cb);
}
// Track memory usage statistic after releasing CodeCache_lock
MemoryService::track_code_cache_memory_usage();
@@ -299,7 +302,10 @@
size += round_to(buffer_size, oopSize);
{
MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
- blob = new (size) MethodHandlesAdapterBlob(size);
+ // The parameter 'true' indicates a critical memory allocation.
+ // This means that CodeCacheMinimumFreeSpace is used, if necessary
+ const bool is_critical = true;
+ blob = new (size, is_critical) MethodHandlesAdapterBlob(size);
}
// Track memory usage statistic after releasing CodeCache_lock
MemoryService::track_code_cache_memory_usage();
diff --git a/hotspot/src/share/vm/code/codeBlob.hpp b/hotspot/src/share/vm/code/codeBlob.hpp
index 6587b2d..db270f1 100644
--- a/hotspot/src/share/vm/code/codeBlob.hpp
+++ b/hotspot/src/share/vm/code/codeBlob.hpp
@@ -209,7 +209,7 @@
BufferBlob(const char* name, int size);
BufferBlob(const char* name, int size, CodeBuffer* cb);
- void* operator new(size_t s, unsigned size) throw();
+ void* operator new(size_t s, unsigned size, bool is_critical = false) throw();
public:
// Creation
@@ -253,7 +253,6 @@
class MethodHandlesAdapterBlob: public BufferBlob {
private:
MethodHandlesAdapterBlob(int size) : BufferBlob("MethodHandles adapters", size) {}
- MethodHandlesAdapterBlob(int size, CodeBuffer* cb) : BufferBlob("MethodHandles adapters", size, cb) {}
public:
// Creation
diff --git a/hotspot/src/share/vm/compiler/abstractCompiler.cpp b/hotspot/src/share/vm/compiler/abstractCompiler.cpp
index 942c168..3f452a1 100644
--- a/hotspot/src/share/vm/compiler/abstractCompiler.cpp
+++ b/hotspot/src/share/vm/compiler/abstractCompiler.cpp
@@ -24,41 +24,42 @@
#include "precompiled.hpp"
#include "compiler/abstractCompiler.hpp"
+#include "compiler/compileBroker.hpp"
#include "runtime/mutexLocker.hpp"
-void AbstractCompiler::initialize_runtimes(initializer f, volatile int* state) {
- if (*state != initialized) {
- // We are thread in native here...
- CompilerThread* thread = CompilerThread::current();
- bool do_initialization = false;
- {
- ThreadInVMfromNative tv(thread);
- ResetNoHandleMark rnhm;
- MutexLocker only_one(CompileThread_lock, thread);
- if ( *state == uninitialized) {
- do_initialization = true;
- *state = initializing;
- } else {
- while (*state == initializing ) {
- CompileThread_lock->wait();
- }
+bool AbstractCompiler::should_perform_init() {
+ if (_compiler_state != initialized) {
+ MutexLocker only_one(CompileThread_lock);
+
+ if (_compiler_state == uninitialized) {
+ _compiler_state = initializing;
+ return true;
+ } else {
+ while (_compiler_state == initializing) {
+ CompileThread_lock->wait();
}
}
- if (do_initialization) {
- // We can not hold any locks here since JVMTI events may call agents
-
- // Compiler(s) run as native
-
- (*f)();
-
- // To in_vm so we can use the lock
-
- ThreadInVMfromNative tv(thread);
- ResetNoHandleMark rnhm;
- MutexLocker only_one(CompileThread_lock, thread);
- assert(*state == initializing, "wrong state");
- *state = initialized;
- CompileThread_lock->notify_all();
- }
}
+ return false;
+}
+
+bool AbstractCompiler::should_perform_shutdown() {
+ // Since this method can be called by multiple threads, the lock ensures atomicity of
+ // decrementing '_num_compiler_threads' and the following operations.
+ MutexLocker only_one(CompileThread_lock);
+ _num_compiler_threads--;
+ assert (CompileBroker::is_compilation_disabled_forever(), "Must be set, otherwise thread waits forever");
+
+ // Only the last thread will perform shutdown operations
+ if (_num_compiler_threads == 0) {
+ return true;
+ }
+ return false;
+}
+
+void AbstractCompiler::set_state(int state) {
+ // Ensure that ste is only set by one thread at a time
+ MutexLocker only_one(CompileThread_lock);
+ _compiler_state = state;
+ CompileThread_lock->notify_all();
}
diff --git a/hotspot/src/share/vm/compiler/abstractCompiler.hpp b/hotspot/src/share/vm/compiler/abstractCompiler.hpp
index 96453e7..d150e8e 100644
--- a/hotspot/src/share/vm/compiler/abstractCompiler.hpp
+++ b/hotspot/src/share/vm/compiler/abstractCompiler.hpp
@@ -27,22 +27,25 @@
#include "ci/compilerInterface.hpp"
-typedef void (*initializer)(void);
-
class AbstractCompiler : public CHeapObj<mtCompiler> {
private:
- bool _is_initialized; // Mark whether compiler object is initialized
+ volatile int _num_compiler_threads;
protected:
+ volatile int _compiler_state;
// Used for tracking global state of compiler runtime initialization
- enum { uninitialized, initializing, initialized };
+ enum { uninitialized, initializing, initialized, failed, shut_down };
- // This method will call the initialization method "f" once (per compiler class/subclass)
- // and do so without holding any locks
- void initialize_runtimes(initializer f, volatile int* state);
+ // This method returns true for the first compiler thread that reaches that methods.
+ // This thread will initialize the compiler runtime.
+ bool should_perform_init();
public:
- AbstractCompiler() : _is_initialized(false) {}
+ AbstractCompiler() : _compiler_state(uninitialized), _num_compiler_threads(0) {}
+
+ // This function determines the compiler thread that will perform the
+ // shutdown of the corresponding compiler runtime.
+ bool should_perform_shutdown();
// Name of this compiler
virtual const char* name() = 0;
@@ -74,17 +77,18 @@
#endif // TIERED
// Customization
- virtual bool needs_stubs () = 0;
+ virtual void initialize () = 0;
- void mark_initialized() { _is_initialized = true; }
- bool is_initialized() { return _is_initialized; }
+ void set_num_compiler_threads(int num) { _num_compiler_threads = num; }
+ int num_compiler_threads() { return _num_compiler_threads; }
- virtual void initialize() = 0;
-
+ // Get/set state of compiler objects
+ bool is_initialized() { return _compiler_state == initialized; }
+ bool is_failed () { return _compiler_state == failed;}
+ void set_state (int state);
+ void set_shut_down () { set_state(shut_down); }
// Compilation entry point for methods
- virtual void compile_method(ciEnv* env,
- ciMethod* target,
- int entry_bci) {
+ virtual void compile_method(ciEnv* env, ciMethod* target, int entry_bci) {
ShouldNotReachHere();
}
diff --git a/hotspot/src/share/vm/compiler/compileBroker.cpp b/hotspot/src/share/vm/compiler/compileBroker.cpp
index 594c58b..cc86061 100644
--- a/hotspot/src/share/vm/compiler/compileBroker.cpp
+++ b/hotspot/src/share/vm/compiler/compileBroker.cpp
@@ -186,7 +186,7 @@
CompileQueue* CompileBroker::_c1_method_queue = NULL;
CompileTask* CompileBroker::_task_free_list = NULL;
-GrowableArray<CompilerThread*>* CompileBroker::_method_threads = NULL;
+GrowableArray<CompilerThread*>* CompileBroker::_compiler_threads = NULL;
class CompilationLog : public StringEventLog {
@@ -587,9 +587,6 @@
-// ------------------------------------------------------------------
-// CompileQueue::add
-//
// Add a CompileTask to a CompileQueue
void CompileQueue::add(CompileTask* task) {
assert(lock()->owned_by_self(), "must own lock");
@@ -626,6 +623,16 @@
lock()->notify_all();
}
+void CompileQueue::delete_all() {
+ assert(lock()->owned_by_self(), "must own lock");
+ if (_first != NULL) {
+ for (CompileTask* task = _first; task != NULL; task = task->next()) {
+ delete task;
+ }
+ _first = NULL;
+ }
+}
+
// ------------------------------------------------------------------
// CompileQueue::get
//
@@ -640,6 +647,11 @@
// case we perform code cache sweeps to free memory such that we can re-enable
// compilation.
while (_first == NULL) {
+ // Exit loop if compilation is disabled forever
+ if (CompileBroker::is_compilation_disabled_forever()) {
+ return NULL;
+ }
+
if (UseCodeCacheFlushing && !CompileBroker::should_compile_new_jobs()) {
// Wait a certain amount of time to possibly do another sweep.
// We must wait until stack scanning has happened so that we can
@@ -664,9 +676,17 @@
// remains unchanged. This behavior is desired, since we want to keep
// the stable state, i.e., we do not want to evict methods from the
// code cache if it is unnecessary.
- lock()->wait();
+ // We need a timed wait here, since compiler threads can exit if compilation
+ // is disabled forever. We use 5 seconds wait time; the exiting of compiler threads
+ // is not critical and we do not want idle compiler threads to wake up too often.
+ lock()->wait(!Mutex::_no_safepoint_check_flag, 5*1000);
}
}
+
+ if (CompileBroker::is_compilation_disabled_forever()) {
+ return NULL;
+ }
+
CompileTask* task = CompilationPolicy::policy()->select_task(this);
remove(task);
return task;
@@ -891,10 +911,8 @@
}
-
-// ------------------------------------------------------------------
-// CompileBroker::make_compiler_thread
-CompilerThread* CompileBroker::make_compiler_thread(const char* name, CompileQueue* queue, CompilerCounters* counters, TRAPS) {
+CompilerThread* CompileBroker::make_compiler_thread(const char* name, CompileQueue* queue, CompilerCounters* counters,
+ AbstractCompiler* comp, TRAPS) {
CompilerThread* compiler_thread = NULL;
Klass* k =
@@ -961,6 +979,7 @@
java_lang_Thread::set_daemon(thread_oop());
compiler_thread->set_threadObj(thread_oop());
+ compiler_thread->set_compiler(comp);
Threads::add(compiler_thread);
Thread::start(compiler_thread);
}
@@ -972,25 +991,24 @@
}
-// ------------------------------------------------------------------
-// CompileBroker::init_compiler_threads
-//
-// Initialize the compilation queue
void CompileBroker::init_compiler_threads(int c1_compiler_count, int c2_compiler_count) {
EXCEPTION_MARK;
#if !defined(ZERO) && !defined(SHARK)
assert(c2_compiler_count > 0 || c1_compiler_count > 0, "No compilers?");
#endif // !ZERO && !SHARK
+ // Initialize the compilation queue
if (c2_compiler_count > 0) {
_c2_method_queue = new CompileQueue("C2MethodQueue", MethodCompileQueue_lock);
+ _compilers[1]->set_num_compiler_threads(c2_compiler_count);
}
if (c1_compiler_count > 0) {
_c1_method_queue = new CompileQueue("C1MethodQueue", MethodCompileQueue_lock);
+ _compilers[0]->set_num_compiler_threads(c1_compiler_count);
}
int compiler_count = c1_compiler_count + c2_compiler_count;
- _method_threads =
+ _compiler_threads =
new (ResourceObj::C_HEAP, mtCompiler) GrowableArray<CompilerThread*>(compiler_count, true);
char name_buffer[256];
@@ -998,21 +1016,22 @@
// Create a name for our thread.
sprintf(name_buffer, "C2 CompilerThread%d", i);
CompilerCounters* counters = new CompilerCounters("compilerThread", i, CHECK);
- CompilerThread* new_thread = make_compiler_thread(name_buffer, _c2_method_queue, counters, CHECK);
- _method_threads->append(new_thread);
+ // Shark and C2
+ CompilerThread* new_thread = make_compiler_thread(name_buffer, _c2_method_queue, counters, _compilers[1], CHECK);
+ _compiler_threads->append(new_thread);
}
for (int i = c2_compiler_count; i < compiler_count; i++) {
// Create a name for our thread.
sprintf(name_buffer, "C1 CompilerThread%d", i);
CompilerCounters* counters = new CompilerCounters("compilerThread", i, CHECK);
- CompilerThread* new_thread = make_compiler_thread(name_buffer, _c1_method_queue, counters, CHECK);
- _method_threads->append(new_thread);
+ // C1
+ CompilerThread* new_thread = make_compiler_thread(name_buffer, _c1_method_queue, counters, _compilers[0], CHECK);
+ _compiler_threads->append(new_thread);
}
if (UsePerfData) {
- PerfDataManager::create_constant(SUN_CI, "threads", PerfData::U_Bytes,
- compiler_count, CHECK);
+ PerfDataManager::create_constant(SUN_CI, "threads", PerfData::U_Bytes, compiler_count, CHECK);
}
}
@@ -1029,27 +1048,6 @@
}
// ------------------------------------------------------------------
-// CompileBroker::is_idle
-bool CompileBroker::is_idle() {
- if (_c2_method_queue != NULL && !_c2_method_queue->is_empty()) {
- return false;
- } else if (_c1_method_queue != NULL && !_c1_method_queue->is_empty()) {
- return false;
- } else {
- int num_threads = _method_threads->length();
- for (int i=0; i<num_threads; i++) {
- if (_method_threads->at(i)->task() != NULL) {
- return false;
- }
- }
-
- // No pending or active compilations.
- return true;
- }
-}
-
-
-// ------------------------------------------------------------------
// CompileBroker::compile_method
//
// Request compilation of a method.
@@ -1551,6 +1549,101 @@
free_task(task);
}
+// Initialize compiler thread(s) + compiler object(s). The postcondition
+// of this function is that the compiler runtimes are initialized and that
+//compiler threads can start compiling.
+bool CompileBroker::init_compiler_runtime() {
+ CompilerThread* thread = CompilerThread::current();
+ AbstractCompiler* comp = thread->compiler();
+ // Final sanity check - the compiler object must exist
+ guarantee(comp != NULL, "Compiler object must exist");
+
+ int system_dictionary_modification_counter;
+ {
+ MutexLocker locker(Compile_lock, thread);
+ system_dictionary_modification_counter = SystemDictionary::number_of_modifications();
+ }
+
+ {
+ // Must switch to native to allocate ci_env
+ ThreadToNativeFromVM ttn(thread);
+ ciEnv ci_env(NULL, system_dictionary_modification_counter);
+ // Cache Jvmti state
+ ci_env.cache_jvmti_state();
+ // Cache DTrace flags
+ ci_env.cache_dtrace_flags();
+
+ // Switch back to VM state to do compiler initialization
+ ThreadInVMfromNative tv(thread);
+ ResetNoHandleMark rnhm;
+
+
+ if (!comp->is_shark()) {
+ // Perform per-thread and global initializations
+ comp->initialize();
+ }
+ }
+
+ if (comp->is_failed()) {
+ disable_compilation_forever();
+ // If compiler initialization failed, no compiler thread that is specific to a
+ // particular compiler runtime will ever start to compile methods.
+
+ shutdown_compiler_runtime(comp, thread);
+ return false;
+ }
+
+ // C1 specific check
+ if (comp->is_c1() && (thread->get_buffer_blob() == NULL)) {
+ warning("Initialization of %s thread failed (no space to run compilers)", thread->name());
+ return false;
+ }
+
+ return true;
+}
+
+// If C1 and/or C2 initialization failed, we shut down all compilation.
+// We do this to keep things simple. This can be changed if it ever turns out to be
+// a problem.
+void CompileBroker::shutdown_compiler_runtime(AbstractCompiler* comp, CompilerThread* thread) {
+ // Free buffer blob, if allocated
+ if (thread->get_buffer_blob() != NULL) {
+ MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+ CodeCache::free(thread->get_buffer_blob());
+ }
+
+ if (comp->should_perform_shutdown()) {
+ // There are two reasons for shutting down the compiler
+ // 1) compiler runtime initialization failed
+ // 2) The code cache is full and the following flag is set: -XX:-UseCodeCacheFlushing
+ warning("Shutting down compiler %s (no space to run compilers)", comp->name());
+
+ // Only one thread per compiler runtime object enters here
+ // Set state to shut down
+ comp->set_shut_down();
+
+ MutexLocker mu(MethodCompileQueue_lock, thread);
+ CompileQueue* queue;
+ if (_c1_method_queue != NULL) {
+ _c1_method_queue->delete_all();
+ queue = _c1_method_queue;
+ _c1_method_queue = NULL;
+ delete _c1_method_queue;
+ }
+
+ if (_c2_method_queue != NULL) {
+ _c2_method_queue->delete_all();
+ queue = _c2_method_queue;
+ _c2_method_queue = NULL;
+ delete _c2_method_queue;
+ }
+
+ // We could delete compiler runtimes also. However, there are references to
+ // the compiler runtime(s) (e.g., nmethod::is_compiled_by_c1()) which then
+ // fail. This can be done later if necessary.
+ }
+}
+
// ------------------------------------------------------------------
// CompileBroker::compiler_thread_loop
//
@@ -1558,7 +1651,6 @@
void CompileBroker::compiler_thread_loop() {
CompilerThread* thread = CompilerThread::current();
CompileQueue* queue = thread->queue();
-
// For the thread that initializes the ciObjectFactory
// this resource mark holds all the shared objects
ResourceMark rm;
@@ -1587,64 +1679,77 @@
log->end_elem();
}
- while (true) {
- {
- // We need this HandleMark to avoid leaking VM handles.
- HandleMark hm(thread);
+ // If compiler thread/runtime initialization fails, exit the compiler thread
+ if (!init_compiler_runtime()) {
+ return;
+ }
- if (CodeCache::unallocated_capacity() < CodeCacheMinimumFreeSpace) {
- // the code cache is really full
- handle_full_code_cache();
- }
+ // Poll for new compilation tasks as long as the JVM runs. Compilation
+ // should only be disabled if something went wrong while initializing the
+ // compiler runtimes. This, in turn, should not happen. The only known case
+ // when compiler runtime initialization fails is if there is not enough free
+ // space in the code cache to generate the necessary stubs, etc.
+ while (!is_compilation_disabled_forever()) {
+ // We need this HandleMark to avoid leaking VM handles.
+ HandleMark hm(thread);
- CompileTask* task = queue->get();
+ if (CodeCache::unallocated_capacity() < CodeCacheMinimumFreeSpace) {
+ // the code cache is really full
+ handle_full_code_cache();
+ }
- // Give compiler threads an extra quanta. They tend to be bursty and
- // this helps the compiler to finish up the job.
- if( CompilerThreadHintNoPreempt )
- os::hint_no_preempt();
+ CompileTask* task = queue->get();
+ if (task == NULL) {
+ continue;
+ }
- // trace per thread time and compile statistics
- CompilerCounters* counters = ((CompilerThread*)thread)->counters();
- PerfTraceTimedEvent(counters->time_counter(), counters->compile_counter());
+ // Give compiler threads an extra quanta. They tend to be bursty and
+ // this helps the compiler to finish up the job.
+ if( CompilerThreadHintNoPreempt )
+ os::hint_no_preempt();
- // Assign the task to the current thread. Mark this compilation
- // thread as active for the profiler.
- CompileTaskWrapper ctw(task);
- nmethodLocker result_handle; // (handle for the nmethod produced by this task)
- task->set_code_handle(&result_handle);
- methodHandle method(thread, task->method());
+ // trace per thread time and compile statistics
+ CompilerCounters* counters = ((CompilerThread*)thread)->counters();
+ PerfTraceTimedEvent(counters->time_counter(), counters->compile_counter());
- // Never compile a method if breakpoints are present in it
- if (method()->number_of_breakpoints() == 0) {
- // Compile the method.
- if ((UseCompiler || AlwaysCompileLoopMethods) && CompileBroker::should_compile_new_jobs()) {
+ // Assign the task to the current thread. Mark this compilation
+ // thread as active for the profiler.
+ CompileTaskWrapper ctw(task);
+ nmethodLocker result_handle; // (handle for the nmethod produced by this task)
+ task->set_code_handle(&result_handle);
+ methodHandle method(thread, task->method());
+
+ // Never compile a method if breakpoints are present in it
+ if (method()->number_of_breakpoints() == 0) {
+ // Compile the method.
+ if ((UseCompiler || AlwaysCompileLoopMethods) && CompileBroker::should_compile_new_jobs()) {
#ifdef COMPILER1
- // Allow repeating compilations for the purpose of benchmarking
- // compile speed. This is not useful for customers.
- if (CompilationRepeat != 0) {
- int compile_count = CompilationRepeat;
- while (compile_count > 0) {
- invoke_compiler_on_method(task);
- nmethod* nm = method->code();
- if (nm != NULL) {
- nm->make_zombie();
- method->clear_code();
- }
- compile_count--;
+ // Allow repeating compilations for the purpose of benchmarking
+ // compile speed. This is not useful for customers.
+ if (CompilationRepeat != 0) {
+ int compile_count = CompilationRepeat;
+ while (compile_count > 0) {
+ invoke_compiler_on_method(task);
+ nmethod* nm = method->code();
+ if (nm != NULL) {
+ nm->make_zombie();
+ method->clear_code();
}
+ compile_count--;
}
-#endif /* COMPILER1 */
- invoke_compiler_on_method(task);
- } else {
- // After compilation is disabled, remove remaining methods from queue
- method->clear_queued_for_compilation();
}
+#endif /* COMPILER1 */
+ invoke_compiler_on_method(task);
+ } else {
+ // After compilation is disabled, remove remaining methods from queue
+ method->clear_queued_for_compilation();
}
}
}
-}
+ // Shut down compiler runtime
+ shutdown_compiler_runtime(thread->compiler(), thread);
+}
// ------------------------------------------------------------------
// CompileBroker::init_compiler_thread_log
@@ -1953,11 +2058,14 @@
// Since code cache is full, immediately stop new compiles
if (CompileBroker::set_should_compile_new_jobs(CompileBroker::stop_compilation)) {
NMethodSweeper::log_sweep("disable_compiler");
+
+ // Switch to 'vm_state'. This ensures that possibly_sweep() can be called
+ // without having to consider the state in which the current thread is.
+ ThreadInVMfromUnknown in_vm;
NMethodSweeper::possibly_sweep();
}
} else {
- UseCompiler = false;
- AlwaysCompileLoopMethods = false;
+ disable_compilation_forever();
}
}
codecache_print(/* detailed= */ true);
diff --git a/hotspot/src/share/vm/compiler/compileBroker.hpp b/hotspot/src/share/vm/compiler/compileBroker.hpp
index f336497..19beeec 100644
--- a/hotspot/src/share/vm/compiler/compileBroker.hpp
+++ b/hotspot/src/share/vm/compiler/compileBroker.hpp
@@ -213,8 +213,12 @@
// Redefine Classes support
void mark_on_stack();
-
+ void delete_all();
void print();
+
+ ~CompileQueue() {
+ assert (is_empty(), " Compile Queue must be empty");
+ }
};
// CompileTaskWrapper
@@ -266,7 +270,7 @@
static CompileQueue* _c1_method_queue;
static CompileTask* _task_free_list;
- static GrowableArray<CompilerThread*>* _method_threads;
+ static GrowableArray<CompilerThread*>* _compiler_threads;
// performance counters
static PerfCounter* _perf_total_compilation;
@@ -311,7 +315,7 @@
static int _sum_nmethod_code_size;
static long _peak_compilation_time;
- static CompilerThread* make_compiler_thread(const char* name, CompileQueue* queue, CompilerCounters* counters, TRAPS);
+ static CompilerThread* make_compiler_thread(const char* name, CompileQueue* queue, CompilerCounters* counters, AbstractCompiler* comp, TRAPS);
static void init_compiler_threads(int c1_compiler_count, int c2_compiler_count);
static bool compilation_is_complete (methodHandle method, int osr_bci, int comp_level);
static bool compilation_is_prohibited(methodHandle method, int osr_bci, int comp_level);
@@ -351,6 +355,9 @@
if (is_c1_compile(comp_level)) return _c1_method_queue;
return NULL;
}
+ static bool init_compiler_runtime();
+ static void shutdown_compiler_runtime(AbstractCompiler* comp, CompilerThread* thread);
+
public:
enum {
// The entry bci used for non-OSR compilations.
@@ -378,9 +385,7 @@
const char* comment, Thread* thread);
static void compiler_thread_loop();
-
static uint get_compilation_id() { return _compilation_id; }
- static bool is_idle();
// Set _should_block.
// Call this from the VM, with Threads_lock held and a safepoint requested.
@@ -391,8 +396,9 @@
enum {
// Flags for toggling compiler activity
- stop_compilation = 0,
- run_compilation = 1
+ stop_compilation = 0,
+ run_compilation = 1,
+ shutdown_compilaton = 2
};
static bool should_compile_new_jobs() { return UseCompiler && (_should_compile_new_jobs == run_compilation); }
@@ -401,6 +407,16 @@
jint old = Atomic::cmpxchg(new_state, &_should_compile_new_jobs, 1-new_state);
return (old == (1-new_state));
}
+
+ static void disable_compilation_forever() {
+ UseCompiler = false;
+ AlwaysCompileLoopMethods = false;
+ Atomic::xchg(shutdown_compilaton, &_should_compile_new_jobs);
+ }
+
+ static bool is_compilation_disabled_forever() {
+ return _should_compile_new_jobs == shutdown_compilaton;
+ }
static void handle_full_code_cache();
// Return total compilation ticks
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
index cac114b..92eee2e 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
@@ -344,6 +344,10 @@
}
}
+ if (FLAG_IS_CMDLINE(NewSize) && FLAG_IS_CMDLINE(MaxNewSize) && NewSize > MaxNewSize) {
+ vm_exit_during_initialization("Initial young gen size set larger than the maximum young gen size");
+ }
+
if (FLAG_IS_CMDLINE(NewSize)) {
_min_desired_young_length = MAX2((uint) (NewSize / HeapRegion::GrainBytes),
1U);
diff --git a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp b/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp
index 31e6bdd..6f53503 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp
@@ -211,7 +211,7 @@
// a GC that freed space for the allocation.
if (!MetadataAllocationFailALot) {
_result = _loader_data->metaspace_non_null()->allocate(_size, _mdtype);
- }
+ }
if (_result == NULL) {
if (UseConcMarkSweepGC) {
@@ -223,9 +223,7 @@
_loader_data->metaspace_non_null()->expand_and_allocate(_size, _mdtype);
}
if (_result == NULL) {
- // Don't clear the soft refs. This GC is for reclaiming metadata
- // and is unrelated to the fullness of the Java heap which should
- // be the criteria for clearing SoftReferences.
+ // Don't clear the soft refs yet.
if (Verbose && PrintGCDetails && UseConcMarkSweepGC) {
gclog_or_tty->print_cr("\nCMS full GC for Metaspace");
}
@@ -235,7 +233,7 @@
_result =
_loader_data->metaspace_non_null()->allocate(_size, _mdtype);
}
- if (_result == NULL && !UseConcMarkSweepGC /* CMS already tried */) {
+ if (_result == NULL) {
// If still failing, allow the Metaspace to expand.
// See delta_capacity_until_GC() for explanation of the
// amount of the expansion.
@@ -243,7 +241,16 @@
// or a MaxMetaspaceSize has been specified on the command line.
_result =
_loader_data->metaspace_non_null()->expand_and_allocate(_size, _mdtype);
-
+ if (_result == NULL) {
+ // If expansion failed, do a last-ditch collection and try allocating
+ // again. A last-ditch collection will clear softrefs. This
+ // behavior is similar to the last-ditch collection done for perm
+ // gen when it was full and a collection for failed allocation
+ // did not free perm gen space.
+ heap->collect_as_vm_thread(GCCause::_last_ditch_collection);
+ _result =
+ _loader_data->metaspace_non_null()->allocate(_size, _mdtype);
+ }
}
if (Verbose && PrintGCDetails && _result == NULL) {
gclog_or_tty->print_cr("\nAfter Metaspace GC failed to allocate size "
diff --git a/hotspot/src/share/vm/interpreter/linkResolver.cpp b/hotspot/src/share/vm/interpreter/linkResolver.cpp
index 9cebf91..e0df093 100644
--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -158,6 +159,22 @@
index = vt->index_of_miranda(resolved_method->name(),
resolved_method->signature());
kind = CallInfo::vtable_call;
+ } else if (resolved_method->has_vtable_index()) {
+ // Can occur if an interface redeclares a method of Object.
+
+#ifdef ASSERT
+ // Ensure that this is really the case.
+ KlassHandle object_klass = SystemDictionary::Object_klass();
+ Method * object_resolved_method = object_klass()->vtable()->method_at(index);
+ assert(object_resolved_method->name() == resolved_method->name(),
+ err_msg("Object and interface method names should match at vtable index %d, %s != %s",
+ index, object_resolved_method->name()->as_C_string(), resolved_method->name()->as_C_string()));
+ assert(object_resolved_method->signature() == resolved_method->signature(),
+ err_msg("Object and interface method signatures should match at vtable index %d, %s != %s",
+ index, object_resolved_method->signature()->as_C_string(), resolved_method->signature()->as_C_string()));
+#endif // ASSERT
+
+ kind = CallInfo::vtable_call;
} else {
// A regular interface call.
kind = CallInfo::itable_call;
@@ -454,7 +471,7 @@
Symbol* method_name = vmSymbols::invoke_name();
Symbol* method_signature = pool->signature_ref_at(index);
KlassHandle current_klass(THREAD, pool->pool_holder());
- resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, CHECK);
+ resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, false, CHECK);
return;
}
@@ -476,22 +493,34 @@
if (code == Bytecodes::_invokeinterface) {
resolve_interface_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, CHECK);
+ } else if (code == Bytecodes::_invokevirtual) {
+ resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, true, CHECK);
} else {
- resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, CHECK);
+ resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, true, false, CHECK);
}
}
void LinkResolver::resolve_method(methodHandle& resolved_method, KlassHandle resolved_klass,
Symbol* method_name, Symbol* method_signature,
- KlassHandle current_klass, bool check_access, TRAPS) {
+ KlassHandle current_klass, bool check_access,
+ bool require_methodref, TRAPS) {
Handle nested_exception;
- // 1. lookup method in resolved klass and its super klasses
+ // 1. check if methodref required, that resolved_klass is not interfacemethodref
+ if (require_methodref && resolved_klass->is_interface()) {
+ ResourceMark rm(THREAD);
+ char buf[200];
+ jio_snprintf(buf, sizeof(buf), "Found interface %s, but class was expected",
+ resolved_klass()->external_name());
+ THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
+ }
+
+ // 2. lookup method in resolved klass and its super klasses
lookup_method_in_klasses(resolved_method, resolved_klass, method_name, method_signature, CHECK);
if (resolved_method.is_null()) { // not found in the class hierarchy
- // 2. lookup method in all the interfaces implemented by the resolved klass
+ // 3. lookup method in all the interfaces implemented by the resolved klass
lookup_method_in_interfaces(resolved_method, resolved_klass, method_name, method_signature, CHECK);
if (resolved_method.is_null()) {
@@ -505,7 +534,7 @@
}
if (resolved_method.is_null()) {
- // 3. method lookup failed
+ // 4. method lookup failed
ResourceMark rm(THREAD);
THROW_MSG_CAUSE(vmSymbols::java_lang_NoSuchMethodError(),
Method::name_and_sig_as_C_string(resolved_klass(),
@@ -515,15 +544,6 @@
}
}
- // 4. check if klass is not interface
- if (resolved_klass->is_interface() && resolved_method->is_abstract()) {
- ResourceMark rm(THREAD);
- char buf[200];
- jio_snprintf(buf, sizeof(buf), "Found interface %s, but class was expected",
- resolved_klass()->external_name());
- THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
- }
-
// 5. check if method is concrete
if (resolved_method->is_abstract() && !resolved_klass->is_abstract()) {
ResourceMark rm(THREAD);
@@ -833,7 +853,7 @@
Symbol* method_name, Symbol* method_signature,
KlassHandle current_klass, bool check_access, TRAPS) {
- resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK);
+ resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, false, CHECK);
assert(resolved_method->name() != vmSymbols::class_initializer_name(), "should have been checked in verifier");
// check if static
@@ -867,7 +887,7 @@
// and the selected method is recalculated relative to the direct superclass
// superinterface.method, which explicitly does not check shadowing
- resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK);
+ resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, false, CHECK);
// check if method name is <init>, that it is found in same klass as static type
if (resolved_method->name() == vmSymbols::object_initializer_name() &&
@@ -1013,7 +1033,7 @@
Symbol* method_name, Symbol* method_signature,
KlassHandle current_klass, bool check_access, TRAPS) {
// normal method resolution
- resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, CHECK);
+ resolve_method(resolved_method, resolved_klass, method_name, method_signature, current_klass, check_access, true, CHECK);
assert(resolved_method->name() != vmSymbols::object_initializer_name(), "should have been checked in verifier");
assert(resolved_method->name() != vmSymbols::class_initializer_name (), "should have been checked in verifier");
diff --git a/hotspot/src/share/vm/interpreter/linkResolver.hpp b/hotspot/src/share/vm/interpreter/linkResolver.hpp
index 55a4ddf..339cb92 100644
--- a/hotspot/src/share/vm/interpreter/linkResolver.hpp
+++ b/hotspot/src/share/vm/interpreter/linkResolver.hpp
@@ -136,7 +136,7 @@
static void resolve_pool (KlassHandle& resolved_klass, Symbol*& method_name, Symbol*& method_signature, KlassHandle& current_klass, constantPoolHandle pool, int index, TRAPS);
static void resolve_interface_method(methodHandle& resolved_method, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS);
- static void resolve_method (methodHandle& resolved_method, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS);
+ static void resolve_method (methodHandle& resolved_method, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, bool require_methodref, TRAPS);
static void linktime_resolve_static_method (methodHandle& resolved_method, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS);
static void linktime_resolve_special_method (methodHandle& resolved_method, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS);
diff --git a/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp b/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp
index bfe1d1b..30b0382 100644
--- a/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp
+++ b/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp
@@ -28,7 +28,6 @@
#include "memory/binaryTreeDictionary.hpp"
#include "memory/freeList.hpp"
#include "memory/freeBlockDictionary.hpp"
-#include "memory/metablock.hpp"
#include "memory/metachunk.hpp"
#include "runtime/globals.hpp"
#include "utilities/ostream.hpp"
diff --git a/hotspot/src/share/vm/memory/freeBlockDictionary.cpp b/hotspot/src/share/vm/memory/freeBlockDictionary.cpp
index 713036e..7cb2b17 100644
--- a/hotspot/src/share/vm/memory/freeBlockDictionary.cpp
+++ b/hotspot/src/share/vm/memory/freeBlockDictionary.cpp
@@ -28,7 +28,6 @@
#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
#endif // INCLUDE_ALL_GCS
#include "memory/freeBlockDictionary.hpp"
-#include "memory/metablock.hpp"
#include "memory/metachunk.hpp"
#include "runtime/thread.inline.hpp"
#include "utilities/macros.hpp"
diff --git a/hotspot/src/share/vm/memory/freeList.cpp b/hotspot/src/share/vm/memory/freeList.cpp
index 385451c..78785e8 100644
--- a/hotspot/src/share/vm/memory/freeList.cpp
+++ b/hotspot/src/share/vm/memory/freeList.cpp
@@ -25,7 +25,6 @@
#include "precompiled.hpp"
#include "memory/freeBlockDictionary.hpp"
#include "memory/freeList.hpp"
-#include "memory/metablock.hpp"
#include "memory/metachunk.hpp"
#include "memory/sharedHeap.hpp"
#include "runtime/globals.hpp"
diff --git a/hotspot/src/share/vm/memory/metablock.cpp b/hotspot/src/share/vm/memory/metablock.cpp
deleted file mode 100644
index b6c6947..0000000
--- a/hotspot/src/share/vm/memory/metablock.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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.
- *
- */
-
-#include "precompiled.hpp"
-#include "memory/allocation.hpp"
-#include "memory/metablock.hpp"
-#include "utilities/copy.hpp"
-#include "utilities/debug.hpp"
-
-// Blocks of space for metadata are allocated out of Metachunks.
-//
-// Metachunk are allocated out of MetadataVirtualspaces and once
-// allocated there is no explicit link between a Metachunk and
-// the MetadataVirtualspaces from which it was allocated.
-//
-// Each SpaceManager maintains a
-// list of the chunks it is using and the current chunk. The current
-// chunk is the chunk from which allocations are done. Space freed in
-// a chunk is placed on the free list of blocks (BlockFreelist) and
-// reused from there.
-//
-// Future modification
-//
-// The Metachunk can conceivable be replaced by the Chunk in
-// allocation.hpp. Note that the latter Chunk is the space for
-// allocation (allocations from the chunk are out of the space in
-// the Chunk after the header for the Chunk) where as Metachunks
-// point to space in a VirtualSpace. To replace Metachunks with
-// Chunks, change Chunks so that they can be allocated out of a VirtualSpace.
-size_t Metablock::_min_block_byte_size = sizeof(Metablock);
-
-// New blocks returned by the Metaspace are zero initialized.
-// We should fix the constructors to not assume this instead.
-Metablock* Metablock::initialize(MetaWord* p, size_t word_size) {
- if (p == NULL) {
- return NULL;
- }
-
- Metablock* result = (Metablock*) p;
-
- // Clear the memory
- Copy::fill_to_aligned_words((HeapWord*)result, word_size);
-#ifdef ASSERT
- result->set_word_size(word_size);
-#endif
- return result;
-}
diff --git a/hotspot/src/share/vm/memory/metablock.hpp b/hotspot/src/share/vm/memory/metablock.hpp
deleted file mode 100644
index fa4c6c0..0000000
--- a/hotspot/src/share/vm/memory/metablock.hpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-#ifndef SHARE_VM_MEMORY_METABLOCK_HPP
-#define SHARE_VM_MEMORY_METABLOCK_HPP
-
-// Metablock are the unit of allocation from a Chunk. It is initialized
-// with the size of the requested allocation. That size is overwritten
-// once the allocation returns.
-//
-// A Metablock may be reused by its SpaceManager but are never moved between
-// SpaceManagers. There is no explicit link to the Metachunk
-// from which it was allocated. Metablock may be deallocated and
-// put on a freelist but the space is never freed, rather
-// the Metachunk it is a part of will be deallocated when it's
-// associated class loader is collected.
-
-class Metablock VALUE_OBJ_CLASS_SPEC {
- friend class VMStructs;
- private:
- // Used to align the allocation (see below).
- union block_t {
- void* _data[3];
- struct header_t {
- size_t _word_size;
- Metablock* _next;
- Metablock* _prev;
- } _header;
- } _block;
- static size_t _min_block_byte_size;
-
- typedef union block_t Block;
- typedef struct header_t Header;
- const Block* block() const { return &_block; }
- const Block::header_t* header() const { return &(block()->_header); }
- public:
-
- static Metablock* initialize(MetaWord* p, size_t word_size);
-
- // This places the body of the block at a 2 word boundary
- // because every block starts on a 2 word boundary. Work out
- // how to make the body on a 2 word boundary if the block
- // starts on a arbitrary boundary. JJJ
-
- size_t word_size() const { return header()->_word_size; }
- void set_word_size(size_t v) { _block._header._word_size = v; }
- size_t size() const volatile { return _block._header._word_size; }
- void set_size(size_t v) { _block._header._word_size = v; }
- Metablock* next() const { return header()->_next; }
- void set_next(Metablock* v) { _block._header._next = v; }
- Metablock* prev() const { return header()->_prev; }
- void set_prev(Metablock* v) { _block._header._prev = v; }
-
- static size_t min_block_byte_size() { return _min_block_byte_size; }
-
- bool is_free() { return header()->_word_size != 0; }
- void clear_next() { set_next(NULL); }
- void link_prev(Metablock* ptr) { set_prev(ptr); }
- uintptr_t* end() { return ((uintptr_t*) this) + size(); }
- bool cantCoalesce() const { return false; }
- void link_next(Metablock* ptr) { set_next(ptr); }
- void link_after(Metablock* ptr){
- link_next(ptr);
- if (ptr != NULL) ptr->link_prev(this);
- }
-
- // Should not be needed in a free list of Metablocks
- void markNotFree() { ShouldNotReachHere(); }
-
- // Debug support
-#ifdef ASSERT
- void* prev_addr() const { return (void*)&_block._header._prev; }
- void* next_addr() const { return (void*)&_block._header._next; }
- void* size_addr() const { return (void*)&_block._header._word_size; }
-#endif
- bool verify_chunk_in_free_list(Metablock* tc) const { return true; }
- bool verify_par_locked() { return true; }
-
- void assert_is_mangled() const {/* Don't check "\*/}
-};
-#endif // SHARE_VM_MEMORY_METABLOCK_HPP
diff --git a/hotspot/src/share/vm/memory/metachunk.cpp b/hotspot/src/share/vm/memory/metachunk.cpp
index 0ac4ced..81a1f8f 100644
--- a/hotspot/src/share/vm/memory/metachunk.cpp
+++ b/hotspot/src/share/vm/memory/metachunk.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, 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
@@ -29,42 +29,39 @@
#include "utilities/debug.hpp"
class VirtualSpaceNode;
-//
-// Future modification
-//
-// The Metachunk can conceivable be replaced by the Chunk in
-// allocation.hpp. Note that the latter Chunk is the space for
-// allocation (allocations from the chunk are out of the space in
-// the Chunk after the header for the Chunk) where as Metachunks
-// point to space in a VirtualSpace. To replace Metachunks with
-// Chunks, change Chunks so that they can be allocated out of a VirtualSpace.
const size_t metadata_chunk_initialize = 0xf7f7f7f7;
-size_t Metachunk::_overhead =
- Chunk::aligned_overhead_size(sizeof(Metachunk)) / BytesPerWord;
+size_t Metachunk::object_alignment() {
+ // Must align pointers and sizes to 8,
+ // so that 64 bit types get correctly aligned.
+ const size_t alignment = 8;
+
+ // Make sure that the Klass alignment also agree.
+ STATIC_ASSERT(alignment == (size_t)KlassAlignmentInBytes);
+
+ return alignment;
+}
+
+size_t Metachunk::overhead() {
+ return align_size_up(sizeof(Metachunk), object_alignment()) / BytesPerWord;
+}
// Metachunk methods
Metachunk::Metachunk(size_t word_size,
- VirtualSpaceNode* container) :
- _word_size(word_size),
- _bottom(NULL),
- _end(NULL),
+ VirtualSpaceNode* container)
+ : Metabase<Metachunk>(word_size),
_top(NULL),
- _next(NULL),
- _prev(NULL),
_container(container)
{
- _bottom = (MetaWord*)this;
- _top = (MetaWord*)this + _overhead;
- _end = (MetaWord*)this + word_size;
+ _top = initial_top();
#ifdef ASSERT
- set_is_free(false);
+ set_is_tagged_free(false);
size_t data_word_size = pointer_delta(end(),
- top(),
+ _top,
sizeof(MetaWord));
- Copy::fill_to_words((HeapWord*) top(),
+ Copy::fill_to_words((HeapWord*)_top,
data_word_size,
metadata_chunk_initialize);
#endif
@@ -82,22 +79,18 @@
// _bottom points to the start of the chunk including the overhead.
size_t Metachunk::used_word_size() const {
- return pointer_delta(_top, _bottom, sizeof(MetaWord));
+ return pointer_delta(_top, bottom(), sizeof(MetaWord));
}
size_t Metachunk::free_word_size() const {
- return pointer_delta(_end, _top, sizeof(MetaWord));
-}
-
-size_t Metachunk::capacity_word_size() const {
- return pointer_delta(_end, _bottom, sizeof(MetaWord));
+ return pointer_delta(end(), _top, sizeof(MetaWord));
}
void Metachunk::print_on(outputStream* st) const {
st->print_cr("Metachunk:"
" bottom " PTR_FORMAT " top " PTR_FORMAT
" end " PTR_FORMAT " size " SIZE_FORMAT,
- bottom(), top(), end(), word_size());
+ bottom(), _top, end(), word_size());
if (Verbose) {
st->print_cr(" used " SIZE_FORMAT " free " SIZE_FORMAT,
used_word_size(), free_word_size());
@@ -109,8 +102,8 @@
// Mangle the payload of the chunk and not the links that
// maintain list of chunks.
HeapWord* start = (HeapWord*)(bottom() + overhead());
- size_t word_size = capacity_word_size() - overhead();
- Copy::fill_to_words(start, word_size, metadata_chunk_initialize);
+ size_t size = word_size() - overhead();
+ Copy::fill_to_words(start, size, metadata_chunk_initialize);
}
#endif // PRODUCT
@@ -118,9 +111,68 @@
#ifdef ASSERT
// Cannot walk through the blocks unless the blocks have
// headers with sizes.
- assert(_bottom <= _top &&
- _top <= _end,
+ assert(bottom() <= _top &&
+ _top <= (MetaWord*)end(),
"Chunk has been smashed");
#endif
return;
}
+
+/////////////// Unit tests ///////////////
+
+#ifndef PRODUCT
+
+class TestMetachunk {
+ public:
+ static void test() {
+ size_t size = 2 * 1024 * 1024;
+ void* memory = malloc(size);
+ assert(memory != NULL, "Failed to malloc 2MB");
+
+ Metachunk* metachunk = ::new (memory) Metachunk(size / BytesPerWord, NULL);
+
+ assert(metachunk->bottom() == (MetaWord*)metachunk, "assert");
+ assert(metachunk->end() == (uintptr_t*)metachunk + metachunk->size(), "assert");
+
+ // Check sizes
+ assert(metachunk->size() == metachunk->word_size(), "assert");
+ assert(metachunk->word_size() == pointer_delta(metachunk->end(), metachunk->bottom(),
+ sizeof(MetaWord*)), "assert");
+
+ // Check usage
+ assert(metachunk->used_word_size() == metachunk->overhead(), "assert");
+ assert(metachunk->free_word_size() == metachunk->word_size() - metachunk->used_word_size(), "assert");
+ assert(metachunk->top() == metachunk->initial_top(), "assert");
+ assert(metachunk->is_empty(), "assert");
+
+ // Allocate
+ size_t alloc_size = 64; // Words
+ assert(is_size_aligned(alloc_size, Metachunk::object_alignment()), "assert");
+
+ MetaWord* mem = metachunk->allocate(alloc_size);
+
+ // Check post alloc
+ assert(mem == metachunk->initial_top(), "assert");
+ assert(mem + alloc_size == metachunk->top(), "assert");
+ assert(metachunk->used_word_size() == metachunk->overhead() + alloc_size, "assert");
+ assert(metachunk->free_word_size() == metachunk->word_size() - metachunk->used_word_size(), "assert");
+ assert(!metachunk->is_empty(), "assert");
+
+ // Clear chunk
+ metachunk->reset_empty();
+
+ // Check post clear
+ assert(metachunk->used_word_size() == metachunk->overhead(), "assert");
+ assert(metachunk->free_word_size() == metachunk->word_size() - metachunk->used_word_size(), "assert");
+ assert(metachunk->top() == metachunk->initial_top(), "assert");
+ assert(metachunk->is_empty(), "assert");
+
+ free(memory);
+ }
+};
+
+void TestMetachunk_test() {
+ TestMetachunk::test();
+}
+
+#endif
diff --git a/hotspot/src/share/vm/memory/metachunk.hpp b/hotspot/src/share/vm/memory/metachunk.hpp
index ff237ab..3bd4d15 100644
--- a/hotspot/src/share/vm/memory/metachunk.hpp
+++ b/hotspot/src/share/vm/memory/metachunk.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, 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
@@ -24,89 +24,44 @@
#ifndef SHARE_VM_MEMORY_METACHUNK_HPP
#define SHARE_VM_MEMORY_METACHUNK_HPP
-// Metachunk - Quantum of allocation from a Virtualspace
-// Metachunks are reused (when freed are put on a global freelist) and
-// have no permanent association to a SpaceManager.
-
-// +--------------+ <- end
-// | | --+ ---+
-// | | | free |
-// | | | |
-// | | | | capacity
-// | | | |
-// | | <- top --+ |
-// | | ---+ |
-// | | | used |
-// | | | |
-// | | | |
-// +--------------+ <- bottom ---+ ---+
+#include "memory/allocation.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/globalDefinitions.hpp"
class VirtualSpaceNode;
-class Metachunk VALUE_OBJ_CLASS_SPEC {
- // link to support lists of chunks
- Metachunk* _next;
- Metachunk* _prev;
- VirtualSpaceNode* _container;
-
- MetaWord* _bottom;
- MetaWord* _end;
- MetaWord* _top;
+// Super class of Metablock and Metachunk to allow them to
+// be put on the FreeList and in the BinaryTreeDictionary.
+template <class T>
+class Metabase VALUE_OBJ_CLASS_SPEC {
size_t _word_size;
- // Used in a guarantee() so included in the Product builds
- // even through it is only for debugging.
- bool _is_free;
+ T* _next;
+ T* _prev;
- // Metachunks are allocated out of a MetadataVirtualSpace and
- // and use some of its space to describe itself (plus alignment
- // considerations). Metadata is allocated in the rest of the chunk.
- // This size is the overhead of maintaining the Metachunk within
- // the space.
- static size_t _overhead;
+ protected:
+ Metabase(size_t word_size) : _word_size(word_size), _next(NULL), _prev(NULL) {}
public:
- Metachunk(size_t word_size , VirtualSpaceNode* container);
+ T* next() const { return _next; }
+ T* prev() const { return _prev; }
+ void set_next(T* v) { _next = v; assert(v != this, "Boom");}
+ void set_prev(T* v) { _prev = v; assert(v != this, "Boom");}
+ void clear_next() { set_next(NULL); }
+ void clear_prev() { set_prev(NULL); }
- // Used to add a Metachunk to a list of Metachunks
- void set_next(Metachunk* v) { _next = v; assert(v != this, "Boom");}
- void set_prev(Metachunk* v) { _prev = v; assert(v != this, "Boom");}
- void set_container(VirtualSpaceNode* v) { _container = v; }
-
- MetaWord* allocate(size_t word_size);
-
- // Accessors
- Metachunk* next() const { return _next; }
- Metachunk* prev() const { return _prev; }
- VirtualSpaceNode* container() const { return _container; }
- MetaWord* bottom() const { return _bottom; }
- MetaWord* end() const { return _end; }
- MetaWord* top() const { return _top; }
- size_t word_size() const { return _word_size; }
size_t size() const volatile { return _word_size; }
void set_size(size_t v) { _word_size = v; }
- bool is_free() { return _is_free; }
- void set_is_free(bool v) { _is_free = v; }
- static size_t overhead() { return _overhead; }
- void clear_next() { set_next(NULL); }
- void link_prev(Metachunk* ptr) { set_prev(ptr); }
- uintptr_t* end() { return ((uintptr_t*) this) + size(); }
- bool cantCoalesce() const { return false; }
- void link_next(Metachunk* ptr) { set_next(ptr); }
- void link_after(Metachunk* ptr){
+
+ void link_next(T* ptr) { set_next(ptr); }
+ void link_prev(T* ptr) { set_prev(ptr); }
+ void link_after(T* ptr) {
link_next(ptr);
- if (ptr != NULL) ptr->link_prev(this);
+ if (ptr != NULL) ptr->link_prev((T*)this);
}
- // Reset top to bottom so chunk can be reused.
- void reset_empty() { _top = (_bottom + _overhead); _next = NULL; _prev = NULL; }
- bool is_empty() { return _top == (_bottom + _overhead); }
+ uintptr_t* end() const { return ((uintptr_t*) this) + size(); }
- // used (has been allocated)
- // free (available for future allocations)
- // capacity (total size of chunk)
- size_t used_word_size() const;
- size_t free_word_size() const;
- size_t capacity_word_size()const;
+ bool cantCoalesce() const { return false; }
// Debug support
#ifdef ASSERT
@@ -114,14 +69,99 @@
void* next_addr() const { return (void*)&_next; }
void* size_addr() const { return (void*)&_word_size; }
#endif
- bool verify_chunk_in_free_list(Metachunk* tc) const { return true; }
+ bool verify_chunk_in_free_list(T* tc) const { return true; }
bool verify_par_locked() { return true; }
void assert_is_mangled() const {/* Don't check "\*/}
+ bool is_free() { return true; }
+};
+
+// Metachunk - Quantum of allocation from a Virtualspace
+// Metachunks are reused (when freed are put on a global freelist) and
+// have no permanent association to a SpaceManager.
+
+// +--------------+ <- end --+ --+
+// | | | |
+// | | | free |
+// | | | |
+// | | | | size | capacity
+// | | | |
+// | | <- top -- + |
+// | | | |
+// | | | used |
+// | | | |
+// | | | |
+// +--------------+ <- bottom --+ --+
+
+class Metachunk : public Metabase<Metachunk> {
+ friend class TestMetachunk;
+ // The VirtualSpaceNode containing this chunk.
+ VirtualSpaceNode* _container;
+
+ // Current allocation top.
+ MetaWord* _top;
+
+ DEBUG_ONLY(bool _is_tagged_free;)
+
+ MetaWord* initial_top() const { return (MetaWord*)this + overhead(); }
+ MetaWord* top() const { return _top; }
+
+ public:
+ // Metachunks are allocated out of a MetadataVirtualSpace and
+ // and use some of its space to describe itself (plus alignment
+ // considerations). Metadata is allocated in the rest of the chunk.
+ // This size is the overhead of maintaining the Metachunk within
+ // the space.
+
+ // Alignment of each allocation in the chunks.
+ static size_t object_alignment();
+
+ // Size of the Metachunk header, including alignment.
+ static size_t overhead();
+
+ Metachunk(size_t word_size , VirtualSpaceNode* container);
+
+ MetaWord* allocate(size_t word_size);
+
+ VirtualSpaceNode* container() const { return _container; }
+
+ MetaWord* bottom() const { return (MetaWord*) this; }
+
+ // Reset top to bottom so chunk can be reused.
+ void reset_empty() { _top = initial_top(); clear_next(); clear_prev(); }
+ bool is_empty() { return _top == initial_top(); }
+
+ // used (has been allocated)
+ // free (available for future allocations)
+ size_t word_size() const { return size(); }
+ size_t used_word_size() const;
+ size_t free_word_size() const;
+
+#ifdef ASSERT
+ bool is_tagged_free() { return _is_tagged_free; }
+ void set_is_tagged_free(bool v) { _is_tagged_free = v; }
+#endif
+
NOT_PRODUCT(void mangle();)
void print_on(outputStream* st) const;
void verify();
};
+
+// Metablock is the unit of allocation from a Chunk.
+//
+// A Metablock may be reused by its SpaceManager but are never moved between
+// SpaceManagers. There is no explicit link to the Metachunk
+// from which it was allocated. Metablock may be deallocated and
+// put on a freelist but the space is never freed, rather
+// the Metachunk it is a part of will be deallocated when it's
+// associated class loader is collected.
+
+class Metablock : public Metabase<Metablock> {
+ friend class VMStructs;
+ public:
+ Metablock(size_t word_size) : Metabase<Metablock>(word_size) {}
+};
+
#endif // SHARE_VM_MEMORY_METACHUNK_HPP
diff --git a/hotspot/src/share/vm/memory/metadataFactory.hpp b/hotspot/src/share/vm/memory/metadataFactory.hpp
index fce8d9b..9f7a22e 100644
--- a/hotspot/src/share/vm/memory/metadataFactory.hpp
+++ b/hotspot/src/share/vm/memory/metadataFactory.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -65,6 +65,7 @@
static void free_array(ClassLoaderData* loader_data, Array<T>* data) {
if (data != NULL) {
assert(loader_data != NULL, "shouldn't pass null");
+ assert(!data->is_shared(), "cannot deallocate array in shared spaces");
int size = data->size();
if (DumpSharedSpaces) {
loader_data->ro_metaspace()->deallocate((MetaWord*)data, size, false);
@@ -83,6 +84,7 @@
// Call metadata's deallocate function which will call deallocate fields
assert(!DumpSharedSpaces, "cannot deallocate metadata when dumping CDS archive");
assert(!md->on_stack(), "can't deallocate things on stack");
+ assert(!md->is_shared(), "cannot deallocate if in shared spaces");
md->deallocate_contents(loader_data);
loader_data->metaspace_non_null()->deallocate((MetaWord*)md, size, md->is_klass());
}
diff --git a/hotspot/src/share/vm/memory/metaspace.cpp b/hotspot/src/share/vm/memory/metaspace.cpp
index 832bd6d..9b321de 100644
--- a/hotspot/src/share/vm/memory/metaspace.cpp
+++ b/hotspot/src/share/vm/memory/metaspace.cpp
@@ -30,7 +30,6 @@
#include "memory/filemap.hpp"
#include "memory/freeList.hpp"
#include "memory/gcLocker.hpp"
-#include "memory/metablock.hpp"
#include "memory/metachunk.hpp"
#include "memory/metaspace.hpp"
#include "memory/metaspaceShared.hpp"
@@ -49,13 +48,10 @@
typedef BinaryTreeDictionary<Metablock, FreeList> BlockTreeDictionary;
typedef BinaryTreeDictionary<Metachunk, FreeList> ChunkTreeDictionary;
-// Define this macro to enable slow integrity checking of
-// the free chunk lists
+
+// Set this constant to enable slow integrity checking of the free chunk lists
const bool metaspace_slow_verify = false;
-// Parameters for stress mode testing
-const uint metadata_deallocate_a_lot_block = 10;
-const uint metadata_deallocate_a_lock_chunk = 3;
size_t const allocation_from_dictionary_limit = 4 * K;
MetaWord* last_allocated = 0;
@@ -92,24 +88,9 @@
uint MetaspaceGC::_shrink_factor = 0;
bool MetaspaceGC::_should_concurrent_collect = false;
-// Blocks of space for metadata are allocated out of Metachunks.
-//
-// Metachunk are allocated out of MetadataVirtualspaces and once
-// allocated there is no explicit link between a Metachunk and
-// the MetadataVirtualspaces from which it was allocated.
-//
-// Each SpaceManager maintains a
-// list of the chunks it is using and the current chunk. The current
-// chunk is the chunk from which allocations are done. Space freed in
-// a chunk is placed on the free list of blocks (BlockFreelist) and
-// reused from there.
-
typedef class FreeList<Metachunk> ChunkList;
// Manages the global free lists of chunks.
-// Has three lists of free chunks, and a total size and
-// count that includes all three
-
class ChunkManager : public CHeapObj<mtInternal> {
// Free list of chunks of different sizes.
@@ -119,7 +100,6 @@
// HumongousChunk
ChunkList _free_chunks[NumberOfFreeLists];
-
// HumongousChunk
ChunkTreeDictionary _humongous_dictionary;
@@ -166,7 +146,6 @@
// add or delete (return) a chunk to the global freelist.
Metachunk* chunk_freelist_allocate(size_t word_size);
- void chunk_freelist_deallocate(Metachunk* chunk);
// Map a size to a list index assuming that there are lists
// for special, small, medium, and humongous chunks.
@@ -200,9 +179,7 @@
// Returns the list for the given chunk word size.
ChunkList* find_free_chunks_list(size_t word_size);
- // Add and remove from a list by size. Selects
- // list based on size of chunk.
- void free_chunks_put(Metachunk* chuck);
+ // Remove from a list by size. Selects list based on size of chunk.
Metachunk* free_chunks_get(size_t chunk_word_size);
// Debug support
@@ -230,7 +207,6 @@
// to the allocation of a quantum of metadata).
class BlockFreelist VALUE_OBJ_CLASS_SPEC {
BlockTreeDictionary* _dictionary;
- static Metablock* initialize_free_chunk(MetaWord* p, size_t word_size);
// Only allocate and split from freelist if the size of the allocation
// is at least 1/4th the size of the available block.
@@ -258,6 +234,7 @@
void print_on(outputStream* st) const;
};
+// A VirtualSpaceList node.
class VirtualSpaceNode : public CHeapObj<mtClass> {
friend class VirtualSpaceList;
@@ -414,13 +391,13 @@
Metachunk* chunk = first_chunk();
Metachunk* invalid_chunk = (Metachunk*) top();
while (chunk < invalid_chunk ) {
- assert(chunk->is_free(), "Should be marked free");
- MetaWord* next = ((MetaWord*)chunk) + chunk->word_size();
- chunk_manager->remove_chunk(chunk);
- assert(chunk->next() == NULL &&
- chunk->prev() == NULL,
- "Was not removed from its list");
- chunk = (Metachunk*) next;
+ assert(chunk->is_tagged_free(), "Should be tagged free");
+ MetaWord* next = ((MetaWord*)chunk) + chunk->word_size();
+ chunk_manager->remove_chunk(chunk);
+ assert(chunk->next() == NULL &&
+ chunk->prev() == NULL,
+ "Was not removed from its list");
+ chunk = (Metachunk*) next;
}
}
@@ -434,7 +411,7 @@
// Don't count the chunks on the free lists. Those are
// still part of the VirtualSpaceNode but not currently
// counted.
- if (!chunk->is_free()) {
+ if (!chunk->is_tagged_free()) {
count++;
}
chunk = (Metachunk*) next;
@@ -550,44 +527,16 @@
class Metadebug : AllStatic {
// Debugging support for Metaspaces
- static int _deallocate_block_a_lot_count;
- static int _deallocate_chunk_a_lot_count;
static int _allocation_fail_alot_count;
public:
- static int deallocate_block_a_lot_count() {
- return _deallocate_block_a_lot_count;
- }
- static void set_deallocate_block_a_lot_count(int v) {
- _deallocate_block_a_lot_count = v;
- }
- static void inc_deallocate_block_a_lot_count() {
- _deallocate_block_a_lot_count++;
- }
- static int deallocate_chunk_a_lot_count() {
- return _deallocate_chunk_a_lot_count;
- }
- static void reset_deallocate_chunk_a_lot_count() {
- _deallocate_chunk_a_lot_count = 1;
- }
- static void inc_deallocate_chunk_a_lot_count() {
- _deallocate_chunk_a_lot_count++;
- }
static void init_allocation_fail_alot_count();
#ifdef ASSERT
static bool test_metadata_failure();
#endif
-
- static void deallocate_chunk_a_lot(SpaceManager* sm,
- size_t chunk_word_size);
- static void deallocate_block_a_lot(SpaceManager* sm,
- size_t chunk_word_size);
-
};
-int Metadebug::_deallocate_block_a_lot_count = 0;
-int Metadebug::_deallocate_chunk_a_lot_count = 0;
int Metadebug::_allocation_fail_alot_count = 0;
// SpaceManager - used by Metaspace to handle allocations
@@ -753,14 +702,11 @@
#endif
size_t get_raw_word_size(size_t word_size) {
- // If only the dictionary is going to be used (i.e., no
- // indexed free list), then there is a minimum size requirement.
- // MinChunkSize is a placeholder for the real minimum size JJJ
size_t byte_size = word_size * BytesPerWord;
- size_t raw_bytes_size = MAX2(byte_size,
- Metablock::min_block_byte_size());
- raw_bytes_size = ARENA_ALIGN(raw_bytes_size);
+ size_t raw_bytes_size = MAX2(byte_size, sizeof(Metablock));
+ raw_bytes_size = align_size_up(raw_bytes_size, Metachunk::object_alignment());
+
size_t raw_word_size = raw_bytes_size / BytesPerWord;
assert(raw_word_size * BytesPerWord == raw_bytes_size, "Size problem");
@@ -813,17 +759,8 @@
}
}
-Metablock* BlockFreelist::initialize_free_chunk(MetaWord* p, size_t word_size) {
- Metablock* block = (Metablock*) p;
- block->set_word_size(word_size);
- block->set_prev(NULL);
- block->set_next(NULL);
-
- return block;
-}
-
void BlockFreelist::return_block(MetaWord* p, size_t word_size) {
- Metablock* free_chunk = initialize_free_chunk(p, word_size);
+ Metablock* free_chunk = ::new (p) Metablock(word_size);
if (dictionary() == NULL) {
_dictionary = new BlockTreeDictionary();
}
@@ -1069,7 +1006,7 @@
}
// Chunk is being removed from the chunks free list.
- dec_free_chunks_total(chunk->capacity_word_size());
+ dec_free_chunks_total(chunk->word_size());
}
// Walk the list of VirtualSpaceNodes and delete
@@ -1563,54 +1500,6 @@
// Metadebug methods
-void Metadebug::deallocate_chunk_a_lot(SpaceManager* sm,
- size_t chunk_word_size){
-#ifdef ASSERT
- VirtualSpaceList* vsl = sm->vs_list();
- if (MetaDataDeallocateALot &&
- Metadebug::deallocate_chunk_a_lot_count() % MetaDataDeallocateALotInterval == 0 ) {
- Metadebug::reset_deallocate_chunk_a_lot_count();
- for (uint i = 0; i < metadata_deallocate_a_lock_chunk; i++) {
- Metachunk* dummy_chunk = vsl->current_virtual_space()->take_from_committed(chunk_word_size);
- if (dummy_chunk == NULL) {
- break;
- }
- sm->chunk_manager()->chunk_freelist_deallocate(dummy_chunk);
-
- if (TraceMetadataChunkAllocation && Verbose) {
- gclog_or_tty->print("Metadebug::deallocate_chunk_a_lot: %d) ",
- sm->sum_count_in_chunks_in_use());
- dummy_chunk->print_on(gclog_or_tty);
- gclog_or_tty->print_cr(" Free chunks total %d count %d",
- sm->chunk_manager()->free_chunks_total_words(),
- sm->chunk_manager()->free_chunks_count());
- }
- }
- } else {
- Metadebug::inc_deallocate_chunk_a_lot_count();
- }
-#endif
-}
-
-void Metadebug::deallocate_block_a_lot(SpaceManager* sm,
- size_t raw_word_size){
-#ifdef ASSERT
- if (MetaDataDeallocateALot &&
- Metadebug::deallocate_block_a_lot_count() % MetaDataDeallocateALotInterval == 0 ) {
- Metadebug::set_deallocate_block_a_lot_count(0);
- for (uint i = 0; i < metadata_deallocate_a_lot_block; i++) {
- MetaWord* dummy_block = sm->allocate_work(raw_word_size);
- if (dummy_block == 0) {
- break;
- }
- sm->deallocate(dummy_block, raw_word_size);
- }
- } else {
- Metadebug::inc_deallocate_block_a_lot_count();
- }
-#endif
-}
-
void Metadebug::init_allocation_fail_alot_count() {
if (MetadataAllocationFailALot) {
_allocation_fail_alot_count =
@@ -1754,31 +1643,6 @@
return free_chunks(index);
}
-void ChunkManager::free_chunks_put(Metachunk* chunk) {
- assert_lock_strong(SpaceManager::expand_lock());
- ChunkList* free_list = find_free_chunks_list(chunk->word_size());
- chunk->set_next(free_list->head());
- free_list->set_head(chunk);
- // chunk is being returned to the chunk free list
- inc_free_chunks_total(chunk->capacity_word_size());
- slow_locked_verify();
-}
-
-void ChunkManager::chunk_freelist_deallocate(Metachunk* chunk) {
- // The deallocation of a chunk originates in the freelist
- // manangement code for a Metaspace and does not hold the
- // lock.
- assert(chunk != NULL, "Deallocating NULL");
- assert_lock_strong(SpaceManager::expand_lock());
- slow_locked_verify();
- if (TraceMetadataChunkAllocation) {
- gclog_or_tty->print_cr("ChunkManager::chunk_freelist_deallocate: chunk "
- PTR_FORMAT " size " SIZE_FORMAT,
- chunk, chunk->word_size());
- }
- free_chunks_put(chunk);
-}
-
Metachunk* ChunkManager::free_chunks_get(size_t word_size) {
assert_lock_strong(SpaceManager::expand_lock());
@@ -1822,7 +1686,7 @@
}
// Chunk is being removed from the chunks free list.
- dec_free_chunks_total(chunk->capacity_word_size());
+ dec_free_chunks_total(chunk->word_size());
// Remove it from the links to this freelist
chunk->set_next(NULL);
@@ -1830,7 +1694,7 @@
#ifdef ASSERT
// Chunk is no longer on any freelist. Setting to false make container_count_slow()
// work.
- chunk->set_is_free(false);
+ chunk->set_is_tagged_free(false);
#endif
chunk->container()->inc_container_count();
@@ -1962,7 +1826,7 @@
for (ChunkIndex i = ZeroIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
Metachunk* chunk = chunks_in_use(i);
while (chunk != NULL) {
- sum += chunk->capacity_word_size();
+ sum += chunk->word_size();
chunk = chunk->next();
}
}
@@ -2098,10 +1962,6 @@
size_t grow_chunks_by_words = calc_chunk_size(word_size);
Metachunk* next = get_new_chunk(word_size, grow_chunks_by_words);
- if (next != NULL) {
- Metadebug::deallocate_chunk_a_lot(this, grow_chunks_by_words);
- }
-
MetaWord* mem = NULL;
// If a chunk was available, add it to the in-use chunk list
@@ -2210,7 +2070,7 @@
// Capture the next link before it is changed
// by the call to return_chunk_at_head();
Metachunk* next = cur->next();
- cur->set_is_free(true);
+ DEBUG_ONLY(cur->set_is_tagged_free(true);)
list->return_chunk_at_head(cur);
cur = next;
}
@@ -2282,7 +2142,7 @@
while (humongous_chunks != NULL) {
#ifdef ASSERT
- humongous_chunks->set_is_free(true);
+ humongous_chunks->set_is_tagged_free(true);
#endif
if (TraceMetadataChunkAllocation && Verbose) {
gclog_or_tty->print(PTR_FORMAT " (" SIZE_FORMAT ") ",
@@ -2446,7 +2306,6 @@
if (p == NULL) {
p = allocate_work(raw_word_size);
}
- Metadebug::deallocate_block_a_lot(this, raw_word_size);
return p;
}
@@ -2545,7 +2404,7 @@
curr->print_on(out);
curr_total += curr->word_size();
used += curr->used_word_size();
- capacity += curr->capacity_word_size();
+ capacity += curr->word_size();
waste += curr->free_word_size() + curr->overhead();;
}
}
@@ -3396,7 +3255,7 @@
}
-Metablock* Metaspace::allocate(ClassLoaderData* loader_data, size_t word_size,
+MetaWord* Metaspace::allocate(ClassLoaderData* loader_data, size_t word_size,
bool read_only, MetaspaceObj::Type type, TRAPS) {
if (HAS_PENDING_EXCEPTION) {
assert(false, "Should not allocate with exception pending");
@@ -3415,10 +3274,14 @@
MetaWord* result = space->allocate(word_size, NonClassType);
if (result == NULL) {
report_out_of_shared_space(read_only ? SharedReadOnly : SharedReadWrite);
- } else {
- space->record_allocation(result, type, space->vsm()->get_raw_word_size(word_size));
}
- return Metablock::initialize(result, word_size);
+
+ space->record_allocation(result, type, space->vsm()->get_raw_word_size(word_size));
+
+ // Zero initialize.
+ Copy::fill_to_aligned_words((HeapWord*)result, word_size, 0);
+
+ return result;
}
MetadataType mdtype = (type == MetaspaceObj::ClassType) ? ClassType : NonClassType;
@@ -3443,7 +3306,10 @@
return NULL;
}
- return Metablock::initialize(result, word_size);
+ // Zero initialize.
+ Copy::fill_to_aligned_words((HeapWord*)result, word_size, 0);
+
+ return result;
}
void Metaspace::report_metadata_oome(ClassLoaderData* loader_data, size_t word_size, MetadataType mdtype, TRAPS) {
diff --git a/hotspot/src/share/vm/memory/metaspace.hpp b/hotspot/src/share/vm/memory/metaspace.hpp
index 3a0f4fe..974a1aa 100644
--- a/hotspot/src/share/vm/memory/metaspace.hpp
+++ b/hotspot/src/share/vm/memory/metaspace.hpp
@@ -139,7 +139,6 @@
// Allocate space for metadata of type mdtype. This is space
// within a Metachunk and is used by
// allocate(ClassLoaderData*, size_t, bool, MetadataType, TRAPS)
- // which returns a Metablock.
MetaWord* allocate(size_t word_size, MetadataType mdtype);
// Virtual Space lists for both classes and other metadata
@@ -217,8 +216,8 @@
size_t used_bytes_slow(MetadataType mdtype) const;
size_t capacity_bytes_slow(MetadataType mdtype) const;
- static Metablock* allocate(ClassLoaderData* loader_data, size_t word_size,
- bool read_only, MetaspaceObj::Type type, TRAPS);
+ static MetaWord* allocate(ClassLoaderData* loader_data, size_t word_size,
+ bool read_only, MetaspaceObj::Type type, TRAPS);
void deallocate(MetaWord* ptr, size_t byte_size, bool is_class);
MetaWord* expand_and_allocate(size_t size,
diff --git a/hotspot/src/share/vm/oops/constantPool.cpp b/hotspot/src/share/vm/oops/constantPool.cpp
index 27f1d84..73cebb4 100644
--- a/hotspot/src/share/vm/oops/constantPool.cpp
+++ b/hotspot/src/share/vm/oops/constantPool.cpp
@@ -869,18 +869,9 @@
bool ConstantPool::compare_entry_to(int index1, constantPoolHandle cp2,
int index2, TRAPS) {
- jbyte t1 = tag_at(index1).value();
- jbyte t2 = cp2->tag_at(index2).value();
-
-
- // JVM_CONSTANT_UnresolvedClassInError is equal to JVM_CONSTANT_UnresolvedClass
- // when comparing
- if (t1 == JVM_CONSTANT_UnresolvedClassInError) {
- t1 = JVM_CONSTANT_UnresolvedClass;
- }
- if (t2 == JVM_CONSTANT_UnresolvedClassInError) {
- t2 = JVM_CONSTANT_UnresolvedClass;
- }
+ // The error tags are equivalent to non-error tags when comparing
+ jbyte t1 = tag_at(index1).non_error_value();
+ jbyte t2 = cp2->tag_at(index2).non_error_value();
if (t1 != t2) {
// Not the same entry type so there is nothing else to check. Note
@@ -1001,8 +992,8 @@
case JVM_CONSTANT_MethodType:
{
- int k1 = method_type_index_at(index1);
- int k2 = cp2->method_type_index_at(index2);
+ int k1 = method_type_index_at_error_ok(index1);
+ int k2 = cp2->method_type_index_at_error_ok(index2);
bool match = compare_entry_to(k1, cp2, k2, CHECK_false);
if (match) {
return true;
@@ -1011,11 +1002,11 @@
case JVM_CONSTANT_MethodHandle:
{
- int k1 = method_handle_ref_kind_at(index1);
- int k2 = cp2->method_handle_ref_kind_at(index2);
+ int k1 = method_handle_ref_kind_at_error_ok(index1);
+ int k2 = cp2->method_handle_ref_kind_at_error_ok(index2);
if (k1 == k2) {
- int i1 = method_handle_index_at(index1);
- int i2 = cp2->method_handle_index_at(index2);
+ int i1 = method_handle_index_at_error_ok(index1);
+ int i2 = cp2->method_handle_index_at_error_ok(index2);
bool match = compare_entry_to(i1, cp2, i2, CHECK_false);
if (match) {
return true;
@@ -1329,14 +1320,6 @@
}
} break;
- case JVM_CONSTANT_UnresolvedClassInError:
- {
- Symbol* k = from_cp->unresolved_klass_at(from_i);
- to_cp->unresolved_klass_at_put(to_i, k);
- to_cp->tag_at_put(to_i, JVM_CONSTANT_UnresolvedClassInError);
- } break;
-
-
case JVM_CONSTANT_String:
{
Symbol* s = from_cp->unresolved_string_at(from_i);
@@ -1352,15 +1335,17 @@
} break;
case JVM_CONSTANT_MethodType:
+ case JVM_CONSTANT_MethodTypeInError:
{
- jint k = from_cp->method_type_index_at(from_i);
+ jint k = from_cp->method_type_index_at_error_ok(from_i);
to_cp->method_type_index_at_put(to_i, k);
} break;
case JVM_CONSTANT_MethodHandle:
+ case JVM_CONSTANT_MethodHandleInError:
{
- int k1 = from_cp->method_handle_ref_kind_at(from_i);
- int k2 = from_cp->method_handle_index_at(from_i);
+ int k1 = from_cp->method_handle_ref_kind_at_error_ok(from_i);
+ int k2 = from_cp->method_handle_index_at_error_ok(from_i);
to_cp->method_handle_index_at_put(to_i, k1, k2);
} break;
diff --git a/hotspot/src/share/vm/oops/instanceKlass.cpp b/hotspot/src/share/vm/oops/instanceKlass.cpp
index d6a617a..971039a 100644
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp
@@ -320,7 +320,8 @@
void InstanceKlass::deallocate_methods(ClassLoaderData* loader_data,
Array<Method*>* methods) {
- if (methods != NULL && methods != Universe::the_empty_method_array()) {
+ if (methods != NULL && methods != Universe::the_empty_method_array() &&
+ !methods->is_shared()) {
for (int i = 0; i < methods->length(); i++) {
Method* method = methods->at(i);
if (method == NULL) continue; // maybe null if error processing
@@ -344,13 +345,14 @@
// check that the interfaces don't come from super class
Array<Klass*>* sti = (super_klass == NULL) ? NULL :
InstanceKlass::cast(super_klass)->transitive_interfaces();
- if (ti != sti) {
+ if (ti != sti && ti != NULL && !ti->is_shared()) {
MetadataFactory::free_array<Klass*>(loader_data, ti);
}
}
// local interfaces can be empty
- if (local_interfaces != Universe::the_empty_klass_array()) {
+ if (local_interfaces != Universe::the_empty_klass_array() &&
+ local_interfaces != NULL && !local_interfaces->is_shared()) {
MetadataFactory::free_array<Klass*>(loader_data, local_interfaces);
}
}
@@ -380,21 +382,25 @@
deallocate_methods(loader_data, methods());
set_methods(NULL);
- if (method_ordering() != Universe::the_empty_int_array()) {
+ if (method_ordering() != NULL &&
+ method_ordering() != Universe::the_empty_int_array() &&
+ !method_ordering()->is_shared()) {
MetadataFactory::free_array<int>(loader_data, method_ordering());
}
set_method_ordering(NULL);
// default methods can be empty
if (default_methods() != NULL &&
- default_methods() != Universe::the_empty_method_array()) {
+ default_methods() != Universe::the_empty_method_array() &&
+ !default_methods()->is_shared()) {
MetadataFactory::free_array<Method*>(loader_data, default_methods());
}
// Do NOT deallocate the default methods, they are owned by superinterfaces.
set_default_methods(NULL);
// default methods vtable indices can be empty
- if (default_vtable_indices() != NULL) {
+ if (default_vtable_indices() != NULL &&
+ !default_vtable_indices()->is_shared()) {
MetadataFactory::free_array<int>(loader_data, default_vtable_indices());
}
set_default_vtable_indices(NULL);
@@ -403,8 +409,10 @@
// This array is in Klass, but remove it with the InstanceKlass since
// this place would be the only caller and it can share memory with transitive
// interfaces.
- if (secondary_supers() != Universe::the_empty_klass_array() &&
- secondary_supers() != transitive_interfaces()) {
+ if (secondary_supers() != NULL &&
+ secondary_supers() != Universe::the_empty_klass_array() &&
+ secondary_supers() != transitive_interfaces() &&
+ !secondary_supers()->is_shared()) {
MetadataFactory::free_array<Klass*>(loader_data, secondary_supers());
}
set_secondary_supers(NULL);
@@ -413,24 +421,32 @@
set_transitive_interfaces(NULL);
set_local_interfaces(NULL);
- MetadataFactory::free_array<jushort>(loader_data, fields());
+ if (fields() != NULL && !fields()->is_shared()) {
+ MetadataFactory::free_array<jushort>(loader_data, fields());
+ }
set_fields(NULL, 0);
// If a method from a redefined class is using this constant pool, don't
// delete it, yet. The new class's previous version will point to this.
if (constants() != NULL) {
assert (!constants()->on_stack(), "shouldn't be called if anything is onstack");
- MetadataFactory::free_metadata(loader_data, constants());
+ if (!constants()->is_shared()) {
+ MetadataFactory::free_metadata(loader_data, constants());
+ }
set_constants(NULL);
}
- if (inner_classes() != Universe::the_empty_short_array()) {
+ if (inner_classes() != NULL &&
+ inner_classes() != Universe::the_empty_short_array() &&
+ !inner_classes()->is_shared()) {
MetadataFactory::free_array<jushort>(loader_data, inner_classes());
}
set_inner_classes(NULL);
- // We should deallocate the Annotations instance
- MetadataFactory::free_metadata(loader_data, annotations());
+ // We should deallocate the Annotations instance if it's not in shared spaces.
+ if (annotations() != NULL && !annotations()->is_shared()) {
+ MetadataFactory::free_metadata(loader_data, annotations());
+ }
set_annotations(NULL);
}
diff --git a/hotspot/src/share/vm/oops/method.hpp b/hotspot/src/share/vm/oops/method.hpp
index c152b26..63705b3 100644
--- a/hotspot/src/share/vm/oops/method.hpp
+++ b/hotspot/src/share/vm/oops/method.hpp
@@ -805,6 +805,7 @@
private:
void print_made_not_compilable(int comp_level, bool is_osr, bool report, const char* reason);
+ public:
MethodCounters* get_method_counters(TRAPS) {
if (_method_counters == NULL) {
build_method_counters(this, CHECK_AND_CLEAR_NULL);
@@ -812,7 +813,6 @@
return _method_counters;
}
- public:
bool is_not_c1_compilable() const { return access_flags().is_not_c1_compilable(); }
void set_not_c1_compilable() { _access_flags.set_not_c1_compilable(); }
void clear_not_c1_compilable() { _access_flags.clear_not_c1_compilable(); }
diff --git a/hotspot/src/share/vm/oops/methodData.cpp b/hotspot/src/share/vm/oops/methodData.cpp
index 89a4cd4..e50107f 100644
--- a/hotspot/src/share/vm/oops/methodData.cpp
+++ b/hotspot/src/share/vm/oops/methodData.cpp
@@ -56,6 +56,11 @@
if (needs_array_len(tag)) {
set_cell_at(ArrayData::array_len_off_set, cell_count - 1); // -1 for header.
}
+ if (tag == call_type_data_tag) {
+ CallTypeData::initialize(this, cell_count);
+ } else if (tag == virtual_call_type_data_tag) {
+ VirtualCallTypeData::initialize(this, cell_count);
+ }
}
void DataLayout::clean_weak_klass_links(BoolObjectClosure* cl) {
@@ -76,7 +81,7 @@
}
#ifndef PRODUCT
-void ProfileData::print_shared(outputStream* st, const char* name) {
+void ProfileData::print_shared(outputStream* st, const char* name) const {
st->print("bci: %d", bci());
st->fill_to(tab_width_one);
st->print("%s", name);
@@ -91,8 +96,8 @@
st->print("flags(%d) ", flags);
}
-void ProfileData::tab(outputStream* st) {
- st->fill_to(tab_width_two);
+void ProfileData::tab(outputStream* st, bool first) const {
+ st->fill_to(first ? tab_width_one : tab_width_two);
}
#endif // !PRODUCT
@@ -104,7 +109,7 @@
#ifndef PRODUCT
-void BitData::print_data_on(outputStream* st) {
+void BitData::print_data_on(outputStream* st) const {
print_shared(st, "BitData");
}
#endif // !PRODUCT
@@ -115,7 +120,7 @@
// A CounterData corresponds to a simple counter.
#ifndef PRODUCT
-void CounterData::print_data_on(outputStream* st) {
+void CounterData::print_data_on(outputStream* st) const {
print_shared(st, "CounterData");
st->print_cr("count(%u)", count());
}
@@ -145,12 +150,207 @@
}
#ifndef PRODUCT
-void JumpData::print_data_on(outputStream* st) {
+void JumpData::print_data_on(outputStream* st) const {
print_shared(st, "JumpData");
st->print_cr("taken(%u) displacement(%d)", taken(), displacement());
}
#endif // !PRODUCT
+int TypeStackSlotEntries::compute_cell_count(Symbol* signature, int max) {
+ ResourceMark rm;
+ SignatureStream ss(signature);
+ int args_count = MIN2(ss.reference_parameter_count(), max);
+ return args_count * per_arg_cell_count;
+}
+
+int TypeEntriesAtCall::compute_cell_count(BytecodeStream* stream) {
+ assert(Bytecodes::is_invoke(stream->code()), "should be invoke");
+ assert(TypeStackSlotEntries::per_arg_count() > ReturnTypeEntry::static_cell_count(), "code to test for arguments/results broken");
+ Bytecode_invoke inv(stream->method(), stream->bci());
+ int args_cell = 0;
+ if (arguments_profiling_enabled()) {
+ args_cell = TypeStackSlotEntries::compute_cell_count(inv.signature(), TypeProfileArgsLimit);
+ }
+ int ret_cell = 0;
+ if (return_profiling_enabled() && (inv.result_type() == T_OBJECT || inv.result_type() == T_ARRAY)) {
+ ret_cell = ReturnTypeEntry::static_cell_count();
+ }
+ int header_cell = 0;
+ if (args_cell + ret_cell > 0) {
+ header_cell = header_cell_count();
+ }
+
+ return header_cell + args_cell + ret_cell;
+}
+
+class ArgumentOffsetComputer : public SignatureInfo {
+private:
+ int _max;
+ GrowableArray<int> _offsets;
+
+ void set(int size, BasicType type) { _size += size; }
+ void do_object(int begin, int end) {
+ if (_offsets.length() < _max) {
+ _offsets.push(_size);
+ }
+ SignatureInfo::do_object(begin, end);
+ }
+ void do_array (int begin, int end) {
+ if (_offsets.length() < _max) {
+ _offsets.push(_size);
+ }
+ SignatureInfo::do_array(begin, end);
+ }
+
+public:
+ ArgumentOffsetComputer(Symbol* signature, int max)
+ : SignatureInfo(signature), _max(max), _offsets(Thread::current(), max) {
+ }
+
+ int total() { lazy_iterate_parameters(); return _size; }
+
+ int off_at(int i) const { return _offsets.at(i); }
+};
+
+void TypeStackSlotEntries::post_initialize(Symbol* signature, bool has_receiver) {
+ ResourceMark rm;
+ ArgumentOffsetComputer aos(signature, _number_of_entries);
+ aos.total();
+ for (int i = 0; i < _number_of_entries; i++) {
+ set_stack_slot(i, aos.off_at(i) + (has_receiver ? 1 : 0));
+ set_type(i, type_none());
+ }
+}
+
+void CallTypeData::post_initialize(BytecodeStream* stream, MethodData* mdo) {
+ assert(Bytecodes::is_invoke(stream->code()), "should be invoke");
+ Bytecode_invoke inv(stream->method(), stream->bci());
+
+ SignatureStream ss(inv.signature());
+ if (has_arguments()) {
+#ifdef ASSERT
+ ResourceMark rm;
+ int count = MIN2(ss.reference_parameter_count(), (int)TypeProfileArgsLimit);
+ assert(count > 0, "room for args type but none found?");
+ check_number_of_arguments(count);
+#endif
+ _args.post_initialize(inv.signature(), inv.has_receiver());
+ }
+
+ if (has_return()) {
+ assert(inv.result_type() == T_OBJECT || inv.result_type() == T_ARRAY, "room for a ret type but doesn't return obj?");
+ _ret.post_initialize();
+ }
+}
+
+void VirtualCallTypeData::post_initialize(BytecodeStream* stream, MethodData* mdo) {
+ assert(Bytecodes::is_invoke(stream->code()), "should be invoke");
+ Bytecode_invoke inv(stream->method(), stream->bci());
+
+ if (has_arguments()) {
+#ifdef ASSERT
+ ResourceMark rm;
+ SignatureStream ss(inv.signature());
+ int count = MIN2(ss.reference_parameter_count(), (int)TypeProfileArgsLimit);
+ assert(count > 0, "room for args type but none found?");
+ check_number_of_arguments(count);
+#endif
+ _args.post_initialize(inv.signature(), inv.has_receiver());
+ }
+
+ if (has_return()) {
+ assert(inv.result_type() == T_OBJECT || inv.result_type() == T_ARRAY, "room for a ret type but doesn't return obj?");
+ _ret.post_initialize();
+ }
+}
+
+bool TypeEntries::is_loader_alive(BoolObjectClosure* is_alive_cl, intptr_t p) {
+ return !is_type_none(p) &&
+ !((Klass*)klass_part(p))->is_loader_alive(is_alive_cl);
+}
+
+void TypeStackSlotEntries::clean_weak_klass_links(BoolObjectClosure* is_alive_cl) {
+ for (int i = 0; i < _number_of_entries; i++) {
+ intptr_t p = type(i);
+ if (is_loader_alive(is_alive_cl, p)) {
+ set_type(i, type_none());
+ }
+ }
+}
+
+void ReturnTypeEntry::clean_weak_klass_links(BoolObjectClosure* is_alive_cl) {
+ intptr_t p = type();
+ if (is_loader_alive(is_alive_cl, p)) {
+ set_type(type_none());
+ }
+}
+
+bool TypeEntriesAtCall::return_profiling_enabled() {
+ return MethodData::profile_return();
+}
+
+bool TypeEntriesAtCall::arguments_profiling_enabled() {
+ return MethodData::profile_arguments();
+}
+
+#ifndef PRODUCT
+void TypeEntries::print_klass(outputStream* st, intptr_t k) {
+ if (is_type_none(k)) {
+ st->print("none");
+ } else if (is_type_unknown(k)) {
+ st->print("unknown");
+ } else {
+ valid_klass(k)->print_value_on(st);
+ }
+ if (was_null_seen(k)) {
+ st->print(" (null seen)");
+ }
+}
+
+void TypeStackSlotEntries::print_data_on(outputStream* st) const {
+ for (int i = 0; i < _number_of_entries; i++) {
+ _pd->tab(st);
+ st->print("%d: stack(%u) ", i, stack_slot(i));
+ print_klass(st, type(i));
+ st->cr();
+ }
+}
+
+void ReturnTypeEntry::print_data_on(outputStream* st) const {
+ _pd->tab(st);
+ print_klass(st, type());
+ st->cr();
+}
+
+void CallTypeData::print_data_on(outputStream* st) const {
+ CounterData::print_data_on(st);
+ if (has_arguments()) {
+ tab(st, true);
+ st->print("argument types");
+ _args.print_data_on(st);
+ }
+ if (has_return()) {
+ tab(st, true);
+ st->print("return type");
+ _ret.print_data_on(st);
+ }
+}
+
+void VirtualCallTypeData::print_data_on(outputStream* st) const {
+ VirtualCallData::print_data_on(st);
+ if (has_arguments()) {
+ tab(st, true);
+ st->print("argument types");
+ _args.print_data_on(st);
+ }
+ if (has_return()) {
+ tab(st, true);
+ st->print("return type");
+ _ret.print_data_on(st);
+ }
+}
+#endif
+
// ==================================================================
// ReceiverTypeData
//
@@ -169,7 +369,7 @@
}
#ifndef PRODUCT
-void ReceiverTypeData::print_receiver_data_on(outputStream* st) {
+void ReceiverTypeData::print_receiver_data_on(outputStream* st) const {
uint row;
int entries = 0;
for (row = 0; row < row_limit(); row++) {
@@ -190,11 +390,11 @@
}
}
}
-void ReceiverTypeData::print_data_on(outputStream* st) {
+void ReceiverTypeData::print_data_on(outputStream* st) const {
print_shared(st, "ReceiverTypeData");
print_receiver_data_on(st);
}
-void VirtualCallData::print_data_on(outputStream* st) {
+void VirtualCallData::print_data_on(outputStream* st) const {
print_shared(st, "VirtualCallData");
print_receiver_data_on(st);
}
@@ -246,7 +446,7 @@
#ifndef PRODUCT
-void RetData::print_data_on(outputStream* st) {
+void RetData::print_data_on(outputStream* st) const {
print_shared(st, "RetData");
uint row;
int entries = 0;
@@ -281,7 +481,7 @@
}
#ifndef PRODUCT
-void BranchData::print_data_on(outputStream* st) {
+void BranchData::print_data_on(outputStream* st) const {
print_shared(st, "BranchData");
st->print_cr("taken(%u) displacement(%d)",
taken(), displacement());
@@ -355,7 +555,7 @@
}
#ifndef PRODUCT
-void MultiBranchData::print_data_on(outputStream* st) {
+void MultiBranchData::print_data_on(outputStream* st) const {
print_shared(st, "MultiBranchData");
st->print_cr("default_count(%u) displacement(%d)",
default_count(), default_displacement());
@@ -369,7 +569,7 @@
#endif
#ifndef PRODUCT
-void ArgInfoData::print_data_on(outputStream* st) {
+void ArgInfoData::print_data_on(outputStream* st) const {
print_shared(st, "ArgInfoData");
int nargs = number_of_args();
for (int i = 0; i < nargs; i++) {
@@ -407,7 +607,11 @@
}
case Bytecodes::_invokespecial:
case Bytecodes::_invokestatic:
- return CounterData::static_cell_count();
+ if (MethodData::profile_arguments() || MethodData::profile_return()) {
+ return variable_cell_count;
+ } else {
+ return CounterData::static_cell_count();
+ }
case Bytecodes::_goto:
case Bytecodes::_goto_w:
case Bytecodes::_jsr:
@@ -415,9 +619,17 @@
return JumpData::static_cell_count();
case Bytecodes::_invokevirtual:
case Bytecodes::_invokeinterface:
- return VirtualCallData::static_cell_count();
+ if (MethodData::profile_arguments() || MethodData::profile_return()) {
+ return variable_cell_count;
+ } else {
+ return VirtualCallData::static_cell_count();
+ }
case Bytecodes::_invokedynamic:
- return CounterData::static_cell_count();
+ if (MethodData::profile_arguments() || MethodData::profile_return()) {
+ return variable_cell_count;
+ } else {
+ return CounterData::static_cell_count();
+ }
case Bytecodes::_ret:
return RetData::static_cell_count();
case Bytecodes::_ifeq:
@@ -453,7 +665,36 @@
return 0;
}
if (cell_count == variable_cell_count) {
- cell_count = MultiBranchData::compute_cell_count(stream);
+ switch (stream->code()) {
+ case Bytecodes::_lookupswitch:
+ case Bytecodes::_tableswitch:
+ cell_count = MultiBranchData::compute_cell_count(stream);
+ break;
+ case Bytecodes::_invokespecial:
+ case Bytecodes::_invokestatic:
+ case Bytecodes::_invokedynamic:
+ assert(MethodData::profile_arguments() || MethodData::profile_return(), "should be collecting args profile");
+ if (profile_arguments_for_invoke(stream->method(), stream->bci()) ||
+ profile_return_for_invoke(stream->method(), stream->bci())) {
+ cell_count = CallTypeData::compute_cell_count(stream);
+ } else {
+ cell_count = CounterData::static_cell_count();
+ }
+ break;
+ case Bytecodes::_invokevirtual:
+ case Bytecodes::_invokeinterface: {
+ assert(MethodData::profile_arguments() || MethodData::profile_return(), "should be collecting args profile");
+ if (profile_arguments_for_invoke(stream->method(), stream->bci()) ||
+ profile_return_for_invoke(stream->method(), stream->bci())) {
+ cell_count = VirtualCallTypeData::compute_cell_count(stream);
+ } else {
+ cell_count = VirtualCallData::static_cell_count();
+ }
+ break;
+ }
+ default:
+ fatal("unexpected bytecode for var length profile data");
+ }
}
// Note: cell_count might be zero, meaning that there is just
// a DataLayout header, with no extra cells.
@@ -499,6 +740,7 @@
// Add a cell to record information about modified arguments.
int arg_size = method->size_of_parameters();
object_size += DataLayout::compute_size_in_bytes(arg_size+1);
+
return object_size;
}
@@ -534,10 +776,21 @@
}
break;
case Bytecodes::_invokespecial:
- case Bytecodes::_invokestatic:
- cell_count = CounterData::static_cell_count();
- tag = DataLayout::counter_data_tag;
+ case Bytecodes::_invokestatic: {
+ int counter_data_cell_count = CounterData::static_cell_count();
+ if (profile_arguments_for_invoke(stream->method(), stream->bci()) ||
+ profile_return_for_invoke(stream->method(), stream->bci())) {
+ cell_count = CallTypeData::compute_cell_count(stream);
+ } else {
+ cell_count = counter_data_cell_count;
+ }
+ if (cell_count > counter_data_cell_count) {
+ tag = DataLayout::call_type_data_tag;
+ } else {
+ tag = DataLayout::counter_data_tag;
+ }
break;
+ }
case Bytecodes::_goto:
case Bytecodes::_goto_w:
case Bytecodes::_jsr:
@@ -546,15 +799,37 @@
tag = DataLayout::jump_data_tag;
break;
case Bytecodes::_invokevirtual:
- case Bytecodes::_invokeinterface:
- cell_count = VirtualCallData::static_cell_count();
- tag = DataLayout::virtual_call_data_tag;
+ case Bytecodes::_invokeinterface: {
+ int virtual_call_data_cell_count = VirtualCallData::static_cell_count();
+ if (profile_arguments_for_invoke(stream->method(), stream->bci()) ||
+ profile_return_for_invoke(stream->method(), stream->bci())) {
+ cell_count = VirtualCallTypeData::compute_cell_count(stream);
+ } else {
+ cell_count = virtual_call_data_cell_count;
+ }
+ if (cell_count > virtual_call_data_cell_count) {
+ tag = DataLayout::virtual_call_type_data_tag;
+ } else {
+ tag = DataLayout::virtual_call_data_tag;
+ }
break;
- case Bytecodes::_invokedynamic:
+ }
+ case Bytecodes::_invokedynamic: {
// %%% should make a type profile for any invokedynamic that takes a ref argument
- cell_count = CounterData::static_cell_count();
- tag = DataLayout::counter_data_tag;
+ int counter_data_cell_count = CounterData::static_cell_count();
+ if (profile_arguments_for_invoke(stream->method(), stream->bci()) ||
+ profile_return_for_invoke(stream->method(), stream->bci())) {
+ cell_count = CallTypeData::compute_cell_count(stream);
+ } else {
+ cell_count = counter_data_cell_count;
+ }
+ if (cell_count > counter_data_cell_count) {
+ tag = DataLayout::call_type_data_tag;
+ } else {
+ tag = DataLayout::counter_data_tag;
+ }
break;
+ }
case Bytecodes::_ret:
cell_count = RetData::static_cell_count();
tag = DataLayout::ret_data_tag;
@@ -585,6 +860,11 @@
break;
}
assert(tag == DataLayout::multi_branch_data_tag ||
+ ((MethodData::profile_arguments() || MethodData::profile_return()) &&
+ (tag == DataLayout::call_type_data_tag ||
+ tag == DataLayout::counter_data_tag ||
+ tag == DataLayout::virtual_call_type_data_tag ||
+ tag == DataLayout::virtual_call_data_tag)) ||
cell_count == bytecode_cell_count(c), "cell counts must agree");
if (cell_count >= 0) {
assert(tag != DataLayout::no_tag, "bad tag");
@@ -631,6 +911,10 @@
return new MultiBranchData(this);
case DataLayout::arg_info_data_tag:
return new ArgInfoData(this);
+ case DataLayout::call_type_data_tag:
+ return new CallTypeData(this);
+ case DataLayout::virtual_call_type_data_tag:
+ return new VirtualCallTypeData(this);
};
}
@@ -898,3 +1182,70 @@
NEEDS_CLEANUP;
// not yet implemented.
}
+
+bool MethodData::profile_jsr292(methodHandle m, int bci) {
+ if (m->is_compiled_lambda_form()) {
+ return true;
+ }
+
+ Bytecode_invoke inv(m , bci);
+ return inv.is_invokedynamic() || inv.is_invokehandle();
+}
+
+int MethodData::profile_arguments_flag() {
+ return TypeProfileLevel % 10;
+}
+
+bool MethodData::profile_arguments() {
+ return profile_arguments_flag() > no_type_profile && profile_arguments_flag() <= type_profile_all;
+}
+
+bool MethodData::profile_arguments_jsr292_only() {
+ return profile_arguments_flag() == type_profile_jsr292;
+}
+
+bool MethodData::profile_all_arguments() {
+ return profile_arguments_flag() == type_profile_all;
+}
+
+bool MethodData::profile_arguments_for_invoke(methodHandle m, int bci) {
+ if (!profile_arguments()) {
+ return false;
+ }
+
+ if (profile_all_arguments()) {
+ return true;
+ }
+
+ assert(profile_arguments_jsr292_only(), "inconsistent");
+ return profile_jsr292(m, bci);
+}
+
+int MethodData::profile_return_flag() {
+ return TypeProfileLevel / 10;
+}
+
+bool MethodData::profile_return() {
+ return profile_return_flag() > no_type_profile && profile_return_flag() <= type_profile_all;
+}
+
+bool MethodData::profile_return_jsr292_only() {
+ return profile_return_flag() == type_profile_jsr292;
+}
+
+bool MethodData::profile_all_return() {
+ return profile_return_flag() == type_profile_all;
+}
+
+bool MethodData::profile_return_for_invoke(methodHandle m, int bci) {
+ if (!profile_return()) {
+ return false;
+ }
+
+ if (profile_all_return()) {
+ return true;
+ }
+
+ assert(profile_return_jsr292_only(), "inconsistent");
+ return profile_jsr292(m, bci);
+}
diff --git a/hotspot/src/share/vm/oops/methodData.hpp b/hotspot/src/share/vm/oops/methodData.hpp
index 76f9b1f..1dc6272 100644
--- a/hotspot/src/share/vm/oops/methodData.hpp
+++ b/hotspot/src/share/vm/oops/methodData.hpp
@@ -117,7 +117,9 @@
ret_data_tag,
branch_data_tag,
multi_branch_data_tag,
- arg_info_data_tag
+ arg_info_data_tag,
+ call_type_data_tag,
+ virtual_call_type_data_tag
};
enum {
@@ -165,7 +167,7 @@
// occurred, and the MDO shows N occurrences of X, we make the
// simplifying assumption that all N occurrences can be blamed
// on that BCI.
- int trap_state() {
+ int trap_state() const {
return ((_header._struct._flags >> trap_shift) & trap_mask);
}
@@ -175,11 +177,11 @@
_header._struct._flags = (new_state << trap_shift) | old_flags;
}
- u1 flags() {
+ u1 flags() const {
return _header._struct._flags;
}
- u2 bci() {
+ u2 bci() const {
return _header._struct._bci;
}
@@ -198,7 +200,7 @@
void release_set_cell_at(int index, intptr_t value) {
OrderAccess::release_store_ptr(&_cells[index], value);
}
- intptr_t cell_at(int index) {
+ intptr_t cell_at(int index) const {
return _cells[index];
}
@@ -206,7 +208,7 @@
assert(flag_number < flag_limit, "oob");
_header._struct._flags |= (0x1 << flag_number);
}
- bool flag_at(int flag_number) {
+ bool flag_at(int flag_number) const {
assert(flag_number < flag_limit, "oob");
return (_header._struct._flags & (0x1 << flag_number)) != 0;
}
@@ -254,19 +256,23 @@
class CounterData;
class ReceiverTypeData;
class VirtualCallData;
+class VirtualCallTypeData;
class RetData;
+class CallTypeData;
class JumpData;
class BranchData;
class ArrayData;
class MultiBranchData;
class ArgInfoData;
-
// ProfileData
//
// A ProfileData object is created to refer to a section of profiling
// data in a structured way.
class ProfileData : public ResourceObj {
+ friend class TypeEntries;
+ friend class ReturnTypeEntry;
+ friend class TypeStackSlotEntries;
private:
#ifndef PRODUCT
enum {
@@ -280,6 +286,7 @@
protected:
DataLayout* data() { return _data; }
+ const DataLayout* data() const { return _data; }
enum {
cell_size = DataLayout::cell_size
@@ -287,7 +294,7 @@
public:
// How many cells are in this?
- virtual int cell_count() {
+ virtual int cell_count() const {
ShouldNotReachHere();
return -1;
}
@@ -307,7 +314,7 @@
assert(0 <= index && index < cell_count(), "oob");
data()->release_set_cell_at(index, value);
}
- intptr_t intptr_at(int index) {
+ intptr_t intptr_at(int index) const {
assert(0 <= index && index < cell_count(), "oob");
return data()->cell_at(index);
}
@@ -317,7 +324,7 @@
void release_set_uint_at(int index, uint value) {
release_set_intptr_at(index, (intptr_t) value);
}
- uint uint_at(int index) {
+ uint uint_at(int index) const {
return (uint)intptr_at(index);
}
void set_int_at(int index, int value) {
@@ -326,23 +333,23 @@
void release_set_int_at(int index, int value) {
release_set_intptr_at(index, (intptr_t) value);
}
- int int_at(int index) {
+ int int_at(int index) const {
return (int)intptr_at(index);
}
- int int_at_unchecked(int index) {
+ int int_at_unchecked(int index) const {
return (int)data()->cell_at(index);
}
void set_oop_at(int index, oop value) {
set_intptr_at(index, cast_from_oop<intptr_t>(value));
}
- oop oop_at(int index) {
+ oop oop_at(int index) const {
return cast_to_oop(intptr_at(index));
}
void set_flag_at(int flag_number) {
data()->set_flag_at(flag_number);
}
- bool flag_at(int flag_number) {
+ bool flag_at(int flag_number) const {
return data()->flag_at(flag_number);
}
@@ -362,7 +369,7 @@
// Constructor for invalid ProfileData.
ProfileData();
- u2 bci() {
+ u2 bci() const {
return data()->bci();
}
@@ -370,7 +377,7 @@
return (address)_data;
}
- int trap_state() {
+ int trap_state() const {
return data()->trap_state();
}
void set_trap_state(int new_state) {
@@ -378,58 +385,68 @@
}
// Type checking
- virtual bool is_BitData() { return false; }
- virtual bool is_CounterData() { return false; }
- virtual bool is_JumpData() { return false; }
- virtual bool is_ReceiverTypeData(){ return false; }
- virtual bool is_VirtualCallData() { return false; }
- virtual bool is_RetData() { return false; }
- virtual bool is_BranchData() { return false; }
- virtual bool is_ArrayData() { return false; }
- virtual bool is_MultiBranchData() { return false; }
- virtual bool is_ArgInfoData() { return false; }
+ virtual bool is_BitData() const { return false; }
+ virtual bool is_CounterData() const { return false; }
+ virtual bool is_JumpData() const { return false; }
+ virtual bool is_ReceiverTypeData()const { return false; }
+ virtual bool is_VirtualCallData() const { return false; }
+ virtual bool is_RetData() const { return false; }
+ virtual bool is_BranchData() const { return false; }
+ virtual bool is_ArrayData() const { return false; }
+ virtual bool is_MultiBranchData() const { return false; }
+ virtual bool is_ArgInfoData() const { return false; }
+ virtual bool is_CallTypeData() const { return false; }
+ virtual bool is_VirtualCallTypeData()const { return false; }
- BitData* as_BitData() {
+ BitData* as_BitData() const {
assert(is_BitData(), "wrong type");
return is_BitData() ? (BitData*) this : NULL;
}
- CounterData* as_CounterData() {
+ CounterData* as_CounterData() const {
assert(is_CounterData(), "wrong type");
return is_CounterData() ? (CounterData*) this : NULL;
}
- JumpData* as_JumpData() {
+ JumpData* as_JumpData() const {
assert(is_JumpData(), "wrong type");
return is_JumpData() ? (JumpData*) this : NULL;
}
- ReceiverTypeData* as_ReceiverTypeData() {
+ ReceiverTypeData* as_ReceiverTypeData() const {
assert(is_ReceiverTypeData(), "wrong type");
return is_ReceiverTypeData() ? (ReceiverTypeData*)this : NULL;
}
- VirtualCallData* as_VirtualCallData() {
+ VirtualCallData* as_VirtualCallData() const {
assert(is_VirtualCallData(), "wrong type");
return is_VirtualCallData() ? (VirtualCallData*)this : NULL;
}
- RetData* as_RetData() {
+ RetData* as_RetData() const {
assert(is_RetData(), "wrong type");
return is_RetData() ? (RetData*) this : NULL;
}
- BranchData* as_BranchData() {
+ BranchData* as_BranchData() const {
assert(is_BranchData(), "wrong type");
return is_BranchData() ? (BranchData*) this : NULL;
}
- ArrayData* as_ArrayData() {
+ ArrayData* as_ArrayData() const {
assert(is_ArrayData(), "wrong type");
return is_ArrayData() ? (ArrayData*) this : NULL;
}
- MultiBranchData* as_MultiBranchData() {
+ MultiBranchData* as_MultiBranchData() const {
assert(is_MultiBranchData(), "wrong type");
return is_MultiBranchData() ? (MultiBranchData*)this : NULL;
}
- ArgInfoData* as_ArgInfoData() {
+ ArgInfoData* as_ArgInfoData() const {
assert(is_ArgInfoData(), "wrong type");
return is_ArgInfoData() ? (ArgInfoData*)this : NULL;
}
+ CallTypeData* as_CallTypeData() const {
+ assert(is_CallTypeData(), "wrong type");
+ return is_CallTypeData() ? (CallTypeData*)this : NULL;
+ }
+ VirtualCallTypeData* as_VirtualCallTypeData() const {
+ assert(is_VirtualCallTypeData(), "wrong type");
+ return is_VirtualCallTypeData() ? (VirtualCallTypeData*)this : NULL;
+ }
// Subclass specific initialization
@@ -443,15 +460,15 @@
// an oop in a ProfileData to the ci equivalent. Generally speaking,
// most ProfileData don't require any translation, so we provide the null
// translation here, and the required translators are in the ci subclasses.
- virtual void translate_from(ProfileData* data) {}
+ virtual void translate_from(const ProfileData* data) {}
- virtual void print_data_on(outputStream* st) {
+ virtual void print_data_on(outputStream* st) const {
ShouldNotReachHere();
}
#ifndef PRODUCT
- void print_shared(outputStream* st, const char* name);
- void tab(outputStream* st);
+ void print_shared(outputStream* st, const char* name) const;
+ void tab(outputStream* st, bool first = false) const;
#endif
};
@@ -470,13 +487,13 @@
BitData(DataLayout* layout) : ProfileData(layout) {
}
- virtual bool is_BitData() { return true; }
+ virtual bool is_BitData() const { return true; }
static int static_cell_count() {
return bit_cell_count;
}
- virtual int cell_count() {
+ virtual int cell_count() const {
return static_cell_count();
}
@@ -498,7 +515,7 @@
}
#ifndef PRODUCT
- void print_data_on(outputStream* st);
+ void print_data_on(outputStream* st) const;
#endif
};
@@ -514,18 +531,18 @@
public:
CounterData(DataLayout* layout) : BitData(layout) {}
- virtual bool is_CounterData() { return true; }
+ virtual bool is_CounterData() const { return true; }
static int static_cell_count() {
return counter_cell_count;
}
- virtual int cell_count() {
+ virtual int cell_count() const {
return static_cell_count();
}
// Direct accessor
- uint count() {
+ uint count() const {
return uint_at(count_off);
}
@@ -542,7 +559,7 @@
}
#ifndef PRODUCT
- void print_data_on(outputStream* st);
+ void print_data_on(outputStream* st) const;
#endif
};
@@ -570,18 +587,18 @@
layout->tag() == DataLayout::branch_data_tag, "wrong type");
}
- virtual bool is_JumpData() { return true; }
+ virtual bool is_JumpData() const { return true; }
static int static_cell_count() {
return jump_cell_count;
}
- virtual int cell_count() {
+ virtual int cell_count() const {
return static_cell_count();
}
// Direct accessor
- uint taken() {
+ uint taken() const {
return uint_at(taken_off_set);
}
@@ -598,7 +615,7 @@
return cnt;
}
- int displacement() {
+ int displacement() const {
return int_at(displacement_off_set);
}
@@ -615,7 +632,418 @@
void post_initialize(BytecodeStream* stream, MethodData* mdo);
#ifndef PRODUCT
- void print_data_on(outputStream* st);
+ void print_data_on(outputStream* st) const;
+#endif
+};
+
+// Entries in a ProfileData object to record types: it can either be
+// none (no profile), unknown (conflicting profile data) or a klass if
+// a single one is seen. Whether a null reference was seen is also
+// recorded. No counter is associated with the type and a single type
+// is tracked (unlike VirtualCallData).
+class TypeEntries {
+
+public:
+
+ // A single cell is used to record information for a type:
+ // - the cell is initialized to 0
+ // - when a type is discovered it is stored in the cell
+ // - bit zero of the cell is used to record whether a null reference
+ // was encountered or not
+ // - bit 1 is set to record a conflict in the type information
+
+ enum {
+ null_seen = 1,
+ type_mask = ~null_seen,
+ type_unknown = 2,
+ status_bits = null_seen | type_unknown,
+ type_klass_mask = ~status_bits
+ };
+
+ // what to initialize a cell to
+ static intptr_t type_none() {
+ return 0;
+ }
+
+ // null seen = bit 0 set?
+ static bool was_null_seen(intptr_t v) {
+ return (v & null_seen) != 0;
+ }
+
+ // conflicting type information = bit 1 set?
+ static bool is_type_unknown(intptr_t v) {
+ return (v & type_unknown) != 0;
+ }
+
+ // not type information yet = all bits cleared, ignoring bit 0?
+ static bool is_type_none(intptr_t v) {
+ return (v & type_mask) == 0;
+ }
+
+ // recorded type: cell without bit 0 and 1
+ static intptr_t klass_part(intptr_t v) {
+ intptr_t r = v & type_klass_mask;
+ assert (r != 0, "invalid");
+ return r;
+ }
+
+ // type recorded
+ static Klass* valid_klass(intptr_t k) {
+ if (!is_type_none(k) &&
+ !is_type_unknown(k)) {
+ return (Klass*)klass_part(k);
+ } else {
+ return NULL;
+ }
+ }
+
+ static intptr_t with_status(intptr_t k, intptr_t in) {
+ return k | (in & status_bits);
+ }
+
+ static intptr_t with_status(Klass* k, intptr_t in) {
+ return with_status((intptr_t)k, in);
+ }
+
+#ifndef PRODUCT
+ static void print_klass(outputStream* st, intptr_t k);
+#endif
+
+ // GC support
+ static bool is_loader_alive(BoolObjectClosure* is_alive_cl, intptr_t p);
+
+protected:
+ // ProfileData object these entries are part of
+ ProfileData* _pd;
+ // offset within the ProfileData object where the entries start
+ const int _base_off;
+
+ TypeEntries(int base_off)
+ : _base_off(base_off), _pd(NULL) {}
+
+ void set_intptr_at(int index, intptr_t value) {
+ _pd->set_intptr_at(index, value);
+ }
+
+ intptr_t intptr_at(int index) const {
+ return _pd->intptr_at(index);
+ }
+
+public:
+ void set_profile_data(ProfileData* pd) {
+ _pd = pd;
+ }
+};
+
+// Type entries used for arguments passed at a call and parameters on
+// method entry. 2 cells per entry: one for the type encoded as in
+// TypeEntries and one initialized with the stack slot where the
+// profiled object is to be found so that the interpreter can locate
+// it quickly.
+class TypeStackSlotEntries : public TypeEntries {
+
+private:
+ enum {
+ stack_slot_entry,
+ type_entry,
+ per_arg_cell_count
+ };
+
+ // offset of cell for stack slot for entry i within ProfileData object
+ int stack_slot_offset(int i) const {
+ return _base_off + stack_slot_local_offset(i);
+ }
+
+protected:
+ const int _number_of_entries;
+
+ // offset of cell for type for entry i within ProfileData object
+ int type_offset(int i) const {
+ return _base_off + type_local_offset(i);
+ }
+
+public:
+
+ TypeStackSlotEntries(int base_off, int nb_entries)
+ : TypeEntries(base_off), _number_of_entries(nb_entries) {}
+
+ static int compute_cell_count(Symbol* signature, int max);
+
+ void post_initialize(Symbol* signature, bool has_receiver);
+
+ // offset of cell for stack slot for entry i within this block of cells for a TypeStackSlotEntries
+ static int stack_slot_local_offset(int i) {
+ return i * per_arg_cell_count + stack_slot_entry;
+ }
+
+ // offset of cell for type for entry i within this block of cells for a TypeStackSlotEntries
+ static int type_local_offset(int i) {
+ return i * per_arg_cell_count + type_entry;
+ }
+
+ // stack slot for entry i
+ uint stack_slot(int i) const {
+ assert(i >= 0 && i < _number_of_entries, "oob");
+ return _pd->uint_at(stack_slot_offset(i));
+ }
+
+ // set stack slot for entry i
+ void set_stack_slot(int i, uint num) {
+ assert(i >= 0 && i < _number_of_entries, "oob");
+ _pd->set_uint_at(stack_slot_offset(i), num);
+ }
+
+ // type for entry i
+ intptr_t type(int i) const {
+ assert(i >= 0 && i < _number_of_entries, "oob");
+ return _pd->intptr_at(type_offset(i));
+ }
+
+ // set type for entry i
+ void set_type(int i, intptr_t k) {
+ assert(i >= 0 && i < _number_of_entries, "oob");
+ _pd->set_intptr_at(type_offset(i), k);
+ }
+
+ static ByteSize per_arg_size() {
+ return in_ByteSize(per_arg_cell_count * DataLayout::cell_size);
+ }
+
+ static int per_arg_count() {
+ return per_arg_cell_count ;
+ }
+
+ // GC support
+ void clean_weak_klass_links(BoolObjectClosure* is_alive_closure);
+
+#ifndef PRODUCT
+ void print_data_on(outputStream* st) const;
+#endif
+};
+
+// Type entry used for return from a call. A single cell to record the
+// type.
+class ReturnTypeEntry : public TypeEntries {
+
+private:
+ enum {
+ cell_count = 1
+ };
+
+public:
+ ReturnTypeEntry(int base_off)
+ : TypeEntries(base_off) {}
+
+ void post_initialize() {
+ set_type(type_none());
+ }
+
+ intptr_t type() const {
+ return _pd->intptr_at(_base_off);
+ }
+
+ void set_type(intptr_t k) {
+ _pd->set_intptr_at(_base_off, k);
+ }
+
+ static int static_cell_count() {
+ return cell_count;
+ }
+
+ static ByteSize size() {
+ return in_ByteSize(cell_count * DataLayout::cell_size);
+ }
+
+ ByteSize type_offset() {
+ return DataLayout::cell_offset(_base_off);
+ }
+
+ // GC support
+ void clean_weak_klass_links(BoolObjectClosure* is_alive_closure);
+
+#ifndef PRODUCT
+ void print_data_on(outputStream* st) const;
+#endif
+};
+
+// Entries to collect type information at a call: contains arguments
+// (TypeStackSlotEntries), a return type (ReturnTypeEntry) and a
+// number of cells. Because the number of cells for the return type is
+// smaller than the number of cells for the type of an arguments, the
+// number of cells is used to tell how many arguments are profiled and
+// whether a return value is profiled. See has_arguments() and
+// has_return().
+class TypeEntriesAtCall {
+private:
+ static int stack_slot_local_offset(int i) {
+ return header_cell_count() + TypeStackSlotEntries::stack_slot_local_offset(i);
+ }
+
+ static int argument_type_local_offset(int i) {
+ return header_cell_count() + TypeStackSlotEntries::type_local_offset(i);;
+ }
+
+public:
+
+ static int header_cell_count() {
+ return 1;
+ }
+
+ static int cell_count_local_offset() {
+ return 0;
+ }
+
+ static int compute_cell_count(BytecodeStream* stream);
+
+ static void initialize(DataLayout* dl, int base, int cell_count) {
+ int off = base + cell_count_local_offset();
+ dl->set_cell_at(off, cell_count - base - header_cell_count());
+ }
+
+ static bool arguments_profiling_enabled();
+ static bool return_profiling_enabled();
+
+ // Code generation support
+ static ByteSize cell_count_offset() {
+ return in_ByteSize(cell_count_local_offset() * DataLayout::cell_size);
+ }
+
+ static ByteSize args_data_offset() {
+ return in_ByteSize(header_cell_count() * DataLayout::cell_size);
+ }
+
+ static ByteSize stack_slot_offset(int i) {
+ return in_ByteSize(stack_slot_local_offset(i) * DataLayout::cell_size);
+ }
+
+ static ByteSize argument_type_offset(int i) {
+ return in_ByteSize(argument_type_local_offset(i) * DataLayout::cell_size);
+ }
+};
+
+// CallTypeData
+//
+// A CallTypeData is used to access profiling information about a non
+// virtual call for which we collect type information about arguments
+// and return value.
+class CallTypeData : public CounterData {
+private:
+ // entries for arguments if any
+ TypeStackSlotEntries _args;
+ // entry for return type if any
+ ReturnTypeEntry _ret;
+
+ int cell_count_global_offset() const {
+ return CounterData::static_cell_count() + TypeEntriesAtCall::cell_count_local_offset();
+ }
+
+ // number of cells not counting the header
+ int cell_count_no_header() const {
+ return uint_at(cell_count_global_offset());
+ }
+
+ void check_number_of_arguments(int total) {
+ assert(number_of_arguments() == total, "should be set in DataLayout::initialize");
+ }
+
+protected:
+ // An entry for a return value takes less space than an entry for an
+ // argument so if the number of cells exceeds the number of cells
+ // needed for an argument, this object contains type information for
+ // at least one argument.
+ bool has_arguments() const {
+ bool res = cell_count_no_header() >= TypeStackSlotEntries::per_arg_count();
+ assert (!res || TypeEntriesAtCall::arguments_profiling_enabled(), "no profiling of arguments");
+ return res;
+ }
+
+public:
+ CallTypeData(DataLayout* layout) :
+ CounterData(layout),
+ _args(CounterData::static_cell_count()+TypeEntriesAtCall::header_cell_count(), number_of_arguments()),
+ _ret(cell_count() - ReturnTypeEntry::static_cell_count())
+ {
+ assert(layout->tag() == DataLayout::call_type_data_tag, "wrong type");
+ // Some compilers (VC++) don't want this passed in member initialization list
+ _args.set_profile_data(this);
+ _ret.set_profile_data(this);
+ }
+
+ const TypeStackSlotEntries* args() const {
+ assert(has_arguments(), "no profiling of arguments");
+ return &_args;
+ }
+
+ const ReturnTypeEntry* ret() const {
+ assert(has_return(), "no profiling of return value");
+ return &_ret;
+ }
+
+ virtual bool is_CallTypeData() const { return true; }
+
+ static int static_cell_count() {
+ return -1;
+ }
+
+ static int compute_cell_count(BytecodeStream* stream) {
+ return CounterData::static_cell_count() + TypeEntriesAtCall::compute_cell_count(stream);
+ }
+
+ static void initialize(DataLayout* dl, int cell_count) {
+ TypeEntriesAtCall::initialize(dl, CounterData::static_cell_count(), cell_count);
+ }
+
+ virtual void post_initialize(BytecodeStream* stream, MethodData* mdo);
+
+ virtual int cell_count() const {
+ return CounterData::static_cell_count() +
+ TypeEntriesAtCall::header_cell_count() +
+ int_at_unchecked(cell_count_global_offset());
+ }
+
+ int number_of_arguments() const {
+ return cell_count_no_header() / TypeStackSlotEntries::per_arg_count();
+ }
+
+ void set_argument_type(int i, Klass* k) {
+ assert(has_arguments(), "no arguments!");
+ intptr_t current = _args.type(i);
+ _args.set_type(i, TypeEntries::with_status(k, current));
+ }
+
+ void set_return_type(Klass* k) {
+ assert(has_return(), "no return!");
+ intptr_t current = _ret.type();
+ _ret.set_type(TypeEntries::with_status(k, current));
+ }
+
+ // An entry for a return value takes less space than an entry for an
+ // argument, so if the remainder of the number of cells divided by
+ // the number of cells for an argument is not null, a return value
+ // is profiled in this object.
+ bool has_return() const {
+ bool res = (cell_count_no_header() % TypeStackSlotEntries::per_arg_count()) != 0;
+ assert (!res || TypeEntriesAtCall::return_profiling_enabled(), "no profiling of return values");
+ return res;
+ }
+
+ // Code generation support
+ static ByteSize args_data_offset() {
+ return cell_offset(CounterData::static_cell_count()) + TypeEntriesAtCall::args_data_offset();
+ }
+
+ // GC support
+ virtual void clean_weak_klass_links(BoolObjectClosure* is_alive_closure) {
+ if (has_arguments()) {
+ _args.clean_weak_klass_links(is_alive_closure);
+ }
+ if (has_return()) {
+ _ret.clean_weak_klass_links(is_alive_closure);
+ }
+ }
+
+#ifndef PRODUCT
+ virtual void print_data_on(outputStream* st) const;
#endif
};
@@ -636,16 +1064,17 @@
public:
ReceiverTypeData(DataLayout* layout) : CounterData(layout) {
assert(layout->tag() == DataLayout::receiver_type_data_tag ||
- layout->tag() == DataLayout::virtual_call_data_tag, "wrong type");
+ layout->tag() == DataLayout::virtual_call_data_tag ||
+ layout->tag() == DataLayout::virtual_call_type_data_tag, "wrong type");
}
- virtual bool is_ReceiverTypeData() { return true; }
+ virtual bool is_ReceiverTypeData() const { return true; }
static int static_cell_count() {
return counter_cell_count + (uint) TypeProfileWidth * receiver_type_row_cell_count;
}
- virtual int cell_count() {
+ virtual int cell_count() const {
return static_cell_count();
}
@@ -660,7 +1089,7 @@
return count0_offset + row * receiver_type_row_cell_count;
}
- Klass* receiver(uint row) {
+ Klass* receiver(uint row) const {
assert(row < row_limit(), "oob");
Klass* recv = (Klass*)intptr_at(receiver_cell_index(row));
@@ -673,7 +1102,7 @@
set_intptr_at(receiver_cell_index(row), (uintptr_t)k);
}
- uint receiver_count(uint row) {
+ uint receiver_count(uint row) const {
assert(row < row_limit(), "oob");
return uint_at(receiver_count_cell_index(row));
}
@@ -721,8 +1150,8 @@
virtual void clean_weak_klass_links(BoolObjectClosure* is_alive_closure);
#ifndef PRODUCT
- void print_receiver_data_on(outputStream* st);
- void print_data_on(outputStream* st);
+ void print_receiver_data_on(outputStream* st) const;
+ void print_data_on(outputStream* st) const;
#endif
};
@@ -733,10 +1162,11 @@
class VirtualCallData : public ReceiverTypeData {
public:
VirtualCallData(DataLayout* layout) : ReceiverTypeData(layout) {
- assert(layout->tag() == DataLayout::virtual_call_data_tag, "wrong type");
+ assert(layout->tag() == DataLayout::virtual_call_data_tag ||
+ layout->tag() == DataLayout::virtual_call_type_data_tag, "wrong type");
}
- virtual bool is_VirtualCallData() { return true; }
+ virtual bool is_VirtualCallData() const { return true; }
static int static_cell_count() {
// At this point we could add more profile state, e.g., for arguments.
@@ -744,7 +1174,7 @@
return ReceiverTypeData::static_cell_count();
}
- virtual int cell_count() {
+ virtual int cell_count() const {
return static_cell_count();
}
@@ -754,7 +1184,134 @@
}
#ifndef PRODUCT
- void print_data_on(outputStream* st);
+ void print_data_on(outputStream* st) const;
+#endif
+};
+
+// VirtualCallTypeData
+//
+// A VirtualCallTypeData is used to access profiling information about
+// a virtual call for which we collect type information about
+// arguments and return value.
+class VirtualCallTypeData : public VirtualCallData {
+private:
+ // entries for arguments if any
+ TypeStackSlotEntries _args;
+ // entry for return type if any
+ ReturnTypeEntry _ret;
+
+ int cell_count_global_offset() const {
+ return VirtualCallData::static_cell_count() + TypeEntriesAtCall::cell_count_local_offset();
+ }
+
+ // number of cells not counting the header
+ int cell_count_no_header() const {
+ return uint_at(cell_count_global_offset());
+ }
+
+ void check_number_of_arguments(int total) {
+ assert(number_of_arguments() == total, "should be set in DataLayout::initialize");
+ }
+
+protected:
+ // An entry for a return value takes less space than an entry for an
+ // argument so if the number of cells exceeds the number of cells
+ // needed for an argument, this object contains type information for
+ // at least one argument.
+ bool has_arguments() const {
+ bool res = cell_count_no_header() >= TypeStackSlotEntries::per_arg_count();
+ assert (!res || TypeEntriesAtCall::arguments_profiling_enabled(), "no profiling of arguments");
+ return res;
+ }
+
+public:
+ VirtualCallTypeData(DataLayout* layout) :
+ VirtualCallData(layout),
+ _args(VirtualCallData::static_cell_count()+TypeEntriesAtCall::header_cell_count(), number_of_arguments()),
+ _ret(cell_count() - ReturnTypeEntry::static_cell_count())
+ {
+ assert(layout->tag() == DataLayout::virtual_call_type_data_tag, "wrong type");
+ // Some compilers (VC++) don't want this passed in member initialization list
+ _args.set_profile_data(this);
+ _ret.set_profile_data(this);
+ }
+
+ const TypeStackSlotEntries* args() const {
+ assert(has_arguments(), "no profiling of arguments");
+ return &_args;
+ }
+
+ const ReturnTypeEntry* ret() const {
+ assert(has_return(), "no profiling of return value");
+ return &_ret;
+ }
+
+ virtual bool is_VirtualCallTypeData() const { return true; }
+
+ static int static_cell_count() {
+ return -1;
+ }
+
+ static int compute_cell_count(BytecodeStream* stream) {
+ return VirtualCallData::static_cell_count() + TypeEntriesAtCall::compute_cell_count(stream);
+ }
+
+ static void initialize(DataLayout* dl, int cell_count) {
+ TypeEntriesAtCall::initialize(dl, VirtualCallData::static_cell_count(), cell_count);
+ }
+
+ virtual void post_initialize(BytecodeStream* stream, MethodData* mdo);
+
+ virtual int cell_count() const {
+ return VirtualCallData::static_cell_count() +
+ TypeEntriesAtCall::header_cell_count() +
+ int_at_unchecked(cell_count_global_offset());
+ }
+
+ int number_of_arguments() const {
+ return cell_count_no_header() / TypeStackSlotEntries::per_arg_count();
+ }
+
+ void set_argument_type(int i, Klass* k) {
+ assert(has_arguments(), "no arguments!");
+ intptr_t current = _args.type(i);
+ _args.set_type(i, TypeEntries::with_status(k, current));
+ }
+
+ void set_return_type(Klass* k) {
+ assert(has_return(), "no return!");
+ intptr_t current = _ret.type();
+ _ret.set_type(TypeEntries::with_status(k, current));
+ }
+
+ // An entry for a return value takes less space than an entry for an
+ // argument, so if the remainder of the number of cells divided by
+ // the number of cells for an argument is not null, a return value
+ // is profiled in this object.
+ bool has_return() const {
+ bool res = (cell_count_no_header() % TypeStackSlotEntries::per_arg_count()) != 0;
+ assert (!res || TypeEntriesAtCall::return_profiling_enabled(), "no profiling of return values");
+ return res;
+ }
+
+ // Code generation support
+ static ByteSize args_data_offset() {
+ return cell_offset(VirtualCallData::static_cell_count()) + TypeEntriesAtCall::args_data_offset();
+ }
+
+ // GC support
+ virtual void clean_weak_klass_links(BoolObjectClosure* is_alive_closure) {
+ ReceiverTypeData::clean_weak_klass_links(is_alive_closure);
+ if (has_arguments()) {
+ _args.clean_weak_klass_links(is_alive_closure);
+ }
+ if (has_return()) {
+ _ret.clean_weak_klass_links(is_alive_closure);
+ }
+ }
+
+#ifndef PRODUCT
+ virtual void print_data_on(outputStream* st) const;
#endif
};
@@ -797,7 +1354,7 @@
assert(layout->tag() == DataLayout::ret_data_tag, "wrong type");
}
- virtual bool is_RetData() { return true; }
+ virtual bool is_RetData() const { return true; }
enum {
no_bci = -1 // value of bci when bci1/2 are not in use.
@@ -807,7 +1364,7 @@
return counter_cell_count + (uint) BciProfileWidth * ret_row_cell_count;
}
- virtual int cell_count() {
+ virtual int cell_count() const {
return static_cell_count();
}
@@ -825,13 +1382,13 @@
}
// Direct accessors
- int bci(uint row) {
+ int bci(uint row) const {
return int_at(bci_cell_index(row));
}
- uint bci_count(uint row) {
+ uint bci_count(uint row) const {
return uint_at(bci_count_cell_index(row));
}
- int bci_displacement(uint row) {
+ int bci_displacement(uint row) const {
return int_at(bci_displacement_cell_index(row));
}
@@ -853,7 +1410,7 @@
void post_initialize(BytecodeStream* stream, MethodData* mdo);
#ifndef PRODUCT
- void print_data_on(outputStream* st);
+ void print_data_on(outputStream* st) const;
#endif
};
@@ -878,18 +1435,18 @@
assert(layout->tag() == DataLayout::branch_data_tag, "wrong type");
}
- virtual bool is_BranchData() { return true; }
+ virtual bool is_BranchData() const { return true; }
static int static_cell_count() {
return branch_cell_count;
}
- virtual int cell_count() {
+ virtual int cell_count() const {
return static_cell_count();
}
// Direct accessor
- uint not_taken() {
+ uint not_taken() const {
return uint_at(not_taken_off_set);
}
@@ -917,7 +1474,7 @@
void post_initialize(BytecodeStream* stream, MethodData* mdo);
#ifndef PRODUCT
- void print_data_on(outputStream* st);
+ void print_data_on(outputStream* st) const;
#endif
};
@@ -935,15 +1492,15 @@
array_start_off_set
};
- uint array_uint_at(int index) {
+ uint array_uint_at(int index) const {
int aindex = index + array_start_off_set;
return uint_at(aindex);
}
- int array_int_at(int index) {
+ int array_int_at(int index) const {
int aindex = index + array_start_off_set;
return int_at(aindex);
}
- oop array_oop_at(int index) {
+ oop array_oop_at(int index) const {
int aindex = index + array_start_off_set;
return oop_at(aindex);
}
@@ -960,17 +1517,17 @@
public:
ArrayData(DataLayout* layout) : ProfileData(layout) {}
- virtual bool is_ArrayData() { return true; }
+ virtual bool is_ArrayData() const { return true; }
static int static_cell_count() {
return -1;
}
- int array_len() {
+ int array_len() const {
return int_at_unchecked(array_len_off_set);
}
- virtual int cell_count() {
+ virtual int cell_count() const {
return array_len() + 1;
}
@@ -1017,29 +1574,29 @@
assert(layout->tag() == DataLayout::multi_branch_data_tag, "wrong type");
}
- virtual bool is_MultiBranchData() { return true; }
+ virtual bool is_MultiBranchData() const { return true; }
static int compute_cell_count(BytecodeStream* stream);
- int number_of_cases() {
+ int number_of_cases() const {
int alen = array_len() - 2; // get rid of default case here.
assert(alen % per_case_cell_count == 0, "must be even");
return (alen / per_case_cell_count);
}
- uint default_count() {
+ uint default_count() const {
return array_uint_at(default_count_off_set);
}
- int default_displacement() {
+ int default_displacement() const {
return array_int_at(default_disaplacement_off_set);
}
- uint count_at(int index) {
+ uint count_at(int index) const {
return array_uint_at(case_array_start +
index * per_case_cell_count +
relative_count_off_set);
}
- int displacement_at(int index) {
+ int displacement_at(int index) const {
return array_int_at(case_array_start +
index * per_case_cell_count +
relative_displacement_off_set);
@@ -1074,7 +1631,7 @@
void post_initialize(BytecodeStream* stream, MethodData* mdo);
#ifndef PRODUCT
- void print_data_on(outputStream* st);
+ void print_data_on(outputStream* st) const;
#endif
};
@@ -1085,14 +1642,14 @@
assert(layout->tag() == DataLayout::arg_info_data_tag, "wrong type");
}
- virtual bool is_ArgInfoData() { return true; }
+ virtual bool is_ArgInfoData() const { return true; }
- int number_of_args() {
+ int number_of_args() const {
return array_len();
}
- uint arg_modified(int arg) {
+ uint arg_modified(int arg) const {
return array_uint_at(arg);
}
@@ -1101,7 +1658,7 @@
}
#ifndef PRODUCT
- void print_data_on(outputStream* st);
+ void print_data_on(outputStream* st) const;
#endif
};
@@ -1271,6 +1828,21 @@
// return the argument info cell
ArgInfoData *arg_info();
+ enum {
+ no_type_profile = 0,
+ type_profile_jsr292 = 1,
+ type_profile_all = 2
+ };
+
+ static bool profile_jsr292(methodHandle m, int bci);
+ static int profile_arguments_flag();
+ static bool profile_arguments_jsr292_only();
+ static bool profile_all_arguments();
+ static bool profile_arguments_for_invoke(methodHandle m, int bci);
+ static int profile_return_flag();
+ static bool profile_all_return();
+ static bool profile_return_for_invoke(methodHandle m, int bci);
+
public:
static int header_size() {
return sizeof(MethodData)/wordSize;
@@ -1510,6 +2082,10 @@
// verification
void verify_on(outputStream* st);
void verify_data_on(outputStream* st);
+
+ static bool profile_arguments();
+ static bool profile_return();
+ static bool profile_return_jsr292_only();
};
#endif // SHARE_VM_OOPS_METHODDATAOOP_HPP
diff --git a/hotspot/src/share/vm/opto/bytecodeInfo.cpp b/hotspot/src/share/vm/opto/bytecodeInfo.cpp
index 2ba7b1c..885ed1d 100644
--- a/hotspot/src/share/vm/opto/bytecodeInfo.cpp
+++ b/hotspot/src/share/vm/opto/bytecodeInfo.cpp
@@ -197,6 +197,7 @@
// negative filter: should callee NOT be inlined?
bool InlineTree::should_not_inline(ciMethod *callee_method,
ciMethod* caller_method,
+ JVMState* jvms,
WarmCallInfo* wci_result) {
const char* fail_msg = NULL;
@@ -226,7 +227,7 @@
// don't inline exception code unless the top method belongs to an
// exception class
if (callee_method->holder()->is_subclass_of(C->env()->Throwable_klass())) {
- ciMethod* top_method = caller_jvms() ? caller_jvms()->of_depth(1)->method() : method();
+ ciMethod* top_method = jvms->caller() != NULL ? jvms->caller()->of_depth(1)->method() : method();
if (!top_method->holder()->is_subclass_of(C->env()->Throwable_klass())) {
wci_result->set_profit(wci_result->profit() * 0.1);
}
@@ -328,7 +329,7 @@
// return true if ok
// Relocated from "InliningClosure::try_to_inline"
bool InlineTree::try_to_inline(ciMethod* callee_method, ciMethod* caller_method,
- int caller_bci, ciCallProfile& profile,
+ int caller_bci, JVMState* jvms, ciCallProfile& profile,
WarmCallInfo* wci_result, bool& should_delay) {
// Old algorithm had funny accumulating BC-size counters
@@ -346,7 +347,7 @@
wci_result)) {
return false;
}
- if (should_not_inline(callee_method, caller_method, wci_result)) {
+ if (should_not_inline(callee_method, caller_method, jvms, wci_result)) {
return false;
}
@@ -397,24 +398,35 @@
}
// detect direct and indirect recursive inlining
- if (!callee_method->is_compiled_lambda_form()) {
+ {
// count the current method and the callee
- int inline_level = (method() == callee_method) ? 1 : 0;
- if (inline_level > MaxRecursiveInlineLevel) {
- set_msg("recursively inlining too deep");
- return false;
+ const bool is_compiled_lambda_form = callee_method->is_compiled_lambda_form();
+ int inline_level = 0;
+ if (!is_compiled_lambda_form) {
+ if (method() == callee_method) {
+ inline_level++;
+ }
}
// count callers of current method and callee
- JVMState* jvms = caller_jvms();
- while (jvms != NULL && jvms->has_method()) {
- if (jvms->method() == callee_method) {
- inline_level++;
- if (inline_level > MaxRecursiveInlineLevel) {
- set_msg("recursively inlining too deep");
- return false;
+ Node* callee_argument0 = is_compiled_lambda_form ? jvms->map()->argument(jvms, 0)->uncast() : NULL;
+ for (JVMState* j = jvms->caller(); j != NULL && j->has_method(); j = j->caller()) {
+ if (j->method() == callee_method) {
+ if (is_compiled_lambda_form) {
+ // Since compiled lambda forms are heavily reused we allow recursive inlining. If it is truly
+ // a recursion (using the same "receiver") we limit inlining otherwise we can easily blow the
+ // compiler stack.
+ Node* caller_argument0 = j->map()->argument(j, 0)->uncast();
+ if (caller_argument0 == callee_argument0) {
+ inline_level++;
+ }
+ } else {
+ inline_level++;
}
}
- jvms = jvms->caller();
+ }
+ if (inline_level > MaxRecursiveInlineLevel) {
+ set_msg("recursive inlining is too deep");
+ return false;
}
}
@@ -536,7 +548,7 @@
// Check if inlining policy says no.
WarmCallInfo wci = *(initial_wci);
bool success = try_to_inline(callee_method, caller_method, caller_bci,
- profile, &wci, should_delay);
+ jvms, profile, &wci, should_delay);
#ifndef PRODUCT
if (UseOldInlining && InlineWarmCalls
diff --git a/hotspot/src/share/vm/opto/c2compiler.cpp b/hotspot/src/share/vm/opto/c2compiler.cpp
index 85f30a5..91653bd 100644
--- a/hotspot/src/share/vm/opto/c2compiler.cpp
+++ b/hotspot/src/share/vm/opto/c2compiler.cpp
@@ -44,9 +44,6 @@
# include "adfiles/ad_ppc.hpp"
#endif
-
-volatile int C2Compiler::_runtimes = uninitialized;
-
// register information defined by ADLC
extern const char register_save_policy[];
extern const int register_save_type[];
@@ -57,7 +54,7 @@
const char* C2Compiler::retry_no_escape_analysis() {
return "retry without escape analysis";
}
-void C2Compiler::initialize_runtime() {
+bool C2Compiler::init_c2_runtime() {
// Check assumptions used while running ADLC
Compile::adlc_verification();
@@ -90,41 +87,31 @@
CompilerThread* thread = CompilerThread::current();
- HandleMark handle_mark(thread);
-
- OptoRuntime::generate(thread->env());
-
+ HandleMark handle_mark(thread);
+ return OptoRuntime::generate(thread->env());
}
void C2Compiler::initialize() {
-
- // This method can only be called once per C2Compiler object
// The first compiler thread that gets here will initialize the
- // small amount of global state (and runtime stubs) that c2 needs.
+ // small amount of global state (and runtime stubs) that C2 needs.
// There is a race possible once at startup and then we're fine
// Note that this is being called from a compiler thread not the
// main startup thread.
-
- if (_runtimes != initialized) {
- initialize_runtimes( initialize_runtime, &_runtimes);
+ if (should_perform_init()) {
+ bool successful = C2Compiler::init_c2_runtime();
+ int new_state = (successful) ? initialized : failed;
+ set_state(new_state);
}
-
- // Mark this compiler object as ready to roll
- mark_initialized();
}
-void C2Compiler::compile_method(ciEnv* env,
- ciMethod* target,
- int entry_bci) {
- if (!is_initialized()) {
- initialize();
- }
+void C2Compiler::compile_method(ciEnv* env, ciMethod* target, int entry_bci) {
+ assert(is_initialized(), "Compiler thread must be initialized");
+
bool subsume_loads = SubsumeLoads;
- bool do_escape_analysis = DoEscapeAnalysis &&
- !env->jvmti_can_access_local_variables();
+ bool do_escape_analysis = DoEscapeAnalysis && !env->jvmti_can_access_local_variables();
bool eliminate_boxing = EliminateAutoBox;
while (!env->failing()) {
// Attempt to compile while subsuming loads into machine instructions.
diff --git a/hotspot/src/share/vm/opto/c2compiler.hpp b/hotspot/src/share/vm/opto/c2compiler.hpp
index c25f2ea..48ccc1b5 100644
--- a/hotspot/src/share/vm/opto/c2compiler.hpp
+++ b/hotspot/src/share/vm/opto/c2compiler.hpp
@@ -28,24 +28,17 @@
#include "compiler/abstractCompiler.hpp"
class C2Compiler : public AbstractCompiler {
-private:
-
- static void initialize_runtime();
+ private:
+ static bool init_c2_runtime();
public:
// Name
const char *name() { return "C2"; }
- static volatile int _runtimes;
-
#ifdef TIERED
virtual bool is_c2() { return true; };
#endif // TIERED
- // Customization
- bool needs_adapters () { return true; }
- bool needs_stubs () { return true; }
-
void initialize();
// Compilation entry point for methods
diff --git a/hotspot/src/share/vm/opto/chaitin.hpp b/hotspot/src/share/vm/opto/chaitin.hpp
index 41276ef..da98d16 100644
--- a/hotspot/src/share/vm/opto/chaitin.hpp
+++ b/hotspot/src/share/vm/opto/chaitin.hpp
@@ -52,6 +52,7 @@
class LRG : public ResourceObj {
friend class VMStructs;
public:
+ static const uint AllStack_size = 0xFFFFF; // This mask size is used to tell that the mask of this LRG supports stack positions
enum { SPILL_REG=29999 }; // Register number of a spilled LRG
double _cost; // 2 for loads/1 for stores times block freq
@@ -80,14 +81,21 @@
private:
uint _eff_degree; // Effective degree: Sum of neighbors _num_regs
public:
- int degree() const { assert( _degree_valid, "" ); return _eff_degree; }
+ int degree() const { assert( _degree_valid , "" ); return _eff_degree; }
// Degree starts not valid and any change to the IFG neighbor
// set makes it not valid.
- void set_degree( uint degree ) { _eff_degree = degree; debug_only(_degree_valid = 1;) }
+ void set_degree( uint degree ) {
+ _eff_degree = degree;
+ debug_only(_degree_valid = 1;)
+ assert(!_mask.is_AllStack() || (_mask.is_AllStack() && lo_degree()), "_eff_degree can't be bigger than AllStack_size - _num_regs if the mask supports stack registers");
+ }
// Made a change that hammered degree
void invalid_degree() { debug_only(_degree_valid=0;) }
// Incrementally modify degree. If it was correct, it should remain correct
- void inc_degree( uint mod ) { _eff_degree += mod; }
+ void inc_degree( uint mod ) {
+ _eff_degree += mod;
+ assert(!_mask.is_AllStack() || (_mask.is_AllStack() && lo_degree()), "_eff_degree can't be bigger than AllStack_size - _num_regs if the mask supports stack registers");
+ }
// Compute the degree between 2 live ranges
int compute_degree( LRG &l ) const;
@@ -95,9 +103,9 @@
RegMask _mask; // Allowed registers for this LRG
uint _mask_size; // cache of _mask.Size();
public:
- int compute_mask_size() const { return _mask.is_AllStack() ? 65535 : _mask.Size(); }
+ int compute_mask_size() const { return _mask.is_AllStack() ? AllStack_size : _mask.Size(); }
void set_mask_size( int size ) {
- assert((size == 65535) || (size == (int)_mask.Size()), "");
+ assert((size == (int)AllStack_size) || (size == (int)_mask.Size()), "");
_mask_size = size;
#ifdef ASSERT
_msize_valid=1;
diff --git a/hotspot/src/share/vm/opto/compile.cpp b/hotspot/src/share/vm/opto/compile.cpp
index 0fed4e0..19c6a97 100644
--- a/hotspot/src/share/vm/opto/compile.cpp
+++ b/hotspot/src/share/vm/opto/compile.cpp
@@ -47,6 +47,7 @@
#include "opto/machnode.hpp"
#include "opto/macro.hpp"
#include "opto/matcher.hpp"
+#include "opto/mathexactnode.hpp"
#include "opto/memnode.hpp"
#include "opto/mulnode.hpp"
#include "opto/node.hpp"
@@ -2986,6 +2987,32 @@
n->set_req(MemBarNode::Precedent, top());
}
break;
+ // Must set a control edge on all nodes that produce a FlagsProj
+ // so they can't escape the block that consumes the flags.
+ // Must also set the non throwing branch as the control
+ // for all nodes that depends on the result. Unless the node
+ // already have a control that isn't the control of the
+ // flag producer
+ case Op_FlagsProj:
+ {
+ MathExactNode* math = (MathExactNode*) n->in(0);
+ Node* ctrl = math->control_node();
+ Node* non_throwing = math->non_throwing_branch();
+ math->set_req(0, ctrl);
+
+ Node* result = math->result_node();
+ if (result != NULL) {
+ for (DUIterator_Fast jmax, j = result->fast_outs(jmax); j < jmax; j++) {
+ Node* out = result->fast_out(j);
+ if (out->in(0) == NULL) {
+ out->set_req(0, non_throwing);
+ } else if (out->in(0) == ctrl) {
+ out->set_req(0, non_throwing);
+ }
+ }
+ }
+ }
+ break;
default:
assert( !n->is_Call(), "" );
assert( !n->is_Mem(), "" );
diff --git a/hotspot/src/share/vm/opto/escape.cpp b/hotspot/src/share/vm/opto/escape.cpp
index c95226f..50afded 100644
--- a/hotspot/src/share/vm/opto/escape.cpp
+++ b/hotspot/src/share/vm/opto/escape.cpp
@@ -780,6 +780,7 @@
}
} else { // Allocate instance
if (cik->is_subclass_of(_compile->env()->Thread_klass()) ||
+ cik->is_subclass_of(_compile->env()->Reference_klass()) ||
!cik->is_instance_klass() || // StressReflectiveCode
cik->as_instance_klass()->has_finalizer()) {
es = PointsToNode::GlobalEscape;
diff --git a/hotspot/src/share/vm/opto/graphKit.cpp b/hotspot/src/share/vm/opto/graphKit.cpp
index 169acbc..7377053 100644
--- a/hotspot/src/share/vm/opto/graphKit.cpp
+++ b/hotspot/src/share/vm/opto/graphKit.cpp
@@ -2122,7 +2122,7 @@
// Null check oop. Set null-path control into Region in slot 3.
// Make a cast-not-nullness use the other not-null control. Return cast.
Node* GraphKit::null_check_oop(Node* value, Node* *null_control,
- bool never_see_null) {
+ bool never_see_null, bool safe_for_replace) {
// Initial NULL check taken path
(*null_control) = top();
Node* cast = null_check_common(value, T_OBJECT, false, null_control);
@@ -2140,6 +2140,9 @@
Deoptimization::Action_make_not_entrant);
(*null_control) = top(); // NULL path is dead
}
+ if ((*null_control) == top() && safe_for_replace) {
+ replace_in_map(value, cast);
+ }
// Cast away null-ness on the result
return cast;
@@ -2634,15 +2637,17 @@
C->set_has_split_ifs(true); // Has chance for split-if optimization
ciProfileData* data = NULL;
+ bool safe_for_replace = false;
if (java_bc() == Bytecodes::_instanceof) { // Only for the bytecode
data = method()->method_data()->bci_to_data(bci());
+ safe_for_replace = true;
}
bool never_see_null = (ProfileDynamicTypes // aggressive use of profile
&& seems_never_null(obj, data));
// Null check; get casted pointer; set region slot 3
Node* null_ctl = top();
- Node* not_null_obj = null_check_oop(obj, &null_ctl, never_see_null);
+ Node* not_null_obj = null_check_oop(obj, &null_ctl, never_see_null, safe_for_replace);
// If not_null_obj is dead, only null-path is taken
if (stopped()) { // Doing instance-of on a NULL?
@@ -2723,11 +2728,13 @@
}
ciProfileData* data = NULL;
+ bool safe_for_replace = false;
if (failure_control == NULL) { // use MDO in regular case only
assert(java_bc() == Bytecodes::_aastore ||
java_bc() == Bytecodes::_checkcast,
"interpreter profiles type checks only for these BCs");
data = method()->method_data()->bci_to_data(bci());
+ safe_for_replace = true;
}
// Make the merge point
@@ -2742,7 +2749,7 @@
// Null check; get casted pointer; set region slot 3
Node* null_ctl = top();
- Node* not_null_obj = null_check_oop(obj, &null_ctl, never_see_null);
+ Node* not_null_obj = null_check_oop(obj, &null_ctl, never_see_null, safe_for_replace);
// If not_null_obj is dead, only null-path is taken
if (stopped()) { // Doing instance-of on a NULL?
@@ -3608,7 +3615,7 @@
Node* marking = __ load(__ ctrl(), marking_adr, TypeInt::INT, active_type, Compile::AliasIdxRaw);
// if (!marking)
- __ if_then(marking, BoolTest::ne, zero); {
+ __ if_then(marking, BoolTest::ne, zero, unlikely); {
BasicType index_bt = TypeX_X->basic_type();
assert(sizeof(size_t) == type2aelembytes(index_bt), "Loading G1 PtrQueue::_index with wrong size.");
Node* index = __ load(__ ctrl(), index_adr, TypeX_X, index_bt, Compile::AliasIdxRaw);
diff --git a/hotspot/src/share/vm/opto/graphKit.hpp b/hotspot/src/share/vm/opto/graphKit.hpp
index 1fd4e86..f9c068d 100644
--- a/hotspot/src/share/vm/opto/graphKit.hpp
+++ b/hotspot/src/share/vm/opto/graphKit.hpp
@@ -378,8 +378,10 @@
// Return a cast-not-null node which depends on the not-null control.
// If never_see_null, use an uncommon trap (*null_control sees a top).
// The cast is not valid along the null path; keep a copy of the original.
+ // If safe_for_replace, then we can replace the value with the cast
+ // in the parsing map (the cast is guaranteed to dominate the map)
Node* null_check_oop(Node* value, Node* *null_control,
- bool never_see_null = false);
+ bool never_see_null = false, bool safe_for_replace = false);
// Check the null_seen bit.
bool seems_never_null(Node* obj, ciProfileData* data);
diff --git a/hotspot/src/share/vm/opto/idealGraphPrinter.cpp b/hotspot/src/share/vm/opto/idealGraphPrinter.cpp
index 9f67a65..4589f6e 100644
--- a/hotspot/src/share/vm/opto/idealGraphPrinter.cpp
+++ b/hotspot/src/share/vm/opto/idealGraphPrinter.cpp
@@ -616,7 +616,11 @@
buffer[0] = 0;
_chaitin->dump_register(node, buffer);
print_prop("reg", buffer);
- print_prop("lrg", _chaitin->_lrg_map.live_range_id(node));
+ uint lrg_id = 0;
+ if (node->_idx < _chaitin->_lrg_map.size()) {
+ lrg_id = _chaitin->_lrg_map.live_range_id(node);
+ }
+ print_prop("lrg", lrg_id);
}
node->_in_dump_cnt--;
diff --git a/hotspot/src/share/vm/opto/ifg.cpp b/hotspot/src/share/vm/opto/ifg.cpp
index db8dbea..89ed5b3 100644
--- a/hotspot/src/share/vm/opto/ifg.cpp
+++ b/hotspot/src/share/vm/opto/ifg.cpp
@@ -677,7 +677,7 @@
} else { // Common case: size 1 bound removal
if( lrg.mask().Member(r_reg) ) {
lrg.Remove(r_reg);
- lrg.set_mask_size(lrg.mask().is_AllStack() ? 65535:old_size-1);
+ lrg.set_mask_size(lrg.mask().is_AllStack() ? LRG::AllStack_size : old_size - 1);
}
}
// If 'l' goes completely dry, it must spill.
diff --git a/hotspot/src/share/vm/opto/ifnode.cpp b/hotspot/src/share/vm/opto/ifnode.cpp
index 7400e93..ee54c4f 100644
--- a/hotspot/src/share/vm/opto/ifnode.cpp
+++ b/hotspot/src/share/vm/opto/ifnode.cpp
@@ -689,6 +689,7 @@
ctrl->in(0)->in(1)->is_Bool() &&
ctrl->in(0)->in(1)->in(1)->Opcode() == Op_CmpI &&
ctrl->in(0)->in(1)->in(1)->in(2)->is_Con() &&
+ ctrl->in(0)->in(1)->in(1)->in(2) != phase->C->top() &&
ctrl->in(0)->in(1)->in(1)->in(1) == n) {
IfNode* dom_iff = ctrl->in(0)->as_If();
Node* otherproj = dom_iff->proj_out(!ctrl->as_Proj()->_con);
diff --git a/hotspot/src/share/vm/opto/mathexactnode.cpp b/hotspot/src/share/vm/opto/mathexactnode.cpp
index e15b336..7e68daf 100644
--- a/hotspot/src/share/vm/opto/mathexactnode.cpp
+++ b/hotspot/src/share/vm/opto/mathexactnode.cpp
@@ -25,9 +25,10 @@
#include "precompiled.hpp"
#include "memory/allocation.inline.hpp"
#include "opto/addnode.hpp"
+#include "opto/cfgnode.hpp"
#include "opto/machnode.hpp"
-#include "opto/mathexactnode.hpp"
#include "opto/matcher.hpp"
+#include "opto/mathexactnode.hpp"
#include "opto/subnode.hpp"
MathExactNode::MathExactNode(Node* ctrl, Node* n1, Node* n2) : MultiNode(3) {
@@ -36,6 +37,33 @@
init_req(2, n2);
}
+BoolNode* MathExactNode::bool_node() const {
+ Node* flags = flags_node();
+ BoolNode* boolnode = flags->unique_out()->as_Bool();
+ assert(boolnode != NULL, "must have BoolNode");
+ return boolnode;
+}
+
+IfNode* MathExactNode::if_node() const {
+ BoolNode* boolnode = bool_node();
+ IfNode* ifnode = boolnode->unique_out()->as_If();
+ assert(ifnode != NULL, "must have IfNode");
+ return ifnode;
+}
+
+Node* MathExactNode::control_node() const {
+ IfNode* ifnode = if_node();
+ return ifnode->in(0);
+}
+
+Node* MathExactNode::non_throwing_branch() const {
+ IfNode* ifnode = if_node();
+ if (bool_node()->_test._test == BoolTest::overflow) {
+ return ifnode->proj_out(0);
+ }
+ return ifnode->proj_out(1);
+}
+
Node* AddExactINode::match(const ProjNode* proj, const Matcher* m) {
uint ideal_reg = proj->ideal_reg();
RegMask rm;
@@ -62,15 +90,15 @@
}
if (flags != NULL) {
- BoolNode* bolnode = (BoolNode *) flags->unique_out();
- switch (bolnode->_test._test) {
+ BoolNode* boolnode = bool_node();
+ switch (boolnode->_test._test) {
case BoolTest::overflow:
// if the check is for overflow - never taken
- igvn->replace_node(bolnode, phase->intcon(0));
+ igvn->replace_node(boolnode, phase->intcon(0));
break;
case BoolTest::no_overflow:
// if the check is for no overflow - always taken
- igvn->replace_node(bolnode, phase->intcon(1));
+ igvn->replace_node(boolnode, phase->intcon(1));
break;
default:
fatal("Unexpected value of BoolTest");
diff --git a/hotspot/src/share/vm/opto/mathexactnode.hpp b/hotspot/src/share/vm/opto/mathexactnode.hpp
index 30d6499..b58482a 100644
--- a/hotspot/src/share/vm/opto/mathexactnode.hpp
+++ b/hotspot/src/share/vm/opto/mathexactnode.hpp
@@ -27,8 +27,11 @@
#include "opto/multnode.hpp"
#include "opto/node.hpp"
+#include "opto/subnode.hpp"
#include "opto/type.hpp"
+class BoolNode;
+class IfNode;
class Node;
class PhaseGVN;
@@ -49,9 +52,13 @@
virtual bool is_CFG() const { return false; }
virtual uint ideal_reg() const { return NotAMachineReg; }
- ProjNode* result_node() { return proj_out(result_proj_node); }
- ProjNode* flags_node() { return proj_out(flags_proj_node); }
+ ProjNode* result_node() const { return proj_out(result_proj_node); }
+ ProjNode* flags_node() const { return proj_out(flags_proj_node); }
+ Node* control_node() const;
+ Node* non_throwing_branch() const;
protected:
+ IfNode* if_node() const;
+ BoolNode* bool_node() const;
Node* no_overflow(PhaseGVN *phase, Node* new_result);
};
diff --git a/hotspot/src/share/vm/opto/parse.hpp b/hotspot/src/share/vm/opto/parse.hpp
index ea01b08..f88ecf1 100644
--- a/hotspot/src/share/vm/opto/parse.hpp
+++ b/hotspot/src/share/vm/opto/parse.hpp
@@ -73,6 +73,7 @@
bool try_to_inline(ciMethod* callee_method,
ciMethod* caller_method,
int caller_bci,
+ JVMState* jvms,
ciCallProfile& profile,
WarmCallInfo* wci_result,
bool& should_delay);
@@ -83,6 +84,7 @@
WarmCallInfo* wci_result);
bool should_not_inline(ciMethod* callee_method,
ciMethod* caller_method,
+ JVMState* jvms,
WarmCallInfo* wci_result);
void print_inlining(ciMethod* callee_method, int caller_bci,
bool success) const;
diff --git a/hotspot/src/share/vm/opto/parse2.cpp b/hotspot/src/share/vm/opto/parse2.cpp
index c41ca25..a910c3e 100644
--- a/hotspot/src/share/vm/opto/parse2.cpp
+++ b/hotspot/src/share/vm/opto/parse2.cpp
@@ -268,7 +268,7 @@
return adjoinRange(value, value, dest, table_index);
}
- void print(ciEnv* env) {
+ void print() {
if (is_singleton())
tty->print(" {%d}=>%d", lo(), dest());
else if (lo() == min_jint)
@@ -471,8 +471,8 @@
// These are the switch destinations hanging off the jumpnode
int i = 0;
for (SwitchRange* r = lo; r <= hi; r++) {
- for (int j = r->lo(); j <= r->hi(); j++, i++) {
- Node* input = _gvn.transform(new (C) JumpProjNode(jtn, i, r->dest(), j - lowval));
+ for (int64 j = r->lo(); j <= r->hi(); j++, i++) {
+ Node* input = _gvn.transform(new (C) JumpProjNode(jtn, i, r->dest(), (int)(j - lowval)));
{
PreserveJVMState pjvms(this);
set_control(input);
@@ -632,7 +632,7 @@
}
tty->print(" ");
for( r = lo; r <= hi; r++ ) {
- r->print(env());
+ r->print();
}
tty->print_cr("");
}
diff --git a/hotspot/src/share/vm/opto/parseHelper.cpp b/hotspot/src/share/vm/opto/parseHelper.cpp
index 5d0c2f7..2ab580b 100644
--- a/hotspot/src/share/vm/opto/parseHelper.cpp
+++ b/hotspot/src/share/vm/opto/parseHelper.cpp
@@ -343,10 +343,14 @@
// Get the Method* node.
ciMethod* m = method();
- address counters_adr = m->ensure_method_counters();
+ MethodCounters* counters_adr = m->ensure_method_counters();
+ if (counters_adr == NULL) {
+ C->record_failure("method counters allocation failed");
+ return;
+ }
Node* ctrl = control();
- const TypePtr* adr_type = TypeRawPtr::make(counters_adr);
+ const TypePtr* adr_type = TypeRawPtr::make((address) counters_adr);
Node *counters_node = makecon(adr_type);
Node* adr_iic_node = basic_plus_adr(counters_node, counters_node,
MethodCounters::interpreter_invocation_counter_offset_in_bytes());
diff --git a/hotspot/src/share/vm/opto/reg_split.cpp b/hotspot/src/share/vm/opto/reg_split.cpp
index 2c4ad87..f58a380 100644
--- a/hotspot/src/share/vm/opto/reg_split.cpp
+++ b/hotspot/src/share/vm/opto/reg_split.cpp
@@ -375,6 +375,7 @@
}
if (lidx < _lrg_map.max_lrg_id() && lrgs(lidx).reg() >= LRG::SPILL_REG) {
+ assert(Reachblock != NULL, "Reachblock must be non-NULL");
Node *rdef = Reachblock[lrg2reach[lidx]];
if (rdef) {
spill->set_req(i, rdef);
@@ -1336,7 +1337,8 @@
_lrg_map.find(pred->get_node(insert - 1)) >= lrgs_before_phi_split) {
insert--;
}
- def = split_Rematerialize(def, pred, insert, maxlrg, splits, slidx, lrg2reach, Reachblock, false);
+ // since the def cannot contain any live range input, we can pass in NULL as Reachlock parameter
+ def = split_Rematerialize(def, pred, insert, maxlrg, splits, slidx, lrg2reach, NULL, false);
if (!def) {
return 0; // Bail out
}
diff --git a/hotspot/src/share/vm/opto/runtime.cpp b/hotspot/src/share/vm/opto/runtime.cpp
index 9a278c5..6e09cb7 100644
--- a/hotspot/src/share/vm/opto/runtime.cpp
+++ b/hotspot/src/share/vm/opto/runtime.cpp
@@ -138,9 +138,10 @@
#define gen(env, var, type_func_gen, c_func, fancy_jump, pass_tls, save_arg_regs, return_pc) \
- var = generate_stub(env, type_func_gen, CAST_FROM_FN_PTR(address, c_func), #var, fancy_jump, pass_tls, save_arg_regs, return_pc)
+ var = generate_stub(env, type_func_gen, CAST_FROM_FN_PTR(address, c_func), #var, fancy_jump, pass_tls, save_arg_regs, return_pc); \
+ if (var == NULL) { return false; }
-void OptoRuntime::generate(ciEnv* env) {
+bool OptoRuntime::generate(ciEnv* env) {
generate_exception_blob();
@@ -158,7 +159,7 @@
gen(env, _multianewarrayN_Java , multianewarrayN_Type , multianewarrayN_C , 0 , true , false, false);
gen(env, _g1_wb_pre_Java , g1_wb_pre_Type , SharedRuntime::g1_wb_pre , 0 , false, false, false);
gen(env, _g1_wb_post_Java , g1_wb_post_Type , SharedRuntime::g1_wb_post , 0 , false, false, false);
- gen(env, _complete_monitor_locking_Java , complete_monitor_enter_Type , SharedRuntime::complete_monitor_locking_C , 0 , false, false, false);
+ gen(env, _complete_monitor_locking_Java , complete_monitor_enter_Type , SharedRuntime::complete_monitor_locking_C, 0, false, false, false);
gen(env, _rethrow_Java , rethrow_Type , rethrow_C , 2 , true , false, true );
gen(env, _slow_arraycopy_Java , slow_arraycopy_Type , SharedRuntime::slow_arraycopy_C , 0 , false, false, false);
@@ -168,7 +169,7 @@
gen(env, _zap_dead_Java_locals_Java , zap_dead_locals_Type , zap_dead_Java_locals_C , 0 , false, true , false );
gen(env, _zap_dead_native_locals_Java , zap_dead_locals_Type , zap_dead_native_locals_C , 0 , false, true , false );
# endif
-
+ return true;
}
#undef gen
@@ -976,30 +977,36 @@
address handler_address = NULL;
Handle exception(thread, thread->exception_oop());
+ address pc = thread->exception_pc();
+
+ // Clear out the exception oop and pc since looking up an
+ // exception handler can cause class loading, which might throw an
+ // exception and those fields are expected to be clear during
+ // normal bytecode execution.
+ thread->clear_exception_oop_and_pc();
if (TraceExceptions) {
- trace_exception(exception(), thread->exception_pc(), "");
+ trace_exception(exception(), pc, "");
}
+
// for AbortVMOnException flag
NOT_PRODUCT(Exceptions::debug_check_abort(exception));
- #ifdef ASSERT
- if (!(exception->is_a(SystemDictionary::Throwable_klass()))) {
- // should throw an exception here
- ShouldNotReachHere();
- }
- #endif
-
+#ifdef ASSERT
+ if (!(exception->is_a(SystemDictionary::Throwable_klass()))) {
+ // should throw an exception here
+ ShouldNotReachHere();
+ }
+#endif
// new exception handling: this method is entered only from adapters
// exceptions from compiled java methods are handled in compiled code
// using rethrow node
- address pc = thread->exception_pc();
nm = CodeCache::find_nmethod(pc);
assert(nm != NULL, "No NMethod found");
if (nm->is_native_method()) {
- fatal("Native mathod should not have path to exception handling");
+ fatal("Native method should not have path to exception handling");
} else {
// we are switching to old paradigm: search for exception handler in caller_frame
// instead in exception handler of caller_frame.sender()
@@ -1346,7 +1353,8 @@
tty->print(" in ");
CodeBlob* blob = CodeCache::find_blob(exception_pc);
if (blob->is_nmethod()) {
- ((nmethod*)blob)->method()->print_value();
+ nmethod* nm = blob->as_nmethod_or_null();
+ nm->method()->print_value();
} else if (blob->is_runtime_stub()) {
tty->print("<runtime-stub>");
} else {
diff --git a/hotspot/src/share/vm/opto/runtime.hpp b/hotspot/src/share/vm/opto/runtime.hpp
index b3f7ff4..aecb97f 100644
--- a/hotspot/src/share/vm/opto/runtime.hpp
+++ b/hotspot/src/share/vm/opto/runtime.hpp
@@ -203,8 +203,10 @@
static bool is_callee_saved_register(MachRegisterNumbers reg);
- // One time only generate runtime code stubs
- static void generate(ciEnv* env);
+ // One time only generate runtime code stubs. Returns true
+ // when runtime stubs have been generated successfully and
+ // false otherwise.
+ static bool generate(ciEnv* env);
// Returns the name of a stub
static const char* stub_name(address entry);
diff --git a/hotspot/src/share/vm/opto/stringopts.cpp b/hotspot/src/share/vm/opto/stringopts.cpp
index 71abc31..0306bc2 100644
--- a/hotspot/src/share/vm/opto/stringopts.cpp
+++ b/hotspot/src/share/vm/opto/stringopts.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, 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
@@ -50,10 +50,11 @@
Node* _arguments; // The list of arguments to be concatenated
GrowableArray<int> _mode; // into a String along with a mode flag
// indicating how to treat the value.
-
+ Node_List _constructors; // List of constructors (many in case of stacked concat)
Node_List _control; // List of control nodes that will be deleted
Node_List _uncommon_traps; // Uncommon traps that needs to be rewritten
// to restart at the initial JVMState.
+
public:
// Mode for converting arguments to Strings
enum {
@@ -73,6 +74,7 @@
_arguments->del_req(0);
}
+ bool validate_mem_flow();
bool validate_control_flow();
void merge_add() {
@@ -189,6 +191,10 @@
assert(!_control.contains(ctrl), "only push once");
_control.push(ctrl);
}
+ void add_constructor(Node* init) {
+ assert(!_constructors.contains(init), "only push once");
+ _constructors.push(init);
+ }
CallStaticJavaNode* end() { return _end; }
AllocateNode* begin() { return _begin; }
Node* string_alloc() { return _string_alloc; }
@@ -301,6 +307,12 @@
}
}
result->set_allocation(other->_begin);
+ for (uint i = 0; i < _constructors.size(); i++) {
+ result->add_constructor(_constructors.at(i));
+ }
+ for (uint i = 0; i < other->_constructors.size(); i++) {
+ result->add_constructor(other->_constructors.at(i));
+ }
result->_multiple = true;
return result;
}
@@ -510,7 +522,8 @@
sc->add_control(constructor);
sc->add_control(alloc);
sc->set_allocation(alloc);
- if (sc->validate_control_flow()) {
+ sc->add_constructor(constructor);
+ if (sc->validate_control_flow() && sc->validate_mem_flow()) {
return sc;
} else {
return NULL;
@@ -620,7 +633,7 @@
#endif
StringConcat* merged = sc->merge(other, arg);
- if (merged->validate_control_flow()) {
+ if (merged->validate_control_flow() && merged->validate_mem_flow()) {
#ifndef PRODUCT
if (PrintOptimizeStringConcat) {
tty->print_cr("stacking would succeed");
@@ -708,6 +721,139 @@
}
+bool StringConcat::validate_mem_flow() {
+ Compile* C = _stringopts->C;
+
+ for (uint i = 0; i < _control.size(); i++) {
+#ifndef PRODUCT
+ Node_List path;
+#endif
+ Node* curr = _control.at(i);
+ if (curr->is_Call() && curr != _begin) { // For all calls except the first allocation
+ // Now here's the main invariant in our case:
+ // For memory between the constructor, and appends, and toString we should only see bottom memory,
+ // produced by the previous call we know about.
+ if (!_constructors.contains(curr)) {
+ NOT_PRODUCT(path.push(curr);)
+ Node* mem = curr->in(TypeFunc::Memory);
+ assert(mem != NULL, "calls should have memory edge");
+ assert(!mem->is_Phi(), "should be handled by control flow validation");
+ NOT_PRODUCT(path.push(mem);)
+ while (mem->is_MergeMem()) {
+ for (uint i = 1; i < mem->req(); i++) {
+ if (i != Compile::AliasIdxBot && mem->in(i) != C->top()) {
+#ifndef PRODUCT
+ if (PrintOptimizeStringConcat) {
+ tty->print("fusion has incorrect memory flow (side effects) for ");
+ _begin->jvms()->dump_spec(tty); tty->cr();
+ path.dump();
+ }
+#endif
+ return false;
+ }
+ }
+ // skip through a potential MergeMem chain, linked through Bot
+ mem = mem->in(Compile::AliasIdxBot);
+ NOT_PRODUCT(path.push(mem);)
+ }
+ // now let it fall through, and see if we have a projection
+ if (mem->is_Proj()) {
+ // Should point to a previous known call
+ Node *prev = mem->in(0);
+ NOT_PRODUCT(path.push(prev);)
+ if (!prev->is_Call() || !_control.contains(prev)) {
+#ifndef PRODUCT
+ if (PrintOptimizeStringConcat) {
+ tty->print("fusion has incorrect memory flow (unknown call) for ");
+ _begin->jvms()->dump_spec(tty); tty->cr();
+ path.dump();
+ }
+#endif
+ return false;
+ }
+ } else {
+ assert(mem->is_Store() || mem->is_LoadStore(), err_msg_res("unexpected node type: %s", mem->Name()));
+#ifndef PRODUCT
+ if (PrintOptimizeStringConcat) {
+ tty->print("fusion has incorrect memory flow (unexpected source) for ");
+ _begin->jvms()->dump_spec(tty); tty->cr();
+ path.dump();
+ }
+#endif
+ return false;
+ }
+ } else {
+ // For memory that feeds into constructors it's more complicated.
+ // However the advantage is that any side effect that happens between the Allocate/Initialize and
+ // the constructor will have to be control-dependent on Initialize.
+ // So we actually don't have to do anything, since it's going to be caught by the control flow
+ // analysis.
+#ifdef ASSERT
+ // Do a quick verification of the control pattern between the constructor and the initialize node
+ assert(curr->is_Call(), "constructor should be a call");
+ // Go up the control starting from the constructor call
+ Node* ctrl = curr->in(0);
+ IfNode* iff = NULL;
+ RegionNode* copy = NULL;
+
+ while (true) {
+ // skip known check patterns
+ if (ctrl->is_Region()) {
+ if (ctrl->as_Region()->is_copy()) {
+ copy = ctrl->as_Region();
+ ctrl = copy->is_copy();
+ } else { // a cast
+ assert(ctrl->req() == 3 &&
+ ctrl->in(1) != NULL && ctrl->in(1)->is_Proj() &&
+ ctrl->in(2) != NULL && ctrl->in(2)->is_Proj() &&
+ ctrl->in(1)->in(0) == ctrl->in(2)->in(0) &&
+ ctrl->in(1)->in(0) != NULL && ctrl->in(1)->in(0)->is_If(),
+ "must be a simple diamond");
+ Node* true_proj = ctrl->in(1)->is_IfTrue() ? ctrl->in(1) : ctrl->in(2);
+ for (SimpleDUIterator i(true_proj); i.has_next(); i.next()) {
+ Node* use = i.get();
+ assert(use == ctrl || use->is_ConstraintCast(),
+ err_msg_res("unexpected user: %s", use->Name()));
+ }
+
+ iff = ctrl->in(1)->in(0)->as_If();
+ ctrl = iff->in(0);
+ }
+ } else if (ctrl->is_IfTrue()) { // null checks, class checks
+ iff = ctrl->in(0)->as_If();
+ assert(iff->is_If(), "must be if");
+ // Verify that the other arm is an uncommon trap
+ Node* otherproj = iff->proj_out(1 - ctrl->as_Proj()->_con);
+ CallStaticJavaNode* call = otherproj->unique_out()->isa_CallStaticJava();
+ assert(strcmp(call->_name, "uncommon_trap") == 0, "must be uncommond trap");
+ ctrl = iff->in(0);
+ } else {
+ break;
+ }
+ }
+
+ assert(ctrl->is_Proj(), "must be a projection");
+ assert(ctrl->in(0)->is_Initialize(), "should be initialize");
+ for (SimpleDUIterator i(ctrl); i.has_next(); i.next()) {
+ Node* use = i.get();
+ assert(use == copy || use == iff || use == curr || use->is_CheckCastPP() || use->is_Load(),
+ err_msg_res("unexpected user: %s", use->Name()));
+ }
+#endif // ASSERT
+ }
+ }
+ }
+
+#ifndef PRODUCT
+ if (PrintOptimizeStringConcat) {
+ tty->print("fusion has correct memory flow for ");
+ _begin->jvms()->dump_spec(tty); tty->cr();
+ tty->cr();
+ }
+#endif
+ return true;
+}
+
bool StringConcat::validate_control_flow() {
// We found all the calls and arguments now lets see if it's
// safe to transform the graph as we would expect.
@@ -753,7 +899,7 @@
}
}
- // Skip backwards through the control checking for unexpected contro flow
+ // Skip backwards through the control checking for unexpected control flow
Node* ptr = _end;
bool fail = false;
while (ptr != _begin) {
@@ -936,7 +1082,7 @@
if (PrintOptimizeStringConcat && !fail) {
ttyLocker ttyl;
tty->cr();
- tty->print("fusion would succeed (%d %d) for ", null_check_count, _uncommon_traps.size());
+ tty->print("fusion has correct control flow (%d %d) for ", null_check_count, _uncommon_traps.size());
_begin->jvms()->dump_spec(tty); tty->cr();
for (int i = 0; i < num_arguments(); i++) {
argument(i)->dump();
diff --git a/hotspot/src/share/vm/prims/jni.cpp b/hotspot/src/share/vm/prims/jni.cpp
index fce0715..b5c2718 100644
--- a/hotspot/src/share/vm/prims/jni.cpp
+++ b/hotspot/src/share/vm/prims/jni.cpp
@@ -5059,6 +5059,7 @@
void TestReserveMemorySpecial_test();
void TestVirtualSpace_test();
void TestMetaspaceAux_test();
+void TestMetachunk_test();
#if INCLUDE_ALL_GCS
void TestG1BiasedArray_test();
#endif
@@ -5070,6 +5071,7 @@
run_unit_test(TestReserveMemorySpecial_test());
run_unit_test(TestVirtualSpace_test());
run_unit_test(TestMetaspaceAux_test());
+ run_unit_test(TestMetachunk_test());
run_unit_test(GlobalDefinitions::test_globals());
run_unit_test(GCTimerAllTest::all());
run_unit_test(arrayOopDesc::test_max_array_length());
diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
index 031d9ce..d1217b0 100644
--- a/hotspot/src/share/vm/runtime/arguments.cpp
+++ b/hotspot/src/share/vm/runtime/arguments.cpp
@@ -2694,8 +2694,9 @@
FLAG_SET_CMDLINE(uintx, MaxHeapSize, (uintx)long_max_heap_size);
// Xmaxf
} else if (match_option(option, "-Xmaxf", &tail)) {
- int maxf = (int)(atof(tail) * 100);
- if (maxf < 0 || maxf > 100) {
+ char* err;
+ int maxf = (int)(strtod(tail, &err) * 100);
+ if (*err != '\0' || maxf < 0 || maxf > 100) {
jio_fprintf(defaultStream::error_stream(),
"Bad max heap free percentage size: %s\n",
option->optionString);
@@ -2705,8 +2706,9 @@
}
// Xminf
} else if (match_option(option, "-Xminf", &tail)) {
- int minf = (int)(atof(tail) * 100);
- if (minf < 0 || minf > 100) {
+ char* err;
+ int minf = (int)(strtod(tail, &err) * 100);
+ if (*err != '\0' || minf < 0 || minf > 100) {
jio_fprintf(defaultStream::error_stream(),
"Bad min heap free percentage size: %s\n",
option->optionString);
diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp
index 91a9946..9e82165 100644
--- a/hotspot/src/share/vm/runtime/globals.hpp
+++ b/hotspot/src/share/vm/runtime/globals.hpp
@@ -1979,13 +1979,6 @@
develop(uintx, MetadataAllocationFailALotInterval, 1000, \
"Metadata allocation failure a lot interval") \
\
- develop(bool, MetaDataDeallocateALot, false, \
- "Deallocation bunches of metadata at intervals controlled by " \
- "MetaDataAllocateALotInterval") \
- \
- develop(uintx, MetaDataDeallocateALotInterval, 100, \
- "Metadata deallocation alot interval") \
- \
develop(bool, TraceMetadataChunkAllocation, false, \
"Trace chunk metadata allocations") \
\
@@ -2175,7 +2168,7 @@
"Minimum ratio of young generation/survivor space size") \
\
product(uintx, InitialSurvivorRatio, 8, \
- "Initial ratio of eden/survivor space size") \
+ "Initial ratio of young generation/survivor space size") \
\
product(uintx, BaseFootPrintEstimate, 256*M, \
"Estimate of footprint other than Java Heap") \
@@ -2677,6 +2670,14 @@
product(bool, AggressiveOpts, false, \
"Enable aggressive optimizations - see arguments.cpp") \
\
+ product_pd(uintx, TypeProfileLevel, \
+ "=XY, with Y, Type profiling of arguments at call" \
+ " X, Type profiling of return value at call" \
+ "X and Y in 0->off ; 1->js292 only; 2->all methods") \
+ \
+ product(intx, TypeProfileArgsLimit, 2, \
+ "max number of call arguments to consider for type profiling") \
+ \
/* statistics */ \
develop(bool, CountCompiledCalls, false, \
"Count method invocations") \
@@ -3125,10 +3126,14 @@
"class pointers are used") \
\
product(uintx, MinHeapFreeRatio, 40, \
- "The minimum percentage of heap free after GC to avoid expansion")\
+ "The minimum percentage of heap free after GC to avoid expansion."\
+ " For most GCs this applies to the old generation. In G1 it" \
+ " applies to the whole heap. Not supported by ParallelGC.") \
\
product(uintx, MaxHeapFreeRatio, 70, \
- "The maximum percentage of heap free after GC to avoid shrinking")\
+ "The maximum percentage of heap free after GC to avoid shrinking."\
+ " For most GCs this applies to the old generation. In G1 it" \
+ " applies to the whole heap. Not supported by ParallelGC.") \
\
product(intx, SoftRefLRUPolicyMSPerMB, 1000, \
"Number of milliseconds per MB of free space in the heap") \
@@ -3823,7 +3828,6 @@
product(bool, UseLockedTracing, false, \
"Use locked-tracing when doing event-based tracing")
-
/*
* Macros for factoring of globals
*/
diff --git a/hotspot/src/share/vm/runtime/java.cpp b/hotspot/src/share/vm/runtime/java.cpp
index 874765f..e33e935 100644
--- a/hotspot/src/share/vm/runtime/java.cpp
+++ b/hotspot/src/share/vm/runtime/java.cpp
@@ -183,6 +183,7 @@
collected_profiled_methods->sort(&compare_methods);
int count = collected_profiled_methods->length();
+ int total_size = 0;
if (count > 0) {
for (int index = 0; index < count; index++) {
Method* m = collected_profiled_methods->at(index);
@@ -190,10 +191,13 @@
tty->print_cr("------------------------------------------------------------------------");
//m->print_name(tty);
m->print_invocation_count();
+ tty->print_cr(" mdo size: %d bytes", m->method_data()->size_in_bytes());
tty->cr();
m->print_codes();
+ total_size += m->method_data()->size_in_bytes();
}
tty->print_cr("------------------------------------------------------------------------");
+ tty->print_cr("Total MDO size: %d bytes", total_size);
}
}
diff --git a/hotspot/src/share/vm/runtime/signature.cpp b/hotspot/src/share/vm/runtime/signature.cpp
index ce1b069..388058a 100644
--- a/hotspot/src/share/vm/runtime/signature.cpp
+++ b/hotspot/src/share/vm/runtime/signature.cpp
@@ -378,6 +378,16 @@
return result;
}
+int SignatureStream::reference_parameter_count() {
+ int args_count = 0;
+ for ( ; !at_return_type(); next()) {
+ if (is_object()) {
+ args_count++;
+ }
+ }
+ return args_count;
+}
+
bool SignatureVerifier::is_valid_signature(Symbol* sig) {
const char* signature = (const char*)sig->bytes();
ssize_t len = sig->utf8_length();
diff --git a/hotspot/src/share/vm/runtime/signature.hpp b/hotspot/src/share/vm/runtime/signature.hpp
index 33c8c82..4bd4d4b 100644
--- a/hotspot/src/share/vm/runtime/signature.hpp
+++ b/hotspot/src/share/vm/runtime/signature.hpp
@@ -401,6 +401,9 @@
// return same as_symbol except allocation of new symbols is avoided.
Symbol* as_symbol_or_null();
+
+ // count the number of references in the signature
+ int reference_parameter_count();
};
class SignatureVerifier : public StackObj {
diff --git a/hotspot/src/share/vm/runtime/thread.cpp b/hotspot/src/share/vm/runtime/thread.cpp
index 0e4295b..f645be3 100644
--- a/hotspot/src/share/vm/runtime/thread.cpp
+++ b/hotspot/src/share/vm/runtime/thread.cpp
@@ -1454,7 +1454,6 @@
_interp_only_mode = 0;
_special_runtime_exit_condition = _no_async_condition;
_pending_async_exception = NULL;
- _is_compiling = false;
_thread_stat = NULL;
_thread_stat = new ThreadStatistics();
_blocked_on_compilation = false;
@@ -1815,7 +1814,8 @@
// Call Thread.exit(). We try 3 times in case we got another Thread.stop during
// the execution of the method. If that is not enough, then we don't really care. Thread.stop
// is deprecated anyhow.
- { int count = 3;
+ if (!is_Compiler_thread()) {
+ int count = 3;
while (java_lang_Thread::threadGroup(threadObj()) != NULL && (count-- > 0)) {
EXCEPTION_MARK;
JavaValue result(T_VOID);
@@ -1828,7 +1828,6 @@
CLEAR_PENDING_EXCEPTION;
}
}
-
// notify JVMTI
if (JvmtiExport::should_post_thread_life()) {
JvmtiExport::post_thread_end(this);
@@ -3239,6 +3238,7 @@
_counters = counters;
_buffer_blob = NULL;
_scanned_nmethod = NULL;
+ _compiler = NULL;
#ifndef PRODUCT
_ideal_graph_printer = NULL;
@@ -3255,6 +3255,7 @@
}
}
+
// ======= Threads ========
// The Threads class links together all active threads, and provides
@@ -3275,8 +3276,6 @@
// All JavaThreads
#define ALL_JAVA_THREADS(X) for (JavaThread* X = _thread_list; X; X = X->next())
-void os_stream();
-
// All JavaThreads + all non-JavaThreads (i.e., every thread in the system)
void Threads::threads_do(ThreadClosure* tc) {
assert_locked_or_safepoint(Threads_lock);
diff --git a/hotspot/src/share/vm/runtime/thread.hpp b/hotspot/src/share/vm/runtime/thread.hpp
index 4d46cfa..d655df4 100644
--- a/hotspot/src/share/vm/runtime/thread.hpp
+++ b/hotspot/src/share/vm/runtime/thread.hpp
@@ -923,9 +923,6 @@
volatile address _exception_handler_pc; // PC for handler of exception
volatile int _is_method_handle_return; // true (== 1) if the current exception PC is a MethodHandle call site.
- // support for compilation
- bool _is_compiling; // is true if a compilation is active inthis thread (one compilation per thread possible)
-
// support for JNI critical regions
jint _jni_active_critical; // count of entries into JNI critical region
@@ -1005,10 +1002,6 @@
// Testers
virtual bool is_Java_thread() const { return true; }
- // compilation
- void set_is_compiling(bool f) { _is_compiling = f; }
- bool is_compiling() const { return _is_compiling; }
-
// Thread chain operations
JavaThread* next() const { return _next; }
void set_next(JavaThread* p) { _next = p; }
@@ -1283,6 +1276,11 @@
void set_exception_handler_pc(address a) { _exception_handler_pc = a; }
void set_is_method_handle_return(bool value) { _is_method_handle_return = value ? 1 : 0; }
+ void clear_exception_oop_and_pc() {
+ set_exception_oop(NULL);
+ set_exception_pc(NULL);
+ }
+
// Stack overflow support
inline size_t stack_available(address cur_sp);
address stack_yellow_zone_base()
@@ -1811,13 +1809,14 @@
private:
CompilerCounters* _counters;
- ciEnv* _env;
- CompileLog* _log;
- CompileTask* _task;
- CompileQueue* _queue;
- BufferBlob* _buffer_blob;
+ ciEnv* _env;
+ CompileLog* _log;
+ CompileTask* _task;
+ CompileQueue* _queue;
+ BufferBlob* _buffer_blob;
- nmethod* _scanned_nmethod; // nmethod being scanned by the sweeper
+ nmethod* _scanned_nmethod; // nmethod being scanned by the sweeper
+ AbstractCompiler* _compiler;
public:
@@ -1829,14 +1828,17 @@
// Hide this compiler thread from external view.
bool is_hidden_from_external_view() const { return true; }
- CompileQueue* queue() { return _queue; }
- CompilerCounters* counters() { return _counters; }
+ void set_compiler(AbstractCompiler* c) { _compiler = c; }
+ AbstractCompiler* compiler() const { return _compiler; }
+
+ CompileQueue* queue() const { return _queue; }
+ CompilerCounters* counters() const { return _counters; }
// Get/set the thread's compilation environment.
ciEnv* env() { return _env; }
void set_env(ciEnv* env) { _env = env; }
- BufferBlob* get_buffer_blob() { return _buffer_blob; }
+ BufferBlob* get_buffer_blob() const { return _buffer_blob; }
void set_buffer_blob(BufferBlob* b) { _buffer_blob = b; };
// Get/set the thread's logging information
diff --git a/hotspot/src/share/vm/runtime/vmStructs.cpp b/hotspot/src/share/vm/runtime/vmStructs.cpp
index 199dbac..ba70ec1 100644
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp
@@ -58,7 +58,7 @@
#include "memory/generation.hpp"
#include "memory/generationSpec.hpp"
#include "memory/heap.hpp"
-#include "memory/metablock.hpp"
+#include "memory/metachunk.hpp"
#include "memory/referenceType.hpp"
#include "memory/space.hpp"
#include "memory/tenuredGeneration.hpp"
@@ -917,7 +917,6 @@
volatile_nonstatic_field(JavaThread, _exception_oop, oop) \
volatile_nonstatic_field(JavaThread, _exception_pc, address) \
volatile_nonstatic_field(JavaThread, _is_method_handle_return, int) \
- nonstatic_field(JavaThread, _is_compiling, bool) \
nonstatic_field(JavaThread, _special_runtime_exit_condition, JavaThread::AsyncRequests) \
nonstatic_field(JavaThread, _saved_exception_pc, address) \
volatile_nonstatic_field(JavaThread, _thread_state, JavaThreadState) \
diff --git a/hotspot/src/share/vm/services/diagnosticCommand.cpp b/hotspot/src/share/vm/services/diagnosticCommand.cpp
index 79c922a..162010e 100644
--- a/hotspot/src/share/vm/services/diagnosticCommand.cpp
+++ b/hotspot/src/share/vm/services/diagnosticCommand.cpp
@@ -48,7 +48,7 @@
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemGCDCmd>(full_export, true, false));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<RunFinalizationDCmd>(full_export, true, false));
#if INCLUDE_SERVICES // Heap dumping/inspection supported
- DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapDumpDCmd>(full_export, true, false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapDumpDCmd>(DCmd_Source_Internal | DCmd_Source_AttachAPI, true, false));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassHistogramDCmd>(full_export, true, false));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassStatsDCmd>(full_export, true, false));
#endif // INCLUDE_SERVICES
diff --git a/hotspot/src/share/vm/services/heapDumper.cpp b/hotspot/src/share/vm/services/heapDumper.cpp
index 5622fad..c0d0104 100644
--- a/hotspot/src/share/vm/services/heapDumper.cpp
+++ b/hotspot/src/share/vm/services/heapDumper.cpp
@@ -1545,7 +1545,9 @@
// writes a HPROF_GC_CLASS_DUMP record for the given class
void VM_HeapDumper::do_class_dump(Klass* k) {
- DumperSupport::dump_class_and_array_classes(writer(), k);
+ if (k->oop_is_instance()) {
+ DumperSupport::dump_class_and_array_classes(writer(), k);
+ }
}
// writes a HPROF_GC_CLASS_DUMP records for a given basic type
@@ -1722,7 +1724,7 @@
SymbolTable::symbols_do(&sym_dumper);
// write HPROF_LOAD_CLASS records
- SystemDictionary::classes_do(&do_load_class);
+ ClassLoaderDataGraph::classes_do(&do_load_class);
Universe::basic_type_classes_do(&do_load_class);
// write HPROF_FRAME and HPROF_TRACE records
@@ -1733,7 +1735,7 @@
write_dump_header();
// Writes HPROF_GC_CLASS_DUMP records
- SystemDictionary::classes_do(&do_class_dump);
+ ClassLoaderDataGraph::classes_do(&do_class_dump);
Universe::basic_type_classes_do(&do_basic_type_array_class_dump);
check_segment_length();
diff --git a/hotspot/src/share/vm/services/runtimeService.cpp b/hotspot/src/share/vm/services/runtimeService.cpp
index fc2fdf1..379b8f3 100644
--- a/hotspot/src/share/vm/services/runtimeService.cpp
+++ b/hotspot/src/share/vm/services/runtimeService.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -119,7 +119,7 @@
#endif /* USDT2 */
// Print the time interval in which the app was executing
- if (PrintGCApplicationConcurrentTime) {
+ if (PrintGCApplicationConcurrentTime && _app_timer.is_updated()) {
gclog_or_tty->date_stamp(PrintGCDateStamps);
gclog_or_tty->stamp(PrintGCTimeStamps);
gclog_or_tty->print_cr("Application time: %3.7f seconds",
diff --git a/hotspot/src/share/vm/shark/sharkCompiler.cpp b/hotspot/src/share/vm/shark/sharkCompiler.cpp
index cde6bc2..211129b 100644
--- a/hotspot/src/share/vm/shark/sharkCompiler.cpp
+++ b/hotspot/src/share/vm/shark/sharkCompiler.cpp
@@ -133,11 +133,10 @@
exit(1);
}
- execution_engine()->addModule(
- _native_context->module());
+ execution_engine()->addModule(_native_context->module());
// All done
- mark_initialized();
+ set_state(initialized);
}
void SharkCompiler::initialize() {
diff --git a/hotspot/src/share/vm/shark/sharkCompiler.hpp b/hotspot/src/share/vm/shark/sharkCompiler.hpp
index 7e530c1..12c3cd8 100644
--- a/hotspot/src/share/vm/shark/sharkCompiler.hpp
+++ b/hotspot/src/share/vm/shark/sharkCompiler.hpp
@@ -50,10 +50,6 @@
return ! (method->is_method_handle_intrinsic() || method->is_compiled_lambda_form());
}
- // Customization
- bool needs_adapters() { return false; }
- bool needs_stubs() { return false; }
-
// Initialization
void initialize();
diff --git a/hotspot/src/share/vm/utilities/constantTag.cpp b/hotspot/src/share/vm/utilities/constantTag.cpp
index 25bff0f..7bc5569 100644
--- a/hotspot/src/share/vm/utilities/constantTag.cpp
+++ b/hotspot/src/share/vm/utilities/constantTag.cpp
@@ -51,7 +51,9 @@
case JVM_CONSTANT_ClassIndex :
case JVM_CONSTANT_StringIndex :
case JVM_CONSTANT_MethodHandle :
+ case JVM_CONSTANT_MethodHandleInError :
case JVM_CONSTANT_MethodType :
+ case JVM_CONSTANT_MethodTypeInError :
return T_OBJECT;
default:
ShouldNotReachHere();
@@ -60,6 +62,19 @@
}
+jbyte constantTag::non_error_value() const {
+ switch (_tag) {
+ case JVM_CONSTANT_UnresolvedClassInError:
+ return JVM_CONSTANT_UnresolvedClass;
+ case JVM_CONSTANT_MethodHandleInError:
+ return JVM_CONSTANT_MethodHandle;
+ case JVM_CONSTANT_MethodTypeInError:
+ return JVM_CONSTANT_MethodType;
+ default:
+ return _tag;
+ }
+}
+
const char* constantTag::internal_name() const {
switch (_tag) {
diff --git a/hotspot/src/share/vm/utilities/constantTag.hpp b/hotspot/src/share/vm/utilities/constantTag.hpp
index 4865ce2..cedddf6 100644
--- a/hotspot/src/share/vm/utilities/constantTag.hpp
+++ b/hotspot/src/share/vm/utilities/constantTag.hpp
@@ -108,7 +108,8 @@
_tag = tag;
}
- jbyte value() { return _tag; }
+ jbyte value() const { return _tag; }
+ jbyte non_error_value() const;
BasicType basic_type() const; // if used with ldc, what kind of value gets pushed?
diff --git a/hotspot/src/share/vm/utilities/ostream.cpp b/hotspot/src/share/vm/utilities/ostream.cpp
index e421550..39f87a4 100644
--- a/hotspot/src/share/vm/utilities/ostream.cpp
+++ b/hotspot/src/share/vm/utilities/ostream.cpp
@@ -465,7 +465,7 @@
}
// log_name comes from -XX:LogFile=log_name or -Xloggc:log_name
-// in log_name, %p => pipd1234 and
+// in log_name, %p => pid1234 and
// %t => YYYY-MM-DD_HH-MM-SS
static const char* make_log_name(const char* log_name, const char* force_directory) {
char timestr[32];
@@ -792,7 +792,7 @@
void defaultStream::init_log() {
// %%% Need a MutexLocker?
- const char* log_name = LogFile != NULL ? LogFile : "hotspot_pid%p.log";
+ const char* log_name = LogFile != NULL ? LogFile : "hotspot_%p.log";
const char* try_name = make_log_name(log_name, NULL);
fileStream* file = new(ResourceObj::C_HEAP, mtInternal) fileStream(try_name);
if (!file->is_open()) {
diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp
index 79769ae..bbf9839 100644
--- a/hotspot/src/share/vm/utilities/vmError.cpp
+++ b/hotspot/src/share/vm/utilities/vmError.cpp
@@ -1050,7 +1050,7 @@
FILE* replay_data_file = os::open(fd, "w");
if (replay_data_file != NULL) {
fileStream replay_data_stream(replay_data_file, /*need_close=*/true);
- env->dump_replay_data(&replay_data_stream);
+ env->dump_replay_data_unsafe(&replay_data_stream);
out.print_raw("#\n# Compiler replay data is saved as:\n# ");
out.print_raw_cr(buffer);
} else {
diff --git a/hotspot/test/TEST.groups b/hotspot/test/TEST.groups
index 2778ebf..6787bd8 100644
--- a/hotspot/test/TEST.groups
+++ b/hotspot/test/TEST.groups
@@ -27,7 +27,7 @@
# - compact1, compact2, compact3, full JRE, JDK
#
# In addition they support testing of the minimal VM on compact1 and compact2.
-# Essentially this defines groups based around the specified API's and VM
+# Essentially this defines groups based around the specified API's and VM
# services available in the runtime.
#
# The groups are defined hierarchically in two forms:
@@ -44,9 +44,9 @@
# by listing the top-level test directories.
#
# To use a group simply list it on the jtreg command line eg:
-# jtreg :jdk
+# jtreg :jdk
# runs all tests. While
-# jtreg :compact2
+# jtreg :compact2
# runs those tests that only require compact1 and compact2 API's.
#
@@ -69,6 +69,7 @@
runtime/7107135/Test7107135.sh \
runtime/7158988/FieldMonitor.java \
runtime/7194254/Test7194254.java \
+ runtime/8026365/InvokeSpecialAnonTest.java \
runtime/jsig/Test8017498.sh \
runtime/Metaspace/FragmentMetaspace.java \
runtime/NMT/BaselineWithParameter.java \
@@ -124,7 +125,7 @@
compiler/whitebox/IsMethodCompilableTest.java \
gc/6581734/Test6581734.java \
gc/7072527/TestFullGCCount.java \
- gc/7168848/HumongousAlloc.java \
+ gc/g1/TestHumongousAllocInitialMark.java \
gc/arguments/TestG1HeapRegionSize.java \
gc/metaspace/TestMetaspaceMemoryPool.java \
runtime/InternalApi/ThreadCpuTimesDeadlock.java \
@@ -140,7 +141,7 @@
-:needs_jdk
# Tests that require compact2 API's and a full VM
-#
+#
needs_full_vm_compact2 =
# Compact 1 adds full VM tests
diff --git a/hotspot/test/compiler/8013496/Test8013496.sh b/hotspot/test/compiler/8013496/Test8013496.sh
deleted file mode 100644
index ae1d1fe..0000000
--- a/hotspot/test/compiler/8013496/Test8013496.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2013, 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 8013496
-# @summary Test checks that the order in which ReversedCodeCacheSize and
-# InitialCodeCacheSize are passed to the VM is irrelevant.
-# @run shell Test8013496.sh
-#
-#
-## some tests require path to find test source dir
-if [ "${TESTSRC}" = "" ]
-then
- TESTSRC=${PWD}
- echo "TESTSRC not set. Using "${TESTSRC}" as default"
-fi
-echo "TESTSRC=${TESTSRC}"
-## Adding common setup Variables for running shell tests.
-. ${TESTSRC}/../../test_env.sh
-set -x
-
-${TESTJAVA}/bin/java ${TESTVMOPTS} -XX:ReservedCodeCacheSize=2m -XX:InitialCodeCacheSize=500K -version > 1.out 2>&1
-${TESTJAVA}/bin/java ${TESTVMOPTS} -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=2m -version > 2.out 2>&1
-
-diff 1.out 2.out
-
-result=$?
-if [ $result -eq 0 ] ; then
- echo "Test Passed"
- exit 0
-else
- echo "Test Failed"
- exit 1
-fi
diff --git a/hotspot/test/compiler/codecache/CheckReservedInitialCodeCacheSizeArgOrder.java b/hotspot/test/compiler/codecache/CheckReservedInitialCodeCacheSizeArgOrder.java
new file mode 100644
index 0000000..eea5c90
--- /dev/null
+++ b/hotspot/test/compiler/codecache/CheckReservedInitialCodeCacheSizeArgOrder.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2013, 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 8013496
+ * @summary Test checks that the order in which ReversedCodeCacheSize and
+ * InitialCodeCacheSize are passed to the VM is irrelevant.
+ * @library /testlibrary
+ *
+ */
+import com.oracle.java.testlibrary.*;
+
+public class CheckReservedInitialCodeCacheSizeArgOrder {
+ public static void main(String[] args) throws Exception {
+ ProcessBuilder pb1, pb2;
+ OutputAnalyzer out1, out2;
+
+ pb1 = ProcessTools.createJavaProcessBuilder("-XX:InitialCodeCacheSize=4m", "-XX:ReservedCodeCacheSize=8m", "-version");
+ pb2 = ProcessTools.createJavaProcessBuilder("-XX:ReservedCodeCacheSize=8m", "-XX:InitialCodeCacheSize=4m", "-version");
+
+ out1 = new OutputAnalyzer(pb1.start());
+ out2 = new OutputAnalyzer(pb2.start());
+
+ // Check that the outputs are equal
+ if (out1.getStdout().compareTo(out2.getStdout()) != 0) {
+ throw new RuntimeException("Test failed");
+ }
+
+ out1.shouldHaveExitValue(0);
+ out2.shouldHaveExitValue(0);
+ }
+}
diff --git a/hotspot/test/compiler/intrinsics/mathexact/RepeatTest.java b/hotspot/test/compiler/intrinsics/mathexact/RepeatTest.java
new file mode 100644
index 0000000..aaf63de
--- /dev/null
+++ b/hotspot/test/compiler/intrinsics/mathexact/RepeatTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2013, 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 8025657
+ * @summary Test repeating addExact
+ * @compile RepeatTest.java
+ * @run main RepeatTest
+ *
+ */
+
+import java.lang.ArithmeticException;
+
+public class RepeatTest {
+ public static void main(String[] args) {
+ java.util.Random rnd = new java.util.Random();
+ for (int i = 0; i < 50000; ++i) {
+ int x = Integer.MAX_VALUE - 10;
+ int y = Integer.MAX_VALUE - 10 + rnd.nextInt(5); //rnd.nextInt() / 2;
+
+ int c = rnd.nextInt() / 2;
+ int d = rnd.nextInt() / 2;
+
+ int a = addExact(x, y);
+
+ if (a != 36) {
+ throw new RuntimeException("a != 0 : " + a);
+ }
+
+ int b = nonExact(c, d);
+ int n = addExact2(c, d);
+
+
+ if (n != b) {
+ throw new RuntimeException("n != b : " + n + " != " + b);
+ }
+ }
+ }
+
+ public static int addExact2(int x, int y) {
+ int result = 0;
+ result += java.lang.Math.addExact(x, y);
+ result += java.lang.Math.addExact(x, y);
+ result += java.lang.Math.addExact(x, y);
+ result += java.lang.Math.addExact(x, y);
+ return result;
+ }
+
+ public static int addExact(int x, int y) {
+ int result = 0;
+ try {
+ result += 5;
+ result = java.lang.Math.addExact(x, y);
+ } catch (ArithmeticException e) {
+ result += 1;
+ }
+ try {
+ result += 6;
+
+ result += java.lang.Math.addExact(x, y);
+ } catch (ArithmeticException e) {
+ result += 2;
+ }
+ try {
+ result += 7;
+ result += java.lang.Math.addExact(x, y);
+ } catch (ArithmeticException e) {
+ result += 3;
+ }
+ try {
+ result += 8;
+ result += java.lang.Math.addExact(x, y);
+ } catch (ArithmeticException e) {
+ result += 4;
+ }
+ return result;
+ }
+
+ public static int nonExact(int x, int y) {
+ int result = x + y;
+ result += x + y;
+ result += x + y;
+ result += x + y;
+ return result;
+ }
+}
diff --git a/hotspot/test/compiler/jsr292/CreatesInterfaceDotEqualsCallInfo.java b/hotspot/test/compiler/jsr292/CreatesInterfaceDotEqualsCallInfo.java
new file mode 100644
index 0000000..0230702
--- /dev/null
+++ b/hotspot/test/compiler/jsr292/CreatesInterfaceDotEqualsCallInfo.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2013, 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 8026124
+ * @summary Javascript file provoked assertion failure in linkResolver.cpp
+ *
+ * @run main/othervm CreatesInterfaceDotEqualsCallInfo
+ */
+
+public class CreatesInterfaceDotEqualsCallInfo {
+ public static void main(String[] args) throws java.io.IOException {
+ String[] jsargs = { System.getProperty("test.src", ".") +
+ "/createsInterfaceDotEqualsCallInfo.js" };
+ jdk.nashorn.tools.Shell.main(System.in, System.out, System.err, jsargs);
+ System.out.println("PASS, did not crash running Javascript");
+ }
+}
diff --git a/hotspot/test/compiler/jsr292/createsInterfaceDotEqualsCallInfo.js b/hotspot/test/compiler/jsr292/createsInterfaceDotEqualsCallInfo.js
new file mode 100644
index 0000000..9c5b8e6
--- /dev/null
+++ b/hotspot/test/compiler/jsr292/createsInterfaceDotEqualsCallInfo.js
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2013, 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.
+ *
+ */
+
+var path = new java.io.File("/Users/someone").toPath();
+path.toString();
diff --git a/hotspot/test/compiler/startup/SmallCodeCacheStartup.java b/hotspot/test/compiler/startup/SmallCodeCacheStartup.java
new file mode 100644
index 0000000..74b2b76
--- /dev/null
+++ b/hotspot/test/compiler/startup/SmallCodeCacheStartup.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2013, 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 8023014
+ * @summary Test ensures that there is no crash when compiler initialization fails
+ * @library /testlibrary
+ *
+ */
+import com.oracle.java.testlibrary.*;
+
+public class SmallCodeCacheStartup {
+ public static void main(String[] args) throws Exception {
+ ProcessBuilder pb;
+ OutputAnalyzer out;
+
+ pb = ProcessTools.createJavaProcessBuilder("-XX:ReservedCodeCacheSize=3m", "-XX:CICompilerCount=64", "-version");
+ out = new OutputAnalyzer(pb.start());
+ out.shouldContain("no space to run compiler");
+ out.shouldHaveExitValue(0);
+ }
+}
diff --git a/hotspot/test/gc/7168848/HumongousAlloc.java b/hotspot/test/gc/7168848/HumongousAlloc.java
deleted file mode 100644
index 7ac6074..0000000
--- a/hotspot/test/gc/7168848/HumongousAlloc.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test Humongous.java
- * @bug 7168848
- * @summary G1: humongous object allocations should initiate marking cycles when necessary
- * @run main/othervm -Xms100m -Xmx100m -XX:+PrintGC -XX:G1HeapRegionSize=1m -XX:+UseG1GC HumongousAlloc
- *
- */
-import java.lang.management.GarbageCollectorMXBean;
-import java.lang.management.ManagementFactory;
-import java.util.List;
-
-public class HumongousAlloc {
-
- public static byte[] dummy;
- private static int sleepFreq = 40;
- private static int sleepTime = 1000;
- private static double size = 0.75;
- private static int iterations = 50;
- private static int MB = 1024 * 1024;
-
- public static void allocate(int size, int sleepTime, int sleepFreq) throws InterruptedException {
- System.out.println("Will allocate objects of size: " + size
- + " bytes and sleep for " + sleepTime
- + " ms after every " + sleepFreq + "th allocation.");
- int count = 0;
- while (count < iterations) {
- for (int i = 0; i < sleepFreq; i++) {
- dummy = new byte[size - 16];
- }
- Thread.sleep(sleepTime);
- count++;
- }
- }
-
- public static void main(String[] args) throws InterruptedException {
- allocate((int) (size * MB), sleepTime, sleepFreq);
- List<GarbageCollectorMXBean> collectors = ManagementFactory.getGarbageCollectorMXBeans();
- for (GarbageCollectorMXBean collector : collectors) {
- if (collector.getName().contains("G1 Old")) {
- long count = collector.getCollectionCount();
- if (count > 0) {
- throw new RuntimeException("Failed: FullGCs should not have happened. The number of FullGC run is " + count);
- }
- else {
- System.out.println("Passed.");
- }
- }
- }
- }
-}
-
diff --git a/hotspot/test/gc/arguments/TestHeapFreeRatio.java b/hotspot/test/gc/arguments/TestHeapFreeRatio.java
new file mode 100644
index 0000000..11e259d
--- /dev/null
+++ b/hotspot/test/gc/arguments/TestHeapFreeRatio.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2013, 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 TestHeapFreeRatio
+ * @key gc
+ * @bug 8025661
+ * @summary Test parsing of -Xminf and -Xmaxf
+ * @library /testlibrary
+ * @run main/othervm TestHeapFreeRatio
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class TestHeapFreeRatio {
+
+ enum Validation {
+ VALID,
+ MIN_INVALID,
+ MAX_INVALID,
+ COMBINATION_INVALID
+ }
+
+ private static void testMinMaxFreeRatio(String min, String max, Validation type) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xminf" + min,
+ "-Xmaxf" + max,
+ "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+
+ switch (type) {
+ case VALID:
+ output.shouldNotContain("Error");
+ output.shouldHaveExitValue(0);
+ break;
+ case MIN_INVALID:
+ output.shouldContain("Bad min heap free percentage size: -Xminf" + min);
+ output.shouldContain("Error");
+ output.shouldHaveExitValue(1);
+ break;
+ case MAX_INVALID:
+ output.shouldContain("Bad max heap free percentage size: -Xmaxf" + max);
+ output.shouldContain("Error");
+ output.shouldHaveExitValue(1);
+ break;
+ case COMBINATION_INVALID:
+ output.shouldContain("must be less than or equal to MaxHeapFreeRatio");
+ output.shouldContain("Error");
+ output.shouldHaveExitValue(1);
+ break;
+ default:
+ throw new IllegalStateException("Must specify expected validation type");
+ }
+
+ System.out.println(output.getOutput());
+ }
+
+ public static void main(String args[]) throws Exception {
+ testMinMaxFreeRatio( "0.1", "0.5", Validation.VALID);
+ testMinMaxFreeRatio( ".1", ".5", Validation.VALID);
+ testMinMaxFreeRatio( "0.5", "0.5", Validation.VALID);
+
+ testMinMaxFreeRatio("-0.1", "0.5", Validation.MIN_INVALID);
+ testMinMaxFreeRatio( "1.1", "0.5", Validation.MIN_INVALID);
+ testMinMaxFreeRatio("=0.1", "0.5", Validation.MIN_INVALID);
+ testMinMaxFreeRatio("0.1f", "0.5", Validation.MIN_INVALID);
+ testMinMaxFreeRatio(
+ "INVALID", "0.5", Validation.MIN_INVALID);
+ testMinMaxFreeRatio(
+ "2147483647", "0.5", Validation.MIN_INVALID);
+
+ testMinMaxFreeRatio( "0.1", "-0.5", Validation.MAX_INVALID);
+ testMinMaxFreeRatio( "0.1", "1.5", Validation.MAX_INVALID);
+ testMinMaxFreeRatio( "0.1", "0.5f", Validation.MAX_INVALID);
+ testMinMaxFreeRatio( "0.1", "=0.5", Validation.MAX_INVALID);
+ testMinMaxFreeRatio(
+ "0.1", "INVALID", Validation.MAX_INVALID);
+ testMinMaxFreeRatio(
+ "0.1", "2147483647", Validation.MAX_INVALID);
+
+ testMinMaxFreeRatio( "0.5", "0.1", Validation.COMBINATION_INVALID);
+ testMinMaxFreeRatio( ".5", ".10", Validation.COMBINATION_INVALID);
+ testMinMaxFreeRatio("0.12","0.100", Validation.COMBINATION_INVALID);
+ }
+}
diff --git a/hotspot/test/gc/g1/TestHumongousAllocInitialMark.java b/hotspot/test/gc/g1/TestHumongousAllocInitialMark.java
new file mode 100644
index 0000000..468ad42
--- /dev/null
+++ b/hotspot/test/gc/g1/TestHumongousAllocInitialMark.java
@@ -0,0 +1,75 @@
+/*
+ * 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 TestHumongousAllocInitialMark
+ * @bug 7168848
+ * @summary G1: humongous object allocations should initiate marking cycles when necessary
+ * @library /testlibrary
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class TestHumongousAllocInitialMark {
+ private static final int heapSize = 200; // MB
+ private static final int heapRegionSize = 1; // MB
+ private static final int initiatingHeapOccupancyPercent = 50; // %
+
+ public static void main(String[] args) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:+UseG1GC",
+ "-Xms" + heapSize + "m",
+ "-Xmx" + heapSize + "m",
+ "-XX:G1HeapRegionSize=" + heapRegionSize + "m",
+ "-XX:InitiatingHeapOccupancyPercent=" + initiatingHeapOccupancyPercent,
+ "-XX:+PrintGC",
+ HumongousObjectAllocator.class.getName());
+
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldContain("GC pause (G1 Humongous Allocation) (young) (initial-mark)");
+ output.shouldNotContain("Full GC");
+ output.shouldHaveExitValue(0);
+ }
+
+ static class HumongousObjectAllocator {
+ private static byte[] dummy;
+
+ public static void main(String [] args) throws Exception {
+ // Make object size 75% of region size
+ final int humongousObjectSize =
+ (int)(heapRegionSize * 1024 * 1024 * 0.75);
+
+ // Number of objects to allocate to go above IHOP
+ final int humongousObjectAllocations =
+ (int)((heapSize * initiatingHeapOccupancyPercent / 100.0) / heapRegionSize) + 1;
+
+ // Allocate
+ for (int i = 1; i <= humongousObjectAllocations; i++) {
+ System.out.println("Allocating humongous object " + i + "/" + humongousObjectAllocations +
+ " of size " + humongousObjectSize + " bytes");
+ dummy = new byte[humongousObjectSize];
+ }
+ }
+ }
+}
+
diff --git a/hotspot/test/gc/startup_warnings/TestCMS.java b/hotspot/test/gc/startup_warnings/TestCMS.java
index 22a0719..93bb563 100644
--- a/hotspot/test/gc/startup_warnings/TestCMS.java
+++ b/hotspot/test/gc/startup_warnings/TestCMS.java
@@ -38,7 +38,7 @@
public static void main(String args[]) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseConcMarkSweepGC", "-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
- output.shouldNotContain("warning");
+ output.shouldNotContain("deprecated");
output.shouldNotContain("error");
output.shouldHaveExitValue(0);
}
diff --git a/hotspot/test/gc/startup_warnings/TestCMSNoIncrementalMode.java b/hotspot/test/gc/startup_warnings/TestCMSNoIncrementalMode.java
index f218090..0d329fb 100644
--- a/hotspot/test/gc/startup_warnings/TestCMSNoIncrementalMode.java
+++ b/hotspot/test/gc/startup_warnings/TestCMSNoIncrementalMode.java
@@ -37,7 +37,7 @@
public static void main(String args[]) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseConcMarkSweepGC", "-XX:-CMSIncrementalMode", "-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
- output.shouldNotContain("warning");
+ output.shouldNotContain("deprecated");
output.shouldNotContain("error");
output.shouldHaveExitValue(0);
}
diff --git a/hotspot/test/gc/startup_warnings/TestG1.java b/hotspot/test/gc/startup_warnings/TestG1.java
index 536612b..b1dfaa4 100644
--- a/hotspot/test/gc/startup_warnings/TestG1.java
+++ b/hotspot/test/gc/startup_warnings/TestG1.java
@@ -37,7 +37,7 @@
public static void main(String args[]) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseG1GC", "-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
- output.shouldNotContain("warning");
+ output.shouldNotContain("deprecated");
output.shouldNotContain("error");
output.shouldHaveExitValue(0);
}
diff --git a/hotspot/test/gc/startup_warnings/TestParNewCMS.java b/hotspot/test/gc/startup_warnings/TestParNewCMS.java
index f74d65c..3f8bfb4 100644
--- a/hotspot/test/gc/startup_warnings/TestParNewCMS.java
+++ b/hotspot/test/gc/startup_warnings/TestParNewCMS.java
@@ -38,7 +38,7 @@
public static void main(String args[]) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseParNewGC", "-XX:+UseConcMarkSweepGC", "-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
- output.shouldNotContain("warning");
+ output.shouldNotContain("deprecated");
output.shouldNotContain("error");
output.shouldHaveExitValue(0);
}
diff --git a/hotspot/test/gc/startup_warnings/TestParallelGC.java b/hotspot/test/gc/startup_warnings/TestParallelGC.java
index 7a0766e..e216309 100644
--- a/hotspot/test/gc/startup_warnings/TestParallelGC.java
+++ b/hotspot/test/gc/startup_warnings/TestParallelGC.java
@@ -38,7 +38,7 @@
public static void main(String args[]) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseParallelGC", "-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
- output.shouldNotContain("warning");
+ output.shouldNotContain("deprecated");
output.shouldNotContain("error");
output.shouldHaveExitValue(0);
}
diff --git a/hotspot/test/gc/startup_warnings/TestParallelScavengeSerialOld.java b/hotspot/test/gc/startup_warnings/TestParallelScavengeSerialOld.java
index 27a25b2..5d1cbdd 100644
--- a/hotspot/test/gc/startup_warnings/TestParallelScavengeSerialOld.java
+++ b/hotspot/test/gc/startup_warnings/TestParallelScavengeSerialOld.java
@@ -38,7 +38,7 @@
public static void main(String args[]) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseParallelGC", "-XX:-UseParallelOldGC", "-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
- output.shouldNotContain("warning");
+ output.shouldNotContain("deprecated");
output.shouldNotContain("error");
output.shouldHaveExitValue(0);
}
diff --git a/hotspot/test/gc/startup_warnings/TestSerialGC.java b/hotspot/test/gc/startup_warnings/TestSerialGC.java
index d84fd5d..4ce1af2 100644
--- a/hotspot/test/gc/startup_warnings/TestSerialGC.java
+++ b/hotspot/test/gc/startup_warnings/TestSerialGC.java
@@ -38,7 +38,7 @@
public static void main(String args[]) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseSerialGC", "-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
- output.shouldNotContain("warning");
+ output.shouldNotContain("deprecated");
output.shouldNotContain("error");
output.shouldHaveExitValue(0);
}
diff --git a/hotspot/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java b/hotspot/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
index 37d7b70..df6ecb2 100644
--- a/hotspot/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
+++ b/hotspot/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
@@ -59,7 +59,7 @@
// If we are on MacOSX, test if JMap tool is signed, otherwise return
// since test will fail with privilege error.
if (Platform.isOSX()) {
- String jmapToolPath = JDKToolFinder.getCurrentJDKTool("jmap");
+ String jmapToolPath = JDKToolFinder.getTestJDKTool("jmap");
ProcessBuilder codesignProcessBuilder = new ProcessBuilder(
"codesign", "-v", jmapToolPath);
Process codesignProcess = codesignProcessBuilder.start();
@@ -107,7 +107,7 @@
System.out.println("Extracted pid: " + pid);
JDKToolLauncher jMapLauncher = JDKToolLauncher
- .create("jmap", false);
+ .createUsingTestJDK("jmap");
jMapLauncher.addToolArg("-dump:format=b,file=" + pid + "-"
+ HEAP_DUMP_FILE_NAME);
jMapLauncher.addToolArg(String.valueOf(pid));
diff --git a/hotspot/test/testlibrary/com/oracle/java/testlibrary/JDKToolLauncher.java b/hotspot/test/testlibrary/com/oracle/java/testlibrary/JDKToolLauncher.java
index 29df4a7..7871bd2 100644
--- a/hotspot/test/testlibrary/com/oracle/java/testlibrary/JDKToolLauncher.java
+++ b/hotspot/test/testlibrary/com/oracle/java/testlibrary/JDKToolLauncher.java
@@ -56,7 +56,7 @@
if (useCompilerJDK) {
executable = JDKToolFinder.getJDKTool(tool);
} else {
- executable = JDKToolFinder.getCurrentJDKTool(tool);
+ executable = JDKToolFinder.getTestJDKTool(tool);
}
vmArgs.addAll(Arrays.asList(ProcessTools.getPlatformSpecificVMArgs()));
}
@@ -74,17 +74,15 @@
}
/**
- * Creates a new JDKToolLauncher for the specified tool.
+ * Creates a new JDKToolLauncher for the specified tool in the Tested JDK.
*
* @param tool
* The name of the tool
- * @param useCompilerPath
- * If true use the compiler JDK path, otherwise use the tested
- * JDK path.
+ *
* @return A new JDKToolLauncher
*/
- public static JDKToolLauncher create(String tool, boolean useCompilerJDK) {
- return new JDKToolLauncher(tool, useCompilerJDK);
+ public static JDKToolLauncher createUsingTestJDK(String tool) {
+ return new JDKToolLauncher(tool, false);
}
/**
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index fb2959b..7621bc5 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -233,3 +233,4 @@
02bfab2aa93899e0f02584f1e85537485a196553 jdk8-b109
4c84c5b447b09aff27f3b72667ab3a5401e85968 jdk8-b110
17ee0d3e97fdb412e48f14d87f504946a708f846 jdk8-b111
+c1f9158fbb9c2da50f6946fffd974e8236e08447 jdk8-b112
diff --git a/jaxp/make/jprt.properties b/jaxp/make/jprt.properties
index b03c53c..5dfce3c 100644
--- a/jaxp/make/jprt.properties
+++ b/jaxp/make/jprt.properties
@@ -33,9 +33,7 @@
# Standard list of jprt build targets for this source tree
jprt.build.targets= \
- solaris_sparc_5.10-{product|fastdebug}, \
solaris_sparcv9_5.10-{product|fastdebug}, \
- solaris_i586_5.10-{product|fastdebug}, \
solaris_x64_5.10-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java b/jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java
index ce50626..f4a80af 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java
@@ -39,6 +39,116 @@
//
// Constants
//
+ //Xerces security manager
+ public static final String SECURITY_MANAGER =
+ "http://apache.org/xml/properties/security-manager";
+
+ //
+ // Implementation limits: API properties
+ //
+ /** Oracle JAXP property prefix ("http://www.oracle.com/xml/jaxp/properties/"). */
+ public static final String ORACLE_JAXP_PROPERTY_PREFIX =
+ "http://www.oracle.com/xml/jaxp/properties/";
+ /**
+ * JDK entity expansion limit; Note that the existing system property
+ * "entityExpansionLimit" with no prefix is still observed
+ */
+ public static final String JDK_ENTITY_EXPANSION_LIMIT =
+ ORACLE_JAXP_PROPERTY_PREFIX + "entityExpansionLimit";
+
+ /**
+ * JDK element attribute limit; Note that the existing system property
+ * "elementAttributeLimit" with no prefix is still observed
+ */
+ public static final String JDK_ELEMENT_ATTRIBUTE_LIMIT =
+ ORACLE_JAXP_PROPERTY_PREFIX + "elementAttributeLimit";
+
+ /**
+ * JDK maxOccur limit; Note that the existing system property
+ * "maxOccurLimit" with no prefix is still observed
+ */
+ public static final String JDK_MAX_OCCUR_LIMIT =
+ ORACLE_JAXP_PROPERTY_PREFIX + "maxOccurLimit";
+
+ /**
+ * JDK total entity size limit
+ */
+ public static final String JDK_TOTAL_ENTITY_SIZE_LIMIT =
+ ORACLE_JAXP_PROPERTY_PREFIX + "totalEntitySizeLimit";
+
+ /**
+ * JDK maximum general entity size limit
+ */
+ public static final String JDK_GENEAL_ENTITY_SIZE_LIMIT =
+ ORACLE_JAXP_PROPERTY_PREFIX + "maxGeneralEntitySizeLimit";
+ /**
+ * JDK maximum parameter entity size limit
+ */
+ public static final String JDK_PARAMETER_ENTITY_SIZE_LIMIT =
+ ORACLE_JAXP_PROPERTY_PREFIX + "maxParameterEntitySizeLimit";
+ /**
+ * JDK maximum XML name limit
+ */
+ public static final String JDK_XML_NAME_LIMIT =
+ ORACLE_JAXP_PROPERTY_PREFIX + "maxXMLNameLimit";
+ /**
+ * JDK property indicating whether the parser shall print out entity
+ * count information
+ * Value: a string "yes" means print, "no" or any other string means not.
+ */
+ public static final String JDK_ENTITY_COUNT_INFO =
+ ORACLE_JAXP_PROPERTY_PREFIX + "getEntityCountInfo";
+
+ //
+ // Implementation limits: corresponding System Properties of the above
+ // API properties
+ //
+ /**
+ * JDK entity expansion limit; Note that the existing system property
+ * "entityExpansionLimit" with no prefix is still observed
+ */
+ public static final String SP_ENTITY_EXPANSION_LIMIT = "jdk.xml.entityExpansionLimit";
+
+ /**
+ * JDK element attribute limit; Note that the existing system property
+ * "elementAttributeLimit" with no prefix is still observed
+ */
+ public static final String SP_ELEMENT_ATTRIBUTE_LIMIT = "jdk.xml.elementAttributeLimit";
+
+ /**
+ * JDK maxOccur limit; Note that the existing system property
+ * "maxOccurLimit" with no prefix is still observed
+ */
+ public static final String SP_MAX_OCCUR_LIMIT = "jdk.xml.maxOccurLimit";
+
+ /**
+ * JDK total entity size limit
+ */
+ public static final String SP_TOTAL_ENTITY_SIZE_LIMIT = "jdk.xml.totalEntitySizeLimit";
+
+ /**
+ * JDK maximum general entity size limit
+ */
+ public static final String SP_GENEAL_ENTITY_SIZE_LIMIT = "jdk.xml.maxGeneralEntitySizeLimit";
+ /**
+ * JDK maximum parameter entity size limit
+ */
+ public static final String SP_PARAMETER_ENTITY_SIZE_LIMIT = "jdk.xml.maxParameterEntitySizeLimit";
+ /**
+ * JDK maximum XML name limit
+ */
+ public static final String SP_XML_NAME_LIMIT = "jdk.xml.maxXMLNameLimit";
+
+ //legacy System Properties
+ public final static String ENTITY_EXPANSION_LIMIT = "entityExpansionLimit";
+ public static final String ELEMENT_ATTRIBUTE_LIMIT = "elementAttributeLimit" ;
+ public final static String MAX_OCCUR_LIMIT = "maxOccurLimit";
+
+ /**
+ * A string "yes" that can be used for properties such as getEntityCountInfo
+ */
+ public static final String JDK_YES = "yes";
+
// Oracle Feature:
/**
* <p>Use Service Mechanism</p>
@@ -51,21 +161,16 @@
* <li>
* {@code false} instruct an object to skip service mechanism and
* use the default implementation for that service.
- * </li>
- * </ul>
- */
-
+ * </li>
+ * </ul>
+ */
public static final String ORACLE_FEATURE_SERVICE_MECHANISM = "http://www.oracle.com/feature/use-service-mechanism";
- /** Oracle JAXP property prefix ("http://www.oracle.com/xml/jaxp/properties/"). */
- public static final String ORACLE_JAXP_PROPERTY_PREFIX =
- "http://www.oracle.com/xml/jaxp/properties/";
//System Properties corresponding to ACCESS_EXTERNAL_* properties
public static final String SP_ACCESS_EXTERNAL_STYLESHEET = "javax.xml.accessExternalStylesheet";
public static final String SP_ACCESS_EXTERNAL_DTD = "javax.xml.accessExternalDTD";
-
//all access keyword
public static final String ACCESS_EXTERNAL_ALL = "all";
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java
index aea4fff..1a85fc3 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java
@@ -471,7 +471,13 @@
// Error messages...
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/** Error message ID that has a null message, but takes in a single object. */
{"ER0000" , "{0}" },
@@ -1412,13 +1418,6 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The int to message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
// ================= INFRASTRUCTURE ======================
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
index 40a5c71..c9cea1d 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
@@ -471,7 +471,13 @@
// Error messages...
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/** Error message ID that has a null message, but takes in a single object. */
{"ER0000" , "{0}" },
@@ -1412,13 +1418,6 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The int to message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
// ================= INFRASTRUCTURE ======================
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java
index 9937fe6..7294a36 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java
@@ -471,7 +471,13 @@
// Error messages...
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/** Error message ID that has a null message, but takes in a single object. */
{"ER0000" , "{0}" },
@@ -1412,13 +1418,6 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The int to message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
// ================= INFRASTRUCTURE ======================
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java
index 9dc7f69..1748506 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java
@@ -471,7 +471,13 @@
// Error messages...
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/** Error message ID that has a null message, but takes in a single object. */
{"ER0000" , "{0}" },
@@ -1412,13 +1418,6 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The int to message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
// ================= INFRASTRUCTURE ======================
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java
index 2d7351c..d25eb67 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java
@@ -471,7 +471,13 @@
// Error messages...
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/** Error message ID that has a null message, but takes in a single object. */
{"ER0000" , "{0}" },
@@ -1412,13 +1418,6 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The int to message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
// ================= INFRASTRUCTURE ======================
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java
index e5c2567..50028e7 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java
@@ -471,7 +471,13 @@
// Error messages...
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/** Error message ID that has a null message, but takes in a single object. */
{"ER0000" , "{0}" },
@@ -1412,13 +1418,6 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The int to message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
// ================= INFRASTRUCTURE ======================
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java
index 36203fb..d4b9b32 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java
@@ -471,7 +471,13 @@
// Error messages...
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/** Error message ID that has a null message, but takes in a single object. */
{"ER0000" , "{0}" },
@@ -1412,13 +1418,6 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The int to message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
// ================= INFRASTRUCTURE ======================
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java
index ae6f6c7..b79cfab 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java
@@ -471,7 +471,13 @@
// Error messages...
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/** Error message ID that has a null message, but takes in a single object. */
{"ER0000" , "{0}" },
@@ -1412,13 +1418,6 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The int to message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
// ================= INFRASTRUCTURE ======================
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java
index 999092d..53e943c 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java
@@ -471,7 +471,13 @@
// Error messages...
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/** Error message ID that has a null message, but takes in a single object. */
{"ER0000" , "{0}" },
@@ -1412,13 +1418,6 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The int to message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
// ================= INFRASTRUCTURE ======================
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java
index c42b6f3..3c45440 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java
@@ -471,7 +471,13 @@
// Error messages...
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/** Error message ID that has a null message, but takes in a single object. */
{"ER0000" , "{0}" },
@@ -1412,13 +1418,6 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The int to message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
// ================= INFRASTRUCTURE ======================
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java
index 317ee20..a842dfa 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java
@@ -471,7 +471,13 @@
// Error messages...
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/** Error message ID that has a null message, but takes in a single object. */
{"ER0000" , "{0}" },
@@ -1412,13 +1418,6 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The int to message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
// ================= INFRASTRUCTURE ======================
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java b/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java
new file mode 100644
index 0000000..99a8e2d
--- /dev/null
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java
@@ -0,0 +1,449 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.sun.org.apache.xalan.internal.utils;
+
+import com.sun.org.apache.xalan.internal.XalanConstants;
+
+
+/**
+ * This class is not the same as that in Xerces. It is used to manage the
+ * state of corresponding Xerces properties and pass the values over to
+ * the Xerces Security Manager.
+ *
+ * @author Joe Wang Oracle Corp.
+ *
+ */
+public final class XMLSecurityManager {
+
+ /**
+ * States of the settings of a property, in the order: default value, value
+ * set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system
+ * properties, and jaxp api properties
+ */
+ public static enum State {
+ //this order reflects the overriding order
+
+ DEFAULT("default"), FSP("FEATURE_SECURE_PROCESSING"),
+ JAXPDOTPROPERTIES("jaxp.properties"), SYSTEMPROPERTY("system property"),
+ APIPROPERTY("property");
+
+ final String literal;
+ State(String literal) {
+ this.literal = literal;
+ }
+
+ String literal() {
+ return literal;
+ }
+ }
+
+ /**
+ * Limits managed by the security manager
+ */
+ public static enum Limit {
+
+ ENTITY_EXPANSION_LIMIT(XalanConstants.JDK_ENTITY_EXPANSION_LIMIT,
+ XalanConstants.SP_ENTITY_EXPANSION_LIMIT, 0, 64000),
+ MAX_OCCUR_NODE_LIMIT(XalanConstants.JDK_MAX_OCCUR_LIMIT,
+ XalanConstants.SP_MAX_OCCUR_LIMIT, 0, 5000),
+ ELEMENT_ATTRIBUTE_LIMIT(XalanConstants.JDK_ELEMENT_ATTRIBUTE_LIMIT,
+ XalanConstants.SP_ELEMENT_ATTRIBUTE_LIMIT, 0, 10000),
+ TOTAL_ENTITY_SIZE_LIMIT(XalanConstants.JDK_TOTAL_ENTITY_SIZE_LIMIT,
+ XalanConstants.SP_TOTAL_ENTITY_SIZE_LIMIT, 0, 50000000),
+ GENEAL_ENTITY_SIZE_LIMIT(XalanConstants.JDK_GENEAL_ENTITY_SIZE_LIMIT,
+ XalanConstants.SP_GENEAL_ENTITY_SIZE_LIMIT, 0, 0),
+ PARAMETER_ENTITY_SIZE_LIMIT(XalanConstants.JDK_PARAMETER_ENTITY_SIZE_LIMIT,
+ XalanConstants.SP_PARAMETER_ENTITY_SIZE_LIMIT, 0, 1000000);
+
+ final String apiProperty;
+ final String systemProperty;
+ final int defaultValue;
+ final int secureValue;
+
+ Limit(String apiProperty, String systemProperty, int value, int secureValue) {
+ this.apiProperty = apiProperty;
+ this.systemProperty = systemProperty;
+ this.defaultValue = value;
+ this.secureValue = secureValue;
+ }
+
+ public boolean equalsAPIPropertyName(String propertyName) {
+ return (propertyName == null) ? false : apiProperty.equals(propertyName);
+ }
+
+ public boolean equalsSystemPropertyName(String propertyName) {
+ return (propertyName == null) ? false : systemProperty.equals(propertyName);
+ }
+
+ public String apiProperty() {
+ return apiProperty;
+ }
+
+ String systemProperty() {
+ return systemProperty;
+ }
+
+ int defaultValue() {
+ return defaultValue;
+ }
+
+ int secureValue() {
+ return secureValue;
+ }
+ }
+
+ /**
+ * Map old property names with the new ones
+ */
+ public static enum NameMap {
+
+ ENTITY_EXPANSION_LIMIT(XalanConstants.SP_ENTITY_EXPANSION_LIMIT,
+ XalanConstants.ENTITY_EXPANSION_LIMIT),
+ MAX_OCCUR_NODE_LIMIT(XalanConstants.SP_MAX_OCCUR_LIMIT,
+ XalanConstants.MAX_OCCUR_LIMIT),
+ ELEMENT_ATTRIBUTE_LIMIT(XalanConstants.SP_ELEMENT_ATTRIBUTE_LIMIT,
+ XalanConstants.ELEMENT_ATTRIBUTE_LIMIT);
+ final String newName;
+ final String oldName;
+
+ NameMap(String newName, String oldName) {
+ this.newName = newName;
+ this.oldName = oldName;
+ }
+
+ String getOldName(String newName) {
+ if (newName.equals(this.newName)) {
+ return oldName;
+ }
+ return null;
+ }
+ }
+ /**
+ * Values of the properties
+ */
+ private final int[] values;
+ /**
+ * States of the settings for each property
+ */
+ private State[] states;
+ /**
+ * States that determine if properties are set explicitly
+ */
+ private boolean[] isSet;
+
+
+ /**
+ * Index of the special entityCountInfo property
+ */
+ private int indexEntityCountInfo = 10000;
+ private String printEntityCountInfo = "";
+
+ /**
+ * Default constructor. Establishes default values for known security
+ * vulnerabilities.
+ */
+ public XMLSecurityManager() {
+ this(false);
+ }
+
+ /**
+ * Instantiate Security Manager in accordance with the status of
+ * secure processing
+ * @param secureProcessing
+ */
+ public XMLSecurityManager(boolean secureProcessing) {
+ values = new int[Limit.values().length];
+ states = new State[Limit.values().length];
+ isSet = new boolean[Limit.values().length];
+ for (Limit limit : Limit.values()) {
+ if (secureProcessing) {
+ values[limit.ordinal()] = limit.secureValue();
+ states[limit.ordinal()] = State.FSP;
+ } else {
+ values[limit.ordinal()] = limit.defaultValue();
+ states[limit.ordinal()] = State.DEFAULT;
+ }
+ }
+ //read system properties or jaxp.properties
+ readSystemProperties();
+ }
+
+ /**
+ * Setting FEATURE_SECURE_PROCESSING explicitly
+ */
+ public void setSecureProcessing(boolean secure) {
+ for (Limit limit : Limit.values()) {
+ if (secure) {
+ setLimit(limit.ordinal(), State.FSP, limit.secureValue());
+ } else {
+ setLimit(limit.ordinal(), State.FSP, limit.defaultValue());
+ }
+ }
+ }
+
+ /**
+ * Set limit by property name and state
+ * @param propertyName property name
+ * @param state the state of the property
+ * @param value the value of the property
+ * @return true if the property is managed by the security manager; false
+ * if otherwise.
+ */
+ public boolean setLimit(String propertyName, State state, Object value) {
+ int index = getIndex(propertyName);
+ if (index > -1) {
+ setLimit(index, state, value);
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Set the value for a specific limit.
+ *
+ * @param limit the limit
+ * @param state the state of the property
+ * @param value the value of the property
+ */
+ public void setLimit(Limit limit, State state, int value) {
+ setLimit(limit.ordinal(), state, value);
+ }
+
+ /**
+ * Set the value of a property by its index
+ *
+ * @param index the index of the property
+ * @param state the state of the property
+ * @param value the value of the property
+ */
+ public void setLimit(int index, State state, Object value) {
+ if (index == indexEntityCountInfo) {
+ //if it's explicitly set, it's treated as yes no matter the value
+ printEntityCountInfo = (String)value;
+ } else {
+ int temp = 0;
+ try {
+ temp = Integer.parseInt((String) value);
+ if (temp < 0) {
+ temp = 0;
+ }
+ } catch (NumberFormatException e) {}
+ setLimit(index, state, temp); }
+ }
+
+ /**
+ * Set the value of a property by its index
+ *
+ * @param index the index of the property
+ * @param state the state of the property
+ * @param value the value of the property
+ */
+ public void setLimit(int index, State state, int value) {
+ if (index == indexEntityCountInfo) {
+ //if it's explicitly set, it's treated as yes no matter the value
+ printEntityCountInfo = XalanConstants.JDK_YES;
+ } else {
+ //only update if it shall override
+ if (state.compareTo(states[index]) >= 0) {
+ values[index] = value;
+ states[index] = state;
+ isSet[index] = true;
+ }
+ }
+ }
+
+
+ /**
+ * Return the value of the specified property.
+ *
+ * @param propertyName the property name
+ * @return the value of the property as a string. If a property is managed
+ * by this manager, its value shall not be null.
+ */
+ public String getLimitAsString(String propertyName) {
+ int index = getIndex(propertyName);
+ if (index > -1) {
+ return getLimitValueByIndex(index);
+ }
+
+ return null;
+ }
+
+ /**
+ * Return the value of a property by its ordinal
+ *
+ * @param limit the property
+ * @return value of a property
+ */
+ public String getLimitValueAsString(Limit limit) {
+ return Integer.toString(values[limit.ordinal()]);
+ }
+
+ /**
+ * Return the value of the specified property
+ *
+ * @param limit the property
+ * @return the value of the property
+ */
+ public int getLimit(Limit limit) {
+ return values[limit.ordinal()];
+ }
+
+ /**
+ * Return the value of a property by its ordinal
+ *
+ * @param index the index of a property
+ * @return value of a property
+ */
+ public int getLimitByIndex(int index) {
+ return values[index];
+ }
+ /**
+ * Return the value of a property by its index
+ *
+ * @param index the index of a property
+ * @return limit of a property as a string
+ */
+ public String getLimitValueByIndex(int index) {
+ if (index == indexEntityCountInfo) {
+ return printEntityCountInfo;
+ }
+
+ return Integer.toString(values[index]);
+ }
+ /**
+ * Return the state of the limit property
+ *
+ * @param limit the limit
+ * @return the state of the limit property
+ */
+ public State getState(Limit limit) {
+ return states[limit.ordinal()];
+ }
+
+ /**
+ * Return the state of the limit property
+ *
+ * @param limit the limit
+ * @return the state of the limit property
+ */
+ public String getStateLiteral(Limit limit) {
+ return states[limit.ordinal()].literal();
+ }
+
+ /**
+ * Get the index by property name
+ *
+ * @param propertyName property name
+ * @return the index of the property if found; return -1 if not
+ */
+ public int getIndex(String propertyName) {
+ for (Limit limit : Limit.values()) {
+ if (limit.equalsAPIPropertyName(propertyName)) {
+ //internally, ordinal is used as index
+ return limit.ordinal();
+ }
+ }
+ //special property to return entity count info
+ if (propertyName.equals(XalanConstants.JDK_ENTITY_COUNT_INFO)) {
+ return indexEntityCountInfo;
+ }
+ return -1;
+ }
+
+ /**
+ * Indicate if a property is set explicitly
+ * @param index
+ * @return
+ */
+ public boolean isSet(int index) {
+ return isSet[index];
+ }
+
+ public boolean printEntityCountInfo() {
+ return printEntityCountInfo.equals(XalanConstants.JDK_YES);
+ }
+ /**
+ * Read from system properties, or those in jaxp.properties
+ */
+ private void readSystemProperties() {
+
+ for (Limit limit : Limit.values()) {
+ if (!getSystemProperty(limit, limit.systemProperty())) {
+ //if system property is not found, try the older form if any
+ for (NameMap nameMap : NameMap.values()) {
+ String oldName = nameMap.getOldName(limit.systemProperty());
+ if (oldName != null) {
+ getSystemProperty(limit, oldName);
+ }
+ }
+ }
+ }
+
+ }
+
+ /**
+ * Read from system properties, or those in jaxp.properties
+ *
+ * @param property the type of the property
+ * @param sysPropertyName the name of system property
+ */
+ private boolean getSystemProperty(Limit limit, String sysPropertyName) {
+ try {
+ String value = SecuritySupport.getSystemProperty(sysPropertyName);
+ if (value != null && !value.equals("")) {
+ values[limit.ordinal()] = Integer.parseInt(value);
+ states[limit.ordinal()] = State.SYSTEMPROPERTY;
+ return true;
+ }
+
+ value = SecuritySupport.readJAXPProperty(sysPropertyName);
+ if (value != null && !value.equals("")) {
+ values[limit.ordinal()] = Integer.parseInt(value);
+ states[limit.ordinal()] = State.JAXPDOTPROPERTIES;
+ return true;
+ }
+ } catch (NumberFormatException e) {
+ //invalid setting
+ throw new NumberFormatException("Invalid setting for system property: " + limit.systemProperty());
+ }
+ return false;
+ }
+}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java b/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java
index 5f5501a..35dc9a5 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java
@@ -94,6 +94,23 @@
}
/**
+ * Set limit by property name and state
+ * @param propertyName property name
+ * @param state the state of the property
+ * @param value the value of the property
+ * @return true if the property is managed by the security property manager;
+ * false if otherwise.
+ */
+ public boolean setValue(String propertyName, State state, Object value) {
+ int index = getIndex(propertyName);
+ if (index > -1) {
+ setValue(index, state, (String)value);
+ return true;
+ }
+ return false;
+ }
+
+ /**
* Set the value for a specific property.
*
* @param property the property
@@ -121,6 +138,22 @@
states[index] = state;
}
}
+
+ /**
+ * Return the value of the specified property
+ *
+ * @param propertyName the property name
+ * @return the value of the property as a string
+ */
+ public String getValue(String propertyName) {
+ int index = getIndex(propertyName);
+ if (index > -1) {
+ return getValueByIndex(index);
+ }
+
+ return null;
+ }
+
/**
* Return the value of the specified property
*
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java
index fdfbe17..e1971d3 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java
@@ -86,7 +86,7 @@
if (input == null) {
docToLoad = SystemIDResolver.getAbsoluteURI(docToLoad, currLoadedDoc);
String accessError = SecuritySupport.checkAccess(docToLoad,
- xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
+ (String)xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
XalanConstants.ACCESS_EXTERNAL_ALL);
if (accessError != null) {
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java
index 71c129f..5bf12f8 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java
@@ -87,7 +87,7 @@
if (input == null) {
docToLoad = SystemIDResolver.getAbsoluteURI(docToLoad, currLoadedDoc);
String accessError = SecuritySupport.checkAccess(docToLoad,
- xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
+ (String)xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
XalanConstants.ACCESS_EXTERNAL_ALL);
if (accessError != null) {
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java
index 3c186a1..0903d9a 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java
@@ -28,6 +28,7 @@
import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
import com.sun.org.apache.xalan.internal.utils.ObjectFactory;
import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
+import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
import com.sun.org.apache.xalan.internal.xsltc.compiler.util.MethodType;
import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Type;
@@ -487,6 +488,20 @@
}
final XMLReader reader = parser.getXMLReader();
+ try {
+ XMLSecurityManager securityManager =
+ (XMLSecurityManager)_xsltc.getProperty(XalanConstants.SECURITY_MANAGER);
+ for (XMLSecurityManager.Limit limit : XMLSecurityManager.Limit.values()) {
+ reader.setProperty(limit.apiProperty(), securityManager.getLimitValueAsString(limit));
+ }
+ if (securityManager.printEntityCountInfo()) {
+ parser.setProperty(XalanConstants.JDK_ENTITY_COUNT_INFO, XalanConstants.JDK_YES);
+ }
+ } catch (SAXException se) {
+ System.err.println("Warning: " + reader.getClass().getName() + ": "
+ + se.getMessage());
+ }
+
return(parse(reader, input));
}
catch (ParserConfigurationException e) {
@@ -565,7 +580,7 @@
}
path = SystemIDResolver.getAbsoluteURI(path);
String accessError = SecuritySupport.checkAccess(path,
- _xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
+ (String)_xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
XalanConstants.ACCESS_EXTERNAL_ALL);
if (accessError != null) {
ErrorMsg msg = new ErrorMsg(ErrorMsg.ACCESSING_XSLT_TARGET_ERR,
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java
index 97fff3b..10823f1 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java
@@ -44,11 +44,11 @@
import com.sun.org.apache.bcel.internal.classfile.JavaClass;
import com.sun.org.apache.xalan.internal.XalanConstants;
import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
+import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Util;
import com.sun.org.apache.xml.internal.dtm.DTM;
-import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
@@ -146,6 +146,7 @@
*/
private String _accessExternalDTD = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
+ private XMLSecurityManager _xmlSecurityManager;
/**
* XSLTC compiler constructor
@@ -184,12 +185,14 @@
/**
* Return allowed protocols for accessing external stylesheet.
*/
- public String getProperty(String name) {
+ public Object getProperty(String name) {
if (name.equals(XMLConstants.ACCESS_EXTERNAL_STYLESHEET)) {
return _accessExternalStylesheet;
}
else if (name.equals(XMLConstants.ACCESS_EXTERNAL_DTD)) {
return _accessExternalDTD;
+ } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
+ return _xmlSecurityManager;
}
return null;
}
@@ -197,12 +200,14 @@
/**
* Set allowed protocols for accessing external stylesheet.
*/
- public void setProperty(String name, String value) {
+ public void setProperty(String name, Object value) {
if (name.equals(XMLConstants.ACCESS_EXTERNAL_STYLESHEET)) {
_accessExternalStylesheet = (String)value;
}
else if (name.equals(XMLConstants.ACCESS_EXTERNAL_DTD)) {
_accessExternalDTD = (String)value;
+ } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
+ _xmlSecurityManager = (XMLSecurityManager)value;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java
index 8595d82..500c3fc 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java
@@ -90,7 +90,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
{ErrorMsg.MULTIPLE_STYLESHEET_ERR,
"More than one stylesheet defined in the same file."},
@@ -1012,12 +1018,5 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java
index fa28ddc..708f744 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java
@@ -90,7 +90,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
{ErrorMsg.MULTIPLE_STYLESHEET_ERR,
"S'ha definit m\u00e9s d'un full d'estils en el mateix fitxer."},
@@ -853,12 +859,5 @@
"FEATURE_SECURE_PROCESSING: Cannot set the feature to false when security manager is present."}
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java
index 4220efd..f172643 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java
@@ -90,7 +90,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
{ErrorMsg.MULTIPLE_STYLESHEET_ERR,
"V\u00edce ne\u017e jedna p\u0159edloha stylu je definov\u00e1na ve stejn\u00e9m souboru."},
@@ -853,12 +859,5 @@
"FEATURE_SECURE_PROCESSING: Cannot set the feature to false when security manager is present."}
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
index 48c3b6d..9807d06 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
@@ -90,7 +90,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
{ErrorMsg.MULTIPLE_STYLESHEET_ERR,
"Mehrere Stylesheets in derselben Datei definiert."},
@@ -964,12 +970,5 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java
index 46e69aa..1225bd9 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java
@@ -90,7 +90,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
{ErrorMsg.MULTIPLE_STYLESHEET_ERR,
"Se ha definido m\u00E1s de una hoja de estilo en el mismo archivo."},
@@ -964,12 +970,5 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java
index 6d68f24..588e02d 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java
@@ -90,7 +90,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
{ErrorMsg.MULTIPLE_STYLESHEET_ERR,
"Plusieurs feuilles de style d\u00E9finies dans le m\u00EAme fichier."},
@@ -964,12 +970,5 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java
index 32872e7..030ea71 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java
@@ -90,7 +90,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
{ErrorMsg.MULTIPLE_STYLESHEET_ERR,
"Sono stati definiti pi\u00F9 fogli di stile nello stesso file."},
@@ -964,12 +970,5 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java
index 7507e5d..efd1327 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java
@@ -90,7 +90,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
{ErrorMsg.MULTIPLE_STYLESHEET_ERR,
"\u540C\u3058\u30D5\u30A1\u30A4\u30EB\u306B\u8907\u6570\u306E\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059\u3002"},
@@ -964,12 +970,5 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java
index dc0d6c3..3921af4 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java
@@ -90,7 +90,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
{ErrorMsg.MULTIPLE_STYLESHEET_ERR,
"\uB3D9\uC77C\uD55C \uD30C\uC77C\uC5D0 \uC2A4\uD0C0\uC77C\uC2DC\uD2B8\uAC00 \uB450 \uAC1C \uC774\uC0C1 \uC815\uC758\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
@@ -964,12 +970,5 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java
index 274a4a0..6760941 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java
@@ -90,7 +90,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
{ErrorMsg.MULTIPLE_STYLESHEET_ERR,
"Mais de uma folha de estilos definida no mesmo arquivo."},
@@ -964,12 +970,5 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java
index 1a76afc..17646e9 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java
@@ -90,7 +90,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
{ErrorMsg.MULTIPLE_STYLESHEET_ERR,
"Viac ne\u017e jeden \u0161t\u00fdl dokumentu bol definovan\u00fd v rovnakom s\u00fabore."},
@@ -853,12 +859,5 @@
"FEATURE_SECURE_PROCESSING: Cannot set the feature to false when security manager is present."}
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java
index 66ee5fb..93edfa9 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java
@@ -90,7 +90,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
{ErrorMsg.MULTIPLE_STYLESHEET_ERR,
"Fler \u00E4n en formatmall har definierats i samma fil."},
@@ -964,12 +970,5 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java
index 6896db3..93889c3 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java
@@ -90,7 +90,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
{ErrorMsg.MULTIPLE_STYLESHEET_ERR,
"\u540C\u4E00\u6587\u4EF6\u4E2D\u5B9A\u4E49\u4E86\u591A\u4E2A\u6837\u5F0F\u8868\u3002"},
@@ -964,12 +970,5 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java
index 59c0b33..d99e7ec 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java
@@ -90,7 +90,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
{ErrorMsg.MULTIPLE_STYLESHEET_ERR,
"\u76F8\u540C\u6A94\u6848\u4E2D\u5B9A\u7FA9\u4E86\u8D85\u904E\u4E00\u500B\u6A23\u5F0F\u8868\u3002"},
@@ -964,12 +970,5 @@
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java
index 37b4176..e1fd9e3 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java
@@ -81,7 +81,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/*
* Note to translators: the substitution text in the following message
@@ -276,13 +282,6 @@
{BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
"Use of the extension element ''{0}'' is not allowed when the secure processing feature is set to true."},
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java
index 1f1c461..a2b2ba1 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java
@@ -79,7 +79,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/*
* Note to translators: the substitution text in the following message
@@ -223,13 +229,6 @@
"No s''ha pogut resoldre la refer\u00e8ncia d''URI ''{0}''."}
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java
index 497367b..88409e1 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java
@@ -79,7 +79,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/*
* Note to translators: the substitution text in the following message
@@ -223,13 +229,6 @@
"Nelze p\u0159elo\u017eit odkazy URI ''{0}''."}
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
index 181b4e1..747ae52 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
@@ -81,7 +81,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/*
* Note to translators: the substitution text in the following message
@@ -276,13 +282,6 @@
{BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
"Verwendung des Erweiterungselements \"{0}\" ist nicht zul\u00E4ssig, wenn das Feature f\u00FCr die sichere Verarbeitung auf \"true\" gesetzt ist."},
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java
index a597958..7810adaf 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java
@@ -81,7 +81,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/*
* Note to translators: the substitution text in the following message
@@ -276,13 +282,6 @@
{BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
"El uso del elemento de extensi\u00F3n ''{0}'' no est\u00E1 permitido cuando la funci\u00F3n de procesamiento seguro se ha definido en true."},
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java
index 5319304..28089e9 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java
@@ -81,7 +81,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/*
* Note to translators: the substitution text in the following message
@@ -276,13 +282,6 @@
{BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
"L''utilisation de l''\u00E9l\u00E9ment d''extension ''{0}'' n''est pas autoris\u00E9e lorsque la fonctionnalit\u00E9 de traitement s\u00E9curis\u00E9 est d\u00E9finie sur True."},
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java
index da6622e..3fa594b 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java
@@ -81,7 +81,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/*
* Note to translators: the substitution text in the following message
@@ -276,13 +282,6 @@
{BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
"Non \u00E8 consentito utilizzare l''elemento di estensione ''{0}'' se la funzione di elaborazione sicura \u00E8 impostata su true."},
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java
index 54dc000..ce4f170 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java
@@ -81,7 +81,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/*
* Note to translators: the substitution text in the following message
@@ -276,13 +282,6 @@
{BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
"\u30BB\u30AD\u30E5\u30A2\u51E6\u7406\u6A5F\u80FD\u304Ctrue\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u3068\u304D\u3001\u62E1\u5F35\u8981\u7D20''{0}''\u306E\u4F7F\u7528\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093\u3002"},
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java
index 87b5323..6ede7df 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java
@@ -81,7 +81,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/*
* Note to translators: the substitution text in the following message
@@ -276,13 +282,6 @@
{BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
"\uBCF4\uC548 \uCC98\uB9AC \uAE30\uB2A5\uC774 true\uB85C \uC124\uC815\uB41C \uACBD\uC6B0 \uD655\uC7A5 \uC694\uC18C ''{0}''\uC744(\uB97C) \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java
index 0eb0cfa..6004632 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java
@@ -81,7 +81,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/*
* Note to translators: the substitution text in the following message
@@ -276,13 +282,6 @@
{BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
"O uso do elemento da extens\u00E3o ''{0}'' n\u00E3o ser\u00E1 permitido quando o recurso de processamento seguro for definido como verdadeiro."},
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java
index cf23692..6ee58b7 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java
@@ -79,7 +79,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/*
* Note to translators: the substitution text in the following message
@@ -223,13 +229,6 @@
"Nebolo mo\u017en\u00e9 rozl\u00ed\u0161i\u0165 referenciu URI ''{0}''."}
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java
index 0e7b2fe..14f6797 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java
@@ -81,7 +81,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/*
* Note to translators: the substitution text in the following message
@@ -276,13 +282,6 @@
{BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
"Anv\u00E4ndning av till\u00E4ggselementet ''{0}'' \u00E4r inte till\u00E5tet n\u00E4r s\u00E4ker bearbetning till\u00E4mpas."},
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java
index 2900d55..c673f2b 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java
@@ -81,7 +81,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/*
* Note to translators: the substitution text in the following message
@@ -276,13 +282,6 @@
{BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
"\u5F53\u5B89\u5168\u5904\u7406\u529F\u80FD\u8BBE\u7F6E\u4E3A\u201C\u771F\u201D\u65F6, \u4E0D\u5141\u8BB8\u4F7F\u7528\u6269\u5C55\u5143\u7D20 ''{0}''\u3002"},
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java
index 8e591a2..50972c6 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java
@@ -81,7 +81,13 @@
*/
// These message should be read from a locale-specific resource bundle
- private static final Object[][] _contents = new Object[][] {
+ /** Get the lookup table for error messages.
+ *
+ * @return The message lookup table.
+ */
+ public Object[][] getContents()
+ {
+ return new Object[][] {
/*
* Note to translators: the substitution text in the following message
@@ -276,13 +282,6 @@
{BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
"\u7576\u5B89\u5168\u8655\u7406\u529F\u80FD\u8A2D\u70BA\u771F\u6642\uFF0C\u4E0D\u5141\u8A31\u4F7F\u7528\u64F4\u5145\u5957\u4EF6\u5143\u7D20 ''{0}''\u3002"},
};
- /** Get the lookup table for error messages.
- *
- * @return The message lookup table.
- */
- public Object[][] getContents()
- {
- return _contents;
}
}
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java
index 879c1cb..ff43ca9 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java
@@ -29,7 +29,7 @@
import javax.xml.transform.TransformerException;
import javax.xml.transform.URIResolver;
import javax.xml.transform.sax.TemplatesHandler;
-
+import com.sun.org.apache.xalan.internal.XalanConstants;
import com.sun.org.apache.xalan.internal.xsltc.compiler.CompilerException;
import com.sun.org.apache.xalan.internal.xsltc.compiler.Parser;
import com.sun.org.apache.xalan.internal.xsltc.compiler.SourceLoader;
@@ -103,6 +103,8 @@
(String)tfactory.getAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET));
xsltc.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD,
(String)tfactory.getAttribute(XMLConstants.ACCESS_EXTERNAL_DTD));
+ xsltc.setProperty(XalanConstants.SECURITY_MANAGER,
+ tfactory.getAttribute(XalanConstants.SECURITY_MANAGER));
if ("true".equals(tfactory.getAttribute(TransformerFactoryImpl.ENABLE_INLINING)))
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
index 8748929..9b6589d 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
@@ -27,6 +27,7 @@
import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
import com.sun.org.apache.xalan.internal.utils.ObjectFactory;
import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
+import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager;
import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager.Property;
import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager.State;
@@ -218,13 +219,13 @@
* protocols allowed for external references set by the stylesheet processing instruction, Import and Include element.
*/
private String _accessExternalStylesheet = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
-
/**
* protocols allowed for external DTD references in source file and/or stylesheet.
*/
private String _accessExternalDTD = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
private XMLSecurityPropertyManager _xmlSecurityPropertyMgr;
+ private XMLSecurityManager _xmlSecurityManager;
/**
* javax.xml.transform.sax.TransformerFactory implementation.
@@ -250,6 +251,9 @@
Property.ACCESS_EXTERNAL_DTD);
_accessExternalStylesheet = _xmlSecurityPropertyMgr.getValue(
Property.ACCESS_EXTERNAL_STYLESHEET);
+
+ //Parser's security manager
+ _xmlSecurityManager = new XMLSecurityManager(true);
}
/**
@@ -311,11 +315,21 @@
return Boolean.TRUE;
else
return Boolean.FALSE;
+ } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
+ return _xmlSecurityManager;
}
- int index = _xmlSecurityPropertyMgr.getIndex(name);
- if (index > -1) {
- return _xmlSecurityPropertyMgr.getValueByIndex(index);
+ /** Check to see if the property is managed by the security manager **/
+ String propertyValue = (_xmlSecurityManager != null) ?
+ _xmlSecurityManager.getLimitAsString(name) : null;
+ if (propertyValue != null) {
+ return propertyValue;
+ } else {
+ propertyValue = (_xmlSecurityPropertyMgr != null) ?
+ _xmlSecurityPropertyMgr.getValue(name) : null;
+ if (propertyValue != null) {
+ return propertyValue;
+ }
}
// Throw an exception for all other attributes
@@ -419,10 +433,13 @@
}
}
- int index = _xmlSecurityPropertyMgr.getIndex(name);
- if (index > -1) {
- _xmlSecurityPropertyMgr.setValue(index,
- State.APIPROPERTY, (String)value);
+ if (_xmlSecurityManager != null &&
+ _xmlSecurityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, value)) {
+ return;
+ }
+
+ if (_xmlSecurityPropertyMgr != null &&
+ _xmlSecurityPropertyMgr.setValue(name, XMLSecurityPropertyManager.State.APIPROPERTY, value)) {
_accessExternalDTD = _xmlSecurityPropertyMgr.getValue(
Property.ACCESS_EXTERNAL_DTD);
_accessExternalStylesheet = _xmlSecurityPropertyMgr.getValue(
@@ -473,6 +490,7 @@
throw new TransformerConfigurationException(err.toString());
}
_isNotSecureProcessing = !value;
+ _xmlSecurityManager.setSecureProcessing(value);
// set external access restriction when FSP is explicitly set
if (value && XalanConstants.IS_JDK8_OR_ABOVE) {
@@ -849,6 +867,7 @@
if (!_isNotSecureProcessing) xsltc.setSecureProcessing(true);
xsltc.setProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, _accessExternalStylesheet);
xsltc.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, _accessExternalDTD);
+ xsltc.setProperty(XalanConstants.SECURITY_MANAGER, _xmlSecurityManager);
xsltc.init();
// Set a document loader (for xsl:include/import) if defined
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
index 63446e7..6bf365f 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
@@ -25,6 +25,7 @@
import com.sun.org.apache.xalan.internal.XalanConstants;
import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
+import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -214,6 +215,7 @@
*/
private String _accessExternalDTD = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
+ private XMLSecurityManager _securityManager;
/**
* A hashtable to store parameters for the identity transform. These
* are not needed during the transformation, but we must keep track of
@@ -269,8 +271,11 @@
_useServicesMechanism = _tfactory.useServicesMechnism();
_accessExternalStylesheet = (String)_tfactory.getAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET);
_accessExternalDTD = (String)_tfactory.getAttribute(XMLConstants.ACCESS_EXTERNAL_DTD);
+ _securityManager = (XMLSecurityManager)_tfactory.getAttribute(XalanConstants.SECURITY_MANAGER);
_readerManager = XMLReaderManager.getInstance(_useServicesMechanism);
_readerManager.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, _accessExternalDTD);
+ _readerManager.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, _isSecureProcessing);
+ _readerManager.setProperty(XalanConstants.SECURITY_MANAGER, _securityManager);
//_isIncremental = tfactory._incremental;
}
@@ -286,6 +291,7 @@
*/
public void setSecureProcessing(boolean flag) {
_isSecureProcessing = flag;
+ _readerManager.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, _isSecureProcessing);
}
/**
* Return the state of the services mechanism feature.
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java
index 25c45c0..4c6e029 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java
@@ -23,6 +23,7 @@
package com.sun.org.apache.xalan.internal.xsltc.trax;
+import com.sun.org.apache.xalan.internal.XalanConstants;
import java.io.InputStream;
import java.io.Reader;
@@ -43,6 +44,7 @@
import javax.xml.transform.stream.StreamSource;
import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
+import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xalan.internal.xsltc.compiler.XSLTC;
import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
@@ -105,6 +107,13 @@
if (reader == null) {
try {
reader= XMLReaderFactory.createXMLReader();
+ try {
+ reader.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
+ xsltc.isSecureProcessing());
+ } catch (SAXNotRecognizedException e) {
+ System.err.println("Warning: " + reader.getClass().getName() + ": "
+ + e.getMessage());
+ }
} catch (Exception e ) {
try {
@@ -144,6 +153,22 @@
+ e.getMessage());
}
+ try {
+ XMLSecurityManager securityManager =
+ (XMLSecurityManager)xsltc.getProperty(XalanConstants.SECURITY_MANAGER);
+ if (securityManager != null) {
+ for (XMLSecurityManager.Limit limit : XMLSecurityManager.Limit.values()) {
+ reader.setProperty(limit.apiProperty(),
+ securityManager.getLimitValueAsString(limit));
+ }
+ if (securityManager.printEntityCountInfo()) {
+ reader.setProperty(XalanConstants.JDK_ENTITY_COUNT_INFO, XalanConstants.JDK_YES);
+ }
+ }
+ } catch (SAXException se) {
+ System.err.println("Warning: " + reader.getClass().getName() + ": "
+ + se.getMessage());
+ }
xsltc.setXMLReader(reader);
}catch (SAXNotRecognizedException snre ) {
throw new TransformerConfigurationException
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java b/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java
index 832724a..1e8dcd9 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java
@@ -33,6 +33,7 @@
import com.sun.org.apache.xerces.internal.util.PropertyState;
import com.sun.org.apache.xerces.internal.util.SymbolTable;
import com.sun.org.apache.xerces.internal.utils.ObjectFactory;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
import com.sun.org.apache.xerces.internal.xni.XMLDTDContentModelHandler;
import com.sun.org.apache.xerces.internal.xni.XMLDTDHandler;
@@ -59,6 +60,7 @@
import org.w3c.dom.ls.LSResourceResolver;
+
/**
* Xerces implementation of DOMConfiguration that maintains a table of recognized parameters.
*
@@ -156,6 +158,9 @@
protected static final String SCHEMA_DV_FACTORY =
Constants.XERCES_PROPERTY_PREFIX + Constants.SCHEMA_DV_FACTORY_PROPERTY;
+ /** Property identifier: Security manager. */
+ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
+
/** Property identifier: Security property manager. */
private static final String XML_SECURITY_PROPERTY_MANAGER =
Constants.XML_SECURITY_PROPERTY_MANAGER;
@@ -279,6 +284,7 @@
JAXP_SCHEMA_LANGUAGE,
DTD_VALIDATOR_FACTORY_PROPERTY,
SCHEMA_DV_FACTORY,
+ SECURITY_MANAGER,
XML_SECURITY_PROPERTY_MANAGER
};
addRecognizedProperties(recognizedProperties);
@@ -313,6 +319,8 @@
fValidationManager = createValidationManager();
setProperty(VALIDATION_MANAGER, fValidationManager);
+ setProperty(SECURITY_MANAGER, new XMLSecurityManager(true));
+
setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER,
new XMLSecurityPropertyManager());
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java b/jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java
index bcc2a79..579622a 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java
@@ -174,8 +174,6 @@
/** JAXP schemaSource language: when used internally may include DTD namespace (DOM) */
public static final String SCHEMA_LANGUAGE = "schemaLanguage";
- public static final String SYSTEM_PROPERTY_ELEMENT_ATTRIBUTE_LIMIT = "elementAttributeLimit" ;
-
/** JAXP Standard property prefix ("http://javax.xml.XMLConstants/property/"). */
public static final String JAXPAPI_PROPERTY_PREFIX =
"http://javax.xml.XMLConstants/property/";
@@ -209,6 +207,107 @@
public static final boolean IS_JDK8_OR_ABOVE = isJavaVersionAtLeast(8);
//
+ // Implementation limits: corresponding System Properties of the above
+ // API properties
+ //
+ /**
+ * JDK entity expansion limit; Note that the existing system property
+ * "entityExpansionLimit" with no prefix is still observed
+ */
+ public static final String JDK_ENTITY_EXPANSION_LIMIT =
+ ORACLE_JAXP_PROPERTY_PREFIX + "entityExpansionLimit";
+
+ /**
+ * JDK element attribute limit; Note that the existing system property
+ * "elementAttributeLimit" with no prefix is still observed
+ */
+ public static final String JDK_ELEMENT_ATTRIBUTE_LIMIT =
+ ORACLE_JAXP_PROPERTY_PREFIX + "elementAttributeLimit";
+
+ /**
+ * JDK maxOccur limit; Note that the existing system property
+ * "maxOccurLimit" with no prefix is still observed
+ */
+ public static final String JDK_MAX_OCCUR_LIMIT =
+ ORACLE_JAXP_PROPERTY_PREFIX + "maxOccurLimit";
+
+ /**
+ * JDK total entity size limit
+ */
+ public static final String JDK_TOTAL_ENTITY_SIZE_LIMIT =
+ ORACLE_JAXP_PROPERTY_PREFIX + "totalEntitySizeLimit";
+
+ /**
+ * JDK maximum general entity size limit
+ */
+ public static final String JDK_GENEAL_ENTITY_SIZE_LIMIT =
+ ORACLE_JAXP_PROPERTY_PREFIX + "maxGeneralEntitySizeLimit";
+ /**
+ * JDK maximum parameter entity size limit
+ */
+ public static final String JDK_PARAMETER_ENTITY_SIZE_LIMIT =
+ ORACLE_JAXP_PROPERTY_PREFIX + "maxParameterEntitySizeLimit";
+ /**
+ * JDK maximum XML name limit
+ */
+ public static final String JDK_XML_NAME_LIMIT =
+ ORACLE_JAXP_PROPERTY_PREFIX + "maxXMLNameLimit";
+ /**
+ * JDK property to allow printing out information from the limit analyzer
+ */
+ public static final String JDK_ENTITY_COUNT_INFO =
+ ORACLE_JAXP_PROPERTY_PREFIX + "getEntityCountInfo";
+
+ //
+ // Implementation limits: API properties
+ //
+ /**
+ * JDK entity expansion limit; Note that the existing system property
+ * "entityExpansionLimit" with no prefix is still observed
+ */
+ public static final String SP_ENTITY_EXPANSION_LIMIT = "jdk.xml.entityExpansionLimit";
+
+ /**
+ * JDK element attribute limit; Note that the existing system property
+ * "elementAttributeLimit" with no prefix is still observed
+ */
+ public static final String SP_ELEMENT_ATTRIBUTE_LIMIT = "jdk.xml.elementAttributeLimit";
+
+ /**
+ * JDK maxOccur limit; Note that the existing system property
+ * "maxOccurLimit" with no prefix is still observed
+ */
+ public static final String SP_MAX_OCCUR_LIMIT = "jdk.xml.maxOccurLimit";
+
+ /**
+ * JDK total entity size limit
+ */
+ public static final String SP_TOTAL_ENTITY_SIZE_LIMIT = "jdk.xml.totalEntitySizeLimit";
+
+ /**
+ * JDK maximum general entity size limit
+ */
+ public static final String SP_GENEAL_ENTITY_SIZE_LIMIT = "jdk.xml.maxGeneralEntitySizeLimit";
+ /**
+ * JDK maximum parameter entity size limit
+ */
+ public static final String SP_PARAMETER_ENTITY_SIZE_LIMIT = "jdk.xml.maxParameterEntitySizeLimit";
+ /**
+ * JDK maximum XML name limit
+ */
+ public static final String SP_XML_NAME_LIMIT = "jdk.xml.maxXMLNameLimit";
+
+ //legacy System Properties
+ public final static String ENTITY_EXPANSION_LIMIT = "entityExpansionLimit";
+ public static final String ELEMENT_ATTRIBUTE_LIMIT = "elementAttributeLimit" ;
+ public final static String MAX_OCCUR_LIMIT = "maxOccurLimit";
+
+ /**
+ * A string "yes" that can be used for properties such as getEntityCountInfo
+ */
+ public static final String JDK_YES = "yes";
+
+ //
// DOM features
//
@@ -443,7 +542,7 @@
public static final String LOCALE_PROPERTY = "locale";
/** property identifier: security manager. */
- protected static final String SECURITY_MANAGER =
+ public static final String SECURITY_MANAGER =
Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY;
@@ -511,9 +610,6 @@
*/
public final static String ATTRIBUTE_DECLARED = "ATTRIBUTE_DECLARED";
- public final static String ENTITY_EXPANSION_LIMIT = "entityExpansionLimit";
-
- public final static String MAX_OCCUR_LIMIT = "maxOccurLimit";
/**
* {@link org.w3c.dom.TypeInfo} associated with current element/attribute
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java b/jaxp/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
index 0f5119d..2c8f3af 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
@@ -25,6 +25,7 @@
package com.sun.org.apache.xerces.internal.impl;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
import com.sun.xml.internal.stream.StaxEntityResolverWrapper;
import java.util.HashMap;
@@ -50,12 +51,16 @@
private static final String STRING_INTERNING = "http://xml.org/sax/features/string-interning";
+ /** Property identifier: Security manager. */
+ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
+
/** Property identifier: Security property manager. */
private static final String XML_SECURITY_PROPERTY_MANAGER =
Constants.XML_SECURITY_PROPERTY_MANAGER;
HashMap supportedProps = new HashMap();
+ private XMLSecurityManager fSecurityManager;
private XMLSecurityPropertyManager fSecurityPropertyMgr;
public static final int CONTEXT_READER = 1;
@@ -82,6 +87,7 @@
HashMap properties = propertyManager.getProperties();
supportedProps.putAll(properties);
+ fSecurityManager = (XMLSecurityManager)getProperty(SECURITY_MANAGER);
fSecurityPropertyMgr = (XMLSecurityPropertyManager)getProperty(XML_SECURITY_PROPERTY_MANAGER);
}
@@ -124,6 +130,8 @@
supportedProps.put(Constants.XERCES_FEATURE_PREFIX + Constants.WARN_ON_DUPLICATE_ENTITYDEF_FEATURE, new Boolean(false));
supportedProps.put(Constants.XERCES_FEATURE_PREFIX + Constants.WARN_ON_UNDECLARED_ELEMDEF_FEATURE, new Boolean(false));
+ fSecurityManager = new XMLSecurityManager(true);
+ supportedProps.put(SECURITY_MANAGER, fSecurityManager);
fSecurityPropertyMgr = new XMLSecurityPropertyManager();
supportedProps.put(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
}
@@ -142,6 +150,7 @@
*/
public boolean containsProperty(String property){
return supportedProps.containsKey(property) ||
+ (fSecurityManager != null && fSecurityManager.getIndex(property) > -1) ||
(fSecurityPropertyMgr!=null && fSecurityPropertyMgr.getIndex(property) > -1) ;
}
@@ -169,12 +178,34 @@
supportedProps.put( Constants.XERCES_PROPERTY_PREFIX + Constants.STAX_ENTITY_RESOLVER_PROPERTY , new StaxEntityResolverWrapper((XMLResolver)value)) ;
}
- int index = (fSecurityPropertyMgr != null) ? fSecurityPropertyMgr.getIndex(property) : -1;
- if (index > -1) {
- fSecurityPropertyMgr.setValue(index,
- XMLSecurityPropertyManager.State.APIPROPERTY, (String)value);
- } else {
- supportedProps.put(property, value);
+ /**
+ * It's possible for users to set a security manager through the interface.
+ * If it's the old SecurityManager, convert it to the new XMLSecurityManager
+ */
+ if (property.equals(Constants.SECURITY_MANAGER)) {
+ fSecurityManager = XMLSecurityManager.convert(value, fSecurityManager);
+ supportedProps.put(Constants.SECURITY_MANAGER, fSecurityManager);
+ return;
+ }
+ if (property.equals(Constants.XML_SECURITY_PROPERTY_MANAGER)) {
+ if (value == null) {
+ fSecurityPropertyMgr = new XMLSecurityPropertyManager();
+ } else {
+ fSecurityPropertyMgr = (XMLSecurityPropertyManager)value;
+ }
+ supportedProps.put(Constants.XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
+ return;
+ }
+
+ //check if the property is managed by security manager
+ if (fSecurityManager == null ||
+ !fSecurityManager.setLimit(property, XMLSecurityManager.State.APIPROPERTY, value)) {
+ //check if the property is managed by security property manager
+ if (fSecurityPropertyMgr == null ||
+ !fSecurityPropertyMgr.setValue(property, XMLSecurityPropertyManager.State.APIPROPERTY, value)) {
+ //fall back to the existing property manager
+ supportedProps.put(property, value);
+ }
}
if(equivalentProperty != null){
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java
index dbfd46a..7a826df 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java
@@ -108,6 +108,7 @@
* @author Elena Litani, IBM
* @author Michael Glavassevich, IBM
* @author Sunitha Reddy, Sun Microsystems
+ * @version $Id: XML11NSDocumentScannerImpl.java,v 1.6 2010-11-01 04:39:40 joehw Exp $
*/
public class XML11NSDocumentScannerImpl extends XML11DocumentScannerImpl {
@@ -236,7 +237,8 @@
// attributes
scanAttribute(fAttributes);
- if (fSecurityManager != null && fAttributes.getLength() > fElementAttributeLimit){
+ if (fSecurityManager != null && (!fSecurityManager.isNoLimit(fElementAttributeLimit)) &&
+ fAttributes.getLength() > fElementAttributeLimit){
fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,
"ElementAttributeLimit",
new Object[]{rawname, new Integer(fElementAttributeLimit) },
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java
index 6c5553c..18a9902 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java
@@ -44,6 +44,8 @@
import com.sun.org.apache.xerces.internal.impl.XMLErrorReporter;
import com.sun.org.apache.xerces.internal.impl.XMLEntityHandler;
import com.sun.org.apache.xerces.internal.impl.Constants;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+import com.sun.xml.internal.stream.Entity;
/**
* This class is responsible for scanning the declarations found
@@ -66,7 +68,7 @@
* @author Glenn Marcy, IBM
* @author Eric Ye, IBM
*
- * @version $Id: XMLDTDScannerImpl.java,v 1.7 2007/09/26 12:52:40 ndw Exp $
+ * @version $Id: XMLDTDScannerImpl.java,v 1.8 2010-11-01 04:39:41 joehw Exp $
*/
public class XMLDTDScannerImpl
extends XMLScanner
@@ -1545,7 +1547,7 @@
// internal entity
if (systemId == null) {
- scanEntityValue(fLiteral, fLiteral2);
+ scanEntityValue(name, isPEDecl, fLiteral, fLiteral2);
// since we need it's value anyway, let's snag it so it doesn't get corrupted
// if a new load takes place before we store the entity values
fStringBuffer.clear();
@@ -1610,7 +1612,7 @@
* the use of scanCharReferenceValue), and fStringBuffer2, anything in them
* at the time of calling is lost.
*/
- protected final void scanEntityValue(XMLString value,
+ protected final void scanEntityValue(String entityName, boolean isPEDecl, XMLString value,
XMLString nonNormalizedValue)
throws IOException, XNIException {
int quote = fEntityScanner.scanChar();
@@ -1622,10 +1624,20 @@
XMLString literal = fString;
XMLString literal2 = fString;
+ int countChar = 0;
+ if (fLimitAnalyzer == null && fSecurityManager != null) {
+ fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
+ fLimitAnalyzer.startEntity(entityName);
+ }
+
if (fEntityScanner.scanLiteral(quote, fString) != quote) {
fStringBuffer.clear();
fStringBuffer2.clear();
do {
+ if (isPEDecl && fLimitAnalyzer != null) {
+ checkLimit("%" + entityName, fString.length + countChar);
+ }
+ countChar = 0;
fStringBuffer.append(fString);
fStringBuffer2.append(fString);
if (fEntityScanner.skipChar('&')) {
@@ -1685,6 +1697,7 @@
}
}
else {
+ countChar++;
int c = fEntityScanner.peekChar();
if (XMLChar.isHighSurrogate(c)) {
scanSurrogates(fStringBuffer2);
@@ -1708,9 +1721,17 @@
fStringBuffer2.append(fString);
literal = fStringBuffer;
literal2 = fStringBuffer2;
+ } else {
+ if (isPEDecl) {
+ checkLimit("%" + entityName, literal);
+ }
}
value.setValues(literal);
nonNormalizedValue.setValues(literal2);
+ if (fLimitAnalyzer != null) {
+ fLimitAnalyzer.endEntity(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT, entityName);
+ }
+
if (!fEntityScanner.skipChar(quote)) {
reportFatalError("CloseQuoteMissingInDecl", null);
}
@@ -2126,6 +2147,43 @@
//new SymbolTable());
}
+ /**
+ * Add the count of the content buffer and check if the accumulated
+ * value exceeds the limit
+ * @param entityName entity name
+ * @param buffer content buffer
+ */
+ private void checkLimit(String entityName, XMLString buffer) {
+ checkLimit(entityName, buffer.length);
+ }
+
+ /**
+ * Add the count and check limit
+ * @param entityName entity name
+ * @param len length of the buffer
+ */
+ private void checkLimit(String entityName, int len) {
+ if (fLimitAnalyzer == null) {
+ fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
+ }
+ fLimitAnalyzer.addValue(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT, entityName, len);
+ if (fSecurityManager.isOverLimit(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT)) {
+ fSecurityManager.debugPrint();
+ reportFatalError("MaxEntitySizeLimit", new Object[]{entityName,
+ fLimitAnalyzer.getValue(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT),
+ fSecurityManager.getLimit(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT),
+ fSecurityManager.getStateLiteral(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT)});
+ }
+ if (fSecurityManager.isOverLimit(XMLSecurityManager.Limit.TOTAL_ENTITY_SIZE_LIMIT)) {
+ fSecurityManager.debugPrint();
+ reportFatalError("TotalEntitySizeLimit",
+ new Object[]{fLimitAnalyzer.getTotalValue(XMLSecurityManager.Limit.TOTAL_ENTITY_SIZE_LIMIT),
+ fSecurityManager.getLimit(XMLSecurityManager.Limit.TOTAL_ENTITY_SIZE_LIMIT),
+ fSecurityManager.getStateLiteral(XMLSecurityManager.Limit.TOTAL_ENTITY_SIZE_LIMIT)});
+ }
+
+ }
+
public DTDGrammar getGrammar(){
return nvGrammarInfo;
}
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
index 050b852..600527d 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
@@ -50,12 +50,14 @@
import com.sun.org.apache.xerces.internal.xni.Augmentations;
import com.sun.org.apache.xerces.internal.impl.Constants;
import com.sun.org.apache.xerces.internal.impl.XMLEntityHandler;
-import com.sun.org.apache.xerces.internal.util.SecurityManager;
import com.sun.org.apache.xerces.internal.util.NamespaceSupport;
import com.sun.org.apache.xerces.internal.utils.SecuritySupport;
+import com.sun.org.apache.xerces.internal.utils.XMLLimitAnalyzer;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager.Limit;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager.State;
import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
-import com.sun.xml.internal.stream.Entity;
import javax.xml.XMLConstants;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.events.XMLEvent;
@@ -213,11 +215,8 @@
};
private static final char [] cdata = {'[','C','D','A','T','A','['};
- private static final char [] endTag = {'<','/'};
-
- //this variable is also used by XMLDocumentScannerImpl in the same package
static final char [] xmlDecl = {'<','?','x','m','l'};
-
+ private static final char [] endTag = {'<','/'};
// debugging
/** Debug scanner state. */
@@ -316,6 +315,7 @@
protected String fDeclaredEncoding = null;
/** Xerces Feature: Disallow doctype declaration. */
protected boolean fDisallowDoctype = false;
+
/**
* comma-delimited list of protocols that are allowed for the purpose
* of accessing external dtd or entity references
@@ -384,7 +384,6 @@
protected boolean foundBuiltInRefs = false;
- protected SecurityManager fSecurityManager = null;
//skip element algorithm
static final short MAX_DEPTH_LIMIT = 5 ;
@@ -571,8 +570,11 @@
// xerces features
fReportCdataEvent = componentManager.getFeature(Constants.STAX_REPORT_CDATA_EVENT, true);
- fSecurityManager = (SecurityManager)componentManager.getProperty(Constants.SECURITY_MANAGER, null);
- fElementAttributeLimit = (fSecurityManager != null)?fSecurityManager.getElementAttrLimit():0;
+ fSecurityManager = (XMLSecurityManager)componentManager.getProperty(Constants.SECURITY_MANAGER, null);
+ fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
+
+ fElementAttributeLimit = (fSecurityManager != null)?
+ fSecurityManager.getLimit(XMLSecurityManager.Limit.ELEMENT_ATTRIBUTE_LIMIT):0;
fNotifyBuiltInRefs = componentManager.getFeature(NOTIFY_BUILTIN_REFS, false);
@@ -598,9 +600,6 @@
//xxx: external entities are supported in Xerces
// it would be good to define feature for this case
fSupportExternalEntities = true;
- fSupportExternalEntities = true;
- fSupportExternalEntities = true;
- fSupportExternalEntities = true;
fReplaceEntityReferences = true;
fIsCoalesce = false;
@@ -671,6 +670,9 @@
XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)
propertyManager.getProperty(XML_SECURITY_PROPERTY_MANAGER);
fAccessExternalDTD = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD);
+
+ fSecurityManager = (XMLSecurityManager)propertyManager.getProperty(Constants.SECURITY_MANAGER);
+ fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
} // reset(XMLComponentManager)
/**
@@ -1322,7 +1324,8 @@
fAddDefaultAttr = true;
do {
scanAttribute(fAttributes);
- if (fSecurityManager != null && fAttributes.getLength() > fElementAttributeLimit){
+ if (fSecurityManager != null && !fSecurityManager.isNoLimit(fElementAttributeLimit) &&
+ fAttributes.getLength() > fElementAttributeLimit){
fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,
"ElementAttributeLimit",
new Object[]{rawname, new Integer(fAttributes.getLength()) },
@@ -2036,6 +2039,13 @@
} // getDriverName():String
+ /**
+ * Check the protocol used in the systemId against allowed protocols
+ *
+ * @param systemId the Id of the URI
+ * @param allowedProtocols a list of allowed protocols separated by comma
+ * @return the name of the protocol if rejected, null otherwise
+ */
String checkAccess(String systemId, String allowedProtocols) throws IOException {
String baseSystemId = fEntityScanner.getBaseSystemId();
String expandedSystemId = fEntityManager.expandSystemId(systemId, baseSystemId,fStrictURI);
@@ -2833,6 +2843,8 @@
if(DEBUG){
System.out.println("NOT USING THE BUFFER, STRING = " + fTempString.toString());
}
+ //check limit before returning event
+ checkLimit(fContentBuffer);
if(dtdGrammarUtil!= null && dtdGrammarUtil.isIgnorableWhiteSpace(fContentBuffer)){
if(DEBUG)System.out.println("Return SPACE EVENT");
return XMLEvent.SPACE;
@@ -2931,6 +2943,8 @@
fLastSectionWasCharacterData = true ;
continue;
}else{
+ //check limit before returning event
+ checkLimit(fContentBuffer);
if(dtdGrammarUtil!= null && dtdGrammarUtil.isIgnorableWhiteSpace(fContentBuffer)){
if(DEBUG)System.out.println("Return SPACE EVENT");
return XMLEvent.SPACE;
@@ -3141,6 +3155,30 @@
} //while loop
}//next
+ /**
+ * Add the count of the content buffer and check if the accumulated
+ * value exceeds the limit
+ * @param buffer content buffer
+ */
+ protected void checkLimit(XMLStringBuffer buffer) {
+ if (fLimitAnalyzer.isTracking(fCurrentEntityName)) {
+ fLimitAnalyzer.addValue(Limit.GENEAL_ENTITY_SIZE_LIMIT, fCurrentEntityName, buffer.length);
+ if (fSecurityManager.isOverLimit(Limit.GENEAL_ENTITY_SIZE_LIMIT)) {
+ fSecurityManager.debugPrint();
+ reportFatalError("MaxEntitySizeLimit", new Object[]{fCurrentEntityName,
+ fLimitAnalyzer.getValue(Limit.GENEAL_ENTITY_SIZE_LIMIT),
+ fSecurityManager.getLimit(Limit.GENEAL_ENTITY_SIZE_LIMIT),
+ fSecurityManager.getStateLiteral(Limit.GENEAL_ENTITY_SIZE_LIMIT)});
+ }
+ if (fSecurityManager.isOverLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT)) {
+ fSecurityManager.debugPrint();
+ reportFatalError("TotalEntitySizeLimit",
+ new Object[]{fLimitAnalyzer.getTotalValue(Limit.TOTAL_ENTITY_SIZE_LIMIT),
+ fSecurityManager.getLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT),
+ fSecurityManager.getStateLiteral(Limit.TOTAL_ENTITY_SIZE_LIMIT)});
+ }
+ }
+ }
//
// Protected methods
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
index da90290..59f3aa0 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
@@ -28,9 +28,10 @@
import com.sun.org.apache.xerces.internal.impl.XMLEntityHandler;
import com.sun.org.apache.xerces.internal.impl.validation.ValidationManager;
import com.sun.org.apache.xerces.internal.util.*;
-import com.sun.org.apache.xerces.internal.util.SecurityManager;
import com.sun.org.apache.xerces.internal.util.URI;
import com.sun.org.apache.xerces.internal.utils.SecuritySupport;
+import com.sun.org.apache.xerces.internal.utils.XMLLimitAnalyzer;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
import com.sun.org.apache.xerces.internal.xni.Augmentations;
import com.sun.org.apache.xerces.internal.xni.XMLResourceIdentifier;
@@ -174,7 +175,6 @@
/** access external dtd: file protocol */
static final String EXTERNAL_ACCESS_DEFAULT = Constants.EXTERNAL_ACCESS_DEFAULT;
-
// recognized features and properties
/** Recognized features. */
@@ -307,6 +307,7 @@
/** used to restrict external access */
protected String fAccessExternalDTD = EXTERNAL_ACCESS_DEFAULT;
+
// settings
/**
@@ -324,9 +325,12 @@
*/
protected int fBufferSize = DEFAULT_BUFFER_SIZE;
- // stores defaults for entity expansion limit if it has
- // been set on the configuration.
- protected SecurityManager fSecurityManager = null;
+ /** Security Manager */
+ protected XMLSecurityManager fSecurityManager = null;
+
+ protected XMLLimitAnalyzer fLimitAnalyzer = null;
+
+ protected int entityExpansionIndex;
/**
* True if the document entity is standalone. This should really
@@ -352,10 +356,6 @@
/** XML 1.1 entity scanner. */
protected XMLEntityScanner fXML11EntityScanner;
- /** entity expansion limit (contains useful data if and only if
- fSecurityManager is non-null) */
- protected int fEntityExpansionLimit = 0;
-
/** count of entities expanded: */
protected int fEntityExpansionCount = 0;
@@ -833,6 +833,9 @@
fCurrentEntity.setEncodingExternallySpecified(encodingExternallySpecified);
fEntityScanner.setCurrentEntity(fCurrentEntity);
fResourceIdentifier.setValues(publicId, literalSystemId, baseSystemId, expandedSystemId);
+ if (fLimitAnalyzer != null) {
+ fLimitAnalyzer.startEntity(name);
+ }
return encoding;
} //setupCurrentEntity(String, XMLInputSource, boolean, boolean): String
@@ -1294,10 +1297,13 @@
//expansions exceeds the entity expansion limit, parser will throw fatal error.
// Note that this represents the nesting level of open entities.
fEntityExpansionCount++;
- if( fSecurityManager != null && fEntityExpansionCount > fEntityExpansionLimit ){
- fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,
- "EntityExpansionLimitExceeded",
- new Object[]{new Integer(fEntityExpansionLimit) },
+ if(fLimitAnalyzer != null) {
+ fLimitAnalyzer.addValue(entityExpansionIndex, name, 1);
+ }
+ if( fSecurityManager != null && fSecurityManager.isOverLimit(entityExpansionIndex)){
+ fSecurityManager.debugPrint();
+ fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,"EntityExpansionLimitExceeded",
+ new Object[]{fSecurityManager.getLimitValueByIndex(entityExpansionIndex)},
XMLErrorReporter.SEVERITY_FATAL_ERROR );
// is there anything better to do than reset the counter?
// at least one can envision debugging applications where this might
@@ -1361,6 +1367,12 @@
if(fCurrentEntity != null){
//close the reader
try{
+ if (fLimitAnalyzer != null) {
+ fLimitAnalyzer.endEntity(XMLSecurityManager.Limit.GENEAL_ENTITY_SIZE_LIMIT, fCurrentEntity.name);
+ if (fCurrentEntity.name.equals("[xml]")) {
+ fSecurityManager.debugPrint();
+ }
+ }
fCurrentEntity.close();
}catch(IOException ex){
throw new XNIException(ex);
@@ -1426,6 +1438,9 @@
XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager) propertyManager.getProperty(XML_SECURITY_PROPERTY_MANAGER);
fAccessExternalDTD = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD);
+ fSecurityManager = (XMLSecurityManager)propertyManager.getProperty(SECURITY_MANAGER);
+ fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
+
// initialize state
//fStandalone = false;
fEntities.clear();
@@ -1485,7 +1500,9 @@
fEntityResolver = (XMLEntityResolver)componentManager.getProperty(ENTITY_RESOLVER, null);
fStaxEntityResolver = (StaxEntityResolverWrapper)componentManager.getProperty(STAX_ENTITY_RESOLVER, null);
fValidationManager = (ValidationManager)componentManager.getProperty(VALIDATION_MANAGER, null);
- fSecurityManager = (SecurityManager)componentManager.getProperty(SECURITY_MANAGER, null);
+ fSecurityManager = (XMLSecurityManager)componentManager.getProperty(SECURITY_MANAGER, null);
+ fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
+ entityExpansionIndex = fSecurityManager.getIndex(Constants.JDK_ENTITY_EXPANSION_LIMIT);
// JAXP 1.5 feature
XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager) componentManager.getProperty(XML_SECURITY_PROPERTY_MANAGER, null);
@@ -1506,7 +1523,6 @@
// a class acting as a component manager but not
// implementing that interface for whatever reason.
public void reset() {
- fEntityExpansionLimit = (fSecurityManager != null)?fSecurityManager.getEntityExpansionLimit():0;
// initialize state
fStandalone = false;
@@ -1642,8 +1658,8 @@
}
if (suffixLength == Constants.SECURITY_MANAGER_PROPERTY.length() &&
propertyId.endsWith(Constants.SECURITY_MANAGER_PROPERTY)) {
- fSecurityManager = (SecurityManager)value;
- fEntityExpansionLimit = (fSecurityManager != null)?fSecurityManager.getEntityExpansionLimit():0;
+ fSecurityManager = (XMLSecurityManager)value;
+ fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
}
}
@@ -1652,9 +1668,8 @@
{
XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)value;
fAccessExternalDTD = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD);
+ }
}
- }
-
/**
* Returns a list of property identifiers that are recognized by
* this component. This method may return null if no properties
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java
index b0461eb..464511c 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java
@@ -58,6 +58,7 @@
* @author Neeraj Bajaj, Sun Microsystems
* @author Venugopal Rao K, Sun Microsystems
* @author Elena Litani, IBM
+ * @version $Id: XMLNSDocumentScannerImpl.java,v 1.11 2010-11-01 04:39:41 joehw Exp $
*/
public class XMLNSDocumentScannerImpl
extends XMLDocumentScannerImpl {
@@ -251,7 +252,8 @@
do {
scanAttribute(fAttributes);
- if (fSecurityManager != null && fAttributes.getLength() > fElementAttributeLimit){
+ if (fSecurityManager != null && (!fSecurityManager.isNoLimit(fElementAttributeLimit)) &&
+ fAttributes.getLength() > fElementAttributeLimit){
fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,
"ElementAttributeLimit",
new Object[]{rawname, new Integer(fAttributes.getLength()) },
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
index 0c66aa2..70de786 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
@@ -32,6 +32,8 @@
import com.sun.org.apache.xerces.internal.util.XMLChar;
import com.sun.org.apache.xerces.internal.util.XMLResourceIdentifierImpl;
import com.sun.org.apache.xerces.internal.util.XMLStringBuffer;
+import com.sun.org.apache.xerces.internal.utils.XMLLimitAnalyzer;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.xni.Augmentations;
import com.sun.org.apache.xerces.internal.xni.XMLAttributes;
import com.sun.org.apache.xerces.internal.xni.XMLResourceIdentifier;
@@ -106,6 +108,9 @@
protected static final String ENTITY_MANAGER =
Constants.XERCES_PROPERTY_PREFIX + Constants.ENTITY_MANAGER_PROPERTY;
+ /** Property identifier: Security manager. */
+ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
+
// debugging
/** Debug attribute normalization. */
@@ -159,6 +164,12 @@
/** xxx this should be available from EntityManager Entity storage */
protected XMLEntityStorage fEntityStore = null ;
+ /** Security manager. */
+ protected XMLSecurityManager fSecurityManager = null;
+
+ /** Limit analyzer. */
+ protected XMLLimitAnalyzer fLimitAnalyzer = null;
+
// protected data
/** event type */
@@ -256,6 +267,7 @@
fSymbolTable = (SymbolTable)componentManager.getProperty(SYMBOL_TABLE);
fErrorReporter = (XMLErrorReporter)componentManager.getProperty(ERROR_REPORTER);
fEntityManager = (XMLEntityManager)componentManager.getProperty(ENTITY_MANAGER);
+ fSecurityManager = (XMLSecurityManager)componentManager.getProperty(SECURITY_MANAGER);
//this step is extra because we have separated the storage of entity
fEntityStore = fEntityManager.getEntityStore() ;
@@ -293,6 +305,10 @@
fEntityManager = (XMLEntityManager)value;
}
}
+
+ if (propertyId.equals(SECURITY_MANAGER)) {
+ fSecurityManager = (XMLSecurityManager)value;
+ }
/*else if(propertyId.equals(Constants.STAX_PROPERTIES)){
fStaxProperties = (HashMap)value;
//TODO::discuss with neeraj what are his thoughts on passing properties.
@@ -352,6 +368,8 @@
fEntityManager = (XMLEntityManager)propertyManager.getProperty(ENTITY_MANAGER);
fEntityStore = fEntityManager.getEntityStore() ;
fEntityScanner = (XMLEntityScanner)fEntityManager.getEntityScanner() ;
+ fSecurityManager = (XMLSecurityManager)propertyManager.getProperty(SECURITY_MANAGER);
+
//fEntityManager.reset();
// DTD preparsing defaults:
fValidation = false;
@@ -499,7 +517,7 @@
reportFatalError("SDDeclInvalid", new Object[] {standalone});
}
} else {
- reportFatalError("EncodingDeclRequired", null);
+ reportFatalError("SDDeclNameInvalid", null);
}
break;
}
@@ -510,8 +528,9 @@
sawSpace = fEntityScanner.skipSpaces();
}
// restore original literal value
- if(currLiteral)
+ if(currLiteral) {
currEnt.literal = true;
+ }
// REVISIT: should we remove this error reporting?
if (scanningTextDecl && state != STATE_DONE) {
reportFatalError("MorePseudoAttributes", null);
@@ -564,7 +583,7 @@
XMLString value)
throws IOException, XNIException {
- String name = fEntityScanner.scanName();
+ String name = scanPseudoAttributeName();
// XMLEntityManager.print(fEntityManager.getCurrentEntity());
if (name == null) {
@@ -617,6 +636,35 @@
} // scanPseudoAttribute(XMLString):String
/**
+ * Scans the name of a pseudo attribute. The only legal names
+ * in XML 1.0/1.1 documents are 'version', 'encoding' and 'standalone'.
+ *
+ * @return the name of the pseudo attribute or <code>null</code>
+ * if a legal pseudo attribute name could not be scanned.
+ */
+ private String scanPseudoAttributeName() throws IOException, XNIException {
+ final int ch = fEntityScanner.peekChar();
+ switch (ch) {
+ case 'v':
+ if (fEntityScanner.skipString(fVersionSymbol)) {
+ return fVersionSymbol;
+ }
+ break;
+ case 'e':
+ if (fEntityScanner.skipString(fEncodingSymbol)) {
+ return fEncodingSymbol;
+ }
+ break;
+ case 's':
+ if (fEntityScanner.skipString(fStandaloneSymbol)) {
+ return fStandaloneSymbol;
+ }
+ break;
+ }
+ return null;
+ } // scanPseudoAttributeName()
+
+ /**
* Scans a processing instruction.
* <p>
* <pre>
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties
index 1a5d62a..200b904 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties
@@ -44,6 +44,7 @@
# 2.9 Standalone Document Declaration
SDDeclInvalid = The standalone document declaration value must be \"yes\" or \"no\", not \"{0}\".
+ SDDeclNameInvalid = The standalone name in XML declaration may be misspelled.
# 2.12 Language Identification
XMLLangInvalid = The xml:lang attribute value \"{0}\" is an invalid language identifier.
# 3. Logical Structures
@@ -292,8 +293,10 @@
InvalidCharInLiteral=InvalidCharInLiteral
-#Application can set the limit of number of entities that should be expanded by the parser.
-EntityExpansionLimitExceeded=The parser has encountered more than \"{0}\" entity expansions in this document; this is the limit imposed by the application.
+# Implementation limits
+ EntityExpansionLimitExceeded=JAXP00010001: The parser has encountered more than \"{0}\" entity expansions in this document; this is the limit imposed by the JDK.
+ ElementAttributeLimit=JAXP00010002: Element \"{0}\" has more than \"{1}\" attributes, \"{1}\" is the limit imposed by the JDK.
+ MaxEntitySizeLimit=JAXP00010003: The length of entity \"{0}\" is \"{1}\" that exceeds the \"{2}\" limit set by \"{3}\".
+ TotalEntitySizeLimit=JAXP00010004: The accumulated size \"{0}\" of entities exceeded the \"{1}\" limit set by \"{2}\".
+ MaxXMLNameLimit=JAXP00010005: The name \"{0}\" exceeded the \"{1}\" limit set by \"{2}\".
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= Element \"{0}\" has more than \"{1}\" attributes, \"{1}\" is the limit imposed by the application.
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java
index 90d6491..eb652a8 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java
@@ -1422,7 +1422,7 @@
}
ch = data.charAt(currentOffset);
} while (ch == ' ' || ch == 0x0A || ch == 0x09 || ch == 0x0D);
- if (currentOffset == endOffset || ch == '|') {
+ if (currentOffset == endOffset || ch == '|' || ch == '/') {
addToken(tokens, XPath.Tokens.EXPRTOKEN_PERIOD);
starIsMultiplyOperator = true;
break;
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java
index d183166..6aa06b8 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java
@@ -21,13 +21,13 @@
package com.sun.org.apache.xerces.internal.impl.xs.models;
-import com.sun.org.apache.xerces.internal.impl.XMLErrorReporter;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLComponentManager;
-import com.sun.org.apache.xerces.internal.util.SecurityManager ;
-import com.sun.org.apache.xerces.internal.impl.dtd.models.CMNode;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLConfigurationException;
-import com.sun.org.apache.xerces.internal.impl.xs.XSMessageFormatter;
import com.sun.org.apache.xerces.internal.impl.Constants;
+import com.sun.org.apache.xerces.internal.impl.XMLErrorReporter;
+import com.sun.org.apache.xerces.internal.impl.dtd.models.CMNode;
+import com.sun.org.apache.xerces.internal.impl.xs.XSMessageFormatter;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+import com.sun.org.apache.xerces.internal.xni.parser.XMLComponentManager;
+import com.sun.org.apache.xerces.internal.xni.parser.XMLConfigurationException;
/**
*
@@ -68,7 +68,7 @@
// stores defaults for different security holes (maxOccurLimit in current context) if it has
// been set on the configuration.
- private SecurityManager fSecurityManager = null;
+ private XMLSecurityManager fSecurityManager = null;
/** default constructor */
public CMNodeFactory() {
@@ -77,10 +77,10 @@
public void reset(XMLComponentManager componentManager){
fErrorReporter = (XMLErrorReporter)componentManager.getProperty(ERROR_REPORTER);
try {
- fSecurityManager = (SecurityManager)componentManager.getProperty(SECURITY_MANAGER);
+ fSecurityManager = (XMLSecurityManager)componentManager.getProperty(SECURITY_MANAGER);
//we are setting the limit of number of nodes to 3times the maxOccur value..
if(fSecurityManager != null){
- maxNodeLimit = fSecurityManager.getMaxOccurNodeLimit() * MULTIPLICITY ;
+ maxNodeLimit = fSecurityManager.getLimit(XMLSecurityManager.Limit.MAX_OCCUR_NODE_LIMIT) * MULTIPLICITY ;
}
}
catch (XMLConfigurationException e) {
@@ -109,7 +109,8 @@
}
public void nodeCountCheck(){
- if( fSecurityManager != null && nodeCount++ > maxNodeLimit){
+ if( fSecurityManager != null && !fSecurityManager.isNoLimit(maxNodeLimit) &&
+ nodeCount++ > maxNodeLimit){
if(DEBUG){
System.out.println("nodeCount = " + nodeCount ) ;
System.out.println("nodeLimit = " + maxNodeLimit ) ;
@@ -150,8 +151,9 @@
if (suffixLength == Constants.SECURITY_MANAGER_PROPERTY.length() &&
propertyId.endsWith(Constants.SECURITY_MANAGER_PROPERTY)) {
- fSecurityManager = (SecurityManager)value;
- maxNodeLimit = (fSecurityManager != null) ? fSecurityManager.getMaxOccurNodeLimit() * MULTIPLICITY : 0 ;
+ fSecurityManager = (XMLSecurityManager)value;
+ maxNodeLimit = (fSecurityManager != null) ?
+ fSecurityManager.getLimit(XMLSecurityManager.Limit.MAX_OCCUR_NODE_LIMIT) * MULTIPLICITY : 0 ;
return;
}
if (suffixLength == Constants.ERROR_REPORTER_PROPERTY.length() &&
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java
index 3744692..f9eea6a 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java
@@ -40,6 +40,7 @@
import com.sun.org.apache.xerces.internal.util.SymbolTable;
import com.sun.org.apache.xerces.internal.util.XMLChar;
import com.sun.org.apache.xerces.internal.util.XMLSymbols;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.xni.QName;
import com.sun.org.apache.xerces.internal.xs.XSConstants;
import java.util.HashMap;
@@ -1194,8 +1195,8 @@
if (!optimize) {
//Revisit :: IMO this is not right place to check
// maxOccurNodeLimit.
- int maxOccurNodeLimit = fSchemaHandler.fSecureProcessing.getMaxOccurNodeLimit();
- if (max > maxOccurNodeLimit) {
+ int maxOccurNodeLimit = fSchemaHandler.fSecureProcessing.getLimit(XMLSecurityManager.Limit.MAX_OCCUR_NODE_LIMIT);
+ if (max > maxOccurNodeLimit && !fSchemaHandler.fSecureProcessing.isNoLimit(maxOccurNodeLimit)) {
reportSchemaFatalError("maxOccurLimit", new Object[] {new Integer(maxOccurNodeLimit)}, element);
// reset max values in case processing continues on error
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
index d947cf8..d6a6e94 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
@@ -70,7 +70,6 @@
import com.sun.org.apache.xerces.internal.util.DefaultErrorHandler;
import com.sun.org.apache.xerces.internal.util.ErrorHandlerWrapper;
import com.sun.org.apache.xerces.internal.util.SAXInputSource;
-import com.sun.org.apache.xerces.internal.util.SecurityManager;
import com.sun.org.apache.xerces.internal.util.StAXInputSource;
import com.sun.org.apache.xerces.internal.util.StAXLocationWrapper;
import com.sun.org.apache.xerces.internal.util.SymbolHash;
@@ -79,6 +78,7 @@
import com.sun.org.apache.xerces.internal.util.URI.MalformedURIException;
import com.sun.org.apache.xerces.internal.utils.SecuritySupport;
import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.xni.QName;
import com.sun.org.apache.xerces.internal.xni.XNIException;
import com.sun.org.apache.xerces.internal.xni.grammars.Grammar;
@@ -257,7 +257,7 @@
*
* <p>Protected to allow access by any traverser.</p>
*/
- protected SecurityManager fSecureProcessing = null;
+ protected XMLSecurityManager fSecureProcessing = null;
private String fAccessExternalSchema;
private String fAccessExternalDTD;
@@ -3509,7 +3509,7 @@
fSecureProcessing = null;
if( componentManager!=null ) {
- fSecureProcessing = (SecurityManager) componentManager.getProperty(SECURE_PROCESSING, null);
+ fSecureProcessing = (XMLSecurityManager) componentManager.getProperty(SECURE_PROCESSING, null);
}
//set entity resolver
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java
index 00bc0bb..0c8d0a8 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java
@@ -20,6 +20,8 @@
package com.sun.org.apache.xerces.internal.jaxp;
+import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
+import java.util.Locale;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
@@ -30,6 +32,11 @@
class DefaultValidationErrorHandler extends DefaultHandler {
static private int ERROR_COUNT_LIMIT = 10;
private int errorCount = 0;
+ private Locale locale = Locale.getDefault();
+
+ public DefaultValidationErrorHandler(Locale locale) {
+ this.locale = locale;
+ }
// XXX Fix message i18n
public void error(SAXParseException e) throws SAXException {
@@ -38,11 +45,8 @@
return;
} else if (errorCount == 0) {
// Print a warning before the first error
- System.err.println("Warning: validation was turned on but an org.xml.sax.ErrorHandler was not");
- System.err.println("set, which is probably not what is desired. Parser will use a default");
- System.err.println("ErrorHandler to print the first " +
- ERROR_COUNT_LIMIT + " errors. Please call");
- System.err.println("the 'setErrorHandler' method to fix this.");
+ System.err.println(SAXMessageFormatter.formatMessage(locale,
+ "errorHandlerNotSet", new Object [] {errorCount}));
}
String systemId = e.getSystemId();
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
index 0c90afe..51f22d7 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
@@ -36,7 +36,7 @@
import com.sun.org.apache.xerces.internal.impl.xs.XMLSchemaValidator;
import com.sun.org.apache.xerces.internal.jaxp.validation.XSGrammarPoolContainer;
import com.sun.org.apache.xerces.internal.parsers.DOMParser;
-import com.sun.org.apache.xerces.internal.util.SecurityManager;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager.Property;
import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager.State;
@@ -46,7 +46,6 @@
import com.sun.org.apache.xerces.internal.xni.parser.XMLConfigurationException;
import com.sun.org.apache.xerces.internal.xni.parser.XMLDocumentSource;
import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
-import javax.xml.XMLConstants;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.xml.sax.EntityResolver;
@@ -125,6 +124,7 @@
/** Initial EntityResolver */
private final EntityResolver fInitEntityResolver;
+ private XMLSecurityManager fSecurityManager;
private XMLSecurityPropertyManager fSecurityPropertyMgr;
DocumentBuilderImpl(DocumentBuilderFactoryImpl dbf, Hashtable dbfAttrs, Hashtable features)
@@ -141,7 +141,7 @@
// validation errors with a warning telling the user to set an
// ErrorHandler
if (dbf.isValidating()) {
- fInitErrorHandler = new DefaultValidationErrorHandler();
+ fInitErrorHandler = new DefaultValidationErrorHandler(domParser.getXMLParserConfiguration().getLocale());
setErrorHandler(fInitErrorHandler);
}
else {
@@ -173,10 +173,10 @@
fSecurityPropertyMgr = new XMLSecurityPropertyManager();
domParser.setProperty(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
- // If the secure processing feature is on set a security manager.
- if (secureProcessing) {
- domParser.setProperty(SECURITY_MANAGER, new SecurityManager());
+ fSecurityManager = new XMLSecurityManager(secureProcessing);
+ domParser.setProperty(SECURITY_MANAGER, fSecurityManager);
+ if (secureProcessing) {
/**
* If secure processing is explicitly set on the factory, the
* access properties will be set unless the corresponding
@@ -250,9 +250,9 @@
String feature = (String) entry.getKey();
boolean value = ((Boolean) entry.getValue()).booleanValue();
domParser.setFeature(feature, value);
- }
}
}
+ }
/**
* Set any DocumentBuilderFactory attributes of our underlying DOMParser
@@ -303,14 +303,17 @@
}
}
} else {
- int index = fSecurityPropertyMgr.getIndex(name);
- if (index > -1) {
- fSecurityPropertyMgr.setValue(index,
- XMLSecurityPropertyManager.State.APIPROPERTY, (String)val);
- } else {
- // Let Xerces code handle the property
- domParser.setProperty(name, val);
- }
+ //check if the property is managed by security manager
+ if (fSecurityManager == null ||
+ !fSecurityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, val)) {
+ //check if the property is managed by security property manager
+ if (fSecurityPropertyMgr == null ||
+ !fSecurityPropertyMgr.setValue(name, XMLSecurityPropertyManager.State.APIPROPERTY, val)) {
+ //fall back to the existing property manager
+ domParser.setProperty(name, val);
+ }
+ }
+
}
}
}
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
index 3a6d38f..6cc3e9a 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
@@ -20,22 +20,13 @@
package com.sun.org.apache.xerces.internal.jaxp;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.XMLConstants;
-import javax.xml.validation.Schema;
-
import com.sun.org.apache.xerces.internal.impl.Constants;
import com.sun.org.apache.xerces.internal.impl.validation.ValidationManager;
import com.sun.org.apache.xerces.internal.impl.xs.XMLSchemaValidator;
import com.sun.org.apache.xerces.internal.jaxp.validation.XSGrammarPoolContainer;
import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
-import com.sun.org.apache.xerces.internal.util.SecurityManager;
import com.sun.org.apache.xerces.internal.util.Status;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
import com.sun.org.apache.xerces.internal.xni.XMLDocumentHandler;
import com.sun.org.apache.xerces.internal.xni.parser.XMLComponent;
@@ -46,6 +37,14 @@
import com.sun.org.apache.xerces.internal.xs.AttributePSVI;
import com.sun.org.apache.xerces.internal.xs.ElementPSVI;
import com.sun.org.apache.xerces.internal.xs.PSVIProvider;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import javax.xml.XMLConstants;
+import javax.xml.validation.Schema;
import org.xml.sax.EntityResolver;
import org.xml.sax.ErrorHandler;
import org.xml.sax.HandlerBase;
@@ -112,6 +111,7 @@
/** Initial EntityResolver */
private final EntityResolver fInitEntityResolver;
+ private final XMLSecurityManager fSecurityManager;
private final XMLSecurityPropertyManager fSecurityPropertyMgr;
/**
@@ -130,10 +130,10 @@
SAXParserImpl(SAXParserFactoryImpl spf, Hashtable features, boolean secureProcessing)
throws SAXException
{
+ fSecurityManager = new XMLSecurityManager(secureProcessing);
fSecurityPropertyMgr = new XMLSecurityPropertyManager();
-
// Instantiate a SAXParser directly and not through SAX so that we use the right ClassLoader
- xmlReader = new JAXPSAXParser(this, fSecurityPropertyMgr);
+ xmlReader = new JAXPSAXParser(this, fSecurityPropertyMgr, fSecurityManager);
// JAXP "namespaceAware" == SAX Namespaces feature
// Note: there is a compatibility problem here with default values:
@@ -154,9 +154,9 @@
xmlReader.setProperty0(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
- // If the secure processing feature is on set a security manager.
+ xmlReader.setProperty0(SECURITY_MANAGER, fSecurityManager);
+
if (secureProcessing) {
- xmlReader.setProperty0(SECURITY_MANAGER, new SecurityManager());
/**
* By default, secure processing is set, no external access is allowed.
* However, we need to check if it is actively set on the factory since we
@@ -164,6 +164,7 @@
* the default value
*/
if (features != null) {
+
Object temp = features.get(XMLConstants.FEATURE_SECURE_PROCESSING);
if (temp != null) {
boolean value = ((Boolean) temp).booleanValue();
@@ -185,7 +186,7 @@
// validation errors with a warning telling the user to set an
// ErrorHandler.
if (spf.isValidating()) {
- fInitErrorHandler = new DefaultValidationErrorHandler();
+ fInitErrorHandler = new DefaultValidationErrorHandler(xmlReader.getLocale());
xmlReader.setErrorHandler(fInitErrorHandler);
}
else {
@@ -398,28 +399,42 @@
private final HashMap fInitFeatures = new HashMap();
private final HashMap fInitProperties = new HashMap();
private final SAXParserImpl fSAXParser;
+ private XMLSecurityManager fSecurityManager;
private XMLSecurityPropertyManager fSecurityPropertyMgr;
public JAXPSAXParser() {
- this(null, null);
+ this(null, null, null);
}
- JAXPSAXParser(SAXParserImpl saxParser, XMLSecurityPropertyManager spm) {
+ JAXPSAXParser(SAXParserImpl saxParser, XMLSecurityPropertyManager securityPropertyMgr,
+ XMLSecurityManager securityManager) {
super();
fSAXParser = saxParser;
- fSecurityPropertyMgr = spm;
-
+ fSecurityManager = securityManager;
+ fSecurityPropertyMgr = securityPropertyMgr;
/**
* This class may be used directly. So initialize the security manager if
* it is null.
*/
+ if (fSecurityManager == null) {
+ fSecurityManager = new XMLSecurityManager(true);
+ try {
+ super.setProperty(SECURITY_MANAGER, fSecurityManager);
+ } catch (SAXException e) {
+ throw new UnsupportedOperationException(
+ SAXMessageFormatter.formatMessage(fConfiguration.getLocale(),
+ "property-not-recognized", new Object [] {SECURITY_MANAGER}), e);
+ }
+ }
if (fSecurityPropertyMgr == null) {
fSecurityPropertyMgr = new XMLSecurityPropertyManager();
try {
super.setProperty(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
- } catch (Exception ex) {
- //shall not happen
+ } catch (SAXException e) {
+ throw new UnsupportedOperationException(
+ SAXMessageFormatter.formatMessage(fConfiguration.getLocale(),
+ "property-not-recognized", new Object [] {SECURITY_MANAGER}), e);
}
}
}
@@ -437,7 +452,8 @@
}
if (name.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
try {
- setProperty(SECURITY_MANAGER, value ? new SecurityManager() : null);
+ fSecurityManager.setSecureProcessing(value);
+ setProperty(SECURITY_MANAGER, fSecurityManager);
}
catch (SAXNotRecognizedException exc) {
// If the property is not supported
@@ -473,13 +489,7 @@
throw new NullPointerException();
}
if (name.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
- try {
- return (super.getProperty(SECURITY_MANAGER) != null);
- }
- // If the property is not supported the value must be false.
- catch (SAXException exc) {
- return false;
- }
+ return fSecurityManager.isSecureProcessing();
}
return super.getFeature(name);
}
@@ -558,17 +568,21 @@
if (fSAXParser != null && fSAXParser.fSchemaValidator != null) {
setSchemaValidatorProperty(name, value);
}
- /** Check to see if the property is managed by the property manager **/
- int index = (fSecurityPropertyMgr != null) ? fSecurityPropertyMgr.getIndex(name) : -1;
- if (index > -1) {
- fSecurityPropertyMgr.setValue(index,
- XMLSecurityPropertyManager.State.APIPROPERTY, (String)value);
- } else {
- if (!fInitProperties.containsKey(name)) {
- fInitProperties.put(name, super.getProperty(name));
+
+ //check if the property is managed by security manager
+ if (fSecurityManager == null ||
+ !fSecurityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, value)) {
+ //check if the property is managed by security property manager
+ if (fSecurityPropertyMgr == null ||
+ !fSecurityPropertyMgr.setValue(name, XMLSecurityPropertyManager.State.APIPROPERTY, value)) {
+ //fall back to the existing property manager
+ if (!fInitProperties.containsKey(name)) {
+ fInitProperties.put(name, super.getProperty(name));
+ }
+ super.setProperty(name, value);
}
- super.setProperty(name, value);
}
+
}
public synchronized Object getProperty(String name)
@@ -581,9 +595,18 @@
// JAXP 1.2 support
return fSAXParser.schemaLanguage;
}
- int index = (fSecurityPropertyMgr != null) ? fSecurityPropertyMgr.getIndex(name) : -1;
- if (index > -1) {
- return fSecurityPropertyMgr.getValueByIndex(index);
+
+ /** Check to see if the property is managed by the security manager **/
+ String propertyValue = (fSecurityManager != null) ?
+ fSecurityManager.getLimitAsString(name) : null;
+ if (propertyValue != null) {
+ return propertyValue;
+ } else {
+ propertyValue = (fSecurityPropertyMgr != null) ?
+ fSecurityPropertyMgr.getValue(name) : null;
+ if (propertyValue != null) {
+ return propertyValue;
+ }
}
return super.getProperty(name);
@@ -662,6 +685,10 @@
return super.getProperty(name);
}
+ Locale getLocale() {
+ return fConfiguration.getLocale();
+ }
+
private void setSchemaValidatorFeature(String name, boolean value)
throws SAXNotRecognizedException, SAXNotSupportedException {
try {
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java
index f398e03..5af27e2 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java
@@ -26,6 +26,7 @@
package com.sun.org.apache.xerces.internal.jaxp.validation;
import com.sun.org.apache.xerces.internal.impl.Constants;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import java.io.IOException;
import javax.xml.transform.Result;
@@ -73,6 +74,19 @@
SAXTransformerFactory tf = fComponentManager.getFeature(Constants.ORACLE_FEATURE_SERVICE_MECHANISM) ?
(SAXTransformerFactory)SAXTransformerFactory.newInstance()
: (SAXTransformerFactory) TransformerFactory.newInstance(DEFAULT_TRANSFORMER_IMPL, StAXValidatorHelper.class.getClassLoader());
+ XMLSecurityManager securityManager = (XMLSecurityManager)fComponentManager.getProperty(Constants.SECURITY_MANAGER);
+ if (securityManager != null) {
+ for (XMLSecurityManager.Limit limit : XMLSecurityManager.Limit.values()) {
+ if (securityManager.isSet(limit.ordinal())){
+ tf.setAttribute(limit.apiProperty(),
+ securityManager.getLimitValueAsString(limit));
+ }
+ }
+ if (securityManager.printEntityCountInfo()) {
+ tf.setAttribute(Constants.JDK_ENTITY_COUNT_INFO, "yes");
+ }
+ }
+
identityTransformer1 = tf.newTransformer();
identityTransformer2 = tf.newTransformerHandler();
} catch (TransformerConfigurationException e) {
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java
index c3f1b67..d6c04fd 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java
@@ -20,28 +20,27 @@
package com.sun.org.apache.xerces.internal.jaxp.validation;
-import java.lang.ref.SoftReference;
-import java.io.IOException;
-
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.XMLConstants;
-
import com.sun.org.apache.xerces.internal.impl.Constants;
import com.sun.org.apache.xerces.internal.impl.XMLErrorReporter;
import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter;
import com.sun.org.apache.xerces.internal.parsers.XML11Configuration;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.xni.XNIException;
import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
import com.sun.org.apache.xerces.internal.xni.parser.XMLParseException;
import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
+import java.io.IOException;
+import java.lang.ref.SoftReference;
+import javax.xml.XMLConstants;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
import org.xml.sax.SAXException;
/**
@@ -86,6 +85,11 @@
Constants.XERCES_PROPERTY_PREFIX + Constants.VALIDATION_MANAGER_PROPERTY;
private static final String DEFAULT_TRANSFORMER_IMPL = "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl";
+
+ /** Property id: security manager. */
+ private static final String SECURITY_MANAGER =
+ Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY;
+
//
// Data
//
@@ -165,6 +169,9 @@
private XMLParserConfiguration initialize() {
XML11Configuration config = new XML11Configuration();
+ if (fComponentManager.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING)) {
+ config.setProperty(SECURITY_MANAGER, new XMLSecurityManager());
+ }
config.setProperty(ENTITY_RESOLVER, fComponentManager.getProperty(ENTITY_RESOLVER));
config.setProperty(ERROR_HANDLER, fComponentManager.getProperty(ERROR_HANDLER));
XMLErrorReporter errorReporter = (XMLErrorReporter) fComponentManager.getProperty(ERROR_REPORTER);
@@ -182,6 +189,8 @@
config.setDTDContentModelHandler(null);
config.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER,
fComponentManager.getProperty(Constants.XML_SECURITY_PROPERTY_MANAGER));
+ config.setProperty(Constants.SECURITY_MANAGER,
+ fComponentManager.getProperty(Constants.SECURITY_MANAGER));
fConfiguration = new SoftReference(config);
return config;
}
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java
index 8add5d2..fc652af 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java
@@ -49,11 +49,11 @@
import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
import com.sun.org.apache.xerces.internal.util.Status;
import com.sun.org.apache.xerces.internal.util.SymbolTable;
-import com.sun.org.apache.xerces.internal.util.SecurityManager;
import com.sun.org.apache.xerces.internal.util.URI;
import com.sun.org.apache.xerces.internal.util.XMLAttributesImpl;
import com.sun.org.apache.xerces.internal.util.XMLSymbols;
import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.xni.Augmentations;
import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
import com.sun.org.apache.xerces.internal.xni.QName;
@@ -679,10 +679,12 @@
SAXParserFactory.newInstance() : new SAXParserFactoryImpl();
spf.setNamespaceAware(true);
try {
+ spf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
+ fComponentManager.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING));
reader = spf.newSAXParser().getXMLReader();
// If this is a Xerces SAX parser, set the security manager if there is one
if (reader instanceof com.sun.org.apache.xerces.internal.parsers.SAXParser) {
- SecurityManager securityManager = (SecurityManager) fComponentManager.getProperty(SECURITY_MANAGER);
+ XMLSecurityManager securityManager = (XMLSecurityManager) fComponentManager.getProperty(SECURITY_MANAGER);
if (securityManager != null) {
try {
reader.setProperty(SECURITY_MANAGER, securityManager);
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
index a19088d..f2dadd0 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
@@ -41,10 +41,10 @@
import com.sun.org.apache.xerces.internal.util.ErrorHandlerWrapper;
import com.sun.org.apache.xerces.internal.util.SAXInputSource;
import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
-import com.sun.org.apache.xerces.internal.util.SecurityManager;
import com.sun.org.apache.xerces.internal.util.StAXInputSource;
import com.sun.org.apache.xerces.internal.util.Status;
import com.sun.org.apache.xerces.internal.util.XMLGrammarPoolImpl;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
import com.sun.org.apache.xerces.internal.xni.XNIException;
import com.sun.org.apache.xerces.internal.xni.grammars.Grammar;
@@ -79,7 +79,7 @@
private static final String XMLGRAMMAR_POOL =
Constants.XERCES_PROPERTY_PREFIX + Constants.XMLGRAMMAR_POOL_PROPERTY;
- /** Property identifier: SecurityManager. */
+ /** Property identifier: XMLSecurityManager. */
private static final String SECURITY_MANAGER =
Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY;
@@ -108,7 +108,7 @@
private ErrorHandlerWrapper fErrorHandlerWrapper;
/** The SecurityManager. */
- private SecurityManager fSecurityManager;
+ private XMLSecurityManager fSecurityManager;
/** The Security property manager. */
private XMLSecurityPropertyManager fSecurityPropertyMgr;
@@ -141,7 +141,7 @@
fXMLSchemaLoader.setErrorHandler(fErrorHandlerWrapper);
// Enable secure processing feature by default
- fSecurityManager = new SecurityManager();
+ fSecurityManager = new XMLSecurityManager(true);
fXMLSchemaLoader.setProperty(SECURITY_MANAGER, fSecurityManager);
fSecurityPropertyMgr = new XMLSecurityPropertyManager();
@@ -301,7 +301,7 @@
"FeatureNameNull", null));
}
if (name.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
- return (fSecurityManager != null);
+ return (fSecurityManager != null && fSecurityManager.isSecureProcessing());
}
try {
return fXMLSchemaLoader.getFeature(name);
@@ -365,17 +365,15 @@
SAXMessageFormatter.formatMessage(null,
"jaxp-secureprocessing-feature", null));
}
- if (value) {
- fSecurityManager = new SecurityManager();
+ fSecurityManager.setSecureProcessing(value);
+ if (value) {
if (Constants.IS_JDK8_OR_ABOVE) {
fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD,
XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA,
XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
}
- } else {
- fSecurityManager = null;
}
fXMLSchemaLoader.setProperty(SECURITY_MANAGER, fSecurityManager);
@@ -410,9 +408,17 @@
"ProperyNameNull", null));
}
if (name.equals(SECURITY_MANAGER)) {
- fSecurityManager = (SecurityManager) object;
+ fSecurityManager = XMLSecurityManager.convert(object, fSecurityManager);
fXMLSchemaLoader.setProperty(SECURITY_MANAGER, fSecurityManager);
return;
+ } else if (name.equals(Constants.XML_SECURITY_PROPERTY_MANAGER)) {
+ if (object == null) {
+ fSecurityPropertyMgr = new XMLSecurityPropertyManager();
+ } else {
+ fSecurityPropertyMgr = (XMLSecurityPropertyManager)object;
+ }
+ fXMLSchemaLoader.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
+ return;
}
else if (name.equals(XMLGRAMMAR_POOL)) {
throw new SAXNotSupportedException(
@@ -420,12 +426,15 @@
"property-not-supported", new Object [] {name}));
}
try {
- int index = fSecurityPropertyMgr.getIndex(name);
- if (index > -1) {
- fSecurityPropertyMgr.setValue(index,
- XMLSecurityPropertyManager.State.APIPROPERTY, (String)object);
- } else {
- fXMLSchemaLoader.setProperty(name, object);
+ //check if the property is managed by security manager
+ if (fSecurityManager == null ||
+ !fSecurityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, object)) {
+ //check if the property is managed by security property manager
+ if (fSecurityPropertyMgr == null ||
+ !fSecurityPropertyMgr.setValue(name, XMLSecurityPropertyManager.State.APIPROPERTY, object)) {
+ //fall back to the existing property manager
+ fXMLSchemaLoader.setProperty(name, object);
+ }
}
}
catch (XMLConfigurationException e) {
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
index 74e30da..dcbbabd 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
@@ -39,10 +39,10 @@
import com.sun.org.apache.xerces.internal.util.NamespaceSupport;
import com.sun.org.apache.xerces.internal.util.ParserConfigurationSettings;
import com.sun.org.apache.xerces.internal.util.PropertyState;
-import com.sun.org.apache.xerces.internal.util.SecurityManager;
import com.sun.org.apache.xerces.internal.util.Status;
import com.sun.org.apache.xerces.internal.util.SymbolTable;
import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
import com.sun.org.apache.xerces.internal.xni.XNIException;
import com.sun.org.apache.xerces.internal.xni.parser.XMLComponent;
@@ -181,7 +181,7 @@
private final HashMap fInitProperties = new HashMap();
/** Stores the initial security manager. */
- private final SecurityManager fInitSecurityManager;
+ private XMLSecurityManager fInitSecurityManager;
/** Stores the initial security property manager. */
private final XMLSecurityPropertyManager fSecurityPropertyMgr;
@@ -221,12 +221,6 @@
fComponents.put(ENTITY_RESOLVER, null);
fComponents.put(ERROR_HANDLER, null);
- if (System.getSecurityManager() != null) {
- _isSecureMode = true;
- setProperty(SECURITY_MANAGER, new SecurityManager());
- } else {
- fComponents.put(SECURITY_MANAGER, null);
- }
fComponents.put(SYMBOL_TABLE, new SymbolTable());
// setup grammar pool
@@ -241,15 +235,21 @@
addRecognizedParamsAndSetDefaults(fErrorReporter, grammarContainer);
addRecognizedParamsAndSetDefaults(fSchemaValidator, grammarContainer);
- // if the secure processing feature is set to true, add a security manager to the configuration
- Boolean secureProcessing = grammarContainer.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING);
- if (Boolean.TRUE.equals(secureProcessing)) {
- fInitSecurityManager = new SecurityManager();
+ boolean secureProcessing = grammarContainer.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING);
+ if (System.getSecurityManager() != null) {
+ _isSecureMode = true;
+ secureProcessing = true;
}
- else {
- fInitSecurityManager = null;
+
+ fInitSecurityManager = (XMLSecurityManager)
+ grammarContainer.getProperty(SECURITY_MANAGER);
+ if (fInitSecurityManager != null ) {
+ fInitSecurityManager.setSecureProcessing(secureProcessing);
+ } else {
+ fInitSecurityManager = new XMLSecurityManager(secureProcessing);
}
- fComponents.put(SECURITY_MANAGER, fInitSecurityManager);
+
+ setProperty(SECURITY_MANAGER, fInitSecurityManager);
//pass on properties set on SchemaFactory
fSecurityPropertyMgr = (XMLSecurityPropertyManager)
@@ -281,7 +281,7 @@
return FeatureState.is(fUseGrammarPoolOnly);
}
else if (XMLConstants.FEATURE_SECURE_PROCESSING.equals(featureId)) {
- return FeatureState.is(getProperty(SECURITY_MANAGER) != null);
+ return FeatureState.is(fInitSecurityManager.isSecureProcessing());
}
else if (SCHEMA_ELEMENT_DEFAULT.equals(featureId)) {
return FeatureState.is(true); //pre-condition: VALIDATION and SCHEMA_VALIDATION are always true
@@ -311,7 +311,9 @@
if (_isSecureMode && !value) {
throw new XMLConfigurationException(Status.NOT_ALLOWED, XMLConstants.FEATURE_SECURE_PROCESSING);
}
- setProperty(SECURITY_MANAGER, value ? new SecurityManager() : null);
+
+ fInitSecurityManager.setSecureProcessing(value);
+ setProperty(SECURITY_MANAGER, fInitSecurityManager);
if (value && Constants.IS_JDK8_OR_ABOVE) {
fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD,
@@ -390,10 +392,19 @@
fComponents.put(propertyId, value);
return;
}
- if (!fInitProperties.containsKey(propertyId)) {
- fInitProperties.put(propertyId, super.getProperty(propertyId));
+ //check if the property is managed by security manager
+ if (fInitSecurityManager == null ||
+ !fInitSecurityManager.setLimit(propertyId, XMLSecurityManager.State.APIPROPERTY, value)) {
+ //check if the property is managed by security property manager
+ if (fSecurityPropertyMgr == null ||
+ !fSecurityPropertyMgr.setValue(propertyId, XMLSecurityPropertyManager.State.APIPROPERTY, value)) {
+ //fall back to the existing property manager
+ if (!fInitProperties.containsKey(propertyId)) {
+ fInitProperties.put(propertyId, super.getProperty(propertyId));
+ }
+ super.setProperty(propertyId, value);
+ }
}
- super.setProperty(propertyId, value);
}
/**
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java
index 726f31e..eea7057 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java
@@ -20,18 +20,15 @@
package com.sun.org.apache.xerces.internal.parsers;
-import java.io.IOException;
-import java.util.Locale;
-
import com.sun.org.apache.xerces.internal.impl.Constants;
-import com.sun.org.apache.xerces.internal.util.Status;
-import com.sun.org.apache.xerces.internal.xs.PSVIProvider;
-import com.sun.org.apache.xerces.internal.util.EntityResolverWrapper;
import com.sun.org.apache.xerces.internal.util.EntityResolver2Wrapper;
+import com.sun.org.apache.xerces.internal.util.EntityResolverWrapper;
import com.sun.org.apache.xerces.internal.util.ErrorHandlerWrapper;
import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
+import com.sun.org.apache.xerces.internal.util.Status;
import com.sun.org.apache.xerces.internal.util.SymbolHash;
import com.sun.org.apache.xerces.internal.util.XMLSymbols;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.xni.Augmentations;
import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
import com.sun.org.apache.xerces.internal.xni.QName;
@@ -48,15 +45,17 @@
import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
import com.sun.org.apache.xerces.internal.xs.AttributePSVI;
import com.sun.org.apache.xerces.internal.xs.ElementPSVI;
+import com.sun.org.apache.xerces.internal.xs.PSVIProvider;
+import java.io.IOException;
+import java.util.Locale;
+import javax.xml.XMLConstants;
import org.xml.sax.AttributeList;
-import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.DTDHandler;
import org.xml.sax.DocumentHandler;
import org.xml.sax.EntityResolver;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
import org.xml.sax.Parser;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
@@ -131,6 +130,10 @@
protected static final String DOM_NODE =
Constants.SAX_PROPERTY_PREFIX + Constants.DOM_NODE_PROPERTY;
+ /** Property id: security manager. */
+ private static final String SECURITY_MANAGER =
+ Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY;
+
/** Recognized properties. */
private static final String[] RECOGNIZED_PROPERTIES = {
LEXICAL_HANDLER,
@@ -1645,19 +1648,13 @@
// Drop through and perform default processing
//
}
-
- //
- // Xerces Features
- //
-
- /*
- else if (featureId.startsWith(XERCES_FEATURES_PREFIX)) {
- String feature = featureId.substring(XERCES_FEATURES_PREFIX.length());
- //
- // Drop through and perform default processing
- //
+ else if (featureId.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
+ if (state) {
+ if (fConfiguration.getProperty(SECURITY_MANAGER )==null) {
+ fConfiguration.setProperty(SECURITY_MANAGER, new XMLSecurityManager());
+ }
+ }
}
- */
//
// Default handling
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java
index f681fad..f2020ef 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java
@@ -29,6 +29,7 @@
import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
import com.sun.org.apache.xerces.internal.util.Status;
import com.sun.org.apache.xerces.internal.util.SymbolTable;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
import com.sun.org.apache.xerces.internal.xni.XNIException;
import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
@@ -531,7 +532,54 @@
*/
public void setProperty(String propertyId, Object value)
throws SAXNotRecognizedException, SAXNotSupportedException {
+ /**
+ * It's possible for users to set a security manager through the interface.
+ * If it's the old SecurityManager, convert it to the new XMLSecurityManager
+ */
+ if (propertyId.equals(Constants.SECURITY_MANAGER)) {
+ securityManager = XMLSecurityManager.convert(value, securityManager);
+ setProperty0(Constants.SECURITY_MANAGER, securityManager);
+ return;
+ }
+ if (propertyId.equals(Constants.XML_SECURITY_PROPERTY_MANAGER)) {
+ if (value == null) {
+ securityPropertyManager = new XMLSecurityPropertyManager();
+ } else {
+ securityPropertyManager = (XMLSecurityPropertyManager)value;
+ }
+ setProperty0(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
+ return;
+ }
+ if (securityManager == null) {
+ securityManager = new XMLSecurityManager(true);
+ setProperty0(Constants.SECURITY_MANAGER, securityManager);
+ }
+
+ if (securityPropertyManager == null) {
+ securityPropertyManager = new XMLSecurityPropertyManager();
+ setProperty0(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
+ }
+ int index = securityPropertyManager.getIndex(propertyId);
+
+ if (index > -1) {
+ /**
+ * this is a direct call to this parser, not a subclass since
+ * internally the support of this property is done through
+ * XMLSecurityPropertyManager
+ */
+ securityPropertyManager.setValue(index, XMLSecurityPropertyManager.State.APIPROPERTY, (String)value);
+ } else {
+ //check if the property is managed by security manager
+ if (!securityManager.setLimit(propertyId, XMLSecurityManager.State.APIPROPERTY, value)) {
+ //fall back to the default configuration to handle the property
+ setProperty0(propertyId, value);
+ }
+ }
+ }
+
+ public void setProperty0(String propertyId, Object value)
+ throws SAXNotRecognizedException, SAXNotSupportedException {
try {
fConfiguration.setProperty(propertyId, value);
}
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java
index c63ae43..0f37f7c 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java
@@ -185,9 +185,12 @@
protected static final String LOCALE =
Constants.XERCES_PROPERTY_PREFIX + Constants.LOCALE_PROPERTY;
- /** Property identifier: Security property manager. */
- protected static final String XML_SECURITY_PROPERTY_MANAGER =
- Constants.XML_SECURITY_PROPERTY_MANAGER;
+ /** Property identifier: Security property manager. */
+ protected static final String XML_SECURITY_PROPERTY_MANAGER =
+ Constants.XML_SECURITY_PROPERTY_MANAGER;
+
+ /** Property identifier: Security manager. */
+ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
// debugging
@@ -334,6 +337,7 @@
JAXP_SCHEMA_SOURCE,
JAXP_SCHEMA_LANGUAGE,
LOCALE,
+ SECURITY_MANAGER,
XML_SECURITY_PROPERTY_MANAGER
};
addRecognizedProperties(recognizedProperties);
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java
index 481eda6..4697801 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java
@@ -158,9 +158,12 @@
protected static final String LOCALE =
Constants.XERCES_PROPERTY_PREFIX + Constants.LOCALE_PROPERTY;
- /** Property identifier: Security property manager. */
- protected static final String XML_SECURITY_PROPERTY_MANAGER =
- Constants.XML_SECURITY_PROPERTY_MANAGER;
+ /** Property identifier: Security property manager. */
+ protected static final String XML_SECURITY_PROPERTY_MANAGER =
+ Constants.XML_SECURITY_PROPERTY_MANAGER;
+
+ /** Property identifier: Security manager. */
+ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
// debugging
@@ -316,6 +319,7 @@
DATATYPE_VALIDATOR_FACTORY,
VALIDATION_MANAGER,
LOCALE,
+ SECURITY_MANAGER,
XML_SECURITY_PROPERTY_MANAGER
};
addRecognizedProperties(recognizedProperties);
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
index 1ba84af..48b8a1e 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
@@ -22,6 +22,7 @@
import com.sun.org.apache.xerces.internal.impl.Constants;
import com.sun.org.apache.xerces.internal.util.SymbolTable;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
@@ -76,7 +77,7 @@
XMLGRAMMAR_POOL,
};
- XMLSecurityPropertyManager securityPropertyManager;
+
//
// Constructors
//
@@ -130,11 +131,36 @@
*/
public void setProperty(String name, Object value)
throws SAXNotRecognizedException, SAXNotSupportedException {
+ /**
+ * It's possible for users to set a security manager through the interface.
+ * If it's the old SecurityManager, convert it to the new XMLSecurityManager
+ */
+ if (name.equals(Constants.SECURITY_MANAGER)) {
+ securityManager = XMLSecurityManager.convert(value, securityManager);
+ super.setProperty(Constants.SECURITY_MANAGER, securityManager);
+ return;
+ }
+ if (name.equals(Constants.XML_SECURITY_PROPERTY_MANAGER)) {
+ if (value == null) {
+ securityPropertyManager = new XMLSecurityPropertyManager();
+ } else {
+ securityPropertyManager = (XMLSecurityPropertyManager)value;
+ }
+ super.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
+ return;
+ }
+
+ if (securityManager == null) {
+ securityManager = new XMLSecurityManager(true);
+ super.setProperty(Constants.SECURITY_MANAGER, securityManager);
+ }
+
if (securityPropertyManager == null) {
securityPropertyManager = new XMLSecurityPropertyManager();
+ super.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
}
- int index = securityPropertyManager.getIndex(name);
+ int index = securityPropertyManager.getIndex(name);
if (index > -1) {
/**
* this is a direct call to this parser, not a subclass since
@@ -142,9 +168,12 @@
* XMLSecurityPropertyManager
*/
securityPropertyManager.setValue(index, XMLSecurityPropertyManager.State.APIPROPERTY, (String)value);
- super.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
} else {
- super.setProperty(name, value);
+ //check if the property is managed by security manager
+ if (!securityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, value)) {
+ //fall back to the default configuration to handle the property
+ super.setProperty(name, value);
+ }
}
}
} // class SAXParser
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java
index df32bfa..65c85d1 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java
@@ -23,8 +23,8 @@
import com.sun.org.apache.xerces.internal.impl.Constants;
import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
import com.sun.org.apache.xerces.internal.xni.parser.XMLComponentManager;
-import com.sun.org.apache.xerces.internal.util.SecurityManager;
import com.sun.org.apache.xerces.internal.util.SymbolTable;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
/**
* This configuration allows Xerces to behave in a security-conscious manner; that is,
@@ -44,6 +44,7 @@
*
* @author Neil Graham, IBM
*
+ * @version $Id: SecurityConfiguration.java,v 1.6 2010-11-01 04:40:09 joehw Exp $
*/
public class SecurityConfiguration extends XIncludeAwareParserConfiguration
{
@@ -107,7 +108,7 @@
super(symbolTable, grammarPool, parentSettings);
// create the SecurityManager property:
- setProperty(SECURITY_MANAGER_PROPERTY, new SecurityManager());
+ setProperty(SECURITY_MANAGER_PROPERTY, new XMLSecurityManager(true));
} // <init>(SymbolTable,XMLGrammarPool)
} // class SecurityConfiguration
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java
index 993ef61..bbcbcee 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java
@@ -52,6 +52,7 @@
import com.sun.org.apache.xerces.internal.util.ParserConfigurationSettings;
import com.sun.org.apache.xerces.internal.util.PropertyState;
import com.sun.org.apache.xerces.internal.util.SymbolTable;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
import com.sun.org.apache.xerces.internal.xni.XMLDTDContentModelHandler;
import com.sun.org.apache.xerces.internal.xni.XMLDTDHandler;
@@ -279,6 +280,8 @@
private static final String XML_SECURITY_PROPERTY_MANAGER =
Constants.XML_SECURITY_PROPERTY_MANAGER;
+ /** Property identifier: Security manager. */
+ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
// debugging
@@ -449,26 +452,26 @@
XMLGrammarPool grammarPool,
XMLComponentManager parentSettings) {
- super(parentSettings);
+ super(parentSettings);
- // create a vector to hold all the components in use
- // XML 1.0 specialized components
- fComponents = new ArrayList();
- // XML 1.1 specialized components
- fXML11Components = new ArrayList();
- // Common components for XML 1.1. and XML 1.0
- fCommonComponents = new ArrayList();
+ // create a vector to hold all the components in use
+ // XML 1.0 specialized components
+ fComponents = new ArrayList();
+ // XML 1.1 specialized components
+ fXML11Components = new ArrayList();
+ // Common components for XML 1.1. and XML 1.0
+ fCommonComponents = new ArrayList();
- // create table for features and properties
- fFeatures = new HashMap();
- fProperties = new HashMap();
+ // create table for features and properties
+ fFeatures = new HashMap();
+ fProperties = new HashMap();
// add default recognized features
final String[] recognizedFeatures =
{
CONTINUE_AFTER_FATAL_ERROR, LOAD_EXTERNAL_DTD, // from XMLDTDScannerImpl
- VALIDATION,
- NAMESPACES,
+ VALIDATION,
+ NAMESPACES,
NORMALIZE_DATA, SCHEMA_ELEMENT_DEFAULT, SCHEMA_AUGMENT_PSVI,
GENERATE_SYNTHETIC_ANNOTATIONS, VALIDATE_ANNOTATIONS,
HONOUR_ALL_SCHEMALOCATIONS, NAMESPACE_GROWTH,
@@ -479,47 +482,47 @@
// features might not have been set and it would cause a
// not-recognized exception to be thrown. -Ac
XMLSCHEMA_VALIDATION, XMLSCHEMA_FULL_CHECKING,
- EXTERNAL_GENERAL_ENTITIES,
- EXTERNAL_PARAMETER_ENTITIES,
- PARSER_SETTINGS,
- XMLConstants.FEATURE_SECURE_PROCESSING
+ EXTERNAL_GENERAL_ENTITIES,
+ EXTERNAL_PARAMETER_ENTITIES,
+ PARSER_SETTINGS,
+ XMLConstants.FEATURE_SECURE_PROCESSING
};
addRecognizedFeatures(recognizedFeatures);
- // set state for default features
- fFeatures.put(VALIDATION, Boolean.FALSE);
- fFeatures.put(NAMESPACES, Boolean.TRUE);
- fFeatures.put(EXTERNAL_GENERAL_ENTITIES, Boolean.TRUE);
- fFeatures.put(EXTERNAL_PARAMETER_ENTITIES, Boolean.TRUE);
- fFeatures.put(CONTINUE_AFTER_FATAL_ERROR, Boolean.FALSE);
- fFeatures.put(LOAD_EXTERNAL_DTD, Boolean.TRUE);
- fFeatures.put(SCHEMA_ELEMENT_DEFAULT, Boolean.TRUE);
- fFeatures.put(NORMALIZE_DATA, Boolean.TRUE);
- fFeatures.put(SCHEMA_AUGMENT_PSVI, Boolean.TRUE);
- fFeatures.put(GENERATE_SYNTHETIC_ANNOTATIONS, Boolean.FALSE);
- fFeatures.put(VALIDATE_ANNOTATIONS, Boolean.FALSE);
- fFeatures.put(HONOUR_ALL_SCHEMALOCATIONS, Boolean.FALSE);
- fFeatures.put(NAMESPACE_GROWTH, Boolean.FALSE);
- fFeatures.put(TOLERATE_DUPLICATES, Boolean.FALSE);
- fFeatures.put(USE_GRAMMAR_POOL_ONLY, Boolean.FALSE);
- fFeatures.put(PARSER_SETTINGS, Boolean.TRUE);
- fFeatures.put(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
+ // set state for default features
+ fFeatures.put(VALIDATION, Boolean.FALSE);
+ fFeatures.put(NAMESPACES, Boolean.TRUE);
+ fFeatures.put(EXTERNAL_GENERAL_ENTITIES, Boolean.TRUE);
+ fFeatures.put(EXTERNAL_PARAMETER_ENTITIES, Boolean.TRUE);
+ fFeatures.put(CONTINUE_AFTER_FATAL_ERROR, Boolean.FALSE);
+ fFeatures.put(LOAD_EXTERNAL_DTD, Boolean.TRUE);
+ fFeatures.put(SCHEMA_ELEMENT_DEFAULT, Boolean.TRUE);
+ fFeatures.put(NORMALIZE_DATA, Boolean.TRUE);
+ fFeatures.put(SCHEMA_AUGMENT_PSVI, Boolean.TRUE);
+ fFeatures.put(GENERATE_SYNTHETIC_ANNOTATIONS, Boolean.FALSE);
+ fFeatures.put(VALIDATE_ANNOTATIONS, Boolean.FALSE);
+ fFeatures.put(HONOUR_ALL_SCHEMALOCATIONS, Boolean.FALSE);
+ fFeatures.put(NAMESPACE_GROWTH, Boolean.FALSE);
+ fFeatures.put(TOLERATE_DUPLICATES, Boolean.FALSE);
+ fFeatures.put(USE_GRAMMAR_POOL_ONLY, Boolean.FALSE);
+ fFeatures.put(PARSER_SETTINGS, Boolean.TRUE);
+ fFeatures.put(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
// add default recognized properties
final String[] recognizedProperties =
{
- SYMBOL_TABLE,
- ERROR_HANDLER,
- ENTITY_RESOLVER,
+ SYMBOL_TABLE,
+ ERROR_HANDLER,
+ ENTITY_RESOLVER,
ERROR_REPORTER,
ENTITY_MANAGER,
DOCUMENT_SCANNER,
DTD_SCANNER,
DTD_PROCESSOR,
DTD_VALIDATOR,
- DATATYPE_VALIDATOR_FACTORY,
- VALIDATION_MANAGER,
- SCHEMA_VALIDATOR,
- XML_STRING,
+ DATATYPE_VALIDATOR_FACTORY,
+ VALIDATION_MANAGER,
+ SCHEMA_VALIDATOR,
+ XML_STRING,
XMLGRAMMAR_POOL,
JAXP_SCHEMA_SOURCE,
JAXP_SCHEMA_LANGUAGE,
@@ -531,19 +534,20 @@
SCHEMA_NONS_LOCATION,
LOCALE,
SCHEMA_DV_FACTORY,
+ SECURITY_MANAGER,
XML_SECURITY_PROPERTY_MANAGER
};
addRecognizedProperties(recognizedProperties);
- if (symbolTable == null) {
- symbolTable = new SymbolTable();
- }
- fSymbolTable = symbolTable;
- fProperties.put(SYMBOL_TABLE, fSymbolTable);
+ if (symbolTable == null) {
+ symbolTable = new SymbolTable();
+ }
+ fSymbolTable = symbolTable;
+ fProperties.put(SYMBOL_TABLE, fSymbolTable);
fGrammarPool = grammarPool;
if (fGrammarPool != null) {
- fProperties.put(XMLGRAMMAR_POOL, fGrammarPool);
+ fProperties.put(XMLGRAMMAR_POOL, fGrammarPool);
}
fEntityManager = new XMLEntityManager();
@@ -579,8 +583,6 @@
fVersionDetector = new XMLVersionDetector();
- fProperties.put(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager());
-
// add message formatters
if (fErrorReporter.getMessageFormatter(XMLMessageFormatter.XML_DOMAIN) == null) {
XMLMessageFormatter xmft = new XMLMessageFormatter();
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java
index 210b7ce..970cc51 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java
@@ -23,6 +23,8 @@
import java.io.IOException;
import com.sun.org.apache.xerces.internal.impl.Constants;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
import com.sun.org.apache.xerces.internal.xni.XNIException;
import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
@@ -78,6 +80,13 @@
/** The parser configuration. */
protected XMLParserConfiguration fConfiguration;
+ /** The XML Security Manager. */
+ XMLSecurityManager securityManager;
+
+ /** The XML Security Property Manager. */
+ XMLSecurityPropertyManager securityPropertyManager;
+
+
//
// Constructors
//
@@ -118,6 +127,15 @@
*/
public void parse(XMLInputSource inputSource)
throws XNIException, IOException {
+ // null indicates that the parser is called directly, initialize them
+ if (securityManager == null) {
+ securityManager = new XMLSecurityManager(true);
+ fConfiguration.setProperty(Constants.SECURITY_MANAGER, securityManager);
+ }
+ if (securityPropertyManager == null) {
+ securityPropertyManager = new XMLSecurityPropertyManager();
+ fConfiguration.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
+ }
reset();
fConfiguration.parse(inputSource);
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java b/jaxp/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java
index dd510b6..d916f5b 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java
@@ -61,8 +61,6 @@
package com.sun.org.apache.xerces.internal.util;
import com.sun.org.apache.xerces.internal.impl.Constants;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
/**
* This class is a container for parser settings that relate to
* security, or more specifically, it is intended to be used to prevent denial-of-service
@@ -79,7 +77,6 @@
*
* @author Neil Graham, IBM
*
- * @version $Id: SecurityManager.java,v 1.5 2010-11-01 04:40:14 joehw Exp $
*/
public final class SecurityManager {
@@ -179,48 +176,40 @@
private void readSystemProperties(){
- //TODO: also read SYSTEM_PROPERTY_ELEMENT_ATTRIBUTE_LIMIT
- try {
- String value = getSystemProperty(Constants.ENTITY_EXPANSION_LIMIT);
- if(value != null && !value.equals("")){
- entityExpansionLimit = Integer.parseInt(value);
- if (entityExpansionLimit < 0)
- entityExpansionLimit = DEFAULT_ENTITY_EXPANSION_LIMIT;
- }
- else
- entityExpansionLimit = DEFAULT_ENTITY_EXPANSION_LIMIT;
- }catch(Exception ex){}
+ try {
+ String value = System.getProperty(Constants.ENTITY_EXPANSION_LIMIT);
+ if(value != null && !value.equals("")){
+ entityExpansionLimit = Integer.parseInt(value);
+ if (entityExpansionLimit < 0)
+ entityExpansionLimit = DEFAULT_ENTITY_EXPANSION_LIMIT;
+ }
+ else
+ entityExpansionLimit = DEFAULT_ENTITY_EXPANSION_LIMIT;
+ }catch(Exception ex){}
- try {
- String value = getSystemProperty(Constants.MAX_OCCUR_LIMIT);
- if(value != null && !value.equals("")){
- maxOccurLimit = Integer.parseInt(value);
- if (maxOccurLimit < 0)
- maxOccurLimit = DEFAULT_MAX_OCCUR_NODE_LIMIT;
- }
- else
- maxOccurLimit = DEFAULT_MAX_OCCUR_NODE_LIMIT;
- }catch(Exception ex){}
+ try {
+ String value = System.getProperty(Constants.MAX_OCCUR_LIMIT);
+ if(value != null && !value.equals("")){
+ maxOccurLimit = Integer.parseInt(value);
+ if (maxOccurLimit < 0)
+ maxOccurLimit = DEFAULT_MAX_OCCUR_NODE_LIMIT;
+ }
+ else
+ maxOccurLimit = DEFAULT_MAX_OCCUR_NODE_LIMIT;
+ }catch(Exception ex){}
- try {
- String value = getSystemProperty(Constants.SYSTEM_PROPERTY_ELEMENT_ATTRIBUTE_LIMIT);
- if(value != null && !value.equals("")){
- fElementAttributeLimit = Integer.parseInt(value);
- if ( fElementAttributeLimit < 0)
- fElementAttributeLimit = DEFAULT_ELEMENT_ATTRIBUTE_LIMIT;
- }
- else
- fElementAttributeLimit = DEFAULT_ELEMENT_ATTRIBUTE_LIMIT;
+ try {
+ String value = System.getProperty(Constants.ELEMENT_ATTRIBUTE_LIMIT);
+ if(value != null && !value.equals("")){
+ fElementAttributeLimit = Integer.parseInt(value);
+ if ( fElementAttributeLimit < 0)
+ fElementAttributeLimit = DEFAULT_ELEMENT_ATTRIBUTE_LIMIT;
+ }
+ else
+ fElementAttributeLimit = DEFAULT_ELEMENT_ATTRIBUTE_LIMIT;
}catch(Exception ex){}
}
- private String getSystemProperty(final String propName) {
- return AccessController.doPrivileged(new PrivilegedAction<String>() {
- public String run() {
- return System.getProperty(propName);
- }
- });
- }
} // class SecurityManager
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java b/jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java
index b3d9ed7..8e62c1f 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java
@@ -173,7 +173,7 @@
for (int i = 0; i < length; i++) {
code = code * 37 + symbol.charAt(i);
}
- return code & 0x7FFFFFF;
+ return code & 0x7FFFFFFF;
} // hash(String):int
@@ -194,7 +194,7 @@
for (int i = 0; i < length; i++) {
code = code * 37 + buffer[offset + i];
}
- return code & 0x7FFFFFF;
+ return code & 0x7FFFFFFF;
} // hash(char[],int,int):int
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/util/URI.java b/jaxp/src/com/sun/org/apache/xerces/internal/util/URI.java
index e420f26..a92cd20 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/util/URI.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/util/URI.java
@@ -689,9 +689,13 @@
if (!initializeAuthority(uriSpec.substring(startPos, index))) {
index = startPos - 2;
}
- }
- else {
+ } else if (index < uriSpecLen) {
+ //Same as java.net.URI:
+ // DEVIATION: Allow empty authority prior to non-empty
+ // path, query component or fragment identifier
m_host = "";
+ } else {
+ throw new MalformedURIException("Expected authority.");
}
}
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java b/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java
new file mode 100644
index 0000000..82667ed
--- /dev/null
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java
@@ -0,0 +1,239 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.sun.org.apache.xerces.internal.utils;
+
+import com.sun.org.apache.xerces.internal.impl.Constants;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager.Limit;
+import java.util.Formatter;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A helper for analyzing entity expansion limits
+ *
+ * @author Joe Wang Oracle Corp.
+ *
+ */
+public final class XMLLimitAnalyzer {
+
+ /**
+ * Map old property names with the new ones
+ */
+ public static enum NameMap {
+ ENTITY_EXPANSION_LIMIT(Constants.SP_ENTITY_EXPANSION_LIMIT, Constants.ENTITY_EXPANSION_LIMIT),
+ MAX_OCCUR_NODE_LIMIT(Constants.SP_MAX_OCCUR_LIMIT, Constants.MAX_OCCUR_LIMIT),
+ ELEMENT_ATTRIBUTE_LIMIT(Constants.SP_ELEMENT_ATTRIBUTE_LIMIT, Constants.ELEMENT_ATTRIBUTE_LIMIT);
+
+ final String newName;
+ final String oldName;
+
+ NameMap(String newName, String oldName) {
+ this.newName = newName;
+ this.oldName = oldName;
+ }
+
+ String getOldName(String newName) {
+ if (newName.equals(this.newName)) {
+ return oldName;
+ }
+ return null;
+ }
+ }
+
+ private XMLSecurityManager securityManager;
+ /**
+ * Max value accumulated for each property
+ */
+ private final int[] values;
+ /**
+ * Names of the entities corresponding to their max values
+ */
+ private final String[] names;
+ /**
+ * Total value of accumulated entities
+ */
+ private final int[] totalValue;
+
+ /**
+ * Maintain values of the top 10 elements in the process of parsing
+ */
+ private final Map[] caches;
+
+ private String entityStart, entityEnd;
+ /**
+ * Default constructor. Establishes default values for known security
+ * vulnerabilities.
+ */
+ public XMLLimitAnalyzer(XMLSecurityManager securityManager) {
+ this.securityManager = securityManager;
+ values = new int[Limit.values().length];
+ totalValue = new int[Limit.values().length];
+ names = new String[Limit.values().length];
+ caches = new Map[Limit.values().length];
+ }
+
+ /**
+ * Add the value to the current max count for the specified property
+ * To find the max value of all entities, set no limit
+ *
+ * @param limit the type of the property
+ * @param entityName the name of the entity
+ * @param value the value of the entity
+ */
+ public void addValue(Limit limit, String entityName, int value) {
+ addValue(limit.ordinal(), entityName, value);
+ }
+
+ /**
+ * Add the value to the current count by the index of the property
+ * @param index the index of the property
+ * @param entityName the name of the entity
+ * @param value the value of the entity
+ */
+ public void addValue(int index, String entityName, int value) {
+ if (index == Limit.ENTITY_EXPANSION_LIMIT.ordinal() ||
+ index == Limit.MAX_OCCUR_NODE_LIMIT.ordinal() ||
+ index == Limit.ELEMENT_ATTRIBUTE_LIMIT.ordinal()) {
+ totalValue[index] += value;
+ return;
+ }
+
+ Map<String, Integer> cache;
+ if (caches[index] == null) {
+ cache = new HashMap<String, Integer>(10);
+ caches[index] = cache;
+ } else {
+ cache = caches[index];
+ }
+
+ int accumulatedValue = value;
+ if (cache.containsKey(entityName)) {
+ accumulatedValue += cache.get(entityName).intValue();
+ cache.put(entityName, Integer.valueOf(accumulatedValue));
+ } else {
+ cache.put(entityName, Integer.valueOf(value));
+ }
+
+ if (accumulatedValue > values[index]) {
+ values[index] = accumulatedValue;
+ names[index] = entityName;
+ }
+
+
+ if (index == Limit.GENEAL_ENTITY_SIZE_LIMIT.ordinal() ||
+ index == Limit.PARAMETER_ENTITY_SIZE_LIMIT.ordinal()) {
+ totalValue[Limit.TOTAL_ENTITY_SIZE_LIMIT.ordinal()] += value;
+ }
+ }
+
+ /**
+ * Return the value of the current max count for the specified property
+ *
+ * @param limit the property
+ * @return the value of the property
+ */
+ public int getValue(Limit limit) {
+ return values[limit.ordinal()];
+ }
+
+ public int getValue(int index) {
+ return values[index];
+ }
+ /**
+ * Return the total value accumulated so far
+ *
+ * @param limit the property
+ * @return the accumulated value of the property
+ */
+ public int getTotalValue(Limit limit) {
+ return totalValue[limit.ordinal()];
+ }
+
+ public int getTotalValue(int index) {
+ return totalValue[index];
+ }
+ /**
+ * Return the current max value (count or length) by the index of a property
+ * @param index the index of a property
+ * @return count of a property
+ */
+ public int getValueByIndex(int index) {
+ return values[index];
+ }
+
+ public void startEntity(String name) {
+ entityStart = name;
+ }
+
+ public boolean isTracking(String name) {
+ if (entityStart == null) {
+ return false;
+ }
+ return entityStart.equals(name);
+ }
+ /**
+ * Stop tracking the entity
+ * @param limit the limit property
+ * @param name the name of an entity
+ */
+ public void endEntity(Limit limit, String name) {
+ entityStart = "";
+ Map<String, Integer> cache = caches[limit.ordinal()];
+ if (cache != null) {
+ cache.remove(name);
+ }
+ }
+
+ public void debugPrint() {
+ Formatter formatter = new Formatter();
+ System.out.println(formatter.format("%30s %15s %15s %15s %30s",
+ "Property","Limit","Total size","Size","Entity Name"));
+
+ for (Limit limit : Limit.values()) {
+ formatter = new Formatter();
+ System.out.println(formatter.format("%30s %15d %15d %15d %30s",
+ limit.name(),
+ securityManager.getLimit(limit),
+ totalValue[limit.ordinal()],
+ values[limit.ordinal()],
+ names[limit.ordinal()]));
+ }
+ }
+}
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java b/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java
new file mode 100644
index 0000000..a28e80d
--- /dev/null
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java
@@ -0,0 +1,555 @@
+/*
+ * Copyright (c) 2013 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 com.sun.org.apache.xerces.internal.utils;
+
+import com.sun.org.apache.xerces.internal.impl.Constants;
+import com.sun.org.apache.xerces.internal.util.SecurityManager;
+
+/**
+ * This class manages standard and implementation-specific limitations.
+ *
+ */
+public final class XMLSecurityManager {
+
+ /**
+ * States of the settings of a property, in the order: default value, value
+ * set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system
+ * properties, and jaxp api properties
+ */
+ public static enum State {
+ //this order reflects the overriding order
+
+ DEFAULT("default"), FSP("FEATURE_SECURE_PROCESSING"),
+ JAXPDOTPROPERTIES("jaxp.properties"), SYSTEMPROPERTY("system property"),
+ APIPROPERTY("property");
+
+ final String literal;
+ State(String literal) {
+ this.literal = literal;
+ }
+
+ String literal() {
+ return literal;
+ }
+ }
+
+ /**
+ * Limits managed by the security manager
+ */
+ public static enum Limit {
+
+ ENTITY_EXPANSION_LIMIT(Constants.JDK_ENTITY_EXPANSION_LIMIT, Constants.SP_ENTITY_EXPANSION_LIMIT, 0, 64000),
+ MAX_OCCUR_NODE_LIMIT(Constants.JDK_MAX_OCCUR_LIMIT, Constants.SP_MAX_OCCUR_LIMIT, 0, 5000),
+ ELEMENT_ATTRIBUTE_LIMIT(Constants.JDK_ELEMENT_ATTRIBUTE_LIMIT, Constants.SP_ELEMENT_ATTRIBUTE_LIMIT, 0, 10000),
+ TOTAL_ENTITY_SIZE_LIMIT(Constants.JDK_TOTAL_ENTITY_SIZE_LIMIT, Constants.SP_TOTAL_ENTITY_SIZE_LIMIT, 0, 50000000),
+ GENEAL_ENTITY_SIZE_LIMIT(Constants.JDK_GENEAL_ENTITY_SIZE_LIMIT, Constants.SP_GENEAL_ENTITY_SIZE_LIMIT, 0, 0),
+ PARAMETER_ENTITY_SIZE_LIMIT(Constants.JDK_PARAMETER_ENTITY_SIZE_LIMIT, Constants.SP_PARAMETER_ENTITY_SIZE_LIMIT, 0, 1000000);
+
+ final String apiProperty;
+ final String systemProperty;
+ final int defaultValue;
+ final int secureValue;
+
+ Limit(String apiProperty, String systemProperty, int value, int secureValue) {
+ this.apiProperty = apiProperty;
+ this.systemProperty = systemProperty;
+ this.defaultValue = value;
+ this.secureValue = secureValue;
+ }
+
+ public boolean equalsAPIPropertyName(String propertyName) {
+ return (propertyName == null) ? false : apiProperty.equals(propertyName);
+ }
+
+ public boolean equalsSystemPropertyName(String propertyName) {
+ return (propertyName == null) ? false : systemProperty.equals(propertyName);
+ }
+
+ public String apiProperty() {
+ return apiProperty;
+ }
+
+ String systemProperty() {
+ return systemProperty;
+ }
+
+ int defaultValue() {
+ return defaultValue;
+ }
+
+ int secureValue() {
+ return secureValue;
+ }
+ }
+
+ /**
+ * Map old property names with the new ones
+ */
+ public static enum NameMap {
+
+ ENTITY_EXPANSION_LIMIT(Constants.SP_ENTITY_EXPANSION_LIMIT, Constants.ENTITY_EXPANSION_LIMIT),
+ MAX_OCCUR_NODE_LIMIT(Constants.SP_MAX_OCCUR_LIMIT, Constants.MAX_OCCUR_LIMIT),
+ ELEMENT_ATTRIBUTE_LIMIT(Constants.SP_ELEMENT_ATTRIBUTE_LIMIT, Constants.ELEMENT_ATTRIBUTE_LIMIT);
+ final String newName;
+ final String oldName;
+
+ NameMap(String newName, String oldName) {
+ this.newName = newName;
+ this.oldName = oldName;
+ }
+
+ String getOldName(String newName) {
+ if (newName.equals(this.newName)) {
+ return oldName;
+ }
+ return null;
+ }
+ }
+ private static final int NO_LIMIT = 0;
+ /**
+ * Values of the properties
+ */
+ private final int[] values;
+ /**
+ * States of the settings for each property
+ */
+ private State[] states;
+ /**
+ * Flag indicating if secure processing is set
+ */
+ boolean secureProcessing;
+
+ /**
+ * States that determine if properties are set explicitly
+ */
+ private boolean[] isSet;
+
+
+ private XMLLimitAnalyzer limitAnalyzer;
+ /**
+ * Index of the special entityCountInfo property
+ */
+ private int indexEntityCountInfo = 10000;
+ private String printEntityCountInfo = "";
+
+ /**
+ * Default constructor. Establishes default values for known security
+ * vulnerabilities.
+ */
+ public XMLSecurityManager() {
+ this(false);
+ }
+
+ /**
+ * Instantiate Security Manager in accordance with the status of
+ * secure processing
+ * @param secureProcessing
+ */
+ public XMLSecurityManager(boolean secureProcessing) {
+ limitAnalyzer = new XMLLimitAnalyzer(this);
+ values = new int[Limit.values().length];
+ states = new State[Limit.values().length];
+ isSet = new boolean[Limit.values().length];
+ this.secureProcessing = secureProcessing;
+ for (Limit limit : Limit.values()) {
+ if (secureProcessing) {
+ values[limit.ordinal()] = limit.secureValue;
+ states[limit.ordinal()] = State.FSP;
+ } else {
+ values[limit.ordinal()] = limit.defaultValue();
+ states[limit.ordinal()] = State.DEFAULT;
+ }
+ }
+ //read system properties or jaxp.properties
+ readSystemProperties();
+ }
+
+ /**
+ * Setting FEATURE_SECURE_PROCESSING explicitly
+ */
+ public void setSecureProcessing(boolean secure) {
+ secureProcessing = secure;
+ for (Limit limit : Limit.values()) {
+ if (secure) {
+ setLimit(limit.ordinal(), State.FSP, limit.secureValue());
+ } else {
+ setLimit(limit.ordinal(), State.FSP, limit.defaultValue());
+ }
+ }
+ }
+
+ /**
+ * Return the state of secure processing
+ * @return the state of secure processing
+ */
+ public boolean isSecureProcessing() {
+ return secureProcessing;
+ }
+
+
+ /**
+ * Set limit by property name and state
+ * @param propertyName property name
+ * @param state the state of the property
+ * @param value the value of the property
+ * @return true if the property is managed by the security manager; false
+ * if otherwise.
+ */
+ public boolean setLimit(String propertyName, State state, Object value) {
+ int index = getIndex(propertyName);
+ if (index > -1) {
+ setLimit(index, state, value);
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Set the value for a specific limit.
+ *
+ * @param limit the limit
+ * @param state the state of the property
+ * @param value the value of the property
+ */
+ public void setLimit(Limit limit, State state, int value) {
+ setLimit(limit.ordinal(), state, value);
+ }
+
+ /**
+ * Set the value of a property by its index
+ *
+ * @param index the index of the property
+ * @param state the state of the property
+ * @param value the value of the property
+ */
+ public void setLimit(int index, State state, Object value) {
+ if (index == indexEntityCountInfo) {
+ printEntityCountInfo = (String)value;
+ } else {
+ int temp = 0;
+ try {
+ temp = Integer.parseInt((String) value);
+ if (temp < 0) {
+ temp = 0;
+ }
+ } catch (NumberFormatException e) {}
+ setLimit(index, state, temp);
+ }
+ }
+
+ /**
+ * Set the value of a property by its index
+ *
+ * @param index the index of the property
+ * @param state the state of the property
+ * @param value the value of the property
+ */
+ public void setLimit(int index, State state, int value) {
+ if (index == indexEntityCountInfo) {
+ //if it's explicitly set, it's treated as yes no matter the value
+ printEntityCountInfo = Constants.JDK_YES;
+ } else {
+ //only update if it shall override
+ if (state.compareTo(states[index]) >= 0) {
+ values[index] = value;
+ states[index] = state;
+ isSet[index] = true;
+ }
+ }
+ }
+
+ /**
+ * Return the value of the specified property
+ *
+ * @param propertyName the property name
+ * @return the value of the property as a string. If a property is managed
+ * by this manager, its value shall not be null.
+ */
+ public String getLimitAsString(String propertyName) {
+ int index = getIndex(propertyName);
+ if (index > -1) {
+ return getLimitValueByIndex(index);
+ }
+
+ return null;
+ }
+ /**
+ * Return the value of the specified property
+ *
+ * @param limit the property
+ * @return the value of the property
+ */
+ public int getLimit(Limit limit) {
+ return values[limit.ordinal()];
+ }
+
+ /**
+ * Return the value of a property by its ordinal
+ *
+ * @param limit the property
+ * @return value of a property
+ */
+ public String getLimitValueAsString(Limit limit) {
+ return Integer.toString(values[limit.ordinal()]);
+ }
+
+ /**
+ * Return the value of a property by its ordinal
+ *
+ * @param index the index of a property
+ * @return limit of a property as a string
+ */
+ public String getLimitValueByIndex(int index) {
+ if (index == indexEntityCountInfo) {
+ return printEntityCountInfo;
+ }
+
+ return Integer.toString(values[index]);
+ }
+
+ /**
+ * Return the state of the limit property
+ *
+ * @param limit the limit
+ * @return the state of the limit property
+ */
+ public State getState(Limit limit) {
+ return states[limit.ordinal()];
+ }
+
+ /**
+ * Return the state of the limit property
+ *
+ * @param limit the limit
+ * @return the state of the limit property
+ */
+ public String getStateLiteral(Limit limit) {
+ return states[limit.ordinal()].literal();
+ }
+
+ /**
+ * Get the index by property name
+ *
+ * @param propertyName property name
+ * @return the index of the property if found; return -1 if not
+ */
+ public int getIndex(String propertyName) {
+ for (Limit limit : Limit.values()) {
+ if (limit.equalsAPIPropertyName(propertyName)) {
+ //internally, ordinal is used as index
+ return limit.ordinal();
+ }
+ }
+ //special property to return entity count info
+ if (propertyName.equals(Constants.JDK_ENTITY_COUNT_INFO)) {
+ return indexEntityCountInfo;
+ }
+ return -1;
+ }
+
+ /**
+ * Check if there's no limit defined by the Security Manager
+ * @param limit
+ * @return
+ */
+ public boolean isNoLimit(int limit) {
+ return limit==NO_LIMIT;
+ }
+ /**
+ * Check if the size (length or count) of the specified limit property is
+ * over the limit
+ *
+ * @param limit the type of the limit property
+ * @param entityName the name of the entity
+ * @param size the size (count or length) of the entity
+ * @return true if the size is over the limit, false otherwise
+ */
+ public boolean isOverLimit(Limit limit, String entityName, int size) {
+ return isOverLimit(limit.ordinal(), entityName, size);
+ }
+
+ /**
+ * Check if the value (length or count) of the specified limit property is
+ * over the limit
+ *
+ * @param index the index of the limit property
+ * @param entityName the name of the entity
+ * @param size the size (count or length) of the entity
+ * @return true if the size is over the limit, false otherwise
+ */
+ public boolean isOverLimit(int index, String entityName, int size) {
+ if (values[index] == NO_LIMIT) {
+ return false;
+ }
+ if (size > values[index]) {
+ limitAnalyzer.addValue(index, entityName, size);
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Check against cumulated value
+ *
+ * @param limit the type of the limit property
+ * @param size the size (count or length) of the entity
+ * @return true if the size is over the limit, false otherwise
+ */
+ public boolean isOverLimit(Limit limit) {
+ return isOverLimit(limit.ordinal());
+ }
+
+ public boolean isOverLimit(int index) {
+ if (values[index] == NO_LIMIT) {
+ return false;
+ }
+
+ if (index==Limit.ELEMENT_ATTRIBUTE_LIMIT.ordinal() ||
+ index==Limit.ENTITY_EXPANSION_LIMIT.ordinal() ||
+ index==Limit.TOTAL_ENTITY_SIZE_LIMIT.ordinal()) {
+ return (limitAnalyzer.getTotalValue(index) > values[index]);
+ } else {
+ return (limitAnalyzer.getValue(index) > values[index]);
+ }
+ }
+
+ public void debugPrint() {
+ if (printEntityCountInfo.equals(Constants.JDK_YES)) {
+ limitAnalyzer.debugPrint();
+ }
+ }
+
+ /**
+ * Return the limit analyzer
+ *
+ * @return the limit analyzer
+ */
+ public XMLLimitAnalyzer getLimitAnalyzer() {
+ return limitAnalyzer;
+ }
+
+ /**
+ * Set limit analyzer
+ *
+ * @param analyzer a limit analyzer
+ */
+ public void setLimitAnalyzer(XMLLimitAnalyzer analyzer) {
+ limitAnalyzer = analyzer;
+ }
+
+ /**
+ * Indicate if a property is set explicitly
+ * @param index
+ * @return
+ */
+ public boolean isSet(int index) {
+ return isSet[index];
+ }
+
+ public boolean printEntityCountInfo() {
+ return printEntityCountInfo.equals(Constants.JDK_YES);
+ }
+
+ /**
+ * Read from system properties, or those in jaxp.properties
+ */
+ private void readSystemProperties() {
+
+ for (Limit limit : Limit.values()) {
+ if (!getSystemProperty(limit, limit.systemProperty())) {
+ //if system property is not found, try the older form if any
+ for (NameMap nameMap : NameMap.values()) {
+ String oldName = nameMap.getOldName(limit.systemProperty());
+ if (oldName != null) {
+ getSystemProperty(limit, oldName);
+ }
+ }
+ }
+ }
+
+ }
+
+ /**
+ * Read from system properties, or those in jaxp.properties
+ *
+ * @param property the type of the property
+ * @param sysPropertyName the name of system property
+ */
+ private boolean getSystemProperty(Limit limit, String sysPropertyName) {
+ try {
+ String value = SecuritySupport.getSystemProperty(sysPropertyName);
+ if (value != null && !value.equals("")) {
+ values[limit.ordinal()] = Integer.parseInt(value);
+ states[limit.ordinal()] = State.SYSTEMPROPERTY;
+ return true;
+ }
+
+ value = SecuritySupport.readJAXPProperty(sysPropertyName);
+ if (value != null && !value.equals("")) {
+ values[limit.ordinal()] = Integer.parseInt(value);
+ states[limit.ordinal()] = State.JAXPDOTPROPERTIES;
+ return true;
+ }
+ } catch (NumberFormatException e) {
+ //invalid setting
+ throw new NumberFormatException("Invalid setting for system property: " + limit.systemProperty());
+ }
+ return false;
+ }
+
+
+ /**
+ * Convert a value set through setProperty to XMLSecurityManager.
+ * If the value is an instance of XMLSecurityManager, use it to override the default;
+ * If the value is an old SecurityManager, convert to the new XMLSecurityManager.
+ *
+ * @param value user specified security manager
+ * @param securityManager an instance of XMLSecurityManager
+ * @return an instance of the new security manager XMLSecurityManager
+ */
+ static public XMLSecurityManager convert(Object value, XMLSecurityManager securityManager) {
+ if (value == null) {
+ if (securityManager == null) {
+ securityManager = new XMLSecurityManager(true);
+ }
+ return securityManager;
+ }
+ if (XMLSecurityManager.class.isAssignableFrom(value.getClass())) {
+ return (XMLSecurityManager)value;
+ } else {
+ if (securityManager == null) {
+ securityManager = new XMLSecurityManager(true);
+ }
+ if (SecurityManager.class.isAssignableFrom(value.getClass())) {
+ SecurityManager origSM = (SecurityManager)value;
+ securityManager.setLimit(Limit.MAX_OCCUR_NODE_LIMIT, State.APIPROPERTY, origSM.getMaxOccurNodeLimit());
+ securityManager.setLimit(Limit.ENTITY_EXPANSION_LIMIT, State.APIPROPERTY, origSM.getEntityExpansionLimit());
+ securityManager.setLimit(Limit.ELEMENT_ATTRIBUTE_LIMIT, State.APIPROPERTY, origSM.getElementAttrLimit());
+ }
+ return securityManager;
+ }
+ }
+}
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java b/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java
index c6bb031..4286f04 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java
@@ -91,6 +91,24 @@
readSystemProperties();
}
+
+ /**
+ * Set limit by property name and state
+ * @param propertyName property name
+ * @param state the state of the property
+ * @param value the value of the property
+ * @return true if the property is managed by the security property manager;
+ * false if otherwise.
+ */
+ public boolean setValue(String propertyName, State state, Object value) {
+ int index = getIndex(propertyName);
+ if (index > -1) {
+ setValue(index, state, (String)value);
+ return true;
+ }
+ return false;
+ }
+
/**
* Set the value for a specific property.
*
@@ -119,6 +137,23 @@
states[index] = state;
}
}
+
+
+ /**
+ * Return the value of the specified property
+ *
+ * @param propertyName the property name
+ * @return the value of the property as a string
+ */
+ public String getValue(String propertyName) {
+ int index = getIndex(propertyName);
+ if (index > -1) {
+ return getValueByIndex(index);
+ }
+
+ return null;
+ }
+
/**
* Return the value of the specified property
*
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java b/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java
index 0c01d60..a060f99 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java
@@ -37,7 +37,6 @@
import com.sun.org.apache.xerces.internal.util.HTTPInputSource;
import com.sun.org.apache.xerces.internal.util.IntStack;
import com.sun.org.apache.xerces.internal.util.ParserConfigurationSettings;
-import com.sun.org.apache.xerces.internal.util.SecurityManager;
import com.sun.org.apache.xerces.internal.util.SymbolTable;
import com.sun.org.apache.xerces.internal.util.URI;
import com.sun.org.apache.xerces.internal.util.XMLAttributesImpl;
@@ -45,6 +44,7 @@
import com.sun.org.apache.xerces.internal.util.XMLChar;
import com.sun.org.apache.xerces.internal.util.XMLSymbols;
import com.sun.org.apache.xerces.internal.util.URI.MalformedURIException;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
import com.sun.org.apache.xerces.internal.xni.Augmentations;
import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
import com.sun.org.apache.xerces.internal.xni.QName;
@@ -289,7 +289,7 @@
protected SymbolTable fSymbolTable;
protected XMLErrorReporter fErrorReporter;
protected XMLEntityResolver fEntityResolver;
- protected SecurityManager fSecurityManager;
+ protected XMLSecurityManager fSecurityManager;
protected XMLSecurityPropertyManager fSecurityPropertyMgr;
// these are needed for text include processing
@@ -517,8 +517,8 @@
// Get security manager.
try {
- SecurityManager value =
- (SecurityManager)componentManager.getProperty(
+ XMLSecurityManager value =
+ (XMLSecurityManager)componentManager.getProperty(
SECURITY_MANAGER);
if (value != null) {
@@ -674,7 +674,7 @@
return;
}
if (propertyId.equals(SECURITY_MANAGER)) {
- fSecurityManager = (SecurityManager)value;
+ fSecurityManager = (XMLSecurityManager)value;
if (fChildConfig != null) {
fChildConfig.setProperty(propertyId, value);
}
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java b/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java
index cab4f46..a9c9aab 100644
--- a/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java
+++ b/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java
@@ -25,12 +25,15 @@
import com.sun.org.apache.xalan.internal.XalanConstants;
import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
+import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
import java.util.HashMap;
+
import javax.xml.XMLConstants;
import javax.xml.parsers.FactoryConfigurationError;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
@@ -63,11 +66,15 @@
private HashMap m_inUse;
private boolean m_useServicesMechanism = true;
+
+ private boolean _secureProcessing;
/**
* protocols allowed for external DTD references in source file and/or stylesheet.
*/
private String _accessExternalDTD = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
+ private XMLSecurityManager _xmlSecurityManager;
+
/**
* Hidden constructor
*/
@@ -118,7 +125,12 @@
// TransformerFactory creates a reader via the
// XMLReaderFactory if setXMLReader is not used
reader = XMLReaderFactory.createXMLReader();
-
+ try {
+ reader.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, _secureProcessing);
+ } catch (SAXNotRecognizedException e) {
+ System.err.println("Warning: " + reader.getClass().getName() + ": "
+ + e.getMessage());
+ }
} catch (Exception e) {
try {
// If unable to create an instance, let's try to use
@@ -164,6 +176,21 @@
+ se.getMessage());
}
+ try {
+ if (_xmlSecurityManager != null) {
+ for (XMLSecurityManager.Limit limit : XMLSecurityManager.Limit.values()) {
+ reader.setProperty(limit.apiProperty(),
+ _xmlSecurityManager.getLimitValueAsString(limit));
+ }
+ if (_xmlSecurityManager.printEntityCountInfo()) {
+ reader.setProperty(XalanConstants.JDK_ENTITY_COUNT_INFO, XalanConstants.JDK_YES);
+ }
+ }
+ } catch (SAXException se) {
+ System.err.println("Warning: " + reader.getClass().getName() + ": "
+ + se.getMessage());
+ }
+
return reader;
}
@@ -195,11 +222,22 @@
}
/**
+ * Set feature
+ */
+ public void setFeature(String name, boolean value) {
+ if (name.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
+ _secureProcessing = value;
+ }
+ }
+
+ /**
* Get property value
*/
- public String getProperty(String name) {
+ public Object getProperty(String name) {
if (name.equals(XMLConstants.ACCESS_EXTERNAL_DTD)) {
return _accessExternalDTD;
+ } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
+ return _xmlSecurityManager;
}
return null;
}
@@ -207,9 +245,11 @@
/**
* Set property.
*/
- public void setProperty(String name, String value) {
+ public void setProperty(String name, Object value) {
if (name.equals(XMLConstants.ACCESS_EXTERNAL_DTD)) {
_accessExternalDTD = (String)value;
+ } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
+ _xmlSecurityManager = (XMLSecurityManager)value;
}
}
}
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java b/jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java
index e71f61e..fd5db6f 100644
--- a/jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java
+++ b/jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java
@@ -99,8 +99,7 @@
* the DTMManager, it really is a proxy for this object, which
* is the real DTMManager.
*/
- protected DTMManager m_dtmManager = DTMManager.newInstance(
- com.sun.org.apache.xpath.internal.objects.XMLStringFactoryImpl.getFactory());
+ protected DTMManager m_dtmManager = null;
/**
* Return the DTMManager object. Though XPathContext context extends
diff --git a/jaxp/src/javax/xml/stream/FactoryFinder.java b/jaxp/src/javax/xml/stream/FactoryFinder.java
index 68f4ef2..886caa5 100644
--- a/jaxp/src/javax/xml/stream/FactoryFinder.java
+++ b/jaxp/src/javax/xml/stream/FactoryFinder.java
@@ -253,7 +253,13 @@
// Use the system property first
try {
- String systemProp = ss.getSystemProperty(factoryId);
+
+ final String systemProp;
+ if (type.getName().equals(factoryId)) {
+ systemProp = ss.getSystemProperty(factoryId);
+ } else {
+ systemProp = System.getProperty(factoryId);
+ }
if (systemProp != null) {
dPrint("found system property, value=" + systemProp);
// There's a bug here - because 'cl' is ignored.
@@ -262,7 +268,8 @@
}
}
catch (SecurityException se) {
- if (debug) se.printStackTrace();
+ throw new FactoryConfigurationError(
+ "Failed to read factoryId '" + factoryId + "'", se);
}
// Try read $java.home/lib/stax.properties followed by
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index a8d2259..74b6fb8 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -233,3 +233,4 @@
df5d4d01642572e77fd3c01e4c8703ed3f6eec87 jdk8-b109
cc682329886be2fc26220fc30597ee4e5bba43ed jdk8-b110
32edc7a2c86696dfcbdb6ffae641ff153f8e34bd jdk8-b111
+dbdd5c76250928582cb5342bcf7b299a6007d538 jdk8-b112
diff --git a/jaxws/make/jprt.properties b/jaxws/make/jprt.properties
index 12ce773..8afa531 100644
--- a/jaxws/make/jprt.properties
+++ b/jaxws/make/jprt.properties
@@ -33,9 +33,7 @@
# Standard list of jprt build targets for this source tree
jprt.build.targets= \
- solaris_sparc_5.10-{product|fastdebug}, \
solaris_sparcv9_5.10-{product|fastdebug}, \
- solaris_i586_5.10-{product|fastdebug}, \
solaris_x64_5.10-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \
diff --git a/jaxws/makefiles/BuildJaxws.gmk b/jaxws/makefiles/BuildJaxws.gmk
index db718ff..204dd47 100644
--- a/jaxws/makefiles/BuildJaxws.gmk
+++ b/jaxws/makefiles/BuildJaxws.gmk
@@ -57,7 +57,7 @@
COPY_FILES := $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \
$(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java \
$(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml, \
- ADD_JAVAC_FLAGS = -cp $(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar))
+ ADD_JAVAC_FLAGS = -Xbootclasspath/p:$(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar))
$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin: \
$(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin
diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AbstractInstanceResolver.java b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AbstractInstanceResolver.java
index e670ac4..560e98e 100644
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AbstractInstanceResolver.java
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AbstractInstanceResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -66,7 +66,7 @@
if (!method.isAccessible()) {
method.setAccessible(true);
}
- method.invoke(instance,args);
+ MethodUtil.invoke(instance,method, args);
} catch (IllegalAccessException e) {
throw new ServerRtException("server.rt.err",e);
} catch (InvocationTargetException e) {
diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java
index 625f59f..7c11e64 100644
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -232,7 +232,7 @@
public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException {
T t = resolve(p);
try {
- return m.invoke(t, args );
+ return MethodUtil.invoke(t, m, args );
} finally {
postInvoke(p,t);
}
diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java
new file mode 100644
index 0000000..c849705
--- /dev/null
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2013, 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 com.sun.xml.internal.ws.api.server;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
+ * to java.lang,reflect.Method.invoke()
+ *
+ * Be careful, copy of this class exists in several packages, iny modification must be done to other copies too!
+ */
+class MethodUtil {
+
+ private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
+ private static final Method INVOKE_METHOD;
+
+ static {
+ Method method;
+ try {
+ Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
+ method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
+ }
+ } catch (Throwable t) {
+ method = null;
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
+ }
+ }
+ INVOKE_METHOD = method;
+ }
+
+ static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
+ if (INVOKE_METHOD != null) {
+ // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
+ }
+ try {
+ return INVOKE_METHOD.invoke(null, method, target, args);
+ } catch (InvocationTargetException ite) {
+ // unwrap invocation exception added by reflection code ...
+ throw unwrapException(ite);
+ }
+ } else {
+ // other then Oracle JDK ...
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
+ }
+ return method.invoke(target, args);
+ }
+ }
+
+ private static InvocationTargetException unwrapException(InvocationTargetException ite) {
+ Throwable targetException = ite.getTargetException();
+ if (targetException != null && targetException instanceof InvocationTargetException) {
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
+ }
+ return (InvocationTargetException) targetException;
+ } else {
+ return ite;
+ }
+ }
+
+}
diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java
new file mode 100644
index 0000000..f0daea5
--- /dev/null
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2013, 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 com.sun.xml.internal.ws.client.sei;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
+ * to java.lang,reflect.Method.invoke()
+ * <p/>
+ * Be careful, copy of this class exists in several packages, iny modification must be done to other copies too!
+ */
+class MethodUtil {
+
+ private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
+ private static final Method INVOKE_METHOD;
+
+ static {
+ Method method;
+ try {
+ Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
+ method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
+ }
+ } catch (Throwable t) {
+ method = null;
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
+ }
+ }
+ INVOKE_METHOD = method;
+ }
+
+ static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
+ if (INVOKE_METHOD != null) {
+ // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
+ }
+ try {
+ return INVOKE_METHOD.invoke(null, method, target, args);
+ } catch (InvocationTargetException ite) {
+ // unwrap invocation exception added by reflection code ...
+ throw unwrapException(ite);
+ }
+ } else {
+ // other then Oracle JDK ...
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
+ }
+ return method.invoke(target, args);
+ }
+ }
+
+ private static InvocationTargetException unwrapException(InvocationTargetException ite) {
+ Throwable targetException = ite.getTargetException();
+ if (targetException != null && targetException instanceof InvocationTargetException) {
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
+ }
+ return (InvocationTargetException) targetException;
+ } else {
+ return ite;
+ }
+ }
+
+}
diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java
index 7a5f0e3..9ad1f6e 100644
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java
@@ -28,6 +28,7 @@
import com.sun.istack.internal.NotNull;
import com.sun.istack.internal.Nullable;
import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
import com.sun.xml.internal.ws.api.client.WSPortInfo;
import com.sun.xml.internal.ws.api.databinding.Databinding;
import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
@@ -36,12 +37,16 @@
import com.sun.xml.internal.ws.api.message.Packet;
import com.sun.xml.internal.ws.api.model.MEP;
import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
-import com.sun.xml.internal.ws.api.pipe.Tube;
import com.sun.xml.internal.ws.api.pipe.Fiber;
+import com.sun.xml.internal.ws.api.pipe.Tube;
import com.sun.xml.internal.ws.api.server.Container;
import com.sun.xml.internal.ws.api.server.ContainerResolver;
import com.sun.xml.internal.ws.binding.BindingImpl;
-import com.sun.xml.internal.ws.client.*;
+import com.sun.xml.internal.ws.client.AsyncResponseImpl;
+import com.sun.xml.internal.ws.client.RequestContext;
+import com.sun.xml.internal.ws.client.ResponseContextReceiver;
+import com.sun.xml.internal.ws.client.Stub;
+import com.sun.xml.internal.ws.client.WSServiceDelegate;
import com.sun.xml.internal.ws.model.JavaMethodImpl;
import com.sun.xml.internal.ws.model.SOAPSEIModel;
import com.sun.xml.internal.ws.wsdl.OperationDispatcher;
@@ -50,6 +55,8 @@
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
import java.util.HashMap;
import java.util.Map;
@@ -132,6 +139,7 @@
private final Map<Method, MethodHandler> methodHandlers = new HashMap<Method, MethodHandler>();
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ validateInputs(proxy, method);
Container old = ContainerResolver.getDefault().enterContainer(owner.getContainer());
try {
MethodHandler handler = methodHandlers.get(method);
@@ -155,6 +163,17 @@
}
}
+ private void validateInputs(Object proxy, Method method) {
+ if (proxy == null || !Proxy.isProxyClass(proxy.getClass())) {
+ throw new IllegalStateException("Passed object is not proxy!");
+ }
+ Class<?> declaringClass = method.getDeclaringClass();
+ if (method == null || declaringClass == null
+ || Modifier.isStatic(method.getModifiers())) {
+ throw new IllegalStateException("Invoking static method is not allowed!");
+ }
+ }
+
public final Packet doProcess(Packet request, RequestContext rc, ResponseContextReceiver receiver) {
return super.process(request, rc, receiver);
}
diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java
new file mode 100644
index 0000000..ad2ad4a
--- /dev/null
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2013, 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 com.sun.xml.internal.ws.policy.privateutil;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
+ * to java.lang,reflect.Method.invoke()
+ */
+class MethodUtil {
+
+ private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
+ private static final Method INVOKE_METHOD;
+
+ static {
+ Method method;
+ try {
+ Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
+ method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
+ }
+ } catch (Throwable t) {
+ method = null;
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
+ }
+ }
+ INVOKE_METHOD = method;
+ }
+
+ static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
+ if (INVOKE_METHOD != null) {
+ // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
+ }
+ try {
+ return INVOKE_METHOD.invoke(null, method, target, args);
+ } catch (InvocationTargetException ite) {
+ // unwrap invocation exception added by reflection code ...
+ throw unwrapException(ite);
+ }
+ } else {
+ // other then Oracle JDK ...
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
+ }
+ return method.invoke(target, args);
+ }
+ }
+
+ private static InvocationTargetException unwrapException(InvocationTargetException ite) {
+ Throwable targetException = ite.getTargetException();
+ if (targetException != null && targetException instanceof InvocationTargetException) {
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
+ }
+ return (InvocationTargetException) targetException;
+ } else {
+ return ite;
+ }
+ }
+
+}
diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java
index d3a2752..ec537d8 100644
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -282,13 +282,13 @@
/**
* Reflection utilities wrapper
*/
- public static class Reflection {
+ static class Reflection {
private static final PolicyLogger LOGGER = PolicyLogger.getLogger(PolicyUtils.Reflection.class);
/**
* Reflectively invokes specified method on the specified target
*/
- public static <T> T invoke(final Object target, final String methodName,
+ static <T> T invoke(final Object target, final String methodName,
final Class<T> resultClass, final Object... parameters) throws RuntimePolicyUtilsException {
Class[] parameterTypes;
if (parameters != null && parameters.length > 0) {
@@ -311,7 +311,7 @@
final Object[] parameters, final Class[] parameterTypes) throws RuntimePolicyUtilsException {
try {
final Method method = target.getClass().getMethod(methodName, parameterTypes);
- final Object result = method.invoke(target, parameters);
+ final Object result = MethodUtil.invoke(target, method,parameters);
return resultClass.cast(result);
} catch (IllegalArgumentException e) {
diff --git a/jdk/.hgtags b/jdk/.hgtags
index 3a38f34..6fc1c37 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -233,3 +233,4 @@
946f3fd5f8bf0ccd180c258d25e5837fa1bf004c jdk8-b109
54e099776f08430d3a7f4feabd9f2ba886b55320 jdk8-b110
719befd87c7b96ae103c05730ca555227bfc0116 jdk8-b111
+f002f5f3a16cca62e139cb8eed05ffaeb373587d jdk8-b112
diff --git a/jdk/make/com/sun/jmx/Makefile b/jdk/make/com/sun/jmx/Makefile
index 6243575..02ef6b0 100644
--- a/jdk/make/com/sun/jmx/Makefile
+++ b/jdk/make/com/sun/jmx/Makefile
@@ -130,11 +130,13 @@
$(RMIC) -classpath "$(CLASSDESTDIR)" \
-d $(CLASSDESTDIR) \
-iiop -v1.2 \
+ -emitPermissionCheck \
$(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
$(RMIC) $(HOTSPOT_INTERPRETER_FLAG) -classpath "$(CLASSDESTDIR)" \
-d $(CLASSDESTDIR) \
-iiop -v1.2 \
-standardPackage \
+ -emitPermissionCheck \
$(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
@$(java-vm-cleanup)
diff --git a/jdk/make/common/Defs-macosx.gmk b/jdk/make/common/Defs-macosx.gmk
index befd2cf..83ccf60 100644
--- a/jdk/make/common/Defs-macosx.gmk
+++ b/jdk/make/common/Defs-macosx.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2013, 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
@@ -85,6 +85,100 @@
CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required!
+# The Full Debug Symbols (FDS) default for VARIANT == OPT builds is
+# enabled with debug info files ZIP'ed to save space. For VARIANT !=
+# OPT builds, FDS is always enabled, after all a debug build without
+# debug info isn't very useful. The ZIP_DEBUGINFO_FILES option only has
+# meaning when FDS is enabled.
+#
+# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
+# disabled for a VARIANT == OPT build.
+#
+# Note: Use of a different variable name for the FDS override option
+# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
+# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
+# in options via environment variables, use of distinct variables
+# prevents strange behaviours. For example, in a VARIANT != OPT build,
+# the FULL_DEBUG_SYMBOLS environment variable will be 0, but the
+# ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If the same
+# variable name is used, then different values can be picked up by
+# different parts of the build. Just to be clear, we only need two
+# variable names because the incoming option value can be overridden
+# in some situations, e.g., a VARIANT != OPT build.
+
+ifeq ($(VARIANT), OPT)
+ FULL_DEBUG_SYMBOLS ?= 1
+ ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
+else
+ # debug variants always get Full Debug Symbols (if available)
+ ENABLE_FULL_DEBUG_SYMBOLS = 1
+endif
+_JUNK_ := $(shell \
+ echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
+# since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
+
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(OS_NAME),darwin)
+ # MacOS X doesn't use OBJCOPY or STRIP_POLICY
+ OBJCOPY=
+ STRIP_POLICY=
+ ZIP_DEBUGINFO_FILES ?= 1
+ else
+ ifndef CROSS_COMPILE_ARCH
+ # Default OBJCOPY comes from GNU Binutils on Linux:
+ DEF_OBJCOPY=/usr/bin/objcopy
+ else
+ # Assume objcopy is part of the cross-compilation toolkit
+ DEF_OBJCOPY=$(COMPILER_PATH)/objcopy
+ endif
+ OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
+ ifneq ($(ALT_OBJCOPY),)
+ _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
+ # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path
+ OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
+ endif
+
+ # Setting ENABLE_FULL_DEBUG_SYMBOLS=1 (and OBJCOPY) above enables the
+ # JDK build to import .debuginfo or .diz files from the HotSpot build.
+ # However, adding FDS support to the JDK build will occur in phases
+ # so a different make variable (LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
+ # and PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS) is used to indicate that a
+ # particular library or program supports FDS.
+
+ ifeq ($(OBJCOPY),)
+ _JUNK_ := $(shell \
+ echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo" \
+ "files. You may need to set ALT_OBJCOPY.")
+ ENABLE_FULL_DEBUG_SYMBOLS=0
+ else
+ _JUNK_ := $(shell \
+ echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
+
+ # Library stripping policies for .debuginfo configs:
+ # all_strip - strips everything from the library
+ # min_strip - strips most stuff from the library; leaves
+ # minimum symbols
+ # no_strip - does not strip the library at all
+ #
+ # Oracle security policy requires "all_strip". A waiver was granted
+ # on 2011.09.01 that permits using "min_strip" in the Java JDK and
+ # Java JRE.
+ #
+ # Currently, STRIP_POLICY is only used when Full Debug Symbols
+ # is enabled.
+ STRIP_POLICY ?= min_strip
+
+ _JUNK_ := $(shell \
+ echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
+
+ ZIP_DEBUGINFO_FILES ?= 1
+ endif
+ endif
+
+ _JUNK_ := $(shell \
+ echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
+endif
+
#
# Default optimization
#
diff --git a/jdk/make/common/Defs.gmk b/jdk/make/common/Defs.gmk
index fe2bc94..5403664 100644
--- a/jdk/make/common/Defs.gmk
+++ b/jdk/make/common/Defs.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2013, 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
@@ -508,12 +508,18 @@
# Convenient macros
#
-# Prepare $@ target, remove old one and making sure directory exists
+# Prepare $@ target, remove old one and making sure containing dir exists
define prep-target
$(MKDIR) -p $(@D)
$(RM) $@
endef
+# Prepare $@ target dir, remove old one and making sure containing dir exists
+define prep-target-dir
+$(MKDIR) -p $(@D)
+$(RM) -r $@
+endef
+
# Simple install of $< file to $@
define install-file
$(prep-target)
@@ -616,6 +622,26 @@
fi
endef
+# MacOS X strongly discourages 'cp -r' and provides 'cp -R' instead.
+# May need to have a MacOS X specific definition of install-import-dir
+# sometime in the future.
+define install-import-dir
+@$(ECHO) "ASSEMBLY_IMPORT: $@"
+$(prep-target-dir)
+$(CP) -r $< $@
+endef
+
+ifeq ($(PLATFORM), macosx)
+# On MacOS X, debug info is in .dSYM directories
+define install-import-debuginfo
+$(install-import-dir)
+endef
+else
+define install-import-debuginfo
+$(install-import-file)
+endef
+endif
+
define install-import-file
$(install-importonly-file)
endef
diff --git a/jdk/make/java/management/mapfile-vers b/jdk/make/java/management/mapfile-vers
index 63c4fbf..0ea2ab4 100644
--- a/jdk/make/java/management/mapfile-vers
+++ b/jdk/make/java/management/mapfile-vers
@@ -57,7 +57,7 @@
Java_sun_management_GcInfoBuilder_fillGcAttributeInfo;
Java_sun_management_GcInfoBuilder_getLastGcInfo0;
Java_sun_management_GcInfoBuilder_getNumGcExtAttributes;
- Java_sun_management_HotSpotDiagnostic_dumpHeap;
+ Java_sun_management_HotSpotDiagnostic_dumpHeap0;
Java_sun_management_HotspotThread_getInternalThreadCount;
Java_sun_management_HotspotThread_getInternalThreadTimes0;
Java_sun_management_MemoryImpl_getMemoryManagers0;
diff --git a/jdk/make/java/redist/Makefile b/jdk/make/java/redist/Makefile
index fb257f5..f06e5d1 100644
--- a/jdk/make/java/redist/Makefile
+++ b/jdk/make/java/redist/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2013, 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
@@ -60,15 +60,24 @@
JVMDB_NAME = $(LIB_PREFIX)jvm$(DB_SUFFIX).$(LIBRARY_SUFFIX)
JVMDTRACE_NAME = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).$(LIBRARY_SUFFIX)
-JVM_DEBUGINFO_NAME = $(LIB_PREFIX)jvm.debuginfo
JVM_DIZ_NAME = $(LIB_PREFIX)jvm.diz
-LIBJSIG_DEBUGINFO_NAME = $(LIB_PREFIX)jsig.debuginfo
LIBJSIG_DIZ_NAME = $(LIB_PREFIX)jsig.diz
-JVMDB_DEBUGINFO_NAME = $(LIB_PREFIX)jvm$(DB_SUFFIX).debuginfo
JVMDB_DIZ_NAME = $(LIB_PREFIX)jvm$(DB_SUFFIX).diz
-JVMDTRACE_DEBUGINFO_NAME = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).debuginfo
JVMDTRACE_DIZ_NAME = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).diz
+ifeq ($(PLATFORM), macosx)
+ # Note: *.dSYM is a directory
+ JVM_DEBUGINFO_NAME = $(LIB_PREFIX)jvm.dSYM
+ LIBJSIG_DEBUGINFO_NAME = $(LIB_PREFIX)jsig.dSYM
+ JVMDB_DEBUGINFO_NAME = $(LIB_PREFIX)jvm$(DB_SUFFIX).dSYM
+ JVMDTRACE_DEBUGINFO_NAME = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).dSYM
+else
+ JVM_DEBUGINFO_NAME = $(LIB_PREFIX)jvm.debuginfo
+ LIBJSIG_DEBUGINFO_NAME = $(LIB_PREFIX)jsig.debuginfo
+ JVMDB_DEBUGINFO_NAME = $(LIB_PREFIX)jvm$(DB_SUFFIX).debuginfo
+ JVMDTRACE_DEBUGINFO_NAME = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).debuginfo
+endif
+
CLASSSHARINGDATA_DIR = $(BUILDDIR)/tools/sharing
# Needed to do file copy
@@ -441,7 +450,7 @@
$(install-import-file)
else
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_DEBUGINFO_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_DEBUGINFO_NAME)
- $(install-import-file)
+ $(install-import-debuginfo)
endif
endif
@@ -459,7 +468,7 @@
$(install-import-file)
else
$(LIB_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME): $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DEBUGINFO_NAME)
- $(install-import-file)
+ $(install-import-debuginfo)
endif
endif
@@ -471,8 +480,8 @@
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
# We don't create a symlink to a libjsig.diz file, but we do put
-# the libjsig.debuginfo symlink into a libjsig.diz file. The aurora
-# system does not like dangling symlinks.
+# the $(LIBJSIG_DEBUGINFO_NAME) symlink into a libjsig.diz file.
+# The aurora system does not like dangling symlinks.
ifeq ($(ZIP_DEBUGINFO_FILES),1)
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DIZ_NAME) \
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DIZ_NAME):
@@ -496,8 +505,8 @@
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
# We don't create a symlink to a libjsig.diz file, but we do put
-# the libjsig.debuginfo symlink into a libjsig.diz file. The aurora
-# system does not like dangling symlinks.
+# the $(LIBJSIG_DEBUGINFO_NAME) symlink into a libjsig.diz file.
+# The aurora system does not like dangling symlinks.
ifeq ($(ZIP_DEBUGINFO_FILES),1)
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DIZ_NAME):
@$(prep-target)
@@ -531,10 +540,10 @@
$(install-import-file)
else
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_DEBUGINFO_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDB_DEBUGINFO_NAME)
- $(install-import-file)
+ $(install-import-debuginfo)
$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_DEBUGINFO_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDB_DEBUGINFO_NAME)
- $(install-import-file)
+ $(install-import-debuginfo)
endif
endif
@@ -556,10 +565,10 @@
$(install-import-file)
else
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_DEBUGINFO_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDB_DEBUGINFO_NAME)
- $(install-import-file)
+ $(install-import-debuginfo)
$(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_DEBUGINFO_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_DEBUGINFO_NAME)
- $(install-import-file)
+ $(install-import-debuginfo)
endif
endif
endif
@@ -581,10 +590,10 @@
$(install-import-file)
else
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_DEBUGINFO_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_DEBUGINFO_NAME)
- $(install-import-file)
+ $(install-import-debuginfo)
$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_DEBUGINFO_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDTRACE_DEBUGINFO_NAME)
- $(install-import-file)
+ $(install-import-debuginfo)
endif
endif
@@ -613,13 +622,13 @@
$(install-import-file)
else
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_DEBUGINFO_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_DEBUGINFO_NAME)
- $(install-import-file)
+ $(install-import-debuginfo)
$(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_DEBUGINFO_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_DEBUGINFO_NAME)
- $(install-import-file)
+ $(install-import-debuginfo)
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_DEBUGINFO_NAME): $(HOTSPOT_SERVER_PATH)/$(JVM_DEBUGINFO_NAME)
- $(install-import-file)
+ $(install-import-debuginfo)
endif
endif
diff --git a/jdk/make/java/security/Makefile b/jdk/make/java/security/Makefile
index 05b6b8a..8135973 100644
--- a/jdk/make/java/security/Makefile
+++ b/jdk/make/java/security/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2013, 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,9 @@
BLACKLISTED_CERTS_SRC += $(wildcard $(CLOSED_SHARE_SRC)/lib/security/blacklisted.certs)
TRUSTEDLIBS_SRC = $(CLOSED_SHARE_SRC)/lib/security/trusted.libraries
TRUSTEDLIBS_BUILD = $(LIBDIR)/security/trusted.libraries
+ RESTRICTED_PKGS_SRC = $(CLOSED_SHARE_SRC)/lib/security/restricted.pkgs
+ RESTRICTED_PKGS := $(shell $(CAT) $(RESTRICTED_PKGS_SRC) | $(TR) "\n" " ")
+ ADDTORESTRICTEDPKGS_JARFILE = $(BUILDTOOLJARDIR)/addtorestrictedpkgs.jar
endif
FILES_class = $(FILES_java:%.java=$(CLASSBINDIR)/%.class)
@@ -108,8 +111,15 @@
trustedlibs: classes $(TRUSTEDLIBS_BUILD)
+ifdef OPENJDK
$(PROPS_BUILD): $(PROPS_SRC)
$(install-file)
+else
+$(PROPS_BUILD): $(PROPS_SRC)
+ $(MKDIR) -p $(@D)
+ $(BOOT_JAVA_CMD) -jar $(ADDTORESTRICTEDPKGS_JARFILE) $^ $@.tmp $(RESTRICTED_PKGS)
+ $(MV) $@.tmp $@
+endif
$(POLICY_BUILD): $(POLICY_SRC)
$(install-file)
diff --git a/jdk/make/jprt.properties b/jdk/make/jprt.properties
index eb6ff3f..c34540e 100644
--- a/jdk/make/jprt.properties
+++ b/jdk/make/jprt.properties
@@ -33,9 +33,7 @@
# Standard list of jprt build targets for this source tree
jprt.build.targets= \
- solaris_sparc_5.10-{product|fastdebug}, \
solaris_sparcv9_5.10-{product|fastdebug}, \
- solaris_i586_5.10-{product|fastdebug}, \
solaris_x64_5.10-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \
@@ -48,9 +46,7 @@
# Test target list (no fastdebug & limited c2 testing)
jprt.my.test.target.set= \
- solaris_sparc_5.10-product-c1-TESTNAME, \
solaris_sparcv9_5.10-product-c2-TESTNAME, \
- solaris_i586_5.10-product-c1-TESTNAME, \
solaris_x64_5.10-product-c2-TESTNAME, \
linux_i586_2.6-product-{c1|c2}-TESTNAME, \
linux_x64_2.6-product-c2-TESTNAME, \
@@ -112,9 +108,7 @@
# JCK test targets in test/Makefile (no windows)
jprt.my.jck.test.target.set= \
- solaris_sparc_5.10-product-c1-JCK7TESTRULE, \
solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, \
- solaris_i586_5.10-product-c1-JCK7TESTRULE, \
solaris_x64_5.10-product-c2-JCK7TESTRULE, \
linux_i586_2.6-product-c1-JCK7TESTRULE, \
linux_x64_2.6-product-c2-JCK7TESTRULE
diff --git a/jdk/make/sun/awt/Makefile b/jdk/make/sun/awt/Makefile
index 8b7612e..9f11638 100644
--- a/jdk/make/sun/awt/Makefile
+++ b/jdk/make/sun/awt/Makefile
@@ -145,8 +145,6 @@
#
# Files
#
-include FILES_c_macosx.gmk
-include FILES_export_macosx.gmk
FILES_objc = $(FILES_AWT_objc)
OTHER_LDLIBS = -lmlib_image $(JVMLIB) $(LIBM) \
diff --git a/jdk/make/sun/javazic/tzdata/VERSION b/jdk/make/sun/javazic/tzdata/VERSION
index e50b6f3..ea1c49a 100644
--- a/jdk/make/sun/javazic/tzdata/VERSION
+++ b/jdk/make/sun/javazic/tzdata/VERSION
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2013d
+tzdata2013g
diff --git a/jdk/make/sun/javazic/tzdata/africa b/jdk/make/sun/javazic/tzdata/africa
index 6b19b98..19bc98a 100644
--- a/jdk/make/sun/javazic/tzdata/africa
+++ b/jdk/make/sun/javazic/tzdata/africa
@@ -881,13 +881,23 @@
# transitions would be 2013-07-07 and 2013-08-10; see:
# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10
-# From Paul Eggert (2013-07-03):
+# From Steffen Thorsen (2013-09-28):
+# Morocco extends DST by one month, on very short notice, just 1 day
+# before it was going to end. There is a new decree (2.13.781) for
+# this, where DST from now on goes from last Sunday of March at 02:00
+# to last Sunday of October at 03:00, similar to EU rules. Official
+# source (French):
+# http://www.maroc.gov.ma/fr/actualites/lhoraire-dete-gmt1-maintenu-jusquau-27-octobre-2013
+# Another source (specifying the time for start and end in the decree):
+# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
+
+# From Paul Eggert (2013-09-30):
# To estimate what the Moroccan government will do in future years,
-# transition dates for 2014 through 2021 were determined by running
+# transition dates for 2014 through 2037 were determined by running
# the following program under GNU Emacs 24.3:
#
# (let ((islamic-year 1435))
-# (while (< islamic-year 1444)
+# (while (< islamic-year 1460)
# (let ((a
# (calendar-gregorian-from-absolute
# (calendar-islamic-to-absolute (list 9 1 islamic-year))))
@@ -902,13 +912,14 @@
# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
# (setq islamic-year (+ 1 islamic-year))))
#
-# with the results hand-edited for 2020-2022, when the normal spring-forward
-# date falls during the estimated Ramadan.
-#
-# From 2023 through 2038 Ramadan is not predicted to overlap with
-# daylight saving time. Starting in 2039 there will be overlap again,
+# with spring-forward transitions removed for 2023-2025, when the
+# normal spring-forward date falls during the estimated Ramadan; with
+# all transitions removed for 2026-2035, where the estimated Ramadan
+# falls entirely outside daylight-saving time; and with fall-back
+# transitions removed for 2036-2037, where the normal fall-back
+# date falls during the estimated Ramadan. Problems continue after that,
# but 32-bit time_t values roll around in 2038 so for now do not worry
-# about dates after 2038.
+# about dates after 2037.
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -935,12 +946,14 @@
Rule Morocco 2010 only - Aug 8 0:00 0 -
Rule Morocco 2011 only - Apr 3 0:00 1:00 S
Rule Morocco 2011 only - Jul 31 0 0 -
-Rule Morocco 2012 2019 - Apr lastSun 2:00 1:00 S
-Rule Morocco 2012 max - Sep lastSun 3:00 0 -
+Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 S
+Rule Morocco 2012 only - Sep 30 3:00 0 -
Rule Morocco 2012 only - Jul 20 3:00 0 -
Rule Morocco 2012 only - Aug 20 2:00 1:00 S
Rule Morocco 2013 only - Jul 7 3:00 0 -
Rule Morocco 2013 only - Aug 10 2:00 1:00 S
+Rule Morocco 2013 2035 - Oct lastSun 3:00 0 -
+Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S
Rule Morocco 2014 only - Jun 29 3:00 0 -
Rule Morocco 2014 only - Jul 29 2:00 1:00 S
Rule Morocco 2015 only - Jun 18 3:00 0 -
@@ -953,10 +966,21 @@
Rule Morocco 2018 only - Jun 15 2:00 1:00 S
Rule Morocco 2019 only - May 6 3:00 0 -
Rule Morocco 2019 only - Jun 5 2:00 1:00 S
+Rule Morocco 2020 only - Apr 24 3:00 0 -
Rule Morocco 2020 only - May 24 2:00 1:00 S
+Rule Morocco 2021 only - Apr 13 3:00 0 -
Rule Morocco 2021 only - May 13 2:00 1:00 S
+Rule Morocco 2022 only - Apr 3 3:00 0 -
Rule Morocco 2022 only - May 3 2:00 1:00 S
-Rule Morocco 2023 max - Apr lastSun 2:00 1:00 S
+Rule Morocco 2023 only - Apr 22 2:00 1:00 S
+Rule Morocco 2024 only - Apr 10 2:00 1:00 S
+Rule Morocco 2025 only - Mar 31 2:00 1:00 S
+Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S
+Rule Morocco 2036 only - Oct 21 3:00 0 -
+Rule Morocco 2037 only - Oct 11 3:00 0 -
+Rule Morocco 2038 only - Sep 30 3:00 0 -
+Rule Morocco 2038 only - Oct 30 2:00 1:00 S
+Rule Morocco 2038 max - Oct lastSun 3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
@@ -1123,9 +1147,7 @@
3:00 - EAT
# South Sudan
-Zone Africa/Juba 2:06:24 - LMT 1931
- 2:00 Sudan CA%sT 2000 Jan 15 12:00
- 3:00 - EAT
+Link Africa/Khartoum Africa/Juba
# Swaziland
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
diff --git a/jdk/make/sun/javazic/tzdata/antarctica b/jdk/make/sun/javazic/tzdata/antarctica
index 4344326..f30cf74 100644
--- a/jdk/make/sun/javazic/tzdata/antarctica
+++ b/jdk/make/sun/javazic/tzdata/antarctica
@@ -39,9 +39,9 @@
#
# Except for the French entries,
# I made up all time zone abbreviations mentioned here; corrections welcome!
-# FORMAT is `zzz' and GMTOFF is 0 for locations while uninhabited.
+# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited.
-# These rules are stolen from the `southamerica' file.
+# These rules are stolen from the 'southamerica' file.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule ArgAQ 1964 1966 - Mar 1 0:00 0 -
Rule ArgAQ 1964 1966 - Oct 15 0:00 1:00 S
@@ -251,9 +251,10 @@
# Scott Island (never inhabited)
#
# year-round base
-# Scott, Ross Island, since 1957-01, is like Antarctica/McMurdo.
+# Scott Base, Ross Island, since 1957-01.
+# See Pacific/Auckland.
#
-# These rules for New Zealand are stolen from the `australasia' file.
+# These rules for New Zealand are stolen from the 'australasia' file.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D
Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D
@@ -291,11 +292,11 @@
# From Lee Hotz (2001-03-08):
# I queried the folks at Columbia who spent the summer at Vostok and this is
# what they had to say about time there:
-# ``in the US Camp (East Camp) we have been on New Zealand (McMurdo)
+# "in the US Camp (East Camp) we have been on New Zealand (McMurdo)
# time, which is 12 hours ahead of GMT. The Russian Station Vostok was
# 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead
# of GMT). This is a time zone I think two hours east of Moscow. The
-# natural time zone is in between the two: 8 hours ahead of GMT.''
+# natural time zone is in between the two: 8 hours ahead of GMT."
#
# From Paul Eggert (2001-05-04):
# This seems to be hopelessly confusing, so I asked Lee Hotz about it
@@ -360,16 +361,8 @@
-4:00 ChileAQ CL%sT
#
#
-# McMurdo, Ross Island, since 1955-12
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Antarctica/McMurdo 0 - zzz 1956
- 12:00 NZAQ NZ%sT
-#
-# Amundsen-Scott, South Pole, continuously occupied since 1956-11-20
-#
-# From Paul Eggert (1996-09-03):
-# Normally it wouldn't have a separate entry, since it's like the
-# larger Antarctica/McMurdo since 1970, but it's too famous to omit.
+# McMurdo Station, Ross Island, since 1955-12
+# Amundsen-Scott South Pole Station, continuously occupied since 1956-11-20
#
# From Chris Carrier (1996-06-27):
# Siple, the first commander of the South Pole station,
@@ -391,4 +384,4 @@
# we have to go around and set them back 5 minutes or so.
# Maybe if we let them run fast all of the time, we'd get to leave here sooner!!
#
-Link Antarctica/McMurdo Antarctica/South_Pole
+# See 'australasia' for Antarctica/McMurdo.
diff --git a/jdk/make/sun/javazic/tzdata/asia b/jdk/make/sun/javazic/tzdata/asia
index f0931b3..fd278e5 100644
--- a/jdk/make/sun/javazic/tzdata/asia
+++ b/jdk/make/sun/javazic/tzdata/asia
@@ -29,7 +29,7 @@
# go ahead and edit the file (and please send any changes to
# tz@iana.org for general use in the future).
-# From Paul Eggert (2013-02-21):
+# From Paul Eggert (2013-08-11):
#
# A good source for time zone historical data outside the U.S. is
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -67,11 +67,11 @@
# 4:00 GST Gulf*
# 5:30 IST India
# 7:00 ICT Indochina*
-# 7:00 WIT west Indonesia
-# 8:00 CIT central Indonesia
+# 7:00 WIB west Indonesia (Waktu Indonesia Barat)
+# 8:00 WITA central Indonesia (Waktu Indonesia Tengah)
# 8:00 CST China
# 9:00 CJT Central Japanese Time (1896/1937)*
-# 9:00 EIT east Indonesia
+# 9:00 WIT east Indonesia (Waktu Indonesia Timur)
# 9:00 JST JDT Japan
# 9:00 KST KDT Korea
# 9:30 CST (Australian) Central Standard Time
@@ -779,7 +779,7 @@
8:00 - TLT 1942 Feb 21 23:00 # E Timor Time
9:00 - JST 1945 Sep 23
9:00 - TLT 1976 May 3
- 8:00 - CIT 2000 Sep 17 00:00
+ 8:00 - WITA 2000 Sep 17 00:00
9:00 - TLT
# India
@@ -816,36 +816,53 @@
# (Hollandia). For now, assume all Indonesian locations other than Jayapura
# switched on 1945-09-23.
#
+# From Paul Eggert (2013-08-11):
+# Normally the tz database uses English-language abbreviations, but in
+# Indonesia it's typical to use Indonesian-language abbreviations even
+# when writing in English. For example, see the English-language
+# summary published by the Time and Frequency Laboratory of the
+# Research Center for Calibration, Instrumentation and Metrology,
+# Indonesia, <http://time.kim.lipi.go.id/time-eng.php> (2006-09-29).
+# The abbreviations are:
+#
+# WIB - UTC+7 - Waktu Indonesia Barat (Indonesia western time)
+# WITA - UTC+8 - Waktu Indonesia Tengah (Indonesia central time)
+# WIT - UTC+9 - Waktu Indonesia Timur (Indonesia eastern time)
+#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Java, Sumatra
Zone Asia/Jakarta 7:07:12 - LMT 1867 Aug 10
# Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13,
# but this must be a typo.
- 7:07:12 - JMT 1923 Dec 31 23:47:12 # Jakarta
+ 7:07:12 - BMT 1923 Dec 31 23:47:12 # Batavia
7:20 - JAVT 1932 Nov # Java Time
- 7:30 - WIT 1942 Mar 23
+ 7:30 - WIB 1942 Mar 23
9:00 - JST 1945 Sep 23
- 7:30 - WIT 1948 May
- 8:00 - WIT 1950 May
- 7:30 - WIT 1964
- 7:00 - WIT
+ 7:30 - WIB 1948 May
+ 8:00 - WIB 1950 May
+ 7:30 - WIB 1964
+ 7:00 - WIB
+# west and central Borneo
Zone Asia/Pontianak 7:17:20 - LMT 1908 May
7:17:20 - PMT 1932 Nov # Pontianak MT
- 7:30 - WIT 1942 Jan 29
+ 7:30 - WIB 1942 Jan 29
9:00 - JST 1945 Sep 23
- 7:30 - WIT 1948 May
- 8:00 - WIT 1950 May
- 7:30 - WIT 1964
- 8:00 - CIT 1988 Jan 1
- 7:00 - WIT
+ 7:30 - WIB 1948 May
+ 8:00 - WIB 1950 May
+ 7:30 - WIB 1964
+ 8:00 - WITA 1988 Jan 1
+ 7:00 - WIB
+# Sulawesi, Lesser Sundas, east and south Borneo
Zone Asia/Makassar 7:57:36 - LMT 1920
7:57:36 - MMT 1932 Nov # Macassar MT
- 8:00 - CIT 1942 Feb 9
+ 8:00 - WITA 1942 Feb 9
9:00 - JST 1945 Sep 23
- 8:00 - CIT
+ 8:00 - WITA
+# Maluku Islands, West Papua, Papua
Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov
- 9:00 - EIT 1944 Sep 1
+ 9:00 - WIT 1944 Sep 1
9:30 - CST 1964
- 9:00 - EIT
+ 9:00 - WIT
# Iran
@@ -1387,9 +1404,11 @@
# until about the same time next year (at least).
# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950
#
-# From Paul Eggert (2012-10-25):
-# For now, assume this is just a one-year measure. If it becomes
-# permanent, we should move Jordan from EET to AST effective tomorrow.
+# From Paul Eggert (2013-09-21):
+# It's looking like this change will be permanent; see
+# Petra News Agency, Cancelling winter saved Jordan $7 million (2013-02-20)
+# <http://www.albawaba.com/business/jordan-winter-electricity--472005>.
+# So move Jordan to UTC+3 as of the abovementioned date.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Jordan 1973 only - Jun 6 0:00 1:00 S
@@ -1415,15 +1434,15 @@
Rule Jordan 1999 only - Jul 1 0:00s 1:00 S
Rule Jordan 1999 2002 - Sep lastFri 0:00s 0 -
Rule Jordan 2000 2001 - Mar lastThu 0:00s 1:00 S
-Rule Jordan 2002 max - Mar lastThu 24:00 1:00 S
+Rule Jordan 2002 2012 - Mar lastThu 24:00 1:00 S
Rule Jordan 2003 only - Oct 24 0:00s 0 -
Rule Jordan 2004 only - Oct 15 0:00s 0 -
Rule Jordan 2005 only - Sep lastFri 0:00s 0 -
-Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 -
-Rule Jordan 2013 max - Oct lastFri 0:00s 0 -
+Rule Jordan 2006 2012 - Oct lastFri 0:00s 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Amman 2:23:44 - LMT 1931
- 2:00 Jordan EE%sT
+ 2:00 Jordan EE%sT 2012 Oct 26 0:00s
+ 3:00 - AST
# Kazakhstan
@@ -2303,9 +2322,18 @@
# http://www.samanews.com/index.php?act=Show&id=154120
# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html
-# From Paul Eggert (2013-04-15):
+# From Steffen Thorsen (2013-09-24):
+# The Gaza and West Bank are ending DST Thursday at midnight
+# (2013-09-27 00:00:00) (one hour earlier than last year...).
+# This source in English, says "that winter time will go into effect
+# at midnight on Thursday in the West Bank and Gaza Strip":
+# http://english.wafa.ps/index.php?action=detail&id=23246
+# official source...:
+# http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252
+
+# From Paul Eggert (2013-09-24):
# For future dates, guess the last Thursday in March at 24:00 through
-# the first Friday on or after September 21 at 01:00. This is consistent with
+# the first Friday on or after September 21 at 00:00. This is consistent with
# the predictions in today's editions of the following URLs,
# which are for Gaza and Hebron respectively:
# http://www.timeanddate.com/worldclock/timezone.html?n=702
@@ -2336,7 +2364,8 @@
Rule Palestine 2011 only - Aug 30 0:00 1:00 S
Rule Palestine 2011 only - Sep 30 0:00 0 -
Rule Palestine 2012 max - Mar lastThu 24:00 1:00 S
-Rule Palestine 2012 max - Sep Fri>=21 1:00 0 -
+Rule Palestine 2012 only - Sep 21 1:00 0 -
+Rule Palestine 2013 max - Sep Fri>=21 0:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
diff --git a/jdk/make/sun/javazic/tzdata/australasia b/jdk/make/sun/javazic/tzdata/australasia
index 11a3cb9..cd6b724 100644
--- a/jdk/make/sun/javazic/tzdata/australasia
+++ b/jdk/make/sun/javazic/tzdata/australasia
@@ -375,16 +375,25 @@
# today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st
# October 2012 and end at 3 am on Sunday 20th January 2013.
# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155
+
+# From the Fijian Government Media Center (2013-08-30) via David Wheeler:
+# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am
+# on Sunday 19th January, 2014.... move clocks forward by one hour from 2am
+# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx
#
-# From Paul Eggert (2012-08-31):
-# For now, guess a pattern of the penultimate Sundays in October and January.
+# From Paul Eggert (2013-09-09):
+# For now, guess that Fiji springs forward the Sunday before the fourth
+# Monday in October. This matches both recent practice and
+# timeanddate.com's current spring-forward prediction.
+# For the January 2014 transition we guessed right while timeanddate.com
+# guessed wrong, so leave the fall-back prediction alone.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S
Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
Rule Fiji 2009 only - Nov 29 2:00 1:00 S
Rule Fiji 2010 only - Mar lastSun 3:00 0 -
-Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S
+Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S
Rule Fiji 2011 only - Mar Sun>=1 3:00 0 -
Rule Fiji 2012 max - Jan Sun>=18 3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -510,6 +519,7 @@
Zone Pacific/Chatham 12:13:48 - LMT 1957 Jan 1
12:45 Chatham CHA%sT
+Link Pacific/Auckland Antarctica/McMurdo
# Auckland Is
# uninhabited; Maori and Moriori, colonial settlers, pastoralists, sealers,
@@ -759,7 +769,7 @@
# 1886-1891; Baker was similar but exact dates are not known.
# Inhabited by civilians 1935-1942; U.S. military bases 1943-1944;
# uninhabited thereafter.
-# Howland observed Hawaii Standard Time (UTC-10:30) in 1937;
+# Howland observed Hawaii Standard Time (UT-10:30) in 1937;
# see page 206 of Elgen M. Long and Marie K. Long,
# Amelia Earhart: the Mystery Solved, Simon & Schuster (2000).
# So most likely Howland and Baker observed Hawaii Time from 1935
@@ -772,8 +782,17 @@
# no information; was probably like Pacific/Kiritimati
# Johnston
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Pacific/Johnston -10:00 - HST
+#
+# From Paul Eggert (2013-09-03):
+# In his memoirs of June 6th to October 4, 1945
+# <http://www.315bw.org/Herb_Bach.htm> (2005), Herbert C. Bach writes,
+# "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM
+# Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and
+# confirms that Johnston kept the same time as Honolulu in summer 1945.
+# We have no better information, so for now, assume this has been true
+# indefinitely into the past.
+#
+# See 'northamerica' for Pacific/Johnston.
# Kingman
# uninhabited
diff --git a/jdk/make/sun/javazic/tzdata/backward b/jdk/make/sun/javazic/tzdata/backward
index ca4c437..5afe9a3 100644
--- a/jdk/make/sun/javazic/tzdata/backward
+++ b/jdk/make/sun/javazic/tzdata/backward
@@ -45,15 +45,17 @@
Link America/Argentina/Mendoza America/Mendoza
Link America/Rio_Branco America/Porto_Acre
Link America/Argentina/Cordoba America/Rosario
-Link America/St_Thomas America/Virgin
+Link America/Denver America/Shiprock
+Link America/Port_of_Spain America/Virgin
+Link Pacific/Auckland Antarctica/South_Pole
Link Asia/Ashgabat Asia/Ashkhabad
+Link Asia/Kolkata Asia/Calcutta
Link Asia/Chongqing Asia/Chungking
Link Asia/Dhaka Asia/Dacca
Link Asia/Kathmandu Asia/Katmandu
-Link Asia/Kolkata Asia/Calcutta
Link Asia/Macau Asia/Macao
-Link Asia/Jerusalem Asia/Tel_Aviv
Link Asia/Ho_Chi_Minh Asia/Saigon
+Link Asia/Jerusalem Asia/Tel_Aviv
Link Asia/Thimphu Asia/Thimbu
Link Asia/Makassar Asia/Ujung_Pandang
Link Asia/Ulaanbaatar Asia/Ulan_Bator
@@ -111,10 +113,10 @@
Link Pacific/Chatham NZ-CHAT
Link America/Denver Navajo
Link Asia/Shanghai PRC
-Link Pacific/Pago_Pago Pacific/Samoa
-Link Pacific/Chuuk Pacific/Yap
-Link Pacific/Chuuk Pacific/Truk
Link Pacific/Pohnpei Pacific/Ponape
+Link Pacific/Pago_Pago Pacific/Samoa
+Link Pacific/Chuuk Pacific/Truk
+Link Pacific/Chuuk Pacific/Yap
Link Europe/Warsaw Poland
Link Europe/Lisbon Portugal
Link Asia/Taipei ROC
diff --git a/jdk/make/sun/javazic/tzdata/etcetera b/jdk/make/sun/javazic/tzdata/etcetera
index d557e30..ebaa5fd 100644
--- a/jdk/make/sun/javazic/tzdata/etcetera
+++ b/jdk/make/sun/javazic/tzdata/etcetera
@@ -54,9 +54,9 @@
# even though this is the opposite of what many people expect.
# POSIX has positive signs west of Greenwich, but many people expect
# positive signs east of Greenwich. For example, TZ='Etc/GMT+4' uses
-# the abbreviation "GMT+4" and corresponds to 4 hours behind UTC
+# the abbreviation "GMT+4" and corresponds to 4 hours behind UT
# (i.e. west of Greenwich) even though many people would expect it to
-# mean 4 hours ahead of UTC (i.e. east of Greenwich).
+# mean 4 hours ahead of UT (i.e. east of Greenwich).
#
# In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for
# TZ='<GMT-4>+4'; if you want time zone abbreviations conforming to
diff --git a/jdk/make/sun/javazic/tzdata/europe b/jdk/make/sun/javazic/tzdata/europe
index 688136c..9f574a3 100644
--- a/jdk/make/sun/javazic/tzdata/europe
+++ b/jdk/make/sun/javazic/tzdata/europe
@@ -65,7 +65,7 @@
# </a> (1998-09-21, in Portuguese)
#
-# I invented the abbreviations marked `*' in the following table;
+# I invented the abbreviations marked '*' in the following table;
# the rest are from earlier versions of this file, or from other sources.
# Corrections are welcome!
# std dst 2dst
@@ -119,7 +119,7 @@
# and a sketch map showing some of the sightlines involved. One paragraph
# of the text said:
#
-# `An old stone obelisk marking a forgotten terrestrial meridian stands
+# 'An old stone obelisk marking a forgotten terrestrial meridian stands
# beside the river at Kew. In the 18th century, before time and longitude
# was standardised by the Royal Observatory in Greenwich, scholars observed
# this stone and the movement of stars from Kew Observatory nearby. They
@@ -163,7 +163,7 @@
# From Paul Eggert (2003-09-27):
# Summer Time was first seriously proposed by William Willett (1857-1915),
# a London builder and member of the Royal Astronomical Society
-# who circulated a pamphlet ``The Waste of Daylight'' (1907)
+# who circulated a pamphlet "The Waste of Daylight" (1907)
# that proposed advancing clocks 20 minutes on each of four Sundays in April,
# and retarding them by the same amount on four Sundays in September.
# A bill was drafted in 1909 and introduced in Parliament several times,
@@ -188,10 +188,10 @@
# </a>
# From Paul Eggert (1996-09-03):
-# The OED Supplement says that the English originally said ``Daylight Saving''
+# The OED Supplement says that the English originally said "Daylight Saving"
# when they were debating the adoption of DST in 1908; but by 1916 this
# term appears only in quotes taken from DST's opponents, whereas the
-# proponents (who eventually won the argument) are quoted as using ``Summer''.
+# proponents (who eventually won the argument) are quoted as using "Summer".
# From Arthur David Olson (1989-01-19):
#
@@ -231,9 +231,9 @@
# which could not be said to run counter to any official description.
# From Paul Eggert (2000-10-02):
-# Howse writes (p 157) `DBST' too, but `BDST' seems to have been common
+# Howse writes (p 157) 'DBST' too, but 'BDST' seems to have been common
# and follows the more usual convention of putting the location name first,
-# so we use `BDST'.
+# so we use 'BDST'.
# Peter Ilieve (1998-04-19) described at length
# the history of summer time legislation in the United Kingdom.
@@ -454,6 +454,8 @@
Rule GB-Eire 1990 1995 - Oct Sun>=22 1:00u 0 GMT
# Summer Time Order 1997 (S.I. 1997/2982)
# See EU for rules starting in 1996.
+#
+# Use Europe/London for Jersey, Guernsey, and the Isle of Man.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Europe/London -0:01:15 - LMT 1847 Dec 1 0:00s
@@ -820,7 +822,7 @@
1:00 EU CE%sT
# Bosnia and Herzegovina
-# see Serbia
+# See Europe/Belgrade.
# Bulgaria
#
@@ -848,10 +850,10 @@
2:00 EU EE%sT
# Croatia
-# see Serbia
+# See Europe/Belgrade.
# Cyprus
-# Please see the `asia' file for Asia/Nicosia.
+# Please see the 'asia' file for Asia/Nicosia.
# Czech Republic
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -868,6 +870,7 @@
1:00 C-Eur CE%sT 1944 Sep 17 2:00s
1:00 Czech CE%sT 1979
1:00 EU CE%sT
+# Use Europe/Prague also for Slovakia.
# Denmark, Faroe Islands, and Greenland
@@ -1031,12 +1034,12 @@
# From Peter Ilieve (1996-10-28):
# [IATA SSIM (1992/1996) claims that the Baltic republics switch at 01:00s,
# but a relative confirms that Estonia still switches at 02:00s, writing:]
-# ``I do not [know] exactly but there are some little different
+# "I do not [know] exactly but there are some little different
# (confusing) rules for International Air and Railway Transport Schedules
# conversion in Sunday connected with end of summer time in Estonia....
# A discussion is running about the summer time efficiency and effect on
# human physiology. It seems that Estonia maybe will not change to
-# summer time next spring.''
+# summer time next spring."
# From Peter Ilieve (1998-11-04), heavily edited:
# <a href="http://trip.rk.ee/cgi-bin/thw?${BASE}=akt&${OOHTML}=rtd&TA=1998&TO=1&AN=1390">
@@ -1091,7 +1094,7 @@
# Well, here in Helsinki we're just changing from summer time to regular one,
# and it's supposed to change at 4am...
-# From Janne Snabb (2010-0715):
+# From Janne Snabb (2010-07-15):
#
# I noticed that the Finland data is not accurate for years 1981 and 1982.
# During these two first trial years the DST adjustment was made one hour
@@ -1148,7 +1151,7 @@
#
-# Shank & Pottenger seem to use `24:00' ambiguously; resolve it with Whitman.
+# Shank & Pottenger seem to use '24:00' ambiguously; resolve it with Whitman.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule France 1916 only - Jun 14 23:00s 1:00 S
Rule France 1916 1919 - Oct Sun>=1 23:00s 0 -
@@ -1438,7 +1441,7 @@
# <a href="http://toi.iriti.cnr.it/uk/ienitlt.html">
# Day-light Saving Time in Italy (2006-02-03)
# </a>
-# (`FP' below), taken from an Italian National Electrotechnical Institute
+# ('FP' below), taken from an Italian National Electrotechnical Institute
# publication. When the three sources disagree, guess who's right, as follows:
#
# year FP Shanks&P. (S) Whitman (W) Go with:
@@ -1584,10 +1587,22 @@
2:00 EU EE%sT
# Liechtenstein
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Europe/Vaduz 0:38:04 - LMT 1894 Jun
- 1:00 - CET 1981
- 1:00 EU CE%sT
+
+# From Paul Eggert (2013-09-09):
+# Shanks & Pottenger say Vaduz is like Zurich.
+
+# From Alois Treindl (2013-09-18):
+# http://www.eliechtensteinensia.li/LIJ/1978/1938-1978/1941.pdf
+# ... confirms on p. 6 that Liechtenstein followed Switzerland in 1941 and 1942.
+# I ... translate only the last two paragraphs:
+# ... during second world war, in the years 1941 and 1942, Liechtenstein
+# introduced daylight saving time, adapting to Switzerland. From 1943 on
+# central European time was in force throughout the year.
+# From a report of the duke's government to the high council,
+# regarding the introduction of a time law, of 31 May 1977.
+
+Link Europe/Zurich Europe/Vaduz
+
# Lithuania
@@ -1675,7 +1690,7 @@
1:00 EU CE%sT
# Macedonia
-# see Serbia
+# See Europe/Belgrade.
# Malta
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -1768,7 +1783,7 @@
1:00 EU CE%sT
# Montenegro
-# see Serbia
+# See Europe/Belgrade.
# Netherlands
@@ -1883,7 +1898,7 @@
# before 1895, and therefore probably changed the local time somewhere
# between 1895 and 1925 (inclusive).
-# From Paul Eggert (2001-05-01):
+# From Paul Eggert (2013-09-04):
#
# Actually, Jan Mayen was never occupied by Germany during World War II,
# so it must have diverged from Oslo time during the war, as Oslo was
@@ -1894,7 +1909,7 @@
# 1941 with a small Norwegian garrison and continued operations despite
# frequent air ttacks from Germans. In 1943 the Americans established a
# radiolocating station on the island, called "Atlantic City". Possibly
-# the UTC offset changed during the war, but I think it unlikely that
+# the UT offset changed during the war, but I think it unlikely that
# Jan Mayen used German daylight-saving rules.
#
# Svalbard is more complicated, as it was raided in August 1941 by an
@@ -1907,9 +1922,8 @@
# the German armed forces at the Svalbard weather station code-named
# Haudegen did not surrender to the Allies until September 1945.
#
-# All these events predate our cutoff date of 1970. Unless we can
-# come up with more definitive info about the timekeeping during the
-# war years it's probably best just do...the following for now:
+# All these events predate our cutoff date of 1970, so use Europe/Oslo
+# for these regions.
Link Europe/Oslo Arctic/Longyearbyen
# Poland
@@ -2167,7 +2181,7 @@
# so we (Novosibirsk) simply did not switch.
#
# From Andrey A. Chernov (1996-10-04):
-# `MSK' and `MSD' were born and used initially on Moscow computers with
+# 'MSK' and 'MSD' were born and used initially on Moscow computers with
# UNIX-like OSes by several developer groups (e.g. Demos group, Kiae group)....
# The next step was the UUCP network, the Relcom predecessor
# (used mainly for mail), and MSK/MSD was actively used there.
@@ -2466,6 +2480,9 @@
11:00 Russia ANA%sT 2011 Mar 27 2:00s
12:00 - ANAT
+# San Marino
+# See Europe/Rome.
+
# Serbia
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Europe/Belgrade 1:22:00 - LMT 1884
@@ -2488,7 +2505,7 @@
Link Europe/Prague Europe/Bratislava
# Slovenia
-# see Serbia
+# See Europe/Belgrade.
# Spain
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -2622,7 +2639,7 @@
# and their performance improved enormously. Communities began to keep
# mean time in preference to apparent time -- Geneva from 1780 ....
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-# From Whitman (who writes ``Midnight?''):
+# From Whitman (who writes "Midnight?"):
# Rule Swiss 1940 only - Nov 2 0:00 1:00 S
# Rule Swiss 1940 only - Dec 31 0:00 0 -
# From Shanks & Pottenger:
@@ -2667,23 +2684,53 @@
# The 1940 rules must be deleted.
#
# One further detail for Switzerland, which is probably out of scope for
-# most users of tzdata:
-# The zone file
-# Zone Europe/Zurich 0:34:08 - LMT 1848 Sep 12
-# 0:29:44 - BMT 1894 Jun #Bern Mean Time
-# 1:00 Swiss CE%sT 1981
-# 1:00 EU CE%sT
+# most users of tzdata: The [Europe/Zurich zone] ...
# describes all of Switzerland correctly, with the exception of
# the Cantone Geneve (Geneva, Genf). Between 1848 and 1894 Geneve did not
# follow Bern Mean Time but kept its own local mean time.
# To represent this, an extra zone would be needed.
+#
+# From Alois Treindl (2013-09-11):
+# The Federal regulations say
+# http://www.admin.ch/opc/de/classified-compilation/20071096/index.html
+# ... the meridian for Bern mean time ... is 7 degrees 26'22.50".
+# Expressed in time, it is 0h29m45.5s.
+
+# From Pierre-Yves Berger (2013-09-11):
+# the "Circulaire du conseil federal" (December 11 1893)
+# <http://www.amtsdruckschriften.bar.admin.ch/viewOrigDoc.do?id=10071353> ...
+# clearly states that the [1894-06-01] change should be done at midnight
+# but if no one is present after 11 at night, could be postponed until one
+# hour before the beginning of service.
+
+# From Paul Eggert (2013-09-11):
+# Round BMT to the nearest even second, 0:29:46.
+#
+# We can find no reliable source for Shanks's assertion that all of Switzerland
+# except Geneva switched to Bern Mean Time at 00:00 on 1848-09-12. This book:
+#
+# Jakob Messerli. Gleichmassig, punktlich, schnell: Zeiteinteilung und
+# Zeitgebrauch in der Schweiz im 19. Jahrhundert. Chronos, Zurich 1995,
+# ISBN 3-905311-68-2, OCLC 717570797.
+#
+# suggests that the transition was more gradual, and that the Swiss did not
+# agree about civil time during the transition. The timekeeping it gives the
+# most detail for is postal and telegraph time: here, federal legislation (the
+# "Bundesgesetz uber die Erstellung von elektrischen Telegraphen") passed on
+# 1851-11-23, and an official implementation notice was published 1853-07-16
+# (Bundesblatt 1853, Bd. II, S. 859). On p 72 Messerli writes that in
+# practice since July 1853 Bernese time was used in "all postal and telegraph
+# offices in Switzerland from Geneva to St. Gallen and Basel to Chiasso"
+# (Google translation). For now, model this transition as occurring on
+# 1853-07-16, though it probably occurred at some other date in Zurich, and
+# legal civil time probably changed at still some other transition date.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Swiss 1941 1942 - May Mon>=1 1:00 1:00 S
Rule Swiss 1941 1942 - Oct Mon>=1 2:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Europe/Zurich 0:34:08 - LMT 1848 Sep 12
- 0:29:44 - BMT 1894 Jun # Bern Mean Time
+Zone Europe/Zurich 0:34:08 - LMT 1853 Jul 16 # See above comment.
+ 0:29:46 - BMT 1894 Jun # Bern Mean Time
1:00 Swiss CE%sT 1981
1:00 EU CE%sT
@@ -2907,7 +2954,7 @@
# From Paul Eggert (2006-03-22):
# The _Economist_ (1994-05-28, p 45) reports that central Crimea switched
# from Kiev to Moscow time sometime after the January 1994 elections.
-# Shanks (1999) says ``date of change uncertain'', but implies that it happened
+# Shanks (1999) says "date of change uncertain", but implies that it happened
# sometime between the 1994 DST switches. Shanks & Pottenger simply say
# 1994-09-25 03:00, but that can't be right. For now, guess it
# changed in May.
@@ -2921,6 +2968,9 @@
3:00 - MSK 1997 Mar lastSun 1:00u
2:00 EU EE%sT
+# Vatican City
+# See Europe/Rome.
+
###############################################################################
# One source shows that Bulgaria, Cyprus, Finland, and Greece observe DST from
diff --git a/jdk/make/sun/javazic/tzdata/iso3166.tab b/jdk/make/sun/javazic/tzdata/iso3166.tab
index c6b2d0a..28fb64b 100644
--- a/jdk/make/sun/javazic/tzdata/iso3166.tab
+++ b/jdk/make/sun/javazic/tzdata/iso3166.tab
@@ -32,7 +32,7 @@
# 1. ISO 3166-1 alpha-2 country code, current as of
# ISO 3166-1 Newsletter VI-15 (2013-05-10). See: Updates on ISO 3166
# http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
-# 2. The usual English name for the country,
+# 2. The usual English name for the coded region,
# chosen so that alphabetic sorting of subsets produces helpful lists.
# This is not the same as the English name in the ISO 3166 tables.
#
@@ -46,7 +46,7 @@
# to take or endorse any position on legal or territorial claims.
#
#country-
-#code country name
+#code name of country, territory, area, or subdivision
AD Andorra
AE United Arab Emirates
AF Afghanistan
@@ -76,7 +76,7 @@
BM Bermuda
BN Brunei
BO Bolivia
-BQ Bonaire, St Eustatius & Saba
+BQ Caribbean Netherlands
BR Brazil
BS Bahamas
BT Bhutan
diff --git a/jdk/make/sun/javazic/tzdata/leapseconds b/jdk/make/sun/javazic/tzdata/leapseconds
index 9128012..faf5319 100644
--- a/jdk/make/sun/javazic/tzdata/leapseconds
+++ b/jdk/make/sun/javazic/tzdata/leapseconds
@@ -20,18 +20,24 @@
# 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.
-#
-# <pre>
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
# Allowance for leapseconds added to each timezone file.
+# This file is in the public domain.
+
+# This file is generated automatically from the data in the public-domain
+# leap-seconds.list file available from most NIST time servers.
+# If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,
+# you should be able to pick up leap-seconds.list from a secondary NIST server.
+# For more about leap-seconds.list, please see
+# The NTP Timescale and Leap Seconds
+# <http://www.eecis.udel.edu/~mills/leap.html>.
+
# The International Earth Rotation Service periodically uses leap seconds
# to keep UTC to within 0.9 s of UT1
# (which measures the true angular orientation of the earth in space); see
# Terry J Quinn, The BIPM and the accurate measure of time,
-# Proc IEEE 79, 7 (July 1991), 894-905.
+# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>.
# There were no leap seconds before 1972, because the official mechanism
# accounting for the discrepancy between atomic time and the earth's rotation
# did not exist until the early 1970s.
@@ -42,8 +48,8 @@
# or
# Leap YEAR MON DAY 23:59:59 - R/S
-# If the leapsecond is Rolling (R) the given time is local time
-# If the leapsecond is Stationary (S) the given time is UTC
+# If the leapsecond is Rolling (R) the given time is local time.
+# If the leapsecond is Stationary (S) the given time is UTC.
# Leap YEAR MONTH DAY HH:MM:SS CORR R/S
Leap 1972 Jun 30 23:59:60 + S
@@ -71,53 +77,3 @@
Leap 2005 Dec 31 23:59:60 + S
Leap 2008 Dec 31 23:59:60 + S
Leap 2012 Jun 30 23:59:60 + S
-
-# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
-#
-# SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
-#
-#
-# SERVICE DE LA ROTATION TERRESTRE
-# OBSERVATOIRE DE PARIS
-# 61, Av. de l'Observatoire 75014 PARIS (France)
-# Tel. : 33 (0) 1 40 51 22 26
-# FAX : 33 (0) 1 40 51 22 91
-# e-mail : (E-Mail Removed)
-# http://hpiers.obspm.fr/eop-pc
-#
-# Paris, 5 January 2012
-#
-#
-# Bulletin C 43
-#
-# To authorities responsible
-# for the measurement and
-# distribution of time
-#
-#
-# UTC TIME STEP
-# on the 1st of July 2012
-#
-#
-# A positive leap second will be introduced at the end of June 2012.
-# The sequence of dates of the UTC second markers will be:
-#
-# 2012 June 30, 23h 59m 59s
-# 2012 June 30, 23h 59m 60s
-# 2012 July 1, 0h 0m 0s
-#
-# The difference between UTC and the International Atomic Time TAI is:
-#
-# from 2009 January 1, 0h UTC, to 2012 July 1 0h UTC : UTC-TAI = - 34s
-# from 2012 July 1, 0h UTC, until further notice : UTC-TAI = - 35s
-#
-# Leap seconds can be introduced in UTC at the end of the months of December
-# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
-# six months, either to announce a time step in UTC or to confirm that there
-# will be no time step at the next possible date.
-#
-#
-# Daniel GAMBIS
-# Head
-# Earth Orientation Center of IERS
-# Observatoire de Paris, France
diff --git a/jdk/make/sun/javazic/tzdata/northamerica b/jdk/make/sun/javazic/tzdata/northamerica
index 43a0b22..b8caf6d 100644
--- a/jdk/make/sun/javazic/tzdata/northamerica
+++ b/jdk/make/sun/javazic/tzdata/northamerica
@@ -43,7 +43,7 @@
# Howse writes (pp 121-125) that time zones were invented by
# Professor Charles Ferdinand Dowd (1825-1904),
# Principal of Temple Grove Ladies' Seminary (Saratoga Springs, NY).
-# His pamphlet ``A System of National Time for Railroads'' (1870)
+# His pamphlet "A System of National Time for Railroads" (1870)
# was the result of his proposals at the Convention of Railroad Trunk Lines
# in New York City (1869-10). His 1870 proposal was based on Washington, DC,
# but in 1872-05 he moved the proposed origin to Greenwich.
@@ -63,8 +63,8 @@
# From Paul Eggert (2001-03-06):
# Daylight Saving Time was first suggested as a joke by Benjamin Franklin
-# in his whimsical essay ``An Economical Project for Diminishing the Cost
-# of Light'' published in the Journal de Paris (1784-04-26).
+# in his whimsical essay "An Economical Project for Diminishing the Cost
+# of Light" published in the Journal de Paris (1784-04-26).
# Not everyone is happy with the results:
#
# I don't really care how time is reckoned so long as there is some
@@ -190,8 +190,8 @@
# of the Aleutian islands. No DST.
# From Paul Eggert (1995-12-19):
-# The tables below use `NST', not `NT', for Nome Standard Time.
-# I invented `CAWT' for Central Alaska War Time.
+# The tables below use 'NST', not 'NT', for Nome Standard Time.
+# I invented 'CAWT' for Central Alaska War Time.
# From U. S. Naval Observatory (1989-01-19):
# USA EASTERN 5 H BEHIND UTC NEW YORK, WASHINGTON
@@ -260,9 +260,9 @@
# H.R. 6, Energy Policy Act of 2005, SEC. 110. DAYLIGHT SAVINGS.
# (a) Amendment- Section 3(a) of the Uniform Time Act of 1966 (15
# U.S.C. 260a(a)) is amended--
-# (1) by striking `first Sunday of April' and inserting `second
+# (1) by striking 'first Sunday of April' and inserting 'second
# Sunday of March'; and
-# (2) by striking `last Sunday of October' and inserting `first
+# (2) by striking 'last Sunday of October' and inserting 'first
# Sunday of November'.
# (b) Effective Date- Subsection (a) shall take effect 1 year after the
# date of enactment of this Act or March 1, 2007, whichever is later.
@@ -623,6 +623,8 @@
-10:30 - HST 1947 Jun 8 2:00 #Schmitt&Cox+2
-10:00 - HST
+Link Pacific/Honolulu Pacific/Johnston
+
# Now we turn to US areas that have diverged from the consensus since 1970.
# Arizona mostly uses MST.
@@ -659,8 +661,9 @@
# Navajo Nation participates in the Daylight Saving Time policy, due to its
# large size and location in three states." (The "only" means that other
# tribal nations don't use DST.)
-
-Link America/Denver America/Shiprock
+#
+# From Paul Eggert (2013-08-26):
+# See America/Denver for a zone appropriate for the Navajo Nation.
# Southern Idaho (Ada, Adams, Bannock, Bear Lake, Bingham, Blaine,
# Boise, Bonneville, Butte, Camas, Canyon, Caribou, Cassia, Clark,
@@ -700,13 +703,13 @@
# and Switzerland counties have their own time zone histories as noted below.
#
# Shanks partitioned Indiana into 345 regions, each with its own time history,
-# and wrote ``Even newspaper reports present contradictory information.''
+# and wrote "Even newspaper reports present contradictory information."
# Those Hoosiers! Such a flighty and changeable people!
# Fortunately, most of the complexity occurred before our cutoff date of 1970.
#
# Other than Indianapolis, the Indiana place names are so nondescript
-# that they would be ambiguous if we left them at the `America' level.
-# So we reluctantly put them all in a subdirectory `America/Indiana'.
+# that they would be ambiguous if we left them at the 'America' level.
+# So we reluctantly put them all in a subdirectory 'America/Indiana'.
# From Paul Eggert (2005-08-16):
# http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006.
@@ -970,8 +973,8 @@
# This story is too entertaining to be false, so go with Howse over Shanks.
#
# From Paul Eggert (2001-03-06):
-# Garland (1927) writes ``Cleveland and Detroit advanced their clocks
-# one hour in 1914.'' This change is not in Shanks. We have no more
+# Garland (1927) writes "Cleveland and Detroit advanced their clocks
+# one hour in 1914." This change is not in Shanks. We have no more
# info, so omit this for now.
#
# Most of Michigan observed DST from 1973 on, but was a bit late in 1975.
@@ -1011,7 +1014,7 @@
# occupied 1857/1900 by the Navassa Phosphate Co
# US lighthouse 1917/1996-09
# currently uninhabited
-# see Mark Fineman, ``An Isle Rich in Guano and Discord'',
+# see Mark Fineman, "An Isle Rich in Guano and Discord",
# _Los Angeles Times_ (1998-11-10), A1, A10; it cites
# Jimmy Skaggs, _The Great Guano Rush_ (1994).
@@ -1045,7 +1048,7 @@
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
# <http://www.jstor.org/stable/1774359>.
#
-# See the `europe' file for Greenland.
+# See the 'europe' file for Greenland.
# Canada
@@ -1246,7 +1249,7 @@
# most of east Labrador
-# The name `Happy Valley-Goose Bay' is too long; use `Goose Bay'.
+# The name 'Happy Valley-Goose Bay' is too long; use 'Goose Bay'.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Goose_Bay -4:01:40 - LMT 1884 # Happy Valley-Goose Bay
-3:30:52 - NST 1918
@@ -1363,25 +1366,27 @@
# Quebec
-# From Paul Eggert (2006-07-09):
-# Shanks & Pottenger write that since 1970 most of Quebec has been
-# like Montreal.
+# From Paul Eggert (2013-08-30):
+# Since 1970 most of Quebec has been like Toronto.
+# However, because earlier versions of the tz database mistakenly relied on data
+# from Shanks & Pottenger saying that Quebec differed from Ontario after 1970,
+# a separate entry was created for most of Quebec. We're loath to lose
+# its pre-1970 info, even though the tz database is normally limited to
+# zones that differ after 1970, so keep this otherwise out-of-scope entry.
-# From Paul Eggert (2006-06-27):
# Matthews and Vincent (1998) also write that Quebec east of the -63
# meridian is supposed to observe AST, but residents as far east as
# Natashquan use EST/EDT, and residents east of Natashquan use AST.
-# In "Official time in Quebec" the Quebec department of justice writes in
-# http://www.justice.gouv.qc.ca/english/publications/generale/temps-regl-1-a.htm
-# that "The residents of the Municipality of the
-# Cote-Nord-du-Golfe-Saint-Laurent and the municipalities of Saint-Augustin,
-# Bonne-Esperance and Blanc-Sablon apply the Official Time Act as it is
-# written and use Atlantic standard time all year round. The same applies to
-# the residents of the Native facilities along the lower North Shore."
-# <http://www.assnat.qc.ca/eng/37legislature2/Projets-loi/Publics/06-a002.htm>
+# The Quebec department of justice writes in
+# "The situation in Minganie and Basse-Cote-Nord"
+# http://www.justice.gouv.qc.ca/english/publications/generale/temps-minganie-a.htm
+# that the coastal strip from just east of Natashquan to Blanc-Sablon
+# observes Atlantic standard time all year round.
+# http://www.assnat.qc.ca/Media/Process.aspx?MediaId=ANQ.Vigie.Bll.DocumentGenerique_8845en
# says this common practice was codified into law as of 2007.
# For lack of better info, guess this practice began around 1970, contra to
# Shanks & Pottenger who have this region observing AST/ADT.
+# for post-1970 data America/Puerto_Rico.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Mont 1917 only - Mar 25 2:00 1:00 D
@@ -1425,7 +1430,6 @@
-5:00 Mont E%sT 1974
-5:00 Canada E%sT
-
# Ontario
# From Paul Eggert (2006-07-09):
@@ -1644,7 +1648,7 @@
-6:00 - CST 1910
-5:00 - EST 1942
-5:00 Canada E%sT 1970
- -5:00 Mont E%sT 1973
+ -5:00 Toronto E%sT 1973
-5:00 - EST 1974
-5:00 Canada E%sT
Zone America/Nipigon -5:53:04 - LMT 1895
@@ -2231,7 +2235,7 @@
# From Paul Eggert (1996-06-12):
# For an English translation of the decree, see
# <a href="http://mexico-travel.com/extra/timezone_eng.html">
-# ``Diario Oficial: Time Zone Changeover'' (1996-01-04).
+# "Diario Oficial: Time Zone Changeover" (1996-01-04).
# </a>
# From Rives McDow (1998-10-08):
@@ -2568,9 +2572,7 @@
###############################################################################
# Anguilla
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Anguilla -4:12:16 - LMT 1912 Mar 2
- -4:00 - AST
+# See 'southamerica'.
# Antigua and Barbuda
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -2639,13 +2641,13 @@
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton
-4:00 - AST 1974 Apr 28 2:00
- -4:00 Bahamas A%sT 1976
+ -4:00 Canada A%sT 1976
-4:00 US A%sT
# Cayman Is
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown
- -5:07:12 - KMT 1912 Feb # Kingston Mean Time
+ -5:07:11 - KMT 1912 Feb # Kingston Mean Time
-5:00 - EST
# Costa Rica
@@ -2660,7 +2662,7 @@
# go with Shanks & Pottenger.
Rule CR 1991 only - Jul 1 0:00 0 S
Rule CR 1992 only - Mar 15 0:00 0 S
-# There are too many San Joses elsewhere, so we'll use `Costa Rica'.
+# There are too many San Joses elsewhere, so we'll use 'Costa Rica'.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Costa_Rica -5:36:13 - LMT 1890 # San Jose
-5:36:13 - SJMT 1921 Jan 15 # San Jose Mean Time
@@ -2892,9 +2894,7 @@
-5:00 Cuba C%sT
# Dominica
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Dominica -4:05:36 - LMT 1911 Jul 1 0:01 # Roseau
- -4:00 - AST
+# See 'southamerica'.
# Dominican Republic
@@ -2943,18 +2943,10 @@
-6:00 Salv C%sT
# Grenada
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Grenada -4:07:00 - LMT 1911 Jul # St George's
- -4:00 - AST
-
# Guadeloupe
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Guadeloupe -4:06:08 - LMT 1911 Jun 8 # Pointe a Pitre
- -4:00 - AST
# St Barthelemy
-Link America/Guadeloupe America/St_Barthelemy
# St Martin (French part)
-Link America/Guadeloupe America/Marigot
+# See 'southamerica'.
# Guatemala
#
@@ -3097,17 +3089,12 @@
# Great Swan I ceded by US to Honduras in 1972
# Jamaica
-
-# From Bob Devine (1988-01-28):
-# Follows US rules.
-
-# From U. S. Naval Observatory (1989-01-19):
-# JAMAICA 5 H BEHIND UTC
-
-# From Shanks & Pottenger:
+# Shanks & Pottenger give -5:07:12, but Milne records -5:07:10.41 from an
+# unspecified official document, and says "This time is used throughout the
+# island". Go with Milne. Round to the nearest second as required by zic.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Jamaica -5:07:12 - LMT 1890 # Kingston
- -5:07:12 - KMT 1912 Feb # Kingston Mean Time
+Zone America/Jamaica -5:07:11 - LMT 1890 # Kingston
+ -5:07:11 - KMT 1912 Feb # Kingston Mean Time
-5:00 - EST 1974 Apr 28 2:00
-5:00 US E%sT 1984
-5:00 - EST
@@ -3121,12 +3108,7 @@
-4:00 - AST
# Montserrat
-# From Paul Eggert (2006-03-22):
-# In 1995 volcanic eruptions forced evacuation of Plymouth, the capital.
-# world.gazetteer.com says Cork Hill is the most populous location now.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Montserrat -4:08:52 - LMT 1911 Jul 1 0:01 # Cork Hill
- -4:00 - AST
+# See 'southamerica'.
# Nicaragua
#
@@ -3200,7 +3182,7 @@
-5:00 - EST
# Puerto Rico
-# There are too many San Juans elsewhere, so we'll use `Puerto_Rico'.
+# There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Puerto_Rico -4:24:25 - LMT 1899 Mar 28 12:00 # San Juan
-4:00 - AST 1942 May 3
@@ -3208,18 +3190,11 @@
-4:00 - AST
# St Kitts-Nevis
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/St_Kitts -4:10:52 - LMT 1912 Mar 2 # Basseterre
- -4:00 - AST
-
# St Lucia
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/St_Lucia -4:04:00 - LMT 1890 # Castries
- -4:04:00 - CMT 1912 # Castries Mean Time
- -4:00 - AST
+# See 'southamerica'.
# St Pierre and Miquelon
-# There are too many St Pierres elsewhere, so we'll use `Miquelon'.
+# There are too many St Pierres elsewhere, so we'll use 'Miquelon'.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Miquelon -3:44:40 - LMT 1911 May 15 # St Pierre
-4:00 - AST 1980 May
@@ -3227,10 +3202,7 @@
-3:00 Canada PM%sT
# St Vincent and the Grenadines
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/St_Vincent -4:04:56 - LMT 1890 # Kingstown
- -4:04:56 - KMT 1912 # Kingstown Mean Time
- -4:00 - AST
+# See 'southamerica'.
# Turks and Caicos
#
@@ -3260,15 +3232,9 @@
Rule TC 2007 max - Nov Sun>=1 2:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Grand_Turk -4:44:32 - LMT 1890
- -5:07:12 - KMT 1912 Feb # Kingston Mean Time
+ -5:07:11 - KMT 1912 Feb # Kingston Mean Time
-5:00 TC E%sT
# British Virgin Is
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Tortola -4:18:28 - LMT 1911 Jul # Road Town
- -4:00 - AST
-
# Virgin Is
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/St_Thomas -4:19:44 - LMT 1911 Jul # Charlotte Amalie
- -4:00 - AST
+# See 'southamerica'.
diff --git a/jdk/make/sun/javazic/tzdata/southamerica b/jdk/make/sun/javazic/tzdata/southamerica
index e7df18a..2230d06 100644
--- a/jdk/make/sun/javazic/tzdata/southamerica
+++ b/jdk/make/sun/javazic/tzdata/southamerica
@@ -474,6 +474,17 @@
# rules...San Luis is still using "Western ARgentina Time" and it got
# stuck on Summer daylight savings time even though the summer is over.
+# From Paul Eggert (2013-09-05):
+# Perhaps San Luis operates on the legal fiction that it is at UTC-4
+# with perpetual summer time, but ordinary usage typically seems to
+# just say it's at UTC-3; see, for example,
+# <http://es.wikipedia.org/wiki/Hora_oficial_argentina>.
+# We've documented similar situations as being plain changes to
+# standard time, so let's do that here too. This does not change UTC
+# offsets, only tm_isdst and the time zone abbreviations. One minor
+# plus is that this silences a zic complaint that there's no POSIX TZ
+# setting for time stamps past 2038.
+
# From Paul Eggert (2013-02-21):
# Milne says Cordoba time was -4:16:48.2. Round to the nearest second.
@@ -611,7 +622,7 @@
# San Luis (SL)
Rule SanLuis 2008 2009 - Mar Sun>=8 0:00 0 -
-Rule SanLuis 2007 2009 - Oct Sun>=8 0:00 1:00 S
+Rule SanLuis 2007 2008 - Oct Sun>=8 0:00 1:00 S
Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31
-4:16:48 - CMT 1920 May
@@ -627,7 +638,8 @@
-3:00 - ART 2004 May 31
-4:00 - WART 2004 Jul 25
-3:00 Arg AR%sT 2008 Jan 21
- -4:00 SanLuis WAR%sT
+ -4:00 SanLuis WAR%sT 2009 Oct 11
+ -3:00 - ART
#
# Santa Cruz (SC)
Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31
@@ -654,10 +666,7 @@
-3:00 - ART
# Aruba
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Aruba -4:40:24 - LMT 1912 Feb 12 # Oranjestad
- -4:30 - ANT 1965 # Netherlands Antilles Time
- -4:00 - AST
+Link America/Curacao America/Aruba
# Bolivia
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -859,6 +868,12 @@
# Tocantins state will have DST.
# http://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306.html
+# From Steffen Thorsen (2013-09-20):
+# Tocantins in Brazil is very likely not to observe DST from October....
+# http://conexaoto.com.br/2013/09/18/ministerio-confirma-que-tocantins-esta-fora-do-horario-de-verao-em-2013-mas-falta-publicacao-de-decreto
+# We will keep this article updated when this is confirmed:
+# http://www.timeanddate.com/news/time/brazil-starts-dst-2013.html
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
# Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
# Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
@@ -1078,7 +1093,8 @@
-3:00 - BRT 1995 Sep 14
-3:00 Brazil BR%sT 2003 Sep 24
-3:00 - BRT 2012 Oct 21
- -3:00 Brazil BR%sT
+ -3:00 Brazil BR%sT 2013 Sep
+ -3:00 - BRT
#
# Alagoas (AL), Sergipe (SE)
Zone America/Maceio -2:22:52 - LMT 1914
@@ -1373,12 +1389,12 @@
-4:00 - AST
# From Arthur David Olson (2011-06-15):
-# At least for now, use links for places with new iso3166 codes.
+# use links for places with new iso3166 codes.
# The name "Lower Prince's Quarter" is both longer than fourteen charaters
# and contains an apostrophe; use "Lower_Princes" below.
-Link America/Curacao America/Lower_Princes # Sint Maarten
-Link America/Curacao America/Kralendijk # Bonaire, Sint Estatius and Saba
+Link America/Curacao America/Lower_Princes # Sint Maarten
+Link America/Curacao America/Kralendijk # Caribbean Netherlands
# Ecuador
#
@@ -1519,10 +1535,16 @@
-4:00 - GYT
# Paraguay
+#
# From Paul Eggert (2006-03-22):
# Shanks & Pottenger say that spring transitions are from 01:00 -> 02:00,
# and autumn transitions are from 00:00 -> 23:00. Go with pre-1999
# editions of Shanks, and with the IATA, who say transitions occur at 00:00.
+#
+# From Waldemar Villamayor-Venialbo (2013-09-20):
+# No time of the day is established for the adjustment, so people normally
+# adjust their clocks at 0 hour of the given dates.
+#
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Para 1975 1988 - Oct 1 0:00 1:00 S
Rule Para 1975 1978 - Mar 1 0:00 0 -
@@ -1656,6 +1678,19 @@
Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2
-4:00 - AST
+Link America/Port_of_Spain America/Anguilla
+Link America/Port_of_Spain America/Dominica
+Link America/Port_of_Spain America/Grenada
+Link America/Port_of_Spain America/Guadeloupe
+Link America/Port_of_Spain America/Marigot
+Link America/Port_of_Spain America/Montserrat
+Link America/Port_of_Spain America/St_Barthelemy
+Link America/Port_of_Spain America/St_Kitts
+Link America/Port_of_Spain America/St_Lucia
+Link America/Port_of_Spain America/St_Thomas
+Link America/Port_of_Spain America/St_Vincent
+Link America/Port_of_Spain America/Tortola
+
# Uruguay
# From Paul Eggert (1993-11-18):
# Uruguay wins the prize for the strangest peacetime manipulation of the rules.
@@ -1673,7 +1708,7 @@
# Whitman gives 1937 Oct 3; go with Shanks & Pottenger.
Rule Uruguay 1937 1940 - Oct lastSun 0:00 0:30 HS
# Whitman gives 1941 Oct 24 - 1942 Mar 27, 1942 Dec 14 - 1943 Apr 13,
-# and 1943 Apr 13 ``to present time''; go with Shanks & Pottenger.
+# and 1943 Apr 13 "to present time"; go with Shanks & Pottenger.
Rule Uruguay 1941 only - Aug 1 0:00 0:30 HS
Rule Uruguay 1942 only - Jan 1 0:00 0 -
Rule Uruguay 1942 only - Dec 14 0:00 1:00 S
diff --git a/jdk/make/sun/javazic/tzdata/zone.tab b/jdk/make/sun/javazic/tzdata/zone.tab
index aa247c2..b34cdb0d 100644
--- a/jdk/make/sun/javazic/tzdata/zone.tab
+++ b/jdk/make/sun/javazic/tzdata/zone.tab
@@ -26,27 +26,30 @@
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
#
-# From Paul Eggert (2013-05-27):
+# From Paul Eggert (2013-08-14):
#
-# This file contains a table with the following columns:
-# 1. ISO 3166 2-character country code. See the file `iso3166.tab'.
-# This identifies a country that overlaps the zone. The country may
-# overlap other zones and the zone may overlap other countries.
-# 2. Latitude and longitude of the zone's principal location
+# This file contains a table where each row stands for an area that is
+# the intersection of a region identified by a country code and of a
+# zone where civil clocks have agreed since 1970. The columns of the
+# table are as follows:
+#
+# 1. ISO 3166 2-character country code. See the file 'iso3166.tab'.
+# 2. Latitude and longitude of the area's principal location
# in ISO 6709 sign-degrees-minutes-seconds format,
# either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
# first latitude (+ is north), then longitude (+ is east).
-# This location need not lie within the column-1 country.
# 3. Zone name used in value of TZ environment variable.
# Please see the 'Theory' file for how zone names are chosen.
+# If multiple zones overlap a country, each has a row in the
+# table, with column 1 being duplicated.
# 4. Comments; present if and only if the country has multiple rows.
#
# Columns are separated by a single tab.
# The table is sorted first by country, then an order within the country that
# (1) makes some geographical sense, and
-# (2) puts the most populous zones first, where that does not contradict (1).
+# (2) puts the most populous areas first, where that does not contradict (1).
#
-# Lines beginning with `#' are comments.
+# Lines beginning with '#' are comments.
#
# This table is intended as an aid for users, to help them select time
# zone data appropriate for their practical needs. It is not intended
@@ -62,8 +65,7 @@
AL +4120+01950 Europe/Tirane
AM +4011+04430 Asia/Yerevan
AO -0848+01314 Africa/Luanda
-AQ -7750+16636 Antarctica/McMurdo McMurdo Station, Ross Island
-AQ -9000+00000 Antarctica/South_Pole Amundsen-Scott Station, South Pole
+AQ -7750+16636 Antarctica/McMurdo McMurdo, South Pole, Scott (New Zealand time)
AQ -6734-06808 Antarctica/Rothera Rothera Station, Adelaide Island
AQ -6448-06406 Antarctica/Palmer Palmer Station, Anvers Island
AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay
@@ -143,8 +145,7 @@
CA +4606-06447 America/Moncton Atlantic Time - New Brunswick
CA +5320-06025 America/Goose_Bay Atlantic Time - Labrador - most locations
CA +5125-05707 America/Blanc-Sablon Atlantic Standard Time - Quebec - Lower North Shore
-CA +4531-07334 America/Montreal Eastern Time - Quebec - most locations
-CA +4339-07923 America/Toronto Eastern Time - Ontario - most locations
+CA +4339-07923 America/Toronto Eastern Time - Ontario & Quebec - most locations
CA +4901-08816 America/Nipigon Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario
CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut - most locations
@@ -255,7 +256,7 @@
IS +6409-02151 Atlantic/Reykjavik
IT +4154+01229 Europe/Rome
JE +4912-00207 Europe/Jersey
-JM +1800-07648 America/Jamaica
+JM +175805-0764736 America/Jamaica
JO +3157+03556 Asia/Amman
JP +353916+1394441 Asia/Tokyo
KE -0117+03649 Africa/Nairobi
@@ -444,8 +445,7 @@
US +471551-1014640 America/North_Dakota/Beulah Central Time - North Dakota - Mercer County
US +394421-1045903 America/Denver Mountain Time
US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon
-US +364708-1084111 America/Shiprock Mountain Time - Navajo
-US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona
+US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo)
US +340308-1181434 America/Los_Angeles Pacific Time
US +611305-1495401 America/Anchorage Alaska Time
US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle
diff --git a/jdk/make/tools/Makefile b/jdk/make/tools/Makefile
index e01f77e..d6724f7 100644
--- a/jdk/make/tools/Makefile
+++ b/jdk/make/tools/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2013, 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
@@ -35,6 +35,7 @@
# Note: freetypecheck is built by Sanity.gmk if needed
SUBDIRS = \
addjsum \
+ addtorestrictedpkgs \
buildmetaindex \
cldrconverter \
commentchecker \
diff --git a/jdk/make/sun/awt/FILES_export_macosx.gmk b/jdk/make/tools/addtorestrictedpkgs/Makefile
similarity index 70%
rename from jdk/make/sun/awt/FILES_export_macosx.gmk
rename to jdk/make/tools/addtorestrictedpkgs/Makefile
index c7f0e00..53922d5 100644
--- a/jdk/make/sun/awt/FILES_export_macosx.gmk
+++ b/jdk/make/tools/addtorestrictedpkgs/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 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,21 @@
# questions.
#
-# FILES_export definitions for Mac OS X
+#
+# Makefile for building the addtorestrictedpkgs tool
+#
-FILES_export += \
- com/apple/resources/MacOSXResourceBundle.java
+BUILDDIR = ../..
+PACKAGE = build.tools.addtorestrictedpkgs
+PRODUCT = tools
+PROGRAM = addtorestrictedpkgs
+include $(BUILDDIR)/common/Defs.gmk
+
+BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
+BUILDTOOL_MAIN = $(PKGDIR)/AddToRestrictedPkgs.java
+
+#
+# Build tool jar rules.
+#
+include $(BUILDDIR)/common/BuildToolJar.gmk
+
diff --git a/jdk/make/tools/src/build/tools/addtorestrictedpkgs/AddToRestrictedPkgs.java b/jdk/make/tools/src/build/tools/addtorestrictedpkgs/AddToRestrictedPkgs.java
new file mode 100644
index 0000000..ee9deb4
--- /dev/null
+++ b/jdk/make/tools/src/build/tools/addtorestrictedpkgs/AddToRestrictedPkgs.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2013, 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 build.tools.addtorestrictedpkgs;
+
+import java.io.*;
+
+/**
+ * Adds additional packages to the package.access and package.definition
+ * security properties.
+ */
+public class AddToRestrictedPkgs {
+
+ private static final String PKG_ACC = "package.access";
+ private static final String PKG_DEF = "package.definition";
+ private static final int PKG_ACC_INDENT = 15;
+ private static final int PKG_DEF_INDENT = 19;
+
+ public static void main(String[] args) throws Exception {
+
+ if (args.length < 3) {
+ System.err.println("Usage: java AddToRestrictedPkgs " +
+ "[input java.security file name] " +
+ "[output java.security file name] " +
+ "[packages ...]");
+ System.exit(1);
+ }
+
+ try (FileReader fr = new FileReader(args[0]);
+ BufferedReader br = new BufferedReader(fr);
+ FileWriter fw = new FileWriter(args[1]);
+ BufferedWriter bw = new BufferedWriter(fw))
+ {
+ // parse the file line-by-line, looking for pkg access properties
+ String line = br.readLine();
+ while (line != null) {
+ if (line.startsWith(PKG_ACC)) {
+ writePackages(br, bw, line, PKG_ACC_INDENT, args);
+ } else if (line.startsWith(PKG_DEF)) {
+ writePackages(br, bw, line, PKG_DEF_INDENT, args);
+ } else {
+ writeLine(bw, line);
+ }
+ line = br.readLine();
+ }
+ bw.flush();
+ }
+ }
+
+ private static void writePackages(BufferedReader br, BufferedWriter bw,
+ String line, int numSpaces,
+ String[] args) throws IOException {
+ // parse property until EOL, not including line breaks
+ while (line.endsWith("\\")) {
+ writeLine(bw, line);
+ line = br.readLine();
+ }
+ // append comma and line-break to last package
+ writeLine(bw, line + ",\\");
+ // add new packages, one per line
+ for (int i = 2; i < args.length - 1; i++) {
+ indent(bw, numSpaces);
+ writeLine(bw, args[i] + ",\\");
+ }
+ indent(bw, numSpaces);
+ writeLine(bw, args[args.length - 1]);
+ }
+
+ private static void writeLine(BufferedWriter bw, String line)
+ throws IOException
+ {
+ bw.write(line);
+ bw.newLine();
+ }
+
+ private static void indent(BufferedWriter bw, int numSpaces)
+ throws IOException
+ {
+ for (int i = 0; i < numSpaces; i++) {
+ bw.append(' ');
+ }
+ }
+}
diff --git a/jdk/make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java b/jdk/make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java
index f573c57..f08b115 100644
--- a/jdk/make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java
+++ b/jdk/make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java
@@ -173,6 +173,12 @@
*/
private HashMap<String, HashSet<String>> knownPrefixMap = new HashMap<>();
+ /**
+ * Special value for the HashSet to indicate that there are classes in
+ * the top-level package.
+ */
+ private static final String TOP_LEVEL = "TOP";
+
/*
* A class for mapping package prefixes to the number of
* levels of package elements to include.
@@ -212,7 +218,7 @@
/*
- * We add maximum 5 second level entries to "sun", "java" and
+ * We add maximum 5 second level entries to "sun", "jdk", "java" and
* "javax" entries. Tune this parameter to get a balance on the
* cold start and footprint.
*/
@@ -223,6 +229,7 @@
JarMetaIndex(String fileName) throws IOException {
jar = new JarFile(fileName);
knownPrefixMap.put("sun", new HashSet<String>());
+ knownPrefixMap.put("jdk", new HashSet<String>());
knownPrefixMap.put("java", new HashSet<String>());
knownPrefixMap.put("javax", new HashSet<String>());
}
@@ -336,12 +343,12 @@
return false;
}
- String secondPkgElement = name.substring(firstSlashIndex + 1,
- name.indexOf("/",
- firstSlashIndex + 1));
-
/* Add the second level package name to the corresponding hashset. */
- if (secondPkgElement != null) {
+ int secondSlashIndex = name.indexOf("/", firstSlashIndex+1);
+ if (secondSlashIndex == -1) {
+ pkgSet.add(TOP_LEVEL);
+ } else {
+ String secondPkgElement = name.substring(firstSlashIndex+1, secondSlashIndex);
pkgSet.add(secondPkgElement);
}
@@ -368,8 +375,9 @@
if (setSize == 0) {
continue;
}
- else if (setSize > JarMetaIndex.MAX_PKGS_WITH_KNOWN_PREFIX) {
- indexSet.add(key + "/");
+ if (setSize > JarMetaIndex.MAX_PKGS_WITH_KNOWN_PREFIX ||
+ pkgSetStartsWithKey.contains(TOP_LEVEL)) {
+ indexSet.add(key + "/");
} else {
/* If the set contains less than MAX_PKGS_WITH_KNOWN_PREFIX, add
* them to the indexSet of the MetaIndex object.
diff --git a/jdk/makefiles/CompileJavaClasses.gmk b/jdk/makefiles/CompileJavaClasses.gmk
index e032f47..bc830d5 100644
--- a/jdk/makefiles/CompileJavaClasses.gmk
+++ b/jdk/makefiles/CompileJavaClasses.gmk
@@ -269,7 +269,10 @@
$(JDK_TOPDIR)/src/solaris/classes/java/net/DefaultInterface.java \
$(JDK_TOPDIR)/src/solaris/classes/java/lang/ClassLoaderHelper.java \
$(JDK_TOPDIR)/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \
- $(JDK_TOPDIR)/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java
+ $(JDK_TOPDIR)/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java \
+ $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
+ $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
+ $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
# JObjC.jar contains 1.5 byte-code...so skip it here :-(
# MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/jobjc/src
diff --git a/jdk/makefiles/CompileLaunchers.gmk b/jdk/makefiles/CompileLaunchers.gmk
index b3cc4e2..af5b358 100644
--- a/jdk/makefiles/CompileLaunchers.gmk
+++ b/jdk/makefiles/CompileLaunchers.gmk
@@ -52,8 +52,7 @@
ifeq ($(OPENJDK_TARGET_OS), macosx)
ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN)
else
- ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli) \
- $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
+ ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
endif
#
@@ -62,8 +61,7 @@
# devloper documentation of JAWT and what worked with OpenJDK6.
#
ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris), )
- ORIGIN_ARG += $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)) \
- $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR))
+ ORIGIN_ARG += $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR))
endif
define SetupLauncher
@@ -576,9 +574,7 @@
BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
endif
ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
- BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
- endif
+ BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
endif
# TODO:
diff --git a/jdk/makefiles/CompileNativeLibraries.gmk b/jdk/makefiles/CompileNativeLibraries.gmk
index 294f73b..57ef12e 100644
--- a/jdk/makefiles/CompileNativeLibraries.gmk
+++ b/jdk/makefiles/CompileNativeLibraries.gmk
@@ -56,9 +56,7 @@
# Absolute paths to lib files on windows for use in LDFLAGS. Should figure out a more
# elegant solution to this.
-WIN_VERIFY_LIB := $(JDK_OUTPUTDIR)/objs/libverify/verify.lib
WIN_JAVA_LIB := $(JDK_OUTPUTDIR)/objs/libjava/java.lib
-WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib
# Use this variable to set DEBUG_SYMBOLS true on windows for all libraries, but
# not on other platforms.
@@ -71,3386 +69,23 @@
DEBUG_ALL_BINARIES := true
endif
-#
-# TODO replace with X_FLAGS / X_LIBS
-# and add them to configure
-#
-OPENWIN_LIB := $(OPENWIN_HOME)/lib
-
##########################################################################################
-BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+include lib/CoreLibraries.gmk
-ifneq ($(OPENJDK_TARGET_OS), solaris)
- BUILD_LIBFDLIBM_OPTIMIZATION := NONE
-endif
+include lib/PlatformLibraries.gmk
-ifneq ($(OPENJDK_TARGET_OS), macosx)
- $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \
- STATIC_LIBRARY := fdlibm, \
- OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
- SRC := $(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src, \
- LANG := C, \
- OPTIMIZATION := $(BUILD_LIBFDLIBM_OPTIMIZATION), \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \
- CFLAGS_windows_debug := -DLOGGING, \
- ARFLAGS := $(ARFLAGS), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+include lib/NetworkingLibraries.gmk
-else
+include lib/NioLibraries.gmk
-# On macosx the old build does partial (incremental) linking of fdlibm instead of
-# a plain static library.
- $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM_MAC, \
- LIBRARY := fdlibm, \
- OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
- SRC := $(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src, \
- LANG := C, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \
- LDFLAGS := -nostdlib -r -arch x86_64, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+include lib/SecurityLibraries.gmk
- BUILD_LIBFDLIBM := $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX)
- $(BUILD_LIBFDLIBM): $(BUILD_LIBFDLIBM_MAC)
- $(call install-file)
+include lib/ServiceabilityLibraries.gmk
-endif
-BUILD_LIBRARIES += $(BUILD_LIBFDLIBM)
+include lib/Awt2dLibraries.gmk
-##########################################################################################
-
-BUILD_LIBVERIFY_SRC := check_code.c check_format.c
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifneq ($(OPENJDK_TARGET_CPU), x86_64)
- BUILD_LIBVERIFY_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libverify/reorder-$(OPENJDK_TARGET_CPU)
- endif
-endif
-
-LIBVERIFY_OPTIMIZATION := HIGH
-ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
- ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
- LIBVERIFY_OPTIMIZATION := LOW
- endif
-endif
-
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY, \
- LIBRARY := verify, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/common, \
- INCLUDE_FILES := $(BUILD_LIBVERIFY_SRC), \
- LANG := C, \
- OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
- CFLAGS := $(CFLAGS_JDKLIB), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libverify/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_posix := -ljvm -lc, \
- LDFLAGS_SUFFIX_windows := jvm.lib, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=verify.dll" \
- -D "JDK_INTERNAL_NAME=verify" \
- -D "JDK_FTYPE=0x2L", \
- REORDER := $(BUILD_LIBVERIFY_REORDER), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libverify, \
- DEBUG_SYMBOLS := true))
-
-BUILD_LIBRARIES += $(BUILD_LIBVERIFY)
-
-##########################################################################################
-
-LIBJAVA_SRC_DIRS := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/lang \
- $(JDK_TOPDIR)/src/share/native/java/lang \
- $(JDK_TOPDIR)/src/share/native/java/lang/ref \
- $(JDK_TOPDIR)/src/share/native/java/lang/reflect \
- $(JDK_TOPDIR)/src/share/native/java/io \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io \
- $(JDK_TOPDIR)/src/share/native/java/nio \
- $(JDK_TOPDIR)/src/share/native/java/security \
- $(JDK_TOPDIR)/src/share/native/common \
- $(JDK_TOPDIR)/src/share/native/sun/misc \
- $(JDK_TOPDIR)/src/share/native/sun/reflect \
- $(JDK_TOPDIR)/src/share/native/java/util \
- $(JDK_TOPDIR)/src/share/native/java/util/concurrent/atomic \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/util
-
-ifneq ($(OPENJDK_TARGET_OS), macosx)
- LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/util/locale/provider
-else
- LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/util/locale/provider
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/provider \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/io
-endif
-
-LIBJAVA_CFLAGS := $(foreach dir, $(LIBJAVA_SRC_DIRS), -I$(dir)) \
- -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include \
- -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
-
-LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
- -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
- -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \
- -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"'
-
-ifneq (, $(JDK_UPDATE_VERSION))
- LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"'
-endif
-
-LIBJAVA_EXCLUDE_FILES := check_code.c check_format.c jspawnhelper.c
-
-ifneq ($(OPENJDK_TARGET_OS), macosx)
- LIBJAVA_EXCLUDE_FILES += java_props_macosx.c
-else
- BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
- BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBJAVA_EXCLUDE_FILES += \
- UNIXProcess_md.c \
- UnixFileSystem_md.c \
- FileSystemPreferences.c
-else
- LIBJAVA_EXCLUDE_FILES += \
- ProcessImpl_md.c \
- WinNTFileSystem_md.c \
- dirent_md.c \
- WindowsPreferences.c \
- sun/security/provider/WinCAPISeedGenerator.c \
- sun/io/Win32ErrorMode.c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifneq ($(OPENJDK_TARGET_CPU), x86_64)
- LIBJAVA_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU)
- endif
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \
- LIBRARY := java, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBJAVA_SRC_DIRS), \
- EXCLUDES := fdlibm/src zip, \
- EXCLUDE_FILES := $(LIBJAVA_EXCLUDE_FILES), \
- LANG := C, \
- OPTIMIZATION := HIGH, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(LIBJAVA_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjava/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_posix := -ljvm -lverify, \
- LDFLAGS_SUFFIX_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \
- LDFLAGS_SUFFIX_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \
- LDFLAGS_SUFFIX_macosx := -L$(JDK_OUTPUTDIR)/objs/ -lfdlibm \
- -framework CoreFoundation \
- -framework Foundation \
- -framework Security -framework SystemConfiguration, \
- LDFLAGS_SUFFIX_windows := -export:winFileHandleOpen -export:handleLseek \
- jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \
- shell32.lib delayimp.lib -DELAYLOAD:shell32.dll \
- advapi32.lib, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=java.dll" \
- -D "JDK_INTERNAL_NAME=java" \
- -D "JDK_FTYPE=0x2L", \
- REORDER := $(LIBJAVA_REORDER), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjava, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-BUILD_LIBRARIES += $(BUILD_LIBJAVA)
-
-$(BUILD_LIBJAVA): $(LIBJLI_BINARY)
-
-$(BUILD_LIBJAVA): $(BUILD_LIBVERIFY)
-
-$(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
-
-##########################################################################################
-
-BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/share/native/sun/awt/medialib
-BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
- -I$(BUILD_LIBMLIB_SRC) \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/medialib
-
-BUILD_LIBMLIB_LDLIBS :=
-BUILD_LIBMLIB_IMAGE_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libmlib_image/mapfile-vers
-
-BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH
-
-ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
- BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT
-endif
-
-ifneq ($(OPENJDK_TARGET_OS), windows)
- BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL)
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \
- LIBRARY := mlib_image, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(BUILD_LIBMLIB_SRC), \
- EXCLUDE_FILES := awt_ImagingLib.c mlib_c_ImageBlendTable.c, \
- LANG := C, \
- OPTIMIZATION := HIGHEST, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(BUILD_LIBMLIB_CFLAGS), \
- MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(BUILD_LIBMLIB_LDLIBS) \
- $(LDFLAGS_JDKLIB_SUFFIX), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=mlib_image.dll" \
- -D "JDK_INTERNAL_NAME=mlib_image" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmlib_image, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-$(BUILD_LIBMLIB_IMAGE): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE)
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
-
- BUILD_LIBMLIB_IMAGE_V_FILES := \
- mlib_v_ImageLookUp.c \
- mlib_ImageCreate.c \
- mlib_ImageAffine.c \
- mlib_ImageConvMxN.c \
- mlib_ImageConvKernelConvert.c \
- mlib_sys.c \
- mlib_ImageLookUp_64.c \
- mlib_ImageLookUp_Bit.c \
- mlib_ImageColorTrue2Index.c \
- mlib_c_ImageThresh1_U8.c \
- mlib_v_ImageLookUpS16S16Func.c \
- mlib_v_ImageLookUpS16S32Func.c \
- mlib_v_ImageLookUpS16U16Func.c \
- mlib_v_ImageLookUpS16U8Func.c \
- mlib_v_ImageLookUpS32S16Func.c \
- mlib_v_ImageLookUpS32S32Func.c \
- mlib_v_ImageLookUpS32U16Func.c \
- mlib_v_ImageLookUpS32U8Func.c \
- mlib_v_ImageLookUpSIS16S16Func.c \
- mlib_v_ImageLookUpSIS16S32Func.c \
- mlib_v_ImageLookUpSIS16U16Func.c \
- mlib_v_ImageLookUpSIS16U8Func.c \
- mlib_v_ImageLookUpSIS32S16Func.c \
- mlib_v_ImageLookUpSIS32S32Func.c \
- mlib_v_ImageLookUpSIS32U16Func.c \
- mlib_v_ImageLookUpSIS32U8Func.c \
- mlib_v_ImageLookUpSIU16S16Func.c \
- mlib_v_ImageLookUpSIU16S32Func.c \
- mlib_v_ImageLookUpSIU16U16Func.c \
- mlib_v_ImageLookUpSIU16U8Func.c \
- mlib_v_ImageLookUpSIU8S16Func.c \
- mlib_v_ImageLookUpSIU8S32Func.c \
- mlib_v_ImageLookUpSIU8U16Func.c \
- mlib_v_ImageLookUpSIU8U8Func.c \
- mlib_v_ImageLookUpU16S16Func.c \
- mlib_v_ImageLookUpU16S32Func.c \
- mlib_v_ImageLookUpU16U16Func.c \
- mlib_v_ImageLookUpU16U8Func.c \
- mlib_v_ImageLookUpU8S16Func.c \
- mlib_v_ImageLookUpU8S32Func.c \
- mlib_v_ImageLookUpU8U16Func.c \
- mlib_v_ImageLookUpU8U8Func.c \
- mlib_v_ImageAffineIndex_BC.c \
- mlib_v_ImageAffine_BC.c \
- mlib_v_ImageAffine_BC_S16.c \
- mlib_v_ImageAffine_BC_U16.c \
- mlib_v_ImageAffine_BL.c \
- mlib_v_ImageAffine_BL_S16.c \
- mlib_v_ImageAffine_BL_U16.c \
- mlib_v_ImageAffine_NN.c \
- mlib_v_ImageFilters.c \
- mlib_ImageAffineEdge.c \
- mlib_ImageAffine_BC_D64.c \
- mlib_ImageAffine_BC_F32.c \
- mlib_ImageAffine_BC_S32.c \
- mlib_ImageAffine_BL_D64.c \
- mlib_ImageAffine_BL_F32.c \
- mlib_ImageAffine_BL_S32.c \
- mlib_ImageAffine_NN.c \
- mlib_ImageAffine_NN_Bit.c \
- mlib_ImageFilters.c \
- mlib_ImageScanPoly.c \
- mlib_ImageConv_8nw.c \
- mlib_ImageConv_8ext.c \
- mlib_ImageConv_16nw.c \
- mlib_ImageConv_16ext.c \
- mlib_ImageConv_u16nw.c \
- mlib_ImageConv_u16ext.c \
- mlib_ImageConv_32nw.c \
- mlib_ImageConv_F32nw.c \
- mlib_ImageConvMxN_Fp.c \
- mlib_ImageConvMxN_ext.c \
- mlib_ImageConv_D64nw.c \
- mlib_ImageClipping.c \
- mlib_ImageConvCopyEdge_Bit.c \
- mlib_ImageConvClearEdge_Bit.c \
- mlib_ImageConv2x2_f.c \
- mlib_ImageConvClearEdge_Fp.c \
- mlib_v_ImageConvMxN_8.c \
- mlib_v_ImageConvClearEdge.c \
- mlib_v_ImageConvCopyEdge.c \
- mlib_v_ImageConvMxN_8ext.c \
- mlib_v_ImageConvVersion.c \
- mlib_v_ImageConv_8nw.c \
- mlib_ImageConvCopyEdge_Fp.c \
- mlib_v_ImageChannelInsert_1.c \
- mlib_v_ImageChannelExtract_43.c \
- mlib_v_ImageChannelExtract_1.c \
- mlib_ImageCopy_Bit.c \
- mlib_v_ImageCopy_f.c \
- mlib_ImageUtils.c \
- mlib_ImageDivTables.c
-
- BUILD_LIBMLIB_V_CFLAGS := $(filter-out -DMLIB_NO_LIBSUNMATH, $(BUILD_LIBMLIB_CFLAGS))
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE_V, \
- LIBRARY := mlib_image_v, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/awt/medialib \
- $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib, \
- LANG := C, \
- INCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_FILES), \
- OPTIMIZATION := HIGHEST, \
- CFLAGS := -xarch=sparcvis \
- $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il \
- $(BUILD_LIBMLIB_V_CFLAGS) \
- $(CFLAGS_JDKLIB), \
- MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmlib_image_v, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBMLIB_IMAGE_V): $(BUILD_LIBJAVA)
-
- BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE_V)
-
-endif
-
-##########################################################################################
-
-LIBAWT_DIRS := \
- $(JDK_TOPDIR)/src/share/native/sun/awt \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
- $(JDK_TOPDIR)/src/share/native/sun/awt/image \
- $(JDK_TOPDIR)/src/share/native/sun/awt/image/gif \
- $(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
- $(JDK_TOPDIR)/src/share/native/sun/awt/medialib \
- $(JDK_TOPDIR)/src/share/native/sun/awt/debug \
- $(JDK_TOPDIR)/src/share/native/sun/awt/utility \
- $(JDK_TOPDIR)/src/share/native/sun/java2d \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
- $(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
- $(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
- $(JDK_TOPDIR)/src/share/native/sun/awt/image \
- $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
- $(JDK_TOPDIR)/src/share/native/sun/font
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBAWT_DIRS += \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/d3d
-else
- LIBAWT_DIRS += \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11
-endif
-
-LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
- $(X_CFLAGS) \
- $(foreach dir, $(LIBAWT_DIRS), -I$(dir))
-
-LIBAWT_FILES := \
- gifdecoder.c \
- imageInitIDs.c \
- img_globals.c \
- SurfaceData.c \
- Region.c \
- BufImgSurfaceData.c \
- Disposer.c \
- Trace.c \
- GraphicsPrimitiveMgr.c \
- Blit.c \
- BlitBg.c \
- ScaledBlit.c \
- FillRect.c \
- FillSpans.c \
- FillParallelogram.c \
- DrawParallelogram.c \
- DrawLine.c \
- DrawRect.c \
- DrawPolygons.c \
- DrawPath.c \
- FillPath.c \
- ProcessPath.c \
- MaskBlit.c \
- MaskFill.c \
- TransformHelper.c \
- AlphaMath.c \
- AlphaMacros.c \
- AnyByte.c \
- ByteBinary1Bit.c \
- ByteBinary2Bit.c \
- ByteBinary4Bit.c \
- ByteIndexed.c \
- ByteGray.c \
- Index8Gray.c \
- Index12Gray.c \
- AnyShort.c \
- Ushort555Rgb.c \
- Ushort565Rgb.c \
- Ushort4444Argb.c \
- Ushort555Rgbx.c \
- UshortGray.c \
- UshortIndexed.c \
- Any3Byte.c \
- ThreeByteBgr.c \
- AnyInt.c \
- IntArgb.c \
- IntArgbPre.c \
- IntArgbBm.c \
- IntRgb.c \
- IntBgr.c \
- IntRgbx.c \
- Any4Byte.c \
- FourByteAbgr.c \
- FourByteAbgrPre.c \
- BufferedMaskBlit.c \
- BufferedRenderPipe.c \
- ShapeSpanIterator.c \
- SpanClipRenderer.c \
- awt_ImageRep.c \
- awt_ImagingLib.c \
- awt_Mlib.c \
- awt_parseImage.c \
- DataBufferNative.c \
- dither.c \
- debug_assert.c \
- debug_mem.c \
- debug_trace.c \
- debug_util.c
-
-ifneq (, $(filter $(OPENJDK_TARGET_OS), solaris linux))
- LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBAWT_FILES += awt_LoadLibrary.c img_colors.c
- LIBAWT_DIRS += $(JDK_TOPDIR)/src/macosx/native/com/apple/resources
- LIBAWT_FILES += awt_LoadLibrary.c MacOSXResourceBundle.m
- LIBAWT_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks
-
- LIBAWT_MacOSXResourceBundle.m_CFLAGS := -O0
-endif
-
-ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
- LIBAWT_CFLAGS += -DMLIB_ADD_SUFF
- LIBAWT_CFLAGS += -xarch=sparcvis
- LIBAWT_CFLAGS += $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il
- LIBAWT_CFLAGS += \
- -I$(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib \
- -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d/medialib \
- -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d/loops
-
- LIBAWT_DIRS += $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib \
- $(JDK_TOPDIR)/src/solaris/native/sun/java2d/loops
-
- LIBAWT_FILES += \
- vis_FuncArray.c \
- java2d_Mlib.c \
- mlib_ImageCreate.c \
- mlib_ImageZoom_NN.c \
- mlib_ImageCopy_Bit.c \
- mlib_sys.c \
- mlib_v_ImageClear.c \
- mlib_v_ImageClear_f.c \
- mlib_v_ImageConstXor.c \
- mlib_v_ImageCopy.c \
- mlib_v_ImageCopy_f.c \
- mlib_v_ImageXor.c \
- mlib_v_ImageZoom_NN_f.c \
- vis_Interp.c \
- vis_AlphaMacros.c \
- vis_AlphaMaskBlit.c \
- vis_AlphaMaskFill.c \
- vis_ByteGray.c \
- vis_ByteGray_FromRgb.c \
- vis_ByteGray_Mask.c \
- vis_ByteIndexed.c \
- vis_DrawLine.c \
- vis_FourByteAbgr.c \
- vis_IntArgb.c \
- vis_IntArgbPre.c \
- vis_IntArgbPre_Mask.c \
- vis_IntBgr.c \
- vis_IntRgb.c \
- vis_IntRgbx.c \
- vis_SrcMaskFill.c \
- vis_SrcOverMaskBlit.c \
- vis_SrcOverMaskFill.c \
- vis_FourByteAbgrPre.c \
- vis_GlyphList.c \
- vis_GlyphListXor.c \
- vis_IntArgbBm.c \
- vis_ThreeByteBgr.c \
- vis_UshortGray.c \
- vis_UshortGray_FromRgb.c \
- vis_XorBlit.c \
- mlib_v_ImageCopy_blk.s
-
- ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
- LIBAWT_ASFLAGS = -P -xarch=v9a
- else
- LIBAWT_ASFLAGS = -P -xarch=v8plusa
- endif
-else
- LIBAWT_FILES += MapAccelFunc.c
-endif
-
-ifneq ($(OPENJDK_TARGET_OS), solaris)
- LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
-endif
-
-LIBAWT_LANG := C
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBAWT_FILES += AccelGlyphCache.c \
- ShaderList.c \
- CmdIDList.cpp \
- Hashtable.cpp \
- GDIHashtable.cpp \
- Devices.cpp \
- ObjectList.cpp \
- GDIBlitLoops.cpp \
- GDIRenderer.cpp \
- GDIWindowSurfaceData.cpp \
- WindowsFlags.cpp \
- WPrinterJob.cpp \
- awt_%.cpp \
- D3DBlitLoops.cpp \
- D3DBufImgOps.cpp \
- D3DContext.cpp \
- D3DGlyphCache.cpp \
- D3DGraphicsDevice.cpp \
- D3DMaskBlit.cpp \
- D3DMaskCache.cpp \
- D3DMaskFill.cpp \
- D3DPipelineManager.cpp \
- D3DPaints.cpp \
- D3DRenderer.cpp \
- D3DRenderQueue.cpp \
- D3DResourceManager.cpp \
- D3DSurfaceData.cpp \
- D3DTextRenderer.cpp \
- D3DVertexCacher.cpp \
- ShellFolder2.cpp \
- ThemeReader.cpp \
- ComCtl32Util.cpp \
- DllUtil.cpp \
- initIDs.cpp \
- MouseInfo.cpp \
- rect.c \
- OGLBlitLoops.c \
- OGLBufImgOps.c \
- OGLContext.c \
- OGLFuncs.c \
- OGLMaskBlit.c \
- OGLMaskFill.c \
- OGLPaints.c \
- OGLRenderQueue.c \
- OGLRenderer.c \
- OGLSurfaceData.c \
- OGLTextRenderer.c \
- OGLVertexCache.c \
- WGLGraphicsConfig.c \
- WGLSurfaceData.c
-
- LIBAWT_LANG := C++
- LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
- ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
- LIBAWT_CFLAGS += -DMLIB_OS64BIT
- endif
-
- ifdef OPENJDK
- LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/windows/resource/icons"
- else
- LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows"
- endif
- LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/native/sun/windows/awt.rc
-endif
-
-ifeq ($(MILESTONE), internal)
- LIBAWT_CFLAGS += -DINTERNAL_BUILD
-endif
-
-LIBAWT_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libawt/mapfile-vers
-ifeq ($(OPENJDK_TARGET_OS), linux)
- LIBAWT_MAPFILE :=
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \
- LIBRARY := awt, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBAWT_DIRS), \
- INCLUDE_FILES := $(LIBAWT_FILES), \
- LANG := $(LIBAWT_LANG), \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
- ASFLAGS := $(LIBAWT_ASFLAGS), \
- MAPFILE := $(LIBAWT_MAPFILE), \
- LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_solaris := -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \
- LDFLAGS_SUFFIX_linux := -ljvm $(LIBM) $(LIBDL) -ljava, \
- LDFLAGS_SUFFIX_solaris := -ljvm $(LIBM) $(LIBDL) -ljava -lc, \
- LDFLAGS_SUFFIX_macosx := -lmlib_image -ljvm $(LIBM) \
- -framework Cocoa \
- -framework OpenGL \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -framework JavaNativeFoundation \
- -framework JavaRuntimeSupport \
- -framework ApplicationServices \
- -framework AudioToolbox \
- -ljava, \
- LDFLAGS_SUFFIX_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \
- imm32.lib ole32.lib uuid.lib shell32.lib \
- comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \
- delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib \
- -DELAYLOAD:user32.dll -DELAYLOAD:gdi32.dll \
- -DELAYLOAD:shell32.dll -DELAYLOAD:winmm.dll \
- -DELAYLOAD:winspool.drv -DELAYLOAD:imm32.dll \
- -DELAYLOAD:ole32.dll -DELAYLOAD:comdlg32.dll \
- -DELAYLOAD:comctl32.dll -DELAYLOAD:shlwapi.dll, \
- VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
- RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
- -D "JDK_FNAME=awt.dll" \
- -D "JDK_INTERNAL_NAME=awt" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-$(BUILD_LIBAWT): $(BUILD_LIBJAVA)
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- $(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE)
-endif
-
-BUILD_LIBRARIES += $(BUILD_LIBAWT)
-
-##########################################################################################
-
-# TODO!!
-# Even though this variable as a general name, it is
-# only used on macos, in fontpath.c, as prefix for where to find fonts.
-#
-# It's used for libawt_headless _and_ libawt_xawt
-#
-X11_PATH := /usr/X11R6
-
-ifneq ($(OPENJDK_TARGET_OS), windows)
- ifndef BUILD_HEADLESS_ONLY
-
- LIBAWT_XAWT_DIRS := \
- $(JDK_TOPDIR)/src/share/native/sun/awt/debug \
- $(JDK_TOPDIR)/src/share/native/sun/awt/utility \
- $(JDK_TOPDIR)/src/share/native/sun/font \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \
- $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/xawt \
-
- LIBAWT_XAWT_CFLAGS := -DXAWT -DXAWT_HACK \
- -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
- $(CUPS_CFLAGS) \
- $(foreach dir, $(LIBAWT_XAWT_DIRS), -I$(dir)) \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga
-
- ifeq ($(OPENJDK_TARGET_OS), solaris)
- LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15
- endif
-
- ifeq ($(OPENJDK_TARGET_OS), linux)
- ifndef OPENJDK
- include $(JDK_TOPDIR)/make/closed/xawt.gmk
- endif
-
- ifeq ($(DISABLE_XRENDER), true)
- LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
- endif
- endif
-
- ifeq ($(MILESTONE), internal)
- LIBAWT_XAWT_CFLAGS += -DINTERNAL_BUILD
- endif
-
- LIBAWT_XAWT_FILES := \
- XlibWrapper.c \
- XWindow.c \
- XToolkit.c \
- X11Color.c \
- X11SurfaceData.c \
- awt_GraphicsEnv.c \
- awt_InputMethod.c \
- robot_common.c \
- awt_Robot.c \
- list.c \
- multiVis.c \
- initIDs.c \
- awt_util.c \
- awt_Desktop.c \
- awt_UNIXToolkit.c \
- X11FontScaler_md.c \
- X11TextRenderer_md.c \
- fontpath.c \
- awt_Insets.c \
- awt_Event.c \
- X11Renderer.c \
- X11PMBlitLoops.c \
- OGLBlitLoops.c \
- OGLBufImgOps.c \
- OGLContext.c \
- OGLFuncs.c \
- OGLMaskBlit.c \
- OGLMaskFill.c \
- OGLPaints.c \
- OGLRenderQueue.c \
- OGLRenderer.c \
- OGLSurfaceData.c \
- OGLTextRenderer.c \
- OGLVertexCache.c \
- GLXGraphicsConfig.c \
- GLXSurfaceData.c \
- AccelGlyphCache.c \
- awt_Font.c \
- multi_font.c \
- awt_AWTEvent.c \
- awt_DrawingSurface.c \
- jawt.c \
- CUPSfuncs.c \
- debug_assert.c \
- debug_mem.c \
- debug_trace.c \
- debug_util.c \
- awt_Plugin.c \
- gnome_interface.c \
- gtk2_interface.c \
- swing_GTKEngine.c \
- swing_GTKStyle.c \
- rect.c \
- sun_awt_X11_GtkFileDialogPeer.c \
- XRSurfaceData.c \
- XRBackendNative.c
-
- LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
-
- ifeq ($(OPENJDK_TARGET_OS), linux)
- # To match old build, add this to LDFLAGS instead of suffix.
- LIBAWT_XAWT_LDFLAGS += -lpthread
- endif
-
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBAWT_XAWT_LDFLAGS_SUFFIX += -lpthread
- endif
-
- # On macosx, the shared library origin is set twice for this lib.
- $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT, \
- LIBRARY := awt_xawt, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBAWT_XAWT_DIRS), \
- INCLUDE_FILES := $(LIBAWT_XAWT_FILES), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
- $(X_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libawt_xawt/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(X_LIBS) $(LIBAWT_XAWT_LDFLAGS), \
- LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN) \
- $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
- LDFLAGS_solaris := -L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) \
- -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) \
- -R$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) \
- -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) \
- -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \
- $(call SET_SHARED_LIBRARY_ORIGIN) \
- $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
- LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN) \
- $(call SET_SHARED_LIBRARY_ORIGIN). \
- $(call SET_SHARED_LIBRARY_ORIGIN) \
- $(call SET_SHARED_LIBRARY_ORIGIN)., \
- LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=xawt.dll" \
- -D "JDK_INTERNAL_NAME=xawt" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_xawt, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBAWT_XAWT): $(BUILD_LIBJAVA)
-
- $(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT)
-
- BUILD_LIBRARIES += $(BUILD_LIBAWT_XAWT)
-
- endif
-endif
-
-##########################################################################################
-
-BUILD_LIBZIP_EXCLUDES :=
-ifeq ($(USE_EXTERNAL_LIBZ), true)
- LIBZ := -lz
- LIBZIP_EXCLUDES += zlib-1.2.5
-else
- ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
-endif
-
-BUILD_LIBZIP_REORDER :=
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifneq ($(OPENJDK_TARGET_CPU), x86_64)
- BUILD_LIBZIP_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libzip/reorder-$(OPENJDK_TARGET_CPU)
- endif
-endif
-
-ifeq ($(LIBZIP_CAN_USE_MMAP), true)
- BUILD_LIBZIP_MMAP := -DUSE_MMAP
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \
- LIBRARY := zip, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- SRC := $(JDK_TOPDIR)/src/share/native/java/util/zip, \
- EXCLUDES := $(LIBZIP_EXCLUDES), \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(ZLIB_CPPFLAGS) \
- -I$(JDK_TOPDIR)/src/share/native/java/io \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io, \
- CFLAGS_posix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libzip/mapfile-vers, \
- REORDER := $(BUILD_LIBZIP_REORDER), \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN) \
- $(EXPORT_ZIP_FUNCS), \
- LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \
- -export:ZIP_ReadEntry -export:ZIP_GetNextEntry jvm.lib \
- $(WIN_JAVA_LIB), \
- LDFLAGS_SUFFIX_linux := -ljvm -ljava $(LIBZ), \
- LDFLAGS_SUFFIX_solaris := -ljvm -ljava $(LIBZ) -lc, \
- LDFLAGS_SUFFIX_macosx := $(LIBZ) -ljava -ljvm, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=zip.dll" \
- -D "JDK_INTERNAL_NAME=zip" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libzip, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-
-$(BUILD_LIBZIP): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBZIP)
-
-##########################################################################################
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK, \
- LIBRARY := unpack, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack, \
- EXCLUDE_FILES := main.cpp, \
- LANG := C++, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CXXFLAGS_JDKLIB) \
- -DNO_ZLIB -DUNPACK_JNI -DFULL, \
- CFLAGS_release := -DPRODUCT, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_windows := -map:$(JDK_OUTPUTDIR)/objs/unpack.map -debug \
- jvm.lib $(WIN_JAVA_LIB), \
- LDFLAGS_SUFFIX_posix := -ljvm $(LIBCXX) -ljava -lc, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libunpack, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=unpack.dll" \
- -D "JDK_INTERNAL_NAME=unpack" \
- -D "JDK_FTYPE=0x2L", \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-$(BUILD_LIBUNPACK): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBUNPACK)
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.map: $(BUILD_LIBUNPACK)
- $(ECHO) Copying $(@F)
- $(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX), %.map, $<) $@
-
- $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.pdb: $(BUILD_LIBUNPACK)
- $(ECHO) Copying $(@F)
- $(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX), %.pdb, $<) $@
-endif
-
-##########################################################################################
-
-LIBATTACH_EXCLUDE_FILES :=
-ifneq ($(OPENJDK_TARGET_OS), solaris)
- LIBATTACH_EXCLUDE_FILES += SolarisVirtualMachine.c
-endif
-ifneq ($(OPENJDK_TARGET_OS), linux)
- LIBATTACH_EXCLUDE_FILES += LinuxVirtualMachine.c
-endif
-ifneq ($(OPENJDK_TARGET_OS), macosx)
- LIBATTACH_EXCLUDE_FILES += BsdVirtualMachine.c
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBATTACH, \
- LIBRARY := attach, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tools/attach, \
- EXCLUDE_FILES := $(LIBATTACH_EXCLUDE_FILES), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB), \
- CFLAGS_windows := /Gy, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=attach.dll" \
- -D "JDK_INTERNAL_NAME=attach" \
- -D "JDK_FTYPE=0x2L", \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_solaris := -ldoor, \
- LDFLAGS_windows := /ORDER:@$(JDK_TOPDIR)/makefiles/mapfiles/libattach/reorder-windows-$(OPENJDK_TARGET_CPU), \
- LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
- LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib psapi.lib, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libattach, \
- DEBUG_SYMBOLS := true))
-
-$(BUILD_LIBATTACH): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBATTACH)
-
-##########################################################################################
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBDT_SOCKET, \
- LIBRARY := dt_socket, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/transport/socket \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
- -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
- -I$(JDK_TOPDIR)/src/share/transport/socket \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket \
- -I$(JDK_TOPDIR)/src/share/back/export \
- -I$(JDK_TOPDIR)/src/share/back, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libdt_socket/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_linux := -lpthread, \
- LDFLAGS_SUFFIX_solaris := -lnsl -lsocket -lc, \
- LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX) -export:jdwpTransport_OnLoad ws2_32.lib, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=dt_socket.dll" \
- -D "JDK_INTERNAL_NAME=dt_socket" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdt_socket, \
- DEBUG_SYMBOLS := true))
-
-$(BUILD_LIBDT_SOCKET): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBDT_SOCKET)
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBDT_SHMEM, \
- LIBRARY := dt_shmem, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/com/sun/tools/jdi \
- $(JDK_TOPDIR)/src/share/transport/shmem \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
- -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
- -I$(JDK_TOPDIR)/src/share/transport/shmem \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem \
- -I$(JDK_TOPDIR)/src/share/back/export, \
- LDFLAGS := $(LDFLAGS_JDKLIB), \
- LDFLAGS_windows := -export:jdwpTransport_OnLoad, \
- LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=dt_shmem.dll" \
- -D "JDK_INTERNAL_NAME=dt_shmem" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdt_shmem, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBDT_SHMEM)
-
-endif # OPENJDK_TARGET_OS
-
-##########################################################################################
-# JDWP_LOGGING causes log messages to be compiled into the library.
-$(eval $(call SetupNativeCompilation,BUILD_LIBJDWP, \
- LIBRARY := jdwp, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/back $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING \
- -I$(JDK_TOPDIR)/src/share/transport/export \
- -I$(JDK_TOPDIR)/src/share/back/export \
- -I$(JDK_TOPDIR)/src/share/npt \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \
- -I$(JDK_TOPDIR)/src/share/back \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back \
- -I$(JDK_OUTPUTDIR)/gensrc_jdwp_headers, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjdwp/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_linux := $(LIBDL), \
- LDFLAGS_SUFFIX_solaris := $(LIBDL) -lc, \
- LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=jdwp.dll" \
- -D "JDK_INTERNAL_NAME=jdwp" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjdwp, \
- DEBUG_SYMBOLS := true))
-
-$(BUILD_LIBJDWP): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBJDWP)
-
-##########################################################################################
-
-LIBJAAS_MAPFILE :=
-ifneq ($(OPENJDK_TARGET_OS), solaris)
- LIBJAAS_EXCLUDE_FILES := Solaris.c
-else
- # only on solaris...wonder why
- LIBJAAS_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjaas/mapfile-vers
-endif
-
-LIBJAAS_NAME := jaas_unix
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBJAAS_NAME := jaas_nt
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJAAS, \
- LIBRARY := $(LIBJAAS_NAME), \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/security/auth/module, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB), \
- MAPFILE := $(LIBJAAS_MAPFILE), \
- LDFLAGS := $(filter-out -ljava, $(LDFLAGS_JDKLIB)) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_windows := netapi32.lib user32.lib mpr.lib advapi32.lib, \
- LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- EXCLUDE_FILES := $(LIBJAAS_EXCLUDE_FILES), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=$(LIBJAAS_NAME).dll" \
- -D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjaas, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-$(BUILD_LIBJAAS): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBJAAS)
-
-##########################################################################################
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJSDT, \
- LIBRARY := jsdt, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tracing/dtrace, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjsdt/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_linux := $(LIBDL), \
- LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX) $(LIBDL), \
- LDFLAGS_SUFFIX_macosx := $(LIBDL), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=jsdt.dll" \
- -D "JDK_INTERNAL_NAME=jsdt" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsdt, \
- DEBUG_SYMBOLS := true))
-
-$(BUILD_LIBJSDT): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBJSDT)
-
-##########################################################################################
-
-# TODO: Update awt lib path when awt is converted
-$(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
- LIBRARY := lcms, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
- LANG := C, \
- OPTIMIZATION := HIGHEST, \
- CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
- $(SHARED_LIBRARY_FLAGS) \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
- CFLAGS_solaris := -xc99=no_lib, \
- CFLAGS_windows := -DCMS_IS_WINDOWS_, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/liblcms/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
- LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
- LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \
- LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
- LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=lcms.dll" \
- -D "JDK_INTERNAL_NAME=lcms" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-BUILD_LIBRARIES += $(BUILD_LIBLCMS)
-
-$(BUILD_LIBLCMS): $(BUILD_LIBAWT)
-
-##########################################################################################
-
-ifdef OPENJDK
- BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers
-else
- BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers-closed
- BUILD_LIBJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
- BUILD_LIBJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJPEG_CLOSED_SRC)
-endif
-
-BUILD_LIBJPEG_REORDER :=
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifneq ($(OPENJDK_TARGET_CPU), x86_64)
- BUILD_LIBJPEG_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
- endif
-endif
-
-# Suppress gcc warnings like "variable might be clobbered by 'longjmp'
-# or 'vfork'": this warning indicates that some variable is placed to
-# a register by optimized compiler and it's value might be lost on longjmp().
-# Recommended way to avoid such warning is to declare the variable as
-# volatile to prevent the optimization. However, this approach does not
-# work because we have to declare all variables as volatile in result.
-#ifndef CROSS_COMPILE_ARCH
-# CC_43_OR_NEWER := \
-# $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
-# \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
-# ifeq ($(CC_43_OR_NEWER), 1)
-# BUILD_LIBJPEG_CFLAGS_linux += -Wno-clobbered
-# endif
-#endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJPEG, \
- LIBRARY := jpeg, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \
- $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
- LANG := C, \
- OPTIMIZATION := HIGHEST, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(BUILD_LIBJPEG_CLOSED_INCLUDES) \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
- MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
- LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=jpeg.dll" \
- -D "JDK_INTERNAL_NAME=jpeg" \
- -D "JDK_FTYPE=0x2L", \
- REORDER := $(BUILD_LIBJPEG_REORDER), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-$(BUILD_LIBJPEG): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBJPEG)
-
-##########################################################################################
-
-ifndef OPENJDK
- FONT_HEADERS := -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k
- BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers
- LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c
-else
- FONT_HEADERS := $(FREETYPE2_CFLAGS)
- BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers.openjdk
- BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE2_LIBS)
-endif
-
-LIBFONTMANAGER_OPTIMIZATION := HIGH
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
- X11TextRenderer.c
- LIBFONTMANAGER_OPTIMIZATION := HIGHEST
-else
- LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
- lcdglyph.c
-endif
-
-BUILD_LIBFONTMANAGER_CFLAGS_COMMON := \
- $(X_CFLAGS) \
- -DLE_STANDALONE -DHEADLESS \
- $(FONT_HEADERS) \
- -I$(JDK_TOPDIR)/src/share/native/sun/font \
- -I$(JDK_TOPDIR)/src/share/native/sun/font/layout \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d
-
-# Turn off aliasing with GCC for ExtensionSubtables.cpp
-ifeq ($(OPENJDK_TARGET_OS), linux)
- BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
- LIBRARY := fontmanager, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/font \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font, \
- EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
- AccelGlyphCache.c, \
- LANG := C++, \
- CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON), \
- CXXFLAGS := $(CXXFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON), \
- OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
- CFLAGS_windows = -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
- -DCC_NOEX, \
- MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \
- LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \
- LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
- LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
- LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
- -ljava -ljvm, \
- LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
- $(WIN_AWT_LIB), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=fontmanager.dll" \
- -D "JDK_INTERNAL_NAME=fontmanager" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfontmanager, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
-
-ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris macosx))
- $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_XAWT)
-endif
-
-BUILD_LIBRARIES += $(BUILD_LIBFONTMANAGER)
-
-##########################################################################################
-
-ifndef OPENJDK
-
- #ifeq ($(OPENJDK_TARGET_OS), linux)
- # ifeq ("$(CC_VER_MAJOR)", "3")
- # OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
- # endif
- #endif
- #
- # The resulting size of the t2k lib file is (at least on linux) dependant on the order of
- # the input .o files. Because of this the new build will differ in size to the old build.
- BUILD_LIBT2K_CFLAGS_COMMON := -I$(JDK_TOPDIR)/src/share/native/sun/font \
- -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \
- -I$(JDK_TOPDIR)/src/closed/share/native/sun/font \
- -I$(JDK_TOPDIR)/src/share/share/native/sun/font \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBT2K, \
- LIBRARY := t2k, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/font \
- $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \
- $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k/ttHints, \
- EXCLUDE_FILES := orion.c, \
- LANG := C++, \
- OPTIMIZATION := HIGH, \
- CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON), \
- CXXFLAGS := $(CXXFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON), \
- CFLAGS_windows = -DCC_NOEX, \
- CXXFLAGS_windows = -DCC_NOEX, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libt2k/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_windows := user32.lib $(JDK_OUTPUTDIR)/objs/libfontmanager/fontmanager.lib, \
- LDFLAGS_SUFFIX_posix := $(LIBM) $(LIBCXX) -lfontmanager -ljava -ljvm -lc, \
- LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=t2k.dll" \
- -D "JDK_INTERNAL_NAME=t2k" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libt2k, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- # t2k is linked against fontmanager
- $(BUILD_LIBT2K): $(BUILD_LIBFONTMANAGER)
-
- BUILD_LIBRARIES += $(BUILD_LIBT2K)
-endif
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- ifeq ($(OPENJDK_TARGET_CPU), x86)
- KERNEL32_LIB := kernel32.lib
- endif
- $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
- LIBRARY := jawt, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows, \
- INCLUDE_FILES := jawt.cpp, \
- LANG := C++, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CXXFLAGS_JDKLIB) \
- -EHsc -DUNICODE -D_UNICODE \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows, \
- LDFLAGS := $(LDFLAGS_JDKLIB) $(KERNEL32_LIB) $(LDFLAGS_CXX_JDK) \
- advapi32.lib $(WIN_AWT_LIB), \
- LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=jawt.dll" \
- -D "JDK_INTERNAL_NAME=jawt" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBJAWT): $(BUILD_LIBAWT)
-
- $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT)
- $(ECHO) Copying $(@F)
- $(CP) $(JDK_OUTPUTDIR)/objs/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@
-
- BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
-
-else # OPENJDK_TARGET_OS not windows
-
- JAWT_LIBS :=
- ifneq ($(OPENJDK_TARGET_OS), solaris)
- JAWT_LIBS += -lawt
- endif
-
- ifndef BUILD_HEADLESS_ONLY
- JAWT_LIBS += -lawt_xawt
- else
- JAWT_LIBS += -lawt_headless
- HEADLESS_CFLAG += -DHEADLESS
- endif
-
- JAWT_FILES := jawt.c
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- JAWT_FILES := jawt.m
- JAWT_LIBS := -lawt_lwawt
- endif
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
- LIBRARY := jawt, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
- $(JDK_TOPDIR)/src/macosx/native/sun/awt, \
- INCLUDE_FILES := $(JAWT_FILES), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB), \
- CFLAGS_linux := $(HEADLESS_CFLAG), \
- CFLAGS_macosx := -I$(JDK_TOPDIR)/src/solaris/native/sun/awt, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjawt/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_solaris := -L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \
- LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \
- LDFLAGS_SUFFIX_solaris := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender, \
- LDFLAGS_SUFFIX_macosx := -Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \
- -framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- ifndef BUILD_HEADLESS_ONLY
- $(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
- else
- $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX)
- endif
-
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX)
- endif
-
-endif # OPENJDK_TARGET_OS
-
-BUILD_LIBRARIES += $(BUILD_LIBJAWT)
-
-##########################################################################################
-
-LIBINSTRUMENT_SRC := $(JDK_TOPDIR)/src/share/instrument \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/instrument
-
-LIBINSTRUMENT_FILES := \
- EncodingSupport.c \
- EncodingSupport_md.c \
- FileSystemSupport_md.c \
- InstrumentationImplNativeMethods.c \
- InvocationAdapter.c \
- JarFacade.c \
- JPLISAgent.c \
- JPLISAssert.c \
- JavaExceptions.c \
- PathCharsValidator.c \
- Reentrancy.c \
- Utilities.c \
- canonicalize_md.c
-
-LIBINSTRUMENT_DIR := $(JDK_OUTPUTDIR)/objs/libinstrument
-LIBINSTRUMENT_CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/instrument \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/instrument \
- -I$(JDK_TOPDIR)/src/share/bin
-
-LIBINSTRUMENT_LDFLAGS :=
-LIBINSTRUMENT_LDFLAGS_SUFFIX :=
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBINSTRUMENT_LDFLAGS += $(JDK_OUTPUTDIR)/objs/jli_static.lib $(WIN_JAVA_LIB) \
- -export:Agent_OnAttach advapi32.lib
- # Statically link the C runtime so that there are not dependencies on modules
- # not on the search patch when invoked from the Windows system directory
- # (or elsewhere).
- LIBINSTRUMENT_CFLAGS := $(filter-out -MD, $(LIBINSTRUMENT_CFLAGS))
- # equivalent of strcasecmp is stricmp on Windows
- LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBINSTRUMENT, \
- LIBRARY := instrument, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBINSTRUMENT_SRC), \
- INCLUDE_FILES := $(LIBINSTRUMENT_FILES), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
- CFLAGS_debug := -DJPLIS_LOGGING, \
- CFLAGS_release := -DNO_JPLIS_LOGGING, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libinstrument/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN) \
- $(LIBINSTRUMENT_LDFLAGS), \
- LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
- LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
- LDFLAGS_macosx := -Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
- -framework Cocoa -framework Security -framework ApplicationServices, \
- LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \
- LDFLAGS_SUFFIX_macosx := -liconv $(LIBZ), \
- LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \
- LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=instrument.dll" \
- -D "JDK_INTERNAL_NAME=instrument" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(LIBINSTRUMENT_DIR), \
- DEBUG_SYMBOLS := true))
-
-ifneq (, $(findstring $(OPENJDK_TARGET_OS), macosx windows))
- $(BUILD_LIBINSTRUMENT): $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX)
-else
- $(BUILD_LIBINSTRUMENT): $(INSTALL_LIBRARIES_HERE)/jli/$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX)
-endif
-$(BUILD_LIBINSTRUMENT): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBINSTRUMENT)
-
-##########################################################################################
-
-BUILD_LIBMANAGEMENT_SRC := $(JDK_TOPDIR)/src/share/native/sun/management \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/management \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/management
-
-BUILD_LIBMANAGEMENT_EXCLUDES :=
-
-BUILD_LIBMANAGEMENT_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/management
-
-ifneq ($(OPENJDK_TARGET_OS), windows)
- BUILD_LIBMANAGEMENT_EXCLUDES += OperatingSystem_md.c
-else
- BUILD_LIBMANAGEMENT_EXCLUDES += UnixOperatingSystem_md.c
-endif
-
-ifneq ($(OPENJDK_TARGET_OS), solaris)
- BUILD_LIBMANAGEMENT_EXCLUDES += SolarisOperatingSystem.c
-endif
-
-ifneq ($(OPENJDK_TARGET_OS), linux)
- BUILD_LIBMANAGEMENT_EXCLUDES += LinuxOperatingSystem.c
-endif
-
-ifneq ($(OPENJDK_TARGET_OS), macosx)
- BUILD_LIBMANAGEMENT_EXCLUDES += MacosxOperatingSystem.c
-endif
-
-LIBMANAGEMENT_OPTIMIZATION := HIGH
-ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
- ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
- LIBMANAGEMENT_OPTIMIZATION := LOW
- endif
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT, \
- LIBRARY := management, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(BUILD_LIBMANAGEMENT_SRC), \
- EXCLUDE_FILES := $(BUILD_LIBMANAGEMENT_EXCLUDES), \
- LANG := C, \
- OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \
- CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBMANAGEMENT_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libmanagement/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_solaris := -lkstat, \
- LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
- LDFLAGS_SUFFIX_windows := jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=management.dll" \
- -D "JDK_INTERNAL_NAME=management" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmanagement, \
- DEBUG_SYMBOLS := true))
-
-$(BUILD_LIBMANAGEMENT): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBMANAGEMENT)
-
-##########################################################################################
-
-BUILD_LIBHPROF_SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/hprof $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/demo/jvmti/hprof
-BUILD_LIBHPROF_CFLAGS := -I$(JDK_TOPDIR)/src/share/demo/jvmti/hprof \
- -I$(JDK_TOPDIR)/src/share/npt \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \
- -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo
-
-BUILD_LIBHPROF_LDFLAGS :=
-
-LIBHPROF_OPTIMIZATION := HIGHEST
-ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
- ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
- LIBHPROF_OPTIMIZATION := LOW
- endif
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBHPROF, \
- LIBRARY := hprof, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(BUILD_LIBHPROF_SRC), \
- LANG := C, \
- OPTIMIZATION := $(LIBHPROF_OPTIMIZATION), \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(BUILD_LIBHPROF_CFLAGS), \
- CFLAGS_debug := -DHPROF_LOGGING, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libhprof/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_windows := wsock32.lib winmm.lib advapi32.lib, \
- LDFLAGS_SUFFIX_linux := $(LIBDL), \
- LDFLAGS_SUFFIX_macosx := $(LIBDL), \
- LDFLAGS_SUFFIX_solaris := -lsocket -lnsl $(LIBDL) -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=hprof.dll" \
- -D "JDK_INTERNAL_NAME=hprof" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libhprof_jvmti, \
- DEBUG_SYMBOLS := true))
-
-BUILD_LIBRARIES += $(BUILD_LIBHPROF)
-
-##########################################################################################
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA_CRW_DEMO, \
- LIBRARY := java_crw_demo, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjava_crw_demo/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=java_crw_demo.dll" \
- -D "JDK_INTERNAL_NAME=java_crw_demo" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjava_crw_demo, \
- DEBUG_SYMBOLS := true))
-
-BUILD_LIBRARIES += $(BUILD_LIBJAVA_CRW_DEMO)
-
-##########################################################################################
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBNPT, \
- LIBRARY := npt, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/npt $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/npt \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnpt/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_macosx := -liconv, \
- LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=npt.dll" \
- -D "JDK_INTERNAL_NAME=npt" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnpt, \
- DEBUG_SYMBOLS := true))
-
-BUILD_LIBRARIES += $(BUILD_LIBNPT)
-
-##########################################################################################
-
-LIBNET_SRC_DIRS := $(JDK_TOPDIR)/src/share/native/java/net \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/dns \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/spi
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBNET_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/www/protocol/http/ntlm
-else
- LIBNET_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/sdp
-endif
-
-LIBNET_CFLAGS := $(foreach dir, $(LIBNET_SRC_DIRS), -I$(dir))
-
-LIBNET_EXCLUDE_FILES :=
-ifneq ($(OPENJDK_TARGET_OS), linux)
- LIBNET_EXCLUDE_FILES += linux_close.c
-endif
-
-ifneq ($(OPENJDK_TARGET_OS), macosx)
- LIBNET_EXCLUDE_FILES += bsd_close.c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBNET_EXCLUDE_FILES += PlainSocketImpl.c PlainDatagramSocketImpl.c SdpSupport.c
-else
- LIBNET_EXCLUDE_FILES += TwoStacksPlainSocketImpl.c DualStackPlainSocketImpl.c \
- TwoStacksPlainDatagramSocketImpl.c DualStackPlainDatagramSocketImpl.c \
- NTLMAuthSequence.c NetworkInterface_winXP.c
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBNET, \
- LIBRARY := net, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBNET_SRC_DIRS), \
- EXCLUDE_FILES := $(LIBNET_EXCLUDE_FILES), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(LIBNET_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnet/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_macosx := -ljvm -ljava, \
- LDFLAGS_SUFFIX_solaris := -ljvm -ljava -lnsl -lsocket $(LIBDL) -lc, \
- LDFLAGS_SUFFIX_linux := $(LIBDL) -ljvm -lpthread -ljava, \
- LDFLAGS_SUFFIX_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \
- delayimp.lib $(WIN_JAVA_LIB) advapi32.lib \
- -DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=net.dll" \
- -D "JDK_INTERNAL_NAME=net" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnet, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-$(BUILD_LIBNET): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBNET)
-
-$(JDK_OUTPUTDIR)/lib/net.properties: $(JDK_TOPDIR)/src/share/lib/net.properties
- $(ECHO) $(LOG_INFO) Copying $(@F)
- $(call install-file)
-
-COPY_FILES += $(JDK_OUTPUTDIR)/lib/net.properties
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template: $(JDK_TOPDIR)/src/${OPENJDK_TARGET_OS_API_DIR}/lib/sdp/sdp.conf.template
- $(ECHO) $(LOG_INFO) Copying $(@F)
- $(call install-file)
-
- COPY_FILES += $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template
-endif
-
-##########################################################################################
-
-BUILD_LIBNIO_SRC := \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/nio \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
-
-BUILD_LIBNIO_CFLAGS := \
- -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch \
- -I$(JDK_TOPDIR)/src/share/native/java/io \
- -I$(JDK_TOPDIR)/src/share/native/java/net \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net
-
-BUILD_LIBNIO_FILES := \
- DatagramChannelImpl.c \
- DatagramDispatcher.c \
- FileChannelImpl.c \
- FileDispatcherImpl.c \
- FileKey.c \
- IOUtil.c \
- MappedByteBuffer.c \
- Net.c \
- ServerSocketChannelImpl.c \
- SocketChannelImpl.c \
- SocketDispatcher.c
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- BUILD_LIBNIO_FILES += \
- Iocp.c \
- RegistryFileTypeDetector.c \
- WindowsAsynchronousFileChannelImpl.c \
- WindowsAsynchronousServerSocketChannelImpl.c \
- WindowsAsynchronousSocketChannelImpl.c \
- WindowsNativeDispatcher.c \
- WindowsSelectorImpl.c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), linux)
- BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
- BUILD_LIBNIO_FILES += \
- EPoll.c \
- EPollArrayWrapper.c \
- EPollPort.c \
- InheritedChannel.c \
- NativeThread.c \
- PollArrayWrapper.c \
- UnixAsynchronousServerSocketChannelImpl.c \
- UnixAsynchronousSocketChannelImpl.c \
- GnomeFileTypeDetector.c \
- MagicFileTypeDetector.c \
- LinuxNativeDispatcher.c \
- LinuxWatchService.c \
- UnixCopyFile.c \
- UnixNativeDispatcher.c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
- BUILD_LIBNIO_SRC += $(JDK_TOPDIR)/src/macosx/native/sun/nio/ch
- BUILD_LIBNIO_FILES += \
- InheritedChannel.c \
- NativeThread.c \
- PollArrayWrapper.c \
- UnixAsynchronousServerSocketChannelImpl.c \
- UnixAsynchronousSocketChannelImpl.c \
- BsdNativeDispatcher.c \
- MacOSXNativeDispatcher.c \
- UnixCopyFile.c \
- UnixNativeDispatcher.c \
- KQueue.c \
- KQueuePort.c \
- KQueueArrayWrapper.c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
- BUILD_LIBNIO_FILES += \
- DevPollArrayWrapper.c \
- InheritedChannel.c \
- NativeThread.c \
- PollArrayWrapper.c \
- SolarisEventPort.c \
- UnixAsynchronousServerSocketChannelImpl.c \
- UnixAsynchronousSocketChannelImpl.c \
- GnomeFileTypeDetector.c \
- SolarisNativeDispatcher.c \
- SolarisWatchService.c \
- UnixCopyFile.c \
- UnixNativeDispatcher.c
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \
- LIBRARY := nio, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(BUILD_LIBNIO_SRC), \
- INCLUDE_FILES := $(BUILD_LIBNIO_FILES), \
- LANG := C, \
- OPTIMIZATION := HIGH, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(BUILD_LIBNIO_CFLAGS), \
- MAPFILE := $(BUILD_LIBNIO_MAPFILE), \
- LDFLAGS := $(LDFLAGS_JDKLIB) $(BUILD_LIBNIO_LDFLAGS) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_linux := -ljava -lnet -lpthread $(LIBDL), \
- LDFLAGS_SUFFIX_solaris := -ljvm -lsocket -lposix4 $(LIBDL) \
- -lsendfile -ljava -lnet -lc, \
- LDFLAGS_SUFFIX_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \
- $(JDK_OUTPUTDIR)/objs/libnet/net.lib \
- advapi32.lib, \
- LDFLAGS_SUFFIX_macosx := -ljava -lnet -pthread -framework CoreFoundation, \
- LDFLAGS_SUFFIX :=, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=nio.dll" \
- -D "JDK_INTERNAL_NAME=nio" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnio, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-BUILD_LIBRARIES += $(BUILD_LIBNIO)
-
-$(BUILD_LIBNIO): $(BUILD_LIBNET)
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS_API), posix)
-
- ifneq ($(OPENJDK_TARGET_OS), macosx)
-
- SCTP_WERROR := -Werror
- ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
- SCTP_WERROR :=
- endif
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBSCTP, \
- LIBRARY := sctp, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch/sctp, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch \
- -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch/sctp \
- -I$(JDK_TOPDIR)/src/share/native/java/net \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net, \
- CFLAGS_linux := $(SCTP_WERROR), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsctp/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_linux := -lpthread $(LIBDL) -ljava -ljvm, \
- LDFLAGS_SUFFIX_posix := -lnio -lnet, \
- LDFLAGS_SUFFIX_solaris := -lsocket -ljava -ljvm -lc, \
- LDFLAGS_SUFFIX_macosx := -ljava -ljvm, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsctp, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBSCTP)
-
- $(BUILD_LIBSCTP): $(BUILD_LIBNIO)
- endif
-endif
-
-##########################################################################################
-
-BUILD_LIBJLI_SRC_DIRS := $(JDK_TOPDIR)/src/share/bin $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin
-LIBJLI_CFLAGS := $(CFLAGS_JDKLIB) $(foreach dir, $(BUILD_LIBJLI_SRC_DIRS), -I$(dir))
-
-BUILD_LIBJLI_FILES := \
- java.c \
- splashscreen_stubs.c \
- parse_manifest.c \
- version_comp.c \
- wildcard.c \
- jli_util.c
-
-ifeq ($(JVM_VARIANT_ZERO), true)
- ERGO_FAMILY := zero
-else
- ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
- ERGO_FAMILY := i586
- else
- ERGO_FAMILY := $(OPENJDK_TARGET_CPU_ARCH)
- endif
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBJLI_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/bin
- BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/bin
- BUILD_LIBJLI_FILES += java_md_common.c java_md_macosx.c
-
- BUILD_LIBJLI_java_md_macosx.c_CFLAGS := -x objective-c
- BUILD_LIBJLI_STATIC_java_md_macosx.c_CFLAGS := -x objective-c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- BUILD_LIBJLI_FILES += java_md.c \
- cmdtoargs.c
- # Staticically link with c runtime on windows.
- LIBJLI_CFLAGS := $(filter-out -MD, $(LIBJLI_CFLAGS))
-else ifneq ($(OPENJDK_TARGET_OS), macosx)
-
- BUILD_LIBJLI_FILES += java_md_common.c
- BUILD_LIBJLI_FILES += java_md_solinux.c ergo.c
-
- ERGO_ARCH_FILE = ergo_$(ERGO_FAMILY).c
-
- # if the architecture specific ergo file exists then
- # use it, else use the generic definitions from ergo.c
- ifneq ($(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(ERGO_ARCH_FILE)), )
- BUILD_LIBJLI_FILES += $(ERGO_ARCH_FILE)
- else # !ERGO_ARCH_FILE
- LIBJLI_CFLAGS += -DUSE_GENERIC_ERGO
- endif # ERGO_ARCH_FILE
-endif #WINDOWS
-
-# Append defines depending on target platform
-LIBJLI_CFLAGS += $(OPENJDK_TARGET_CPU_JLI_CFLAGS)
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
-endif
-
-ifneq ($(USE_EXTERNAL_LIBZ), true)
- BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
- LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS)
- BUILD_LIBJLI_FILES += \
- inflate.c \
- inftrees.c \
- inffast.c \
- zadler32.c \
- zcrc32.c \
- zutil.c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)
-else
- LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)/jli
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \
- LIBRARY := jli, \
- OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \
- SRC := $(BUILD_LIBJLI_SRC_DIRS), \
- INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
- LANG := C, \
- OPTIMIZATION := HIGH, \
- CFLAGS := $(LIBJLI_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjli/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
- LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
- LDFLAGS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \
- LDFLAGS_SUFFIX_solaris := $(LIBZ) $(LIBDL) -lc, \
- LDFLAGS_SUFFIX_linux := $(LIBZ) $(LIBDL) -lc -lpthread, \
- LDFLAGS_SUFFIX_macosx := $(LIBZ), \
- LDFLAGS_SUFFIX_windows := \
- -export:JLI_Launch \
- -export:JLI_ManifestIterate \
- -export:JLI_SetTraceLauncher \
- -export:JLI_ReportErrorMessage \
- -export:JLI_ReportErrorMessageSys \
- -export:JLI_ReportMessage \
- -export:JLI_ReportExceptionDescription \
- -export:JLI_MemAlloc \
- -export:JLI_CmdToArgs \
- -export:JLI_GetStdArgc \
- -export:JLI_GetStdArgs \
- advapi32.lib \
- comctl32.lib \
- user32.lib, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=jli.dll" \
- -D "JDK_INTERNAL_NAME=jli" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-BUILD_LIBRARIES += $(BUILD_LIBJLI)
-
-# On windows, the static library has the same suffix as the import library created by
-# with the shared library, so the static library is given a different name. No harm
-# in doing it for all platform to reduce complexity.
-ifeq ($(OPENJDK_TARGET_OS), windows)
- $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
- STATIC_LIBRARY := jli_static, \
- OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
- SRC := $(BUILD_LIBJLI_SRC_DIRS), \
- INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
- LANG := C, \
- OPTIMIZATION := HIGH, \
- CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \
- ARFLAGS := $(ARFLAGS), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli_static, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC)
-
-else ifeq ($(OPENJDK_TARGET_OS), macosx)
- #
- # On macosx they do partial (incremental) linking of libjli_static.a
- # code it here...rather than add support to NativeCompilation
- # as this is first time I see it
- $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
- LIBRARY := jli_static, \
- OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
- SRC := $(BUILD_LIBJLI_SRC_DIRS), \
- INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
- LANG := C, \
- OPTIMIZATION := HIGH, \
- CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
- LDFLAGS := -nostdlib -r, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli_static, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(JDK_OUTPUTDIR)/objs/libjli_static.a: $(BUILD_LIBJLI_STATIC)
- $(call install-file)
-
- BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a
-endif
-
-##########################################################################################
-
-ifndef OPENJDK
- ifeq ($(ENABLE_JFR), true)
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBJFR, \
- LIBRARY := jfr, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/closed/share/native/oracle/jfr, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/closed/share/javavm/export, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjfr/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=jfr.dll" \
- -D "JDK_INTERNAL_NAME=jfr" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjfr, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBJFR)
-
-endif
-endif
-
-##########################################################################################
-
-ifndef OPENJDK
-
- BUILD_LIBKCMS_EXCLUDE_FILES :=
- ifeq ($(OPENJDK_TARGET_OS), windows)
- BUILD_LIBKCMS_EXCLUDE_FILES += ukcpmgr.c unixmem.c
- else
- BUILD_LIBKCMS_EXCLUDE_FILES += cmmdll.c registry.c spxffile.c sysinfo.c winmem.c wkcpmgr.c
- endif
-
- BUILD_LIBKCMS_FLAGS := $(CFLAGS_JDKLIB)
-
- ifeq ($(OPENJDK_TARGET_OS), solaris)
- # This particular library uses a feature called PIC_CODE_SMALL (on solaris)
- # implement it like this...since it's only used here
- BUILD_LIBKCMS_FLAGS := $(patsubst -KPIC, -Kpic, $(BUILD_LIBKCMS_FLAGS))
- else ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
- BUILD_LIBKCMS_FLAGS := $(patsubst -fPIC, -fpic, $(BUILD_LIBKCMS_FLAGS))
- endif
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBKCMS, \
- LIBRARY := kcms, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms, \
- LANG := C, \
- EXCLUDE_FILES := $(BUILD_LIBKCMS_EXCLUDE_FILES), \
- OPTIMIZATION := LOW, \
- CFLAGS := $(BUILD_LIBKCMS_FLAGS) \
- -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST, \
- CFLAGS_linux := -Wno-missing-field-initializers, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libkcms/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_linux := -lc -lpthread, \
- LDFLAGS_SUFFIX_solaris := -lc, \
- LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib version.lib, \
- LDFLAGS_SUFFIX_posix := -lm -ljava -ljvm, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=kcms.dll" \
- -D "JDK_INTERNAL_NAME=kcms" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkcms, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBKCMS): $(BUILD_LIBJAVA)
-
- BUILD_LIBRARIES += $(BUILD_LIBKCMS)
-
-endif
-
-##########################################################################################
-
-ifndef OPENJDK
- ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-
- ifeq ($(shell if test "$(OS_VERSION_MAJOR)" -eq 5 -a "$(OS_VERSION_MINOR)" -le 10; then $(ECHO) ok; fi), ok)
-
- SUNWJDGA_MAPFILE :=
- ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
- SUNWJDGA_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjdga/mapfile-vers
- endif
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBSUNWJDGA, \
- LIBRARY := sunwjdga, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/solaris/native/sun/jdga, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/javavm/export \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \
- -I$(OPENWIN_HOME)/include, \
- MAPFILE := $(SUNWJDGA_MAPFILE), \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -ldga -lX11 $(LIBDL) -lc, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunwjdga, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBSUNWJDGA)
-
- endif
- endif
- endif
-endif
-
-##########################################################################################
-
-ifeq ($(BUILD_HEADLESS), true)
- ifneq ($(OPENJDK_TARGET_OS), windows)
-
- LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/share/native/sun/font \
- $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
- $(JDK_TOPDIR)/src/solaris/native/sun/font \
- $(JDK_TOPDIR)/src/solaris/native/sun/awt \
- $(JDK_TOPDIR)/src/solaris/native/sun/java2d/opengl \
- $(JDK_TOPDIR)/src/solaris/native/sun/java2d/x11
-
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBAWT_HEADLESS_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/font
- endif
-
- LIBAWT_HEADLESS_CFLAGS := -DHEADLESS=true \
- -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
- $(CUPS_CFLAGS) \
- $(X_CFLAGS) \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
- $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir))
-
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBAWT_HEADLESS_CFLAGS += \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
- endif
-
- LIBAWT_HEADLESS_FILES := \
- awt_Font.c \
- HeadlessToolkit.c \
- fontpath.c \
- VDrawingArea.c \
- X11Color.c \
- X11Renderer.c \
- X11PMBlitLoops.c \
- X11SurfaceData.c \
- X11FontScaler_md.c \
- X11TextRenderer_md.c \
- OGLBlitLoops.c \
- OGLBufImgOps.c \
- OGLContext.c \
- OGLFuncs.c \
- OGLMaskBlit.c \
- OGLMaskFill.c \
- OGLPaints.c \
- OGLRenderQueue.c \
- OGLRenderer.c \
- OGLSurfaceData.c \
- OGLTextRenderer.c \
- OGLVertexCache.c \
- GLXGraphicsConfig.c \
- GLXSurfaceData.c \
- AccelGlyphCache.c \
- CUPSfuncs.c
-
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBAWT_HEADLESS_FILES += \
- AWTFont.m \
- AWTStrike.m \
- CCharToGlyphMapper.m \
- CGGlyphImages.m \
- CGGlyphOutlines.m \
- CoreTextSupport.m
- endif
-
- LIBAWT_HEADLESS_REORDER :=
- ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifneq ($(OPENJDK_TARGET_CPU), x86_64)
- LIBAWT_HEADLESS_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
- endif
- endif
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_HEADLESS, \
- LIBRARY := awt_headless, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBAWT_HEADLESS_DIRS), \
- INCLUDE_FILES := $(LIBAWT_HEADLESS_FILES), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_HEADLESS_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
- LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..) \
- -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \
- -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \
- LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN)., \
- REORDER := $(LIBAWT_HEADLESS_REORDER), \
- LDFLAGS_SUFFIX_linux := -ljvm -lawt -lm $(LIBDL) -ljava, \
- LDFLAGS_SUFFIX_solaris := $(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc, \
- LDFLAGS_SUFFIX_macosx := -ljvm $(LIBCXX) -lawt $(LIBDL) -ljava \
- -framework Accelerate \
- -framework ApplicationServices \
- -framework Cocoa \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -framework JavaNativeFoundation \
- -framework JavaRuntimeSupport, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_headless, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
-
- BUILD_LIBRARIES += $(BUILD_LIBAWT_HEADLESS)
-
- endif
-endif
-
-##########################################################################################
-
-ifndef BUILD_HEADLESS_ONLY
- LIBSPLASHSCREEN_DIRS := \
- $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
- $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
- $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
-
- ifeq ($(USE_EXTERNAL_LIBGIF), true)
- GIFLIB_LDFLAGS := -lgif
- else
- LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/giflib
- GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
- endif
-
- ifneq ($(OPENJDK_TARGET_OS), macosx)
- LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
- else
- LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen
- endif
-
- LIBSPLASHSCREEN_CFLAGS := -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
- $(foreach dir, $(LIBSPLASHSCREEN_DIRS), -I$(dir))
-
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \
- $(LIBSPLASHSCREEN_CFLAGS) \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks
- LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
- LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp
-
- LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
- LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
- LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
- LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
- LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
- LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
- LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
-
- else ifneq ($(OPENJDK_TARGET_OS), windows)
- LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
- else
- LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
- endif
-
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX :=
-
- ifneq ($(USE_EXTERNAL_LIBZ), true)
- LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
- LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS)
- endif
-
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(LIBM) -lpthread -liconv -losxapp \
- -framework ApplicationServices \
- -framework Foundation \
- -framework Cocoa \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -framework JavaNativeFoundation
- else ifneq ($(OPENJDK_TARGET_OS), windows)
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
- else # OPENJDK_TARGET_OS
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
- endif # OPENJDK_TARGET_OS
-
- $(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN, \
- LIBRARY := splashscreen, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBSPLASHSCREEN_DIRS), \
- EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) $(GIFLIB_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=splashscreen.dll" \
- -D "JDK_INTERNAL_NAME=splashscreen" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsplashscreen, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(LIBSPLASHSCREEN)
-
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- $(LIBSPLASHSCREEN): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX)
- endif
-
-endif
-
-##########################################################################################
-
-ifndef OPENJDK
-
- LIBDCPR_SRC_DIRS := \
- $(JDK_TOPDIR)/src/closed/share/native/sun/dc/doe \
- $(JDK_TOPDIR)/src/closed/share/native/sun/dc/path \
- $(JDK_TOPDIR)/src/closed/share/native/sun/dc/pr \
- $(JDK_TOPDIR)/src/closed/share/native/sun/dc/util
-
- LIBDCPR_CFLAGS := $(foreach dir, $(LIBDCPR_SRC_DIRS), -I$(dir)) \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBDCPR, \
- LIBRARY := dcpr, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBDCPR_SRC_DIRS), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(LIBDCPR_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libdcpr/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(LIBM) $(LDFLAGS_JDKLIB_SUFFIX), \
- LDFLAGS_SUFFIX_posix := -lm, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=dcpr.dll" \
- -D "JDK_INTERNAL_NAME=dcpr" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdcpr, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBDCPR): $(BUILD_LIBJAVA)
-
- BUILD_LIBRARIES += $(BUILD_LIBDCPR)
-
-endif
-
-##########################################################################################
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PCSC, \
- LIBRARY := j2pcsc, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio, \
- LANG := C, \
- CFLAGS_posix := -D__sun_jdk, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio/MUSCLE, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2pcsc/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_posix := $(LIBDL), \
- LDFLAGS_SUFFIX_windows := winscard.lib, \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=j2pcsc.dll" \
- -D "JDK_INTERNAL_NAME=j2pcsc" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2pcsc, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-BUILD_LIBRARIES += $(BUILD_LIBJ2PCSC)
-
-##########################################################################################
-
-ifneq ($(OPENJDK_TARGET_OS), windows)
- $(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS, \
- LIBRARY := j2gss, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2gss/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(LIBDL), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2gss, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBJ2GSS)
-endif
-
-##########################################################################################
-
-ifneq ($(BUILD_CRYPTO), no)
- BUILD_LIBKRB5_NAME :=
- ifeq ($(OPENJDK_TARGET_OS), windows)
- BUILD_LIBKRB5_NAME := w2k_lsa_auth
- BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5
- BUILD_LIBKRB5_LIBS := advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \
- gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib \
- ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib
- else ifeq ($(OPENJDK_TARGET_OS), macosx)
- BUILD_LIBKRB5_NAME := osxkrb5
- BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/share/native/sun/security/krb5
- BUILD_LIBKRB5_LIBS := -framework Kerberos
- endif
-
- ifneq ($(BUILD_LIBKRB5_NAME), )
- $(eval $(call SetupNativeCompilation,BUILD_LIBKRB5, \
- LIBRARY := $(BUILD_LIBKRB5_NAME), \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(BUILD_LIBKRB5_SRC), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/native/sun/security/krb5 \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(BUILD_LIBKRB5_LIBS), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=$(BUILD_LIBKRB5_NAME).dll" \
- -D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkrb5, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBKRB5)
- endif
-endif
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBSUNMSCAPI, \
- LIBRARY := sunmscapi, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi, \
- LANG := C++, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi, \
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := Crypt32.Lib advapi32.lib, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=sunmscapi.dll" \
- -D "JDK_INTERNAL_NAME=sunmscapi" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunmscapi, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBSUNMSCAPI)
-endif
-
-##########################################################################################
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11, \
- LIBRARY := j2pkcs11, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \
- $(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \
- -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2pkcs11/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_posix := $(LIBDL), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=j2pkcs11.dll" \
- -D "JDK_INTERNAL_NAME=j2pkcs11" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2pkcs11, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-BUILD_LIBRARIES += $(BUILD_LIBJ2PKCS11)
-
-##########################################################################################
-
-ifeq ($(ENABLE_INTREE_EC), yes)
-
- BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \
- -I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
-
- #
- # On sol-sparc...all libraries are compiled with -xregs=no%appl
- # (set in CFLAGS_REQUIRED_sparc)
- #
- # except!!! libsunec.so
- #
- ECC_JNI_SOLSPARC_FILTER :=
- ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
- ECC_JNI_SOLSPARC_FILTER := -xregs=no%appl
- endif
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC, \
- LIBRARY := sunec, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec \
- $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl, \
- LANG := C++, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \
- $(BUILD_LIBSUNEC_FLAGS) \
- -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \
- CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \
- $(BUILD_LIBSUNEC_FLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsunec/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
- LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(LIBCXX), \
- LDFLAGS_SUFFIX_linux := -lc, \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=sunec.dll" \
- -D "JDK_INTERNAL_NAME=sunec" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunec, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBSUNEC)
-endif
-
-##########################################################################################
-
-LIBJSOUND_SRC_DIRS := \
- $(JDK_TOPDIR)/src/share/native/com/sun/media/sound \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/media/sound
-
-LIBJSOUND_SRC_FILES := Utilities.c Platform.c
-
-LIBJSOUND_LANG := C
-LIBJSOUND_CFLAGS := $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir))
-
-EXTRA_SOUND_JNI_LIBS :=
-
-LIBJSOUND_MIDIFILES := \
- MidiInDevice.c \
- MidiInDeviceProvider.c \
- MidiOutDevice.c \
- MidiOutDeviceProvider.c \
- PlatformMidi.c
-
-# files needed for ports
-LIBJSOUND_PORTFILES := \
- PortMixerProvider.c \
- PortMixer.c
-
-# files needed for direct audio
-LIBJSOUND_DAUDIOFILES := \
- DirectAudioDeviceProvider.c \
- DirectAudioDevice.c
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- EXTRA_SOUND_JNI_LIBS += jsoundds
- LIBJSOUND_CFLAGS += -DX_PLATFORM=X_WINDOWS \
- -DUSE_PLATFORM_MIDI_OUT=TRUE \
- -DUSE_PLATFORM_MIDI_IN=TRUE \
- -DUSE_PORTS=TRUE
- LIBJSOUND_SRC_FILES += \
- PLATFORM_API_WinOS_MidiIn.cpp \
- PLATFORM_API_WinOS_MidiOut.c \
- PLATFORM_API_WinOS_Util.c \
- PLATFORM_API_WinOS_Ports.c
- LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
- LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
-endif # OPENJDK_TARGET_OS windows
-
-ifeq ($(OPENJDK_TARGET_OS), linux)
- EXTRA_SOUND_JNI_LIBS += jsoundalsa
- LIBJSOUND_CFLAGS += -DX_PLATFORM=X_LINUX
-endif # OPENJDK_TARGET_OS linux
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBJSOUND_LANG := C++
- LIBJSOUND_CFLAGS += -DX_PLATFORM=X_MACOSX \
- -DUSE_PORTS=TRUE \
- -DUSE_DAUDIO=TRUE \
- -DUSE_PLATFORM_MIDI_OUT=TRUE \
- -DUSE_PLATFORM_MIDI_IN=TRUE
- LIBJSOUND_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/com/sun/media/sound
- LIBJSOUND_SRC_FILES += \
- PLATFORM_API_MacOSX_Utils.cpp \
- PLATFORM_API_MacOSX_PCM.cpp \
- PLATFORM_API_MacOSX_Ports.cpp \
- PLATFORM_API_MacOSX_MidiIn.c \
- PLATFORM_API_MacOSX_MidiOut.c \
- PLATFORM_API_MacOSX_MidiUtils.c
- LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
- LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
- LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES)
-endif # OPENJDK_TARGET_OS macosx
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- LIBJSOUND_CFLAGS += -DX_PLATFORM=X_SOLARIS \
- -DUSE_PORTS=TRUE \
- -DUSE_DAUDIO=TRUE
- LIBJSOUND_SRC_FILES += \
- PLATFORM_API_SolarisOS_Utils.c \
- PLATFORM_API_SolarisOS_Ports.c \
- PLATFORM_API_SolarisOS_PCM.c
- LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
- LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
- LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES)
-endif # OPENJDK_TARGET_OS solaris
-
-
-ifeq ($(JVM_VARIANT_ZERO), true)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_ZERO
-else
- ifeq ($(OPENJDK_TARGET_CPU), x86)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_I586
- endif
-
- ifeq ($(OPENJDK_TARGET_CPU), sparc)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_SPARC
- endif
-
- ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_SPARCV9
- endif
-
- ifeq ($(OPENJDK_TARGET_CPU), x86_64)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_AMD64
- endif
-
- ifeq ($(OPENJDK_TARGET_CPU), arm)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_ARM
- endif
-
- ifeq ($(OPENJDK_TARGET_CPU), ppc)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC
- endif
-endif
-
-LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \
- LIBRARY := jsound, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBJSOUND_SRC_DIRS), \
- INCLUDE_FILES := $(LIBJSOUND_SRC_FILES), \
- LANG := $(LIBJSOUND_LANG), \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(LIBJSOUND_CFLAGS), \
- CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjsound/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_macosx := -framework CoreAudio -framework CoreFoundation \
- -framework CoreServices -framework AudioUnit $(LIBCXX) \
- -framework CoreMIDI -framework AudioToolbox, \
- LDFLAGS_windows := $(WIN_JAVA_LIB) advapi32.lib winmm.lib, \
- LDFLAGS_SUFFIX_posix := -ljava -ljvm, \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=jsound.dll" \
- -D "JDK_INTERNAL_NAME=jsound" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsound, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-$(BUILD_LIBJSOUND): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBJSOUND)
-
-##########################################################################################
-
-ifneq ($(filter jsoundalsa, $(EXTRA_SOUND_JNI_LIBS)), )
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDALSA, \
- LIBRARY := jsoundalsa, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBJSOUND_SRC_DIRS), \
- INCLUDE_FILES := Utilities.c $(LIBJSOUND_MIDIFILES) $(LIBJSOUND_PORTFILES) \
- $(LIBJSOUND_DAUDIOFILES) \
- PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \
- PLATFORM_API_LinuxOS_ALSA_PCM.c \
- PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \
- PLATFORM_API_LinuxOS_ALSA_MidiIn.c \
- PLATFORM_API_LinuxOS_ALSA_MidiOut.c \
- PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \
- PLATFORM_API_LinuxOS_ALSA_Ports.c, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) $(ALSA_CFLAGS) \
- $(LIBJSOUND_CFLAGS) \
- -DUSE_DAUDIO=TRUE \
- -DUSE_PORTS=TRUE \
- -DUSE_PLATFORM_MIDI_OUT=TRUE \
- -DUSE_PLATFORM_MIDI_IN=TRUE, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjsoundalsa/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundalsa, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBJSOUNDALSA): $(BUILD_LIBJAVA)
-
- BUILD_LIBRARIES += $(BUILD_LIBJSOUNDALSA)
-
-endif
-
-##########################################################################################
-
-ifneq ($(filter jsoundds, $(EXTRA_SOUND_JNI_LIBS)), )
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDDS, \
- LIBRARY := jsoundds, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBJSOUND_SRC_DIRS), \
- INCLUDE_FILES := Utilities.c $(LIBJSOUND_DAUDIOFILES) \
- PLATFORM_API_WinOS_DirectSound.cpp, \
- LANG := C++, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(LIBJSOUND_CFLAGS) \
- -DUSE_DAUDIO=TRUE, \
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX) dsound.lib winmm.lib user32.lib ole32.lib, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=jsoundds.dll" \
- -D "JDK_INTERNAL_NAME=jsoundds" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundds, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBJSOUNDDS): $(BUILD_LIBJAVA)
-
- BUILD_LIBRARIES += $(BUILD_LIBJSOUNDDS)
-
-endif
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifndef OPENJDK
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBJ2UCRYPTO, \
- LIBRARY := j2ucrypto, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2ucrypto/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB), \
- LDFLAGS_SUFFIX := $(LIBDL), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2ucrypto, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBJ2UCRYPTO): $(BUILD_LIBJAVA)
-
- BUILD_LIBRARIES += $(BUILD_LIBJ2UCRYPTO)
-
- endif
-endif
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBAPPLESCRIPTENGINE, \
- LIBRARY := AppleScriptEngine, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/macosx/native/apple/applescript, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/macosx/native/apple/applescript \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := -framework Cocoa \
- -framework Carbon \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -framework JavaNativeFoundation \
- $(LDFLAGS_JDKLIB_SUFFIX), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libAppleScriptEngine, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBAPPLESCRIPTENGINE): $(BUILD_LIBJAVA)
-
- BUILD_LIBRARIES += $(BUILD_LIBAPPLESCRIPTENGINE)
-
-endif
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBOSXAPP, \
- LIBRARY := osxapp, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/macosx/native/sun/osxapp, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
- -I$(JDK_OUTPUTDIR)/gensrc/sun/osxapp \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_macosx := \
- -framework Accelerate \
- -framework ApplicationServices \
- -framework AudioToolbox \
- -framework Carbon \
- -framework Cocoa \
- -framework Security \
- -framework ExceptionHandling \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -framework JavaNativeFoundation \
- -framework JavaRuntimeSupport \
- -framework OpenGL \
- -framework IOSurface \
- -framework QuartzCore, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosxapp, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBOSXAPP)
-
-endif
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
-
- LIBOSX_DIRS := \
- $(JDK_TOPDIR)/src/macosx/native/com/apple/concurrent \
- $(JDK_TOPDIR)/src/macosx/native/java/util \
- $(JDK_TOPDIR)/src/macosx/native/com/apple/eio \
- $(JDK_TOPDIR)/src/macosx/native/apple/security \
- $(JDK_TOPDIR)/src/macosx/native/apple/launcher
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBOSX, \
- LIBRARY := osx, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBOSX_DIRS), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(foreach dir, $(LIBOSX_DIRS), -I$(dir)) \
- -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_macosx := \
- -losxapp \
- -framework Cocoa \
- -framework ApplicationServices \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -framework JavaNativeFoundation \
- -framework JavaRuntimeSupport \
- -framework Security \
- -framework SystemConfiguration \
- $(LDFLAGS_JDKLIB_SUFFIX), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosx, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBOSX)
-
- $(BUILD_LIBOSX): $(BUILD_LIBOSXAPP)
-
- $(BUILD_LIBOSX): $(BUILD_LIBJAVA)
-
-endif
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
-
- LIBAWT_LWAWT_FILES := \
- awt.m \
- ApplicationDelegate.m \
- CFRetainedResource.m \
- CGLGraphicsConfig.m \
- CGLSurfaceData.m \
- CGLLayer.m \
- CGraphicsConfig.m \
- CGraphicsDevice.m \
- CGraphicsEnv.m \
- CCharToGlyphMapper.m \
- CSystemColors.m \
- AWTFont.m \
- CGGlyphOutlines.m \
- CGGlyphImages.m \
- CoreTextSupport.m \
- AWTStrike.m \
- InitIDs.m \
- AWTEvent.m \
- AWTView.m \
- AWTWindow.m \
- AWTSurfaceLayers.m \
- CCursorManager.m \
- CClipboard.m \
- CDataTransferer.m \
- CDragSource.m \
- CDragSourceContextPeer.m \
- CDropTarget.m \
- CDropTargetContextPeer.m \
- CInputMethod.m \
- CDesktopPeer.m \
- OSVersion.m \
- DnDUtilities.m \
- CFileDialog.m \
- CImage.m \
- CMenu.m \
- CMenuBar.m \
- CMenuComponent.m \
- CMenuItem.m \
- CPopupMenu.m \
- CRobot.m \
- CTrayIcon.m \
- CWrapper.m \
- JavaAccessibilityAction.m \
- JavaAccessibilityUtilities.m \
- JavaComponentAccessibility.m \
- JavaTextAccessibility.m \
- LWCToolkit.m \
- GeomUtilities.m \
- CPrinterJob.m \
- PrintModel.m \
- PrinterSurfaceData.m \
- PrinterView.m \
- QuartzSurfaceData.m \
- QuartzRenderer.m \
- CTextPipe.m \
- ImageSurfaceData.m \
- awt_DrawingSurface.m \
- \
- OGLBlitLoops.c \
- OGLBufImgOps.c \
- OGLContext.c \
- OGLFuncs.c \
- OGLMaskBlit.c \
- OGLMaskFill.c \
- OGLPaints.c \
- OGLRenderQueue.c \
- OGLRenderer.c \
- OGLSurfaceData.c \
- OGLTextRenderer.c \
- OGLVertexCache.c \
- AccelGlyphCache.c \
- CUPSfuncs.c
-
-
- LIBAWT_LWAWT_DIRS := \
- $(JDK_TOPDIR)/src/macosx/native/sun/awt \
- $(JDK_TOPDIR)/src/macosx/native/sun/font \
- $(JDK_TOPDIR)/src/macosx/native/sun/java2d/opengl \
- $(JDK_TOPDIR)/src/solaris/native/sun/awt \
- $(JDK_TOPDIR)/src/share/native/sun/font \
- $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \
- LIBRARY := awt_lwawt, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBAWT_LWAWT_DIRS), \
- LANG := C, \
- INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(X_CFLAGS) \
- $(X_LIBS) \
- $(foreach dir, $(LIBAWT_LWAWT_DIRS), -I$(dir)) \
- -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_macosx := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
- -framework Accelerate \
- -framework ApplicationServices \
- -framework AudioToolbox \
- -framework Carbon \
- -framework Cocoa \
- -framework Security \
- -framework ExceptionHandling \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -framework JavaNativeFoundation \
- -framework JavaRuntimeSupport \
- -framework OpenGL \
- -framework QuartzCore -ljava, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_lwawt, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBAWT_LWAWT)
-
- $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT)
-
- $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBMLIB_IMAGE)
-
- $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBOSXAPP)
-
- $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBJAVA)
-
-endif
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBOSXUI, \
- LIBRARY := osxui, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/macosx/native/com/apple/laf, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/macosx/native/com/apple/laf \
- -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
- -I$(JDK_TOPDIR)/src/macosx/native/sun/awt \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN) \
- -Xlinker -rpath -Xlinker @loader_path, \
- LDFLAGS_SUFFIX_macosx := -lawt -losxapp -lawt_lwawt \
- -framework Cocoa \
- -framework Carbon \
- -framework ApplicationServices \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -framework JavaNativeFoundation \
- -framework JavaRuntimeSupport \
- -ljava -ljvm, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosxui, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBOSXUI)
-
- $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
-
- $(BUILD_LIBOSXUI): $(BUILD_LIBOSXAPP)
-
- $(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT)
-
- #$(BUILD_LIBOSXUI): $(BUILD_LIBJAVA)
-
-endif
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
-
- # Ugly hack to mimic behaviour in old build where this is built as an xcode project.
- SET_SHARED_LIBRARY_NAME = -Xlinker -install_name -Xlinker /usr/local/lib/libJObjC.dylib
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBJOBJC32, \
- LIBRARY := JObjC, \
- OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/libjobjc32, \
- SRC := $(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/native \
- $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/native, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := -fpascal-strings \
- -fobjc-gc \
- -gdwarf-2 \
- $(CFLAGS_JDKLIB) -I$(JDK_OUTPUTDIR)/gensrc_headers_jobjc \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -m32, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- -m32, \
- LDFLAGS_SUFFIX := -framework Foundation -framework JavaVM \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -framework JavaNativeFoundation \
- -lffi, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjobjc32, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBJOBJC64, \
- LIBRARY := JObjC, \
- OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/libjobjc64, \
- SRC := $(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/native \
- $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/native, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := -fpascal-strings \
- -fobjc-gc \
- -gdwarf-2 \
- $(CFLAGS_JDKLIB) -I$(JDK_OUTPUTDIR)/gensrc_headers_jobjc \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- , \
- LDFLAGS := -fpascal-strings \
- -fobjc-gc \
- -gdwarf-2 \
- $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := -framework Foundation -framework JavaVM \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -framework JavaNativeFoundation \
- -lffi, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjobjc64, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)JObjC$(SHARED_LIBRARY_SUFFIX): $(BUILD_LIBJOBJC32) $(BUILD_LIBJOBJC64)
- $(LIPO) -create -output $@ $(BUILD_LIBJOBJC32) $(BUILD_LIBJOBJC64)
-
- BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)JObjC$(SHARED_LIBRARY_SUFFIX)
-
-endif
-
-##########################################################################################
-
-ifndef OPENJDK
- ifeq ($(OPENJDK_TARGET_OS), windows)
-
- ACCESSBRIDGE_SRCDIR := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge
-
- define SetupAccessBridge
- # Parameter 1 Suffix
- # Parameter 2 Machine
- # Parameter 3 ACCESSBRIDGE_ARCH_ suffix
-
- $(call SetupNativeCompilation,BUILD_JAWTACCESSBRIDGE$1, \
- LIBRARY = JAWTAccessBridge$1, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(ACCESSBRIDGE_SRCDIR), \
- INCLUDE_FILES := JAWTAccessBridge.cpp, \
- LANG := C++, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -DACCESSBRIDGE_ARCH_$3, \
- LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
- winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib \
- ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
- -subsystem:windows -machine:$2 \
- -def:$(ACCESSBRIDGE_SRCDIR)/JAWTAccessBridge.DEF, \
- VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
- RC_FLAGS := $(RC_FLAGS), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawtaccessbridge$1, \
- DEBUG_SYMBOLS := true)
-
- $$(BUILD_JAWTACCESSBRIDGE$1): $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
-
- $(call SetupNativeCompilation,BUILD_JAVAACCESSBRIDGE$1, \
- LIBRARY = JavaAccessBridge$1, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(ACCESSBRIDGE_SRCDIR), \
- INCLUDE_FILES := AccessBridgeATInstance.cpp AccessBridgeDebug.cpp \
- AccessBridgeJavaEntryPoints.cpp \
- AccessBridgeMessages.cpp JavaAccessBridge.cpp, \
- LANG := C++, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -DACCESSBRIDGE_ARCH_$3, \
- LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
- winspool.lib comdlg32.lib advapi32.lib shell32.lib \
- ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
- -subsystem:windows -machine:$2 \
- -def:$(ACCESSBRIDGE_SRCDIR)/JavaAccessBridge.DEF, \
- VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
- RC_FLAGS := $(RC_FLAGS), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavaaccessbridge$1, \
- DEBUG_SYMBOLS := true)
-
- $(call SetupNativeCompilation,BUILD_WINDOWSACCESSBRIDGE$1, \
- LIBRARY = WindowsAccessBridge$1, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(ACCESSBRIDGE_SRCDIR), \
- INCLUDE_FILES := AccessBridgeJavaVMInstance.cpp AccessBridgeMessageQueue.cpp \
- AccessBridgeMessages.cpp AccessBridgeWindowsEntryPoints.cpp \
- WinAccessBridge.cpp AccessBridgeDebug.cpp \
- AccessBridgeEventHandler.cpp, \
- LANG := C++, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \
- -DACCESSBRIDGE_ARCH_$3, \
- LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
- winspool.lib comdlg32.lib advapi32.lib shell32.lib \
- ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
- -subsystem:windows -machine:$2 \
- -def:$(ACCESSBRIDGE_SRCDIR)/WinAccessBridge.DEF, \
- VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
- RC_FLAGS := $(RC_FLAGS), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libwindowsaccessbridge$1, \
- DEBUG_SYMBOLS := true)
-
- BUILD_LIBRARIES += $$(BUILD_JAWTACCESSBRIDGE$1) $$(BUILD_JAVAACCESSBRIDGE$1) \
- $$(BUILD_WINDOWSACCESSBRIDGE$1)
-
- endef
-
- ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
- $(eval $(call SetupAccessBridge,-32,I386,32))
- $(eval $(call SetupAccessBridge,,I386,LEGACY))
- else
- $(eval $(call SetupAccessBridge,-64,X64,64))
- endif
- endif
-endif
-
+include lib/SoundLibraries.gmk
##########################################################################################
diff --git a/jdk/makefiles/CopyFiles.gmk b/jdk/makefiles/CopyFiles.gmk
index 0ad18ce..02bafaf 100644
--- a/jdk/makefiles/CopyFiles.gmk
+++ b/jdk/makefiles/CopyFiles.gmk
@@ -215,39 +215,37 @@
##########################################################################################
-# make sure freetype dll will be available at runtime as well as link time
-#
-# NB: Default freetype build system uses -h linker option and
-# result .so contains hardcoded library name that is later
-# used for adding dependencies to other objects
-# (e.g. libfontmanager.so).
-#
-# It is not obvious how to extract that hardcoded name (libfreetype.so.6)
-# without overcomplicating logic here.
-# To workaround this we hardcode .6 suffix for now.
-#
-# Note that .so.6 library will not be found by System.loadLibrary()
-# but fortunately we need to load FreeType library explicitly
-# on windows only
-#
-#TODO: rework this to avoid hardcoding library name in the makefile
-#
-ifdef OPENJDK
+ifneq ($(FREETYPE_BUNDLE_LIB_PATH), )
+ # We need to bundle the freetype library, so it will be available at runtime as well as link time.
+ #
+ # NB: Default freetype build system uses -h linker option and
+ # result .so contains hardcoded library name that is later
+ # used for adding dependencies to other objects
+ # (e.g. libfontmanager.so).
+ #
+ # It is not obvious how to extract that hardcoded name (libfreetype.so.6)
+ # without overcomplicating logic here.
+ # To workaround this we hardcode .6 suffix for now.
+ #
+ # Note that .so.6 library will not be found by System.loadLibrary()
+ # but fortunately we need to load FreeType library explicitly
+ # on windows only
+ #
+ #TODO: rework this to avoid hardcoding library name in the makefile
+ #
ifeq ($(OPENJDK_TARGET_OS), windows)
- FREETYPE_LIB = $(JDK_OUTPUTDIR)/bin/$(call SHARED_LIBRARY,freetype)
+ FREETYPE_TARGET_LIB = $(JDK_OUTPUTDIR)/bin/$(call SHARED_LIBRARY,freetype)
else
- ifeq ($(USING_SYSTEM_FT_LIB), false)
- FREETYPE_LIB = $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6
- endif
+ FREETYPE_TARGET_LIB = $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6
endif
- $(FREETYPE_LIB): $(FREETYPE2_LIB_PATH)/$(call SHARED_LIBRARY,freetype)
- $(CP) $(FREETYPE2_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $@
+ $(FREETYPE_TARGET_LIB): $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype)
+ $(CP) $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $@
ifeq ($(OPENJDK_BUILD_OS), windows)
$(CHMOD) +rx $@
endif
- COPY_FILES += $(FREETYPE_LIB)
+ COPY_FILES += $(FREETYPE_TARGET_LIB)
endif
##########################################################################################
@@ -354,9 +352,23 @@
PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-$(OPENJDK_TARGET_OS)
PROPS_DST := $(JDK_OUTPUTDIR)/lib/security/java.security
+ifndef OPENJDK
+
+RESTRICTED_PKGS_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/restricted.pkgs
+RESTRICTED_PKGS := $(shell $(CAT) $(RESTRICTED_PKGS_SRC) | $(TR) "\n" " ")
+
+$(PROPS_DST): $(PROPS_SRC)
+ $(MKDIR) -p $(@D)
+ $(TOOL_ADDTORESTRICTEDPKGS) $^ $@.tmp $(RESTRICTED_PKGS)
+ $(MV) $@.tmp $@
+
+else
+
$(PROPS_DST): $(PROPS_SRC)
$(call install-file)
+endif
+
COPY_FILES += $(PROPS_DST)
##########################################################################################
diff --git a/jdk/makefiles/CopyIntoClasses.gmk b/jdk/makefiles/CopyIntoClasses.gmk
index 2eb496b..ddf5ae8 100644
--- a/jdk/makefiles/CopyIntoClasses.gmk
+++ b/jdk/makefiles/CopyIntoClasses.gmk
@@ -91,7 +91,7 @@
$(SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED)/icons/JavaCup32.png
endif
-ifndef OPENJDK
+ifeq ($(ENABLE_JFR), true)
JFR_CONFIGURATION_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings
COPY_FILES += \
$(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd
diff --git a/jdk/makefiles/CreateJars.gmk b/jdk/makefiles/CreateJars.gmk
index 05c88da..b3595ab 100644
--- a/jdk/makefiles/CreateJars.gmk
+++ b/jdk/makefiles/CreateJars.gmk
@@ -216,11 +216,6 @@
oracle/jrockit/jfr \
jdk/jfr
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- RT_JAR_EXCLUDES += com/sun/nio/sctp \
- sun/nio/ch/sctp
-endif
-
# Find all files in the classes dir to use as dependencies. This could be more fine granular.
ALL_FILES_IN_CLASSES := $(call not-containing, _the., $(filter-out %javac_state, \
$(call CacheFind, $(JDK_OUTPUTDIR)/classes)))
@@ -988,8 +983,6 @@
JARINDEX := true))
endif
-##########################################################################################
-
# This file is imported from hotspot in Import.gmk. Copying it into images/lib so that
# all jars can be found in one place when creating images in Images.gmk. It needs to be
# done here so that clean targets can be simple and accurate.
diff --git a/jdk/makefiles/GenerateClasses.gmk b/jdk/makefiles/GenerateClasses.gmk
index 4c68353..f4dafc5 100644
--- a/jdk/makefiles/GenerateClasses.gmk
+++ b/jdk/makefiles/GenerateClasses.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, 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
@@ -28,12 +28,33 @@
include $(SPEC)
include MakeBase.gmk
include RMICompilation.gmk
+include JavaCompilation.gmk
+include Setup.gmk
-# To ensure the latest stub generator files are picked up from corba repo
-# when available, we need to run with latest rmic version available.
-ifneq ($(COMPILE_TYPE), cross)
- RMIC := $(FIXPATH) $(JDK_OUTPUTDIR)/bin/rmic
-endif
+##########################################################################################
+
+RMIC_PKGS := \
+ sun/rmi/rmic \
+ sun/tools/asm \
+ sun/tools/java \
+ sun/tools/javac \
+ sun/tools/tree \
+ sun/tools/util \
+ #
+
+$(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_RMIC, \
+ SETUP := GENERATE_OLDBYTECODE, \
+ SRC := $(JDK_TOPDIR)/src/share/classes, \
+ INCLUDES := $(RMIC_PKGS), \
+ BIN := $(JDK_OUTPUTDIR)/btclasses_rmic, \
+ COPY := .properties, \
+ JAVAC_SOURCE_PATH_OVERRIDE := $(addprefix $(JDK_TOPDIR)/src/share/classes/, $(RMIC_PKGS))))
+
+##########################################################################################
+
+BTRMIC_CP := $(CORBA_OUTPUTDIR)/btjars/btcorba.jar$(PATH_SEP)$(JDK_OUTPUTDIR)/btclasses_rmic$(PATH_SEP)$(BOOTSTRAP_JAVAC_JAR)
+BTRMIC_ARGS := "-Xbootclasspath/p:$(BTRMIC_CP)" -cp "$(BTRMIC_CP)"
+RMIC := $(JAVA) $(BTRMIC_ARGS) sun.rmi.rmic.Main
CLASSES_DIR := $(JDK_OUTPUTDIR)/classes
# NOTE: If the smart javac dependency management is reintroduced, these classes risk
@@ -91,6 +112,8 @@
##########################################################################################
+$(RMI_12) $(RMI_11) $(RMI_IIOP) $(RMI_SRC): $(BUILD_BOOTSTRAP_RMIC)
+
$(RMIC_GENSRC_DIR)/_the.classes.removed: $(GENCLASSES)
$(FIND) $(RMIC_GENSRC_DIR) -name "*.class" $(FIND_DELETE)
$(TOUCH) $@
diff --git a/jdk/makefiles/Images.gmk b/jdk/makefiles/Images.gmk
index 4626e36..e40cc6d 100644
--- a/jdk/makefiles/Images.gmk
+++ b/jdk/makefiles/Images.gmk
@@ -238,6 +238,11 @@
JDK_LIB_FILES += jexec
endif
+ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris),) # If Linux or Solaris
+ JDK_LIB_FILES += $(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) \
+ $(LIBRARY_PREFIX)jawt$(SHARED_LIBRARY_SUFFIX)
+endif
+
# Find all files to copy from $(JDK_OUTPUTDIR)/lib
# Jar files are not expected to be here
ALL_JDKOUT_LIB_LIST := $(call not-containing,_the., $(filter-out %.jar, \
diff --git a/jdk/makefiles/Import.gmk b/jdk/makefiles/Import.gmk
index 8d74196..50164b9 100644
--- a/jdk/makefiles/Import.gmk
+++ b/jdk/makefiles/Import.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, 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
@@ -119,8 +119,13 @@
$(eval $(call CopyDir,HOTSPOT0, $(HOTSPOT_LIB_DIR), $(INSTALL_LIBRARIES_HERE), $(HOTSPOT_IMPORT_FILES)))
$(eval $(call CopyDir,HOTSPOT1, $(HOTSPOT_DIST)/lib, $(JDK_OUTPUTDIR)/lib, $(HOTSPOT_IMPORT_FILES)))
-JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.debuginfo) \
- $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.dSYM) \
+ $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
+else
+ JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.debuginfo) \
+ $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
+endif
ifneq ($(OPENJDK_TARGET_OS), windows)
ifeq ($(JVM_VARIANT_SERVER), true)
@@ -135,12 +140,14 @@
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
endif
endif
- ifeq ($(JVM_VARIANT_MINIMAL1), true)
- IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
- ifneq (, $(JSIG_DEBUGINFO))
- IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
+ ifneq ($(OPENJDK_TARGET_OS), macosx)
+ ifeq ($(JVM_VARIANT_MINIMAL1), true)
+ IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
+ ifneq (,$(JSIG_DEBUGINFO))
+ IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
+ endif
+ endif
endif
- endif
endif
$(INSTALL_LIBRARIES_HERE)/server/%$(SHARED_LIBRARY_SUFFIX): $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX)
@@ -148,6 +155,21 @@
$(RM) $@
$(LN) -s ../$(@F) $@
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+$(INSTALL_LIBRARIES_HERE)/server/%.dSYM : $(INSTALL_LIBRARIES_HERE)/%.dSYM
+ $(MKDIR) -p $(@D)
+ $(RM) $@
+ $(LN) -s ../$(@F) $@
+
+$(INSTALL_LIBRARIES_HERE)/server/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz
+ $(MKDIR) -p $(@D)
+ $(RM) $@
+ $(RM) $@.tmp $(basename $@).dSYM
+ $(LN) -s ../$(basename $(@F)).dSYM $(basename $@).dSYM
+ $(CD) $(@D) && $(ZIP) -q -y $@.tmp $(basename $(@F)).dSYM
+ $(RM) $(basename $@).dSYM
+ $(MV) $@.tmp $@
+else
$(INSTALL_LIBRARIES_HERE)/server/%.debuginfo: $(INSTALL_LIBRARIES_HERE)/%.debuginfo
$(MKDIR) -p $(@D)
$(RM) $@
@@ -161,12 +183,28 @@
$(CD) $(@D) && $(ZIP) -q -y $@.tmp $(basename $(@F)).debuginfo
$(RM) $(basename $@).debuginfo
$(MV) $@.tmp $@
+endif
$(INSTALL_LIBRARIES_HERE)/client/%$(SHARED_LIBRARY_SUFFIX): $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX)
$(MKDIR) -p $(@D)
$(RM) $@
$(LN) -s ../$(@F) $@
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+$(INSTALL_LIBRARIES_HERE)/client/%.dSYM : $(INSTALL_LIBRARIES_HERE)/%.dSYM
+ $(MKDIR) -p $(@D)
+ $(RM) $@
+ $(LN) -s ../$(@F) $@
+
+$(INSTALL_LIBRARIES_HERE)/client/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz
+ $(MKDIR) -p $(@D)
+ $(RM) $@
+ $(RM) $@.tmp $(basename $@).dSYM
+ $(LN) -s ../$(basename $(@F)).dSYM $(basename $@).dSYM
+ $(CD) $(@D) && $(ZIP) -q -y $@.tmp $(basename $(@F)).dSYM
+ $(RM) $(basename $@).dSYM
+ $(MV) $@.tmp $@
+else
$(INSTALL_LIBRARIES_HERE)/client/%.debuginfo: $(INSTALL_LIBRARIES_HERE)/%.debuginfo
$(MKDIR) -p $(@D)
$(RM) $@
@@ -180,12 +218,14 @@
$(CD) $(@D) && $(ZIP) -q -y $@.tmp $(basename $(@F)).debuginfo
$(RM) $(basename $@).debuginfo
$(MV) $@.tmp $@
+endif
$(INSTALL_LIBRARIES_HERE)/minimal/%$(SHARED_LIBRARY_SUFFIX): $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX)
$(MKDIR) -p $(@D)
$(RM) $@
$(LN) -s ../$(@F) $@
+ifneq ($(OPENJDK_TARGET_OS), macosx)
$(INSTALL_LIBRARIES_HERE)/minimal/%.debuginfo: $(INSTALL_LIBRARIES_HERE)/%.debuginfo
$(MKDIR) -p $(@D)
$(RM) $@
@@ -199,6 +239,7 @@
$(CD) $(@D) && $(ZIP) -q -y $@.tmp $(basename $(@F)).debuginfo
$(RM) $(basename $@).debuginfo
$(MV) $@.tmp $@
+endif
##########################################################################################
# Unpack the binary distributions of the crypto classes if they exist.
diff --git a/jdk/makefiles/Setup.gmk b/jdk/makefiles/Setup.gmk
index f40ded5..b624afb 100644
--- a/jdk/makefiles/Setup.gmk
+++ b/jdk/makefiles/Setup.gmk
@@ -29,13 +29,18 @@
# make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000"
JAVAC_WARNINGS := -Xlint:-unchecked,-deprecation,-overrides,classfile,dep-ann,divzero,varargs -Werror
+# Any java code executed during a JDK build to build other parts of the JDK must be
+# executed by the bootstrap JDK (probably with -Xbootclasspath/p: ) and for this
+# purpose must be built with -target PREVIOUS for bootstrapping purposes, which
+# requires restricting to language level and api of previous JDK.
+#
# The generate old bytecode javac setup uses the new compiler to compile for the
# boot jdk to generate tools that need to be run with the boot jdk.
-# Thus we force the target bytecode to 7.
+# Thus we force the target bytecode to the previous JDK version.
$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \
JVM := $(JAVA), \
JAVAC := $(NEW_JAVAC), \
- FLAGS := -source 7 -target 7 -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS), \
+ FLAGS := $(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS), \
SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
diff --git a/jdk/makefiles/Tools.gmk b/jdk/makefiles/Tools.gmk
index 9dc4af0..49a3c61 100644
--- a/jdk/makefiles/Tools.gmk
+++ b/jdk/makefiles/Tools.gmk
@@ -149,10 +149,14 @@
-cp $(JDK_OUTPUTDIR)/btclasses:$(JDK_OUTPUTDIR) \
build.tools.deps.CheckDeps
+TOOL_ADDTORESTRICTEDPKGS=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
+ build.tools.addtorestrictedpkgs.AddToRestrictedPkgs
+
##########################################################################################
# Tools needed on solaris because OBJCOPY is broken.
+ifeq ($(OPENJDK_TARGET_OS), solaris)
$(eval $(call SetupNativeCompilation,ADD_GNU_DEBUGLINK, \
SRC := $(JDK_TOPDIR)/make/tools/add_gnu_debuglink, \
LANG := C, \
@@ -172,3 +176,4 @@
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/fix_empty_sec_hdr_flags, \
OUTPUT_DIR := $(JDK_OUTPUTDIR)/btbin, \
PROGRAM := fix_empty_sec_hdr_flags))
+endif
diff --git a/jdk/makefiles/gendata/GendataBreakIterator.gmk b/jdk/makefiles/gendata/GendataBreakIterator.gmk
index b0f6253..1b9eba3 100644
--- a/jdk/makefiles/gendata/GendataBreakIterator.gmk
+++ b/jdk/makefiles/gendata/GendataBreakIterator.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, 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
@@ -44,17 +44,17 @@
BREAK_ITERATOR_DIR = $(JDK_OUTPUTDIR)/break_iterator
BREAK_ITERATOR_CLASSES = $(BREAK_ITERATOR_DIR)/classes
-# JAVAC_SOURCE_PATH_UGLY_OVERRIDE is set to isolate the compile to just those
+# JAVAC_SOURCE_PATH_OVERRIDE is set to isolate the compile to just those
# two files in that directory and not get anything implicit from
-# surrounding directories which aren't jdk 6 compatible.
-# Because we are targeting jdk 6, but the surrounding source code is jdk 7. Ugh.
+# surrounding directories which aren't jdk N-1 compatible.
+# Because we are targeting jdk N-1, but the surrounding source code is jdk N.
# These two files should be moved out to a build tool! We have to disable
# sjavac here as well.
$(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR, \
SETUP := GENERATE_OLDBYTECODE, \
SRC := $(TEXT_SRCDIR), \
DISABLE_SJAVAC := true, \
- JAVAC_SOURCE_PATH_UGLY_OVERRIDE := $(TEXT_SRCDIR)/$(TEXT_PKG), \
+ JAVAC_SOURCE_PATH_OVERRIDE := $(TEXT_SRCDIR)/$(TEXT_PKG), \
INCLUDES := $(TEXT_PKG), \
INCLUDE_FILES := $(TEXT_SOURCES), \
BIN := $(BREAK_ITERATOR_CLASSES)))
diff --git a/jdk/makefiles/jprt.properties b/jdk/makefiles/jprt.properties
index 7a1b8a2..6dfdf2f 100644
--- a/jdk/makefiles/jprt.properties
+++ b/jdk/makefiles/jprt.properties
@@ -33,9 +33,7 @@
# Standard list of jprt build targets for this source tree
jprt.build.targets= \
- solaris_sparc_5.10-{product|fastdebug}, \
solaris_sparcv9_5.10-{product|fastdebug}, \
- solaris_i586_5.10-{product|fastdebug}, \
solaris_x64_5.10-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \
@@ -47,9 +45,7 @@
# Standard vm test target
jprt.vm.default.test.targets= \
- solaris_sparc_5.10-product-c1-jvm98, \
solaris_sparcv9_5.10-product-c2-jvm98, \
- solaris_i586_5.10-product-c1-jvm98, \
solaris_x64_5.10-product-c2-jvm98, \
linux_i586_2.6-product-{c1|c2}-jvm98, \
linux_x64_2.6-product-c2-jvm98, \
@@ -64,117 +60,91 @@
# Default jdk test targets in test/Makefile (no fastdebug & limited c2)
jprt.make.rule.default.test.targets= \
\
- solaris_sparc_5.10-product-c1-jdk_beans1, \
solaris_sparcv9_5.10-product-c2-jdk_beans1, \
- solaris_i586_5.10-product-c1-jdk_beans1, \
solaris_x64_5.10-product-c2-jdk_beans1, \
linux_i586_2.6-product-{c1|c2}-jdk_beans1, \
linux_x64_2.6-product-c2-jdk_beans1, \
windows_i586_6.1-product-c1-jdk_beans1, \
windows_x64_6.1-product-c2-jdk_beans1, \
\
- solaris_sparc_5.10-product-c1-jdk_io, \
solaris_sparcv9_5.10-product-c2-jdk_io, \
- solaris_i586_5.10-product-c1-jdk_io, \
solaris_x64_5.10-product-c2-jdk_io, \
linux_i586_2.6-product-{c1|c2}-jdk_io, \
linux_x64_2.6-product-c2-jdk_io, \
windows_i586_6.1-product-c1-jdk_io, \
windows_x64_6.1-product-c2-jdk_io, \
\
- solaris_sparc_5.10-product-c1-jdk_lang, \
solaris_sparcv9_5.10-product-c2-jdk_lang, \
- solaris_i586_5.10-product-c1-jdk_lang, \
solaris_x64_5.10-product-c2-jdk_lang, \
linux_i586_2.6-product-{c1|c2}-jdk_lang, \
linux_x64_2.6-product-c2-jdk_lang, \
windows_i586_6.1-product-c1-jdk_lang, \
windows_x64_6.1-product-c2-jdk_lang, \
\
- solaris_sparc_5.10-product-c1-jdk_math, \
solaris_sparcv9_5.10-product-c2-jdk_math, \
- solaris_i586_5.10-product-c1-jdk_math, \
solaris_x64_5.10-product-c2-jdk_math, \
linux_i586_2.6-product-{c1|c2}-jdk_math, \
linux_x64_2.6-product-c2-jdk_math, \
windows_i586_6.1-product-c1-jdk_math, \
windows_x64_6.1-product-c2-jdk_math, \
\
- solaris_sparc_5.10-product-c1-jdk_misc, \
solaris_sparcv9_5.10-product-c2-jdk_misc, \
- solaris_i586_5.10-product-c1-jdk_misc, \
solaris_x64_5.10-product-c2-jdk_misc, \
linux_i586_2.6-product-{c1|c2}-jdk_misc, \
linux_x64_2.6-product-c2-jdk_misc, \
windows_i586_6.1-product-c1-jdk_misc, \
windows_x64_6.1-product-c2-jdk_misc, \
\
- solaris_sparc_5.10-product-c1-jdk_net, \
solaris_sparcv9_5.10-product-c2-jdk_net, \
- solaris_i586_5.10-product-c1-jdk_net, \
solaris_x64_5.10-product-c2-jdk_net, \
linux_i586_2.6-product-{c1|c2}-jdk_net, \
linux_x64_2.6-product-c2-jdk_net, \
windows_i586_6.1-product-c1-jdk_net, \
windows_x64_6.1-product-c2-jdk_net, \
\
- solaris_sparc_5.10-product-c1-jdk_nio1, \
solaris_sparcv9_5.10-product-c2-jdk_nio1, \
- solaris_i586_5.10-product-c1-jdk_nio1, \
solaris_x64_5.10-product-c2-jdk_nio1, \
linux_i586_2.6-product-{c1|c2}-jdk_nio1, \
linux_x64_2.6-product-c2-jdk_nio1, \
windows_i586_6.1-product-c1-jdk_nio1, \
windows_x64_6.1-product-c2-jdk_nio1, \
\
- solaris_sparc_5.10-product-c1-jdk_nio2, \
solaris_sparcv9_5.10-product-c2-jdk_nio2, \
- solaris_i586_5.10-product-c1-jdk_nio2, \
solaris_x64_5.10-product-c2-jdk_nio2, \
linux_i586_2.6-product-{c1|c2}-jdk_nio2, \
linux_x64_2.6-product-c2-jdk_nio2, \
windows_i586_6.1-product-c1-jdk_nio2, \
windows_x64_6.1-product-c2-jdk_nio2, \
\
- solaris_sparc_5.10-product-c1-jdk_nio3, \
solaris_sparcv9_5.10-product-c2-jdk_nio3, \
- solaris_i586_5.10-product-c1-jdk_nio3, \
solaris_x64_5.10-product-c2-jdk_nio3, \
linux_i586_2.6-product-{c1|c2}-jdk_nio3, \
linux_x64_2.6-product-c2-jdk_nio3, \
windows_i586_6.1-product-c1-jdk_nio3, \
windows_x64_6.1-product-c2-jdk_nio3, \
\
- solaris_sparc_5.10-product-c1-jdk_security1, \
solaris_sparcv9_5.10-product-c2-jdk_security1, \
- solaris_i586_5.10-product-c1-jdk_security1, \
solaris_x64_5.10-product-c2-jdk_security1, \
linux_i586_2.6-product-{c1|c2}-jdk_security1, \
linux_x64_2.6-product-c2-jdk_security1, \
windows_i586_6.1-product-c1-jdk_security1, \
windows_x64_6.1-product-c2-jdk_security1, \
\
- solaris_sparc_5.10-product-c1-jdk_text, \
solaris_sparcv9_5.10-product-c2-jdk_text, \
- solaris_i586_5.10-product-c1-jdk_text, \
solaris_x64_5.10-product-c2-jdk_text, \
linux_i586_2.6-product-{c1|c2}-jdk_text, \
linux_x64_2.6-product-c2-jdk_text, \
windows_i586_6.1-product-c1-jdk_text, \
windows_x64_6.1-product-c2-jdk_text, \
\
- solaris_sparc_5.10-product-c1-jdk_tools1, \
solaris_sparcv9_5.10-product-c2-jdk_tools1, \
- solaris_i586_5.10-product-c1-jdk_tools1, \
solaris_x64_5.10-product-c2-jdk_tools1, \
linux_i586_2.6-product-{c1|c2}-jdk_tools1, \
linux_x64_2.6-product-c2-jdk_tools1, \
windows_i586_6.1-product-c1-jdk_tools1, \
windows_x64_6.1-product-c2-jdk_tools1, \
\
- solaris_sparc_5.10-product-c1-jdk_util, \
solaris_sparcv9_5.10-product-c2-jdk_util, \
- solaris_i586_5.10-product-c1-jdk_util, \
solaris_x64_5.10-product-c2-jdk_util, \
linux_i586_2.6-product-{c1|c2}-jdk_util, \
linux_x64_2.6-product-c2-jdk_util, \
@@ -186,99 +156,77 @@
\
${jprt.make.rule.default.test.targets}, \
\
- solaris_sparc_5.10-product-c1-jdk_awt, \
solaris_sparcv9_5.10-product-c2-jdk_awt, \
- solaris_i586_5.10-product-c1-jdk_awt, \
solaris_x64_5.10-product-c2-jdk_awt, \
linux_i586_2.6-product-{c1|c2}-jdk_awt, \
linux_x64_2.6-product-c2-jdk_awt, \
windows_i586_6.1-product-c1-jdk_awt, \
windows_x64_6.1-product-c2-jdk_awt, \
\
- solaris_sparc_5.10-product-c1-jdk_beans2, \
solaris_sparcv9_5.10-product-c2-jdk_beans2, \
- solaris_i586_5.10-product-c1-jdk_beans2, \
solaris_x64_5.10-product-c2-jdk_beans2, \
linux_i586_2.6-product-{c1|c2}-jdk_beans2, \
linux_x64_2.6-product-c2-jdk_beans2, \
windows_i586_6.1-product-c1-jdk_beans2, \
windows_x64_6.1-product-c2-jdk_beans2, \
\
- solaris_sparc_5.10-product-c1-jdk_beans3, \
solaris_sparcv9_5.10-product-c2-jdk_beans3, \
- solaris_i586_5.10-product-c1-jdk_beans3, \
solaris_x64_5.10-product-c2-jdk_beans3, \
linux_i586_2.6-product-{c1|c2}-jdk_beans3, \
linux_x64_2.6-product-c2-jdk_beans3, \
windows_i586_6.1-product-c1-jdk_beans3, \
windows_x64_6.1-product-c2-jdk_beans3, \
\
- solaris_sparc_5.10-product-c1-jdk_management1, \
solaris_sparcv9_5.10-product-c2-jdk_management1, \
- solaris_i586_5.10-product-c1-jdk_management1, \
solaris_x64_5.10-product-c2-jdk_management1, \
linux_i586_2.6-product-{c1|c2}-jdk_management1, \
linux_x64_2.6-product-c2-jdk_management1, \
windows_i586_6.1-product-c1-jdk_management1, \
windows_x64_6.1-product-c2-jdk_management1, \
\
- solaris_sparc_5.10-product-c1-jdk_management2, \
solaris_sparcv9_5.10-product-c2-jdk_management2, \
- solaris_i586_5.10-product-c1-jdk_management2, \
solaris_x64_5.10-product-c2-jdk_management2, \
linux_i586_2.6-product-{c1|c2}-jdk_management2, \
linux_x64_2.6-product-c2-jdk_management2, \
windows_i586_6.1-product-c1-jdk_management2, \
windows_x64_6.1-product-c2-jdk_management2, \
\
- solaris_sparc_5.10-product-c1-jdk_rmi, \
solaris_sparcv9_5.10-product-c2-jdk_rmi, \
- solaris_i586_5.10-product-c1-jdk_rmi, \
solaris_x64_5.10-product-c2-jdk_rmi, \
linux_i586_2.6-product-{c1|c2}-jdk_rmi, \
linux_x64_2.6-product-c2-jdk_rmi, \
windows_i586_6.1-product-c1-jdk_rmi, \
windows_x64_6.1-product-c2-jdk_rmi, \
\
- solaris_sparc_5.10-product-c1-jdk_security2, \
solaris_sparcv9_5.10-product-c2-jdk_security2, \
- solaris_i586_5.10-product-c1-jdk_security2, \
solaris_x64_5.10-product-c2-jdk_security2, \
linux_i586_2.6-product-{c1|c2}-jdk_security2, \
linux_x64_2.6-product-c2-jdk_security2, \
windows_i586_6.1-product-c1-jdk_security2, \
windows_x64_6.1-product-c2-jdk_security2, \
\
- solaris_sparc_5.10-product-c1-jdk_security3, \
solaris_sparcv9_5.10-product-c2-jdk_security3, \
- solaris_i586_5.10-product-c1-jdk_security3, \
solaris_x64_5.10-product-c2-jdk_security3, \
linux_i586_2.6-product-{c1|c2}-jdk_security3, \
linux_x64_2.6-product-c2-jdk_security3, \
windows_i586_6.1-product-c1-jdk_security3, \
windows_x64_6.1-product-c2-jdk_security3, \
\
- solaris_sparc_5.10-product-c1-jdk_sound, \
solaris_sparcv9_5.10-product-c2-jdk_sound, \
- solaris_i586_5.10-product-c1-jdk_sound, \
solaris_x64_5.10-product-c2-jdk_sound, \
linux_i586_2.6-product-{c1|c2}-jdk_sound, \
linux_x64_2.6-product-c2-jdk_sound, \
windows_i586_6.1-product-c1-jdk_sound, \
windows_x64_6.1-product-c2-jdk_sound, \
\
- solaris_sparc_5.10-product-c1-jdk_swing, \
solaris_sparcv9_5.10-product-c2-jdk_swing, \
- solaris_i586_5.10-product-c1-jdk_swing, \
solaris_x64_5.10-product-c2-jdk_swing, \
linux_i586_2.6-product-{c1|c2}-jdk_swing, \
linux_x64_2.6-product-c2-jdk_swing, \
windows_i586_6.1-product-c1-jdk_swing, \
windows_x64_6.1-product-c2-jdk_swing, \
\
- solaris_sparc_5.10-product-c1-jdk_tools2, \
solaris_sparcv9_5.10-product-c2-jdk_tools2, \
- solaris_i586_5.10-product-c1-jdk_tools2, \
solaris_x64_5.10-product-c2-jdk_tools2, \
linux_i586_2.6-product-{c1|c2}-jdk_tools2, \
linux_x64_2.6-product-c2-jdk_tools2, \
@@ -287,9 +235,7 @@
# JCK test targets in test/Makefile (no fastdebug & limited c2, windows broken)
jprt.my.jck.test.target.set= \
- solaris_sparc_5.10-product-c1-JCK7TESTRULE, \
solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, \
- solaris_i586_5.10-product-c1-JCK7TESTRULE, \
solaris_x64_5.10-product-c2-JCK7TESTRULE, \
linux_i586_2.6-product-c1-JCK7TESTRULE, \
linux_x64_2.6-product-c2-JCK7TESTRULE
diff --git a/jdk/makefiles/lib/Awt2dLibraries.gmk b/jdk/makefiles/lib/Awt2dLibraries.gmk
new file mode 100644
index 0000000..9d1caa2
--- /dev/null
+++ b/jdk/makefiles/lib/Awt2dLibraries.gmk
@@ -0,0 +1,1527 @@
+#
+# Copyright (c) 2011, 2013, 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.
+#
+
+# Openwin is defined on Solaris.
+OPENWIN_LIB := $(OPENWIN_HOME)/lib
+
+WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib
+
+##########################################################################################
+
+BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/share/native/sun/awt/medialib
+BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
+ -I$(BUILD_LIBMLIB_SRC) \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/medialib
+
+BUILD_LIBMLIB_LDLIBS :=
+BUILD_LIBMLIB_IMAGE_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libmlib_image/mapfile-vers
+
+BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH
+
+ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
+ BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), windows)
+ BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL)
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \
+ LIBRARY := mlib_image, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(BUILD_LIBMLIB_SRC), \
+ EXCLUDE_FILES := awt_ImagingLib.c mlib_c_ImageBlendTable.c, \
+ LANG := C, \
+ OPTIMIZATION := HIGHEST, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(BUILD_LIBMLIB_CFLAGS), \
+ MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(BUILD_LIBMLIB_LDLIBS) \
+ $(LDFLAGS_JDKLIB_SUFFIX), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=mlib_image.dll" \
+ -D "JDK_INTERNAL_NAME=mlib_image" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmlib_image, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+$(BUILD_LIBMLIB_IMAGE): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE)
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
+
+ BUILD_LIBMLIB_IMAGE_V_FILES := \
+ mlib_v_ImageLookUp.c \
+ mlib_ImageCreate.c \
+ mlib_ImageAffine.c \
+ mlib_ImageConvMxN.c \
+ mlib_ImageConvKernelConvert.c \
+ mlib_sys.c \
+ mlib_ImageLookUp_64.c \
+ mlib_ImageLookUp_Bit.c \
+ mlib_ImageColorTrue2Index.c \
+ mlib_c_ImageThresh1_U8.c \
+ mlib_v_ImageLookUpS16S16Func.c \
+ mlib_v_ImageLookUpS16S32Func.c \
+ mlib_v_ImageLookUpS16U16Func.c \
+ mlib_v_ImageLookUpS16U8Func.c \
+ mlib_v_ImageLookUpS32S16Func.c \
+ mlib_v_ImageLookUpS32S32Func.c \
+ mlib_v_ImageLookUpS32U16Func.c \
+ mlib_v_ImageLookUpS32U8Func.c \
+ mlib_v_ImageLookUpSIS16S16Func.c \
+ mlib_v_ImageLookUpSIS16S32Func.c \
+ mlib_v_ImageLookUpSIS16U16Func.c \
+ mlib_v_ImageLookUpSIS16U8Func.c \
+ mlib_v_ImageLookUpSIS32S16Func.c \
+ mlib_v_ImageLookUpSIS32S32Func.c \
+ mlib_v_ImageLookUpSIS32U16Func.c \
+ mlib_v_ImageLookUpSIS32U8Func.c \
+ mlib_v_ImageLookUpSIU16S16Func.c \
+ mlib_v_ImageLookUpSIU16S32Func.c \
+ mlib_v_ImageLookUpSIU16U16Func.c \
+ mlib_v_ImageLookUpSIU16U8Func.c \
+ mlib_v_ImageLookUpSIU8S16Func.c \
+ mlib_v_ImageLookUpSIU8S32Func.c \
+ mlib_v_ImageLookUpSIU8U16Func.c \
+ mlib_v_ImageLookUpSIU8U8Func.c \
+ mlib_v_ImageLookUpU16S16Func.c \
+ mlib_v_ImageLookUpU16S32Func.c \
+ mlib_v_ImageLookUpU16U16Func.c \
+ mlib_v_ImageLookUpU16U8Func.c \
+ mlib_v_ImageLookUpU8S16Func.c \
+ mlib_v_ImageLookUpU8S32Func.c \
+ mlib_v_ImageLookUpU8U16Func.c \
+ mlib_v_ImageLookUpU8U8Func.c \
+ mlib_v_ImageAffineIndex_BC.c \
+ mlib_v_ImageAffine_BC.c \
+ mlib_v_ImageAffine_BC_S16.c \
+ mlib_v_ImageAffine_BC_U16.c \
+ mlib_v_ImageAffine_BL.c \
+ mlib_v_ImageAffine_BL_S16.c \
+ mlib_v_ImageAffine_BL_U16.c \
+ mlib_v_ImageAffine_NN.c \
+ mlib_v_ImageFilters.c \
+ mlib_ImageAffineEdge.c \
+ mlib_ImageAffine_BC_D64.c \
+ mlib_ImageAffine_BC_F32.c \
+ mlib_ImageAffine_BC_S32.c \
+ mlib_ImageAffine_BL_D64.c \
+ mlib_ImageAffine_BL_F32.c \
+ mlib_ImageAffine_BL_S32.c \
+ mlib_ImageAffine_NN.c \
+ mlib_ImageAffine_NN_Bit.c \
+ mlib_ImageFilters.c \
+ mlib_ImageScanPoly.c \
+ mlib_ImageConv_8nw.c \
+ mlib_ImageConv_8ext.c \
+ mlib_ImageConv_16nw.c \
+ mlib_ImageConv_16ext.c \
+ mlib_ImageConv_u16nw.c \
+ mlib_ImageConv_u16ext.c \
+ mlib_ImageConv_32nw.c \
+ mlib_ImageConv_F32nw.c \
+ mlib_ImageConvMxN_Fp.c \
+ mlib_ImageConvMxN_ext.c \
+ mlib_ImageConv_D64nw.c \
+ mlib_ImageClipping.c \
+ mlib_ImageConvCopyEdge_Bit.c \
+ mlib_ImageConvClearEdge_Bit.c \
+ mlib_ImageConv2x2_f.c \
+ mlib_ImageConvClearEdge_Fp.c \
+ mlib_v_ImageConvMxN_8.c \
+ mlib_v_ImageConvClearEdge.c \
+ mlib_v_ImageConvCopyEdge.c \
+ mlib_v_ImageConvMxN_8ext.c \
+ mlib_v_ImageConvVersion.c \
+ mlib_v_ImageConv_8nw.c \
+ mlib_ImageConvCopyEdge_Fp.c \
+ mlib_v_ImageChannelInsert_1.c \
+ mlib_v_ImageChannelExtract_43.c \
+ mlib_v_ImageChannelExtract_1.c \
+ mlib_ImageCopy_Bit.c \
+ mlib_v_ImageCopy_f.c \
+ mlib_ImageUtils.c \
+ mlib_ImageDivTables.c
+
+ BUILD_LIBMLIB_V_CFLAGS := $(filter-out -DMLIB_NO_LIBSUNMATH, $(BUILD_LIBMLIB_CFLAGS))
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE_V, \
+ LIBRARY := mlib_image_v, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/sun/awt/medialib \
+ $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib, \
+ LANG := C, \
+ INCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_FILES), \
+ OPTIMIZATION := HIGHEST, \
+ CFLAGS := -xarch=sparcvis \
+ $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il \
+ $(BUILD_LIBMLIB_V_CFLAGS) \
+ $(CFLAGS_JDKLIB), \
+ MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmlib_image_v, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBMLIB_IMAGE_V): $(BUILD_LIBJAVA)
+
+ BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE_V)
+
+endif
+
+##########################################################################################
+
+LIBAWT_DIRS := \
+ $(JDK_TOPDIR)/src/share/native/sun/awt \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/image \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/image/gif \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/medialib \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/debug \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/utility \
+ $(JDK_TOPDIR)/src/share/native/sun/java2d \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
+ $(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
+ $(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/image \
+ $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
+ $(JDK_TOPDIR)/src/share/native/sun/font
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBAWT_DIRS += \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/d3d
+else
+ LIBAWT_DIRS += \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11
+endif
+
+LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
+ $(X_CFLAGS) \
+ $(foreach dir, $(LIBAWT_DIRS), -I$(dir))
+
+LIBAWT_FILES := \
+ gifdecoder.c \
+ imageInitIDs.c \
+ img_globals.c \
+ SurfaceData.c \
+ Region.c \
+ BufImgSurfaceData.c \
+ Disposer.c \
+ Trace.c \
+ GraphicsPrimitiveMgr.c \
+ Blit.c \
+ BlitBg.c \
+ ScaledBlit.c \
+ FillRect.c \
+ FillSpans.c \
+ FillParallelogram.c \
+ DrawParallelogram.c \
+ DrawLine.c \
+ DrawRect.c \
+ DrawPolygons.c \
+ DrawPath.c \
+ FillPath.c \
+ ProcessPath.c \
+ MaskBlit.c \
+ MaskFill.c \
+ TransformHelper.c \
+ AlphaMath.c \
+ AlphaMacros.c \
+ AnyByte.c \
+ ByteBinary1Bit.c \
+ ByteBinary2Bit.c \
+ ByteBinary4Bit.c \
+ ByteIndexed.c \
+ ByteGray.c \
+ Index8Gray.c \
+ Index12Gray.c \
+ AnyShort.c \
+ Ushort555Rgb.c \
+ Ushort565Rgb.c \
+ Ushort4444Argb.c \
+ Ushort555Rgbx.c \
+ UshortGray.c \
+ UshortIndexed.c \
+ Any3Byte.c \
+ ThreeByteBgr.c \
+ AnyInt.c \
+ IntArgb.c \
+ IntArgbPre.c \
+ IntArgbBm.c \
+ IntRgb.c \
+ IntBgr.c \
+ IntRgbx.c \
+ Any4Byte.c \
+ FourByteAbgr.c \
+ FourByteAbgrPre.c \
+ BufferedMaskBlit.c \
+ BufferedRenderPipe.c \
+ ShapeSpanIterator.c \
+ SpanClipRenderer.c \
+ awt_ImageRep.c \
+ awt_ImagingLib.c \
+ awt_Mlib.c \
+ awt_parseImage.c \
+ DataBufferNative.c \
+ dither.c \
+ debug_assert.c \
+ debug_mem.c \
+ debug_trace.c \
+ debug_util.c
+
+ifneq (, $(filter $(OPENJDK_TARGET_OS), solaris linux))
+ LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBAWT_FILES += awt_LoadLibrary.c img_colors.c
+ LIBAWT_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks
+endif
+
+ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
+ LIBAWT_CFLAGS += -DMLIB_ADD_SUFF
+ LIBAWT_CFLAGS += -xarch=sparcvis
+ LIBAWT_CFLAGS += $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il
+ LIBAWT_CFLAGS += \
+ -I$(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib \
+ -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d/medialib \
+ -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d/loops
+
+ LIBAWT_DIRS += $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib \
+ $(JDK_TOPDIR)/src/solaris/native/sun/java2d/loops
+
+ LIBAWT_FILES += \
+ vis_FuncArray.c \
+ java2d_Mlib.c \
+ mlib_ImageCreate.c \
+ mlib_ImageZoom_NN.c \
+ mlib_ImageCopy_Bit.c \
+ mlib_sys.c \
+ mlib_v_ImageClear.c \
+ mlib_v_ImageClear_f.c \
+ mlib_v_ImageConstXor.c \
+ mlib_v_ImageCopy.c \
+ mlib_v_ImageCopy_f.c \
+ mlib_v_ImageXor.c \
+ mlib_v_ImageZoom_NN_f.c \
+ vis_Interp.c \
+ vis_AlphaMacros.c \
+ vis_AlphaMaskBlit.c \
+ vis_AlphaMaskFill.c \
+ vis_ByteGray.c \
+ vis_ByteGray_FromRgb.c \
+ vis_ByteGray_Mask.c \
+ vis_ByteIndexed.c \
+ vis_DrawLine.c \
+ vis_FourByteAbgr.c \
+ vis_IntArgb.c \
+ vis_IntArgbPre.c \
+ vis_IntArgbPre_Mask.c \
+ vis_IntBgr.c \
+ vis_IntRgb.c \
+ vis_IntRgbx.c \
+ vis_SrcMaskFill.c \
+ vis_SrcOverMaskBlit.c \
+ vis_SrcOverMaskFill.c \
+ vis_FourByteAbgrPre.c \
+ vis_GlyphList.c \
+ vis_GlyphListXor.c \
+ vis_IntArgbBm.c \
+ vis_ThreeByteBgr.c \
+ vis_UshortGray.c \
+ vis_UshortGray_FromRgb.c \
+ vis_XorBlit.c \
+ mlib_v_ImageCopy_blk.s
+
+ ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
+ LIBAWT_ASFLAGS = -P -xarch=v9a
+ else
+ LIBAWT_ASFLAGS = -P -xarch=v8plusa
+ endif
+else
+ LIBAWT_FILES += MapAccelFunc.c
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+ LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
+endif
+
+LIBAWT_LANG := C
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBAWT_FILES += AccelGlyphCache.c \
+ ShaderList.c \
+ CmdIDList.cpp \
+ Hashtable.cpp \
+ GDIHashtable.cpp \
+ Devices.cpp \
+ ObjectList.cpp \
+ GDIBlitLoops.cpp \
+ GDIRenderer.cpp \
+ GDIWindowSurfaceData.cpp \
+ WindowsFlags.cpp \
+ WPrinterJob.cpp \
+ awt_%.cpp \
+ D3DBlitLoops.cpp \
+ D3DBufImgOps.cpp \
+ D3DContext.cpp \
+ D3DGlyphCache.cpp \
+ D3DGraphicsDevice.cpp \
+ D3DMaskBlit.cpp \
+ D3DMaskCache.cpp \
+ D3DMaskFill.cpp \
+ D3DPipelineManager.cpp \
+ D3DPaints.cpp \
+ D3DRenderer.cpp \
+ D3DRenderQueue.cpp \
+ D3DResourceManager.cpp \
+ D3DSurfaceData.cpp \
+ D3DTextRenderer.cpp \
+ D3DVertexCacher.cpp \
+ ShellFolder2.cpp \
+ ThemeReader.cpp \
+ ComCtl32Util.cpp \
+ DllUtil.cpp \
+ initIDs.cpp \
+ MouseInfo.cpp \
+ rect.c \
+ OGLBlitLoops.c \
+ OGLBufImgOps.c \
+ OGLContext.c \
+ OGLFuncs.c \
+ OGLMaskBlit.c \
+ OGLMaskFill.c \
+ OGLPaints.c \
+ OGLRenderQueue.c \
+ OGLRenderer.c \
+ OGLSurfaceData.c \
+ OGLTextRenderer.c \
+ OGLVertexCache.c \
+ WGLGraphicsConfig.c \
+ WGLSurfaceData.c
+
+ LIBAWT_LANG := C++
+ LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
+ ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
+ LIBAWT_CFLAGS += -DMLIB_OS64BIT
+ endif
+
+ ifdef OPENJDK
+ LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/windows/resource/icons"
+ else
+ LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows"
+ endif
+ LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/native/sun/windows/awt.rc
+endif
+
+ifeq ($(MILESTONE), internal)
+ LIBAWT_CFLAGS += -DINTERNAL_BUILD
+endif
+
+LIBAWT_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libawt/mapfile-vers
+ifeq ($(OPENJDK_TARGET_OS), linux)
+ LIBAWT_MAPFILE :=
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \
+ LIBRARY := awt, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBAWT_DIRS), \
+ INCLUDE_FILES := $(LIBAWT_FILES), \
+ LANG := $(LIBAWT_LANG), \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
+ ASFLAGS := $(LIBAWT_ASFLAGS), \
+ MAPFILE := $(LIBAWT_MAPFILE), \
+ LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_solaris := -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \
+ LDFLAGS_SUFFIX_linux := -ljvm $(LIBM) $(LIBDL) -ljava, \
+ LDFLAGS_SUFFIX_solaris := -ljvm $(LIBM) $(LIBDL) -ljava -lc, \
+ LDFLAGS_SUFFIX_macosx := -lmlib_image -ljvm $(LIBM) \
+ -framework Cocoa \
+ -framework OpenGL \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -framework JavaNativeFoundation \
+ -framework JavaRuntimeSupport \
+ -framework ApplicationServices \
+ -framework AudioToolbox \
+ -ljava, \
+ LDFLAGS_SUFFIX_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \
+ imm32.lib ole32.lib uuid.lib shell32.lib \
+ comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \
+ delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib \
+ -DELAYLOAD:user32.dll -DELAYLOAD:gdi32.dll \
+ -DELAYLOAD:shell32.dll -DELAYLOAD:winmm.dll \
+ -DELAYLOAD:winspool.drv -DELAYLOAD:imm32.dll \
+ -DELAYLOAD:ole32.dll -DELAYLOAD:comdlg32.dll \
+ -DELAYLOAD:comctl32.dll -DELAYLOAD:shlwapi.dll, \
+ VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
+ RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
+ -D "JDK_FNAME=awt.dll" \
+ -D "JDK_INTERNAL_NAME=awt" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+$(BUILD_LIBAWT): $(BUILD_LIBJAVA)
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ $(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE)
+endif
+
+BUILD_LIBRARIES += $(BUILD_LIBAWT)
+
+##########################################################################################
+
+# TODO!!
+# Even though this variable as a general name, it is
+# only used on macos, in fontpath.c, as prefix for where to find fonts.
+#
+# It's used for libawt_headless _and_ libawt_xawt
+#
+X11_PATH := /usr/X11R6
+
+ifneq ($(OPENJDK_TARGET_OS), windows)
+ ifndef BUILD_HEADLESS_ONLY
+
+ LIBAWT_XAWT_DIRS := \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/debug \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/utility \
+ $(JDK_TOPDIR)/src/share/native/sun/font \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \
+ $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/xawt \
+
+ LIBAWT_XAWT_CFLAGS := -DXAWT -DXAWT_HACK \
+ -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
+ $(CUPS_CFLAGS) \
+ $(foreach dir, $(LIBAWT_XAWT_DIRS), -I$(dir)) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga
+
+ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15
+ endif
+
+ ifeq ($(OPENJDK_TARGET_OS), linux)
+ ifndef OPENJDK
+ include $(JDK_TOPDIR)/make/closed/xawt.gmk
+ endif
+
+ ifeq ($(DISABLE_XRENDER), true)
+ LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
+ endif
+ endif
+
+ ifeq ($(MILESTONE), internal)
+ LIBAWT_XAWT_CFLAGS += -DINTERNAL_BUILD
+ endif
+
+ LIBAWT_XAWT_FILES := \
+ XlibWrapper.c \
+ XWindow.c \
+ XToolkit.c \
+ X11Color.c \
+ X11SurfaceData.c \
+ awt_GraphicsEnv.c \
+ awt_InputMethod.c \
+ robot_common.c \
+ awt_Robot.c \
+ list.c \
+ multiVis.c \
+ initIDs.c \
+ awt_util.c \
+ awt_Desktop.c \
+ awt_UNIXToolkit.c \
+ X11FontScaler_md.c \
+ X11TextRenderer_md.c \
+ fontpath.c \
+ awt_Insets.c \
+ awt_Event.c \
+ X11Renderer.c \
+ X11PMBlitLoops.c \
+ OGLBlitLoops.c \
+ OGLBufImgOps.c \
+ OGLContext.c \
+ OGLFuncs.c \
+ OGLMaskBlit.c \
+ OGLMaskFill.c \
+ OGLPaints.c \
+ OGLRenderQueue.c \
+ OGLRenderer.c \
+ OGLSurfaceData.c \
+ OGLTextRenderer.c \
+ OGLVertexCache.c \
+ GLXGraphicsConfig.c \
+ GLXSurfaceData.c \
+ AccelGlyphCache.c \
+ awt_Font.c \
+ multi_font.c \
+ awt_AWTEvent.c \
+ awt_DrawingSurface.c \
+ jawt.c \
+ CUPSfuncs.c \
+ debug_assert.c \
+ debug_mem.c \
+ debug_trace.c \
+ debug_util.c \
+ awt_Plugin.c \
+ gnome_interface.c \
+ gtk2_interface.c \
+ swing_GTKEngine.c \
+ swing_GTKStyle.c \
+ rect.c \
+ sun_awt_X11_GtkFileDialogPeer.c \
+ XRSurfaceData.c \
+ XRBackendNative.c
+
+ LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
+
+ ifeq ($(OPENJDK_TARGET_OS), linux)
+ # To match old build, add this to LDFLAGS instead of suffix.
+ LIBAWT_XAWT_LDFLAGS += -lpthread
+ endif
+
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBAWT_XAWT_LDFLAGS_SUFFIX += -lpthread
+ endif
+
+ # On macosx, the shared library origin is set twice for this lib.
+ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT, \
+ LIBRARY := awt_xawt, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBAWT_XAWT_DIRS), \
+ INCLUDE_FILES := $(LIBAWT_XAWT_FILES), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
+ $(X_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libawt_xawt/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(X_LIBS) $(LIBAWT_XAWT_LDFLAGS), \
+ LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN) \
+ $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
+ LDFLAGS_solaris := -L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) \
+ -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) \
+ -R$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) \
+ -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) \
+ -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \
+ $(call SET_SHARED_LIBRARY_ORIGIN) \
+ $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
+ LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN) \
+ $(call SET_SHARED_LIBRARY_ORIGIN). \
+ $(call SET_SHARED_LIBRARY_ORIGIN) \
+ $(call SET_SHARED_LIBRARY_ORIGIN)., \
+ LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=xawt.dll" \
+ -D "JDK_INTERNAL_NAME=xawt" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_xawt, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBAWT_XAWT): $(BUILD_LIBJAVA)
+
+ $(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT)
+
+ BUILD_LIBRARIES += $(BUILD_LIBAWT_XAWT)
+
+ endif
+endif
+
+##########################################################################################
+
+# TODO: Update awt lib path when awt is converted
+$(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
+ LIBRARY := lcms, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
+ LANG := C, \
+ OPTIMIZATION := HIGHEST, \
+ CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
+ $(SHARED_LIBRARY_FLAGS) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
+ CFLAGS_solaris := -xc99=no_lib, \
+ CFLAGS_windows := -DCMS_IS_WINDOWS_, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/liblcms/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
+ LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
+ LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \
+ LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
+ LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=lcms.dll" \
+ -D "JDK_INTERNAL_NAME=lcms" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+BUILD_LIBRARIES += $(BUILD_LIBLCMS)
+
+$(BUILD_LIBLCMS): $(BUILD_LIBAWT)
+
+##########################################################################################
+
+ifdef OPENJDK
+ BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers
+else
+ BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers-closed
+ BUILD_LIBJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
+ BUILD_LIBJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJPEG_CLOSED_SRC)
+endif
+
+BUILD_LIBJPEG_REORDER :=
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifneq ($(OPENJDK_TARGET_CPU), x86_64)
+ BUILD_LIBJPEG_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
+ endif
+endif
+
+# Suppress gcc warnings like "variable might be clobbered by 'longjmp'
+# or 'vfork'": this warning indicates that some variable is placed to
+# a register by optimized compiler and it's value might be lost on longjmp().
+# Recommended way to avoid such warning is to declare the variable as
+# volatile to prevent the optimization. However, this approach does not
+# work because we have to declare all variables as volatile in result.
+#ifndef CROSS_COMPILE_ARCH
+# CC_43_OR_NEWER := \
+# $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
+# \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
+# ifeq ($(CC_43_OR_NEWER), 1)
+# BUILD_LIBJPEG_CFLAGS_linux += -Wno-clobbered
+# endif
+#endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJPEG, \
+ LIBRARY := jpeg, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
+ LANG := C, \
+ OPTIMIZATION := HIGHEST, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(BUILD_LIBJPEG_CLOSED_INCLUDES) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
+ MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
+ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=jpeg.dll" \
+ -D "JDK_INTERNAL_NAME=jpeg" \
+ -D "JDK_FTYPE=0x2L", \
+ REORDER := $(BUILD_LIBJPEG_REORDER), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+$(BUILD_LIBJPEG): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBJPEG)
+
+##########################################################################################
+
+ifndef OPENJDK
+ FONT_HEADERS := -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k
+ BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers
+ LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c
+else
+ FONT_HEADERS := $(FREETYPE_CFLAGS)
+ BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers.openjdk
+ BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE_LIBS)
+endif
+
+LIBFONTMANAGER_OPTIMIZATION := HIGH
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
+ X11TextRenderer.c
+ LIBFONTMANAGER_OPTIMIZATION := HIGHEST
+else
+ LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
+ lcdglyph.c
+endif
+
+BUILD_LIBFONTMANAGER_CFLAGS_COMMON := \
+ $(X_CFLAGS) \
+ -DLE_STANDALONE -DHEADLESS \
+ $(FONT_HEADERS) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/font \
+ -I$(JDK_TOPDIR)/src/share/native/sun/font/layout \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d
+
+# Turn off aliasing with GCC for ExtensionSubtables.cpp
+ifeq ($(OPENJDK_TARGET_OS), linux)
+ BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
+ LIBRARY := fontmanager, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/sun/font \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font, \
+ EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
+ AccelGlyphCache.c, \
+ LANG := C++, \
+ CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON), \
+ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON), \
+ OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
+ CFLAGS_windows = -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
+ -DCC_NOEX, \
+ MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \
+ LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \
+ LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
+ LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
+ LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
+ -ljava -ljvm, \
+ LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
+ $(WIN_AWT_LIB), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=fontmanager.dll" \
+ -D "JDK_INTERNAL_NAME=fontmanager" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfontmanager, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
+
+ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris macosx))
+ $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_XAWT)
+endif
+
+BUILD_LIBRARIES += $(BUILD_LIBFONTMANAGER)
+
+##########################################################################################
+
+ifndef OPENJDK
+
+ #ifeq ($(OPENJDK_TARGET_OS), linux)
+ # ifeq ("$(CC_VER_MAJOR)", "3")
+ # OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
+ # endif
+ #endif
+ #
+ # The resulting size of the t2k lib file is (at least on linux) dependant on the order of
+ # the input .o files. Because of this the new build will differ in size to the old build.
+ BUILD_LIBT2K_CFLAGS_COMMON := -I$(JDK_TOPDIR)/src/share/native/sun/font \
+ -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \
+ -I$(JDK_TOPDIR)/src/closed/share/native/sun/font \
+ -I$(JDK_TOPDIR)/src/share/share/native/sun/font \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBT2K, \
+ LIBRARY := t2k, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/font \
+ $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \
+ $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k/ttHints, \
+ EXCLUDE_FILES := orion.c, \
+ LANG := C++, \
+ OPTIMIZATION := HIGH, \
+ CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON), \
+ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON), \
+ CFLAGS_windows = -DCC_NOEX, \
+ CXXFLAGS_windows = -DCC_NOEX, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libt2k/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_windows := user32.lib $(JDK_OUTPUTDIR)/objs/libfontmanager/fontmanager.lib, \
+ LDFLAGS_SUFFIX_posix := $(LIBM) $(LIBCXX) -lfontmanager -ljava -ljvm -lc, \
+ LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=t2k.dll" \
+ -D "JDK_INTERNAL_NAME=t2k" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libt2k, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ # t2k is linked against fontmanager
+ $(BUILD_LIBT2K): $(BUILD_LIBFONTMANAGER)
+
+ BUILD_LIBRARIES += $(BUILD_LIBT2K)
+endif
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ ifeq ($(OPENJDK_TARGET_CPU), x86)
+ KERNEL32_LIB := kernel32.lib
+ endif
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
+ LIBRARY := jawt, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows, \
+ INCLUDE_FILES := jawt.cpp, \
+ LANG := C++, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CXXFLAGS_JDKLIB) \
+ -EHsc -DUNICODE -D_UNICODE \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) $(KERNEL32_LIB) $(LDFLAGS_CXX_JDK) \
+ advapi32.lib $(WIN_AWT_LIB), \
+ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=jawt.dll" \
+ -D "JDK_INTERNAL_NAME=jawt" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBJAWT): $(BUILD_LIBAWT)
+
+ $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT)
+ $(ECHO) Copying $(@F)
+ $(CP) $(JDK_OUTPUTDIR)/objs/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@
+
+ BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
+
+else # OPENJDK_TARGET_OS not windows
+
+ JAWT_LIBS :=
+ ifneq ($(OPENJDK_TARGET_OS), solaris)
+ JAWT_LIBS += -lawt
+ endif
+
+ ifndef BUILD_HEADLESS_ONLY
+ JAWT_LIBS += -lawt_xawt
+ else
+ JAWT_LIBS += -lawt_headless
+ HEADLESS_CFLAG += -DHEADLESS
+ endif
+
+ JAWT_FILES := jawt.c
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ JAWT_FILES := jawt.m
+ JAWT_LIBS := -lawt_lwawt
+ endif
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
+ LIBRARY := jawt, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
+ $(JDK_TOPDIR)/src/macosx/native/sun/awt, \
+ INCLUDE_FILES := $(JAWT_FILES), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB), \
+ CFLAGS_linux := $(HEADLESS_CFLAG), \
+ CFLAGS_macosx := -I$(JDK_TOPDIR)/src/solaris/native/sun/awt, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjawt/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_solaris := -L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \
+ LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \
+ LDFLAGS_SUFFIX_solaris := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender, \
+ LDFLAGS_SUFFIX_macosx := -Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \
+ -framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ ifndef BUILD_HEADLESS_ONLY
+ $(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
+ else
+ $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX)
+ endif
+
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX)
+ endif
+
+endif # OPENJDK_TARGET_OS
+
+BUILD_LIBRARIES += $(BUILD_LIBJAWT)
+
+##########################################################################################
+
+ifndef OPENJDK
+
+ BUILD_LIBKCMS_EXCLUDE_FILES :=
+ ifeq ($(OPENJDK_TARGET_OS), windows)
+ BUILD_LIBKCMS_EXCLUDE_FILES += ukcpmgr.c unixmem.c
+ else
+ BUILD_LIBKCMS_EXCLUDE_FILES += cmmdll.c registry.c spxffile.c sysinfo.c winmem.c wkcpmgr.c
+ endif
+
+ BUILD_LIBKCMS_FLAGS := $(CFLAGS_JDKLIB)
+
+ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ # This particular library uses a feature called PIC_CODE_SMALL (on solaris)
+ # implement it like this...since it's only used here
+ BUILD_LIBKCMS_FLAGS := $(patsubst -KPIC, -Kpic, $(BUILD_LIBKCMS_FLAGS))
+ else ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
+ BUILD_LIBKCMS_FLAGS := $(patsubst -fPIC, -fpic, $(BUILD_LIBKCMS_FLAGS))
+ endif
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBKCMS, \
+ LIBRARY := kcms, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms, \
+ LANG := C, \
+ EXCLUDE_FILES := $(BUILD_LIBKCMS_EXCLUDE_FILES), \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(BUILD_LIBKCMS_FLAGS) \
+ -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST, \
+ CFLAGS_linux := -Wno-missing-field-initializers, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libkcms/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_linux := -lc -lpthread, \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib version.lib, \
+ LDFLAGS_SUFFIX_posix := -lm -ljava -ljvm, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=kcms.dll" \
+ -D "JDK_INTERNAL_NAME=kcms" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkcms, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBKCMS): $(BUILD_LIBJAVA)
+
+ BUILD_LIBRARIES += $(BUILD_LIBKCMS)
+
+endif
+
+##########################################################################################
+
+ifndef OPENJDK
+ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifneq ($(OPENJDK_TARGET_CPU), x86_64)
+
+ ifeq ($(shell if test "$(OS_VERSION_MAJOR)" -eq 5 -a "$(OS_VERSION_MINOR)" -le 10; then $(ECHO) ok; fi), ok)
+
+ SUNWJDGA_MAPFILE :=
+ ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
+ SUNWJDGA_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjdga/mapfile-vers
+ endif
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBSUNWJDGA, \
+ LIBRARY := sunwjdga, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/solaris/native/sun/jdga, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/javavm/export \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \
+ -I$(OPENWIN_HOME)/include, \
+ MAPFILE := $(SUNWJDGA_MAPFILE), \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -ldga -lX11 $(LIBDL) -lc, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunwjdga, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBSUNWJDGA)
+
+ endif
+ endif
+ endif
+endif
+
+##########################################################################################
+
+ifeq ($(BUILD_HEADLESS), true)
+ ifneq ($(OPENJDK_TARGET_OS), windows)
+
+ LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/share/native/sun/font \
+ $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
+ $(JDK_TOPDIR)/src/solaris/native/sun/font \
+ $(JDK_TOPDIR)/src/solaris/native/sun/awt \
+ $(JDK_TOPDIR)/src/solaris/native/sun/java2d/opengl \
+ $(JDK_TOPDIR)/src/solaris/native/sun/java2d/x11
+
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBAWT_HEADLESS_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/font
+ endif
+
+ LIBAWT_HEADLESS_CFLAGS := -DHEADLESS=true \
+ -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
+ $(CUPS_CFLAGS) \
+ $(X_CFLAGS) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
+ $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir))
+
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBAWT_HEADLESS_CFLAGS += \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
+ endif
+
+ LIBAWT_HEADLESS_FILES := \
+ awt_Font.c \
+ HeadlessToolkit.c \
+ fontpath.c \
+ VDrawingArea.c \
+ X11Color.c \
+ X11Renderer.c \
+ X11PMBlitLoops.c \
+ X11SurfaceData.c \
+ X11FontScaler_md.c \
+ X11TextRenderer_md.c \
+ OGLBlitLoops.c \
+ OGLBufImgOps.c \
+ OGLContext.c \
+ OGLFuncs.c \
+ OGLMaskBlit.c \
+ OGLMaskFill.c \
+ OGLPaints.c \
+ OGLRenderQueue.c \
+ OGLRenderer.c \
+ OGLSurfaceData.c \
+ OGLTextRenderer.c \
+ OGLVertexCache.c \
+ GLXGraphicsConfig.c \
+ GLXSurfaceData.c \
+ AccelGlyphCache.c \
+ CUPSfuncs.c
+
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBAWT_HEADLESS_FILES += \
+ AWTFont.m \
+ AWTStrike.m \
+ CCharToGlyphMapper.m \
+ CGGlyphImages.m \
+ CGGlyphOutlines.m \
+ CoreTextSupport.m
+ endif
+
+ LIBAWT_HEADLESS_REORDER :=
+ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifneq ($(OPENJDK_TARGET_CPU), x86_64)
+ LIBAWT_HEADLESS_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
+ endif
+ endif
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_HEADLESS, \
+ LIBRARY := awt_headless, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBAWT_HEADLESS_DIRS), \
+ INCLUDE_FILES := $(LIBAWT_HEADLESS_FILES), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_HEADLESS_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
+ LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..) \
+ -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \
+ -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \
+ LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN)., \
+ REORDER := $(LIBAWT_HEADLESS_REORDER), \
+ LDFLAGS_SUFFIX_linux := -ljvm -lawt -lm $(LIBDL) -ljava, \
+ LDFLAGS_SUFFIX_solaris := $(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc, \
+ LDFLAGS_SUFFIX_macosx := -ljvm $(LIBCXX) -lawt $(LIBDL) -ljava \
+ -framework Accelerate \
+ -framework ApplicationServices \
+ -framework Cocoa \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -framework JavaNativeFoundation \
+ -framework JavaRuntimeSupport, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_headless, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
+
+ BUILD_LIBRARIES += $(BUILD_LIBAWT_HEADLESS)
+
+ endif
+endif
+
+##########################################################################################
+
+ifndef BUILD_HEADLESS_ONLY
+ LIBSPLASHSCREEN_DIRS := \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
+
+ ifeq ($(USE_EXTERNAL_LIBGIF), true)
+ GIFLIB_LDFLAGS := -lgif
+ else
+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/giflib
+ GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
+ endif
+
+ ifneq ($(OPENJDK_TARGET_OS), macosx)
+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
+ else
+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen
+ endif
+
+ LIBSPLASHSCREEN_CFLAGS := -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
+ $(foreach dir, $(LIBSPLASHSCREEN_DIRS), -I$(dir))
+
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \
+ $(LIBSPLASHSCREEN_CFLAGS) \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks
+ LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
+ LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp
+
+ LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
+ LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
+ LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
+ LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
+ LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
+ LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
+ LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
+
+ else ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
+ else ifeq ($(OPENJDK_TARGET_OS), solaris)
+ LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
+ else
+ LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
+ endif
+
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX :=
+
+ ifneq ($(USE_EXTERNAL_LIBZ), true)
+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
+ LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS)
+ endif
+
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(LIBM) -lpthread -liconv -losxapp \
+ -framework ApplicationServices \
+ -framework Foundation \
+ -framework Cocoa \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -framework JavaNativeFoundation
+ else ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
+ else ifeq ($(OPENJDK_TARGET_OS), solaris)
+ # Solaris still uses OPENWIN_LIB ..
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
+ else # .. all other Unixes can use X_LIBS
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
+ endif
+
+ $(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN, \
+ LIBRARY := splashscreen, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBSPLASHSCREEN_DIRS), \
+ EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) $(GIFLIB_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=splashscreen.dll" \
+ -D "JDK_INTERNAL_NAME=splashscreen" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsplashscreen, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(LIBSPLASHSCREEN)
+
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ $(LIBSPLASHSCREEN): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX)
+ endif
+
+endif
+
+##########################################################################################
+
+ifndef OPENJDK
+
+ LIBDCPR_SRC_DIRS := \
+ $(JDK_TOPDIR)/src/closed/share/native/sun/dc/doe \
+ $(JDK_TOPDIR)/src/closed/share/native/sun/dc/path \
+ $(JDK_TOPDIR)/src/closed/share/native/sun/dc/pr \
+ $(JDK_TOPDIR)/src/closed/share/native/sun/dc/util
+
+ LIBDCPR_CFLAGS := $(foreach dir, $(LIBDCPR_SRC_DIRS), -I$(dir)) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBDCPR, \
+ LIBRARY := dcpr, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBDCPR_SRC_DIRS), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(LIBDCPR_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libdcpr/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(LIBM) $(LDFLAGS_JDKLIB_SUFFIX), \
+ LDFLAGS_SUFFIX_posix := -lm, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=dcpr.dll" \
+ -D "JDK_INTERNAL_NAME=dcpr" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdcpr, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBDCPR): $(BUILD_LIBJAVA)
+
+ BUILD_LIBRARIES += $(BUILD_LIBDCPR)
+
+endif
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+
+ LIBAWT_LWAWT_FILES := \
+ awt.m \
+ ApplicationDelegate.m \
+ CFRetainedResource.m \
+ CGLGraphicsConfig.m \
+ CGLSurfaceData.m \
+ CGLLayer.m \
+ CGraphicsConfig.m \
+ CGraphicsDevice.m \
+ CGraphicsEnv.m \
+ CCharToGlyphMapper.m \
+ CSystemColors.m \
+ AWTFont.m \
+ CGGlyphOutlines.m \
+ CGGlyphImages.m \
+ CoreTextSupport.m \
+ AWTStrike.m \
+ InitIDs.m \
+ AWTEvent.m \
+ AWTView.m \
+ AWTWindow.m \
+ AWTSurfaceLayers.m \
+ CCursorManager.m \
+ CClipboard.m \
+ CDataTransferer.m \
+ CDragSource.m \
+ CDragSourceContextPeer.m \
+ CDropTarget.m \
+ CDropTargetContextPeer.m \
+ CInputMethod.m \
+ CDesktopPeer.m \
+ OSVersion.m \
+ DnDUtilities.m \
+ CFileDialog.m \
+ CImage.m \
+ CMenu.m \
+ CMenuBar.m \
+ CMenuComponent.m \
+ CMenuItem.m \
+ CPopupMenu.m \
+ CRobot.m \
+ CTrayIcon.m \
+ CWrapper.m \
+ JavaAccessibilityAction.m \
+ JavaAccessibilityUtilities.m \
+ JavaComponentAccessibility.m \
+ JavaTextAccessibility.m \
+ LWCToolkit.m \
+ GeomUtilities.m \
+ CPrinterJob.m \
+ PrintModel.m \
+ PrinterSurfaceData.m \
+ PrinterView.m \
+ QuartzSurfaceData.m \
+ QuartzRenderer.m \
+ CTextPipe.m \
+ ImageSurfaceData.m \
+ awt_DrawingSurface.m \
+ \
+ OGLBlitLoops.c \
+ OGLBufImgOps.c \
+ OGLContext.c \
+ OGLFuncs.c \
+ OGLMaskBlit.c \
+ OGLMaskFill.c \
+ OGLPaints.c \
+ OGLRenderQueue.c \
+ OGLRenderer.c \
+ OGLSurfaceData.c \
+ OGLTextRenderer.c \
+ OGLVertexCache.c \
+ AccelGlyphCache.c \
+ CUPSfuncs.c
+
+
+ LIBAWT_LWAWT_DIRS := \
+ $(JDK_TOPDIR)/src/macosx/native/sun/awt \
+ $(JDK_TOPDIR)/src/macosx/native/sun/font \
+ $(JDK_TOPDIR)/src/macosx/native/sun/java2d/opengl \
+ $(JDK_TOPDIR)/src/solaris/native/sun/awt \
+ $(JDK_TOPDIR)/src/share/native/sun/font \
+ $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \
+ LIBRARY := awt_lwawt, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBAWT_LWAWT_DIRS), \
+ LANG := C, \
+ INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(X_CFLAGS) \
+ $(X_LIBS) \
+ $(foreach dir, $(LIBAWT_LWAWT_DIRS), -I$(dir)) \
+ -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_macosx := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
+ -framework Accelerate \
+ -framework ApplicationServices \
+ -framework AudioToolbox \
+ -framework Carbon \
+ -framework Cocoa \
+ -framework Security \
+ -framework ExceptionHandling \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -framework JavaNativeFoundation \
+ -framework JavaRuntimeSupport \
+ -framework OpenGL \
+ -framework QuartzCore -ljava, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_lwawt, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBAWT_LWAWT)
+
+ $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT)
+
+ $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBMLIB_IMAGE)
+
+ $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBOSXAPP)
+
+ $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBJAVA)
+
+endif
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBOSXUI, \
+ LIBRARY := osxui, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/macosx/native/com/apple/laf, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/macosx/native/com/apple/laf \
+ -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
+ -I$(JDK_TOPDIR)/src/macosx/native/sun/awt \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN) \
+ -Xlinker -rpath -Xlinker @loader_path, \
+ LDFLAGS_SUFFIX_macosx := -lawt -losxapp -lawt_lwawt \
+ -framework Cocoa \
+ -framework Carbon \
+ -framework ApplicationServices \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -framework JavaNativeFoundation \
+ -framework JavaRuntimeSupport \
+ -ljava -ljvm, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosxui, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBOSXUI)
+
+ $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
+
+ $(BUILD_LIBOSXUI): $(BUILD_LIBOSXAPP)
+
+ $(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT)
+
+ #$(BUILD_LIBOSXUI): $(BUILD_LIBJAVA)
+
+endif
diff --git a/jdk/makefiles/lib/CoreLibraries.gmk b/jdk/makefiles/lib/CoreLibraries.gmk
new file mode 100644
index 0000000..29c1d5f
--- /dev/null
+++ b/jdk/makefiles/lib/CoreLibraries.gmk
@@ -0,0 +1,510 @@
+#
+# Copyright (c) 2011, 2013, 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.
+#
+
+WIN_VERIFY_LIB := $(JDK_OUTPUTDIR)/objs/libverify/verify.lib
+
+##########################################################################################
+
+BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+ BUILD_LIBFDLIBM_OPTIMIZATION := NONE
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), macosx)
+ $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \
+ STATIC_LIBRARY := fdlibm, \
+ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
+ SRC := $(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src, \
+ LANG := C, \
+ OPTIMIZATION := $(BUILD_LIBFDLIBM_OPTIMIZATION), \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \
+ CFLAGS_windows_debug := -DLOGGING, \
+ ARFLAGS := $(ARFLAGS), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+else
+
+ # On macosx the old build does partial (incremental) linking of fdlibm instead of
+ # a plain static library.
+ $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM_MAC, \
+ LIBRARY := fdlibm, \
+ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
+ SRC := $(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src, \
+ LANG := C, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \
+ LDFLAGS := -nostdlib -r -arch x86_64, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBFDLIBM := $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX)
+ $(BUILD_LIBFDLIBM): $(BUILD_LIBFDLIBM_MAC)
+ $(call install-file)
+
+endif
+
+BUILD_LIBRARIES += $(BUILD_LIBFDLIBM)
+
+##########################################################################################
+
+BUILD_LIBVERIFY_SRC := check_code.c check_format.c
+
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifneq ($(OPENJDK_TARGET_CPU), x86_64)
+ BUILD_LIBVERIFY_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libverify/reorder-$(OPENJDK_TARGET_CPU)
+ endif
+endif
+
+LIBVERIFY_OPTIMIZATION := HIGH
+ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
+ ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
+ LIBVERIFY_OPTIMIZATION := LOW
+ endif
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY, \
+ LIBRARY := verify, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/common, \
+ INCLUDE_FILES := $(BUILD_LIBVERIFY_SRC), \
+ LANG := C, \
+ OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
+ CFLAGS := $(CFLAGS_JDKLIB), \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libverify/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_posix := -ljvm -lc, \
+ LDFLAGS_SUFFIX_windows := jvm.lib, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=verify.dll" \
+ -D "JDK_INTERNAL_NAME=verify" \
+ -D "JDK_FTYPE=0x2L", \
+ REORDER := $(BUILD_LIBVERIFY_REORDER), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libverify, \
+ DEBUG_SYMBOLS := true))
+
+BUILD_LIBRARIES += $(BUILD_LIBVERIFY)
+
+##########################################################################################
+
+LIBJAVA_SRC_DIRS := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/lang \
+ $(JDK_TOPDIR)/src/share/native/java/lang \
+ $(JDK_TOPDIR)/src/share/native/java/lang/ref \
+ $(JDK_TOPDIR)/src/share/native/java/lang/reflect \
+ $(JDK_TOPDIR)/src/share/native/java/io \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io \
+ $(JDK_TOPDIR)/src/share/native/java/nio \
+ $(JDK_TOPDIR)/src/share/native/java/security \
+ $(JDK_TOPDIR)/src/share/native/common \
+ $(JDK_TOPDIR)/src/share/native/sun/misc \
+ $(JDK_TOPDIR)/src/share/native/sun/reflect \
+ $(JDK_TOPDIR)/src/share/native/java/util \
+ $(JDK_TOPDIR)/src/share/native/java/util/concurrent/atomic \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/util
+
+ifneq ($(OPENJDK_TARGET_OS), macosx)
+ LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/util/locale/provider
+else
+ LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/util/locale/provider
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/provider \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/io
+endif
+
+LIBJAVA_CFLAGS := $(foreach dir, $(LIBJAVA_SRC_DIRS), -I$(dir)) \
+ -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include \
+ -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
+
+LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
+ -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
+ -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \
+ -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"'
+
+ifneq (, $(JDK_UPDATE_VERSION))
+ LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"'
+endif
+
+LIBJAVA_EXCLUDE_FILES := check_code.c check_format.c jspawnhelper.c
+
+ifneq ($(OPENJDK_TARGET_OS), macosx)
+ LIBJAVA_EXCLUDE_FILES += java_props_macosx.c
+else
+ BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
+ BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBJAVA_EXCLUDE_FILES += \
+ UNIXProcess_md.c \
+ UnixFileSystem_md.c \
+ FileSystemPreferences.c
+else
+ LIBJAVA_EXCLUDE_FILES += \
+ ProcessImpl_md.c \
+ WinNTFileSystem_md.c \
+ dirent_md.c \
+ WindowsPreferences.c \
+ sun/security/provider/WinCAPISeedGenerator.c \
+ sun/io/Win32ErrorMode.c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifneq ($(OPENJDK_TARGET_CPU), x86_64)
+ LIBJAVA_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU)
+ endif
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \
+ LIBRARY := java, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBJAVA_SRC_DIRS), \
+ EXCLUDES := fdlibm/src zip, \
+ EXCLUDE_FILES := $(LIBJAVA_EXCLUDE_FILES), \
+ LANG := C, \
+ OPTIMIZATION := HIGH, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(LIBJAVA_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjava/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_posix := -ljvm -lverify, \
+ LDFLAGS_SUFFIX_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \
+ LDFLAGS_SUFFIX_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \
+ LDFLAGS_SUFFIX_macosx := -L$(JDK_OUTPUTDIR)/objs/ -lfdlibm \
+ -framework CoreFoundation \
+ -framework Foundation \
+ -framework Security -framework SystemConfiguration, \
+ LDFLAGS_SUFFIX_windows := -export:winFileHandleOpen -export:handleLseek \
+ jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \
+ shell32.lib delayimp.lib -DELAYLOAD:shell32.dll \
+ advapi32.lib, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=java.dll" \
+ -D "JDK_INTERNAL_NAME=java" \
+ -D "JDK_FTYPE=0x2L", \
+ REORDER := $(LIBJAVA_REORDER), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjava, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+BUILD_LIBRARIES += $(BUILD_LIBJAVA)
+
+$(BUILD_LIBJAVA): $(LIBJLI_BINARY)
+
+$(BUILD_LIBJAVA): $(BUILD_LIBVERIFY)
+
+$(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
+
+##########################################################################################
+
+BUILD_LIBZIP_EXCLUDES :=
+ifeq ($(USE_EXTERNAL_LIBZ), true)
+ LIBZ := -lz
+ LIBZIP_EXCLUDES += zlib-1.2.5
+else
+ ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
+endif
+
+BUILD_LIBZIP_REORDER :=
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifneq ($(OPENJDK_TARGET_CPU), x86_64)
+ BUILD_LIBZIP_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libzip/reorder-$(OPENJDK_TARGET_CPU)
+ endif
+endif
+
+ifeq ($(LIBZIP_CAN_USE_MMAP), true)
+ BUILD_LIBZIP_MMAP := -DUSE_MMAP
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \
+ LIBRARY := zip, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ SRC := $(JDK_TOPDIR)/src/share/native/java/util/zip, \
+ EXCLUDES := $(LIBZIP_EXCLUDES), \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(ZLIB_CPPFLAGS) \
+ -I$(JDK_TOPDIR)/src/share/native/java/io \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io, \
+ CFLAGS_posix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libzip/mapfile-vers, \
+ REORDER := $(BUILD_LIBZIP_REORDER), \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN) \
+ $(EXPORT_ZIP_FUNCS), \
+ LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \
+ -export:ZIP_ReadEntry -export:ZIP_GetNextEntry jvm.lib \
+ $(WIN_JAVA_LIB), \
+ LDFLAGS_SUFFIX_linux := -ljvm -ljava $(LIBZ), \
+ LDFLAGS_SUFFIX_solaris := -ljvm -ljava $(LIBZ) -lc, \
+ LDFLAGS_SUFFIX_macosx := $(LIBZ) -ljava -ljvm, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=zip.dll" \
+ -D "JDK_INTERNAL_NAME=zip" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libzip, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+
+$(BUILD_LIBZIP): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBZIP)
+
+##########################################################################################
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK, \
+ LIBRARY := unpack, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack, \
+ EXCLUDE_FILES := main.cpp, \
+ LANG := C++, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CXXFLAGS_JDKLIB) \
+ -DNO_ZLIB -DUNPACK_JNI -DFULL, \
+ CFLAGS_release := -DPRODUCT, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_windows := -map:$(JDK_OUTPUTDIR)/objs/unpack.map -debug \
+ jvm.lib $(WIN_JAVA_LIB), \
+ LDFLAGS_SUFFIX_posix := -ljvm $(LIBCXX) -ljava -lc, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libunpack, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=unpack.dll" \
+ -D "JDK_INTERNAL_NAME=unpack" \
+ -D "JDK_FTYPE=0x2L", \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+$(BUILD_LIBUNPACK): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBUNPACK)
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.map: $(BUILD_LIBUNPACK)
+ $(ECHO) Copying $(@F)
+ $(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX), %.map, $<) $@
+
+ $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.pdb: $(BUILD_LIBUNPACK)
+ $(ECHO) Copying $(@F)
+ $(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX), %.pdb, $<) $@
+endif
+
+##########################################################################################
+
+BUILD_LIBJLI_SRC_DIRS := $(JDK_TOPDIR)/src/share/bin $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin
+LIBJLI_CFLAGS := $(CFLAGS_JDKLIB) $(foreach dir, $(BUILD_LIBJLI_SRC_DIRS), -I$(dir))
+
+BUILD_LIBJLI_FILES := \
+ java.c \
+ splashscreen_stubs.c \
+ parse_manifest.c \
+ version_comp.c \
+ wildcard.c \
+ jli_util.c
+
+ifeq ($(JVM_VARIANT_ZERO), true)
+ ERGO_FAMILY := zero
+else
+ ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
+ ERGO_FAMILY := i586
+ else
+ ERGO_FAMILY := $(OPENJDK_TARGET_CPU_ARCH)
+ endif
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBJLI_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/bin
+ BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/bin
+ BUILD_LIBJLI_FILES += java_md_common.c java_md_macosx.c
+
+ BUILD_LIBJLI_java_md_macosx.c_CFLAGS := -x objective-c
+ BUILD_LIBJLI_STATIC_java_md_macosx.c_CFLAGS := -x objective-c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ BUILD_LIBJLI_FILES += java_md.c \
+ cmdtoargs.c
+ # Staticically link with c runtime on windows.
+ LIBJLI_CFLAGS := $(filter-out -MD, $(LIBJLI_CFLAGS))
+else ifneq ($(OPENJDK_TARGET_OS), macosx)
+
+ BUILD_LIBJLI_FILES += java_md_common.c
+ BUILD_LIBJLI_FILES += java_md_solinux.c ergo.c
+
+ ERGO_ARCH_FILE = ergo_$(ERGO_FAMILY).c
+
+ # if the architecture specific ergo file exists then
+ # use it, else use the generic definitions from ergo.c
+ ifneq ($(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(ERGO_ARCH_FILE)), )
+ BUILD_LIBJLI_FILES += $(ERGO_ARCH_FILE)
+ else # !ERGO_ARCH_FILE
+ LIBJLI_CFLAGS += -DUSE_GENERIC_ERGO
+ endif # ERGO_ARCH_FILE
+endif #WINDOWS
+
+# Append defines depending on target platform
+LIBJLI_CFLAGS += $(OPENJDK_TARGET_CPU_JLI_CFLAGS)
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
+endif
+
+ifneq ($(USE_EXTERNAL_LIBZ), true)
+ BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
+ LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS)
+ BUILD_LIBJLI_FILES += \
+ inflate.c \
+ inftrees.c \
+ inffast.c \
+ zadler32.c \
+ zcrc32.c \
+ zutil.c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)
+else
+ LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)/jli
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \
+ LIBRARY := jli, \
+ OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \
+ SRC := $(BUILD_LIBJLI_SRC_DIRS), \
+ INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
+ LANG := C, \
+ OPTIMIZATION := HIGH, \
+ CFLAGS := $(LIBJLI_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjli/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
+ LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
+ LDFLAGS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \
+ LDFLAGS_SUFFIX_solaris := $(LIBZ) $(LIBDL) -lc, \
+ LDFLAGS_SUFFIX_linux := $(LIBZ) $(LIBDL) -lc -lpthread, \
+ LDFLAGS_SUFFIX_macosx := $(LIBZ), \
+ LDFLAGS_SUFFIX_windows := \
+ -export:JLI_Launch \
+ -export:JLI_ManifestIterate \
+ -export:JLI_SetTraceLauncher \
+ -export:JLI_ReportErrorMessage \
+ -export:JLI_ReportErrorMessageSys \
+ -export:JLI_ReportMessage \
+ -export:JLI_ReportExceptionDescription \
+ -export:JLI_MemAlloc \
+ -export:JLI_CmdToArgs \
+ -export:JLI_GetStdArgc \
+ -export:JLI_GetStdArgs \
+ advapi32.lib \
+ comctl32.lib \
+ user32.lib, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=jli.dll" \
+ -D "JDK_INTERNAL_NAME=jli" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+BUILD_LIBRARIES += $(BUILD_LIBJLI)
+
+# On windows, the static library has the same suffix as the import library created by
+# with the shared library, so the static library is given a different name. No harm
+# in doing it for all platform to reduce complexity.
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
+ STATIC_LIBRARY := jli_static, \
+ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
+ SRC := $(BUILD_LIBJLI_SRC_DIRS), \
+ INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
+ LANG := C, \
+ OPTIMIZATION := HIGH, \
+ CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \
+ ARFLAGS := $(ARFLAGS), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli_static, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC)
+
+else ifeq ($(OPENJDK_TARGET_OS), macosx)
+ #
+ # On macosx they do partial (incremental) linking of libjli_static.a
+ # code it here...rather than add support to NativeCompilation
+ # as this is first time I see it
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
+ LIBRARY := jli_static, \
+ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
+ SRC := $(BUILD_LIBJLI_SRC_DIRS), \
+ INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
+ LANG := C, \
+ OPTIMIZATION := HIGH, \
+ CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
+ LDFLAGS := -nostdlib -r, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli_static, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(JDK_OUTPUTDIR)/objs/libjli_static.a: $(BUILD_LIBJLI_STATIC)
+ $(call install-file)
+
+ BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a
+endif
+
+##########################################################################################
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBNPT, \
+ LIBRARY := npt, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/npt $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/npt \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnpt/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_macosx := -liconv, \
+ LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=npt.dll" \
+ -D "JDK_INTERNAL_NAME=npt" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnpt, \
+ DEBUG_SYMBOLS := true))
+
+BUILD_LIBRARIES += $(BUILD_LIBNPT)
diff --git a/jdk/makefiles/lib/NetworkingLibraries.gmk b/jdk/makefiles/lib/NetworkingLibraries.gmk
new file mode 100644
index 0000000..546565a
--- /dev/null
+++ b/jdk/makefiles/lib/NetworkingLibraries.gmk
@@ -0,0 +1,98 @@
+#
+# Copyright (c) 2011, 2013, 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.
+#
+
+LIBNET_SRC_DIRS := $(JDK_TOPDIR)/src/share/native/java/net \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/dns \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/spi
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBNET_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/www/protocol/http/ntlm
+else
+ LIBNET_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/sdp
+endif
+
+LIBNET_CFLAGS := $(foreach dir, $(LIBNET_SRC_DIRS), -I$(dir))
+
+LIBNET_EXCLUDE_FILES :=
+ifneq ($(OPENJDK_TARGET_OS), linux)
+ LIBNET_EXCLUDE_FILES += linux_close.c
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), macosx)
+ LIBNET_EXCLUDE_FILES += bsd_close.c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBNET_EXCLUDE_FILES += PlainSocketImpl.c PlainDatagramSocketImpl.c SdpSupport.c
+else
+ LIBNET_EXCLUDE_FILES += TwoStacksPlainSocketImpl.c DualStackPlainSocketImpl.c \
+ TwoStacksPlainDatagramSocketImpl.c DualStackPlainDatagramSocketImpl.c \
+ NTLMAuthSequence.c NetworkInterface_winXP.c
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBNET, \
+ LIBRARY := net, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBNET_SRC_DIRS), \
+ EXCLUDE_FILES := $(LIBNET_EXCLUDE_FILES), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(LIBNET_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnet/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_macosx := -ljvm -ljava, \
+ LDFLAGS_SUFFIX_solaris := -ljvm -ljava -lnsl -lsocket $(LIBDL) -lc, \
+ LDFLAGS_SUFFIX_linux := $(LIBDL) -ljvm -lpthread -ljava, \
+ LDFLAGS_SUFFIX_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \
+ delayimp.lib $(WIN_JAVA_LIB) advapi32.lib \
+ -DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=net.dll" \
+ -D "JDK_INTERNAL_NAME=net" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnet, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+$(BUILD_LIBNET): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBNET)
+
+$(JDK_OUTPUTDIR)/lib/net.properties: $(JDK_TOPDIR)/src/share/lib/net.properties
+ $(ECHO) $(LOG_INFO) Copying $(@F)
+ $(call install-file)
+
+COPY_FILES += $(JDK_OUTPUTDIR)/lib/net.properties
+
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template: $(JDK_TOPDIR)/src/${OPENJDK_TARGET_OS_API_DIR}/lib/sdp/sdp.conf.template
+ $(ECHO) $(LOG_INFO) Copying $(@F)
+ $(call install-file)
+
+ COPY_FILES += $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template
+endif
diff --git a/jdk/makefiles/lib/NioLibraries.gmk b/jdk/makefiles/lib/NioLibraries.gmk
new file mode 100644
index 0000000..afab1c9
--- /dev/null
+++ b/jdk/makefiles/lib/NioLibraries.gmk
@@ -0,0 +1,186 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+BUILD_LIBNIO_SRC := \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/nio \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
+
+BUILD_LIBNIO_CFLAGS := \
+ -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch \
+ -I$(JDK_TOPDIR)/src/share/native/java/io \
+ -I$(JDK_TOPDIR)/src/share/native/java/net \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net
+
+BUILD_LIBNIO_FILES := \
+ DatagramChannelImpl.c \
+ DatagramDispatcher.c \
+ FileChannelImpl.c \
+ FileDispatcherImpl.c \
+ FileKey.c \
+ IOUtil.c \
+ MappedByteBuffer.c \
+ Net.c \
+ ServerSocketChannelImpl.c \
+ SocketChannelImpl.c \
+ SocketDispatcher.c
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ BUILD_LIBNIO_FILES += \
+ Iocp.c \
+ RegistryFileTypeDetector.c \
+ WindowsAsynchronousFileChannelImpl.c \
+ WindowsAsynchronousServerSocketChannelImpl.c \
+ WindowsAsynchronousSocketChannelImpl.c \
+ WindowsNativeDispatcher.c \
+ WindowsSelectorImpl.c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), linux)
+ BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
+ BUILD_LIBNIO_FILES += \
+ EPoll.c \
+ EPollArrayWrapper.c \
+ EPollPort.c \
+ InheritedChannel.c \
+ NativeThread.c \
+ PollArrayWrapper.c \
+ UnixAsynchronousServerSocketChannelImpl.c \
+ UnixAsynchronousSocketChannelImpl.c \
+ GnomeFileTypeDetector.c \
+ MagicFileTypeDetector.c \
+ LinuxNativeDispatcher.c \
+ LinuxWatchService.c \
+ UnixCopyFile.c \
+ UnixNativeDispatcher.c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
+ BUILD_LIBNIO_SRC += $(JDK_TOPDIR)/src/macosx/native/sun/nio/ch
+ BUILD_LIBNIO_FILES += \
+ InheritedChannel.c \
+ NativeThread.c \
+ PollArrayWrapper.c \
+ UnixAsynchronousServerSocketChannelImpl.c \
+ UnixAsynchronousSocketChannelImpl.c \
+ BsdNativeDispatcher.c \
+ MacOSXNativeDispatcher.c \
+ UnixCopyFile.c \
+ UnixNativeDispatcher.c \
+ KQueue.c \
+ KQueuePort.c \
+ KQueueArrayWrapper.c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
+ BUILD_LIBNIO_FILES += \
+ DevPollArrayWrapper.c \
+ InheritedChannel.c \
+ NativeThread.c \
+ PollArrayWrapper.c \
+ SolarisEventPort.c \
+ UnixAsynchronousServerSocketChannelImpl.c \
+ UnixAsynchronousSocketChannelImpl.c \
+ GnomeFileTypeDetector.c \
+ SolarisNativeDispatcher.c \
+ SolarisWatchService.c \
+ UnixCopyFile.c \
+ UnixNativeDispatcher.c
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \
+ LIBRARY := nio, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(BUILD_LIBNIO_SRC), \
+ INCLUDE_FILES := $(BUILD_LIBNIO_FILES), \
+ LANG := C, \
+ OPTIMIZATION := HIGH, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(BUILD_LIBNIO_CFLAGS), \
+ MAPFILE := $(BUILD_LIBNIO_MAPFILE), \
+ LDFLAGS := $(LDFLAGS_JDKLIB) $(BUILD_LIBNIO_LDFLAGS) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_linux := -ljava -lnet -lpthread $(LIBDL), \
+ LDFLAGS_SUFFIX_solaris := -ljvm -lsocket -lposix4 $(LIBDL) \
+ -lsendfile -ljava -lnet -lc, \
+ LDFLAGS_SUFFIX_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \
+ $(JDK_OUTPUTDIR)/objs/libnet/net.lib \
+ advapi32.lib, \
+ LDFLAGS_SUFFIX_macosx := -ljava -lnet -pthread -framework CoreFoundation, \
+ LDFLAGS_SUFFIX :=, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=nio.dll" \
+ -D "JDK_INTERNAL_NAME=nio" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnio, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+BUILD_LIBRARIES += $(BUILD_LIBNIO)
+
+$(BUILD_LIBNIO): $(BUILD_LIBNET)
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS_API), posix)
+
+ ifneq ($(OPENJDK_TARGET_OS), macosx)
+
+ # Suppress unused parameters required by exported JNI functions.
+ SCTP_WERROR := -Werror -Wno-error=unused-parameter
+ ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
+ SCTP_WERROR :=
+ endif
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBSCTP, \
+ LIBRARY := sctp, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch/sctp, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch \
+ -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch/sctp \
+ -I$(JDK_TOPDIR)/src/share/native/java/net \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net, \
+ CFLAGS_linux := $(SCTP_WERROR), \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsctp/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_linux := -lpthread $(LIBDL) -ljava -ljvm, \
+ LDFLAGS_SUFFIX_posix := -lnio -lnet, \
+ LDFLAGS_SUFFIX_solaris := -lsocket -ljava -ljvm -lc, \
+ LDFLAGS_SUFFIX_macosx := -ljava -ljvm, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsctp, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBSCTP)
+
+ $(BUILD_LIBSCTP): $(BUILD_LIBNIO)
+ endif
+endif
diff --git a/jdk/makefiles/lib/PlatformLibraries.gmk b/jdk/makefiles/lib/PlatformLibraries.gmk
new file mode 100644
index 0000000..7684bdd
--- /dev/null
+++ b/jdk/makefiles/lib/PlatformLibraries.gmk
@@ -0,0 +1,283 @@
+#
+# Copyright (c) 2011, 2013, 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.
+#
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBAPPLESCRIPTENGINE, \
+ LIBRARY := AppleScriptEngine, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/macosx/native/apple/applescript, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/macosx/native/apple/applescript \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := -framework Cocoa \
+ -framework Carbon \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -framework JavaNativeFoundation \
+ $(LDFLAGS_JDKLIB_SUFFIX), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libAppleScriptEngine, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBAPPLESCRIPTENGINE): $(BUILD_LIBJAVA)
+
+ BUILD_LIBRARIES += $(BUILD_LIBAPPLESCRIPTENGINE)
+
+endif
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBOSXAPP, \
+ LIBRARY := osxapp, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/macosx/native/sun/osxapp, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
+ -I$(JDK_OUTPUTDIR)/gensrc/sun/osxapp \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_macosx := \
+ -framework Accelerate \
+ -framework ApplicationServices \
+ -framework AudioToolbox \
+ -framework Carbon \
+ -framework Cocoa \
+ -framework Security \
+ -framework ExceptionHandling \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -framework JavaNativeFoundation \
+ -framework JavaRuntimeSupport \
+ -framework OpenGL \
+ -framework IOSurface \
+ -framework QuartzCore, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosxapp, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBOSXAPP)
+
+endif
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+
+ LIBOSX_DIRS := \
+ $(JDK_TOPDIR)/src/macosx/native/com/apple/concurrent \
+ $(JDK_TOPDIR)/src/macosx/native/java/util \
+ $(JDK_TOPDIR)/src/macosx/native/com/apple/eio \
+ $(JDK_TOPDIR)/src/macosx/native/apple/security \
+ $(JDK_TOPDIR)/src/macosx/native/apple/launcher
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBOSX, \
+ LIBRARY := osx, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBOSX_DIRS), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(foreach dir, $(LIBOSX_DIRS), -I$(dir)) \
+ -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_macosx := \
+ -losxapp \
+ -framework Cocoa \
+ -framework ApplicationServices \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -framework JavaNativeFoundation \
+ -framework JavaRuntimeSupport \
+ -framework Security \
+ -framework SystemConfiguration \
+ $(LDFLAGS_JDKLIB_SUFFIX), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosx, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBOSX)
+
+ $(BUILD_LIBOSX): $(BUILD_LIBOSXAPP)
+
+ $(BUILD_LIBOSX): $(BUILD_LIBJAVA)
+
+endif
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJOBJC32, \
+ LIBRARY := JObjC, \
+ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/libjobjc32, \
+ SRC := $(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/native \
+ $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/native, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := -fpascal-strings \
+ -fobjc-gc \
+ -gdwarf-2 \
+ $(CFLAGS_JDKLIB) -I$(JDK_OUTPUTDIR)/gensrc_headers_jobjc \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -m32, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ -m32, \
+ LDFLAGS_SUFFIX := -framework Foundation -framework JavaVM \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -framework JavaNativeFoundation \
+ -lffi, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjobjc32, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJOBJC64, \
+ LIBRARY := JObjC, \
+ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/libjobjc64, \
+ SRC := $(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/native \
+ $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/native, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := -fpascal-strings \
+ -fobjc-gc \
+ -gdwarf-2 \
+ $(CFLAGS_JDKLIB) -I$(JDK_OUTPUTDIR)/gensrc_headers_jobjc \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ , \
+ LDFLAGS := -fpascal-strings \
+ -fobjc-gc \
+ -gdwarf-2 \
+ $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := -framework Foundation -framework JavaVM \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -framework JavaNativeFoundation \
+ -lffi, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjobjc64, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)JObjC$(SHARED_LIBRARY_SUFFIX): $(BUILD_LIBJOBJC32) $(BUILD_LIBJOBJC64)
+ $(LIPO) -create -output $@ $(BUILD_LIBJOBJC32) $(BUILD_LIBJOBJC64)
+
+ BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)JObjC$(SHARED_LIBRARY_SUFFIX)
+
+endif
+
+##########################################################################################
+
+ifndef OPENJDK
+ ifeq ($(OPENJDK_TARGET_OS), windows)
+
+ ACCESSBRIDGE_SRCDIR := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge
+
+ define SetupAccessBridge
+ # Parameter 1 Suffix
+ # Parameter 2 Machine
+ # Parameter 3 ACCESSBRIDGE_ARCH_ suffix
+
+ $(call SetupNativeCompilation,BUILD_JAWTACCESSBRIDGE$1, \
+ LIBRARY = JAWTAccessBridge$1, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(ACCESSBRIDGE_SRCDIR), \
+ INCLUDE_FILES := JAWTAccessBridge.cpp, \
+ LANG := C++, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -DACCESSBRIDGE_ARCH_$3, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
+ winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib \
+ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
+ -subsystem:windows -machine:$2 \
+ -def:$(ACCESSBRIDGE_SRCDIR)/JAWTAccessBridge.DEF, \
+ VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
+ RC_FLAGS := $(RC_FLAGS), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawtaccessbridge$1, \
+ DEBUG_SYMBOLS := true)
+
+ $$(BUILD_JAWTACCESSBRIDGE$1): $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
+
+ $(call SetupNativeCompilation,BUILD_JAVAACCESSBRIDGE$1, \
+ LIBRARY = JavaAccessBridge$1, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(ACCESSBRIDGE_SRCDIR), \
+ INCLUDE_FILES := AccessBridgeATInstance.cpp AccessBridgeDebug.cpp \
+ AccessBridgeJavaEntryPoints.cpp \
+ AccessBridgeMessages.cpp JavaAccessBridge.cpp, \
+ LANG := C++, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -DACCESSBRIDGE_ARCH_$3, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib \
+ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
+ -subsystem:windows -machine:$2 \
+ -def:$(ACCESSBRIDGE_SRCDIR)/JavaAccessBridge.DEF, \
+ VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
+ RC_FLAGS := $(RC_FLAGS), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavaaccessbridge$1, \
+ DEBUG_SYMBOLS := true)
+
+ $(call SetupNativeCompilation,BUILD_WINDOWSACCESSBRIDGE$1, \
+ LIBRARY = WindowsAccessBridge$1, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(ACCESSBRIDGE_SRCDIR), \
+ INCLUDE_FILES := AccessBridgeJavaVMInstance.cpp AccessBridgeMessageQueue.cpp \
+ AccessBridgeMessages.cpp AccessBridgeWindowsEntryPoints.cpp \
+ WinAccessBridge.cpp AccessBridgeDebug.cpp \
+ AccessBridgeEventHandler.cpp, \
+ LANG := C++, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \
+ -DACCESSBRIDGE_ARCH_$3, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib \
+ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
+ -subsystem:windows -machine:$2 \
+ -def:$(ACCESSBRIDGE_SRCDIR)/WinAccessBridge.DEF, \
+ VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
+ RC_FLAGS := $(RC_FLAGS), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libwindowsaccessbridge$1, \
+ DEBUG_SYMBOLS := true)
+
+ BUILD_LIBRARIES += $$(BUILD_JAWTACCESSBRIDGE$1) $$(BUILD_JAVAACCESSBRIDGE$1) \
+ $$(BUILD_WINDOWSACCESSBRIDGE$1)
+
+ endef
+
+ ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
+ $(eval $(call SetupAccessBridge,-32,I386,32))
+ $(eval $(call SetupAccessBridge,,I386,LEGACY))
+ else
+ $(eval $(call SetupAccessBridge,-64,X64,64))
+ endif
+ endif
+endif
diff --git a/jdk/makefiles/lib/SecurityLibraries.gmk b/jdk/makefiles/lib/SecurityLibraries.gmk
new file mode 100644
index 0000000..779504f
--- /dev/null
+++ b/jdk/makefiles/lib/SecurityLibraries.gmk
@@ -0,0 +1,289 @@
+#
+# Copyright (c) 2011, 2013, 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.
+#
+
+LIBJAAS_MAPFILE :=
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+ LIBJAAS_EXCLUDE_FILES := Solaris.c
+else
+ # only on solaris...wonder why
+ LIBJAAS_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjaas/mapfile-vers
+endif
+
+LIBJAAS_NAME := jaas_unix
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBJAAS_NAME := jaas_nt
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJAAS, \
+ LIBRARY := $(LIBJAAS_NAME), \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/security/auth/module, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB), \
+ MAPFILE := $(LIBJAAS_MAPFILE), \
+ LDFLAGS := $(filter-out -ljava, $(LDFLAGS_JDKLIB)) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_windows := netapi32.lib user32.lib mpr.lib advapi32.lib, \
+ LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ EXCLUDE_FILES := $(LIBJAAS_EXCLUDE_FILES), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=$(LIBJAAS_NAME).dll" \
+ -D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjaas, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+$(BUILD_LIBJAAS): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBJAAS)
+
+##########################################################################################
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PCSC, \
+ LIBRARY := j2pcsc, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio, \
+ LANG := C, \
+ CFLAGS_posix := -D__sun_jdk, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio/MUSCLE, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2pcsc/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_posix := $(LIBDL), \
+ LDFLAGS_SUFFIX_windows := winscard.lib, \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=j2pcsc.dll" \
+ -D "JDK_INTERNAL_NAME=j2pcsc" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2pcsc, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+BUILD_LIBRARIES += $(BUILD_LIBJ2PCSC)
+
+##########################################################################################
+
+ifneq ($(OPENJDK_TARGET_OS), windows)
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS, \
+ LIBRARY := j2gss, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2gss/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(LIBDL), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2gss, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBJ2GSS)
+endif
+
+##########################################################################################
+
+ifneq ($(BUILD_CRYPTO), no)
+ BUILD_LIBKRB5_NAME :=
+ ifeq ($(OPENJDK_TARGET_OS), windows)
+ BUILD_LIBKRB5_NAME := w2k_lsa_auth
+ BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5
+ BUILD_LIBKRB5_LIBS := advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \
+ gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib \
+ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib
+ else ifeq ($(OPENJDK_TARGET_OS), macosx)
+ BUILD_LIBKRB5_NAME := osxkrb5
+ BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/share/native/sun/security/krb5
+ BUILD_LIBKRB5_LIBS := -framework Kerberos
+ endif
+
+ ifneq ($(BUILD_LIBKRB5_NAME), )
+ $(eval $(call SetupNativeCompilation,BUILD_LIBKRB5, \
+ LIBRARY := $(BUILD_LIBKRB5_NAME), \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(BUILD_LIBKRB5_SRC), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/security/krb5 \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(BUILD_LIBKRB5_LIBS), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=$(BUILD_LIBKRB5_NAME).dll" \
+ -D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkrb5, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBKRB5)
+ endif
+endif
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBSUNMSCAPI, \
+ LIBRARY := sunmscapi, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi, \
+ LANG := C++, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := Crypt32.Lib advapi32.lib, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=sunmscapi.dll" \
+ -D "JDK_INTERNAL_NAME=sunmscapi" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunmscapi, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBSUNMSCAPI)
+endif
+
+##########################################################################################
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11, \
+ LIBRARY := j2pkcs11, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \
+ $(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \
+ -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2pkcs11/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_posix := $(LIBDL), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=j2pkcs11.dll" \
+ -D "JDK_INTERNAL_NAME=j2pkcs11" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2pkcs11, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+BUILD_LIBRARIES += $(BUILD_LIBJ2PKCS11)
+
+##########################################################################################
+
+ifeq ($(ENABLE_INTREE_EC), yes)
+
+ BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \
+ -I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
+
+ #
+ # On sol-sparc...all libraries are compiled with -xregs=no%appl
+ # (set in CFLAGS_REQUIRED_sparc)
+ #
+ # except!!! libsunec.so
+ #
+ ECC_JNI_SOLSPARC_FILTER :=
+ ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
+ ECC_JNI_SOLSPARC_FILTER := -xregs=no%appl
+ endif
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC, \
+ LIBRARY := sunec, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec \
+ $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl, \
+ LANG := C++, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \
+ $(BUILD_LIBSUNEC_FLAGS) \
+ -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \
+ CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \
+ $(BUILD_LIBSUNEC_FLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsunec/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
+ LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(LIBCXX), \
+ LDFLAGS_SUFFIX_linux := -lc, \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=sunec.dll" \
+ -D "JDK_INTERNAL_NAME=sunec" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunec, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBSUNEC)
+endif
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifndef OPENJDK
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2UCRYPTO, \
+ LIBRARY := j2ucrypto, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2ucrypto/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB), \
+ LDFLAGS_SUFFIX := $(LIBDL), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2ucrypto, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBJ2UCRYPTO): $(BUILD_LIBJAVA)
+
+ BUILD_LIBRARIES += $(BUILD_LIBJ2UCRYPTO)
+
+ endif
+endif
diff --git a/jdk/makefiles/lib/ServiceabilityLibraries.gmk b/jdk/makefiles/lib/ServiceabilityLibraries.gmk
new file mode 100644
index 0000000..0cc5ad9
--- /dev/null
+++ b/jdk/makefiles/lib/ServiceabilityLibraries.gmk
@@ -0,0 +1,431 @@
+#
+# Copyright (c) 2011, 2013, 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.
+#
+
+LIBATTACH_EXCLUDE_FILES :=
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+ LIBATTACH_EXCLUDE_FILES += SolarisVirtualMachine.c
+endif
+ifneq ($(OPENJDK_TARGET_OS), linux)
+ LIBATTACH_EXCLUDE_FILES += LinuxVirtualMachine.c
+endif
+ifneq ($(OPENJDK_TARGET_OS), macosx)
+ LIBATTACH_EXCLUDE_FILES += BsdVirtualMachine.c
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBATTACH, \
+ LIBRARY := attach, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tools/attach, \
+ EXCLUDE_FILES := $(LIBATTACH_EXCLUDE_FILES), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB), \
+ CFLAGS_windows := /Gy, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=attach.dll" \
+ -D "JDK_INTERNAL_NAME=attach" \
+ -D "JDK_FTYPE=0x2L", \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_solaris := -ldoor, \
+ LDFLAGS_windows := /ORDER:@$(JDK_TOPDIR)/makefiles/mapfiles/libattach/reorder-windows-$(OPENJDK_TARGET_CPU), \
+ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
+ LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib psapi.lib, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libattach, \
+ DEBUG_SYMBOLS := true))
+
+$(BUILD_LIBATTACH): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBATTACH)
+
+##########################################################################################
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBDT_SOCKET, \
+ LIBRARY := dt_socket, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/transport/socket \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
+ -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
+ -I$(JDK_TOPDIR)/src/share/transport/socket \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket \
+ -I$(JDK_TOPDIR)/src/share/back/export \
+ -I$(JDK_TOPDIR)/src/share/back, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libdt_socket/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_linux := -lpthread, \
+ LDFLAGS_SUFFIX_solaris := -lnsl -lsocket -lc, \
+ LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX) -export:jdwpTransport_OnLoad ws2_32.lib, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=dt_socket.dll" \
+ -D "JDK_INTERNAL_NAME=dt_socket" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdt_socket, \
+ DEBUG_SYMBOLS := true))
+
+$(BUILD_LIBDT_SOCKET): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBDT_SOCKET)
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBDT_SHMEM, \
+ LIBRARY := dt_shmem, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/com/sun/tools/jdi \
+ $(JDK_TOPDIR)/src/share/transport/shmem \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
+ -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
+ -I$(JDK_TOPDIR)/src/share/transport/shmem \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem \
+ -I$(JDK_TOPDIR)/src/share/back/export, \
+ LDFLAGS := $(LDFLAGS_JDKLIB), \
+ LDFLAGS_windows := -export:jdwpTransport_OnLoad, \
+ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=dt_shmem.dll" \
+ -D "JDK_INTERNAL_NAME=dt_shmem" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdt_shmem, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBDT_SHMEM)
+
+endif # OPENJDK_TARGET_OS
+
+##########################################################################################
+
+# JDWP_LOGGING causes log messages to be compiled into the library.
+$(eval $(call SetupNativeCompilation,BUILD_LIBJDWP, \
+ LIBRARY := jdwp, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/back $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING \
+ -I$(JDK_TOPDIR)/src/share/transport/export \
+ -I$(JDK_TOPDIR)/src/share/back/export \
+ -I$(JDK_TOPDIR)/src/share/npt \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \
+ -I$(JDK_TOPDIR)/src/share/back \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back \
+ -I$(JDK_OUTPUTDIR)/gensrc_jdwp_headers, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjdwp/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_linux := $(LIBDL), \
+ LDFLAGS_SUFFIX_solaris := $(LIBDL) -lc, \
+ LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=jdwp.dll" \
+ -D "JDK_INTERNAL_NAME=jdwp" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjdwp, \
+ DEBUG_SYMBOLS := true))
+
+$(BUILD_LIBJDWP): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBJDWP)
+
+##########################################################################################
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJSDT, \
+ LIBRARY := jsdt, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tracing/dtrace, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjsdt/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_linux := $(LIBDL), \
+ LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX) $(LIBDL), \
+ LDFLAGS_SUFFIX_macosx := $(LIBDL), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=jsdt.dll" \
+ -D "JDK_INTERNAL_NAME=jsdt" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsdt, \
+ DEBUG_SYMBOLS := true))
+
+$(BUILD_LIBJSDT): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBJSDT)
+
+##########################################################################################
+
+LIBINSTRUMENT_SRC := $(JDK_TOPDIR)/src/share/instrument \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/instrument
+
+LIBINSTRUMENT_FILES := \
+ EncodingSupport.c \
+ EncodingSupport_md.c \
+ FileSystemSupport_md.c \
+ InstrumentationImplNativeMethods.c \
+ InvocationAdapter.c \
+ JarFacade.c \
+ JPLISAgent.c \
+ JPLISAssert.c \
+ JavaExceptions.c \
+ PathCharsValidator.c \
+ Reentrancy.c \
+ Utilities.c \
+ canonicalize_md.c
+
+LIBINSTRUMENT_DIR := $(JDK_OUTPUTDIR)/objs/libinstrument
+LIBINSTRUMENT_CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/instrument \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/instrument \
+ -I$(JDK_TOPDIR)/src/share/bin
+
+LIBINSTRUMENT_LDFLAGS :=
+LIBINSTRUMENT_LDFLAGS_SUFFIX :=
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBINSTRUMENT_LDFLAGS += $(JDK_OUTPUTDIR)/objs/jli_static.lib $(WIN_JAVA_LIB) \
+ -export:Agent_OnAttach advapi32.lib
+ # Statically link the C runtime so that there are not dependencies on modules
+ # not on the search patch when invoked from the Windows system directory
+ # (or elsewhere).
+ LIBINSTRUMENT_CFLAGS := $(filter-out -MD, $(LIBINSTRUMENT_CFLAGS))
+ # equivalent of strcasecmp is stricmp on Windows
+ LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBINSTRUMENT, \
+ LIBRARY := instrument, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBINSTRUMENT_SRC), \
+ INCLUDE_FILES := $(LIBINSTRUMENT_FILES), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
+ CFLAGS_debug := -DJPLIS_LOGGING, \
+ CFLAGS_release := -DNO_JPLIS_LOGGING, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libinstrument/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN) \
+ $(LIBINSTRUMENT_LDFLAGS), \
+ LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
+ LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
+ LDFLAGS_macosx := -Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
+ -framework Cocoa -framework Security -framework ApplicationServices, \
+ LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \
+ LDFLAGS_SUFFIX_macosx := -liconv $(LIBZ), \
+ LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \
+ LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=instrument.dll" \
+ -D "JDK_INTERNAL_NAME=instrument" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(LIBINSTRUMENT_DIR), \
+ DEBUG_SYMBOLS := true))
+
+ifneq (, $(findstring $(OPENJDK_TARGET_OS), macosx windows))
+ $(BUILD_LIBINSTRUMENT): $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX)
+else
+ $(BUILD_LIBINSTRUMENT): $(INSTALL_LIBRARIES_HERE)/jli/$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX)
+endif
+$(BUILD_LIBINSTRUMENT): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBINSTRUMENT)
+
+##########################################################################################
+
+BUILD_LIBMANAGEMENT_SRC := $(JDK_TOPDIR)/src/share/native/sun/management \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/management \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/management
+
+BUILD_LIBMANAGEMENT_EXCLUDES :=
+
+BUILD_LIBMANAGEMENT_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/management
+
+ifneq ($(OPENJDK_TARGET_OS), windows)
+ BUILD_LIBMANAGEMENT_EXCLUDES += OperatingSystem_md.c
+else
+ BUILD_LIBMANAGEMENT_EXCLUDES += UnixOperatingSystem_md.c
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+ BUILD_LIBMANAGEMENT_EXCLUDES += SolarisOperatingSystem.c
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), linux)
+ BUILD_LIBMANAGEMENT_EXCLUDES += LinuxOperatingSystem.c
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), macosx)
+ BUILD_LIBMANAGEMENT_EXCLUDES += MacosxOperatingSystem.c
+endif
+
+LIBMANAGEMENT_OPTIMIZATION := HIGH
+ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
+ ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
+ LIBMANAGEMENT_OPTIMIZATION := LOW
+ endif
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT, \
+ LIBRARY := management, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(BUILD_LIBMANAGEMENT_SRC), \
+ EXCLUDE_FILES := $(BUILD_LIBMANAGEMENT_EXCLUDES), \
+ LANG := C, \
+ OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \
+ CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBMANAGEMENT_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libmanagement/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_solaris := -lkstat, \
+ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
+ LDFLAGS_SUFFIX_windows := jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=management.dll" \
+ -D "JDK_INTERNAL_NAME=management" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmanagement, \
+ DEBUG_SYMBOLS := true))
+
+$(BUILD_LIBMANAGEMENT): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBMANAGEMENT)
+
+##########################################################################################
+
+BUILD_LIBHPROF_SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/hprof $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/demo/jvmti/hprof
+BUILD_LIBHPROF_CFLAGS := -I$(JDK_TOPDIR)/src/share/demo/jvmti/hprof \
+ -I$(JDK_TOPDIR)/src/share/npt \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \
+ -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo
+
+BUILD_LIBHPROF_LDFLAGS :=
+
+LIBHPROF_OPTIMIZATION := HIGHEST
+ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
+ ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
+ LIBHPROF_OPTIMIZATION := LOW
+ endif
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBHPROF, \
+ LIBRARY := hprof, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(BUILD_LIBHPROF_SRC), \
+ LANG := C, \
+ OPTIMIZATION := $(LIBHPROF_OPTIMIZATION), \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(BUILD_LIBHPROF_CFLAGS), \
+ CFLAGS_debug := -DHPROF_LOGGING, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libhprof/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_windows := wsock32.lib winmm.lib advapi32.lib, \
+ LDFLAGS_SUFFIX_linux := $(LIBDL), \
+ LDFLAGS_SUFFIX_macosx := $(LIBDL), \
+ LDFLAGS_SUFFIX_solaris := -lsocket -lnsl $(LIBDL) -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=hprof.dll" \
+ -D "JDK_INTERNAL_NAME=hprof" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libhprof_jvmti, \
+ DEBUG_SYMBOLS := true))
+
+BUILD_LIBRARIES += $(BUILD_LIBHPROF)
+
+##########################################################################################
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA_CRW_DEMO, \
+ LIBRARY := java_crw_demo, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjava_crw_demo/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=java_crw_demo.dll" \
+ -D "JDK_INTERNAL_NAME=java_crw_demo" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjava_crw_demo, \
+ DEBUG_SYMBOLS := true))
+
+BUILD_LIBRARIES += $(BUILD_LIBJAVA_CRW_DEMO)
+
+##########################################################################################
+
+ifndef OPENJDK
+ ifeq ($(ENABLE_JFR), true)
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJFR, \
+ LIBRARY := jfr, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/closed/share/native/oracle/jfr, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/closed/share/javavm/export, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjfr/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=jfr.dll" \
+ -D "JDK_INTERNAL_NAME=jfr" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjfr, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBJFR)
+
+ endif
+endif
diff --git a/jdk/makefiles/lib/SoundLibraries.gmk b/jdk/makefiles/lib/SoundLibraries.gmk
new file mode 100644
index 0000000..dc507ab
--- /dev/null
+++ b/jdk/makefiles/lib/SoundLibraries.gmk
@@ -0,0 +1,237 @@
+#
+# Copyright (c) 2011, 2013, 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.
+#
+
+LIBJSOUND_SRC_DIRS := \
+ $(JDK_TOPDIR)/src/share/native/com/sun/media/sound \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/media/sound
+
+LIBJSOUND_SRC_FILES := Utilities.c Platform.c
+
+LIBJSOUND_LANG := C
+LIBJSOUND_CFLAGS := $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir))
+
+EXTRA_SOUND_JNI_LIBS :=
+
+LIBJSOUND_MIDIFILES := \
+ MidiInDevice.c \
+ MidiInDeviceProvider.c \
+ MidiOutDevice.c \
+ MidiOutDeviceProvider.c \
+ PlatformMidi.c
+
+# files needed for ports
+LIBJSOUND_PORTFILES := \
+ PortMixerProvider.c \
+ PortMixer.c
+
+# files needed for direct audio
+LIBJSOUND_DAUDIOFILES := \
+ DirectAudioDeviceProvider.c \
+ DirectAudioDevice.c
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ EXTRA_SOUND_JNI_LIBS += jsoundds
+ LIBJSOUND_CFLAGS += -DX_PLATFORM=X_WINDOWS \
+ -DUSE_PLATFORM_MIDI_OUT=TRUE \
+ -DUSE_PLATFORM_MIDI_IN=TRUE \
+ -DUSE_PORTS=TRUE
+ LIBJSOUND_SRC_FILES += \
+ PLATFORM_API_WinOS_MidiIn.cpp \
+ PLATFORM_API_WinOS_MidiOut.c \
+ PLATFORM_API_WinOS_Util.c \
+ PLATFORM_API_WinOS_Ports.c
+ LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
+ LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
+endif # OPENJDK_TARGET_OS windows
+
+ifeq ($(OPENJDK_TARGET_OS), linux)
+ EXTRA_SOUND_JNI_LIBS += jsoundalsa
+ LIBJSOUND_CFLAGS += -DX_PLATFORM=X_LINUX
+endif # OPENJDK_TARGET_OS linux
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBJSOUND_LANG := C++
+ LIBJSOUND_CFLAGS += -DX_PLATFORM=X_MACOSX \
+ -DUSE_PORTS=TRUE \
+ -DUSE_DAUDIO=TRUE \
+ -DUSE_PLATFORM_MIDI_OUT=TRUE \
+ -DUSE_PLATFORM_MIDI_IN=TRUE
+ LIBJSOUND_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/com/sun/media/sound
+ LIBJSOUND_SRC_FILES += \
+ PLATFORM_API_MacOSX_Utils.cpp \
+ PLATFORM_API_MacOSX_PCM.cpp \
+ PLATFORM_API_MacOSX_Ports.cpp \
+ PLATFORM_API_MacOSX_MidiIn.c \
+ PLATFORM_API_MacOSX_MidiOut.c \
+ PLATFORM_API_MacOSX_MidiUtils.c
+ LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
+ LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
+ LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES)
+endif # OPENJDK_TARGET_OS macosx
+
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ LIBJSOUND_CFLAGS += -DX_PLATFORM=X_SOLARIS \
+ -DUSE_PORTS=TRUE \
+ -DUSE_DAUDIO=TRUE
+ LIBJSOUND_SRC_FILES += \
+ PLATFORM_API_SolarisOS_Utils.c \
+ PLATFORM_API_SolarisOS_Ports.c \
+ PLATFORM_API_SolarisOS_PCM.c
+ LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
+ LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
+ LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES)
+endif # OPENJDK_TARGET_OS solaris
+
+
+ifeq ($(JVM_VARIANT_ZERO), true)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_ZERO
+else
+ ifeq ($(OPENJDK_TARGET_CPU), x86)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_I586
+ endif
+
+ ifeq ($(OPENJDK_TARGET_CPU), sparc)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_SPARC
+ endif
+
+ ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_SPARCV9
+ endif
+
+ ifeq ($(OPENJDK_TARGET_CPU), x86_64)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_AMD64
+ endif
+
+ ifeq ($(OPENJDK_TARGET_CPU), arm)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_ARM
+ endif
+
+ ifeq ($(OPENJDK_TARGET_CPU), ppc)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC
+ endif
+endif
+
+LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \
+ LIBRARY := jsound, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBJSOUND_SRC_DIRS), \
+ INCLUDE_FILES := $(LIBJSOUND_SRC_FILES), \
+ LANG := $(LIBJSOUND_LANG), \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(LIBJSOUND_CFLAGS), \
+ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjsound/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_macosx := -framework CoreAudio -framework CoreFoundation \
+ -framework CoreServices -framework AudioUnit $(LIBCXX) \
+ -framework CoreMIDI -framework AudioToolbox, \
+ LDFLAGS_windows := $(WIN_JAVA_LIB) advapi32.lib winmm.lib, \
+ LDFLAGS_SUFFIX_posix := -ljava -ljvm, \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=jsound.dll" \
+ -D "JDK_INTERNAL_NAME=jsound" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsound, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+$(BUILD_LIBJSOUND): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBJSOUND)
+
+##########################################################################################
+
+ifneq ($(filter jsoundalsa, $(EXTRA_SOUND_JNI_LIBS)), )
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDALSA, \
+ LIBRARY := jsoundalsa, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBJSOUND_SRC_DIRS), \
+ INCLUDE_FILES := Utilities.c $(LIBJSOUND_MIDIFILES) $(LIBJSOUND_PORTFILES) \
+ $(LIBJSOUND_DAUDIOFILES) \
+ PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \
+ PLATFORM_API_LinuxOS_ALSA_PCM.c \
+ PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \
+ PLATFORM_API_LinuxOS_ALSA_MidiIn.c \
+ PLATFORM_API_LinuxOS_ALSA_MidiOut.c \
+ PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \
+ PLATFORM_API_LinuxOS_ALSA_Ports.c, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) $(ALSA_CFLAGS) \
+ $(LIBJSOUND_CFLAGS) \
+ -DUSE_DAUDIO=TRUE \
+ -DUSE_PORTS=TRUE \
+ -DUSE_PLATFORM_MIDI_OUT=TRUE \
+ -DUSE_PLATFORM_MIDI_IN=TRUE, \
+ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjsoundalsa/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundalsa, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBJSOUNDALSA): $(BUILD_LIBJAVA)
+
+ BUILD_LIBRARIES += $(BUILD_LIBJSOUNDALSA)
+
+endif
+
+##########################################################################################
+
+ifneq ($(filter jsoundds, $(EXTRA_SOUND_JNI_LIBS)), )
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDDS, \
+ LIBRARY := jsoundds, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBJSOUND_SRC_DIRS), \
+ INCLUDE_FILES := Utilities.c $(LIBJSOUND_DAUDIOFILES) \
+ PLATFORM_API_WinOS_DirectSound.cpp, \
+ LANG := C++, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(LIBJSOUND_CFLAGS) \
+ -DUSE_DAUDIO=TRUE, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX) dsound.lib winmm.lib user32.lib ole32.lib, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=jsoundds.dll" \
+ -D "JDK_INTERNAL_NAME=jsoundds" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundds, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBJSOUNDDS): $(BUILD_LIBJAVA)
+
+ BUILD_LIBRARIES += $(BUILD_LIBJSOUNDDS)
+
+endif
diff --git a/jdk/makefiles/mapfiles/libmanagement/mapfile-vers b/jdk/makefiles/mapfiles/libmanagement/mapfile-vers
index b934fe8..724f7bb 100644
--- a/jdk/makefiles/mapfiles/libmanagement/mapfile-vers
+++ b/jdk/makefiles/mapfiles/libmanagement/mapfile-vers
@@ -57,7 +57,7 @@
Java_sun_management_GcInfoBuilder_fillGcAttributeInfo;
Java_sun_management_GcInfoBuilder_getLastGcInfo0;
Java_sun_management_GcInfoBuilder_getNumGcExtAttributes;
- Java_sun_management_HotSpotDiagnostic_dumpHeap;
+ Java_sun_management_HotSpotDiagnostic_dumpHeap0;
Java_sun_management_HotspotThread_getInternalThreadCount;
Java_sun_management_HotspotThread_getInternalThreadTimes0;
Java_sun_management_MemoryImpl_getMemoryManagers0;
diff --git a/jdk/makefiles/profile-includes.txt b/jdk/makefiles/profile-includes.txt
index 1d1adbf..105f9d3 100644
--- a/jdk/makefiles/profile-includes.txt
+++ b/jdk/makefiles/profile-includes.txt
@@ -33,8 +33,6 @@
$(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)jsig.diz \
$(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)net$(SHARED_LIBRARY_SUFFIX) \
$(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)nio$(SHARED_LIBRARY_SUFFIX) \
- $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)npt$(SHARED_LIBRARY_SUFFIX) \
- $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)npt.diz \
$(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)sunec$(SHARED_LIBRARY_SUFFIX) \
$(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)verify$(SHARED_LIBRARY_SUFFIX) \
$(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)verify.diz \
@@ -130,6 +128,8 @@
$(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)jsdt.diz \
$(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)management$(SHARED_LIBRARY_SUFFIX) \
$(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)management.diz \
+ $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)npt$(SHARED_LIBRARY_SUFFIX) \
+ $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)npt.diz \
$(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)sctp$(SHARED_LIBRARY_SUFFIX) \
jvm.hprof.txt \
management-agent.jar \
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java b/jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java
index 457b82d..046d693 100644
--- a/jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java
+++ b/jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java
@@ -37,8 +37,6 @@
import sun.swing.*;
import apple.laf.*;
-import com.apple.resources.MacOSXResourceBundle;
-
public class AquaLookAndFeel extends BasicLookAndFeel {
static final String sOldPropertyPrefix = "com.apple.macos."; // old prefix for things like 'useScreenMenuBar'
static final String sPropertyPrefix = "apple.laf."; // new prefix for things like 'useScreenMenuBar'
@@ -252,7 +250,7 @@
table.setDefaultLocale(Locale.getDefault());
table.addResourceBundle(PKG_PREFIX + "resources.aqua");
try {
- final ResourceBundle aquaProperties = MacOSXResourceBundle.getMacResourceBundle(PKG_PREFIX + "resources.aqua");
+ final ResourceBundle aquaProperties = ResourceBundle.getBundle(PKG_PREFIX + "resources.aqua");
final Enumeration<String> propertyKeys = aquaProperties.getKeys();
while (propertyKeys.hasMoreElements()) {
diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaUtils.java b/jdk/src/macosx/classes/com/apple/laf/AquaUtils.java
index 0592da7..a5f5501 100644
--- a/jdk/src/macosx/classes/com/apple/laf/AquaUtils.java
+++ b/jdk/src/macosx/classes/com/apple/laf/AquaUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, 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
@@ -29,6 +29,7 @@
import java.awt.image.*;
import java.lang.ref.SoftReference;
import java.lang.reflect.Method;
+import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.*;
@@ -41,56 +42,68 @@
import sun.lwawt.macosx.CImage;
import sun.lwawt.macosx.CImage.Creator;
import sun.lwawt.macosx.CPlatformWindow;
+import sun.misc.Launcher;
+import sun.reflect.misc.ReflectUtil;
+import sun.security.action.GetPropertyAction;
import sun.swing.SwingUtilities2;
import com.apple.laf.AquaImageFactory.SlicedImageControl;
-public class AquaUtils {
- final static String ANIMATIONS_SYSTEM_PROPERTY = "swing.enableAnimations";
+final class AquaUtils {
- /*
+ private static final String ANIMATIONS_PROPERTY = "swing.enableAnimations";
+
+ /**
+ * Suppresses default constructor, ensuring non-instantiability.
+ */
+ private AquaUtils() {
+ }
+
+ /**
* Convenience function for determining ComponentOrientation. Helps us
* avoid having Munge directives throughout the code.
*/
- public static boolean isLeftToRight(final Component c) {
+ static boolean isLeftToRight(final Component c) {
return c.getComponentOrientation().isLeftToRight();
}
- public static void enforceComponentOrientation(Component c, ComponentOrientation orientation) {
+ static void enforceComponentOrientation(final Component c, final ComponentOrientation orientation) {
c.setComponentOrientation(orientation);
if (c instanceof Container) {
- for (Component child : ((Container)c).getComponents()) {
+ for (final Component child : ((Container)c).getComponents()) {
enforceComponentOrientation(child, orientation);
}
}
}
- private static CImage.Creator getCImageCreatorInternal() {
- return java.security.AccessController.doPrivileged(new PrivilegedAction<CImage.Creator>() {
+ private static Creator getCImageCreatorInternal() {
+ return AccessController.doPrivileged(new PrivilegedAction<Creator>() {
+ @Override
public Creator run() {
try {
final Method getCreatorMethod = CImage.class.getDeclaredMethod("getCreator", new Class[] {});
getCreatorMethod.setAccessible(true);
- return (CImage.Creator)getCreatorMethod.invoke(null, new Object[] {});
- } catch (final Exception e) {
+ return (Creator)getCreatorMethod.invoke(null, new Object[] {});
+ } catch (final Exception ignored) {
return null;
}
}
});
}
- private static final RecyclableSingleton<CImage.Creator> cImageCreator = new RecyclableSingleton<CImage.Creator>() {
+ private static final RecyclableSingleton<Creator> cImageCreator = new RecyclableSingleton<Creator>() {
@Override
protected Creator getInstance() {
return getCImageCreatorInternal();
}
};
- static CImage.Creator getCImageCreator() {
+ static Creator getCImageCreator() {
return cImageCreator.get();
}
- protected static Image generateSelectedDarkImage(final Image image) {
+ static Image generateSelectedDarkImage(final Image image) {
final ImageProducer prod = new FilteredImageSource(image.getSource(), new IconImageFilter() {
+ @Override
int getGreyFor(final int gray) {
return gray * 75 / 100;
}
@@ -98,8 +111,9 @@
return Toolkit.getDefaultToolkit().createImage(prod);
}
- protected static Image generateDisabledImage(final Image image) {
+ static Image generateDisabledImage(final Image image) {
final ImageProducer prod = new FilteredImageSource(image.getSource(), new IconImageFilter() {
+ @Override
int getGreyFor(final int gray) {
return 255 - ((255 - gray) * 65 / 100);
}
@@ -107,19 +121,20 @@
return Toolkit.getDefaultToolkit().createImage(prod);
}
- protected static Image generateLightenedImage(final Image image, final int percent) {
+ static Image generateLightenedImage(final Image image, final int percent) {
final GrayFilter filter = new GrayFilter(true, percent);
final ImageProducer prod = new FilteredImageSource(image.getSource(), filter);
return Toolkit.getDefaultToolkit().createImage(prod);
}
- static abstract class IconImageFilter extends RGBImageFilter {
- public IconImageFilter() {
+ private abstract static class IconImageFilter extends RGBImageFilter {
+ IconImageFilter() {
super();
canFilterIndexColorModel = true;
}
- public int filterRGB(final int x, final int y, final int rgb) {
+ @Override
+ public final int filterRGB(final int x, final int y, final int rgb) {
final int red = (rgb >> 16) & 0xff;
final int green = (rgb >> 8) & 0xff;
final int blue = rgb & 0xff;
@@ -135,14 +150,14 @@
return result;
}
- abstract int getGreyFor(final int gray);
+ abstract int getGreyFor(int gray);
}
- public abstract static class RecyclableObject<T> {
- protected SoftReference<T> objectRef = null;
+ abstract static class RecyclableObject<T> {
+ private SoftReference<T> objectRef;
- public T get() {
- T referent = null;
+ T get() {
+ T referent;
if (objectRef != null && (referent = objectRef.get()) != null) return referent;
referent = create();
objectRef = new SoftReference<T>(referent);
@@ -152,8 +167,8 @@
protected abstract T create();
}
- public abstract static class RecyclableSingleton<T> {
- public T get() {
+ abstract static class RecyclableSingleton<T> {
+ final T get() {
final AppContext appContext = AppContext.getAppContext();
SoftReference<T> ref = (SoftReference<T>) appContext.get(this);
if (ref != null) {
@@ -166,38 +181,36 @@
return object;
}
- public void reset() {
- AppContext appContext = AppContext.getAppContext();
- appContext.remove(this);
+ void reset() {
+ AppContext.getAppContext().remove(this);
}
- protected abstract T getInstance();
+ abstract T getInstance();
}
- public static class RecyclableSingletonFromDefaultConstructor<T> extends RecyclableSingleton<T> {
- protected final Class<T> clazz;
+ static class RecyclableSingletonFromDefaultConstructor<T> extends RecyclableSingleton<T> {
+ private final Class<T> clazz;
- public RecyclableSingletonFromDefaultConstructor(final Class<T> clazz) {
+ RecyclableSingletonFromDefaultConstructor(final Class<T> clazz) {
this.clazz = clazz;
}
- protected T getInstance() {
+ @Override
+ T getInstance() {
try {
+ ReflectUtil.checkPackageAccess(clazz);
return clazz.newInstance();
- } catch (final InstantiationException e) {
- e.printStackTrace();
- } catch (final IllegalAccessException e) {
- e.printStackTrace();
+ } catch (InstantiationException | IllegalAccessException ignored) {
}
return null;
}
}
- public abstract static class LazyKeyedSingleton<K, V> {
- protected Map<K, V> refs;
+ abstract static class LazyKeyedSingleton<K, V> {
+ private Map<K, V> refs;
- public V get(final K key) {
- if (refs == null) refs = new HashMap<K, V>();
+ V get(final K key) {
+ if (refs == null) refs = new HashMap<>();
final V cachedValue = refs.get(key);
if (cachedValue != null) return cachedValue;
@@ -207,44 +220,45 @@
return value;
}
- protected abstract V getInstance(final K key);
+ protected abstract V getInstance(K key);
}
- static final RecyclableSingleton<Boolean> enableAnimations = new RecyclableSingleton<Boolean>() {
+ private static final RecyclableSingleton<Boolean> enableAnimations = new RecyclableSingleton<Boolean>() {
@Override
protected Boolean getInstance() {
- final String sizeProperty = (String)java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.GetPropertyAction(ANIMATIONS_SYSTEM_PROPERTY));
- return new Boolean(!"false".equals(sizeProperty)); // should be true by default
+ final String sizeProperty = (String) AccessController.doPrivileged((PrivilegedAction<?>)new GetPropertyAction(
+ ANIMATIONS_PROPERTY));
+ return !"false".equals(sizeProperty); // should be true by default
}
};
- static boolean animationsEnabled() {
+ private static boolean animationsEnabled() {
return enableAnimations.get();
}
- static final int MENU_BLINK_DELAY = 50; // 50ms == 3/60 sec, according to the spec
- protected static void blinkMenu(final Selectable selectable) {
+ private static final int MENU_BLINK_DELAY = 50; // 50ms == 3/60 sec, according to the spec
+ static void blinkMenu(final Selectable selectable) {
if (!animationsEnabled()) return;
try {
selectable.paintSelected(false);
Thread.sleep(MENU_BLINK_DELAY);
selectable.paintSelected(true);
Thread.sleep(MENU_BLINK_DELAY);
- } catch (final InterruptedException e) { }
+ } catch (final InterruptedException ignored) { }
}
interface Selectable {
- void paintSelected(final boolean selected);
+ void paintSelected(boolean selected);
}
interface JComponentPainter {
- public void paint(JComponent c, Graphics g, int x, int y, int w, int h);
+ void paint(JComponent c, Graphics g, int x, int y, int w, int h);
}
interface Painter {
- public void paint(final Graphics g, int x, int y, int w, int h);
+ void paint(Graphics g, int x, int y, int w, int h);
}
- public static void paintDropShadowText(final Graphics g, final JComponent c, final Font font, final FontMetrics metrics, final int x, final int y, final int offsetX, final int offsetY, final Color textColor, final Color shadowColor, final String text) {
+ static void paintDropShadowText(final Graphics g, final JComponent c, final Font font, final FontMetrics metrics, final int x, final int y, final int offsetX, final int offsetY, final Color textColor, final Color shadowColor, final String text) {
g.setFont(font);
g.setColor(shadowColor);
SwingUtilities2.drawString(c, g, text, x + offsetX, y + offsetY + metrics.getAscent());
@@ -252,22 +266,22 @@
SwingUtilities2.drawString(c, g, text, x, y + metrics.getAscent());
}
- public static class ShadowBorder implements Border {
- final Painter prePainter;
- final Painter postPainter;
+ static class ShadowBorder implements Border {
+ private final Painter prePainter;
+ private final Painter postPainter;
- final int offsetX;
- final int offsetY;
- final float distance;
- final int blur;
- final Insets insets;
- final ConvolveOp blurOp;
+ private final int offsetX;
+ private final int offsetY;
+ private final float distance;
+ private final int blur;
+ private final Insets insets;
+ private final ConvolveOp blurOp;
- public ShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur) {
+ ShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur) {
this.prePainter = prePainter; this.postPainter = postPainter;
this.offsetX = offsetX; this.offsetY = offsetY; this.distance = distance; this.blur = blur;
final int halfBlur = blur / 2;
- this.insets = new Insets(halfBlur - offsetY, halfBlur - offsetX, halfBlur + offsetY, halfBlur + offsetX);
+ insets = new Insets(halfBlur - offsetY, halfBlur - offsetX, halfBlur + offsetY, halfBlur + offsetX);
final float blurry = intensity / (blur * blur);
final float[] blurKernel = new float[blur * blur];
@@ -275,14 +289,17 @@
blurOp = new ConvolveOp(new Kernel(blur, blur, blurKernel));
}
- public boolean isBorderOpaque() {
+ @Override
+ public final boolean isBorderOpaque() {
return false;
}
- public Insets getBorderInsets(final Component c) {
+ @Override
+ public final Insets getBorderInsets(final Component c) {
return insets;
}
+ @Override
public void paintBorder(final Component c, final Graphics g, final int x, final int y, final int width, final int height) {
final BufferedImage img = new BufferedImage(width + blur * 2, height + blur * 2, BufferedImage.TYPE_INT_ARGB_PRE);
paintToImage(img, x, y, width, height);
@@ -290,7 +307,7 @@
g.drawImage(img, -blur, -blur, null);
}
- protected void paintToImage(final BufferedImage img, final int x, final int y, final int width, final int height) {
+ private void paintToImage(final BufferedImage img, final int x, final int y, final int width, final int height) {
// clear the prior image
Graphics2D imgG = (Graphics2D)img.getGraphics();
imgG.setComposite(AlphaComposite.Clear);
@@ -319,10 +336,10 @@
}
}
- public static class SlicedShadowBorder extends ShadowBorder {
- final SlicedImageControl slices;
+ static class SlicedShadowBorder extends ShadowBorder {
+ private final SlicedImageControl slices;
- public SlicedShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur, final int templateWidth, final int templateHeight, final int leftCut, final int topCut, final int rightCut, final int bottomCut) {
+ SlicedShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur, final int templateWidth, final int templateHeight, final int leftCut, final int topCut, final int rightCut, final int bottomCut) {
super(prePainter, postPainter, offsetX, offsetY, distance, intensity, blur);
final BufferedImage i = new BufferedImage(templateWidth, templateHeight, BufferedImage.TYPE_INT_ARGB_PRE);
@@ -331,15 +348,12 @@
slices = new SlicedImageControl(i, leftCut, topCut, rightCut, bottomCut, false);
}
+ @Override
public void paintBorder(final Component c, final Graphics g, final int x, final int y, final int width, final int height) {
slices.paint(g, x, y, width, height);
}
}
- public interface NineSliceMetricsProvider {
-
- }
-
// static void debugFrame(String name, Image image) {
// JFrame f = new JFrame(name);
// f.setContentPane(new JLabel(new ImageIcon(image)));
@@ -350,28 +364,30 @@
// special casing naughty applications, like InstallAnywhere
// <rdar://problem/4851533> REGR: JButton: Myst IV: the buttons of 1.0.3 updater have redraw issue
static boolean shouldUseOpaqueButtons() {
- final ClassLoader launcherClassLoader = sun.misc.Launcher.getLauncher().getClassLoader();
+ final ClassLoader launcherClassLoader = Launcher.getLauncher().getClassLoader();
if (classExists(launcherClassLoader, "com.installshield.wizard.platform.macosx.MacOSXUtils")) return true;
return false;
}
- static boolean classExists(final ClassLoader classLoader, final String clazzName) {
+ private static boolean classExists(final ClassLoader classLoader, final String clazzName) {
try {
return Class.forName(clazzName, false, classLoader) != null;
- } catch (final Throwable e) { }
+ } catch (final Throwable ignored) { }
return false;
}
- private static RecyclableSingleton<Method> getJComponentGetFlagMethod = new RecyclableSingleton<Method>() {
+ private static final RecyclableSingleton<Method> getJComponentGetFlagMethod = new RecyclableSingleton<Method>() {
+ @Override
protected Method getInstance() {
- return java.security.AccessController.doPrivileged(
+ return AccessController.doPrivileged(
new PrivilegedAction<Method>() {
+ @Override
public Method run() {
try {
final Method method = JComponent.class.getDeclaredMethod("getFlag", new Class[] { int.class });
method.setAccessible(true);
return method;
- } catch (final Throwable e) {
+ } catch (final Throwable ignored) {
return null;
}
}
@@ -380,18 +396,18 @@
}
};
- private static final Integer OPAQUE_SET_FLAG = new Integer(24); // private int JComponent.OPAQUE_SET
- protected static boolean hasOpaqueBeenExplicitlySet(final JComponent c) {
+ private static final Integer OPAQUE_SET_FLAG = 24; // private int JComponent.OPAQUE_SET
+ static boolean hasOpaqueBeenExplicitlySet(final JComponent c) {
final Method method = getJComponentGetFlagMethod.get();
if (method == null) return false;
try {
return Boolean.TRUE.equals(method.invoke(c, OPAQUE_SET_FLAG));
- } catch (final Throwable e) {
+ } catch (final Throwable ignored) {
return false;
}
}
- protected static boolean isWindowTextured(final Component c) {
+ private static boolean isWindowTextured(final Component c) {
if (!(c instanceof JComponent)) {
return false;
}
@@ -412,13 +428,12 @@
return new Color(color.getRed(), color.getGreen(), color.getBlue(), 0);
}
- protected static void fillRect(final Graphics g, final Component c) {
+ static void fillRect(final Graphics g, final Component c) {
fillRect(g, c, c.getBackground(), 0, 0, c.getWidth(), c.getHeight());
}
- protected static void fillRect(final Graphics g, final Component c,
- final Color color, final int x, final int y,
- final int w, final int h) {
+ static void fillRect(final Graphics g, final Component c, final Color color,
+ final int x, final int y, final int w, final int h) {
if (!(g instanceof Graphics2D)) {
return;
}
diff --git a/jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java b/jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java
index 5f78ff6..8739340 100644
--- a/jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java
+++ b/jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java
@@ -36,7 +36,10 @@
import sun.lwawt.LWToolkit;
import sun.lwawt.macosx.*;
-class ScreenMenu extends Menu implements ContainerListener, ComponentListener, ScreenMenuPropertyHandler {
+final class ScreenMenu extends Menu
+ implements ContainerListener, ComponentListener,
+ ScreenMenuPropertyHandler {
+
static {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Void>() {
@@ -48,20 +51,22 @@
}
// screen menu stuff
- public static native long addMenuListeners(ScreenMenu listener, long nativeMenu);
- public static native void removeMenuListeners(long modelPtr);
+ private static native long addMenuListeners(ScreenMenu listener, long nativeMenu);
+ private static native void removeMenuListeners(long modelPtr);
- long fModelPtr = 0;
+ private transient long fModelPtr;
- Hashtable<Component, MenuItem> fItems;
- JMenu fInvoker;
+ private final Hashtable<Component, MenuItem> fItems;
+ private final JMenu fInvoker;
- Component fLastMouseEventTarget;
- Rectangle fLastTargetRect;
+ private Component fLastMouseEventTarget;
+ private Rectangle fLastTargetRect;
private volatile Rectangle[] fItemBounds;
+ private ScreenMenuPropertyListener fPropertyListener;
+
// Array of child hashes used to see if we need to recreate the Menu.
- int childHashArray[];
+ private int childHashArray[];
ScreenMenu(final JMenu invoker) {
super(invoker.getText());
@@ -74,25 +79,12 @@
updateItems();
}
- // I'm always 'visible', but never on screen
- static class ScreenMenuComponent extends Container {
- public boolean isVisible() { return true; }
- public boolean isShowing() { return true; }
- public void setVisible(final boolean b) {}
- public void show() {}
- }
-
- ScreenMenuComponent makeScreenMenuComponent() {
- return new ScreenMenuComponent();
- }
-
-
/**
* Determine if we need to tear down the Menu and re-create it, since the contents may have changed in the Menu opened listener and
* we do not get notified of it, because EDT is busy in our code. We only need to update if the menu contents have changed in some
* way, such as the number of menu items, the text of the menuitems, icon, shortcut etc.
*/
- static boolean needsUpdate(final Component items[], final int childHashArray[]) {
+ private static boolean needsUpdate(final Component items[], final int childHashArray[]) {
if (items == null || childHashArray == null) {
return true;
}
@@ -112,7 +104,7 @@
* Used to recreate the AWT based Menu structure that implements the Screen Menu.
* Also computes hashcode and stores them so that we can compare them later in needsUpdate.
*/
- void updateItems() {
+ private void updateItems() {
final int count = fInvoker.getMenuComponentCount();
final Component[] items = fInvoker.getMenuComponents();
if (needsUpdate(items, childHashArray)) {
@@ -163,16 +155,14 @@
LWCToolkit.invokeAndWait(new Runnable() {
public void run() {
invoker.setSelected(false);
-
- // Null out the tracking rectangles and the array.
+ // Null out the tracking rectangles and the array.
if (fItemBounds != null) {
- for (int i = 0; i < fItemBounds.length; i++) {
- fItemBounds[i] = null;
- }
+ for (int i = 0; i < fItemBounds.length; i++) {
+ fItemBounds[i] = null;
+ }
}
-
- fItemBounds = null;
- }
+ fItemBounds = null;
+ }
}, invoker);
} catch (final Exception e) {
e.printStackTrace();
@@ -237,49 +227,56 @@
});
}
- ScreenMenuPropertyListener fPropertyListener;
+ @Override
public void addNotify() {
- super.addNotify();
- if (fModelPtr == 0) {
- fInvoker.addContainerListener(this);
- fInvoker.addComponentListener(this);
- fPropertyListener = new ScreenMenuPropertyListener(this);
- fInvoker.addPropertyChangeListener(fPropertyListener);
+ synchronized (getTreeLock()) {
+ super.addNotify();
+ if (fModelPtr == 0) {
+ fInvoker.addContainerListener(this);
+ fInvoker.addComponentListener(this);
+ fPropertyListener = new ScreenMenuPropertyListener(this);
+ fInvoker.addPropertyChangeListener(fPropertyListener);
- final Icon icon = fInvoker.getIcon();
- if (icon != null) {
- this.setIcon(icon);
- }
+ final Icon icon = fInvoker.getIcon();
+ if (icon != null) {
+ setIcon(icon);
+ }
- final String tooltipText = fInvoker.getToolTipText();
- if (tooltipText != null) {
- this.setToolTipText(tooltipText);
- }
- final MenuComponentPeer peer = getPeer();
- if (peer instanceof CMenu) {
- final CMenu menu = (CMenu)peer;
- final long nativeMenu = menu.getNativeMenu();
- fModelPtr = addMenuListeners(this, nativeMenu);
+ final String tooltipText = fInvoker.getToolTipText();
+ if (tooltipText != null) {
+ setToolTipText(tooltipText);
+ }
+ final MenuComponentPeer peer = getPeer();
+ if (peer instanceof CMenu) {
+ final CMenu menu = (CMenu) peer;
+ final long nativeMenu = menu.getNativeMenu();
+ fModelPtr = addMenuListeners(this, nativeMenu);
+ }
}
}
}
+ @Override
public void removeNotify() {
- // Call super so that the NSMenu has been removed, before we release the delegate in removeMenuListeners
- super.removeNotify();
- fItems.clear();
- if (fModelPtr != 0) {
- removeMenuListeners(fModelPtr);
- fModelPtr = 0;
- fInvoker.removeContainerListener(this);
- fInvoker.removeComponentListener(this);
- fInvoker.removePropertyChangeListener(fPropertyListener);
+ synchronized (getTreeLock()) {
+ // Call super so that the NSMenu has been removed, before we release
+ // the delegate in removeMenuListeners
+ super.removeNotify();
+ fItems.clear();
+ if (fModelPtr != 0) {
+ removeMenuListeners(fModelPtr);
+ fModelPtr = 0;
+ fInvoker.removeContainerListener(this);
+ fInvoker.removeComponentListener(this);
+ fInvoker.removePropertyChangeListener(fPropertyListener);
+ }
}
}
/**
* Invoked when a component has been added to the container.
*/
+ @Override
public void componentAdded(final ContainerEvent e) {
addItem(e.getChild());
}
@@ -287,23 +284,26 @@
/**
* Invoked when a component has been removed from the container.
*/
+ @Override
public void componentRemoved(final ContainerEvent e) {
final Component child = e.getChild();
final MenuItem sm = fItems.get(child);
if (sm == null) return;
- remove(sm);
- fItems.remove(sm);
- }
+ remove(sm);
+ fItems.remove(sm);
+ }
/**
* Invoked when the component's size changes.
*/
+ @Override
public void componentResized(final ComponentEvent e) {}
/**
* Invoked when the component's position changes.
*/
+ @Override
public void componentMoved(final ComponentEvent e) {}
/**
@@ -311,6 +311,7 @@
* See componentHidden - we should still have a MenuItem
* it just isn't inserted
*/
+ @Override
public void componentShown(final ComponentEvent e) {
setVisible(true);
}
@@ -321,11 +322,12 @@
* so we remove the ScreenMenuItem from the ScreenMenu
* but leave it in fItems
*/
+ @Override
public void componentHidden(final ComponentEvent e) {
setVisible(false);
}
- public void setVisible(final boolean b) {
+ private void setVisible(final boolean b) {
// Tell our parent to add/remove us
final MenuContainer parent = getParent();
@@ -333,20 +335,24 @@
if (parent instanceof ScreenMenu) {
final ScreenMenu sm = (ScreenMenu)parent;
sm.setChildVisible(fInvoker, b);
- }
+ }
}
}
+ @Override
public void setChildVisible(final JMenuItem child, final boolean b) {
fItems.remove(child);
updateItems();
}
+ @Override
public void setAccelerator(final KeyStroke ks) {}
// only check and radio items can be indeterminate
+ @Override
public void setIndeterminate(boolean indeterminate) { }
+ @Override
public void setToolTipText(final String text) {
final MenuComponentPeer peer = getPeer();
if (!(peer instanceof CMenuItem)) return;
@@ -355,6 +361,7 @@
cmi.setToolTipText(text);
}
+ @Override
public void setIcon(final Icon i) {
final MenuComponentPeer peer = getPeer();
if (!(peer instanceof CMenuItem)) return;
@@ -374,9 +381,8 @@
/**
* Gets a hashCode for a JMenu or JMenuItem or subclass so that we can compare for
* changes in the Menu.
- *
*/
- static int getHashCode(final Component m) {
+ private static int getHashCode(final Component m) {
int hashCode = m.hashCode();
if (m instanceof JMenuItem) {
@@ -408,7 +414,7 @@
return hashCode;
}
- void addItem(final Component m) {
+ private void addItem(final Component m) {
if (!m.isVisible()) return;
MenuItem sm = fItems.get(m);
diff --git a/jdk/src/macosx/classes/com/apple/resources/MacOSXResourceBundle.java b/jdk/src/macosx/classes/com/apple/resources/MacOSXResourceBundle.java
deleted file mode 100644
index 143584b..0000000
--- a/jdk/src/macosx/classes/com/apple/resources/MacOSXResourceBundle.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.apple.resources;
-
-import java.security.*;
-import java.util.PropertyResourceBundle;
-import java.util.ResourceBundle;
-import java.io.*;
-
-public class MacOSXResourceBundle extends PropertyResourceBundle {
- MacOSXResourceBundle(InputStream stream) throws IOException {
- super(stream);
- }
-
- void setItsParent(ResourceBundle rb) {
- setParent(rb);
- }
-
- public static ResourceBundle getMacResourceBundle(String baseJavaBundle) throws Exception {
- return getMacResourceBundle(baseJavaBundle, null);
- }
-
- public static ResourceBundle getMacResourceBundle(String baseJavaBundle, String filename) throws Exception {
- LoadNativeBundleAction lnba = new LoadNativeBundleAction(baseJavaBundle, filename);
- return (ResourceBundle)java.security.AccessController.doPrivileged(lnba);
- }
-}
-
-class LoadNativeBundleAction implements PrivilegedExceptionAction {
- String mBaseJavaBundle;
- String mFilenameOverride;
-
- LoadNativeBundleAction(String baseJavaBundle, String filenameOverride) {
- mBaseJavaBundle = baseJavaBundle;
- mFilenameOverride = filenameOverride;
- }
-
- public Object run() {
- java.util.ResourceBundle returnValue = null;
- MacOSXResourceBundle macOSrb = null;
-
- // Load the Mac OS X resources.
- // Use a base filename if we were given one. Otherwise, we will look for the last piece of the bundle path
- // with '.properties' appended. Either way, the native method will take care of the extension.
- String filename = mFilenameOverride;
-
- if (filename == null) {
- filename = mBaseJavaBundle.substring(mBaseJavaBundle.lastIndexOf('.') + 1);
- }
-
- File propsFile = null;
- String propertyFileName = getPathToBundleFile(filename);
- InputStream stream = null;
-
- try {
- propsFile = new File(propertyFileName);
- stream = new FileInputStream(propsFile);
- stream = new java.io.BufferedInputStream(stream);
- macOSrb = new MacOSXResourceBundle(stream);
- } catch (Exception e) {
- //e.printStackTrace();
- //System.out.println("Failed to create resources from application bundle. Using Java-based resources.");
- } finally {
- try {
- if (stream != null) stream.close();
- stream = null;
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- returnValue = ResourceBundle.getBundle(mBaseJavaBundle);
-
- // If we have a platform-specific bundle, make it the parent of the generic bundle, so failures propagate up to the parent.
- if (returnValue != null) {
- if (macOSrb != null) {
- macOSrb.setItsParent(returnValue);
- returnValue = macOSrb;
- }
- }
-
- return returnValue;
- }
-
- private static native String getPathToBundleFile(String filename);
-}
-
diff --git a/jdk/src/macosx/classes/sun/nio/ch/sctp/SctpChannelImpl.java b/jdk/src/macosx/classes/sun/nio/ch/sctp/SctpChannelImpl.java
new file mode 100644
index 0000000..8a14720
--- /dev/null
+++ b/jdk/src/macosx/classes/sun/nio/ch/sctp/SctpChannelImpl.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package sun.nio.ch.sctp;
+
+import java.net.SocketAddress;
+import java.net.InetAddress;
+import java.io.IOException;
+import java.util.Set;
+import java.nio.ByteBuffer;
+import java.nio.channels.spi.SelectorProvider;
+import com.sun.nio.sctp.Association;
+import com.sun.nio.sctp.MessageInfo;
+import com.sun.nio.sctp.NotificationHandler;
+import com.sun.nio.sctp.SctpChannel;
+import com.sun.nio.sctp.SctpSocketOption;
+
+/**
+ * Unimplemented.
+ */
+public class SctpChannelImpl extends SctpChannel
+{
+ private static final String message = "SCTP not supported on this platform";
+
+ public SctpChannelImpl(SelectorProvider provider) {
+ super(provider);
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public Association association() {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public SctpChannel bind(SocketAddress local)
+ throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public SctpChannel bindAddress(InetAddress address)
+ throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public SctpChannel unbindAddress(InetAddress address)
+ throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public boolean connect(SocketAddress remote) throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public boolean connect(SocketAddress remote, int maxOutStreams,
+ int maxInStreams) throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public boolean isConnectionPending() {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public boolean finishConnect() throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public Set<SocketAddress> getAllLocalAddresses()
+ throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public Set<SocketAddress> getRemoteAddresses()
+ throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public SctpChannel shutdown() throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public <T> T getOption(SctpSocketOption<T> name)
+ throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public <T> SctpChannel setOption(SctpSocketOption<T> name, T value)
+ throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public Set<SctpSocketOption<?>> supportedOptions() {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public <T> MessageInfo receive(ByteBuffer dst, T attachment,
+ NotificationHandler<T> handler) throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public int send(ByteBuffer src, MessageInfo messageInfo)
+ throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ protected void implConfigureBlocking(boolean block) throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public void implCloseSelectableChannel() throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+}
diff --git a/jdk/src/macosx/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java b/jdk/src/macosx/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
new file mode 100644
index 0000000..c2c1d96
--- /dev/null
+++ b/jdk/src/macosx/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package sun.nio.ch.sctp;
+
+import java.net.SocketAddress;
+import java.net.InetAddress;
+import java.io.IOException;
+import java.util.Set;
+import java.nio.ByteBuffer;
+import java.nio.channels.spi.SelectorProvider;
+import com.sun.nio.sctp.Association;
+import com.sun.nio.sctp.SctpChannel;
+import com.sun.nio.sctp.MessageInfo;
+import com.sun.nio.sctp.NotificationHandler;
+import com.sun.nio.sctp.SctpMultiChannel;
+import com.sun.nio.sctp.SctpSocketOption;
+
+/**
+ * Unimplemented.
+ */
+public class SctpMultiChannelImpl extends SctpMultiChannel
+{
+ private static final String message = "SCTP not supported on this platform";
+
+ public SctpMultiChannelImpl(SelectorProvider provider) {
+ super(provider);
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public Set<Association> associations() {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public SctpMultiChannel bind(SocketAddress local,
+ int backlog) throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public SctpMultiChannel bindAddress(InetAddress address)
+ throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public SctpMultiChannel unbindAddress(InetAddress address)
+ throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public Set<SocketAddress> getAllLocalAddresses()
+ throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public Set<SocketAddress> getRemoteAddresses
+ (Association association) throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public SctpMultiChannel shutdown(Association association)
+ throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public <T> T getOption(SctpSocketOption<T> name,
+ Association association) throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public <T> SctpMultiChannel setOption(SctpSocketOption<T> name,
+ T value, Association association) throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public Set<SctpSocketOption<?>> supportedOptions() {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public <T> MessageInfo receive(ByteBuffer buffer, T attachment,
+ NotificationHandler<T> handler) throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public int send(ByteBuffer buffer, MessageInfo messageInfo)
+ throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public SctpChannel branch(Association association)
+ throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ protected void implConfigureBlocking(boolean block) throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public void implCloseSelectableChannel() throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+}
diff --git a/jdk/src/macosx/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java b/jdk/src/macosx/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
new file mode 100644
index 0000000..1e224af
--- /dev/null
+++ b/jdk/src/macosx/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package sun.nio.ch.sctp;
+
+import java.net.SocketAddress;
+import java.net.InetAddress;
+import java.io.IOException;
+import java.util.Set;
+import java.nio.channels.spi.SelectorProvider;
+import com.sun.nio.sctp.SctpChannel;
+import com.sun.nio.sctp.SctpServerChannel;
+import com.sun.nio.sctp.SctpSocketOption;
+
+/**
+ * Unimplemented.
+ */
+public class SctpServerChannelImpl extends SctpServerChannel
+{
+ private static final String message = "SCTP not supported on this platform";
+
+ public SctpServerChannelImpl(SelectorProvider provider) {
+ super(provider);
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public SctpChannel accept() throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public SctpServerChannel bind(SocketAddress local,
+ int backlog) throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public SctpServerChannel bindAddress(InetAddress address)
+ throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public SctpServerChannel unbindAddress(InetAddress address)
+ throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public Set<SocketAddress> getAllLocalAddresses()
+ throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public <T> T getOption(SctpSocketOption<T> name) throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public <T> SctpServerChannel setOption(SctpSocketOption<T> name,
+ T value) throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public Set<SctpSocketOption<?>> supportedOptions() {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ protected void implConfigureBlocking(boolean block) throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+
+ @Override
+ public void implCloseSelectableChannel() throws IOException {
+ throw new UnsupportedOperationException(message);
+ }
+}
diff --git a/jdk/src/macosx/native/com/apple/resources/MacOSXResourceBundle.m b/jdk/src/macosx/native/com/apple/resources/MacOSXResourceBundle.m
deleted file mode 100644
index 0b98d2b..0000000
--- a/jdk/src/macosx/native/com/apple/resources/MacOSXResourceBundle.m
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#import <dlfcn.h>
-#import <Cocoa/Cocoa.h>
-#import <JavaNativeFoundation/JavaNativeFoundation.h>
-
-#ifndef MAXPATHLEN
-#define MAXPATHLEN PATH_MAX
-#endif
-
-static jboolean
-GetPathFromCurrentBinary(char *buf, jint bufsize)
-{
- Dl_info dlinfo;
- dladdr((void *)GetPathFromCurrentBinary, &dlinfo);
- if (realpath(dlinfo.dli_fname, buf) == NULL) {
-// fprintf(stderr, "Error: realpath(`%s') failed.\n", dlinfo.dli_fname);
- return JNI_FALSE;
- }
-
- const char *libawt = "lib/libawt.dylib";
- int strLen, libawtLen;
-
- strLen = strlen(buf);
- libawtLen = strlen(libawt);
-
- if (strLen < libawtLen ||
- strcmp(buf + strLen - libawtLen, libawt) != 0) {
- return JNI_FALSE;
- }
-
- buf[strLen - libawtLen] = '\0';
-
- return JNI_TRUE;
-}
-
-#define JAVA_DLL "libjava.dylib"
-
-static jboolean
-GetJREPath(char *buf, jint bufsize)
-{
- /* try to get the path from the current binary, if not, bail to the framework */
- if (GetPathFromCurrentBinary(buf, bufsize) == JNI_TRUE) {
- /* does the rest of the JRE exist? */
- char libjava[MAXPATHLEN];
- snprintf(libjava, MAXPATHLEN, "%s/lib/" JAVA_DLL, buf);
- if (access(libjava, F_OK) == 0) {
- return JNI_TRUE;
- }
- }
-
- return JNI_FALSE;
-}
-
-static NSString *getRunningJavaBundle()
-{
- char path[MAXPATHLEN];
- GetJREPath(path, MAXPATHLEN);
- return [[NSString alloc] initWithFormat:@"%@/bundle", [NSString stringWithUTF8String:path]];
-}
-
-/*
- * Class: com_apple_resources_LoadNativeBundleAction
- * Method: getPathToBundleFile
- * Signature: (Ljava/lang/String)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL
-Java_com_apple_resources_LoadNativeBundleAction_getPathToBundleFile
- (JNIEnv *env, jclass klass, jstring filename)
-{
- jstring returnVal = NULL;
- if (filename == NULL) {
- return NULL;
- }
-
-JNF_COCOA_ENTER(env);
- NSBundle *javaBundle = [NSBundle bundleWithPath:getRunningJavaBundle()];
- NSString *baseFilename = JNFJavaToNSString(env, filename);
- NSString *propertyFilePath = [javaBundle pathForResource:baseFilename ofType:@"properties"];
-
- if (propertyFilePath != nil) {
- returnVal = JNFNSToJavaString(env, propertyFilePath);
- }
-JNF_COCOA_EXIT(env);
-
- return returnVal;
-}
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/CipherBlockChaining.java b/jdk/src/share/classes/com/sun/crypto/provider/CipherBlockChaining.java
index 3ed00e0..c32aa7f 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/CipherBlockChaining.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/CipherBlockChaining.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -135,9 +135,10 @@
* @param plainLen the length of the input data
* @param cipher the buffer for the result
* @param cipherOffset the offset in <code>cipher</code>
+ * @return the length of the encrypted data
*/
- void encrypt(byte[] plain, int plainOffset, int plainLen,
- byte[] cipher, int cipherOffset)
+ int encrypt(byte[] plain, int plainOffset, int plainLen,
+ byte[] cipher, int cipherOffset)
{
int i;
int endIndex = plainOffset + plainLen;
@@ -150,6 +151,7 @@
embeddedCipher.encryptBlock(k, 0, cipher, cipherOffset);
System.arraycopy(cipher, cipherOffset, r, 0, blockSize);
}
+ return plainLen;
}
/**
@@ -174,13 +176,14 @@
* @param cipherLen the length of the input data
* @param plain the buffer for the result
* @param plainOffset the offset in <code>plain</code>
+ * @return the length of the decrypted data
*
* @exception IllegalBlockSizeException if input data whose length does
* not correspond to the embedded cipher's block size is passed to the
* embedded cipher
*/
- void decrypt(byte[] cipher, int cipherOffset, int cipherLen,
- byte[] plain, int plainOffset)
+ int decrypt(byte[] cipher, int cipherOffset, int cipherLen,
+ byte[] plain, int plainOffset)
{
int i;
byte[] cipherOrig=null;
@@ -195,7 +198,6 @@
// the plaintext result.
cipherOrig = cipher.clone();
}
-
for (; cipherOffset < endIndex;
cipherOffset += blockSize, plainOffset += blockSize) {
embeddedCipher.decryptBlock(cipher, cipherOffset, k, 0);
@@ -208,5 +210,6 @@
System.arraycopy(cipherOrig, cipherOffset, r, 0, blockSize);
}
}
+ return cipherLen;
}
}
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/CipherCore.java b/jdk/src/share/classes/com/sun/crypto/provider/CipherCore.java
index 7548612..dab1b4d 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/CipherCore.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/CipherCore.java
@@ -310,49 +310,20 @@
* @return the required output buffer size (in bytes)
*/
int getOutputSize(int inputLen) {
- int totalLen = buffered + inputLen;
-
- // GCM: this call may be for either update() or doFinal(), so have to
- // return the larger value of both
- // Encryption: based on doFinal value: inputLen + tag
- // Decryption: based on update value: inputLen
- if (!decrypting && (cipherMode == GCM_MODE)) {
- return (totalLen + ((GaloisCounterMode) cipher).getTagLen());
- }
-
- if (padding == null) {
- return totalLen;
- }
-
- if (decrypting) {
- return totalLen;
- }
-
- if (unitBytes != blockSize) {
- if (totalLen < diffBlocksize) {
- return diffBlocksize;
- } else {
- return (totalLen + blockSize -
- ((totalLen - diffBlocksize) % blockSize));
- }
- } else {
- return totalLen + padding.padLength(totalLen);
- }
+ // estimate based on the maximum
+ return getOutputSizeByOperation(inputLen, true);
}
private int getOutputSizeByOperation(int inputLen, boolean isDoFinal) {
- int totalLen = 0;
+ int totalLen = buffered + inputLen + cipher.getBufferedLength();
switch (cipherMode) {
case GCM_MODE:
- totalLen = buffered + inputLen;
if (isDoFinal) {
int tagLen = ((GaloisCounterMode) cipher).getTagLen();
- if (decrypting) {
- // need to get the actual value from cipher??
- // deduct tagLen
- totalLen -= tagLen;
- } else {
+ if (!decrypting) {
totalLen += tagLen;
+ } else {
+ totalLen -= tagLen;
}
}
if (totalLen < 0) {
@@ -360,8 +331,19 @@
}
break;
default:
- totalLen = getOutputSize(inputLen);
- break;
+ if (padding != null && !decrypting) {
+ if (unitBytes != blockSize) {
+ if (totalLen < diffBlocksize) {
+ totalLen = diffBlocksize;
+ } else {
+ int residue = (totalLen - diffBlocksize) % blockSize;
+ totalLen += (blockSize - residue);
+ }
+ } else {
+ totalLen += padding.padLength(totalLen);
+ }
+ }
+ break;
}
return totalLen;
}
@@ -729,36 +711,52 @@
len = (len > 0 ? (len - (len%unitBytes)) : 0);
// check output buffer capacity
- if ((output == null) || ((output.length - outputOffset) < len)) {
+ if ((output == null) ||
+ ((output.length - outputOffset) < len)) {
throw new ShortBufferException("Output buffer must be "
+ "(at least) " + len
+ " bytes long");
}
- if (len != 0) {
- // there is some work to do
- byte[] in = new byte[len];
-
- int inputConsumed = len - buffered;
- int bufferedConsumed = buffered;
- if (inputConsumed < 0) {
- inputConsumed = 0;
- bufferedConsumed = len;
+ int outLen = 0;
+ if (len != 0) { // there is some work to do
+ if (len <= buffered) {
+ // all to-be-processed data are from 'buffer'
+ if (decrypting) {
+ outLen = cipher.decrypt(buffer, 0, len, output, outputOffset);
+ } else {
+ outLen = cipher.encrypt(buffer, 0, len, output, outputOffset);
+ }
+ buffered -= len;
+ if (buffered != 0) {
+ System.arraycopy(buffer, len, buffer, 0, buffered);
+ }
+ } else { // len > buffered
+ if (buffered == 0) {
+ // all to-be-processed data are from 'input'
+ if (decrypting) {
+ outLen = cipher.decrypt(input, inputOffset, len, output, outputOffset);
+ } else {
+ outLen = cipher.encrypt(input, inputOffset, len, output, outputOffset);
+ }
+ inputOffset += len;
+ inputLen -= len;
+ } else {
+ // assemble the data using both 'buffer' and 'input'
+ byte[] in = new byte[len];
+ System.arraycopy(buffer, 0, in, 0, buffered);
+ int inConsumed = len - buffered;
+ System.arraycopy(input, inputOffset, in, buffered, inConsumed);
+ buffered = 0;
+ inputOffset += inConsumed;
+ inputLen -= inConsumed;
+ if (decrypting) {
+ outLen = cipher.decrypt(in, 0, len, output, outputOffset);
+ } else {
+ outLen = cipher.encrypt(in, 0, len, output, outputOffset);
+ }
+ }
}
-
- if (buffered != 0) {
- System.arraycopy(buffer, 0, in, 0, bufferedConsumed);
- }
- if (inputConsumed > 0) {
- System.arraycopy(input, inputOffset, in,
- bufferedConsumed, inputConsumed);
- }
- if (decrypting) {
- cipher.decrypt(in, 0, len, output, outputOffset);
- } else {
- cipher.encrypt(in, 0, len, output, outputOffset);
- }
-
// Let's keep track of how many bytes are needed to make
// the total input length a multiple of blocksize when
// padding is applied
@@ -770,23 +768,14 @@
((len - diffBlocksize) % blockSize);
}
}
-
- inputLen -= inputConsumed;
- inputOffset += inputConsumed;
- outputOffset += len;
- buffered -= bufferedConsumed;
- if (buffered > 0) {
- System.arraycopy(buffer, bufferedConsumed, buffer, 0,
- buffered);
- }
}
- // left over again
+ // Store remaining input into 'buffer' again
if (inputLen > 0) {
System.arraycopy(input, inputOffset, buffer, buffered,
inputLen);
+ buffered += inputLen;
}
- buffered += inputLen;
- return len;
+ return outLen;
}
/**
@@ -881,11 +870,24 @@
("Must use either different key or iv for GCM encryption");
}
- // calculate the total input length
- int totalLen = buffered + inputLen;
- int paddedLen = totalLen;
- int paddingLen = 0;
+ int estOutSize = getOutputSizeByOperation(inputLen, true);
+ // check output buffer capacity.
+ // if we are decrypting with padding applied, we can perform this
+ // check only after we have determined how many padding bytes there
+ // are.
+ int outputCapacity = output.length - outputOffset;
+ int minOutSize = (decrypting? (estOutSize - blockSize):estOutSize);
+ if ((output == null) || (outputCapacity < minOutSize)) {
+ throw new ShortBufferException("Output buffer must be "
+ + "(at least) " + minOutSize + " bytes long");
+ }
+ // calculate total input length
+ int len = buffered + inputLen;
+
+ // calculate padding length
+ int totalLen = len + cipher.getBufferedLength();
+ int paddingLen = 0;
// will the total input length be a multiple of blockSize?
if (unitBytes != blockSize) {
if (totalLen < diffBlocksize) {
@@ -898,40 +900,23 @@
paddingLen = padding.padLength(totalLen);
}
- if ((paddingLen > 0) && (paddingLen != blockSize) &&
- (padding != null) && decrypting) {
+ if (decrypting && (padding != null) &&
+ (paddingLen > 0) && (paddingLen != blockSize)) {
throw new IllegalBlockSizeException
("Input length must be multiple of " + blockSize +
" when decrypting with padded cipher");
}
- // if encrypting and padding not null, add padding
- if (!decrypting && padding != null) {
- paddedLen += paddingLen;
- }
-
- // check output buffer capacity.
- // if we are decrypting with padding applied, we can perform this
- // check only after we have determined how many padding bytes there
- // are.
- if (output == null) {
- throw new ShortBufferException("Output buffer is null");
- }
- int outputCapacity = output.length - outputOffset;
-
- if (((!decrypting) && (outputCapacity < paddedLen)) ||
- (decrypting && (outputCapacity < (paddedLen - blockSize)))) {
- throw new ShortBufferException("Output buffer too short: "
- + outputCapacity + " bytes given, "
- + paddedLen + " bytes needed");
- }
-
// prepare the final input avoiding copying if possible
byte[] finalBuf = input;
int finalOffset = inputOffset;
+ int finalBufLen = inputLen;
if ((buffered != 0) || (!decrypting && padding != null)) {
+ if (decrypting || padding == null) {
+ paddingLen = 0;
+ }
+ finalBuf = new byte[len + paddingLen];
finalOffset = 0;
- finalBuf = new byte[paddedLen];
if (buffered != 0) {
System.arraycopy(buffer, 0, finalBuf, 0, buffered);
}
@@ -939,50 +924,50 @@
System.arraycopy(input, inputOffset, finalBuf,
buffered, inputLen);
}
- if (!decrypting && padding != null) {
- padding.padWithLen(finalBuf, totalLen, paddingLen);
+ if (paddingLen != 0) {
+ padding.padWithLen(finalBuf, (buffered+inputLen), paddingLen);
}
+ finalBufLen = finalBuf.length;
}
-
+ int outLen = 0;
if (decrypting) {
// if the size of specified output buffer is less than
// the length of the cipher text, then the current
// content of cipher has to be preserved in order for
// users to retry the call with a larger buffer in the
// case of ShortBufferException.
- if (outputCapacity < paddedLen) {
+ if (outputCapacity < estOutSize) {
cipher.save();
}
// create temporary output buffer so that only "real"
// data bytes are passed to user's output buffer.
- byte[] outWithPadding = new byte[totalLen];
- totalLen = finalNoPadding(finalBuf, finalOffset, outWithPadding,
- 0, totalLen);
+ byte[] outWithPadding = new byte[estOutSize];
+ outLen = finalNoPadding(finalBuf, finalOffset, outWithPadding,
+ 0, finalBufLen);
if (padding != null) {
- int padStart = padding.unpad(outWithPadding, 0, totalLen);
+ int padStart = padding.unpad(outWithPadding, 0, outLen);
if (padStart < 0) {
throw new BadPaddingException("Given final block not "
+ "properly padded");
}
- totalLen = padStart;
+ outLen = padStart;
}
- if ((output.length - outputOffset) < totalLen) {
+ if (outputCapacity < outLen) {
// restore so users can retry with a larger buffer
cipher.restore();
throw new ShortBufferException("Output buffer too short: "
- + (output.length-outputOffset)
- + " bytes given, " + totalLen
+ + (outputCapacity)
+ + " bytes given, " + outLen
+ " bytes needed");
}
- for (int i = 0; i < totalLen; i++) {
- output[outputOffset + i] = outWithPadding[i];
- }
+ // copy the result into user-supplied output buffer
+ System.arraycopy(outWithPadding, 0, output, outputOffset, outLen);
} else { // encrypting
try {
- totalLen = finalNoPadding(finalBuf, finalOffset, output,
- outputOffset, paddedLen);
+ outLen = finalNoPadding(finalBuf, finalOffset, output,
+ outputOffset, finalBufLen);
} finally {
// reset after doFinal() for GCM encryption
requireReinit = (cipherMode == GCM_MODE);
@@ -994,12 +979,13 @@
if (cipherMode != ECB_MODE) {
cipher.reset();
}
- return totalLen;
+ return outLen;
}
private int finalNoPadding(byte[] in, int inOfs, byte[] out, int outOfs,
int len)
- throws IllegalBlockSizeException, AEADBadTagException {
+ throws IllegalBlockSizeException, AEADBadTagException,
+ ShortBufferException {
if ((cipherMode != GCM_MODE) && (in == null || len == 0)) {
return 0;
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/CipherFeedback.java b/jdk/src/share/classes/com/sun/crypto/provider/CipherFeedback.java
index a5f74f6..f8e6115 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/CipherFeedback.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/CipherFeedback.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -150,9 +150,10 @@
* @param plainLen the length of the input data
* @param cipher the buffer for the result
* @param cipherOffset the offset in <code>cipher</code>
+ * @return the length of the encrypted data
*/
- void encrypt(byte[] plain, int plainOffset, int plainLen,
- byte[] cipher, int cipherOffset)
+ int encrypt(byte[] plain, int plainOffset, int plainLen,
+ byte[] cipher, int cipherOffset)
{
int i, len;
len = blockSize - numBytes;
@@ -194,6 +195,7 @@
}
}
}
+ return plainLen;
}
/**
@@ -218,9 +220,10 @@
* @param cipherLen the length of the input data
* @param plain the buffer for the result
* @param plainOffset the offset in <code>plain</code>
+ * @return the length of the decrypted data
*/
- void decrypt(byte[] cipher, int cipherOffset, int cipherLen,
- byte[] plain, int plainOffset)
+ int decrypt(byte[] cipher, int cipherOffset, int cipherLen,
+ byte[] plain, int plainOffset)
{
int i, len;
len = blockSize - numBytes;
@@ -268,5 +271,6 @@
}
}
}
+ return cipherLen;
}
}
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/CounterMode.java b/jdk/src/share/classes/com/sun/crypto/provider/CounterMode.java
index d9e936c..438998e 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/CounterMode.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/CounterMode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 201313, 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
@@ -149,9 +149,10 @@
* @param len the length of the input data
* @param out the buffer for the result
* @param outOff the offset in <code>cipher</code>
+ * @return the length of the encrypted data
*/
- void encrypt(byte[] in, int inOff, int len, byte[] out, int outOff) {
- crypt(in, inOff, len, out, outOff);
+ int encrypt(byte[] in, int inOff, int len, byte[] out, int outOff) {
+ return crypt(in, inOff, len, out, outOff);
}
/**
@@ -176,9 +177,10 @@
* @param len the length of the input data
* @param out the buffer for the result
* @param outOff the offset in <code>plain</code>
+ * @return the length of the decrypted data
*/
- void decrypt(byte[] in, int inOff, int len, byte[] out, int outOff) {
- crypt(in, inOff, len, out, outOff);
+ int decrypt(byte[] in, int inOff, int len, byte[] out, int outOff) {
+ return crypt(in, inOff, len, out, outOff);
}
/**
@@ -197,7 +199,8 @@
* keystream generated by encrypting the counter values. Counter values
* are encrypted on demand.
*/
- private void crypt(byte[] in, int inOff, int len, byte[] out, int outOff) {
+ private int crypt(byte[] in, int inOff, int len, byte[] out, int outOff) {
+ int result = len;
while (len-- > 0) {
if (used >= blockSize) {
embeddedCipher.encryptBlock(counter, 0, encryptedCounter, 0);
@@ -206,5 +209,6 @@
}
out[outOff++] = (byte)(in[inOff++] ^ encryptedCounter[used++]);
}
+ return result;
}
}
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java b/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
index 00baf13..a12e945 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
@@ -58,6 +58,16 @@
// The source of randomness
private SecureRandom random = null;
+ private static void checkKeySize(int keysize)
+ throws InvalidAlgorithmParameterException {
+ if ((keysize != 2048) &&
+ ((keysize < 512) || (keysize > 1024) || (keysize % 64 != 0))) {
+ throw new InvalidAlgorithmParameterException(
+ "Keysize must be multiple of 64 ranging from "
+ + "512 to 1024 (inclusive), or 2048");
+ }
+ }
+
/**
* Initializes this parameter generator for a certain keysize
* and source of randomness.
@@ -67,11 +77,11 @@
* @param random the source of randomness
*/
protected void engineInit(int keysize, SecureRandom random) {
- if ((keysize < 512) || (keysize > 2048) || (keysize % 64 != 0)) {
- throw new InvalidParameterException("Keysize must be multiple "
- + "of 64, and can only range "
- + "from 512 to 2048 "
- + "(inclusive)");
+ // Re-uses DSA parameters and thus have the same range
+ try {
+ checkKeySize(keysize);
+ } catch (InvalidAlgorithmParameterException ex) {
+ throw new InvalidParameterException(ex.getMessage());
}
this.primeSize = keysize;
this.random = random;
@@ -91,31 +101,29 @@
protected void engineInit(AlgorithmParameterSpec genParamSpec,
SecureRandom random)
throws InvalidAlgorithmParameterException {
- if (!(genParamSpec instanceof DHGenParameterSpec)) {
- throw new InvalidAlgorithmParameterException
- ("Inappropriate parameter type");
- }
+ if (!(genParamSpec instanceof DHGenParameterSpec)) {
+ throw new InvalidAlgorithmParameterException
+ ("Inappropriate parameter type");
+ }
- DHGenParameterSpec dhParamSpec = (DHGenParameterSpec)genParamSpec;
+ DHGenParameterSpec dhParamSpec = (DHGenParameterSpec)genParamSpec;
- primeSize = dhParamSpec.getPrimeSize();
- if ((primeSize<512) || (primeSize>2048) || (primeSize%64 != 0)) {
- throw new InvalidAlgorithmParameterException
- ("Modulus size must be multiple of 64, and can only range "
- + "from 512 to 2048 (inclusive)");
- }
+ primeSize = dhParamSpec.getPrimeSize();
- exponentSize = dhParamSpec.getExponentSize();
- if (exponentSize <= 0) {
- throw new InvalidAlgorithmParameterException
- ("Exponent size must be greater than zero");
- }
+ // Re-uses DSA parameters and thus have the same range
+ checkKeySize(primeSize);
- // Require exponentSize < primeSize
- if (exponentSize >= primeSize) {
- throw new InvalidAlgorithmParameterException
- ("Exponent size must be less than modulus size");
- }
+ exponentSize = dhParamSpec.getExponentSize();
+ if (exponentSize <= 0) {
+ throw new InvalidAlgorithmParameterException
+ ("Exponent size must be greater than zero");
+ }
+
+ // Require exponentSize < primeSize
+ if (exponentSize >= primeSize) {
+ throw new InvalidAlgorithmParameterException
+ ("Exponent size must be less than modulus size");
+ }
}
/**
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java b/jdk/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java
index e3254c4..c87cc1c 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java
@@ -271,22 +271,6 @@
}
}
- public String toString() {
- String LINE_SEP = System.getProperty("line.separator");
-
- StringBuffer strbuf
- = new StringBuffer("SunJCE Diffie-Hellman Private Key:"
- + LINE_SEP + "x:" + LINE_SEP
- + Debug.toHexString(this.x)
- + LINE_SEP + "p:" + LINE_SEP
- + Debug.toHexString(this.p)
- + LINE_SEP + "g:" + LINE_SEP
- + Debug.toHexString(this.g));
- if (this.l != 0)
- strbuf.append(LINE_SEP + "l:" + LINE_SEP + " " + this.l);
- return strbuf.toString();
- }
-
private void parseKeyBits() throws InvalidKeyException {
try {
DerInputStream in = new DerInputStream(this.key);
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java b/jdk/src/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java
index abbddd7..a407b6a 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -115,14 +115,15 @@
* @param len the length of the input data
* @param out the buffer for the result
* @param outOff the offset in <code>cipher</code>
+ * @return the length of the encrypted data
*/
- void encrypt(byte[] in, int inOff, int len, byte[] out, int outOff) {
- while (len >= blockSize) {
+ int encrypt(byte[] in, int inOff, int len, byte[] out, int outOff) {
+ for (int i = len; i >= blockSize; i -= blockSize) {
embeddedCipher.encryptBlock(in, inOff, out, outOff);
- len -= blockSize;
inOff += blockSize;
outOff += blockSize;
}
+ return len;
}
/**
@@ -147,14 +148,14 @@
* @param len the length of the input data
* @param out the buffer for the result
* @param outOff the offset in <code>plain</code>
+ * @return the length of the decrypted data
*/
- void decrypt(byte[] in, int inOff, int len, byte[] out, int outOff) {
- while (len >= blockSize) {
+ int decrypt(byte[] in, int inOff, int len, byte[] out, int outOff) {
+ for (int i = len; i >= blockSize; i -= blockSize) {
embeddedCipher.decryptBlock(in, inOff, out, outOff);
- len -= blockSize;
inOff += blockSize;
outOff += blockSize;
}
+ return len;
}
-
}
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/FeedbackCipher.java b/jdk/src/share/classes/com/sun/crypto/provider/FeedbackCipher.java
index c273324..8d03913 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/FeedbackCipher.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/FeedbackCipher.java
@@ -133,9 +133,10 @@
* @param plainLen the length of the input data
* @param cipher the buffer for the encryption result
* @param cipherOffset the offset in <code>cipher</code>
+ * @return the number of bytes placed into <code>cipher</code>
*/
- abstract void encrypt(byte[] plain, int plainOffset, int plainLen,
- byte[] cipher, int cipherOffset);
+ abstract int encrypt(byte[] plain, int plainOffset, int plainLen,
+ byte[] cipher, int cipherOffset);
/**
* Performs encryption operation for the last time.
*
@@ -154,10 +155,9 @@
*/
int encryptFinal(byte[] plain, int plainOffset, int plainLen,
byte[] cipher, int cipherOffset)
- throws IllegalBlockSizeException {
- encrypt(plain, plainOffset, plainLen, cipher, cipherOffset);
- return plainLen;
- }
+ throws IllegalBlockSizeException, ShortBufferException {
+ return encrypt(plain, plainOffset, plainLen, cipher, cipherOffset);
+ }
/**
* Performs decryption operation.
*
@@ -174,9 +174,10 @@
* @param cipherLen the length of the input data
* @param plain the buffer for the decryption result
* @param plainOffset the offset in <code>plain</code>
+ * @return the number of bytes placed into <code>plain</code>
*/
- abstract void decrypt(byte[] cipher, int cipherOffset, int cipherLen,
- byte[] plain, int plainOffset);
+ abstract int decrypt(byte[] cipher, int cipherOffset, int cipherLen,
+ byte[] plain, int plainOffset);
/**
* Performs decryption operation for the last time.
@@ -196,9 +197,9 @@
*/
int decryptFinal(byte[] cipher, int cipherOffset, int cipherLen,
byte[] plain, int plainOffset)
- throws IllegalBlockSizeException, AEADBadTagException {
- decrypt(cipher, cipherOffset, cipherLen, plain, plainOffset);
- return cipherLen;
+ throws IllegalBlockSizeException, AEADBadTagException,
+ ShortBufferException {
+ return decrypt(cipher, cipherOffset, cipherLen, plain, plainOffset);
}
/**
@@ -228,4 +229,15 @@
void updateAAD(byte[] src, int offset, int len) {
throw new IllegalStateException("No AAD accepted");
}
+
+ /**
+ * @return the number of bytes that are buffered internally inside
+ * this FeedbackCipher instance.
+ * @since 1.8
+ */
+ int getBufferedLength() {
+ // Currently only AEAD cipher impl, e.g. GCM, buffers data
+ // internally during decryption mode
+ return 0;
+ }
}
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/GCTR.java b/jdk/src/share/classes/com/sun/crypto/provider/GCTR.java
index 74d3555..d4cd740 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/GCTR.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/GCTR.java
@@ -54,7 +54,7 @@
private byte[] counter;
// needed for save/restore calls
- private byte[] counterSave;
+ private byte[] counterSave = null;
// NOTE: cipher should already be initialized
GCTR(SymmetricCipher cipher, byte[] initialCounterBlk) {
@@ -98,17 +98,16 @@
throw new IllegalBlockSizeException("Negative input size!");
} else if (inLen > 0) {
int lastBlockSize = inLen % AES_BLOCK_SIZE;
+ int completeBlkLen = inLen - lastBlockSize;
// process the complete blocks first
- update(in, inOfs, inLen - lastBlockSize, out, outOfs);
+ update(in, inOfs, completeBlkLen, out, outOfs);
if (lastBlockSize != 0) {
// do the last partial block
byte[] encryptedCntr = new byte[AES_BLOCK_SIZE];
aes.encryptBlock(counter, 0, encryptedCntr, 0);
-
- int processed = inLen - lastBlockSize;
for (int n = 0; n < lastBlockSize; n++) {
- out[outOfs + processed + n] =
- (byte) ((in[inOfs + processed + n] ^
+ out[outOfs + completeBlkLen + n] =
+ (byte) ((in[inOfs + completeBlkLen + n] ^
encryptedCntr[n]));
}
}
@@ -120,12 +119,11 @@
}
/**
- * Resets the current counter to its initial value.
- * This is used after the doFinal() is called so this object can be
- * reused w/o explicit re-initialization.
+ * Resets the content of this object to when it's first constructed.
*/
void reset() {
System.arraycopy(icb, 0, counter, 0, icb.length);
+ counterSave = null;
}
/**
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/GaloisCounterMode.java b/jdk/src/share/classes/com/sun/crypto/provider/GaloisCounterMode.java
index 2f8b584..37bf6f4 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/GaloisCounterMode.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/GaloisCounterMode.java
@@ -35,10 +35,12 @@
* This class represents ciphers in GaloisCounter (GCM) mode.
*
* <p>This mode currently should only be used w/ AES cipher.
- * Although no checking is done here, caller should only
- * pass AES Cipher to the constructor.
+ * Although no checking is done, caller should only pass AES
+ * Cipher to the constructor.
*
- * <p>NOTE: This class does not deal with buffering or padding.
+ * <p>NOTE: Unlike other modes, when used for decryption, this class
+ * will buffer all processed outputs internally and won't return them
+ * until the tag has been successfully verified.
*
* @since 1.8
*/
@@ -51,6 +53,9 @@
private ByteArrayOutputStream aadBuffer = new ByteArrayOutputStream();
private int sizeOfAAD = 0;
+ // buffer for storing input in decryption, not used for encryption
+ private ByteArrayOutputStream ibuffer = null;
+
// in bytes; need to convert to bits (default value 128) when needed
private int tagLenBytes = DEFAULT_TAG_LEN;
@@ -68,12 +73,14 @@
// additional variables for save/restore calls
private byte[] aadBufferSave = null;
private int sizeOfAADSave = 0;
+ private byte[] ibufferSave = null;
private int processedSave = 0;
// value must be 16-byte long; used by GCTR and GHASH as well
static void increment32(byte[] value) {
if (value.length != AES_BLOCK_SIZE) {
- throw new RuntimeException("Unexpected counter block length");
+ // should never happen
+ throw new ProviderException("Illegal counter block length");
}
// start from last byte and only go over 4 bytes, i.e. total 32 bits
int n = value.length - 1;
@@ -171,6 +178,9 @@
if (ghashAllToS != null) ghashAllToS.reset();
processed = 0;
sizeOfAAD = 0;
+ if (ibuffer != null) {
+ ibuffer.reset();
+ }
}
/**
@@ -184,6 +194,9 @@
null : aadBuffer.toByteArray());
if (gctrPAndC != null) gctrPAndC.save();
if (ghashAllToS != null) ghashAllToS.save();
+ if (ibuffer != null) {
+ ibufferSave = ibuffer.toByteArray();
+ }
}
/**
@@ -198,8 +211,12 @@
aadBuffer.write(aadBufferSave, 0, aadBufferSave.length);
}
}
- if (gctrPAndC != null) gctrPAndC.restore();
- if (ghashAllToS != null) ghashAllToS.restore();
+ if (gctrPAndC != null) gctrPAndC.restore();
+ if (ghashAllToS != null) ghashAllToS.restore();
+ if (ibuffer != null) {
+ ibuffer.reset();
+ ibuffer.write(ibufferSave, 0, ibufferSave.length);
+ }
}
/**
@@ -261,6 +278,9 @@
}
processed = 0;
sizeOfAAD = 0;
+ if (decrypting) {
+ ibuffer = new ByteArrayOutputStream();
+ }
}
/**
@@ -299,7 +319,7 @@
// Feed the AAD data to GHASH, pad if necessary
void processAAD() {
- if (aadBuffer != null) {
+ if (aadBuffer != null && aadBuffer.size() > 0) {
byte[] aad = aadBuffer.toByteArray();
sizeOfAAD = aad.length;
aadBuffer = null;
@@ -365,13 +385,14 @@
* @param out the buffer for the result
* @param outOfs the offset in <code>out</code>
*/
- void encrypt(byte[] in, int inOfs, int len, byte[] out, int outOfs) {
+ int encrypt(byte[] in, int inOfs, int len, byte[] out, int outOfs) {
processAAD();
if (len > 0) {
gctrPAndC.update(in, inOfs, len, out, outOfs);
processed += len;
ghashAllToS.update(out, outOfs, len);
}
+ return len;
}
/**
@@ -387,28 +408,28 @@
* @param outOfs the offset in <code>out</code>
* @return the number of bytes placed into the <code>out</code> buffer
*/
- int encryptFinal(byte[] in, int inOfs, int len, byte[] out, int outOfs)
- throws IllegalBlockSizeException {
- if (out.length - outOfs < (len + tagLenBytes)) {
- throw new RuntimeException("Output buffer too small");
- }
+ int encryptFinal(byte[] in, int inOfs, int len, byte[] out, int outOfs)
+ throws IllegalBlockSizeException, ShortBufferException {
+ if (out.length - outOfs < (len + tagLenBytes)) {
+ throw new ShortBufferException("Output buffer too small");
+ }
- processAAD();
- if (len > 0) {
- //ByteUtil.dumpArray(Arrays.copyOfRange(in, inOfs, inOfs + len));
- doLastBlock(in, inOfs, len, out, outOfs, true);
- }
+ processAAD();
+ if (len > 0) {
+ doLastBlock(in, inOfs, len, out, outOfs, true);
+ }
- byte[] lengthBlock = getLengthBlock(sizeOfAAD*8, processed*8);
- ghashAllToS.update(lengthBlock);
- byte[] s = ghashAllToS.digest();
- byte[] sOut = new byte[s.length];
- GCTR gctrForSToTag = new GCTR(embeddedCipher, this.preCounterBlock);
- gctrForSToTag.doFinal(s, 0, s.length, sOut, 0);
+ byte[] lengthBlock =
+ getLengthBlock(sizeOfAAD*8, processed*8);
+ ghashAllToS.update(lengthBlock);
+ byte[] s = ghashAllToS.digest();
+ byte[] sOut = new byte[s.length];
+ GCTR gctrForSToTag = new GCTR(embeddedCipher, this.preCounterBlock);
+ gctrForSToTag.doFinal(s, 0, s.length, sOut, 0);
- System.arraycopy(sOut, 0, out, (outOfs + len), tagLenBytes);
- return (len + tagLenBytes);
- }
+ System.arraycopy(sOut, 0, out, (outOfs + len), tagLenBytes);
+ return (len + tagLenBytes);
+ }
/**
* Performs decryption operation.
@@ -432,14 +453,16 @@
* @param out the buffer for the result
* @param outOfs the offset in <code>out</code>
*/
- void decrypt(byte[] in, int inOfs, int len, byte[] out, int outOfs) {
+ int decrypt(byte[] in, int inOfs, int len, byte[] out, int outOfs) {
processAAD();
- if (len > 0) { // must be at least AES_BLOCK_SIZE bytes long
- gctrPAndC.update(in, inOfs, len, out, outOfs);
- processed += len;
- ghashAllToS.update(in, inOfs, len);
+ if (len > 0) {
+ // store internally until decryptFinal is called because
+ // spec mentioned that only return recovered data after tag
+ // is successfully verified
+ ibuffer.write(in, inOfs, len);
}
+ return 0;
}
/**
@@ -458,44 +481,62 @@
* @param outOfs the offset in <code>plain</code>
* @return the number of bytes placed into the <code>out</code> buffer
*/
- int decryptFinal(byte[] in, int inOfs, int len,
- byte[] out, int outOfs)
- throws IllegalBlockSizeException, AEADBadTagException {
- if (len < tagLenBytes) {
- throw new RuntimeException("Input buffer too short - need tag");
- }
- if (out.length - outOfs < (len - tagLenBytes)) {
- throw new RuntimeException("Output buffer too small");
- }
- processAAD();
+ int decryptFinal(byte[] in, int inOfs, int len,
+ byte[] out, int outOfs)
+ throws IllegalBlockSizeException, AEADBadTagException,
+ ShortBufferException {
+ if (len < tagLenBytes) {
+ throw new AEADBadTagException("Input too short - need tag");
+ }
+ if (out.length - outOfs < ((ibuffer.size() + len) - tagLenBytes)) {
+ throw new ShortBufferException("Output buffer too small");
+ }
+ processAAD();
+ if (len != 0) {
+ ibuffer.write(in, inOfs, len);
+ }
- int processedOld = processed;
- byte[] tag = new byte[tagLenBytes];
- // get the trailing tag bytes from 'in'
- System.arraycopy(in, inOfs + len - tagLenBytes, tag, 0, tagLenBytes);
- len -= tagLenBytes;
+ // refresh 'in' to all buffered-up bytes
+ in = ibuffer.toByteArray();
+ inOfs = 0;
+ len = in.length;
+ ibuffer.reset();
- if (len > 0) {
- doLastBlock(in, inOfs, len, out, outOfs, false);
- }
+ byte[] tag = new byte[tagLenBytes];
+ // get the trailing tag bytes from 'in'
+ System.arraycopy(in, len - tagLenBytes, tag, 0, tagLenBytes);
+ len -= tagLenBytes;
- byte[] lengthBlock = getLengthBlock(sizeOfAAD*8, processed*8);
- ghashAllToS.update(lengthBlock);
+ if (len > 0) {
+ doLastBlock(in, inOfs, len, out, outOfs, false);
+ }
- byte[] s = ghashAllToS.digest();
- byte[] sOut = new byte[s.length];
- GCTR gctrForSToTag = new GCTR(embeddedCipher, this.preCounterBlock);
- gctrForSToTag.doFinal(s, 0, s.length, sOut, 0);
- for (int i = 0; i < tagLenBytes; i++) {
- if (tag[i] != sOut[i]) {
- throw new AEADBadTagException("Tag mismatch!");
- }
- }
- return len;
- }
+ byte[] lengthBlock =
+ getLengthBlock(sizeOfAAD*8, processed*8);
+ ghashAllToS.update(lengthBlock);
+
+ byte[] s = ghashAllToS.digest();
+ byte[] sOut = new byte[s.length];
+ GCTR gctrForSToTag = new GCTR(embeddedCipher, this.preCounterBlock);
+ gctrForSToTag.doFinal(s, 0, s.length, sOut, 0);
+ for (int i = 0; i < tagLenBytes; i++) {
+ if (tag[i] != sOut[i]) {
+ throw new AEADBadTagException("Tag mismatch!");
+ }
+ }
+ return len;
+ }
// return tag length in bytes
int getTagLen() {
return this.tagLenBytes;
}
+
+ int getBufferedLength() {
+ if (ibuffer == null) {
+ return 0;
+ } else {
+ return ibuffer.size();
+ }
+ }
}
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/OutputFeedback.java b/jdk/src/share/classes/com/sun/crypto/provider/OutputFeedback.java
index f8a3460..ea5890d 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/OutputFeedback.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/OutputFeedback.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -149,9 +149,10 @@
* @param plainLen the length of the input data
* @param cipher the buffer for the result
* @param cipherOffset the offset in <code>cipher</code>
+ * @return the length of the encrypted data
*/
- void encrypt(byte[] plain, int plainOffset, int plainLen,
- byte[] cipher, int cipherOffset)
+ int encrypt(byte[] plain, int plainOffset, int plainLen,
+ byte[] cipher, int cipherOffset)
{
int i;
int len = blockSize - numBytes;
@@ -195,6 +196,7 @@
System.arraycopy(k, 0, register, len, numBytes);
}
}
+ return plainLen;
}
/**
@@ -219,11 +221,12 @@
* @param cipherLen the length of the input data
* @param plain the buffer for the result
* @param plainOffset the offset in <code>plain</code>
+ * @return the length of the decrypted data
*/
- void decrypt(byte[] cipher, int cipherOffset, int cipherLen,
+ int decrypt(byte[] cipher, int cipherOffset, int cipherLen,
byte[] plain, int plainOffset)
{
// OFB encrypt and decrypt are identical
- encrypt(cipher, cipherOffset, cipherLen, plain, plainOffset);
+ return encrypt(cipher, cipherOffset, cipherLen, plain, plainOffset);
}
}
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PCBC.java b/jdk/src/share/classes/com/sun/crypto/provider/PCBC.java
index aa47585..360e183 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/PCBC.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/PCBC.java
@@ -136,8 +136,8 @@
* @param cipher the buffer for the result
* @param cipherOffset the offset in <code>cipher</code>
*/
- void encrypt(byte[] plain, int plainOffset, int plainLen,
- byte[] cipher, int cipherOffset)
+ int encrypt(byte[] plain, int plainOffset, int plainLen,
+ byte[] cipher, int cipherOffset)
{
int i;
int endIndex = plainOffset + plainLen;
@@ -152,6 +152,7 @@
k[i] = (byte)(plain[i+plainOffset] ^ cipher[i+cipherOffset]);
}
}
+ return plainLen;
}
/**
@@ -177,8 +178,8 @@
* @param plain the buffer for the result
* @param plainOffset the offset in <code>plain</code>
*/
- void decrypt(byte[] cipher, int cipherOffset, int cipherLen,
- byte[] plain, int plainOffset)
+ int decrypt(byte[] cipher, int cipherOffset, int cipherLen,
+ byte[] plain, int plainOffset)
{
int i;
int endIndex = cipherOffset + cipherLen;
@@ -194,5 +195,6 @@
k[i] = (byte)(plain[i+plainOffset] ^ cipher[i+cipherOffset]);
}
}
+ return cipherLen;
}
}
diff --git a/jdk/src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java b/jdk/src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java
index f2e33d7..9695087 100644
--- a/jdk/src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java
+++ b/jdk/src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java
@@ -53,7 +53,10 @@
public static void ObjectInit(Object obj)
{
- if ( engaged != 0 ) {
+ if ( engaged != 0) {
+ if (obj == null) {
+ throw new IllegalArgumentException("Null object.");
+ }
nativeObjectInit(Thread.currentThread(), obj);
}
}
@@ -66,7 +69,10 @@
public static void NewArray(Object obj)
{
- if ( engaged != 0 ) {
+ if ( engaged != 0) {
+ if (obj == null) {
+ throw new IllegalArgumentException("Null object.");
+ }
nativeNewArray(Thread.currentThread(), obj);
}
}
@@ -82,6 +88,14 @@
public static void CallSite(int cnum, int mnum)
{
if ( engaged != 0 ) {
+ if (cnum < 0) {
+ throw new IllegalArgumentException("Negative class index");
+ }
+
+ if (mnum < 0) {
+ throw new IllegalArgumentException("Negative method index");
+ }
+
nativeCallSite(Thread.currentThread(), cnum, mnum);
}
}
@@ -95,6 +109,14 @@
public static void ReturnSite(int cnum, int mnum)
{
if ( engaged != 0 ) {
+ if (cnum < 0) {
+ throw new IllegalArgumentException("Negative class index");
+ }
+
+ if (mnum < 0) {
+ throw new IllegalArgumentException("Negative method index");
+ }
+
nativeReturnSite(Thread.currentThread(), cnum, mnum);
}
}
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
index d69200c..0b7a865 100644
--- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
@@ -1165,6 +1165,11 @@
target = imRas;
}
int [] bandSizes = target.getSampleModel().getSampleSize();
+ for (int i = 0; i < bandSizes.length; i++) {
+ if (bandSizes[i] <= 0 || bandSizes[i] > 8) {
+ throw new IIOException("Illegal band size: should be 0 < size <= 8");
+ }
+ }
/*
* If the process is sequential, and we have restart markers,
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
index b856417..d9723e7 100644
--- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
@@ -495,8 +495,8 @@
// handle <= 8-bit samples. We now check the band sizes and throw
// an exception for images, such as USHORT_GRAY, with > 8 bits
// per sample.
- if (bandSizes[i] > 8) {
- throw new IIOException("Sample size must be <= 8");
+ if (bandSizes[i] <= 0 || bandSizes[i] > 8) {
+ throw new IIOException("Illegal band size: should be 0 < size <= 8");
}
// 4450894 part 2: We expand IndexColorModel images to full 24-
// or 32-bit in grabPixels() for each scanline. For indexed
diff --git a/jdk/src/share/classes/com/sun/jdi/AbsentInformationException.java b/jdk/src/share/classes/com/sun/jdi/AbsentInformationException.java
index 93b0a75..31f2f61 100644
--- a/jdk/src/share/classes/com/sun/jdi/AbsentInformationException.java
+++ b/jdk/src/share/classes/com/sun/jdi/AbsentInformationException.java
@@ -31,6 +31,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public class AbsentInformationException extends Exception
{
private static final long serialVersionUID = 4988939309582416373L;
diff --git a/jdk/src/share/classes/com/sun/jdi/Accessible.java b/jdk/src/share/classes/com/sun/jdi/Accessible.java
index 7eb8dbb..4ad4d3b 100644
--- a/jdk/src/share/classes/com/sun/jdi/Accessible.java
+++ b/jdk/src/share/classes/com/sun/jdi/Accessible.java
@@ -36,6 +36,7 @@
* @author James McIlree
* @since 1.3
*/
+@jdk.Exported
public interface Accessible {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/ArrayReference.java b/jdk/src/share/classes/com/sun/jdi/ArrayReference.java
index f450931..87ee957 100644
--- a/jdk/src/share/classes/com/sun/jdi/ArrayReference.java
+++ b/jdk/src/share/classes/com/sun/jdi/ArrayReference.java
@@ -39,6 +39,7 @@
* @author James McIlree
* @since 1.3
*/
+@jdk.Exported
public interface ArrayReference extends ObjectReference {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/ArrayType.java b/jdk/src/share/classes/com/sun/jdi/ArrayType.java
index fb5b2da..fc209fa 100644
--- a/jdk/src/share/classes/com/sun/jdi/ArrayType.java
+++ b/jdk/src/share/classes/com/sun/jdi/ArrayType.java
@@ -38,6 +38,7 @@
* @author James McIlree
* @since 1.3
*/
+@jdk.Exported
public interface ArrayType extends ReferenceType {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/BooleanType.java b/jdk/src/share/classes/com/sun/jdi/BooleanType.java
index ae7bbb9..adbb49e 100644
--- a/jdk/src/share/classes/com/sun/jdi/BooleanType.java
+++ b/jdk/src/share/classes/com/sun/jdi/BooleanType.java
@@ -35,5 +35,6 @@
* @author James McIlree
* @since 1.3
*/
+@jdk.Exported
public interface BooleanType extends PrimitiveType {
}
diff --git a/jdk/src/share/classes/com/sun/jdi/BooleanValue.java b/jdk/src/share/classes/com/sun/jdi/BooleanValue.java
index 02aa89a..d360e80 100644
--- a/jdk/src/share/classes/com/sun/jdi/BooleanValue.java
+++ b/jdk/src/share/classes/com/sun/jdi/BooleanValue.java
@@ -34,8 +34,9 @@
* @author James McIlree
* @since 1.3
*/
-public interface BooleanValue extends PrimitiveValue
-{
+@jdk.Exported
+public interface BooleanValue extends PrimitiveValue {
+
/**
* Returns this BooleanValue as a boolean.
*
diff --git a/jdk/src/share/classes/com/sun/jdi/Bootstrap.java b/jdk/src/share/classes/com/sun/jdi/Bootstrap.java
index e4c0f95..ca449dd 100644
--- a/jdk/src/share/classes/com/sun/jdi/Bootstrap.java
+++ b/jdk/src/share/classes/com/sun/jdi/Bootstrap.java
@@ -34,6 +34,7 @@
* @since 1.3
*/
+@jdk.Exported
public class Bootstrap extends Object {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/ByteType.java b/jdk/src/share/classes/com/sun/jdi/ByteType.java
index be8efa8..87da248 100644
--- a/jdk/src/share/classes/com/sun/jdi/ByteType.java
+++ b/jdk/src/share/classes/com/sun/jdi/ByteType.java
@@ -35,6 +35,6 @@
* @author James McIlree
* @since 1.3
*/
-public interface ByteType extends PrimitiveType
-{
+@jdk.Exported
+public interface ByteType extends PrimitiveType {
}
diff --git a/jdk/src/share/classes/com/sun/jdi/ByteValue.java b/jdk/src/share/classes/com/sun/jdi/ByteValue.java
index 4e4a899..b7fc08b 100644
--- a/jdk/src/share/classes/com/sun/jdi/ByteValue.java
+++ b/jdk/src/share/classes/com/sun/jdi/ByteValue.java
@@ -33,8 +33,9 @@
* @author James McIlree
* @since 1.3
*/
-public interface ByteValue extends PrimitiveValue, Comparable<ByteValue>
-{
+@jdk.Exported
+public interface ByteValue extends PrimitiveValue, Comparable<ByteValue> {
+
/**
* Returns this ByteValue as a <code>byte</code>.
*
diff --git a/jdk/src/share/classes/com/sun/jdi/CharType.java b/jdk/src/share/classes/com/sun/jdi/CharType.java
index 0174c0d..cdcf036 100644
--- a/jdk/src/share/classes/com/sun/jdi/CharType.java
+++ b/jdk/src/share/classes/com/sun/jdi/CharType.java
@@ -35,6 +35,6 @@
* @author James McIlree
* @since 1.3
*/
-public interface CharType extends PrimitiveType
-{
+@jdk.Exported
+public interface CharType extends PrimitiveType {
}
diff --git a/jdk/src/share/classes/com/sun/jdi/CharValue.java b/jdk/src/share/classes/com/sun/jdi/CharValue.java
index 87a9d44..6909fb9 100644
--- a/jdk/src/share/classes/com/sun/jdi/CharValue.java
+++ b/jdk/src/share/classes/com/sun/jdi/CharValue.java
@@ -34,8 +34,9 @@
* @author James McIlree
* @since 1.3
*/
-public interface CharValue extends PrimitiveValue, Comparable<CharValue>
-{
+@jdk.Exported
+public interface CharValue extends PrimitiveValue, Comparable<CharValue> {
+
/**
* Returns this CharValue as a <code>char</code>.
*
diff --git a/jdk/src/share/classes/com/sun/jdi/ClassLoaderReference.java b/jdk/src/share/classes/com/sun/jdi/ClassLoaderReference.java
index 11edb71..8e511d8 100644
--- a/jdk/src/share/classes/com/sun/jdi/ClassLoaderReference.java
+++ b/jdk/src/share/classes/com/sun/jdi/ClassLoaderReference.java
@@ -39,6 +39,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public interface ClassLoaderReference extends ObjectReference {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/ClassNotLoadedException.java b/jdk/src/share/classes/com/sun/jdi/ClassNotLoadedException.java
index 9773276..debc3bd 100644
--- a/jdk/src/share/classes/com/sun/jdi/ClassNotLoadedException.java
+++ b/jdk/src/share/classes/com/sun/jdi/ClassNotLoadedException.java
@@ -67,6 +67,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public class ClassNotLoadedException extends Exception
{
private static final long serialVersionUID = -6242978768444298722L;
diff --git a/jdk/src/share/classes/com/sun/jdi/ClassNotPreparedException.java b/jdk/src/share/classes/com/sun/jdi/ClassNotPreparedException.java
index 538bc82..a26f93d 100644
--- a/jdk/src/share/classes/com/sun/jdi/ClassNotPreparedException.java
+++ b/jdk/src/share/classes/com/sun/jdi/ClassNotPreparedException.java
@@ -32,6 +32,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public class ClassNotPreparedException extends RuntimeException {
private static final long serialVersionUID = -6120698967144079642L;
public ClassNotPreparedException()
diff --git a/jdk/src/share/classes/com/sun/jdi/ClassObjectReference.java b/jdk/src/share/classes/com/sun/jdi/ClassObjectReference.java
index f6fa386..d008379 100644
--- a/jdk/src/share/classes/com/sun/jdi/ClassObjectReference.java
+++ b/jdk/src/share/classes/com/sun/jdi/ClassObjectReference.java
@@ -35,6 +35,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public interface ClassObjectReference extends ObjectReference {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/ClassType.java b/jdk/src/share/classes/com/sun/jdi/ClassType.java
index 73e94f1..7372024 100644
--- a/jdk/src/share/classes/com/sun/jdi/ClassType.java
+++ b/jdk/src/share/classes/com/sun/jdi/ClassType.java
@@ -41,6 +41,7 @@
* @author James McIlree
* @since 1.3
*/
+@jdk.Exported
public interface ClassType extends ReferenceType {
/**
* Gets the superclass of this class.
diff --git a/jdk/src/share/classes/com/sun/jdi/DoubleType.java b/jdk/src/share/classes/com/sun/jdi/DoubleType.java
index a585f45..7898aa4 100644
--- a/jdk/src/share/classes/com/sun/jdi/DoubleType.java
+++ b/jdk/src/share/classes/com/sun/jdi/DoubleType.java
@@ -35,6 +35,6 @@
* @author James McIlree
* @since 1.3
*/
-public interface DoubleType extends PrimitiveType
-{
+@jdk.Exported
+public interface DoubleType extends PrimitiveType {
}
diff --git a/jdk/src/share/classes/com/sun/jdi/DoubleValue.java b/jdk/src/share/classes/com/sun/jdi/DoubleValue.java
index fccff0d..529e233 100644
--- a/jdk/src/share/classes/com/sun/jdi/DoubleValue.java
+++ b/jdk/src/share/classes/com/sun/jdi/DoubleValue.java
@@ -34,8 +34,9 @@
* @author James McIlree
* @since 1.3
*/
-public interface DoubleValue extends PrimitiveValue, Comparable<DoubleValue>
-{
+@jdk.Exported
+public interface DoubleValue extends PrimitiveValue, Comparable<DoubleValue> {
+
/**
* Returns this DoubleValue as a <code>double</code>.
*
diff --git a/jdk/src/share/classes/com/sun/jdi/Field.java b/jdk/src/share/classes/com/sun/jdi/Field.java
index fea18a9..5e5dff2 100644
--- a/jdk/src/share/classes/com/sun/jdi/Field.java
+++ b/jdk/src/share/classes/com/sun/jdi/Field.java
@@ -38,6 +38,7 @@
* @author James McIlree
* @since 1.3
*/
+@jdk.Exported
public interface Field extends TypeComponent, Comparable<Field> {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/FloatType.java b/jdk/src/share/classes/com/sun/jdi/FloatType.java
index c0de125..e0d3d48 100644
--- a/jdk/src/share/classes/com/sun/jdi/FloatType.java
+++ b/jdk/src/share/classes/com/sun/jdi/FloatType.java
@@ -35,6 +35,6 @@
* @author James McIlree
* @since 1.3
*/
-public interface FloatType extends PrimitiveType
-{
+@jdk.Exported
+public interface FloatType extends PrimitiveType {
}
diff --git a/jdk/src/share/classes/com/sun/jdi/FloatValue.java b/jdk/src/share/classes/com/sun/jdi/FloatValue.java
index 07937d2..273451b 100644
--- a/jdk/src/share/classes/com/sun/jdi/FloatValue.java
+++ b/jdk/src/share/classes/com/sun/jdi/FloatValue.java
@@ -34,8 +34,9 @@
* @author James McIlree
* @since 1.3
*/
-public interface FloatValue extends PrimitiveValue, Comparable<FloatValue>
-{
+@jdk.Exported
+public interface FloatValue extends PrimitiveValue, Comparable<FloatValue> {
+
/**
* Returns this FloatValue as a float.
*
diff --git a/jdk/src/share/classes/com/sun/jdi/IncompatibleThreadStateException.java b/jdk/src/share/classes/com/sun/jdi/IncompatibleThreadStateException.java
index 01b7c71..ccb5c99 100644
--- a/jdk/src/share/classes/com/sun/jdi/IncompatibleThreadStateException.java
+++ b/jdk/src/share/classes/com/sun/jdi/IncompatibleThreadStateException.java
@@ -32,16 +32,15 @@
* @author Gordon Hirsch
* @since 1.3
*/
-public class IncompatibleThreadStateException extends Exception
-{
+@jdk.Exported
+public class IncompatibleThreadStateException extends Exception {
private static final long serialVersionUID = 6199174323414551389L;
- public IncompatibleThreadStateException()
- {
+
+ public IncompatibleThreadStateException() {
super();
}
- public IncompatibleThreadStateException(String s)
- {
+ public IncompatibleThreadStateException(String s) {
super(s);
}
}
diff --git a/jdk/src/share/classes/com/sun/jdi/InconsistentDebugInfoException.java b/jdk/src/share/classes/com/sun/jdi/InconsistentDebugInfoException.java
index a7caff8..deaa41e 100644
--- a/jdk/src/share/classes/com/sun/jdi/InconsistentDebugInfoException.java
+++ b/jdk/src/share/classes/com/sun/jdi/InconsistentDebugInfoException.java
@@ -34,6 +34,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public class InconsistentDebugInfoException extends RuntimeException {
private static final long serialVersionUID = 7964236415376861808L;
public InconsistentDebugInfoException() {
diff --git a/jdk/src/share/classes/com/sun/jdi/IntegerType.java b/jdk/src/share/classes/com/sun/jdi/IntegerType.java
index 03601a5..8142ed4 100644
--- a/jdk/src/share/classes/com/sun/jdi/IntegerType.java
+++ b/jdk/src/share/classes/com/sun/jdi/IntegerType.java
@@ -35,6 +35,6 @@
* @author James McIlree
* @since 1.3
*/
-public interface IntegerType extends PrimitiveType
-{
+@jdk.Exported
+public interface IntegerType extends PrimitiveType {
}
diff --git a/jdk/src/share/classes/com/sun/jdi/IntegerValue.java b/jdk/src/share/classes/com/sun/jdi/IntegerValue.java
index 89b7def..4cdd352 100644
--- a/jdk/src/share/classes/com/sun/jdi/IntegerValue.java
+++ b/jdk/src/share/classes/com/sun/jdi/IntegerValue.java
@@ -34,8 +34,9 @@
* @author James McIlree
* @since 1.3
*/
-public interface IntegerValue extends PrimitiveValue, Comparable<IntegerValue>
-{
+@jdk.Exported
+public interface IntegerValue extends PrimitiveValue, Comparable<IntegerValue> {
+
/**
* Returns this IntegerValue as an int.
*
diff --git a/jdk/src/share/classes/com/sun/jdi/InterfaceType.java b/jdk/src/share/classes/com/sun/jdi/InterfaceType.java
index 94a26e0..e2c28ec 100644
--- a/jdk/src/share/classes/com/sun/jdi/InterfaceType.java
+++ b/jdk/src/share/classes/com/sun/jdi/InterfaceType.java
@@ -43,6 +43,7 @@
* @author James McIlree
* @since 1.3
*/
+@jdk.Exported
public interface InterfaceType extends ReferenceType {
/**
* Gets the interfaces directly extended by this interface.
diff --git a/jdk/src/share/classes/com/sun/jdi/InternalException.java b/jdk/src/share/classes/com/sun/jdi/InternalException.java
index 668a4bc..706bc65 100644
--- a/jdk/src/share/classes/com/sun/jdi/InternalException.java
+++ b/jdk/src/share/classes/com/sun/jdi/InternalException.java
@@ -32,6 +32,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public class InternalException extends RuntimeException {
private static final long serialVersionUID = -9171606393104480607L;
private int errorCode;
diff --git a/jdk/src/share/classes/com/sun/jdi/InvalidCodeIndexException.java b/jdk/src/share/classes/com/sun/jdi/InvalidCodeIndexException.java
index 357f6c5..bae0b07 100644
--- a/jdk/src/share/classes/com/sun/jdi/InvalidCodeIndexException.java
+++ b/jdk/src/share/classes/com/sun/jdi/InvalidCodeIndexException.java
@@ -34,6 +34,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
@Deprecated
public class InvalidCodeIndexException extends RuntimeException {
private static final long serialVersionUID = 7416010225133747805L;
diff --git a/jdk/src/share/classes/com/sun/jdi/InvalidLineNumberException.java b/jdk/src/share/classes/com/sun/jdi/InvalidLineNumberException.java
index acf530c..38a0980 100644
--- a/jdk/src/share/classes/com/sun/jdi/InvalidLineNumberException.java
+++ b/jdk/src/share/classes/com/sun/jdi/InvalidLineNumberException.java
@@ -34,6 +34,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
@Deprecated
public class InvalidLineNumberException extends RuntimeException {
private static final long serialVersionUID = 4048709912372692875L;
diff --git a/jdk/src/share/classes/com/sun/jdi/InvalidStackFrameException.java b/jdk/src/share/classes/com/sun/jdi/InvalidStackFrameException.java
index 8bcca8e..696d21d 100644
--- a/jdk/src/share/classes/com/sun/jdi/InvalidStackFrameException.java
+++ b/jdk/src/share/classes/com/sun/jdi/InvalidStackFrameException.java
@@ -32,6 +32,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public class InvalidStackFrameException extends RuntimeException {
private static final long serialVersionUID = -1919378296505827922L;
public InvalidStackFrameException() {
diff --git a/jdk/src/share/classes/com/sun/jdi/InvalidTypeException.java b/jdk/src/share/classes/com/sun/jdi/InvalidTypeException.java
index 20d0f48..9671dfd 100644
--- a/jdk/src/share/classes/com/sun/jdi/InvalidTypeException.java
+++ b/jdk/src/share/classes/com/sun/jdi/InvalidTypeException.java
@@ -32,16 +32,15 @@
* @author James McIlree
* @since 1.3
*/
-public class InvalidTypeException extends Exception
-{
+@jdk.Exported
+public class InvalidTypeException extends Exception {
private static final long serialVersionUID = 2256667231949650806L;
- public InvalidTypeException()
- {
+
+ public InvalidTypeException() {
super();
}
- public InvalidTypeException(String s)
- {
+ public InvalidTypeException(String s) {
super(s);
}
}
diff --git a/jdk/src/share/classes/com/sun/jdi/InvocationException.java b/jdk/src/share/classes/com/sun/jdi/InvocationException.java
index 565a74d..89e8763 100644
--- a/jdk/src/share/classes/com/sun/jdi/InvocationException.java
+++ b/jdk/src/share/classes/com/sun/jdi/InvocationException.java
@@ -32,19 +32,17 @@
* @author Gordon Hirsch
* @since 1.3
*/
-public class InvocationException extends Exception
-{
+@jdk.Exported
+public class InvocationException extends Exception {
private static final long serialVersionUID = 6066780907971918568L;
ObjectReference exception;
- public InvocationException(ObjectReference exception)
- {
+ public InvocationException(ObjectReference exception) {
super("Exception occurred in target VM");
this.exception = exception;
}
- public ObjectReference exception()
- {
+ public ObjectReference exception() {
return exception;
}
}
diff --git a/jdk/src/share/classes/com/sun/jdi/JDIPermission.java b/jdk/src/share/classes/com/sun/jdi/JDIPermission.java
index cb69adf..ddcb8f7 100644
--- a/jdk/src/share/classes/com/sun/jdi/JDIPermission.java
+++ b/jdk/src/share/classes/com/sun/jdi/JDIPermission.java
@@ -78,6 +78,7 @@
*
*/
+@jdk.Exported
public final class JDIPermission extends java.security.BasicPermission {
private static final long serialVersionUID = -6988461416938786271L;
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/LocalVariable.java b/jdk/src/share/classes/com/sun/jdi/LocalVariable.java
index dc74f91..60fe24a 100644
--- a/jdk/src/share/classes/com/sun/jdi/LocalVariable.java
+++ b/jdk/src/share/classes/com/sun/jdi/LocalVariable.java
@@ -42,6 +42,7 @@
* @since 1.3
*/
+@jdk.Exported
public interface LocalVariable extends Mirror, Comparable<LocalVariable> {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/Locatable.java b/jdk/src/share/classes/com/sun/jdi/Locatable.java
index a00badf..4cb0ea7 100644
--- a/jdk/src/share/classes/com/sun/jdi/Locatable.java
+++ b/jdk/src/share/classes/com/sun/jdi/Locatable.java
@@ -33,6 +33,7 @@
* @author James McIlree
* @since 1.3
*/
+@jdk.Exported
public interface Locatable {
/**
* Returns the {@link Location} of this mirror, if there
diff --git a/jdk/src/share/classes/com/sun/jdi/Location.java b/jdk/src/share/classes/com/sun/jdi/Location.java
index a244728..e3fd4c1 100644
--- a/jdk/src/share/classes/com/sun/jdi/Location.java
+++ b/jdk/src/share/classes/com/sun/jdi/Location.java
@@ -86,6 +86,7 @@
* @author James McIlree
* @since 1.3
*/
+@jdk.Exported
public interface Location extends Mirror, Comparable<Location> {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/LongType.java b/jdk/src/share/classes/com/sun/jdi/LongType.java
index b27c5d3..126317c 100644
--- a/jdk/src/share/classes/com/sun/jdi/LongType.java
+++ b/jdk/src/share/classes/com/sun/jdi/LongType.java
@@ -35,6 +35,6 @@
* @author James McIlree
* @since 1.3
*/
-public interface LongType extends PrimitiveType
-{
+@jdk.Exported
+public interface LongType extends PrimitiveType {
}
diff --git a/jdk/src/share/classes/com/sun/jdi/LongValue.java b/jdk/src/share/classes/com/sun/jdi/LongValue.java
index 1dfd41f..1ccd37d 100644
--- a/jdk/src/share/classes/com/sun/jdi/LongValue.java
+++ b/jdk/src/share/classes/com/sun/jdi/LongValue.java
@@ -34,8 +34,9 @@
* @author James McIlree
* @since 1.3
*/
-public interface LongValue extends PrimitiveValue, Comparable<LongValue>
-{
+@jdk.Exported
+public interface LongValue extends PrimitiveValue, Comparable<LongValue> {
+
/**
* Returns this LongValue as a long.
*
diff --git a/jdk/src/share/classes/com/sun/jdi/Method.java b/jdk/src/share/classes/com/sun/jdi/Method.java
index 2d41b47..396381f 100644
--- a/jdk/src/share/classes/com/sun/jdi/Method.java
+++ b/jdk/src/share/classes/com/sun/jdi/Method.java
@@ -39,6 +39,7 @@
* @author James McIlree
* @since 1.3
*/
+@jdk.Exported
public interface Method extends TypeComponent, Locatable, Comparable<Method> {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/Mirror.java b/jdk/src/share/classes/com/sun/jdi/Mirror.java
index d821c4f..9660ebd 100644
--- a/jdk/src/share/classes/com/sun/jdi/Mirror.java
+++ b/jdk/src/share/classes/com/sun/jdi/Mirror.java
@@ -56,6 +56,7 @@
* @author James McIlree
* @since 1.3
*/
+@jdk.Exported
public interface Mirror {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/MonitorInfo.java b/jdk/src/share/classes/com/sun/jdi/MonitorInfo.java
index fb6557c..a35cc40 100644
--- a/jdk/src/share/classes/com/sun/jdi/MonitorInfo.java
+++ b/jdk/src/share/classes/com/sun/jdi/MonitorInfo.java
@@ -32,6 +32,7 @@
* @since 1.6
*/
+@jdk.Exported
public interface MonitorInfo extends Mirror {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/NativeMethodException.java b/jdk/src/share/classes/com/sun/jdi/NativeMethodException.java
index 311fd1f..2db8460 100644
--- a/jdk/src/share/classes/com/sun/jdi/NativeMethodException.java
+++ b/jdk/src/share/classes/com/sun/jdi/NativeMethodException.java
@@ -32,6 +32,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public class NativeMethodException extends RuntimeException {
private static final long serialVersionUID = 3924951669039469992L;
diff --git a/jdk/src/share/classes/com/sun/jdi/ObjectCollectedException.java b/jdk/src/share/classes/com/sun/jdi/ObjectCollectedException.java
index 720690d..29da6d9 100644
--- a/jdk/src/share/classes/com/sun/jdi/ObjectCollectedException.java
+++ b/jdk/src/share/classes/com/sun/jdi/ObjectCollectedException.java
@@ -32,6 +32,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public class ObjectCollectedException extends RuntimeException {
private static final long serialVersionUID = -1928428056197269588L;
public ObjectCollectedException() {
diff --git a/jdk/src/share/classes/com/sun/jdi/ObjectReference.java b/jdk/src/share/classes/com/sun/jdi/ObjectReference.java
index 66e8acf..18710cb 100644
--- a/jdk/src/share/classes/com/sun/jdi/ObjectReference.java
+++ b/jdk/src/share/classes/com/sun/jdi/ObjectReference.java
@@ -55,8 +55,9 @@
* @author James McIlree
* @since 1.3
*/
-public interface ObjectReference extends Value
-{
+@jdk.Exported
+public interface ObjectReference extends Value {
+
/**
* Gets the {@link ReferenceType} that mirrors the type
* of this object. The type may be a subclass or implementor of the
diff --git a/jdk/src/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java b/jdk/src/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java
index 8c4aae7..e2c9ae7 100644
--- a/jdk/src/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java
+++ b/jdk/src/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java
@@ -33,6 +33,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public interface PathSearchingVirtualMachine extends VirtualMachine {
/**
* Get the class path for this virtual machine.
diff --git a/jdk/src/share/classes/com/sun/jdi/PrimitiveType.java b/jdk/src/share/classes/com/sun/jdi/PrimitiveType.java
index ba34a50..3805d6a 100644
--- a/jdk/src/share/classes/com/sun/jdi/PrimitiveType.java
+++ b/jdk/src/share/classes/com/sun/jdi/PrimitiveType.java
@@ -37,5 +37,6 @@
* @author James McIlree
* @since 1.3
*/
+@jdk.Exported
public interface PrimitiveType extends Type {
}
diff --git a/jdk/src/share/classes/com/sun/jdi/PrimitiveValue.java b/jdk/src/share/classes/com/sun/jdi/PrimitiveValue.java
index 0d9442a..6af5a33 100644
--- a/jdk/src/share/classes/com/sun/jdi/PrimitiveValue.java
+++ b/jdk/src/share/classes/com/sun/jdi/PrimitiveValue.java
@@ -35,8 +35,9 @@
* @author James McIlree
* @since 1.3
*/
-public interface PrimitiveValue extends Value
-{
+@jdk.Exported
+public interface PrimitiveValue extends Value {
+
/**
* Converts this value to a BooleanValue and returns the result
* as a boolean.
diff --git a/jdk/src/share/classes/com/sun/jdi/ReferenceType.java b/jdk/src/share/classes/com/sun/jdi/ReferenceType.java
index 864e368..96973bc 100644
--- a/jdk/src/share/classes/com/sun/jdi/ReferenceType.java
+++ b/jdk/src/share/classes/com/sun/jdi/ReferenceType.java
@@ -77,6 +77,7 @@
* @author James McIlree
* @since 1.3
*/
+@jdk.Exported
public interface ReferenceType
extends Type, Comparable<ReferenceType>, Accessible
{
diff --git a/jdk/src/share/classes/com/sun/jdi/ShortType.java b/jdk/src/share/classes/com/sun/jdi/ShortType.java
index c7b9e8b..87542a1 100644
--- a/jdk/src/share/classes/com/sun/jdi/ShortType.java
+++ b/jdk/src/share/classes/com/sun/jdi/ShortType.java
@@ -35,5 +35,6 @@
* @author James McIlree
* @since 1.3
*/
+@jdk.Exported
public interface ShortType extends PrimitiveType {
}
diff --git a/jdk/src/share/classes/com/sun/jdi/ShortValue.java b/jdk/src/share/classes/com/sun/jdi/ShortValue.java
index 771ef56..c7011c3 100644
--- a/jdk/src/share/classes/com/sun/jdi/ShortValue.java
+++ b/jdk/src/share/classes/com/sun/jdi/ShortValue.java
@@ -34,8 +34,9 @@
* @author James McIlree
* @since 1.3
*/
-public interface ShortValue extends PrimitiveValue, Comparable<ShortValue>
-{
+@jdk.Exported
+public interface ShortValue extends PrimitiveValue, Comparable<ShortValue> {
+
/**
* Returns this ShortValue as a short.
*
diff --git a/jdk/src/share/classes/com/sun/jdi/StackFrame.java b/jdk/src/share/classes/com/sun/jdi/StackFrame.java
index 40c0302..dc78485 100644
--- a/jdk/src/share/classes/com/sun/jdi/StackFrame.java
+++ b/jdk/src/share/classes/com/sun/jdi/StackFrame.java
@@ -58,8 +58,9 @@
* @author James McIlree
* @since 1.3
*/
-public interface StackFrame extends Mirror, Locatable
-{
+@jdk.Exported
+public interface StackFrame extends Mirror, Locatable {
+
/**
* Returns the {@link Location} of the current instruction in the frame.
* The method for which this frame was created can also be accessed
diff --git a/jdk/src/share/classes/com/sun/jdi/StringReference.java b/jdk/src/share/classes/com/sun/jdi/StringReference.java
index a149768..e32b442 100644
--- a/jdk/src/share/classes/com/sun/jdi/StringReference.java
+++ b/jdk/src/share/classes/com/sun/jdi/StringReference.java
@@ -35,8 +35,8 @@
* @author James McIlree
* @since 1.3
*/
-public interface StringReference extends ObjectReference
-{
+@jdk.Exported
+public interface StringReference extends ObjectReference {
/**
* Returns the StringReference as a String. The returned string
* is the equivalent of the mirrored string, but is an entity in the
diff --git a/jdk/src/share/classes/com/sun/jdi/ThreadGroupReference.java b/jdk/src/share/classes/com/sun/jdi/ThreadGroupReference.java
index 8bf631d..ca13fc3 100644
--- a/jdk/src/share/classes/com/sun/jdi/ThreadGroupReference.java
+++ b/jdk/src/share/classes/com/sun/jdi/ThreadGroupReference.java
@@ -37,8 +37,9 @@
* @author James McIlree
* @since 1.3
*/
-public interface ThreadGroupReference extends ObjectReference
-{
+@jdk.Exported
+public interface ThreadGroupReference extends ObjectReference {
+
/**
* Returns the name of this thread group.
*
diff --git a/jdk/src/share/classes/com/sun/jdi/ThreadReference.java b/jdk/src/share/classes/com/sun/jdi/ThreadReference.java
index 235ab29..a082ddf 100644
--- a/jdk/src/share/classes/com/sun/jdi/ThreadReference.java
+++ b/jdk/src/share/classes/com/sun/jdi/ThreadReference.java
@@ -36,8 +36,8 @@
* @author James McIlree
* @since 1.3
*/
-public interface ThreadReference extends ObjectReference
-{
+@jdk.Exported
+public interface ThreadReference extends ObjectReference {
/** Thread status is unknown */
public final int THREAD_STATUS_UNKNOWN =-1;
/** Thread has completed execution */
diff --git a/jdk/src/share/classes/com/sun/jdi/Type.java b/jdk/src/share/classes/com/sun/jdi/Type.java
index 3f216e5..fdcccd4 100644
--- a/jdk/src/share/classes/com/sun/jdi/Type.java
+++ b/jdk/src/share/classes/com/sun/jdi/Type.java
@@ -127,8 +127,9 @@
* @author James McIlree
* @since 1.3
*/
-public interface Type extends Mirror
-{
+@jdk.Exported
+public interface Type extends Mirror {
+
/**
* Returns the JNI-style signature for this type.
* <p>
diff --git a/jdk/src/share/classes/com/sun/jdi/TypeComponent.java b/jdk/src/share/classes/com/sun/jdi/TypeComponent.java
index 5f2a192..5354a67 100644
--- a/jdk/src/share/classes/com/sun/jdi/TypeComponent.java
+++ b/jdk/src/share/classes/com/sun/jdi/TypeComponent.java
@@ -44,6 +44,7 @@
* @author James McIlree
* @since 1.3
*/
+@jdk.Exported
public interface TypeComponent extends Mirror, Accessible {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/VMCannotBeModifiedException.java b/jdk/src/share/classes/com/sun/jdi/VMCannotBeModifiedException.java
index 36e424b..b5f354a 100644
--- a/jdk/src/share/classes/com/sun/jdi/VMCannotBeModifiedException.java
+++ b/jdk/src/share/classes/com/sun/jdi/VMCannotBeModifiedException.java
@@ -32,6 +32,7 @@
* @author Jim Holmlund
* @since 1.5
*/
+@jdk.Exported
public class VMCannotBeModifiedException extends UnsupportedOperationException {
private static final long serialVersionUID = -4063879815130164009L;
public VMCannotBeModifiedException() {
diff --git a/jdk/src/share/classes/com/sun/jdi/VMDisconnectedException.java b/jdk/src/share/classes/com/sun/jdi/VMDisconnectedException.java
index bf78d85..888308c 100644
--- a/jdk/src/share/classes/com/sun/jdi/VMDisconnectedException.java
+++ b/jdk/src/share/classes/com/sun/jdi/VMDisconnectedException.java
@@ -33,6 +33,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public class VMDisconnectedException extends RuntimeException {
private static final long serialVersionUID = 2892975269768351637L;
diff --git a/jdk/src/share/classes/com/sun/jdi/VMMismatchException.java b/jdk/src/share/classes/com/sun/jdi/VMMismatchException.java
index c4e19ac..90c0232 100644
--- a/jdk/src/share/classes/com/sun/jdi/VMMismatchException.java
+++ b/jdk/src/share/classes/com/sun/jdi/VMMismatchException.java
@@ -33,6 +33,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public class VMMismatchException extends RuntimeException {
private static final long serialVersionUID = 289169358790459564L;
public VMMismatchException() {
diff --git a/jdk/src/share/classes/com/sun/jdi/VMOutOfMemoryException.java b/jdk/src/share/classes/com/sun/jdi/VMOutOfMemoryException.java
index 1848d22..afb8235 100644
--- a/jdk/src/share/classes/com/sun/jdi/VMOutOfMemoryException.java
+++ b/jdk/src/share/classes/com/sun/jdi/VMOutOfMemoryException.java
@@ -32,6 +32,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public class VMOutOfMemoryException extends RuntimeException {
private static final long serialVersionUID = 71504228548910686L;
public VMOutOfMemoryException() {
diff --git a/jdk/src/share/classes/com/sun/jdi/Value.java b/jdk/src/share/classes/com/sun/jdi/Value.java
index 316f4b8..582f439 100644
--- a/jdk/src/share/classes/com/sun/jdi/Value.java
+++ b/jdk/src/share/classes/com/sun/jdi/Value.java
@@ -168,8 +168,8 @@
* @since 1.3
*/
-public interface Value extends Mirror
-{
+@jdk.Exported
+public interface Value extends Mirror {
/**
* Returns the run-time type of this value.
*
diff --git a/jdk/src/share/classes/com/sun/jdi/VirtualMachine.java b/jdk/src/share/classes/com/sun/jdi/VirtualMachine.java
index 38faf90..096465a 100644
--- a/jdk/src/share/classes/com/sun/jdi/VirtualMachine.java
+++ b/jdk/src/share/classes/com/sun/jdi/VirtualMachine.java
@@ -70,6 +70,7 @@
* @author James McIlree
* @since 1.3
*/
+@jdk.Exported
public interface VirtualMachine extends Mirror {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/VirtualMachineManager.java b/jdk/src/share/classes/com/sun/jdi/VirtualMachineManager.java
index 5af1776..a388086 100644
--- a/jdk/src/share/classes/com/sun/jdi/VirtualMachineManager.java
+++ b/jdk/src/share/classes/com/sun/jdi/VirtualMachineManager.java
@@ -271,6 +271,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public interface VirtualMachineManager {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/VoidType.java b/jdk/src/share/classes/com/sun/jdi/VoidType.java
index 4a976e8..85671b4 100644
--- a/jdk/src/share/classes/com/sun/jdi/VoidType.java
+++ b/jdk/src/share/classes/com/sun/jdi/VoidType.java
@@ -35,5 +35,6 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface VoidType extends Type {
}
diff --git a/jdk/src/share/classes/com/sun/jdi/VoidValue.java b/jdk/src/share/classes/com/sun/jdi/VoidValue.java
index 8a8a79e..74fee8d 100644
--- a/jdk/src/share/classes/com/sun/jdi/VoidValue.java
+++ b/jdk/src/share/classes/com/sun/jdi/VoidValue.java
@@ -32,6 +32,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface VoidValue extends Value {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/AttachingConnector.java b/jdk/src/share/classes/com/sun/jdi/connect/AttachingConnector.java
index 8b84613..9343795 100644
--- a/jdk/src/share/classes/com/sun/jdi/connect/AttachingConnector.java
+++ b/jdk/src/share/classes/com/sun/jdi/connect/AttachingConnector.java
@@ -35,6 +35,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public interface AttachingConnector extends Connector {
/**
* Attaches to a running application and and returns a
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/Connector.java b/jdk/src/share/classes/com/sun/jdi/connect/Connector.java
index e817c44..f6bd8060 100644
--- a/jdk/src/share/classes/com/sun/jdi/connect/Connector.java
+++ b/jdk/src/share/classes/com/sun/jdi/connect/Connector.java
@@ -45,6 +45,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public interface Connector {
/**
* Returns a short identifier for the connector. Connector implementors
@@ -91,6 +92,7 @@
* {@link Connector.IntegerArgument},
* or {@link Connector.SelectedArgument}.
*/
+ @jdk.Exported
public interface Argument extends Serializable {
/**
* Returns a short, unique identifier for the argument.
@@ -156,6 +158,7 @@
* whose value is Boolean. Boolean values are represented
* by the localized versions of the strings "true" and "false".
*/
+ @jdk.Exported
public interface BooleanArgument extends Argument {
/**
* Sets the value of the argument.
@@ -196,6 +199,7 @@
* whose value is an integer. Integer values are represented
* by their corresponding strings.
*/
+ @jdk.Exported
public interface IntegerArgument extends Argument {
/**
* Sets the value of the argument.
@@ -257,6 +261,7 @@
* Specification for and value of a Connector argument,
* whose value is a String.
*/
+ @jdk.Exported
public interface StringArgument extends Argument {
/**
* Performs basic sanity check of argument.
@@ -269,6 +274,7 @@
* Specification for and value of a Connector argument,
* whose value is a String selected from a list of choices.
*/
+ @jdk.Exported
public interface SelectedArgument extends Argument {
/**
* Return the possible values for the argument
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java b/jdk/src/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java
index fd45b15..27c4974 100644
--- a/jdk/src/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java
+++ b/jdk/src/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java
@@ -36,8 +36,9 @@
* @author Gordon Hirsch
* @since 1.3
*/
-public class IllegalConnectorArgumentsException extends Exception
-{
+@jdk.Exported
+public class IllegalConnectorArgumentsException extends Exception {
+
private static final long serialVersionUID = -3042212603611350941L;
List<String> names;
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/LaunchingConnector.java b/jdk/src/share/classes/com/sun/jdi/connect/LaunchingConnector.java
index 206c8aa..dc636ed 100644
--- a/jdk/src/share/classes/com/sun/jdi/connect/LaunchingConnector.java
+++ b/jdk/src/share/classes/com/sun/jdi/connect/LaunchingConnector.java
@@ -35,6 +35,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public interface LaunchingConnector extends Connector {
/**
* Launches an application and connects to its VM. Properties
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/ListeningConnector.java b/jdk/src/share/classes/com/sun/jdi/connect/ListeningConnector.java
index b588875..b6e4f0a 100644
--- a/jdk/src/share/classes/com/sun/jdi/connect/ListeningConnector.java
+++ b/jdk/src/share/classes/com/sun/jdi/connect/ListeningConnector.java
@@ -35,6 +35,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public interface ListeningConnector extends Connector {
/**
* Indicates whether this listening connector supports multiple
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/Transport.java b/jdk/src/share/classes/com/sun/jdi/connect/Transport.java
index 266bd80..b271a96 100644
--- a/jdk/src/share/classes/com/sun/jdi/connect/Transport.java
+++ b/jdk/src/share/classes/com/sun/jdi/connect/Transport.java
@@ -42,6 +42,7 @@
* @author Gordon Hirsch
* @since 1.3
*/
+@jdk.Exported
public interface Transport {
/**
* Returns a short identifier for the transport.
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/TransportTimeoutException.java b/jdk/src/share/classes/com/sun/jdi/connect/TransportTimeoutException.java
index fcfc48c..9ea50ee 100644
--- a/jdk/src/share/classes/com/sun/jdi/connect/TransportTimeoutException.java
+++ b/jdk/src/share/classes/com/sun/jdi/connect/TransportTimeoutException.java
@@ -54,6 +54,7 @@
*
* @since 1.5
*/
+@jdk.Exported
public class TransportTimeoutException extends java.io.IOException {
private static final long serialVersionUID = 4107035242623365074L;
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/VMStartException.java b/jdk/src/share/classes/com/sun/jdi/connect/VMStartException.java
index 111d48b..0163347 100644
--- a/jdk/src/share/classes/com/sun/jdi/connect/VMStartException.java
+++ b/jdk/src/share/classes/com/sun/jdi/connect/VMStartException.java
@@ -34,8 +34,9 @@
* @author Gordon Hirsch
* @since 1.3
*/
-public class VMStartException extends Exception
-{
+@jdk.Exported
+public class VMStartException extends Exception {
+
private static final long serialVersionUID = 6408644824640801020L;
Process process;
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/package-info.java b/jdk/src/share/classes/com/sun/jdi/connect/package-info.java
new file mode 100644
index 0000000..c444b75
--- /dev/null
+++ b/jdk/src/share/classes/com/sun/jdi/connect/package-info.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 1998, 2013, 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 package defines connections between the virtual machine
+ * using the JDI and the target virtual machine.
+ * In concert with {@link com.sun.jdi.VirtualMachineManager}
+ * it is the mechanism for launching, attaching, etc to
+ * target virtual machines.
+ * <p>
+ * Methods may be added to the interfaces in the JDI packages in future
+ * releases. Existing packages may be renamed if the JDI becomes a standard
+ * extension.
+ */
+
+@jdk.Exported
+package com.sun.jdi.connect;
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/package.html b/jdk/src/share/classes/com/sun/jdi/connect/package.html
deleted file mode 100644
index 7484ce2..0000000
--- a/jdk/src/share/classes/com/sun/jdi/connect/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<html>
-<head>
-<title>com.sun.jdi.connect description</title>
-<!--
-
-Copyright (c) 1998, 1999, 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.
--->
-</head>
-<body bgcolor="white">
-
-This package defines
-connections between the virtual machine
-using the JDI and the target virtual machine.
-In concert with {@link com.sun.jdi.VirtualMachineManager}
-it is the mechanism for launching, attaching, etc to
-target virtual machines.
-<p>
-Methods may be added to the interfaces in the JDI packages in future
-releases. Existing packages may be renamed if the JDI becomes a standard
-extension.
- </body>
-</html>
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java b/jdk/src/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java
index 6c172af..bd0a8c4 100644
--- a/jdk/src/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java
+++ b/jdk/src/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java
@@ -45,6 +45,7 @@
*
* @since 1.5
*/
+@jdk.Exported
public class ClosedConnectionException extends java.io.IOException {
private static final long serialVersionUID = 3877032124297204774L;
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/spi/Connection.java b/jdk/src/share/classes/com/sun/jdi/connect/spi/Connection.java
index 6d87949..d4b1721 100644
--- a/jdk/src/share/classes/com/sun/jdi/connect/spi/Connection.java
+++ b/jdk/src/share/classes/com/sun/jdi/connect/spi/Connection.java
@@ -56,6 +56,7 @@
* @since 1.5
*/
+@jdk.Exported
public abstract class Connection {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/spi/TransportService.java b/jdk/src/share/classes/com/sun/jdi/connect/spi/TransportService.java
index 6db4cfe..297d3e2 100644
--- a/jdk/src/share/classes/com/sun/jdi/connect/spi/TransportService.java
+++ b/jdk/src/share/classes/com/sun/jdi/connect/spi/TransportService.java
@@ -77,6 +77,7 @@
* @since 1.5
*/
+@jdk.Exported
public abstract class TransportService {
/**
@@ -96,6 +97,7 @@
/**
* The transport service capabilities.
*/
+ @jdk.Exported
public static abstract class Capabilities {
/**
@@ -229,6 +231,7 @@
* #stopListening stopListening} to stop the transport
* service from listening on an address.
*/
+ @jdk.Exported
public static abstract class ListenKey {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/spi/package-info.java b/jdk/src/share/classes/com/sun/jdi/connect/spi/package-info.java
new file mode 100644
index 0000000..956e28d
--- /dev/null
+++ b/jdk/src/share/classes/com/sun/jdi/connect/spi/package-info.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2003, 2013, 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 package comprises the interfaces and classes used to
+ * develop new {@link com.sun.jdi.connect.spi.TransportService}
+ * implementations.
+ */
+
+@jdk.Exported
+package com.sun.jdi.connect.spi;
diff --git a/jdk/src/share/classes/com/sun/jdi/connect/spi/package.html b/jdk/src/share/classes/com/sun/jdi/connect/spi/package.html
deleted file mode 100644
index 29f98ed..0000000
--- a/jdk/src/share/classes/com/sun/jdi/connect/spi/package.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<html>
-<head>
- <title>com.sun.jdi.connect.spi description</title>
-<!--
-
-Copyright (c) 2003, 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.
--->
-</head>
-<body bgcolor="white">
-This package comprises the interfaces and classes used to
-develop new {@link com.sun.jdi.connect.spi.TransportService}
-implementations.
- </body>
-</html>
diff --git a/jdk/src/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java b/jdk/src/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java
index 1770fca..6bee053 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java
@@ -37,5 +37,6 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface AccessWatchpointEvent extends WatchpointEvent {
}
diff --git a/jdk/src/share/classes/com/sun/jdi/event/BreakpointEvent.java b/jdk/src/share/classes/com/sun/jdi/event/BreakpointEvent.java
index 811e6f7..0fbd9cf 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/BreakpointEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/BreakpointEvent.java
@@ -47,6 +47,6 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface BreakpointEvent extends LocatableEvent {
-
}
diff --git a/jdk/src/share/classes/com/sun/jdi/event/ClassPrepareEvent.java b/jdk/src/share/classes/com/sun/jdi/event/ClassPrepareEvent.java
index 9b57fee..2922ed8 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/ClassPrepareEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/ClassPrepareEvent.java
@@ -39,6 +39,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface ClassPrepareEvent extends Event {
/**
* Returns the thread in which this event has occurred.
diff --git a/jdk/src/share/classes/com/sun/jdi/event/ClassUnloadEvent.java b/jdk/src/share/classes/com/sun/jdi/event/ClassUnloadEvent.java
index 8835b1e..1da9da3 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/ClassUnloadEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/ClassUnloadEvent.java
@@ -39,6 +39,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface ClassUnloadEvent extends Event {
/**
* Returns the name of the class that has been unloaded.
diff --git a/jdk/src/share/classes/com/sun/jdi/event/Event.java b/jdk/src/share/classes/com/sun/jdi/event/Event.java
index ba00573..92c0217 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/Event.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/Event.java
@@ -43,6 +43,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface Event extends Mirror {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/event/EventIterator.java b/jdk/src/share/classes/com/sun/jdi/event/EventIterator.java
index 220a1e4..a66fc85 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/EventIterator.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/EventIterator.java
@@ -40,6 +40,7 @@
* @since 1.3
*/
+@jdk.Exported
public interface EventIterator extends Iterator<Event> {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/event/EventQueue.java b/jdk/src/share/classes/com/sun/jdi/event/EventQueue.java
index 4c966a9..5dde746 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/EventQueue.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/EventQueue.java
@@ -57,6 +57,7 @@
* @since 1.3
*/
+@jdk.Exported
public interface EventQueue extends Mirror {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/event/EventSet.java b/jdk/src/share/classes/com/sun/jdi/event/EventSet.java
index 26efafc..63efacf 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/EventSet.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/EventSet.java
@@ -127,6 +127,7 @@
* @since 1.3
*/
+@jdk.Exported
public interface EventSet extends Mirror, Set<Event> {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/event/ExceptionEvent.java b/jdk/src/share/classes/com/sun/jdi/event/ExceptionEvent.java
index 89cb466..1a03bb6 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/ExceptionEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/ExceptionEvent.java
@@ -44,6 +44,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface ExceptionEvent extends LocatableEvent {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/event/LocatableEvent.java b/jdk/src/share/classes/com/sun/jdi/event/LocatableEvent.java
index d7f6605..66a2070 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/LocatableEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/LocatableEvent.java
@@ -36,6 +36,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface LocatableEvent extends Event, Locatable {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/event/MethodEntryEvent.java b/jdk/src/share/classes/com/sun/jdi/event/MethodEntryEvent.java
index 963b4e6..2f48a4a 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/MethodEntryEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/MethodEntryEvent.java
@@ -43,6 +43,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface MethodEntryEvent extends LocatableEvent {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/event/MethodExitEvent.java b/jdk/src/share/classes/com/sun/jdi/event/MethodExitEvent.java
index e492cc4..7a08790 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/MethodExitEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/MethodExitEvent.java
@@ -40,6 +40,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface MethodExitEvent extends LocatableEvent {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java b/jdk/src/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java
index 32d637d..9531ad4 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java
@@ -38,6 +38,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface ModificationWatchpointEvent extends WatchpointEvent {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java b/jdk/src/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java
index 9f22f9a..338ac38 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java
@@ -40,6 +40,7 @@
* @author Swamy Venkataramanappa
* @since 1.6
*/
+@jdk.Exported
public interface MonitorContendedEnterEvent extends LocatableEvent {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java b/jdk/src/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java
index 0b4ba81..1c9835b 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java
@@ -39,6 +39,7 @@
* @author Swamy Venkataramanappa
* @since 1.6
*/
+@jdk.Exported
public interface MonitorContendedEnteredEvent extends LocatableEvent {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/event/MonitorWaitEvent.java b/jdk/src/share/classes/com/sun/jdi/event/MonitorWaitEvent.java
index 7d3d717..d8630df 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/MonitorWaitEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/MonitorWaitEvent.java
@@ -38,6 +38,7 @@
* @author Swamy Venkataramanappa
* @since 1.6
*/
+@jdk.Exported
public interface MonitorWaitEvent extends LocatableEvent {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java b/jdk/src/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java
index f9b14ca..b458ad6 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java
@@ -38,6 +38,7 @@
* @author Swamy Venkataramanappa
* @since 1.6
*/
+@jdk.Exported
public interface MonitorWaitedEvent extends LocatableEvent {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/event/StepEvent.java b/jdk/src/share/classes/com/sun/jdi/event/StepEvent.java
index e6a5f75..ebeadff 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/StepEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/StepEvent.java
@@ -46,6 +46,6 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface StepEvent extends LocatableEvent {
-
}
diff --git a/jdk/src/share/classes/com/sun/jdi/event/ThreadDeathEvent.java b/jdk/src/share/classes/com/sun/jdi/event/ThreadDeathEvent.java
index 01f4b04..f998e6da 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/ThreadDeathEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/ThreadDeathEvent.java
@@ -45,6 +45,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface ThreadDeathEvent extends Event {
/**
* Returns the thread which is terminating.
diff --git a/jdk/src/share/classes/com/sun/jdi/event/ThreadStartEvent.java b/jdk/src/share/classes/com/sun/jdi/event/ThreadStartEvent.java
index 5be5d0f..7730e9a 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/ThreadStartEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/ThreadStartEvent.java
@@ -52,6 +52,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface ThreadStartEvent extends Event {
/**
* Returns the thread which has started.
diff --git a/jdk/src/share/classes/com/sun/jdi/event/VMDeathEvent.java b/jdk/src/share/classes/com/sun/jdi/event/VMDeathEvent.java
index 7225ae0..a6decf0 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/VMDeathEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/VMDeathEvent.java
@@ -68,5 +68,6 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface VMDeathEvent extends Event {
}
diff --git a/jdk/src/share/classes/com/sun/jdi/event/VMDisconnectEvent.java b/jdk/src/share/classes/com/sun/jdi/event/VMDisconnectEvent.java
index 8301d78..55a928c 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/VMDisconnectEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/VMDisconnectEvent.java
@@ -52,5 +52,6 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface VMDisconnectEvent extends Event {
}
diff --git a/jdk/src/share/classes/com/sun/jdi/event/VMStartEvent.java b/jdk/src/share/classes/com/sun/jdi/event/VMStartEvent.java
index cf500a2..3172bc7 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/VMStartEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/VMStartEvent.java
@@ -43,6 +43,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface VMStartEvent extends Event {
/**
* Returns the initial thread of the VM which has started.
diff --git a/jdk/src/share/classes/com/sun/jdi/event/WatchpointEvent.java b/jdk/src/share/classes/com/sun/jdi/event/WatchpointEvent.java
index d60908f..9cb5d5d 100644
--- a/jdk/src/share/classes/com/sun/jdi/event/WatchpointEvent.java
+++ b/jdk/src/share/classes/com/sun/jdi/event/WatchpointEvent.java
@@ -37,6 +37,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface WatchpointEvent extends LocatableEvent {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/event/package-info.java b/jdk/src/share/classes/com/sun/jdi/event/package-info.java
new file mode 100644
index 0000000..fa9afe3
--- /dev/null
+++ b/jdk/src/share/classes/com/sun/jdi/event/package-info.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 1998, 2013, 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 package defines JDI events and event processing.
+ * An {@link com.sun.jdi.event.Event} is always a member of an
+ * {@link com.sun.jdi.event.EventSet}, which
+ * is retrieved from the {@link com.sun.jdi.event.EventQueue}.
+ * Examples of Events include
+ * {@link com.sun.jdi.event.BreakpointEvent "breakpoints events"},
+ * {@link com.sun.jdi.event.ThreadStartEvent "thread creation events"} and
+ * {@link com.sun.jdi.event.VMDeathEvent "virtual machine death event"}.
+ * With the exception
+ * of termination events, all events received must be requested with an
+ * {@link com.sun.jdi.request.EventRequest "EventRequest"}. The
+ * {@link com.sun.jdi.request} package defines event requests and event
+ * request management.
+ * <p>
+ * Methods may be added to the interfaces in the JDI packages in future
+ * releases. Existing packages may be renamed if the JDI becomes a standard
+ * extension.
+ */
+
+@jdk.Exported
+package com.sun.jdi.event;
diff --git a/jdk/src/share/classes/com/sun/jdi/event/package.html b/jdk/src/share/classes/com/sun/jdi/event/package.html
deleted file mode 100644
index 521a8b7..0000000
--- a/jdk/src/share/classes/com/sun/jdi/event/package.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<html>
-<head>
- <title>com.sun.jdi.event description</title>
-<!--
-
-Copyright (c) 1998, 1999, 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.
--->
-</head>
-<body bgcolor="white">
-This package defines JDI events and event processing.
-An {@link com.sun.jdi.event.Event} is always a member of an
-{@link com.sun.jdi.event.EventSet}, which
-is retrieved from the {@link com.sun.jdi.event.EventQueue}.
-Examples of Events include
-{@link com.sun.jdi.event.BreakpointEvent "breakpoints events"},
-{@link com.sun.jdi.event.ThreadStartEvent "thread creation events"} and
-{@link com.sun.jdi.event.VMDeathEvent "virtual machine death event"}.
-With the exception
-of termination events, all events received must be requested with an
-{@link com.sun.jdi.request.EventRequest "EventRequest"}. The
-{@link com.sun.jdi.request} package defines event requests and event
-request management.
-<p>
-Methods may be added to the interfaces in the JDI packages in future
-releases. Existing packages may be renamed if the JDI becomes a standard
-extension.
- </body>
-</html>
diff --git a/jdk/src/share/classes/com/sun/jdi/package-info.java b/jdk/src/share/classes/com/sun/jdi/package-info.java
new file mode 100644
index 0000000..00f422f
--- /dev/null
+++ b/jdk/src/share/classes/com/sun/jdi/package-info.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 1998, 2013, 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 the core package of the Java Debug
+ * Interface (JDI), it defines mirrors for values, types, and the target
+ * VirtualMachine itself - as well bootstrapping facilities.
+ * {@link com.sun.jdi.VirtualMachine} mirrors the target virtual machine and
+ * is the origin of all information provided by the JDI. A VirtualMachine
+ * is typically created by using the
+ * {@link com.sun.jdi.VirtualMachineManager} to create
+ * a connection to the target virtual machine (see the
+ * {@link com.sun.jdi.connect} package). In turn the
+ * {@link com.sun.jdi.VirtualMachineManager} is typically created by calling
+ * {@link com.sun.jdi.Bootstrap#virtualMachineManager()}.
+ * <p>
+ * Most of the methods within this package can throw the unchecked exception
+ * {@link com.sun.jdi.VMDisconnectedException}.
+ * <p>
+ * Methods may be added to the interfaces in the JDI packages in future
+ * releases. Existing packages may be renamed if the JDI becomes a standard
+ * extension.
+ */
+
+@jdk.Exported
+package com.sun.jdi;
diff --git a/jdk/src/share/classes/com/sun/jdi/package.html b/jdk/src/share/classes/com/sun/jdi/package.html
deleted file mode 100644
index 5aee603..0000000
--- a/jdk/src/share/classes/com/sun/jdi/package.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-<head>
- <title>com.sun.jdi package description</title>
-<!--
-
-Copyright (c) 1998, 2000, 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.
--->
-</head>
-<body bgcolor="white">
-This is the core package of the Java Debug
-Interface (JDI), it defines mirrors for values, types, and the target
-VirtualMachine itself - as well bootstrapping facilities.
-{@link com.sun.jdi.VirtualMachine} mirrors the target virtual machine and
-is the origin of all information provided by the JDI. A VirtualMachine
-is typically created by using the
-{@link com.sun.jdi.VirtualMachineManager} to create
-a connection to the target virtual machine (see the
-{@link com.sun.jdi.connect} package). In turn the
-{@link com.sun.jdi.VirtualMachineManager} is typically created by calling
-{@link com.sun.jdi.Bootstrap#virtualMachineManager()}.
-<p>
-Most of the methods within this package can throw the unchecked exception
-{@link com.sun.jdi.VMDisconnectedException}.
-<p>
-Methods may be added to the interfaces in the JDI packages in future
-releases. Existing packages may be renamed if the JDI becomes a standard
-extension.
- </body>
-</html>
diff --git a/jdk/src/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java b/jdk/src/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java
index 7276147..1591525 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java
@@ -56,5 +56,6 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface AccessWatchpointRequest extends WatchpointRequest {
}
diff --git a/jdk/src/share/classes/com/sun/jdi/request/BreakpointRequest.java b/jdk/src/share/classes/com/sun/jdi/request/BreakpointRequest.java
index d31df57..6d6ee7d 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/BreakpointRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/BreakpointRequest.java
@@ -46,6 +46,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface BreakpointRequest extends EventRequest, Locatable {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/request/ClassPrepareRequest.java b/jdk/src/share/classes/com/sun/jdi/request/ClassPrepareRequest.java
index 19f1bfc..6089292 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/ClassPrepareRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/ClassPrepareRequest.java
@@ -47,6 +47,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface ClassPrepareRequest extends EventRequest {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/request/ClassUnloadRequest.java b/jdk/src/share/classes/com/sun/jdi/request/ClassUnloadRequest.java
index abad6d3..4868b80 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/ClassUnloadRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/ClassUnloadRequest.java
@@ -46,6 +46,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface ClassUnloadRequest extends EventRequest {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/request/DuplicateRequestException.java b/jdk/src/share/classes/com/sun/jdi/request/DuplicateRequestException.java
index 5de664e..b502034 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/DuplicateRequestException.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/DuplicateRequestException.java
@@ -31,16 +31,15 @@
* @author Robert Field
* @since 1.3
*/
-public class DuplicateRequestException extends RuntimeException
-{
+@jdk.Exported
+public class DuplicateRequestException extends RuntimeException {
private static final long serialVersionUID = -3719784920313411060L;
- public DuplicateRequestException()
- {
+
+ public DuplicateRequestException() {
super();
}
- public DuplicateRequestException(String s)
- {
+ public DuplicateRequestException(String s) {
super(s);
}
}
diff --git a/jdk/src/share/classes/com/sun/jdi/request/EventRequest.java b/jdk/src/share/classes/com/sun/jdi/request/EventRequest.java
index 9b9138e..8b64f1f 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/EventRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/EventRequest.java
@@ -78,6 +78,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface EventRequest extends Mirror {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/request/EventRequestManager.java b/jdk/src/share/classes/com/sun/jdi/request/EventRequestManager.java
index e2627de..13f03fc 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/EventRequestManager.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/EventRequestManager.java
@@ -44,6 +44,7 @@
* @since 1.3
*/
+@jdk.Exported
public interface EventRequestManager extends Mirror {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/request/ExceptionRequest.java b/jdk/src/share/classes/com/sun/jdi/request/ExceptionRequest.java
index e7e06bf..ddb5d97 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/ExceptionRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/ExceptionRequest.java
@@ -43,6 +43,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface ExceptionRequest extends EventRequest {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/request/InvalidRequestStateException.java b/jdk/src/share/classes/com/sun/jdi/request/InvalidRequestStateException.java
index 8bd3292..619f47b 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/InvalidRequestStateException.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/InvalidRequestStateException.java
@@ -35,6 +35,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public class InvalidRequestStateException extends RuntimeException {
private static final long serialVersionUID = -3774632428543322148L;
public InvalidRequestStateException()
diff --git a/jdk/src/share/classes/com/sun/jdi/request/MethodEntryRequest.java b/jdk/src/share/classes/com/sun/jdi/request/MethodEntryRequest.java
index 397e97c..1d98ade 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/MethodEntryRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/MethodEntryRequest.java
@@ -44,6 +44,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface MethodEntryRequest extends EventRequest {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/request/MethodExitRequest.java b/jdk/src/share/classes/com/sun/jdi/request/MethodExitRequest.java
index c6a4649..e061290 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/MethodExitRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/MethodExitRequest.java
@@ -44,6 +44,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface MethodExitRequest extends EventRequest {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java b/jdk/src/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java
index 778d5d8..20b5b23 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java
@@ -55,5 +55,6 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface ModificationWatchpointRequest extends WatchpointRequest {
}
diff --git a/jdk/src/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java b/jdk/src/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java
index b3edd95..864522c 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java
@@ -45,6 +45,7 @@
* @author Swamy Venkataramanappa
* @since 1.6
*/
+@jdk.Exported
public interface MonitorContendedEnterRequest extends EventRequest {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java b/jdk/src/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java
index 0066f86..965df47 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java
@@ -45,6 +45,7 @@
* @author Swamy Venkataramanappa
* @since 1.6
*/
+@jdk.Exported
public interface MonitorContendedEnteredRequest extends EventRequest {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/request/MonitorWaitRequest.java b/jdk/src/share/classes/com/sun/jdi/request/MonitorWaitRequest.java
index 37ce47f..35df225 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/MonitorWaitRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/MonitorWaitRequest.java
@@ -45,6 +45,7 @@
* @author Swamy Venkataramanappa
* @since 1.6
*/
+@jdk.Exported
public interface MonitorWaitRequest extends EventRequest {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java b/jdk/src/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java
index 9fea543..ee4982a 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java
@@ -45,6 +45,7 @@
* @author Swamy Venkataramanappa
* @since 1.6
*/
+@jdk.Exported
public interface MonitorWaitedRequest extends EventRequest {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/request/StepRequest.java b/jdk/src/share/classes/com/sun/jdi/request/StepRequest.java
index 765fdd0..2ea385f 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/StepRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/StepRequest.java
@@ -43,6 +43,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface StepRequest extends EventRequest {
/** Step into any newly pushed frames */
diff --git a/jdk/src/share/classes/com/sun/jdi/request/ThreadDeathRequest.java b/jdk/src/share/classes/com/sun/jdi/request/ThreadDeathRequest.java
index fe9e68a..ac17fa2 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/ThreadDeathRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/ThreadDeathRequest.java
@@ -44,6 +44,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface ThreadDeathRequest extends EventRequest {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/request/ThreadStartRequest.java b/jdk/src/share/classes/com/sun/jdi/request/ThreadStartRequest.java
index 298da9a..596c96b 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/ThreadStartRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/ThreadStartRequest.java
@@ -44,6 +44,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface ThreadStartRequest extends EventRequest {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/request/VMDeathRequest.java b/jdk/src/share/classes/com/sun/jdi/request/VMDeathRequest.java
index c600651..8643440 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/VMDeathRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/VMDeathRequest.java
@@ -56,6 +56,7 @@
* @author Robert Field
* @since 1.4
*/
+@jdk.Exported
public interface VMDeathRequest extends EventRequest {
}
diff --git a/jdk/src/share/classes/com/sun/jdi/request/WatchpointRequest.java b/jdk/src/share/classes/com/sun/jdi/request/WatchpointRequest.java
index cafe61d..9c78f75 100644
--- a/jdk/src/share/classes/com/sun/jdi/request/WatchpointRequest.java
+++ b/jdk/src/share/classes/com/sun/jdi/request/WatchpointRequest.java
@@ -38,6 +38,7 @@
* @author Robert Field
* @since 1.3
*/
+@jdk.Exported
public interface WatchpointRequest extends EventRequest {
/**
diff --git a/jdk/src/share/classes/com/sun/jdi/request/package-info.java b/jdk/src/share/classes/com/sun/jdi/request/package-info.java
new file mode 100644
index 0000000..add151d
--- /dev/null
+++ b/jdk/src/share/classes/com/sun/jdi/request/package-info.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 1998, 2013, 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 package is used to request that a JDI
+ * event be sent under specified conditions.
+ * With the exception of termination events, which are
+ * always sent, there is one kind of
+ * {@link com.sun.jdi.request.EventRequest} for each kind of
+ * {@link com.sun.jdi.event.Event Event} - for example,
+ * {@link com.sun.jdi.request.BreakpointRequest} is used to request a
+ * {@link com.sun.jdi.event.BreakpointEvent BreakpointEvent}.
+ * Event requests are created by the
+ * {@link com.sun.jdi.request.EventRequestManager}.
+ * Events and event processing are defined in the
+ * {@link com.sun.jdi.event} package.
+ * <p>
+ * Methods may be added to the interfaces in the JDI packages in future
+ * releases. Existing packages may be renamed if the JDI becomes a standard
+ * extension.
+ */
+
+@jdk.Exported
+package com.sun.jdi.request;
diff --git a/jdk/src/share/classes/com/sun/jdi/request/package.html b/jdk/src/share/classes/com/sun/jdi/request/package.html
deleted file mode 100644
index c99c1c8..0000000
--- a/jdk/src/share/classes/com/sun/jdi/request/package.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<html>
-<head>
- <title>com.sun.jdi.request description</title>
-<!--
-
-Copyright (c) 1998, 1999, 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.
--->
-</head>
-<body bgcolor="white">
-This package is used to request that a JDI
-event be sent under specified conditions.
-With the exception of termination events, which are
-always sent, there is one kind of
-{@link com.sun.jdi.request.EventRequest} for each kind of
-{@link com.sun.jdi.event.Event Event} - for example,
-{@link com.sun.jdi.request.BreakpointRequest} is used to request a
-{@link com.sun.jdi.event.BreakpointEvent BreakpointEvent}.
-Event requests are created by the
-{@link com.sun.jdi.request.EventRequestManager}.
-Events and event processing are defined in the
-{@link com.sun.jdi.event} package.
-<p>
-Methods may be added to the interfaces in the JDI packages in future
-releases. Existing packages may be renamed if the JDI becomes a standard
-extension.
- </body>
-</html>
diff --git a/jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java b/jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java
index d4171b2..b0fe91b 100644
--- a/jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java
+++ b/jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009,2013, 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,13 +36,34 @@
import java.rmi.NoSuchObjectException;
import com.sun.jmx.remote.internal.IIOPProxy;
+import java.io.SerializablePermission;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.Permissions;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.security.ProtectionDomain;
/**
- * An implementatin of IIOPProxy that simply delegates to the appropriate
+ * An implementation of IIOPProxy that simply delegates to the appropriate
* RMI-IIOP and CORBA APIs.
*/
public class IIOPProxyImpl implements IIOPProxy {
+ // special ACC used to initialize the IIOP stub
+ // the only allowed privilege is SerializablePermission("enableSubclassImplementation")
+ private static final AccessControlContext STUB_ACC;
+
+ static {
+ Permissions p = new Permissions();
+ p.add(new SerializablePermission("enableSubclassImplementation"));
+ STUB_ACC = new AccessControlContext(
+ new ProtectionDomain[]{
+ new ProtectionDomain(null, p)
+ }
+ );
+ }
+
public IIOPProxyImpl() { }
@Override
@@ -113,7 +134,24 @@
}
@Override
- public Remote toStub(Remote obj) throws NoSuchObjectException {
- return PortableRemoteObject.toStub(obj);
+ public Remote toStub(final Remote obj) throws NoSuchObjectException {
+ if (System.getSecurityManager() == null) {
+ return PortableRemoteObject.toStub(obj);
+ } else {
+ try {
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<Remote>() {
+
+ @Override
+ public Remote run() throws Exception {
+ return PortableRemoteObject.toStub(obj);
+ }
+ }, STUB_ACC);
+ } catch (PrivilegedActionException e) {
+ if (e.getException() instanceof NoSuchObjectException) {
+ throw (NoSuchObjectException)e.getException();
+ }
+ throw new RuntimeException("Unexpected exception type", e.getException());
+ }
+ }
}
}
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java b/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java
index d6ab731..9797aad 100644
--- a/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java
+++ b/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java
@@ -237,7 +237,7 @@
private static String[] getTypeNames(Class<?> currentClass, Vector<String> v) {
getClassesAux(currentClass, v);
- Class[] members = currentClass.getInterfaces();
+ Class<?>[] members = currentClass.getInterfaces();
for (int i = 0; i < members.length; i++) {
getClassesAux(members[i], v);
}
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapPoolManager.java b/jdk/src/share/classes/com/sun/jndi/ldap/LdapPoolManager.java
index b401c02..1222538 100644
--- a/jdk/src/share/classes/com/sun/jndi/ldap/LdapPoolManager.java
+++ b/jdk/src/share/classes/com/sun/jndi/ldap/LdapPoolManager.java
@@ -237,7 +237,7 @@
!socketFactory.equals(LdapCtx.DEFAULT_SSL_FACTORY)) {
try {
Class<?> socketFactoryClass = Obj.helper.loadClass(socketFactory);
- Class[] interfaces = socketFactoryClass.getInterfaces();
+ Class<?>[] interfaces = socketFactoryClass.getInterfaces();
for (int i = 0; i < interfaces.length; i++) {
if (interfaces[i].getCanonicalName().equals(COMPARATOR)) {
foundSockCmp = true;
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java b/jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java
index 9e8854a..63e6bd2 100644
--- a/jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java
+++ b/jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java
@@ -25,11 +25,12 @@
package com.sun.jndi.ldap;
-import java.net.URL;
import java.net.URLClassLoader;
import java.net.MalformedURLException;
+import java.security.AccessControlContext;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import sun.misc.SharedSecrets;
final class VersionHelper12 extends VersionHelper {
@@ -82,12 +83,16 @@
}
Thread createThread(final Runnable r) {
+ final AccessControlContext acc = AccessController.getContext();
+ // 4290486: doPrivileged is needed to create a thread in
+ // an environment that restricts "modifyThreadGroup".
return AccessController.doPrivileged(
- new PrivilegedAction<Thread>() {
- public Thread run() {
- return new Thread(r);
+ new PrivilegedAction<Thread>() {
+ public Thread run() {
+ return SharedSecrets.getJavaLangAccess()
+ .newThreadWithAcc(r, acc);
+ }
}
- }
);
}
}
diff --git a/jdk/src/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java b/jdk/src/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java
index 64fb94b..b275120 100644
--- a/jdk/src/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java
+++ b/jdk/src/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java
@@ -85,6 +85,7 @@
* </ul>
**/
+@jdk.Exported
public class GarbageCollectionNotificationInfo implements CompositeDataView {
private final String gcName;
diff --git a/jdk/src/share/classes/com/sun/management/GarbageCollectorMXBean.java b/jdk/src/share/classes/com/sun/management/GarbageCollectorMXBean.java
index ad9335f..af574ca 100644
--- a/jdk/src/share/classes/com/sun/management/GarbageCollectorMXBean.java
+++ b/jdk/src/share/classes/com/sun/management/GarbageCollectorMXBean.java
@@ -37,6 +37,7 @@
* @author Mandy Chung
* @since 1.5
*/
+@jdk.Exported
public interface GarbageCollectorMXBean
extends java.lang.management.GarbageCollectorMXBean {
diff --git a/jdk/src/share/classes/com/sun/management/GcInfo.java b/jdk/src/share/classes/com/sun/management/GcInfo.java
index 5fa897c..516174a 100644
--- a/jdk/src/share/classes/com/sun/management/GcInfo.java
+++ b/jdk/src/share/classes/com/sun/management/GcInfo.java
@@ -64,6 +64,7 @@
* @author Mandy Chung
* @since 1.5
*/
+@jdk.Exported
public class GcInfo implements CompositeData, CompositeDataView {
private final long index;
private final long startTime;
diff --git a/jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java b/jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
index 2fe8835..60751b0 100644
--- a/jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
+++ b/jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
@@ -48,6 +48,7 @@
*
* @see ManagementFactory#getPlatformMXBeans(Class)
*/
+@jdk.Exported
public interface HotSpotDiagnosticMXBean extends PlatformManagedObject {
/**
* Dumps the heap to the <tt>outputFile</tt> file in the same
@@ -66,6 +67,11 @@
* cannot be created, opened, or written to.
* @throws UnsupportedOperationException if this operation is not supported.
* @throws NullPointerException if <tt>outputFile</tt> is <tt>null</tt>.
+ * @throws SecurityException
+ * If a security manager exists and its {@link
+ * java.lang.SecurityManager#checkWrite(java.lang.String)}
+ * method denies write access to the named file
+ * or the caller does not have ManagmentPermission("control").
*/
public void dumpHeap(String outputFile, boolean live) throws java.io.IOException;
diff --git a/jdk/src/share/classes/com/sun/management/OperatingSystemMXBean.java b/jdk/src/share/classes/com/sun/management/OperatingSystemMXBean.java
index d20cd36..5707508 100644
--- a/jdk/src/share/classes/com/sun/management/OperatingSystemMXBean.java
+++ b/jdk/src/share/classes/com/sun/management/OperatingSystemMXBean.java
@@ -39,6 +39,7 @@
* @author Mandy Chung
* @since 1.5
*/
+@jdk.Exported
public interface OperatingSystemMXBean extends
java.lang.management.OperatingSystemMXBean {
diff --git a/jdk/src/share/classes/com/sun/management/ThreadMXBean.java b/jdk/src/share/classes/com/sun/management/ThreadMXBean.java
index f5a9a5b..25a59c4 100644
--- a/jdk/src/share/classes/com/sun/management/ThreadMXBean.java
+++ b/jdk/src/share/classes/com/sun/management/ThreadMXBean.java
@@ -38,6 +38,7 @@
* @since 6u25
*/
+@jdk.Exported
public interface ThreadMXBean extends java.lang.management.ThreadMXBean {
/**
* Returns the total CPU time for each thread whose ID is
diff --git a/jdk/src/share/classes/com/sun/management/UnixOperatingSystemMXBean.java b/jdk/src/share/classes/com/sun/management/UnixOperatingSystemMXBean.java
index 20f43bf..00cb3f4 100644
--- a/jdk/src/share/classes/com/sun/management/UnixOperatingSystemMXBean.java
+++ b/jdk/src/share/classes/com/sun/management/UnixOperatingSystemMXBean.java
@@ -32,6 +32,7 @@
* @author Mandy Chung
* @since 1.5
*/
+@jdk.Exported
public interface UnixOperatingSystemMXBean extends
com.sun.management.OperatingSystemMXBean {
diff --git a/jdk/src/share/classes/com/sun/management/VMOption.java b/jdk/src/share/classes/com/sun/management/VMOption.java
index ba8e1d0..d79bc5b 100644
--- a/jdk/src/share/classes/com/sun/management/VMOption.java
+++ b/jdk/src/share/classes/com/sun/management/VMOption.java
@@ -52,6 +52,7 @@
* @author Mandy Chung
* @since 1.6
*/
+@jdk.Exported
public class VMOption {
private String name;
private String value;
@@ -64,6 +65,7 @@
*
* @since 1.6
*/
+ @jdk.Exported
public enum Origin {
/**
* The VM option has not been set and its value
diff --git a/jdk/src/share/classes/com/sun/management/package-info.java b/jdk/src/share/classes/com/sun/management/package-info.java
new file mode 100644
index 0000000..75808f5
--- /dev/null
+++ b/jdk/src/share/classes/com/sun/management/package-info.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2004, 2013, 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 package contains Oracle Corporation's platform extension to
+ * the implementation of the
+ * <a href="{@docRoot}/../../../../api/java/lang/management/package-summary.html">
+ * java.lang.management</a> API and also defines the management
+ * interface for some other components for the platform.
+ *
+ * <p>
+ * All platform MBeans are registered in the <em>platform MBeanServer</em>
+ * which can be obtained via the
+ * <a href="{@docRoot}/../../../../api/java/lang/management/ManagementFactory.html#getPlatformMBeanServer()">
+ * java.lang.management.ManagementFactory.getPlatformMBeanServer</a>
+ *
+ * @author Mandy Chung
+ * @since 1.5
+ */
+
+@jdk.Exported
+package com.sun.management;
diff --git a/jdk/src/share/classes/com/sun/management/package.html b/jdk/src/share/classes/com/sun/management/package.html
deleted file mode 100644
index c26d430..0000000
--- a/jdk/src/share/classes/com/sun/management/package.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-Copyright (c) 2004, 2006, 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.
--->
-
-</head>
-<body bgcolor="white">
-
-This package contains Oracle Corporation's platform extension to
-the implementation of the
-<a href="{@docRoot}/../../../../api/java/lang/management/package-summary.html">
-java.lang.management</a> API and also defines the management
-interface for some other components for the platform.
-
-<p>
-All platform MBeans are registered in the <em>platform MBeanServer</em>
-which can be obtained via the
-<a href="{@docRoot}/../../../../api/java/lang/management/ManagementFactory.html#getPlatformMBeanServer()">
-java.lang.management.ManagementFactory.getPlatformMBeanServer</a>
-
-@author Mandy Chung
-@since 1.5
-
-</body>
-</html>
-
-
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/Authenticator.java b/jdk/src/share/classes/com/sun/net/httpserver/Authenticator.java
index c9a0bc3..ba4aecb 100644
--- a/jdk/src/share/classes/com/sun/net/httpserver/Authenticator.java
+++ b/jdk/src/share/classes/com/sun/net/httpserver/Authenticator.java
@@ -36,6 +36,7 @@
* Note. This implies that any caching of credentials or other authentication
* information must be done outside of this class.
*/
+@jdk.Exported
public abstract class Authenticator {
/**
@@ -47,6 +48,7 @@
* Indicates an authentication failure. The authentication
* attempt has completed.
*/
+ @jdk.Exported
public static class Failure extends Result {
private int responseCode;
@@ -68,6 +70,7 @@
* authenticated user principal can be acquired by calling
* getPrincipal().
*/
+ @jdk.Exported
public static class Success extends Result {
private HttpPrincipal principal;
@@ -89,6 +92,7 @@
* set any necessary response headers in the given HttpExchange
* before returning this Retry object.
*/
+ @jdk.Exported
public static class Retry extends Result {
private int responseCode;
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java b/jdk/src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java
index 60ccd3a..09964d5 100644
--- a/jdk/src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java
+++ b/jdk/src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java
@@ -33,6 +33,7 @@
* to provide an implementation of {@link #checkCredentials(String,String)}
* which is called to verify each incoming request.
*/
+@jdk.Exported
public abstract class BasicAuthenticator extends Authenticator {
protected String realm;
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/Filter.java b/jdk/src/share/classes/com/sun/net/httpserver/Filter.java
index 7431453..01fd7b6 100644
--- a/jdk/src/share/classes/com/sun/net/httpserver/Filter.java
+++ b/jdk/src/share/classes/com/sun/net/httpserver/Filter.java
@@ -39,6 +39,7 @@
* exchange handler.
* @since 1.6
*/
+@jdk.Exported
public abstract class Filter {
protected Filter () {}
@@ -48,6 +49,7 @@
* Each filter in the chain is given one of these
* so it can invoke the next filter in the chain
*/
+ @jdk.Exported
public static class Chain {
/* the last element in the chain must invoke the users
* handler
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/Headers.java b/jdk/src/share/classes/com/sun/net/httpserver/Headers.java
index afe3c21..c33e250 100644
--- a/jdk/src/share/classes/com/sun/net/httpserver/Headers.java
+++ b/jdk/src/share/classes/com/sun/net/httpserver/Headers.java
@@ -58,6 +58,7 @@
* as a header line containing the key but no associated value.
* @since 1.6
*/
+@jdk.Exported
public class Headers implements Map<String,List<String>> {
HashMap<String,List<String>> map;
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpContext.java b/jdk/src/share/classes/com/sun/net/httpserver/HttpContext.java
index d42833c..b145813 100644
--- a/jdk/src/share/classes/com/sun/net/httpserver/HttpContext.java
+++ b/jdk/src/share/classes/com/sun/net/httpserver/HttpContext.java
@@ -40,6 +40,7 @@
* context can be pre- and post-processed by each Filter in the chain.
* @since 1.6
*/
+@jdk.Exported
public abstract class HttpContext {
protected HttpContext () {
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpExchange.java b/jdk/src/share/classes/com/sun/net/httpserver/HttpExchange.java
index 1754fe3..2ceacf7 100644
--- a/jdk/src/share/classes/com/sun/net/httpserver/HttpExchange.java
+++ b/jdk/src/share/classes/com/sun/net/httpserver/HttpExchange.java
@@ -65,6 +65,7 @@
* @since 1.6
*/
+@jdk.Exported
public abstract class HttpExchange {
protected HttpExchange () {
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpHandler.java b/jdk/src/share/classes/com/sun/net/httpserver/HttpHandler.java
index 54c69cb..3611d67 100644
--- a/jdk/src/share/classes/com/sun/net/httpserver/HttpHandler.java
+++ b/jdk/src/share/classes/com/sun/net/httpserver/HttpHandler.java
@@ -32,6 +32,7 @@
* HTTP exchange is handled by one of these handlers.
* @since 1.6
*/
+@jdk.Exported
public interface HttpHandler {
/**
* Handle the given request and generate an appropriate response.
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpPrincipal.java b/jdk/src/share/classes/com/sun/net/httpserver/HttpPrincipal.java
index 2a2f6e9..e34eccb 100644
--- a/jdk/src/share/classes/com/sun/net/httpserver/HttpPrincipal.java
+++ b/jdk/src/share/classes/com/sun/net/httpserver/HttpPrincipal.java
@@ -33,6 +33,7 @@
* Represents a user authenticated by HTTP Basic or Digest
* authentication.
*/
+@jdk.Exported
public class HttpPrincipal implements Principal {
private String username, realm;
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpServer.java b/jdk/src/share/classes/com/sun/net/httpserver/HttpServer.java
index e24b133..21dfe41 100644
--- a/jdk/src/share/classes/com/sun/net/httpserver/HttpServer.java
+++ b/jdk/src/share/classes/com/sun/net/httpserver/HttpServer.java
@@ -87,6 +87,7 @@
* @since 1.6
*/
+@jdk.Exported
public abstract class HttpServer {
/**
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpsConfigurator.java b/jdk/src/share/classes/com/sun/net/httpserver/HttpsConfigurator.java
index 2543a15..f15c8a9 100644
--- a/jdk/src/share/classes/com/sun/net/httpserver/HttpsConfigurator.java
+++ b/jdk/src/share/classes/com/sun/net/httpserver/HttpsConfigurator.java
@@ -67,6 +67,7 @@
* </blockquote></pre>
* @since 1.6
*/
+@jdk.Exported
public class HttpsConfigurator {
private SSLContext context;
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpsExchange.java b/jdk/src/share/classes/com/sun/net/httpserver/HttpsExchange.java
index 807bb51..1893b1d 100644
--- a/jdk/src/share/classes/com/sun/net/httpserver/HttpsExchange.java
+++ b/jdk/src/share/classes/com/sun/net/httpserver/HttpsExchange.java
@@ -39,6 +39,7 @@
* @since 1.6
*/
+@jdk.Exported
public abstract class HttpsExchange extends HttpExchange {
protected HttpsExchange () {
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpsParameters.java b/jdk/src/share/classes/com/sun/net/httpserver/HttpsParameters.java
index d740c11..70df374 100644
--- a/jdk/src/share/classes/com/sun/net/httpserver/HttpsParameters.java
+++ b/jdk/src/share/classes/com/sun/net/httpserver/HttpsParameters.java
@@ -49,6 +49,7 @@
* are used, and any settings made in this object are ignored.
* @since 1.6
*/
+@jdk.Exported
public abstract class HttpsParameters {
private String[] cipherSuites;
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/HttpsServer.java b/jdk/src/share/classes/com/sun/net/httpserver/HttpsServer.java
index dbcdd9f..b4a0a58 100644
--- a/jdk/src/share/classes/com/sun/net/httpserver/HttpsServer.java
+++ b/jdk/src/share/classes/com/sun/net/httpserver/HttpsServer.java
@@ -45,6 +45,7 @@
* @since 1.6
*/
+@jdk.Exported
public abstract class HttpsServer extends HttpServer {
/**
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/package-info.java b/jdk/src/share/classes/com/sun/net/httpserver/package-info.java
index 859746c..ebe76e5 100644
--- a/jdk/src/share/classes/com/sun/net/httpserver/package-info.java
+++ b/jdk/src/share/classes/com/sun/net/httpserver/package-info.java
@@ -123,4 +123,5 @@
<p>
@since 1.6
*/
+@jdk.Exported
package com.sun.net.httpserver;
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java b/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
index 080420b..affd8ab 100644
--- a/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
+++ b/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
@@ -40,6 +40,7 @@
* {@link HttpServer} and associated classes. Applications do not normally use
* this class. See {@link #provider()} for how providers are found and loaded.
*/
+@jdk.Exported
public abstract class HttpServerProvider {
/**
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/spi/package-info.java b/jdk/src/share/classes/com/sun/net/httpserver/spi/package-info.java
index 9f85747..f4d244a 100644
--- a/jdk/src/share/classes/com/sun/net/httpserver/spi/package-info.java
+++ b/jdk/src/share/classes/com/sun/net/httpserver/spi/package-info.java
@@ -24,7 +24,8 @@
*/
/**
- Provides a pluggable service provider interface, which allows the HTTP server
- implementation to be replaced with other implementations.
-*/
+ * Provides a pluggable service provider interface, which allows the HTTP server
+ * implementation to be replaced with other implementations.
+ */
+@jdk.Exported
package com.sun.net.httpserver.spi;
diff --git a/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java b/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java
index 776a84c..f4a2a80 100644
--- a/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java
+++ b/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java
@@ -404,6 +404,7 @@
return delegate.getContent();
}
+ @SuppressWarnings("rawtypes")
public Object getContent(Class[] classes) throws IOException {
return delegate.getContent(classes);
}
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java b/jdk/src/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java
index 6240c6c..d11cc16 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java
@@ -39,6 +39,7 @@
*
* @since 1.7
*/
+@jdk.Exported
public class AbstractNotificationHandler<T>
implements NotificationHandler<T>
{
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/Association.java b/jdk/src/share/classes/com/sun/nio/sctp/Association.java
index 965feae..01cc82d 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/Association.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/Association.java
@@ -51,6 +51,7 @@
*
* @since 1.7
*/
+@jdk.Exported
public class Association {
private final int associationID;
private final int maxInStreams;
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java b/jdk/src/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java
index 5e8b29d..ff41b47 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java
@@ -29,6 +29,7 @@
*
* @since 1.7
*/
+@jdk.Exported
public abstract class AssociationChangeNotification
implements Notification
{
@@ -37,6 +38,7 @@
*
* @since 1.7
*/
+ @jdk.Exported
public enum AssocChangeEvent
{
/**
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/HandlerResult.java b/jdk/src/share/classes/com/sun/nio/sctp/HandlerResult.java
index 7301b45..42dd17f 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/HandlerResult.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/HandlerResult.java
@@ -34,6 +34,7 @@
*
* @since 1.7
*/
+@jdk.Exported
public enum HandlerResult {
/**
* Try to receieve another message or notification.
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/IllegalReceiveException.java b/jdk/src/share/classes/com/sun/nio/sctp/IllegalReceiveException.java
index b5a4137..dec6382 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/IllegalReceiveException.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/IllegalReceiveException.java
@@ -31,6 +31,7 @@
*
* @since 1.7
*/
+@jdk.Exported
public class IllegalReceiveException extends IllegalStateException {
private static final long serialVersionUID = 2296619040988576224L;
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/IllegalUnbindException.java b/jdk/src/share/classes/com/sun/nio/sctp/IllegalUnbindException.java
index 4088df3..dc965d6 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/IllegalUnbindException.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/IllegalUnbindException.java
@@ -31,6 +31,7 @@
*
* @since 1.7
*/
+@jdk.Exported
public class IllegalUnbindException extends IllegalStateException {
private static final long serialVersionUID = -310540883995532224L;
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/InvalidStreamException.java b/jdk/src/share/classes/com/sun/nio/sctp/InvalidStreamException.java
index abe49f2..c331b25 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/InvalidStreamException.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/InvalidStreamException.java
@@ -30,6 +30,7 @@
*
* @since 1.7
*/
+@jdk.Exported
public class InvalidStreamException extends IllegalArgumentException {
private static final long serialVersionUID = -9172703378046665558L;
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/MessageInfo.java b/jdk/src/share/classes/com/sun/nio/sctp/MessageInfo.java
index 997c625..a63f909 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/MessageInfo.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/MessageInfo.java
@@ -56,6 +56,7 @@
*
* @since 1.7
*/
+@jdk.Exported
public abstract class MessageInfo {
/**
* Initializes a new instance of this class.
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/Notification.java b/jdk/src/share/classes/com/sun/nio/sctp/Notification.java
index 2436fae..8c20103 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/Notification.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/Notification.java
@@ -37,6 +37,7 @@
*
* @since 1.7
*/
+@jdk.Exported
public interface Notification {
/**
* Returns the association that this notification is applicable to.
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/NotificationHandler.java b/jdk/src/share/classes/com/sun/nio/sctp/NotificationHandler.java
index f5af2b2..f95d9ec 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/NotificationHandler.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/NotificationHandler.java
@@ -49,6 +49,7 @@
*
* @since 1.7
*/
+@jdk.Exported
public interface NotificationHandler<T> {
/**
* Invoked when a notification is received from the SCTP stack.
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java b/jdk/src/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java
index d8afdcd..e05c8bb 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java
@@ -32,6 +32,7 @@
*
* @since 1.7
*/
+@jdk.Exported
public abstract class PeerAddressChangeNotification
implements Notification
{
@@ -46,6 +47,7 @@
*
* @since 1.7
*/
+ @jdk.Exported
public enum AddressChangeEvent {
/**
* This address is now reachable.
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SctpChannel.java b/jdk/src/share/classes/com/sun/nio/sctp/SctpChannel.java
index 22cf076..52709b0 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/SctpChannel.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/SctpChannel.java
@@ -134,6 +134,7 @@
*
* @since 1.7
*/
+@jdk.Exported
public abstract class SctpChannel
extends AbstractSelectableChannel
{
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java b/jdk/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java
index 42e5659..79c5efb 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java
@@ -134,6 +134,7 @@
*
* @since 1.7
*/
+@jdk.Exported
public abstract class SctpMultiChannel
extends AbstractSelectableChannel
{
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java b/jdk/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java
index c96e516..a1e7a9a 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java
@@ -68,6 +68,7 @@
*
* @since 1.7
*/
+@jdk.Exported
public abstract class SctpServerChannel
extends AbstractSelectableChannel
{
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SctpSocketOption.java b/jdk/src/share/classes/com/sun/nio/sctp/SctpSocketOption.java
index 3cccefa..783bc56 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/SctpSocketOption.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/SctpSocketOption.java
@@ -35,4 +35,5 @@
*
* @see SctpStandardSocketOptions
*/
+@jdk.Exported
public interface SctpSocketOption<T> extends SocketOption<T> { }
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java b/jdk/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java
index 839c73b..1ac4c79 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java
@@ -34,6 +34,7 @@
*
* @since 1.7
*/
+@jdk.Exported
public class SctpStandardSocketOptions {
private SctpStandardSocketOptions() {}
/**
@@ -315,6 +316,7 @@
*
* @since 1.7
*/
+ @jdk.Exported
public static class InitMaxStreams {
private int maxInStreams;
private int maxOutStreams;
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SendFailedNotification.java b/jdk/src/share/classes/com/sun/nio/sctp/SendFailedNotification.java
index 2c3bc85..8178b3c 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/SendFailedNotification.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/SendFailedNotification.java
@@ -37,6 +37,7 @@
*
* @since 1.7
*/
+@jdk.Exported
public abstract class SendFailedNotification implements Notification {
/**
* Initializes a new instance of this class.
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/ShutdownNotification.java b/jdk/src/share/classes/com/sun/nio/sctp/ShutdownNotification.java
index 6405752..d3556b3 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/ShutdownNotification.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/ShutdownNotification.java
@@ -32,6 +32,7 @@
*
* @since 1.7
*/
+@jdk.Exported
public abstract class ShutdownNotification implements Notification {
/**
* Initializes a new instance of this class.
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/package-info.java b/jdk/src/share/classes/com/sun/nio/sctp/package-info.java
index 7893a4d..fe63d18 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/package-info.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/package-info.java
@@ -72,4 +72,5 @@
* @since 1.7
*/
+@jdk.Exported
package com.sun.nio.sctp;
diff --git a/jdk/src/share/classes/com/sun/security/auth/LdapPrincipal.java b/jdk/src/share/classes/com/sun/security/auth/LdapPrincipal.java
index 6e067fe..e974f2c 100644
--- a/jdk/src/share/classes/com/sun/security/auth/LdapPrincipal.java
+++ b/jdk/src/share/classes/com/sun/security/auth/LdapPrincipal.java
@@ -45,6 +45,7 @@
*
* @since 1.6
*/
+@jdk.Exported
public final class LdapPrincipal implements Principal, java.io.Serializable {
private static final long serialVersionUID = 6820120005580754861L;
diff --git a/jdk/src/share/classes/com/sun/security/auth/NTDomainPrincipal.java b/jdk/src/share/classes/com/sun/security/auth/NTDomainPrincipal.java
index 9afbfea..e89e565 100644
--- a/jdk/src/share/classes/com/sun/security/auth/NTDomainPrincipal.java
+++ b/jdk/src/share/classes/com/sun/security/auth/NTDomainPrincipal.java
@@ -45,6 +45,7 @@
* @see java.security.Principal
* @see javax.security.auth.Subject
*/
+@jdk.Exported
public class NTDomainPrincipal implements Principal, java.io.Serializable {
private static final long serialVersionUID = -4408637351440771220L;
diff --git a/jdk/src/share/classes/com/sun/security/auth/NTNumericCredential.java b/jdk/src/share/classes/com/sun/security/auth/NTNumericCredential.java
index b574f8c..02f9634 100644
--- a/jdk/src/share/classes/com/sun/security/auth/NTNumericCredential.java
+++ b/jdk/src/share/classes/com/sun/security/auth/NTNumericCredential.java
@@ -31,6 +31,7 @@
*
*/
+@jdk.Exported
public class NTNumericCredential {
private long impersonationToken;
diff --git a/jdk/src/share/classes/com/sun/security/auth/NTSid.java b/jdk/src/share/classes/com/sun/security/auth/NTSid.java
index 0720c5e..2c64deb 100644
--- a/jdk/src/share/classes/com/sun/security/auth/NTSid.java
+++ b/jdk/src/share/classes/com/sun/security/auth/NTSid.java
@@ -47,6 +47,7 @@
* @see java.security.Principal
* @see javax.security.auth.Subject
*/
+@jdk.Exported
public class NTSid implements Principal, java.io.Serializable {
private static final long serialVersionUID = 4412290580770249885L;
diff --git a/jdk/src/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java b/jdk/src/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java
index 0182c34..082b9c4 100644
--- a/jdk/src/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java
+++ b/jdk/src/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java
@@ -43,6 +43,7 @@
* @see java.security.Principal
* @see javax.security.auth.Subject
*/
+@jdk.Exported
public class NTSidDomainPrincipal extends NTSid {
private static final long serialVersionUID = 5247810785821650912L;
diff --git a/jdk/src/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java b/jdk/src/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java
index 66df636..52205c9 100644
--- a/jdk/src/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java
+++ b/jdk/src/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java
@@ -40,6 +40,7 @@
* @see javax.security.auth.Subject
* @see com.sun.security.auth.NTSid
*/
+@jdk.Exported
public class NTSidGroupPrincipal extends NTSid {
private static final long serialVersionUID = -1373347438636198229L;
diff --git a/jdk/src/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java b/jdk/src/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java
index 10055e5..7d3f666 100644
--- a/jdk/src/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java
+++ b/jdk/src/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java
@@ -39,6 +39,7 @@
* @see java.security.Principal
* @see javax.security.auth.Subject
*/
+@jdk.Exported
public class NTSidPrimaryGroupPrincipal extends NTSid {
private static final long serialVersionUID = 8011978367305190527L;
diff --git a/jdk/src/share/classes/com/sun/security/auth/NTSidUserPrincipal.java b/jdk/src/share/classes/com/sun/security/auth/NTSidUserPrincipal.java
index c7f8f9b..b180f52 100644
--- a/jdk/src/share/classes/com/sun/security/auth/NTSidUserPrincipal.java
+++ b/jdk/src/share/classes/com/sun/security/auth/NTSidUserPrincipal.java
@@ -39,6 +39,7 @@
* @see java.security.Principal
* @see javax.security.auth.Subject
*/
+@jdk.Exported
public class NTSidUserPrincipal extends NTSid {
private static final long serialVersionUID = -5573239889517749525L;
diff --git a/jdk/src/share/classes/com/sun/security/auth/NTUserPrincipal.java b/jdk/src/share/classes/com/sun/security/auth/NTUserPrincipal.java
index c5d4248..405d553 100644
--- a/jdk/src/share/classes/com/sun/security/auth/NTUserPrincipal.java
+++ b/jdk/src/share/classes/com/sun/security/auth/NTUserPrincipal.java
@@ -41,6 +41,7 @@
* @see java.security.Principal
* @see javax.security.auth.Subject
*/
+@jdk.Exported
public class NTUserPrincipal implements Principal, java.io.Serializable {
private static final long serialVersionUID = -8737649811939033735L;
diff --git a/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java b/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java
index 1df3442..a6402eb 100644
--- a/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java
+++ b/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java
@@ -215,6 +215,7 @@
* @see java.security.ProtectionDomain
* @see java.security.Security security properties
*/
+@jdk.Exported(false)
@Deprecated
public class PolicyFile extends javax.security.auth.Policy {
diff --git a/jdk/src/share/classes/com/sun/security/auth/PrincipalComparator.java b/jdk/src/share/classes/com/sun/security/auth/PrincipalComparator.java
index 2d8ccde..122a31c 100644
--- a/jdk/src/share/classes/com/sun/security/auth/PrincipalComparator.java
+++ b/jdk/src/share/classes/com/sun/security/auth/PrincipalComparator.java
@@ -50,6 +50,7 @@
* @see java.security.Principal
* @see javax.security.auth.Subject
*/
+@jdk.Exported
public interface PrincipalComparator {
/**
* Check if the specified <code>Subject</code> is implied by
diff --git a/jdk/src/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java b/jdk/src/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java
index 66943aa..bb7e8b8 100644
--- a/jdk/src/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java
+++ b/jdk/src/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java
@@ -45,6 +45,7 @@
* @see java.security.Principal
* @see javax.security.auth.Subject
*/
+@jdk.Exported(false)
@Deprecated
public class SolarisNumericGroupPrincipal implements
Principal,
diff --git a/jdk/src/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java b/jdk/src/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java
index 5623239..eff1f3d 100644
--- a/jdk/src/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java
+++ b/jdk/src/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java
@@ -44,6 +44,7 @@
* @see java.security.Principal
* @see javax.security.auth.Subject
*/
+@jdk.Exported(false)
@Deprecated
public class SolarisNumericUserPrincipal implements
Principal,
diff --git a/jdk/src/share/classes/com/sun/security/auth/SolarisPrincipal.java b/jdk/src/share/classes/com/sun/security/auth/SolarisPrincipal.java
index 406692c..bd3e8c8 100644
--- a/jdk/src/share/classes/com/sun/security/auth/SolarisPrincipal.java
+++ b/jdk/src/share/classes/com/sun/security/auth/SolarisPrincipal.java
@@ -44,6 +44,7 @@
* @see java.security.Principal
* @see javax.security.auth.Subject
*/
+@jdk.Exported(false)
@Deprecated
public class SolarisPrincipal implements Principal, java.io.Serializable {
diff --git a/jdk/src/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java b/jdk/src/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java
index 5c4260b..7e63b44 100644
--- a/jdk/src/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java
+++ b/jdk/src/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java
@@ -41,6 +41,7 @@
* @see java.security.Principal
* @see javax.security.auth.Subject
*/
+@jdk.Exported
public class UnixNumericGroupPrincipal implements
Principal,
java.io.Serializable {
diff --git a/jdk/src/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java b/jdk/src/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java
index bb15312..2581186 100644
--- a/jdk/src/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java
+++ b/jdk/src/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java
@@ -41,6 +41,7 @@
* @see java.security.Principal
* @see javax.security.auth.Subject
*/
+@jdk.Exported
public class UnixNumericUserPrincipal implements
Principal,
java.io.Serializable {
diff --git a/jdk/src/share/classes/com/sun/security/auth/UnixPrincipal.java b/jdk/src/share/classes/com/sun/security/auth/UnixPrincipal.java
index 67d9133..3a8004f 100644
--- a/jdk/src/share/classes/com/sun/security/auth/UnixPrincipal.java
+++ b/jdk/src/share/classes/com/sun/security/auth/UnixPrincipal.java
@@ -41,6 +41,7 @@
* @see java.security.Principal
* @see javax.security.auth.Subject
*/
+@jdk.Exported
public class UnixPrincipal implements Principal, java.io.Serializable {
private static final long serialVersionUID = -2951667807323493631L;
diff --git a/jdk/src/share/classes/com/sun/security/auth/UserPrincipal.java b/jdk/src/share/classes/com/sun/security/auth/UserPrincipal.java
index 0b8a9a8..a156b47 100644
--- a/jdk/src/share/classes/com/sun/security/auth/UserPrincipal.java
+++ b/jdk/src/share/classes/com/sun/security/auth/UserPrincipal.java
@@ -42,6 +42,7 @@
*
* @since 1.6
*/
+@jdk.Exported
public final class UserPrincipal implements Principal, java.io.Serializable {
private static final long serialVersionUID = 892106070870210969L;
diff --git a/jdk/src/share/classes/com/sun/security/auth/X500Principal.java b/jdk/src/share/classes/com/sun/security/auth/X500Principal.java
index cb48043..d4b7ce2 100644
--- a/jdk/src/share/classes/com/sun/security/auth/X500Principal.java
+++ b/jdk/src/share/classes/com/sun/security/auth/X500Principal.java
@@ -49,6 +49,7 @@
* class.
* @see javax.security.auth.x500.X500Principal
*/
+@jdk.Exported(false)
@Deprecated
public class X500Principal implements Principal, java.io.Serializable {
diff --git a/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java b/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java
index 9f6bd04..a68ad5d 100644
--- a/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java
+++ b/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java
@@ -54,6 +54,7 @@
* @see javax.security.auth.callback
* @deprecated This class will be removed in a future release.
*/
+@jdk.Exported(false)
@Deprecated
public class DialogCallbackHandler implements CallbackHandler {
diff --git a/jdk/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java b/jdk/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java
index 004c05d..6bebfb4 100644
--- a/jdk/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java
+++ b/jdk/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java
@@ -53,6 +53,7 @@
* @see javax.security.auth.callback
*/
+@jdk.Exported
public class TextCallbackHandler implements CallbackHandler {
/**
diff --git a/jdk/src/share/classes/com/sun/security/auth/callback/package-info.java b/jdk/src/share/classes/com/sun/security/auth/callback/package-info.java
new file mode 100644
index 0000000..61d6568
--- /dev/null
+++ b/jdk/src/share/classes/com/sun/security/auth/callback/package-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+@jdk.Exported
+package com.sun.security.auth.callback;
diff --git a/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java b/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java
index 3e6dc7d..5305817 100644
--- a/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java
+++ b/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java
@@ -83,6 +83,7 @@
* @see javax.security.auth.login.LoginContext
* @see java.security.Security security properties
*/
+@jdk.Exported
public class ConfigFile extends Configuration {
private final sun.security.provider.ConfigFile.Spi spi;
diff --git a/jdk/src/share/classes/com/sun/security/auth/login/package-info.java b/jdk/src/share/classes/com/sun/security/auth/login/package-info.java
new file mode 100644
index 0000000..a0b207c
--- /dev/null
+++ b/jdk/src/share/classes/com/sun/security/auth/login/package-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+@jdk.Exported
+package com.sun.security.auth.login;
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java b/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java
index b6b8660..35d35cc 100644
--- a/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java
+++ b/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java
@@ -151,6 +151,7 @@
* </pre>
*
*/
+@jdk.Exported
public class JndiLoginModule implements LoginModule {
private static final ResourceBundle rb = AccessController.doPrivileged(
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java b/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
index 70f74d6..ada7630 100644
--- a/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
+++ b/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
@@ -110,6 +110,7 @@
*
* </dl>
*/
+@jdk.Exported
public class KeyStoreLoginModule implements LoginModule {
private static final ResourceBundle rb = AccessController.doPrivileged(
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java b/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
index cd60c6a..c5b2689 100644
--- a/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
+++ b/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
@@ -379,6 +379,7 @@
* @author Ram Marti
*/
+@jdk.Exported
public class Krb5LoginModule implements LoginModule {
// initial state
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/LdapLoginModule.java b/jdk/src/share/classes/com/sun/security/auth/module/LdapLoginModule.java
index 10fa6b6..24c7571 100644
--- a/jdk/src/share/classes/com/sun/security/auth/module/LdapLoginModule.java
+++ b/jdk/src/share/classes/com/sun/security/auth/module/LdapLoginModule.java
@@ -304,6 +304,7 @@
*
* @since 1.6
*/
+@jdk.Exported
public class LdapLoginModule implements LoginModule {
// Use the default classloader for this class to load the prompt strings.
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/NTLoginModule.java b/jdk/src/share/classes/com/sun/security/auth/module/NTLoginModule.java
index 4ef208d..18fb73d 100644
--- a/jdk/src/share/classes/com/sun/security/auth/module/NTLoginModule.java
+++ b/jdk/src/share/classes/com/sun/security/auth/module/NTLoginModule.java
@@ -57,6 +57,7 @@
*
* @see javax.security.auth.spi.LoginModule
*/
+@jdk.Exported
public class NTLoginModule implements LoginModule {
private NTSystem ntSystem;
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/NTSystem.java b/jdk/src/share/classes/com/sun/security/auth/module/NTSystem.java
index 51f9a2c..502d92a 100644
--- a/jdk/src/share/classes/com/sun/security/auth/module/NTSystem.java
+++ b/jdk/src/share/classes/com/sun/security/auth/module/NTSystem.java
@@ -30,6 +30,7 @@
* security information for the current user.
*
*/
+@jdk.Exported
public class NTSystem {
private native void getCurrent(boolean debug);
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java b/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java
index 07042b7..e03eb7a 100644
--- a/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java
+++ b/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java
@@ -52,6 +52,7 @@
* UnixLoginModule.
*
*/
+@jdk.Exported(false)
@Deprecated
public class SolarisLoginModule implements LoginModule {
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/SolarisSystem.java b/jdk/src/share/classes/com/sun/security/auth/module/SolarisSystem.java
index 622671b..df4f527 100644
--- a/jdk/src/share/classes/com/sun/security/auth/module/SolarisSystem.java
+++ b/jdk/src/share/classes/com/sun/security/auth/module/SolarisSystem.java
@@ -30,6 +30,7 @@
* UID/GID/groups information for the current user.
*
*/
+@jdk.Exported
public class SolarisSystem {
private native void getSolarisInfo();
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java b/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java
index 00b7d25..3b59267 100644
--- a/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java
+++ b/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java
@@ -47,6 +47,7 @@
* debug messages will be output to the output stream, System.out.
*
*/
+@jdk.Exported
public class UnixLoginModule implements LoginModule {
// initial state
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/UnixSystem.java b/jdk/src/share/classes/com/sun/security/auth/module/UnixSystem.java
index b902cc9..804d8c1 100644
--- a/jdk/src/share/classes/com/sun/security/auth/module/UnixSystem.java
+++ b/jdk/src/share/classes/com/sun/security/auth/module/UnixSystem.java
@@ -30,6 +30,7 @@
* UID/GID/groups information for the current user.
*
*/
+@jdk.Exported
public class UnixSystem {
private native void getUnixInfo();
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/package-info.java b/jdk/src/share/classes/com/sun/security/auth/module/package-info.java
new file mode 100644
index 0000000..2156967
--- /dev/null
+++ b/jdk/src/share/classes/com/sun/security/auth/module/package-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+@jdk.Exported
+package com.sun.security.auth.module;
diff --git a/jdk/src/share/classes/com/sun/security/auth/package-info.java b/jdk/src/share/classes/com/sun/security/auth/package-info.java
new file mode 100644
index 0000000..3fe7e20
--- /dev/null
+++ b/jdk/src/share/classes/com/sun/security/auth/package-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+@jdk.Exported
+package com.sun.security.auth;
diff --git a/jdk/src/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java b/jdk/src/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java
index afdb880..fdabd19 100644
--- a/jdk/src/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java
+++ b/jdk/src/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java
@@ -28,7 +28,8 @@
/**
* Kerberos 5 AuthorizationData entry.
*/
-final public class AuthorizationDataEntry {
+@jdk.Exported
+public final class AuthorizationDataEntry {
private final int type;
private final byte[] data;
diff --git a/jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSContext.java b/jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSContext.java
index 3d8935a..798379e 100644
--- a/jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSContext.java
+++ b/jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSContext.java
@@ -32,6 +32,7 @@
* functionalities not defined by {@code org.ietf.jgss.GSSContext},
* such as querying context-specific attributes.
*/
+@jdk.Exported
public interface ExtendedGSSContext extends GSSContext {
/**
* Return the mechanism-specific attribute associated with {@code type}.
diff --git a/jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java b/jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java
index 8f09482..bf44dff 100644
--- a/jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java
+++ b/jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java
@@ -32,6 +32,7 @@
* functionalities not defined by {@code org.ietf.jgss.GSSCredential}.
* @since 1.8
*/
+@jdk.Exported
public interface ExtendedGSSCredential extends GSSCredential {
/**
* Impersonates a principal. In Kerberos, this can be implemented
diff --git a/jdk/src/share/classes/com/sun/security/jgss/GSSUtil.java b/jdk/src/share/classes/com/sun/security/jgss/GSSUtil.java
index d05582a..50b83da 100644
--- a/jdk/src/share/classes/com/sun/security/jgss/GSSUtil.java
+++ b/jdk/src/share/classes/com/sun/security/jgss/GSSUtil.java
@@ -33,6 +33,7 @@
* GSS-API Utilities for using in conjunction with Sun Microsystem's
* implementation of Java GSS-API.
*/
+@jdk.Exported
public class GSSUtil {
/**
diff --git a/jdk/src/share/classes/com/sun/security/jgss/InquireSecContextPermission.java b/jdk/src/share/classes/com/sun/security/jgss/InquireSecContextPermission.java
index e07072d..1e247f9 100644
--- a/jdk/src/share/classes/com/sun/security/jgss/InquireSecContextPermission.java
+++ b/jdk/src/share/classes/com/sun/security/jgss/InquireSecContextPermission.java
@@ -35,6 +35,7 @@
*
* <p>The target name is the {@link InquireType} allowed.
*/
+@jdk.Exported
public final class InquireSecContextPermission extends BasicPermission {
private static final long serialVersionUID = -7131173349668647297L;
diff --git a/jdk/src/share/classes/com/sun/security/jgss/InquireType.java b/jdk/src/share/classes/com/sun/security/jgss/InquireType.java
index e69ad1a..c153ccb 100644
--- a/jdk/src/share/classes/com/sun/security/jgss/InquireType.java
+++ b/jdk/src/share/classes/com/sun/security/jgss/InquireType.java
@@ -29,6 +29,7 @@
* Attribute types that can be specified as an argument of
* {@link com.sun.security.jgss.ExtendedGSSContext#inquireSecContext}
*/
+@jdk.Exported
public enum InquireType {
/**
* Attribute type for retrieving the session key of an
diff --git a/jdk/src/share/classes/com/sun/security/jgss/package-info.java b/jdk/src/share/classes/com/sun/security/jgss/package-info.java
new file mode 100644
index 0000000..b1c82d7
--- /dev/null
+++ b/jdk/src/share/classes/com/sun/security/jgss/package-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+@jdk.Exported
+package com.sun.security.jgss;
diff --git a/jdk/src/share/classes/com/sun/tools/attach/AgentInitializationException.java b/jdk/src/share/classes/com/sun/tools/attach/AgentInitializationException.java
index 5f241b4..cee1a51 100644
--- a/jdk/src/share/classes/com/sun/tools/attach/AgentInitializationException.java
+++ b/jdk/src/share/classes/com/sun/tools/attach/AgentInitializationException.java
@@ -40,6 +40,7 @@
* the error returned by the agent's <code>Agent_OnAttach</code> function.
* This error code can be obtained by invoking the {@link #returnValue() returnValue} method.
*/
+@jdk.Exported
public class AgentInitializationException extends Exception {
/** use serialVersionUID for interoperability */
diff --git a/jdk/src/share/classes/com/sun/tools/attach/AgentLoadException.java b/jdk/src/share/classes/com/sun/tools/attach/AgentLoadException.java
index a724d8b..fa19a5f 100644
--- a/jdk/src/share/classes/com/sun/tools/attach/AgentLoadException.java
+++ b/jdk/src/share/classes/com/sun/tools/attach/AgentLoadException.java
@@ -36,6 +36,7 @@
* com.sun.tools.attach.VirtualMachine#loadAgentPath loadAgentPath} methods
* if the agent, or agent library, cannot be loaded.
*/
+@jdk.Exported
public class AgentLoadException extends Exception {
/** use serialVersionUID for interoperability */
diff --git a/jdk/src/share/classes/com/sun/tools/attach/AttachNotSupportedException.java b/jdk/src/share/classes/com/sun/tools/attach/AttachNotSupportedException.java
index ac4d1ee..40f8624 100644
--- a/jdk/src/share/classes/com/sun/tools/attach/AttachNotSupportedException.java
+++ b/jdk/src/share/classes/com/sun/tools/attach/AttachNotSupportedException.java
@@ -36,6 +36,7 @@
* AttachProvider.attachVirtualMachine} if the provider attempts to
* attach to a Java virtual machine with which it not comptatible.
*/
+@jdk.Exported
public class AttachNotSupportedException extends Exception {
/** use serialVersionUID for interoperability */
diff --git a/jdk/src/share/classes/com/sun/tools/attach/AttachPermission.java b/jdk/src/share/classes/com/sun/tools/attach/AttachPermission.java
index ca094d6..4d05f1e 100644
--- a/jdk/src/share/classes/com/sun/tools/attach/AttachPermission.java
+++ b/jdk/src/share/classes/com/sun/tools/attach/AttachPermission.java
@@ -79,6 +79,7 @@
* @see com.sun.tools.attach.spi.AttachProvider
*/
+@jdk.Exported
public final class AttachPermission extends java.security.BasicPermission {
/** use serialVersionUID for interoperability */
diff --git a/jdk/src/share/classes/com/sun/tools/attach/VirtualMachine.java b/jdk/src/share/classes/com/sun/tools/attach/VirtualMachine.java
index 29464d8..1bea751 100644
--- a/jdk/src/share/classes/com/sun/tools/attach/VirtualMachine.java
+++ b/jdk/src/share/classes/com/sun/tools/attach/VirtualMachine.java
@@ -102,6 +102,7 @@
* @since 1.6
*/
+@jdk.Exported
public abstract class VirtualMachine {
private AttachProvider provider;
private String id;
diff --git a/jdk/src/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java b/jdk/src/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java
index 9334ea1..3e27fe8 100644
--- a/jdk/src/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java
+++ b/jdk/src/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java
@@ -55,6 +55,7 @@
*
* @since 1.6
*/
+@jdk.Exported
public class VirtualMachineDescriptor {
private AttachProvider provider;
diff --git a/jdk/src/share/classes/com/sun/tools/attach/package-info.java b/jdk/src/share/classes/com/sun/tools/attach/package-info.java
new file mode 100644
index 0000000..e335725
--- /dev/null
+++ b/jdk/src/share/classes/com/sun/tools/attach/package-info.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2005, 2013, 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.
+ */
+
+/**
+ * Provides the API to attach to a Java<sup><font size=-2>TM</font></sup>
+ * virtual machine.
+ * <p>
+ * A tool, written in the Java Language, uses this API to attach to a target
+ * virtual machine (VM) and load its tool agent into the target VM. For
+ * example, a management console might have a management agent which it uses
+ * to obtain management information from instrumented objects in a Java
+ * virtual machine. If the management console is required to manage
+ * an application that is running in a virtual machine that does not include
+ * the management agent, then this API can be used to attach to the target
+ * VM and load the agent.
+ *
+ * @since 1.6
+ */
+
+@jdk.Exported
+package com.sun.tools.attach;
diff --git a/jdk/src/share/classes/com/sun/tools/attach/package.html b/jdk/src/share/classes/com/sun/tools/attach/package.html
deleted file mode 100644
index 8673b11..0000000
--- a/jdk/src/share/classes/com/sun/tools/attach/package.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
- Copyright (c) 2005, 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.
--->
-
-<!doctype html public "-//IETF//DTD HTML//EN">
-<html>
-<body bgcolor="white">
-
-Provides the API to attach to a Java<sup><font size=-2>TM</font></sup>
-virtual machine.
-
-A tool, written in the Java Language, uses this API to attach to a target
-virtual machine (VM) and load its tool agent into the target VM. For
-example, a management console might have a management agent which it uses
-to obtain management information from instrumented objects in a Java
-virtual machine. If the management console is required to manage
-an application that is running in a virtual machine that does not include
-the management agent, then this API can be used to attach to the target
-VM and load the agent.
-
-@since 1.6
-
-</body>
-</html>
-
-
-
diff --git a/jdk/src/share/classes/com/sun/tools/attach/spi/AttachProvider.java b/jdk/src/share/classes/com/sun/tools/attach/spi/AttachProvider.java
index f85daab..67f74f7 100644
--- a/jdk/src/share/classes/com/sun/tools/attach/spi/AttachProvider.java
+++ b/jdk/src/share/classes/com/sun/tools/attach/spi/AttachProvider.java
@@ -74,6 +74,7 @@
* @since 1.6
*/
+@jdk.Exported
public abstract class AttachProvider {
private static final Object lock = new Object();
diff --git a/jdk/src/share/classes/com/sun/tools/attach/spi/package-info.java b/jdk/src/share/classes/com/sun/tools/attach/spi/package-info.java
new file mode 100644
index 0000000..b2c68eb
--- /dev/null
+++ b/jdk/src/share/classes/com/sun/tools/attach/spi/package-info.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2005, 2013, 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.
+ */
+
+
+/**
+ * Only developers who are defining new attach providers should need to make
+ * direct use of this package.
+ *
+ * @since 1.6
+ */
+
+@jdk.Exported
+package com.sun.tools.attach.spi;
diff --git a/jdk/src/share/classes/com/sun/tools/attach/spi/package.html b/jdk/src/share/classes/com/sun/tools/attach/spi/package.html
deleted file mode 100644
index 28b7db6..0000000
--- a/jdk/src/share/classes/com/sun/tools/attach/spi/package.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
- Copyright (c) 2005, 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.
--->
-
-<!doctype html public "-//IETF//DTD HTML//EN">
-<html>
-<body bgcolor="white">
-
-Provider classes for the <tt>{@link com.sun.tools.attach}</tt> package.
-
-<p> Only developers who are defining new attach providers should need to make
-direct use of this package. </p>
-
-@since 1.6
-
-</body>
-</html>
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java b/jdk/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java
index d44a8fc..bdf01b8 100644
--- a/jdk/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java
+++ b/jdk/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java
@@ -84,7 +84,7 @@
lastPackage = pkg;
printClass(clazz);
if (clazz.getId() != -1) {
- out.print(" [" + clazz.getIdString() + "]");
+ print(" [" + clazz.getIdString() + "]");
}
out.println("<br>");
}
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java b/jdk/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java
index 1d57823..f13572a 100644
--- a/jdk/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java
+++ b/jdk/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java
@@ -112,12 +112,12 @@
out.println("<h2>Instances</h2>");
printAnchorStart();
- out.print("instances/" + encodeForURL(clazz));
+ print("instances/" + encodeForURL(clazz));
out.print("\">");
out.println("Exclude subclasses</a><br>");
printAnchorStart();
- out.print("allInstances/" + encodeForURL(clazz));
+ print("allInstances/" + encodeForURL(clazz));
out.print("\">");
out.println("Include subclasses</a><br>");
@@ -126,19 +126,19 @@
out.println("<h2>New Instances</h2>");
printAnchorStart();
- out.print("newInstances/" + encodeForURL(clazz));
+ print("newInstances/" + encodeForURL(clazz));
out.print("\">");
out.println("Exclude subclasses</a><br>");
printAnchorStart();
- out.print("allNewInstances/" + encodeForURL(clazz));
+ print("allNewInstances/" + encodeForURL(clazz));
out.print("\">");
out.println("Include subclasses</a><br>");
}
out.println("<h2>References summary by Type</h2>");
printAnchorStart();
- out.print("refsByType/" + encodeForURL(clazz));
+ print("refsByType/" + encodeForURL(clazz));
out.print("\">");
out.println("References summary by type</a>");
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java b/jdk/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java
index f86c8ca..f08c987 100644
--- a/jdk/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java
+++ b/jdk/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java
@@ -41,21 +41,17 @@
import java.net.Socket;
-import java.net.ServerSocket;
-import java.net.InetAddress;
import java.io.InputStream;
import java.io.BufferedInputStream;
import java.io.IOException;
-import java.io.Writer;
import java.io.BufferedWriter;
import java.io.PrintWriter;
-import java.io.OutputStream;
import java.io.OutputStreamWriter;
-import java.io.BufferedOutputStream;
import com.sun.tools.hat.internal.model.Snapshot;
import com.sun.tools.hat.internal.oql.OQLEngine;
+import com.sun.tools.hat.internal.util.Misc;
public class HttpReader implements Runnable {
@@ -87,7 +83,7 @@
outputError("Protocol error");
}
int data;
- StringBuffer queryBuf = new StringBuffer();
+ StringBuilder queryBuf = new StringBuilder();
while ((data = in.read()) != -1 && data != ' ') {
char ch = (char) data;
queryBuf.append(ch);
@@ -217,7 +213,7 @@
private void outputError(String msg) {
out.println();
out.println("<html><body bgcolor=\"#ffffff\">");
- out.println(msg);
+ out.println(Misc.encodeHtml(msg));
out.println("</body></html>");
}
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java b/jdk/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java
index 724b549..7e87543 100644
--- a/jdk/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java
+++ b/jdk/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java
@@ -102,7 +102,7 @@
int count = clazz.getInstancesCount(false);
print("" + count);
printAnchorStart();
- out.print("instances/" + encodeForURL(classes[i]));
+ print("instances/" + encodeForURL(classes[i]));
out.print("\"> ");
if (count == 1) {
print("instance");
@@ -121,7 +121,7 @@
}
print("(");
printAnchorStart();
- out.print("newInstances/" + encodeForURL(classes[i]));
+ print("newInstances/" + encodeForURL(classes[i]));
out.print("\">");
print("" + newInst + " new");
out.print("</a>) ");
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java b/jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java
index 6aaa909..730d2b7 100644
--- a/jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java
+++ b/jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java
@@ -54,10 +54,7 @@
out.print((char)ch);
}
} catch (Exception exp) {
- out.println(exp.getMessage());
- out.println("<pre>");
- exp.printStackTrace(out);
- out.println("</pre>");
+ printException(exp);
}
}
}
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java b/jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java
index 8e5ec5e..3e99bbc 100644
--- a/jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java
+++ b/jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java
@@ -32,10 +32,7 @@
package com.sun.tools.hat.internal.server;
-import com.sun.tools.hat.internal.model.*;
import com.sun.tools.hat.internal.oql.*;
-import com.sun.tools.hat.internal.util.ArraySorter;
-import com.sun.tools.hat.internal.util.Comparer;
/**
* This handles Object Query Language (OQL) queries.
@@ -68,7 +65,7 @@
out.println("<p align='center'>");
out.println("<textarea name='query' cols=80 rows=10>");
if (oql != null) {
- out.println(oql);
+ println(oql);
}
out.println("</textarea>");
out.println("</p>");
@@ -91,10 +88,7 @@
try {
out.println(engine.toHtml(o));
} catch (Exception e) {
- out.println(e.getMessage());
- out.println("<pre>");
- e.printStackTrace(out);
- out.println("</pre>");
+ printException(e);
}
out.println("</td></tr>");
return false;
@@ -102,10 +96,7 @@
});
out.println("</table>");
} catch (OQLException exp) {
- out.println(exp.getMessage());
- out.println("<pre>");
- exp.printStackTrace(out);
- out.println("</pre>");
+ printException(exp);
}
}
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java b/jdk/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java
index deda0f4..9a6d93d 100644
--- a/jdk/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java
+++ b/jdk/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java
@@ -36,6 +36,7 @@
import com.sun.tools.hat.internal.model.*;
import com.sun.tools.hat.internal.util.Misc;
+import java.io.StringWriter;
import java.net.URLEncoder;
import java.io.UnsupportedEncodingException;
@@ -96,7 +97,7 @@
}
protected void error(String msg) {
- out.println(msg);
+ println(msg);
}
protected void printAnchorStart() {
@@ -160,7 +161,6 @@
out.println("null");
return;
}
- String name = clazz.getName();
printAnchorStart();
out.print("class/");
print(encodeForURL(clazz));
@@ -208,6 +208,15 @@
}
}
+ protected void printException(Throwable t) {
+ println(t.getMessage());
+ out.println("<pre>");
+ StringWriter sw = new StringWriter();
+ t.printStackTrace(new PrintWriter(sw));
+ print(sw.toString());
+ out.println("</pre>");
+ }
+
protected void printHex(long addr) {
if (snapshot.getIdentifierSize() == 4) {
out.print(Misc.toHex((int)addr));
@@ -223,4 +232,8 @@
protected void print(String str) {
out.print(Misc.encodeHtml(str));
}
+
+ protected void println(String str) {
+ out.println(Misc.encodeHtml(str));
+ }
}
diff --git a/jdk/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java b/jdk/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java
index 5e7de9a..3337b47 100644
--- a/jdk/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java
+++ b/jdk/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java
@@ -89,7 +89,7 @@
out.println("<p align='center'>");
printClass(clazz);
if (clazz.getId() != -1) {
- out.println("[" + clazz.getIdString() + "]");
+ println("[" + clazz.getIdString() + "]");
}
out.println("</p>");
@@ -125,9 +125,9 @@
JavaClass clazz = classes[i];
out.println("<tr><td>");
out.print("<a href='/refsByType/");
- out.print(clazz.getIdString());
+ print(clazz.getIdString());
out.print("'>");
- out.print(clazz.getName());
+ print(clazz.getName());
out.println("</a>");
out.println("</td><td>");
out.println(map.get(clazz));
diff --git a/jdk/src/share/classes/com/sun/tools/jconsole/JConsoleContext.java b/jdk/src/share/classes/com/sun/tools/jconsole/JConsoleContext.java
index 0c24061..9c8895f 100644
--- a/jdk/src/share/classes/com/sun/tools/jconsole/JConsoleContext.java
+++ b/jdk/src/share/classes/com/sun/tools/jconsole/JConsoleContext.java
@@ -43,6 +43,7 @@
*
* @since 1.6
*/
+@jdk.Exported
public interface JConsoleContext {
/**
* The {@link ConnectionState ConnectionState} bound property name.
@@ -53,6 +54,7 @@
* Values for the {@linkplain #CONNECTION_STATE_PROPERTY
* <i>ConnectionState</i>} bound property.
*/
+ @jdk.Exported
public enum ConnectionState {
/**
* The connection has been successfully established.
diff --git a/jdk/src/share/classes/com/sun/tools/jconsole/JConsolePlugin.java b/jdk/src/share/classes/com/sun/tools/jconsole/JConsolePlugin.java
index ab8a969..daff88c 100644
--- a/jdk/src/share/classes/com/sun/tools/jconsole/JConsolePlugin.java
+++ b/jdk/src/share/classes/com/sun/tools/jconsole/JConsolePlugin.java
@@ -72,6 +72,7 @@
*
* @since 1.6
*/
+@jdk.Exported
public abstract class JConsolePlugin {
private volatile JConsoleContext context = null;
private List<PropertyChangeListener> listeners = null;
diff --git a/jdk/src/share/classes/com/sun/tools/jconsole/package-info.java b/jdk/src/share/classes/com/sun/tools/jconsole/package-info.java
new file mode 100644
index 0000000..99b52aa3
--- /dev/null
+++ b/jdk/src/share/classes/com/sun/tools/jconsole/package-info.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2006, 2013, 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 package contains the JConsole API.
+ *
+ * @since 1.6
+ */
+
+@jdk.Exported
+package com.sun.tools.jconsole;
diff --git a/jdk/src/share/classes/com/sun/tools/jconsole/package.html b/jdk/src/share/classes/com/sun/tools/jconsole/package.html
deleted file mode 100644
index c0859d2..0000000
--- a/jdk/src/share/classes/com/sun/tools/jconsole/package.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
- Copyright (c) 2006, 2007, 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.
--->
-
-<!doctype html public "-//IETF//DTD HTML//EN">
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-This package contains the JConsole API.
-
-@since 1.6
-
-</body>
-</html>
diff --git a/jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java b/jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java
index ac14033..86ac95c 100644
--- a/jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java
+++ b/jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java
@@ -30,6 +30,9 @@
import java.util.*;
import sun.awt.datatransfer.DataTransferer;
+import sun.reflect.misc.ReflectUtil;
+
+import static sun.security.util.SecurityConstants.GET_CLASSLOADER_PERMISSION;
/**
* A {@code DataFlavor} provides meta information about data. {@code DataFlavor}
@@ -116,27 +119,33 @@
ClassLoader fallback)
throws ClassNotFoundException
{
- ClassLoader systemClassLoader = (ClassLoader)
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Object run() {
- ClassLoader cl = Thread.currentThread().
- getContextClassLoader();
- return (cl != null)
- ? cl
- : ClassLoader.getSystemClassLoader();
- }
- });
-
+ ReflectUtil.checkPackageAccess(className);
try {
- return Class.forName(className, true, systemClassLoader);
- } catch (ClassNotFoundException e2) {
- if (fallback != null) {
- return Class.forName(className, true, fallback);
- } else {
- throw new ClassNotFoundException(className);
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(GET_CLASSLOADER_PERMISSION);
}
+ ClassLoader loader = ClassLoader.getSystemClassLoader();
+ try {
+ // bootstrap class loader and system class loader if present
+ return Class.forName(className, true, loader);
+ }
+ catch (ClassNotFoundException exception) {
+ // thread context class loader if and only if present
+ loader = Thread.currentThread().getContextClassLoader();
+ if (loader != null) {
+ try {
+ return Class.forName(className, true, loader);
+ }
+ catch (ClassNotFoundException e) {
+ // fallback to user's class loader
+ }
+ }
+ }
+ } catch (SecurityException exception) {
+ // ignore secured class loaders
}
+ return Class.forName(className, true, fallback);
}
/*
diff --git a/jdk/src/share/classes/java/beans/Beans.java b/jdk/src/share/classes/java/beans/Beans.java
index 58a4116..5bf13fa 100644
--- a/jdk/src/share/classes/java/beans/Beans.java
+++ b/jdk/src/share/classes/java/beans/Beans.java
@@ -42,6 +42,8 @@
import java.io.ObjectStreamClass;
import java.io.StreamCorruptedException;
+import java.lang.reflect.Modifier;
+
import java.net.URL;
import java.security.AccessController;
@@ -224,6 +226,10 @@
throw ex;
}
+ if (!Modifier.isPublic(cl.getModifiers())) {
+ throw new ClassNotFoundException("" + cl + " : no public access");
+ }
+
/*
* Try to instantiate the class.
*/
diff --git a/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java b/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java
index 0d056c2..d4ec31a 100644
--- a/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java
+++ b/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java
@@ -222,6 +222,9 @@
// Write out the properties of this instance.
private void initBean(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
for (Field field : type.getFields()) {
+ if (!ReflectUtil.isPackageAccessible(field.getDeclaringClass())) {
+ continue;
+ }
int mod = field.getModifiers();
if (Modifier.isFinal(mod) || Modifier.isStatic(mod) || Modifier.isTransient(mod)) {
continue;
diff --git a/jdk/src/share/classes/java/beans/MetaData.java b/jdk/src/share/classes/java/beans/MetaData.java
index 61f51d4..d733b6f 100644
--- a/jdk/src/share/classes/java/beans/MetaData.java
+++ b/jdk/src/share/classes/java/beans/MetaData.java
@@ -42,6 +42,7 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
@@ -56,7 +57,7 @@
import sun.swing.PrintColorUIResource;
-import java.util.Objects;
+import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
/*
* Like the <code>Intropector</code>, the <code>MetaData</code> class
@@ -850,13 +851,15 @@
static class StaticFieldsPersistenceDelegate extends PersistenceDelegate {
protected void installFields(Encoder out, Class<?> cls) {
- Field fields[] = cls.getFields();
- for(int i = 0; i < fields.length; i++) {
- Field field = fields[i];
- // Don't install primitives, their identity will not be preserved
- // by wrapping.
- if (Object.class.isAssignableFrom(field.getType())) {
- out.writeExpression(new Expression(field, "get", new Object[]{null}));
+ if (Modifier.isPublic(cls.getModifiers()) && isPackageAccessible(cls)) {
+ Field fields[] = cls.getFields();
+ for(int i = 0; i < fields.length; i++) {
+ Field field = fields[i];
+ // Don't install primitives, their identity will not be preserved
+ // by wrapping.
+ if (Object.class.isAssignableFrom(field.getType())) {
+ out.writeExpression(new Expression(field, "get", new Object[]{null}));
+ }
}
}
}
diff --git a/jdk/src/share/classes/java/io/ObjectInputStream.java b/jdk/src/share/classes/java/io/ObjectInputStream.java
index d754cc2c..c71681c 100644
--- a/jdk/src/share/classes/java/io/ObjectInputStream.java
+++ b/jdk/src/share/classes/java/io/ObjectInputStream.java
@@ -491,11 +491,12 @@
public void defaultReadObject()
throws IOException, ClassNotFoundException
{
- if (curContext == null) {
+ SerialCallbackContext ctx = curContext;
+ if (ctx == null) {
throw new NotActiveException("not in call to readObject");
}
- Object curObj = curContext.getObj();
- ObjectStreamClass curDesc = curContext.getDesc();
+ Object curObj = ctx.getObj();
+ ObjectStreamClass curDesc = ctx.getDesc();
bin.setBlockDataMode(false);
defaultReadFields(curObj, curDesc);
bin.setBlockDataMode(true);
@@ -529,11 +530,12 @@
public ObjectInputStream.GetField readFields()
throws IOException, ClassNotFoundException
{
- if (curContext == null) {
+ SerialCallbackContext ctx = curContext;
+ if (ctx == null) {
throw new NotActiveException("not in call to readObject");
}
- Object curObj = curContext.getObj();
- ObjectStreamClass curDesc = curContext.getDesc();
+ Object curObj = ctx.getObj();
+ ObjectStreamClass curDesc = ctx.getDesc();
bin.setBlockDataMode(false);
GetFieldImpl getField = new GetFieldImpl(curDesc);
getField.readFields();
@@ -1968,7 +1970,6 @@
private void defaultReadFields(Object obj, ObjectStreamClass desc)
throws IOException
{
- // REMIND: is isInstance check necessary?
Class<?> cl = desc.forClass();
if (cl != null && obj != null && !cl.isInstance(obj)) {
throw new ClassCastException();
diff --git a/jdk/src/share/classes/java/io/ObjectOutputStream.java b/jdk/src/share/classes/java/io/ObjectOutputStream.java
index 6f4c1f3..c851b3a 100644
--- a/jdk/src/share/classes/java/io/ObjectOutputStream.java
+++ b/jdk/src/share/classes/java/io/ObjectOutputStream.java
@@ -431,11 +431,12 @@
* <code>OutputStream</code>
*/
public void defaultWriteObject() throws IOException {
- if ( curContext == null ) {
+ SerialCallbackContext ctx = curContext;
+ if (ctx == null) {
throw new NotActiveException("not in call to writeObject");
}
- Object curObj = curContext.getObj();
- ObjectStreamClass curDesc = curContext.getDesc();
+ Object curObj = ctx.getObj();
+ ObjectStreamClass curDesc = ctx.getDesc();
bout.setBlockDataMode(false);
defaultWriteFields(curObj, curDesc);
bout.setBlockDataMode(true);
@@ -453,11 +454,12 @@
*/
public ObjectOutputStream.PutField putFields() throws IOException {
if (curPut == null) {
- if (curContext == null) {
+ SerialCallbackContext ctx = curContext;
+ if (ctx == null) {
throw new NotActiveException("not in call to writeObject");
}
- Object curObj = curContext.getObj();
- ObjectStreamClass curDesc = curContext.getDesc();
+ Object curObj = ctx.getObj();
+ ObjectStreamClass curDesc = ctx.getDesc();
curPut = new PutFieldImpl(curDesc);
}
return curPut;
@@ -1517,7 +1519,11 @@
private void defaultWriteFields(Object obj, ObjectStreamClass desc)
throws IOException
{
- // REMIND: perform conservative isInstance check here?
+ Class<?> cl = desc.forClass();
+ if (cl != null && obj != null && !cl.isInstance(obj)) {
+ throw new ClassCastException();
+ }
+
desc.checkDefaultSerialize();
int primDataSize = desc.getPrimDataSize();
diff --git a/jdk/src/share/classes/java/lang/Class.java b/jdk/src/share/classes/java/lang/Class.java
index 6d1aa00..500f70d 100644
--- a/jdk/src/share/classes/java/lang/Class.java
+++ b/jdk/src/share/classes/java/lang/Class.java
@@ -1209,9 +1209,25 @@
* type, or void,then this method returns null.
*
* @return the declaring class for this class
+ * @throws SecurityException
+ * If a security manager, <i>s</i>, is present and the caller's
+ * class loader is not the same as or an ancestor of the class
+ * loader for the declaring class and invocation of {@link
+ * SecurityManager#checkPackageAccess s.checkPackageAccess()}
+ * denies access to the package of the declaring class
* @since JDK1.1
*/
- public native Class<?> getDeclaringClass();
+ @CallerSensitive
+ public Class<?> getDeclaringClass() throws SecurityException {
+ final Class<?> candidate = getDeclaringClass0();
+
+ if (candidate != null)
+ candidate.checkPackageAccess(
+ ClassLoader.getClassLoader(Reflection.getCallerClass()), true);
+ return candidate;
+ }
+
+ private native Class<?> getDeclaringClass0();
/**
diff --git a/jdk/src/share/classes/java/lang/ClassLoader.java b/jdk/src/share/classes/java/lang/ClassLoader.java
index c3f2aa2..7aa5087a 100644
--- a/jdk/src/share/classes/java/lang/ClassLoader.java
+++ b/jdk/src/share/classes/java/lang/ClassLoader.java
@@ -57,6 +57,7 @@
import sun.misc.VM;
import sun.reflect.CallerSensitive;
import sun.reflect.Reflection;
+import sun.reflect.misc.ReflectUtil;
import sun.security.util.SecurityConstants;
/**
@@ -486,6 +487,13 @@
private void checkPackageAccess(Class<?> cls, ProtectionDomain pd) {
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
+ if (ReflectUtil.isNonPublicProxyClass(cls)) {
+ for (Class intf: cls.getInterfaces()) {
+ checkPackageAccess(intf, pd);
+ }
+ return;
+ }
+
final String name = cls.getName();
final int i = name.lastIndexOf('.');
if (i != -1) {
@@ -1061,6 +1069,10 @@
* built-in to the virtual machine is searched. That failing, this method
* will invoke {@link #findResource(String)} to find the resource. </p>
*
+ * @apiNote When overriding this method it is recommended that an
+ * implementation ensures that any delegation is consistent with the {@link
+ * #getResources(java.lang.String) getResources(String)} method.
+ *
* @param name
* The resource name
*
@@ -1094,6 +1106,13 @@
* <p> The search order is described in the documentation for {@link
* #getResource(String)}. </p>
*
+ * @apiNote When overriding this method it is recommended that an
+ * implementation ensures that any delegation is consistent with the {@link
+ * #getResource(java.lang.String) getResource(String)} method. This should
+ * ensure that the first element returned by the Enumeration's
+ * {@code nextElement} method is the same resource that the
+ * {@code getResource(String)} method would return.
+ *
* @param name
* The resource name
*
diff --git a/jdk/src/share/classes/java/lang/System.java b/jdk/src/share/classes/java/lang/System.java
index 79eb643..c5b5e9e 100644
--- a/jdk/src/share/classes/java/lang/System.java
+++ b/jdk/src/share/classes/java/lang/System.java
@@ -26,6 +26,7 @@
import java.io.*;
import java.lang.reflect.Executable;
+import java.security.AccessControlContext;
import java.util.Properties;
import java.util.PropertyPermission;
import java.util.StringTokenizer;
@@ -1254,6 +1255,9 @@
public String newStringUnsafe(char[] chars) {
return new String(chars, true);
}
+ public Thread newThreadWithAcc(Runnable target, AccessControlContext acc) {
+ return new Thread(target, acc);
+ }
});
}
}
diff --git a/jdk/src/share/classes/java/lang/Thread.java b/jdk/src/share/classes/java/lang/Thread.java
index d8a9ee2..c2f5561b 100644
--- a/jdk/src/share/classes/java/lang/Thread.java
+++ b/jdk/src/share/classes/java/lang/Thread.java
@@ -341,6 +341,15 @@
}
/**
+ * Initializes a Thread with the current AccessControlContext.
+ * @see #init(ThreadGroup,Runnable,String,long,AccessControlContext)
+ */
+ private void init(ThreadGroup g, Runnable target, String name,
+ long stackSize) {
+ init(g, target, name, stackSize, null);
+ }
+
+ /**
* Initializes a Thread.
*
* @param g the Thread group
@@ -348,9 +357,11 @@
* @param name the name of the new Thread
* @param stackSize the desired stack size for the new thread, or
* zero to indicate that this parameter is to be ignored.
+ * @param acc the AccessControlContext to inherit, or
+ * AccessController.getContext() if null
*/
private void init(ThreadGroup g, Runnable target, String name,
- long stackSize) {
+ long stackSize, AccessControlContext acc) {
if (name == null) {
throw new NullPointerException("name cannot be null");
}
@@ -396,7 +407,8 @@
this.contextClassLoader = parent.getContextClassLoader();
else
this.contextClassLoader = parent.contextClassLoader;
- this.inheritedAccessControlContext = AccessController.getContext();
+ this.inheritedAccessControlContext =
+ acc != null ? acc : AccessController.getContext();
this.target = target;
setPriority(priority);
if (parent.inheritableThreadLocals != null)
@@ -449,6 +461,14 @@
}
/**
+ * Creates a new Thread that inherits the given AccessControlContext.
+ * This is not a public constructor.
+ */
+ Thread(Runnable target, AccessControlContext acc) {
+ init(null, target, "Thread-" + nextThreadNum(), 0, acc);
+ }
+
+ /**
* Allocates a new {@code Thread} object. This constructor has the same
* effect as {@linkplain #Thread(ThreadGroup,Runnable,String) Thread}
* {@code (group, target, gname)} ,where {@code gname} is a newly generated
diff --git a/jdk/src/share/classes/java/lang/instrument/Instrumentation.java b/jdk/src/share/classes/java/lang/instrument/Instrumentation.java
index 4cdb2de..bedb780 100644
--- a/jdk/src/share/classes/java/lang/instrument/Instrumentation.java
+++ b/jdk/src/share/classes/java/lang/instrument/Instrumentation.java
@@ -381,6 +381,7 @@
*
* @return an array containing all the classes loaded by the JVM, zero-length if there are none
*/
+ @SuppressWarnings("rawtypes")
Class[]
getAllLoadedClasses();
@@ -393,6 +394,7 @@
* @return an array containing all the classes for which loader is an initiating loader,
* zero-length if there are none
*/
+ @SuppressWarnings("rawtypes")
Class[]
getInitiatedClasses(ClassLoader loader);
diff --git a/jdk/src/share/classes/java/lang/invoke/CallSite.java b/jdk/src/share/classes/java/lang/invoke/CallSite.java
index 1d584d5..5da81af 100644
--- a/jdk/src/share/classes/java/lang/invoke/CallSite.java
+++ b/jdk/src/share/classes/java/lang/invoke/CallSite.java
@@ -124,7 +124,7 @@
* or if the target returned by the hook is not of the given {@code targetType}
* @throws NullPointerException if the hook returns a null value
* @throws ClassCastException if the hook returns something other than a {@code MethodHandle}
- * @throws Throwable anything else thrown by the the hook function
+ * @throws Throwable anything else thrown by the hook function
*/
/*package-private*/
CallSite(MethodType targetType, MethodHandle createTargetHook) throws Throwable {
diff --git a/jdk/src/share/classes/java/lang/invoke/ConstantCallSite.java b/jdk/src/share/classes/java/lang/invoke/ConstantCallSite.java
index 2d9fede..771b06d 100644
--- a/jdk/src/share/classes/java/lang/invoke/ConstantCallSite.java
+++ b/jdk/src/share/classes/java/lang/invoke/ConstantCallSite.java
@@ -75,7 +75,7 @@
* or if the target returned by the hook is not of the given {@code targetType}
* @throws NullPointerException if the hook returns a null value
* @throws ClassCastException if the hook returns something other than a {@code MethodHandle}
- * @throws Throwable anything else thrown by the the hook function
+ * @throws Throwable anything else thrown by the hook function
*/
protected ConstantCallSite(MethodType targetType, MethodHandle createTargetHook) throws Throwable {
super(targetType, createTargetHook);
@@ -85,7 +85,7 @@
/**
* Returns the target method of the call site, which behaves
* like a {@code final} field of the {@code ConstantCallSite}.
- * That is, the the target is always the original value passed
+ * That is, the target is always the original value passed
* to the constructor call which created this instance.
*
* @return the immutable linkage state of this call site, a constant method handle
diff --git a/jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java b/jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
index f74678e..4866807 100644
--- a/jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
+++ b/jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
@@ -27,12 +27,15 @@
import jdk.internal.org.objectweb.asm.*;
import sun.misc.Unsafe;
+import sun.security.action.GetPropertyAction;
+import java.io.FilePermission;
import java.lang.reflect.Constructor;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.PropertyPermission;
import static jdk.internal.org.objectweb.asm.Opcodes.*;
@@ -66,12 +69,23 @@
// Used to ensure that each spun class name is unique
private static final AtomicInteger counter = new AtomicInteger(0);
+ // For dumping generated classes to disk, for debugging purposes
+ private static final ProxyClassesDumper dumper;
+
+ static {
+ final String key = "jdk.internal.lambda.dumpProxyClasses";
+ String path = AccessController.doPrivileged(
+ new GetPropertyAction(key), null,
+ new PropertyPermission(key , "read"));
+ dumper = (null == path) ? null : ProxyClassesDumper.getInstance(path);
+ }
+
// See context values in AbstractValidatingLambdaMetafactory
private final String implMethodClassName; // Name of type containing implementation "CC"
private final String implMethodName; // Name of implementation method "impl"
private final String implMethodDesc; // Type descriptor for implementation methods "(I)Ljava/lang/String;"
- private final Type[] implMethodArgumentTypes; // ASM types for implementaion method parameters
- private final Type implMethodReturnType; // ASM type for implementaion method return type "Ljava/lang/String;"
+ private final Type[] implMethodArgumentTypes; // ASM types for implementation method parameters
+ private final Type implMethodReturnType; // ASM type for implementation method return type "Ljava/lang/String;"
private final MethodType constructorType; // Generated class constructor type "(CC)void"
private final String constructorDesc; // Type descriptor for constructor "(LCC;)V"
private final ClassWriter cw; // ASM class writer
@@ -259,29 +273,31 @@
final byte[] classBytes = cw.toByteArray();
- /*** Uncomment to dump the generated file
- System.out.printf("Loaded: %s (%d bytes) %n", lambdaClassName,
- classBytes.length);
- try (FileOutputStream fos = new FileOutputStream(lambdaClassName
- .replace('/', '.') + ".class")) {
- fos.write(classBytes);
- } catch (IOException ex) {
- PlatformLogger.getLogger(InnerClassLambdaMetafactory.class
- .getName()).severe(ex.getMessage(), ex);
- }
- ***/
+ // If requested, dump out to a file for debugging purposes
+ if (dumper != null) {
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ @Override
+ public Void run() {
+ dumper.dumpClass(lambdaClassName, classBytes);
+ return null;
+ }
+ }, null,
+ new FilePermission("<<ALL FILES>>", "read, write"),
+ // createDirectories may need it
+ new PropertyPermission("user.dir", "read"));
+ }
ClassLoader loader = targetClass.getClassLoader();
ProtectionDomain pd = (loader == null)
- ? null
- : AccessController.doPrivileged(
- new PrivilegedAction<ProtectionDomain>() {
- @Override
- public ProtectionDomain run() {
- return targetClass.getProtectionDomain();
- }
- }
- );
+ ? null
+ : AccessController.doPrivileged(
+ new PrivilegedAction<ProtectionDomain>() {
+ @Override
+ public ProtectionDomain run() {
+ return targetClass.getProtectionDomain();
+ }
+ }
+ );
return UNSAFE.defineClass(lambdaClassName,
classBytes, 0, classBytes.length,
diff --git a/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java b/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
index 7b6b413..639b362 100644
--- a/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
+++ b/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, 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
@@ -609,6 +609,7 @@
cls = cls.getComponentType();
if (cls.isPrimitive())
return true; // int[].class, for example
+ // could use VerifyAccess.isClassAccessible but the following is a safe approximation
if (cls.getClassLoader() != Object.class.getClassLoader())
return false;
if (VerifyAccess.isSamePackage(MethodHandle.class, cls))
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandle.java b/jdk/src/share/classes/java/lang/invoke/MethodHandle.java
index 14bc2b4..ce115df 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandle.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandle.java
@@ -251,7 +251,7 @@
*
* <h1>Usage examples</h1>
* Here are some examples of usage:
- * <p><blockquote><pre>{@code
+ * <blockquote><pre>{@code
Object x, y; String s; int i;
MethodType mt; MethodHandle mh;
MethodHandles.Lookup lookup = MethodHandles.lookup();
@@ -608,7 +608,7 @@
* or forced to null if the return type is void.
* <p>
* This call is equivalent to the following code:
- * <p><blockquote><pre>{@code
+ * <blockquote><pre>{@code
* MethodHandle invoker = MethodHandles.spreadInvoker(this.type(), 0);
* Object result = invoker.invokeExact(this, arguments);
* }</pre></blockquote>
@@ -643,9 +643,9 @@
* of the argument array.
* <p>
* This method is also equivalent to the following code:
- * <p><blockquote><pre>
- * {@link #invokeWithArguments(Object...) invokeWithArguments}{@code(arguments.toArray())}
- * </pre></blockquote>
+ * <blockquote><pre>{@code
+ * invokeWithArguments(arguments.toArray()
+ * }</pre></blockquote>
*
* @param arguments the arguments to pass to the target
* @return the result returned by the target
@@ -1183,7 +1183,7 @@
/**
* Makes a <em>fixed arity</em> method handle which is otherwise
- * equivalent to the the current method handle.
+ * equivalent to the current method handle.
* <p>
* If the current method handle is not of
* {@linkplain #asVarargsCollector variable arity},
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandles.java b/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
index 369d14b..1ad7e9c 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
@@ -597,7 +597,7 @@
Lookup(Class<?> lookupClass) {
this(lookupClass, ALL_MODES);
// make sure we haven't accidentally picked up a privileged class:
- checkUnprivilegedlookupClass(lookupClass);
+ checkUnprivilegedlookupClass(lookupClass, ALL_MODES);
}
private Lookup(Class<?> lookupClass, int allowedModes) {
@@ -651,7 +651,7 @@
// No permissions.
newModes = 0;
}
- checkUnprivilegedlookupClass(requestedLookupClass);
+ checkUnprivilegedlookupClass(requestedLookupClass, newModes);
return new Lookup(requestedLookupClass, newModes);
}
@@ -667,10 +667,19 @@
/** Package-private version of lookup which is trusted. */
static final Lookup IMPL_LOOKUP = new Lookup(Object.class, TRUSTED);
- private static void checkUnprivilegedlookupClass(Class<?> lookupClass) {
+ private static void checkUnprivilegedlookupClass(Class<?> lookupClass, int allowedModes) {
String name = lookupClass.getName();
if (name.startsWith("java.lang.invoke."))
throw newIllegalArgumentException("illegal lookupClass: "+lookupClass);
+
+ // For caller-sensitive MethodHandles.lookup()
+ // disallow lookup more restricted packages
+ if (allowedModes == ALL_MODES && lookupClass.getClassLoader() == null) {
+ if (name.startsWith("java.") ||
+ (name.startsWith("sun.") && !name.startsWith("sun.invoke."))) {
+ throw newIllegalArgumentException("illegal lookupClass: " + lookupClass);
+ }
+ }
}
/**
@@ -739,7 +748,7 @@
* If the returned method handle is invoked, the method's class will
* be initialized, if it has not already been initialized.
* <p><b>Example:</b>
- * <p><blockquote><pre>{@code
+ * <blockquote><pre>{@code
import static java.lang.invoke.MethodHandles.*;
import static java.lang.invoke.MethodType.*;
...
@@ -797,7 +806,7 @@
* with the same {@code type} argument.
*
* <b>Example:</b>
- * <p><blockquote><pre>{@code
+ * <blockquote><pre>{@code
import static java.lang.invoke.MethodHandles.*;
import static java.lang.invoke.MethodType.*;
...
@@ -873,7 +882,7 @@
* If the returned method handle is invoked, the constructor's class will
* be initialized, if it has not already been initialized.
* <p><b>Example:</b>
- * <p><blockquote><pre>{@code
+ * <blockquote><pre>{@code
import static java.lang.invoke.MethodHandles.*;
import static java.lang.invoke.MethodType.*;
...
@@ -933,7 +942,7 @@
* in special circumstances. Use {@link #findConstructor findConstructor}
* to access instance initialization methods in a safe manner.)</em>
* <p><b>Example:</b>
- * <p><blockquote><pre>{@code
+ * <blockquote><pre>{@code
import static java.lang.invoke.MethodHandles.*;
import static java.lang.invoke.MethodType.*;
...
@@ -1759,6 +1768,12 @@
if (MethodHandleNatives.refKindIsField(refKind)) {
return getDirectFieldNoSecurityManager(refKind, defc, member);
} else if (MethodHandleNatives.refKindIsMethod(refKind)) {
+ if (defc == MethodHandle.class && refKind == REF_invokeVirtual) {
+ MethodHandle mh = findVirtualForMH(member.getName(), member.getMethodType());
+ if (mh != null) {
+ return mh;
+ }
+ }
return getDirectMethodNoSecurityManager(refKind, defc, member, lookupClass);
} else if (refKind == REF_newInvokeSpecial) {
return getDirectConstructorNoSecurityManager(defc, member);
@@ -2208,7 +2223,7 @@
* they will come after.
* <p>
* <b>Example:</b>
- * <p><blockquote><pre>{@code
+ * <blockquote><pre>{@code
import static java.lang.invoke.MethodHandles.*;
import static java.lang.invoke.MethodType.*;
...
@@ -2222,7 +2237,7 @@
* }</pre></blockquote>
* <p>
* This method is also equivalent to the following code:
- * <p><blockquote><pre>
+ * <blockquote><pre>
* {@link #dropArguments(MethodHandle,int,Class...) dropArguments}{@code (target, pos, valueTypes.toArray(new Class[0]))}
* </pre></blockquote>
* @param target the method handle to invoke after the arguments are dropped
@@ -2266,7 +2281,7 @@
* they will come after.
* <p>
* <b>Example:</b>
- * <p><blockquote><pre>{@code
+ * <blockquote><pre>{@code
import static java.lang.invoke.MethodHandles.*;
import static java.lang.invoke.MethodType.*;
...
@@ -2284,7 +2299,7 @@
* }</pre></blockquote>
* <p>
* This method is also equivalent to the following code:
- * <p><blockquote><pre>
+ * <blockquote><pre>
* {@link #dropArguments(MethodHandle,int,List) dropArguments}{@code (target, pos, Arrays.asList(valueTypes))}
* </pre></blockquote>
* @param target the method handle to invoke after the arguments are dropped
@@ -2332,7 +2347,7 @@
* (null or not)
* which do not correspond to argument positions in the target.
* <p><b>Example:</b>
- * <p><blockquote><pre>{@code
+ * <blockquote><pre>{@code
import static java.lang.invoke.MethodHandles.*;
import static java.lang.invoke.MethodType.*;
...
@@ -2425,7 +2440,7 @@
* In all cases, {@code pos} must be greater than or equal to zero, and
* {@code pos} must also be less than or equal to the target's arity.
* <p><b>Example:</b>
- * <p><blockquote><pre>{@code
+ * <blockquote><pre>{@code
import static java.lang.invoke.MethodHandles.*;
import static java.lang.invoke.MethodType.*;
...
@@ -2530,7 +2545,7 @@
* The argument type of the filter (if any) must be identical to the
* return type of the target.
* <p><b>Example:</b>
- * <p><blockquote><pre>{@code
+ * <blockquote><pre>{@code
import static java.lang.invoke.MethodHandles.*;
import static java.lang.invoke.MethodType.*;
...
@@ -2621,7 +2636,7 @@
* arguments will not need to be live on the stack on entry to the
* target.)
* <p><b>Example:</b>
- * <p><blockquote><pre>{@code
+ * <blockquote><pre>{@code
import static java.lang.invoke.MethodHandles.*;
import static java.lang.invoke.MethodType.*;
...
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodType.java b/jdk/src/share/classes/java/lang/invoke/MethodType.java
index 5a73037..f8e0967 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodType.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodType.java
@@ -137,7 +137,7 @@
/** This number is the maximum arity of a method handle invoker, 253.
* It is derived from the absolute JVM-imposed arity by subtracting two,
- * which are the slots occupied by invoke method handle, and the the
+ * which are the slots occupied by invoke method handle, and the
* target method handle, which are both at the beginning of the argument
* list used to invoke the target method handle.
* The longest possible invocation will look like
diff --git a/jdk/src/share/classes/java/lang/invoke/ProxyClassesDumper.java b/jdk/src/share/classes/java/lang/invoke/ProxyClassesDumper.java
new file mode 100644
index 0000000..463f1ff
--- /dev/null
+++ b/jdk/src/share/classes/java/lang/invoke/ProxyClassesDumper.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2013, 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 java.lang.invoke;
+
+import sun.util.logging.PlatformLogger;
+
+import java.io.FilePermission;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Helper class used by InnerClassLambdaMetafactory to log generated classes
+ *
+ * @implNote
+ * <p> Because this class is called by LambdaMetafactory, make use
+ * of lambda lead to recursive calls cause stack overflow.
+ */
+final class ProxyClassesDumper {
+ private static final char[] HEX = {
+ '0', '1', '2', '3', '4', '5', '6', '7',
+ '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
+ };
+ private static final char[] BAD_CHARS = {
+ '\\', ':', '*', '?', '"', '<', '>', '|'
+ };
+ private static final String[] REPLACEMENT = {
+ "%5C", "%3A", "%2A", "%3F", "%22", "%3C", "%3E", "%7C"
+ };
+
+ private final Path dumpDir;
+
+ public static ProxyClassesDumper getInstance(String path) {
+ if (null == path) {
+ return null;
+ }
+ try {
+ path = path.trim();
+ final Path dir = Paths.get(path.length() == 0 ? "." : path);
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ @Override
+ public Void run() {
+ validateDumpDir(dir);
+ return null;
+ }
+ }, null, new FilePermission("<<ALL FILES>>", "read, write"));
+ return new ProxyClassesDumper(dir);
+ } catch (InvalidPathException ex) {
+ PlatformLogger.getLogger(ProxyClassesDumper.class.getName())
+ .warning("Path " + path + " is not valid - dumping disabled", ex);
+ } catch (IllegalArgumentException iae) {
+ PlatformLogger.getLogger(ProxyClassesDumper.class.getName())
+ .warning(iae.getMessage() + " - dumping disabled");
+ }
+ return null;
+ }
+
+ private ProxyClassesDumper(Path path) {
+ dumpDir = Objects.requireNonNull(path);
+ }
+
+ private static void validateDumpDir(Path path) {
+ if (!Files.exists(path)) {
+ throw new IllegalArgumentException("Directory " + path + " does not exist");
+ } else if (!Files.isDirectory(path)) {
+ throw new IllegalArgumentException("Path " + path + " is not a directory");
+ } else if (!Files.isWritable(path)) {
+ throw new IllegalArgumentException("Directory " + path + " is not writable");
+ }
+ }
+
+ public static String encodeForFilename(String className) {
+ final int len = className.length();
+ StringBuilder sb = new StringBuilder(len);
+
+ for (int i = 0; i < len; i++) {
+ char c = className.charAt(i);
+ // control characters
+ if (c <= 31) {
+ sb.append('%');
+ sb.append(HEX[c >> 4 & 0x0F]);
+ sb.append(HEX[c & 0x0F]);
+ } else {
+ int j = 0;
+ for (; j < BAD_CHARS.length; j++) {
+ if (c == BAD_CHARS[j]) {
+ sb.append(REPLACEMENT[j]);
+ break;
+ }
+ }
+ if (j >= BAD_CHARS.length) {
+ sb.append(c);
+ }
+ }
+ }
+
+ return sb.toString();
+ }
+
+ public void dumpClass(String className, final byte[] classBytes) {
+ Path file;
+ try {
+ file = dumpDir.resolve(encodeForFilename(className) + ".class");
+ } catch (InvalidPathException ex) {
+ PlatformLogger.getLogger(ProxyClassesDumper.class.getName())
+ .warning("Invalid path for class " + className);
+ return;
+ }
+
+ try {
+ Path dir = file.getParent();
+ Files.createDirectories(dir);
+ Files.write(file, classBytes);
+ } catch (Exception ignore) {
+ PlatformLogger.getLogger(ProxyClassesDumper.class.getName())
+ .warning("Exception writing to path at " + file.toString());
+ // simply don't care if this operation failed
+ }
+ }
+}
diff --git a/jdk/src/share/classes/java/lang/reflect/Array.java b/jdk/src/share/classes/java/lang/reflect/Array.java
index 55b3dbf..f6d7efe 100644
--- a/jdk/src/share/classes/java/lang/reflect/Array.java
+++ b/jdk/src/share/classes/java/lang/reflect/Array.java
@@ -55,13 +55,18 @@
* </pre>
* </blockquote>
*
+ * <p>The number of dimensions of the new array must not
+ * exceed 255.
+ *
* @param componentType the {@code Class} object representing the
* component type of the new array
* @param length the length of the new array
* @return the new array
* @exception NullPointerException if the specified
* {@code componentType} parameter is null
- * @exception IllegalArgumentException if componentType is {@link Void#TYPE}
+ * @exception IllegalArgumentException if componentType is {@link
+ * Void#TYPE} or if the number of dimensions of the requested array
+ * instance exceed 255.
* @exception NegativeArraySizeException if the specified {@code length}
* is negative
*/
@@ -85,8 +90,7 @@
* {@code componentType}.
*
* <p>The number of dimensions of the new array must not
- * exceed the number of array dimensions supported by the
- * implementation (typically 255).
+ * exceed 255.
*
* @param componentType the {@code Class} object representing the component
* type of the new array
@@ -96,10 +100,9 @@
* @exception NullPointerException if the specified
* {@code componentType} argument is null
* @exception IllegalArgumentException if the specified {@code dimensions}
- * argument is a zero-dimensional array, or if the number of
- * requested dimensions exceeds the limit on the number of array dimensions
- * supported by the implementation (typically 255), or if componentType
- * is {@link Void#TYPE}.
+ * argument is a zero-dimensional array, if componentType is {@link
+ * Void#TYPE}, or if the number of dimensions of the requested array
+ * instance exceed 255.
* @exception NegativeArraySizeException if any of the components in
* the specified {@code dimensions} argument is negative.
*/
diff --git a/jdk/src/share/classes/java/lang/reflect/MalformedParametersException.java b/jdk/src/share/classes/java/lang/reflect/MalformedParametersException.java
index c68600b..7479624 100644
--- a/jdk/src/share/classes/java/lang/reflect/MalformedParametersException.java
+++ b/jdk/src/share/classes/java/lang/reflect/MalformedParametersException.java
@@ -50,10 +50,22 @@
*/
public class MalformedParametersException extends RuntimeException {
+ /**
+ * Version for serialization.
+ */
private static final long serialVersionUID = 20130919L;
+ /**
+ * Create a {@code MalformedParametersException} with an empty
+ * reason.
+ */
public MalformedParametersException() {}
+ /**
+ * Create a {@code MalformedParametersException}.
+ *
+ * @param reason The reason for the exception.
+ */
public MalformedParametersException(String reason) {
super(reason);
}
diff --git a/jdk/src/share/classes/java/lang/reflect/Proxy.java b/jdk/src/share/classes/java/lang/reflect/Proxy.java
index dd5c2ad..f2e4eda 100644
--- a/jdk/src/share/classes/java/lang/reflect/Proxy.java
+++ b/jdk/src/share/classes/java/lang/reflect/Proxy.java
@@ -347,11 +347,11 @@
* s.checkPermission} with
* {@code RuntimePermission("getClassLoader")} permission
* denies access.</li>
- * <li> the caller's class loader is not the same as or an
- * ancestor of the class loader for the current class and
+ * <li> for each proxy interface, {@code intf},
+ * the caller's class loader is not the same as or an
+ * ancestor of the class loader for {@code intf} and
* invocation of {@link SecurityManager#checkPackageAccess
- * s.checkPackageAccess()} denies access to any one of the
- * given proxy interfaces.</li>
+ * s.checkPackageAccess()} denies access to {@code intf}.</li>
* </ul>
* @throws NullPointerException if the {@code interfaces} array
@@ -680,11 +680,11 @@
* s.checkPermission} with
* {@code RuntimePermission("getClassLoader")} permission
* denies access;</li>
- * <li> the caller's class loader is not the same as or an
- * ancestor of the class loader for the current class and
+ * <li> for each proxy interface, {@code intf},
+ * the caller's class loader is not the same as or an
+ * ancestor of the class loader for {@code intf} and
* invocation of {@link SecurityManager#checkPackageAccess
- * s.checkPackageAccess()} denies access to any one of the
- * given proxy interfaces.</li>
+ * s.checkPackageAccess()} denies access to {@code intf};</li>
* <li> any of the given proxy interfaces is non-public and the
* caller class is not in the same {@linkplain Package runtime package}
* as the non-public interface and the invocation of
@@ -795,7 +795,14 @@
* @return the invocation handler for the proxy instance
* @throws IllegalArgumentException if the argument is not a
* proxy instance
+ * @throws SecurityException if a security manager, <em>s</em>, is present
+ * and the caller's class loader is not the same as or an
+ * ancestor of the class loader for the invocation handler
+ * and invocation of {@link SecurityManager#checkPackageAccess
+ * s.checkPackageAccess()} denies access to the invocation
+ * handler's class.
*/
+ @CallerSensitive
public static InvocationHandler getInvocationHandler(Object proxy)
throws IllegalArgumentException
{
@@ -806,8 +813,19 @@
throw new IllegalArgumentException("not a proxy instance");
}
- Proxy p = (Proxy) proxy;
- return p.h;
+ final Proxy p = (Proxy) proxy;
+ final InvocationHandler ih = p.h;
+ if (System.getSecurityManager() != null) {
+ Class<?> ihClass = ih.getClass();
+ Class<?> caller = Reflection.getCallerClass();
+ if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(),
+ ihClass.getClassLoader()))
+ {
+ ReflectUtil.checkPackageAccess(ihClass);
+ }
+ }
+
+ return ih;
}
private static native Class<?> defineClass0(ClassLoader loader, String name,
diff --git a/jdk/src/share/classes/java/math/BigDecimal.java b/jdk/src/share/classes/java/math/BigDecimal.java
index 0abfb75..c17b8b7 100644
--- a/jdk/src/share/classes/java/math/BigDecimal.java
+++ b/jdk/src/share/classes/java/math/BigDecimal.java
@@ -727,36 +727,27 @@
* <dl>
* <dt><i>BigDecimalString:</i>
* <dd><i>Sign<sub>opt</sub> Significand Exponent<sub>opt</sub></i>
- * <p>
* <dt><i>Sign:</i>
* <dd>{@code +}
* <dd>{@code -}
- * <p>
* <dt><i>Significand:</i>
* <dd><i>IntegerPart</i> {@code .} <i>FractionPart<sub>opt</sub></i>
* <dd>{@code .} <i>FractionPart</i>
* <dd><i>IntegerPart</i>
- * <p>
* <dt><i>IntegerPart:</i>
* <dd><i>Digits</i>
- * <p>
* <dt><i>FractionPart:</i>
* <dd><i>Digits</i>
- * <p>
* <dt><i>Exponent:</i>
* <dd><i>ExponentIndicator SignedInteger</i>
- * <p>
* <dt><i>ExponentIndicator:</i>
* <dd>{@code e}
* <dd>{@code E}
- * <p>
* <dt><i>SignedInteger:</i>
* <dd><i>Sign<sub>opt</sub> Digits</i>
- * <p>
* <dt><i>Digits:</i>
* <dd><i>Digit</i>
* <dd><i>Digits Digit</i>
- * <p>
* <dt><i>Digit:</i>
* <dd>any character for which {@link Character#isDigit}
* returns {@code true}, including 0, 1, 2 ...
diff --git a/jdk/src/share/classes/java/math/BigInteger.java b/jdk/src/share/classes/java/math/BigInteger.java
index 6beaed7..f7878ab 100644
--- a/jdk/src/share/classes/java/math/BigInteger.java
+++ b/jdk/src/share/classes/java/math/BigInteger.java
@@ -35,6 +35,7 @@
import java.io.ObjectStreamField;
import java.util.Arrays;
import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
import sun.misc.DoubleConsts;
import sun.misc.FloatConsts;
@@ -918,15 +919,6 @@
return u;
}
- private static volatile Random staticRandom;
-
- private static Random getSecureRandom() {
- if (staticRandom == null) {
- staticRandom = new java.security.SecureRandom();
- }
- return staticRandom;
- }
-
/**
* Returns true iff this BigInteger passes the specified number of
* Miller-Rabin tests. This test is taken from the DSA spec (NIST FIPS
@@ -945,7 +937,7 @@
// Do the tests
if (rnd == null) {
- rnd = getSecureRandom();
+ rnd = ThreadLocalRandom.current();
}
for (int i=0; i < iterations; i++) {
// Generate a uniform random on (1, this)
diff --git a/jdk/src/share/classes/java/math/RoundingMode.java b/jdk/src/share/classes/java/math/RoundingMode.java
index 41493a2..3a4fe97 100644
--- a/jdk/src/share/classes/java/math/RoundingMode.java
+++ b/jdk/src/share/classes/java/math/RoundingMode.java
@@ -51,7 +51,6 @@
* proper {@code MathContext}. A summary table showing the results
* of these rounding operations for all rounding modes appears below.
*
- *<p>
*<table border>
* <caption><b>Summary of Rounding Operations Under Different Rounding Modes</b></caption>
* <tr><th></th><th colspan=8>Result of rounding input to one digit with the given
diff --git a/jdk/src/share/classes/java/net/ContentHandler.java b/jdk/src/share/classes/java/net/ContentHandler.java
index 8c585cb..c658585 100644
--- a/jdk/src/share/classes/java/net/ContentHandler.java
+++ b/jdk/src/share/classes/java/net/ContentHandler.java
@@ -96,6 +96,7 @@
* @exception IOException if an I/O error occurs while reading the object.
* @since 1.3
*/
+ @SuppressWarnings("rawtypes")
public Object getContent(URLConnection urlc, Class[] classes) throws IOException {
Object obj = getContent(urlc);
diff --git a/jdk/src/share/classes/java/net/HostPortrange.java b/jdk/src/share/classes/java/net/HostPortrange.java
new file mode 100644
index 0000000..fc5e3d9
--- /dev/null
+++ b/jdk/src/share/classes/java/net/HostPortrange.java
@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 2013, 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 java.net;
+
+import java.net.*;
+import java.util.Formatter;
+import java.util.Locale;
+import sun.net.util.IPAddressUtil;
+
+/**
+ * Parses a string containing a host/domain name and port range
+ */
+class HostPortrange {
+
+ String hostname;
+ String scheme;
+ int[] portrange;
+
+ boolean wildcard;
+ boolean literal;
+ boolean ipv6, ipv4;
+ static final int PORT_MIN = 0;
+ static final int PORT_MAX = (1 << 16) -1;
+
+ boolean equals(HostPortrange that) {
+ return this.hostname.equals(that.hostname)
+ && this.portrange[0] == that.portrange[0]
+ && this.portrange[1] == that.portrange[1]
+ && this.wildcard == that.wildcard
+ && this.literal == that.literal;
+ }
+
+ public int hashCode() {
+ return hostname.hashCode() + portrange[0] + portrange[1];
+ }
+
+ HostPortrange(String scheme, String str) {
+ // Parse the host name. A name has up to three components, the
+ // hostname, a port number, or two numbers representing a port
+ // range. "www.sun.com:8080-9090" is a valid host name.
+
+ // With IPv6 an address can be 2010:836B:4179::836B:4179
+ // An IPv6 address needs to be enclose in []
+ // For ex: [2010:836B:4179::836B:4179]:8080-9090
+ // Refer to RFC 2732 for more information.
+
+ // first separate string into two fields: hoststr, portstr
+ String hoststr, portstr = null;
+ this.scheme = scheme;
+
+ // check for IPv6 address
+ if (str.charAt(0) == '[') {
+ ipv6 = literal = true;
+ int rb = str.indexOf(']');
+ if (rb != -1) {
+ hoststr = str.substring(1, rb);
+ } else {
+ throw new IllegalArgumentException("invalid IPv6 address: " + str);
+ }
+ int sep = str.indexOf(':', rb + 1);
+ if (sep != -1 && str.length() > sep) {
+ portstr = str.substring(sep + 1);
+ }
+ // need to normalize hoststr now
+ byte[] ip = IPAddressUtil.textToNumericFormatV6(hoststr);
+ if (ip == null) {
+ throw new IllegalArgumentException("illegal IPv6 address");
+ }
+ StringBuilder sb = new StringBuilder();
+ Formatter formatter = new Formatter(sb, Locale.US);
+ formatter.format("%02x%02x:%02x%02x:%02x%02x:%02x"
+ + "%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
+ ip[0], ip[1], ip[2], ip[3], ip[4], ip[5], ip[6], ip[7], ip[8],
+ ip[9], ip[10], ip[11], ip[12], ip[13], ip[14], ip[15]);
+ hostname = sb.toString();
+ } else {
+ // not IPv6 therefore ':' is the port separator
+
+ int sep = str.indexOf(':');
+ if (sep != -1 && str.length() > sep) {
+ hoststr = str.substring(0, sep);
+ portstr = str.substring(sep + 1);
+ } else {
+ hoststr = sep == -1 ? str : str.substring(0, sep);
+ }
+ // is this a domain wildcard specification?
+ if (hoststr.lastIndexOf('*') > 0) {
+ throw new IllegalArgumentException("invalid host wildcard specification");
+ } else if (hoststr.startsWith("*")) {
+ wildcard = true;
+ if (hoststr.equals("*")) {
+ hoststr = "";
+ } else if (hoststr.startsWith("*.")) {
+ hoststr = hoststr.substring(1).toLowerCase(); // leave the '.' ?
+ } else {
+ throw new IllegalArgumentException("invalid host wildcard specification");
+ }
+ } else {
+ // check if ipv4 (if rightmost label a number)
+ // The normal way to specify ipv4 is 4 decimal labels
+ // but actually three, two or single label formats valid also
+ // So, we recognise ipv4 by just testing the rightmost label
+ // being a number.
+ int lastdot = hoststr.lastIndexOf('.');
+ if (lastdot != -1 && (hoststr.length() > 1)) {
+ boolean ipv4 = true;
+
+ for (int i = lastdot + 1, len = hoststr.length(); i < len; i++) {
+ char c = hoststr.charAt(i);
+ if (c < '0' || c > '9') {
+ ipv4 = false;
+ break;
+ }
+ }
+ this.ipv4 = this.literal = ipv4;
+ if (ipv4) {
+ byte[] ip = IPAddressUtil.textToNumericFormatV4(hoststr);
+ if (ip == null) {
+ throw new IllegalArgumentException("illegal IPv4 address");
+ }
+ StringBuilder sb = new StringBuilder();
+ Formatter formatter = new Formatter(sb, Locale.US);
+ formatter.format("%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
+ hoststr = sb.toString();
+ } else {
+ // regular domain name
+ hoststr = hoststr.toLowerCase();
+ }
+ }
+ }
+ hostname = hoststr;
+ }
+
+ try {
+ portrange = parsePort(portstr);
+ } catch (Exception e) {
+ throw new IllegalArgumentException("invalid port range: " + portstr);
+ }
+ }
+
+ public boolean literal() {
+ return literal;
+ }
+
+ public boolean ipv4Literal() {
+ return ipv4;
+ }
+
+ public boolean ipv6Literal() {
+ return ipv6;
+ }
+
+ public String hostname() {
+ return hostname;
+ }
+
+ public int[] portrange() {
+ return portrange;
+ }
+
+ /**
+ * returns true if the hostname part started with *
+ * hostname returns the remaining part of the host component
+ * eg "*.foo.com" -> ".foo.com" or "*" -> ""
+ *
+ * @return
+ */
+ public boolean wildcard() {
+ return wildcard;
+ }
+
+ // these shouldn't leak outside the implementation
+ final static int[] HTTP_PORT = {80, 80};
+ final static int[] HTTPS_PORT = {443, 443};
+ final static int[] NO_PORT = {-1, -1};
+
+ int[] defaultPort() {
+ if (scheme.equals("http")) {
+ return HTTP_PORT;
+ } else if (scheme.equals("https")) {
+ return HTTPS_PORT;
+ }
+ return NO_PORT;
+ }
+
+ int[] parsePort(String port)
+ {
+
+ if (port == null || port.equals("")) {
+ return defaultPort();
+ }
+
+ if (port.equals("*")) {
+ return new int[] {PORT_MIN, PORT_MAX};
+ }
+
+ try {
+ int dash = port.indexOf('-');
+
+ if (dash == -1) {
+ int p = Integer.parseInt(port);
+ return new int[] {p, p};
+ } else {
+ String low = port.substring(0, dash);
+ String high = port.substring(dash+1);
+ int l,h;
+
+ if (low.equals("")) {
+ l = PORT_MIN;
+ } else {
+ l = Integer.parseInt(low);
+ }
+
+ if (high.equals("")) {
+ h = PORT_MAX;
+ } else {
+ h = Integer.parseInt(high);
+ }
+ if (l < 0 || h < 0 || h<l) {
+ return defaultPort();
+ }
+ return new int[] {l, h};
+ }
+ } catch (IllegalArgumentException e) {
+ return defaultPort();
+ }
+ }
+}
diff --git a/jdk/src/share/classes/java/net/HttpURLConnection.java b/jdk/src/share/classes/java/net/HttpURLConnection.java
index be23241..a98fd37 100644
--- a/jdk/src/share/classes/java/net/HttpURLConnection.java
+++ b/jdk/src/share/classes/java/net/HttpURLConnection.java
@@ -57,7 +57,7 @@
* attempt to open a connection, the caller must possess either:-
* <ul><li>a "connect" {@link SocketPermission} to the host/port combination of the
* destination URL or</li>
- * <li>a {@link HttpURLPermission} that permits this request.</li>
+ * <li>a {@link URLPermission} that permits this request.</li>
* </ul><p>
* If automatic redirection is enabled, and this request is redirected to another
* destination, then the caller must also have permission to connect to the
diff --git a/jdk/src/share/classes/java/net/HttpURLPermission.java b/jdk/src/share/classes/java/net/HttpURLPermission.java
deleted file mode 100644
index 4e038bc..0000000
--- a/jdk/src/share/classes/java/net/HttpURLPermission.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- * Copyright (c) 2013, 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 java.net;
-
-import java.io.ObjectInputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.security.Permission;
-
-/**
- * Represents permission to access a resource or set of resources defined by a
- * given http or https url, and for a given set of user-settable request methods
- * and request headers. The <i>name</i> of the permission is the url string.
- * The <i>actions</i> string is a concatenation of the request methods and headers.
- * The range of method and header names is not restricted by this class.
- * <p><b>The url</b><p>
- * The url string is also used to instantiate a {@link URI} object which is
- * used for comparison with other HttpURLPermission instances. Therefore, any
- * references in this specification to url, mean this URI object.
- * The path component of the url comprises a sequence of path segments, separated
- * by '/' characters. The path is specified in a similar way to the path
- * in {@link java.io.FilePermission}. There are three different ways
- * as the following examples show:
- * <table border>
- * <caption>URL Examples</caption>
- * <tr><th>Example url</th><th>Description</th></tr>
- * <tr><td style="white-space:nowrap;">http://www.oracle.com/a/b/c.html</td>
- * <td>A url which identifies a specific (single) resource</td>
- * </tr>
- * <tr><td>http://www.oracle.com/a/b/*</td>
- * <td>The '*' character refers to all resources in the same "directory" - in
- * other words all resources with the same number of path components, and
- * which only differ in the final path component, represented by the '*'.
- * </td>
- * </tr>
- * <tr><td>http://www.oracle.com/a/b/-</td>
- * <td>The '-' character refers to all resources recursively below the
- * preceding path (eg. http://www.oracle.com/a/b/c/d/e.html matches this
- * example).
- * </td>
- * </tr>
- * </table>
- * <p>
- * The '*' and '-' may only be specified in the final segment of a path and must be
- * the only character in that segment. Any query or fragment components of the
- * url are ignored when constructing HttpURLPermissions.
- * <p>
- * As a special case, urls of the form, "http:*" or "https:*" are accepted to
- * mean any url of the given scheme.
- * <p><b>The actions string</b><p>
- * The actions string of a HttpURLPermission is a concatenation of the <i>method list</i>
- * and the <i>request headers list</i>. These are lists of the permitted HTTP request
- * methods and permitted request headers of the permission (respectively). The two lists
- * are separated by a colon ':' character and elements of each list are comma separated.
- * Some examples are:
- * <pre>
- * "POST,GET,DELETE"
- * "GET:X-Foo-Request,X-Bar-Request"
- * "POST,GET:Header1,Header2"
- * </pre>
- * The first example specifies the methods: POST, GET and DELETE, but no request headers.
- * The second example specifies one request method and two headers. The third
- * example specifies two request methods, and two headers.
- * <p>
- * The colon separator need not be present if the request headers list is empty.
- * No white-space is permitted in the actions string. The action strings supplied to
- * the HttpURLPermission constructors are case-insensitive and are normalized by converting
- * method names to upper-case and header names to the form defines in RFC2616 (lower case
- * with initial letter of each word capitalized). Either list can contain a wild-card '*'
- * character which signifies all request methods or headers respectively.
- * <p>
- * Note. Depending on the context of use, some request methods and headers may be permitted
- * at all times, and others may not be permitted at any time. For example, the
- * HTTP protocol handler might disallow certain headers such as Content-Length
- * from being set by application code, regardless of whether the security policy
- * in force, permits it.
- *
- * @since 1.8
- */
-public final class HttpURLPermission extends Permission {
-
- private static final long serialVersionUID = -2702463814894478682L;
-
- private transient URI uri;
- private transient List<String> methods;
- private transient List<String> requestHeaders;
-
- // serialized field
- private String actions;
-
- /**
- * Creates a new HttpURLPermission from a url string and which permits the given
- * request methods and user-settable request headers.
- * The name of the permission is its url string. Only the scheme, authority
- * and path components of the url are used. Any fragment or query
- * components are ignored. The permissions action string is as specified above.
- *
- * @param url the url string
- *
- * @param actions the actions string
- *
- * @throws IllegalArgumentException if url does not result in a valid {@link URI},
- * its scheme is not http or https, or if actions contains white-space.
- */
- public HttpURLPermission(String url, String actions) {
- super(url);
- init(actions);
- }
-
- private void init(String actions) {
- URI uri = parseURI(getName());
- int colon = actions.indexOf(':');
- if (actions.lastIndexOf(':') != colon) {
- throw new IllegalArgumentException("invalid actions string");
- }
-
- String methods, headers;
- if (colon == -1) {
- methods = actions;
- headers = "";
- } else {
- methods = actions.substring(0, colon);
- headers = actions.substring(colon+1);
- }
-
- List<String> l = normalizeMethods(methods);
- Collections.sort(l);
- this.methods = Collections.unmodifiableList(l);
-
- l = normalizeHeaders(headers);
- Collections.sort(l);
- this.requestHeaders = Collections.unmodifiableList(l);
-
- this.actions = actions();
- this.uri = uri;
- }
-
- /**
- * Creates a HttpURLPermission with the given url string and unrestricted
- * methods and request headers by invoking the two argument
- * constructor as follows: HttpURLPermission(url, "*:*")
- *
- * @param url the url string
- *
- * @throws IllegalArgumentException if url does not result in a valid {@link URI}
- */
- public HttpURLPermission(String url) {
- this(url, "*:*");
- }
-
- /**
- * Returns the normalized method list and request
- * header list, in the form:
- * <pre>
- * "method-names : header-names"
- * </pre>
- * <p>
- * where method-names is the list of methods separated by commas
- * and header-names is the list of permitted headers separated by commas.
- * There is no white space in the returned String. If header-names is empty
- * then the colon separator will not be present.
- */
- public String getActions() {
- return actions;
- }
-
- /**
- * Checks if this HttpURLPermission implies the given permission.
- * Specifically, the following checks are done as if in the
- * following sequence:
- * <p><ul>
- * <li>if 'p' is not an instance of HttpURLPermission return false</li>
- * <li>if any of p's methods are not in this's method list, and if
- * this's method list is not equal to "*", then return false.</li>
- * <li>if any of p's headers are not in this's request header list, and if
- * this's request header list is not equal to "*", then return false.</li>
- * <li>if this's url is equal to p's url , then return true</li>
- * <li>if this's url scheme is not equal to p's url scheme return false</li>
- * <li>if the scheme specific part of this's url is '*' return true</li>
- * <li>if this's url authority is not equal to p's url authority
- * return false</li>
- * <li>if the path or paths specified by p's url are contained in the
- * set of paths specified by this's url, then return true
- * <li>otherwise, return false</li>
- * </ul>
- * <p>Some examples of how paths are matched are shown below:
- * <p><table border>
- * <caption>Examples of Path Matching</caption>
- * <tr><th>this's path</th><th>p's path</th><th>match</th></tr>
- * <tr><td>/a/b</td><td>/a/b</td><td>yes</td></tr>
- * <tr><td>/a/b/*</td><td>/a/b/c</td><td>yes</td></tr>
- * <tr><td>/a/b/*</td><td>/a/b/c/d</td><td>no</td></tr>
- * <tr><td>/a/b/-</td><td>/a/b/c/d</td><td>yes</td></tr>
- * <tr><td>/a/b/-</td><td>/a/b/c/d/e</td><td>yes</td></tr>
- * <tr><td>/a/b/-</td><td>/a/b/c/*</td><td>yes</td></tr>
- * <tr><td>/a/b/*</td><td>/a/b/c/-</td><td>no</td></tr>
- * </table>
- */
- public boolean implies(Permission p) {
- if (! (p instanceof HttpURLPermission)) {
- return false;
- }
-
- HttpURLPermission that = (HttpURLPermission)p;
-
- if (!this.methods.get(0).equals("*") &&
- Collections.indexOfSubList(this.methods, that.methods) == -1) {
- return false;
- }
-
- if (this.requestHeaders.isEmpty() && !that.requestHeaders.isEmpty()) {
- return false;
- }
-
- if (!this.requestHeaders.isEmpty() &&
- !this.requestHeaders.get(0).equals("*") &&
- Collections.indexOfSubList(this.requestHeaders,
- that.requestHeaders) == -1) {
- return false;
- }
-
- if (this.uri.equals(that.uri)) {
- return true;
- }
-
- if (!this.uri.getScheme().equals(that.uri.getScheme())) {
- return false;
- }
-
- if (this.uri.getSchemeSpecificPart().equals("*")) {
- return true;
- }
-
- String thisAuthority = this.uri.getAuthority();
-
- if (thisAuthority != null &&
- !thisAuthority.equals(that.uri.getAuthority())) {
- return false;
- }
-
- String thispath = this.uri.getPath();
- String thatpath = that.uri.getPath();
-
- if (thispath.endsWith("/-")) {
- String thisprefix = thispath.substring(0, thispath.length() - 1);
- return thatpath.startsWith(thisprefix);
- }
-
- if (thispath.endsWith("/*")) {
- String thisprefix = thispath.substring(0, thispath.length() - 1);
- if (!thatpath.startsWith(thisprefix)) {
- return false;
- }
- String thatsuffix = thatpath.substring(thisprefix.length());
- // suffix must not contain '/' chars
- if (thatsuffix.indexOf('/') != -1) {
- return false;
- }
- if (thatsuffix.equals("-")) {
- return false;
- }
- return true;
- }
- return false;
- }
-
-
- /**
- * Returns true if, this.getActions().equals(p.getActions())
- * and p's url equals this's url. Returns false otherwise.
- */
- public boolean equals(Object p) {
- if (!(p instanceof HttpURLPermission)) {
- return false;
- }
- HttpURLPermission that = (HttpURLPermission)p;
- return this.getActions().equals(that.getActions()) &&
- this.uri.equals(that.uri);
- }
-
- /**
- * Returns a hashcode calculated from the hashcode of the
- * actions String and the url
- */
- public int hashCode() {
- return getActions().hashCode() + uri.hashCode();
- }
-
-
- private List<String> normalizeMethods(String methods) {
- List<String> l = new ArrayList<>();
- StringBuilder b = new StringBuilder();
- for (int i=0; i<methods.length(); i++) {
- char c = methods.charAt(i);
- if (c == ',') {
- String s = b.toString();
- if (s.length() > 0)
- l.add(s);
- b = new StringBuilder();
- } else if (c == ' ' || c == '\t') {
- throw new IllegalArgumentException("white space not allowed");
- } else {
- if (c >= 'a' && c <= 'z') {
- c += 'A' - 'a';
- }
- b.append(c);
- }
- }
- String s = b.toString();
- if (s.length() > 0)
- l.add(s);
- return l;
- }
-
- private List<String> normalizeHeaders(String headers) {
- List<String> l = new ArrayList<>();
- StringBuilder b = new StringBuilder();
- boolean capitalizeNext = true;
- for (int i=0; i<headers.length(); i++) {
- char c = headers.charAt(i);
- if (c >= 'a' && c <= 'z') {
- if (capitalizeNext) {
- c += 'A' - 'a';
- capitalizeNext = false;
- }
- b.append(c);
- } else if (c == ' ' || c == '\t') {
- throw new IllegalArgumentException("white space not allowed");
- } else if (c == '-') {
- capitalizeNext = true;
- b.append(c);
- } else if (c == ',') {
- String s = b.toString();
- if (s.length() > 0)
- l.add(s);
- b = new StringBuilder();
- capitalizeNext = true;
- } else {
- capitalizeNext = false;
- b.append(c);
- }
- }
- String s = b.toString();
- if (s.length() > 0)
- l.add(s);
- return l;
- }
-
- private URI parseURI(String url) {
- URI u = URI.create(url);
- String scheme = u.getScheme();
- if (!(scheme.equalsIgnoreCase("http") ||
- scheme.equalsIgnoreCase("https"))) {
- throw new IllegalArgumentException ("unexpected URL scheme");
- }
- if (!u.getSchemeSpecificPart().equals("*")) {
- u = URI.create(scheme + "://" + u.getRawAuthority() + u.getRawPath());
- }
- return u;
- }
-
- private String actions() {
- StringBuilder b = new StringBuilder();
- for (String s : methods) {
- b.append(s);
- }
- b.append(":");
- for (String s : requestHeaders) {
- b.append(s);
- }
- return b.toString();
- }
- /**
- * restore the state of this object from stream
- */
- private void readObject(ObjectInputStream s)
- throws IOException, ClassNotFoundException {
- ObjectInputStream.GetField fields = s.readFields();
- String actions = (String)fields.get("actions", null);
-
- init(actions);
- }
-}
diff --git a/jdk/src/share/classes/java/net/Inet6Address.java b/jdk/src/share/classes/java/net/Inet6Address.java
index 7b10db9..068a4ce 100644
--- a/jdk/src/share/classes/java/net/Inet6Address.java
+++ b/jdk/src/share/classes/java/net/Inet6Address.java
@@ -28,7 +28,10 @@
import java.io.IOException;
import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamField;
import java.util.Enumeration;
+import java.util.Arrays;
/**
* This class represents an Internet Protocol version 6 (IPv6) address.
@@ -177,37 +180,192 @@
*/
private transient int cached_scope_id; // 0
- /**
- * Holds a 128-bit (16 bytes) IPv6 address.
- *
- * @serial
- */
- byte[] ipaddress;
+ private class Inet6AddressHolder {
- /**
- * scope_id. The scope specified when the object is created. If the object
- * is created with an interface name, then the scope_id is not determined
- * until the time it is needed.
- */
- private int scope_id; // 0
+ private Inet6AddressHolder() {
+ ipaddress = new byte[INADDRSZ];
+ }
- /**
- * This will be set to true when the scope_id field contains a valid
- * integer scope_id.
- */
- private boolean scope_id_set; // false
+ private Inet6AddressHolder(
+ byte[] ipaddress, int scope_id, boolean scope_id_set,
+ NetworkInterface ifname, boolean scope_ifname_set)
+ {
+ this.ipaddress = ipaddress;
+ this.scope_id = scope_id;
+ this.scope_id_set = scope_id_set;
+ this.scope_ifname_set = scope_ifname_set;
+ this.scope_ifname = ifname;
+ }
- /**
- * scoped interface. scope_id is derived from this as the scope_id of the first
- * address whose scope is the same as this address for the named interface.
- */
- private transient NetworkInterface scope_ifname; // null
+ /**
+ * Holds a 128-bit (16 bytes) IPv6 address.
+ */
+ byte[] ipaddress;
- /**
- * set if the object is constructed with a scoped
- * interface instead of a numeric scope id.
- */
- private boolean scope_ifname_set; // false;
+ /**
+ * scope_id. The scope specified when the object is created. If the object
+ * is created with an interface name, then the scope_id is not determined
+ * until the time it is needed.
+ */
+ int scope_id; // 0
+
+ /**
+ * This will be set to true when the scope_id field contains a valid
+ * integer scope_id.
+ */
+ boolean scope_id_set; // false
+
+ /**
+ * scoped interface. scope_id is derived from this as the scope_id of the first
+ * address whose scope is the same as this address for the named interface.
+ */
+ NetworkInterface scope_ifname; // null
+
+ /**
+ * set if the object is constructed with a scoped
+ * interface instead of a numeric scope id.
+ */
+ boolean scope_ifname_set; // false;
+
+ void setAddr(byte addr[]) {
+ if (addr.length == INADDRSZ) { // normal IPv6 address
+ System.arraycopy(addr, 0, ipaddress, 0, INADDRSZ);
+ }
+ }
+
+ void init(byte addr[], int scope_id) {
+ setAddr(addr);
+
+ if (scope_id >= 0) {
+ this.scope_id = scope_id;
+ this.scope_id_set = true;
+ }
+ }
+
+ void init(byte addr[], NetworkInterface nif)
+ throws UnknownHostException
+ {
+ setAddr(addr);
+
+ if (nif != null) {
+ this.scope_id = deriveNumericScope(ipaddress, nif);
+ this.scope_id_set = true;
+ this.scope_ifname = nif;
+ this.scope_ifname_set = true;
+ }
+ }
+
+ String getHostAddress() {
+ String s = numericToTextFormat(ipaddress);
+ if (scope_ifname != null) { /* must check this first */
+ s = s + "%" + scope_ifname.getName();
+ } else if (scope_id_set) {
+ s = s + "%" + scope_id;
+ }
+ return s;
+ }
+
+ public boolean equals(Object o) {
+ if (! (o instanceof Inet6AddressHolder)) {
+ return false;
+ }
+ Inet6AddressHolder that = (Inet6AddressHolder)o;
+
+ return Arrays.equals(this.ipaddress, that.ipaddress);
+ }
+
+ public int hashCode() {
+ if (ipaddress != null) {
+
+ int hash = 0;
+ int i=0;
+ while (i<INADDRSZ) {
+ int j=0;
+ int component=0;
+ while (j<4 && i<INADDRSZ) {
+ component = (component << 8) + ipaddress[i];
+ j++;
+ i++;
+ }
+ hash += component;
+ }
+ return hash;
+
+ } else {
+ return 0;
+ }
+ }
+
+ boolean isIPv4CompatibleAddress() {
+ if ((ipaddress[0] == 0x00) && (ipaddress[1] == 0x00) &&
+ (ipaddress[2] == 0x00) && (ipaddress[3] == 0x00) &&
+ (ipaddress[4] == 0x00) && (ipaddress[5] == 0x00) &&
+ (ipaddress[6] == 0x00) && (ipaddress[7] == 0x00) &&
+ (ipaddress[8] == 0x00) && (ipaddress[9] == 0x00) &&
+ (ipaddress[10] == 0x00) && (ipaddress[11] == 0x00)) {
+ return true;
+ }
+ return false;
+ }
+
+ boolean isMulticastAddress() {
+ return ((ipaddress[0] & 0xff) == 0xff);
+ }
+
+ boolean isAnyLocalAddress() {
+ byte test = 0x00;
+ for (int i = 0; i < INADDRSZ; i++) {
+ test |= ipaddress[i];
+ }
+ return (test == 0x00);
+ }
+
+ boolean isLoopbackAddress() {
+ byte test = 0x00;
+ for (int i = 0; i < 15; i++) {
+ test |= ipaddress[i];
+ }
+ return (test == 0x00) && (ipaddress[15] == 0x01);
+ }
+
+ boolean isLinkLocalAddress() {
+ return ((ipaddress[0] & 0xff) == 0xfe
+ && (ipaddress[1] & 0xc0) == 0x80);
+ }
+
+
+ boolean isSiteLocalAddress() {
+ return ((ipaddress[0] & 0xff) == 0xfe
+ && (ipaddress[1] & 0xc0) == 0xc0);
+ }
+
+ boolean isMCGlobal() {
+ return ((ipaddress[0] & 0xff) == 0xff
+ && (ipaddress[1] & 0x0f) == 0x0e);
+ }
+
+ boolean isMCNodeLocal() {
+ return ((ipaddress[0] & 0xff) == 0xff
+ && (ipaddress[1] & 0x0f) == 0x01);
+ }
+
+ boolean isMCLinkLocal() {
+ return ((ipaddress[0] & 0xff) == 0xff
+ && (ipaddress[1] & 0x0f) == 0x02);
+ }
+
+ boolean isMCSiteLocal() {
+ return ((ipaddress[0] & 0xff) == 0xff
+ && (ipaddress[1] & 0x0f) == 0x05);
+ }
+
+ boolean isMCOrgLocal() {
+ return ((ipaddress[0] & 0xff) == 0xff
+ && (ipaddress[1] & 0x0f) == 0x08);
+ }
+ }
+
+ private final transient Inet6AddressHolder holder6;
private static final long serialVersionUID = 6880410070516793377L;
@@ -216,27 +374,21 @@
Inet6Address() {
super();
- holder().hostName = null;
- ipaddress = new byte[INADDRSZ];
- holder().family = IPv6;
+ holder.init(null, IPv6);
+ holder6 = new Inet6AddressHolder();
}
/* checking of value for scope_id should be done by caller
* scope_id must be >= 0, or -1 to indicate not being set
*/
Inet6Address(String hostName, byte addr[], int scope_id) {
- holder().hostName = hostName;
- if (addr.length == INADDRSZ) { // normal IPv6 address
- holder().family = IPv6;
- ipaddress = addr.clone();
- }
- if (scope_id >= 0) {
- this.scope_id = scope_id;
- scope_id_set = true;
- }
+ holder.init(hostName, IPv6);
+ holder6 = new Inet6AddressHolder();
+ holder6.init(addr, scope_id);
}
Inet6Address(String hostName, byte addr[]) {
+ holder6 = new Inet6AddressHolder();
try {
initif (hostName, addr, null);
} catch (UnknownHostException e) {} /* cant happen if ifname is null */
@@ -245,12 +397,14 @@
Inet6Address (String hostName, byte addr[], NetworkInterface nif)
throws UnknownHostException
{
+ holder6 = new Inet6AddressHolder();
initif (hostName, addr, nif);
}
Inet6Address (String hostName, byte addr[], String ifname)
throws UnknownHostException
{
+ holder6 = new Inet6AddressHolder();
initstr (hostName, addr, ifname);
}
@@ -341,17 +495,13 @@
private void initif(String hostName, byte addr[], NetworkInterface nif)
throws UnknownHostException
{
- holder().hostName = hostName;
+ int family = -1;
+ holder6.init(addr, nif);
+
if (addr.length == INADDRSZ) { // normal IPv6 address
- holder().family = IPv6;
- ipaddress = addr.clone();
+ family = IPv6;
}
- if (nif != null) {
- scope_ifname = nif;
- scope_id = deriveNumericScope(nif);
- scope_id_set = true;
- scope_ifname_set = true; // for consistency
- }
+ holder.init(hostName, family);
}
/* check the two Ipv6 addresses and return false if they are both
@@ -359,17 +509,22 @@
* (ie. one is sitelocal and the other linklocal)
* return true otherwise.
*/
- private boolean differentLocalAddressTypes(Inet6Address other) {
- if (isLinkLocalAddress() && !other.isLinkLocalAddress())
+
+ private static boolean isDifferentLocalAddressType(
+ byte[] thisAddr, byte[] otherAddr) {
+
+ if (Inet6Address.isLinkLocalAddress(thisAddr) &&
+ !Inet6Address.isLinkLocalAddress(otherAddr)) {
return false;
- if (isSiteLocalAddress() && !other.isSiteLocalAddress())
+ }
+ if (Inet6Address.isSiteLocalAddress(thisAddr) &&
+ !Inet6Address.isSiteLocalAddress(otherAddr)) {
return false;
+ }
return true;
}
- private int deriveNumericScope(NetworkInterface ifc)
- throws UnknownHostException
- {
+ private static int deriveNumericScope (byte[] thisAddr, NetworkInterface ifc) throws UnknownHostException {
Enumeration<InetAddress> addresses = ifc.getInetAddresses();
while (addresses.hasMoreElements()) {
InetAddress addr = addresses.nextElement();
@@ -378,46 +533,60 @@
}
Inet6Address ia6_addr = (Inet6Address)addr;
/* check if site or link local prefixes match */
- if (!differentLocalAddressTypes(ia6_addr)){
+ if (!isDifferentLocalAddressType(thisAddr, ia6_addr.getAddress())){
/* type not the same, so carry on searching */
continue;
}
/* found a matching address - return its scope_id */
- return ia6_addr.scope_id;
+ return ia6_addr.getScopeId();
}
throw new UnknownHostException ("no scope_id found");
}
- private int deriveNumericScope(String ifname) throws UnknownHostException {
+ private int deriveNumericScope (String ifname) throws UnknownHostException {
Enumeration<NetworkInterface> en;
try {
en = NetworkInterface.getNetworkInterfaces();
} catch (SocketException e) {
- throw new UnknownHostException(
- "could not enumerate local network interfaces");
+ throw new UnknownHostException ("could not enumerate local network interfaces");
}
while (en.hasMoreElements()) {
NetworkInterface ifc = en.nextElement();
- if (ifc.getName().equals(ifname)) {
- Enumeration<InetAddress> addresses = ifc.getInetAddresses();
- while (addresses.hasMoreElements()) {
- InetAddress addr = addresses.nextElement();
- if (!(addr instanceof Inet6Address)) {
- continue;
- }
- Inet6Address ia6_addr = (Inet6Address)addr;
- /* check if site or link local prefixes match */
- if (!differentLocalAddressTypes(ia6_addr)){
- /* type not the same, so carry on searching */
- continue;
- }
- /* found a matching address - return its scope_id */
- return ia6_addr.scope_id;
- }
+ if (ifc.getName().equals (ifname)) {
+ return deriveNumericScope(holder6.ipaddress, ifc);
}
}
- throw new UnknownHostException(
- "No matching address found for interface : " +ifname);
+ throw new UnknownHostException ("No matching address found for interface : " +ifname);
+ }
+
+ /**
+ * @serialField ipaddress byte[]
+ * @serialField scope_id int
+ * @serialField scope_id_set boolean
+ * @serialField scope_ifname_set boolean
+ * @serialField ifname String
+ */
+
+ private static final ObjectStreamField[] serialPersistentFields = {
+ new ObjectStreamField("ipaddress", byte[].class),
+ new ObjectStreamField("scope_id", int.class),
+ new ObjectStreamField("scope_id_set", boolean.class),
+ new ObjectStreamField("scope_ifname_set", boolean.class),
+ new ObjectStreamField("ifname", String.class)
+ };
+
+ private static final long FIELDS_OFFSET;
+ private static final sun.misc.Unsafe UNSAFE;
+
+ static {
+ try {
+ sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
+ FIELDS_OFFSET = unsafe.objectFieldOffset(
+ Inet6Address.class.getDeclaredField("holder6"));
+ UNSAFE = unsafe;
+ } catch (ReflectiveOperationException e) {
+ throw new Error(e);
+ }
}
/**
@@ -427,35 +596,41 @@
*/
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
+ NetworkInterface scope_ifname = null;
if (getClass().getClassLoader() != null) {
throw new SecurityException ("invalid address type");
}
- s.defaultReadObject();
+ ObjectInputStream.GetField gf = s.readFields();
+ byte[] ipaddress = (byte[])gf.get("ipaddress", null);
+ int scope_id = (int)gf.get("scope_id", -1);
+ boolean scope_id_set = (boolean)gf.get("scope_id_set", false);
+ boolean scope_ifname_set = (boolean)gf.get("scope_ifname_set", false);
+ String ifname = (String)gf.get("ifname", null);
- if (ifname != null && !ifname.equals("")) {
+ if (ifname != null && !"".equals (ifname)) {
try {
scope_ifname = NetworkInterface.getByName(ifname);
- if (scope_ifname != null) {
- scope_ifname_set = true;
- try {
- scope_id = deriveNumericScope(scope_ifname);
- } catch (UnknownHostException e) {
- // typically should not happen, but it may be that
- // the machine being used for deserialization has
- // the same interface name but without IPv6 configured.
- }
- } else {
+ if (scope_ifname == null) {
/* the interface does not exist on this system, so we clear
* the scope information completely */
scope_id_set = false;
scope_ifname_set = false;
scope_id = 0;
+ } else {
+ scope_ifname_set = true;
+ try {
+ scope_id = deriveNumericScope (ipaddress, scope_ifname);
+ } catch (UnknownHostException e) {
+ // typically should not happen, but it may be that
+ // the machine being used for deserialization has
+ // the same interface name but without IPv6 configured.
+ }
}
} catch (SocketException e) {}
-
}
+
/* if ifname was not supplied, then the numeric info is used */
ipaddress = ipaddress.clone();
@@ -466,9 +641,38 @@
ipaddress.length);
}
- if (holder().getFamily() != IPv6) {
+ if (holder.getFamily() != IPv6) {
throw new InvalidObjectException("invalid address family type");
}
+
+ Inet6AddressHolder h = new Inet6AddressHolder(
+ ipaddress, scope_id, scope_id_set, scope_ifname, scope_ifname_set
+ );
+
+ UNSAFE.putObject(this, FIELDS_OFFSET, h);
+ }
+
+ /**
+ * default behavior is overridden in order to write the
+ * scope_ifname field as a String, rather than a NetworkInterface
+ * which is not serializable
+ */
+ private synchronized void writeObject(ObjectOutputStream s)
+ throws IOException
+ {
+ String ifname = null;
+
+ if (holder6.scope_ifname != null) {
+ ifname = holder6.scope_ifname.getName();
+ holder6.scope_ifname_set = true;
+ }
+ ObjectOutputStream.PutField pfields = s.putFields();
+ pfields.put("ipaddress", holder6.ipaddress);
+ pfields.put("scope_id", holder6.scope_id);
+ pfields.put("scope_id_set", holder6.scope_id_set);
+ pfields.put("scope_ifname_set", holder6.scope_ifname_set);
+ pfields.put("ifname", ifname);
+ s.writeFields();
}
/**
@@ -483,7 +687,7 @@
*/
@Override
public boolean isMulticastAddress() {
- return ((ipaddress[0] & 0xff) == 0xff);
+ return holder6.isMulticastAddress();
}
/**
@@ -496,11 +700,7 @@
*/
@Override
public boolean isAnyLocalAddress() {
- byte test = 0x00;
- for (int i = 0; i < INADDRSZ; i++) {
- test |= ipaddress[i];
- }
- return (test == 0x00);
+ return holder6.isAnyLocalAddress();
}
/**
@@ -513,11 +713,7 @@
*/
@Override
public boolean isLoopbackAddress() {
- byte test = 0x00;
- for (int i = 0; i < 15; i++) {
- test |= ipaddress[i];
- }
- return (test == 0x00) && (ipaddress[15] == 0x01);
+ return holder6.isLoopbackAddress();
}
/**
@@ -530,6 +726,11 @@
*/
@Override
public boolean isLinkLocalAddress() {
+ return holder6.isLinkLocalAddress();
+ }
+
+ /* static version of above */
+ static boolean isLinkLocalAddress(byte[] ipaddress) {
return ((ipaddress[0] & 0xff) == 0xfe
&& (ipaddress[1] & 0xc0) == 0x80);
}
@@ -544,6 +745,11 @@
*/
@Override
public boolean isSiteLocalAddress() {
+ return holder6.isSiteLocalAddress();
+ }
+
+ /* static version of above */
+ static boolean isSiteLocalAddress(byte[] ipaddress) {
return ((ipaddress[0] & 0xff) == 0xfe
&& (ipaddress[1] & 0xc0) == 0xc0);
}
@@ -559,8 +765,7 @@
*/
@Override
public boolean isMCGlobal() {
- return ((ipaddress[0] & 0xff) == 0xff
- && (ipaddress[1] & 0x0f) == 0x0e);
+ return holder6.isMCGlobal();
}
/**
@@ -574,8 +779,7 @@
*/
@Override
public boolean isMCNodeLocal() {
- return ((ipaddress[0] & 0xff) == 0xff
- && (ipaddress[1] & 0x0f) == 0x01);
+ return holder6.isMCNodeLocal();
}
/**
@@ -589,8 +793,7 @@
*/
@Override
public boolean isMCLinkLocal() {
- return ((ipaddress[0] & 0xff) == 0xff
- && (ipaddress[1] & 0x0f) == 0x02);
+ return holder6.isMCLinkLocal();
}
/**
@@ -604,8 +807,7 @@
*/
@Override
public boolean isMCSiteLocal() {
- return ((ipaddress[0] & 0xff) == 0xff
- && (ipaddress[1] & 0x0f) == 0x05);
+ return holder6.isMCSiteLocal();
}
/**
@@ -619,10 +821,8 @@
*/
@Override
public boolean isMCOrgLocal() {
- return ((ipaddress[0] & 0xff) == 0xff
- && (ipaddress[1] & 0x0f) == 0x08);
+ return holder6.isMCOrgLocal();
}
-
/**
* Returns the raw IP address of this {@code InetAddress} object. The result
* is in network byte order: the highest order byte of the address is in
@@ -632,7 +832,7 @@
*/
@Override
public byte[] getAddress() {
- return ipaddress.clone();
+ return holder6.ipaddress.clone();
}
/**
@@ -644,7 +844,7 @@
* @since 1.5
*/
public int getScopeId() {
- return scope_id;
+ return holder6.scope_id;
}
/**
@@ -655,7 +855,7 @@
* @since 1.5
*/
public NetworkInterface getScopedInterface() {
- return scope_ifname;
+ return holder6.scope_ifname;
}
/**
@@ -669,13 +869,7 @@
*/
@Override
public String getHostAddress() {
- String s = numericToTextFormat(ipaddress);
- if (scope_ifname != null) { /* must check this first */
- s = s + "%" + scope_ifname.getName();
- } else if (scope_id_set) {
- s = s + "%" + scope_id;
- }
- return s;
+ return holder6.getHostAddress();
}
/**
@@ -685,25 +879,7 @@
*/
@Override
public int hashCode() {
- if (ipaddress != null) {
-
- int hash = 0;
- int i=0;
- while (i<INADDRSZ) {
- int j=0;
- int component=0;
- while (j<4 && i<INADDRSZ) {
- component = (component << 8) + ipaddress[i];
- j++;
- i++;
- }
- hash += component;
- }
- return hash;
-
- } else {
- return 0;
- }
+ return holder6.hashCode();
}
/**
@@ -728,12 +904,8 @@
return false;
Inet6Address inetAddr = (Inet6Address)obj;
- for (int i = 0; i < INADDRSZ; i++) {
- if (ipaddress[i] != inetAddr.ipaddress[i])
- return false;
- }
- return true;
+ return holder6.equals(inetAddr.holder6);
}
/**
@@ -746,15 +918,7 @@
* @since 1.4
*/
public boolean isIPv4CompatibleAddress() {
- if ((ipaddress[0] == 0x00) && (ipaddress[1] == 0x00) &&
- (ipaddress[2] == 0x00) && (ipaddress[3] == 0x00) &&
- (ipaddress[4] == 0x00) && (ipaddress[5] == 0x00) &&
- (ipaddress[6] == 0x00) && (ipaddress[7] == 0x00) &&
- (ipaddress[8] == 0x00) && (ipaddress[9] == 0x00) &&
- (ipaddress[10] == 0x00) && (ipaddress[11] == 0x00)) {
- return true;
- }
- return false;
+ return holder6.isIPv4CompatibleAddress();
}
// Utilities
@@ -784,24 +948,4 @@
* Perform class load-time initializations.
*/
private static native void init();
-
- /**
- * Following field is only used during (de)/serialization
- */
- private String ifname;
-
- /**
- * default behavior is overridden in order to write the
- * scope_ifname field as a String, rather than a NetworkInterface
- * which is not serializable
- */
- private synchronized void writeObject(java.io.ObjectOutputStream s)
- throws IOException
- {
- if (scope_ifname != null) {
- ifname = scope_ifname.getName();
- scope_ifname_set = true;
- }
- s.defaultWriteObject();
- }
}
diff --git a/jdk/src/share/classes/java/net/InetAddress.java b/jdk/src/share/classes/java/net/InetAddress.java
index 4817849..3bb7249 100644
--- a/jdk/src/share/classes/java/net/InetAddress.java
+++ b/jdk/src/share/classes/java/net/InetAddress.java
@@ -212,6 +212,13 @@
this.family = family;
}
+ void init(String hostName, int family) {
+ this.hostName = hostName;
+ if (family != -1) {
+ this.family = family;
+ }
+ }
+
String hostName;
String getHostName() {
@@ -239,7 +246,7 @@
}
/* Used to store the serializable fields of InetAddress */
- private final transient InetAddressHolder holder;
+ final transient InetAddressHolder holder;
InetAddressHolder holder() {
return holder;
diff --git a/jdk/src/share/classes/java/net/URLPermission.java b/jdk/src/share/classes/java/net/URLPermission.java
new file mode 100644
index 0000000..f6572cd
--- /dev/null
+++ b/jdk/src/share/classes/java/net/URLPermission.java
@@ -0,0 +1,523 @@
+/*
+ * Copyright (c) 2013, 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 java.net;
+
+import java.io.ObjectInputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.security.Permission;
+
+/**
+ * Represents permission to access a resource or set of resources defined by a
+ * given url, and for a given set of user-settable request methods
+ * and request headers. The <i>name</i> of the permission is the url string.
+ * The <i>actions</i> string is a concatenation of the request methods and headers.
+ * The range of method and header names is not restricted by this class.
+ * <p><b>The url</b><p>
+ * The url string has the following expected structure.
+ * <pre>
+ * scheme : // authority [ / path ]
+ * </pre>
+ * <i>scheme</i> will typically be http or https, but is not restricted by this
+ * class.
+ * <i>authority</i> is specified as:<p>
+ * <pre>
+ * authority = hostrange [ : portrange ]
+ * portrange = portnumber | -portnumber | portnumber-[portnumber] | *
+ * hostrange = ([*.] dnsname) | IPv4address | IPv6address
+ * </pre>
+ * <i>dnsname</i> is a standard DNS host or domain name, ie. one or more labels
+ * separated by ".". <i>IPv4address</i> is a standard literal IPv4 address and
+ * <i>IPv6address</i> is as defined in <a href="http://www.ietf.org/rfc/rfc2732.txt">
+ * RFC 2732</a>. Literal IPv6 addresses must however, be enclosed in '[]' characters.
+ * The <i>dnsname</i> specification can be preceded by "*." which means
+ * the name will match any hostname whose right-most domain labels are the same as
+ * this name. For example, "*.oracle.com" matches "foo.bar.oracle.com"
+ * <p>
+ * <i>portrange</i> is used to specify a port number, or a bounded or unbounded range of ports
+ * that this permission applies to. If portrange is absent or invalid, then a default
+ * port number is assumed if the scheme is {@code http} (default 80) or {@code https}
+ * (default 443). No default is assumed for other schemes. A wildcard may be specified
+ * which means all ports.
+ * <p>
+ * The <i>path</i> component comprises a sequence of path segments,
+ * separated by '/' characters. <i>path</i> may also be empty. The path is specified
+ * in a similar way to the path in {@link java.io.FilePermission}. There are
+ * three different ways as the following examples show:
+ * <table border>
+ * <caption>URL Examples</caption>
+ * <tr><th>Example url</th><th>Description</th></tr>
+ * <tr><td style="white-space:nowrap;">http://www.oracle.com/a/b/c.html</td>
+ * <td>A url which identifies a specific (single) resource</td>
+ * </tr>
+ * <tr><td>http://www.oracle.com/a/b/*</td>
+ * <td>The '*' character refers to all resources in the same "directory" - in
+ * other words all resources with the same number of path components, and
+ * which only differ in the final path component, represented by the '*'.
+ * </td>
+ * </tr>
+ * <tr><td>http://www.oracle.com/a/b/-</td>
+ * <td>The '-' character refers to all resources recursively below the
+ * preceding path (eg. http://www.oracle.com/a/b/c/d/e.html matches this
+ * example).
+ * </td>
+ * </tr>
+ * </table>
+ * <p>
+ * The '*' and '-' may only be specified in the final segment of a path and must be
+ * the only character in that segment. Any query or fragment components of the
+ * url are ignored when constructing URLPermissions.
+ * <p>
+ * As a special case, urls of the form, "scheme:*" are accepted to
+ * mean any url of the given scheme.
+ * <p>
+ * The <i>scheme</i> and <i>authority</i> components of the url string are handled
+ * without regard to case. This means {@link #equals(Object)},
+ * {@link #hashCode()} and {@link #implies(Permission)} are case insensitive with respect
+ * to these components. If the <i>authority</i> contains a literal IP address,
+ * then the address is normalized for comparison. The path component is case sensitive.
+ * <p><b>The actions string</b><p>
+ * The actions string of a URLPermission is a concatenation of the <i>method list</i>
+ * and the <i>request headers list</i>. These are lists of the permitted request
+ * methods and permitted request headers of the permission (respectively). The two lists
+ * are separated by a colon ':' character and elements of each list are comma separated.
+ * Some examples are:
+ * <pre>
+ * "POST,GET,DELETE"
+ * "GET:X-Foo-Request,X-Bar-Request"
+ * "POST,GET:Header1,Header2"
+ * </pre>
+ * The first example specifies the methods: POST, GET and DELETE, but no request headers.
+ * The second example specifies one request method and two headers. The third
+ * example specifies two request methods, and two headers.
+ * <p>
+ * The colon separator need not be present if the request headers list is empty.
+ * No white-space is permitted in the actions string. The action strings supplied to
+ * the URLPermission constructors are case-insensitive and are normalized by converting
+ * method names to upper-case and header names to the form defines in RFC2616 (lower case
+ * with initial letter of each word capitalized). Either list can contain a wild-card '*'
+ * character which signifies all request methods or headers respectively.
+ * <p>
+ * Note. Depending on the context of use, some request methods and headers may be permitted
+ * at all times, and others may not be permitted at any time. For example, the
+ * HTTP protocol handler might disallow certain headers such as Content-Length
+ * from being set by application code, regardless of whether the security policy
+ * in force, permits it.
+ *
+ * @since 1.8
+ */
+public final class URLPermission extends Permission {
+
+ private static final long serialVersionUID = -2702463814894478682L;
+
+ private transient String scheme;
+ private transient String ssp; // scheme specific part
+ private transient String path;
+ private transient List<String> methods;
+ private transient List<String> requestHeaders;
+ private transient Authority authority;
+
+ // serialized field
+ private String actions;
+
+ /**
+ * Creates a new URLPermission from a url string and which permits the given
+ * request methods and user-settable request headers.
+ * The name of the permission is the url string it was created with. Only the scheme,
+ * authority and path components of the url are used internally. Any fragment or query
+ * components are ignored. The permissions action string is as specified above.
+ *
+ * @param url the url string
+ *
+ * @param actions the actions string
+ *
+ * @exception IllegalArgumentException if url is invalid or if actions contains white-space.
+ */
+ public URLPermission(String url, String actions) {
+ super(url);
+ init(actions);
+ }
+
+ private void init(String actions) {
+ parseURI(getName());
+ int colon = actions.indexOf(':');
+ if (actions.lastIndexOf(':') != colon) {
+ throw new IllegalArgumentException("invalid actions string");
+ }
+
+ String methods, headers;
+ if (colon == -1) {
+ methods = actions;
+ headers = "";
+ } else {
+ methods = actions.substring(0, colon);
+ headers = actions.substring(colon+1);
+ }
+
+ List<String> l = normalizeMethods(methods);
+ Collections.sort(l);
+ this.methods = Collections.unmodifiableList(l);
+
+ l = normalizeHeaders(headers);
+ Collections.sort(l);
+ this.requestHeaders = Collections.unmodifiableList(l);
+
+ this.actions = actions();
+ }
+
+ /**
+ * Creates a URLPermission with the given url string and unrestricted
+ * methods and request headers by invoking the two argument
+ * constructor as follows: URLPermission(url, "*:*")
+ *
+ * @param url the url string
+ *
+ * @throws IllegalArgumentException if url does not result in a valid {@link URI}
+ */
+ public URLPermission(String url) {
+ this(url, "*:*");
+ }
+
+ /**
+ * Returns the normalized method list and request
+ * header list, in the form:
+ * <pre>
+ * "method-names : header-names"
+ * </pre>
+ * <p>
+ * where method-names is the list of methods separated by commas
+ * and header-names is the list of permitted headers separated by commas.
+ * There is no white space in the returned String. If header-names is empty
+ * then the colon separator will not be present.
+ */
+ public String getActions() {
+ return actions;
+ }
+
+ /**
+ * Checks if this URLPermission implies the given permission.
+ * Specifically, the following checks are done as if in the
+ * following sequence:
+ * <p><ul>
+ * <li>if 'p' is not an instance of URLPermission return false</li>
+ * <li>if any of p's methods are not in this's method list, and if
+ * this's method list is not equal to "*", then return false.</li>
+ * <li>if any of p's headers are not in this's request header list, and if
+ * this's request header list is not equal to "*", then return false.</li>
+ * <li>if this's url scheme is not equal to p's url scheme return false</li>
+ * <li>if the scheme specific part of this's url is '*' return true</li>
+ * <li>if the set of hosts defined by p's url hostrange is not a subset of
+ * this's url hostrange then return false. For example, "*.foo.oracle.com"
+ * is a subset of "*.oracle.com". "foo.bar.oracle.com" is not
+ * a subset of "*.foo.oracle.com"</li>
+ * <li>if the portrange defined by p's url is not a subset of the
+ * portrange defined by this's url then return false.
+ * <li>if the path or paths specified by p's url are contained in the
+ * set of paths specified by this's url, then return true
+ * <li>otherwise, return false</li>
+ * </ul>
+ * <p>Some examples of how paths are matched are shown below:
+ * <p><table border>
+ * <caption>Examples of Path Matching</caption>
+ * <tr><th>this's path</th><th>p's path</th><th>match</th></tr>
+ * <tr><td>/a/b</td><td>/a/b</td><td>yes</td></tr>
+ * <tr><td>/a/b/*</td><td>/a/b/c</td><td>yes</td></tr>
+ * <tr><td>/a/b/*</td><td>/a/b/c/d</td><td>no</td></tr>
+ * <tr><td>/a/b/-</td><td>/a/b/c/d</td><td>yes</td></tr>
+ * <tr><td>/a/b/-</td><td>/a/b/c/d/e</td><td>yes</td></tr>
+ * <tr><td>/a/b/-</td><td>/a/b/c/*</td><td>yes</td></tr>
+ * <tr><td>/a/b/*</td><td>/a/b/c/-</td><td>no</td></tr>
+ * </table>
+ */
+ public boolean implies(Permission p) {
+ if (! (p instanceof URLPermission)) {
+ return false;
+ }
+
+ URLPermission that = (URLPermission)p;
+
+ if (!this.methods.get(0).equals("*") &&
+ Collections.indexOfSubList(this.methods, that.methods) == -1) {
+ return false;
+ }
+
+ if (this.requestHeaders.isEmpty() && !that.requestHeaders.isEmpty()) {
+ return false;
+ }
+
+ if (!this.requestHeaders.isEmpty() &&
+ !this.requestHeaders.get(0).equals("*") &&
+ Collections.indexOfSubList(this.requestHeaders,
+ that.requestHeaders) == -1) {
+ return false;
+ }
+
+ if (!this.scheme.equals(that.scheme)) {
+ return false;
+ }
+
+ if (this.ssp.equals("*")) {
+ return true;
+ }
+
+ if (!this.authority.implies(that.authority)) {
+ return false;
+ }
+
+ if (this.path == null) {
+ return that.path == null;
+ }
+ if (that.path == null) {
+ return false;
+ }
+
+ if (this.path.endsWith("/-")) {
+ String thisprefix = this.path.substring(0, this.path.length() - 1);
+ return that.path.startsWith(thisprefix);
+ }
+
+ if (this.path.endsWith("/*")) {
+ String thisprefix = this.path.substring(0, this.path.length() - 1);
+ if (!that.path.startsWith(thisprefix)) {
+ return false;
+ }
+ String thatsuffix = that.path.substring(thisprefix.length());
+ // suffix must not contain '/' chars
+ if (thatsuffix.indexOf('/') != -1) {
+ return false;
+ }
+ if (thatsuffix.equals("-")) {
+ return false;
+ }
+ return true;
+ }
+ return this.path.equals(that.path);
+ }
+
+
+ /**
+ * Returns true if, this.getActions().equals(p.getActions())
+ * and p's url equals this's url. Returns false otherwise.
+ */
+ public boolean equals(Object p) {
+ if (!(p instanceof URLPermission)) {
+ return false;
+ }
+ URLPermission that = (URLPermission)p;
+ if (!this.scheme.equals(that.scheme)) {
+ return false;
+ }
+ if (!this.getActions().equals(that.getActions())) {
+ return false;
+ }
+ if (!this.authority.equals(that.authority)) {
+ return false;
+ }
+ if (this.path != null) {
+ return this.path.equals(that.path);
+ } else {
+ return that.path == null;
+ }
+ }
+
+ /**
+ * Returns a hashcode calculated from the hashcode of the
+ * actions String and the url string.
+ */
+ public int hashCode() {
+ return getActions().hashCode()
+ + scheme.hashCode()
+ + authority.hashCode()
+ + path == null ? 0 : path.hashCode();
+ }
+
+
+ private List<String> normalizeMethods(String methods) {
+ List<String> l = new ArrayList<>();
+ StringBuilder b = new StringBuilder();
+ for (int i=0; i<methods.length(); i++) {
+ char c = methods.charAt(i);
+ if (c == ',') {
+ String s = b.toString();
+ if (s.length() > 0)
+ l.add(s);
+ b = new StringBuilder();
+ } else if (c == ' ' || c == '\t') {
+ throw new IllegalArgumentException("white space not allowed");
+ } else {
+ if (c >= 'a' && c <= 'z') {
+ c += 'A' - 'a';
+ }
+ b.append(c);
+ }
+ }
+ String s = b.toString();
+ if (s.length() > 0)
+ l.add(s);
+ return l;
+ }
+
+ private List<String> normalizeHeaders(String headers) {
+ List<String> l = new ArrayList<>();
+ StringBuilder b = new StringBuilder();
+ boolean capitalizeNext = true;
+ for (int i=0; i<headers.length(); i++) {
+ char c = headers.charAt(i);
+ if (c >= 'a' && c <= 'z') {
+ if (capitalizeNext) {
+ c += 'A' - 'a';
+ capitalizeNext = false;
+ }
+ b.append(c);
+ } else if (c == ' ' || c == '\t') {
+ throw new IllegalArgumentException("white space not allowed");
+ } else if (c == '-') {
+ capitalizeNext = true;
+ b.append(c);
+ } else if (c == ',') {
+ String s = b.toString();
+ if (s.length() > 0)
+ l.add(s);
+ b = new StringBuilder();
+ capitalizeNext = true;
+ } else {
+ capitalizeNext = false;
+ b.append(c);
+ }
+ }
+ String s = b.toString();
+ if (s.length() > 0)
+ l.add(s);
+ return l;
+ }
+
+ private void parseURI(String url) {
+ int len = url.length();
+ int delim = url.indexOf(':');
+ if (delim == -1 || delim + 1 == len) {
+ throw new IllegalArgumentException("invalid URL string");
+ }
+ scheme = url.substring(0, delim).toLowerCase();
+ this.ssp = url.substring(delim + 1);
+
+ if (!ssp.startsWith("//")) {
+ this.authority = new Authority(scheme, ssp.toLowerCase());
+ return;
+ }
+ String authpath = ssp.substring(2);
+
+ delim = authpath.indexOf('/');
+ String auth;
+ if (delim == -1) {
+ this.path = "";
+ auth = authpath;
+ } else {
+ auth = authpath.substring(0, delim);
+ this.path = authpath.substring(delim);
+ }
+ this.authority = new Authority(scheme, auth.toLowerCase());
+ }
+
+ private String actions() {
+ StringBuilder b = new StringBuilder();
+ for (String s : methods) {
+ b.append(s);
+ }
+ b.append(":");
+ for (String s : requestHeaders) {
+ b.append(s);
+ }
+ return b.toString();
+ }
+
+ /**
+ * restore the state of this object from stream
+ */
+ private void readObject(ObjectInputStream s)
+ throws IOException, ClassNotFoundException {
+ ObjectInputStream.GetField fields = s.readFields();
+ String actions = (String)fields.get("actions", null);
+
+ init(actions);
+ }
+
+ static class Authority {
+ HostPortrange p;
+
+ Authority(String scheme, String authority) {
+ p = new HostPortrange(scheme, authority);
+ }
+
+ boolean implies(Authority other) {
+ return impliesHostrange(other) && impliesPortrange(other);
+ }
+
+ private boolean impliesHostrange(Authority that) {
+ String thishost = this.p.hostname();
+ String thathost = that.p.hostname();
+
+ if (p.wildcard() && thishost.equals("")) {
+ // this "*" implies all others
+ return true;
+ }
+ if (that.p.wildcard() && thathost.equals("")) {
+ // that "*" can only be implied by this "*"
+ return false;
+ }
+ if (thishost.equals(thathost)) {
+ // covers all cases of literal IP addresses and fixed
+ // domain names.
+ return true;
+ }
+ if (this.p.wildcard()) {
+ // this "*.foo.com" implies "bub.bar.foo.com"
+ return thathost.endsWith(thishost);
+ }
+ return false;
+ }
+
+ private boolean impliesPortrange(Authority that) {
+ int[] thisrange = this.p.portrange();
+ int[] thatrange = that.p.portrange();
+ if (thisrange[0] == -1) {
+ /* port not specified non http/s URL */
+ return true;
+ }
+ return thisrange[0] <= thatrange[0] &&
+ thisrange[1] >= thatrange[1];
+ }
+
+ boolean equals(Authority that) {
+ return this.p.equals(that.p);
+ }
+
+ public int hashCode() {
+ return p.hashCode();
+ }
+ }
+}
diff --git a/jdk/src/share/classes/java/nio/file/Files.java b/jdk/src/share/classes/java/nio/file/Files.java
index 0162944..920ac93 100644
--- a/jdk/src/share/classes/java/nio/file/Files.java
+++ b/jdk/src/share/classes/java/nio/file/Files.java
@@ -43,9 +43,10 @@
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CharsetEncoder;
+import java.nio.charset.StandardCharsets;
import java.nio.file.attribute.BasicFileAttributeView;
import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.attribute.DosFileAttributes;
+import java.nio.file.attribute.DosFileAttributes; // javadoc
import java.nio.file.attribute.FileAttribute;
import java.nio.file.attribute.FileAttributeView;
import java.nio.file.attribute.FileOwnerAttributeView;
@@ -104,8 +105,7 @@
return () -> {
try {
c.close();
- }
- catch (IOException e) {
+ } catch (IOException e) {
throw new UncheckedIOException(e);
}
};
@@ -2550,7 +2550,7 @@
* checkExec} is invoked to check execute access to the file.
*/
public static boolean isExecutable(Path path) {
- return isAccessible(path, AccessMode.EXECUTE);
+ return isAccessible(path, AccessMode.EXECUTE);
}
// -- Recursive operations --
@@ -2783,6 +2783,37 @@
}
/**
+ * Opens a file for reading, returning a {@code BufferedReader} to read text
+ * from the file in an efficient manner. Bytes from the file are decoded into
+ * characters using the {@link StandardCharsets#UTF_8 UTF-8} {@link Charset
+ * charset}.
+ *
+ * <p> This method works as if invoking it were equivalent to evaluating the
+ * expression:
+ * <pre>{@code
+ * Files.newBufferedReader(path, StandardCharsets.UTF_8)
+ * }</pre>
+ *
+ * @param path
+ * the path to the file
+ *
+ * @return a new buffered reader, with default buffer size, to read text
+ * from the file
+ *
+ * @throws IOException
+ * if an I/O error occurs opening the file
+ * @throws SecurityException
+ * In the case of the default provider, and a security manager is
+ * installed, the {@link SecurityManager#checkRead(String) checkRead}
+ * method is invoked to check read access to the file.
+ *
+ * @since 1.8
+ */
+ public static BufferedReader newBufferedReader(Path path) throws IOException {
+ return newBufferedReader(path, StandardCharsets.UTF_8);
+ }
+
+ /**
* Opens or creates a file for writing, returning a {@code BufferedWriter}
* that may be used to write text to the file in an efficient manner.
* The {@code options} parameter specifies how the the file is created or
@@ -2828,6 +2859,41 @@
}
/**
+ * Opens or creates a file for writing, returning a {@code BufferedWriter}
+ * to write text to the file in an efficient manner. The text is encoded
+ * into bytes for writing using the {@link StandardCharsets#UTF_8 UTF-8}
+ * {@link Charset charset}.
+ *
+ * <p> This method works as if invoking it were equivalent to evaluating the
+ * expression:
+ * <pre>{@code
+ * Files.newBufferedWriter(path, StandardCharsets.UTF_8, options)
+ * }</pre>
+ *
+ * @param path
+ * the path to the file
+ * @param options
+ * options specifying how the file is opened
+ *
+ * @return a new buffered writer, with default buffer size, to write text
+ * to the file
+ *
+ * @throws IOException
+ * if an I/O error occurs opening or creating the file
+ * @throws UnsupportedOperationException
+ * if an unsupported option is specified
+ * @throws SecurityException
+ * In the case of the default provider, and a security manager is
+ * installed, the {@link SecurityManager#checkWrite(String) checkWrite}
+ * method is invoked to check write access to the file.
+ *
+ * @since 1.8
+ */
+ public static BufferedWriter newBufferedWriter(Path path, OpenOption... options) throws IOException {
+ return newBufferedWriter(path, StandardCharsets.UTF_8, options);
+ }
+
+ /**
* Reads all bytes from an input stream and writes them to an output stream.
*/
private static long copy(InputStream source, OutputStream sink)
@@ -3025,9 +3091,7 @@
* @throws OutOfMemoryError
* if an array of the required size cannot be allocated
*/
- private static byte[] read(InputStream source, int initialSize)
- throws IOException
- {
+ private static byte[] read(InputStream source, int initialSize) throws IOException {
int capacity = initialSize;
byte[] buf = new byte[capacity];
int nread = 0;
@@ -3131,9 +3195,7 @@
*
* @see #newBufferedReader
*/
- public static List<String> readAllLines(Path path, Charset cs)
- throws IOException
- {
+ public static List<String> readAllLines(Path path, Charset cs) throws IOException {
try (BufferedReader reader = newBufferedReader(path, cs)) {
List<String> result = new ArrayList<>();
for (;;) {
@@ -3147,6 +3209,37 @@
}
/**
+ * Read all lines from a file. Bytes from the file are decoded into characters
+ * using the {@link StandardCharsets#UTF_8 UTF-8} {@link Charset charset}.
+ *
+ * <p> This method works as if invoking it were equivalent to evaluating the
+ * expression:
+ * <pre>{@code
+ * Files.readAllLines(path, StandardCharsets.UTF_8)
+ * }</pre>
+ *
+ * @param path
+ * the path to the file
+ *
+ * @return the lines from the file as a {@code List}; whether the {@code
+ * List} is modifiable or not is implementation dependent and
+ * therefore not specified
+ *
+ * @throws IOException
+ * if an I/O error occurs reading from the file or a malformed or
+ * unmappable byte sequence is read
+ * @throws SecurityException
+ * In the case of the default provider, and a security manager is
+ * installed, the {@link SecurityManager#checkRead(String) checkRead}
+ * method is invoked to check read access to the file.
+ *
+ * @since 1.8
+ */
+ public static List<String> readAllLines(Path path) throws IOException {
+ return readAllLines(path, StandardCharsets.UTF_8);
+ }
+
+ /**
* Writes bytes to a file. The {@code options} parameter specifies how the
* the file is created or opened. If no options are present then this method
* works as if the {@link StandardOpenOption#CREATE CREATE}, {@link
@@ -3262,6 +3355,45 @@
return path;
}
+ /**
+ * Write lines of text to a file. Characters are encoded into bytes using
+ * the {@link StandardCharsets#UTF_8 UTF-8} {@link Charset charset}.
+ *
+ * <p> This method works as if invoking it were equivalent to evaluating the
+ * expression:
+ * <pre>{@code
+ * Files.write(path, lines, StandardCharsets.UTF_8, options);
+ * }</pre>
+ *
+ * @param path
+ * the path to the file
+ * @param lines
+ * an object to iterate over the char sequences
+ * @param options
+ * options specifying how the file is opened
+ *
+ * @return the path
+ *
+ * @throws IOException
+ * if an I/O error occurs writing to or creating the file, or the
+ * text cannot be encoded as {@code UTF-8}
+ * @throws UnsupportedOperationException
+ * if an unsupported option is specified
+ * @throws SecurityException
+ * In the case of the default provider, and a security manager is
+ * installed, the {@link SecurityManager#checkWrite(String) checkWrite}
+ * method is invoked to check write access to the file.
+ *
+ * @since 1.8
+ */
+ public static Path write(Path path,
+ Iterable<? extends CharSequence> lines,
+ OpenOption... options)
+ throws IOException
+ {
+ return write(path, lines, StandardCharsets.UTF_8, options);
+ }
+
// -- Stream APIs --
/**
@@ -3431,9 +3563,11 @@
* if an I/O error is thrown when accessing the starting file.
* @since 1.8
*/
- public static Stream<Path> walk(Path start, int maxDepth,
+ public static Stream<Path> walk(Path start,
+ int maxDepth,
FileVisitOption... options)
- throws IOException {
+ throws IOException
+ {
FileTreeIterator iterator = new FileTreeIterator(start, maxDepth, options);
try {
return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, Spliterator.DISTINCT), false)
@@ -3484,9 +3618,7 @@
* @see #walk(Path, int, FileVisitOption...)
* @since 1.8
*/
- public static Stream<Path> walk(Path start,
- FileVisitOption... options)
- throws IOException {
+ public static Stream<Path> walk(Path start, FileVisitOption... options) throws IOException {
return walk(start, Integer.MAX_VALUE, options);
}
@@ -3547,7 +3679,8 @@
int maxDepth,
BiPredicate<Path, BasicFileAttributes> matcher,
FileVisitOption... options)
- throws IOException {
+ throws IOException
+ {
FileTreeIterator iterator = new FileTreeIterator(start, maxDepth, options);
try {
return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, Spliterator.DISTINCT), false)
@@ -3561,7 +3694,7 @@
}
/**
- * Read all lines from a file as a {@code Stream}. Unlike {@link
+ * Read all lines from a file as a {@code Stream}. Unlike {@link
* #readAllLines(Path, Charset) readAllLines}, this method does not read
* all lines into a {@code List}, but instead populates lazily as the stream
* is consumed.
@@ -3619,4 +3752,33 @@
throw e;
}
}
+
+ /**
+ * Read all lines from a file as a {@code Stream}. Bytes from the file are
+ * decoded into characters using the {@link StandardCharsets#UTF_8 UTF-8}
+ * {@link Charset charset}.
+ *
+ * <p> This method works as if invoking it were equivalent to evaluating the
+ * expression:
+ * <pre>{@code
+ * Files.lines(path, StandardCharsets.UTF_8)
+ * }</pre>
+ *
+ * @param path
+ * the path to the file
+ *
+ * @return the lines from the file as a {@code Stream}
+ *
+ * @throws IOException
+ * if an I/O error occurs opening the file
+ * @throws SecurityException
+ * In the case of the default provider, and a security manager is
+ * installed, the {@link SecurityManager#checkRead(String) checkRead}
+ * method is invoked to check read access to the file.
+ *
+ * @since 1.8
+ */
+ public static Stream<String> lines(Path path) throws IOException {
+ return lines(path, StandardCharsets.UTF_8);
+ }
}
diff --git a/jdk/src/share/classes/java/security/DomainLoadStoreParameter.java b/jdk/src/share/classes/java/security/DomainLoadStoreParameter.java
new file mode 100644
index 0000000..bc96975
--- /dev/null
+++ b/jdk/src/share/classes/java/security/DomainLoadStoreParameter.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2013, 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 java.security;
+
+import java.net.URI;
+import java.util.*;
+import static java.security.KeyStore.*;
+
+/**
+ * Configuration data that specifies the keystores in a keystore domain.
+ * A keystore domain is a collection of keystores that are presented as a
+ * single logical keystore. The configuration data is used during
+ * {@code KeyStore}
+ * {@link KeyStore#load(KeyStore.LoadStoreParameter) load} and
+ * {@link KeyStore#store(KeyStore.LoadStoreParameter) store} operations.
+ * <p>
+ * The following syntax is supported for configuration data:
+ * <pre>{@code
+ * domain <domainName> [<property> ...] {
+ * keystore <keystoreName> [<property> ...] ;
+ * ...
+ * };
+ * ...
+ * }</pre>
+ * where {@code domainName} and {@code keystoreName} are identifiers
+ * and {@code property} is a key/value pairing. The key and value are
+ * separated by an 'equals' symbol and the value is enclosed in double
+ * quotes. A property value may be either a printable string or a binary
+ * string of colon-separated pairs of hexadecimal digits. Multi-valued
+ * properties are represented as a comma-separated list of values,
+ * enclosed in square brackets.
+ * See {@link Arrays#toString(java.lang.Object[])}.
+ * <p>
+ * To ensure that keystore entries are uniquely identified, each
+ * entry's alias is prefixed by its {@code keystoreName} followed
+ * by the entry name separator and each {@code keystoreName} must be
+ * unique within its domain. Entry name prefixes are omitted when
+ * storing a keystore.
+ * <p>
+ * Properties are context-sensitive: properties that apply to
+ * all the keystores in a domain are located in the domain clause,
+ * and properties that apply only to a specific keystore are located
+ * in that keystore's clause.
+ * Unless otherwise specified, a property in a keystore clause overrides
+ * a property of the same name in the domain clause. All property names
+ * are case-insensitive. The following properties are supported:
+ * <dl>
+ * <dt> {@code keystoreType="<type>"} </dt>
+ * <dd> The keystore type. </dd>
+ * <dt> {@code keystoreURI="<url>"} </dt>
+ * <dd> The keystore location. </dd>
+ * <dt> {@code keystoreProviderName="<name>"} </dt>
+ * <dd> The name of the keystore's JCE provider. </dd>
+ * <dt> {@code keystorePasswordEnv="<environment-variable>"} </dt>
+ * <dd> The environment variable that stores a keystore password.
+ * Alternatively, passwords may be supplied to the constructor
+ * method in a {@code Map<String, ProtectionParameter>}. </dd>
+ * <dt> {@code entryNameSeparator="<separator>"} </dt>
+ * <dd> The separator between a keystore name prefix and an entry name.
+ * When specified, it applies to all the entries in a domain.
+ * Its default value is a space. </dd>
+ * </dl>
+ * <p>
+ * For example, configuration data for a simple keystore domain
+ * comprising three keystores is shown below:
+ * <pre>
+ *
+ * domain app1 {
+ * keystore app1-truststore
+ * keystoreURI="file:///app1/etc/truststore.jks";
+ *
+ * keystore system-truststore
+ * keystoreURI="${java.home}/lib/security/cacerts";
+ *
+ * keystore app1-keystore
+ * keystoreType="PKCS12"
+ * keystoreURI="file:///app1/etc/keystore.p12";
+ * };
+ *
+ * </pre>
+ * @since 1.8
+ */
+public final class DomainLoadStoreParameter implements LoadStoreParameter {
+
+ private final URI configuration;
+ private final Map<String,ProtectionParameter> protectionParams;
+
+ /**
+ * Constructs a DomainLoadStoreParameter for a keystore domain with
+ * the parameters used to protect keystore data.
+ *
+ * @param configuration identifier for the domain configuration data.
+ * The name of the target domain should be specified in the
+ * {@code java.net.URI} fragment component when it is necessary
+ * to distinguish between several domain configurations at the
+ * same location.
+ *
+ * @param protectionParams the map from keystore name to the parameter
+ * used to protect keystore data.
+ * A {@code java.util.Collections.EMPTY_MAP} should be used
+ * when protection parameters are not required or when they have
+ * been specified by properties in the domain configuration data.
+ * It is cloned to prevent subsequent modification.
+ *
+ * @exception NullPointerException if {@code configuration} or
+ * {@code protectionParams} is {@code null}
+ */
+ public DomainLoadStoreParameter(URI configuration,
+ Map<String,ProtectionParameter> protectionParams) {
+ if (configuration == null || protectionParams == null) {
+ throw new NullPointerException("invalid null input");
+ }
+ this.configuration = configuration;
+ this.protectionParams =
+ Collections.unmodifiableMap(new HashMap<>(protectionParams));
+ }
+
+ /**
+ * Gets the identifier for the domain configuration data.
+ *
+ * @return the identifier for the configuration data
+ */
+ public URI getConfiguration() {
+ return configuration;
+ }
+
+ /**
+ * Gets the keystore protection parameters for keystores in this
+ * domain.
+ *
+ * @return an unmodifiable map of keystore names to protection
+ * parameters
+ */
+ public Map<String,ProtectionParameter> getProtectionParams() {
+ return protectionParams;
+ }
+
+ /**
+ * Gets the keystore protection parameters for this domain.
+ * Keystore domains do not support a protection parameter.
+ *
+ * @return always returns {@code null}
+ */
+ @Override
+ public KeyStore.ProtectionParameter getProtectionParameter() {
+ return null;
+ }
+}
diff --git a/jdk/src/share/classes/java/security/KeyStore.java b/jdk/src/share/classes/java/security/KeyStore.java
index 187683b..e769bb1 100644
--- a/jdk/src/share/classes/java/security/KeyStore.java
+++ b/jdk/src/share/classes/java/security/KeyStore.java
@@ -219,148 +219,6 @@
}
/**
- * Configuration data that specifies the keystores in a keystore domain.
- * A keystore domain is a collection of keystores that are presented as a
- * single logical keystore. The configuration data is used during
- * {@code KeyStore}
- * {@link #load(KeyStore.LoadStoreParameter) load} and
- * {@link #store(KeyStore.LoadStoreParameter) store} operations.
- * <p>
- * The following syntax is supported for configuration data:
- * <pre>{@code
- * domain <domainName> [<property> ...] {
- * keystore <keystoreName> [<property> ...] ;
- * ...
- * };
- * ...
- * }</pre>
- * where {@code domainName} and {@code keystoreName} are identifiers
- * and {@code property} is a key/value pairing. The key and value are
- * separated by an 'equals' symbol and the value is enclosed in double
- * quotes. A property value may be either a printable string or a binary
- * string of colon-separated pairs of hexadecimal digits. Multi-valued
- * properties are represented as a comma-separated list of values,
- * enclosed in square brackets.
- * See {@link Arrays#toString(java.lang.Object[])}.
- * <p>
- * To ensure that keystore entries are uniquely identified, each
- * entry's alias is prefixed by its {@code keystoreName} followed
- * by the entry name separator and each {@code keystoreName} must be
- * unique within its domain. Entry name prefixes are omitted when
- * storing a keystore.
- * <p>
- * Properties are context-sensitive: properties that apply to
- * all the keystores in a domain are located in the domain clause,
- * and properties that apply only to a specific keystore are located
- * in that keystore's clause.
- * Unless otherwise specified, a property in a keystore clause overrides
- * a property of the same name in the domain clause. All property names
- * are case-insensitive. The following properties are supported:
- * <dl>
- * <dt> {@code keystoreType="<type>"} </dt>
- * <dd> The keystore type. </dd>
- * <dt> {@code keystoreURI="<url>"} </dt>
- * <dd> The keystore location. </dd>
- * <dt> {@code keystoreProviderName="<name>"} </dt>
- * <dd> The name of the keystore's JCE provider. </dd>
- * <dt> {@code keystorePasswordEnv="<environment-variable>"} </dt>
- * <dd> The environment variable that stores a keystore password.
- * Alternatively, passwords may be supplied to the constructor
- * method in a {@code Map<String, ProtectionParameter>}. </dd>
- * <dt> {@code entryNameSeparator="<separator>"} </dt>
- * <dd> The separator between a keystore name prefix and an entry name.
- * When specified, it applies to all the entries in a domain.
- * Its default value is a space. </dd>
- * </dl>
- * <p>
- * For example, configuration data for a simple keystore domain
- * comprising three keystores is shown below:
- * <pre>
- *
- * domain app1 {
- * keystore app1-truststore
- * keystoreURI="file:///app1/etc/truststore.jks"
- *
- * keystore system-truststore
- * keystoreURI="${java.home}/lib/security/cacerts"
- *
- * keystore app1-keystore
- * keystoreType="PKCS12"
- * keystoreURI="file:///app1/etc/keystore.p12"
- * };
- *
- * </pre>
- * @since 1.8
- */
- public static final class DomainLoadStoreParameter
- implements LoadStoreParameter {
-
- private final URI configuration;
- private final Map<String,ProtectionParameter> protectionParams;
-
- /**
- * Constructs a DomainLoadStoreParameter for a keystore domain with
- * the parameters used to protect keystore data.
- *
- * @param configuration identifier for the domain configuration data.
- * The name of the target domain should be specified in the
- * {@code java.net.URI} fragment component when it is necessary
- * to distinguish between several domain configurations at the
- * same location.
- *
- * @param protectionParams the map from keystore name to the parameter
- * used to protect keystore data.
- * A {@code java.util.Collections.EMPTY_MAP} should be used
- * when protection parameters are not required or when they have
- * been specified by properties in the domain configuration data.
- * It is cloned to prevent subsequent modification.
- *
- * @exception NullPointerException if {@code configuration} or
- * {@code protectionParams} is {@code null}
- */
- public DomainLoadStoreParameter(URI configuration,
- Map<String,ProtectionParameter> protectionParams) {
- if (configuration == null || protectionParams == null) {
- throw new NullPointerException("invalid null input");
- }
- this.configuration = configuration;
- this.protectionParams =
- Collections.unmodifiableMap(new HashMap<>(protectionParams));
- }
-
- /**
- * Gets the identifier for the domain configuration data.
- *
- * @return the identifier for the configuration data
- */
- public URI getConfiguration() {
- return configuration;
- }
-
- /**
- * Gets the keystore protection parameters for keystores in this
- * domain.
- *
- * @return an unmodifiable map of keystore names to protection
- * parameters
- */
- public Map<String,ProtectionParameter> getProtectionParams() {
- return protectionParams;
- }
-
- /**
- * Gets the keystore protection parameters for this domain.
- * Keystore domains do not support a protection parameter.
- *
- * @return always returns {@code null}
- */
- @Override
- public KeyStore.ProtectionParameter getProtectionParameter() {
- return null;
- }
- }
-
- /**
* A marker interface for keystore protection parameters.
*
* <p> The information stored in a {@code ProtectionParameter}
diff --git a/jdk/src/share/classes/java/sql/CallableStatement.java b/jdk/src/share/classes/java/sql/CallableStatement.java
index dc98859..a41aa10 100644
--- a/jdk/src/share/classes/java/sql/CallableStatement.java
+++ b/jdk/src/share/classes/java/sql/CallableStatement.java
@@ -56,7 +56,7 @@
* For maximum portability, a call's <code>ResultSet</code> objects and
* update counts should be processed prior to getting the values of output
* parameters.
- * <P>
+ *
*
* @see Connection#prepareCall
* @see ResultSet
diff --git a/jdk/src/share/classes/java/sql/Connection.java b/jdk/src/share/classes/java/sql/Connection.java
index 9b67065..3077c3c 100644
--- a/jdk/src/share/classes/java/sql/Connection.java
+++ b/jdk/src/share/classes/java/sql/Connection.java
@@ -611,7 +611,7 @@
* <code>Map</code> object returned from
* <code>getTypeMap</code> as a JDBC driver may create an internal
* copy of the <code>Map</code> object passed to <code>setTypeMap</code>:
- * <p>
+ *
* <pre>
* Map<String,Class<?>> myMap = con.getTypeMap();
* myMap.put("mySchemaName.ATHLETES", Athletes.class);
@@ -636,7 +636,7 @@
* You must set the the values for the <code>TypeMap</code> prior to
* callng <code>setMap</code> as a JDBC driver may create an internal copy
* of the <code>TypeMap</code>:
- * <p>
+ *
* <pre>
* Map myMap<String,Class<?>> = new HashMap<String,Class<?>>();
* myMap.put("mySchemaName.ATHLETES", Athletes.class);
@@ -1119,7 +1119,7 @@
* @exception SQLException if the value supplied for <code>timeout</code>
* is less then 0
* @since 1.6
- * <p>
+ *
* @see java.sql.DatabaseMetaData#getClientInfoProperties
*/
boolean isValid(int timeout) throws SQLException;
@@ -1154,7 +1154,7 @@
* required to support these properties however if the driver supports a
* client info property that can be described by one of the standard
* properties, the standard property name should be used.
- * <p>
+ *
* <ul>
* <li>ApplicationName - The name of the application currently utilizing
* the connection</li>
@@ -1208,7 +1208,7 @@
* @throws SQLClientInfoException if the database server returns an error while
* setting the clientInfo values on the database server or this method
* is called on a closed connection
- * <p>
+ *
*/
void setClientInfo(Properties properties)
throws SQLClientInfoException;
@@ -1232,7 +1232,7 @@
*or this method is called on a closed connection
* <p>
* @since 1.6
- * <p>
+ *
* @see java.sql.DatabaseMetaData#getClientInfoProperties
*/
String getClientInfo(String name)
diff --git a/jdk/src/share/classes/java/sql/DatabaseMetaData.java b/jdk/src/share/classes/java/sql/DatabaseMetaData.java
index 63c6f13..1ab6a60 100644
--- a/jdk/src/share/classes/java/sql/DatabaseMetaData.java
+++ b/jdk/src/share/classes/java/sql/DatabaseMetaData.java
@@ -67,7 +67,7 @@
* entries matching the search pattern are returned. If a search pattern
* argument is set to <code>null</code>, that argument's criterion will
* be dropped from the search.
- * <P>
+ *
*/
public interface DatabaseMetaData extends Wrapper {
@@ -3271,7 +3271,7 @@
/**
* Retrieves a list of the client info properties
* that the driver supports. The result set contains the following columns
- * <p>
+ *
* <ol>
* <li><b>NAME</b> String{@code =>} The name of the client info property<br>
* <li><b>MAX_LEN</b> int{@code =>} The maximum length of the value for the property<br>
diff --git a/jdk/src/share/classes/java/sql/ResultSet.java b/jdk/src/share/classes/java/sql/ResultSet.java
index ad954e8..3b9bfbb 100644
--- a/jdk/src/share/classes/java/sql/ResultSet.java
+++ b/jdk/src/share/classes/java/sql/ResultSet.java
@@ -76,7 +76,7 @@
* getter method and returns a suitable Java value. The JDBC specification
* has a table showing the allowable mappings from SQL types to Java types
* that can be used by the <code>ResultSet</code> getter methods.
- * <P>
+ *
* <P>Column names used as input to getter methods are case
* insensitive. When a getter method is called with
* a column name and several columns have the same name,
@@ -199,8 +199,7 @@
*<p>
* Calling the method <code>close</code> on a <code>ResultSet</code>
* object that is already closed is a no-op.
- * <P>
- * <p>
+ *
*
* @exception SQLException if a database access error occurs
*/
diff --git a/jdk/src/share/classes/java/sql/SQLException.java b/jdk/src/share/classes/java/sql/SQLException.java
index 4f9d752..dfc5be3 100644
--- a/jdk/src/share/classes/java/sql/SQLException.java
+++ b/jdk/src/share/classes/java/sql/SQLException.java
@@ -134,7 +134,7 @@
* The <code>cause</code> is not initialized, and may subsequently be
* initialized by a call to the
* {@link Throwable#initCause(java.lang.Throwable)} method.
- * <p>
+ *
*/
public SQLException() {
super();
diff --git a/jdk/src/share/classes/java/sql/SQLFeatureNotSupportedException.java b/jdk/src/share/classes/java/sql/SQLFeatureNotSupportedException.java
index e9a38d6..164c318 100644
--- a/jdk/src/share/classes/java/sql/SQLFeatureNotSupportedException.java
+++ b/jdk/src/share/classes/java/sql/SQLFeatureNotSupportedException.java
@@ -30,7 +30,7 @@
* ( the value is 'zero' A).
* This indicates that the JDBC driver does not support an optional JDBC feature.
* Optional JDBC features can fall into the fallowing categories:
- *<p>
+ *
*<UL>
*<LI>no support for an optional feature
*<LI>no support for an optional overloaded method
diff --git a/jdk/src/share/classes/java/sql/SQLPermission.java b/jdk/src/share/classes/java/sql/SQLPermission.java
index d264706..e3a2422 100644
--- a/jdk/src/share/classes/java/sql/SQLPermission.java
+++ b/jdk/src/share/classes/java/sql/SQLPermission.java
@@ -56,7 +56,7 @@
* The following table lists all the possible <code>SQLPermission</code> target names.
* The table gives a description of what the permission allows
* and a discussion of the risks of granting code the permission.
- * <P>
+ *
*
* <table border=1 cellpadding=5 summary="permission target name, what the permission allows, and associated risks">
* <tr>
diff --git a/jdk/src/share/classes/java/sql/SQLWarning.java b/jdk/src/share/classes/java/sql/SQLWarning.java
index 3c88ba0..944540c 100644
--- a/jdk/src/share/classes/java/sql/SQLWarning.java
+++ b/jdk/src/share/classes/java/sql/SQLWarning.java
@@ -108,7 +108,7 @@
* The <code>cause</code> is not initialized, and may subsequently be
* initialized by a call to the
* {@link Throwable#initCause(java.lang.Throwable)} method.
- * <p>
+ *
*/
public SQLWarning() {
super();
diff --git a/jdk/src/share/classes/java/sql/SQLXML.java b/jdk/src/share/classes/java/sql/SQLXML.java
index 7234bf5..65f3821 100644
--- a/jdk/src/share/classes/java/sql/SQLXML.java
+++ b/jdk/src/share/classes/java/sql/SQLXML.java
@@ -177,8 +177,8 @@
* The state moves from writable to not writeable once free() or any of the
* writing APIs are called: setBinaryStream(), setCharacterStream(), setResult(), and setString().
* Implementations may also change the state to not readable when this occurs.
+ *
* <p>
- * <p>
* All methods on the <code>SQLXML</code> interface must be fully implemented if the
* JDBC driver supports the data type.
*
diff --git a/jdk/src/share/classes/java/sql/Statement.java b/jdk/src/share/classes/java/sql/Statement.java
index 29b372f..ca34707 100644
--- a/jdk/src/share/classes/java/sql/Statement.java
+++ b/jdk/src/share/classes/java/sql/Statement.java
@@ -559,7 +559,7 @@
* <code>BatchUpdateException.getUpdateCounts</code>
* will contain as many elements as there are commands in the batch, and
* at least one of the elements will be the following:
- * <P>
+ *
* <LI>A value of <code>EXECUTE_FAILED</code> -- indicates that the command failed
* to execute successfully and occurs only if a driver continues to
* process commands after a command fails
@@ -1165,7 +1165,7 @@
* <code>BatchUpdateException.getLargeUpdateCounts</code>
* will contain as many elements as there are commands in the batch, and
* at least one of the elements will be the following:
- * <P>
+ *
* <LI>A value of <code>EXECUTE_FAILED</code> -- indicates that the command failed
* to execute successfully and occurs only if a driver continues to
* process commands after a command fails
diff --git a/jdk/src/share/classes/java/time/DayOfWeek.java b/jdk/src/share/classes/java/time/DayOfWeek.java
index b484822..ecd03f2 100644
--- a/jdk/src/share/classes/java/time/DayOfWeek.java
+++ b/jdk/src/share/classes/java/time/DayOfWeek.java
@@ -71,6 +71,7 @@
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.UnsupportedTemporalTypeException;
import java.time.temporal.ValueRange;
@@ -187,7 +188,12 @@
if (temporal instanceof DayOfWeek) {
return (DayOfWeek) temporal;
}
- return of(temporal.get(DAY_OF_WEEK));
+ try {
+ return of(temporal.get(DAY_OF_WEEK));
+ } catch (DateTimeException ex) {
+ throw new DateTimeException("Unable to obtain DayOfWeek from TemporalAccessor: " +
+ temporal + " of type " + temporal.getClass().getName(), ex);
+ }
}
//-----------------------------------------------------------------------
@@ -398,7 +404,7 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.precision()) {
+ if (query == TemporalQueries.precision()) {
return (R) DAYS;
}
return TemporalAccessor.super.query(query);
diff --git a/jdk/src/share/classes/java/time/Instant.java b/jdk/src/share/classes/java/time/Instant.java
index 0e22c7b..e654416 100644
--- a/jdk/src/share/classes/java/time/Instant.java
+++ b/jdk/src/share/classes/java/time/Instant.java
@@ -76,7 +76,6 @@
import java.io.DataOutput;
import java.io.IOException;
import java.io.InvalidObjectException;
-import java.io.InvalidObjectException;
import java.io.Serializable;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
@@ -87,6 +86,7 @@
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
@@ -156,14 +156,14 @@
* internationally-agreed time scale is modified or replaced, a new
* segment of the Java Time-Scale must be defined for it. Each segment
* must meet these requirements:
- * <p><ul>
+ * <ul>
* <li>the Java Time-Scale shall closely match the underlying international
* civil time scale;</li>
* <li>the Java Time-Scale shall exactly match the international civil
* time scale at noon each day;</li>
* <li>the Java Time-Scale shall have a precisely-defined relationship to
* the international civil time scale.</li>
- * </ul><p>
+ * </ul>
* There are currently, as of 2013, two segments in the Java time-scale.
* <p>
* For the segment from 1972-11-03 (exact boundary discussed below) until
@@ -366,9 +366,14 @@
return (Instant) temporal;
}
Objects.requireNonNull(temporal, "temporal");
- long instantSecs = temporal.getLong(INSTANT_SECONDS);
- int nanoOfSecond = temporal.get(NANO_OF_SECOND);
- return Instant.ofEpochSecond(instantSecs, nanoOfSecond);
+ try {
+ long instantSecs = temporal.getLong(INSTANT_SECONDS);
+ int nanoOfSecond = temporal.get(NANO_OF_SECOND);
+ return Instant.ofEpochSecond(instantSecs, nanoOfSecond);
+ } catch (DateTimeException ex) {
+ throw new DateTimeException("Unable to obtain Instant from TemporalAccessor: " +
+ temporal + " of type " + temporal.getClass().getName());
+ }
}
//-----------------------------------------------------------------------
@@ -1045,12 +1050,12 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.precision()) {
+ if (query == TemporalQueries.precision()) {
return (R) NANOS;
}
// inline TemporalAccessor.super.query(query) as an optimization
- if (query == TemporalQuery.chronology() || query == TemporalQuery.zoneId() ||
- query == TemporalQuery.zone() || query == TemporalQuery.offset()) {
+ if (query == TemporalQueries.chronology() || query == TemporalQueries.zoneId() ||
+ query == TemporalQueries.zone() || query == TemporalQueries.offset()) {
return null;
}
return query.queryFrom(this);
diff --git a/jdk/src/share/classes/java/time/LocalDate.java b/jdk/src/share/classes/java/time/LocalDate.java
index f388959..e844787 100644
--- a/jdk/src/share/classes/java/time/LocalDate.java
+++ b/jdk/src/share/classes/java/time/LocalDate.java
@@ -78,7 +78,6 @@
import java.io.DataOutput;
import java.io.IOException;
import java.io.InvalidObjectException;
-import java.io.InvalidObjectException;
import java.io.Serializable;
import java.time.chrono.ChronoLocalDate;
import java.time.chrono.Era;
@@ -92,6 +91,7 @@
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
@@ -342,7 +342,7 @@
* A {@code TemporalAccessor} represents an arbitrary set of date and time information,
* which this factory converts to an instance of {@code LocalDate}.
* <p>
- * The conversion uses the {@link TemporalQuery#localDate()} query, which relies
+ * The conversion uses the {@link TemporalQueries#localDate()} query, which relies
* on extracting the {@link ChronoField#EPOCH_DAY EPOCH_DAY} field.
* <p>
* This method matches the signature of the functional interface {@link TemporalQuery}
@@ -354,9 +354,10 @@
*/
public static LocalDate from(TemporalAccessor temporal) {
Objects.requireNonNull(temporal, "temporal");
- LocalDate date = temporal.query(TemporalQuery.localDate());
+ LocalDate date = temporal.query(TemporalQueries.localDate());
if (date == null) {
- throw new DateTimeException("Unable to obtain LocalDate from TemporalAccessor: " + temporal.getClass());
+ throw new DateTimeException("Unable to obtain LocalDate from TemporalAccessor: " +
+ temporal + " of type " + temporal.getClass().getName());
}
return date;
}
@@ -1500,7 +1501,7 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.localDate()) {
+ if (query == TemporalQueries.localDate()) {
return (R) this;
}
return ChronoLocalDate.super.query(query);
diff --git a/jdk/src/share/classes/java/time/LocalDateTime.java b/jdk/src/share/classes/java/time/LocalDateTime.java
index aed44dd..f60d286 100644
--- a/jdk/src/share/classes/java/time/LocalDateTime.java
+++ b/jdk/src/share/classes/java/time/LocalDateTime.java
@@ -76,7 +76,6 @@
import java.io.DataOutput;
import java.io.IOException;
import java.io.InvalidObjectException;
-import java.io.InvalidObjectException;
import java.io.Serializable;
import java.time.chrono.ChronoLocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -88,6 +87,7 @@
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
@@ -449,7 +449,8 @@
LocalTime time = LocalTime.from(temporal);
return new LocalDateTime(date, time);
} catch (DateTimeException ex) {
- throw new DateTimeException("Unable to obtain LocalDateTime from TemporalAccessor: " + temporal.getClass(), ex);
+ throw new DateTimeException("Unable to obtain LocalDateTime from TemporalAccessor: " +
+ temporal + " of type " + temporal.getClass().getName(), ex);
}
}
@@ -1578,7 +1579,7 @@
@SuppressWarnings("unchecked")
@Override // override for Javadoc
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.localDate()) {
+ if (query == TemporalQueries.localDate()) {
return (R) date;
}
return ChronoLocalDateTime.super.query(query);
@@ -1940,13 +1941,13 @@
* Outputs this date-time as a {@code String}, such as {@code 2007-12-03T10:15:30}.
* <p>
* The output will be one of the following ISO-8601 formats:
- * <p><ul>
+ * <ul>
* <li>{@code uuuu-MM-dd'T'HH:mm}</li>
* <li>{@code uuuu-MM-dd'T'HH:mm:ss}</li>
* <li>{@code uuuu-MM-dd'T'HH:mm:ss.SSS}</li>
* <li>{@code uuuu-MM-dd'T'HH:mm:ss.SSSSSS}</li>
* <li>{@code uuuu-MM-dd'T'HH:mm:ss.SSSSSSSSS}</li>
- * </ul><p>
+ * </ul>
* The format used will be the shortest that outputs the full value of
* the time where the omitted parts are implied to be zero.
*
diff --git a/jdk/src/share/classes/java/time/LocalTime.java b/jdk/src/share/classes/java/time/LocalTime.java
index 77ab2c7..34ba18e 100644
--- a/jdk/src/share/classes/java/time/LocalTime.java
+++ b/jdk/src/share/classes/java/time/LocalTime.java
@@ -74,7 +74,6 @@
import java.io.DataOutput;
import java.io.IOException;
import java.io.InvalidObjectException;
-import java.io.InvalidObjectException;
import java.io.Serializable;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
@@ -85,6 +84,7 @@
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
@@ -383,7 +383,7 @@
* A {@code TemporalAccessor} represents an arbitrary set of date and time information,
* which this factory converts to an instance of {@code LocalTime}.
* <p>
- * The conversion uses the {@link TemporalQuery#localTime()} query, which relies
+ * The conversion uses the {@link TemporalQueries#localTime()} query, which relies
* on extracting the {@link ChronoField#NANO_OF_DAY NANO_OF_DAY} field.
* <p>
* This method matches the signature of the functional interface {@link TemporalQuery}
@@ -395,9 +395,10 @@
*/
public static LocalTime from(TemporalAccessor temporal) {
Objects.requireNonNull(temporal, "temporal");
- LocalTime time = temporal.query(TemporalQuery.localTime());
+ LocalTime time = temporal.query(TemporalQueries.localTime());
if (time == null) {
- throw new DateTimeException("Unable to obtain LocalTime from TemporalAccessor: " + temporal.getClass());
+ throw new DateTimeException("Unable to obtain LocalTime from TemporalAccessor: " +
+ temporal + " of type " + temporal.getClass().getName());
}
return time;
}
@@ -1280,14 +1281,14 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.chronology() || query == TemporalQuery.zoneId() ||
- query == TemporalQuery.zone() || query == TemporalQuery.offset()) {
+ if (query == TemporalQueries.chronology() || query == TemporalQueries.zoneId() ||
+ query == TemporalQueries.zone() || query == TemporalQueries.offset()) {
return null;
- } else if (query == TemporalQuery.localTime()) {
+ } else if (query == TemporalQueries.localTime()) {
return (R) this;
- } else if (query == TemporalQuery.localDate()) {
+ } else if (query == TemporalQueries.localDate()) {
return null;
- } else if (query == TemporalQuery.precision()) {
+ } else if (query == TemporalQueries.precision()) {
return (R) NANOS;
}
// inline TemporalAccessor.super.query(query) as an optimization
@@ -1553,13 +1554,13 @@
* Outputs this time as a {@code String}, such as {@code 10:15}.
* <p>
* The output will be one of the following ISO-8601 formats:
- * <p><ul>
+ * <ul>
* <li>{@code HH:mm}</li>
* <li>{@code HH:mm:ss}</li>
* <li>{@code HH:mm:ss.SSS}</li>
* <li>{@code HH:mm:ss.SSSSSS}</li>
* <li>{@code HH:mm:ss.SSSSSSSSS}</li>
- * </ul><p>
+ * </ul>
* The format used will be the shortest that outputs the full value of
* the time where the omitted parts are implied to be zero.
*
diff --git a/jdk/src/share/classes/java/time/Month.java b/jdk/src/share/classes/java/time/Month.java
index 85d12d8..2e85b6c 100644
--- a/jdk/src/share/classes/java/time/Month.java
+++ b/jdk/src/share/classes/java/time/Month.java
@@ -73,6 +73,7 @@
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.UnsupportedTemporalTypeException;
import java.time.temporal.ValueRange;
@@ -217,7 +218,8 @@
}
return of(temporal.get(MONTH_OF_YEAR));
} catch (DateTimeException ex) {
- throw new DateTimeException("Unable to obtain Month from TemporalAccessor: " + temporal.getClass(), ex);
+ throw new DateTimeException("Unable to obtain Month from TemporalAccessor: " +
+ temporal + " of type " + temporal.getClass().getName(), ex);
}
}
@@ -559,9 +561,9 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.chronology()) {
+ if (query == TemporalQueries.chronology()) {
return (R) IsoChronology.INSTANCE;
- } else if (query == TemporalQuery.precision()) {
+ } else if (query == TemporalQueries.precision()) {
return (R) MONTHS;
}
return TemporalAccessor.super.query(query);
diff --git a/jdk/src/share/classes/java/time/MonthDay.java b/jdk/src/share/classes/java/time/MonthDay.java
index 67f5d4f..458fbc7 100644
--- a/jdk/src/share/classes/java/time/MonthDay.java
+++ b/jdk/src/share/classes/java/time/MonthDay.java
@@ -68,7 +68,6 @@
import java.io.DataOutput;
import java.io.IOException;
import java.io.InvalidObjectException;
-import java.io.InvalidObjectException;
import java.io.Serializable;
import java.time.chrono.Chronology;
import java.time.chrono.IsoChronology;
@@ -80,6 +79,7 @@
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.UnsupportedTemporalTypeException;
import java.time.temporal.ValueRange;
@@ -266,7 +266,8 @@
}
return of(temporal.get(MONTH_OF_YEAR), temporal.get(DAY_OF_MONTH));
} catch (DateTimeException ex) {
- throw new DateTimeException("Unable to obtain MonthDay from TemporalAccessor: " + temporal.getClass(), ex);
+ throw new DateTimeException("Unable to obtain MonthDay from TemporalAccessor: " +
+ temporal + " of type " + temporal.getClass().getName(), ex);
}
}
@@ -581,7 +582,7 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.chronology()) {
+ if (query == TemporalQueries.chronology()) {
return (R) IsoChronology.INSTANCE;
}
return TemporalAccessor.super.query(query);
diff --git a/jdk/src/share/classes/java/time/OffsetDateTime.java b/jdk/src/share/classes/java/time/OffsetDateTime.java
index 410c7f3..755d677 100644
--- a/jdk/src/share/classes/java/time/OffsetDateTime.java
+++ b/jdk/src/share/classes/java/time/OffsetDateTime.java
@@ -69,7 +69,6 @@
import static java.time.temporal.ChronoUnit.NANOS;
import java.io.IOException;
-import java.io.InvalidObjectException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.InvalidObjectException;
@@ -84,6 +83,7 @@
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
@@ -347,8 +347,8 @@
if (temporal instanceof OffsetDateTime) {
return (OffsetDateTime) temporal;
}
- ZoneOffset offset = ZoneOffset.from(temporal);
try {
+ ZoneOffset offset = ZoneOffset.from(temporal);
try {
LocalDateTime ldt = LocalDateTime.from(temporal);
return OffsetDateTime.of(ldt, offset);
@@ -357,7 +357,8 @@
return OffsetDateTime.ofInstant(instant, offset);
}
} catch (DateTimeException ex) {
- throw new DateTimeException("Unable to obtain OffsetDateTime from TemporalAccessor: " + temporal.getClass(), ex);
+ throw new DateTimeException("Unable to obtain OffsetDateTime from TemporalAccessor: " +
+ temporal + " of type " + temporal.getClass().getName(), ex);
}
}
@@ -1526,17 +1527,17 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.offset() || query == TemporalQuery.zone()) {
+ if (query == TemporalQueries.offset() || query == TemporalQueries.zone()) {
return (R) getOffset();
- } else if (query == TemporalQuery.zoneId()) {
+ } else if (query == TemporalQueries.zoneId()) {
return null;
- } else if (query == TemporalQuery.localDate()) {
+ } else if (query == TemporalQueries.localDate()) {
return (R) toLocalDate();
- } else if (query == TemporalQuery.localTime()) {
+ } else if (query == TemporalQueries.localTime()) {
return (R) toLocalTime();
- } else if (query == TemporalQuery.chronology()) {
+ } else if (query == TemporalQueries.chronology()) {
return (R) IsoChronology.INSTANCE;
- } else if (query == TemporalQuery.precision()) {
+ } else if (query == TemporalQueries.precision()) {
return (R) NANOS;
}
// inline TemporalAccessor.super.query(query) as an optimization
@@ -1879,13 +1880,13 @@
* Outputs this date-time as a {@code String}, such as {@code 2007-12-03T10:15:30+01:00}.
* <p>
* The output will be one of the following ISO-8601 formats:
- * <p><ul>
+ * <ul>
* <li>{@code uuuu-MM-dd'T'HH:mmXXXXX}</li>
* <li>{@code uuuu-MM-dd'T'HH:mm:ssXXXXX}</li>
* <li>{@code uuuu-MM-dd'T'HH:mm:ss.SSSXXXXX}</li>
* <li>{@code uuuu-MM-dd'T'HH:mm:ss.SSSSSSXXXXX}</li>
* <li>{@code uuuu-MM-dd'T'HH:mm:ss.SSSSSSSSSXXXXX}</li>
- * </ul><p>
+ * </ul>
* The format used will be the shortest that outputs the full value of
* the time where the omitted parts are implied to be zero.
*
diff --git a/jdk/src/share/classes/java/time/OffsetTime.java b/jdk/src/share/classes/java/time/OffsetTime.java
index a8dbf8a..c9601a0 100644
--- a/jdk/src/share/classes/java/time/OffsetTime.java
+++ b/jdk/src/share/classes/java/time/OffsetTime.java
@@ -70,7 +70,6 @@
import static java.time.temporal.ChronoUnit.NANOS;
import java.io.IOException;
-import java.io.InvalidObjectException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.InvalidObjectException;
@@ -84,6 +83,7 @@
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
@@ -284,7 +284,8 @@
ZoneOffset offset = ZoneOffset.from(temporal);
return new OffsetTime(time, offset);
} catch (DateTimeException ex) {
- throw new DateTimeException("Unable to obtain OffsetTime from TemporalAccessor: " + temporal.getClass(), ex);
+ throw new DateTimeException("Unable to obtain OffsetTime from TemporalAccessor: " +
+ temporal + " of type " + temporal.getClass().getName(), ex);
}
}
@@ -1067,13 +1068,13 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.offset() || query == TemporalQuery.zone()) {
+ if (query == TemporalQueries.offset() || query == TemporalQueries.zone()) {
return (R) offset;
- } else if (query == TemporalQuery.zoneId() | query == TemporalQuery.chronology() || query == TemporalQuery.localDate()) {
+ } else if (query == TemporalQueries.zoneId() | query == TemporalQueries.chronology() || query == TemporalQueries.localDate()) {
return null;
- } else if (query == TemporalQuery.localTime()) {
+ } else if (query == TemporalQueries.localTime()) {
return (R) time;
- } else if (query == TemporalQuery.precision()) {
+ } else if (query == TemporalQueries.precision()) {
return (R) NANOS;
}
// inline TemporalAccessor.super.query(query) as an optimization
@@ -1350,13 +1351,13 @@
* Outputs this time as a {@code String}, such as {@code 10:15:30+01:00}.
* <p>
* The output will be one of the following ISO-8601 formats:
- * <p><ul>
+ * <ul>
* <li>{@code HH:mmXXXXX}</li>
* <li>{@code HH:mm:ssXXXXX}</li>
* <li>{@code HH:mm:ss.SSSXXXXX}</li>
* <li>{@code HH:mm:ss.SSSSSSXXXXX}</li>
* <li>{@code HH:mm:ss.SSSSSSSSSXXXXX}</li>
- * </ul><p>
+ * </ul>
* The format used will be the shortest that outputs the full value of
* the time where the omitted parts are implied to be zero.
*
diff --git a/jdk/src/share/classes/java/time/Period.java b/jdk/src/share/classes/java/time/Period.java
index bd272a9..998eb60 100644
--- a/jdk/src/share/classes/java/time/Period.java
+++ b/jdk/src/share/classes/java/time/Period.java
@@ -79,7 +79,7 @@
import java.time.temporal.Temporal;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalAmount;
-import java.time.temporal.TemporalQuery;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
import java.util.Arrays;
@@ -958,7 +958,7 @@
*/
private void validateChrono(TemporalAccessor temporal) {
Objects.requireNonNull(temporal, "temporal");
- Chronology temporalChrono = temporal.query(TemporalQuery.chronology());
+ Chronology temporalChrono = temporal.query(TemporalQueries.chronology());
if (temporalChrono != null && IsoChronology.INSTANCE.equals(temporalChrono) == false) {
throw new DateTimeException("Chronology mismatch, expected: ISO, actual: " + temporalChrono.getId());
}
diff --git a/jdk/src/share/classes/java/time/Year.java b/jdk/src/share/classes/java/time/Year.java
index 377dfd5..ac239cb 100644
--- a/jdk/src/share/classes/java/time/Year.java
+++ b/jdk/src/share/classes/java/time/Year.java
@@ -74,7 +74,6 @@
import java.io.DataOutput;
import java.io.IOException;
import java.io.InvalidObjectException;
-import java.io.InvalidObjectException;
import java.io.Serializable;
import java.time.chrono.Chronology;
import java.time.chrono.IsoChronology;
@@ -89,6 +88,7 @@
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
@@ -249,7 +249,8 @@
}
return of(temporal.get(YEAR));
} catch (DateTimeException ex) {
- throw new DateTimeException("Unable to obtain Year from TemporalAccessor: " + temporal.getClass(), ex);
+ throw new DateTimeException("Unable to obtain Year from TemporalAccessor: " +
+ temporal + " of type " + temporal.getClass().getName(), ex);
}
}
@@ -811,9 +812,9 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.chronology()) {
+ if (query == TemporalQueries.chronology()) {
return (R) IsoChronology.INSTANCE;
- } else if (query == TemporalQuery.precision()) {
+ } else if (query == TemporalQueries.precision()) {
return (R) YEARS;
}
return Temporal.super.query(query);
diff --git a/jdk/src/share/classes/java/time/YearMonth.java b/jdk/src/share/classes/java/time/YearMonth.java
index 223c90a..5be6ca1 100644
--- a/jdk/src/share/classes/java/time/YearMonth.java
+++ b/jdk/src/share/classes/java/time/YearMonth.java
@@ -77,7 +77,6 @@
import java.io.DataOutput;
import java.io.IOException;
import java.io.InvalidObjectException;
-import java.io.InvalidObjectException;
import java.io.Serializable;
import java.time.chrono.Chronology;
import java.time.chrono.IsoChronology;
@@ -92,6 +91,7 @@
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
@@ -252,7 +252,8 @@
}
return of(temporal.get(YEAR), temporal.get(MONTH_OF_YEAR));
} catch (DateTimeException ex) {
- throw new DateTimeException("Unable to obtain YearMonth from TemporalAccessor: " + temporal.getClass(), ex);
+ throw new DateTimeException("Unable to obtain YearMonth from TemporalAccessor: " +
+ temporal + " of type " + temporal.getClass().getName(), ex);
}
}
@@ -944,9 +945,9 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.chronology()) {
+ if (query == TemporalQueries.chronology()) {
return (R) IsoChronology.INSTANCE;
- } else if (query == TemporalQuery.precision()) {
+ } else if (query == TemporalQueries.precision()) {
return (R) MONTHS;
}
return Temporal.super.query(query);
diff --git a/jdk/src/share/classes/java/time/ZoneId.java b/jdk/src/share/classes/java/time/ZoneId.java
index 86b0c74..42f3909 100644
--- a/jdk/src/share/classes/java/time/ZoneId.java
+++ b/jdk/src/share/classes/java/time/ZoneId.java
@@ -69,6 +69,7 @@
import java.time.format.TextStyle;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.UnsupportedTemporalTypeException;
import java.time.zone.ZoneRules;
@@ -88,12 +89,12 @@
* A {@code ZoneId} is used to identify the rules used to convert between
* an {@link Instant} and a {@link LocalDateTime}.
* There are two distinct types of ID:
- * <p><ul>
+ * <ul>
* <li>Fixed offsets - a fully resolved offset from UTC/Greenwich, that uses
* the same offset for all local date-times
* <li>Geographical regions - an area where a specific set of rules for finding
* the offset from UTC/Greenwich apply
- * </ul><p>
+ * </ul>
* Most fixed offsets are represented by {@link ZoneOffset}.
* Calling {@link #normalized()} on any {@code ZoneId} will ensure that a
* fixed offset ID will be represented as a {@code ZoneOffset}.
@@ -179,7 +180,7 @@
* This is in line with versions of TZDB before 2005r.
* <p>
* This maps as follows:
- * <p><ul>
+ * <ul>
* <li>EST - America/New_York</li>
* <li>MST - America/Denver</li>
* <li>HST - Pacific/Honolulu</li>
@@ -208,7 +209,7 @@
* <li>PST - America/Los_Angeles</li>
* <li>SST - Pacific/Guadalcanal</li>
* <li>VST - Asia/Ho_Chi_Minh</li>
- * </ul><p>
+ * </ul>
* The map is unmodifiable.
*/
public static final Map<String, String> OLD_SHORT_IDS;
@@ -224,7 +225,7 @@
* This is in line with TZDB 2005r and later.
* <p>
* This maps as follows:
- * <p><ul>
+ * <ul>
* <li>EST - -05:00</li>
* <li>HST - -10:00</li>
* <li>MST - -07:00</li>
@@ -253,7 +254,7 @@
* <li>PST - America/Los_Angeles</li>
* <li>SST - Pacific/Guadalcanal</li>
* <li>VST - Asia/Ho_Chi_Minh</li>
- * </ul><p>
+ * </ul>
* The map is unmodifiable.
*/
public static final Map<String, String> SHORT_IDS;
@@ -492,7 +493,7 @@
* This factory converts the arbitrary temporal object to an instance of {@code ZoneId}.
* <p>
* The conversion will try to obtain the zone in a way that favours region-based
- * zones over offset-based zones using {@link TemporalQuery#zone()}.
+ * zones over offset-based zones using {@link TemporalQueries#zone()}.
* <p>
* This method matches the signature of the functional interface {@link TemporalQuery}
* allowing it to be used in queries via method reference, {@code ZoneId::from}.
@@ -502,9 +503,10 @@
* @throws DateTimeException if unable to convert to a {@code ZoneId}
*/
public static ZoneId from(TemporalAccessor temporal) {
- ZoneId obj = temporal.query(TemporalQuery.zone());
+ ZoneId obj = temporal.query(TemporalQueries.zone());
if (obj == null) {
- throw new DateTimeException("Unable to obtain ZoneId from TemporalAccessor: " + temporal.getClass());
+ throw new DateTimeException("Unable to obtain ZoneId from TemporalAccessor: " +
+ temporal + " of type " + temporal.getClass().getName());
}
return obj;
}
@@ -557,7 +559,7 @@
* methods on the interface have no meaning to {@code ZoneId}.
* <p>
* The returned temporal has no supported fields, with the query method
- * supporting the return of the zone using {@link TemporalQuery#zoneId()}.
+ * supporting the return of the zone using {@link TemporalQueries#zoneId()}.
*
* @return a temporal equivalent to this zone, not null
*/
@@ -574,7 +576,7 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.zoneId()) {
+ if (query == TemporalQueries.zoneId()) {
return (R) ZoneId.this;
}
return TemporalAccessor.super.query(query);
diff --git a/jdk/src/share/classes/java/time/ZoneOffset.java b/jdk/src/share/classes/java/time/ZoneOffset.java
index 3475e5f..d5f51fe 100644
--- a/jdk/src/share/classes/java/time/ZoneOffset.java
+++ b/jdk/src/share/classes/java/time/ZoneOffset.java
@@ -70,13 +70,13 @@
import java.io.DataOutput;
import java.io.IOException;
import java.io.InvalidObjectException;
-import java.io.InvalidObjectException;
import java.io.Serializable;
import java.time.temporal.ChronoField;
import java.time.temporal.Temporal;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.UnsupportedTemporalTypeException;
import java.time.temporal.ValueRange;
@@ -166,7 +166,7 @@
* This method parses the string ID of a {@code ZoneOffset} to
* return an instance. The parsing accepts all the formats generated by
* {@link #getId()}, plus some additional formats:
- * <p><ul>
+ * <ul>
* <li>{@code Z} - for UTC
* <li>{@code +h}
* <li>{@code +hh}
@@ -178,7 +178,7 @@
* <li>{@code -hh:mm:ss}
* <li>{@code +hhmmss}
* <li>{@code -hhmmss}
- * </ul><p>
+ * </ul>
* Note that ± means either the plus or minus symbol.
* <p>
* The ID of the returned offset will be normalized to one of the formats
@@ -322,7 +322,7 @@
* A {@code TemporalAccessor} represents some form of date and time information.
* This factory converts the arbitrary temporal object to an instance of {@code ZoneOffset}.
* <p>
- * The conversion uses the {@link TemporalQuery#offset()} query, which relies
+ * The conversion uses the {@link TemporalQueries#offset()} query, which relies
* on extracting the {@link ChronoField#OFFSET_SECONDS OFFSET_SECONDS} field.
* <p>
* This method matches the signature of the functional interface {@link TemporalQuery}
@@ -334,9 +334,10 @@
*/
public static ZoneOffset from(TemporalAccessor temporal) {
Objects.requireNonNull(temporal, "temporal");
- ZoneOffset offset = temporal.query(TemporalQuery.offset());
+ ZoneOffset offset = temporal.query(TemporalQueries.offset());
if (offset == null) {
- throw new DateTimeException("Unable to obtain ZoneOffset from TemporalAccessor: " + temporal.getClass());
+ throw new DateTimeException("Unable to obtain ZoneOffset from TemporalAccessor: " +
+ temporal + " of type " + temporal.getClass().getName());
}
return offset;
}
@@ -470,11 +471,11 @@
* <p>
* The ID is minor variation to the standard ISO-8601 formatted string
* for the offset. There are three formats:
- * <p><ul>
+ * <ul>
* <li>{@code Z} - for UTC (ISO-8601)
* <li>{@code +hh:mm} or {@code -hh:mm} - if the seconds are zero (ISO-8601)
* <li>{@code +hh:mm:ss} or {@code -hh:mm:ss} - if the seconds are non-zero (not ISO-8601)
- * </ul><p>
+ * </ul>
*
* @return the zone offset ID, not null
*/
@@ -641,7 +642,7 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.offset() || query == TemporalQuery.zone()) {
+ if (query == TemporalQueries.offset() || query == TemporalQueries.zone()) {
return (R) this;
}
return TemporalAccessor.super.query(query);
diff --git a/jdk/src/share/classes/java/time/ZonedDateTime.java b/jdk/src/share/classes/java/time/ZonedDateTime.java
index 1114ab4..e950db7 100644
--- a/jdk/src/share/classes/java/time/ZonedDateTime.java
+++ b/jdk/src/share/classes/java/time/ZonedDateTime.java
@@ -111,7 +111,7 @@
* Obtaining the offset for an instant is simple, as there is exactly one valid
* offset for each instant. By contrast, obtaining the offset for a local date-time
* is not straightforward. There are three cases:
- * <p><ul>
+ * <ul>
* <li>Normal, with one valid offset. For the vast majority of the year, the normal
* case applies, where there is a single valid offset for the local date-time.</li>
* <li>Gap, with zero valid offsets. This is when clocks jump forward typically
@@ -120,7 +120,7 @@
* <li>Overlap, with two valid offsets. This is when clocks are set back typically
* due to the autumn daylight savings change from "summer" to "winter".
* In an overlap there are local date-time values with two valid offsets.</li>
- * </ul><p>
+ * </ul>
* <p>
* Any method that converts directly or implicitly from a local date-time to an
* instant by obtaining the offset has the potential to be complicated.
@@ -553,7 +553,8 @@
return of(ldt, zone);
}
} catch (DateTimeException ex) {
- throw new DateTimeException("Unable to create ZonedDateTime from TemporalAccessor: " + temporal.getClass(), ex);
+ throw new DateTimeException("Unable to obtain ZonedDateTime from TemporalAccessor: " +
+ temporal + " of type " + temporal.getClass().getName(), ex);
}
}
@@ -1698,12 +1699,12 @@
* <p>
* For example, consider a time-zone where the spring DST cutover means that the
* local times 01:00 to 01:59 occur twice changing from offset +02:00 to +01:00.
- * <p><ul>
+ * <ul>
* <li>Adding one hour to 00:30+02:00 will result in 01:30+02:00
* <li>Adding one hour to 01:30+02:00 will result in 01:30+01:00
* <li>Adding one hour to 01:30+01:00 will result in 02:30+01:00
* <li>Adding three hours to 00:30+02:00 will result in 02:30+01:00
- * </ul><p>
+ * </ul>
* <p>
* This instance is immutable and unaffected by this method call.
*
@@ -1939,12 +1940,12 @@
* <p>
* For example, consider a time-zone where the spring DST cutover means that the
* local times 01:00 to 01:59 occur twice changing from offset +02:00 to +01:00.
- * <p><ul>
+ * <ul>
* <li>Subtracting one hour from 02:30+01:00 will result in 01:30+02:00
* <li>Subtracting one hour from 01:30+01:00 will result in 01:30+02:00
* <li>Subtracting one hour from 01:30+02:00 will result in 00:30+01:00
* <li>Subtracting three hours from 02:30+01:00 will result in 00:30+02:00
- * </ul><p>
+ * </ul>
* <p>
* This instance is immutable and unaffected by this method call.
*
diff --git a/jdk/src/share/classes/java/time/chrono/AbstractChronology.java b/jdk/src/share/classes/java/time/chrono/AbstractChronology.java
new file mode 100644
index 0000000..e91c596
--- /dev/null
+++ b/jdk/src/share/classes/java/time/chrono/AbstractChronology.java
@@ -0,0 +1,783 @@
+/*
+ * Copyright (c) 2012, 2013, 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 file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Copyright (c) 2012, Stephen Colebourne & Michael Nascimento Santos
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * * Neither the name of JSR-310 nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package java.time.chrono;
+
+import static java.time.temporal.ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH;
+import static java.time.temporal.ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR;
+import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_MONTH;
+import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_YEAR;
+import static java.time.temporal.ChronoField.DAY_OF_MONTH;
+import static java.time.temporal.ChronoField.DAY_OF_WEEK;
+import static java.time.temporal.ChronoField.DAY_OF_YEAR;
+import static java.time.temporal.ChronoField.EPOCH_DAY;
+import static java.time.temporal.ChronoField.ERA;
+import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
+import static java.time.temporal.ChronoField.PROLEPTIC_MONTH;
+import static java.time.temporal.ChronoField.YEAR;
+import static java.time.temporal.ChronoField.YEAR_OF_ERA;
+import static java.time.temporal.ChronoUnit.DAYS;
+import static java.time.temporal.ChronoUnit.MONTHS;
+import static java.time.temporal.ChronoUnit.WEEKS;
+import static java.time.temporal.TemporalAdjusters.nextOrSame;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.time.DateTimeException;
+import java.time.DayOfWeek;
+import java.time.format.ResolverStyle;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalAdjusters;
+import java.time.temporal.TemporalField;
+import java.time.temporal.ValueRange;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.ServiceLoader;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import sun.util.logging.PlatformLogger;
+
+/**
+ * An abstract implementation of a calendar system, used to organize and identify dates.
+ * <p>
+ * The main date and time API is built on the ISO calendar system.
+ * The chronology operates behind the scenes to represent the general concept of a calendar system.
+ * <p>
+ * See {@link Chronology} for more details.
+ *
+ * @implSpec
+ * This class is separated from the {@code Chronology} interface so that the static methods
+ * are not inherited. While {@code Chronology} can be implemented directly, it is strongly
+ * recommended to extend this abstract class instead.
+ * <p>
+ * This class must be implemented with care to ensure other classes operate correctly.
+ * All implementations that can be instantiated must be final, immutable and thread-safe.
+ * Subclasses should be Serializable wherever possible.
+ *
+ * @since 1.8
+ */
+public abstract class AbstractChronology implements Chronology {
+
+ /**
+ * ChronoLocalDate order constant.
+ */
+ static final Comparator<ChronoLocalDate> DATE_ORDER =
+ (Comparator<ChronoLocalDate> & Serializable) (date1, date2) -> {
+ return Long.compare(date1.toEpochDay(), date2.toEpochDay());
+ };
+ /**
+ * ChronoLocalDateTime order constant.
+ */
+ static final Comparator<ChronoLocalDateTime<? extends ChronoLocalDate>> DATE_TIME_ORDER =
+ (Comparator<ChronoLocalDateTime<? extends ChronoLocalDate>> & Serializable) (dateTime1, dateTime2) -> {
+ int cmp = Long.compare(dateTime1.toLocalDate().toEpochDay(), dateTime2.toLocalDate().toEpochDay());
+ if (cmp == 0) {
+ cmp = Long.compare(dateTime1.toLocalTime().toNanoOfDay(), dateTime2.toLocalTime().toNanoOfDay());
+ }
+ return cmp;
+ };
+ /**
+ * ChronoZonedDateTime order constant.
+ */
+ static final Comparator<ChronoZonedDateTime<?>> INSTANT_ORDER =
+ (Comparator<ChronoZonedDateTime<?>> & Serializable) (dateTime1, dateTime2) -> {
+ int cmp = Long.compare(dateTime1.toEpochSecond(), dateTime2.toEpochSecond());
+ if (cmp == 0) {
+ cmp = Long.compare(dateTime1.toLocalTime().getNano(), dateTime2.toLocalTime().getNano());
+ }
+ return cmp;
+ };
+
+ /**
+ * Map of available calendars by ID.
+ */
+ private static final ConcurrentHashMap<String, Chronology> CHRONOS_BY_ID = new ConcurrentHashMap<>();
+ /**
+ * Map of available calendars by calendar type.
+ */
+ private static final ConcurrentHashMap<String, Chronology> CHRONOS_BY_TYPE = new ConcurrentHashMap<>();
+
+ /**
+ * Register a Chronology by its ID and type for lookup by {@link #of(String)}.
+ * Chronologies must not be registered until they are completely constructed.
+ * Specifically, not in the constructor of Chronology.
+ *
+ * @param chrono the chronology to register; not null
+ * @return the already registered Chronology if any, may be null
+ */
+ static Chronology registerChrono(Chronology chrono) {
+ return registerChrono(chrono, chrono.getId());
+ }
+
+ /**
+ * Register a Chronology by ID and type for lookup by {@link #of(String)}.
+ * Chronos must not be registered until they are completely constructed.
+ * Specifically, not in the constructor of Chronology.
+ *
+ * @param chrono the chronology to register; not null
+ * @param id the ID to register the chronology; not null
+ * @return the already registered Chronology if any, may be null
+ */
+ static Chronology registerChrono(Chronology chrono, String id) {
+ Chronology prev = CHRONOS_BY_ID.putIfAbsent(id, chrono);
+ if (prev == null) {
+ String type = chrono.getCalendarType();
+ if (type != null) {
+ CHRONOS_BY_TYPE.putIfAbsent(type, chrono);
+ }
+ }
+ return prev;
+ }
+
+ /**
+ * Initialization of the maps from id and type to Chronology.
+ * The ServiceLoader is used to find and register any implementations
+ * of {@link java.time.chrono.AbstractChronology} found in the bootclass loader.
+ * The built-in chronologies are registered explicitly.
+ * Calendars configured via the Thread's context classloader are local
+ * to that thread and are ignored.
+ * <p>
+ * The initialization is done only once using the registration
+ * of the IsoChronology as the test and the final step.
+ * Multiple threads may perform the initialization concurrently.
+ * Only the first registration of each Chronology is retained by the
+ * ConcurrentHashMap.
+ * @return true if the cache was initialized
+ */
+ private static boolean initCache() {
+ if (CHRONOS_BY_ID.get("ISO") == null) {
+ // Initialization is incomplete
+
+ // Register built-in Chronologies
+ registerChrono(HijrahChronology.INSTANCE);
+ registerChrono(JapaneseChronology.INSTANCE);
+ registerChrono(MinguoChronology.INSTANCE);
+ registerChrono(ThaiBuddhistChronology.INSTANCE);
+
+ // Register Chronologies from the ServiceLoader
+ @SuppressWarnings("rawtypes")
+ ServiceLoader<AbstractChronology> loader = ServiceLoader.load(AbstractChronology.class, null);
+ for (AbstractChronology chrono : loader) {
+ String id = chrono.getId();
+ if (id.equals("ISO") || registerChrono(chrono) != null) {
+ // Log the attempt to replace an existing Chronology
+ PlatformLogger logger = PlatformLogger.getLogger("java.time.chrono");
+ logger.warning("Ignoring duplicate Chronology, from ServiceLoader configuration " + id);
+ }
+ }
+
+ // finally, register IsoChronology to mark initialization is complete
+ registerChrono(IsoChronology.INSTANCE);
+ return true;
+ }
+ return false;
+ }
+
+ //-----------------------------------------------------------------------
+ /**
+ * Obtains an instance of {@code Chronology} from a locale.
+ * <p>
+ * See {@link Chronology#ofLocale(Locale)}.
+ *
+ * @param locale the locale to use to obtain the calendar system, not null
+ * @return the calendar system associated with the locale, not null
+ * @throws java.time.DateTimeException if the locale-specified calendar cannot be found
+ */
+ static Chronology ofLocale(Locale locale) {
+ Objects.requireNonNull(locale, "locale");
+ String type = locale.getUnicodeLocaleType("ca");
+ if (type == null || "iso".equals(type) || "iso8601".equals(type)) {
+ return IsoChronology.INSTANCE;
+ }
+ // Not pre-defined; lookup by the type
+ do {
+ Chronology chrono = CHRONOS_BY_TYPE.get(type);
+ if (chrono != null) {
+ return chrono;
+ }
+ // If not found, do the initialization (once) and repeat the lookup
+ } while (initCache());
+
+ // Look for a Chronology using ServiceLoader of the Thread's ContextClassLoader
+ // Application provided Chronologies must not be cached
+ @SuppressWarnings("rawtypes")
+ ServiceLoader<Chronology> loader = ServiceLoader.load(Chronology.class);
+ for (Chronology chrono : loader) {
+ if (type.equals(chrono.getCalendarType())) {
+ return chrono;
+ }
+ }
+ throw new DateTimeException("Unknown calendar system: " + type);
+ }
+
+ //-----------------------------------------------------------------------
+ /**
+ * Obtains an instance of {@code Chronology} from a chronology ID or
+ * calendar system type.
+ * <p>
+ * See {@link Chronology#of(String)}.
+ *
+ * @param id the chronology ID or calendar system type, not null
+ * @return the chronology with the identifier requested, not null
+ * @throws java.time.DateTimeException if the chronology cannot be found
+ */
+ static Chronology of(String id) {
+ Objects.requireNonNull(id, "id");
+ do {
+ Chronology chrono = of0(id);
+ if (chrono != null) {
+ return chrono;
+ }
+ // If not found, do the initialization (once) and repeat the lookup
+ } while (initCache());
+
+ // Look for a Chronology using ServiceLoader of the Thread's ContextClassLoader
+ // Application provided Chronologies must not be cached
+ @SuppressWarnings("rawtypes")
+ ServiceLoader<Chronology> loader = ServiceLoader.load(Chronology.class);
+ for (Chronology chrono : loader) {
+ if (id.equals(chrono.getId()) || id.equals(chrono.getCalendarType())) {
+ return chrono;
+ }
+ }
+ throw new DateTimeException("Unknown chronology: " + id);
+ }
+
+ /**
+ * Obtains an instance of {@code Chronology} from a chronology ID or
+ * calendar system type.
+ *
+ * @param id the chronology ID or calendar system type, not null
+ * @return the chronology with the identifier requested, or {@code null} if not found
+ */
+ private static Chronology of0(String id) {
+ Chronology chrono = CHRONOS_BY_ID.get(id);
+ if (chrono == null) {
+ chrono = CHRONOS_BY_TYPE.get(id);
+ }
+ return chrono;
+ }
+
+ /**
+ * Returns the available chronologies.
+ * <p>
+ * Each returned {@code Chronology} is available for use in the system.
+ * The set of chronologies includes the system chronologies and
+ * any chronologies provided by the application via ServiceLoader
+ * configuration.
+ *
+ * @return the independent, modifiable set of the available chronology IDs, not null
+ */
+ static Set<Chronology> getAvailableChronologies() {
+ initCache(); // force initialization
+ HashSet<Chronology> chronos = new HashSet<>(CHRONOS_BY_ID.values());
+
+ /// Add in Chronologies from the ServiceLoader configuration
+ @SuppressWarnings("rawtypes")
+ ServiceLoader<Chronology> loader = ServiceLoader.load(Chronology.class);
+ for (Chronology chrono : loader) {
+ chronos.add(chrono);
+ }
+ return chronos;
+ }
+
+ //-----------------------------------------------------------------------
+ /**
+ * Creates an instance.
+ */
+ protected AbstractChronology() {
+ }
+
+ //-----------------------------------------------------------------------
+ /**
+ * Resolves parsed {@code ChronoField} values into a date during parsing.
+ * <p>
+ * Most {@code TemporalField} implementations are resolved using the
+ * resolve method on the field. By contrast, the {@code ChronoField} class
+ * defines fields that only have meaning relative to the chronology.
+ * As such, {@code ChronoField} date fields are resolved here in the
+ * context of a specific chronology.
+ * <p>
+ * {@code ChronoField} instances are resolved by this method, which may
+ * be overridden in subclasses.
+ * <ul>
+ * <li>{@code EPOCH_DAY} - If present, this is converted to a date and
+ * all other date fields are then cross-checked against the date.
+ * <li>{@code PROLEPTIC_MONTH} - If present, then it is split into the
+ * {@code YEAR} and {@code MONTH_OF_YEAR}. If the mode is strict or smart
+ * then the field is validated.
+ * <li>{@code YEAR_OF_ERA} and {@code ERA} - If both are present, then they
+ * are combined to form a {@code YEAR}. In lenient mode, the {@code YEAR_OF_ERA}
+ * range is not validated, in smart and strict mode it is. The {@code ERA} is
+ * validated for range in all three modes. If only the {@code YEAR_OF_ERA} is
+ * present, and the mode is smart or lenient, then the last available era
+ * is assumed. In strict mode, no era is assumed and the {@code YEAR_OF_ERA} is
+ * left untouched. If only the {@code ERA} is present, then it is left untouched.
+ * <li>{@code YEAR}, {@code MONTH_OF_YEAR} and {@code DAY_OF_MONTH} -
+ * If all three are present, then they are combined to form a date.
+ * In all three modes, the {@code YEAR} is validated.
+ * If the mode is smart or strict, then the month and day are validated.
+ * If the mode is lenient, then the date is combined in a manner equivalent to
+ * creating a date on the first day of the first month in the requested year,
+ * then adding the difference in months, then the difference in days.
+ * If the mode is smart, and the day-of-month is greater than the maximum for
+ * the year-month, then the day-of-month is adjusted to the last day-of-month.
+ * If the mode is strict, then the three fields must form a valid date.
+ * <li>{@code YEAR} and {@code DAY_OF_YEAR} -
+ * If both are present, then they are combined to form a date.
+ * In all three modes, the {@code YEAR} is validated.
+ * If the mode is lenient, then the date is combined in a manner equivalent to
+ * creating a date on the first day of the requested year, then adding
+ * the difference in days.
+ * If the mode is smart or strict, then the two fields must form a valid date.
+ * <li>{@code YEAR}, {@code MONTH_OF_YEAR}, {@code ALIGNED_WEEK_OF_MONTH} and
+ * {@code ALIGNED_DAY_OF_WEEK_IN_MONTH} -
+ * If all four are present, then they are combined to form a date.
+ * In all three modes, the {@code YEAR} is validated.
+ * If the mode is lenient, then the date is combined in a manner equivalent to
+ * creating a date on the first day of the first month in the requested year, then adding
+ * the difference in months, then the difference in weeks, then in days.
+ * If the mode is smart or strict, then the all four fields are validated to
+ * their outer ranges. The date is then combined in a manner equivalent to
+ * creating a date on the first day of the requested year and month, then adding
+ * the amount in weeks and days to reach their values. If the mode is strict,
+ * the date is additionally validated to check that the day and week adjustment
+ * did not change the month.
+ * <li>{@code YEAR}, {@code MONTH_OF_YEAR}, {@code ALIGNED_WEEK_OF_MONTH} and
+ * {@code DAY_OF_WEEK} - If all four are present, then they are combined to
+ * form a date. The approach is the same as described above for
+ * years, months and weeks in {@code ALIGNED_DAY_OF_WEEK_IN_MONTH}.
+ * The day-of-week is adjusted as the next or same matching day-of-week once
+ * the years, months and weeks have been handled.
+ * <li>{@code YEAR}, {@code ALIGNED_WEEK_OF_YEAR} and {@code ALIGNED_DAY_OF_WEEK_IN_YEAR} -
+ * If all three are present, then they are combined to form a date.
+ * In all three modes, the {@code YEAR} is validated.
+ * If the mode is lenient, then the date is combined in a manner equivalent to
+ * creating a date on the first day of the requested year, then adding
+ * the difference in weeks, then in days.
+ * If the mode is smart or strict, then the all three fields are validated to
+ * their outer ranges. The date is then combined in a manner equivalent to
+ * creating a date on the first day of the requested year, then adding
+ * the amount in weeks and days to reach their values. If the mode is strict,
+ * the date is additionally validated to check that the day and week adjustment
+ * did not change the year.
+ * <li>{@code YEAR}, {@code ALIGNED_WEEK_OF_YEAR} and {@code DAY_OF_WEEK} -
+ * If all three are present, then they are combined to form a date.
+ * The approach is the same as described above for years and weeks in
+ * {@code ALIGNED_DAY_OF_WEEK_IN_YEAR}. The day-of-week is adjusted as the
+ * next or same matching day-of-week once the years and weeks have been handled.
+ * </ul>
+ * <p>
+ * The default implementation is suitable for most calendar systems.
+ * If {@link java.time.temporal.ChronoField#YEAR_OF_ERA} is found without an {@link java.time.temporal.ChronoField#ERA}
+ * then the last era in {@link #eras()} is used.
+ * The implementation assumes a 7 day week, that the first day-of-month
+ * has the value 1, that first day-of-year has the value 1, and that the
+ * first of the month and year always exists.
+ *
+ * @param fieldValues the map of fields to values, which can be updated, not null
+ * @param resolverStyle the requested type of resolve, not null
+ * @return the resolved date, null if insufficient information to create a date
+ * @throws java.time.DateTimeException if the date cannot be resolved, typically
+ * because of a conflict in the input data
+ */
+ @Override
+ public ChronoLocalDate resolveDate(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
+ // check epoch-day before inventing era
+ if (fieldValues.containsKey(EPOCH_DAY)) {
+ return dateEpochDay(fieldValues.remove(EPOCH_DAY));
+ }
+
+ // fix proleptic month before inventing era
+ resolveProlepticMonth(fieldValues, resolverStyle);
+
+ // invent era if necessary to resolve year-of-era
+ ChronoLocalDate resolved = resolveYearOfEra(fieldValues, resolverStyle);
+ if (resolved != null) {
+ return resolved;
+ }
+
+ // build date
+ if (fieldValues.containsKey(YEAR)) {
+ if (fieldValues.containsKey(MONTH_OF_YEAR)) {
+ if (fieldValues.containsKey(DAY_OF_MONTH)) {
+ return resolveYMD(fieldValues, resolverStyle);
+ }
+ if (fieldValues.containsKey(ALIGNED_WEEK_OF_MONTH)) {
+ if (fieldValues.containsKey(ALIGNED_DAY_OF_WEEK_IN_MONTH)) {
+ return resolveYMAA(fieldValues, resolverStyle);
+ }
+ if (fieldValues.containsKey(DAY_OF_WEEK)) {
+ return resolveYMAD(fieldValues, resolverStyle);
+ }
+ }
+ }
+ if (fieldValues.containsKey(DAY_OF_YEAR)) {
+ return resolveYD(fieldValues, resolverStyle);
+ }
+ if (fieldValues.containsKey(ALIGNED_WEEK_OF_YEAR)) {
+ if (fieldValues.containsKey(ALIGNED_DAY_OF_WEEK_IN_YEAR)) {
+ return resolveYAA(fieldValues, resolverStyle);
+ }
+ if (fieldValues.containsKey(DAY_OF_WEEK)) {
+ return resolveYAD(fieldValues, resolverStyle);
+ }
+ }
+ }
+ return null;
+ }
+
+ void resolveProlepticMonth(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
+ Long pMonth = fieldValues.remove(PROLEPTIC_MONTH);
+ if (pMonth != null) {
+ if (resolverStyle != ResolverStyle.LENIENT) {
+ PROLEPTIC_MONTH.checkValidValue(pMonth);
+ }
+ // first day-of-month is likely to be safest for setting proleptic-month
+ // cannot add to year zero, as not all chronologies have a year zero
+ ChronoLocalDate chronoDate = dateNow()
+ .with(DAY_OF_MONTH, 1).with(PROLEPTIC_MONTH, pMonth);
+ addFieldValue(fieldValues, MONTH_OF_YEAR, chronoDate.get(MONTH_OF_YEAR));
+ addFieldValue(fieldValues, YEAR, chronoDate.get(YEAR));
+ }
+ }
+
+ ChronoLocalDate resolveYearOfEra(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
+ Long yoeLong = fieldValues.remove(YEAR_OF_ERA);
+ if (yoeLong != null) {
+ Long eraLong = fieldValues.remove(ERA);
+ int yoe;
+ if (resolverStyle != ResolverStyle.LENIENT) {
+ yoe = range(YEAR_OF_ERA).checkValidIntValue(yoeLong, YEAR_OF_ERA);
+ } else {
+ yoe = Math.toIntExact(yoeLong);
+ }
+ if (eraLong != null) {
+ Era eraObj = eraOf(range(ERA).checkValidIntValue(eraLong, ERA));
+ addFieldValue(fieldValues, YEAR, prolepticYear(eraObj, yoe));
+ } else {
+ if (fieldValues.containsKey(YEAR)) {
+ int year = range(YEAR).checkValidIntValue(fieldValues.get(YEAR), YEAR);
+ ChronoLocalDate chronoDate = dateYearDay(year, 1);
+ addFieldValue(fieldValues, YEAR, prolepticYear(chronoDate.getEra(), yoe));
+ } else if (resolverStyle == ResolverStyle.STRICT) {
+ // do not invent era if strict
+ // reinstate the field removed earlier, no cross-check issues
+ fieldValues.put(YEAR_OF_ERA, yoeLong);
+ } else {
+ List<Era> eras = eras();
+ if (eras.isEmpty()) {
+ addFieldValue(fieldValues, YEAR, yoe);
+ } else {
+ Era eraObj = eras.get(eras.size() - 1);
+ addFieldValue(fieldValues, YEAR, prolepticYear(eraObj, yoe));
+ }
+ }
+ }
+ } else if (fieldValues.containsKey(ERA)) {
+ range(ERA).checkValidValue(fieldValues.get(ERA), ERA); // always validated
+ }
+ return null;
+ }
+
+ ChronoLocalDate resolveYMD(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
+ int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR);
+ if (resolverStyle == ResolverStyle.LENIENT) {
+ long months = Math.subtractExact(fieldValues.remove(MONTH_OF_YEAR), 1);
+ long days = Math.subtractExact(fieldValues.remove(DAY_OF_MONTH), 1);
+ return date(y, 1, 1).plus(months, MONTHS).plus(days, DAYS);
+ }
+ int moy = range(MONTH_OF_YEAR).checkValidIntValue(fieldValues.remove(MONTH_OF_YEAR), MONTH_OF_YEAR);
+ ValueRange domRange = range(DAY_OF_MONTH);
+ int dom = domRange.checkValidIntValue(fieldValues.remove(DAY_OF_MONTH), DAY_OF_MONTH);
+ if (resolverStyle == ResolverStyle.SMART) { // previous valid
+ try {
+ return date(y, moy, dom);
+ } catch (DateTimeException ex) {
+ return date(y, moy, 1).with(TemporalAdjusters.lastDayOfMonth());
+ }
+ }
+ return date(y, moy, dom);
+ }
+
+ ChronoLocalDate resolveYD(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
+ int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR);
+ if (resolverStyle == ResolverStyle.LENIENT) {
+ long days = Math.subtractExact(fieldValues.remove(DAY_OF_YEAR), 1);
+ return dateYearDay(y, 1).plus(days, DAYS);
+ }
+ int doy = range(DAY_OF_YEAR).checkValidIntValue(fieldValues.remove(DAY_OF_YEAR), DAY_OF_YEAR);
+ return dateYearDay(y, doy); // smart is same as strict
+ }
+
+ ChronoLocalDate resolveYMAA(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
+ int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR);
+ if (resolverStyle == ResolverStyle.LENIENT) {
+ long months = Math.subtractExact(fieldValues.remove(MONTH_OF_YEAR), 1);
+ long weeks = Math.subtractExact(fieldValues.remove(ALIGNED_WEEK_OF_MONTH), 1);
+ long days = Math.subtractExact(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_MONTH), 1);
+ return date(y, 1, 1).plus(months, MONTHS).plus(weeks, WEEKS).plus(days, DAYS);
+ }
+ int moy = range(MONTH_OF_YEAR).checkValidIntValue(fieldValues.remove(MONTH_OF_YEAR), MONTH_OF_YEAR);
+ int aw = range(ALIGNED_WEEK_OF_MONTH).checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_MONTH), ALIGNED_WEEK_OF_MONTH);
+ int ad = range(ALIGNED_DAY_OF_WEEK_IN_MONTH).checkValidIntValue(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_MONTH), ALIGNED_DAY_OF_WEEK_IN_MONTH);
+ ChronoLocalDate date = date(y, moy, 1).plus((aw - 1) * 7 + (ad - 1), DAYS);
+ if (resolverStyle == ResolverStyle.STRICT && date.get(MONTH_OF_YEAR) != moy) {
+ throw new DateTimeException("Strict mode rejected resolved date as it is in a different month");
+ }
+ return date;
+ }
+
+ ChronoLocalDate resolveYMAD(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
+ int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR);
+ if (resolverStyle == ResolverStyle.LENIENT) {
+ long months = Math.subtractExact(fieldValues.remove(MONTH_OF_YEAR), 1);
+ long weeks = Math.subtractExact(fieldValues.remove(ALIGNED_WEEK_OF_MONTH), 1);
+ long dow = Math.subtractExact(fieldValues.remove(DAY_OF_WEEK), 1);
+ return resolveAligned(date(y, 1, 1), months, weeks, dow);
+ }
+ int moy = range(MONTH_OF_YEAR).checkValidIntValue(fieldValues.remove(MONTH_OF_YEAR), MONTH_OF_YEAR);
+ int aw = range(ALIGNED_WEEK_OF_MONTH).checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_MONTH), ALIGNED_WEEK_OF_MONTH);
+ int dow = range(DAY_OF_WEEK).checkValidIntValue(fieldValues.remove(DAY_OF_WEEK), DAY_OF_WEEK);
+ ChronoLocalDate date = date(y, moy, 1).plus((aw - 1) * 7, DAYS).with(nextOrSame(DayOfWeek.of(dow)));
+ if (resolverStyle == ResolverStyle.STRICT && date.get(MONTH_OF_YEAR) != moy) {
+ throw new DateTimeException("Strict mode rejected resolved date as it is in a different month");
+ }
+ return date;
+ }
+
+ ChronoLocalDate resolveYAA(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
+ int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR);
+ if (resolverStyle == ResolverStyle.LENIENT) {
+ long weeks = Math.subtractExact(fieldValues.remove(ALIGNED_WEEK_OF_YEAR), 1);
+ long days = Math.subtractExact(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_YEAR), 1);
+ return dateYearDay(y, 1).plus(weeks, WEEKS).plus(days, DAYS);
+ }
+ int aw = range(ALIGNED_WEEK_OF_YEAR).checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_YEAR), ALIGNED_WEEK_OF_YEAR);
+ int ad = range(ALIGNED_DAY_OF_WEEK_IN_YEAR).checkValidIntValue(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_YEAR), ALIGNED_DAY_OF_WEEK_IN_YEAR);
+ ChronoLocalDate date = dateYearDay(y, 1).plus((aw - 1) * 7 + (ad - 1), DAYS);
+ if (resolverStyle == ResolverStyle.STRICT && date.get(YEAR) != y) {
+ throw new DateTimeException("Strict mode rejected resolved date as it is in a different year");
+ }
+ return date;
+ }
+
+ ChronoLocalDate resolveYAD(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
+ int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR);
+ if (resolverStyle == ResolverStyle.LENIENT) {
+ long weeks = Math.subtractExact(fieldValues.remove(ALIGNED_WEEK_OF_YEAR), 1);
+ long dow = Math.subtractExact(fieldValues.remove(DAY_OF_WEEK), 1);
+ return resolveAligned(dateYearDay(y, 1), 0, weeks, dow);
+ }
+ int aw = range(ALIGNED_WEEK_OF_YEAR).checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_YEAR), ALIGNED_WEEK_OF_YEAR);
+ int dow = range(DAY_OF_WEEK).checkValidIntValue(fieldValues.remove(DAY_OF_WEEK), DAY_OF_WEEK);
+ ChronoLocalDate date = dateYearDay(y, 1).plus((aw - 1) * 7, DAYS).with(nextOrSame(DayOfWeek.of(dow)));
+ if (resolverStyle == ResolverStyle.STRICT && date.get(YEAR) != y) {
+ throw new DateTimeException("Strict mode rejected resolved date as it is in a different year");
+ }
+ return date;
+ }
+
+ ChronoLocalDate resolveAligned(ChronoLocalDate base, long months, long weeks, long dow) {
+ ChronoLocalDate date = base.plus(months, MONTHS).plus(weeks, WEEKS);
+ if (dow > 7) {
+ date = date.plus((dow - 1) / 7, WEEKS);
+ dow = ((dow - 1) % 7) + 1;
+ } else if (dow < 1) {
+ date = date.plus(Math.subtractExact(dow, 7) / 7, WEEKS);
+ dow = ((dow + 6) % 7) + 1;
+ }
+ return date.with(nextOrSame(DayOfWeek.of((int) dow)));
+ }
+
+ /**
+ * Adds a field-value pair to the map, checking for conflicts.
+ * <p>
+ * If the field is not already present, then the field-value pair is added to the map.
+ * If the field is already present and it has the same value as that specified, no action occurs.
+ * If the field is already present and it has a different value to that specified, then
+ * an exception is thrown.
+ *
+ * @param field the field to add, not null
+ * @param value the value to add, not null
+ * @throws java.time.DateTimeException if the field is already present with a different value
+ */
+ void addFieldValue(Map<TemporalField, Long> fieldValues, ChronoField field, long value) {
+ Long old = fieldValues.get(field); // check first for better error message
+ if (old != null && old.longValue() != value) {
+ throw new DateTimeException("Conflict found: " + field + " " + old + " differs from " + field + " " + value);
+ }
+ fieldValues.put(field, value);
+ }
+
+ //-----------------------------------------------------------------------
+ /**
+ * Compares this chronology to another chronology.
+ * <p>
+ * The comparison order first by the chronology ID string, then by any
+ * additional information specific to the subclass.
+ * It is "consistent with equals", as defined by {@link Comparable}.
+ *
+ * @implSpec
+ * This implementation compares the chronology ID.
+ * Subclasses must compare any additional state that they store.
+ *
+ * @param other the other chronology to compare to, not null
+ * @return the comparator value, negative if less, positive if greater
+ */
+ @Override
+ public int compareTo(Chronology other) {
+ return getId().compareTo(other.getId());
+ }
+
+ /**
+ * Checks if this chronology is equal to another chronology.
+ * <p>
+ * The comparison is based on the entire state of the object.
+ *
+ * @implSpec
+ * This implementation checks the type and calls
+ * {@link #compareTo(java.time.chrono.Chronology)}.
+ *
+ * @param obj the object to check, null returns false
+ * @return true if this is equal to the other chronology
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj instanceof AbstractChronology) {
+ return compareTo((AbstractChronology) obj) == 0;
+ }
+ return false;
+ }
+
+ /**
+ * A hash code for this chronology.
+ * <p>
+ * The hash code should be based on the entire state of the object.
+ *
+ * @implSpec
+ * This implementation is based on the chronology ID and class.
+ * Subclasses should add any additional state that they store.
+ *
+ * @return a suitable hash code
+ */
+ @Override
+ public int hashCode() {
+ return getClass().hashCode() ^ getId().hashCode();
+ }
+
+ //-----------------------------------------------------------------------
+ /**
+ * Outputs this chronology as a {@code String}, using the chronology ID.
+ *
+ * @return a string representation of this chronology, not null
+ */
+ @Override
+ public String toString() {
+ return getId();
+ }
+
+ //-----------------------------------------------------------------------
+ /**
+ * Writes the Chronology using a
+ * <a href="../../../serialized-form.html#java.time.chrono.Ser">dedicated serialized form</a>.
+ * <pre>
+ * out.writeByte(1); // identifies this as a Chronology
+ * out.writeUTF(getId());
+ * </pre>
+ *
+ * @return the instance of {@code Ser}, not null
+ */
+ Object writeReplace() {
+ return new Ser(Ser.CHRONO_TYPE, this);
+ }
+
+ /**
+ * Defend against malicious streams.
+ * @return never
+ * @throws java.io.InvalidObjectException always
+ */
+ private Object readResolve() throws ObjectStreamException {
+ throw new InvalidObjectException("Deserialization via serialization delegate");
+ }
+
+ void writeExternal(DataOutput out) throws IOException {
+ out.writeUTF(getId());
+ }
+
+ static Chronology readExternal(DataInput in) throws IOException {
+ String id = in.readUTF();
+ return Chronology.of(id);
+ }
+
+}
diff --git a/jdk/src/share/classes/java/time/chrono/ChronoLocalDate.java b/jdk/src/share/classes/java/time/chrono/ChronoLocalDate.java
index 58e4f5d..baa7b69 100644
--- a/jdk/src/share/classes/java/time/chrono/ChronoLocalDate.java
+++ b/jdk/src/share/classes/java/time/chrono/ChronoLocalDate.java
@@ -77,6 +77,7 @@
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
@@ -194,13 +195,13 @@
*
* <h3>Using LocalDate instead</h3>
* The primary alternative to using this interface throughout your application is as follows.
- * <p><ul>
+ * <ul>
* <li>Declare all method signatures referring to dates in terms of {@code LocalDate}.
* <li>Either store the chronology (calendar system) in the user profile or lookup
* the chronology from the user locale
* <li>Convert the ISO {@code LocalDate} to and from the user's preferred calendar system during
* printing and parsing
- * </ul><p>
+ * </ul>
* This approach treats the problem of globalized calendar systems as a localization issue
* and confines it to the UI layer. This approach is in keeping with other localization
* issues in the java platform.
@@ -221,13 +222,13 @@
* For example, an application may need to calculate the next Islamic or Hebrew holiday
* which may require manipulating the date.
* This kind of use case can be handled as follows:
- * <p><ul>
+ * <ul>
* <li>start from the ISO {@code LocalDate} being passed to the method
* <li>convert the date to the alternate calendar system, which for this use case is known
* rather than arbitrary
* <li>perform the calculation
* <li>convert back to {@code LocalDate}
- * </ul><p>
+ * </ul>
* Developers writing low-level frameworks or libraries should also avoid this interface.
* Instead, one of the two general purpose access interfaces should be used.
* Use {@link TemporalAccessor} if read-only access is required, or use {@link Temporal}
@@ -262,7 +263,7 @@
* @see #isEqual
*/
static Comparator<ChronoLocalDate> timeLineOrder() {
- return Chronology.DATE_ORDER;
+ return AbstractChronology.DATE_ORDER;
}
//-----------------------------------------------------------------------
@@ -292,7 +293,7 @@
return (ChronoLocalDate) temporal;
}
Objects.requireNonNull(temporal, "temporal");
- Chronology chrono = temporal.query(TemporalQuery.chronology());
+ Chronology chrono = temporal.query(TemporalQueries.chronology());
if (chrono == null) {
throw new DateTimeException("Unable to obtain ChronoLocalDate from TemporalAccessor: " + temporal.getClass());
}
@@ -511,13 +512,13 @@
@SuppressWarnings("unchecked")
@Override
default <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.zoneId() || query == TemporalQuery.zone() || query == TemporalQuery.offset()) {
+ if (query == TemporalQueries.zoneId() || query == TemporalQueries.zone() || query == TemporalQueries.offset()) {
return null;
- } else if (query == TemporalQuery.localTime()) {
+ } else if (query == TemporalQueries.localTime()) {
return null;
- } else if (query == TemporalQuery.chronology()) {
+ } else if (query == TemporalQueries.chronology()) {
return (R) getChronology();
- } else if (query == TemporalQuery.precision()) {
+ } else if (query == TemporalQueries.precision()) {
return (R) DAYS;
}
// inline TemporalAccessor.super.query(query) as an optimization
diff --git a/jdk/src/share/classes/java/time/chrono/ChronoLocalDateTime.java b/jdk/src/share/classes/java/time/chrono/ChronoLocalDateTime.java
index 4c2ddfd..0607932 100644
--- a/jdk/src/share/classes/java/time/chrono/ChronoLocalDateTime.java
+++ b/jdk/src/share/classes/java/time/chrono/ChronoLocalDateTime.java
@@ -80,6 +80,7 @@
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.time.zone.ZoneRules;
@@ -136,7 +137,7 @@
* @see #isEqual
*/
static Comparator<ChronoLocalDateTime<?>> timeLineOrder() {
- return Chronology.DATE_TIME_ORDER;
+ return AbstractChronology.DATE_TIME_ORDER;
}
//-----------------------------------------------------------------------
@@ -166,7 +167,7 @@
return (ChronoLocalDateTime<?>) temporal;
}
Objects.requireNonNull(temporal, "temporal");
- Chronology chrono = temporal.query(TemporalQuery.chronology());
+ Chronology chrono = temporal.query(TemporalQueries.chronology());
if (chrono == null) {
throw new DateTimeException("Unable to obtain ChronoLocalDateTime from TemporalAccessor: " + temporal.getClass());
}
@@ -334,13 +335,13 @@
@SuppressWarnings("unchecked")
@Override
default <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.zoneId() || query == TemporalQuery.zone() || query == TemporalQuery.offset()) {
+ if (query == TemporalQueries.zoneId() || query == TemporalQueries.zone() || query == TemporalQueries.offset()) {
return null;
- } else if (query == TemporalQuery.localTime()) {
+ } else if (query == TemporalQueries.localTime()) {
return (R) toLocalTime();
- } else if (query == TemporalQuery.chronology()) {
+ } else if (query == TemporalQueries.chronology()) {
return (R) getChronology();
- } else if (query == TemporalQuery.precision()) {
+ } else if (query == TemporalQueries.precision()) {
return (R) NANOS;
}
// inline TemporalAccessor.super.query(query) as an optimization
diff --git a/jdk/src/share/classes/java/time/chrono/ChronoPeriodImpl.java b/jdk/src/share/classes/java/time/chrono/ChronoPeriodImpl.java
index d301adb..221ce74 100644
--- a/jdk/src/share/classes/java/time/chrono/ChronoPeriodImpl.java
+++ b/jdk/src/share/classes/java/time/chrono/ChronoPeriodImpl.java
@@ -72,7 +72,7 @@
import java.time.temporal.Temporal;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalAmount;
-import java.time.temporal.TemporalQuery;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
import java.time.temporal.ValueRange;
@@ -308,7 +308,7 @@
*/
private void validateChrono(TemporalAccessor temporal) {
Objects.requireNonNull(temporal, "temporal");
- Chronology temporalChrono = temporal.query(TemporalQuery.chronology());
+ Chronology temporalChrono = temporal.query(TemporalQueries.chronology());
if (temporalChrono != null && chrono.equals(temporalChrono) == false) {
throw new DateTimeException("Chronology mismatch, expected: " + chrono.getId() + ", actual: " + temporalChrono.getId());
}
diff --git a/jdk/src/share/classes/java/time/chrono/ChronoZonedDateTime.java b/jdk/src/share/classes/java/time/chrono/ChronoZonedDateTime.java
index 033ab99..24e3a3a 100644
--- a/jdk/src/share/classes/java/time/chrono/ChronoZonedDateTime.java
+++ b/jdk/src/share/classes/java/time/chrono/ChronoZonedDateTime.java
@@ -80,6 +80,7 @@
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
@@ -137,7 +138,7 @@
* @see #isEqual
*/
static Comparator<ChronoZonedDateTime<?>> timeLineOrder() {
- return Chronology.INSTANT_ORDER;
+ return AbstractChronology.INSTANT_ORDER;
}
//-----------------------------------------------------------------------
@@ -167,7 +168,7 @@
return (ChronoZonedDateTime<?>) temporal;
}
Objects.requireNonNull(temporal, "temporal");
- Chronology chrono = temporal.query(TemporalQuery.chronology());
+ Chronology chrono = temporal.query(TemporalQueries.chronology());
if (chrono == null) {
throw new DateTimeException("Unable to obtain ChronoZonedDateTime from TemporalAccessor: " + temporal.getClass());
}
@@ -481,15 +482,15 @@
@SuppressWarnings("unchecked")
@Override
default <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.zone() || query == TemporalQuery.zoneId()) {
+ if (query == TemporalQueries.zone() || query == TemporalQueries.zoneId()) {
return (R) getZone();
- } else if (query == TemporalQuery.offset()) {
+ } else if (query == TemporalQueries.offset()) {
return (R) getOffset();
- } else if (query == TemporalQuery.localTime()) {
+ } else if (query == TemporalQueries.localTime()) {
return (R) toLocalTime();
- } else if (query == TemporalQuery.chronology()) {
+ } else if (query == TemporalQueries.chronology()) {
return (R) getChronology();
- } else if (query == TemporalQuery.precision()) {
+ } else if (query == TemporalQueries.precision()) {
return (R) NANOS;
}
// inline TemporalAccessor.super.query(query) as an optimization
diff --git a/jdk/src/share/classes/java/time/chrono/Chronology.java b/jdk/src/share/classes/java/time/chrono/Chronology.java
index ed40f41..7c17da1 100644
--- a/jdk/src/share/classes/java/time/chrono/Chronology.java
+++ b/jdk/src/share/classes/java/time/chrono/Chronology.java
@@ -61,33 +61,8 @@
*/
package java.time.chrono;
-import static java.time.temporal.ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH;
-import static java.time.temporal.ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR;
-import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_MONTH;
-import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_YEAR;
-import static java.time.temporal.ChronoField.DAY_OF_MONTH;
-import static java.time.temporal.ChronoField.DAY_OF_WEEK;
-import static java.time.temporal.ChronoField.DAY_OF_YEAR;
-import static java.time.temporal.ChronoField.EPOCH_DAY;
-import static java.time.temporal.ChronoField.ERA;
-import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
-import static java.time.temporal.ChronoField.PROLEPTIC_MONTH;
-import static java.time.temporal.ChronoField.YEAR;
-import static java.time.temporal.ChronoField.YEAR_OF_ERA;
-import static java.time.temporal.ChronoUnit.DAYS;
-import static java.time.temporal.ChronoUnit.MONTHS;
-import static java.time.temporal.ChronoUnit.WEEKS;
-import static java.time.temporal.TemporalAdjuster.nextOrSame;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.io.InvalidObjectException;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
import java.time.Clock;
import java.time.DateTimeException;
-import java.time.DayOfWeek;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalTime;
@@ -97,28 +72,22 @@
import java.time.format.TextStyle;
import java.time.temporal.ChronoField;
import java.time.temporal.TemporalAccessor;
-import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.UnsupportedTemporalTypeException;
import java.time.temporal.ValueRange;
-import java.util.Comparator;
-import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
-import java.util.ServiceLoader;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import sun.util.logging.PlatformLogger;
/**
* A calendar system, used to organize and identify dates.
* <p>
* The main date and time API is built on the ISO calendar system.
- * This class operates behind the scenes to represent the general concept of a calendar system.
+ * The chronology operates behind the scenes to represent the general concept of a calendar system.
* For example, the Japanese, Minguo, Thai Buddhist and others.
* <p>
* Most other calendar systems also operate on the shared concepts of year, month and day,
@@ -148,7 +117,7 @@
* <p>
* The {@code Chronology} instance provides a set of methods to create {@code ChronoLocalDate} instances.
* The date classes are used to manipulate specific dates.
- * <p><ul>
+ * <ul>
* <li> {@link #dateNow() dateNow()}
* <li> {@link #dateNow(Clock) dateNow(clock)}
* <li> {@link #dateNow(ZoneId) dateNow(zone)}
@@ -157,7 +126,7 @@
* <li> {@link #dateYearDay(int, int) dateYearDay(yearProleptic, dayOfYear)}
* <li> {@link #dateYearDay(Era, int, int) dateYearDay(era, yearOfEra, dayOfYear)}
* <li> {@link #date(TemporalAccessor) date(TemporalAccessor)}
- * </ul><p>
+ * </ul>
*
* <h3 id="addcalendars">Adding New Calendars</h3>
* The set of available chronologies can be extended by applications.
@@ -179,138 +148,22 @@
* CLDR type and, if applicable, the CLDR variant,
*
* @implSpec
- * This class must be implemented with care to ensure other classes operate correctly.
+ * This interface must be implemented with care to ensure other classes operate correctly.
* All implementations that can be instantiated must be final, immutable and thread-safe.
* Subclasses should be Serializable wherever possible.
*
* @since 1.8
*/
-public abstract class Chronology implements Comparable<Chronology> {
+public interface Chronology extends Comparable<Chronology> {
/**
- * ChronoLocalDate order constant.
- */
- static final Comparator<ChronoLocalDate> DATE_ORDER =
- (Comparator<ChronoLocalDate> & Serializable) (date1, date2) -> {
- return Long.compare(date1.toEpochDay(), date2.toEpochDay());
- };
- /**
- * ChronoLocalDateTime order constant.
- */
- static final Comparator<ChronoLocalDateTime<?>> DATE_TIME_ORDER =
- (Comparator<ChronoLocalDateTime<?>> & Serializable) (dateTime1, dateTime2) -> {
- int cmp = Long.compare(dateTime1.toLocalDate().toEpochDay(), dateTime2.toLocalDate().toEpochDay());
- if (cmp == 0) {
- cmp = Long.compare(dateTime1.toLocalTime().toNanoOfDay(), dateTime2.toLocalTime().toNanoOfDay());
- }
- return cmp;
- };
- /**
- * ChronoZonedDateTime order constant.
- */
- static final Comparator<ChronoZonedDateTime<?>> INSTANT_ORDER =
- (Comparator<ChronoZonedDateTime<?>> & Serializable) (dateTime1, dateTime2) -> {
- int cmp = Long.compare(dateTime1.toEpochSecond(), dateTime2.toEpochSecond());
- if (cmp == 0) {
- cmp = Long.compare(dateTime1.toLocalTime().getNano(), dateTime2.toLocalTime().getNano());
- }
- return cmp;
- };
-
- /**
- * Map of available calendars by ID.
- */
- private static final ConcurrentHashMap<String, Chronology> CHRONOS_BY_ID = new ConcurrentHashMap<>();
- /**
- * Map of available calendars by calendar type.
- */
- private static final ConcurrentHashMap<String, Chronology> CHRONOS_BY_TYPE = new ConcurrentHashMap<>();
-
- /**
- * Register a Chronology by its ID and type for lookup by {@link #of(java.lang.String)}.
- * Chronologies must not be registered until they are completely constructed.
- * Specifically, not in the constructor of Chronology.
- *
- * @param chrono the chronology to register; not null
- * @return the already registered Chronology if any, may be null
- */
- static Chronology registerChrono(Chronology chrono) {
- return registerChrono(chrono, chrono.getId());
- }
-
- /**
- * Register a Chronology by ID and type for lookup by {@link #of(java.lang.String)}.
- * Chronos must not be registered until they are completely constructed.
- * Specifically, not in the constructor of Chronology.
- *
- * @param chrono the chronology to register; not null
- * @param id the ID to register the chronology; not null
- * @return the already registered Chronology if any, may be null
- */
- static Chronology registerChrono(Chronology chrono, String id) {
- Chronology prev = CHRONOS_BY_ID.putIfAbsent(id, chrono);
- if (prev == null) {
- String type = chrono.getCalendarType();
- if (type != null) {
- CHRONOS_BY_TYPE.putIfAbsent(type, chrono);
- }
- }
- return prev;
- }
-
- /**
- * Initialization of the maps from id and type to Chronology.
- * The ServiceLoader is used to find and register any implementations
- * of {@link java.time.chrono.Chronology} found in the bootclass loader.
- * The built-in chronologies are registered explicitly.
- * Calendars configured via the Thread's context classloader are local
- * to that thread and are ignored.
- * <p>
- * The initialization is done only once using the registration
- * of the IsoChronology as the test and the final step.
- * Multiple threads may perform the initialization concurrently.
- * Only the first registration of each Chronology is retained by the
- * ConcurrentHashMap.
- * @return true if the cache was initialized
- */
- private static boolean initCache() {
- if (CHRONOS_BY_ID.get("ISO") == null) {
- // Initialization is incomplete
-
- // Register built-in Chronologies
- registerChrono(HijrahChronology.INSTANCE);
- registerChrono(JapaneseChronology.INSTANCE);
- registerChrono(MinguoChronology.INSTANCE);
- registerChrono(ThaiBuddhistChronology.INSTANCE);
-
- // Register Chronologies from the ServiceLoader
- @SuppressWarnings("rawtypes")
- ServiceLoader<Chronology> loader = ServiceLoader.load(Chronology.class, null);
- for (Chronology chrono : loader) {
- String id = chrono.getId();
- if (id.equals("ISO") || registerChrono(chrono) != null) {
- // Log the attempt to replace an existing Chronology
- PlatformLogger logger = PlatformLogger.getLogger("java.time.chrono");
- logger.warning("Ignoring duplicate Chronology, from ServiceLoader configuration " + id);
- }
- }
-
- // finally, register IsoChronology to mark initialization is complete
- registerChrono(IsoChronology.INSTANCE);
- return true;
- }
- return false;
- }
-
- //-----------------------------------------------------------------------
- /**
* Obtains an instance of {@code Chronology} from a temporal object.
* <p>
* This obtains a chronology based on the specified temporal.
* A {@code TemporalAccessor} represents an arbitrary set of date and time information,
* which this factory converts to an instance of {@code Chronology}.
* <p>
- * The conversion will obtain the chronology using {@link TemporalQuery#chronology()}.
+ * The conversion will obtain the chronology using {@link TemporalQueries#chronology()}.
* If the specified temporal object does not have a chronology, {@link IsoChronology} is returned.
* <p>
* This method matches the signature of the functional interface {@link TemporalQuery}
@@ -320,9 +173,9 @@
* @return the chronology, not null
* @throws DateTimeException if unable to convert to an {@code Chronology}
*/
- public static Chronology from(TemporalAccessor temporal) {
+ static Chronology from(TemporalAccessor temporal) {
Objects.requireNonNull(temporal, "temporal");
- Chronology obj = temporal.query(TemporalQuery.chronology());
+ Chronology obj = temporal.query(TemporalQueries.chronology());
return (obj != null ? obj : IsoChronology.INSTANCE);
}
@@ -367,31 +220,8 @@
* @return the calendar system associated with the locale, not null
* @throws DateTimeException if the locale-specified calendar cannot be found
*/
- public static Chronology ofLocale(Locale locale) {
- Objects.requireNonNull(locale, "locale");
- String type = locale.getUnicodeLocaleType("ca");
- if (type == null || "iso".equals(type) || "iso8601".equals(type)) {
- return IsoChronology.INSTANCE;
- }
- // Not pre-defined; lookup by the type
- do {
- Chronology chrono = CHRONOS_BY_TYPE.get(type);
- if (chrono != null) {
- return chrono;
- }
- // If not found, do the initialization (once) and repeat the lookup
- } while (initCache());
-
- // Look for a Chronology using ServiceLoader of the Thread's ContextClassLoader
- // Application provided Chronologies must not be cached
- @SuppressWarnings("rawtypes")
- ServiceLoader<Chronology> loader = ServiceLoader.load(Chronology.class);
- for (Chronology chrono : loader) {
- if (type.equals(chrono.getCalendarType())) {
- return chrono;
- }
- }
- throw new DateTimeException("Unknown calendar system: " + type);
+ static Chronology ofLocale(Locale locale) {
+ return AbstractChronology.ofLocale(locale);
}
//-----------------------------------------------------------------------
@@ -415,41 +245,8 @@
* @return the chronology with the identifier requested, not null
* @throws DateTimeException if the chronology cannot be found
*/
- public static Chronology of(String id) {
- Objects.requireNonNull(id, "id");
- do {
- Chronology chrono = of0(id);
- if (chrono != null) {
- return chrono;
- }
- // If not found, do the initialization (once) and repeat the lookup
- } while (initCache());
-
- // Look for a Chronology using ServiceLoader of the Thread's ContextClassLoader
- // Application provided Chronologies must not be cached
- @SuppressWarnings("rawtypes")
- ServiceLoader<Chronology> loader = ServiceLoader.load(Chronology.class);
- for (Chronology chrono : loader) {
- if (id.equals(chrono.getId()) || id.equals(chrono.getCalendarType())) {
- return chrono;
- }
- }
- throw new DateTimeException("Unknown chronology: " + id);
- }
-
- /**
- * Obtains an instance of {@code Chronology} from a chronology ID or
- * calendar system type.
- *
- * @param id the chronology ID or calendar system type, not null
- * @return the chronology with the identifier requested, or {@code null} if not found
- */
- private static Chronology of0(String id) {
- Chronology chrono = CHRONOS_BY_ID.get(id);
- if (chrono == null) {
- chrono = CHRONOS_BY_TYPE.get(id);
- }
- return chrono;
+ static Chronology of(String id) {
+ return AbstractChronology.of(id);
}
/**
@@ -462,24 +259,8 @@
*
* @return the independent, modifiable set of the available chronology IDs, not null
*/
- public static Set<Chronology> getAvailableChronologies() {
- initCache(); // force initialization
- HashSet<Chronology> chronos = new HashSet<>(CHRONOS_BY_ID.values());
-
- /// Add in Chronologies from the ServiceLoader configuration
- @SuppressWarnings("rawtypes")
- ServiceLoader<Chronology> loader = ServiceLoader.load(Chronology.class);
- for (Chronology chrono : loader) {
- chronos.add(chrono);
- }
- return chronos;
- }
-
- //-----------------------------------------------------------------------
- /**
- * Creates an instance.
- */
- protected Chronology() {
+ static Set<Chronology> getAvailableChronologies() {
+ return AbstractChronology.getAvailableChronologies();
}
//-----------------------------------------------------------------------
@@ -492,7 +273,7 @@
* @return the chronology ID, not null
* @see #getCalendarType()
*/
- public abstract String getId();
+ String getId();
/**
* Gets the calendar type of the calendar system.
@@ -507,13 +288,17 @@
* @return the calendar system type, null if the calendar is not defined by CLDR/LDML
* @see #getId()
*/
- public abstract String getCalendarType();
+ String getCalendarType();
//-----------------------------------------------------------------------
/**
* Obtains a local date in this chronology from the era, year-of-era,
* month-of-year and day-of-month fields.
*
+ * @implSpec
+ * The default implementation combines the era and year-of-era into a proleptic
+ * year before calling {@link #date(int, int, int)}.
+ *
* @param era the era of the correct type for the chronology, not null
* @param yearOfEra the chronology year-of-era
* @param month the chronology month-of-year
@@ -522,7 +307,7 @@
* @throws DateTimeException if unable to create the date
* @throws ClassCastException if the {@code era} is not of the correct type for the chronology
*/
- public ChronoLocalDate date(Era era, int yearOfEra, int month, int dayOfMonth) {
+ default ChronoLocalDate date(Era era, int yearOfEra, int month, int dayOfMonth) {
return date(prolepticYear(era, yearOfEra), month, dayOfMonth);
}
@@ -536,12 +321,16 @@
* @return the local date in this chronology, not null
* @throws DateTimeException if unable to create the date
*/
- public abstract ChronoLocalDate date(int prolepticYear, int month, int dayOfMonth);
+ ChronoLocalDate date(int prolepticYear, int month, int dayOfMonth);
/**
* Obtains a local date in this chronology from the era, year-of-era and
* day-of-year fields.
*
+ * @implSpec
+ * The default implementation combines the era and year-of-era into a proleptic
+ * year before calling {@link #dateYearDay(int, int)}.
+ *
* @param era the era of the correct type for the chronology, not null
* @param yearOfEra the chronology year-of-era
* @param dayOfYear the chronology day-of-year
@@ -549,7 +338,7 @@
* @throws DateTimeException if unable to create the date
* @throws ClassCastException if the {@code era} is not of the correct type for the chronology
*/
- public ChronoLocalDate dateYearDay(Era era, int yearOfEra, int dayOfYear) {
+ default ChronoLocalDate dateYearDay(Era era, int yearOfEra, int dayOfYear) {
return dateYearDay(prolepticYear(era, yearOfEra), dayOfYear);
}
@@ -562,7 +351,7 @@
* @return the local date in this chronology, not null
* @throws DateTimeException if unable to create the date
*/
- public abstract ChronoLocalDate dateYearDay(int prolepticYear, int dayOfYear);
+ ChronoLocalDate dateYearDay(int prolepticYear, int dayOfYear);
/**
* Obtains a local date in this chronology from the epoch-day.
@@ -574,7 +363,7 @@
* @return the local date in this chronology, not null
* @throws DateTimeException if unable to create the date
*/
- public abstract ChronoLocalDate dateEpochDay(long epochDay);
+ ChronoLocalDate dateEpochDay(long epochDay);
//-----------------------------------------------------------------------
/**
@@ -585,13 +374,14 @@
* <p>
* Using this method will prevent the ability to use an alternate clock for testing
* because the clock is hard-coded.
- * <p>
- * This implementation uses {@link #dateNow(Clock)}.
+ *
+ * @implSpec
+ * The default implementation invokes {@link #dateNow(Clock)}.
*
* @return the current local date using the system clock and default time-zone, not null
* @throws DateTimeException if unable to create the date
*/
- public ChronoLocalDate dateNow() {
+ default ChronoLocalDate dateNow() {
return dateNow(Clock.systemDefaultZone());
}
@@ -604,11 +394,14 @@
* Using this method will prevent the ability to use an alternate clock for testing
* because the clock is hard-coded.
*
+ * @implSpec
+ * The default implementation invokes {@link #dateNow(Clock)}.
+ *
* @param zone the zone ID to use, not null
* @return the current local date using the system clock, not null
* @throws DateTimeException if unable to create the date
*/
- public ChronoLocalDate dateNow(ZoneId zone) {
+ default ChronoLocalDate dateNow(ZoneId zone) {
return dateNow(Clock.system(zone));
}
@@ -619,11 +412,14 @@
* Using this method allows the use of an alternate clock for testing.
* The alternate clock may be introduced using {@link Clock dependency injection}.
*
+ * @implSpec
+ * The default implementation invokes {@link #date(TemporalAccessor)} )}.
+ *
* @param clock the clock to use, not null
* @return the current local date, not null
* @throws DateTimeException if unable to create the date
*/
- public ChronoLocalDate dateNow(Clock clock) {
+ default ChronoLocalDate dateNow(Clock clock) {
Objects.requireNonNull(clock, "clock");
return date(LocalDate.now(clock));
}
@@ -647,7 +443,7 @@
* @throws DateTimeException if unable to create the date
* @see ChronoLocalDate#from(TemporalAccessor)
*/
- public abstract ChronoLocalDate date(TemporalAccessor temporal);
+ ChronoLocalDate date(TemporalAccessor temporal);
/**
* Obtains a local date-time in this chronology from another temporal object.
@@ -670,7 +466,7 @@
* @throws DateTimeException if unable to create the date-time
* @see ChronoLocalDateTime#from(TemporalAccessor)
*/
- public ChronoLocalDateTime<? extends ChronoLocalDate> localDateTime(TemporalAccessor temporal) {
+ default ChronoLocalDateTime<? extends ChronoLocalDate> localDateTime(TemporalAccessor temporal) {
try {
return date(temporal).atTime(LocalTime.from(temporal));
} catch (DateTimeException ex) {
@@ -702,7 +498,7 @@
* @throws DateTimeException if unable to create the date-time
* @see ChronoZonedDateTime#from(TemporalAccessor)
*/
- public ChronoZonedDateTime<? extends ChronoLocalDate> zonedDateTime(TemporalAccessor temporal) {
+ default ChronoZonedDateTime<? extends ChronoLocalDate> zonedDateTime(TemporalAccessor temporal) {
try {
ZoneId zone = ZoneId.from(temporal);
try {
@@ -728,7 +524,7 @@
* @return the zoned date-time, not null
* @throws DateTimeException if the result exceeds the supported range
*/
- public ChronoZonedDateTime<? extends ChronoLocalDate> zonedDateTime(Instant instant, ZoneId zone) {
+ default ChronoZonedDateTime<? extends ChronoLocalDate> zonedDateTime(Instant instant, ZoneId zone) {
return ChronoZonedDateTimeImpl.ofInstant(this, instant, zone);
}
@@ -738,15 +534,15 @@
* <p>
* A leap-year is a year of a longer length than normal.
* The exact meaning is determined by the chronology according to the following constraints.
- * <p><ul>
+ * <ul>
* <li>a leap-year must imply a year-length longer than a non leap-year.
* <li>a chronology that does not support the concept of a year must return false.
- * </ul><p>
+ * </ul>
*
* @param prolepticYear the proleptic-year to check, not validated for range
* @return true if the year is a leap year
*/
- public abstract boolean isLeapYear(long prolepticYear);
+ boolean isLeapYear(long prolepticYear);
/**
* Calculates the proleptic-year given the era and year-of-era.
@@ -764,7 +560,7 @@
* such as if the year is invalid for the era
* @throws ClassCastException if the {@code era} is not of the correct type for the chronology
*/
- public abstract int prolepticYear(Era era, int yearOfEra);
+ int prolepticYear(Era era, int yearOfEra);
/**
* Creates the chronology era object from the numeric value.
@@ -785,7 +581,7 @@
* @return the calendar system era, not null
* @throws DateTimeException if unable to create the era
*/
- public abstract Era eraOf(int eraValue);
+ Era eraOf(int eraValue);
/**
* Gets the list of eras for the chronology.
@@ -796,7 +592,7 @@
*
* @return the list of eras for the chronology, may be immutable, not null
*/
- public abstract List<Era> eras();
+ List<Era> eras();
//-----------------------------------------------------------------------
/**
@@ -815,7 +611,7 @@
* @return the range of valid values for the field, not null
* @throws DateTimeException if the range for the field cannot be obtained
*/
- public abstract ValueRange range(ChronoField field);
+ ValueRange range(ChronoField field);
//-----------------------------------------------------------------------
/**
@@ -825,28 +621,16 @@
* suitable for presentation to the user.
* The parameters control the style of the returned text and the locale.
*
+ * @implSpec
+ * The default implementation behaves as the the formatter was used to
+ * format the chronology textual name.
+ *
* @param style the style of the text required, not null
* @param locale the locale to use, not null
* @return the text value of the chronology, not null
*/
- public String getDisplayName(TextStyle style, Locale locale) {
- return new DateTimeFormatterBuilder().appendChronologyText(style).toFormatter(locale).format(toTemporal());
- }
-
- /**
- * Converts this chronology to a {@code TemporalAccessor}.
- * <p>
- * A {@code Chronology} can be fully represented as a {@code TemporalAccessor}.
- * However, the interface is not implemented by this class as most of the
- * methods on the interface have no meaning to {@code Chronology}.
- * <p>
- * The returned temporal has no supported fields, with the query method
- * supporting the return of the chronology using {@link TemporalQuery#chronology()}.
- *
- * @return a temporal equivalent to this chronology, not null
- */
- private TemporalAccessor toTemporal() {
- return new TemporalAccessor() {
+ default String getDisplayName(TextStyle style, Locale locale) {
+ TemporalAccessor temporal = new TemporalAccessor() {
@Override
public boolean isSupported(TemporalField field) {
return false;
@@ -858,12 +642,13 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.chronology()) {
+ if (query == TemporalQueries.chronology()) {
return (R) Chronology.this;
}
return TemporalAccessor.super.query(query);
}
};
+ return new DateTimeFormatterBuilder().appendChronologyText(style).toFormatter(locale).format(temporal);
}
//-----------------------------------------------------------------------
@@ -876,82 +661,8 @@
* As such, {@code ChronoField} date fields are resolved here in the
* context of a specific chronology.
* <p>
- * {@code ChronoField} instances are resolved by this method, which may
- * be overridden in subclasses.
- * <ul>
- * <li>{@code EPOCH_DAY} - If present, this is converted to a date and
- * all other date fields are then cross-checked against the date.
- * <li>{@code PROLEPTIC_MONTH} - If present, then it is split into the
- * {@code YEAR} and {@code MONTH_OF_YEAR}. If the mode is strict or smart
- * then the field is validated.
- * <li>{@code YEAR_OF_ERA} and {@code ERA} - If both are present, then they
- * are combined to form a {@code YEAR}. In lenient mode, the {@code YEAR_OF_ERA}
- * range is not validated, in smart and strict mode it is. The {@code ERA} is
- * validated for range in all three modes. If only the {@code YEAR_OF_ERA} is
- * present, and the mode is smart or lenient, then the last available era
- * is assumed. In strict mode, no era is assumed and the {@code YEAR_OF_ERA} is
- * left untouched. If only the {@code ERA} is present, then it is left untouched.
- * <li>{@code YEAR}, {@code MONTH_OF_YEAR} and {@code DAY_OF_MONTH} -
- * If all three are present, then they are combined to form a date.
- * In all three modes, the {@code YEAR} is validated.
- * If the mode is smart or strict, then the month and day are validated.
- * If the mode is lenient, then the date is combined in a manner equivalent to
- * creating a date on the first day of the first month in the requested year,
- * then adding the difference in months, then the difference in days.
- * If the mode is smart, and the day-of-month is greater than the maximum for
- * the year-month, then the day-of-month is adjusted to the last day-of-month.
- * If the mode is strict, then the three fields must form a valid date.
- * <li>{@code YEAR} and {@code DAY_OF_YEAR} -
- * If both are present, then they are combined to form a date.
- * In all three modes, the {@code YEAR} is validated.
- * If the mode is lenient, then the date is combined in a manner equivalent to
- * creating a date on the first day of the requested year, then adding
- * the difference in days.
- * If the mode is smart or strict, then the two fields must form a valid date.
- * <li>{@code YEAR}, {@code MONTH_OF_YEAR}, {@code ALIGNED_WEEK_OF_MONTH} and
- * {@code ALIGNED_DAY_OF_WEEK_IN_MONTH} -
- * If all four are present, then they are combined to form a date.
- * In all three modes, the {@code YEAR} is validated.
- * If the mode is lenient, then the date is combined in a manner equivalent to
- * creating a date on the first day of the first month in the requested year, then adding
- * the difference in months, then the difference in weeks, then in days.
- * If the mode is smart or strict, then the all four fields are validated to
- * their outer ranges. The date is then combined in a manner equivalent to
- * creating a date on the first day of the requested year and month, then adding
- * the amount in weeks and days to reach their values. If the mode is strict,
- * the date is additionally validated to check that the day and week adjustment
- * did not change the month.
- * <li>{@code YEAR}, {@code MONTH_OF_YEAR}, {@code ALIGNED_WEEK_OF_MONTH} and
- * {@code DAY_OF_WEEK} - If all four are present, then they are combined to
- * form a date. The approach is the same as described above for
- * years, months and weeks in {@code ALIGNED_DAY_OF_WEEK_IN_MONTH}.
- * The day-of-week is adjusted as the next or same matching day-of-week once
- * the years, months and weeks have been handled.
- * <li>{@code YEAR}, {@code ALIGNED_WEEK_OF_YEAR} and {@code ALIGNED_DAY_OF_WEEK_IN_YEAR} -
- * If all three are present, then they are combined to form a date.
- * In all three modes, the {@code YEAR} is validated.
- * If the mode is lenient, then the date is combined in a manner equivalent to
- * creating a date on the first day of the requested year, then adding
- * the difference in weeks, then in days.
- * If the mode is smart or strict, then the all three fields are validated to
- * their outer ranges. The date is then combined in a manner equivalent to
- * creating a date on the first day of the requested year, then adding
- * the amount in weeks and days to reach their values. If the mode is strict,
- * the date is additionally validated to check that the day and week adjustment
- * did not change the year.
- * <li>{@code YEAR}, {@code ALIGNED_WEEK_OF_YEAR} and {@code DAY_OF_WEEK} -
- * If all three are present, then they are combined to form a date.
- * The approach is the same as described above for years and weeks in
- * {@code ALIGNED_DAY_OF_WEEK_IN_YEAR}. The day-of-week is adjusted as the
- * next or same matching day-of-week once the years and weeks have been handled.
- * </ul>
- * <p>
- * The default implementation is suitable for most calendar systems.
- * If {@link ChronoField#YEAR_OF_ERA} is found without an {@link ChronoField#ERA}
- * then the last era in {@link #eras()} is used.
- * The implementation assumes a 7 day week, that the first day-of-month
- * has the value 1, that first day-of-year has the value 1, and that the
- * first of the month and year always exists.
+ * The default implementation, which explains typical resolve behaviour,
+ * is provided in {@link AbstractChronology}.
*
* @param fieldValues the map of fields to values, which can be updated, not null
* @param resolverStyle the requested type of resolve, not null
@@ -959,233 +670,7 @@
* @throws DateTimeException if the date cannot be resolved, typically
* because of a conflict in the input data
*/
- public ChronoLocalDate resolveDate(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
- // check epoch-day before inventing era
- if (fieldValues.containsKey(EPOCH_DAY)) {
- return dateEpochDay(fieldValues.remove(EPOCH_DAY));
- }
-
- // fix proleptic month before inventing era
- resolveProlepticMonth(fieldValues, resolverStyle);
-
- // invent era if necessary to resolve year-of-era
- ChronoLocalDate resolved = resolveYearOfEra(fieldValues, resolverStyle);
- if (resolved != null) {
- return resolved;
- }
-
- // build date
- if (fieldValues.containsKey(YEAR)) {
- if (fieldValues.containsKey(MONTH_OF_YEAR)) {
- if (fieldValues.containsKey(DAY_OF_MONTH)) {
- return resolveYMD(fieldValues, resolverStyle);
- }
- if (fieldValues.containsKey(ALIGNED_WEEK_OF_MONTH)) {
- if (fieldValues.containsKey(ALIGNED_DAY_OF_WEEK_IN_MONTH)) {
- return resolveYMAA(fieldValues, resolverStyle);
- }
- if (fieldValues.containsKey(DAY_OF_WEEK)) {
- return resolveYMAD(fieldValues, resolverStyle);
- }
- }
- }
- if (fieldValues.containsKey(DAY_OF_YEAR)) {
- return resolveYD(fieldValues, resolverStyle);
- }
- if (fieldValues.containsKey(ALIGNED_WEEK_OF_YEAR)) {
- if (fieldValues.containsKey(ALIGNED_DAY_OF_WEEK_IN_YEAR)) {
- return resolveYAA(fieldValues, resolverStyle);
- }
- if (fieldValues.containsKey(DAY_OF_WEEK)) {
- return resolveYAD(fieldValues, resolverStyle);
- }
- }
- }
- return null;
- }
-
- void resolveProlepticMonth(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
- Long pMonth = fieldValues.remove(PROLEPTIC_MONTH);
- if (pMonth != null) {
- if (resolverStyle != ResolverStyle.LENIENT) {
- PROLEPTIC_MONTH.checkValidValue(pMonth);
- }
- // first day-of-month is likely to be safest for setting proleptic-month
- // cannot add to year zero, as not all chronologies have a year zero
- ChronoLocalDate chronoDate = dateNow()
- .with(DAY_OF_MONTH, 1).with(PROLEPTIC_MONTH, pMonth);
- addFieldValue(fieldValues, MONTH_OF_YEAR, chronoDate.get(MONTH_OF_YEAR));
- addFieldValue(fieldValues, YEAR, chronoDate.get(YEAR));
- }
- }
-
- ChronoLocalDate resolveYearOfEra(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
- Long yoeLong = fieldValues.remove(YEAR_OF_ERA);
- if (yoeLong != null) {
- Long eraLong = fieldValues.remove(ERA);
- int yoe;
- if (resolverStyle != ResolverStyle.LENIENT) {
- yoe = range(YEAR_OF_ERA).checkValidIntValue(yoeLong, YEAR_OF_ERA);
- } else {
- yoe = Math.toIntExact(yoeLong);
- }
- if (eraLong != null) {
- Era eraObj = eraOf(range(ERA).checkValidIntValue(eraLong, ERA));
- addFieldValue(fieldValues, YEAR, prolepticYear(eraObj, yoe));
- } else {
- if (fieldValues.containsKey(YEAR)) {
- int year = range(YEAR).checkValidIntValue(fieldValues.get(YEAR), YEAR);
- ChronoLocalDate chronoDate = dateYearDay(year, 1);
- addFieldValue(fieldValues, YEAR, prolepticYear(chronoDate.getEra(), yoe));
- } else if (resolverStyle == ResolverStyle.STRICT) {
- // do not invent era if strict
- // reinstate the field removed earlier, no cross-check issues
- fieldValues.put(YEAR_OF_ERA, yoeLong);
- } else {
- List<Era> eras = eras();
- if (eras.isEmpty()) {
- addFieldValue(fieldValues, YEAR, yoe);
- } else {
- Era eraObj = eras.get(eras.size() - 1);
- addFieldValue(fieldValues, YEAR, prolepticYear(eraObj, yoe));
- }
- }
- }
- } else if (fieldValues.containsKey(ERA)) {
- range(ERA).checkValidValue(fieldValues.get(ERA), ERA); // always validated
- }
- return null;
- }
-
- ChronoLocalDate resolveYMD(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
- int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR);
- if (resolverStyle == ResolverStyle.LENIENT) {
- long months = Math.subtractExact(fieldValues.remove(MONTH_OF_YEAR), 1);
- long days = Math.subtractExact(fieldValues.remove(DAY_OF_MONTH), 1);
- return date(y, 1, 1).plus(months, MONTHS).plus(days, DAYS);
- }
- int moy = range(MONTH_OF_YEAR).checkValidIntValue(fieldValues.remove(MONTH_OF_YEAR), MONTH_OF_YEAR);
- ValueRange domRange = range(DAY_OF_MONTH);
- int dom = domRange.checkValidIntValue(fieldValues.remove(DAY_OF_MONTH), DAY_OF_MONTH);
- if (resolverStyle == ResolverStyle.SMART) { // previous valid
- try {
- return date(y, moy, dom);
- } catch (DateTimeException ex) {
- return date(y, moy, 1).with(TemporalAdjuster.lastDayOfMonth());
- }
- }
- return date(y, moy, dom);
- }
-
- ChronoLocalDate resolveYD(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
- int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR);
- if (resolverStyle == ResolverStyle.LENIENT) {
- long days = Math.subtractExact(fieldValues.remove(DAY_OF_YEAR), 1);
- return dateYearDay(y, 1).plus(days, DAYS);
- }
- int doy = range(DAY_OF_YEAR).checkValidIntValue(fieldValues.remove(DAY_OF_YEAR), DAY_OF_YEAR);
- return dateYearDay(y, doy); // smart is same as strict
- }
-
- ChronoLocalDate resolveYMAA(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
- int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR);
- if (resolverStyle == ResolverStyle.LENIENT) {
- long months = Math.subtractExact(fieldValues.remove(MONTH_OF_YEAR), 1);
- long weeks = Math.subtractExact(fieldValues.remove(ALIGNED_WEEK_OF_MONTH), 1);
- long days = Math.subtractExact(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_MONTH), 1);
- return date(y, 1, 1).plus(months, MONTHS).plus(weeks, WEEKS).plus(days, DAYS);
- }
- int moy = range(MONTH_OF_YEAR).checkValidIntValue(fieldValues.remove(MONTH_OF_YEAR), MONTH_OF_YEAR);
- int aw = range(ALIGNED_WEEK_OF_MONTH).checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_MONTH), ALIGNED_WEEK_OF_MONTH);
- int ad = range(ALIGNED_DAY_OF_WEEK_IN_MONTH).checkValidIntValue(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_MONTH), ALIGNED_DAY_OF_WEEK_IN_MONTH);
- ChronoLocalDate date = date(y, moy, 1).plus((aw - 1) * 7 + (ad - 1), DAYS);
- if (resolverStyle == ResolverStyle.STRICT && date.get(MONTH_OF_YEAR) != moy) {
- throw new DateTimeException("Strict mode rejected resolved date as it is in a different month");
- }
- return date;
- }
-
- ChronoLocalDate resolveYMAD(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
- int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR);
- if (resolverStyle == ResolverStyle.LENIENT) {
- long months = Math.subtractExact(fieldValues.remove(MONTH_OF_YEAR), 1);
- long weeks = Math.subtractExact(fieldValues.remove(ALIGNED_WEEK_OF_MONTH), 1);
- long dow = Math.subtractExact(fieldValues.remove(DAY_OF_WEEK), 1);
- return resolveAligned(date(y, 1, 1), months, weeks, dow);
- }
- int moy = range(MONTH_OF_YEAR).checkValidIntValue(fieldValues.remove(MONTH_OF_YEAR), MONTH_OF_YEAR);
- int aw = range(ALIGNED_WEEK_OF_MONTH).checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_MONTH), ALIGNED_WEEK_OF_MONTH);
- int dow = range(DAY_OF_WEEK).checkValidIntValue(fieldValues.remove(DAY_OF_WEEK), DAY_OF_WEEK);
- ChronoLocalDate date = date(y, moy, 1).plus((aw - 1) * 7, DAYS).with(nextOrSame(DayOfWeek.of(dow)));
- if (resolverStyle == ResolverStyle.STRICT && date.get(MONTH_OF_YEAR) != moy) {
- throw new DateTimeException("Strict mode rejected resolved date as it is in a different month");
- }
- return date;
- }
-
- ChronoLocalDate resolveYAA(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
- int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR);
- if (resolverStyle == ResolverStyle.LENIENT) {
- long weeks = Math.subtractExact(fieldValues.remove(ALIGNED_WEEK_OF_YEAR), 1);
- long days = Math.subtractExact(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_YEAR), 1);
- return dateYearDay(y, 1).plus(weeks, WEEKS).plus(days, DAYS);
- }
- int aw = range(ALIGNED_WEEK_OF_YEAR).checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_YEAR), ALIGNED_WEEK_OF_YEAR);
- int ad = range(ALIGNED_DAY_OF_WEEK_IN_YEAR).checkValidIntValue(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_YEAR), ALIGNED_DAY_OF_WEEK_IN_YEAR);
- ChronoLocalDate date = dateYearDay(y, 1).plus((aw - 1) * 7 + (ad - 1), DAYS);
- if (resolverStyle == ResolverStyle.STRICT && date.get(YEAR) != y) {
- throw new DateTimeException("Strict mode rejected resolved date as it is in a different year");
- }
- return date;
- }
-
- ChronoLocalDate resolveYAD(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle) {
- int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR);
- if (resolverStyle == ResolverStyle.LENIENT) {
- long weeks = Math.subtractExact(fieldValues.remove(ALIGNED_WEEK_OF_YEAR), 1);
- long dow = Math.subtractExact(fieldValues.remove(DAY_OF_WEEK), 1);
- return resolveAligned(dateYearDay(y, 1), 0, weeks, dow);
- }
- int aw = range(ALIGNED_WEEK_OF_YEAR).checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_YEAR), ALIGNED_WEEK_OF_YEAR);
- int dow = range(DAY_OF_WEEK).checkValidIntValue(fieldValues.remove(DAY_OF_WEEK), DAY_OF_WEEK);
- ChronoLocalDate date = dateYearDay(y, 1).plus((aw - 1) * 7, DAYS).with(nextOrSame(DayOfWeek.of(dow)));
- if (resolverStyle == ResolverStyle.STRICT && date.get(YEAR) != y) {
- throw new DateTimeException("Strict mode rejected resolved date as it is in a different year");
- }
- return date;
- }
-
- ChronoLocalDate resolveAligned(ChronoLocalDate base, long months, long weeks, long dow) {
- ChronoLocalDate date = base.plus(months, MONTHS).plus(weeks, WEEKS);
- if (dow > 7) {
- date = date.plus((dow - 1) / 7, WEEKS);
- dow = ((dow - 1) % 7) + 1;
- } else if (dow < 1) {
- date = date.plus(Math.subtractExact(dow, 7) / 7, WEEKS);
- dow = ((dow + 6) % 7) + 1;
- }
- return date.with(nextOrSame(DayOfWeek.of((int) dow)));
- }
-
- /**
- * Adds a field-value pair to the map, checking for conflicts.
- * <p>
- * If the field is not already present, then the field-value pair is added to the map.
- * If the field is already present and it has the same value as that specified, no action occurs.
- * If the field is already present and it has a different value to that specified, then
- * an exception is thrown.
- *
- * @param field the field to add, not null
- * @param value the value to add, not null
- * @throws DateTimeException if the field is already present with a different value
- */
- void addFieldValue(Map<TemporalField, Long> fieldValues, ChronoField field, long value) {
- Long old = fieldValues.get(field); // check first for better error message
- if (old != null && old.longValue() != value) {
- throw new DateTimeException("Conflict found: " + field + " " + old + " differs from " + field + " " + value);
- }
- fieldValues.put(field, value);
- }
+ ChronoLocalDate resolveDate(Map<TemporalField, Long> fieldValues, ResolverStyle resolverStyle);
//-----------------------------------------------------------------------
/**
@@ -1215,7 +700,7 @@
* @param days the number of years, may be negative
* @return the period in terms of this chronology, not null
*/
- public ChronoPeriod period(int years, int months, int days) {
+ default ChronoPeriod period(int years, int months, int days) {
return new ChronoPeriodImpl(this, years, months, days);
}
@@ -1226,107 +711,43 @@
* The comparison order first by the chronology ID string, then by any
* additional information specific to the subclass.
* It is "consistent with equals", as defined by {@link Comparable}.
- * <p>
- * The default implementation compares the chronology ID.
- * Subclasses must compare any additional state that they store.
*
* @param other the other chronology to compare to, not null
* @return the comparator value, negative if less, positive if greater
*/
@Override
- public int compareTo(Chronology other) {
- return getId().compareTo(other.getId());
- }
+ int compareTo(Chronology other);
/**
* Checks if this chronology is equal to another chronology.
* <p>
* The comparison is based on the entire state of the object.
- * <p>
- * The default implementation checks the type and calls {@link #compareTo(Chronology)}.
*
* @param obj the object to check, null returns false
* @return true if this is equal to the other chronology
*/
@Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj instanceof Chronology) {
- return compareTo((Chronology) obj) == 0;
- }
- return false;
- }
+ boolean equals(Object obj);
/**
* A hash code for this chronology.
* <p>
- * The default implementation is based on the ID and class.
- * Subclasses should add any additional state that they store.
+ * The hash code should be based on the entire state of the object.
*
* @return a suitable hash code
*/
@Override
- public int hashCode() {
- return getClass().hashCode() ^ getId().hashCode();
- }
+ int hashCode();
//-----------------------------------------------------------------------
/**
- * Outputs this chronology as a {@code String}, using the ID.
+ * Outputs this chronology as a {@code String}.
+ * <p>
+ * The format should include the entire state of the object.
*
* @return a string representation of this chronology, not null
*/
@Override
- public String toString() {
- return getId();
- }
-
- //-----------------------------------------------------------------------
- /**
- * Writes the Chronology using a
- * <a href="../../../serialized-form.html#java.time.chrono.Ser">dedicated serialized form</a>.
- * @serialData
- * <pre>
- * out.writeByte(1); // identifies a Chronology
- * out.writeUTF(getId());
- * </pre>
- *
- * @return the instance of {@code Ser}, not null
- */
- Object writeReplace() {
- return new Ser(Ser.CHRONO_TYPE, this);
- }
-
- /**
- * Defend against malicious streams.
- * @return never
- * @throws InvalidObjectException always
- */
- private Object readResolve() throws InvalidObjectException {
- throw new InvalidObjectException("Deserialization via serialization delegate");
- }
-
- /**
- * Write the Chronology id to the stream.
- * @param out the output stream
- * @throws IOException on any error during the write
- */
- void writeExternal(DataOutput out) throws IOException {
- out.writeUTF(getId());
- }
-
- /**
- * Reads the Chronology id and creates the Chronology.
- * @param in the input stream
- * @return the Chronology
- * @throws IOException on errors during the read
- * @throws DateTimeException if the Chronology cannot be returned
- */
- static Chronology readExternal(DataInput in) throws IOException {
- String id = in.readUTF();
- return Chronology.of(id);
- }
+ String toString();
}
diff --git a/jdk/src/share/classes/java/time/chrono/Era.java b/jdk/src/share/classes/java/time/chrono/Era.java
index 0fd31c9..ec65e3f 100644
--- a/jdk/src/share/classes/java/time/chrono/Era.java
+++ b/jdk/src/share/classes/java/time/chrono/Era.java
@@ -73,6 +73,7 @@
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.ValueRange;
import java.util.Locale;
@@ -110,11 +111,11 @@
* All fields, including eras, have an associated numeric value.
* The meaning of the numeric value for era is determined by the chronology
* according to these principles:
- * <p><ul>
+ * <ul>
* <li>The era in use at the epoch 1970-01-01 (ISO) has the value 1.
* <li>Later eras have sequentially higher values.
* <li>Earlier eras have sequentially lower values, which may be negative.
- * </ul><p>
+ * </ul>
*
* @return the numeric era value
*/
@@ -265,7 +266,7 @@
@SuppressWarnings("unchecked")
@Override
default <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.precision()) {
+ if (query == TemporalQueries.precision()) {
return (R) ERAS;
}
return TemporalAccessor.super.query(query);
diff --git a/jdk/src/share/classes/java/time/chrono/HijrahChronology.java b/jdk/src/share/classes/java/time/chrono/HijrahChronology.java
index 7d44858..277b101 100644
--- a/jdk/src/share/classes/java/time/chrono/HijrahChronology.java
+++ b/jdk/src/share/classes/java/time/chrono/HijrahChronology.java
@@ -214,7 +214,7 @@
*
* @since 1.8
*/
-public final class HijrahChronology extends Chronology implements Serializable {
+public final class HijrahChronology extends AbstractChronology implements Serializable {
/**
* The Hijrah Calendar id.
@@ -308,8 +308,8 @@
try {
INSTANCE = new HijrahChronology("Hijrah-umalqura");
// Register it by its aliases
- Chronology.registerChrono(INSTANCE, "Hijrah");
- Chronology.registerChrono(INSTANCE, "islamic");
+ AbstractChronology.registerChrono(INSTANCE, "Hijrah");
+ AbstractChronology.registerChrono(INSTANCE, "islamic");
} catch (DateTimeException ex) {
// Absence of Hijrah calendar is fatal to initializing this class.
PlatformLogger logger = PlatformLogger.getLogger("java.time.chrono");
@@ -336,7 +336,7 @@
try {
// Create and register the variant
HijrahChronology chrono = new HijrahChronology(id);
- Chronology.registerChrono(chrono);
+ AbstractChronology.registerChrono(chrono);
} catch (DateTimeException ex) {
// Log error and continue
PlatformLogger logger = PlatformLogger.getLogger("java.time.chrono");
diff --git a/jdk/src/share/classes/java/time/chrono/IsoChronology.java b/jdk/src/share/classes/java/time/chrono/IsoChronology.java
index 9638f6e..d45b042 100644
--- a/jdk/src/share/classes/java/time/chrono/IsoChronology.java
+++ b/jdk/src/share/classes/java/time/chrono/IsoChronology.java
@@ -100,7 +100,7 @@
* <i>de facto</i> world calendar.
* <p>
* The fields are defined as follows:
- * <p><ul>
+ * <ul>
* <li>era - There are two eras, 'Current Era' (CE) and 'Before Current Era' (BCE).
* <li>year-of-era - The year-of-era is the same as the proleptic-year for the current CE era.
* For the BCE era before the ISO epoch the year increases from 1 upwards as time goes backwards.
@@ -113,14 +113,14 @@
* <li>day-of-year - There are 365 days in a standard ISO year and 366 in a leap year.
* The days are numbered from 1 to 365 or 1 to 366.
* <li>leap-year - Leap years occur every 4 years, except where the year is divisble by 100 and not divisble by 400.
- * </ul><p>
+ * </ul>
*
* @implSpec
* This class is immutable and thread-safe.
*
* @since 1.8
*/
-public final class IsoChronology extends Chronology implements Serializable {
+public final class IsoChronology extends AbstractChronology implements Serializable {
/**
* Singleton instance of the ISO chronology.
diff --git a/jdk/src/share/classes/java/time/chrono/IsoEra.java b/jdk/src/share/classes/java/time/chrono/IsoEra.java
index 15fa2e4..bd29969 100644
--- a/jdk/src/share/classes/java/time/chrono/IsoEra.java
+++ b/jdk/src/share/classes/java/time/chrono/IsoEra.java
@@ -69,7 +69,7 @@
* The ISO-8601 standard does not define eras.
* A definition has therefore been created with two eras - 'Current era' (CE) for
* years on or after 0001-01-01 (ISO), and 'Before current era' (BCE) for years before that.
- * <p>
+ *
* <table summary="ISO years and eras" cellpadding="2" cellspacing="3" border="0" >
* <thead>
* <tr class="tableSubHeadingColor">
diff --git a/jdk/src/share/classes/java/time/chrono/JapaneseChronology.java b/jdk/src/share/classes/java/time/chrono/JapaneseChronology.java
index b01707e..41aa39a 100644
--- a/jdk/src/share/classes/java/time/chrono/JapaneseChronology.java
+++ b/jdk/src/share/classes/java/time/chrono/JapaneseChronology.java
@@ -56,8 +56,6 @@
*/
package java.time.chrono;
-import java.io.InvalidObjectException;
-import java.io.ObjectStreamException;
import static java.time.temporal.ChronoField.DAY_OF_MONTH;
import static java.time.temporal.ChronoField.DAY_OF_YEAR;
import static java.time.temporal.ChronoField.ERA;
@@ -67,6 +65,7 @@
import static java.time.temporal.ChronoUnit.DAYS;
import static java.time.temporal.ChronoUnit.MONTHS;
+import java.io.InvalidObjectException;
import java.io.Serializable;
import java.time.Clock;
import java.time.DateTimeException;
@@ -77,7 +76,7 @@
import java.time.format.ResolverStyle;
import java.time.temporal.ChronoField;
import java.time.temporal.TemporalAccessor;
-import java.time.temporal.TemporalAdjuster;
+import java.time.temporal.TemporalAdjusters;
import java.time.temporal.TemporalField;
import java.time.temporal.UnsupportedTemporalTypeException;
import java.time.temporal.ValueRange;
@@ -120,7 +119,7 @@
*
* @since 1.8
*/
-public final class JapaneseChronology extends Chronology implements Serializable {
+public final class JapaneseChronology extends AbstractChronology implements Serializable {
static final LocalGregorianCalendar JCAL =
(LocalGregorianCalendar) CalendarSystem.forName("japanese");
@@ -480,7 +479,7 @@
try {
result = date(y, moy, dom);
} catch (DateTimeException ex) {
- result = date(y, moy, 1).with(TemporalAdjuster.lastDayOfMonth());
+ result = date(y, moy, 1).with(TemporalAdjusters.lastDayOfMonth());
}
// handle the era being changed
// only allow if the new date is in the same Jan-Dec as the era change
diff --git a/jdk/src/share/classes/java/time/chrono/MinguoChronology.java b/jdk/src/share/classes/java/time/chrono/MinguoChronology.java
index db75a86..8e26f7d 100644
--- a/jdk/src/share/classes/java/time/chrono/MinguoChronology.java
+++ b/jdk/src/share/classes/java/time/chrono/MinguoChronology.java
@@ -85,7 +85,7 @@
* Dates are aligned such that {@code 0001-01-01 (Minguo)} is {@code 1912-01-01 (ISO)}.
* <p>
* The fields are defined as follows:
- * <p><ul>
+ * <ul>
* <li>era - There are two eras, the current 'Republic' (ERA_ROC) and the previous era (ERA_BEFORE_ROC).
* <li>year-of-era - The year-of-era for the current era increases uniformly from the epoch at year one.
* For the previous era the year increases from one as time goes backwards.
@@ -98,14 +98,14 @@
* <li>day-of-year - The Minguo day-of-year exactly matches ISO.
* <li>leap-year - The Minguo leap-year pattern exactly matches ISO, such that the two calendars
* are never out of step.
- * </ul><p>
+ * </ul>
*
* @implSpec
* This class is immutable and thread-safe.
*
* @since 1.8
*/
-public final class MinguoChronology extends Chronology implements Serializable {
+public final class MinguoChronology extends AbstractChronology implements Serializable {
/**
* Singleton instance for the Minguo chronology.
diff --git a/jdk/src/share/classes/java/time/chrono/MinguoEra.java b/jdk/src/share/classes/java/time/chrono/MinguoEra.java
index 6bfdab2..fd96de1 100644
--- a/jdk/src/share/classes/java/time/chrono/MinguoEra.java
+++ b/jdk/src/share/classes/java/time/chrono/MinguoEra.java
@@ -70,7 +70,7 @@
* The current era, for years from 1 onwards, is known as the 'Republic of China' era.
* All previous years, zero or earlier in the proleptic count or one and greater
* in the year-of-era count, are part of the 'Before Republic of China' era.
- * <p>
+ *
* <table summary="Minguo years and eras" cellpadding="2" cellspacing="3" border="0" >
* <thead>
* <tr class="tableSubHeadingColor">
diff --git a/jdk/src/share/classes/java/time/chrono/Ser.java b/jdk/src/share/classes/java/time/chrono/Ser.java
index 5a4e3c1..317a769 100644
--- a/jdk/src/share/classes/java/time/chrono/Ser.java
+++ b/jdk/src/share/classes/java/time/chrono/Ser.java
@@ -161,7 +161,7 @@
out.writeByte(type);
switch (type) {
case CHRONO_TYPE:
- ((Chronology) object).writeExternal(out);
+ ((AbstractChronology) object).writeExternal(out);
break;
case CHRONO_LOCAL_DATE_TIME_TYPE:
((ChronoLocalDateTimeImpl<?>) object).writeExternal(out);
@@ -231,7 +231,7 @@
private static Object readInternal(byte type, ObjectInput in) throws IOException, ClassNotFoundException {
switch (type) {
- case CHRONO_TYPE: return Chronology.readExternal(in);
+ case CHRONO_TYPE: return AbstractChronology.readExternal(in);
case CHRONO_LOCAL_DATE_TIME_TYPE: return ChronoLocalDateTimeImpl.readExternal(in);
case CHRONO_ZONE_DATE_TIME_TYPE: return ChronoZonedDateTimeImpl.readExternal(in);
case JAPANESE_DATE_TYPE: return JapaneseDate.readExternal(in);
diff --git a/jdk/src/share/classes/java/time/chrono/ThaiBuddhistChronology.java b/jdk/src/share/classes/java/time/chrono/ThaiBuddhistChronology.java
index 4ffd15b..2ef5793 100644
--- a/jdk/src/share/classes/java/time/chrono/ThaiBuddhistChronology.java
+++ b/jdk/src/share/classes/java/time/chrono/ThaiBuddhistChronology.java
@@ -86,7 +86,7 @@
* Dates are aligned such that {@code 2484-01-01 (Buddhist)} is {@code 1941-01-01 (ISO)}.
* <p>
* The fields are defined as follows:
- * <p><ul>
+ * <ul>
* <li>era - There are two eras, the current 'Buddhist' (ERA_BE) and the previous era (ERA_BEFORE_BE).
* <li>year-of-era - The year-of-era for the current era increases uniformly from the epoch at year one.
* For the previous era the year increases from one as time goes backwards.
@@ -99,14 +99,14 @@
* <li>day-of-year - The ThaiBuddhist day-of-year exactly matches ISO.
* <li>leap-year - The ThaiBuddhist leap-year pattern exactly matches ISO, such that the two calendars
* are never out of step.
- * </ul><p>
+ * </ul>
*
* @implSpec
* This class is immutable and thread-safe.
*
* @since 1.8
*/
-public final class ThaiBuddhistChronology extends Chronology implements Serializable {
+public final class ThaiBuddhistChronology extends AbstractChronology implements Serializable {
/**
* Singleton instance of the Buddhist chronology.
diff --git a/jdk/src/share/classes/java/time/chrono/ThaiBuddhistEra.java b/jdk/src/share/classes/java/time/chrono/ThaiBuddhistEra.java
index c549229..e3e6e86 100644
--- a/jdk/src/share/classes/java/time/chrono/ThaiBuddhistEra.java
+++ b/jdk/src/share/classes/java/time/chrono/ThaiBuddhistEra.java
@@ -70,7 +70,7 @@
* The current era, for years from 1 onwards, is known as the 'Buddhist' era.
* All previous years, zero or earlier in the proleptic count or one and greater
* in the year-of-era count, are part of the 'Before Buddhist' era.
- * <p>
+ *
* <table summary="Buddhist years and eras" cellpadding="2" cellspacing="3" border="0" >
* <thead>
* <tr class="tableSubHeadingColor">
diff --git a/jdk/src/share/classes/java/time/format/DateTimeFormatter.java b/jdk/src/share/classes/java/time/format/DateTimeFormatter.java
index 0c0a597..4109d20 100644
--- a/jdk/src/share/classes/java/time/format/DateTimeFormatter.java
+++ b/jdk/src/share/classes/java/time/format/DateTimeFormatter.java
@@ -146,7 +146,7 @@
* Some applications may need to use the older {@link Format java.text.Format}
* class for formatting. The {@link #toFormat()} method returns an
* implementation of {@code java.text.Format}.
- * <p>
+ *
* <h3 id="predefined">Predefined Formatters</h3>
* <table summary="Predefined Formatters" cellpadding="2" cellspacing="3" border="0" >
* <thead>
@@ -460,7 +460,7 @@
* <li>The {@code ChronoField} time fields are resolved.
* This is documented on {@link ChronoField} and is the same for all chronologies.
* <li>Any fields that are not {@code ChronoField} are processed.
- * This is achieved using {@link TemporalField#resolve(Map, Chronology, ZoneId, ResolverStyle)}.
+ * This is achieved using {@link TemporalField#resolve(Map, TemporalAccessor, ResolverStyle)}.
* Documentation about field resolution is located in the implementation
* of {@code TemporalField}.
* <li>The {@code ChronoField} date and time fields are re-resolved.
@@ -684,7 +684,7 @@
* This returns an immutable formatter capable of formatting and parsing
* the ISO-8601 extended local date format.
* The format consists of:
- * <p><ul>
+ * <ul>
* <li>Four digits or more for the {@link ChronoField#YEAR year}.
* Years in the range 0000 to 9999 will be pre-padded by zero to ensure four digits.
* Years outside that range will have a prefixed positive or negative symbol.
@@ -719,7 +719,7 @@
* This returns an immutable formatter capable of formatting and parsing
* the ISO-8601 extended offset date format.
* The format consists of:
- * <p><ul>
+ * <ul>
* <li>The {@link #ISO_LOCAL_DATE}
* <li>The {@link ZoneOffset#getId() offset ID}. If the offset has seconds then
* they will be handled even though this is not part of the ISO-8601 standard.
@@ -747,7 +747,7 @@
* This returns an immutable formatter capable of formatting and parsing
* the ISO-8601 extended date format.
* The format consists of:
- * <p><ul>
+ * <ul>
* <li>The {@link #ISO_LOCAL_DATE}
* <li>If the offset is not available then the format is complete.
* <li>The {@link ZoneOffset#getId() offset ID}. If the offset has seconds then
@@ -780,7 +780,7 @@
* This returns an immutable formatter capable of formatting and parsing
* the ISO-8601 extended local time format.
* The format consists of:
- * <p><ul>
+ * <ul>
* <li>Two digits for the {@link ChronoField#HOUR_OF_DAY hour-of-day}.
* This is pre-padded by zero to ensure two digits.
* <li>A colon
@@ -821,7 +821,7 @@
* This returns an immutable formatter capable of formatting and parsing
* the ISO-8601 extended offset time format.
* The format consists of:
- * <p><ul>
+ * <ul>
* <li>The {@link #ISO_LOCAL_TIME}
* <li>The {@link ZoneOffset#getId() offset ID}. If the offset has seconds then
* they will be handled even though this is not part of the ISO-8601 standard.
@@ -848,7 +848,7 @@
* This returns an immutable formatter capable of formatting and parsing
* the ISO-8601 extended offset time format.
* The format consists of:
- * <p><ul>
+ * <ul>
* <li>The {@link #ISO_LOCAL_TIME}
* <li>If the offset is not available then the format is complete.
* <li>The {@link ZoneOffset#getId() offset ID}. If the offset has seconds then
@@ -880,7 +880,7 @@
* This returns an immutable formatter capable of formatting and parsing
* the ISO-8601 extended offset date-time format.
* The format consists of:
- * <p><ul>
+ * <ul>
* <li>The {@link #ISO_LOCAL_DATE}
* <li>The letter 'T'. Parsing is case insensitive.
* <li>The {@link #ISO_LOCAL_TIME}
@@ -908,7 +908,7 @@
* This returns an immutable formatter capable of formatting and parsing
* the ISO-8601 extended offset date-time format.
* The format consists of:
- * <p><ul>
+ * <ul>
* <li>The {@link #ISO_LOCAL_DATE_TIME}
* <li>The {@link ZoneOffset#getId() offset ID}. If the offset has seconds then
* they will be handled even though this is not part of the ISO-8601 standard.
@@ -938,7 +938,7 @@
* to add the time-zone.
* The section in square brackets is not part of the ISO-8601 standard.
* The format consists of:
- * <p><ul>
+ * <ul>
* <li>The {@link #ISO_OFFSET_DATE_TIME}
* <li>If the zone ID is not available or is a {@code ZoneOffset} then the format is complete.
* <li>An open square bracket '['.
@@ -973,7 +973,7 @@
* the ISO-8601 extended local or offset date-time format, as well as the
* extended non-ISO form specifying the time-zone.
* The format consists of:
- * <p><ul>
+ * <ul>
* <li>The {@link #ISO_LOCAL_DATE_TIME}
* <li>If the offset is not available to format or parse then the format is complete.
* <li>The {@link ZoneOffset#getId() offset ID}. If the offset has seconds then
@@ -1014,7 +1014,7 @@
* This returns an immutable formatter capable of formatting and parsing
* the ISO-8601 extended ordinal date format.
* The format consists of:
- * <p><ul>
+ * <ul>
* <li>Four digits or more for the {@link ChronoField#YEAR year}.
* Years in the range 0000 to 9999 will be pre-padded by zero to ensure four digits.
* Years outside that range will have a prefixed positive or negative symbol.
@@ -1054,7 +1054,7 @@
* This returns an immutable formatter capable of formatting and parsing
* the ISO-8601 extended week-based date format.
* The format consists of:
- * <p><ul>
+ * <ul>
* <li>Four digits or more for the {@link IsoFields#WEEK_BASED_YEAR week-based-year}.
* Years in the range 0000 to 9999 will be pre-padded by zero to ensure four digits.
* Years outside that range will have a prefixed positive or negative symbol.
@@ -1114,7 +1114,7 @@
* a suitable conversion using {@code ZoneOffset.UTC}.
* <p>
* The format consists of:
- * <p><ul>
+ * <ul>
* <li>The {@link #ISO_OFFSET_DATE_TIME} where the instant is converted from
* {@link ChronoField#INSTANT_SECONDS} and {@link ChronoField#NANO_OF_SECOND}
* using the {@code UTC} offset. Parsing is case insensitive.
@@ -1139,7 +1139,7 @@
* This returns an immutable formatter capable of formatting and parsing
* the ISO-8601 basic local date format.
* The format consists of:
- * <p><ul>
+ * <ul>
* <li>Four digits for the {@link ChronoField#YEAR year}.
* Only years in the range 0000 to 9999 are supported.
* <li>Two digits for the {@link ChronoField#MONTH_OF_YEAR month-of-year}.
@@ -1183,7 +1183,7 @@
* names, only 'GMT' and offset amounts.
* <p>
* The format consists of:
- * <p><ul>
+ * <ul>
* <li>If the day-of-week is not available to format or parse then jump to day-of-month.
* <li>Three letter {@link ChronoField#DAY_OF_WEEK day-of-week} in English.
* <li>A comma
@@ -1274,11 +1274,11 @@
* a non-null period, with a zero period returned instead of null.
* <p>
* There are two situations where this query may return a non-zero period.
- * <p><ul>
+ * <ul>
* <li>If the {@code ResolverStyle} is {@code LENIENT} and a time is parsed
* without a date, then the complete result of the parse consists of a
* {@code LocalTime} and an excess {@code Period} in days.
- * <p>
+ *
* <li>If the {@code ResolverStyle} is {@code SMART} and a time is parsed
* without a date where the time is 24:00:00, then the complete result of
* the parse consists of a {@code LocalTime} of 00:00:00 and an excess
diff --git a/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java b/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java
index f4983b4..29792b8 100644
--- a/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java
+++ b/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java
@@ -78,9 +78,11 @@
import java.text.ParsePosition;
import java.time.DateTimeException;
import java.time.Instant;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
+import java.time.chrono.ChronoLocalDate;
import java.time.chrono.Chronology;
import java.time.chrono.IsoChronology;
import java.time.format.DateTimeTextProvider.LocaleStore;
@@ -88,6 +90,7 @@
import java.time.temporal.IsoFields;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.ValueRange;
import java.time.temporal.WeekFields;
@@ -122,7 +125,7 @@
* All date-time formatters are created ultimately using this builder.
* <p>
* The basic elements of date-time can all be added:
- * <p><ul>
+ * <ul>
* <li>Value - a numeric value</li>
* <li>Fraction - a fractional value including the decimal place. Always use this when
* outputting fractions to ensure that the fraction is parsed correctly</li>
@@ -135,7 +138,7 @@
* <li>Literal - a text literal</li>
* <li>Nested and Optional - formats can be nested or made optional</li>
* <li>Other - the printer and parser interfaces can be used to add user supplied formatting</li>
- * </ul><p>
+ * </ul>
* In addition, any of the elements may be decorated by padding, either with spaces or any other character.
* <p>
* Finally, a shorthand pattern, mostly compatible with {@code java.text.SimpleDateFormat SimpleDateFormat}
@@ -153,7 +156,7 @@
* Query for a time-zone that is region-only.
*/
private static final TemporalQuery<ZoneId> QUERY_REGION_ONLY = (temporal) -> {
- ZoneId zone = temporal.query(TemporalQuery.zoneId());
+ ZoneId zone = temporal.query(TemporalQueries.zoneId());
return (zone != null && zone instanceof ZoneOffset == false ? zone : null);
};
@@ -499,51 +502,16 @@
//-----------------------------------------------------------------------
/**
- * Appends the reduced value of a date-time field with fixed width to the formatter.
+ * Appends the reduced value of a date-time field to the formatter.
* <p>
- * This is typically used for formatting and parsing a two digit year.
- * The {@code width} is the printed and parsed width.
- * The {@code baseValue} is used during parsing to determine the valid range.
- * <p>
- * For formatting, the width is used to determine the number of characters to format.
- * The rightmost characters are output to match the width, left padding with zero.
- * <p>
- * For strict parsing, the number of characters allowed by the width are parsed.
- * For lenient parsing, the number of characters must be at least 1 and less than 10.
- * If the number of digits parsed is equal to {@code width} and the value is positive,
- * the value of the field is computed to be the first number greater than
- * or equal to the {@code baseValue} with the same least significant characters,
- * otherwise the value parsed is the field value.
- * This allows a reduced value to be entered for values in range of the baseValue
- * and width and absolute values can be entered for values outside the range.
- * <p>
- * For example, a base value of {@code 1980} and a width of {@code 2} will have
- * valid values from {@code 1980} to {@code 2079}.
- * During parsing, the text {@code "12"} will result in the value {@code 2012} as that
- * is the value within the range where the last two characters are "12".
- * Compare with lenient parsing the text {@code "1915"} that will result in the
- * value {@code 1915}.
- *
- * @param field the field to append, not null
- * @param width the field width of the printed and parsed field, from 1 to 10
- * @param baseValue the base value of the range of valid values
- * @return this, for chaining, not null
- * @throws IllegalArgumentException if the width or base value is invalid
- * @see #appendValueReduced(java.time.temporal.TemporalField, int, int, int)
- */
- public DateTimeFormatterBuilder appendValueReduced(TemporalField field,
- int width, int baseValue) {
- return appendValueReduced(field, width, width, baseValue);
- }
-
- /**
- * Appends the reduced value of a date-time field with a flexible width to the formatter.
- * <p>
- * This is typically used for formatting and parsing a two digit year
- * but allowing for the year value to be up to maxWidth.
+ * Since fields such as year vary by chronology, it is recommended to use the
+ * {@link #appendValueReduced(TemporalField, int, int, ChronoLocalDate)} date}
+ * variant of this method in most cases. This variant is suitable for
+ * simple fields or working with only the ISO chronology.
* <p>
* For formatting, the {@code width} and {@code maxWidth} are used to
* determine the number of characters to format.
+ * If they are equal then the format is fixed width.
* If the value of the field is within the range of the {@code baseValue} using
* {@code width} characters then the reduced value is formatted otherwise the value is
* truncated to fit {@code maxWidth}.
@@ -562,8 +530,7 @@
* valid values from {@code 1980} to {@code 2079}.
* During parsing, the text {@code "12"} will result in the value {@code 2012} as that
* is the value within the range where the last two characters are "12".
- * Compare with parsing the text {@code "1915"} that will result in the
- * value {@code 1915}.
+ * By contrast, parsing the text {@code "1915"} will result in the value {@code 1915}.
*
* @param field the field to append, not null
* @param width the field width of the printed and parsed field, from 1 to 10
@@ -575,7 +542,67 @@
public DateTimeFormatterBuilder appendValueReduced(TemporalField field,
int width, int maxWidth, int baseValue) {
Objects.requireNonNull(field, "field");
- ReducedPrinterParser pp = new ReducedPrinterParser(field, width, maxWidth, baseValue);
+ ReducedPrinterParser pp = new ReducedPrinterParser(field, width, maxWidth, baseValue, null);
+ appendValue(pp);
+ return this;
+ }
+
+ /**
+ * Appends the reduced value of a date-time field to the formatter.
+ * <p>
+ * This is typically used for formatting and parsing a two digit year.
+ * <p>
+ * The base date is used to calculate the full value during parsing.
+ * For example, if the base date is 1950-01-01 then parsed values for
+ * a two digit year parse will be in the range 1950-01-01 to 2049-12-31.
+ * Only the year would be extracted from the date, thus a base date of
+ * 1950-08-25 would also parse to the range 1950-01-01 to 2049-12-31.
+ * This behaviour is necessary to support fields such as week-based-year
+ * or other calendar systems where the parsed value does not align with
+ * standard ISO years.
+ * <p>
+ * The exact behavior is as follows. Parse the full set of fields and
+ * determine the effective chronology. Then convert the base date to the
+ * effective chronology. Then extract the specified field from the
+ * chronology-specific base date and use it to determine the
+ * {@code baseValue} used below.
+ * <p>
+ * For formatting, the {@code width} and {@code maxWidth} are used to
+ * determine the number of characters to format.
+ * If they are equal then the format is fixed width.
+ * If the value of the field is within the range of the {@code baseValue} using
+ * {@code width} characters then the reduced value is formatted otherwise the value is
+ * truncated to fit {@code maxWidth}.
+ * The rightmost characters are output to match the width, left padding with zero.
+ * <p>
+ * For strict parsing, the number of characters allowed by {@code width} to {@code maxWidth} are parsed.
+ * For lenient parsing, the number of characters must be at least 1 and less than 10.
+ * If the number of digits parsed is equal to {@code width} and the value is positive,
+ * the value of the field is computed to be the first number greater than
+ * or equal to the {@code baseValue} with the same least significant characters,
+ * otherwise the value parsed is the field value.
+ * This allows a reduced value to be entered for values in range of the baseValue
+ * and width and absolute values can be entered for values outside the range.
+ * <p>
+ * For example, a base value of {@code 1980} and a width of {@code 2} will have
+ * valid values from {@code 1980} to {@code 2079}.
+ * During parsing, the text {@code "12"} will result in the value {@code 2012} as that
+ * is the value within the range where the last two characters are "12".
+ * By contrast, parsing the text {@code "1915"} will result in the value {@code 1915}.
+ *
+ * @param field the field to append, not null
+ * @param width the field width of the printed and parsed field, from 1 to 10
+ * @param maxWidth the maximum field width of the printed field, from 1 to 10
+ * @param baseDate the base date used to calculate the base value for the range
+ * of valid values in the parsed chronology, not null
+ * @return this, for chaining, not null
+ * @throws IllegalArgumentException if the width or base value is invalid
+ */
+ public DateTimeFormatterBuilder appendValueReduced(
+ TemporalField field, int width, int maxWidth, ChronoLocalDate baseDate) {
+ Objects.requireNonNull(field, "field");
+ Objects.requireNonNull(baseDate, "baseDate");
+ ReducedPrinterParser pp = new ReducedPrinterParser(field, width, maxWidth, 0, baseDate);
appendValue(pp);
return this;
}
@@ -851,7 +878,7 @@
* This appends an instruction to format/parse the offset ID to the builder.
* <p>
* During formatting, the offset is obtained using a mechanism equivalent
- * to querying the temporal with {@link TemporalQuery#offset()}.
+ * to querying the temporal with {@link TemporalQueries#offset()}.
* It will be printed using the format defined below.
* If the offset cannot be obtained then an exception is thrown unless the
* section of the formatter is optional.
@@ -862,7 +889,7 @@
* <p>
* The format of the offset is controlled by a pattern which must be one
* of the following:
- * <p><ul>
+ * <ul>
* <li>{@code +HH} - hour only, ignoring minute and second
* <li>{@code +HHmm} - hour, with minute if non-zero, ignoring second, no colon
* <li>{@code +HH:mm} - hour, with minute if non-zero, ignoring second, with colon
@@ -872,7 +899,7 @@
* <li>{@code +HH:MM:ss} - hour and minute, with second if non-zero, with colon
* <li>{@code +HHMMSS} - hour, minute and second, no colon
* <li>{@code +HH:MM:SS} - hour, minute and second, with colon
- * </ul><p>
+ * </ul>
* The "no offset" text controls what text is printed when the total amount of
* the offset fields to be output is zero.
* Example values would be 'Z', '+00:00', 'UTC' or 'GMT'.
@@ -894,17 +921,17 @@
* This appends a localized zone offset to the builder, the format of the
* localized offset is controlled by the specified {@link FormatStyle style}
* to this method:
- * <p><ul>
+ * <ul>
* <li>{@link TextStyle#FULL full} - formats with localized offset text, such
* as 'GMT, 2-digit hour and minute field, optional second field if non-zero,
* and colon.
* <li>{@link TextStyle#SHORT short} - formats with localized offset text,
* such as 'GMT, hour without leading zero, optional 2-digit minute and
* second if non-zero, and colon.
- * </ul><p>
+ * </ul>
* <p>
* During formatting, the offset is obtained using a mechanism equivalent
- * to querying the temporal with {@link TemporalQuery#offset()}.
+ * to querying the temporal with {@link TemporalQueries#offset()}.
* If the offset cannot be obtained then an exception is thrown unless the
* section of the formatter is optional.
* <p>
@@ -936,7 +963,7 @@
* for use with this method, see {@link #appendZoneOrOffsetId()}.
* <p>
* During formatting, the zone is obtained using a mechanism equivalent
- * to querying the temporal with {@link TemporalQuery#zoneId()}.
+ * to querying the temporal with {@link TemporalQueries#zoneId()}.
* It will be printed using the result of {@link ZoneId#getId()}.
* If the zone cannot be obtained then an exception is thrown unless the
* section of the formatter is optional.
@@ -974,7 +1001,7 @@
* @see #appendZoneRegionId()
*/
public DateTimeFormatterBuilder appendZoneId() {
- appendInternal(new ZoneIdPrinterParser(TemporalQuery.zoneId(), "ZoneId()"));
+ appendInternal(new ZoneIdPrinterParser(TemporalQueries.zoneId(), "ZoneId()"));
return this;
}
@@ -986,7 +1013,7 @@
* only if it is a region-based ID.
* <p>
* During formatting, the zone is obtained using a mechanism equivalent
- * to querying the temporal with {@link TemporalQuery#zoneId()}.
+ * to querying the temporal with {@link TemporalQueries#zoneId()}.
* If the zone is a {@code ZoneOffset} or it cannot be obtained then
* an exception is thrown unless the section of the formatter is optional.
* If the zone is not an offset, then the zone will be printed using
@@ -1045,7 +1072,7 @@
* then attempts to find an offset, such as that on {@code OffsetDateTime}.
* <p>
* During formatting, the zone is obtained using a mechanism equivalent
- * to querying the temporal with {@link TemporalQuery#zone()}.
+ * to querying the temporal with {@link TemporalQueries#zone()}.
* It will be printed using the result of {@link ZoneId#getId()}.
* If the zone cannot be obtained then an exception is thrown unless the
* section of the formatter is optional.
@@ -1086,7 +1113,7 @@
* @see #appendZoneId()
*/
public DateTimeFormatterBuilder appendZoneOrOffsetId() {
- appendInternal(new ZoneIdPrinterParser(TemporalQuery.zone(), "ZoneOrOffsetId()"));
+ appendInternal(new ZoneIdPrinterParser(TemporalQueries.zone(), "ZoneOrOffsetId()"));
return this;
}
@@ -1097,7 +1124,7 @@
* the builder.
* <p>
* During formatting, the zone is obtained using a mechanism equivalent
- * to querying the temporal with {@link TemporalQuery#zoneId()}.
+ * to querying the temporal with {@link TemporalQueries#zoneId()}.
* If the zone is a {@code ZoneOffset} it will be printed using the
* result of {@link ZoneOffset#getId()}.
* If the zone is not an offset, the textual name will be looked up
@@ -1133,7 +1160,7 @@
* the builder.
* <p>
* During formatting, the zone is obtained using a mechanism equivalent
- * to querying the temporal with {@link TemporalQuery#zoneId()}.
+ * to querying the temporal with {@link TemporalQueries#zoneId()}.
* If the zone is a {@code ZoneOffset} it will be printed using the
* result of {@link ZoneOffset#getId()}.
* If the zone is not an offset, the textual name will be looked up
@@ -1176,7 +1203,7 @@
* This appends an instruction to format/parse the chronology ID to the builder.
* <p>
* During formatting, the chronology is obtained using a mechanism equivalent
- * to querying the temporal with {@link TemporalQuery#chronology()}.
+ * to querying the temporal with {@link TemporalQueries#chronology()}.
* It will be printed using the result of {@link Chronology#getId()}.
* If the chronology cannot be obtained then an exception is thrown unless the
* section of the formatter is optional.
@@ -1217,12 +1244,12 @@
* This appends a localized section to the builder, suitable for outputting
* a date, time or date-time combination. The format of the localized
* section is lazily looked up based on four items:
- * <p><ul>
+ * <ul>
* <li>the {@code dateStyle} specified to this method
* <li>the {@code timeStyle} specified to this method
* <li>the {@code Locale} of the {@code DateTimeFormatter}
* <li>the {@code Chronology}, selecting the best available
- * </ul><p>
+ * </ul>
* During formatting, the chronology is obtained from the temporal object
* being formatted, which may have been overridden by
* {@link DateTimeFormatter#withChronology(Chronology)}.
@@ -1682,7 +1709,7 @@
case 'u':
case 'y':
if (count == 2) {
- appendValueReduced(field, 2, 2000);
+ appendValueReduced(field, 2, 2, ReducedPrinterParser.BASE_DATE);
} else if (count < 4) {
appendValue(field, count, 19, SignStyle.NORMAL);
} else {
@@ -2516,7 +2543,7 @@
if (valueLong == null) {
return false;
}
- long value = getValue(valueLong);
+ long value = getValue(context, valueLong);
DecimalStyle decimalStyle = context.getDecimalStyle();
String str = (value == Long.MIN_VALUE ? "9223372036854775808" : Long.toString(Math.abs(value)));
if (str.length() > maxWidth) {
@@ -2560,10 +2587,11 @@
/**
* Gets the value to output.
*
- * @param value the base value of the field, not null
+ * @param context the context
+ * @param value the value of the field, not null
* @return the value
*/
- long getValue(long value) {
+ long getValue(DateTimePrintContext context, long value) {
return value;
}
@@ -2703,7 +2731,13 @@
* Prints and parses a reduced numeric date-time field.
*/
static final class ReducedPrinterParser extends NumberPrinterParser {
+ /**
+ * The base date for reduced value parsing.
+ */
+ static final LocalDate BASE_DATE = LocalDate.of(2000, 1, 1);
+
private final int baseValue;
+ private final ChronoLocalDate baseDate;
/**
* Constructor.
@@ -2712,10 +2746,11 @@
* @param minWidth the minimum field width, from 1 to 10
* @param maxWidth the maximum field width, from 1 to 10
* @param baseValue the base value
+ * @param baseDate the base date
*/
ReducedPrinterParser(TemporalField field, int minWidth, int maxWidth,
- int baseValue) {
- this(field, minWidth, maxWidth, baseValue, 0);
+ int baseValue, ChronoLocalDate baseDate) {
+ this(field, minWidth, maxWidth, baseValue, baseDate, 0);
if (minWidth < 1 || minWidth > 10) {
throw new IllegalArgumentException("The minWidth must be from 1 to 10 inclusive but was " + minWidth);
}
@@ -2726,11 +2761,13 @@
throw new IllegalArgumentException("Maximum width must exceed or equal the minimum width but " +
maxWidth + " < " + minWidth);
}
- if (field.range().isValidValue(baseValue) == false) {
- throw new IllegalArgumentException("The base value must be within the range of the field");
- }
- if ((((long) baseValue) + EXCEED_POINTS[maxWidth]) > Integer.MAX_VALUE) {
- throw new DateTimeException("Unable to add printer-parser as the range exceeds the capacity of an int");
+ if (baseDate == null) {
+ if (field.range().isValidValue(baseValue) == false) {
+ throw new IllegalArgumentException("The base value must be within the range of the field");
+ }
+ if ((((long) baseValue) + EXCEED_POINTS[maxWidth]) > Integer.MAX_VALUE) {
+ throw new DateTimeException("Unable to add printer-parser as the range exceeds the capacity of an int");
+ }
}
}
@@ -2742,17 +2779,24 @@
* @param minWidth the minimum field width, from 1 to 10
* @param maxWidth the maximum field width, from 1 to 10
* @param baseValue the base value
+ * @param baseDate the base date
* @param subsequentWidth the subsequentWidth for this instance
*/
private ReducedPrinterParser(TemporalField field, int minWidth, int maxWidth,
- int baseValue, int subsequentWidth) {
+ int baseValue, ChronoLocalDate baseDate, int subsequentWidth) {
super(field, minWidth, maxWidth, SignStyle.NOT_NEGATIVE, subsequentWidth);
this.baseValue = baseValue;
+ this.baseDate = baseDate;
}
@Override
- long getValue(long value) {
+ long getValue(DateTimePrintContext context, long value) {
long absValue = Math.abs(value);
+ int baseValue = this.baseValue;
+ if (baseDate != null) {
+ Chronology chrono = Chronology.from(context.getTemporal());
+ baseValue = chrono.date(baseDate).get(field);
+ }
if (value >= baseValue && value < baseValue + EXCEED_POINTS[minWidth]) {
// Use the reduced value if it fits in minWidth
return absValue % EXCEED_POINTS[minWidth];
@@ -2763,6 +2807,12 @@
@Override
int setValue(DateTimeParseContext context, long value, int errorPos, int successPos) {
+ int baseValue = this.baseValue;
+ if (baseDate != null) {
+ // TODO: effective chrono is inaccurate at this point
+ Chronology chrono = context.getEffectiveChronology();
+ baseValue = chrono.date(baseDate).get(field);
+ }
int parseLen = successPos - errorPos;
if (parseLen == minWidth && value >= 0) {
long range = EXCEED_POINTS[minWidth];
@@ -2773,7 +2823,7 @@
} else {
value = basePart - value;
}
- if (basePart != 0 && value < baseValue) {
+ if (value < baseValue) {
value += range;
}
}
@@ -2790,7 +2840,7 @@
if (subsequentWidth == -1) {
return this;
}
- return new ReducedPrinterParser(field, minWidth, maxWidth, baseValue, -1);
+ return new ReducedPrinterParser(field, minWidth, maxWidth, baseValue, baseDate, -1);
}
/**
@@ -2801,13 +2851,13 @@
*/
@Override
ReducedPrinterParser withSubsequentWidth(int subsequentWidth) {
- return new ReducedPrinterParser(field, minWidth, maxWidth, baseValue,
+ return new ReducedPrinterParser(field, minWidth, maxWidth, baseValue, baseDate,
this.subsequentWidth + subsequentWidth);
}
@Override
public String toString() {
- return "ReducedValue(" + field + "," + minWidth + "," + maxWidth + "," + baseValue + ")";
+ return "ReducedValue(" + field + "," + minWidth + "," + maxWidth + "," + (baseDate != null ? baseDate : baseValue) + ")";
}
}
@@ -3013,7 +3063,7 @@
return false;
}
String text;
- Chronology chrono = context.getTemporal().query(TemporalQuery.chronology());
+ Chronology chrono = context.getTemporal().query(TemporalQueries.chronology());
if (chrono == null || chrono == IsoChronology.INSTANCE) {
text = provider.getText(field, value, textStyle, context.getLocale());
} else {
@@ -3541,7 +3591,7 @@
private Set<String> preferredZones;
ZoneTextPrinterParser(TextStyle textStyle, Set<ZoneId> preferredZones) {
- super(TemporalQuery.zone(), "ZoneText(" + textStyle + ")");
+ super(TemporalQueries.zone(), "ZoneText(" + textStyle + ")");
this.textStyle = Objects.requireNonNull(textStyle, "textStyle");
if (preferredZones != null && preferredZones.size() != 0) {
this.preferredZones = new HashSet<>();
@@ -3598,7 +3648,7 @@
@Override
public boolean format(DateTimePrintContext context, StringBuilder buf) {
- ZoneId zone = context.getValue(TemporalQuery.zoneId());
+ ZoneId zone = context.getValue(TemporalQueries.zoneId());
if (zone == null) {
return false;
}
@@ -4179,7 +4229,7 @@
@Override
public boolean format(DateTimePrintContext context, StringBuilder buf) {
- Chronology chrono = context.getValue(TemporalQuery.chronology());
+ Chronology chrono = context.getValue(TemporalQueries.chronology());
if (chrono == null) {
return false;
}
@@ -4351,7 +4401,7 @@
case 'Y':
field = weekDef.weekBasedYear();
if (count == 2) {
- return new ReducedPrinterParser(field, 2, 2, 2000, 0);
+ return new ReducedPrinterParser(field, 2, 2, 0, ReducedPrinterParser.BASE_DATE, 0);
} else {
return new NumberPrinterParser(field, count, 19,
(count < 4) ? SignStyle.NORMAL : SignStyle.EXCEEDS_PAD, -1);
@@ -4380,7 +4430,7 @@
if (count == 1) {
sb.append("WeekBasedYear");
} else if (count == 2) {
- sb.append("ReducedValue(WeekBasedYear,2,2000)");
+ sb.append("ReducedValue(WeekBasedYear,2,2,2000-01-01)");
} else {
sb.append("WeekBasedYear,").append(count).append(",")
.append(19).append(",")
diff --git a/jdk/src/share/classes/java/time/format/DateTimePrintContext.java b/jdk/src/share/classes/java/time/format/DateTimePrintContext.java
index e744bb7..543a317 100644
--- a/jdk/src/share/classes/java/time/format/DateTimePrintContext.java
+++ b/jdk/src/share/classes/java/time/format/DateTimePrintContext.java
@@ -75,6 +75,7 @@
import java.time.temporal.ChronoField;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.ValueRange;
import java.util.Locale;
@@ -128,8 +129,8 @@
}
// ensure minimal change (early return is an optimization)
- Chronology temporalChrono = temporal.query(TemporalQuery.chronology());
- ZoneId temporalZone = temporal.query(TemporalQuery.zoneId());
+ Chronology temporalChrono = temporal.query(TemporalQueries.chronology());
+ ZoneId temporalZone = temporal.query(TemporalQueries.zoneId());
if (Objects.equals(overrideChrono, temporalChrono)) {
overrideChrono = null;
}
@@ -206,13 +207,13 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.chronology()) {
+ if (query == TemporalQueries.chronology()) {
return (R) effectiveChrono;
}
- if (query == TemporalQuery.zoneId()) {
+ if (query == TemporalQueries.zoneId()) {
return (R) effectiveZone;
}
- if (query == TemporalQuery.precision()) {
+ if (query == TemporalQueries.precision()) {
return temporal.query(query);
}
return query.queryFrom(this);
diff --git a/jdk/src/share/classes/java/time/format/Parsed.java b/jdk/src/share/classes/java/time/format/Parsed.java
index 7413467..38eda94 100644
--- a/jdk/src/share/classes/java/time/format/Parsed.java
+++ b/jdk/src/share/classes/java/time/format/Parsed.java
@@ -89,6 +89,7 @@
import java.time.temporal.ChronoField;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.UnsupportedTemporalTypeException;
import java.util.HashMap;
@@ -207,17 +208,17 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.zoneId()) {
+ if (query == TemporalQueries.zoneId()) {
return (R) zone;
- } else if (query == TemporalQuery.chronology()) {
+ } else if (query == TemporalQueries.chronology()) {
return (R) chrono;
- } else if (query == TemporalQuery.localDate()) {
+ } else if (query == TemporalQueries.localDate()) {
return (R) (date != null ? LocalDate.from(date) : null);
- } else if (query == TemporalQuery.localTime()) {
+ } else if (query == TemporalQueries.localTime()) {
return (R) time;
- } else if (query == TemporalQuery.zone() || query == TemporalQuery.offset()) {
+ } else if (query == TemporalQueries.zone() || query == TemporalQueries.offset()) {
return query.queryFrom(this);
- } else if (query == TemporalQuery.precision()) {
+ } else if (query == TemporalQueries.precision()) {
return null; // not a complete date/time
}
// inline TemporalAccessor.super.query(query) as an optimization
@@ -262,7 +263,7 @@
while (changedCount < 50) {
for (Map.Entry<TemporalField, Long> entry : fieldValues.entrySet()) {
TemporalField targetField = entry.getKey();
- TemporalAccessor resolvedObject = targetField.resolve(fieldValues, chrono, zone, resolverStyle);
+ TemporalAccessor resolvedObject = targetField.resolve(fieldValues, this, resolverStyle);
if (resolvedObject != null) {
if (resolvedObject instanceof ChronoZonedDateTime) {
ChronoZonedDateTime czdt = (ChronoZonedDateTime) resolvedObject;
@@ -588,11 +589,23 @@
//-----------------------------------------------------------------------
@Override
public String toString() {
- String str = fieldValues.toString() + "," + chrono + "," + zone;
- if (date != null || time != null) {
- str += " resolved to " + date + "," + time;
+ StringBuilder buf = new StringBuilder(64);
+ buf.append(fieldValues).append(',').append(chrono);
+ if (zone != null) {
+ buf.append(',').append(zone);
}
- return str;
+ if (date != null || time != null) {
+ buf.append(" resolved to ");
+ if (date != null) {
+ buf.append(date);
+ if (time != null) {
+ buf.append('T').append(time);
+ }
+ } else {
+ buf.append(time);
+ }
+ }
+ return buf.toString();
}
}
diff --git a/jdk/src/share/classes/java/time/temporal/IsoFields.java b/jdk/src/share/classes/java/time/temporal/IsoFields.java
index bb19c29..8d9cc84 100644
--- a/jdk/src/share/classes/java/time/temporal/IsoFields.java
+++ b/jdk/src/share/classes/java/time/temporal/IsoFields.java
@@ -69,14 +69,13 @@
import static java.time.temporal.ChronoUnit.WEEKS;
import static java.time.temporal.ChronoUnit.YEARS;
+import java.time.DateTimeException;
import java.time.Duration;
import java.time.LocalDate;
-import java.time.ZoneId;
import java.time.chrono.ChronoLocalDate;
import java.time.chrono.Chronology;
import java.time.chrono.IsoChronology;
import java.time.format.ResolverStyle;
-import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
@@ -101,11 +100,11 @@
* October, November and December are in Q4.
* <p>
* The complete date is expressed using three fields:
- * <p><ul>
+ * <ul>
* <li>{@link #DAY_OF_QUARTER DAY_OF_QUARTER} - the day within the quarter, from 1 to 90, 91 or 92
* <li>{@link #QUARTER_OF_YEAR QUARTER_OF_YEAR} - the week within the week-based-year
* <li>{@link ChronoField#YEAR YEAR} - the standard ISO year
- * </ul><p>
+ * </ul>
*
* <h3>Week based years</h3>
* The ISO-8601 standard was originally intended as a data interchange format,
@@ -113,18 +112,18 @@
* alternate way of expressing the date, based on the concept of week-based-year.
* <p>
* The date is expressed using three fields:
- * <p><ul>
+ * <ul>
* <li>{@link ChronoField#DAY_OF_WEEK DAY_OF_WEEK} - the standard field defining the
* day-of-week from Monday (1) to Sunday (7)
* <li>{@link #WEEK_OF_WEEK_BASED_YEAR} - the week within the week-based-year
* <li>{@link #WEEK_BASED_YEAR WEEK_BASED_YEAR} - the week-based-year
- * </ul><p>
+ * </ul>
* The week-based-year itself is defined relative to the standard ISO proleptic year.
* It differs from the standard year in that it always starts on a Monday.
* <p>
* The first week of a week-based-year is the first Monday-based week of the standard
* ISO year that has at least 4 days in the new year.
- * <p><ul>
+ * <ul>
* <li>If January 1st is Monday then week 1 starts on January 1st
* <li>If January 1st is Tuesday then week 1 starts on December 31st of the previous standard year
* <li>If January 1st is Wednesday then week 1 starts on December 30th of the previous standard year
@@ -132,11 +131,11 @@
* <li>If January 1st is Friday then week 1 starts on January 4th
* <li>If January 1st is Saturday then week 1 starts on January 3rd
* <li>If January 1st is Sunday then week 1 starts on January 2nd
- * </ul><p>
+ * </ul>
* There are 52 weeks in most week-based years, however on occasion there are 53 weeks.
* <p>
* For example:
- * <p>
+ *
* <table cellpadding="0" cellspacing="3" border="0" style="text-align: left; width: 50%;">
* <caption>Examples of Week based Years</caption>
* <tr><th>Date</th><th>Day-of-week</th><th>Field values</th></tr>
@@ -343,7 +342,7 @@
}
@Override
public ChronoLocalDate resolve(
- Map<TemporalField, Long> fieldValues, Chronology chronology, ZoneId zone, ResolverStyle resolverStyle) {
+ Map<TemporalField, Long> fieldValues, TemporalAccessor partialTemporal, ResolverStyle resolverStyle) {
Long yearLong = fieldValues.get(YEAR);
Long qoyLong = fieldValues.get(QUARTER_OF_YEAR);
if (yearLong == null || qoyLong == null) {
@@ -351,6 +350,7 @@
}
int y = YEAR.checkValidIntValue(yearLong); // always validate
long doq = fieldValues.get(DAY_OF_QUARTER);
+ ensureIso(partialTemporal);
LocalDate date;
if (resolverStyle == ResolverStyle.LENIENT) {
date = LocalDate.of(y, 1, 1).plusMonths(Math.multiplyExact(Math.subtractExact(qoyLong, 1), 3));
@@ -464,7 +464,7 @@
}
@Override
public ChronoLocalDate resolve(
- Map<TemporalField, Long> fieldValues, Chronology chronology, ZoneId zone, ResolverStyle resolverStyle) {
+ Map<TemporalField, Long> fieldValues, TemporalAccessor partialTemporal, ResolverStyle resolverStyle) {
Long wbyLong = fieldValues.get(WEEK_BASED_YEAR);
Long dowLong = fieldValues.get(DAY_OF_WEEK);
if (wbyLong == null || dowLong == null) {
@@ -472,6 +472,7 @@
}
int wby = WEEK_BASED_YEAR.range().checkValidIntValue(wbyLong, WEEK_BASED_YEAR); // always validate
long wowby = fieldValues.get(WEEK_OF_WEEK_BASED_YEAR);
+ ensureIso(partialTemporal);
LocalDate date = LocalDate.of(wby, 1, 4);
if (resolverStyle == ResolverStyle.LENIENT) {
long dow = dowLong; // unvalidated
@@ -568,6 +569,12 @@
return Chronology.from(temporal).equals(IsoChronology.INSTANCE);
}
+ private static void ensureIso(TemporalAccessor temporal) {
+ if (isIso(temporal) == false) {
+ throw new DateTimeException("Resolve requires IsoChronology");
+ }
+ }
+
private static ValueRange getWeekRange(LocalDate date) {
int wby = getWeekBasedYear(date);
date = date.withDayOfYear(1).withYear(wby);
diff --git a/jdk/src/share/classes/java/time/temporal/JulianFields.java b/jdk/src/share/classes/java/time/temporal/JulianFields.java
index 326f20d..3270379 100644
--- a/jdk/src/share/classes/java/time/temporal/JulianFields.java
+++ b/jdk/src/share/classes/java/time/temporal/JulianFields.java
@@ -66,11 +66,9 @@
import static java.time.temporal.ChronoUnit.FOREVER;
import java.time.DateTimeException;
-import java.time.ZoneId;
import java.time.chrono.ChronoLocalDate;
import java.time.chrono.Chronology;
import java.time.format.ResolverStyle;
-import java.util.Collections;
import java.util.Map;
/**
@@ -116,7 +114,7 @@
* In {@linkplain ResolverStyle#STRICT strict mode} and {@linkplain ResolverStyle#SMART smart mode}
* the Julian Day value is validated against the range of valid values.
* In {@linkplain ResolverStyle#LENIENT lenient mode} no validation occurs.
- * <p>
+ *
* <h3>Astronomical and Scientific Notes</h3>
* The standard astronomical definition uses a fraction to indicate the time-of-day,
* thus 3.25 would represent the time 18:00, since days start at midday.
@@ -124,7 +122,7 @@
* The integer value for the Julian Day Number is the astronomical Julian Day value at midday
* of the date in question.
* This amounts to the astronomical Julian Day, rounded to an integer {@code JDN = floor(JD + 0.5)}.
- * <p>
+ *
* <pre>
* | ISO date | Julian Day Number | Astronomical Julian Day |
* | 1970-01-01T00:00 | 2,440,588 | 2,440,587.5 |
@@ -164,7 +162,7 @@
* In {@linkplain ResolverStyle#STRICT strict mode} and {@linkplain ResolverStyle#SMART smart mode}
* the Modified Julian Day value is validated against the range of valid values.
* In {@linkplain ResolverStyle#LENIENT lenient mode} no validation occurs.
- * <p>
+ *
* <h3>Astronomical and Scientific Notes</h3>
* <pre>
* | ISO date | Modified Julian Day | Decimal MJD |
@@ -176,7 +174,7 @@
* | 1970-01-02T06:00 | 40,588 | 40,588.25 |
* | 1970-01-02T12:00 | 40,588 | 40,588.5 |
* </pre>
- * <p>
+ *
* Modified Julian Days are sometimes taken to imply Universal Time or UTC, but this
* implementation always uses the Modified Julian Day for the local date,
* regardless of the offset or time-zone.
@@ -291,13 +289,14 @@
//-----------------------------------------------------------------------
@Override
public ChronoLocalDate resolve(
- Map<TemporalField, Long> fieldValues, Chronology chronology, ZoneId zone, ResolverStyle resolverStyle) {
+ Map<TemporalField, Long> fieldValues, TemporalAccessor partialTemporal, ResolverStyle resolverStyle) {
long value = fieldValues.remove(this);
+ Chronology chrono = Chronology.from(partialTemporal);
if (resolverStyle == ResolverStyle.LENIENT) {
- return chronology.dateEpochDay(Math.subtractExact(value, offset));
+ return chrono.dateEpochDay(Math.subtractExact(value, offset));
}
range().checkValidValue(value, this);
- return chronology.dateEpochDay(value - offset);
+ return chrono.dateEpochDay(value - offset);
}
//-----------------------------------------------------------------------
diff --git a/jdk/src/share/classes/java/time/temporal/Temporal.java b/jdk/src/share/classes/java/time/temporal/Temporal.java
index 9931c46..937a37e 100644
--- a/jdk/src/share/classes/java/time/temporal/Temporal.java
+++ b/jdk/src/share/classes/java/time/temporal/Temporal.java
@@ -95,15 +95,15 @@
* <h3>When to implement</h3>
* <p>
* A class should implement this interface if it meets three criteria:
- * <p><ul>
+ * <ul>
* <li>it provides access to date/time/offset information, as per {@code TemporalAccessor}
* <li>the set of fields are contiguous from the largest to the smallest
* <li>the set of fields are complete, such that no other field is needed to define the
* valid range of values for the fields that are represented
- * </ul><p>
+ * </ul>
* <p>
* Four examples make this clear:
- * <p><ul>
+ * <ul>
* <li>{@code LocalDate} implements this interface as it represents a set of fields
* that are contiguous from days to forever and require no external information to determine
* the validity of each date. It is therefore able to implement plus/minus correctly.
@@ -117,7 +117,7 @@
* <li>The combination day-of-week and day-of-month ("Friday the 13th") should not implement
* this interface. It does not represent a contiguous set of fields, as days to weeks overlaps
* days to months.
- * </ul><p>
+ * </ul>
*
* @implSpec
* This interface places no restrictions on the mutability of implementations,
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalAccessor.java b/jdk/src/share/classes/java/time/temporal/TemporalAccessor.java
index 343447e..081bbba 100644
--- a/jdk/src/share/classes/java/time/temporal/TemporalAccessor.java
+++ b/jdk/src/share/classes/java/time/temporal/TemporalAccessor.java
@@ -272,8 +272,8 @@
* @implSpec
* The default implementation must behave equivalent to this code:
* <pre>
- * if (query == TemporalQuery.zoneId() ||
- * query == TemporalQuery.chronology() || query == TemporalQuery.precision()) {
+ * if (query == TemporalQueries.zoneId() ||
+ * query == TemporalQueries.chronology() || query == TemporalQueries.precision()) {
* return null;
* }
* return query.queryFrom(this);
@@ -290,7 +290,7 @@
* For example, an application-defined {@code HourMin} class storing the hour
* and minute must override this method as follows:
* <pre>
- * if (query == TemporalQuery.precision()) {
+ * if (query == TemporalQueries.precision()) {
* return MINUTES;
* }
* return TemporalAccessor.super.query(query);
@@ -306,7 +306,9 @@
* @throws ArithmeticException if numeric overflow occurs
*/
default <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.zoneId() || query == TemporalQuery.chronology() || query == TemporalQuery.precision()) {
+ if (query == TemporalQueries.zoneId()
+ || query == TemporalQueries.chronology()
+ || query == TemporalQueries.precision()) {
return null;
}
return query.queryFrom(this);
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalAdjuster.java b/jdk/src/share/classes/java/time/temporal/TemporalAdjuster.java
index 13f8cea..09b5fba 100644
--- a/jdk/src/share/classes/java/time/temporal/TemporalAdjuster.java
+++ b/jdk/src/share/classes/java/time/temporal/TemporalAdjuster.java
@@ -62,9 +62,6 @@
package java.time.temporal;
import java.time.DateTimeException;
-import java.time.DayOfWeek;
-import java.time.LocalDate;
-import java.util.function.UnaryOperator;
/**
* Strategy for adjusting a temporal object.
@@ -86,7 +83,8 @@
* It is recommended to use the second approach, {@code with(TemporalAdjuster)},
* as it is a lot clearer to read in code.
* <p>
- * This class also contains a standard set of adjusters, available as static methods.
+ * The {@link TemporalAdjusters} class contains a standard set of adjusters,
+ * available as static methods.
* These include:
* <ul>
* <li>finding the first or last day of the month
@@ -100,9 +98,8 @@
* @implSpec
* This interface places no restrictions on the mutability of implementations,
* however immutability is strongly recommended.
- * <p>
- * All the implementations supplied by the static methods on this interface are immutable.
*
+ * @see TemporalAdjusters
* @since 1.8
*/
@FunctionalInterface
@@ -140,7 +137,7 @@
* <p>
* The input temporal object may be in a calendar system other than ISO.
* Implementations may choose to document compatibility with other calendar systems,
- * or reject non-ISO temporal objects by {@link TemporalQuery#chronology() querying the chronology}.
+ * or reject non-ISO temporal objects by {@link TemporalQueries#chronology() querying the chronology}.
* <p>
* This method may be called from multiple threads in parallel.
* It must be thread-safe when invoked.
@@ -152,311 +149,4 @@
*/
Temporal adjustInto(Temporal temporal);
- //-----------------------------------------------------------------------
- /**
- * Obtains a {@code TemporalAdjuster} that wraps a date adjuster.
- * <p>
- * The {@code TemporalAdjuster} is based on the low level {@code Temporal} interface.
- * This method allows an adjustment from {@code LocalDate} to {@code LocalDate}
- * to be wrapped to match the temporal-based interface.
- * This is provided for convenience to make user-written adjusters simpler.
- * <p>
- * In general, user-written adjusters should be static constants:
- * <pre>{@code
- * static TemporalAdjuster TWO_DAYS_LATER = TemporalAdjuster.ofDateAdjuster(
- * date -> date.plusDays(2));
- * }</pre>
- *
- * @param dateBasedAdjuster the date-based adjuster, not null
- * @return the temporal adjuster wrapping on the date adjuster, not null
- */
- static TemporalAdjuster ofDateAdjuster(UnaryOperator<LocalDate> dateBasedAdjuster) {
- return TemporalAdjusters.ofDateAdjuster(dateBasedAdjuster);
- }
-
- //-----------------------------------------------------------------------
- /**
- * Returns the "first day of month" adjuster, which returns a new date set to
- * the first day of the current month.
- * <p>
- * The ISO calendar system behaves as follows:<br>
- * The input 2011-01-15 will return 2011-01-01.<br>
- * The input 2011-02-15 will return 2011-02-01.
- * <p>
- * The behavior is suitable for use with most calendar systems.
- * It is equivalent to:
- * <pre>
- * temporal.with(DAY_OF_MONTH, 1);
- * </pre>
- *
- * @return the first day-of-month adjuster, not null
- */
- static TemporalAdjuster firstDayOfMonth() {
- return TemporalAdjusters.firstDayOfMonth();
- }
-
- /**
- * Returns the "last day of month" adjuster, which returns a new date set to
- * the last day of the current month.
- * <p>
- * The ISO calendar system behaves as follows:<br>
- * The input 2011-01-15 will return 2011-01-31.<br>
- * The input 2011-02-15 will return 2011-02-28.<br>
- * The input 2012-02-15 will return 2012-02-29 (leap year).<br>
- * The input 2011-04-15 will return 2011-04-30.
- * <p>
- * The behavior is suitable for use with most calendar systems.
- * It is equivalent to:
- * <pre>
- * long lastDay = temporal.range(DAY_OF_MONTH).getMaximum();
- * temporal.with(DAY_OF_MONTH, lastDay);
- * </pre>
- *
- * @return the last day-of-month adjuster, not null
- */
- static TemporalAdjuster lastDayOfMonth() {
- return TemporalAdjusters.lastDayOfMonth();
- }
-
- /**
- * Returns the "first day of next month" adjuster, which returns a new date set to
- * the first day of the next month.
- * <p>
- * The ISO calendar system behaves as follows:<br>
- * The input 2011-01-15 will return 2011-02-01.<br>
- * The input 2011-02-15 will return 2011-03-01.
- * <p>
- * The behavior is suitable for use with most calendar systems.
- * It is equivalent to:
- * <pre>
- * temporal.with(DAY_OF_MONTH, 1).plus(1, MONTHS);
- * </pre>
- *
- * @return the first day of next month adjuster, not null
- */
- static TemporalAdjuster firstDayOfNextMonth() {
- return TemporalAdjusters.firstDayOfNextMonth();
- }
-
- //-----------------------------------------------------------------------
- /**
- * Returns the "first day of year" adjuster, which returns a new date set to
- * the first day of the current year.
- * <p>
- * The ISO calendar system behaves as follows:<br>
- * The input 2011-01-15 will return 2011-01-01.<br>
- * The input 2011-02-15 will return 2011-01-01.<br>
- * <p>
- * The behavior is suitable for use with most calendar systems.
- * It is equivalent to:
- * <pre>
- * temporal.with(DAY_OF_YEAR, 1);
- * </pre>
- *
- * @return the first day-of-year adjuster, not null
- */
- static TemporalAdjuster firstDayOfYear() {
- return TemporalAdjusters.firstDayOfYear();
- }
-
- /**
- * Returns the "last day of year" adjuster, which returns a new date set to
- * the last day of the current year.
- * <p>
- * The ISO calendar system behaves as follows:<br>
- * The input 2011-01-15 will return 2011-12-31.<br>
- * The input 2011-02-15 will return 2011-12-31.<br>
- * <p>
- * The behavior is suitable for use with most calendar systems.
- * It is equivalent to:
- * <pre>
- * long lastDay = temporal.range(DAY_OF_YEAR).getMaximum();
- * temporal.with(DAY_OF_YEAR, lastDay);
- * </pre>
- *
- * @return the last day-of-year adjuster, not null
- */
- static TemporalAdjuster lastDayOfYear() {
- return TemporalAdjusters.lastDayOfYear();
- }
-
- /**
- * Returns the "first day of next year" adjuster, which returns a new date set to
- * the first day of the next year.
- * <p>
- * The ISO calendar system behaves as follows:<br>
- * The input 2011-01-15 will return 2012-01-01.
- * <p>
- * The behavior is suitable for use with most calendar systems.
- * It is equivalent to:
- * <pre>
- * temporal.with(DAY_OF_YEAR, 1).plus(1, YEARS);
- * </pre>
- *
- * @return the first day of next month adjuster, not null
- */
- static TemporalAdjuster firstDayOfNextYear() {
- return TemporalAdjusters.firstDayOfNextYear();
- }
-
- //-----------------------------------------------------------------------
- /**
- * Returns the first in month adjuster, which returns a new date
- * in the same month with the first matching day-of-week.
- * This is used for expressions like 'first Tuesday in March'.
- * <p>
- * The ISO calendar system behaves as follows:<br>
- * The input 2011-12-15 for (MONDAY) will return 2011-12-05.<br>
- * The input 2011-12-15 for (FRIDAY) will return 2011-12-02.<br>
- * <p>
- * The behavior is suitable for use with most calendar systems.
- * It uses the {@code DAY_OF_WEEK} and {@code DAY_OF_MONTH} fields
- * and the {@code DAYS} unit, and assumes a seven day week.
- *
- * @param dayOfWeek the day-of-week, not null
- * @return the first in month adjuster, not null
- */
- static TemporalAdjuster firstInMonth(DayOfWeek dayOfWeek) {
- return TemporalAdjuster.dayOfWeekInMonth(1, dayOfWeek);
- }
-
- /**
- * Returns the last in month adjuster, which returns a new date
- * in the same month with the last matching day-of-week.
- * This is used for expressions like 'last Tuesday in March'.
- * <p>
- * The ISO calendar system behaves as follows:<br>
- * The input 2011-12-15 for (MONDAY) will return 2011-12-26.<br>
- * The input 2011-12-15 for (FRIDAY) will return 2011-12-30.<br>
- * <p>
- * The behavior is suitable for use with most calendar systems.
- * It uses the {@code DAY_OF_WEEK} and {@code DAY_OF_MONTH} fields
- * and the {@code DAYS} unit, and assumes a seven day week.
- *
- * @param dayOfWeek the day-of-week, not null
- * @return the first in month adjuster, not null
- */
- static TemporalAdjuster lastInMonth(DayOfWeek dayOfWeek) {
- return TemporalAdjuster.dayOfWeekInMonth(-1, dayOfWeek);
- }
-
- /**
- * Returns the day-of-week in month adjuster, which returns a new date
- * in the same month with the ordinal day-of-week.
- * This is used for expressions like the 'second Tuesday in March'.
- * <p>
- * The ISO calendar system behaves as follows:<br>
- * The input 2011-12-15 for (1,TUESDAY) will return 2011-12-06.<br>
- * The input 2011-12-15 for (2,TUESDAY) will return 2011-12-13.<br>
- * The input 2011-12-15 for (3,TUESDAY) will return 2011-12-20.<br>
- * The input 2011-12-15 for (4,TUESDAY) will return 2011-12-27.<br>
- * The input 2011-12-15 for (5,TUESDAY) will return 2012-01-03.<br>
- * The input 2011-12-15 for (-1,TUESDAY) will return 2011-12-27 (last in month).<br>
- * The input 2011-12-15 for (-4,TUESDAY) will return 2011-12-06 (3 weeks before last in month).<br>
- * The input 2011-12-15 for (-5,TUESDAY) will return 2011-11-29 (4 weeks before last in month).<br>
- * The input 2011-12-15 for (0,TUESDAY) will return 2011-11-29 (last in previous month).<br>
- * <p>
- * For a positive or zero ordinal, the algorithm is equivalent to finding the first
- * day-of-week that matches within the month and then adding a number of weeks to it.
- * For a negative ordinal, the algorithm is equivalent to finding the last
- * day-of-week that matches within the month and then subtracting a number of weeks to it.
- * The ordinal number of weeks is not validated and is interpreted leniently
- * according to this algorithm. This definition means that an ordinal of zero finds
- * the last matching day-of-week in the previous month.
- * <p>
- * The behavior is suitable for use with most calendar systems.
- * It uses the {@code DAY_OF_WEEK} and {@code DAY_OF_MONTH} fields
- * and the {@code DAYS} unit, and assumes a seven day week.
- *
- * @param ordinal the week within the month, unbounded but typically from -5 to 5
- * @param dayOfWeek the day-of-week, not null
- * @return the day-of-week in month adjuster, not null
- */
- static TemporalAdjuster dayOfWeekInMonth(final int ordinal, DayOfWeek dayOfWeek) {
- return TemporalAdjusters.dayOfWeekInMonth(ordinal, dayOfWeek);
- }
-
- //-----------------------------------------------------------------------
- /**
- * Returns the next day-of-week adjuster, which adjusts the date to the
- * first occurrence of the specified day-of-week after the date being adjusted.
- * <p>
- * The ISO calendar system behaves as follows:<br>
- * The input 2011-01-15 (a Saturday) for parameter (MONDAY) will return 2011-01-17 (two days later).<br>
- * The input 2011-01-15 (a Saturday) for parameter (WEDNESDAY) will return 2011-01-19 (four days later).<br>
- * The input 2011-01-15 (a Saturday) for parameter (SATURDAY) will return 2011-01-22 (seven days later).
- * <p>
- * The behavior is suitable for use with most calendar systems.
- * It uses the {@code DAY_OF_WEEK} field and the {@code DAYS} unit,
- * and assumes a seven day week.
- *
- * @param dayOfWeek the day-of-week to move the date to, not null
- * @return the next day-of-week adjuster, not null
- */
- static TemporalAdjuster next(DayOfWeek dayOfWeek) {
- return TemporalAdjusters.next(dayOfWeek);
- }
-
- /**
- * Returns the next-or-same day-of-week adjuster, which adjusts the date to the
- * first occurrence of the specified day-of-week after the date being adjusted
- * unless it is already on that day in which case the same object is returned.
- * <p>
- * The ISO calendar system behaves as follows:<br>
- * The input 2011-01-15 (a Saturday) for parameter (MONDAY) will return 2011-01-17 (two days later).<br>
- * The input 2011-01-15 (a Saturday) for parameter (WEDNESDAY) will return 2011-01-19 (four days later).<br>
- * The input 2011-01-15 (a Saturday) for parameter (SATURDAY) will return 2011-01-15 (same as input).
- * <p>
- * The behavior is suitable for use with most calendar systems.
- * It uses the {@code DAY_OF_WEEK} field and the {@code DAYS} unit,
- * and assumes a seven day week.
- *
- * @param dayOfWeek the day-of-week to check for or move the date to, not null
- * @return the next-or-same day-of-week adjuster, not null
- */
- static TemporalAdjuster nextOrSame(DayOfWeek dayOfWeek) {
- return TemporalAdjusters.nextOrSame(dayOfWeek);
- }
-
- /**
- * Returns the previous day-of-week adjuster, which adjusts the date to the
- * first occurrence of the specified day-of-week before the date being adjusted.
- * <p>
- * The ISO calendar system behaves as follows:<br>
- * The input 2011-01-15 (a Saturday) for parameter (MONDAY) will return 2011-01-10 (five days earlier).<br>
- * The input 2011-01-15 (a Saturday) for parameter (WEDNESDAY) will return 2011-01-12 (three days earlier).<br>
- * The input 2011-01-15 (a Saturday) for parameter (SATURDAY) will return 2011-01-08 (seven days earlier).
- * <p>
- * The behavior is suitable for use with most calendar systems.
- * It uses the {@code DAY_OF_WEEK} field and the {@code DAYS} unit,
- * and assumes a seven day week.
- *
- * @param dayOfWeek the day-of-week to move the date to, not null
- * @return the previous day-of-week adjuster, not null
- */
- static TemporalAdjuster previous(DayOfWeek dayOfWeek) {
- return TemporalAdjusters.previous(dayOfWeek);
- }
-
- /**
- * Returns the previous-or-same day-of-week adjuster, which adjusts the date to the
- * first occurrence of the specified day-of-week before the date being adjusted
- * unless it is already on that day in which case the same object is returned.
- * <p>
- * The ISO calendar system behaves as follows:<br>
- * The input 2011-01-15 (a Saturday) for parameter (MONDAY) will return 2011-01-10 (five days earlier).<br>
- * The input 2011-01-15 (a Saturday) for parameter (WEDNESDAY) will return 2011-01-12 (three days earlier).<br>
- * The input 2011-01-15 (a Saturday) for parameter (SATURDAY) will return 2011-01-15 (same as input).
- * <p>
- * The behavior is suitable for use with most calendar systems.
- * It uses the {@code DAY_OF_WEEK} field and the {@code DAYS} unit,
- * and assumes a seven day week.
- *
- * @param dayOfWeek the day-of-week to check for or move the date to, not null
- * @return the previous-or-same day-of-week adjuster, not null
- */
- static TemporalAdjuster previousOrSame(DayOfWeek dayOfWeek) {
- return TemporalAdjusters.previousOrSame(dayOfWeek);
- }
-
}
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalAdjusters.java b/jdk/src/share/classes/java/time/temporal/TemporalAdjusters.java
index 2934853..0180c81 100644
--- a/jdk/src/share/classes/java/time/temporal/TemporalAdjusters.java
+++ b/jdk/src/share/classes/java/time/temporal/TemporalAdjusters.java
@@ -74,13 +74,47 @@
import java.util.function.UnaryOperator;
/**
- * Implementations of the static methods in {@code TemporalAdjuster}
+ * Common and useful TemporalAdjusters.
+ * <p>
+ * Adjusters are a key tool for modifying temporal objects.
+ * They exist to externalize the process of adjustment, permitting different
+ * approaches, as per the strategy design pattern.
+ * Examples might be an adjuster that sets the date avoiding weekends, or one that
+ * sets the date to the last day of the month.
+ * <p>
+ * There are two equivalent ways of using a {@code TemporalAdjuster}.
+ * The first is to invoke the method on the interface directly.
+ * The second is to use {@link Temporal#with(TemporalAdjuster)}:
+ * <pre>
+ * // these two lines are equivalent, but the second approach is recommended
+ * temporal = thisAdjuster.adjustInto(temporal);
+ * temporal = temporal.with(thisAdjuster);
+ * </pre>
+ * It is recommended to use the second approach, {@code with(TemporalAdjuster)},
+ * as it is a lot clearer to read in code.
+ * <p>
+ * This class contains a standard set of adjusters, available as static methods.
+ * These include:
+ * <ul>
+ * <li>finding the first or last day of the month
+ * <li>finding the first day of next month
+ * <li>finding the first or last day of the year
+ * <li>finding the first day of next year
+ * <li>finding the first or last day-of-week within a month, such as "first Wednesday in June"
+ * <li>finding the next or previous day-of-week, such as "next Thursday"
+ * </ul>
*
+ * @implSpec
+ * All the implementations supplied by the static methods are immutable.
+ *
+ * @see TemporalAdjuster
* @since 1.8
*/
-final class TemporalAdjusters {
- // work around compiler bug not allowing lambdas in static methods
+public final class TemporalAdjusters {
+ /**
+ * Private constructor since this is a utility class.
+ */
private TemporalAdjusters() {
}
@@ -94,15 +128,15 @@
* This is provided for convenience to make user-written adjusters simpler.
* <p>
* In general, user-written adjusters should be static constants:
- * <pre>
- * public static TemporalAdjuster TWO_DAYS_LATER = TemporalAdjuster.ofDateAdjuster(
- * date -> date.plusDays(2));
- * </pre>
+ * <pre>{@code
+ * static TemporalAdjuster TWO_DAYS_LATER =
+ * TemporalAdjusters.ofDateAdjuster(date -> date.plusDays(2));
+ * }</pre>
*
* @param dateBasedAdjuster the date-based adjuster, not null
* @return the temporal adjuster wrapping on the date adjuster, not null
*/
- static TemporalAdjuster ofDateAdjuster(UnaryOperator<LocalDate> dateBasedAdjuster) {
+ public static TemporalAdjuster ofDateAdjuster(UnaryOperator<LocalDate> dateBasedAdjuster) {
Objects.requireNonNull(dateBasedAdjuster, "dateBasedAdjuster");
return (temporal) -> {
LocalDate input = LocalDate.from(temporal);
@@ -128,7 +162,7 @@
*
* @return the first day-of-month adjuster, not null
*/
- static TemporalAdjuster firstDayOfMonth() {
+ public static TemporalAdjuster firstDayOfMonth() {
return (temporal) -> temporal.with(DAY_OF_MONTH, 1);
}
@@ -151,7 +185,7 @@
*
* @return the last day-of-month adjuster, not null
*/
- static TemporalAdjuster lastDayOfMonth() {
+ public static TemporalAdjuster lastDayOfMonth() {
return (temporal) -> temporal.with(DAY_OF_MONTH, temporal.range(DAY_OF_MONTH).getMaximum());
}
@@ -171,7 +205,7 @@
*
* @return the first day of next month adjuster, not null
*/
- static TemporalAdjuster firstDayOfNextMonth() {
+ public static TemporalAdjuster firstDayOfNextMonth() {
return (temporal) -> temporal.with(DAY_OF_MONTH, 1).plus(1, MONTHS);
}
@@ -192,7 +226,7 @@
*
* @return the first day-of-year adjuster, not null
*/
- static TemporalAdjuster firstDayOfYear() {
+ public static TemporalAdjuster firstDayOfYear() {
return (temporal) -> temporal.with(DAY_OF_YEAR, 1);
}
@@ -213,7 +247,7 @@
*
* @return the last day-of-year adjuster, not null
*/
- static TemporalAdjuster lastDayOfYear() {
+ public static TemporalAdjuster lastDayOfYear() {
return (temporal) -> temporal.with(DAY_OF_YEAR, temporal.range(DAY_OF_YEAR).getMaximum());
}
@@ -232,7 +266,7 @@
*
* @return the first day of next month adjuster, not null
*/
- static TemporalAdjuster firstDayOfNextYear() {
+ public static TemporalAdjuster firstDayOfNextYear() {
return (temporal) -> temporal.with(DAY_OF_YEAR, 1).plus(1, YEARS);
}
@@ -253,7 +287,7 @@
* @param dayOfWeek the day-of-week, not null
* @return the first in month adjuster, not null
*/
- static TemporalAdjuster firstInMonth(DayOfWeek dayOfWeek) {
+ public static TemporalAdjuster firstInMonth(DayOfWeek dayOfWeek) {
return TemporalAdjusters.dayOfWeekInMonth(1, dayOfWeek);
}
@@ -273,7 +307,7 @@
* @param dayOfWeek the day-of-week, not null
* @return the first in month adjuster, not null
*/
- static TemporalAdjuster lastInMonth(DayOfWeek dayOfWeek) {
+ public static TemporalAdjuster lastInMonth(DayOfWeek dayOfWeek) {
return TemporalAdjusters.dayOfWeekInMonth(-1, dayOfWeek);
}
@@ -309,7 +343,7 @@
* @param dayOfWeek the day-of-week, not null
* @return the day-of-week in month adjuster, not null
*/
- static TemporalAdjuster dayOfWeekInMonth(int ordinal, DayOfWeek dayOfWeek) {
+ public static TemporalAdjuster dayOfWeekInMonth(int ordinal, DayOfWeek dayOfWeek) {
Objects.requireNonNull(dayOfWeek, "dayOfWeek");
int dowValue = dayOfWeek.getValue();
if (ordinal >= 0) {
@@ -349,7 +383,7 @@
* @param dayOfWeek the day-of-week to move the date to, not null
* @return the next day-of-week adjuster, not null
*/
- static TemporalAdjuster next(DayOfWeek dayOfWeek) {
+ public static TemporalAdjuster next(DayOfWeek dayOfWeek) {
int dowValue = dayOfWeek.getValue();
return (temporal) -> {
int calDow = temporal.get(DAY_OF_WEEK);
@@ -375,7 +409,7 @@
* @param dayOfWeek the day-of-week to check for or move the date to, not null
* @return the next-or-same day-of-week adjuster, not null
*/
- static TemporalAdjuster nextOrSame(DayOfWeek dayOfWeek) {
+ public static TemporalAdjuster nextOrSame(DayOfWeek dayOfWeek) {
int dowValue = dayOfWeek.getValue();
return (temporal) -> {
int calDow = temporal.get(DAY_OF_WEEK);
@@ -403,7 +437,7 @@
* @param dayOfWeek the day-of-week to move the date to, not null
* @return the previous day-of-week adjuster, not null
*/
- static TemporalAdjuster previous(DayOfWeek dayOfWeek) {
+ public static TemporalAdjuster previous(DayOfWeek dayOfWeek) {
int dowValue = dayOfWeek.getValue();
return (temporal) -> {
int calDow = temporal.get(DAY_OF_WEEK);
@@ -429,7 +463,7 @@
* @param dayOfWeek the day-of-week to check for or move the date to, not null
* @return the previous-or-same day-of-week adjuster, not null
*/
- static TemporalAdjuster previousOrSame(DayOfWeek dayOfWeek) {
+ public static TemporalAdjuster previousOrSame(DayOfWeek dayOfWeek) {
int dowValue = dayOfWeek.getValue();
return (temporal) -> {
int calDow = temporal.get(DAY_OF_WEEK);
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalAmount.java b/jdk/src/share/classes/java/time/temporal/TemporalAmount.java
index 802dc4d..0d8b8a9 100644
--- a/jdk/src/share/classes/java/time/temporal/TemporalAmount.java
+++ b/jdk/src/share/classes/java/time/temporal/TemporalAmount.java
@@ -163,7 +163,7 @@
* <p>
* The input temporal object may be in a calendar system other than ISO.
* Implementations may choose to document compatibility with other calendar systems,
- * or reject non-ISO temporal objects by {@link TemporalQuery#chronology() querying the chronology}.
+ * or reject non-ISO temporal objects by {@link TemporalQueries#chronology() querying the chronology}.
* <p>
* This method may be called from multiple threads in parallel.
* It must be thread-safe when invoked.
@@ -205,7 +205,7 @@
* <p>
* The input temporal object may be in a calendar system other than ISO.
* Implementations may choose to document compatibility with other calendar systems,
- * or reject non-ISO temporal objects by {@link TemporalQuery#chronology() querying the chronology}.
+ * or reject non-ISO temporal objects by {@link TemporalQueries#chronology() querying the chronology}.
* <p>
* This method may be called from multiple threads in parallel.
* It must be thread-safe when invoked.
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalField.java b/jdk/src/share/classes/java/time/temporal/TemporalField.java
index e757734..51903ed 100644
--- a/jdk/src/share/classes/java/time/temporal/TemporalField.java
+++ b/jdk/src/share/classes/java/time/temporal/TemporalField.java
@@ -62,7 +62,6 @@
package java.time.temporal;
import java.time.DateTimeException;
-import java.time.ZoneId;
import java.time.chrono.Chronology;
import java.time.format.ResolverStyle;
import java.util.Locale;
@@ -338,6 +337,13 @@
* complete {@code LocalDate}. The resolve method will remove all three
* fields from the map before returning the {@code LocalDate}.
* <p>
+ * A partially complete temporal is used to allow the chronology and zone
+ * to be queried. In general, only the chronology will be needed.
+ * Querying items other than the zone or chronology is undefined and
+ * must not be relied on.
+ * The behavior of other methods such as {@code get}, {@code getLong},
+ * {@code range} and {@code isSupported} is unpredictable and the results undefined.
+ * <p>
* If resolution should be possible, but the data is invalid, the resolver
* style should be used to determine an appropriate level of leniency, which
* may require throwing a {@code DateTimeException} or {@code ArithmeticException}.
@@ -350,16 +356,14 @@
* instances that can produce a date, such as {@code EPOCH_DAY}.
* <p>
* Not all {@code TemporalAccessor} implementations are accepted as return values.
- * Implementations must accept {@code ChronoLocalDate}, {@code ChronoLocalDateTime},
- * {@code ChronoZonedDateTime} and {@code LocalTime}.
- * <p>
- * The zone is not normally required for resolution, but is provided for completeness.
+ * Implementations that call this method must accept {@code ChronoLocalDate},
+ * {@code ChronoLocalDateTime}, {@code ChronoZonedDateTime} and {@code LocalTime}.
* <p>
* The default implementation must return null.
*
* @param fieldValues the map of fields to values, which can be updated, not null
- * @param chronology the effective chronology, not null
- * @param zone the effective zone, not null
+ * @param partialTemporal the partially complete temporal to query for zone and
+ * chronology; querying for other things is undefined and not recommended, not null
* @param resolverStyle the requested type of resolve, not null
* @return the resolved temporal object; null if resolving only
* changed the map, or no resolve occurred
@@ -368,8 +372,9 @@
* by querying a field on the temporal without first checking if it is supported
*/
default TemporalAccessor resolve(
- Map<TemporalField, Long> fieldValues, Chronology chronology,
- ZoneId zone, ResolverStyle resolverStyle) {
+ Map<TemporalField, Long> fieldValues,
+ TemporalAccessor partialTemporal,
+ ResolverStyle resolverStyle) {
return null;
}
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalQueries.java b/jdk/src/share/classes/java/time/temporal/TemporalQueries.java
index f7c95ad..42fd4ab 100644
--- a/jdk/src/share/classes/java/time/temporal/TemporalQueries.java
+++ b/jdk/src/share/classes/java/time/temporal/TemporalQueries.java
@@ -78,10 +78,44 @@
* These are defined here as they must be constants, and the definition
* of lambdas does not guarantee that. By assigning them once here,
* they become 'normal' Java constants.
+ * <p>
+ * Queries are a key tool for extracting information from temporal objects.
+ * They exist to externalize the process of querying, permitting different
+ * approaches, as per the strategy design pattern.
+ * Examples might be a query that checks if the date is the day before February 29th
+ * in a leap year, or calculates the number of days to your next birthday.
+ * <p>
+ * The {@link TemporalField} interface provides another mechanism for querying
+ * temporal objects. That interface is limited to returning a {@code long}.
+ * By contrast, queries can return any type.
+ * <p>
+ * There are two equivalent ways of using a {@code TemporalQuery}.
+ * The first is to invoke the method on this interface directly.
+ * The second is to use {@link TemporalAccessor#query(TemporalQuery)}:
+ * <pre>
+ * // these two lines are equivalent, but the second approach is recommended
+ * temporal = thisQuery.queryFrom(temporal);
+ * temporal = temporal.query(thisQuery);
+ * </pre>
+ * It is recommended to use the second approach, {@code query(TemporalQuery)},
+ * as it is a lot clearer to read in code.
+ * <p>
+ * The most common implementations are method references, such as
+ * {@code LocalDate::from} and {@code ZoneId::from}.
+ * Additional common queries are provided to return:
+ * <ul>
+ * <li> a Chronology,
+ * <li> a LocalDate,
+ * <li> a LocalTime,
+ * <li> a ZoneOffset,
+ * <li> a precision,
+ * <li> a zone, or
+ * <li> a zoneId.
+ * </ul>
*
* @since 1.8
*/
-final class TemporalQueries {
+public final class TemporalQueries {
// note that it is vital that each method supplies a constant, not a
// calculated value, as they will be checked for using ==
// it is also vital that each constant is different (due to the == checking)
@@ -94,6 +128,216 @@
}
//-----------------------------------------------------------------------
+ // special constants should be used to extract information from a TemporalAccessor
+ // that cannot be derived in other ways
+ // Javadoc added here, so as to pretend they are more normal than they really are
+
+ /**
+ * A strict query for the {@code ZoneId}.
+ * <p>
+ * This queries a {@code TemporalAccessor} for the zone.
+ * The zone is only returned if the date-time conceptually contains a {@code ZoneId}.
+ * It will not be returned if the date-time only conceptually has an {@code ZoneOffset}.
+ * Thus a {@link java.time.ZonedDateTime} will return the result of {@code getZone()},
+ * but an {@link java.time.OffsetDateTime} will return null.
+ * <p>
+ * In most cases, applications should use {@link #zone()} as this query is too strict.
+ * <p>
+ * The result from JDK classes implementing {@code TemporalAccessor} is as follows:<br>
+ * {@code LocalDate} returns null<br>
+ * {@code LocalTime} returns null<br>
+ * {@code LocalDateTime} returns null<br>
+ * {@code ZonedDateTime} returns the associated zone<br>
+ * {@code OffsetTime} returns null<br>
+ * {@code OffsetDateTime} returns null<br>
+ * {@code ChronoLocalDate} returns null<br>
+ * {@code ChronoLocalDateTime} returns null<br>
+ * {@code ChronoZonedDateTime} returns the associated zone<br>
+ * {@code Era} returns null<br>
+ * {@code DayOfWeek} returns null<br>
+ * {@code Month} returns null<br>
+ * {@code Year} returns null<br>
+ * {@code YearMonth} returns null<br>
+ * {@code MonthDay} returns null<br>
+ * {@code ZoneOffset} returns null<br>
+ * {@code Instant} returns null<br>
+ *
+ * @return a query that can obtain the zone ID of a temporal, not null
+ */
+ public static TemporalQuery<ZoneId> zoneId() {
+ return TemporalQueries.ZONE_ID;
+ }
+
+ /**
+ * A query for the {@code Chronology}.
+ * <p>
+ * This queries a {@code TemporalAccessor} for the chronology.
+ * If the target {@code TemporalAccessor} represents a date, or part of a date,
+ * then it should return the chronology that the date is expressed in.
+ * As a result of this definition, objects only representing time, such as
+ * {@code LocalTime}, will return null.
+ * <p>
+ * The result from JDK classes implementing {@code TemporalAccessor} is as follows:<br>
+ * {@code LocalDate} returns {@code IsoChronology.INSTANCE}<br>
+ * {@code LocalTime} returns null (does not represent a date)<br>
+ * {@code LocalDateTime} returns {@code IsoChronology.INSTANCE}<br>
+ * {@code ZonedDateTime} returns {@code IsoChronology.INSTANCE}<br>
+ * {@code OffsetTime} returns null (does not represent a date)<br>
+ * {@code OffsetDateTime} returns {@code IsoChronology.INSTANCE}<br>
+ * {@code ChronoLocalDate} returns the associated chronology<br>
+ * {@code ChronoLocalDateTime} returns the associated chronology<br>
+ * {@code ChronoZonedDateTime} returns the associated chronology<br>
+ * {@code Era} returns the associated chronology<br>
+ * {@code DayOfWeek} returns null (shared across chronologies)<br>
+ * {@code Month} returns {@code IsoChronology.INSTANCE}<br>
+ * {@code Year} returns {@code IsoChronology.INSTANCE}<br>
+ * {@code YearMonth} returns {@code IsoChronology.INSTANCE}<br>
+ * {@code MonthDay} returns null {@code IsoChronology.INSTANCE}<br>
+ * {@code ZoneOffset} returns null (does not represent a date)<br>
+ * {@code Instant} returns null (does not represent a date)<br>
+ * <p>
+ * The method {@link java.time.chrono.Chronology#from(TemporalAccessor)} can be used as a
+ * {@code TemporalQuery} via a method reference, {@code Chronology::from}.
+ * That method is equivalent to this query, except that it throws an
+ * exception if a chronology cannot be obtained.
+ *
+ * @return a query that can obtain the chronology of a temporal, not null
+ */
+ public static TemporalQuery<Chronology> chronology() {
+ return TemporalQueries.CHRONO;
+ }
+
+ /**
+ * A query for the smallest supported unit.
+ * <p>
+ * This queries a {@code TemporalAccessor} for the time precision.
+ * If the target {@code TemporalAccessor} represents a consistent or complete date-time,
+ * date or time then this must return the smallest precision actually supported.
+ * Note that fields such as {@code NANO_OF_DAY} and {@code NANO_OF_SECOND}
+ * are defined to always return ignoring the precision, thus this is the only
+ * way to find the actual smallest supported unit.
+ * For example, were {@code GregorianCalendar} to implement {@code TemporalAccessor}
+ * it would return a precision of {@code MILLIS}.
+ * <p>
+ * The result from JDK classes implementing {@code TemporalAccessor} is as follows:<br>
+ * {@code LocalDate} returns {@code DAYS}<br>
+ * {@code LocalTime} returns {@code NANOS}<br>
+ * {@code LocalDateTime} returns {@code NANOS}<br>
+ * {@code ZonedDateTime} returns {@code NANOS}<br>
+ * {@code OffsetTime} returns {@code NANOS}<br>
+ * {@code OffsetDateTime} returns {@code NANOS}<br>
+ * {@code ChronoLocalDate} returns {@code DAYS}<br>
+ * {@code ChronoLocalDateTime} returns {@code NANOS}<br>
+ * {@code ChronoZonedDateTime} returns {@code NANOS}<br>
+ * {@code Era} returns {@code ERAS}<br>
+ * {@code DayOfWeek} returns {@code DAYS}<br>
+ * {@code Month} returns {@code MONTHS}<br>
+ * {@code Year} returns {@code YEARS}<br>
+ * {@code YearMonth} returns {@code MONTHS}<br>
+ * {@code MonthDay} returns null (does not represent a complete date or time)<br>
+ * {@code ZoneOffset} returns null (does not represent a date or time)<br>
+ * {@code Instant} returns {@code NANOS}<br>
+ *
+ * @return a query that can obtain the precision of a temporal, not null
+ */
+ public static TemporalQuery<TemporalUnit> precision() {
+ return TemporalQueries.PRECISION;
+ }
+
+ //-----------------------------------------------------------------------
+ // non-special constants are standard queries that derive information from other information
+ /**
+ * A lenient query for the {@code ZoneId}, falling back to the {@code ZoneOffset}.
+ * <p>
+ * This queries a {@code TemporalAccessor} for the zone.
+ * It first tries to obtain the zone, using {@link #zoneId()}.
+ * If that is not found it tries to obtain the {@link #offset()}.
+ * Thus a {@link java.time.ZonedDateTime} will return the result of {@code getZone()},
+ * while an {@link java.time.OffsetDateTime} will return the result of {@code getOffset()}.
+ * <p>
+ * In most cases, applications should use this query rather than {@code #zoneId()}.
+ * <p>
+ * The method {@link ZoneId#from(TemporalAccessor)} can be used as a
+ * {@code TemporalQuery} via a method reference, {@code ZoneId::from}.
+ * That method is equivalent to this query, except that it throws an
+ * exception if a zone cannot be obtained.
+ *
+ * @return a query that can obtain the zone ID or offset of a temporal, not null
+ */
+ public static TemporalQuery<ZoneId> zone() {
+ return TemporalQueries.ZONE;
+ }
+
+ /**
+ * A query for {@code ZoneOffset} returning null if not found.
+ * <p>
+ * This returns a {@code TemporalQuery} that can be used to query a temporal
+ * object for the offset. The query will return null if the temporal
+ * object cannot supply an offset.
+ * <p>
+ * The query implementation examines the {@link ChronoField#OFFSET_SECONDS OFFSET_SECONDS}
+ * field and uses it to create a {@code ZoneOffset}.
+ * <p>
+ * The method {@link java.time.ZoneOffset#from(TemporalAccessor)} can be used as a
+ * {@code TemporalQuery} via a method reference, {@code ZoneOffset::from}.
+ * This query and {@code ZoneOffset::from} will return the same result if the
+ * temporal object contains an offset. If the temporal object does not contain
+ * an offset, then the method reference will throw an exception, whereas this
+ * query will return null.
+ *
+ * @return a query that can obtain the offset of a temporal, not null
+ */
+ public static TemporalQuery<ZoneOffset> offset() {
+ return TemporalQueries.OFFSET;
+ }
+
+ /**
+ * A query for {@code LocalDate} returning null if not found.
+ * <p>
+ * This returns a {@code TemporalQuery} that can be used to query a temporal
+ * object for the local date. The query will return null if the temporal
+ * object cannot supply a local date.
+ * <p>
+ * The query implementation examines the {@link ChronoField#EPOCH_DAY EPOCH_DAY}
+ * field and uses it to create a {@code LocalDate}.
+ * <p>
+ * The method {@link ZoneOffset#from(TemporalAccessor)} can be used as a
+ * {@code TemporalQuery} via a method reference, {@code LocalDate::from}.
+ * This query and {@code LocalDate::from} will return the same result if the
+ * temporal object contains a date. If the temporal object does not contain
+ * a date, then the method reference will throw an exception, whereas this
+ * query will return null.
+ *
+ * @return a query that can obtain the date of a temporal, not null
+ */
+ public static TemporalQuery<LocalDate> localDate() {
+ return TemporalQueries.LOCAL_DATE;
+ }
+
+ /**
+ * A query for {@code LocalTime} returning null if not found.
+ * <p>
+ * This returns a {@code TemporalQuery} that can be used to query a temporal
+ * object for the local time. The query will return null if the temporal
+ * object cannot supply a local time.
+ * <p>
+ * The query implementation examines the {@link ChronoField#NANO_OF_DAY NANO_OF_DAY}
+ * field and uses it to create a {@code LocalTime}.
+ * <p>
+ * The method {@link ZoneOffset#from(TemporalAccessor)} can be used as a
+ * {@code TemporalQuery} via a method reference, {@code LocalTime::from}.
+ * This query and {@code LocalTime::from} will return the same result if the
+ * temporal object contains a time. If the temporal object does not contain
+ * a time, then the method reference will throw an exception, whereas this
+ * query will return null.
+ *
+ * @return a query that can obtain the time of a temporal, not null
+ */
+ public static TemporalQuery<LocalTime> localTime() {
+ return TemporalQueries.LOCAL_TIME;
+ }
+
+ //-----------------------------------------------------------------------
/**
* A strict query for the {@code ZoneId}.
*/
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalQuery.java b/jdk/src/share/classes/java/time/temporal/TemporalQuery.java
index 188b13d..9614296 100644
--- a/jdk/src/share/classes/java/time/temporal/TemporalQuery.java
+++ b/jdk/src/share/classes/java/time/temporal/TemporalQuery.java
@@ -62,11 +62,6 @@
package java.time.temporal;
import java.time.DateTimeException;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.chrono.Chronology;
/**
* Strategy for querying a temporal object.
@@ -94,12 +89,14 @@
* <p>
* The most common implementations are method references, such as
* {@code LocalDate::from} and {@code ZoneId::from}.
- * Additional common implementations are provided on this interface as static methods.
+ * Additional common queries are provided as static methods in {@link TemporalQueries}.
*
* @implSpec
* This interface places no restrictions on the mutability of implementations,
* however immutability is strongly recommended.
*
+ * @param <R> the type returned from the query
+ *
* @since 1.8
*/
@FunctionalInterface
@@ -133,7 +130,7 @@
* <p>
* The input temporal object may be in a calendar system other than ISO.
* Implementations may choose to document compatibility with other calendar systems,
- * or reject non-ISO temporal objects by {@link TemporalQuery#chronology() querying the chronology}.
+ * or reject non-ISO temporal objects by {@link TemporalQueries#chronology() querying the chronology}.
* <p>
* This method may be called from multiple threads in parallel.
* It must be thread-safe when invoked.
@@ -145,214 +142,4 @@
*/
R queryFrom(TemporalAccessor temporal);
- //-----------------------------------------------------------------------
- // special constants should be used to extract information from a TemporalAccessor
- // that cannot be derived in other ways
- // Javadoc added here, so as to pretend they are more normal than they really are
-
- /**
- * A strict query for the {@code ZoneId}.
- * <p>
- * This queries a {@code TemporalAccessor} for the zone.
- * The zone is only returned if the date-time conceptually contains a {@code ZoneId}.
- * It will not be returned if the date-time only conceptually has an {@code ZoneOffset}.
- * Thus a {@link java.time.ZonedDateTime} will return the result of {@code getZone()},
- * but an {@link java.time.OffsetDateTime} will return null.
- * <p>
- * In most cases, applications should use {@link #zone()} as this query is too strict.
- * <p>
- * The result from JDK classes implementing {@code TemporalAccessor} is as follows:<br>
- * {@code LocalDate} returns null<br>
- * {@code LocalTime} returns null<br>
- * {@code LocalDateTime} returns null<br>
- * {@code ZonedDateTime} returns the associated zone<br>
- * {@code OffsetTime} returns null<br>
- * {@code OffsetDateTime} returns null<br>
- * {@code ChronoLocalDate} returns null<br>
- * {@code ChronoLocalDateTime} returns null<br>
- * {@code ChronoZonedDateTime} returns the associated zone<br>
- * {@code Era} returns null<br>
- * {@code DayOfWeek} returns null<br>
- * {@code Month} returns null<br>
- * {@code Year} returns null<br>
- * {@code YearMonth} returns null<br>
- * {@code MonthDay} returns null<br>
- * {@code ZoneOffset} returns null<br>
- * {@code Instant} returns null<br>
- *
- * @return a query that can obtain the zone ID of a temporal, not null
- */
- static TemporalQuery<ZoneId> zoneId() {
- return TemporalQueries.ZONE_ID;
- }
-
- /**
- * A query for the {@code Chronology}.
- * <p>
- * This queries a {@code TemporalAccessor} for the chronology.
- * If the target {@code TemporalAccessor} represents a date, or part of a date,
- * then it should return the chronology that the date is expressed in.
- * As a result of this definition, objects only representing time, such as
- * {@code LocalTime}, will return null.
- * <p>
- * The result from JDK classes implementing {@code TemporalAccessor} is as follows:<br>
- * {@code LocalDate} returns {@code IsoChronology.INSTANCE}<br>
- * {@code LocalTime} returns null (does not represent a date)<br>
- * {@code LocalDateTime} returns {@code IsoChronology.INSTANCE}<br>
- * {@code ZonedDateTime} returns {@code IsoChronology.INSTANCE}<br>
- * {@code OffsetTime} returns null (does not represent a date)<br>
- * {@code OffsetDateTime} returns {@code IsoChronology.INSTANCE}<br>
- * {@code ChronoLocalDate} returns the associated chronology<br>
- * {@code ChronoLocalDateTime} returns the associated chronology<br>
- * {@code ChronoZonedDateTime} returns the associated chronology<br>
- * {@code Era} returns the associated chronology<br>
- * {@code DayOfWeek} returns null (shared across chronologies)<br>
- * {@code Month} returns {@code IsoChronology.INSTANCE}<br>
- * {@code Year} returns {@code IsoChronology.INSTANCE}<br>
- * {@code YearMonth} returns {@code IsoChronology.INSTANCE}<br>
- * {@code MonthDay} returns null {@code IsoChronology.INSTANCE}<br>
- * {@code ZoneOffset} returns null (does not represent a date)<br>
- * {@code Instant} returns null (does not represent a date)<br>
- * <p>
- * The method {@link java.time.chrono.Chronology#from(TemporalAccessor)} can be used as a
- * {@code TemporalQuery} via a method reference, {@code Chronology::from}.
- * That method is equivalent to this query, except that it throws an
- * exception if a chronology cannot be obtained.
- *
- * @return a query that can obtain the chronology of a temporal, not null
- */
- static TemporalQuery<Chronology> chronology() {
- return TemporalQueries.CHRONO;
- }
-
- /**
- * A query for the smallest supported unit.
- * <p>
- * This queries a {@code TemporalAccessor} for the time precision.
- * If the target {@code TemporalAccessor} represents a consistent or complete date-time,
- * date or time then this must return the smallest precision actually supported.
- * Note that fields such as {@code NANO_OF_DAY} and {@code NANO_OF_SECOND}
- * are defined to always return ignoring the precision, thus this is the only
- * way to find the actual smallest supported unit.
- * For example, were {@code GregorianCalendar} to implement {@code TemporalAccessor}
- * it would return a precision of {@code MILLIS}.
- * <p>
- * The result from JDK classes implementing {@code TemporalAccessor} is as follows:<br>
- * {@code LocalDate} returns {@code DAYS}<br>
- * {@code LocalTime} returns {@code NANOS}<br>
- * {@code LocalDateTime} returns {@code NANOS}<br>
- * {@code ZonedDateTime} returns {@code NANOS}<br>
- * {@code OffsetTime} returns {@code NANOS}<br>
- * {@code OffsetDateTime} returns {@code NANOS}<br>
- * {@code ChronoLocalDate} returns {@code DAYS}<br>
- * {@code ChronoLocalDateTime} returns {@code NANOS}<br>
- * {@code ChronoZonedDateTime} returns {@code NANOS}<br>
- * {@code Era} returns {@code ERAS}<br>
- * {@code DayOfWeek} returns {@code DAYS}<br>
- * {@code Month} returns {@code MONTHS}<br>
- * {@code Year} returns {@code YEARS}<br>
- * {@code YearMonth} returns {@code MONTHS}<br>
- * {@code MonthDay} returns null (does not represent a complete date or time)<br>
- * {@code ZoneOffset} returns null (does not represent a date or time)<br>
- * {@code Instant} returns {@code NANOS}<br>
- *
- * @return a query that can obtain the precision of a temporal, not null
- */
- static TemporalQuery<TemporalUnit> precision() {
- return TemporalQueries.PRECISION;
- }
-
- //-----------------------------------------------------------------------
- // non-special constants are standard queries that derive information from other information
- /**
- * A lenient query for the {@code ZoneId}, falling back to the {@code ZoneOffset}.
- * <p>
- * This queries a {@code TemporalAccessor} for the zone.
- * It first tries to obtain the zone, using {@link #zoneId()}.
- * If that is not found it tries to obtain the {@link #offset()}.
- * Thus a {@link java.time.ZonedDateTime} will return the result of {@code getZone()},
- * while an {@link java.time.OffsetDateTime} will return the result of {@code getOffset()}.
- * <p>
- * In most cases, applications should use this query rather than {@code #zoneId()}.
- * <p>
- * The method {@link ZoneId#from(TemporalAccessor)} can be used as a
- * {@code TemporalQuery} via a method reference, {@code ZoneId::from}.
- * That method is equivalent to this query, except that it throws an
- * exception if a zone cannot be obtained.
- *
- * @return a query that can obtain the zone ID or offset of a temporal, not null
- */
- static TemporalQuery<ZoneId> zone() {
- return TemporalQueries.ZONE;
- }
-
- /**
- * A query for {@code ZoneOffset} returning null if not found.
- * <p>
- * This returns a {@code TemporalQuery} that can be used to query a temporal
- * object for the offset. The query will return null if the temporal
- * object cannot supply an offset.
- * <p>
- * The query implementation examines the {@link ChronoField#OFFSET_SECONDS OFFSET_SECONDS}
- * field and uses it to create a {@code ZoneOffset}.
- * <p>
- * The method {@link java.time.ZoneOffset#from(TemporalAccessor)} can be used as a
- * {@code TemporalQuery} via a method reference, {@code ZoneOffset::from}.
- * This query and {@code ZoneOffset::from} will return the same result if the
- * temporal object contains an offset. If the temporal object does not contain
- * an offset, then the method reference will throw an exception, whereas this
- * query will return null.
- *
- * @return a query that can obtain the offset of a temporal, not null
- */
- static TemporalQuery<ZoneOffset> offset() {
- return TemporalQueries.OFFSET;
- }
-
- /**
- * A query for {@code LocalDate} returning null if not found.
- * <p>
- * This returns a {@code TemporalQuery} that can be used to query a temporal
- * object for the local date. The query will return null if the temporal
- * object cannot supply a local date.
- * <p>
- * The query implementation examines the {@link ChronoField#EPOCH_DAY EPOCH_DAY}
- * field and uses it to create a {@code LocalDate}.
- * <p>
- * The method {@link ZoneOffset#from(TemporalAccessor)} can be used as a
- * {@code TemporalQuery} via a method reference, {@code LocalDate::from}.
- * This query and {@code LocalDate::from} will return the same result if the
- * temporal object contains a date. If the temporal object does not contain
- * a date, then the method reference will throw an exception, whereas this
- * query will return null.
- *
- * @return a query that can obtain the date of a temporal, not null
- */
- static TemporalQuery<LocalDate> localDate() {
- return TemporalQueries.LOCAL_DATE;
- }
-
- /**
- * A query for {@code LocalTime} returning null if not found.
- * <p>
- * This returns a {@code TemporalQuery} that can be used to query a temporal
- * object for the local time. The query will return null if the temporal
- * object cannot supply a local time.
- * <p>
- * The query implementation examines the {@link ChronoField#NANO_OF_DAY NANO_OF_DAY}
- * field and uses it to create a {@code LocalTime}.
- * <p>
- * The method {@link ZoneOffset#from(TemporalAccessor)} can be used as a
- * {@code TemporalQuery} via a method reference, {@code LocalTime::from}.
- * This query and {@code LocalTime::from} will return the same result if the
- * temporal object contains a time. If the temporal object does not contain
- * a time, then the method reference will throw an exception, whereas this
- * query will return null.
- *
- * @return a query that can obtain the time of a temporal, not null
- */
- static TemporalQuery<LocalTime> localTime() {
- return TemporalQueries.LOCAL_TIME;
- }
-
}
diff --git a/jdk/src/share/classes/java/time/temporal/WeekFields.java b/jdk/src/share/classes/java/time/temporal/WeekFields.java
index b3eb138..dcc459a 100644
--- a/jdk/src/share/classes/java/time/temporal/WeekFields.java
+++ b/jdk/src/share/classes/java/time/temporal/WeekFields.java
@@ -64,7 +64,6 @@
import static java.time.temporal.ChronoField.DAY_OF_MONTH;
import static java.time.temporal.ChronoField.DAY_OF_WEEK;
import static java.time.temporal.ChronoField.DAY_OF_YEAR;
-import static java.time.temporal.ChronoField.EPOCH_DAY;
import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
import static java.time.temporal.ChronoField.YEAR;
import static java.time.temporal.ChronoUnit.DAYS;
@@ -77,12 +76,9 @@
import java.io.Serializable;
import java.time.DateTimeException;
import java.time.DayOfWeek;
-import java.time.ZoneId;
import java.time.chrono.ChronoLocalDate;
import java.time.chrono.Chronology;
import java.time.format.ResolverStyle;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
@@ -119,16 +115,16 @@
* For example, the ISO-8601 standard considers Monday to be the first day-of-week.
* <li>The minimal number of days in the first week.
* For example, the ISO-8601 standard counts the first week as needing at least 4 days.
- * </ul><p>
+ * </ul>
* Together these two values allow a year or month to be divided into weeks.
- * <p>
+ *
* <h3>Week of Month</h3>
* One field is used: week-of-month.
* The calculation ensures that weeks never overlap a month boundary.
* The month is divided into periods where each period starts on the defined first day-of-week.
* The earliest period is referred to as week 0 if it has less than the minimal number of days
* and week 1 if it has at least the minimal number of days.
- * <p>
+ *
* <table cellpadding="0" cellspacing="3" border="0" style="text-align: left; width: 50%;">
* <caption>Examples of WeekFields</caption>
* <tr><th>Date</th><td>Day-of-week</td>
@@ -892,7 +888,7 @@
@Override
public ChronoLocalDate resolve(
- Map<TemporalField, Long> fieldValues, Chronology chronology, ZoneId zone, ResolverStyle resolverStyle) {
+ Map<TemporalField, Long> fieldValues, TemporalAccessor partialTemporal, ResolverStyle resolverStyle) {
final long value = fieldValues.get(this);
final int newValue = Math.toIntExact(value); // broad limit makes overflow checking lighter
// first convert localized day-of-week to ISO day-of-week
@@ -915,19 +911,20 @@
int dow = localizedDayOfWeek(isoDow);
// build date
+ Chronology chrono = Chronology.from(partialTemporal);
if (fieldValues.containsKey(YEAR)) {
int year = YEAR.checkValidIntValue(fieldValues.get(YEAR)); // validate
if (rangeUnit == MONTHS && fieldValues.containsKey(MONTH_OF_YEAR)) { // week-of-month
long month = fieldValues.get(MONTH_OF_YEAR); // not validated yet
- return resolveWoM(fieldValues, chronology, year, month, newValue, dow, resolverStyle);
+ return resolveWoM(fieldValues, chrono, year, month, newValue, dow, resolverStyle);
}
if (rangeUnit == YEARS) { // week-of-year
- return resolveWoY(fieldValues, chronology, year, newValue, dow, resolverStyle);
+ return resolveWoY(fieldValues, chrono, year, newValue, dow, resolverStyle);
}
} else if ((rangeUnit == WEEK_BASED_YEARS || rangeUnit == FOREVER) &&
fieldValues.containsKey(weekDef.weekBasedYear) &&
fieldValues.containsKey(weekDef.weekOfWeekBasedYear)) { // week-of-week-based-year and year-of-week-based-year
- return resolveWBY(fieldValues, chronology, dow, resolverStyle);
+ return resolveWBY(fieldValues, chrono, dow, resolverStyle);
}
return null;
}
diff --git a/jdk/src/share/classes/java/time/temporal/package-info.java b/jdk/src/share/classes/java/time/temporal/package-info.java
index fe4d3f8..d3e9c05 100644
--- a/jdk/src/share/classes/java/time/temporal/package-info.java
+++ b/jdk/src/share/classes/java/time/temporal/package-info.java
@@ -81,7 +81,7 @@
* A unit is used to measure an amount of time, such as years, days or minutes.
* All units implement {@link java.time.temporal.TemporalUnit}.
* The set of well known units is defined in {@link java.time.temporal.ChronoUnit}, such as {@code DAYS}.
- * The unit interface is designed to allow applications defined units.
+ * The unit interface is designed to allow application defined units.
* </p>
* <p>
* A field is used to express part of a larger date-time, such as year, month-of-year or second-of-minute.
@@ -89,7 +89,7 @@
* The set of well known fields are defined in {@link java.time.temporal.ChronoField}, such as {@code HOUR_OF_DAY}.
* Additional fields are defined by {@link java.time.temporal.JulianFields}, {@link java.time.temporal.WeekFields}
* and {@link java.time.temporal.IsoFields}.
- * The field interface is designed to allow applications defined fields.
+ * The field interface is designed to allow application defined fields.
* </p>
* <p>
* This package provides tools that allow the units and fields of date and time to be accessed
@@ -112,23 +112,23 @@
* such as the "last day of the month", or "next Wednesday".
* These are modeled as functions that adjust a base date-time.
* The functions implement {@link java.time.temporal.TemporalAdjuster} and operate on {@code Temporal}.
- * A set of common functions are provided in {@code TemporalAdjuster}.
+ * A set of common functions are provided in {@link java.time.temporal.TemporalAdjusters}.
* For example, to find the first occurrence of a day-of-week after a given date, use
- * {@link java.time.temporal.TemporalAdjuster#next(DayOfWeek)}, such as
+ * {@link java.time.temporal.TemporalAdjusters#next(DayOfWeek)}, such as
* {@code date.with(next(MONDAY))}.
- * Applications can also define adjusters by implementing {@code TemporalAdjuster}.
+ * Applications can also define adjusters by implementing {@link java.time.temporal.TemporalAdjuster}.
* </p>
* <p>
* The {@link java.time.temporal.TemporalAmount} interface models amounts of relative time.
* </p>
* <p>
- * In addition to adjusting a date-time, an interface is provided to enable querying -
+ * In addition to adjusting a date-time, an interface is provided to enable querying via
* {@link java.time.temporal.TemporalQuery}.
* The most common implementations of the query interface are method references.
* The {@code from(TemporalAccessor)} methods on major classes can all be used, such as
* {@code LocalDate::from} or {@code Month::from}.
- * Further implementations are provided in {@code TemporalQuery} as static methods.
- * Applications can also define queries by implementing {@code TemporalQuery}.
+ * Further implementations are provided in {@link java.time.temporal.TemporalQueries} as static methods.
+ * Applications can also define queries by implementing {@link java.time.temporal.TemporalQuery}.
* </p>
*
* <h3>Weeks</h3>
diff --git a/jdk/src/share/classes/java/time/zone/ZoneOffsetTransitionRule.java b/jdk/src/share/classes/java/time/zone/ZoneOffsetTransitionRule.java
index 20e97f0..d0b182b 100644
--- a/jdk/src/share/classes/java/time/zone/ZoneOffsetTransitionRule.java
+++ b/jdk/src/share/classes/java/time/zone/ZoneOffsetTransitionRule.java
@@ -61,8 +61,8 @@
*/
package java.time.zone;
-import static java.time.temporal.TemporalAdjuster.nextOrSame;
-import static java.time.temporal.TemporalAdjuster.previousOrSame;
+import static java.time.temporal.TemporalAdjusters.nextOrSame;
+import static java.time.temporal.TemporalAdjusters.previousOrSame;
import java.io.DataInput;
import java.io.DataOutput;
@@ -83,12 +83,12 @@
* <p>
* This class allows rules for identifying future transitions to be expressed.
* A rule might be written in many forms:
- * <p><ul>
+ * <ul>
* <li>the 16th March
* <li>the Sunday on or after the 16th March
* <li>the Sunday on or before the 16th March
* <li>the last Sunday in February
- * </ul><p>
+ * </ul>
* These different rule types can be expressed and queried.
*
* @implSpec
@@ -575,11 +575,11 @@
* transition date-time.
* <p>
* Time zone rules are expressed in one of three ways:
- * <p><ul>
+ * <ul>
* <li>Relative to UTC</li>
* <li>Relative to the standard offset in force</li>
* <li>Relative to the wall offset (what you would see on a clock on the wall)</li>
- * </ul><p>
+ * </ul>
*/
public static enum TimeDefinition {
/** The local date-time is expressed in terms of the UTC offset. */
diff --git a/jdk/src/share/classes/java/time/zone/ZoneRules.java b/jdk/src/share/classes/java/time/zone/ZoneRules.java
index 064a2d8..4ed1275 100644
--- a/jdk/src/share/classes/java/time/zone/ZoneRules.java
+++ b/jdk/src/share/classes/java/time/zone/ZoneRules.java
@@ -508,7 +508,7 @@
* <p>
* The mapping from a local date-time to an offset is not straightforward.
* There are three cases:
- * <p><ul>
+ * <ul>
* <li>Normal, with one valid offset. For the vast majority of the year, the normal
* case applies, where there is a single valid offset for the local date-time.</li>
* <li>Gap, with zero valid offsets. This is when clocks jump forward typically
@@ -517,7 +517,7 @@
* <li>Overlap, with two valid offsets. This is when clocks are set back typically
* due to the autumn daylight savings change from "summer" to "winter".
* In an overlap there are local date-time values with two valid offsets.</li>
- * </ul><p>
+ * </ul>
* Thus, for any given local date-time there can be zero, one or two valid offsets.
* This method returns the single offset in the Normal case, and in the Gap or Overlap
* case it returns the offset before the transition.
@@ -544,7 +544,7 @@
* <p>
* The mapping from a local date-time to an offset is not straightforward.
* There are three cases:
- * <p><ul>
+ * <ul>
* <li>Normal, with one valid offset. For the vast majority of the year, the normal
* case applies, where there is a single valid offset for the local date-time.</li>
* <li>Gap, with zero valid offsets. This is when clocks jump forward typically
@@ -553,7 +553,7 @@
* <li>Overlap, with two valid offsets. This is when clocks are set back typically
* due to the autumn daylight savings change from "summer" to "winter".
* In an overlap there are local date-time values with two valid offsets.</li>
- * </ul><p>
+ * </ul>
* Thus, for any given local date-time there can be zero, one or two valid offsets.
* This method returns that list of valid offsets, which is a list of size 0, 1 or 2.
* In the case where there are two offsets, the earlier offset is returned at index 0
@@ -595,7 +595,7 @@
* <p>
* The mapping from a local date-time to an offset is not straightforward.
* There are three cases:
- * <p><ul>
+ * <ul>
* <li>Normal, with one valid offset. For the vast majority of the year, the normal
* case applies, where there is a single valid offset for the local date-time.</li>
* <li>Gap, with zero valid offsets. This is when clocks jump forward typically
@@ -604,7 +604,7 @@
* <li>Overlap, with two valid offsets. This is when clocks are set back typically
* due to the autumn daylight savings change from "summer" to "winter".
* In an overlap there are local date-time values with two valid offsets.</li>
- * </ul><p>
+ * </ul>
* A transition is used to model the cases of a Gap or Overlap.
* The Normal case will return null.
* <p>
diff --git a/jdk/src/share/classes/java/util/DoubleSummaryStatistics.java b/jdk/src/share/classes/java/util/DoubleSummaryStatistics.java
index 63c887e..947f47c 100644
--- a/jdk/src/share/classes/java/util/DoubleSummaryStatistics.java
+++ b/jdk/src/share/classes/java/util/DoubleSummaryStatistics.java
@@ -111,12 +111,24 @@
/**
* Returns the sum of values recorded, or zero if no values have been
- * recorded. The sum returned can vary depending upon the order in which
- * values are recorded. This is due to accumulated rounding error in
- * addition of values of differing magnitudes. Values sorted by increasing
- * absolute magnitude tend to yield more accurate results. If any recorded
- * value is a {@code NaN} or the sum is at any point a {@code NaN} then the
- * sum will be {@code NaN}.
+ * recorded.
+ *
+ * If any recorded value is a NaN or the sum is at any point a NaN
+ * then the sum will be NaN.
+ *
+ * <p> The value of a floating-point sum is a function both of the
+ * input values as well as the order of addition operations. The
+ * order of addition operations of this method is intentionally
+ * not defined to allow for implementation flexibility to improve
+ * the speed and accuracy of the computed result.
+ *
+ * In particular, this method may be implemented using compensated
+ * summation or other technique to reduce the error bound in the
+ * numerical sum compared to a simple summation of {@code double}
+ * values.
+ *
+ * @apiNote Sorting values by increasing absolute magnitude tends to yield
+ * more accurate results.
*
* @return the sum of values, or zero if none
*/
@@ -153,13 +165,21 @@
}
/**
- * Returns the arithmetic mean of values recorded, or zero if no values have been
- * recorded. The average returned can vary depending upon the order in
- * which values are recorded. This is due to accumulated rounding error in
- * addition of values of differing magnitudes. Values sorted by increasing
- * absolute magnitude tend to yield more accurate results. If any recorded
- * value is a {@code NaN} or the sum is at any point a {@code NaN} then the
- * average will be {@code NaN}.
+ * Returns the arithmetic mean of values recorded, or zero if no
+ * values have been recorded.
+ *
+ * If any recorded value is a NaN or the sum is at any point a NaN
+ * then the average will be code NaN.
+ *
+ * <p>The average returned can vary depending upon the order in
+ * which values are recorded.
+ *
+ * This method may be implemented using compensated summation or
+ * other technique to reduce the error bound in the {@link #getSum
+ * numerical sum} used to compute the average.
+ *
+ * @apiNote Values sorted by increasing absolute magnitude tend to yield
+ * more accurate results.
*
* @return the arithmetic mean of values, or zero if none
*/
diff --git a/jdk/src/share/classes/java/util/Formatter.java b/jdk/src/share/classes/java/util/Formatter.java
index 3f30c5e..a94234a 100644
--- a/jdk/src/share/classes/java/util/Formatter.java
+++ b/jdk/src/share/classes/java/util/Formatter.java
@@ -56,7 +56,7 @@
import java.time.ZoneOffset;
import java.time.temporal.ChronoField;
import java.time.temporal.TemporalAccessor;
-import java.time.temporal.TemporalQuery;
+import java.time.temporal.TemporalQueries;
import sun.misc.DoubleConsts;
import sun.misc.FormattedFloatingDecimal;
@@ -4153,7 +4153,7 @@
break;
}
case DateTime.ZONE: { // 'Z' (symbol)
- ZoneId zid = t.query(TemporalQuery.zone());
+ ZoneId zid = t.query(TemporalQueries.zone());
if (zid == null) {
throw new IllegalFormatConversionException(c, t.getClass());
}
diff --git a/jdk/src/share/classes/java/util/HashSet.java b/jdk/src/share/classes/java/util/HashSet.java
index 6ab58d0..f9b09ee 100644
--- a/jdk/src/share/classes/java/util/HashSet.java
+++ b/jdk/src/share/classes/java/util/HashSet.java
@@ -25,6 +25,8 @@
package java.util;
+import java.io.InvalidObjectException;
+
/**
* This class implements the <tt>Set</tt> interface, backed by a hash table
* (actually a <tt>HashMap</tt> instance). It makes no guarantees as to the
@@ -294,16 +296,37 @@
// Read in any hidden serialization magic
s.defaultReadObject();
- // Read in HashMap capacity and load factor and create backing HashMap
+ // Read capacity and verify non-negative.
int capacity = s.readInt();
+ if (capacity < 0) {
+ throw new InvalidObjectException("Illegal capacity: " +
+ capacity);
+ }
+
+ // Read load factor and verify positive and non NaN.
float loadFactor = s.readFloat();
+ if (loadFactor <= 0 || Float.isNaN(loadFactor)) {
+ throw new InvalidObjectException("Illegal load factor: " +
+ loadFactor);
+ }
+
+ // Read size and verify non-negative.
+ int size = s.readInt();
+ if (size < 0) {
+ throw new InvalidObjectException("Illegal size: " +
+ size);
+ }
+
+ // Set the capacity according to the size and load factor ensuring that
+ // the HashMap is at least 25% full but clamping to maximum capacity.
+ capacity = (int) Math.min(size * Math.min(1 / loadFactor, 4.0f),
+ HashMap.MAXIMUM_CAPACITY);
+
+ // Create backing HashMap
map = (((HashSet<?>)this) instanceof LinkedHashSet ?
new LinkedHashMap<E,Object>(capacity, loadFactor) :
new HashMap<E,Object>(capacity, loadFactor));
- // Read in size
- int size = s.readInt();
-
// Read in all elements in the proper order.
for (int i=0; i<size; i++) {
@SuppressWarnings("unchecked")
diff --git a/jdk/src/share/classes/java/util/Map.java b/jdk/src/share/classes/java/util/Map.java
index d1695ef..d67e58d 100644
--- a/jdk/src/share/classes/java/util/Map.java
+++ b/jdk/src/share/classes/java/util/Map.java
@@ -465,6 +465,7 @@
* @param <V> the type of the map values
* @return a comparator that compares {@link Map.Entry} in natural order on key.
* @see Comparable
+ * @since 1.8
*/
public static <K extends Comparable<? super K>, V> Comparator<Map.Entry<K,V>> comparingByKey() {
return (Comparator<Map.Entry<K, V>> & Serializable)
@@ -481,6 +482,7 @@
* @param <V> the {@link Comparable} type of the map values
* @return a comparator that compares {@link Map.Entry} in natural order on value.
* @see Comparable
+ * @since 1.8
*/
public static <K, V extends Comparable<? super V>> Comparator<Map.Entry<K,V>> comparingByValue() {
return (Comparator<Map.Entry<K, V>> & Serializable)
@@ -498,6 +500,7 @@
* @param <V> the type of the map values
* @param cmp the key {@link Comparator}
* @return a comparator that compares {@link Map.Entry} by the key.
+ * @since 1.8
*/
public static <K, V> Comparator<Map.Entry<K, V>> comparingByKey(Comparator<? super K> cmp) {
Objects.requireNonNull(cmp);
@@ -516,6 +519,7 @@
* @param <V> the type of the map values
* @param cmp the value {@link Comparator}
* @return a comparator that compares {@link Map.Entry} by the value.
+ * @since 1.8
*/
public static <K, V> Comparator<Map.Entry<K, V>> comparingByValue(Comparator<? super V> cmp) {
Objects.requireNonNull(cmp);
@@ -558,26 +562,27 @@
// Defaultable methods
/**
- * Returns the value to which the specified key is mapped,
- * or {@code defaultValue} if this map contains no mapping
- * for the key.
- *
- * <p>The default implementation makes no guarantees about synchronization
- * or atomicity properties of this method. Any implementation providing
- * atomicity guarantees must override this method and document its
- * concurrency properties.
- *
- * @param key the key whose associated value is to be returned
- * @param defaultValue the default mapping of the key
- * @return the value to which the specified key is mapped, or
- * {@code defaultValue} if this map contains no mapping for the key
- * @throws ClassCastException if the key is of an inappropriate type for
- * this map
- * (<a href="Collection.html#optional-restrictions">optional</a>)
- * @throws NullPointerException if the specified key is null and this map
- * does not permit null keys
- * (<a href="Collection.html#optional-restrictions">optional</a>)
- */
+ * Returns the value to which the specified key is mapped,
+ * or {@code defaultValue} if this map contains no mapping
+ * for the key.
+ *
+ * <p>The default implementation makes no guarantees about synchronization
+ * or atomicity properties of this method. Any implementation providing
+ * atomicity guarantees must override this method and document its
+ * concurrency properties.
+ *
+ * @param key the key whose associated value is to be returned
+ * @param defaultValue the default mapping of the key
+ * @return the value to which the specified key is mapped, or
+ * {@code defaultValue} if this map contains no mapping for the key
+ * @throws ClassCastException if the key is of an inappropriate type for
+ * this map
+ * (<a href="Collection.html#optional-restrictions">optional</a>)
+ * @throws NullPointerException if the specified key is null and this map
+ * does not permit null keys
+ * (<a href="Collection.html#optional-restrictions">optional</a>)
+ * @since 1.8
+ */
default V getOrDefault(Object key, V defaultValue) {
V v;
return (((v = get(key)) != null) || containsKey(key))
diff --git a/jdk/src/share/classes/java/util/ResourceBundle.java b/jdk/src/share/classes/java/util/ResourceBundle.java
index b16174d..c2900fa 100644
--- a/jdk/src/share/classes/java/util/ResourceBundle.java
+++ b/jdk/src/share/classes/java/util/ResourceBundle.java
@@ -311,6 +311,24 @@
private static final ReferenceQueue<Object> referenceQueue = new ReferenceQueue<>();
/**
+ * Returns the base name of this bundle, if known, or {@code null} if unknown.
+ *
+ * If not null, then this is the value of the {@code baseName} parameter
+ * that was passed to the {@code ResourceBundle.getBundle(...)} method
+ * when the resource bundle was loaded.
+ *
+ * @return The base name of the resource bundle, as provided to and expected
+ * by the {@code ResourceBundle.getBundle(...)} methods.
+ *
+ * @see #getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader)
+ *
+ * @since 1.8
+ */
+ public String getBaseBundleName() {
+ return name;
+ }
+
+ /**
* The parent bundle of this bundle.
* The parent bundle is searched by {@link #getObject getObject}
* when this bundle does not contain a particular resource.
diff --git a/jdk/src/share/classes/java/util/ServiceLoader.java b/jdk/src/share/classes/java/util/ServiceLoader.java
index aa5c300..f2473a9 100644
--- a/jdk/src/share/classes/java/util/ServiceLoader.java
+++ b/jdk/src/share/classes/java/util/ServiceLoader.java
@@ -453,6 +453,12 @@
* Invoking its {@link java.util.Iterator#remove() remove} method will
* cause an {@link UnsupportedOperationException} to be thrown.
*
+ * @implNote When adding providers to the cache, the {@link #iterator
+ * Iterator} processes resources in the order that the {@link
+ * java.lang.ClassLoader#getResources(java.lang.String)
+ * ClassLoader.getResources(String)} method finds the service configuration
+ * files.
+ *
* @return An iterator that lazily loads providers for this loader's
* service
*/
diff --git a/jdk/src/share/classes/java/util/Spliterator.java b/jdk/src/share/classes/java/util/Spliterator.java
index 08d8f15..b78bad6 100644
--- a/jdk/src/share/classes/java/util/Spliterator.java
+++ b/jdk/src/share/classes/java/util/Spliterator.java
@@ -414,13 +414,19 @@
* #ORDERED}, {@link #DISTINCT}, {@link #SORTED}, {@link #SIZED},
* {@link #NONNULL}, {@link #IMMUTABLE}, {@link #CONCURRENT},
* {@link #SUBSIZED}. Repeated calls to {@code characteristics()} on
- * a given spliterator should always return the same result.
+ * a given spliterator, prior to or in-between calls to {@code trySplit},
+ * should always return the same result.
*
* <p>If a Spliterator reports an inconsistent set of
* characteristics (either those returned from a single invocation
* or across multiple invocations), no guarantees can be made
* about any computation using this Spliterator.
*
+ * @apiNote The characteristics of a given spliterator before splitting
+ * may differ from the characteristics after splitting. For specific
+ * examples see the characteristic values {@link #SIZED}, {@link #SUBSIZED}
+ * and {@link #CONCURRENT}.
+ *
* @return a representation of characteristics
*/
int characteristics();
diff --git a/jdk/src/share/classes/java/util/TimeZone.java b/jdk/src/share/classes/java/util/TimeZone.java
index b37c9f8..aebe685 100644
--- a/jdk/src/share/classes/java/util/TimeZone.java
+++ b/jdk/src/share/classes/java/util/TimeZone.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, 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
@@ -39,13 +39,9 @@
package java.util;
import java.io.Serializable;
-import java.lang.ref.SoftReference;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.time.ZoneId;
-import java.util.concurrent.ConcurrentHashMap;
-import sun.misc.JavaAWTAccess;
-import sun.misc.SharedSecrets;
import sun.security.action.GetPropertyAction;
import sun.util.calendar.ZoneInfo;
import sun.util.calendar.ZoneInfoFile;
@@ -596,11 +592,26 @@
private static native String getSystemGMTOffsetID();
/**
- * Gets the default <code>TimeZone</code> for this host.
- * The source of the default <code>TimeZone</code>
- * may vary with implementation.
- * @return a default <code>TimeZone</code>.
- * @see #setDefault
+ * Gets the default {@code TimeZone} of the Java virtual machine. If the
+ * cached default {@code TimeZone} is available, its clone is returned.
+ * Otherwise, the method takes the following steps to determine the default
+ * time zone.
+ *
+ * <p><ul>
+ * <li>Use the {@code user.timezone} property value as the default
+ * time zone ID if it's available.</li>
+ * <li>Detect the platform time zone ID. The source of the
+ * platform time zone and ID mapping may vary with implementation.</li>
+ * <li>Use {@code GMT} as the last resort if the given or detected
+ * time zone ID is unknown.</li>
+ * </ul>
+ *
+ * <p>The default {@code TimeZone} created from the ID is cached,
+ * and its clone is returned. The {@code user.timezone} property
+ * value is set to the ID upon return.
+ *
+ * @return the default {@code TimeZone}
+ * @see #setDefault(TimeZone)
*/
public static TimeZone getDefault() {
return (TimeZone) getDefaultRef().clone();
@@ -611,14 +622,11 @@
* method doesn't create a clone.
*/
static TimeZone getDefaultRef() {
- TimeZone defaultZone = getDefaultInAppContext();
+ TimeZone defaultZone = defaultTimeZone;
if (defaultZone == null) {
- defaultZone = defaultTimeZone;
- if (defaultZone == null) {
- // Need to initialize the default time zone.
- defaultZone = setDefaultZone();
- assert defaultZone != null;
- }
+ // Need to initialize the default time zone.
+ defaultZone = setDefaultZone();
+ assert defaultZone != null;
}
// Don't clone here.
return defaultZone;
@@ -676,95 +684,27 @@
return tz;
}
- private static boolean hasPermission() {
- boolean hasPermission = true;
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) {
- try {
- sm.checkPermission(new PropertyPermission
- ("user.timezone", "write"));
- } catch (SecurityException e) {
- hasPermission = false;
- }
- }
- return hasPermission;
- }
-
/**
- * Sets the <code>TimeZone</code> that is
- * returned by the <code>getDefault</code> method. If <code>zone</code>
- * is null, reset the default to the value it had originally when the
- * VM first started.
- * @param zone the new default time zone
+ * Sets the {@code TimeZone} that is returned by the {@code getDefault}
+ * method. {@code zone} is cached. If {@code zone} is null, the cached
+ * default {@code TimeZone} is cleared. This method doesn't change the value
+ * of the {@code user.timezone} property.
+ *
+ * @param zone the new default {@code TimeZone}, or null
+ * @throws SecurityException if the security manager's {@code checkPermission}
+ * denies {@code PropertyPermission("user.timezone",
+ * "write")}
* @see #getDefault
+ * @see PropertyPermission
*/
public static void setDefault(TimeZone zone)
{
- if (hasPermission()) {
- synchronized (TimeZone.class) {
- defaultTimeZone = zone;
- setDefaultInAppContext(null);
- }
- } else {
- setDefaultInAppContext(zone);
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(new PropertyPermission
+ ("user.timezone", "write"));
}
- }
-
- /**
- * Returns the default TimeZone in an AppContext if any AppContext
- * has ever used. null is returned if any AppContext hasn't been
- * used or if the AppContext doesn't have the default TimeZone.
- *
- * Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't
- * been loaded. If so, it implies that AWTSecurityManager is not our
- * SecurityManager and we can use a local static variable.
- * This works around a build time issue.
- */
- private static TimeZone getDefaultInAppContext() {
- // JavaAWTAccess provides access implementation-private methods without using reflection.
- JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
-
- if (javaAWTAccess == null) {
- return mainAppContextDefault;
- } else {
- if (!javaAWTAccess.isDisposed()) {
- TimeZone tz = (TimeZone)
- javaAWTAccess.get(TimeZone.class);
- if (tz == null && javaAWTAccess.isMainAppContext()) {
- return mainAppContextDefault;
- } else {
- return tz;
- }
- }
- }
- return null;
- }
-
- /**
- * Sets the default TimeZone in the AppContext to the given
- * tz. null is handled special: do nothing if any AppContext
- * hasn't been used, remove the default TimeZone in the
- * AppContext otherwise.
- *
- * Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't
- * been loaded. If so, it implies that AWTSecurityManager is not our
- * SecurityManager and we can use a local static variable.
- * This works around a build time issue.
- */
- private static void setDefaultInAppContext(TimeZone tz) {
- // JavaAWTAccess provides access implementation-private methods without using reflection.
- JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
-
- if (javaAWTAccess == null) {
- mainAppContextDefault = tz;
- } else {
- if (!javaAWTAccess.isDisposed()) {
- javaAWTAccess.put(TimeZone.class, tz);
- if (javaAWTAccess.isMainAppContext()) {
- mainAppContextDefault = null;
- }
- }
- }
+ defaultTimeZone = zone;
}
/**
diff --git a/jdk/src/share/classes/java/util/TreeMap.java b/jdk/src/share/classes/java/util/TreeMap.java
index 740456b..6a3ecc0 100644
--- a/jdk/src/share/classes/java/util/TreeMap.java
+++ b/jdk/src/share/classes/java/util/TreeMap.java
@@ -1269,6 +1269,15 @@
public K next() {
return prevEntry().key;
}
+ public void remove() {
+ if (lastReturned == null)
+ throw new IllegalStateException();
+ if (modCount != expectedModCount)
+ throw new ConcurrentModificationException();
+ deleteEntry(lastReturned);
+ lastReturned = null;
+ expectedModCount = modCount;
+ }
}
// Little utilities
diff --git a/jdk/src/share/classes/java/util/concurrent/ForkJoinTask.java b/jdk/src/share/classes/java/util/concurrent/ForkJoinTask.java
index 5f239db..936bfc2 100644
--- a/jdk/src/share/classes/java/util/concurrent/ForkJoinTask.java
+++ b/jdk/src/share/classes/java/util/concurrent/ForkJoinTask.java
@@ -439,11 +439,13 @@
final Throwable ex;
ExceptionNode next;
final long thrower; // use id not ref to avoid weak cycles
+ final int hashCode; // store task hashCode before weak ref disappears
ExceptionNode(ForkJoinTask<?> task, Throwable ex, ExceptionNode next) {
super(task, exceptionTableRefQueue);
this.ex = ex;
this.next = next;
this.thrower = Thread.currentThread().getId();
+ this.hashCode = System.identityHashCode(task);
}
}
@@ -605,9 +607,9 @@
private static void expungeStaleExceptions() {
for (Object x; (x = exceptionTableRefQueue.poll()) != null;) {
if (x instanceof ExceptionNode) {
- ForkJoinTask<?> key = ((ExceptionNode)x).get();
+ int hashCode = ((ExceptionNode)x).hashCode;
ExceptionNode[] t = exceptionTable;
- int i = System.identityHashCode(key) & (t.length - 1);
+ int i = hashCode & (t.length - 1);
ExceptionNode e = t[i];
ExceptionNode pred = null;
while (e != null) {
diff --git a/jdk/src/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java b/jdk/src/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
index 4d885f4..47fdbfb 100644
--- a/jdk/src/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
+++ b/jdk/src/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
@@ -489,7 +489,8 @@
/*
* Try to signal next queued node if:
* Propagation was indicated by caller,
- * or was recorded (as h.waitStatus) by a previous operation
+ * or was recorded (as h.waitStatus either before
+ * or after setHead) by a previous operation
* (note: this uses sign-check of waitStatus because
* PROPAGATE status may transition to SIGNAL.)
* and
@@ -501,7 +502,8 @@
* racing acquires/releases, so most need signals now or soon
* anyway.
*/
- if (propagate > 0 || h == null || h.waitStatus < 0) {
+ if (propagate > 0 || h == null || h.waitStatus < 0 ||
+ (h = head) == null || h.waitStatus < 0) {
Node s = node.next;
if (s == null || s.isShared())
doReleaseShared();
diff --git a/jdk/src/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java b/jdk/src/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
index f0bdeb9..dce3576 100644
--- a/jdk/src/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
+++ b/jdk/src/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
@@ -711,7 +711,8 @@
/*
* Try to signal next queued node if:
* Propagation was indicated by caller,
- * or was recorded (as h.waitStatus) by a previous operation
+ * or was recorded (as h.waitStatus either before
+ * or after setHead) by a previous operation
* (note: this uses sign-check of waitStatus because
* PROPAGATE status may transition to SIGNAL.)
* and
@@ -723,7 +724,8 @@
* racing acquires/releases, so most need signals now or soon
* anyway.
*/
- if (propagate > 0 || h == null || h.waitStatus < 0) {
+ if (propagate > 0 || h == null || h.waitStatus < 0 ||
+ (h = head) == null || h.waitStatus < 0) {
Node s = node.next;
if (s == null || s.isShared())
doReleaseShared();
diff --git a/jdk/src/share/classes/java/util/logging/Level.java b/jdk/src/share/classes/java/util/logging/Level.java
index 9369256..ade3328 100644
--- a/jdk/src/share/classes/java/util/logging/Level.java
+++ b/jdk/src/share/classes/java/util/logging/Level.java
@@ -204,6 +204,12 @@
* @throws NullPointerException if the name is null
*/
protected Level(String name, int value, String resourceBundleName) {
+ this(name, value, resourceBundleName, true);
+ }
+
+ // private constructor to specify whether this instance should be added
+ // to the KnownLevel list from which Level.parse method does its look up
+ private Level(String name, int value, String resourceBundleName, boolean visible) {
if (name == null) {
throw new NullPointerException();
}
@@ -212,7 +218,9 @@
this.resourceBundleName = resourceBundleName;
this.localizedLevelName = resourceBundleName == null ? name : null;
this.cachedLocale = null;
- KnownLevel.add(this);
+ if (visible) {
+ KnownLevel.add(this);
+ }
}
/**
@@ -465,7 +473,7 @@
// Finally, look for a known level with the given localized name,
// in the current default locale.
// This is relatively expensive, but not excessively so.
- level = KnownLevel.findByLocalizedName(name);
+ level = KnownLevel.findByLocalizedLevelName(name);
if (level != null) {
return level.levelObject;
}
@@ -521,13 +529,14 @@
private static Map<String, List<KnownLevel>> nameToLevels = new HashMap<>();
private static Map<Integer, List<KnownLevel>> intToLevels = new HashMap<>();
final Level levelObject; // instance of Level class or Level subclass
- final Level mirroredLevel; // instance of Level class
+ final Level mirroredLevel; // mirror of the custom Level
KnownLevel(Level l) {
this.levelObject = l;
if (l.getClass() == Level.class) {
this.mirroredLevel = l;
} else {
- this.mirroredLevel = new Level(l.name, l.value, l.resourceBundleName);
+ // this mirrored level object is hidden
+ this.mirroredLevel = new Level(l.name, l.value, l.resourceBundleName, false);
}
}
@@ -585,20 +594,6 @@
return null;
}
- // Returns a KnownLevel with the given localized name matching
- // by calling the Level.getLocalizedName() method
- static synchronized KnownLevel findByLocalizedName(String name) {
- for (List<KnownLevel> levels : nameToLevels.values()) {
- for (KnownLevel l : levels) {
- String lname = l.levelObject.getLocalizedName();
- if (name.equals(lname)) {
- return l;
- }
- }
- }
- return null;
- }
-
static synchronized KnownLevel matches(Level l) {
List<KnownLevel> list = nameToLevels.get(l.name);
if (list != null) {
diff --git a/jdk/src/share/classes/java/util/logging/Logger.java b/jdk/src/share/classes/java/util/logging/Logger.java
index 19e3135..d673917 100644
--- a/jdk/src/share/classes/java/util/logging/Logger.java
+++ b/jdk/src/share/classes/java/util/logging/Logger.java
@@ -88,17 +88,21 @@
* the LogRecord to its output Handlers. By default, loggers also
* publish to their parent's Handlers, recursively up the tree.
* <p>
- * Each Logger may have a ResourceBundle name associated with it.
- * The named bundle will be used for localizing logging messages.
- * If a Logger does not have its own ResourceBundle name, then
- * it will inherit the ResourceBundle name from its parent,
- * recursively up the tree.
+ * Each Logger may have a {@code ResourceBundle} associated with it.
+ * The {@code ResourceBundle} may be specified by name, using the
+ * {@link #getLogger(java.lang.String, java.lang.String)} factory
+ * method, or by value - using the {@link
+ * #setResourceBundle(java.util.ResourceBundle) setResourceBundle} method.
+ * This bundle will be used for localizing logging messages.
+ * If a Logger does not have its own {@code ResourceBundle} or resource bundle
+ * name, then it will inherit the {@code ResourceBundle} or resource bundle name
+ * from its parent, recursively up the tree.
* <p>
* Most of the logger output methods take a "msg" argument. This
* msg argument may be either a raw value or a localization key.
* During formatting, if the logger has (or inherits) a localization
- * ResourceBundle and if the ResourceBundle has a mapping for the msg
- * string, then the msg string is replaced by the localized value.
+ * {@code ResourceBundle} and if the {@code ResourceBundle} has a mapping for
+ * the msg string, then the msg string is replaced by the localized value.
* Otherwise the original msg string is used. Typically, formatters use
* java.text.MessageFormat style formatting to format parameters, so
* for example a format string "{0} {1}" would format two parameters
@@ -131,10 +135,30 @@
logger.log(Level.FINER, DiagnosisMessages::systemHealthStatus);
</code></pre>
* <p>
- * When mapping ResourceBundle names to ResourceBundles, the Logger
- * will first try to use the Thread's ContextClassLoader. If that
- * is null it will try the
- * {@linkplain java.lang.ClassLoader#getSystemClassLoader() system ClassLoader} instead.
+ * When looking for a {@code ResourceBundle}, the logger will first look at
+ * whether a bundle was specified using {@link
+ * #setResourceBundle(java.util.ResourceBundle) setResourceBundle}, and then
+ * only whether a resource bundle name was specified through the {@link
+ * #getLogger(java.lang.String, java.lang.String) getLogger} factory method.
+ * If no {@code ResourceBundle} or no resource bundle name is found,
+ * then it will use the nearest {@code ResourceBundle} or resource bundle
+ * name inherited from its parent tree.<br>
+ * When a {@code ResourceBundle} was inherited or specified through the
+ * {@link
+ * #setResourceBundle(java.util.ResourceBundle) setResourceBundle} method, then
+ * that {@code ResourceBundle} will be used. Otherwise if the logger only
+ * has or inherited a resource bundle name, then that resource bundle name
+ * will be mapped to a {@code ResourceBundle} object, using the default Locale
+ * at the time of logging.
+ * <br><a name="ResourceBundleMapping"/>When mapping resource bundle names to
+ * {@code ResourceBundle} objects, the logger will first try to use the
+ * Thread's {@linkplain java.lang.Thread#getContextClassLoader() context class
+ * loader} to map the given resource bundle name to a {@code ResourceBundle}.
+ * If the thread context class loader is {@code null}, it will try the
+ * {@linkplain java.lang.ClassLoader#getSystemClassLoader() system class loader}
+ * instead. If the {@code ResourceBundle} is still not found, it will use the
+ * class loader of the first caller of the {@link
+ * #getLogger(java.lang.String, java.lang.String) getLogger} factory method.
* <p>
* Formatting (including localization) is the responsibility of
* the output Handler, which will typically call a Formatter.
@@ -154,7 +178,7 @@
* <li><p>
* There are a set of "logrb" method (for "log with resource bundle")
* that are like the "logp" method, but also take an explicit resource
- * bundle name for use in localizing the log message.
+ * bundle object for use in localizing the log message.
* <li><p>
* There are convenience methods for tracing method entries (the
* "entering" methods), method returns (the "exiting" methods) and
@@ -198,18 +222,20 @@
private String name;
private final CopyOnWriteArrayList<Handler> handlers =
new CopyOnWriteArrayList<>();
- private String resourceBundleName;
+ private String resourceBundleName; // Base name of the bundle.
+ private ResourceBundle userBundle; // Bundle set through setResourceBundle.
private volatile boolean useParentHandlers = true;
private volatile Filter filter;
private boolean anonymous;
+ // Cache to speed up behavior of findResourceBundle:
private ResourceBundle catalog; // Cached resource bundle
private String catalogName; // name associated with catalog
private Locale catalogLocale; // locale associated with catalog
// The fields relating to parent-child relationships and levels
// are managed under a separate lock, the treeLock.
- private static Object treeLock = new Object();
+ private static final Object treeLock = new Object();
// We keep weak references from parents to children, but strong
// references from children to parents.
private volatile Logger parent; // our nearest parent.
@@ -372,6 +398,7 @@
static boolean disableCallerCheck = getBooleanProperty("sun.util.logging.disableCallerCheck");
private static boolean getBooleanProperty(final String key) {
String s = AccessController.doPrivileged(new PrivilegedAction<String>() {
+ @Override
public String run() {
return System.getProperty(key);
}
@@ -579,11 +606,18 @@
/**
* Retrieve the localization resource bundle for this
- * logger for the current default locale. Note that if
- * the result is null, then the Logger will use a resource
- * bundle inherited from its parent.
+ * logger.
+ * This method will return a {@code ResourceBundle} that was either
+ * set by the {@link
+ * #setResourceBundle(java.util.ResourceBundle) setResourceBundle} method or
+ * <a href="#ResourceBundleMapping">mapped from the
+ * the resource bundle name</a> set via the {@link
+ * Logger#getLogger(java.lang.String, java.lang.String) getLogger} factory
+ * method for the current default locale.
+ * <br>Note that if the result is {@code null}, then the Logger will use a resource
+ * bundle or resource bundle name inherited from its parent.
*
- * @return localization bundle (may be null)
+ * @return localization bundle (may be {@code null})
*/
public ResourceBundle getResourceBundle() {
return findResourceBundle(getResourceBundleName(), true);
@@ -591,10 +625,16 @@
/**
* Retrieve the localization resource bundle name for this
- * logger. Note that if the result is null, then the Logger
- * will use a resource bundle name inherited from its parent.
+ * logger.
+ * This is either the name specified through the {@link
+ * #getLogger(java.lang.String, java.lang.String) getLogger} factory method,
+ * or the {@linkplain ResourceBundle#getBaseBundleName() base name} of the
+ * ResourceBundle set through {@link
+ * #setResourceBundle(java.util.ResourceBundle) setResourceBundle} method.
+ * <br>Note that if the result is {@code null}, then the Logger will use a resource
+ * bundle or resource bundle name inherited from its parent.
*
- * @return localization bundle name (may be null)
+ * @return localization bundle name (may be {@code null})
*/
public String getResourceBundleName() {
return resourceBundleName;
@@ -665,10 +705,11 @@
// resource bundle and then call "void log(LogRecord)".
private void doLog(LogRecord lr) {
lr.setLoggerName(name);
- String ebname = getEffectiveResourceBundleName();
- if (ebname != null && !ebname.equals(SYSTEM_LOGGER_RB_NAME)) {
+ final ResourceBundle bundle = getEffectiveResourceBundle();
+ final String ebname = getEffectiveResourceBundleName();
+ if (ebname != null && bundle != null) {
lr.setResourceBundleName(ebname);
- lr.setResourceBundle(findResourceBundle(ebname, true));
+ lr.setResourceBundle(bundle);
}
log(lr);
}
@@ -1000,6 +1041,16 @@
log(lr);
}
+ // Private support method for logging for "logrb" methods.
+ private void doLog(LogRecord lr, ResourceBundle rb) {
+ lr.setLoggerName(name);
+ if (rb != null) {
+ lr.setResourceBundleName(rb.getBaseBundleName());
+ lr.setResourceBundle(rb);
+ }
+ log(lr);
+ }
+
/**
* Log a message, specifying source class, method, and resource bundle name
* with no arguments.
@@ -1018,7 +1069,11 @@
* @param bundleName name of resource bundle to localize msg,
* can be null
* @param msg The string message (or a key in the message catalog)
+ * @deprecated Use {@link #logrb(java.util.logging.Level, java.lang.String,
+ * java.lang.String, java.util.ResourceBundle, java.lang.String,
+ * java.lang.Object...)} instead.
*/
+ @Deprecated
public void logrb(Level level, String sourceClass, String sourceMethod,
String bundleName, String msg) {
if (!isLoggable(level)) {
@@ -1049,7 +1104,11 @@
* can be null
* @param msg The string message (or a key in the message catalog)
* @param param1 Parameter to the log message.
+ * @deprecated Use {@link #logrb(java.util.logging.Level, java.lang.String,
+ * java.lang.String, java.util.ResourceBundle, java.lang.String,
+ * java.lang.Object...)} instead
*/
+ @Deprecated
public void logrb(Level level, String sourceClass, String sourceMethod,
String bundleName, String msg, Object param1) {
if (!isLoggable(level)) {
@@ -1082,7 +1141,11 @@
* can be null.
* @param msg The string message (or a key in the message catalog)
* @param params Array of parameters to the message
+ * @deprecated Use {@link #logrb(java.util.logging.Level, java.lang.String,
+ * java.lang.String, java.util.ResourceBundle, java.lang.String,
+ * java.lang.Object...)} instead.
*/
+ @Deprecated
public void logrb(Level level, String sourceClass, String sourceMethod,
String bundleName, String msg, Object params[]) {
if (!isLoggable(level)) {
@@ -1096,6 +1159,41 @@
}
/**
+ * Log a message, specifying source class, method, and resource bundle,
+ * with an optional list of message parameters.
+ * <p>
+ * If the logger is currently enabled for the given message
+ * level then a corresponding LogRecord is created and forwarded
+ * to all the registered output Handler objects.
+ * <p>
+ * The {@code msg} string is localized using the given resource bundle.
+ * If the resource bundle is {@code null}, then the {@code msg} string is not
+ * localized.
+ * <p>
+ * @param level One of the message level identifiers, e.g., SEVERE
+ * @param sourceClass Name of the class that issued the logging request
+ * @param sourceMethod Name of the method that issued the logging request
+ * @param bundle Resource bundle to localize {@code msg},
+ * can be {@code null}.
+ * @param msg The string message (or a key in the message catalog)
+ * @param params Parameters to the message (optional, may be none).
+ * @since 1.8
+ */
+ public void logrb(Level level, String sourceClass, String sourceMethod,
+ ResourceBundle bundle, String msg, Object... params) {
+ if (!isLoggable(level)) {
+ return;
+ }
+ LogRecord lr = new LogRecord(level, msg);
+ lr.setSourceClassName(sourceClass);
+ lr.setSourceMethodName(sourceMethod);
+ if (params != null && params.length != 0) {
+ lr.setParameters(params);
+ }
+ doLog(lr, bundle);
+ }
+
+ /**
* Log a message, specifying source class, method, and resource bundle name,
* with associated Throwable information.
* <p>
@@ -1119,7 +1217,11 @@
* can be null
* @param msg The string message (or a key in the message catalog)
* @param thrown Throwable associated with log message.
+ * @deprecated Use {@link #logrb(java.util.logging.Level, java.lang.String,
+ * java.lang.String, java.util.ResourceBundle, java.lang.String,
+ * java.lang.Throwable)} instead.
*/
+ @Deprecated
public void logrb(Level level, String sourceClass, String sourceMethod,
String bundleName, String msg, Throwable thrown) {
if (!isLoggable(level)) {
@@ -1132,6 +1234,43 @@
doLog(lr, bundleName);
}
+ /**
+ * Log a message, specifying source class, method, and resource bundle,
+ * with associated Throwable information.
+ * <p>
+ * If the logger is currently enabled for the given message
+ * level then the given arguments are stored in a LogRecord
+ * which is forwarded to all registered output handlers.
+ * <p>
+ * The {@code msg} string is localized using the given resource bundle.
+ * If the resource bundle is {@code null}, then the {@code msg} string is not
+ * localized.
+ * <p>
+ * Note that the thrown argument is stored in the LogRecord thrown
+ * property, rather than the LogRecord parameters property. Thus it is
+ * processed specially by output Formatters and is not treated
+ * as a formatting parameter to the LogRecord message property.
+ * <p>
+ * @param level One of the message level identifiers, e.g., SEVERE
+ * @param sourceClass Name of the class that issued the logging request
+ * @param sourceMethod Name of the method that issued the logging request
+ * @param bundle Resource bundle to localize {@code msg},
+ * can be {@code null}
+ * @param msg The string message (or a key in the message catalog)
+ * @param thrown Throwable associated with the log message.
+ * @since 1.8
+ */
+ public void logrb(Level level, String sourceClass, String sourceMethod,
+ ResourceBundle bundle, String msg, Throwable thrown) {
+ if (!isLoggable(level)) {
+ return;
+ }
+ LogRecord lr = new LogRecord(level, msg);
+ lr.setSourceClassName(sourceClass);
+ lr.setSourceMethodName(sourceMethod);
+ lr.setThrown(thrown);
+ doLog(lr, bundle);
+ }
//======================================================================
// Start of convenience methods for logging method entries and returns.
@@ -1610,6 +1749,7 @@
private static ResourceBundle findSystemResourceBundle(final Locale locale) {
// the resource bundle is in a restricted package
return AccessController.doPrivileged(new PrivilegedAction<ResourceBundle>() {
+ @Override
public ResourceBundle run() {
try {
return ResourceBundle.getBundle(SYSTEM_LOGGER_RB_NAME,
@@ -1650,7 +1790,10 @@
Locale currentLocale = Locale.getDefault();
// Normally we should hit on our simple one entry cache.
- if (catalog != null && currentLocale.equals(catalogLocale)
+ if (userBundle != null &&
+ name.equals(resourceBundleName)) {
+ return userBundle;
+ } else if (catalog != null && currentLocale.equals(catalogLocale)
&& name.equals(catalogName)) {
return catalog;
}
@@ -1738,6 +1881,45 @@
}
/**
+ * Sets a resource bundle on this logger.
+ * All messages will be logged using the given resource bundle for its
+ * specific {@linkplain ResourceBundle#getLocale locale}.
+ * @param bundle The resource bundle that this logger shall use.
+ * @throws NullPointerException if the given bundle is {@code null}.
+ * @throws IllegalArgumentException if the given bundle doesn't have a
+ * {@linkplain ResourceBundle#getBaseBundleName base name},
+ * or if this logger already has a resource bundle set but
+ * the given bundle has a different base name.
+ * @throws SecurityException if a security manager exists and if
+ * the caller does not have LoggingPermission("control").
+ * @since 1.8
+ */
+ public void setResourceBundle(ResourceBundle bundle) {
+ checkPermission();
+
+ // Will throw NPE if bundle is null.
+ final String baseName = bundle.getBaseBundleName();
+
+ // bundle must have a name
+ if (baseName == null || baseName.isEmpty()) {
+ throw new IllegalArgumentException("resource bundle must have a name");
+ }
+
+ synchronized (this) {
+ final boolean canReplaceResourceBundle = resourceBundleName == null
+ || resourceBundleName.equals(baseName);
+
+ if (!canReplaceResourceBundle) {
+ throw new IllegalArgumentException("can't replace resource bundle");
+ }
+
+
+ userBundle = bundle;
+ resourceBundleName = baseName;
+ }
+ }
+
+ /**
* Return the parent for this Logger.
* <p>
* This method returns the nearest extant parent in the namespace.
@@ -1813,7 +1995,7 @@
// we didn't have a previous parent
ref = manager.new LoggerWeakRef(this);
}
- ref.setParentRef(new WeakReference<Logger>(parent));
+ ref.setParentRef(new WeakReference<>(parent));
parent.kids.add(ref);
// As a result of the reparenting, the effective level
@@ -1895,4 +2077,30 @@
}
+ private ResourceBundle getEffectiveResourceBundle() {
+ Logger target = this;
+ if (SYSTEM_LOGGER_RB_NAME.equals(resourceBundleName)) return null;
+ ResourceBundle localRB = getResourceBundle();
+ if (localRB != null) {
+ return localRB;
+ }
+
+ while (target != null) {
+ final ResourceBundle rb = target.userBundle;
+ if (rb != null) {
+ return rb;
+ }
+ final String rbn = target.getResourceBundleName();
+ if (rbn != null) {
+ if (!SYSTEM_LOGGER_RB_NAME.equals(rbn)) {
+ return findResourceBundle(rbn, true);
+ } else {
+ return null;
+ }
+ }
+ target = target.getParent();
+ }
+ return null;
+ }
+
}
diff --git a/jdk/src/share/classes/java/util/stream/DoublePipeline.java b/jdk/src/share/classes/java/util/stream/DoublePipeline.java
index 43b3d04..6af346c 100644
--- a/jdk/src/share/classes/java/util/stream/DoublePipeline.java
+++ b/jdk/src/share/classes/java/util/stream/DoublePipeline.java
@@ -340,25 +340,18 @@
}
@Override
- public final DoubleStream substream(long startingOffset) {
- if (startingOffset < 0)
- throw new IllegalArgumentException(Long.toString(startingOffset));
- if (startingOffset == 0)
+ public final DoubleStream skip(long n) {
+ if (n < 0)
+ throw new IllegalArgumentException(Long.toString(n));
+ if (n == 0)
return this;
else {
long limit = -1;
- return SliceOps.makeDouble(this, startingOffset, limit);
+ return SliceOps.makeDouble(this, n, limit);
}
}
@Override
- public final DoubleStream substream(long startingOffset, long endingOffset) {
- if (startingOffset < 0 || endingOffset < startingOffset)
- throw new IllegalArgumentException(String.format("substream(%d, %d)", startingOffset, endingOffset));
- return SliceOps.makeDouble(this, startingOffset, endingOffset - startingOffset);
- }
-
- @Override
public final DoubleStream sorted() {
return SortedOps.makeDouble(this);
}
diff --git a/jdk/src/share/classes/java/util/stream/DoubleStream.java b/jdk/src/share/classes/java/util/stream/DoubleStream.java
index f10092a..b50471d 100644
--- a/jdk/src/share/classes/java/util/stream/DoubleStream.java
+++ b/jdk/src/share/classes/java/util/stream/DoubleStream.java
@@ -289,6 +289,20 @@
* <p>This is a <a href="package-summary.html#StreamOps">short-circuiting
* stateful intermediate operation</a>.
*
+ * @apiNote
+ * While {@code limit()} is generally a cheap operation on sequential
+ * stream pipelines, it can be quite expensive on ordered parallel pipelines,
+ * especially for large values of {@code maxSize}, since {@code limit(n)}
+ * is constrained to return not just any <em>n</em> elements, but the
+ * <em>first n</em> elements in the encounter order. Using an unordered
+ * stream source (such as {@link #generate(DoubleSupplier)}) or removing the
+ * ordering constraint with {@link #unordered()} may result in significant
+ * speedups of {@code limit()} in parallel pipelines, if the semantics of
+ * your situation permit. If consistency with encounter order is required,
+ * and you are experiencing poor performance or memory utilization with
+ * {@code limit()} in parallel pipelines, switching to sequential execution
+ * with {@link #sequential()} may improve performance.
+ *
* @param maxSize the number of elements the stream should be limited to
* @return the new stream
* @throws IllegalArgumentException if {@code maxSize} is negative
@@ -297,37 +311,32 @@
/**
* Returns a stream consisting of the remaining elements of this stream
- * after discarding the first {@code startInclusive} elements of the stream.
- * If this stream contains fewer than {@code startInclusive} elements then an
+ * after discarding the first {@code n} elements of the stream.
+ * If this stream contains fewer than {@code n} elements then an
* empty stream will be returned.
*
* <p>This is a <a href="package-summary.html#StreamOps">stateful
* intermediate operation</a>.
*
- * @param startInclusive the number of leading elements to skip
- * @return the new stream
- * @throws IllegalArgumentException if {@code startInclusive} is negative
- */
- DoubleStream substream(long startInclusive);
-
- /**
- * Returns a stream consisting of the remaining elements of this stream
- * after discarding the first {@code startInclusive} elements and truncating
- * the result to be no longer than {@code endExclusive - startInclusive}
- * elements in length. If this stream contains fewer than
- * {@code startInclusive} elements then an empty stream will be returned.
+ * @apiNote
+ * While {@code skip()} is generally a cheap operation on sequential
+ * stream pipelines, it can be quite expensive on ordered parallel pipelines,
+ * especially for large values of {@code n}, since {@code skip(n)}
+ * is constrained to skip not just any <em>n</em> elements, but the
+ * <em>first n</em> elements in the encounter order. Using an unordered
+ * stream source (such as {@link #generate(DoubleSupplier)}) or removing the
+ * ordering constraint with {@link #unordered()} may result in significant
+ * speedups of {@code skip()} in parallel pipelines, if the semantics of
+ * your situation permit. If consistency with encounter order is required,
+ * and you are experiencing poor performance or memory utilization with
+ * {@code skip()} in parallel pipelines, switching to sequential execution
+ * with {@link #sequential()} may improve performance.
*
- * <p>This is a <a href="package-summary.html#StreamOps">short-circuiting
- * stateful intermediate operation</a>.
- *
- * @param startInclusive the starting position of the substream, inclusive
- * @param endExclusive the ending position of the substream, exclusive
+ * @param n the number of leading elements to skip
* @return the new stream
- * @throws IllegalArgumentException if {@code startInclusive} or
- * {@code endExclusive} is negative or {@code startInclusive} is greater
- * than {@code endExclusive}
+ * @throws IllegalArgumentException if {@code n} is negative
*/
- DoubleStream substream(long startInclusive, long endExclusive);
+ DoubleStream skip(long n);
/**
* Performs an action for each element of this stream.
@@ -502,22 +511,42 @@
BiConsumer<R, R> combiner);
/**
- * Returns the sum of elements in this stream. The sum returned can vary
- * depending upon the order in which elements are encountered. This is due
- * to accumulated rounding error in addition of values of differing
- * magnitudes. Elements sorted by increasing absolute magnitude tend to
- * yield more accurate results. If any stream element is a {@code NaN} or
- * the sum is at any point a {@code NaN} then the sum will be {@code NaN}.
- * This is a special case of a
- * <a href="package-summary.html#Reduction">reduction</a> and is
+ * Returns the sum of elements in this stream.
+ *
+ * Summation is a special case of a <a
+ * href="package-summary.html#Reduction">reduction</a>. If
+ * floating-point summation were exact, this method would be
* equivalent to:
+ *
* <pre>{@code
* return reduce(0, Double::sum);
* }</pre>
*
+ * However, since floating-point summation is not exact, the above
+ * code is not necessarily equivalent to the summation computation
+ * done by this method.
+ *
+ * <p>If any stream element is a NaN or the sum is at any point a NaN
+ * then the sum will be NaN.
+ *
+ * The value of a floating-point sum is a function both
+ * of the input values as well as the order of addition
+ * operations. The order of addition operations of this method is
+ * intentionally not defined to allow for implementation
+ * flexibility to improve the speed and accuracy of the computed
+ * result.
+ *
+ * In particular, this method may be implemented using compensated
+ * summation or other technique to reduce the error bound in the
+ * numerical sum compared to a simple summation of {@code double}
+ * values.
+ *
* <p>This is a <a href="package-summary.html#StreamOps">terminal
* operation</a>.
*
+ * @apiNote Sorting values by increasing absolute magnitude tends to yield
+ * more accurate results.
+ *
* @return the sum of elements in this stream
*/
double sum();
@@ -578,19 +607,29 @@
long count();
/**
- * Returns an {@code OptionalDouble} describing the arithmetic mean of elements of
- * this stream, or an empty optional if this stream is empty. The average
- * returned can vary depending upon the order in which elements are
- * encountered. This is due to accumulated rounding error in addition of
- * elements of differing magnitudes. Elements sorted by increasing absolute
- * magnitude tend to yield more accurate results. If any recorded value is
- * a {@code NaN} or the sum is at any point a {@code NaN} then the average
- * will be {@code NaN}. This is a special case of a
- * <a href="package-summary.html#Reduction">reduction</a>.
+ * Returns an {@code OptionalDouble} describing the arithmetic
+ * mean of elements of this stream, or an empty optional if this
+ * stream is empty.
+ *
+ * If any recorded value is a NaN or the sum is at any point a NaN
+ * then the average will be NaN.
+ *
+ * <p>The average returned can vary depending upon the order in
+ * which values are recorded.
+ *
+ * This method may be implemented using compensated summation or
+ * other technique to reduce the error bound in the {@link #sum
+ * numerical sum} used to compute the average.
+ *
+ * <p>The average is a special case of a <a
+ * href="package-summary.html#Reduction">reduction</a>.
*
* <p>This is a <a href="package-summary.html#StreamOps">terminal
* operation</a>.
*
+ * @apiNote Elements sorted by increasing absolute magnitude tend
+ * to yield more accurate results.
+ *
* @return an {@code OptionalDouble} containing the average element of this
* stream, or an empty optional if the stream is empty
*/
diff --git a/jdk/src/share/classes/java/util/stream/IntPipeline.java b/jdk/src/share/classes/java/util/stream/IntPipeline.java
index 13f7e0a..94dfb7e 100644
--- a/jdk/src/share/classes/java/util/stream/IntPipeline.java
+++ b/jdk/src/share/classes/java/util/stream/IntPipeline.java
@@ -368,32 +368,21 @@
// Stateful intermediate ops from IntStream
- private IntStream slice(long skip, long limit) {
- return SliceOps.makeInt(this, skip, limit);
- }
-
@Override
public final IntStream limit(long maxSize) {
if (maxSize < 0)
throw new IllegalArgumentException(Long.toString(maxSize));
- return slice(0, maxSize);
+ return SliceOps.makeInt(this, 0, maxSize);
}
@Override
- public final IntStream substream(long startingOffset) {
- if (startingOffset < 0)
- throw new IllegalArgumentException(Long.toString(startingOffset));
- if (startingOffset == 0)
+ public final IntStream skip(long n) {
+ if (n < 0)
+ throw new IllegalArgumentException(Long.toString(n));
+ if (n == 0)
return this;
else
- return slice(startingOffset, -1);
- }
-
- @Override
- public final IntStream substream(long startingOffset, long endingOffset) {
- if (startingOffset < 0 || endingOffset < startingOffset)
- throw new IllegalArgumentException(String.format("substream(%d, %d)", startingOffset, endingOffset));
- return slice(startingOffset, endingOffset - startingOffset);
+ return SliceOps.makeInt(this, n, -1);
}
@Override
diff --git a/jdk/src/share/classes/java/util/stream/IntStream.java b/jdk/src/share/classes/java/util/stream/IntStream.java
index 07f9ab5..ae0eb49 100644
--- a/jdk/src/share/classes/java/util/stream/IntStream.java
+++ b/jdk/src/share/classes/java/util/stream/IntStream.java
@@ -287,6 +287,20 @@
* <p>This is a <a href="package-summary.html#StreamOps">short-circuiting
* stateful intermediate operation</a>.
*
+ * @apiNote
+ * While {@code limit()} is generally a cheap operation on sequential
+ * stream pipelines, it can be quite expensive on ordered parallel pipelines,
+ * especially for large values of {@code maxSize}, since {@code limit(n)}
+ * is constrained to return not just any <em>n</em> elements, but the
+ * <em>first n</em> elements in the encounter order. Using an unordered
+ * stream source (such as {@link #generate(IntSupplier)}) or removing the
+ * ordering constraint with {@link #unordered()} may result in significant
+ * speedups of {@code limit()} in parallel pipelines, if the semantics of
+ * your situation permit. If consistency with encounter order is required,
+ * and you are experiencing poor performance or memory utilization with
+ * {@code limit()} in parallel pipelines, switching to sequential execution
+ * with {@link #sequential()} may improve performance.
+ *
* @param maxSize the number of elements the stream should be limited to
* @return the new stream
* @throws IllegalArgumentException if {@code maxSize} is negative
@@ -295,37 +309,32 @@
/**
* Returns a stream consisting of the remaining elements of this stream
- * after discarding the first {@code startInclusive} elements of the stream.
- * If this stream contains fewer than {@code startInclusive} elements then an
+ * after discarding the first {@code n} elements of the stream.
+ * If this stream contains fewer than {@code n} elements then an
* empty stream will be returned.
*
* <p>This is a <a href="package-summary.html#StreamOps">stateful
* intermediate operation</a>.
*
- * @param startInclusive the number of leading elements to skip
- * @return the new stream
- * @throws IllegalArgumentException if {@code startInclusive} is negative
- */
- IntStream substream(long startInclusive);
-
- /**
- * Returns a stream consisting of the remaining elements of this stream
- * after discarding the first {@code startInclusive} elements and truncating
- * the result to be no longer than {@code endExclusive - startInclusive}
- * elements in length. If this stream contains fewer than
- * {@code startInclusive} elements then an empty stream will be returned.
+ * @apiNote
+ * While {@code skip()} is generally a cheap operation on sequential
+ * stream pipelines, it can be quite expensive on ordered parallel pipelines,
+ * especially for large values of {@code n}, since {@code skip(n)}
+ * is constrained to skip not just any <em>n</em> elements, but the
+ * <em>first n</em> elements in the encounter order. Using an unordered
+ * stream source (such as {@link #generate(IntSupplier)}) or removing the
+ * ordering constraint with {@link #unordered()} may result in significant
+ * speedups of {@code skip()} in parallel pipelines, if the semantics of
+ * your situation permit. If consistency with encounter order is required,
+ * and you are experiencing poor performance or memory utilization with
+ * {@code skip()} in parallel pipelines, switching to sequential execution
+ * with {@link #sequential()} may improve performance.
*
- * <p>This is a <a href="package-summary.html#StreamOps">short-circuiting
- * stateful intermediate operation</a>.
- *
- * @param startInclusive the starting position of the substream, inclusive
- * @param endExclusive the ending position of the substream, exclusive
+ * @param n the number of leading elements to skip
* @return the new stream
- * @throws IllegalArgumentException if {@code startInclusive} or
- * {@code endExclusive} is negative or {@code startInclusive} is greater
- * than {@code endExclusive}
+ * @throws IllegalArgumentException if {@code n} is negative
*/
- IntStream substream(long startInclusive, long endExclusive);
+ IntStream skip(long n);
/**
* Performs an action for each element of this stream.
diff --git a/jdk/src/share/classes/java/util/stream/LongPipeline.java b/jdk/src/share/classes/java/util/stream/LongPipeline.java
index 5ed030e..88e919e 100644
--- a/jdk/src/share/classes/java/util/stream/LongPipeline.java
+++ b/jdk/src/share/classes/java/util/stream/LongPipeline.java
@@ -349,32 +349,21 @@
// Stateful intermediate ops from LongStream
- private LongStream slice(long skip, long limit) {
- return SliceOps.makeLong(this, skip, limit);
- }
-
@Override
public final LongStream limit(long maxSize) {
if (maxSize < 0)
throw new IllegalArgumentException(Long.toString(maxSize));
- return slice(0, maxSize);
+ return SliceOps.makeLong(this, 0, maxSize);
}
@Override
- public final LongStream substream(long startingOffset) {
- if (startingOffset < 0)
- throw new IllegalArgumentException(Long.toString(startingOffset));
- if (startingOffset == 0)
+ public final LongStream skip(long n) {
+ if (n < 0)
+ throw new IllegalArgumentException(Long.toString(n));
+ if (n == 0)
return this;
else
- return slice(startingOffset, -1);
- }
-
- @Override
- public final LongStream substream(long startingOffset, long endingOffset) {
- if (startingOffset < 0 || endingOffset < startingOffset)
- throw new IllegalArgumentException(String.format("substream(%d, %d)", startingOffset, endingOffset));
- return slice(startingOffset, endingOffset - startingOffset);
+ return SliceOps.makeLong(this, n, -1);
}
@Override
diff --git a/jdk/src/share/classes/java/util/stream/LongStream.java b/jdk/src/share/classes/java/util/stream/LongStream.java
index ca61d2f..0b8fb15 100644
--- a/jdk/src/share/classes/java/util/stream/LongStream.java
+++ b/jdk/src/share/classes/java/util/stream/LongStream.java
@@ -287,6 +287,20 @@
* <p>This is a <a href="package-summary.html#StreamOps">short-circuiting
* stateful intermediate operation</a>.
*
+ * @apiNote
+ * While {@code limit()} is generally a cheap operation on sequential
+ * stream pipelines, it can be quite expensive on ordered parallel pipelines,
+ * especially for large values of {@code maxSize}, since {@code limit(n)}
+ * is constrained to return not just any <em>n</em> elements, but the
+ * <em>first n</em> elements in the encounter order. Using an unordered
+ * stream source (such as {@link #generate(LongSupplier)}) or removing the
+ * ordering constraint with {@link #unordered()} may result in significant
+ * speedups of {@code limit()} in parallel pipelines, if the semantics of
+ * your situation permit. If consistency with encounter order is required,
+ * and you are experiencing poor performance or memory utilization with
+ * {@code limit()} in parallel pipelines, switching to sequential execution
+ * with {@link #sequential()} may improve performance.
+ *
* @param maxSize the number of elements the stream should be limited to
* @return the new stream
* @throws IllegalArgumentException if {@code maxSize} is negative
@@ -295,37 +309,32 @@
/**
* Returns a stream consisting of the remaining elements of this stream
- * after discarding the first {@code startInclusive} elements of the stream.
- * If this stream contains fewer than {@code startInclusive} elements then an
+ * after discarding the first {@code n} elements of the stream.
+ * If this stream contains fewer than {@code n} elements then an
* empty stream will be returned.
*
* <p>This is a <a href="package-summary.html#StreamOps">stateful
* intermediate operation</a>.
*
- * @param startInclusive the number of leading elements to skip
- * @return the new stream
- * @throws IllegalArgumentException if {@code startInclusive} is negative
- */
- LongStream substream(long startInclusive);
-
- /**
- * Returns a stream consisting of the remaining elements of this stream
- * after discarding the first {@code startInclusive} elements and truncating
- * the result to be no longer than {@code endExclusive - startInclusive}
- * elements in length. If this stream contains fewer than
- * {@code startInclusive} elements then an empty stream will be returned.
+ * @apiNote
+ * While {@code skip()} is generally a cheap operation on sequential
+ * stream pipelines, it can be quite expensive on ordered parallel pipelines,
+ * especially for large values of {@code n}, since {@code skip(n)}
+ * is constrained to skip not just any <em>n</em> elements, but the
+ * <em>first n</em> elements in the encounter order. Using an unordered
+ * stream source (such as {@link #generate(LongSupplier)}) or removing the
+ * ordering constraint with {@link #unordered()} may result in significant
+ * speedups of {@code skip()} in parallel pipelines, if the semantics of
+ * your situation permit. If consistency with encounter order is required,
+ * and you are experiencing poor performance or memory utilization with
+ * {@code skip()} in parallel pipelines, switching to sequential execution
+ * with {@link #sequential()} may improve performance.
*
- * <p>This is a <a href="package-summary.html#StreamOps">short-circuiting
- * stateful intermediate operation</a>.
- *
- * @param startInclusive the starting position of the substream, inclusive
- * @param endExclusive the ending position of the substream, exclusive
+ * @param n the number of leading elements to skip
* @return the new stream
- * @throws IllegalArgumentException if {@code startInclusive} or
- * {@code endExclusive} is negative or {@code startInclusive} is greater
- * than {@code endExclusive}
+ * @throws IllegalArgumentException if {@code n} is negative
*/
- LongStream substream(long startInclusive, long endExclusive);
+ LongStream skip(long n);
/**
* Performs an action for each element of this stream.
diff --git a/jdk/src/share/classes/java/util/stream/ReferencePipeline.java b/jdk/src/share/classes/java/util/stream/ReferencePipeline.java
index 0efd978..8f5da0e 100644
--- a/jdk/src/share/classes/java/util/stream/ReferencePipeline.java
+++ b/jdk/src/share/classes/java/util/stream/ReferencePipeline.java
@@ -394,32 +394,21 @@
return SortedOps.makeRef(this, comparator);
}
- private Stream<P_OUT> slice(long skip, long limit) {
- return SliceOps.makeRef(this, skip, limit);
- }
-
@Override
public final Stream<P_OUT> limit(long maxSize) {
if (maxSize < 0)
throw new IllegalArgumentException(Long.toString(maxSize));
- return slice(0, maxSize);
+ return SliceOps.makeRef(this, 0, maxSize);
}
@Override
- public final Stream<P_OUT> substream(long startingOffset) {
- if (startingOffset < 0)
- throw new IllegalArgumentException(Long.toString(startingOffset));
- if (startingOffset == 0)
+ public final Stream<P_OUT> skip(long n) {
+ if (n < 0)
+ throw new IllegalArgumentException(Long.toString(n));
+ if (n == 0)
return this;
else
- return slice(startingOffset, -1);
- }
-
- @Override
- public final Stream<P_OUT> substream(long startingOffset, long endingOffset) {
- if (startingOffset < 0 || endingOffset < startingOffset)
- throw new IllegalArgumentException(String.format("substream(%d, %d)", startingOffset, endingOffset));
- return slice(startingOffset, endingOffset - startingOffset);
+ return SliceOps.makeRef(this, n, -1);
}
// Terminal operations from Stream
diff --git a/jdk/src/share/classes/java/util/stream/Stream.java b/jdk/src/share/classes/java/util/stream/Stream.java
index a48d59d..1961359 100644
--- a/jdk/src/share/classes/java/util/stream/Stream.java
+++ b/jdk/src/share/classes/java/util/stream/Stream.java
@@ -365,6 +365,20 @@
* <p>This is a <a href="package-summary.html#StreamOps">short-circuiting
* stateful intermediate operation</a>.
*
+ * @apiNote
+ * While {@code limit()} is generally a cheap operation on sequential
+ * stream pipelines, it can be quite expensive on ordered parallel pipelines,
+ * especially for large values of {@code maxSize}, since {@code limit(n)}
+ * is constrained to return not just any <em>n</em> elements, but the
+ * <em>first n</em> elements in the encounter order. Using an unordered
+ * stream source (such as {@link #generate(Supplier)}) or removing the
+ * ordering constraint with {@link #unordered()} may result in significant
+ * speedups of {@code limit()} in parallel pipelines, if the semantics of
+ * your situation permit. If consistency with encounter order is required,
+ * and you are experiencing poor performance or memory utilization with
+ * {@code limit()} in parallel pipelines, switching to sequential execution
+ * with {@link #sequential()} may improve performance.
+ *
* @param maxSize the number of elements the stream should be limited to
* @return the new stream
* @throws IllegalArgumentException if {@code maxSize} is negative
@@ -373,37 +387,32 @@
/**
* Returns a stream consisting of the remaining elements of this stream
- * after discarding the first {@code startInclusive} elements of the stream.
- * If this stream contains fewer than {@code startInclusive} elements then an
+ * after discarding the first {@code n} elements of the stream.
+ * If this stream contains fewer than {@code n} elements then an
* empty stream will be returned.
*
* <p>This is a <a href="package-summary.html#StreamOps">stateful
* intermediate operation</a>.
*
- * @param startInclusive the number of leading elements to skip
- * @return the new stream
- * @throws IllegalArgumentException if {@code startInclusive} is negative
- */
- Stream<T> substream(long startInclusive);
-
- /**
- * Returns a stream consisting of the remaining elements of this stream
- * after discarding the first {@code startInclusive} elements and truncating
- * the result to be no longer than {@code endExclusive - startInclusive}
- * elements in length. If this stream contains fewer than
- * {@code startInclusive} elements then an empty stream will be returned.
+ * @apiNote
+ * While {@code skip()} is generally a cheap operation on sequential
+ * stream pipelines, it can be quite expensive on ordered parallel pipelines,
+ * especially for large values of {@code n}, since {@code skip(n)}
+ * is constrained to skip not just any <em>n</em> elements, but the
+ * <em>first n</em> elements in the encounter order. Using an unordered
+ * stream source (such as {@link #generate(Supplier)}) or removing the
+ * ordering constraint with {@link #unordered()} may result in significant
+ * speedups of {@code skip()} in parallel pipelines, if the semantics of
+ * your situation permit. If consistency with encounter order is required,
+ * and you are experiencing poor performance or memory utilization with
+ * {@code skip()} in parallel pipelines, switching to sequential execution
+ * with {@link #sequential()} may improve performance.
*
- * <p>This is a <a href="package-summary.html#StreamOps">short-circuiting
- * stateful intermediate operation</a>.
- *
- * @param startInclusive the starting position of the substream, inclusive
- * @param endExclusive the ending position of the substream, exclusive
+ * @param n the number of leading elements to skip
* @return the new stream
- * @throws IllegalArgumentException if {@code startInclusive} or
- * {@code endExclusive} is negative or {@code startInclusive} is greater
- * than {@code endExclusive}
+ * @throws IllegalArgumentException if {@code n} is negative
*/
- Stream<T> substream(long startInclusive, long endExclusive);
+ Stream<T> skip(long n);
/**
* Performs an action for each element of this stream.
diff --git a/jdk/src/share/classes/javax/crypto/CipherSpi.java b/jdk/src/share/classes/javax/crypto/CipherSpi.java
index d839be7..aae3331 100644
--- a/jdk/src/share/classes/javax/crypto/CipherSpi.java
+++ b/jdk/src/share/classes/javax/crypto/CipherSpi.java
@@ -786,7 +786,9 @@
int total = 0;
do {
int chunk = Math.min(inLen, inArray.length);
- input.get(inArray, 0, chunk);
+ if (chunk > 0) {
+ input.get(inArray, 0, chunk);
+ }
int n;
if (isUpdate || (inLen != chunk)) {
n = engineUpdate(inArray, 0, chunk, outArray, outOfs);
@@ -814,8 +816,9 @@
int total = 0;
boolean resized = false;
do {
- int chunk = Math.min(inLen, outSize);
- if ((a1 == false) && (resized == false)) {
+ int chunk =
+ Math.min(inLen, (outSize == 0? inArray.length : outSize));
+ if (!a1 && !resized && chunk > 0) {
input.get(inArray, 0, chunk);
inOfs = 0;
}
@@ -829,8 +832,10 @@
resized = false;
inOfs += chunk;
inLen -= chunk;
- output.put(outArray, 0, n);
- total += n;
+ if (n > 0) {
+ output.put(outArray, 0, n);
+ total += n;
+ }
} catch (ShortBufferException e) {
if (resized) {
// we just resized the output buffer, but it still
@@ -840,11 +845,13 @@
}
// output buffer is too small, realloc and try again
resized = true;
- int newOut = engineGetOutputSize(chunk);
- outArray = new byte[newOut];
+ outSize = engineGetOutputSize(chunk);
+ outArray = new byte[outSize];
}
} while (inLen > 0);
- input.position(inLimit);
+ if (a1) {
+ input.position(inLimit);
+ }
return total;
}
}
diff --git a/jdk/src/share/classes/javax/crypto/JceSecurityManager.java b/jdk/src/share/classes/javax/crypto/JceSecurityManager.java
index d4818ac..53afe67 100644
--- a/jdk/src/share/classes/javax/crypto/JceSecurityManager.java
+++ b/jdk/src/share/classes/javax/crypto/JceSecurityManager.java
@@ -230,7 +230,7 @@
// See bug 4341369 & 4334690 for more info.
boolean isCallerTrusted() {
// Get the caller and its codebase.
- Class[] context = getClassContext();
+ Class<?>[] context = getClassContext();
URL callerCodeBase = null;
int i;
for (i=0; i<context.length; i++) {
diff --git a/jdk/src/share/classes/javax/management/BadAttributeValueExpException.java b/jdk/src/share/classes/javax/management/BadAttributeValueExpException.java
index 9ed27e9..2eda233 100644
--- a/jdk/src/share/classes/javax/management/BadAttributeValueExpException.java
+++ b/jdk/src/share/classes/javax/management/BadAttributeValueExpException.java
@@ -25,6 +25,9 @@
package javax.management;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+
/**
* Thrown when an invalid MBean attribute is passed to a query
@@ -41,17 +44,19 @@
private static final long serialVersionUID = -3105272988410493376L;
/**
- * @serial The attribute value that originated this exception
+ * @serial A string representation of the attribute that originated this exception.
+ * for example, the string value can be the return of {@code attribute.toString()}
*/
private Object val;
/**
- * Constructs an <CODE>BadAttributeValueExpException</CODE> with the specified Object.
+ * Constructs a BadAttributeValueExpException using the specified Object to
+ * create the toString() value.
*
* @param val the inappropriate value.
*/
public BadAttributeValueExpException (Object val) {
- this.val = val;
+ this.val = val == null ? null : val.toString();
}
@@ -62,4 +67,25 @@
return "BadAttributeValueException: " + val;
}
+ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
+ ObjectInputStream.GetField gf = ois.readFields();
+ Object valObj = gf.get("val", null);
+
+ if (valObj == null) {
+ val = null;
+ } else if (valObj instanceof String) {
+ val= valObj;
+ } else if (System.getSecurityManager() == null
+ || valObj instanceof Long
+ || valObj instanceof Integer
+ || valObj instanceof Float
+ || valObj instanceof Double
+ || valObj instanceof Byte
+ || valObj instanceof Short
+ || valObj instanceof Boolean) {
+ val = valObj.toString();
+ } else { // the serialized object is from a version without JDK-8019292 fix
+ val = System.identityHashCode(valObj) + "@" + valObj.getClass().getName();
+ }
+ }
}
diff --git a/jdk/src/share/classes/javax/management/MBeanNotificationInfo.java b/jdk/src/share/classes/javax/management/MBeanNotificationInfo.java
index ad1c74f..be1b58b 100644
--- a/jdk/src/share/classes/javax/management/MBeanNotificationInfo.java
+++ b/jdk/src/share/classes/javax/management/MBeanNotificationInfo.java
@@ -25,6 +25,9 @@
package javax.management;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
import java.util.Arrays;
import java.util.Objects;
@@ -68,7 +71,7 @@
/**
* @serial The different types of the notification.
*/
- private final String[] types;
+ private String[] types;
/** @see MBeanInfo#arrayGettersSafe */
private final transient boolean arrayGettersSafe;
@@ -115,9 +118,8 @@
notifType, though it doesn't explicitly allow it
either. */
- if (notifTypes == null)
- notifTypes = NO_TYPES;
- this.types = notifTypes;
+ this.types = (notifTypes != null && notifTypes.length > 0) ?
+ notifTypes.clone() : NO_TYPES;
this.arrayGettersSafe =
MBeanInfo.arrayGettersSafe(this.getClass(),
MBeanNotificationInfo.class);
@@ -204,4 +206,11 @@
hash ^= types[i].hashCode();
return hash;
}
+
+ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
+ ObjectInputStream.GetField gf = ois.readFields();
+ String[] t = (String[])gf.get("types", null);
+
+ types = (t != null && t.length != 0) ? t.clone() : NO_TYPES;
+ }
}
diff --git a/jdk/src/share/classes/javax/management/MBeanTrustPermission.java b/jdk/src/share/classes/javax/management/MBeanTrustPermission.java
index 040f0dd..605201a 100644
--- a/jdk/src/share/classes/javax/management/MBeanTrustPermission.java
+++ b/jdk/src/share/classes/javax/management/MBeanTrustPermission.java
@@ -26,6 +26,9 @@
package javax.management;
import java.security.BasicPermission;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
/**
* This permission represents "trust" in a signer or codebase.
@@ -75,15 +78,31 @@
*/
public MBeanTrustPermission(String name, String actions) {
super(name, actions);
- /* Check that actions is a null empty string */
- if (actions != null && actions.length() > 0)
- throw new IllegalArgumentException("MBeanTrustPermission " +
- "actions must be null: " +
- actions);
+ validate(name,actions);
+ }
- if (!name.equals("register") && !name.equals("*"))
- throw new IllegalArgumentException("MBeanTrustPermission: " +
- "Unknown target name " +
+ private static void validate(String name, String actions) {
+ /* Check that actions is a null empty string */
+ if (actions != null && actions.length() > 0) {
+ throw new IllegalArgumentException("MBeanTrustPermission actions must be null: " +
+ actions);
+ }
+
+ if (!name.equals("register") && !name.equals("*")) {
+ throw new IllegalArgumentException("MBeanTrustPermission: Unknown target name " +
"[" + name + "]");
+ }
+ }
+
+ private void readObject(ObjectInputStream in)
+ throws IOException, ClassNotFoundException {
+
+ // Reading private fields of base class
+ in.defaultReadObject();
+ try {
+ validate(super.getName(),super.getActions());
+ } catch (IllegalArgumentException e) {
+ throw new InvalidObjectException(e.getMessage());
+ }
}
}
diff --git a/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java b/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
index 6d28ada..0afd70f 100644
--- a/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
+++ b/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -298,11 +298,15 @@
RequiredModelMBean.class.getName(),
"setModelMBeanInfo(ModelMBeanInfo)",
"Setting ModelMBeanInfo to " + printModelMBeanInfo(mbi));
+ int noOfNotifications = 0;
+ if (mbi.getNotifications() != null) {
+ noOfNotifications = mbi.getNotifications().length;
+ }
MODELMBEAN_LOGGER.logp(Level.FINER,
RequiredModelMBean.class.getName(),
"setModelMBeanInfo(ModelMBeanInfo)",
"ModelMBeanInfo notifications has " +
- (mbi.getNotifications()).length + " elements");
+ noOfNotifications + " elements");
}
modelMBeanInfo = (ModelMBeanInfo)mbi.clone();
diff --git a/jdk/src/share/classes/javax/management/remote/JMXPrincipal.java b/jdk/src/share/classes/javax/management/remote/JMXPrincipal.java
index 258c537..5cb0c37 100644
--- a/jdk/src/share/classes/javax/management/remote/JMXPrincipal.java
+++ b/jdk/src/share/classes/javax/management/remote/JMXPrincipal.java
@@ -26,6 +26,9 @@
package javax.management.remote;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
import java.io.Serializable;
import java.security.Principal;
@@ -64,9 +67,7 @@
* <code>null</code>.
*/
public JMXPrincipal(String name) {
- if (name == null)
- throw new NullPointerException("illegal null input");
-
+ validate(name);
this.name = name;
}
@@ -130,4 +131,20 @@
public int hashCode() {
return name.hashCode();
}
+
+ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
+ ObjectInputStream.GetField gf = ois.readFields();
+ String principalName = (String)gf.get("name", null);
+ try {
+ validate(principalName);
+ this.name = principalName;
+ } catch (NullPointerException e) {
+ throw new InvalidObjectException(e.getMessage());
+ }
+ }
+
+ private static void validate(String name) throws NullPointerException {
+ if (name == null)
+ throw new NullPointerException("illegal null input");
+ }
}
diff --git a/jdk/src/share/classes/javax/management/remote/JMXServiceURL.java b/jdk/src/share/classes/javax/management/remote/JMXServiceURL.java
index 143966b..4b1c376 100644
--- a/jdk/src/share/classes/javax/management/remote/JMXServiceURL.java
+++ b/jdk/src/share/classes/javax/management/remote/JMXServiceURL.java
@@ -29,6 +29,9 @@
import com.sun.jmx.remote.util.ClassLogger;
import com.sun.jmx.remote.util.EnvHelp;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
import java.io.Serializable;
import java.net.InetAddress;
@@ -297,7 +300,7 @@
If we're given an explicit host name that is illegal we
have to reject it. (Bug 5057532.) */
try {
- validateHost(host);
+ validateHost(host, port);
} catch (MalformedURLException e) {
if (logger.fineOn()) {
logger.fine("JMXServiceURL",
@@ -336,36 +339,82 @@
validate();
}
- private void validate() throws MalformedURLException {
+ private static final String INVALID_INSTANCE_MSG =
+ "Trying to deserialize an invalid instance of JMXServiceURL";
+ private void readObject(ObjectInputStream inputStream) throws IOException, ClassNotFoundException {
+ ObjectInputStream.GetField gf = inputStream.readFields();
+ String h = (String)gf.get("host", null);
+ int p = (int)gf.get("port", -1);
+ String proto = (String)gf.get("protocol", null);
+ String url = (String)gf.get("urlPath", null);
+ if (proto == null || url == null || h == null) {
+ StringBuilder sb = new StringBuilder(INVALID_INSTANCE_MSG).append('[');
+ boolean empty = true;
+ if (proto == null) {
+ sb.append("protocol=null");
+ empty = false;
+ }
+ if (h == null) {
+ sb.append(empty ? "" : ",").append("host=null");
+ empty = false;
+ }
+ if (url == null) {
+ sb.append(empty ? "" : ",").append("urlPath=null");
+ }
+ sb.append(']');
+ throw new InvalidObjectException(sb.toString());
+ }
+
+ if (h.contains("[") || h.contains("]")) {
+ throw new InvalidObjectException("Invalid host name: " + h);
+ }
+
+ try {
+ validate(proto, h, p, url);
+ this.protocol = proto;
+ this.host = h;
+ this.port = p;
+ this.urlPath = url;
+ } catch (MalformedURLException e) {
+ throw new InvalidObjectException(INVALID_INSTANCE_MSG + ": " +
+ e.getMessage());
+ }
+
+ }
+
+ private void validate(String proto, String h, int p, String url)
+ throws MalformedURLException {
// Check protocol
-
- final int protoEnd = indexOfFirstNotInSet(protocol, protocolBitSet, 0);
- if (protoEnd == 0 || protoEnd < protocol.length()
- || !alphaBitSet.get(protocol.charAt(0))) {
+ final int protoEnd = indexOfFirstNotInSet(proto, protocolBitSet, 0);
+ if (protoEnd == 0 || protoEnd < proto.length()
+ || !alphaBitSet.get(proto.charAt(0))) {
throw new MalformedURLException("Missing or invalid protocol " +
- "name: \"" + protocol + "\"");
+ "name: \"" + proto + "\"");
}
// Check host
-
- validateHost();
+ validateHost(h, p);
// Check port
-
- if (port < 0)
- throw new MalformedURLException("Bad port: " + port);
+ if (p < 0)
+ throw new MalformedURLException("Bad port: " + p);
// Check URL path
-
- if (urlPath.length() > 0) {
- if (!urlPath.startsWith("/") && !urlPath.startsWith(";"))
- throw new MalformedURLException("Bad URL path: " + urlPath);
+ if (url.length() > 0) {
+ if (!url.startsWith("/") && !url.startsWith(";"))
+ throw new MalformedURLException("Bad URL path: " + url);
}
}
- private void validateHost() throws MalformedURLException {
- if (host.length() == 0) {
+ private void validate() throws MalformedURLException {
+ validate(this.protocol, this.host, this.port, this.urlPath);
+ }
+
+ private static void validateHost(String h, int port)
+ throws MalformedURLException {
+
+ if (h.length() == 0) {
if (port != 0) {
throw new MalformedURLException("Cannot give port number " +
"without host name");
@@ -373,12 +422,6 @@
return;
}
- validateHost(host);
- }
-
- private static void validateHost(String h)
- throws MalformedURLException {
-
if (isNumericIPv6Address(h)) {
/* We assume J2SE >= 1.4 here. Otherwise you can't
use the address anyway. We can't call
@@ -663,22 +706,22 @@
/**
* The value returned by {@link #getProtocol()}.
*/
- private final String protocol;
+ private String protocol;
/**
* The value returned by {@link #getHost()}.
*/
- private final String host;
+ private String host;
/**
* The value returned by {@link #getPort()}.
*/
- private final int port;
+ private int port;
/**
* The value returned by {@link #getURLPath()}.
*/
- private final String urlPath;
+ private String urlPath;
/**
* Cached result of {@link #toString()}.
diff --git a/jdk/src/share/classes/javax/management/remote/NotificationResult.java b/jdk/src/share/classes/javax/management/remote/NotificationResult.java
index cbc7975..ff3978d 100644
--- a/jdk/src/share/classes/javax/management/remote/NotificationResult.java
+++ b/jdk/src/share/classes/javax/management/remote/NotificationResult.java
@@ -25,6 +25,9 @@
package javax.management.remote;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
import java.io.Serializable;
/**
@@ -76,17 +79,7 @@
public NotificationResult(long earliestSequenceNumber,
long nextSequenceNumber,
TargetedNotification[] targetedNotifications) {
- if (targetedNotifications == null) {
- final String msg = "Notifications null";
- throw new IllegalArgumentException(msg);
- }
-
- if (earliestSequenceNumber < 0 || nextSequenceNumber < 0)
- throw new IllegalArgumentException("Bad sequence numbers");
- /* We used to check nextSequenceNumber >= earliestSequenceNumber
- here. But in fact the opposite can legitimately be true if
- notifications have been lost. */
-
+ validate(targetedNotifications, earliestSequenceNumber, nextSequenceNumber);
this.earliestSequenceNumber = earliestSequenceNumber;
this.nextSequenceNumber = nextSequenceNumber;
this.targetedNotifications = (targetedNotifications.length == 0 ? targetedNotifications : targetedNotifications.clone());
@@ -138,7 +131,40 @@
getTargetedNotifications().length;
}
- private final long earliestSequenceNumber;
- private final long nextSequenceNumber;
- private final TargetedNotification[] targetedNotifications;
+ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
+ ois.defaultReadObject();
+ try {
+ validate(
+ this.targetedNotifications,
+ this.earliestSequenceNumber,
+ this.nextSequenceNumber
+ );
+
+ this.targetedNotifications = this.targetedNotifications.length == 0 ?
+ this.targetedNotifications :
+ this.targetedNotifications.clone();
+ } catch (IllegalArgumentException e) {
+ throw new InvalidObjectException(e.getMessage());
+ }
+ }
+
+ private long earliestSequenceNumber;
+ private long nextSequenceNumber;
+ private TargetedNotification[] targetedNotifications;
+
+ private static void validate(TargetedNotification[] targetedNotifications,
+ long earliestSequenceNumber,
+ long nextSequenceNumber)
+ throws IllegalArgumentException {
+ if (targetedNotifications == null) {
+ final String msg = "Notifications null";
+ throw new IllegalArgumentException(msg);
+ }
+
+ if (earliestSequenceNumber < 0 || nextSequenceNumber < 0)
+ throw new IllegalArgumentException("Bad sequence numbers");
+ /* We used to check nextSequenceNumber >= earliestSequenceNumber
+ here. But in fact the opposite can legitimately be true if
+ notifications have been lost. */
+ }
}
diff --git a/jdk/src/share/classes/javax/management/remote/TargetedNotification.java b/jdk/src/share/classes/javax/management/remote/TargetedNotification.java
index c4b58df..cc3d0dc 100644
--- a/jdk/src/share/classes/javax/management/remote/TargetedNotification.java
+++ b/jdk/src/share/classes/javax/management/remote/TargetedNotification.java
@@ -26,6 +26,9 @@
package javax.management.remote;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
import java.io.Serializable;
import javax.management.Notification;
@@ -73,12 +76,9 @@
*/
public TargetedNotification(Notification notification,
Integer listenerID) {
+ validate(notification, listenerID);
// If we replace integer with int...
// this(notification,intValue(listenerID));
- if (notification == null) throw new
- IllegalArgumentException("Invalid notification: null");
- if (listenerID == null) throw new
- IllegalArgumentException("Invalid listener ID: null");
this.notif = notification;
this.id = listenerID;
}
@@ -115,13 +115,13 @@
* @serial A notification to transmit to the other side.
* @see #getNotification()
**/
- private final Notification notif;
+ private Notification notif;
/**
* @serial The ID of the listener to which the notification is
* targeted.
* @see #getListenerID()
**/
- private final Integer id;
+ private Integer id;
//private final int id;
// Needed if we use int instead of Integer...
@@ -130,4 +130,22 @@
// IllegalArgumentException("Invalid listener ID: null");
// return id.intValue();
// }
+
+ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
+ ois.defaultReadObject();
+ try {
+ validate(this.notif, this.id);
+ } catch (IllegalArgumentException e) {
+ throw new InvalidObjectException(e.getMessage());
+ }
+ }
+
+ private static void validate(Notification notif, Integer id) throws IllegalArgumentException {
+ if (notif == null) {
+ throw new IllegalArgumentException("Invalid notification: null");
+ }
+ if (id == null) {
+ throw new IllegalArgumentException("Invalid listener ID: null");
+ }
+ }
}
diff --git a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java b/jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java
index 4868b94..a336566 100644
--- a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java
+++ b/jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, 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
@@ -61,6 +61,7 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
+import java.security.PrivilegedActionException;
import java.security.ProtectionDomain;
import java.util.Arrays;
import java.util.Collections;
@@ -128,7 +129,6 @@
Map<String, ?> environment) {
if (rmiServer == null && address == null) throw new
IllegalArgumentException("rmiServer and jmxServiceURL both null");
-
initTransients();
this.rmiServer = rmiServer;
@@ -2382,13 +2382,21 @@
}
}
- private static RMIConnection shadowIiopStub(Object stub)
+ private static RMIConnection shadowIiopStub(Object stub)
throws InstantiationException, IllegalAccessException {
- Object proxyStub = proxyStubClass.newInstance();
+ Object proxyStub = null;
+ try {
+ proxyStub = AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
+ public Object run() throws Exception {
+ return proxyStubClass.newInstance();
+ }
+ });
+ } catch (PrivilegedActionException e) {
+ throw new InternalError();
+ }
IIOPHelper.setDelegate(proxyStub, IIOPHelper.getDelegate(stub));
return (RMIConnection) proxyStub;
}
-
private static RMIConnection getConnection(RMIServer server,
Object credentials,
boolean checkStub)
diff --git a/jdk/src/share/classes/javax/security/auth/Subject.java b/jdk/src/share/classes/javax/security/auth/Subject.java
index ba6bda7..23ffd22 100644
--- a/jdk/src/share/classes/javax/security/auth/Subject.java
+++ b/jdk/src/share/classes/javax/security/auth/Subject.java
@@ -1315,8 +1315,14 @@
{
ObjectInputStream.GetField fields = ois.readFields();
subject = (Subject) fields.get("this$0", null);
- elements = (LinkedList<E>) fields.get("elements", null);
which = fields.get("which", 0);
+
+ LinkedList<E> tmp = (LinkedList<E>) fields.get("elements", null);
+ if (tmp.getClass() != LinkedList.class) {
+ elements = new LinkedList<E>(tmp);
+ } else {
+ elements = tmp;
+ }
}
}
diff --git a/jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java b/jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java
index 631b7d0..db81539 100644
--- a/jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java
+++ b/jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java
@@ -26,6 +26,7 @@
package javax.security.auth.kerberos;
import java.io.File;
+import java.security.AccessControlException;
import java.util.Objects;
import sun.security.krb5.EncryptionKey;
import sun.security.krb5.KerberosSecrets;
@@ -214,9 +215,22 @@
return new KeyTab(princ, null, true);
}
- //Takes a snapshot of the keytab content
+ // Takes a snapshot of the keytab content. This method is called by
+ // JavaxSecurityAuthKerberosAccessImpl so no more private
sun.security.krb5.internal.ktab.KeyTab takeSnapshot() {
- return sun.security.krb5.internal.ktab.KeyTab.getInstance(file);
+ try {
+ return sun.security.krb5.internal.ktab.KeyTab.getInstance(file);
+ } catch (AccessControlException ace) {
+ if (file != null) {
+ // It's OK to show the name if caller specified it
+ throw ace;
+ } else {
+ AccessControlException ace2 = new AccessControlException(
+ "Access to default keytab denied (modified exception)");
+ ace2.setStackTrace(ace.getStackTrace());
+ throw ace2;
+ }
+ }
}
/**
diff --git a/jdk/src/share/classes/javax/sql/CommonDataSource.java b/jdk/src/share/classes/javax/sql/CommonDataSource.java
index 51f5ea0..ac8728c 100644
--- a/jdk/src/share/classes/javax/sql/CommonDataSource.java
+++ b/jdk/src/share/classes/javax/sql/CommonDataSource.java
@@ -33,7 +33,7 @@
/**
* Interface that defines the methods which are common between <code>DataSource</code>,
* <code>XADataSource</code> and <code>ConnectionPoolDataSource</code>.
- *<p>
+ *
*/
public interface CommonDataSource {
diff --git a/jdk/src/share/classes/javax/sql/RowSet.java b/jdk/src/share/classes/javax/sql/RowSet.java
index 38cd35a..7f6bd2b 100644
--- a/jdk/src/share/classes/javax/sql/RowSet.java
+++ b/jdk/src/share/classes/javax/sql/RowSet.java
@@ -1214,7 +1214,7 @@
* <code>Struct</code>, <code>java.net.URL</code>,
* or <code>Array</code>, the driver should pass it to the database as a
* value of the corresponding SQL type.
- * <P>
+ *
*
* <p>Note that this method may be used to pass datatabase-specific
* abstract data types.
@@ -1384,7 +1384,7 @@
* <code>Struct</code>, <code>java.net.URL</code>,
* or <code>Array</code>, the driver should pass it to the database as a
* value of the corresponding SQL type.
- * <P>
+ *
* <P>
* An exception is thrown if there is an ambiguity, for example, if the
* object is of a class implementing more than one of these interfaces.
diff --git a/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java b/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java
index 1ca60ad..4cc5778 100644
--- a/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java
+++ b/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java
@@ -38,7 +38,7 @@
* An abstract class providing a <code>RowSet</code> object with its basic functionality.
* The basic functions include having properties and sending event notifications,
* which all JavaBeans™ components must implement.
- * <P>
+ *
* <h3>1.0 Overview</h3>
* The <code>BaseRowSet</code> class provides the core functionality
* for all <code>RowSet</code> implementations,
@@ -52,19 +52,19 @@
* interfaces.
* <p>
* The <code>BaseRowSet</code> class provides the following:
- * <p>
+ *
* <UL>
* <LI><b>Properties</b>
* <ul>
* <li>Fields for storing current properties
* <li>Methods for getting and setting properties
* </ul>
- * <p>
+ *
* <LI><b>Event notification</b>
- * <P>
+ *
* <LI><b>A complete set of setter methods</b> for setting the parameters in a
* <code>RowSet</code> object's command
- * <p>
+ *
* <LI> <b>Streams</b>
* <ul>
* <li>Fields for storing stream instances
@@ -95,7 +95,7 @@
* with a naming service that uses the Java Naming and Directory
* Interface™ (JNDI) API. This registration
* is usually done by a person acting in the capacity of a system administrator.
- * <P>
+ *
* <h3>3.0 Setting the Command and Its Parameters</h3>
* When a rowset gets its data from a relational database, it executes a command (a query)
* that produces a <code>ResultSet</code> object. This query is the command that is set
@@ -255,7 +255,7 @@
* identify the <code>RowSet</code> object on which the event occurred.
* What the listener does with this information, which may be nothing, depends on how it was
* implemented.
-* <p>
+*
* <h3>6.0 Default Behavior</h3>
* A default <code>BaseRowSet</code> object is initialized with many starting values.
*
@@ -2530,7 +2530,7 @@
* <code>Struct</code>, or <code>Array</code>,
* the driver should pass it to the database as a value of the
* corresponding SQL type.
- * <P>
+ *
* <p>Note that this method may be used to pass database-
* specific abstract data types.
* <P>
diff --git a/jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java b/jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java
index 2686271..6eecd82 100644
--- a/jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java
+++ b/jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java
@@ -66,7 +66,7 @@
* object much leaner and therefore much easier to pass to another component. For
* example, a disconnected <code>RowSet</code> object can be serialized and passed
* over the wire to a thin client such as a personal digital assistant (PDA).
- * <P>
+ *
*
* <h3>1.0 Creating a <code>CachedRowSet</code> Object</h3>
* The following line of code uses the default constructor for
@@ -139,7 +139,7 @@
* See the comments for <code>SyncFactory</code> and <code>SyncProvider</code> for
* more details.
*
- * <P>
+ *
* <h3>2.0 Retrieving Data from a <code>CachedRowSet</code> Object</h3>
* Data is retrieved from a <code>CachedRowSet</code> object by using the
* getter methods inherited from the <code>ResultSet</code>
@@ -195,7 +195,7 @@
* <LI><i>It includes <code>setter</code> methods:</i> A <code>RowSet</code>
* object uses these methods internally when it is populated with data from a
* different <code>ResultSet</code> object.
- * <P>
+ *
* <LI><i>It contains fewer <code>getter</code> methods:</i> Some
* <code>ResultSetMetaData</code> methods to not apply to a <code>RowSet</code>
* object. For example, methods retrieving whether a column value is writable
@@ -260,7 +260,7 @@
* <code>acceptChanges</code> after all calls to <code>updateRow</code>
* and <code>insertRow</code> have been made. If <code>acceptChanges</code>
* is called only once, only one connection needs to be established.
- * <P>
+ *
* <h3>4.0 Updating the Underlying Data Source</h3>
* When the method <code>acceptChanges</code> is executed, the
* <code>CachedRowSet</code> object's writer, a <code>RowSetWriterImpl</code>
@@ -304,7 +304,7 @@
* the values in the database have been changed, there is a conflict.
* Whether a writer checks for conflicts, what degree of checking it does, and how
* it handles conflicts all depend on how it is implemented.
- * <P>
+ *
* <h3>5.0 Registering and Notifying Listeners</h3>
* Being JavaBeans components, all rowsets participate in the JavaBeans event
* model, inheriting methods for registering listeners and notifying them of
@@ -327,7 +327,7 @@
* data also notifies registered listeners of the changes, so
* <code>table</code> and <code>barGraph</code> will be notified when there is
* a change in <code>crs</code>.
- * <P>
+ *
* <h3>6.0 Passing Data to Thin Clients</h3>
* One of the main reasons to use a <code>CachedRowSet</code> object is to
* pass data between different components of an application. Because it is
@@ -343,7 +343,7 @@
* due to resource limitations or security considerations.
* Thus, a <code>CachedRowSet</code> object provides a means to "get rows in"
* without the need to implement the full JDBC API.
- * <P>
+ *
* <h3>7.0 Scrolling and Updating</h3>
* A second major use for <code>CachedRowSet</code> objects is to provide
* scrolling and updating for <code>ResultSet</code> objects that
@@ -377,7 +377,7 @@
* and it is well suited to sending data to a thin client. However, a
* <code>CachedRowSet</code> object does have a limitation: It is limited in
* size by the amount of data it can store in memory at one time.
- * <P>
+ *
* <h3>8.0 Getting Universal Data Access</h3>
* Another advantage of the <code>CachedRowSet</code> class is that it makes it
* possible to retrieve and store data from sources other than a relational
@@ -390,7 +390,7 @@
* non-SQL data sources. Nevertheless, it is expected that most of the time,
* <code>CachedRowSet</code> objects will contain data that was fetched
* from an SQL database using the JDBC API.
- * <P>
+ *
* <h3>9.0 Setting Properties</h3>
* All rowsets maintain a set of properties, which will usually be set using
* a tool. The number and kinds of properties a rowset has will vary,
diff --git a/jdk/src/share/classes/javax/sql/rowset/FilteredRowSet.java b/jdk/src/share/classes/javax/sql/rowset/FilteredRowSet.java
index 754bc49..7570ae4 100644
--- a/jdk/src/share/classes/javax/sql/rowset/FilteredRowSet.java
+++ b/jdk/src/share/classes/javax/sql/rowset/FilteredRowSet.java
@@ -68,7 +68,7 @@
* By implementing a <code>Predicate</code> (see example in <a href="Predicate.html">Predicate</a>
* class JavaDoc), a <code>FilteredRowSet</code> could then be used as described
* below.
- * <P>
+ *
* <pre>
* {@code
* FilteredRowSet frs = new FilteredRowSetImpl();
@@ -91,7 +91,7 @@
* This framework allows multiple classes implementing predicates to be
* used in combination to achieved the required filtering result with
* out the need for query language processing.
- * <p>
+ *
* <h3>4.0 Updating a <code>FilteredRowSet</code> Object</h3>
* The predicate set on a <code>FilteredRowSet</code> object
* applies a criterion on all rows in a
@@ -112,7 +112,7 @@
* immediate effect on criterion enforcement within the
* <code>FilteredRowSet</code> object, and all subsequent views and updates will be
* subject to similar enforcement.
- * <p>
+ *
* <h3>5.0 Behavior of Rows Outside the Filter</h3>
* Rows that fall outside of the filter set on a <code>FilteredRowSet</code>
* object cannot be modified until the filter is removed or a
diff --git a/jdk/src/share/classes/javax/sql/rowset/JdbcRowSet.java b/jdk/src/share/classes/javax/sql/rowset/JdbcRowSet.java
index bcb05d1..07d01ad 100644
--- a/jdk/src/share/classes/javax/sql/rowset/JdbcRowSet.java
+++ b/jdk/src/share/classes/javax/sql/rowset/JdbcRowSet.java
@@ -59,7 +59,7 @@
* with the data of a <code>ResultSet</code> object and then operate on the
* <code>JdbcRowSet</code> object as if it were the <code>ResultSet</code>
* object.
- * <P>
+ *
* <h3>2.0 Creating a <code>JdbcRowSet</code> Object</h3>
* The reference implementation of the <code>JdbcRowSet</code> interface,
* <code>JdbcRowSetImpl</code>, provides an implementation of
diff --git a/jdk/src/share/classes/javax/sql/rowset/JoinRowSet.java b/jdk/src/share/classes/javax/sql/rowset/JoinRowSet.java
index dbb903b..695e29d 100644
--- a/jdk/src/share/classes/javax/sql/rowset/JoinRowSet.java
+++ b/jdk/src/share/classes/javax/sql/rowset/JoinRowSet.java
@@ -47,8 +47,7 @@
* establishing an SQL <code>JOIN</code> relationship. The match column may
* alternatively be set by supplying it to the appropriate version of the
* <code>JointRowSet</code> method <code>addRowSet</code>.
- * <P>
- * <p>
+ *
* <h3>1.0 Overview</h3>
* Disconnected <code>RowSet</code> objects (<code>CachedRowSet</code> objects
* and implementations extending the <code>CachedRowSet</code> interface)
@@ -98,7 +97,7 @@
* inner join. The comments for the fields in the
* <code>JoinRowSet</code> interface explain these <code>JOIN</code> types, which are
* standard SQL <code>JOIN</code> types.
- * <P>
+ *
* <h3>2.0 Using a <code>JoinRowSet</code> Object for Creating a <code>JOIN</code></h3>
* When a <code>JoinRowSet</code> object is created, it is empty.
* The first <code>RowSet</code> object to be added becomes the basis for the
@@ -193,7 +192,7 @@
* tables. The data in each row in <i>four01k</i> in which the value for the
* <code>EMP_ID</code> column matches a value for the <code>EMP_ID</code> column
* in <i>jrs</i> has been added to <i>jrs</i>.
- * <P>
+ *
* <h3>4.0 <code>JoinRowSet</code> Methods</h3>
* The <code>JoinRowSet</code> interface supplies several methods for adding
* <code>RowSet</code> objects and for getting information about the
@@ -217,7 +216,7 @@
* <LI>A method to make a separate copy of the <code>JoinRowSet</code> object<BR>
* This method creates a copy that can be persisted to the data source.
* </UL>
- * <P>
+ *
*/
public interface JoinRowSet extends WebRowSet {
diff --git a/jdk/src/share/classes/javax/sql/rowset/Joinable.java b/jdk/src/share/classes/javax/sql/rowset/Joinable.java
index c15f44d..24c035f 100644
--- a/jdk/src/share/classes/javax/sql/rowset/Joinable.java
+++ b/jdk/src/share/classes/javax/sql/rowset/Joinable.java
@@ -57,7 +57,7 @@
* :
* }
* </pre>
- * <P>
+ *
* <h3>2.0 Usage Guidelines</h3>
* <P>
* The methods in the <code>Joinable</code> interface allow a <code>RowSet</code> object
@@ -66,7 +66,7 @@
* An instance of a class that implements these methods can be added to a
* <code>JoinRowSet</code> object to allow an SQL <code>JOIN</code> relationship to
* be established.
- * <p>
+ *
* <pre>
* CachedRowSet crs = new MyRowSetImpl();
* crs.populate((ResultSet)rs);
@@ -97,7 +97,7 @@
* <code>JdbcRowSet</code> object, being always connected to its data source, can
* become part of an SQL <code>JOIN</code> directly without having to become part
* of a <code>JoinRowSet</code> object.
- * <P>
+ *
* <h3>3.0 Managing Multiple Match Columns</h3>
* The index array passed into the <code>setMatchColumn</code> methods indicates
* how many match columns are being set (the length of the array) in addition to
diff --git a/jdk/src/share/classes/javax/sql/rowset/Predicate.java b/jdk/src/share/classes/javax/sql/rowset/Predicate.java
index 5b9676d..0c8f747 100644
--- a/jdk/src/share/classes/javax/sql/rowset/Predicate.java
+++ b/jdk/src/share/classes/javax/sql/rowset/Predicate.java
@@ -31,7 +31,7 @@
/**
* The standard interface that provides the framework for all
* <code>FilteredRowSet</code> objects to describe their filters.
- * <p>
+ *
* <h3>1.0 Background</h3>
* The <code>Predicate</code> interface is a standard interface that
* applications can implement to define the filter they wish to apply to a
diff --git a/jdk/src/share/classes/javax/sql/rowset/WebRowSet.java b/jdk/src/share/classes/javax/sql/rowset/WebRowSet.java
index 3f0ba94..8fc3750 100644
--- a/jdk/src/share/classes/javax/sql/rowset/WebRowSet.java
+++ b/jdk/src/share/classes/javax/sql/rowset/WebRowSet.java
@@ -35,7 +35,7 @@
/**
* The standard interface that all implementations of a {@code WebRowSet}
* must implement.
- * <P>
+ *
* <h3>1.0 Overview</h3>
* The {@code WebRowSetImpl} provides the standard
* reference implementation, which may be extended if required.
@@ -77,12 +77,12 @@
* in its data back to the originating data source.
* </li>
* </ul>
- * <P>
+ *
* <h3>2.0 WebRowSet States</h3>
* The following sections demonstrates how a {@code WebRowSet} implementation
* should use the XML Schema to describe update, insert, and delete operations
* and to describe the state of a {@code WebRowSet} object in XML.
- * <p>
+ *
* <h4>2.1 State 1 - Outputting a {@code WebRowSet} Object to XML</h4>
* In this example, a {@code WebRowSet} object is created and populated with a simple 2 column,
* 5 row table from a data source. Having the 5 rows in a {@code WebRowSet} object
diff --git a/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java b/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java
index 6797dc0..d78f5f4 100644
--- a/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java
+++ b/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java
@@ -53,7 +53,7 @@
* per Java VM at any one time. This ensures that there is a single source from which a
* <code>RowSet</code> implementation can obtain its <code>SyncProvider</code>
* implementation.
- * <p>
+ *
* <h3>1.0 Overview</h3>
* The <code>SyncFactory</code> class provides an internal registry of available
* synchronization provider implementations (<code>SyncProvider</code> objects).
@@ -92,12 +92,12 @@
* the <code>SyncFactory</code> does not contain a reference to this provider,
* a <code>SyncFactoryException</code> is thrown stating that the synchronization
* provider could not be found.
- * <p>
+ *
* <li>If a <code>RowSet</code> implementation is instantiated with a specified
* provider and the specified provider has been properly registered, the
* requested provider is supplied. Otherwise a <code>SyncFactoryException</code>
* is thrown.
- * <p>
+ *
* <li>If a <code>RowSet</code> object does not specify a
* <code>SyncProvider</code> implementation and no additional
* <code>SyncProvider</code> implementations are available, the reference
@@ -143,7 +143,7 @@
* rowset.provider.vendor.2=Fred, Inc.
* rowset.provider.version.2=1.0
* </PRE>
- * <p>
+ *
* <li><b>Using a JNDI Context</b><BR>
* Available providers can be registered on a JNDI
* context, and the <code>SyncFactory</code> will attempt to load
diff --git a/jdk/src/share/classes/javax/sql/rowset/spi/SyncProvider.java b/jdk/src/share/classes/javax/sql/rowset/spi/SyncProvider.java
index 7ff6690..7dce603 100644
--- a/jdk/src/share/classes/javax/sql/rowset/spi/SyncProvider.java
+++ b/jdk/src/share/classes/javax/sql/rowset/spi/SyncProvider.java
@@ -54,7 +54,7 @@
* <code>XmlReader</code> object to read data in XML format to populate itself with that
* data. It uses the <code>XmlWriter</code> object to write itself to a stream or
* <code>java.io.Writer</code> object in XML format.
- * <P>
+ *
* <h3>1.0 Naming Convention for Implementations</h3>
* As a guide to naming <code>SyncProvider</code>
* implementations, the following should be noted:
@@ -129,7 +129,7 @@
* registered with the <code>SyncFactory</code> instance, <i>crs</i> will be
* assigned the default provider in the reference implementation, which is
* <code>com.sun.rowset.providers.RIOptimisticProvider</code>.
- * <p>
+ *
* <h3>3.0 Violations and Synchronization Issues</h3>
* If an update between a disconnected <code>RowSet</code> object
* and a data source violates
@@ -147,7 +147,7 @@
* violation is not handled by the <code>SyncProvider</code> implementation,
* all <code>SyncProvider</code>
* objects must throw a <code>SyncProviderException</code>.
- * <p>
+ *
* <h3>4.0 Updatable SQL VIEWs</h3>
* It is possible for any disconnected or connected <code>RowSet</code> object to be populated
* from an SQL query that is formulated originally from an SQL <code>VIEW</code>.
@@ -167,7 +167,7 @@
* <P>
* The default is for a <code>RowSet</code> object not to be updatable if it was
* populated with data from an SQL <code>VIEW</code>.
- * <P>
+ *
* <h3>5.0 <code>SyncProvider</code> Constants</h3>
* The <code>SyncProvider</code> class provides three sets of constants that
* are used as return values or parameters for <code>SyncProvider</code> methods.
diff --git a/jdk/src/share/classes/javax/sql/rowset/spi/SyncResolver.java b/jdk/src/share/classes/javax/sql/rowset/spi/SyncResolver.java
index 71f463f..3783e14 100644
--- a/jdk/src/share/classes/javax/sql/rowset/spi/SyncResolver.java
+++ b/jdk/src/share/classes/javax/sql/rowset/spi/SyncResolver.java
@@ -41,7 +41,7 @@
* the data source row has been modified since the last synchronization. Note also that
* a <code>RowSet</code> object's original values are the values it had just prior to the
* the last synchronization, which are not necessarily its initial values.
- * <p>
+ *
*
* <H2>Description of a <code>SyncResolver</code> Object</H2>
*
@@ -68,7 +68,7 @@
* <code>SyncResolver</code> object contains the values from the data source that caused
* the conflict(s) and <code>null</code> for all other values.
* In addition, it contains information about each conflict.
- * <P>
+ *
*
* <H2>Getting and Using a <code>SyncResolver</code> Object</H2>
*
@@ -99,7 +99,7 @@
* <P>
* The following kinds of information can be obtained from a <code>SyncResolver</code>
* object:
- * <P>
+ *
* <h3>What operation was being attempted when a conflict occurred</h3>
* The <code>SyncProvider</code> interface defines four constants
* describing states that may occur. Three
@@ -111,7 +111,7 @@
* <PRE>
* {@code int operation = resolver.getStatus(); }
* </PRE>
- * <P>
+ *
* <h3>The value in the data source that caused a conflict</h3>
* A conflict exists when a value that a <code>RowSet</code> object has changed
* and is attempting to write to the data source
@@ -142,7 +142,7 @@
* An application calls the method <code>setResolvedValue</code> after it has
* resolved all of the conflicts in the current conflict row and repeats this process
* for each conflict row in the <code>SyncResolver</code> object.
- * <P>
+ *
*
* <H2>Navigating a <code>SyncResolver</code> Object</H2>
*
diff --git a/jdk/src/share/classes/javax/swing/JTable.java b/jdk/src/share/classes/javax/swing/JTable.java
index c366c6b..81b4e6b 100644
--- a/jdk/src/share/classes/javax/swing/JTable.java
+++ b/jdk/src/share/classes/javax/swing/JTable.java
@@ -52,6 +52,7 @@
import javax.print.attribute.*;
import javax.print.PrintService;
+import sun.reflect.misc.ReflectUtil;
import sun.swing.SwingUtilities2;
import sun.swing.SwingUtilities2.Section;
@@ -5462,14 +5463,15 @@
// they have the option to replace the value with
// null or use escape to restore the original.
// For Strings, return "" for backward compatibility.
- if ("".equals(s)) {
- if (constructor.getDeclaringClass() == String.class) {
- value = s;
- }
- return super.stopCellEditing();
- }
-
try {
+ if ("".equals(s)) {
+ if (constructor.getDeclaringClass() == String.class) {
+ value = s;
+ }
+ return super.stopCellEditing();
+ }
+
+ SwingUtilities2.checkAccess(constructor.getModifiers());
value = constructor.newInstance(new Object[]{s});
}
catch (Exception e) {
@@ -5493,6 +5495,8 @@
if (type == Object.class) {
type = String.class;
}
+ ReflectUtil.checkPackageAccess(type);
+ SwingUtilities2.checkAccess(type.getModifiers());
constructor = type.getConstructor(argTypes);
}
catch (Exception e) {
diff --git a/jdk/src/share/classes/javax/swing/UIDefaults.java b/jdk/src/share/classes/javax/swing/UIDefaults.java
index 4812caa..a560b2d 100644
--- a/jdk/src/share/classes/javax/swing/UIDefaults.java
+++ b/jdk/src/share/classes/javax/swing/UIDefaults.java
@@ -53,6 +53,7 @@
import sun.reflect.misc.MethodUtil;
import sun.reflect.misc.ReflectUtil;
+import sun.swing.SwingUtilities2;
import sun.util.CoreResourceBundleControl;
/**
@@ -1101,7 +1102,7 @@
}
ReflectUtil.checkPackageAccess(className);
c = Class.forName(className, true, (ClassLoader)cl);
- checkAccess(c.getModifiers());
+ SwingUtilities2.checkAccess(c.getModifiers());
if (methodName != null) {
Class[] types = getClassArray(args);
Method m = c.getMethod(methodName, types);
@@ -1109,7 +1110,7 @@
} else {
Class[] types = getClassArray(args);
Constructor constructor = c.getConstructor(types);
- checkAccess(constructor.getModifiers());
+ SwingUtilities2.checkAccess(constructor.getModifiers());
return constructor.newInstance(args);
}
} catch(Exception e) {
@@ -1124,13 +1125,6 @@
}, acc);
}
- private void checkAccess(int modifiers) {
- if(System.getSecurityManager() != null &&
- !Modifier.isPublic(modifiers)) {
- throw new SecurityException("Resource is not accessible");
- }
- }
-
/*
* Coerce the array of class types provided into one which
* looks the way the Reflection APIs expect. This is done
diff --git a/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java b/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java
index 1933d38..33cf83c 100644
--- a/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java
+++ b/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java
@@ -24,7 +24,8 @@
*/
package javax.swing.text;
-import sun.reflect.misc.ConstructorUtil;
+import sun.reflect.misc.ReflectUtil;
+import sun.swing.SwingUtilities2;
import java.io.Serializable;
import java.lang.reflect.*;
@@ -247,7 +248,9 @@
Constructor cons;
try {
- cons = ConstructorUtil.getConstructor(vc, new Class[]{String.class});
+ ReflectUtil.checkPackageAccess(vc);
+ SwingUtilities2.checkAccess(vc.getModifiers());
+ cons = vc.getConstructor(new Class[]{String.class});
} catch (NoSuchMethodException nsme) {
cons = null;
@@ -255,6 +258,7 @@
if (cons != null) {
try {
+ SwingUtilities2.checkAccess(cons.getModifiers());
return cons.newInstance(new Object[] { string });
} catch (Throwable ex) {
throw new ParseException("Error creating instance", 0);
diff --git a/jdk/src/share/classes/javax/swing/text/NumberFormatter.java b/jdk/src/share/classes/javax/swing/text/NumberFormatter.java
index 1af2b30..fa69788 100644
--- a/jdk/src/share/classes/javax/swing/text/NumberFormatter.java
+++ b/jdk/src/share/classes/javax/swing/text/NumberFormatter.java
@@ -27,6 +27,8 @@
import java.lang.reflect.*;
import java.text.*;
import java.util.*;
+import sun.reflect.misc.ReflectUtil;
+import sun.swing.SwingUtilities2;
/**
* <code>NumberFormatter</code> subclasses <code>InternationalFormatter</code>
@@ -427,10 +429,12 @@
valueClass = value.getClass();
}
try {
+ ReflectUtil.checkPackageAccess(valueClass);
+ SwingUtilities2.checkAccess(valueClass.getModifiers());
Constructor cons = valueClass.getConstructor(
new Class[] { String.class });
-
if (cons != null) {
+ SwingUtilities2.checkAccess(cons.getModifiers());
return cons.newInstance(new Object[]{string});
}
} catch (Throwable ex) { }
diff --git a/jdk/src/share/classes/javax/swing/text/html/ObjectView.java b/jdk/src/share/classes/javax/swing/text/html/ObjectView.java
index 4e43cfb..00d3a42 100644
--- a/jdk/src/share/classes/javax/swing/text/html/ObjectView.java
+++ b/jdk/src/share/classes/javax/swing/text/html/ObjectView.java
@@ -31,6 +31,9 @@
import java.beans.*;
import java.lang.reflect.*;
+import sun.reflect.misc.MethodUtil;
+import sun.reflect.misc.ReflectUtil;
+
/**
* Component decorator that implements the view interface
* for <object> elements.
@@ -87,6 +90,7 @@
AttributeSet attr = getElement().getAttributes();
String classname = (String) attr.getAttribute(HTML.Attribute.CLASSID);
try {
+ ReflectUtil.checkPackageAccess(classname);
Class c = Class.forName(classname, true,Thread.currentThread().
getContextClassLoader());
Object o = c.newInstance();
@@ -116,28 +120,6 @@
}
/**
- * Get a Class object to use for loading the
- * classid. If possible, the Classloader
- * used to load the associated Document is used.
- * This would typically be the same as the ClassLoader
- * used to load the EditorKit. If the documents
- * ClassLoader is null,
- * <code>Class.forName</code> is used.
- */
- private Class getClass(String classname) throws ClassNotFoundException {
- Class klass;
-
- Class docClass = getDocument().getClass();
- ClassLoader loader = docClass.getClassLoader();
- if (loader != null) {
- klass = loader.loadClass(classname);
- } else {
- klass = Class.forName(classname);
- }
- return klass;
- }
-
- /**
* Initialize this component according the KEY/VALUEs passed in
* via the <param> elements in the corresponding
* <object> element.
@@ -170,7 +152,7 @@
}
Object [] args = { value };
try {
- writer.invoke(comp, args);
+ MethodUtil.invoke(writer, comp, args);
} catch (Exception ex) {
System.err.println("Invocation failed");
// invocation code
diff --git a/jdk/src/share/classes/sun/awt/AppContext.java b/jdk/src/share/classes/sun/awt/AppContext.java
index dbdc920..a9e86fb 100644
--- a/jdk/src/share/classes/sun/awt/AppContext.java
+++ b/jdk/src/share/classes/sun/awt/AppContext.java
@@ -839,6 +839,15 @@
return (numAppContexts.get() == 1 && mainAppContext != null);
}
+ private boolean hasRootThreadGroup(final AppContext ecx) {
+ return AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+ @Override
+ public Boolean run() {
+ return ecx.threadGroup.getParent() == null;
+ }
+ });
+ }
+
/**
* Returns the AppContext used for applet logging isolation, or null if
* the default global context can be used.
@@ -886,7 +895,7 @@
// See: JDK-8023258
final boolean isMainAppContext = ecx == null
|| mainAppContext == ecx
- || mainAppContext == null && ecx.threadGroup.getParent() == null;
+ || mainAppContext == null && hasRootThreadGroup(ecx);
return isMainAppContext ? null : ecx;
}
diff --git a/jdk/src/share/classes/sun/font/FontUtilities.java b/jdk/src/share/classes/sun/font/FontUtilities.java
index 2284c11..04a4f9f 100644
--- a/jdk/src/share/classes/sun/font/FontUtilities.java
+++ b/jdk/src/share/classes/sun/font/FontUtilities.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, 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
@@ -133,9 +133,9 @@
debugFonts = true;
logger = PlatformLogger.getLogger("sun.java2d");
if (debugLevel.equals("warning")) {
- logger.setLevel(PlatformLogger.WARNING);
+ logger.setLevel(PlatformLogger.Level.WARNING);
} else if (debugLevel.equals("severe")) {
- logger.setLevel(PlatformLogger.SEVERE);
+ logger.setLevel(PlatformLogger.Level.SEVERE);
}
}
diff --git a/jdk/src/share/classes/sun/font/GlyphLayout.java b/jdk/src/share/classes/sun/font/GlyphLayout.java
index d29ecf3..f2fc484 100644
--- a/jdk/src/share/classes/sun/font/GlyphLayout.java
+++ b/jdk/src/share/classes/sun/font/GlyphLayout.java
@@ -468,9 +468,10 @@
_gvdata.grow();
}
}
- if (_gvdata._count < 0) {
- break;
- }
+ }
+ // Break out of the outer for loop if layout fails.
+ if (_gvdata._count < 0) {
+ break;
}
}
diff --git a/jdk/src/share/classes/sun/instrument/InstrumentationImpl.java b/jdk/src/share/classes/sun/instrument/InstrumentationImpl.java
index 658afa0..823bdfa 100644
--- a/jdk/src/share/classes/sun/instrument/InstrumentationImpl.java
+++ b/jdk/src/share/classes/sun/instrument/InstrumentationImpl.java
@@ -170,11 +170,13 @@
redefineClasses0(mNativeAgent, definitions);
}
+ @SuppressWarnings("rawtypes")
public Class[]
getAllLoadedClasses() {
return getAllLoadedClasses0(mNativeAgent);
}
+ @SuppressWarnings("rawtypes")
public Class[]
getInitiatedClasses(ClassLoader loader) {
return getInitiatedClasses0(mNativeAgent, loader);
@@ -255,9 +257,11 @@
redefineClasses0(long nativeAgent, ClassDefinition[] definitions)
throws ClassNotFoundException;
+ @SuppressWarnings("rawtypes")
private native Class[]
getAllLoadedClasses0(long nativeAgent);
+ @SuppressWarnings("rawtypes")
private native Class[]
getInitiatedClasses0(long nativeAgent, ClassLoader loader);
diff --git a/jdk/src/share/classes/sun/invoke/util/VerifyAccess.java b/jdk/src/share/classes/sun/invoke/util/VerifyAccess.java
index 3b65b58..02a6e66 100644
--- a/jdk/src/share/classes/sun/invoke/util/VerifyAccess.java
+++ b/jdk/src/share/classes/sun/invoke/util/VerifyAccess.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
import java.lang.reflect.Modifier;
import static java.lang.reflect.Modifier.*;
+import sun.reflect.Reflection;
/**
* This class centralizes information about the JVM's linkage access control.
@@ -140,7 +141,17 @@
}
static boolean isPublicSuperClass(Class<?> defc, Class<?> lookupClass) {
- return isPublic(defc.getModifiers()) && defc.isAssignableFrom(lookupClass);
+ return isPublic(getClassModifiers(defc)) && defc.isAssignableFrom(lookupClass);
+ }
+
+ static int getClassModifiers(Class<?> c) {
+ // This would return the mask stored by javac for the source-level modifiers.
+ // return c.getModifiers();
+ // But what we need for JVM access checks are the actual bits from the class header.
+ // ...But arrays and primitives are synthesized with their own odd flags:
+ if (c.isArray() || c.isPrimitive())
+ return c.getModifiers();
+ return Reflection.getClassAccessFlags(c);
}
/**
@@ -159,7 +170,7 @@
if (allowedModes == 0) return false;
assert((allowedModes & PUBLIC) != 0 &&
(allowedModes & ~(ALL_ACCESS_MODES|PACKAGE_ALLOWED)) == 0);
- int mods = refc.getModifiers();
+ int mods = getClassModifiers(refc);
if (isPublic(mods))
return true;
if ((allowedModes & PACKAGE_ALLOWED) != 0 &&
diff --git a/jdk/src/share/classes/sun/java2d/Disposer.java b/jdk/src/share/classes/sun/java2d/Disposer.java
index dcedfe3..7be5c3a 100644
--- a/jdk/src/share/classes/sun/java2d/Disposer.java
+++ b/jdk/src/share/classes/sun/java2d/Disposer.java
@@ -155,8 +155,7 @@
rec = null;
clearDeferredRecords();
} catch (Exception e) {
- System.out.println("Exception while removing reference: " + e);
- e.printStackTrace();
+ System.out.println("Exception while removing reference.");
}
}
}
@@ -182,7 +181,6 @@
rec.dispose();
} catch (Exception e) {
System.out.println("Exception while disposing deferred rec.");
- e.printStackTrace();
}
}
deferredRecords.clear();
@@ -233,8 +231,7 @@
}
}
} catch (Exception e) {
- System.out.println("Exception while removing reference: " + e);
- e.printStackTrace();
+ System.out.println("Exception while removing reference.");
} finally {
pollingQueue = false;
}
diff --git a/jdk/src/share/classes/sun/management/HotSpotDiagnostic.java b/jdk/src/share/classes/sun/management/HotSpotDiagnostic.java
index a6d3be1..7a4bd99 100644
--- a/jdk/src/share/classes/sun/management/HotSpotDiagnostic.java
+++ b/jdk/src/share/classes/sun/management/HotSpotDiagnostic.java
@@ -40,7 +40,17 @@
public HotSpotDiagnostic() {
}
- public native void dumpHeap(String outputFile, boolean live) throws IOException;
+ public void dumpHeap(String outputFile, boolean live) throws IOException {
+ SecurityManager security = System.getSecurityManager();
+ if (security != null) {
+ security.checkWrite(outputFile);
+ Util.checkControlAccess();
+ }
+
+ dumpHeap0(outputFile, live);
+ }
+
+ private native void dumpHeap0(String outputFile, boolean live) throws IOException;
public List<VMOption> getDiagnosticOptions() {
List<Flag> allFlags = Flag.getAllFlags();
diff --git a/jdk/src/share/classes/sun/misc/JavaLangAccess.java b/jdk/src/share/classes/sun/misc/JavaLangAccess.java
index db9fac6..fa844d4 100644
--- a/jdk/src/share/classes/sun/misc/JavaLangAccess.java
+++ b/jdk/src/share/classes/sun/misc/JavaLangAccess.java
@@ -27,6 +27,8 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Executable;
+import java.security.AccessControlContext;
+
import sun.reflect.ConstantPool;
import sun.reflect.annotation.AnnotationType;
import sun.nio.ch.Interruptible;
@@ -113,4 +115,10 @@
* @return a newly created string whose content is the character array
*/
String newStringUnsafe(char[] chars);
+
+ /**
+ * Returns a new Thread with the given Runnable and an
+ * inherited AccessControlContext.
+ */
+ Thread newThreadWithAcc(Runnable target, AccessControlContext acc);
}
diff --git a/jdk/src/share/classes/sun/net/www/content/image/gif.java b/jdk/src/share/classes/sun/net/www/content/image/gif.java
index 28e41e6..7db08b9 100644
--- a/jdk/src/share/classes/sun/net/www/content/image/gif.java
+++ b/jdk/src/share/classes/sun/net/www/content/image/gif.java
@@ -37,6 +37,7 @@
return new URLImageSource(urlc);
}
+ @SuppressWarnings("rawtypes")
public Object getContent(URLConnection urlc, Class[] classes) throws IOException {
Class<?>[] cls = classes;
for (int i = 0; i < cls.length; i++) {
diff --git a/jdk/src/share/classes/sun/net/www/content/image/jpeg.java b/jdk/src/share/classes/sun/net/www/content/image/jpeg.java
index a663f13..6073dd7 100644
--- a/jdk/src/share/classes/sun/net/www/content/image/jpeg.java
+++ b/jdk/src/share/classes/sun/net/www/content/image/jpeg.java
@@ -36,6 +36,7 @@
return new URLImageSource(urlc);
}
+ @SuppressWarnings("rawtypes")
public Object getContent(URLConnection urlc, Class[] classes) throws IOException {
Class<?>[] cls = classes;
for (int i = 0; i < cls.length; i++) {
diff --git a/jdk/src/share/classes/sun/net/www/content/image/png.java b/jdk/src/share/classes/sun/net/www/content/image/png.java
index fcaa33a..535e31a 100644
--- a/jdk/src/share/classes/sun/net/www/content/image/png.java
+++ b/jdk/src/share/classes/sun/net/www/content/image/png.java
@@ -36,6 +36,7 @@
return new URLImageSource(urlc);
}
+ @SuppressWarnings("rawtypes")
public Object getContent(URLConnection urlc, Class[] classes) throws IOException {
Class<?>[] cls = classes;
for (int i = 0; i < cls.length; i++) {
diff --git a/jdk/src/share/classes/sun/net/www/content/image/x_xbitmap.java b/jdk/src/share/classes/sun/net/www/content/image/x_xbitmap.java
index 9a3fd55..11e86ab 100644
--- a/jdk/src/share/classes/sun/net/www/content/image/x_xbitmap.java
+++ b/jdk/src/share/classes/sun/net/www/content/image/x_xbitmap.java
@@ -35,6 +35,7 @@
return new URLImageSource(urlc);
}
+ @SuppressWarnings("rawtypes")
public Object getContent(URLConnection urlc, Class[] classes) throws java.io.IOException {
Class<?>[] cls = classes;
for (int i = 0; i < cls.length; i++) {
diff --git a/jdk/src/share/classes/sun/net/www/content/image/x_xpixmap.java b/jdk/src/share/classes/sun/net/www/content/image/x_xpixmap.java
index 8a2eb1f..e08609b 100644
--- a/jdk/src/share/classes/sun/net/www/content/image/x_xpixmap.java
+++ b/jdk/src/share/classes/sun/net/www/content/image/x_xpixmap.java
@@ -35,6 +35,7 @@
return new URLImageSource(urlc);
}
+ @SuppressWarnings("rawtypes")
public Object getContent(URLConnection urlc, Class[] classes) throws java.io.IOException {
Class<?>[] cls = classes;
for (int i = 0; i < cls.length; i++) {
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java b/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
index 1efb3e1..0a327cc 100644
--- a/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
+++ b/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
@@ -46,7 +46,7 @@
import java.net.CacheResponse;
import java.net.SecureCacheResponse;
import java.net.CacheRequest;
-import java.net.HttpURLPermission;
+import java.net.URLPermission;
import java.net.Authenticator.RequestorType;
import java.security.AccessController;
import java.security.PrivilegedExceptionAction;
@@ -389,7 +389,7 @@
private int connectTimeout = NetworkClient.DEFAULT_CONNECT_TIMEOUT;
private int readTimeout = NetworkClient.DEFAULT_READ_TIMEOUT;
- /* A permission converted from a HttpURLPermission */
+ /* A permission converted from a URLPermission */
private SocketPermission socketPermission;
/* Logging support */
@@ -930,8 +930,7 @@
plainConnect0();
return null;
}
- }
-// }, null, p -- replace line above, when limited doPriv ready
+ }, null, p
);
} catch (PrivilegedActionException e) {
throw (IOException) e.getException();
@@ -943,7 +942,7 @@
}
/**
- * if the caller has a HttpURLPermission for connecting to the
+ * if the caller has a URLPermission for connecting to the
* given URL, then return a SocketPermission which permits
* access to that destination. Return null otherwise. The permission
* is cached in a field (which can only be changed by redirects)
@@ -969,7 +968,10 @@
String actions = getRequestMethod()+":" +
getUserSetHeaders().getHeaderNamesInList();
- HttpURLPermission p = new HttpURLPermission(url.toString(), actions);
+ String urlstring = url.getProtocol() + "://" + url.getAuthority()
+ + url.getPath();
+
+ URLPermission p = new URLPermission(urlstring, actions);
try {
sm.checkPermission(p);
socketPermission = newPerm;
@@ -1188,8 +1190,7 @@
public OutputStream run() throws IOException {
return getOutputStream0();
}
- }
-// }, null, p -- replace line above, when limited doPriv ready
+ }, null, p
);
} catch (PrivilegedActionException e) {
throw (IOException) e.getException();
@@ -1372,8 +1373,7 @@
public InputStream run() throws IOException {
return getInputStream0();
}
- }
-// }, null, p -- replace line above, when limited doPriv ready
+ }, null, p
);
} catch (PrivilegedActionException e) {
throw (IOException) e.getException();
@@ -2507,8 +2507,7 @@
public Boolean run() throws IOException {
return followRedirect0(loc, stat, locUrl0);
}
- }
-// }, null, p -- replace line above, when limited doPriv ready
+ }, null, p
);
} catch (PrivilegedActionException e) {
throw (IOException) e.getException();
diff --git a/jdk/src/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java b/jdk/src/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java
index 832854c..c664a69 100644
--- a/jdk/src/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java
+++ b/jdk/src/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java
@@ -434,6 +434,7 @@
return delegate.getContent();
}
+ @SuppressWarnings("rawtypes")
public Object getContent(Class[] classes) throws IOException {
return delegate.getContent(classes);
}
diff --git a/jdk/src/share/classes/sun/reflect/AccessorGenerator.java b/jdk/src/share/classes/sun/reflect/AccessorGenerator.java
index 16a19d4..d3eda43 100644
--- a/jdk/src/share/classes/sun/reflect/AccessorGenerator.java
+++ b/jdk/src/share/classes/sun/reflect/AccessorGenerator.java
@@ -379,6 +379,10 @@
return Modifier.isStatic(modifiers);
}
+ protected boolean isPrivate() {
+ return Modifier.isPrivate(modifiers);
+ }
+
/** Returns class name in "internal" form (i.e., '/' separators
instead of '.') */
protected static String getClassName
diff --git a/jdk/src/share/classes/sun/reflect/MethodAccessorGenerator.java b/jdk/src/share/classes/sun/reflect/MethodAccessorGenerator.java
index 232d3c6..b00450c 100644
--- a/jdk/src/share/classes/sun/reflect/MethodAccessorGenerator.java
+++ b/jdk/src/share/classes/sun/reflect/MethodAccessorGenerator.java
@@ -639,10 +639,14 @@
typeSizeInStackSlots(returnType));
} else {
if (isInterface()) {
- cb.opc_invokeinterface(targetMethodRef,
- count,
- count,
- typeSizeInStackSlots(returnType));
+ if (isPrivate()) {
+ cb.opc_invokespecial(targetMethodRef, count, 0);
+ } else {
+ cb.opc_invokeinterface(targetMethodRef,
+ count,
+ count,
+ typeSizeInStackSlots(returnType));
+ }
} else {
cb.opc_invokevirtual(targetMethodRef,
count,
diff --git a/jdk/src/share/classes/sun/reflect/Reflection.java b/jdk/src/share/classes/sun/reflect/Reflection.java
index 274705f..a57b89b 100644
--- a/jdk/src/share/classes/sun/reflect/Reflection.java
+++ b/jdk/src/share/classes/sun/reflect/Reflection.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -65,7 +65,7 @@
to compatibility reasons; see 4471811. Only the values of the
low 13 bits (i.e., a mask of 0x1FFF) are guaranteed to be
valid. */
- private static native int getClassAccessFlags(Class<?> c);
+ public static native int getClassAccessFlags(Class<?> c);
/** A quick "fast-path" check to try to avoid getCallerClass()
calls. */
diff --git a/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java b/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java
index 24abe86..1ec2eb6 100644
--- a/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java
+++ b/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java
@@ -217,7 +217,7 @@
*/
private static class Signature {
private String methodName;
- private Class[] argClasses;
+ private Class<?>[] argClasses;
private volatile int hashCode = 0;
@@ -299,7 +299,7 @@
new PrivilegedExceptionAction<Method>() {
public Method run() throws Exception {
Class<?> t = getTrampolineClass();
- Class[] types = {
+ Class<?>[] types = {
Method.class, Object.class, Object[].class
};
Method b = t.getDeclaredMethod("invoke", types);
diff --git a/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java b/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java
index efd85fc..1f871e8 100644
--- a/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java
+++ b/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java
@@ -26,8 +26,10 @@
package sun.reflect.misc;
+import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Proxy;
+import java.util.Arrays;
import sun.reflect.Reflection;
public final class ReflectUtil {
@@ -250,4 +252,50 @@
String pkg = (i != -1) ? name.substring(0, i) : "";
return Proxy.isProxyClass(cls) && !pkg.equals(PROXY_PACKAGE);
}
+
+ /**
+ * Check if the given method is a method declared in the proxy interface
+ * implemented by the given proxy instance.
+ *
+ * @param proxy a proxy instance
+ * @param method an interface method dispatched to a InvocationHandler
+ *
+ * @throws IllegalArgumentException if the given proxy or method is invalid.
+ */
+ public static void checkProxyMethod(Object proxy, Method method) {
+ // check if it is a valid proxy instance
+ if (proxy == null || !Proxy.isProxyClass(proxy.getClass())) {
+ throw new IllegalArgumentException("Not a Proxy instance");
+}
+ if (Modifier.isStatic(method.getModifiers())) {
+ throw new IllegalArgumentException("Can't handle static method");
+ }
+
+ Class<?> c = method.getDeclaringClass();
+ if (c == Object.class) {
+ String name = method.getName();
+ if (name.equals("hashCode") || name.equals("equals") || name.equals("toString")) {
+ return;
+ }
+ }
+
+ if (isSuperInterface(proxy.getClass(), c)) {
+ return;
+ }
+
+ // disallow any method not declared in one of the proxy intefaces
+ throw new IllegalArgumentException("Can't handle: " + method);
+ }
+
+ private static boolean isSuperInterface(Class<?> c, Class<?> intf) {
+ for (Class<?> i : c.getInterfaces()) {
+ if (i == intf) {
+ return true;
+ }
+ if (isSuperInterface(i, intf)) {
+ return true;
+ }
+ }
+ return false;
+ }
}
diff --git a/jdk/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java b/jdk/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java
index 3bc90ce..b974c3c 100644
--- a/jdk/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java
+++ b/jdk/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, 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
@@ -152,12 +152,4 @@
throw new InvalidKeyException("Invalid EC private key", e);
}
}
-
- // return a string representation of this key for debugging
- public String toString() {
- return "Sun EC private key, " + params.getCurve().getField().getFieldSize()
- + " bits\n private value: "
- + s + "\n parameters: " + params;
- }
-
}
diff --git a/jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java b/jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java
index 584e178..65f6847 100644
--- a/jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java
+++ b/jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -651,7 +651,7 @@
buffer.append(element.isAcceptorCredential() ?
" Accept" : "");
buffer.append(" [");
- buffer.append(element.toString());
+ buffer.append(element.getClass());
buffer.append(']');
} catch (GSSException e) {
// skip to next element
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java b/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java
index 8e462fd..c15ddd2 100644
--- a/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java
+++ b/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java
@@ -277,24 +277,17 @@
byte[] credBytes = new byte[credLen];
System.arraycopy(checksumBytes, 28, credBytes, 0, credLen);
- CipherHelper cipherHelper = context.getCipherHelper(key);
- if (useNullKey(cipherHelper)) {
- delegCreds =
- new KrbCred(credBytes, EncryptionKey.NULL_KEY).
- getDelegatedCreds()[0];
- } else {
- KrbCred cred;
- try {
- cred = new KrbCred(credBytes, key);
- } catch (KrbException e) {
- if (subKey != null) {
- cred = new KrbCred(credBytes, subKey);
- } else {
- throw e;
- }
+ KrbCred cred;
+ try {
+ cred = new KrbCred(credBytes, key);
+ } catch (KrbException ke) {
+ if (subKey != null) {
+ cred = new KrbCred(credBytes, subKey);
+ } else {
+ throw ke;
}
- delegCreds = cred.getDelegatedCreds()[0];
}
+ delegCreds = cred.getDelegatedCreds()[0];
}
}
diff --git a/jdk/src/share/classes/sun/security/krb5/KdcComm.java b/jdk/src/share/classes/sun/security/krb5/KdcComm.java
index 141592f..3d50f95 100644
--- a/jdk/src/share/classes/sun/security/krb5/KdcComm.java
+++ b/jdk/src/share/classes/sun/security/krb5/KdcComm.java
@@ -223,16 +223,24 @@
if (!tempKdc.hasNext()) {
throw new KrbException("Cannot get kdc for realm " + realm);
}
+ byte[] ibuf = null;
try {
- return sendIfPossible(obuf, tempKdc.next(), useTCP);
+ ibuf = sendIfPossible(obuf, tempKdc.next(), useTCP);
} catch(Exception first) {
+ boolean ok = false;
while(tempKdc.hasNext()) {
try {
- return sendIfPossible(obuf, tempKdc.next(), useTCP);
+ ibuf = sendIfPossible(obuf, tempKdc.next(), useTCP);
+ ok = true;
+ break;
} catch(Exception ignore) {}
}
- throw first;
+ if (!ok) throw first;
}
+ if (ibuf == null) {
+ throw new IOException("Cannot get a KDC reply");
+ }
+ return ibuf;
}
// send the AS Request to the specified KDC
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbCred.java b/jdk/src/share/classes/sun/security/krb5/KrbCred.java
index 64dada1..586a666 100644
--- a/jdk/src/share/classes/sun/security/krb5/KrbCred.java
+++ b/jdk/src/share/classes/sun/security/krb5/KrbCred.java
@@ -119,7 +119,7 @@
return credMessg;
}
- // Used in InitialToken, key always NULL_KEY
+ // Used in InitialToken, NULL_KEY might be used
public KrbCred(byte[] asn1Message, EncryptionKey key)
throws KrbException, IOException {
@@ -127,6 +127,9 @@
ticket = credMessg.tickets[0];
+ if (credMessg.encPart.getEType() == 0) {
+ key = EncryptionKey.NULL_KEY;
+ }
byte[] temp = credMessg.encPart.decrypt(key,
KeyUsage.KU_ENC_KRB_CRED_PART);
byte[] plainText = credMessg.encPart.reset(temp);
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/NetClient.java b/jdk/src/share/classes/sun/security/krb5/internal/NetClient.java
index 1f5b15b..7502cf0 100644
--- a/jdk/src/share/classes/sun/security/krb5/internal/NetClient.java
+++ b/jdk/src/share/classes/sun/security/krb5/internal/NetClient.java
@@ -31,6 +31,8 @@
package sun.security.krb5.internal;
+import sun.misc.IOUtils;
+
import java.io.*;
import java.net.*;
@@ -100,17 +102,15 @@
return null;
}
- byte data[] = new byte[len];
- count = readFully(data, len);
- if (count != len) {
+ try {
+ return IOUtils.readFully(in, len, true);
+ } catch (IOException ioe) {
if (Krb5.DEBUG) {
System.out.println(
">>>DEBUG: TCPClient could not read complete packet (" +
len + "/" + count + ")");
}
return null;
- } else {
- return data;
}
}
diff --git a/jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java b/jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java
index c53b421..59512f1 100644
--- a/jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java
+++ b/jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, 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
@@ -304,17 +304,6 @@
return encodedKey.clone();
}
- /*
- * Returns a printable representation of the key
- */
- public String toString ()
- {
- HexDumpEncoder encoder = new HexDumpEncoder ();
-
- return "algorithm = " + algid.toString ()
- + ", unparsed keybits = \n" + encoder.encodeBuffer (key);
- }
-
/**
* Initialize an PKCS8Key object from an input stream. The data
* on that input stream must be encoded using DER, obeying the
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11Key.java b/jdk/src/share/classes/sun/security/pkcs11/P11Key.java
index 236a6ac..235c148 100644
--- a/jdk/src/share/classes/sun/security/pkcs11/P11Key.java
+++ b/jdk/src/share/classes/sun/security/pkcs11/P11Key.java
@@ -554,27 +554,6 @@
fetchValues();
return coeff;
}
- public String toString() {
- fetchValues();
- StringBuilder sb = new StringBuilder(super.toString());
- sb.append("\n modulus: ");
- sb.append(n);
- sb.append("\n public exponent: ");
- sb.append(e);
- sb.append("\n private exponent: ");
- sb.append(d);
- sb.append("\n prime p: ");
- sb.append(p);
- sb.append("\n prime q: ");
- sb.append(q);
- sb.append("\n prime exponent p: ");
- sb.append(pe);
- sb.append("\n prime exponent q: ");
- sb.append(qe);
- sb.append("\n crt coefficient: ");
- sb.append(coeff);
- return sb.toString();
- }
}
// RSA non-CRT private key
@@ -630,15 +609,6 @@
fetchValues();
return d;
}
- public String toString() {
- fetchValues();
- StringBuilder sb = new StringBuilder(super.toString());
- sb.append("\n modulus: ");
- sb.append(n);
- sb.append("\n private exponent: ");
- sb.append(d);
- return sb.toString();
- }
}
private static final class P11RSAPublicKey extends P11Key
@@ -814,11 +784,6 @@
fetchValues();
return params;
}
- public String toString() {
- fetchValues();
- return super.toString() + "\n x: " + x + "\n p: " + params.getP()
- + "\n q: " + params.getQ() + "\n g: " + params.getG();
- }
}
private static final class P11DHPrivateKey extends P11Key
@@ -878,11 +843,6 @@
fetchValues();
return params;
}
- public String toString() {
- fetchValues();
- return super.toString() + "\n x: " + x + "\n p: " + params.getP()
- + "\n g: " + params.getG();
- }
public int hashCode() {
if (token.isValid() == false) {
return 0;
@@ -1049,12 +1009,6 @@
fetchValues();
return params;
}
- public String toString() {
- fetchValues();
- return super.toString()
- + "\n private value: " + s
- + "\n parameters: " + params;
- }
}
private static final class P11ECPublicKey extends P11Key
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java b/jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java
index 036edad..4adac8c 100644
--- a/jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java
+++ b/jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -70,20 +70,67 @@
// for RSA, selected or default value of public exponent, always valid
private BigInteger rsaPublicExponent = RSAKeyGenParameterSpec.F4;
+ // the supported keysize range of the native PKCS11 library
+ // if the value cannot be retrieved or unspecified, -1 is used.
+ private final int minKeySize;
+ private final int maxKeySize;
+
// SecureRandom instance, if specified in init
private SecureRandom random;
P11KeyPairGenerator(Token token, String algorithm, long mechanism)
throws PKCS11Exception {
super();
+ int minKeyLen = -1;
+ int maxKeyLen = -1;
+ try {
+ CK_MECHANISM_INFO mechInfo = token.getMechanismInfo(mechanism);
+ if (mechInfo != null) {
+ minKeyLen = (int) mechInfo.ulMinKeySize;
+ maxKeyLen = (int) mechInfo.ulMaxKeySize;
+ }
+ } catch (PKCS11Exception p11e) {
+ // Should never happen
+ throw new ProviderException
+ ("Unexpected error while getting mechanism info", p11e);
+ }
+ // set default key sizes and apply our own algorithm-specific limits
+ // override lower limit to disallow unsecure keys being generated
+ // override upper limit to deter DOS attack
+ if (algorithm.equals("EC")) {
+ keySize = 256;
+ if ((minKeyLen == -1) || (minKeyLen < 112)) {
+ minKeyLen = 112;
+ }
+ if ((maxKeyLen == -1) || (maxKeyLen > 2048)) {
+ maxKeyLen = 2048;
+ }
+ } else {
+ // RSA, DH, and DSA
+ keySize = 1024;
+ if ((minKeyLen == -1) || (minKeyLen < 512)) {
+ minKeyLen = 512;
+ }
+ if (algorithm.equals("RSA")) {
+ if ((maxKeyLen == -1) || (maxKeyLen > 64 * 1024)) {
+ maxKeyLen = 64 * 1024;
+ }
+ }
+ }
+
+ // auto-adjust default keysize in case it's out-of-range
+ if ((minKeyLen != -1) && (keySize < minKeyLen)) {
+ keySize = minKeyLen;
+ }
+ if ((maxKeyLen != -1) && (keySize > maxKeyLen)) {
+ keySize = maxKeyLen;
+ }
this.token = token;
this.algorithm = algorithm;
this.mechanism = mechanism;
- if (algorithm.equals("EC")) {
- initialize(256, null);
- } else {
- initialize(1024, null);
- }
+ this.minKeySize = minKeyLen;
+ this.maxKeySize = maxKeyLen;
+ initialize(keySize, null);
}
// see JCA spec
@@ -94,9 +141,7 @@
} catch (InvalidAlgorithmParameterException e) {
throw new InvalidParameterException(e.getMessage());
}
- this.keySize = keySize;
this.params = null;
- this.random = random;
if (algorithm.equals("EC")) {
params = P11ECKeyFactory.getECParameterSpec(keySize);
if (params == null) {
@@ -105,33 +150,35 @@
+ keySize + " bits");
}
}
+ this.keySize = keySize;
+ this.random = random;
}
// see JCA spec
public void initialize(AlgorithmParameterSpec params, SecureRandom random)
throws InvalidAlgorithmParameterException {
token.ensureValid();
+ int tmpKeySize;
if (algorithm.equals("DH")) {
if (params instanceof DHParameterSpec == false) {
throw new InvalidAlgorithmParameterException
("DHParameterSpec required for Diffie-Hellman");
}
- DHParameterSpec dhParams = (DHParameterSpec)params;
- int tmpKeySize = dhParams.getP().bitLength();
- checkKeySize(tmpKeySize, dhParams);
- this.keySize = tmpKeySize;
- this.params = dhParams;
+ DHParameterSpec dhParams = (DHParameterSpec) params;
+ tmpKeySize = dhParams.getP().bitLength();
+ checkKeySize(tmpKeySize, null);
// XXX sanity check params
} else if (algorithm.equals("RSA")) {
if (params instanceof RSAKeyGenParameterSpec == false) {
throw new InvalidAlgorithmParameterException
("RSAKeyGenParameterSpec required for RSA");
}
- RSAKeyGenParameterSpec rsaParams = (RSAKeyGenParameterSpec)params;
- int tmpKeySize = rsaParams.getKeysize();
+ RSAKeyGenParameterSpec rsaParams =
+ (RSAKeyGenParameterSpec) params;
+ tmpKeySize = rsaParams.getKeysize();
checkKeySize(tmpKeySize, rsaParams);
- this.keySize = tmpKeySize;
- this.params = null;
+ // override the supplied params to null
+ params = null;
this.rsaPublicExponent = rsaParams.getPublicExponent();
// XXX sanity check params
} else if (algorithm.equals("DSA")) {
@@ -139,11 +186,9 @@
throw new InvalidAlgorithmParameterException
("DSAParameterSpec required for DSA");
}
- DSAParameterSpec dsaParams = (DSAParameterSpec)params;
- int tmpKeySize = dsaParams.getP().bitLength();
- checkKeySize(tmpKeySize, dsaParams);
- this.keySize = tmpKeySize;
- this.params = dsaParams;
+ DSAParameterSpec dsaParams = (DSAParameterSpec) params;
+ tmpKeySize = dsaParams.getP().bitLength();
+ checkKeySize(tmpKeySize, null);
// XXX sanity check params
} else if (algorithm.equals("EC")) {
ECParameterSpec ecParams;
@@ -155,28 +200,42 @@
("Unsupported curve: " + params);
}
} else if (params instanceof ECGenParameterSpec) {
- String name = ((ECGenParameterSpec)params).getName();
+ String name = ((ECGenParameterSpec) params).getName();
ecParams = P11ECKeyFactory.getECParameterSpec(name);
if (ecParams == null) {
throw new InvalidAlgorithmParameterException
("Unknown curve name: " + name);
}
+ // override the supplied params with the derived one
+ params = ecParams;
} else {
throw new InvalidAlgorithmParameterException
("ECParameterSpec or ECGenParameterSpec required for EC");
}
- int tmpKeySize = ecParams.getCurve().getField().getFieldSize();
- checkKeySize(tmpKeySize, ecParams);
- this.keySize = tmpKeySize;
- this.params = ecParams;
+ tmpKeySize = ecParams.getCurve().getField().getFieldSize();
+ checkKeySize(tmpKeySize, null);
} else {
throw new ProviderException("Unknown algorithm: " + algorithm);
}
+ this.keySize = tmpKeySize;
+ this.params = params;
this.random = random;
}
- private void checkKeySize(int keySize, AlgorithmParameterSpec params)
- throws InvalidAlgorithmParameterException {
+ // NOTE: 'params' is only used for checking RSA keys currently.
+ private void checkKeySize(int keySize, RSAKeyGenParameterSpec params)
+ throws InvalidAlgorithmParameterException {
+ // check native range first
+ if ((minKeySize != -1) && (keySize < minKeySize)) {
+ throw new InvalidAlgorithmParameterException(algorithm +
+ " key must be at least " + minKeySize + " bits");
+ }
+ if ((maxKeySize != -1) && (keySize > maxKeySize)) {
+ throw new InvalidAlgorithmParameterException(algorithm +
+ " key must be at most " + maxKeySize + " bits");
+ }
+
+ // check our own algorithm-specific limits also
if (algorithm.equals("EC")) {
if (keySize < 112) {
throw new InvalidAlgorithmParameterException
@@ -187,41 +246,45 @@
throw new InvalidAlgorithmParameterException
("Key size must be at most 2048 bit");
}
- return;
- } else if (algorithm.equals("RSA")) {
- BigInteger tmpExponent = rsaPublicExponent;
- if (params != null) {
- // Already tested for instanceof RSAKeyGenParameterSpec above
- tmpExponent =
- ((RSAKeyGenParameterSpec)params).getPublicExponent();
- }
- try {
- // This provider supports 64K or less.
- RSAKeyFactory.checkKeyLengths(keySize, tmpExponent,
- 512, 64 * 1024);
- } catch (InvalidKeyException e) {
- throw new InvalidAlgorithmParameterException(e.getMessage());
- }
- return;
- }
-
- if (keySize < 512) {
- throw new InvalidAlgorithmParameterException
- ("Key size must be at least 512 bit");
- }
- if (algorithm.equals("DH") && (params != null)) {
- // sanity check, nobody really wants keys this large
- if (keySize > 64 * 1024) {
- throw new InvalidAlgorithmParameterException
- ("Key size must be at most 65536 bit");
- }
} else {
- // this restriction is in the spec for DSA
- // since we currently use DSA parameters for DH as well,
- // it also applies to DH if no parameters are specified
- if ((keySize > 1024) || ((keySize & 0x3f) != 0)) {
+ // RSA, DH, DSA
+ if (keySize < 512) {
throw new InvalidAlgorithmParameterException
- ("Key size must be a multiple of 64 and at most 1024 bit");
+ ("Key size must be at least 512 bit");
+ }
+ if (algorithm.equals("RSA")) {
+ BigInteger tmpExponent = rsaPublicExponent;
+ if (params != null) {
+ tmpExponent = params.getPublicExponent();
+ }
+ try {
+ // Reuse the checking in SunRsaSign provider.
+ // If maxKeySize is -1, then replace it with
+ // Integer.MAX_VALUE to indicate no limit.
+ RSAKeyFactory.checkKeyLengths(keySize, tmpExponent,
+ minKeySize,
+ (maxKeySize==-1? Integer.MAX_VALUE:maxKeySize));
+ } catch (InvalidKeyException e) {
+ throw new InvalidAlgorithmParameterException(e.getMessage());
+ }
+ } else {
+ if (algorithm.equals("DH") && (params != null)) {
+ // sanity check, nobody really wants keys this large
+ if (keySize > 64 * 1024) {
+ throw new InvalidAlgorithmParameterException
+ ("Key size must be at most 65536 bit");
+ }
+ } else {
+ // this restriction is in the spec for DSA
+ // since we currently use DSA parameters for DH as well,
+ // it also applies to DH if no parameters are specified
+ if ((keySize != 2048) &&
+ ((keySize > 1024) || ((keySize & 0x3f) != 0))) {
+ throw new InvalidAlgorithmParameterException(algorithm +
+ " key must be multiples of 64 if less than 1024 bits" +
+ ", or 2048 bits");
+ }
+ }
}
}
}
@@ -325,5 +388,4 @@
token.releaseSession(session);
}
}
-
}
diff --git a/jdk/src/share/classes/sun/security/provider/AuthPolicyFile.java b/jdk/src/share/classes/sun/security/provider/AuthPolicyFile.java
index ed9dce6..a13cee5 100644
--- a/jdk/src/share/classes/sun/security/provider/AuthPolicyFile.java
+++ b/jdk/src/share/classes/sun/security/provider/AuthPolicyFile.java
@@ -91,7 +91,7 @@
private boolean ignoreIdentityScope = true;
// for use with the reflection API
- private static final Class[] PARAMS = { String.class, String.class};
+ private static final Class<?>[] PARAMS = { String.class, String.class};
/**
* Initializes the Policy object and reads the default policy
diff --git a/jdk/src/share/classes/sun/security/provider/DSAPrivateKey.java b/jdk/src/share/classes/sun/security/provider/DSAPrivateKey.java
index b521e3d..97e7ef8 100644
--- a/jdk/src/share/classes/sun/security/provider/DSAPrivateKey.java
+++ b/jdk/src/share/classes/sun/security/provider/DSAPrivateKey.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, 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
@@ -142,11 +142,6 @@
}
}
- public String toString() {
- return "Sun DSA Private Key \nparameters:" + algid + "\nx: " +
- Debug.toHexString(x) + "\n";
- }
-
protected void parseKeyBits() throws InvalidKeyException {
try {
DerInputStream in = new DerInputStream(key);
diff --git a/jdk/src/share/classes/sun/security/provider/DomainKeyStore.java b/jdk/src/share/classes/sun/security/provider/DomainKeyStore.java
index ae0dbfb..1897fd5 100644
--- a/jdk/src/share/classes/sun/security/provider/DomainKeyStore.java
+++ b/jdk/src/share/classes/sun/security/provider/DomainKeyStore.java
@@ -41,7 +41,7 @@
* This class provides the domain keystore type identified as "DKS".
* DKS presents a collection of separate keystores as a single logical keystore.
* The collection of keystores is specified in a domain configuration file which
- * is passed to DKS in a {@link KeyStore.DomainLoadStoreParameter}.
+ * is passed to DKS in a {@link DomainLoadStoreParameter}.
* <p>
* The following properties are supported:
* <dl>
@@ -622,17 +622,16 @@
}
throw new UnsupportedOperationException(
- "This keystore must be stored using a " +
- "KeyStore.DomainLoadStoreParameter");
+ "This keystore must be stored using a DomainLoadStoreParameter");
}
@Override
public void engineStore(KeyStore.LoadStoreParameter param)
throws IOException, NoSuchAlgorithmException, CertificateException
{
- if (param instanceof KeyStore.DomainLoadStoreParameter) {
- KeyStore.DomainLoadStoreParameter domainParameter =
- (KeyStore.DomainLoadStoreParameter) param;
+ if (param instanceof DomainLoadStoreParameter) {
+ DomainLoadStoreParameter domainParameter =
+ (DomainLoadStoreParameter) param;
List<KeyStoreBuilderComponents> builders = getBuilders(
domainParameter.getConfiguration(),
domainParameter.getProtectionParams());
@@ -645,7 +644,7 @@
if (!(pp instanceof KeyStore.PasswordProtection)) {
throw new KeyStoreException(
new IllegalArgumentException("ProtectionParameter" +
- " must be a KeyStore.PasswordPartection"));
+ " must be a KeyStore.PasswordProtection"));
}
char[] password =
((KeyStore.PasswordProtection) builder.protection)
@@ -653,9 +652,12 @@
// Store the keystores
KeyStore keystore = keystores.get(builder.name);
- keystore.store(new FileOutputStream(builder.file),
- password);
+ try (FileOutputStream stream =
+ new FileOutputStream(builder.file)) {
+
+ keystore.store(stream, password);
+ }
} catch (KeyStoreException e) {
throw new IOException(e);
}
@@ -663,7 +665,7 @@
} else {
throw new UnsupportedOperationException(
"This keystore must be stored using a " +
- "KeyStore.DomainLoadStoreParameter");
+ "DomainLoadStoreParameter");
}
}
@@ -710,7 +712,7 @@
} catch (Exception e) {
throw new UnsupportedOperationException(
"This keystore must be loaded using a " +
- "KeyStore.DomainLoadStoreParameter");
+ "DomainLoadStoreParameter");
}
}
@@ -718,9 +720,9 @@
public void engineLoad(KeyStore.LoadStoreParameter param)
throws IOException, NoSuchAlgorithmException, CertificateException
{
- if (param instanceof KeyStore.DomainLoadStoreParameter) {
- KeyStore.DomainLoadStoreParameter domainParameter =
- (KeyStore.DomainLoadStoreParameter) param;
+ if (param instanceof DomainLoadStoreParameter) {
+ DomainLoadStoreParameter domainParameter =
+ (DomainLoadStoreParameter) param;
List<KeyStoreBuilderComponents> builders = getBuilders(
domainParameter.getConfiguration(),
domainParameter.getProtectionParams());
@@ -748,7 +750,7 @@
} else {
throw new UnsupportedOperationException(
"This keystore must be loaded using a " +
- "KeyStore.DomainLoadStoreParameter");
+ "DomainLoadStoreParameter");
}
}
diff --git a/jdk/src/share/classes/sun/security/provider/SubjectCodeSource.java b/jdk/src/share/classes/sun/security/provider/SubjectCodeSource.java
index 89a9812..a92ff27 100644
--- a/jdk/src/share/classes/sun/security/provider/SubjectCodeSource.java
+++ b/jdk/src/share/classes/sun/security/provider/SubjectCodeSource.java
@@ -58,7 +58,7 @@
private Subject subject;
private LinkedList<PrincipalEntry> principals;
- private static final Class[] PARAMS = { String.class };
+ private static final Class<?>[] PARAMS = { String.class };
private static final sun.security.util.Debug debug =
sun.security.util.Debug.getInstance("auth", "\t[Auth Access]");
private ClassLoader sysClassLoader;
diff --git a/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java b/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
index b289ef2..7e68c42 100644
--- a/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
+++ b/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -225,29 +225,4 @@
}
return b;
}
-
- // return a string representation of this key for debugging
- public String toString() {
- StringBuffer sb = new StringBuffer();
- sb.append("Sun RSA private CRT key, ");
- sb.append(n.bitLength());
- sb.append(" bits\n modulus: ");
- sb.append(n);
- sb.append("\n public exponent: ");
- sb.append(e);
- sb.append("\n private exponent: ");
- sb.append(d);
- sb.append("\n prime p: ");
- sb.append(p);
- sb.append("\n prime q: ");
- sb.append(q);
- sb.append("\n prime exponent p: ");
- sb.append(pe);
- sb.append("\n prime exponent q: ");
- sb.append(qe);
- sb.append("\n crt coefficient: ");
- sb.append(coeff);
- return sb.toString();
- }
-
}
diff --git a/jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java b/jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java
index f9a7c34..1a7df13 100644
--- a/jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java
+++ b/jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -98,11 +98,4 @@
public BigInteger getPrivateExponent() {
return d;
}
-
- // return a string representation of this key for debugging
- public String toString() {
- return "Sun RSA private key, " + n.bitLength() + " bits\n modulus: "
- + n + "\n private exponent: " + d;
- }
-
}
diff --git a/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java b/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java
index 72ce461..fe2bf55 100644
--- a/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java
+++ b/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java
@@ -93,7 +93,7 @@
// prefix for new signature-related files in META-INF directory
private static final String SIG_PREFIX = META_INF + "SIG-";
- private static final Class[] PARAM_STRING = { String.class };
+ private static final Class<?>[] PARAM_STRING = { String.class };
private static final String NONE = "NONE";
private static final String P11KEYSTORE = "PKCS11";
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Main.java b/jdk/src/share/classes/sun/security/tools/keytool/Main.java
index c5e0fe7..7cd92d6 100644
--- a/jdk/src/share/classes/sun/security/tools/keytool/Main.java
+++ b/jdk/src/share/classes/sun/security/tools/keytool/Main.java
@@ -309,7 +309,7 @@
}
};
- private static final Class[] PARAM_STRING = { String.class };
+ private static final Class<?>[] PARAM_STRING = { String.class };
private static final String NONE = "NONE";
private static final String P11KEYSTORE = "PKCS11";
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java b/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java
index 9a325e5..bfc91e4 100644
--- a/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java
+++ b/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java
@@ -37,7 +37,16 @@
import java.text.MessageFormat;
import sun.security.util.PropertyExpander;
import sun.security.util.PropertyExpander.ExpandException;
-import java.awt.*;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.FileDialog;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Toolkit;
+import java.awt.Window;
import java.awt.event.*;
import java.security.cert.Certificate;
import java.security.cert.CertificateException;
@@ -45,6 +54,8 @@
import sun.security.provider.*;
import sun.security.util.PolicyUtil;
import javax.security.auth.x500.X500Principal;
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
/**
* PolicyTool may be used by users and administrators to configure the
@@ -66,7 +77,22 @@
static {
// this is for case insensitive string comparisons
collator.setStrength(Collator.PRIMARY);
- };
+
+ // Support for Apple menu bar
+ if (System.getProperty("apple.laf.useScreenMenuBar") == null) {
+ System.setProperty("apple.laf.useScreenMenuBar", "true");
+ }
+ System.setProperty("apple.awt.application.name", getMessage("Policy.Tool"));
+
+ // Apply the system L&F if not specified with a system property.
+ if (System.getProperty("swing.defaultlaf") == null) {
+ try {
+ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+ }
// anyone can add warnings
Vector<String> warnings;
@@ -77,9 +103,9 @@
boolean modified = false;
private static final boolean testing = false;
- private static final Class[] TWOPARAMS = { String.class, String.class };
- private static final Class[] ONEPARAMS = { String.class };
- private static final Class[] NOPARAMS = {};
+ private static final Class<?>[] TWOPARAMS = { String.class, String.class };
+ private static final Class<?>[] ONEPARAMS = { String.class };
+ private static final Class<?>[] NOPARAMS = {};
/*
* All of the policy entries are read in from the
* policy file and stored here. Updates to the policy entries
@@ -228,7 +254,7 @@
PublicKey pubKey = getPublicKeyAlias(signers[i]);
if (pubKey == null) {
newWarning = true;
- MessageFormat form = new MessageFormat(rb.getString
+ MessageFormat form = new MessageFormat(getMessage
("Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured."));
Object[] source = {signers[i]};
warnings.addElement(form.format(source));
@@ -246,7 +272,7 @@
pe.getPrincipalName());
} catch (ClassNotFoundException fnfe) {
newWarning = true;
- MessageFormat form = new MessageFormat(rb.getString
+ MessageFormat form = new MessageFormat(getMessage
("Warning.Class.not.found.class"));
Object[] source = {pe.getPrincipalClass()};
warnings.addElement(form.format(source));
@@ -262,13 +288,13 @@
verifyPermission(pe.permission, pe.name, pe.action);
} catch (ClassNotFoundException fnfe) {
newWarning = true;
- MessageFormat form = new MessageFormat(rb.getString
+ MessageFormat form = new MessageFormat(getMessage
("Warning.Class.not.found.class"));
Object[] source = {pe.permission};
warnings.addElement(form.format(source));
} catch (InvocationTargetException ite) {
newWarning = true;
- MessageFormat form = new MessageFormat(rb.getString
+ MessageFormat form = new MessageFormat(getMessage
("Warning.Invalid.argument.s.for.constructor.arg"));
Object[] source = {pe.permission};
warnings.addElement(form.format(source));
@@ -283,7 +309,7 @@
PublicKey pubKey = getPublicKeyAlias(signers[i]);
if (pubKey == null) {
newWarning = true;
- MessageFormat form = new MessageFormat(rb.getString
+ MessageFormat form = new MessageFormat(getMessage
("Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured."));
Object[] source = {signers[i]};
warnings.addElement(form.format(source));
@@ -611,7 +637,7 @@
Class<?> pc = Class.forName(type, true,
Thread.currentThread().getContextClassLoader());
if (!PRIN.isAssignableFrom(pc)) {
- MessageFormat form = new MessageFormat(rb.getString
+ MessageFormat form = new MessageFormat(getMessage
("Illegal.Principal.Type.type"));
Object[] source = {type};
throw new InstantiationException(form.format(source));
@@ -690,7 +716,7 @@
if (++n == args.length) usage();
policyFileName = args[n];
} else {
- MessageFormat form = new MessageFormat(rb.getString
+ MessageFormat form = new MessageFormat(getMessage
("Illegal.option.option"));
Object[] source = { flags };
System.err.println(form.format(source));
@@ -700,9 +726,9 @@
}
static void usage() {
- System.out.println(rb.getString("Usage.policytool.options."));
+ System.out.println(getMessage("Usage.policytool.options."));
System.out.println();
- System.out.println(rb.getString
+ System.out.println(getMessage
(".file.file.policy.file.location"));
System.out.println();
@@ -714,8 +740,12 @@
*/
public static void main(String args[]) {
parseArgs(args);
- ToolWindow tw = new ToolWindow(new PolicyTool());
- tw.displayToolWindow(args);
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ ToolWindow tw = new ToolWindow(new PolicyTool());
+ tw.displayToolWindow(args);
+ }
+ });
}
// split instr to words according to capitalization,
@@ -725,6 +755,108 @@
return instr.replaceAll("([A-Z])", " $1");
}
+ /**
+ * Returns the message corresponding to the key in the bundle.
+ * This is preferred over {@link #getString} because it removes
+ * any mnemonic '&' character in the string.
+ *
+ * @param key the key
+ *
+ * @return the message
+ */
+ static String getMessage(String key) {
+ return removeMnemonicAmpersand(rb.getString(key));
+ }
+
+
+ /**
+ * Returns the mnemonic for a message.
+ *
+ * @param key the key
+ *
+ * @return the mnemonic <code>int</code>
+ */
+ static int getMnemonicInt(String key) {
+ String message = rb.getString(key);
+ return (findMnemonicInt(message));
+ }
+
+ /**
+ * Returns the mnemonic display index for a message.
+ *
+ * @param key the key
+ *
+ * @return the mnemonic display index
+ */
+ static int getDisplayedMnemonicIndex(String key) {
+ String message = rb.getString(key);
+ return (findMnemonicIndex(message));
+ }
+
+ /**
+ * Finds the mnemonic character in a message.
+ *
+ * The mnemonic character is the first character followed by the first
+ * <code>&</code> that is not followed by another <code>&</code>.
+ *
+ * @return the mnemonic as an <code>int</code>, or <code>0</code> if it
+ * can't be found.
+ */
+ private static int findMnemonicInt(String s) {
+ for (int i = 0; i < s.length() - 1; i++) {
+ if (s.charAt(i) == '&') {
+ if (s.charAt(i + 1) != '&') {
+ return KeyEvent.getExtendedKeyCodeForChar(s.charAt(i + 1));
+ } else {
+ i++;
+ }
+ }
+ }
+ return 0;
+ }
+
+ /**
+ * Finds the index of the mnemonic character in a message.
+ *
+ * The mnemonic character is the first character followed by the first
+ * <code>&</code> that is not followed by another <code>&</code>.
+ *
+ * @return the mnemonic character index as an <code>int</code>, or <code>-1</code> if it
+ * can't be found.
+ */
+ private static int findMnemonicIndex(String s) {
+ for (int i = 0; i < s.length() - 1; i++) {
+ if (s.charAt(i) == '&') {
+ if (s.charAt(i + 1) != '&') {
+ // Return the index of the '&' since it will be removed
+ return i;
+ } else {
+ i++;
+ }
+ }
+ }
+ return -1;
+ }
+
+ /**
+ * Removes the mnemonic identifier (<code>&</code>) from a string unless
+ * it's escaped by <code>&&</code> or placed at the end.
+ *
+ * @param message the message
+ *
+ * @return a message with the mnemonic identifier removed
+ */
+ private static String removeMnemonicAmpersand(String message) {
+ StringBuilder s = new StringBuilder();
+ for (int i = 0; i < message.length(); i++) {
+ char current = message.charAt(i);
+ if (current != '&' || i == message.length() - 1
+ || message.charAt(i + 1) == '&') {
+ s.append(current);
+ }
+ }
+ return s.toString();
+ }
}
/**
@@ -880,10 +1012,13 @@
/**
* The main window for the PolicyTool
*/
-class ToolWindow extends Frame {
+class ToolWindow extends JFrame {
// use serialVersionUID from JDK 1.2.2 for interoperability
private static final long serialVersionUID = 5682568601210376777L;
+ /* ESCAPE key */
+ static final KeyStroke escKey = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
+
/* external paddings */
public static final Insets TOP_PADDING = new Insets(25,0,0,0);
public static final Insets BOTTOM_PADDING = new Insets(0,0,25,0);
@@ -891,35 +1026,25 @@
public static final Insets LR_PADDING = new Insets(0,10,0,10);
public static final Insets TOP_BOTTOM_PADDING = new Insets(15, 0, 15, 0);
public static final Insets L_TOP_BOTTOM_PADDING = new Insets(5,10,15,0);
+ public static final Insets LR_TOP_BOTTOM_PADDING = new Insets(15, 4, 15, 4);
public static final Insets LR_BOTTOM_PADDING = new Insets(0,10,5,10);
public static final Insets L_BOTTOM_PADDING = new Insets(0,10,5,0);
- public static final Insets R_BOTTOM_PADDING = new Insets(0,0,5,10);
+ public static final Insets R_BOTTOM_PADDING = new Insets(0, 0, 25, 5);
+ public static final Insets R_PADDING = new Insets(0, 0, 0, 5);
/* buttons and menus */
- public static final String NEW_POLICY_FILE =
- PolicyTool.rb.getString("New");
- public static final String OPEN_POLICY_FILE =
- PolicyTool.rb.getString("Open");
- public static final String SAVE_POLICY_FILE =
- PolicyTool.rb.getString("Save");
- public static final String SAVE_AS_POLICY_FILE =
- PolicyTool.rb.getString("Save.As");
- public static final String VIEW_WARNINGS =
- PolicyTool.rb.getString("View.Warning.Log");
- public static final String QUIT =
- PolicyTool.rb.getString("Exit");
- public static final String ADD_POLICY_ENTRY =
- PolicyTool.rb.getString("Add.Policy.Entry");
- public static final String EDIT_POLICY_ENTRY =
- PolicyTool.rb.getString("Edit.Policy.Entry");
- public static final String REMOVE_POLICY_ENTRY =
- PolicyTool.rb.getString("Remove.Policy.Entry");
- public static final String EDIT_KEYSTORE =
- PolicyTool.rb.getString("Edit");
- public static final String ADD_PUBKEY_ALIAS =
- PolicyTool.rb.getString("Add.Public.Key.Alias");
- public static final String REMOVE_PUBKEY_ALIAS =
- PolicyTool.rb.getString("Remove.Public.Key.Alias");
+ public static final String NEW_POLICY_FILE = "New";
+ public static final String OPEN_POLICY_FILE = "Open";
+ public static final String SAVE_POLICY_FILE = "Save";
+ public static final String SAVE_AS_POLICY_FILE = "Save.As";
+ public static final String VIEW_WARNINGS = "View.Warning.Log";
+ public static final String QUIT = "Exit";
+ public static final String ADD_POLICY_ENTRY = "Add.Policy.Entry";
+ public static final String EDIT_POLICY_ENTRY = "Edit.Policy.Entry";
+ public static final String REMOVE_POLICY_ENTRY = "Remove.Policy.Entry";
+ public static final String EDIT_KEYSTORE = "Edit";
+ public static final String ADD_PUBKEY_ALIAS = "Add.Public.Key.Alias";
+ public static final String REMOVE_PUBKEY_ALIAS = "Remove.Public.Key.Alias";
/* gridbag index for components in the main window (MW) */
public static final int MW_FILENAME_LABEL = 0;
@@ -930,6 +1055,9 @@
public static final int MW_REMOVE_BUTTON = 2;
public static final int MW_POLICY_LIST = 3; // follows MW_PANEL
+ /* The preferred height of JTextField should match JComboBox. */
+ static final int TEXTFIELD_HEIGHT = new JComboBox().getPreferredSize().height;
+
private PolicyTool tool;
/**
@@ -940,64 +1068,84 @@
}
/**
+ * Don't call getComponent directly on the window
+ */
+ public Component getComponent(int n) {
+ Component c = getContentPane().getComponent(n);
+ if (c instanceof JScrollPane) {
+ c = ((JScrollPane)c).getViewport().getView();
+ }
+ return c;
+ }
+
+ /**
* Initialize the PolicyTool window with the necessary components
*/
private void initWindow() {
+ // The ToolWindowListener will handle closing the window.
+ setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
// create the top menu bar
- MenuBar menuBar = new MenuBar();
+ JMenuBar menuBar = new JMenuBar();
// create a File menu
- Menu menu = new Menu(PolicyTool.rb.getString("File"));
- menu.add(NEW_POLICY_FILE);
- menu.add(OPEN_POLICY_FILE);
- menu.add(SAVE_POLICY_FILE);
- menu.add(SAVE_AS_POLICY_FILE);
- menu.add(VIEW_WARNINGS);
- menu.add(QUIT);
- menu.addActionListener(new FileMenuListener(tool, this));
+ JMenu menu = new JMenu();
+ configureButton(menu, "File");
+ ActionListener actionListener = new FileMenuListener(tool, this);
+ addMenuItem(menu, NEW_POLICY_FILE, actionListener);
+ addMenuItem(menu, OPEN_POLICY_FILE, actionListener);
+ addMenuItem(menu, SAVE_POLICY_FILE, actionListener);
+ addMenuItem(menu, SAVE_AS_POLICY_FILE, actionListener);
+ addMenuItem(menu, VIEW_WARNINGS, actionListener);
+ addMenuItem(menu, QUIT, actionListener);
menuBar.add(menu);
- setMenuBar(menuBar);
// create a KeyStore menu
- menu = new Menu(PolicyTool.rb.getString("KeyStore"));
- menu.add(EDIT_KEYSTORE);
- menu.addActionListener(new MainWindowListener(tool, this));
+ menu = new JMenu();
+ configureButton(menu, "KeyStore");
+ actionListener = new MainWindowListener(tool, this);
+ addMenuItem(menu, EDIT_KEYSTORE, actionListener);
menuBar.add(menu);
- setMenuBar(menuBar);
+ setJMenuBar(menuBar);
+ // Create some space around components
+ ((JPanel)getContentPane()).setBorder(new EmptyBorder(6, 6, 6, 6));
// policy entry listing
- Label label = new Label(PolicyTool.rb.getString("Policy.File."));
+ JLabel label = new JLabel(PolicyTool.getMessage("Policy.File."));
addNewComponent(this, label, MW_FILENAME_LABEL,
0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
- TOP_BOTTOM_PADDING);
- TextField tf = new TextField(50);
+ LR_TOP_BOTTOM_PADDING);
+ JTextField tf = new JTextField(50);
+ tf.setPreferredSize(new Dimension(tf.getPreferredSize().width, TEXTFIELD_HEIGHT));
tf.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("Policy.File."));
+ PolicyTool.getMessage("Policy.File."));
tf.setEditable(false);
addNewComponent(this, tf, MW_FILENAME_TEXTFIELD,
1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
- TOP_BOTTOM_PADDING);
+ LR_TOP_BOTTOM_PADDING);
// add ADD/REMOVE/EDIT buttons in a new panel
- Panel panel = new Panel();
+ JPanel panel = new JPanel();
panel.setLayout(new GridBagLayout());
- Button button = new Button(ADD_POLICY_ENTRY);
+ JButton button = new JButton();
+ configureButton(button, ADD_POLICY_ENTRY);
button.addActionListener(new MainWindowListener(tool, this));
addNewComponent(panel, button, MW_ADD_BUTTON,
0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
LR_PADDING);
- button = new Button(EDIT_POLICY_ENTRY);
+ button = new JButton();
+ configureButton(button, EDIT_POLICY_ENTRY);
button.addActionListener(new MainWindowListener(tool, this));
addNewComponent(panel, button, MW_EDIT_BUTTON,
1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
LR_PADDING);
- button = new Button(REMOVE_POLICY_ENTRY);
+ button = new JButton();
+ configureButton(button, REMOVE_POLICY_ENTRY);
button.addActionListener(new MainWindowListener(tool, this));
addNewComponent(panel, button, MW_REMOVE_BUTTON,
2, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
@@ -1021,41 +1169,47 @@
tool.openPolicy(policyFile);
// display the policy entries via the policy list textarea
- List list = new List(40, false);
- list.addActionListener(new PolicyListListener(tool, this));
+ DefaultListModel listModel = new DefaultListModel();
+ JList list = new JList(listModel);
+ list.setVisibleRowCount(15);
+ list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ list.addMouseListener(new PolicyListListener(tool, this));
PolicyEntry entries[] = tool.getEntry();
if (entries != null) {
- for (int i = 0; i < entries.length; i++)
- list.add(entries[i].headerToString());
+ for (int i = 0; i < entries.length; i++) {
+ listModel.addElement(entries[i].headerToString());
+ }
}
- TextField newFilename = (TextField)
+ JTextField newFilename = (JTextField)
getComponent(MW_FILENAME_TEXTFIELD);
newFilename.setText(policyFile);
initPolicyList(list);
} catch (FileNotFoundException fnfe) {
// add blank policy listing
- List list = new List(40, false);
- list.addActionListener(new PolicyListListener(tool, this));
+ JList list = new JList(new DefaultListModel());
+ list.setVisibleRowCount(15);
+ list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ list.addMouseListener(new PolicyListListener(tool, this));
initPolicyList(list);
tool.setPolicyFileName(null);
tool.modified = false;
- setVisible(true);
// just add warning
tool.warnings.addElement(fnfe.toString());
} catch (Exception e) {
// add blank policy listing
- List list = new List(40, false);
- list.addActionListener(new PolicyListListener(tool, this));
+ JList list = new JList(new DefaultListModel());
+ list.setVisibleRowCount(15);
+ list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ list.addMouseListener(new PolicyListListener(tool, this));
initPolicyList(list);
tool.setPolicyFileName(null);
tool.modified = false;
- setVisible(true);
// display the error
- MessageFormat form = new MessageFormat(PolicyTool.rb.getString
+ MessageFormat form = new MessageFormat(PolicyTool.getMessage
("Could.not.open.policy.file.policyFile.e.toString."));
Object[] source = {policyFile, e.toString()};
displayErrorDialog(null, form.format(source));
@@ -1063,13 +1217,68 @@
}
+ // Platform specific modifier (control / command).
+ private int shortCutModifier = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+
+ private void addMenuItem(JMenu menu, String key, ActionListener actionListener) {
+ JMenuItem menuItem = new JMenuItem();
+ configureButton(menuItem, key);
+
+ if (PolicyTool.rb.containsKey(key + ".accelerator")) {
+ String accelerator = PolicyTool.getMessage(key + ".accelerator");
+ if (accelerator != null && !accelerator.isEmpty()) {
+ KeyStroke keyStroke;
+ if (accelerator.matches("^control .$")) {
+ // Map "control" key to "command" on MacOS
+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.getExtendedKeyCodeForChar(accelerator.charAt(8)),
+ shortCutModifier);
+ } else {
+ keyStroke = KeyStroke.getKeyStroke(accelerator);
+ }
+ menuItem.setAccelerator(keyStroke);
+ }
+ }
+
+ menuItem.addActionListener(actionListener);
+ menu.add(menuItem);
+ }
+
+ static void configureButton(AbstractButton button, String key) {
+ button.setText(PolicyTool.getMessage(key));
+ button.setActionCommand(key);
+
+ int mnemonicInt = PolicyTool.getMnemonicInt(key);
+ if (mnemonicInt > 0) {
+ button.setMnemonic(mnemonicInt);
+ button.setDisplayedMnemonicIndex(PolicyTool.getDisplayedMnemonicIndex(key));
+ }
+ }
+
+ static void configureLabelFor(JLabel label, JComponent component, String key) {
+ label.setText(PolicyTool.getMessage(key));
+ label.setLabelFor(component);
+
+ int mnemonicInt = PolicyTool.getMnemonicInt(key);
+ if (mnemonicInt > 0) {
+ label.setDisplayedMnemonic(mnemonicInt);
+ label.setDisplayedMnemonicIndex(PolicyTool.getDisplayedMnemonicIndex(key));
+ }
+ }
+
+
/**
* Add a component to the PolicyTool window
*/
- void addNewComponent(Container container, Component component,
+ void addNewComponent(Container container, JComponent component,
int index, int gridx, int gridy, int gridwidth, int gridheight,
double weightx, double weighty, int fill, Insets is) {
+ if (container instanceof JFrame) {
+ container = ((JFrame)container).getContentPane();
+ } else if (container instanceof JDialog) {
+ container = ((JDialog)container).getContentPane();
+ }
+
// add the component at the specified gridbag index
container.add(component, index);
@@ -1091,7 +1300,7 @@
/**
* Add a component to the PolicyTool window without external padding
*/
- void addNewComponent(Container container, Component component,
+ void addNewComponent(Container container, JComponent component,
int index, int gridx, int gridy, int gridwidth, int gridheight,
double weightx, double weighty, int fill) {
@@ -1106,10 +1315,12 @@
* Init the policy_entry_list TEXTAREA component in the
* PolicyTool window
*/
- void initPolicyList(List policyList) {
+ void initPolicyList(JList policyList) {
// add the policy list to the window
- addNewComponent(this, policyList, MW_POLICY_LIST,
+ //policyList.setPreferredSize(new Dimension(500, 350));
+ JScrollPane scrollPane = new JScrollPane(policyList);
+ addNewComponent(this, scrollPane, MW_POLICY_LIST,
0, 3, 2, 1, 1.0, 1.0, GridBagConstraints.BOTH);
}
@@ -1117,15 +1328,12 @@
* Replace the policy_entry_list TEXTAREA component in the
* PolicyTool window with an updated one.
*/
- void replacePolicyList(List policyList) {
+ void replacePolicyList(JList policyList) {
// remove the original list of Policy Entries
// and add the new list of entries
- List list = (List)getComponent(MW_POLICY_LIST);
- list.removeAll();
- String newItems[] = policyList.getItems();
- for (int i = 0; i < newItems.length; i++)
- list.add(newItems[i]);
+ JList list = (JList)getComponent(MW_POLICY_LIST);
+ list.setModel(policyList.getModel());
}
/**
@@ -1133,19 +1341,21 @@
*/
void displayToolWindow(String args[]) {
- setTitle(PolicyTool.rb.getString("Policy.Tool"));
+ setTitle(PolicyTool.getMessage("Policy.Tool"));
setResizable(true);
- addWindowListener(new ToolWindowListener(this));
- setBounds(135, 80, 500, 500);
- setLayout(new GridBagLayout());
+ addWindowListener(new ToolWindowListener(tool, this));
+ //setBounds(135, 80, 500, 500);
+ getContentPane().setLayout(new GridBagLayout());
initWindow();
+ pack();
+ setLocationRelativeTo(null);
// display it
setVisible(true);
if (tool.newWarning == true) {
- displayStatusDialog(this, PolicyTool.rb.getString
+ displayStatusDialog(this, PolicyTool.getMessage
("Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information."));
}
}
@@ -1155,24 +1365,29 @@
*/
void displayErrorDialog(Window w, String error) {
ToolDialog ed = new ToolDialog
- (PolicyTool.rb.getString("Error"), tool, this, true);
+ (PolicyTool.getMessage("Error"), tool, this, true);
// find where the PolicyTool gui is
Point location = ((w == null) ?
getLocationOnScreen() : w.getLocationOnScreen());
- ed.setBounds(location.x + 50, location.y + 50, 600, 100);
+ //ed.setBounds(location.x + 50, location.y + 50, 600, 100);
ed.setLayout(new GridBagLayout());
- Label label = new Label(error);
+ JLabel label = new JLabel(error);
addNewComponent(ed, label, 0,
0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH);
- Button okButton = new Button(PolicyTool.rb.getString("OK"));
- okButton.addActionListener(new ErrorOKButtonListener(ed));
+ JButton okButton = new JButton(PolicyTool.getMessage("OK"));
+ ActionListener okListener = new ErrorOKButtonListener(ed);
+ okButton.addActionListener(okListener);
addNewComponent(ed, okButton, 1,
0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.VERTICAL);
+ ed.getRootPane().setDefaultButton(okButton);
+ ed.getRootPane().registerKeyboardAction(okListener, escKey, JComponent.WHEN_IN_FOCUSED_WINDOW);
+
ed.pack();
+ ed.setLocationRelativeTo(w);
ed.setVisible(true);
}
@@ -1191,23 +1406,29 @@
*/
void displayStatusDialog(Window w, String status) {
ToolDialog sd = new ToolDialog
- (PolicyTool.rb.getString("Status"), tool, this, true);
+ (PolicyTool.getMessage("Status"), tool, this, true);
// find the location of the PolicyTool gui
Point location = ((w == null) ?
getLocationOnScreen() : w.getLocationOnScreen());
- sd.setBounds(location.x + 50, location.y + 50, 500, 100);
+ //sd.setBounds(location.x + 50, location.y + 50, 500, 100);
sd.setLayout(new GridBagLayout());
- Label label = new Label(status);
+ JLabel label = new JLabel(status);
addNewComponent(sd, label, 0,
0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH);
- Button okButton = new Button(PolicyTool.rb.getString("OK"));
- okButton.addActionListener(new StatusOKButtonListener(sd));
+ JButton okButton = new JButton(PolicyTool.getMessage("OK"));
+ ActionListener okListener = new StatusOKButtonListener(sd);
+ okButton.addActionListener(okListener);
addNewComponent(sd, okButton, 1,
0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.VERTICAL);
+
+ sd.getRootPane().setDefaultButton(okButton);
+ sd.getRootPane().registerKeyboardAction(okListener, escKey, JComponent.WHEN_IN_FOCUSED_WINDOW);
+
sd.pack();
+ sd.setLocationRelativeTo(w);
sd.setVisible(true);
}
@@ -1217,32 +1438,37 @@
void displayWarningLog(Window w) {
ToolDialog wd = new ToolDialog
- (PolicyTool.rb.getString("Warning"), tool, this, true);
+ (PolicyTool.getMessage("Warning"), tool, this, true);
// find the location of the PolicyTool gui
Point location = ((w == null) ?
getLocationOnScreen() : w.getLocationOnScreen());
- wd.setBounds(location.x + 50, location.y + 50, 500, 100);
+ //wd.setBounds(location.x + 50, location.y + 50, 500, 100);
wd.setLayout(new GridBagLayout());
- TextArea ta = new TextArea();
+ JTextArea ta = new JTextArea();
ta.setEditable(false);
for (int i = 0; i < tool.warnings.size(); i++) {
ta.append(tool.warnings.elementAt(i));
- ta.append(PolicyTool.rb.getString("NEWLINE"));
+ ta.append(PolicyTool.getMessage("NEWLINE"));
}
addNewComponent(wd, ta, 0,
0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
BOTTOM_PADDING);
ta.setFocusable(false);
- Button okButton = new Button(PolicyTool.rb.getString("OK"));
- okButton.addActionListener(new CancelButtonListener(wd));
+ JButton okButton = new JButton(PolicyTool.getMessage("OK"));
+ ActionListener okListener = new CancelButtonListener(wd);
+ okButton.addActionListener(okListener);
addNewComponent(wd, okButton, 1,
0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.VERTICAL,
LR_PADDING);
+ wd.getRootPane().setDefaultButton(okButton);
+ wd.getRootPane().registerKeyboardAction(okListener, escKey, JComponent.WHEN_IN_FOCUSED_WINDOW);
+
wd.pack();
+ wd.setLocationRelativeTo(w);
wd.setVisible(true);
}
@@ -1252,22 +1478,27 @@
(title, tool, this, true);
Point location = ((w == null) ?
getLocationOnScreen() : w.getLocationOnScreen());
- tw.setBounds(location.x + 75, location.y + 100, 400, 150);
+ //tw.setBounds(location.x + 75, location.y + 100, 400, 150);
tw.setLayout(new GridBagLayout());
- TextArea ta = new TextArea(prompt, 10, 50, TextArea.SCROLLBARS_VERTICAL_ONLY);
+ JTextArea ta = new JTextArea(prompt, 10, 50);
ta.setEditable(false);
- addNewComponent(tw, ta, 0,
+ ta.setLineWrap(true);
+ ta.setWrapStyleWord(true);
+ JScrollPane scrollPane = new JScrollPane(ta,
+ JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+ JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+ addNewComponent(tw, scrollPane, 0,
0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH);
ta.setFocusable(false);
- Panel panel = new Panel();
+ JPanel panel = new JPanel();
panel.setLayout(new GridBagLayout());
// StringBuffer to store button press. Must be final.
final StringBuffer chooseResult = new StringBuffer();
- Button button = new Button(yes);
+ JButton button = new JButton(yes);
button.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
chooseResult.append('Y');
@@ -1279,7 +1510,7 @@
0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.VERTICAL,
LR_PADDING);
- button = new Button(no);
+ button = new JButton(no);
button.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
chooseResult.append('N');
@@ -1295,6 +1526,7 @@
0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.VERTICAL);
tw.pack();
+ tw.setLocationRelativeTo(w);
tw.setVisible(true);
if (chooseResult.length() > 0) {
return chooseResult.charAt(0);
@@ -1309,10 +1541,13 @@
/**
* General dialog window
*/
-class ToolDialog extends Dialog {
+class ToolDialog extends JDialog {
// use serialVersionUID from JDK 1.2.2 for interoperability
private static final long serialVersionUID = -372244357011301190L;
+ /* ESCAPE key */
+ static final KeyStroke escKey = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
+
/* necessary constants */
public static final int NOACTION = 0;
public static final int QUIT = 1;
@@ -1329,22 +1564,22 @@
/* popup menus */
public static final String PERM =
- PolicyTool.rb.getString
+ PolicyTool.getMessage
("Permission.");
public static final String PRIN_TYPE =
- PolicyTool.rb.getString("Principal.Type.");
+ PolicyTool.getMessage("Principal.Type.");
public static final String PRIN_NAME =
- PolicyTool.rb.getString("Principal.Name.");
+ PolicyTool.getMessage("Principal.Name.");
/* more popu menus */
public static final String PERM_NAME =
- PolicyTool.rb.getString
+ PolicyTool.getMessage
("Target.Name.");
/* and more popup menus */
public static final String PERM_ACTIONS =
- PolicyTool.rb.getString
+ PolicyTool.getMessage
("Actions.");
/* gridbag index for display PolicyEntry (PE) components */
@@ -1431,6 +1666,9 @@
private static final int PRINCIPAL_TYPE = 4;
private static final int PRINCIPAL_NAME = 5;
+ /* The preferred height of JTextField should match JComboBox. */
+ static final int TEXTFIELD_HEIGHT = new JComboBox().getPreferredSize().height;
+
public static java.util.ArrayList<Perm> PERM_ARRAY;
public static java.util.ArrayList<Prin> PRIN_ARRAY;
PolicyTool tool;
@@ -1447,7 +1685,7 @@
PERM_ARRAY.add(new AWTPerm());
PERM_ARRAY.add(new DelegationPerm());
PERM_ARRAY.add(new FilePerm());
- PERM_ARRAY.add(new HttpURLPerm());
+ PERM_ARRAY.add(new URLPerm());
PERM_ARRAY.add(new InqSecContextPerm());
PERM_ARRAY.add(new LogPerm());
PERM_ARRAY.add(new MgmtPerm());
@@ -1480,6 +1718,20 @@
this.tool = tool;
this.tw = tw;
addWindowListener(new ChildWindowListener(this));
+
+ // Create some space around components
+ ((JPanel)getContentPane()).setBorder(new EmptyBorder(6, 6, 6, 6));
+ }
+
+ /**
+ * Don't call getComponent directly on the window
+ */
+ public Component getComponent(int n) {
+ Component c = getContentPane().getComponent(n);
+ if (c instanceof JScrollPane) {
+ c = ((JScrollPane)c).getViewport().getView();
+ }
+ return c;
}
/**
@@ -1540,25 +1792,25 @@
PolicyEntry entries[] = null;
TaggedList prinList = new TaggedList(3, false);
prinList.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("Principal.List"));
- prinList.addActionListener
+ PolicyTool.getMessage("Principal.List"));
+ prinList.addMouseListener
(new EditPrinButtonListener(tool, tw, this, edit));
TaggedList permList = new TaggedList(10, false);
permList.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("Permission.List"));
- permList.addActionListener
+ PolicyTool.getMessage("Permission.List"));
+ permList.addMouseListener
(new EditPermButtonListener(tool, tw, this, edit));
// find where the PolicyTool gui is
Point location = tw.getLocationOnScreen();
- setBounds(location.x + 75, location.y + 200, 650, 500);
+ //setBounds(location.x + 75, location.y + 200, 650, 500);
setLayout(new GridBagLayout());
setResizable(true);
if (edit) {
// get the selected item
entries = tool.getEntry();
- List policyList = (List)tw.getComponent(ToolWindow.MW_POLICY_LIST);
+ JList policyList = (JList)tw.getComponent(ToolWindow.MW_POLICY_LIST);
listIndex = policyList.getSelectedIndex();
// get principal list
@@ -1582,82 +1834,97 @@
}
// codebase label and textfield
- Label label = new Label(PolicyTool.rb.getString("CodeBase."));
+ JLabel label = new JLabel();
tw.addNewComponent(this, label, PE_CODEBASE_LABEL,
- 0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH);
- TextField tf;
+ 0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
+ ToolWindow.R_PADDING);
+ JTextField tf;
tf = (edit ?
- new TextField(entries[listIndex].getGrantEntry().codeBase, 60) :
- new TextField(60));
+ new JTextField(entries[listIndex].getGrantEntry().codeBase) :
+ new JTextField());
+ ToolWindow.configureLabelFor(label, tf, "CodeBase.");
+ tf.setPreferredSize(new Dimension(tf.getPreferredSize().width, TEXTFIELD_HEIGHT));
tf.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("Code.Base"));
+ PolicyTool.getMessage("Code.Base"));
tw.addNewComponent(this, tf, PE_CODEBASE_TEXTFIELD,
- 1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH);
+ 1, 0, 1, 1, 1.0, 0.0, GridBagConstraints.BOTH);
// signedby label and textfield
- label = new Label(PolicyTool.rb.getString("SignedBy."));
+ label = new JLabel();
tw.addNewComponent(this, label, PE_SIGNEDBY_LABEL,
- 0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH);
+ 0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
+ ToolWindow.R_PADDING);
tf = (edit ?
- new TextField(entries[listIndex].getGrantEntry().signedBy, 60) :
- new TextField(60));
+ new JTextField(entries[listIndex].getGrantEntry().signedBy) :
+ new JTextField());
+ ToolWindow.configureLabelFor(label, tf, "SignedBy.");
+ tf.setPreferredSize(new Dimension(tf.getPreferredSize().width, TEXTFIELD_HEIGHT));
tf.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("Signed.By."));
+ PolicyTool.getMessage("Signed.By."));
tw.addNewComponent(this, tf, PE_SIGNEDBY_TEXTFIELD,
- 1, 1, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH);
+ 1, 1, 1, 1, 1.0, 0.0, GridBagConstraints.BOTH);
// panel for principal buttons
- Panel panel = new Panel();
+ JPanel panel = new JPanel();
panel.setLayout(new GridBagLayout());
- Button button = new Button(PolicyTool.rb.getString("Add.Principal"));
+ JButton button = new JButton();
+ ToolWindow.configureButton(button, "Add.Principal");
button.addActionListener
(new AddPrinButtonListener(tool, tw, this, edit));
tw.addNewComponent(panel, button, PE_ADD_PRIN_BUTTON,
0, 0, 1, 1, 100.0, 0.0, GridBagConstraints.HORIZONTAL);
- button = new Button(PolicyTool.rb.getString("Edit.Principal"));
+ button = new JButton();
+ ToolWindow.configureButton(button, "Edit.Principal");
button.addActionListener(new EditPrinButtonListener
(tool, tw, this, edit));
tw.addNewComponent(panel, button, PE_EDIT_PRIN_BUTTON,
1, 0, 1, 1, 100.0, 0.0, GridBagConstraints.HORIZONTAL);
- button = new Button(PolicyTool.rb.getString("Remove.Principal"));
+ button = new JButton();
+ ToolWindow.configureButton(button, "Remove.Principal");
button.addActionListener(new RemovePrinButtonListener
(tool, tw, this, edit));
tw.addNewComponent(panel, button, PE_REMOVE_PRIN_BUTTON,
2, 0, 1, 1, 100.0, 0.0, GridBagConstraints.HORIZONTAL);
tw.addNewComponent(this, panel, PE_PANEL0,
- 1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.HORIZONTAL);
+ 1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.HORIZONTAL,
+ ToolWindow.LITE_BOTTOM_PADDING);
// principal label and list
- label = new Label(PolicyTool.rb.getString("Principals."));
+ label = new JLabel();
tw.addNewComponent(this, label, PE_PRIN_LABEL,
0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
- ToolWindow.BOTTOM_PADDING);
- tw.addNewComponent(this, prinList, PE_PRIN_LIST,
- 1, 3, 3, 1, 0.0, 0.0, GridBagConstraints.BOTH,
+ ToolWindow.R_BOTTOM_PADDING);
+ JScrollPane scrollPane = new JScrollPane(prinList);
+ ToolWindow.configureLabelFor(label, scrollPane, "Principals.");
+ tw.addNewComponent(this, scrollPane, PE_PRIN_LIST,
+ 1, 3, 3, 1, 0.0, prinList.getVisibleRowCount(), GridBagConstraints.BOTH,
ToolWindow.BOTTOM_PADDING);
// panel for permission buttons
- panel = new Panel();
+ panel = new JPanel();
panel.setLayout(new GridBagLayout());
- button = new Button(PolicyTool.rb.getString(".Add.Permission"));
+ button = new JButton();
+ ToolWindow.configureButton(button, ".Add.Permission");
button.addActionListener(new AddPermButtonListener
(tool, tw, this, edit));
tw.addNewComponent(panel, button, PE_ADD_PERM_BUTTON,
0, 0, 1, 1, 100.0, 0.0, GridBagConstraints.HORIZONTAL);
- button = new Button(PolicyTool.rb.getString(".Edit.Permission"));
+ button = new JButton();
+ ToolWindow.configureButton(button, ".Edit.Permission");
button.addActionListener(new EditPermButtonListener
(tool, tw, this, edit));
tw.addNewComponent(panel, button, PE_EDIT_PERM_BUTTON,
1, 0, 1, 1, 100.0, 0.0, GridBagConstraints.HORIZONTAL);
- button = new Button(PolicyTool.rb.getString("Remove.Permission"));
+ button = new JButton();
+ ToolWindow.configureButton(button, "Remove.Permission");
button.addActionListener(new RemovePermButtonListener
(tool, tw, this, edit));
tw.addNewComponent(panel, button, PE_REMOVE_PERM_BUTTON,
@@ -1668,27 +1935,29 @@
ToolWindow.LITE_BOTTOM_PADDING);
// permission list
- tw.addNewComponent(this, permList, PE_PERM_LIST,
- 0, 5, 3, 1, 0.0, 0.0, GridBagConstraints.BOTH,
+ scrollPane = new JScrollPane(permList);
+ tw.addNewComponent(this, scrollPane, PE_PERM_LIST,
+ 0, 5, 3, 1, 0.0, permList.getVisibleRowCount(), GridBagConstraints.BOTH,
ToolWindow.BOTTOM_PADDING);
// panel for Done and Cancel buttons
- panel = new Panel();
+ panel = new JPanel();
panel.setLayout(new GridBagLayout());
// Done Button
- button = new Button(PolicyTool.rb.getString("Done"));
- button.addActionListener
+ JButton okButton = new JButton(PolicyTool.getMessage("Done"));
+ okButton.addActionListener
(new AddEntryDoneButtonListener(tool, tw, this, edit));
- tw.addNewComponent(panel, button, PE_DONE_BUTTON,
+ tw.addNewComponent(panel, okButton, PE_DONE_BUTTON,
0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.VERTICAL,
ToolWindow.LR_PADDING);
// Cancel Button
- button = new Button(PolicyTool.rb.getString("Cancel"));
- button.addActionListener(new CancelButtonListener(this));
- tw.addNewComponent(panel, button, PE_CANCEL_BUTTON,
+ JButton cancelButton = new JButton(PolicyTool.getMessage("Cancel"));
+ ActionListener cancelListener = new CancelButtonListener(this);
+ cancelButton.addActionListener(cancelListener);
+ tw.addNewComponent(panel, cancelButton, PE_CANCEL_BUTTON,
1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.VERTICAL,
ToolWindow.LR_PADDING);
@@ -1696,6 +1965,11 @@
tw.addNewComponent(this, panel, PE_PANEL2,
0, 6, 2, 1, 0.0, 0.0, GridBagConstraints.VERTICAL);
+ getRootPane().setDefaultButton(okButton);
+ getRootPane().registerKeyboardAction(cancelListener, escKey, JComponent.WHEN_IN_FOCUSED_WINDOW);
+
+ pack();
+ setLocationRelativeTo(tw);
setVisible(true);
}
@@ -1710,13 +1984,13 @@
CertificateException, IOException, Exception {
// get the Codebase
- TextField tf = (TextField)getComponent(PE_CODEBASE_TEXTFIELD);
+ JTextField tf = (JTextField)getComponent(PE_CODEBASE_TEXTFIELD);
String codebase = null;
if (tf.getText().trim().equals("") == false)
codebase = new String(tf.getText().trim());
// get the SignedBy
- tf = (TextField)getComponent(PE_SIGNEDBY_TEXTFIELD);
+ tf = (JTextField)getComponent(PE_SIGNEDBY_TEXTFIELD);
String signedby = null;
if (tf.getText().trim().equals("") == false)
signedby = new String(tf.getText().trim());
@@ -1728,7 +2002,7 @@
// get the new Principals
LinkedList<PolicyParser.PrincipalEntry> prins = new LinkedList<>();
TaggedList prinList = (TaggedList)getComponent(PE_PRIN_LIST);
- for (int i = 0; i < prinList.getItemCount(); i++) {
+ for (int i = 0; i < prinList.getModel().getSize(); i++) {
prins.add((PolicyParser.PrincipalEntry)prinList.getObject(i));
}
ge.principals = prins;
@@ -1736,7 +2010,7 @@
// get the new Permissions
Vector<PolicyParser.PermissionEntry> perms = new Vector<>();
TaggedList permList = (TaggedList)getComponent(PE_PERM_LIST);
- for (int i = 0; i < permList.getItemCount(); i++) {
+ for (int i = 0; i < permList.getModel().getSize(); i++) {
perms.addElement((PolicyParser.PermissionEntry)permList.getObject(i));
}
ge.permissionEntries = perms;
@@ -1754,78 +2028,89 @@
// find where the PolicyTool gui is
Point location = tw.getLocationOnScreen();
- setBounds(location.x + 25, location.y + 100, 500, 300);
+ //setBounds(location.x + 25, location.y + 100, 500, 300);
setLayout(new GridBagLayout());
if (mode == EDIT_KEYSTORE) {
// KeyStore label and textfield
- Label label = new Label
- (PolicyTool.rb.getString("KeyStore.URL."));
+ JLabel label = new JLabel();
tw.addNewComponent(this, label, KSD_NAME_LABEL,
0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
- ToolWindow.BOTTOM_PADDING);
- TextField tf = new TextField(tool.getKeyStoreName(), 30);
+ ToolWindow.R_BOTTOM_PADDING);
+ JTextField tf = new JTextField(tool.getKeyStoreName(), 30);
+ ToolWindow.configureLabelFor(label, tf, "KeyStore.URL.");
+ tf.setPreferredSize(new Dimension(tf.getPreferredSize().width, TEXTFIELD_HEIGHT));
// URL to U R L, so that accessibility reader will pronounce well
tf.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("KeyStore.U.R.L."));
+ PolicyTool.getMessage("KeyStore.U.R.L."));
tw.addNewComponent(this, tf, KSD_NAME_TEXTFIELD,
- 1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
+ 1, 0, 1, 1, 1.0, 0.0, GridBagConstraints.BOTH,
ToolWindow.BOTTOM_PADDING);
// KeyStore type and textfield
- label = new Label(PolicyTool.rb.getString("KeyStore.Type."));
+ label = new JLabel();
tw.addNewComponent(this, label, KSD_TYPE_LABEL,
0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
- ToolWindow.BOTTOM_PADDING);
- tf = new TextField(tool.getKeyStoreType(), 30);
+ ToolWindow.R_BOTTOM_PADDING);
+ tf = new JTextField(tool.getKeyStoreType(), 30);
+ ToolWindow.configureLabelFor(label, tf, "KeyStore.Type.");
+ tf.setPreferredSize(new Dimension(tf.getPreferredSize().width, TEXTFIELD_HEIGHT));
tf.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("KeyStore.Type."));
+ PolicyTool.getMessage("KeyStore.Type."));
tw.addNewComponent(this, tf, KSD_TYPE_TEXTFIELD,
- 1, 1, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
+ 1, 1, 1, 1, 1.0, 0.0, GridBagConstraints.BOTH,
ToolWindow.BOTTOM_PADDING);
// KeyStore provider and textfield
- label = new Label(PolicyTool.rb.getString
- ("KeyStore.Provider."));
+ label = new JLabel();
tw.addNewComponent(this, label, KSD_PROVIDER_LABEL,
0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
- ToolWindow.BOTTOM_PADDING);
- tf = new TextField(tool.getKeyStoreProvider(), 30);
+ ToolWindow.R_BOTTOM_PADDING);
+ tf = new JTextField(tool.getKeyStoreProvider(), 30);
+ ToolWindow.configureLabelFor(label, tf, "KeyStore.Provider.");
+ tf.setPreferredSize(new Dimension(tf.getPreferredSize().width, TEXTFIELD_HEIGHT));
tf.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("KeyStore.Provider."));
+ PolicyTool.getMessage("KeyStore.Provider."));
tw.addNewComponent(this, tf, KSD_PROVIDER_TEXTFIELD,
- 1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
+ 1, 2, 1, 1, 1.0, 0.0, GridBagConstraints.BOTH,
ToolWindow.BOTTOM_PADDING);
// KeyStore password URL and textfield
- label = new Label(PolicyTool.rb.getString
- ("KeyStore.Password.URL."));
+ label = new JLabel();
tw.addNewComponent(this, label, KSD_PWD_URL_LABEL,
0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
- ToolWindow.BOTTOM_PADDING);
- tf = new TextField(tool.getKeyStorePwdURL(), 30);
+ ToolWindow.R_BOTTOM_PADDING);
+ tf = new JTextField(tool.getKeyStorePwdURL(), 30);
+ ToolWindow.configureLabelFor(label, tf, "KeyStore.Password.URL.");
+ tf.setPreferredSize(new Dimension(tf.getPreferredSize().width, TEXTFIELD_HEIGHT));
tf.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("KeyStore.Password.U.R.L."));
+ PolicyTool.getMessage("KeyStore.Password.U.R.L."));
tw.addNewComponent(this, tf, KSD_PWD_URL_TEXTFIELD,
- 1, 3, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
+ 1, 3, 1, 1, 1.0, 0.0, GridBagConstraints.BOTH,
ToolWindow.BOTTOM_PADDING);
// OK button
- Button okButton = new Button(PolicyTool.rb.getString("OK"));
+ JButton okButton = new JButton(PolicyTool.getMessage("OK"));
okButton.addActionListener
(new ChangeKeyStoreOKButtonListener(tool, tw, this));
tw.addNewComponent(this, okButton, KSD_OK_BUTTON,
0, 4, 1, 1, 0.0, 0.0, GridBagConstraints.VERTICAL);
// cancel button
- Button cancelButton = new Button(PolicyTool.rb.getString("Cancel"));
- cancelButton.addActionListener(new CancelButtonListener(this));
+ JButton cancelButton = new JButton(PolicyTool.getMessage("Cancel"));
+ ActionListener cancelListener = new CancelButtonListener(this);
+ cancelButton.addActionListener(cancelListener);
tw.addNewComponent(this, cancelButton, KSD_CANCEL_BUTTON,
1, 4, 1, 1, 0.0, 0.0, GridBagConstraints.VERTICAL);
+ getRootPane().setDefaultButton(okButton);
+ getRootPane().registerKeyboardAction(cancelListener, escKey, JComponent.WHEN_IN_FOCUSED_WINDOW);
}
+
+ pack();
+ setLocationRelativeTo(tw);
setVisible(true);
}
@@ -1851,75 +2136,78 @@
}
ToolDialog newTD = new ToolDialog
- (PolicyTool.rb.getString("Principals"), tool, tw, true);
+ (PolicyTool.getMessage("Principals"), tool, tw, true);
newTD.addWindowListener(new ChildWindowListener(newTD));
// find where the PolicyTool gui is
Point location = getLocationOnScreen();
- newTD.setBounds(location.x + 50, location.y + 100, 650, 190);
+ //newTD.setBounds(location.x + 50, location.y + 100, 650, 190);
newTD.setLayout(new GridBagLayout());
newTD.setResizable(true);
// description label
- Label label = (edit ?
- new Label(PolicyTool.rb.getString(".Edit.Principal.")) :
- new Label(PolicyTool.rb.getString(".Add.New.Principal.")));
+ JLabel label = (edit ?
+ new JLabel(PolicyTool.getMessage(".Edit.Principal.")) :
+ new JLabel(PolicyTool.getMessage(".Add.New.Principal.")));
tw.addNewComponent(newTD, label, PRD_DESC_LABEL,
0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
ToolWindow.TOP_BOTTOM_PADDING);
// principal choice
- Choice choice = new Choice();
- choice.add(PRIN_TYPE);
+ JComboBox choice = new JComboBox();
+ choice.addItem(PRIN_TYPE);
choice.getAccessibleContext().setAccessibleName(PRIN_TYPE);
for (int i = 0; i < PRIN_ARRAY.size(); i++) {
Prin next = PRIN_ARRAY.get(i);
- choice.add(next.CLASS);
+ choice.addItem(next.CLASS);
}
- choice.addItemListener(new PrincipalTypeMenuListener(newTD));
if (edit) {
if (PolicyParser.PrincipalEntry.WILDCARD_CLASS.equals
(editMe.getPrincipalClass())) {
- choice.select(PRIN_TYPE);
+ choice.setSelectedItem(PRIN_TYPE);
} else {
Prin inputPrin = getPrin(editMe.getPrincipalClass(), true);
if (inputPrin != null) {
- choice.select(inputPrin.CLASS);
+ choice.setSelectedItem(inputPrin.CLASS);
}
}
}
+ // Add listener after selected item is set
+ choice.addItemListener(new PrincipalTypeMenuListener(newTD));
tw.addNewComponent(newTD, choice, PRD_PRIN_CHOICE,
0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
ToolWindow.LR_PADDING);
// principal textfield
- TextField tf;
+ JTextField tf;
tf = (edit ?
- new TextField(editMe.getDisplayClass(), 30) :
- new TextField(30));
+ new JTextField(editMe.getDisplayClass(), 30) :
+ new JTextField(30));
+ tf.setPreferredSize(new Dimension(tf.getPreferredSize().width, TEXTFIELD_HEIGHT));
tf.getAccessibleContext().setAccessibleName(PRIN_TYPE);
tw.addNewComponent(newTD, tf, PRD_PRIN_TEXTFIELD,
- 1, 1, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
+ 1, 1, 1, 1, 1.0, 0.0, GridBagConstraints.BOTH,
ToolWindow.LR_PADDING);
// name label and textfield
- label = new Label(PRIN_NAME);
+ label = new JLabel(PRIN_NAME);
tf = (edit ?
- new TextField(editMe.getDisplayName(), 40) :
- new TextField(40));
+ new JTextField(editMe.getDisplayName(), 40) :
+ new JTextField(40));
+ tf.setPreferredSize(new Dimension(tf.getPreferredSize().width, TEXTFIELD_HEIGHT));
tf.getAccessibleContext().setAccessibleName(PRIN_NAME);
tw.addNewComponent(newTD, label, PRD_NAME_LABEL,
0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
ToolWindow.LR_PADDING);
tw.addNewComponent(newTD, tf, PRD_NAME_TEXTFIELD,
- 1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
+ 1, 2, 1, 1, 1.0, 0.0, GridBagConstraints.BOTH,
ToolWindow.LR_PADDING);
// OK button
- Button okButton = new Button(PolicyTool.rb.getString("OK"));
+ JButton okButton = new JButton(PolicyTool.getMessage("OK"));
okButton.addActionListener(
new NewPolicyPrinOKButtonListener
(tool, tw, this, newTD, edit));
@@ -1927,12 +2215,18 @@
0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.VERTICAL,
ToolWindow.TOP_BOTTOM_PADDING);
// cancel button
- Button cancelButton = new Button(PolicyTool.rb.getString("Cancel"));
- cancelButton.addActionListener(new CancelButtonListener(newTD));
+ JButton cancelButton = new JButton(PolicyTool.getMessage("Cancel"));
+ ActionListener cancelListener = new CancelButtonListener(newTD);
+ cancelButton.addActionListener(cancelListener);
tw.addNewComponent(newTD, cancelButton, PRD_CANCEL_BUTTON,
1, 3, 1, 1, 0.0, 0.0, GridBagConstraints.VERTICAL,
ToolWindow.TOP_BOTTOM_PADDING);
+ newTD.getRootPane().setDefaultButton(okButton);
+ newTD.getRootPane().registerKeyboardAction(cancelListener, escKey, JComponent.WHEN_IN_FOCUSED_WINDOW);
+
+ newTD.pack();
+ newTD.setLocationRelativeTo(tw);
newTD.setVisible(true);
}
@@ -1958,98 +2252,102 @@
}
ToolDialog newTD = new ToolDialog
- (PolicyTool.rb.getString("Permissions"), tool, tw, true);
+ (PolicyTool.getMessage("Permissions"), tool, tw, true);
newTD.addWindowListener(new ChildWindowListener(newTD));
// find where the PolicyTool gui is
Point location = getLocationOnScreen();
- newTD.setBounds(location.x + 50, location.y + 100, 700, 250);
+ //newTD.setBounds(location.x + 50, location.y + 100, 700, 250);
newTD.setLayout(new GridBagLayout());
newTD.setResizable(true);
// description label
- Label label = (edit ?
- new Label(PolicyTool.rb.getString(".Edit.Permission.")) :
- new Label(PolicyTool.rb.getString(".Add.New.Permission.")));
+ JLabel label = (edit ?
+ new JLabel(PolicyTool.getMessage(".Edit.Permission.")) :
+ new JLabel(PolicyTool.getMessage(".Add.New.Permission.")));
tw.addNewComponent(newTD, label, PD_DESC_LABEL,
0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
ToolWindow.TOP_BOTTOM_PADDING);
// permission choice (added in alphabetical order)
- Choice choice = new Choice();
- choice.add(PERM);
+ JComboBox choice = new JComboBox();
+ choice.addItem(PERM);
choice.getAccessibleContext().setAccessibleName(PERM);
for (int i = 0; i < PERM_ARRAY.size(); i++) {
Perm next = PERM_ARRAY.get(i);
- choice.add(next.CLASS);
+ choice.addItem(next.CLASS);
}
- choice.addItemListener(new PermissionMenuListener(newTD));
tw.addNewComponent(newTD, choice, PD_PERM_CHOICE,
0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
- ToolWindow.LR_PADDING);
+ ToolWindow.LR_BOTTOM_PADDING);
// permission textfield
- TextField tf;
- tf = (edit ? new TextField(editMe.permission, 30) : new TextField(30));
+ JTextField tf;
+ tf = (edit ? new JTextField(editMe.permission, 30) : new JTextField(30));
+ tf.setPreferredSize(new Dimension(tf.getPreferredSize().width, TEXTFIELD_HEIGHT));
tf.getAccessibleContext().setAccessibleName(PERM);
if (edit) {
Perm inputPerm = getPerm(editMe.permission, true);
if (inputPerm != null) {
- choice.select(inputPerm.CLASS);
+ choice.setSelectedItem(inputPerm.CLASS);
}
}
tw.addNewComponent(newTD, tf, PD_PERM_TEXTFIELD,
- 1, 1, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
- ToolWindow.LR_PADDING);
+ 1, 1, 1, 1, 1.0, 0.0, GridBagConstraints.BOTH,
+ ToolWindow.LR_BOTTOM_PADDING);
+ choice.addItemListener(new PermissionMenuListener(newTD));
// name label and textfield
- choice = new Choice();
- choice.add(PERM_NAME);
+ choice = new JComboBox();
+ choice.addItem(PERM_NAME);
choice.getAccessibleContext().setAccessibleName(PERM_NAME);
- choice.addItemListener(new PermissionNameMenuListener(newTD));
- tf = (edit ? new TextField(editMe.name, 40) : new TextField(40));
+ tf = (edit ? new JTextField(editMe.name, 40) : new JTextField(40));
+ tf.setPreferredSize(new Dimension(tf.getPreferredSize().width, TEXTFIELD_HEIGHT));
tf.getAccessibleContext().setAccessibleName(PERM_NAME);
if (edit) {
setPermissionNames(getPerm(editMe.permission, true), choice, tf);
}
tw.addNewComponent(newTD, choice, PD_NAME_CHOICE,
0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
- ToolWindow.LR_PADDING);
+ ToolWindow.LR_BOTTOM_PADDING);
tw.addNewComponent(newTD, tf, PD_NAME_TEXTFIELD,
- 1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
- ToolWindow.LR_PADDING);
+ 1, 2, 1, 1, 1.0, 0.0, GridBagConstraints.BOTH,
+ ToolWindow.LR_BOTTOM_PADDING);
+ choice.addItemListener(new PermissionNameMenuListener(newTD));
// actions label and textfield
- choice = new Choice();
- choice.add(PERM_ACTIONS);
+ choice = new JComboBox();
+ choice.addItem(PERM_ACTIONS);
choice.getAccessibleContext().setAccessibleName(PERM_ACTIONS);
- choice.addItemListener(new PermissionActionsMenuListener(newTD));
- tf = (edit ? new TextField(editMe.action, 40) : new TextField(40));
+ tf = (edit ? new JTextField(editMe.action, 40) : new JTextField(40));
+ tf.setPreferredSize(new Dimension(tf.getPreferredSize().width, TEXTFIELD_HEIGHT));
tf.getAccessibleContext().setAccessibleName(PERM_ACTIONS);
if (edit) {
setPermissionActions(getPerm(editMe.permission, true), choice, tf);
}
tw.addNewComponent(newTD, choice, PD_ACTIONS_CHOICE,
0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
- ToolWindow.LR_PADDING);
+ ToolWindow.LR_BOTTOM_PADDING);
tw.addNewComponent(newTD, tf, PD_ACTIONS_TEXTFIELD,
- 1, 3, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
- ToolWindow.LR_PADDING);
+ 1, 3, 1, 1, 1.0, 0.0, GridBagConstraints.BOTH,
+ ToolWindow.LR_BOTTOM_PADDING);
+ choice.addItemListener(new PermissionActionsMenuListener(newTD));
// signedby label and textfield
- label = new Label(PolicyTool.rb.getString("Signed.By."));
+ label = new JLabel(PolicyTool.getMessage("Signed.By."));
tw.addNewComponent(newTD, label, PD_SIGNEDBY_LABEL,
0, 4, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
- ToolWindow.LR_PADDING);
- tf = (edit ? new TextField(editMe.signedBy, 40) : new TextField(40));
+ ToolWindow.LR_BOTTOM_PADDING);
+ tf = (edit ? new JTextField(editMe.signedBy, 40) : new JTextField(40));
+ tf.setPreferredSize(new Dimension(tf.getPreferredSize().width, TEXTFIELD_HEIGHT));
tf.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("Signed.By."));
+ PolicyTool.getMessage("Signed.By."));
tw.addNewComponent(newTD, tf, PD_SIGNEDBY_TEXTFIELD,
- 1, 4, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
- ToolWindow.LR_PADDING);
+ 1, 4, 1, 1, 1.0, 0.0, GridBagConstraints.BOTH,
+ ToolWindow.LR_BOTTOM_PADDING);
// OK button
- Button okButton = new Button(PolicyTool.rb.getString("OK"));
+ JButton okButton = new JButton(PolicyTool.getMessage("OK"));
okButton.addActionListener(
new NewPolicyPermOKButtonListener
(tool, tw, this, newTD, edit));
@@ -2058,12 +2356,18 @@
ToolWindow.TOP_BOTTOM_PADDING);
// cancel button
- Button cancelButton = new Button(PolicyTool.rb.getString("Cancel"));
- cancelButton.addActionListener(new CancelButtonListener(newTD));
+ JButton cancelButton = new JButton(PolicyTool.getMessage("Cancel"));
+ ActionListener cancelListener = new CancelButtonListener(newTD);
+ cancelButton.addActionListener(cancelListener);
tw.addNewComponent(newTD, cancelButton, PD_CANCEL_BUTTON,
1, 5, 1, 1, 0.0, 0.0, GridBagConstraints.VERTICAL,
ToolWindow.TOP_BOTTOM_PADDING);
+ newTD.getRootPane().setDefaultButton(okButton);
+ newTD.getRootPane().registerKeyboardAction(cancelListener, escKey, JComponent.WHEN_IN_FOCUSED_WINDOW);
+
+ newTD.pack();
+ newTD.setLocationRelativeTo(tw);
newTD.setVisible(true);
}
@@ -2072,9 +2376,9 @@
*/
PolicyParser.PrincipalEntry getPrinFromDialog() throws Exception {
- TextField tf = (TextField)getComponent(PRD_PRIN_TEXTFIELD);
+ JTextField tf = (JTextField)getComponent(PRD_PRIN_TEXTFIELD);
String pclass = new String(tf.getText().trim());
- tf = (TextField)getComponent(PRD_NAME_TEXTFIELD);
+ tf = (JTextField)getComponent(PRD_NAME_TEXTFIELD);
String pname = new String(tf.getText().trim());
if (pclass.equals("*")) {
pclass = PolicyParser.PrincipalEntry.WILDCARD_CLASS;
@@ -2088,10 +2392,10 @@
if ((pclass.equals(PolicyParser.PrincipalEntry.WILDCARD_CLASS)) &&
(!pname.equals(PolicyParser.PrincipalEntry.WILDCARD_NAME))) {
throw new Exception
- (PolicyTool.rb.getString("Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name"));
+ (PolicyTool.getMessage("Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name"));
} else if (pname.equals("")) {
throw new Exception
- (PolicyTool.rb.getString("Cannot.Specify.Principal.without.a.Name"));
+ (PolicyTool.getMessage("Cannot.Specify.Principal.without.a.Name"));
} else if (pclass.equals("")) {
// make this consistent with what PolicyParser does
// when it sees an empty principal class
@@ -2130,15 +2434,15 @@
*/
PolicyParser.PermissionEntry getPermFromDialog() {
- TextField tf = (TextField)getComponent(PD_PERM_TEXTFIELD);
+ JTextField tf = (JTextField)getComponent(PD_PERM_TEXTFIELD);
String permission = new String(tf.getText().trim());
- tf = (TextField)getComponent(PD_NAME_TEXTFIELD);
+ tf = (JTextField)getComponent(PD_NAME_TEXTFIELD);
String name = null;
if (tf.getText().trim().equals("") == false)
name = new String(tf.getText().trim());
if (permission.equals("") ||
(!permission.equals(ALL_PERM_CLASS) && name == null)) {
- throw new InvalidParameterException(PolicyTool.rb.getString
+ throw new InvalidParameterException(PolicyTool.getMessage
("Permission.and.Target.Name.must.have.a.value"));
}
@@ -2154,11 +2458,11 @@
if (permission.equals(FILE_PERM_CLASS) && name.lastIndexOf("\\\\") > 0) {
char result = tw.displayYesNoDialog(this,
- PolicyTool.rb.getString("Warning"),
- PolicyTool.rb.getString(
+ PolicyTool.getMessage("Warning"),
+ PolicyTool.getMessage(
"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes"),
- PolicyTool.rb.getString("Retain"),
- PolicyTool.rb.getString("Edit")
+ PolicyTool.getMessage("Retain"),
+ PolicyTool.getMessage("Edit")
);
if (result != 'Y') {
// an invisible exception
@@ -2166,13 +2470,13 @@
}
}
// get the Actions
- tf = (TextField)getComponent(PD_ACTIONS_TEXTFIELD);
+ tf = (JTextField)getComponent(PD_ACTIONS_TEXTFIELD);
String actions = null;
if (tf.getText().trim().equals("") == false)
actions = new String(tf.getText().trim());
// get the Signed By
- tf = (TextField)getComponent(PD_SIGNEDBY_TEXTFIELD);
+ tf = (JTextField)getComponent(PD_SIGNEDBY_TEXTFIELD);
String signedBy = null;
if (tf.getText().trim().equals("") == false)
signedBy = new String(tf.getText().trim());
@@ -2189,7 +2493,7 @@
PublicKey pubKey = tool.getPublicKeyAlias(signers[i]);
if (pubKey == null) {
MessageFormat form = new MessageFormat
- (PolicyTool.rb.getString
+ (PolicyTool.getMessage
("Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured."));
Object[] source = {signers[i]};
tool.warnings.addElement(form.format(source));
@@ -2209,27 +2513,27 @@
void displayConfirmRemovePolicyEntry() {
// find the entry to be removed
- List list = (List)tw.getComponent(ToolWindow.MW_POLICY_LIST);
+ JList list = (JList)tw.getComponent(ToolWindow.MW_POLICY_LIST);
int index = list.getSelectedIndex();
PolicyEntry entries[] = tool.getEntry();
// find where the PolicyTool gui is
Point location = tw.getLocationOnScreen();
- setBounds(location.x + 25, location.y + 100, 600, 400);
+ //setBounds(location.x + 25, location.y + 100, 600, 400);
setLayout(new GridBagLayout());
// ask the user do they really want to do this?
- Label label = new Label
- (PolicyTool.rb.getString("Remove.this.Policy.Entry."));
+ JLabel label = new JLabel
+ (PolicyTool.getMessage("Remove.this.Policy.Entry."));
tw.addNewComponent(this, label, CRPE_LABEL1,
0, 0, 2, 1, 0.0, 0.0, GridBagConstraints.BOTH,
ToolWindow.BOTTOM_PADDING);
// display the policy entry
- label = new Label(entries[index].codebaseToString());
+ label = new JLabel(entries[index].codebaseToString());
tw.addNewComponent(this, label, CRPE_LABEL2,
0, 1, 2, 1, 0.0, 0.0, GridBagConstraints.BOTH);
- label = new Label(entries[index].principalsToString().trim());
+ label = new JLabel(entries[index].principalsToString().trim());
tw.addNewComponent(this, label, CRPE_LABEL2+1,
0, 2, 2, 1, 0.0, 0.0, GridBagConstraints.BOTH);
Vector<PolicyParser.PermissionEntry> perms =
@@ -2237,7 +2541,7 @@
for (int i = 0; i < perms.size(); i++) {
PolicyParser.PermissionEntry nextPerm = perms.elementAt(i);
String permString = ToolDialog.PermissionEntryToUserFriendlyString(nextPerm);
- label = new Label(" " + permString);
+ label = new JLabel(" " + permString);
if (i == (perms.size()-1)) {
tw.addNewComponent(this, label, CRPE_LABEL2 + 2 + i,
1, 3 + i, 1, 1, 0.0, 0.0,
@@ -2252,11 +2556,11 @@
// add OK/CANCEL buttons in a new panel
- Panel panel = new Panel();
+ JPanel panel = new JPanel();
panel.setLayout(new GridBagLayout());
// OK button
- Button okButton = new Button(PolicyTool.rb.getString("OK"));
+ JButton okButton = new JButton(PolicyTool.getMessage("OK"));
okButton.addActionListener
(new ConfirmRemovePolicyEntryOKButtonListener(tool, tw, this));
tw.addNewComponent(panel, okButton, CRPE_PANEL_OK,
@@ -2264,8 +2568,9 @@
GridBagConstraints.VERTICAL, ToolWindow.LR_PADDING);
// cancel button
- Button cancelButton = new Button(PolicyTool.rb.getString("Cancel"));
- cancelButton.addActionListener(new CancelButtonListener(this));
+ JButton cancelButton = new JButton(PolicyTool.getMessage("Cancel"));
+ ActionListener cancelListener = new CancelButtonListener(this);
+ cancelButton.addActionListener(cancelListener);
tw.addNewComponent(panel, cancelButton, CRPE_PANEL_CANCEL,
1, 0, 1, 1, 0.0, 0.0,
GridBagConstraints.VERTICAL, ToolWindow.LR_PADDING);
@@ -2274,7 +2579,11 @@
0, 3 + perms.size(), 2, 1, 0.0, 0.0,
GridBagConstraints.VERTICAL, ToolWindow.TOP_BOTTOM_PADDING);
+ getRootPane().setDefaultButton(okButton);
+ getRootPane().registerKeyboardAction(cancelListener, escKey, JComponent.WHEN_IN_FOCUSED_WINDOW);
+
pack();
+ setLocationRelativeTo(tw);
setVisible(true);
}
@@ -2285,7 +2594,7 @@
// pop up a dialog box for the user to enter a filename.
FileDialog fd = new FileDialog
- (tw, PolicyTool.rb.getString("Save.As"), FileDialog.SAVE);
+ (tw, PolicyTool.getMessage("Save.As"), FileDialog.SAVE);
fd.addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
e.getWindow().setVisible(false);
@@ -2308,13 +2617,13 @@
tool.savePolicy(filename);
// display status
- MessageFormat form = new MessageFormat(PolicyTool.rb.getString
+ MessageFormat form = new MessageFormat(PolicyTool.getMessage
("Policy.successfully.written.to.filename"));
Object[] source = {filename};
tw.displayStatusDialog(null, form.format(source));
// display the new policy filename
- TextField newFilename = (TextField)tw.getComponent
+ JTextField newFilename = (JTextField)tw.getComponent
(ToolWindow.MW_FILENAME_TEXTFIELD);
newFilename.setText(filename);
tw.setVisible(true);
@@ -2326,7 +2635,7 @@
} catch (FileNotFoundException fnfe) {
if (filename == null || filename.equals("")) {
tw.displayErrorDialog(null, new FileNotFoundException
- (PolicyTool.rb.getString("null.filename")));
+ (PolicyTool.getMessage("null.filename")));
} else {
tw.displayErrorDialog(null, fnfe);
}
@@ -2344,35 +2653,38 @@
// find where the PolicyTool gui is
Point location = tw.getLocationOnScreen();
- setBounds(location.x + 75, location.y + 100, 400, 150);
+ //setBounds(location.x + 75, location.y + 100, 400, 150);
setLayout(new GridBagLayout());
- Label label = new Label
- (PolicyTool.rb.getString("Save.changes."));
+ JLabel label = new JLabel
+ (PolicyTool.getMessage("Save.changes."));
tw.addNewComponent(this, label, USC_LABEL,
0, 0, 3, 1, 0.0, 0.0, GridBagConstraints.BOTH,
ToolWindow.L_TOP_BOTTOM_PADDING);
- Panel panel = new Panel();
+ JPanel panel = new JPanel();
panel.setLayout(new GridBagLayout());
- Button yesButton = new Button(PolicyTool.rb.getString("Yes"));
+ JButton yesButton = new JButton();
+ ToolWindow.configureButton(yesButton, "Yes");
yesButton.addActionListener
(new UserSaveYesButtonListener(this, tool, tw, select));
tw.addNewComponent(panel, yesButton, USC_YES_BUTTON,
0, 0, 1, 1, 0.0, 0.0,
GridBagConstraints.VERTICAL,
ToolWindow.LR_BOTTOM_PADDING);
- Button noButton = new Button(PolicyTool.rb.getString("No"));
+ JButton noButton = new JButton();
+ ToolWindow.configureButton(noButton, "No");
noButton.addActionListener
(new UserSaveNoButtonListener(this, tool, tw, select));
tw.addNewComponent(panel, noButton, USC_NO_BUTTON,
1, 0, 1, 1, 0.0, 0.0,
GridBagConstraints.VERTICAL,
ToolWindow.LR_BOTTOM_PADDING);
- Button cancelButton = new Button(PolicyTool.rb.getString("Cancel"));
- cancelButton.addActionListener
- (new UserSaveCancelButtonListener(this));
+ JButton cancelButton = new JButton();
+ ToolWindow.configureButton(cancelButton, "Cancel");
+ ActionListener cancelListener = new CancelButtonListener(this);
+ cancelButton.addActionListener(cancelListener);
tw.addNewComponent(panel, cancelButton, USC_CANCEL_BUTTON,
2, 0, 1, 1, 0.0, 0.0,
GridBagConstraints.VERTICAL,
@@ -2381,7 +2693,10 @@
tw.addNewComponent(this, panel, USC_PANEL,
0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH);
+ getRootPane().registerKeyboardAction(cancelListener, escKey, JComponent.WHEN_IN_FOCUSED_WINDOW);
+
pack();
+ setLocationRelativeTo(tw);
setVisible(true);
} else {
// just do the original request (QUIT, NEW, or OPEN)
@@ -2418,12 +2733,14 @@
}
// display the policy entries via the policy list textarea
- List list = new List(40, false);
- list.addActionListener(new PolicyListListener(tool, tw));
+ JList list = new JList(new DefaultListModel());
+ list.setVisibleRowCount(15);
+ list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ list.addMouseListener(new PolicyListListener(tool, tw));
tw.replacePolicyList(list);
// display null policy filename and keystore
- TextField newFilename = (TextField)tw.getComponent(
+ JTextField newFilename = (JTextField)tw.getComponent(
ToolWindow.MW_FILENAME_TEXTFIELD);
newFilename.setText("");
tw.setVisible(true);
@@ -2433,7 +2750,7 @@
// pop up a dialog box for the user to enter a filename.
FileDialog fd = new FileDialog
- (tw, PolicyTool.rb.getString("Open"), FileDialog.LOAD);
+ (tw, PolicyTool.getMessage("Open"), FileDialog.LOAD);
fd.addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
e.getWindow().setVisible(false);
@@ -2454,44 +2771,50 @@
tool.openPolicy(policyFile);
// display the policy entries via the policy list textarea
- list = new List(40, false);
- list.addActionListener(new PolicyListListener(tool, tw));
+ DefaultListModel listModel = new DefaultListModel();
+ list = new JList(listModel);
+ list.setVisibleRowCount(15);
+ list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ list.addMouseListener(new PolicyListListener(tool, tw));
PolicyEntry entries[] = tool.getEntry();
if (entries != null) {
- for (int i = 0; i < entries.length; i++)
- list.add(entries[i].headerToString());
+ for (int i = 0; i < entries.length; i++) {
+ listModel.addElement(entries[i].headerToString());
+ }
}
tw.replacePolicyList(list);
tool.modified = false;
// display the new policy filename
- newFilename = (TextField)tw.getComponent(
+ newFilename = (JTextField)tw.getComponent(
ToolWindow.MW_FILENAME_TEXTFIELD);
newFilename.setText(policyFile);
tw.setVisible(true);
// inform user of warnings
if (tool.newWarning == true) {
- tw.displayStatusDialog(null, PolicyTool.rb.getString
+ tw.displayStatusDialog(null, PolicyTool.getMessage
("Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information."));
}
} catch (Exception e) {
// add blank policy listing
- list = new List(40, false);
- list.addActionListener(new PolicyListListener(tool, tw));
+ list = new JList(new DefaultListModel());
+ list.setVisibleRowCount(15);
+ list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ list.addMouseListener(new PolicyListListener(tool, tw));
tw.replacePolicyList(list);
tool.setPolicyFileName(null);
tool.modified = false;
// display a null policy filename
- newFilename = (TextField)tw.getComponent(
+ newFilename = (JTextField)tw.getComponent(
ToolWindow.MW_FILENAME_TEXTFIELD);
newFilename.setText("");
tw.setVisible(true);
// display the error
- MessageFormat form = new MessageFormat(PolicyTool.rb.getString
+ MessageFormat form = new MessageFormat(PolicyTool.getMessage
("Could.not.open.policy.file.policyFile.e.toString."));
Object[] source = {policyFile, e.toString()};
tw.displayErrorDialog(null, form.format(source));
@@ -2511,9 +2834,9 @@
* (user must enter them by hand) then the TARGETS array may be empty
* (and of course non-null).
*/
- void setPermissionNames(Perm inputPerm, Choice names, TextField field) {
- names.removeAll();
- names.add(PERM_NAME);
+ void setPermissionNames(Perm inputPerm, JComboBox names, JTextField field) {
+ names.removeAllItems();
+ names.addItem(PERM_NAME);
if (inputPerm == null) {
// custom permission
@@ -2525,7 +2848,7 @@
// standard permission with standard targets
field.setEditable(true);
for (int i = 0; i < inputPerm.TARGETS.length; i++) {
- names.add(inputPerm.TARGETS[i]);
+ names.addItem(inputPerm.TARGETS[i]);
}
}
}
@@ -2541,9 +2864,9 @@
* (user must enter them by hand) then the ACTIONS array may be empty
* (and of course non-null).
*/
- void setPermissionActions(Perm inputPerm, Choice actions, TextField field) {
- actions.removeAll();
- actions.add(PERM_ACTIONS);
+ void setPermissionActions(Perm inputPerm, JComboBox actions, JTextField field) {
+ actions.removeAllItems();
+ actions.addItem(PERM_ACTIONS);
if (inputPerm == null) {
// custom permission
@@ -2555,7 +2878,7 @@
// standard permission with standard actions
field.setEditable(true);
for (int i = 0; i < inputPerm.ACTIONS.length; i++) {
- actions.add(inputPerm.ACTIONS[i]);
+ actions.addItem(inputPerm.ACTIONS[i]);
}
}
}
@@ -2587,9 +2910,11 @@
*/
class ToolWindowListener implements WindowListener {
+ private PolicyTool tool;
private ToolWindow tw;
- ToolWindowListener(ToolWindow tw) {
+ ToolWindowListener(PolicyTool tool, ToolWindow tw) {
+ this.tool = tool;
this.tw = tw;
}
@@ -2597,16 +2922,14 @@
}
public void windowClosing(WindowEvent we) {
+ // Closing the window acts the same as choosing Menu->Exit.
- // XXX
- // should we ask user if they want to save changes?
- // (we do if they choose the Menu->Exit)
- // seems that if they kill the application by hand,
- // we don't have to ask.
+ // ask user if they want to save changes
+ ToolDialog td = new ToolDialog(PolicyTool.getMessage("Save.Changes"), tool, tw, true);
+ td.displayUserSave(ToolDialog.QUIT);
- tw.setVisible(false);
- tw.dispose();
- System.exit(0);
+ // the above method will perform the QUIT as long as the
+ // user does not CANCEL the request
}
public void windowClosed(WindowEvent we) {
@@ -2629,7 +2952,7 @@
/**
* Event handler for the Policy List
*/
-class PolicyListListener implements ActionListener {
+class PolicyListListener extends MouseAdapter implements ActionListener {
private PolicyTool tool;
private ToolWindow tw;
@@ -2644,9 +2967,15 @@
// display the permission list for a policy entry
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("Policy.Entry"), tool, tw, true);
+ (PolicyTool.getMessage("Policy.Entry"), tool, tw, true);
td.displayPolicyEntryDialog(true);
}
+
+ public void mouseClicked(MouseEvent evt) {
+ if (evt.getClickCount() == 2) {
+ actionPerformed(null);
+ }
+ }
}
/**
@@ -2669,7 +2998,7 @@
// ask user if they want to save changes
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("Save.Changes"), tool, tw, true);
+ (PolicyTool.getMessage("Save.Changes"), tool, tw, true);
td.displayUserSave(ToolDialog.QUIT);
// the above method will perform the QUIT as long as the
@@ -2680,7 +3009,7 @@
// ask user if they want to save changes
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("Save.Changes"), tool, tw, true);
+ (PolicyTool.getMessage("Save.Changes"), tool, tw, true);
td.displayUserSave(ToolDialog.NEW);
// the above method will perform the NEW as long as the
@@ -2691,7 +3020,7 @@
// ask user if they want to save changes
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("Save.Changes"), tool, tw, true);
+ (PolicyTool.getMessage("Save.Changes"), tool, tw, true);
td.displayUserSave(ToolDialog.OPEN);
// the above method will perform the OPEN as long as the
@@ -2701,14 +3030,14 @@
ToolWindow.SAVE_POLICY_FILE) == 0) {
// get the previously entered filename
- String filename = ((TextField)tw.getComponent(
+ String filename = ((JTextField)tw.getComponent(
ToolWindow.MW_FILENAME_TEXTFIELD)).getText();
// if there is no filename, do a SAVE_AS
if (filename == null || filename.length() == 0) {
// user wants to SAVE AS
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("Save.As"), tool, tw, true);
+ (PolicyTool.getMessage("Save.As"), tool, tw, true);
td.displaySaveAsDialog(ToolDialog.NOACTION);
} else {
try {
@@ -2717,14 +3046,14 @@
// display status
MessageFormat form = new MessageFormat
- (PolicyTool.rb.getString
+ (PolicyTool.getMessage
("Policy.successfully.written.to.filename"));
Object[] source = {filename};
tw.displayStatusDialog(null, form.format(source));
} catch (FileNotFoundException fnfe) {
if (filename == null || filename.equals("")) {
tw.displayErrorDialog(null, new FileNotFoundException
- (PolicyTool.rb.getString("null.filename")));
+ (PolicyTool.getMessage("null.filename")));
} else {
tw.displayErrorDialog(null, fnfe);
}
@@ -2737,7 +3066,7 @@
// user wants to SAVE AS
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("Save.As"), tool, tw, true);
+ (PolicyTool.getMessage("Save.As"), tool, tw, true);
td.displaySaveAsDialog(ToolDialog.NOACTION);
} else if (PolicyTool.collator.compare(e.getActionCommand(),
@@ -2767,23 +3096,23 @@
// display a dialog box for the user to enter policy info
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("Policy.Entry"), tool, tw, true);
+ (PolicyTool.getMessage("Policy.Entry"), tool, tw, true);
td.displayPolicyEntryDialog(false);
} else if (PolicyTool.collator.compare(e.getActionCommand(),
ToolWindow.REMOVE_POLICY_ENTRY) == 0) {
// get the selected entry
- List list = (List)tw.getComponent(ToolWindow.MW_POLICY_LIST);
+ JList list = (JList)tw.getComponent(ToolWindow.MW_POLICY_LIST);
int index = list.getSelectedIndex();
if (index < 0) {
tw.displayErrorDialog(null, new Exception
- (PolicyTool.rb.getString("No.Policy.Entry.selected")));
+ (PolicyTool.getMessage("No.Policy.Entry.selected")));
return;
}
// ask the user if they really want to remove the policy entry
- ToolDialog td = new ToolDialog(PolicyTool.rb.getString
+ ToolDialog td = new ToolDialog(PolicyTool.getMessage
("Remove.Policy.Entry"), tool, tw, true);
td.displayConfirmRemovePolicyEntry();
@@ -2791,17 +3120,17 @@
ToolWindow.EDIT_POLICY_ENTRY) == 0) {
// get the selected entry
- List list = (List)tw.getComponent(ToolWindow.MW_POLICY_LIST);
+ JList list = (JList)tw.getComponent(ToolWindow.MW_POLICY_LIST);
int index = list.getSelectedIndex();
if (index < 0) {
tw.displayErrorDialog(null, new Exception
- (PolicyTool.rb.getString("No.Policy.Entry.selected")));
+ (PolicyTool.getMessage("No.Policy.Entry.selected")));
return;
}
// display the permission list for a policy entry
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("Policy.Entry"), tool, tw, true);
+ (PolicyTool.getMessage("Policy.Entry"), tool, tw, true);
td.displayPolicyEntryDialog(true);
} else if (PolicyTool.collator.compare(e.getActionCommand(),
@@ -2809,7 +3138,7 @@
// display a dialog box for the user to enter keystore info
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("KeyStore"), tool, tw, true);
+ (PolicyTool.getMessage("KeyStore"), tool, tw, true);
td.keyStoreDialog(ToolDialog.EDIT_KEYSTORE);
}
}
@@ -2852,7 +3181,7 @@
PublicKey pubKey = tool.getPublicKeyAlias(signers[i]);
if (pubKey == null) {
MessageFormat form = new MessageFormat
- (PolicyTool.rb.getString
+ (PolicyTool.getMessage
("Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured."));
Object[] source = {signers[i]};
tool.warnings.addElement(form.format(source));
@@ -2862,18 +3191,18 @@
}
// add the entry
- List policyList = (List)tw.getComponent(ToolWindow.MW_POLICY_LIST);
+ JList policyList = (JList)tw.getComponent(ToolWindow.MW_POLICY_LIST);
if (edit) {
int listIndex = policyList.getSelectedIndex();
tool.addEntry(newEntry, listIndex);
String newCodeBaseStr = newEntry.headerToString();
if (PolicyTool.collator.compare
- (newCodeBaseStr, policyList.getItem(listIndex)) != 0)
+ (newCodeBaseStr, policyList.getModel().getElementAt(listIndex)) != 0)
tool.modified = true;
- policyList.replaceItem(newCodeBaseStr, listIndex);
+ ((DefaultListModel)policyList.getModel()).set(listIndex, newCodeBaseStr);
} else {
tool.addEntry(newEntry, -1);
- policyList.add(newEntry.headerToString());
+ ((DefaultListModel)policyList.getModel()).addElement(newEntry.headerToString());
tool.modified = true;
}
td.setVisible(false);
@@ -2903,13 +3232,13 @@
public void actionPerformed(ActionEvent e) {
- String URLString = ((TextField)td.getComponent(
+ String URLString = ((JTextField)td.getComponent(
ToolDialog.KSD_NAME_TEXTFIELD)).getText().trim();
- String type = ((TextField)td.getComponent(
+ String type = ((JTextField)td.getComponent(
ToolDialog.KSD_TYPE_TEXTFIELD)).getText().trim();
- String provider = ((TextField)td.getComponent(
+ String provider = ((JTextField)td.getComponent(
ToolDialog.KSD_PROVIDER_TEXTFIELD)).getText().trim();
- String pwdURL = ((TextField)td.getComponent(
+ String pwdURL = ((JTextField)td.getComponent(
ToolDialog.KSD_PWD_URL_TEXTFIELD)).getText().trim();
try {
@@ -2920,7 +3249,7 @@
(pwdURL.length() == 0 ? null : pwdURL));
tool.modified = true;
} catch (Exception ex) {
- MessageFormat form = new MessageFormat(PolicyTool.rb.getString
+ MessageFormat form = new MessageFormat(PolicyTool.getMessage
("Unable.to.open.KeyStore.ex.toString."));
Object[] source = {ex.toString()};
tw.displayErrorDialog(td, form.format(source));
@@ -3016,7 +3345,7 @@
pppe.getPrincipalName());
} catch (ClassNotFoundException cnfe) {
MessageFormat form = new MessageFormat
- (PolicyTool.rb.getString
+ (PolicyTool.getMessage
("Warning.Class.not.found.class"));
Object[] source = {pppe.getPrincipalClass()};
tool.warnings.addElement(form.format(source));
@@ -3077,7 +3406,7 @@
try {
tool.verifyPermission(pppe.permission, pppe.name, pppe.action);
} catch (ClassNotFoundException cnfe) {
- MessageFormat form = new MessageFormat(PolicyTool.rb.getString
+ MessageFormat form = new MessageFormat(PolicyTool.getMessage
("Warning.Class.not.found.class"));
Object[] source = {pppe.permission};
tool.warnings.addElement(form.format(source));
@@ -3134,7 +3463,7 @@
if (prinIndex < 0) {
tw.displayErrorDialog(td, new Exception
- (PolicyTool.rb.getString("No.principal.selected")));
+ (PolicyTool.getMessage("No.principal.selected")));
return;
}
// remove the principal from the display
@@ -3169,7 +3498,7 @@
if (permIndex < 0) {
tw.displayErrorDialog(td, new Exception
- (PolicyTool.rb.getString("No.permission.selected")));
+ (PolicyTool.getMessage("No.permission.selected")));
return;
}
// remove the permission from the display
@@ -3187,7 +3516,7 @@
* GUI listing. If the user is editing an existing PolicyEntry, we
* update both the GUI listing and the actual PolicyEntry.
*/
-class EditPrinButtonListener implements ActionListener {
+class EditPrinButtonListener extends MouseAdapter implements ActionListener {
private PolicyTool tool;
private ToolWindow tw;
@@ -3211,11 +3540,17 @@
if (prinIndex < 0) {
tw.displayErrorDialog(td, new Exception
- (PolicyTool.rb.getString("No.principal.selected")));
+ (PolicyTool.getMessage("No.principal.selected")));
return;
}
td.displayPrincipalDialog(editPolicyEntry, true);
}
+
+ public void mouseClicked(MouseEvent evt) {
+ if (evt.getClickCount() == 2) {
+ actionPerformed(null);
+ }
+ }
}
/**
@@ -3227,7 +3562,7 @@
* GUI listing. If the user is editing an existing PolicyEntry, we
* update both the GUI listing and the actual PolicyEntry.
*/
-class EditPermButtonListener implements ActionListener {
+class EditPermButtonListener extends MouseAdapter implements ActionListener {
private PolicyTool tool;
private ToolWindow tw;
@@ -3245,16 +3580,22 @@
public void actionPerformed(ActionEvent e) {
// get the Permission selected from the Permission List
- List list = (List)td.getComponent(ToolDialog.PE_PERM_LIST);
+ JList list = (JList)td.getComponent(ToolDialog.PE_PERM_LIST);
int permIndex = list.getSelectedIndex();
if (permIndex < 0) {
tw.displayErrorDialog(td, new Exception
- (PolicyTool.rb.getString("No.permission.selected")));
+ (PolicyTool.getMessage("No.permission.selected")));
return;
}
td.displayPermissionDialog(editPolicyEntry, true);
}
+
+ public void mouseClicked(MouseEvent evt) {
+ if (evt.getClickCount() == 2) {
+ actionPerformed(null);
+ }
+ }
}
/**
@@ -3269,11 +3610,15 @@
}
public void itemStateChanged(ItemEvent e) {
+ if (e.getStateChange() == ItemEvent.DESELECTED) {
+ // We're only interested in SELECTED events
+ return;
+ }
- Choice prin = (Choice)td.getComponent(ToolDialog.PRD_PRIN_CHOICE);
- TextField prinField = (TextField)td.getComponent(
+ JComboBox prin = (JComboBox)td.getComponent(ToolDialog.PRD_PRIN_CHOICE);
+ JTextField prinField = (JTextField)td.getComponent(
ToolDialog.PRD_PRIN_TEXTFIELD);
- TextField nameField = (TextField)td.getComponent(
+ JTextField nameField = (JTextField)td.getComponent(
ToolDialog.PRD_NAME_TEXTFIELD);
prin.getAccessibleContext().setAccessibleName(
@@ -3283,7 +3628,7 @@
if (prinField.getText() != null &&
prinField.getText().length() > 0) {
Prin inputPrin = ToolDialog.getPrin(prinField.getText(), true);
- prin.select(inputPrin.CLASS);
+ prin.setSelectedItem(inputPrin.CLASS);
}
return;
}
@@ -3315,20 +3660,24 @@
}
public void itemStateChanged(ItemEvent e) {
+ if (e.getStateChange() == ItemEvent.DESELECTED) {
+ // We're only interested in SELECTED events
+ return;
+ }
- Choice perms = (Choice)td.getComponent(
+ JComboBox perms = (JComboBox)td.getComponent(
ToolDialog.PD_PERM_CHOICE);
- Choice names = (Choice)td.getComponent(
+ JComboBox names = (JComboBox)td.getComponent(
ToolDialog.PD_NAME_CHOICE);
- Choice actions = (Choice)td.getComponent(
+ JComboBox actions = (JComboBox)td.getComponent(
ToolDialog.PD_ACTIONS_CHOICE);
- TextField nameField = (TextField)td.getComponent(
+ JTextField nameField = (JTextField)td.getComponent(
ToolDialog.PD_NAME_TEXTFIELD);
- TextField actionsField = (TextField)td.getComponent(
+ JTextField actionsField = (JTextField)td.getComponent(
ToolDialog.PD_ACTIONS_TEXTFIELD);
- TextField permField = (TextField)td.getComponent(
+ JTextField permField = (JTextField)td.getComponent(
ToolDialog.PD_PERM_TEXTFIELD);
- TextField signedbyField = (TextField)td.getComponent(
+ JTextField signedbyField = (JTextField)td.getComponent(
ToolDialog.PD_SIGNEDBY_TEXTFIELD);
perms.getAccessibleContext().setAccessibleName(
@@ -3342,7 +3691,7 @@
Perm inputPerm = ToolDialog.getPerm(permField.getText(), true);
if (inputPerm != null) {
- perms.select(inputPerm.CLASS);
+ perms.setSelectedItem(inputPerm.CLASS);
}
}
return;
@@ -3382,15 +3731,19 @@
}
public void itemStateChanged(ItemEvent e) {
+ if (e.getStateChange() == ItemEvent.DESELECTED) {
+ // We're only interested in SELECTED events
+ return;
+ }
- Choice names = (Choice)td.getComponent(ToolDialog.PD_NAME_CHOICE);
+ JComboBox names = (JComboBox)td.getComponent(ToolDialog.PD_NAME_CHOICE);
names.getAccessibleContext().setAccessibleName(
PolicyTool.splitToWords((String)e.getItem()));
if (((String)e.getItem()).indexOf(ToolDialog.PERM_NAME) != -1)
return;
- TextField tf = (TextField)td.getComponent(ToolDialog.PD_NAME_TEXTFIELD);
+ JTextField tf = (JTextField)td.getComponent(ToolDialog.PD_NAME_TEXTFIELD);
tf.setText((String)e.getItem());
}
}
@@ -3407,15 +3760,19 @@
}
public void itemStateChanged(ItemEvent e) {
+ if (e.getStateChange() == ItemEvent.DESELECTED) {
+ // We're only interested in SELECTED events
+ return;
+ }
- Choice actions = (Choice)td.getComponent(
+ JComboBox actions = (JComboBox)td.getComponent(
ToolDialog.PD_ACTIONS_CHOICE);
actions.getAccessibleContext().setAccessibleName((String)e.getItem());
if (((String)e.getItem()).indexOf(ToolDialog.PERM_ACTIONS) != -1)
return;
- TextField tf = (TextField)td.getComponent(
+ JTextField tf = (JTextField)td.getComponent(
ToolDialog.PD_ACTIONS_TEXTFIELD);
if (tf.getText() == null || tf.getText().equals("")) {
tf.setText((String)e.getItem());
@@ -3538,7 +3895,7 @@
us.dispose();
try {
- String filename = ((TextField)tw.getComponent(
+ String filename = ((JTextField)tw.getComponent(
ToolWindow.MW_FILENAME_TEXTFIELD)).getText();
if (filename == null || filename.equals("")) {
us.displaySaveAsDialog(select);
@@ -3551,7 +3908,7 @@
// display status
MessageFormat form = new MessageFormat
- (PolicyTool.rb.getString
+ (PolicyTool.getMessage
("Policy.successfully.written.to.filename"));
Object[] source = {filename};
tw.displayStatusDialog(null, form.format(source));
@@ -3633,18 +3990,22 @@
public void actionPerformed(ActionEvent e) {
// remove the entry
- List list = (List)tw.getComponent(ToolWindow.MW_POLICY_LIST);
+ JList list = (JList)tw.getComponent(ToolWindow.MW_POLICY_LIST);
int index = list.getSelectedIndex();
PolicyEntry entries[] = tool.getEntry();
tool.removeEntry(entries[index]);
// redraw the window listing
- list = new List(40, false);
- list.addActionListener(new PolicyListListener(tool, tw));
+ DefaultListModel listModel = new DefaultListModel();
+ list = new JList(listModel);
+ list.setVisibleRowCount(15);
+ list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ list.addMouseListener(new PolicyListListener(tool, tw));
entries = tool.getEntry();
if (entries != null) {
- for (int i = 0; i < entries.length; i++)
- list.add(entries[i].headerToString());
+ for (int i = 0; i < entries.length; i++) {
+ listModel.addElement(entries[i].headerToString());
+ }
}
tw.replacePolicyList(list);
us.setVisible(false);
@@ -3663,40 +4024,32 @@
/**
* This is a java.awt.List that bind an Object to each String it holds.
*/
-class TaggedList extends List {
+class TaggedList extends JList {
private static final long serialVersionUID = -5676238110427785853L;
private java.util.List<Object> data = new LinkedList<>();
public TaggedList(int i, boolean b) {
- super(i, b);
+ super(new DefaultListModel());
+ setVisibleRowCount(i);
+ setSelectionMode(b ? ListSelectionModel.MULTIPLE_INTERVAL_SELECTION : ListSelectionModel.SINGLE_SELECTION);
}
public Object getObject(int index) {
return data.get(index);
}
- @Override @Deprecated public void add(String string) {
- throw new AssertionError("should not call add in TaggedList");
- }
public void addTaggedItem(String string, Object object) {
- super.add(string);
+ ((DefaultListModel)getModel()).addElement(string);
data.add(object);
}
- @Override @Deprecated public void replaceItem(String string, int index) {
- throw new AssertionError("should not call replaceItem in TaggedList");
- }
public void replaceTaggedItem(String string, Object object, int index) {
- super.replaceItem(string, index);
+ ((DefaultListModel)getModel()).set(index, string);
data.set(index, object);
}
- @Override @Deprecated public void remove(int index) {
- // Cannot throw AssertionError, because replaceItem() call remove() internally
- super.remove(index);
- }
public void removeTaggedItem(int index) {
- super.remove(index);
+ ((DefaultListModel)getModel()).remove(index);
data.remove(index);
}
}
@@ -3782,11 +4135,11 @@
"modifyPrivateCredentials",
"refreshCredential",
"destroyCredential",
- "createLoginContext.<" + PolicyTool.rb.getString("name") + ">",
+ "createLoginContext.<" + PolicyTool.getMessage("name") + ">",
"getLoginConfiguration",
"setLoginConfiguration",
"createLoginConfiguration.<" +
- PolicyTool.rb.getString("configuration.type") + ">",
+ PolicyTool.getMessage("configuration.type") + ">",
"refreshLoginConfiguration"
},
null);
@@ -3843,16 +4196,16 @@
}
}
-class HttpURLPerm extends Perm {
- public HttpURLPerm() {
- super("HttpURLPermission",
- "java.net.HttpURLPermission",
+class URLPerm extends Perm {
+ public URLPerm() {
+ super("URLPermission",
+ "java.net.URLPermission",
new String[] {
- "<"+ PolicyTool.rb.getString("url") + ">",
+ "<"+ PolicyTool.getMessage("url") + ">",
},
new String[] {
- "<" + PolicyTool.rb.getString("method.list") + ">:<"
- + PolicyTool.rb.getString("request.headers.list") + ">",
+ "<" + PolicyTool.getMessage("method.list") + ">:<"
+ + PolicyTool.getMessage("request.headers.list") + ">",
});
}
}
@@ -4017,7 +4370,7 @@
"setSecurityManager",
"createSecurityManager",
"getenv.<" +
- PolicyTool.rb.getString("environment.variable.name") + ">",
+ PolicyTool.getMessage("environment.variable.name") + ">",
"exitVM",
"shutdownHooks",
"setFactory",
@@ -4029,11 +4382,11 @@
"readFileDescriptor",
"writeFileDescriptor",
"loadLibrary.<" +
- PolicyTool.rb.getString("library.name") + ">",
+ PolicyTool.getMessage("library.name") + ">",
"accessClassInPackage.<" +
- PolicyTool.rb.getString("package.name")+">",
+ PolicyTool.getMessage("package.name")+">",
"defineClassInPackage.<" +
- PolicyTool.rb.getString("package.name")+">",
+ PolicyTool.getMessage("package.name")+">",
"accessDeclaredMembers",
"queuePrintJob",
"getStackTrace",
@@ -4056,15 +4409,15 @@
"getPolicy",
"setPolicy",
"createPolicy.<" +
- PolicyTool.rb.getString("policy.type") + ">",
+ PolicyTool.getMessage("policy.type") + ">",
"getProperty.<" +
- PolicyTool.rb.getString("property.name") + ">",
+ PolicyTool.getMessage("property.name") + ">",
"setProperty.<" +
- PolicyTool.rb.getString("property.name") + ">",
+ PolicyTool.getMessage("property.name") + ">",
"insertProvider.<" +
- PolicyTool.rb.getString("provider.name") + ">",
+ PolicyTool.getMessage("provider.name") + ">",
"removeProvider.<" +
- PolicyTool.rb.getString("provider.name") + ">",
+ PolicyTool.getMessage("provider.name") + ">",
//"setSystemScope",
//"setIdentityPublicKey",
//"setIdentityInfo",
@@ -4072,11 +4425,11 @@
//"removeIdentityCertificate",
//"printIdentity",
"clearProviderProperties.<" +
- PolicyTool.rb.getString("provider.name") + ">",
+ PolicyTool.getMessage("provider.name") + ">",
"putProviderProperty.<" +
- PolicyTool.rb.getString("provider.name") + ">",
+ PolicyTool.getMessage("provider.name") + ">",
"removeProviderProperty.<" +
- PolicyTool.rb.getString("provider.name") + ">",
+ PolicyTool.getMessage("provider.name") + ">",
//"getSignerPrivateKey",
//"setSignerKeyPair"
},
diff --git a/jdk/src/share/classes/sun/security/tools/policytool/Resources.java b/jdk/src/share/classes/sun/security/tools/policytool/Resources.java
index b24f7b0..82c53b3 100644
--- a/jdk/src/share/classes/sun/security/tools/policytool/Resources.java
+++ b/jdk/src/share/classes/sun/security/tools/policytool/Resources.java
@@ -44,16 +44,19 @@
{"Usage.policytool.options.", "Usage: policytool [options]"},
{".file.file.policy.file.location",
" [-file <file>] policy file location"},
- {"New", "New"},
- {"Open", "Open"},
- {"Save", "Save"},
- {"Save.As", "Save As"},
- {"View.Warning.Log", "View Warning Log"},
- {"Exit", "Exit"},
- {"Add.Policy.Entry", "Add Policy Entry"},
- {"Edit.Policy.Entry", "Edit Policy Entry"},
- {"Remove.Policy.Entry", "Remove Policy Entry"},
- {"Edit", "Edit"},
+ {"New", "&New"},
+ {"New.accelerator", "control N"},
+ {"Open", "&Open..."},
+ {"Open.accelerator", "control O"},
+ {"Save", "&Save"},
+ {"Save.accelerator", "control S"},
+ {"Save.As", "Save &As..."},
+ {"View.Warning.Log", "View &Warning Log"},
+ {"Exit", "E&xit"},
+ {"Add.Policy.Entry", "&Add Policy Entry"},
+ {"Edit.Policy.Entry", "&Edit Policy Entry"},
+ {"Remove.Policy.Entry", "&Remove Policy Entry"},
+ {"Edit", "&Edit"},
{"Retain", "Retain"},
{"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
@@ -66,8 +69,8 @@
{"Add.Public.Key.Alias", "Add Public Key Alias"},
{"Remove.Public.Key.Alias", "Remove Public Key Alias"},
- {"File", "File"},
- {"KeyStore", "KeyStore"},
+ {"File", "&File"},
+ {"KeyStore", "&KeyStore"},
{"Policy.File.", "Policy File:"},
{"Could.not.open.policy.file.policyFile.e.toString.",
"Could not open policy file: {0}: {1}"},
@@ -89,20 +92,25 @@
{"OK.to.overwrite.existing.file.filename.",
"OK to overwrite existing file {0}?"},
{"Cancel", "Cancel"},
- {"CodeBase.", "CodeBase:"},
- {"SignedBy.", "SignedBy:"},
- {"Add.Principal", "Add Principal"},
- {"Edit.Principal", "Edit Principal"},
- {"Remove.Principal", "Remove Principal"},
- {"Principals.", "Principals:"},
- {".Add.Permission", " Add Permission"},
- {".Edit.Permission", " Edit Permission"},
- {"Remove.Permission", "Remove Permission"},
+
+ // Policy Entry Dialog
+ {"CodeBase.", "&CodeBase:"},
+ {"SignedBy.", "&SignedBy:"},
+ {"Add.Principal", "&Add Principal"},
+ {"Edit.Principal", "&Edit Principal"},
+ {"Remove.Principal", "&Remove Principal"},
+ {"Principals.", "&Principals:"},
+ {".Add.Permission", " A&dd Permission"},
+ {".Edit.Permission", " Ed&it Permission"},
+ {"Remove.Permission", "Re&move Permission"},
{"Done", "Done"},
- {"KeyStore.URL.", "KeyStore URL:"},
- {"KeyStore.Type.", "KeyStore Type:"},
- {"KeyStore.Provider.", "KeyStore Provider:"},
- {"KeyStore.Password.URL.", "KeyStore Password URL:"},
+
+ // KeyStore Edit Dialog
+ {"KeyStore.URL.", "KeyStore &URL:"},
+ {"KeyStore.Type.", "KeyStore &Type:"},
+ {"KeyStore.Provider.", "KeyStore &Provider:"},
+ {"KeyStore.Password.URL.", "KeyStore Pass&word URL:"},
+
{"Principals", "Principals"},
{".Edit.Principal.", " Edit Principal:"},
{".Add.New.Principal.", " Add New Principal:"},
@@ -122,8 +130,8 @@
"Policy successfully written to {0}"},
{"null.filename", "null filename"},
{"Save.changes.", "Save changes?"},
- {"Yes", "Yes"},
- {"No", "No"},
+ {"Yes", "&Yes"},
+ {"No", "&No"},
{"Policy.Entry", "Policy Entry"},
{"Save.Changes", "Save Changes"},
{"No.Policy.Entry.selected", "No Policy Entry selected"},
diff --git a/jdk/src/share/classes/sun/swing/SwingLazyValue.java b/jdk/src/share/classes/sun/swing/SwingLazyValue.java
index 2d1aa9c..a9e6f2c 100644
--- a/jdk/src/share/classes/sun/swing/SwingLazyValue.java
+++ b/jdk/src/share/classes/sun/swing/SwingLazyValue.java
@@ -30,6 +30,7 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import javax.swing.UIDefaults;
+import sun.reflect.misc.ReflectUtil;
/**
* SwingLazyValue is a copy of ProxyLazyValue that does not snapshot the
@@ -63,7 +64,7 @@
public Object createValue(final UIDefaults table) {
try {
- Object cl;
+ ReflectUtil.checkPackageAccess(className);
Class<?> c = Class.forName(className, true, null);
if (methodName != null) {
Class[] types = getClassArray(args);
diff --git a/jdk/src/share/classes/sun/swing/SwingUtilities2.java b/jdk/src/share/classes/sun/swing/SwingUtilities2.java
index 567f5e3..8b79b5e 100644
--- a/jdk/src/share/classes/sun/swing/SwingUtilities2.java
+++ b/jdk/src/share/classes/sun/swing/SwingUtilities2.java
@@ -1361,6 +1361,19 @@
}
/**
+ * Utility method that throws SecurityException if SecurityManager is set
+ * and modifiers are not public
+ *
+ * @param modifiers a set of modifiers
+ */
+ public static void checkAccess(int modifiers) {
+ if (System.getSecurityManager() != null
+ && !Modifier.isPublic(modifiers)) {
+ throw new SecurityException("Resource is not accessible");
+ }
+ }
+
+ /**
* Returns true if EventQueue.getCurrentEvent() has the permissions to
* access the system clipboard and if it is allowed gesture (if
* checkGesture true)
diff --git a/jdk/src/share/classes/sun/tools/jstat/RowClosure.java b/jdk/src/share/classes/sun/tools/jstat/RowClosure.java
index b48fcf0..00b7220 100644
--- a/jdk/src/share/classes/sun/tools/jstat/RowClosure.java
+++ b/jdk/src/share/classes/sun/tools/jstat/RowClosure.java
@@ -62,6 +62,9 @@
double d = ((Number)value).doubleValue();
double scaledValue = c.getScale().scale(d);
DecimalFormat df = new DecimalFormat(c.getFormat());
+ DecimalFormatSymbols syms = df.getDecimalFormatSymbols();
+ syms.setNaN("-");
+ df.setDecimalFormatSymbols(syms);
s = df.format(scaledValue);
}
diff --git a/jdk/src/share/classes/sun/tools/tree/Node.java b/jdk/src/share/classes/sun/tools/tree/Node.java
index e07b6b8..0b0ff45 100644
--- a/jdk/src/share/classes/sun/tools/tree/Node.java
+++ b/jdk/src/share/classes/sun/tools/tree/Node.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2013, 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
@@ -108,7 +108,7 @@
return super.clone();
} catch (CloneNotSupportedException e) {
// this shouldn't happen, since we are Cloneable
- throw new InternalError(e);
+ throw (InternalError) new InternalError().initCause(e);
}
}
diff --git a/jdk/src/share/classes/sun/util/locale/LocaleEquivalentMaps.java b/jdk/src/share/classes/sun/util/locale/LocaleEquivalentMaps.java
index 3133fd3..64638d0 100644
--- a/jdk/src/share/classes/sun/util/locale/LocaleEquivalentMaps.java
+++ b/jdk/src/share/classes/sun/util/locale/LocaleEquivalentMaps.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, 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,7 +43,9 @@
regionVariantEquivMap = new HashMap<>();
// This is an auto-generated file and should not be manually edited.
- // LSR Revision: 2012-09-04
+ // LSR Revision: 2013-09-23
+ singleEquivMap.put("acn", "xia");
+ singleEquivMap.put("adx", "pcr");
singleEquivMap.put("ami", "i-ami");
singleEquivMap.put("art-lojban", "jbo");
singleEquivMap.put("ase", "sgn-us");
@@ -52,6 +54,7 @@
singleEquivMap.put("bjd", "drl");
singleEquivMap.put("bnn", "i-bnn");
singleEquivMap.put("bzs", "sgn-br");
+ singleEquivMap.put("cir", "meg");
singleEquivMap.put("cjr", "mom");
singleEquivMap.put("cka", "cmr");
singleEquivMap.put("cmk", "xch");
@@ -65,6 +68,7 @@
singleEquivMap.put("dse", "sgn-nl");
singleEquivMap.put("dsl", "sgn-dk");
singleEquivMap.put("fsl", "sgn-fr");
+ singleEquivMap.put("gal", "ilw");
singleEquivMap.put("gan", "zh-gan");
singleEquivMap.put("gav", "dev");
singleEquivMap.put("gsg", "sgn-de");
@@ -84,6 +88,7 @@
singleEquivMap.put("i-tsu", "tsu");
singleEquivMap.put("ibi", "opa");
singleEquivMap.put("id", "in");
+ singleEquivMap.put("ilw", "gal");
singleEquivMap.put("in", "id");
singleEquivMap.put("ise", "sgn-it");
singleEquivMap.put("isg", "sgn-ie");
@@ -100,6 +105,7 @@
singleEquivMap.put("lb", "i-lux");
singleEquivMap.put("lcq", "ppr");
singleEquivMap.put("lrr", "yma");
+ singleEquivMap.put("meg", "cir");
singleEquivMap.put("mfs", "sgn-mx");
singleEquivMap.put("mo", "ro");
singleEquivMap.put("mom", "cjr");
@@ -113,6 +119,7 @@
singleEquivMap.put("nun", "ayx");
singleEquivMap.put("nv", "i-navajo");
singleEquivMap.put("opa", "ibi");
+ singleEquivMap.put("pcr", "adx");
singleEquivMap.put("ppr", "lcq");
singleEquivMap.put("psr", "sgn-pt");
singleEquivMap.put("pwn", "i-pwn");
@@ -158,8 +165,10 @@
singleEquivMap.put("weo", "tlw");
singleEquivMap.put("wuu", "zh-wuu");
singleEquivMap.put("xch", "cmk");
+ singleEquivMap.put("xia", "acn");
singleEquivMap.put("yi", "ji");
singleEquivMap.put("yma", "lrr");
+ singleEquivMap.put("yos", "zom");
singleEquivMap.put("yue", "zh-yue");
singleEquivMap.put("zh-cmn-hans", "cmn-hans");
singleEquivMap.put("zh-cmn-hant", "cmn-hant");
@@ -168,6 +177,7 @@
singleEquivMap.put("zh-wuu", "wuu");
singleEquivMap.put("zh-xiang", "hsn");
singleEquivMap.put("zh-yue", "yue");
+ singleEquivMap.put("zom", "yos");
multiEquivsMap.put("ccq", new String[] {"rki", "ybd"});
multiEquivsMap.put("cmn", new String[] {"zh-guoyu", "zh-cmn"});
diff --git a/jdk/src/share/classes/sun/util/logging/PlatformLogger.java b/jdk/src/share/classes/sun/util/logging/PlatformLogger.java
index 9a1b893..532b397 100644
--- a/jdk/src/share/classes/sun/util/logging/PlatformLogger.java
+++ b/jdk/src/share/classes/sun/util/logging/PlatformLogger.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, 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
@@ -85,22 +85,18 @@
* @since 1.7
*/
public class PlatformLogger {
- /*
- * These constants should be shortcuts to Level enum constants that
- * the clients of sun.util.logging.PlatformLogger require no source
- * modification and avoid the conversion from int to Level enum.
- *
- * This can be done when JavaFX is converted to use the new PlatformLogger.Level API.
- */
- public static final int OFF = Integer.MAX_VALUE;
- public static final int SEVERE = 1000;
- public static final int WARNING = 900;
- public static final int INFO = 800;
- public static final int CONFIG = 700;
- public static final int FINE = 500;
- public static final int FINER = 400;
- public static final int FINEST = 300;
- public static final int ALL = Integer.MIN_VALUE;
+
+ // The integer values must match that of {@code java.util.logging.Level}
+ // objects.
+ private static final int OFF = Integer.MAX_VALUE;
+ private static final int SEVERE = 1000;
+ private static final int WARNING = 900;
+ private static final int INFO = 800;
+ private static final int CONFIG = 700;
+ private static final int FINE = 500;
+ private static final int FINER = 400;
+ private static final int FINEST = 300;
+ private static final int ALL = Integer.MIN_VALUE;
/**
* PlatformLogger logging levels.
@@ -127,14 +123,14 @@
/* java.util.logging.Level */ Object javaLevel;
// ascending order for binary search matching the list of enum constants
- private static final int[] levelValues = new int[] {
+ private static final int[] LEVEL_VALUES = new int[] {
PlatformLogger.ALL, PlatformLogger.FINEST, PlatformLogger.FINER,
PlatformLogger.FINE, PlatformLogger.CONFIG, PlatformLogger.INFO,
PlatformLogger.WARNING, PlatformLogger.SEVERE, PlatformLogger.OFF
};
public int intValue() {
- return levelValues[this.ordinal()];
+ return LEVEL_VALUES[this.ordinal()];
}
static Level valueOf(int level) {
@@ -153,7 +149,7 @@
}
// return the nearest Level value >= the given level,
// for level > SEVERE, return SEVERE and exclude OFF
- int i = Arrays.binarySearch(levelValues, 0, levelValues.length-2, level);
+ int i = Arrays.binarySearch(LEVEL_VALUES, 0, LEVEL_VALUES.length-2, level);
return values()[i >= 0 ? i : (-i-1)];
}
}
@@ -264,39 +260,6 @@
/**
* Returns true if a message of the given level would actually
* be logged by this logger.
- *
- * @deprecated Use isLoggable(Level) instead.
- */
- @Deprecated
- public boolean isLoggable(int levelValue) {
- return isLoggable(Level.valueOf(levelValue));
- }
-
- /**
- * Gets the current log level. Returns 0 if the current effective level is
- * not set (equivalent to Logger.getLevel() returns null).
- *
- * @deprecated Use level() instead
- */
- @Deprecated
- public int getLevel() {
- Level level = loggerProxy.getLevel();
- return level != null ? level.intValue() : 0;
- }
-
- /**
- * Sets the log level.
- *
- * @deprecated Use setLevel(Level) instead
- */
- @Deprecated
- public void setLevel(int newLevel) {
- loggerProxy.setLevel(newLevel == 0 ? null : Level.valueOf(newLevel));
- }
-
- /**
- * Returns true if a message of the given level would actually
- * be logged by this logger.
*/
public boolean isLoggable(Level level) {
if (level == null) {
diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
index 974fd26..81b28e7 100644
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
@@ -44,9 +44,6 @@
protected final Object[][] getContents() {
// Note: generic names came from CLDR with some adjustments.
- String ACT[] = new String[] {"Acre Time", "ACT",
- "Acre Summer Time", "ACST",
- "Acre Time", "ACT"};
String ADELAIDE[] = new String[] {"Central Standard Time (South Australia)", "CST",
"Central Summer Time (South Australia)", "CST",
"Central Time (South Australia)", "CT"};
@@ -95,9 +92,9 @@
String CHUT[] = new String[] {"Chuuk Time", "CHUT",
"Chuuk Summer Time", "CHUST",
"Chuuk Time", "CHUT"};
- String CIT[] = new String[] {"Central Indonesia Time", "CIT",
+ String CIT[] = new String[] {"Central Indonesia Time", "WITA",
"Central Indonesia Summer Time", "CIST",
- "Central Indonesia Time", "CIT"};
+ "Central Indonesia Time", "WITA"};
String CLT[] = new String[] {"Chile Time", "CLT",
"Chile Summer Time", "CLST",
"Chile Time", "CLT"};
@@ -251,9 +248,9 @@
String WET[] = new String[] {"Western European Time", "WET",
"Western European Summer Time", "WEST",
"Western European Time", "WET"};
- String WIT[] = new String[] {"West Indonesia Time", "WIT",
+ String WIT[] = new String[] {"West Indonesia Time", "WIB",
"West Indonesia Summer Time", "WIST",
- "West Indonesia Time", "WIT"};
+ "West Indonesia Time", "WIB"};
String WST_AUS[] = new String[] {"Western Standard Time (Australia)", "WST",
"Western Summer Time (Australia)", "WST",
"Western Time (Australia)", "WT"};
@@ -382,7 +379,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
- {"America/Argentina/San_Luis", WART},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -578,7 +575,7 @@
{"Asia/Almaty", new String[] {"Alma-Ata Time", "ALMT",
"Alma-Ata Summer Time", "ALMST",
"Alma-Ata Time", "ALMT"}},
- {"Asia/Amman", EET},
+ {"Asia/Amman", ARAST},
{"Asia/Anadyr", new String[] {"Anadyr Time", "ANAT",
"Anadyr Summer Time", "ANAST",
"Anadyr Time", "ANAT"}},
@@ -633,9 +630,9 @@
"Irkutsk Time", "IRKT"}},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"East Indonesia Time", "EIT",
+ {"Asia/Jayapura", new String[] {"East Indonesia Time", "WIT",
"East Indonesia Summer Time", "EIST",
- "East Indonesia Time", "EIT"}},
+ "East Indonesia Time", "WIT"}},
{"Asia/Kabul", new String[] {"Afghanistan Time", "AFT",
"Afghanistan Summer Time", "AFST",
"Afghanistan Time", "AFT"}},
@@ -806,6 +803,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
+ {"Europe/Busingen", CET},
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
diff --git a/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java b/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
index 8dc71d7..b61fbd3 100644
--- a/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
+++ b/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
@@ -45,10 +45,8 @@
public final class TimeZoneNames_de extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
- String ACT[] = new String[] {"Acre Normalzeit", "ACT",
- "Acre Sommerzeit", "ACST"};
- String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00fcdaustralien)", "CST",
- "Zentrale Sommerzeit (S\u00fcdaustralien)", "CST"};
+ String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien)", "CST",
+ "Zentrale Sommerzeit (S\u00FCdaustralien)", "CST"};
String AGT[] = new String[] {"Argentinische Zeit", "ART",
"Argentinische Sommerzeit", "ARST"};
String AKST[] = new String[] {"Alaska Normalzeit", "AKST",
@@ -63,10 +61,10 @@
"Atlantik Sommerzeit", "ADT"};
String BDT[] = new String[] {"Bangladesch Zeit", "BDT",
"Bangladesch Sommerzeit", "BDST"};
- String BRISBANE[] = new String[] {"\u00d6stliche Normalzeit (Queensland)", "EST",
- "\u00d6stliche Sommerzeit (Queensland)", "EST"};
- String BROKEN_HILL[] = new String[] {"Zentrale Normalzeit (S\u00fcdaustralien/New South Wales)", "CST",
- "Zentrale Sommerzeit (S\u00fcdaustralien/New South Wales)", "CST"};
+ String BRISBANE[] = new String[] {"\u00D6stliche Normalzeit (Queensland)", "EST",
+ "\u00D6stliche Sommerzeit (Queensland)", "EST"};
+ String BROKEN_HILL[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien/New South Wales)", "CST",
+ "Zentrale Sommerzeit (S\u00FCdaustralien/New South Wales)", "CST"};
String BRT[] = new String[] {"Brasilianische Zeit", "BRT",
"Brasilianische Sommerzeit", "BRST"};
String BTT[] = new String[] {"Bhutanische Zeit", "BTT",
@@ -77,9 +75,9 @@
"Mitteleurop\u00e4ische Sommerzeit", "MESZ"};
String CHAST[] = new String[] {"Chatham Normalzeit", "CHAST",
"Chatham Sommerzeit", "CHADT"};
- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
- "Chuuk Summer Time", "CHUST"};
- String CIT[] = new String[] {"Zentralindonesische Zeit", "CIT",
+ String CHUT[] = new String[] {"Chuuk Zeit", "CHUT",
+ "Chuuk Sommerzeit", "CHUST"};
+ String CIT[] = new String[] {"Zentralindonesische Zeit", "WITA",
"Zentralindonesische Sommerzeit", "CIST"};
String CLT[] = new String[] {"Chilenische Zeit", "CLT",
"Chilenische Sommerzeit", "CLST"};
@@ -89,7 +87,7 @@
"Chinesische Sommerzeit", "CDT"};
String CUBA[] = new String[] {"Kubanische Normalzeit", "CST",
"Kubanische Sommerzeit", "CDT"};
- String DARWIN[] = new String[] {"Zentrale Normalzeit (Northern Territory)", "CST",
+ String DARWIN[] = new String[] {"Central Normalzeit (Northern Territory)", "CST",
"Zentrale Sommerzeit (Northern Territory)", "CST"};
String DUBLIN[] = new String[] {"Greenwich Zeit", "GMT",
"Irische Sommerzeit", "IST"};
@@ -103,10 +101,10 @@
"Ostgr\u00f6nl\u00e4ndische Sommerzeit", "EGST"};
String EST[] = new String[] {"\u00d6stliche Normalzeit", "EST",
"\u00d6stliche Sommerzeit", "EDT"};
- String EST_NSW[] = new String[] {"\u00d6stliche Normalzeit (New South Wales)", "EST",
- "\u00d6stliche Sommerzeit (New South Wales)", "EST"};
- String FET[] = new String[] {"Further-eastern European Time", "FET",
- "Further-eastern European Summer Time", "FEST"};
+ String EST_NSW[] = new String[] {"Eastern Normalzeit (Neus\u00FCdwales)", "EST",
+ "\u00D6stliche Sommerzeit (New South Wales)", "EST"};
+ String FET[] = new String[] {"Kaliningrader Zeit", "FET",
+ "Kaliningrader Sommerzeit", "FEST"};
String GHMT[] = new String[] {"Ghanaische Normalzeit", "GMT",
"Ghanaische Sommerzeit", "GHST"};
String GAMBIER[] = new String[] {"Gambier Zeit", "GAMT",
@@ -159,8 +157,8 @@
"Pitcairn Sommerzeit", "PDT"};
String PKT[] = new String[] {"Pakistanische Zeit", "PKT",
"Pakistanische Sommerzeit", "PKST"};
- String PONT[] = new String[] {"Pohnpei Time", "PONT",
- "Pohnpei Summer Time", "PONST"};
+ String PONT[] = new String[] {"Pohnpei Zeit", "PONT",
+ "Pohnpei Sommerzeit", "PONST"};
String PST[] = new String[] {"Pazifische Normalzeit", "PST",
"Pazifische Sommerzeit", "PDT"};
String SAST[] = new String[] {"S\u00fcdafrikanische Normalzeit", "SAST",
@@ -171,8 +169,8 @@
"Singapur Sommerzeit", "SGST"};
String SLST[] = new String[] {"Greenwich Normalzeit", "GMT",
"Sierra Leone Sommerzeit", "SLST"};
- String TASMANIA[] = new String[] {"\u00d6stliche Normalzeit (Tasmanien)", "EST",
- "\u00d6stliche Sommerzeit (Tasmanien)", "EST"};
+ String TASMANIA[] = new String[] {"\u00D6stliche Normalzeit (Tasmanien)", "EST",
+ "\u00D6stliche Sommerzeit (Tasmanien)", "EST"};
String TMT[] = new String[] {"Turkmenische Zeit", "TMT",
"Turkmenische Sommerzeit", "TMST"};
String ULAT[]= new String[] {"Ulaanbaatar Zeit", "ULAT",
@@ -183,7 +181,7 @@
"Westafrikanische Sommerzeit", "WAST"};
String WET[] = new String[] {"Westeurop\u00e4ische Zeit", "WEZ",
"Westeurop\u00e4ische Sommerzeit", "WESZ"};
- String WIT[] = new String[] {"Westindonesische Zeit", "WIT",
+ String WIT[] = new String[] {"Westindonesische Zeit", "WIB",
"Westindonesische Sommerzeit", "WIST"};
String WST_AUS[] = new String[] {"Westliche Normalzeit (Australien)", "WST",
"Westliche Sommerzeit (Australien)", "WST"};
@@ -193,8 +191,8 @@
"West Samoa Sommerzeit", "WSDT"};
String ChST[] = new String[] {"Chamorro Normalzeit", "ChST",
"Chamorro Sommerzeit", "ChDT"};
- String VICTORIA[] = new String[] {"\u00d6stliche Normalzeit (Victoria)", "EST",
- "\u00d6stliche Sommerzeit (Victoria)", "EST"};
+ String VICTORIA[] = new String[] {"\u00D6stliche Normalzeit (Victoria)", "EST",
+ "\u00D6stliche Sommerzeit (Victoria)", "EST"};
String UTC[] = new String[] {"Koordinierte Universalzeit", "UTC",
"Koordinierte Universalzeit", "UTC"};
String UZT[] = new String[] {"Usbekistan Zeit", "UZT",
@@ -306,7 +304,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
- {"America/Argentina/San_Luis", WART},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -399,8 +397,8 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
- "Metlakatla Daylight Time", "MeDT"}},
+ {"America/Metlakatla", new String[] {"Metlakatla Normalzeit", "MeST",
+ "Metlakatla Sommerzeit", "MeDT"}},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Pierre & Miquelon Normalzeit", "PMST",
"Pierre & Miquelon Sommerzeit", "PMDT"}},
@@ -464,8 +462,8 @@
"Davis Sommerzeit", "DAVST"}},
{"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville Zeit", "DDUT",
"Dumont-d'Urville Sommerzeit", "DDUST"}},
- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
- "Macquarie Island Summer Time", "MIST"}},
+ {"Antarctica/Macquarie", new String[] {"Macquarieinsel Zeit", "MIST",
+ "Macquarieinsel Sommerzeit", "MIST"}},
{"Antarctica/Mawson", new String[] {"Mawson Zeit", "MAWT",
"Mawson Sommerzeit", "MAWST"}},
{"Antarctica/McMurdo", NZST},
@@ -481,7 +479,7 @@
{"Asia/Aden", ARAST},
{"Asia/Almaty", new String[] {"Alma Ata Zeit", "ALMT",
"Alma-Ata Sommerzeit", "ALMST"}},
- {"Asia/Amman", EET},
+ {"Asia/Amman", ARAST},
{"Asia/Anadyr", new String[] {"Anadyr Zeit", "ANAT",
"Anadyr Sommerzeit", "ANAST"}},
{"Asia/Aqtau", new String[] {"Aqtau Zeit", "AQTT",
@@ -525,7 +523,7 @@
"Irkutsk Sommerzeit", "IRKST"}},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"Ostindonesische Zeit", "EIT",
+ {"Asia/Jayapura", new String[] {"Ostindonesische Zeit", "WIT",
"Ostindonesische Sommerzeit", "EIST"}},
{"Asia/Kabul", new String[] {"Afghanistanische Zeit", "AFT",
"Afghanistanische Sommerzeit", "AFST"}},
@@ -535,8 +533,8 @@
{"Asia/Kashgar", CTT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
- "Khandyga Summer Time", "YAKST"}},
+ {"Asia/Khandyga", new String[] {"Chandyga Zeit", "YAKT",
+ "Chandyga Sommerzeit", "YAKST"}},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"Krasnojarsker Zeit", "KRAT",
"Krasnojarsker Sommerzeit", "KRAST"}},
@@ -585,8 +583,8 @@
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT},
- {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT",
- "Ust-Nera Summer Time", "VLAST"}},
+ {"Asia/Ust-Nera", new String[] {"Ust-Nera Zeit", "VLAT",
+ "Ust-Nera Sommerzeit", "VLAST"}},
{"Asia/Vientiane", ICT},
{"Asia/Vladivostok", new String[] {"Wladiwostok Zeit", "VLAT",
"Wladiwostok Sommerzeit", "VLAST"}},
@@ -675,6 +673,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
+ {"Europe/Busingen", CET},
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
diff --git a/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java b/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
index 66e3e02..822ba2d 100644
--- a/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
+++ b/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
@@ -45,9 +45,7 @@
public final class TimeZoneNames_es extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
- String ACT[] = new String[] {"Hora de Acre", "ACT",
- "Hora de verano de Acre", "ACST"};
- String ADELAIDE[] = new String[] {"Hora est\u00e1ndar Central (Sur de Australia)", "CST",
+ String ADELAIDE[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia)", "CST",
"Hora de verano Central (Sur de Australia)", "CST"};
String AGT[] = new String[] {"Hora de Argentina", "ART",
"Hora de verano de Argentina", "ARST"};
@@ -63,9 +61,9 @@
"Hora de verano Atl\u00e1ntico", "ADT"};
String BDT[] = new String[] {"Hora de Bangladesh", "BDT",
"Hora de verano de Bangladesh", "BDST"};
- String BRISBANE[] = new String[] {"Hora est\u00e1ndar del Este (Queensland)", "EST",
- "Hora de verano del Este (Queensland)", "EST"};
- String BROKEN_HILL[] = new String[] {"Hora est\u00e1ndar Central (Sur de Australia/Nueva Gales del Sur)", "CST",
+ String BRISBANE[] = new String[] {"Hora est\u00E1ndar del Este (Queensland)", "EST",
+ "Hora est\u00E1ndar de verano del Este (Queensland)", "EST"};
+ String BROKEN_HILL[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia/Nueva Gales del Sur)", "CST",
"Hora de verano Central (Sur de Australia/Nueva Gales del Sur)", "CST"};
String BRT[] = new String[] {"Hora de Brasil", "BRT",
"Hora de verano de Brasil", "BRST"};
@@ -79,7 +77,7 @@
"Hora de verano de Chatham", "CHADT"};
String CHUT[] = new String[] {"Chuuk Time", "CHUT",
"Chuuk Summer Time", "CHUST"};
- String CIT[] = new String[] {"Hora de Indonesia Central", "CIT",
+ String CIT[] = new String[] {"Hora de Indonesia Central", "WITA",
"Hora de verano de Indonesia Central", "CIST"};
String CLT[] = new String[] {"Hora de Chile", "CLT",
"Hora de verano de Chile", "CLST"};
@@ -89,7 +87,7 @@
"Hora de verano de China", "CDT"};
String CUBA[] = new String[] {"Hora est\u00e1ndar de Cuba", "CST",
"Hora de verano de Cuba", "CDT"};
- String DARWIN[] = new String[] {"Hora est\u00e1ndar Central (territorio del Norte)", "CST",
+ String DARWIN[] = new String[] {"Hora est\u00E1ndar Central (territorio del Norte)", "CST",
"Hora de verano Central (territorio del Norte)", "CST"};
String DUBLIN[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
"Hora de verano de Irlanda", "IST"};
@@ -103,10 +101,10 @@
"Hora de verano de Groenlandia Oriental", "EGST"};
String EST[] = new String[] {"Hora est\u00e1ndar Oriental", "EST",
"Hora de verano Oriental", "EDT"};
- String EST_NSW[] = new String[] {"Hora est\u00e1ndar Oriental (Nueva Gales del Sur)", "EST",
+ String EST_NSW[] = new String[] {"Hora est\u00E1ndar Oriental (Nueva Gales del Sur)", "EST",
"Hora de verano Oriental (Nueva Gales del Sur)", "EST"};
- String FET[] = new String[] {"Further-eastern European Time", "FET",
- "Further-eastern European Summer Time", "FEST"};
+ String FET[] = new String[] {"Hora de Europa m\u00E1s Oriental", "FET",
+ "Hora de verano de Europa m\u00E1s Oriental", "FEST"};
String GHMT[] = new String[] {"Hora central de Ghana", "GMT",
"Hora de verano de Ghana", "GHST"};
String GAMBIER[] = new String[] {"Hora de Gambier", "GAMT",
@@ -171,7 +169,7 @@
"Hora de verano de Singapur", "SGST"};
String SLST[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
"Hora de verano de Sierra Leona", "SLST"};
- String TASMANIA[] = new String[] {"Hora est\u00e1ndar del Este (Tasmania)", "EST",
+ String TASMANIA[] = new String[] {"Hora est\u00E1ndar del Este (Tasmania)", "EST",
"Hora de verano del Este (Tasmania)", "EST"};
String TMT[] = new String[] {"Hora de Turkmenist\u00e1n", "TMT",
"Hora de verano de Turkmenist\u00e1n", "TMST"};
@@ -183,9 +181,9 @@
"Hora de verano de \u00c1frica Occidental", "WAST"};
String WET[] = new String[] {"Hora de Europa Occidental", "WET",
"Hora de verano de Europa Occidental", "WEST"};
- String WIT[] = new String[] {"Hora de Indonesia Occidental", "WIT",
+ String WIT[] = new String[] {"Hora de Indonesia Occidental", "WIB",
"Indonesia Hora de verano de Indonesia Occidental", "WIST"};
- String WST_AUS[] = new String[] {"Hora est\u00e1ndar Occidental (Australia)", "WST",
+ String WST_AUS[] = new String[] {"Hora est\u00E1ndar Occidental (Australia)", "WST",
"Hora de verano Occidental (Australia)", "WST"};
String SAMOA[] = new String[] {"Hora est\u00e1ndar de Samoa", "SST",
"Hora de verano de Samoa", "SDT"};
@@ -193,7 +191,7 @@
"Hora de verano de Samoa Occidental", "WSDT"};
String ChST[] = new String[] {"Hora est\u00e1ndar de Chamorro", "ChST",
"Hora de verano de Chamorro", "ChDT"};
- String VICTORIA[] = new String[] {"Hora est\u00e1ndar del Este (Victoria)", "EST",
+ String VICTORIA[] = new String[] {"Hora est\u00E1ndar del Este (Victoria)", "EST",
"Hora de verano del Este (Victoria)", "EST"};
String UTC[] = new String[] {"Hora Universal Coordinada", "UTC",
"Hora Universal Coordinada", "UTC"};
@@ -306,7 +304,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
- {"America/Argentina/San_Luis", WART},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -481,7 +479,7 @@
{"Asia/Aden", ARAST},
{"Asia/Almaty", new String[] {"Hora de Alma-Ata", "ALMT",
"Hora de verano de Alma-Ata", "ALMST"}},
- {"Asia/Amman", EET},
+ {"Asia/Amman", ARAST},
{"Asia/Anadyr", new String[] {"Hora de Anadyr", "ANAT",
"Hora de verano de Anadyr", "ANAST"}},
{"Asia/Aqtau", new String[] {"Hora de Aqtau", "AQTT",
@@ -525,7 +523,7 @@
"Hora de verano de Irkutsk", "IRKST"}},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"Hora de Indonesia Oriental", "EIT",
+ {"Asia/Jayapura", new String[] {"Hora de Indonesia Oriental", "WIT",
"Hora de verano de Indonesia Oriental", "EIST"}},
{"Asia/Kabul", new String[] {"Hora de Afganist\u00e1n", "AFT",
"Hora de verano de Afganist\u00e1n", "AFST"}},
@@ -535,8 +533,8 @@
{"Asia/Kashgar", CTT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
- "Khandyga Summer Time", "YAKST"}},
+ {"Asia/Khandyga", new String[] {"Hora de Khandyga", "YAKT",
+ "Hora de verano de Khandyga", "YAKST"}},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"Hora de Krasnoyarsk", "KRAT",
"Hora de verano de Krasnoyarsk", "KRAST"}},
@@ -585,8 +583,8 @@
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT},
- {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT",
- "Ust-Nera Summer Time", "VLAST"}},
+ {"Asia/Ust-Nera", new String[] {"Hora de Ust-Nera", "VLAT",
+ "Hora de verano de Ust-Nera", "VLAST"}},
{"Asia/Vientiane", ICT},
{"Asia/Vladivostok", new String[] {"Hora de Vladivostok", "VLAT",
"Hora de verano de Vladivostok", "VLAST"}},
@@ -618,8 +616,8 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"Hora est\u00e1ndar de Australia Central y Occidental", "CWST",
- "Hora de verano de Australia Central y Occidental", "CWST"}},
+ {"Australia/Eucla", new String[] {"Hora est\u00E1ndar de Australia Central y Occidental", "CWST",
+ "Hora est\u00E1ndar de verano de Australia Central y Occidental", "CWST"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
@@ -675,6 +673,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
+ {"Europe/Busingen", CET},
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
diff --git a/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java b/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
index 2d96081..fd487e2 100644
--- a/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
+++ b/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
@@ -45,10 +45,8 @@
public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
- String ACT[] = new String[] {"Heure de l'Acre", "ACT",
- "Heure d'\u00e9t\u00e9 de l'Acre", "ACST"};
String ADELAIDE[] = new String[] {"Heure standard d'Australie centrale (Australie du sud)", "CST",
- "Heure d'\u00e9t\u00e9 d'Australie centrale (Australie du sud)", "CST"};
+ "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud)", "CST"};
String AGT[] = new String[] {"Heure D'Argentine", "ART",
"Heure d'\u00e9t\u00e9 D'Argentine", "ARST"} ;
String AKST[] = new String[] {"Heure normale d'Alaska", "AKST",
@@ -64,9 +62,9 @@
String BDT[] = new String[] {"Heure du Bangladesh", "BDT",
"Heure d'\u00e9t\u00e9 du Bangladesh", "BDST"} ;
String BRISBANE[] = new String[] {"Heure standard d'Australie orientale (Queensland)", "EST",
- "Heure d'\u00e9t\u00e9 d'Australie orientale (Queensland)", "EST"};
+ "Heure d'\u00E9t\u00E9 d'Australie orientale (Queensland)", "EST"};
String BROKEN_HILL[] = new String[] {"Heure standard d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "CST",
- "Heure d'\u00e9t\u00e9 d'Australie centrale(Australie du sud/Nouvelle-Galles du sud)", "CST"};
+ "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "CST"};
String BRT[] = new String[] {"Heure du Br\u00e9sil", "BRT",
"Heure d'\u00e9t\u00e9 du Br\u00e9sil", "BRST"} ;
String BTT[] = new String[] {"Heure du Bhoutan", "BTT",
@@ -77,9 +75,9 @@
"Heure d'\u00e9t\u00e9 d'Europe centrale", "CEST"} ;
String CHAST[] = new String[] {"Heure standard de Chatham", "CHAST",
"Heure avanc\u00e9e de Chatham", "CHADT"};
- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
- "Chuuk Summer Time", "CHUST"};
- String CIT[] = new String[] {"Heure d'Indon\u00e9sie centrale", "CIT",
+ String CHUT[] = new String[] {"Heure de Chuuk", "CHUT",
+ "Heure d'\u00E9t\u00E9 de Chuuk", "CHUST"};
+ String CIT[] = new String[] {"Heure d'Indon\u00e9sie centrale", "WITA",
"Heure d'\u00e9t\u00e9 d'Indon\u00e9sie centrale", "CIST"};
String CLT[] = new String[] {"Heure du Chili", "CLT",
"Heure d'\u00e9t\u00e9 du Chili", "CLST"} ;
@@ -90,7 +88,7 @@
String CUBA[] = new String[] {"Heure standard de Cuba", "CST",
"Heure d'\u00e9t\u00e9 de Cuba", "CDT"};
String DARWIN[] = new String[] {"Heure standard d'Australie centrale (Territoire du Nord)", "CST",
- "Heure d'\u00e9t\u00e9 d'Australie centrale (Territoire du Nord)", "CST"};
+ "Heure d'\u00E9t\u00E9 d'Australie centrale (Territoire du Nord)", "CST"};
String DUBLIN[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT",
"Heure d'\u00e9t\u00e9 irlandaise", "IST"};
String EAT[] = new String[] {"Heure d'Afrique de l'Est", "EAT",
@@ -104,9 +102,9 @@
String EST[] = new String[] {"Heure normale de l'Est", "EST",
"Heure avanc\u00e9e de l'Est", "EDT"} ;
String EST_NSW[] = new String[] {"Heure normale de l'Est (Nouvelle-Galles du Sud)", "EST",
- "Heure d'\u00e9t\u00e9 de l'Est (Nouvelle-Galles du Sud)", "EST"} ;
- String FET[] = new String[] {"Further-eastern European Time", "FET",
- "Further-eastern European Summer Time", "FEST"};
+ "Heure d'\u00E9t\u00E9 de l'Est (Nouvelle-Galles du Sud)", "EST"} ;
+ String FET[] = new String[] {"Heure d'Europe de l'Est UTC+3", "FET",
+ "Heure d'\u00E9t\u00E9 d'Europe de l'Est UTC+3", "FEST"};
String GHMT[] = new String[] {"Heure du Ghana", "GMT",
"Heure d'\u00e9t\u00e9 du Ghana", "GHST"};
String GAMBIER[] = new String[] {"Heure de Gambi", "GAMT",
@@ -159,8 +157,8 @@
"heure avanc\u00e9e des Pitcairn", "PDT"};
String PKT[] = new String[] {"Heure du Pakistan", "PKT",
"Heure d'\u00e9t\u00e9 du Pakistan", "PKST"} ;
- String PONT[] = new String[] {"Pohnpei Time", "PONT",
- "Pohnpei Summer Time", "PONST"};
+ String PONT[] = new String[] {"Heure de Pohnpei", "PONT",
+ "Heure d'\u00E9t\u00E9 de Pohnpei", "PONST"};
String PST[] = new String[] {"Heure normale du Pacifique", "PST",
"Heure avanc\u00e9e du Pacifique", "PDT"} ;
String SAST[] = new String[] {"Heure normale d'Afrique du Sud", "SAST",
@@ -172,7 +170,7 @@
String SLST[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT",
"Heure d'\u00e9t\u00e9 de Sierra Leone", "SLST"};
String TASMANIA[] = new String[] {"Heure standard d'Australie orientale (Tasmanie)", "EST",
- "Heure d'\u00e9t\u00e9 d'Australie orientale (Tasmanie)", "EST"};
+ "Heure d'\u00E9t\u00E9 d'Australie orientale (Tasmanie)", "EST"};
String TMT[] = new String[] {"Heure du Turkm\u00e9nistan", "TMT",
"Heure d'\u00e9t\u00e9 du Turkm\u00e9nistan", "TMST"} ;
String ULAT[]= new String[] {"Heure de l'Ulaanbaatar", "ULAT",
@@ -183,10 +181,10 @@
"Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST"} ;
String WET[] = new String[] {"Heure d'Europe de l'Ouest", "WET",
"Heure d'\u00e9t\u00e9 d'Europe de l'Ouest", "WEST"} ;
- String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIT",
+ String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIB",
"Heure d'\u00e9t\u00e9 de l'Indon\u00e9sie occidentale", "WIST"};
String WST_AUS[] = new String[] {"Heure normale de l'Ouest (Australie)", "WST",
- "Heure d'\u00e9t\u00e9 de l'Ouest (Australie)", "WST"} ;
+ "Heure d'\u00E9t\u00E9 de l'Ouest (Australie)", "WST"} ;
String SAMOA[] = new String[] {"Heure standard de Samoa", "SST",
"Heure avanc\u00e9e de Samoa", "SDT"};
String WST_SAMOA[] = new String[] {"Heure des Samoas occidentales", "WST",
@@ -194,7 +192,7 @@
String ChST[] = new String[] {"Heure normale des \u00eeles Mariannes", "ChST",
"Heure d'\u00e9t\u00e9 des \u00eeles Mariannes", "ChDT"};
String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "EST",
- "Heure d'\u00e9t\u00e9 d'Australie orientale (Victoria)", "EST"};
+ "Heure d'\u00E9t\u00E9 d'Australie orientale (Victoria)", "EST"};
String UTC[] = new String[] {"Temps universel coordonn\u00e9", "UTC",
"Temps universel coordonn\u00e9", "UTC"};
String UZT[] = new String[] {"Heure de l'Ouzb\u00e9kistan", "UZT",
@@ -306,7 +304,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
- {"America/Argentina/San_Luis", WART},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -399,8 +397,8 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
- "Metlakatla Daylight Time", "MeDT"}},
+ {"America/Metlakatla", new String[] {"Heure normale de Metlakatla", "MeST",
+ "Heure avanc\u00E9e de Metlakatla", "MeDT"}},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Heure normale de Saint-Pierre et Miquelon", "PMST",
"Heure avanc\u00e9e de Saint-Pierre et Miquelon", "PMDT"}},
@@ -464,8 +462,8 @@
"Heure d'\u00e9t\u00e9 de Davis", "DAVST"}},
{"Antarctica/DumontDUrville", new String[] {"Heure de Dumont-d'Urville", "DDUT",
"Heure d'\u00e9t\u00e9 de Dumont-d'Urville", "DDUST"}},
- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
- "Macquarie Island Summer Time", "MIST"}},
+ {"Antarctica/Macquarie", new String[] {"Heure de l'Ile Macquarie", "MIST",
+ "Heure d'\u00E9t\u00E9 de l'Ile Macquarie", "MIST"}},
{"Antarctica/Mawson", new String[] {"Heure de Mawson", "MAWT",
"Heure d'\u00e9t\u00e9 de Mawson", "MAWST"}},
{"Antarctica/McMurdo", NZST},
@@ -481,7 +479,7 @@
{"Asia/Aden", ARAST},
{"Asia/Almaty", new String[] {"Heure d'Alma-Ata", "ALMT",
"Heure d'\u00e9t\u00e9 d'Alma-Ata", "ALMST"}},
- {"Asia/Amman", EET},
+ {"Asia/Amman", ARAST},
{"Asia/Anadyr", new String[] {"Heure d'Anadyr", "ANAT",
"Heure d'\u00e9t\u00e9 d'Anadyr", "ANAST"}},
{"Asia/Aqtau", new String[] {"Heure d'Aqtau", "AQTT",
@@ -525,7 +523,7 @@
"Heure d'\u00e9t\u00e9 d'Irkutsk", "IRKST"}},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"Heure d'Indon\u00e9sie orientale", "EIT",
+ {"Asia/Jayapura", new String[] {"Heure d'Indon\u00e9sie orientale", "WIT",
"Heure d'\u00e9t\u00e9 d'Indon\u00e9sie orientale", "EIST"}},
{"Asia/Kabul", new String[] {"Heure d'Afghanistan", "AFT",
"Heure d'\u00e9t\u00e9 d'Afghanistan", "AFST"}},
@@ -535,8 +533,8 @@
{"Asia/Kashgar", CTT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
- "Khandyga Summer Time", "YAKST"}},
+ {"Asia/Khandyga", new String[] {"Heure de Khandyga", "YAKT",
+ "Heure d'\u00E9t\u00E9 de Khandyga", "YAKST"}},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"Heure de Krasno\u00efarsk", "KRAT",
"Heure d'\u00e9t\u00e9 de Krasno\u00efarsk", "KRAST"}},
@@ -585,8 +583,8 @@
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT},
- {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT",
- "Ust-Nera Summer Time", "VLAST"}},
+ {"Asia/Ust-Nera", new String[] {"Heure d'Ust-Nera", "VLAT",
+ "Heure d'\u00E9t\u00E9 d'Ust-Nera", "VLAST"}},
{"Asia/Vientiane", ICT},
{"Asia/Vladivostok", new String[] {"Heure de Vladivostok", "VLAT",
"Heure d'\u00e9t\u00e9 de Vladivostok", "VLAST"}},
@@ -619,7 +617,7 @@
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
{"Australia/Eucla", new String[] {"Heure standard de l'Australie occidentale (centre)", "CWST",
- "Heure d'\u00e9t\u00e9 de l'Australie occidentale (centre)", "CWST"}},
+ "Heure d'\u00E9t\u00E9 de l'Australie occidentale (centre)", "CWST"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
@@ -675,6 +673,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
+ {"Europe/Busingen", CET},
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
diff --git a/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java b/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
index 18b4344..0b51765 100644
--- a/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
+++ b/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
@@ -45,10 +45,8 @@
public final class TimeZoneNames_it extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
- String ACT[] = new String[] {"Ora di Acre", "ACT",
- "Ora estiva di Acre", "ACST"};
- String ADELAIDE[] = new String[] {"Ora centrale standard (Australia del Sud)", "CST",
- "Ora estiva standard (Australia del Sud)", "CST"};
+ String ADELAIDE[] = new String[] {"Ora standard centrale (Australia del Sud)", "CST",
+ "Ora estiva centrale (Australia del Sud)", "CST"};
String AGT[] = new String[] {"Ora dell'Argentina", "ART",
"Ora estiva dell'Argentina", "ARST"};
String AKST[] = new String[] {"Ora solare dell'Alaska", "AKST",
@@ -63,9 +61,9 @@
"Ora legale dell'Atlantico occidentale", "ADT"};
String BDT[] = new String[] {"Ora del Bangladesh", "BDT",
"Ora estiva del Bangladesh", "BDST"};
- String BRISBANE[] = new String[] {"Ora orientale standard (Queensland)", "EST",
+ String BRISBANE[] = new String[] {"Ora standard orientale (Queensland)", "EST",
"Ora estiva orientale (Queensland)", "EST"};
- String BROKEN_HILL[] = new String[] {"Ora centrale standard (Australia del Sud/Nuovo Galles del Sud)", "CST",
+ String BROKEN_HILL[] = new String[] {"Ora standard centrale (Australia del Sud/Nuovo Galles del Sud)", "CST",
"Ora estiva centrale (Australia del Sud/Nuovo Galles del Sud)", "CST"};
String BRT[] = new String[] {"Ora del Brasile", "BRT",
"Ora estiva del Brasile", "BRST"};
@@ -77,9 +75,9 @@
"Ora estiva dell'Europa centrale", "CEST"};
String CHAST[] = new String[] {"Ora di Chatham standard", "CHAST",
"Ora legale di Chatham", "CHADT"};
- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
- "Chuuk Summer Time", "CHUST"};
- String CIT[] = new String[] {"Ora dell'Indonesia centrale", "CIT",
+ String CHUT[] = new String[] {"Ora di Chuuk", "CHUT",
+ "Ora estiva di Chuuk", "CHUST"};
+ String CIT[] = new String[] {"Ora dell'Indonesia centrale", "WITA",
"Ora estiva dell'Indonesia centrale", "CIST"};
String CLT[] = new String[] {"Ora del Cile", "CLT",
"Ora estiva del Cile", "CLST"};
@@ -89,7 +87,7 @@
"Ora legale della Cina", "CDT"};
String CUBA[] = new String[] {"Ora solare Cuba", "CST",
"Ora legale Cuba", "CDT"};
- String DARWIN[] = new String[] {"Ora centrale standard (Territori del Nord)", "CST",
+ String DARWIN[] = new String[] {"Ora standard centrale (Territori del Nord)", "CST",
"Ora estiva centrale (Territori del Nord)", "CST"};
String DUBLIN[] = new String[] {"Ora media di Greenwich", "GMT",
"Ora estiva irlandese", "IST"};
@@ -103,10 +101,10 @@
"Ora estiva della Groenlandia orientale", "EGST"};
String EST[] = new String[] {"Ora solare USA orientale", "EST",
"Ora legale USA orientale", "EDT"};
- String EST_NSW[] = new String[] {"Ora solare dell'Australia orientale (Nuovo Galles del Sud)", "EST",
+ String EST_NSW[] = new String[] {"Ora standard dell'Australia orientale (Nuovo Galles del Sud)", "EST",
"Ora estiva dell'Australia orientale (Nuovo Galles del Sud)", "EST"};
- String FET[] = new String[] {"Further-eastern European Time", "FET",
- "Further-eastern European Summer Time", "FEST"};
+ String FET[] = new String[] {"Ora dei paesi europei pi\u00F9 orientali", "FET",
+ "Ora estiva dei paesi europei pi\u00F9 orientali", "FEST"};
String GHMT[] = new String[] {"Ora media del Ghana", "GMT",
"Ora legale del Ghana", "GHST"};
String GAMBIER[] = new String[] {"Ora di Gambier", "GAMT",
@@ -159,8 +157,8 @@
"Ora legale di Pitcairn", "PDT"};
String PKT[] = new String[] {"Ora del Pakistan", "PKT",
"Ora estiva del Pakistan", "PKST"};
- String PONT[] = new String[] {"Pohnpei Time", "PONT",
- "Pohnpei Summer Time", "PONST"};
+ String PONT[] = new String[] {"Ora di Pohnpei", "PONT",
+ "Ora estiva di Pohnpei", "PONST"};
String PST[] = new String[] {"Ora solare della costa occidentale USA", "PST",
"Ora legale della costa occidentale USA", "PDT"};
String SAST[] = new String[] {"Ora solare del Sudafrica", "SAST",
@@ -171,7 +169,7 @@
"Ora estiva di Singapore", "SGST"};
String SLST[] = new String[] {"Ora media di Greenwich", "GMT",
"Ora legale della Sierra Leone", "SLST"};
- String TASMANIA[] = new String[] {"Ora orientale standard (Tasmania)", "EST",
+ String TASMANIA[] = new String[] {"Ora standard orientale (Tasmania)", "EST",
"Ora estiva orientale (Tasmania)", "EST"};
String TMT[] = new String[] {"Ora del Turkmenistan", "TMT",
"Ora estiva del Turkmenistan", "TMST"};
@@ -183,9 +181,9 @@
"Ora estiva dell'Africa occidentale", "WAST"};
String WET[] = new String[] {"Ora dell'Europa occidentale", "WET",
"Ora estiva dell'Europa occidentale", "WEST"};
- String WIT[] = new String[] {"Ora dell'Indonesia occidentale", "WIT",
+ String WIT[] = new String[] {"Ora dell'Indonesia occidentale", "WIB",
"Ora estiva dell'Indonesia occidentale", "WIST"};
- String WST_AUS[] = new String[] {"Ora solare dell'Australia occidentale", "WST",
+ String WST_AUS[] = new String[] {"Ora standard dell'Australia occidentale", "WST",
"Ora estiva dell'Australia occidentale", "WST"};
String SAMOA[] = new String[] {"Ora standard di Samoa", "SST",
"Ora legale di Samoa", "SDT"};
@@ -193,7 +191,7 @@
"Ora estiva di Samoa", "WSDT"};
String ChST[] = new String[] {"Ora standard di Chamorro", "ChST",
"Ora legale di Chamorro", "ChDT"};
- String VICTORIA[] = new String[] {"Ora orientale standard (Victoria)", "EST",
+ String VICTORIA[] = new String[] {"Ora standard orientale (Victoria)", "EST",
"Ora estiva orientale (Victoria)", "EST"};
String UTC[] = new String[] {"Tempo universale coordinato", "UTC",
"Tempo universale coordinato", "UTC"};
@@ -306,7 +304,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
- {"America/Argentina/San_Luis", WART},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -399,8 +397,8 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
- "Metlakatla Daylight Time", "MeDT"}},
+ {"America/Metlakatla", new String[] {"Ora standard di Metlakatla", "MeST",
+ "Ora legale di Metlakatla", "MeDT"}},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Ora solare di Saint-Pierre e Miquelon", "PMST",
"Ora legale di Saint-Pierre e Miquelon", "PMDT"}},
@@ -464,8 +462,8 @@
"Ora estiva di Davis", "DAVST"}},
{"Antarctica/DumontDUrville", new String[] {"Ora di Dumont-d'Urville", "DDUT",
"Ora estiva di Dumont-d'Urville", "DDUST"}},
- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
- "Macquarie Island Summer Time", "MIST"}},
+ {"Antarctica/Macquarie", new String[] {"Ora dell'Isola Macquarie", "MIST",
+ "Ora estiva dell'Isola Macquarie", "MIST"}},
{"Antarctica/Mawson", new String[] {"Ora di Mawson", "MAWT",
"Ora estiva di Mawson", "MAWST"}},
{"Antarctica/McMurdo", NZST},
@@ -481,7 +479,7 @@
{"Asia/Aden", ARAST},
{"Asia/Almaty", new String[] {"Ora di Alma-Ata", "ALMT",
"Ora estiva di Alma-Ata", "ALMST"}},
- {"Asia/Amman", EET},
+ {"Asia/Amman", ARAST},
{"Asia/Anadyr", new String[] {"Ora di Anadyr", "ANAT",
"Ora estiva di Anadyr", "ANAST"}},
{"Asia/Aqtau", new String[] {"Ora di Aqtau", "AQTT",
@@ -525,7 +523,7 @@
"Ora estiva di Irkutsk", "IRKST"}},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"Ora dell'Indonesia orientale", "EIT",
+ {"Asia/Jayapura", new String[] {"Ora dell'Indonesia orientale", "WIT",
"Ora estiva dell'Indonesia orientale", "EIST"}},
{"Asia/Kabul", new String[] {"Ora dell'Afghanistan", "AFT",
"Ora estiva dell'Afghanistan", "AFST"}},
@@ -536,8 +534,8 @@
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
{"Asia/Kolkata", IST},
- {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
- "Khandyga Summer Time", "YAKST"}},
+ {"Asia/Khandyga", new String[] {"Ora di Khandyga", "YAKT",
+ "Ora estiva di Khandyga", "YAKST"}},
{"Asia/Krasnoyarsk", new String[] {"Ora di Krasnojarsk", "KRAT",
"Ora estiva di Krasnojarsk", "KRAST"}},
{"Asia/Kuala_Lumpur", MYT},
@@ -585,8 +583,8 @@
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT},
- {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT",
- "Ust-Nera Summer Time", "VLAST"}},
+ {"Asia/Ust-Nera", new String[] {"Ora di Ust-Nera", "VLAT",
+ "Ora estiva di Ust-Nera", "VLAST"}},
{"Asia/Vientiane", ICT},
{"Asia/Vladivostok", new String[] {"Ora di Vladivostok", "VLAT",
"Ora estiva di Vladivostok", "VLAST"}},
@@ -618,8 +616,8 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"Ora solare Australia centrorientale", "CWST",
- "Ora estiva Australia centrorientale", "CWST"}},
+ {"Australia/Eucla", new String[] {"Ora standard Australia centro-occidentale", "CWST",
+ "Ora estiva Australia centro-occidentale", "CWST"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
@@ -675,6 +673,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
+ {"Europe/Busingen", CET},
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
diff --git a/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java b/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
index 5001fd2..2c8734c 100644
--- a/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
+++ b/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
@@ -45,10 +45,8 @@
public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
- String ACT[] = new String[] {"\u30a2\u30af\u30ec\u6642\u9593", "ACT",
- "\u30a2\u30af\u30ec\u590f\u6642\u9593", "ACST"};
- String ADELAIDE[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CST",
- "\u4e2d\u90e8\u590f\u6642\u9593 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CST"};
+ String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CST",
+ "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CST"};
String AGT[] = new String[] {"\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "ART",
"\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "ARST"};
String AKST[] = new String[] {"\u30a2\u30e9\u30b9\u30ab\u6a19\u6e96\u6642", "AKST",
@@ -63,10 +61,10 @@
"\u5927\u897f\u6d0b\u590f\u6642\u9593", "ADT"};
String BDT[] = new String[] {"\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u6642\u9593", "BDT",
"\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u590f\u6642\u9593", "BDST"};
- String BRISBANE[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30af\u30a4\u30fc\u30f3\u30ba\u30e9\u30f3\u30c9)", "EST",
- "\u6771\u90e8\u590f\u6642\u9593 (\u30af\u30a4\u30fc\u30f3\u30ba\u30e9\u30f3\u30c9)", "EST"};
- String BROKEN_HILL[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2/\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "CST",
- "\u4e2d\u90e8\u590f\u6642\u9593 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2/\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "CST"};
+ String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "EST",
+ "\u6771\u90E8\u590F\u6642\u9593(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "EST"};
+ String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "CST",
+ "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "CST"};
String BRT[] = new String[] {"\u30d6\u30e9\u30b8\u30eb\u6642\u9593", "BRT",
"\u30d6\u30e9\u30b8\u30eb\u590f\u6642\u9593", "BRST"};
String BTT[] = new String[] {"\u30d6\u30fc\u30bf\u30f3\u6642\u9593", "BTT",
@@ -77,9 +75,9 @@
"\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "CEST"};
String CHAST[] = new String[] {"\u30c1\u30e3\u30bf\u30e0\u6a19\u6e96\u6642", "CHAST",
"\u30c1\u30e3\u30bf\u30e0\u590f\u6642\u9593", "CHADT"};
- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
- "Chuuk Summer Time", "CHUST"};
- String CIT[] = new String[] {"\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "CIT",
+ String CHUT[] = new String[] {"\u30C1\u30E5\u30FC\u30AF\u6642\u9593", "CHUT",
+ "Chuuk Time", "CHUST"};
+ String CIT[] = new String[] {"\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WITA",
"\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "CIST"};
String CLT[] = new String[] {"\u30c1\u30ea\u6642\u9593", "CLT",
"\u30c1\u30ea\u590f\u6642\u9593", "CLST"};
@@ -89,8 +87,8 @@
"\u4e2d\u56fd\u590f\u6642\u9593", "CDT"};
String CUBA[] = new String[] {"\u30ad\u30e5\u30fc\u30d0\u6a19\u6e96\u6642", "CST",
"\u30ad\u30e5\u30fc\u30d0\u590f\u6642\u9593", "CDT"};
- String DARWIN[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642 (\u30ce\u30fc\u30b6\u30f3\u30c6\u30ea\u30c8\u30ea\u30fc)", "CST",
- "\u4e2d\u90e8\u590f\u6642\u9593 (\u30ce\u30fc\u30b6\u30f3\u30c6\u30ea\u30c8\u30ea\u30fc)", "CST"};
+ String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "CST",
+ "\u4E2D\u90E8\u590F\u6642\u9593(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "CST"};
String DUBLIN[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT",
"\u30a2\u30a4\u30eb\u30e9\u30f3\u30c9\u590f\u6642\u9593", "IST"};
String EAT[] = new String[] {"\u6771\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "EAT",
@@ -103,10 +101,10 @@
"\u6771\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u590f\u6642\u9593", "EGST"};
String EST[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642", "EST",
"\u6771\u90e8\u590f\u6642\u9593", "EDT"};
- String EST_NSW[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "EST",
- "\u6771\u90e8\u590f\u6642\u9593 (\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "EST"};
- String FET[] = new String[] {"Further-eastern European Time", "FET",
- "Further-eastern European Summer Time", "FEST"};
+ String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "EST",
+ "\u6771\u90E8\u590F\u6642\u9593(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "EST"};
+ String FET[] = new String[] {"\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u6642\u9593", "FET",
+ "\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u590F\u6642\u9593", "FEST"};
String GHMT[] = new String[] {"\u30ac\u30fc\u30ca\u6a19\u6e96\u6642", "GMT",
"\u30ac\u30fc\u30ca\u590f\u6642\u9593", "GHST"};
String GAMBIER[] = new String[] {"\u30ac\u30f3\u30d3\u30a2\u6642\u9593", "GAMT",
@@ -159,8 +157,8 @@
"\u30d4\u30c8\u30b1\u30eb\u30f3\u5cf6\u590f\u6642\u9593", "PDT"};
String PKT[] = new String[] {"\u30d1\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "PKT",
"\u30d1\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "PKST"};
- String PONT[] = new String[] {"Pohnpei Time", "PONT",
- "Pohnpei Summer Time", "PONST"};
+ String PONT[] = new String[] {"\u30DD\u30F3\u30DA\u30A4\u6642\u9593", "PONT",
+ "\u30DD\u30F3\u30DA\u30A4\u590F\u6642\u9593", "PONST"};
String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642", "PST",
"\u592a\u5e73\u6d0b\u590f\u6642\u9593", "PDT"};
String SAST[] = new String[] {"\u5357\u30a2\u30d5\u30ea\u30ab\u6a19\u6e96\u6642", "SAST",
@@ -171,8 +169,8 @@
"\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb\u590f\u6642\u9593", "SGST"};
String SLST[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT",
"\u30b7\u30a8\u30e9\u30ec\u30aa\u30cd\u590f\u6642\u9593", "SLST"};
- String TASMANIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30bf\u30b9\u30de\u30cb\u30a2)", "EST",
- "\u6771\u90e8\u590f\u6642\u9593 (\u30bf\u30b9\u30de\u30cb\u30a2)", "EST"};
+ String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30BF\u30B9\u30DE\u30CB\u30A2)", "EST",
+ "\u6771\u90E8\u590F\u6642\u9593(\u30BF\u30B9\u30DE\u30CB\u30A2)", "EST"};
String TMT[] = new String[] {"\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u6642\u9593", "TMT",
"\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u590f\u6642\u9593", "TMST"};
String ULAT[]= new String[] {"\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u6642\u9593", "ULAT",
@@ -183,18 +181,18 @@
"\u897f\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "WAST"};
String WET[] = new String[] {"\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "WET",
"\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "WEST"};
- String WIT[] = new String[] {"\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIT",
+ String WIT[] = new String[] {"\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIB",
"\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "WIST"};
- String WST_AUS[] = new String[] {"\u897f\u90e8\u6a19\u6e96\u6642 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "WST",
- "\u897f\u90e8\u590f\u6642\u9593 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "WST"};
+ String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "WST",
+ "\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "WST"};
String SAMOA[] = new String[] {"\u30b5\u30e2\u30a2\u6a19\u6e96\u6642", "SST",
"\u30b5\u30e2\u30a2\u590f\u6642\u9593", "SDT"};
String WST_SAMOA[] = new String[] {"\u897f\u30b5\u30e2\u30a2\u6642\u9593", "WST",
"\u897f\u30b5\u30e2\u30a2\u590f\u6642\u9593", "WSDT"};
String ChST[] = new String[] {"\u30b0\u30a2\u30e0\u6a19\u6e96\u6642", "ChST",
"\u30b0\u30a2\u30e0\u590f\u6642\u9593", "ChDT"};
- String VICTORIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30d3\u30af\u30c8\u30ea\u30a2)", "EST",
- "\u6771\u90e8\u590f\u6642\u9593 (\u30d3\u30af\u30c8\u30ea\u30a2)", "EST"};
+ String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30D3\u30AF\u30C8\u30EA\u30A2)", "EST",
+ "\u6771\u90E8\u590F\u6642\u9593(\u30D3\u30AF\u30C8\u30EA\u30A2)", "EST"};
String UTC[] = new String[] {"\u5354\u5b9a\u4e16\u754c\u6642", "UTC",
"\u5354\u5b9a\u4e16\u754c\u6642", "UTC"};
String UZT[] = new String[] {"\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "UZT",
@@ -306,7 +304,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
- {"America/Argentina/San_Luis", WART},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -399,8 +397,8 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
- "Metlakatla Daylight Time", "MeDT"}},
+ {"America/Metlakatla", new String[] {"\u30E1\u30C8\u30E9\u30AB\u30C8\u30E9\u6A19\u6E96\u6642\u9593", "MeST",
+ "\u30E1\u30C8\u30E9\u30AB\u30C8\u30E9\u590F\u6642\u9593", "MeDT"}},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u6a19\u6e96\u6642", "PMST",
"\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u590f\u6642\u9593", "PMDT"}},
@@ -464,8 +462,8 @@
"\u30c7\u30a4\u30d3\u30b9\u590f\u6642\u9593", "DAVST"}},
{"Antarctica/DumontDUrville", new String[] {"\u30c7\u30e5\u30e2\u30f3\u30c7\u30e5\u30eb\u30f4\u30a3\u30eb\u6642\u9593", "DDUT",
"\u30c7\u30e5\u30e2\u30f3\u30c7\u30e5\u30eb\u30f4\u30a3\u30eb\u590f\u6642\u9593", "DDUST"}},
- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
- "Macquarie Island Summer Time", "MIST"}},
+ {"Antarctica/Macquarie", new String[] {"\u30DE\u30C3\u30B3\u30FC\u30EA\u30FC\u5CF6\u6642\u9593", "MIST",
+ "\u30DE\u30C3\u30B3\u30FC\u30EA\u30FC\u5CF6\u590F\u6642\u9593", "MIST"}},
{"Antarctica/Mawson", new String[] {"\u30e2\u30fc\u30bd\u30f3\u6642\u9593", "MAWT",
"\u30e2\u30fc\u30bd\u30f3\u590f\u6642\u9593", "MAWST"}},
{"Antarctica/McMurdo", NZST},
@@ -481,7 +479,7 @@
{"Asia/Aden", ARAST},
{"Asia/Almaty", new String[] {"\u30a2\u30eb\u30de\u30a2\u30bf\u6642\u9593", "ALMT",
"\u30a2\u30eb\u30de\u30a2\u30bf\u590f\u6642\u9593", "ALMST"}},
- {"Asia/Amman", EET},
+ {"Asia/Amman", ARAST},
{"Asia/Anadyr", new String[] {"\u30a2\u30ca\u30c9\u30a5\u30a4\u30ea\u6642\u9593", "ANAT",
"\u30a2\u30ca\u30c9\u30a5\u30a4\u30ea\u590f\u6642\u9593", "ANAST"}},
{"Asia/Aqtau", new String[] {"\u30a2\u30af\u30bf\u30a6\u6642\u9593", "AQTT",
@@ -525,7 +523,7 @@
"\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "IRKST"}},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "EIT",
+ {"Asia/Jayapura", new String[] {"\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIT",
"\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "EIST" }},
{"Asia/Kabul", new String[] {"\u30a2\u30d5\u30ac\u30cb\u30b9\u30bf\u30f3\u6642\u9593", "AFT",
"\u30a2\u30d5\u30ac\u30cb\u30b9\u30bf\u30f3\u590f\u6642\u9593", "AFST"}},
@@ -535,8 +533,8 @@
{"Asia/Kashgar", CTT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
- "Khandyga Summer Time", "YAKST"}},
+ {"Asia/Khandyga", new String[] {"\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u6642\u9593", "YAKT",
+ "\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u590F\u6642\u9593", "YAKST"}},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u6642\u9593", "KRAT",
"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u590f\u6642\u9593", "KRAST"}},
@@ -585,8 +583,8 @@
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT},
- {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT",
- "Ust-Nera Summer Time", "VLAST"}},
+ {"Asia/Ust-Nera", new String[] {"\u30A6\u30B9\u30C1\u30CD\u30E9\u6642\u9593", "VLAT",
+ "\u30A6\u30B9\u30C1\u30CD\u30E9\u590F\u6642\u9593", "VLAST"}},
{"Asia/Vientiane", ICT},
{"Asia/Vladivostok", new String[] {"\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u6642\u9593", "VLAT",
"\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u590f\u6642\u9593", "VLAST"}},
@@ -618,8 +616,8 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6a19\u6e96\u6642 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CWST",
- "\u4e2d\u897f\u90e8\u590f\u6642\u9593 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CWST"}},
+ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CWST",
+ "\u4E2D\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CWST"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
@@ -675,6 +673,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
+ {"Europe/Busingen", CET},
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
diff --git a/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java b/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
index 416a2c5..79542f7 100644
--- a/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
+++ b/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
@@ -45,10 +45,8 @@
public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
- String ACT[] = new String[] {"\uc5d0\uc774\ucee4 \uc2dc\uac04", "ACT",
- "\uc5d0\uc774\ucee4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ACST"};
- String ADELAIDE[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CST",
- "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CST"};
+ String ADELAIDE[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CST",
+ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CST"};
String AGT[] = new String[] {"\uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "ART",
"\uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ARST"};
String AKST[] = new String[] {"\uc54c\ub798\uc2a4\uce74 \ud45c\uc900\uc2dc", "AKST",
@@ -63,10 +61,10 @@
"\ub300\uc11c\uc591 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ADT"};
String BDT[] = new String[] {"\ubc29\uae00\ub77c\ub370\uc2dc \uc2dc\uac04", "BDT",
"\ubc29\uae00\ub77c\ub370\uc2dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BDST"};
- String BRISBANE[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ud038\uc990\ub79c\ub4dc)", "EST",
- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ud038\uc990\ub79c\ub4dc)", "EST"};
- String BROKEN_HILL[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544/\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "CST",
- "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544/\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "CST"};
+ String BRISBANE[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD038\uC990\uB79C\uB4DC)", "EST",
+ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD038\uC990\uB79C\uB4DC)", "EST"};
+ String BROKEN_HILL[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "CST",
+ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "CST"};
String BRT[] = new String[] {"\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc2dc\uac04", "BRT",
"\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BRST"};
String BTT[] = new String[] {"\ubd80\ud0c4 \uc2dc\uac04", "BTT",
@@ -77,9 +75,9 @@
"\uc911\uc559 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CEST"};
String CHAST[] = new String[] {"Chatham \ud45c\uc900\uc2dc", "CHAST",
"Chatham \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CHADT"};
- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
- "Chuuk Summer Time", "CHUST"};
- String CIT[] = new String[] {"\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "CIT",
+ String CHUT[] = new String[] {"\uCD94\uD06C \uD45C\uC900\uC2DC", "CHUT",
+ "\uCD94\uD06C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "CHUST"};
+ String CIT[] = new String[] {"\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WITA",
"\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CIST"};
String CLT[] = new String[] {"\uce60\ub808 \uc2dc\uac04", "CLT",
"\uce60\ub808 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CLST"};
@@ -89,8 +87,8 @@
"\uc911\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"};
String CUBA[] = new String[] {"\ucfe0\ubc14 \ud45c\uc900\uc2dc", "CST",
"\ucfe0\ubc14 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"};
- String DARWIN[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\ub178\ub358 \uc9c0\uc5ed)", "CST",
- "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ub178\ub358 \uc9c0\uc5ed)", "CST"};
+ String DARWIN[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uBD81\uBD80 \uC9C0\uC5ED)", "CST",
+ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBD81\uBD80 \uC9C0\uC5ED)", "CST"};
String DUBLIN[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT",
"\uc544\uc77c\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IST"};
String EAT[] = new String[] {"\ub3d9\ubd80 \uc544\ud504\ub9ac\uce74 \uc2dc\uac04", "EAT",
@@ -103,10 +101,10 @@
"\ub3d9\ubd80 \uadf8\ub9b0\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EGST"};
String EST[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc", "EST",
"\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EDT"};
- String EST_NSW[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "EST",
- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "EST"};
- String FET[] = new String[] {"Further-eastern European Time", "FET",
- "Further-eastern European Summer Time", "FEST"};
+ String EST_NSW[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "EST",
+ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "EST"};
+ String FET[] = new String[] {"\uADF9\uB3D9 \uC720\uB7FD \uD45C\uC900\uC2DC", "FET",
+ "\uADF9\uB3D9 \uC720\uB7FD \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "FEST"};
String GHMT[] = new String[] {"\uac00\ub098 \ud45c\uc900\uc2dc", "GMT",
"\uac00\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GHST"};
String GAMBIER[] = new String[] {"\uac10\ube44\uc544 \uc2dc\uac04", "GAMT",
@@ -159,8 +157,8 @@
"Pitcairn \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PDT"};
String PKT[] = new String[] {"\ud30c\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "PKT",
"\ud30c\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PKST"};
- String PONT[] = new String[] {"Pohnpei Time", "PONT",
- "Pohnpei Summer Time", "PONST"};
+ String PONT[] = new String[] {"\uD3F0\uD398\uC774 \uD45C\uC900\uC2DC", "PONT",
+ "\uD3F0\uD398\uC774 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "PONST"};
String PST[] = new String[] {"\ud0dc\ud3c9\uc591 \ud45c\uc900\uc2dc", "PST",
"\ud0dc\ud3c9\uc591 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PDT"};
String SAST[] = new String[] {"\ub0a8\uc544\ud504\ub9ac\uce74 \ud45c\uc900\uc2dc", "SAST",
@@ -171,8 +169,8 @@
"\uc2f1\uac00\ud3ec\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SGST"};
String SLST[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT",
"\uc2dc\uc5d0\ub77c\ub9ac\uc628 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SLST"};
- String TASMANIA[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ud0dc\uc988\uba54\uc774\ub2c8\uc544)", "EST",
- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ud0dc\uc988\uba54\uc774\ub2c8\uc544)", "EST"};
+ String TASMANIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "EST",
+ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "EST"};
String TMT[] = new String[] {"\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc2dc\uac04", "TMT",
"\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TMST"};
String ULAT[]= new String[] {"\uc6b8\ub780\ubc14\ud0c0\ub974 \uc2dc\uac04", "ULAT",
@@ -183,18 +181,18 @@
"\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WAST"};
String WET[] = new String[] {"\uc11c\uc720\ub7fd \uc2dc\uac04", "WET",
"\uc11c\uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WEST"};
- String WIT[] = new String[] {"\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIT",
+ String WIT[] = new String[] {"\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIB",
"\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WIST"};
- String WST_AUS[] = new String[] {"\uc11c\ubd80 \ud45c\uc900\uc2dc(\ud638\uc8fc)", "WST",
- "\uc11c\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ud638\uc8fc)", "WST"};
+ String WST_AUS[] = new String[] {"\uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "WST",
+ "\uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "WST"};
String SAMOA[] = new String[] {"\uc0ac\ubaa8\uc544 \ud45c\uc900\uc2dc", "SST",
"\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SDT"};
String WST_SAMOA[] = new String[] {"\uc11c\uc0ac\ubaa8\uc544 \uc2dc\uac04", "WST",
"\uc11c\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WSDT"};
String ChST[] = new String[] {"\ucc28\ubaa8\ub85c \ud45c\uc900\uc2dc", "ChST",
"\ucc28\ubaa8\ub85c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ChDT"};
- String VICTORIA[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ube45\ud1a0\ub9ac\uc544)", "EST",
- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ube45\ud1a0\ub9ac\uc544)", "EST"};
+ String VICTORIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uBE45\uD1A0\uB9AC\uC544)", "EST",
+ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBE45\uD1A0\uB9AC\uC544)", "EST"};
String UTC[] = new String[] {"\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC",
"\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC"};
String UZT[] = new String[] {"\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "UZT",
@@ -306,7 +304,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
- {"America/Argentina/San_Luis", WART},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -399,8 +397,8 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
- "Metlakatla Daylight Time", "MeDT"}},
+ {"America/Metlakatla", new String[] {"\uBA54\uD2B8\uB77C\uCE74\uD2B8\uB77C \uD45C\uC900\uC2DC", "MeST",
+ "\uBA54\uD2B8\uB77C\uCE74\uD2B8\uB77C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "MeDT"}},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \ud45c\uc900\uc2dc", "PMST",
"\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PMDT"}},
@@ -464,8 +462,8 @@
"Davis \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "DAVST"}},
{"Antarctica/DumontDUrville", new String[] {"\ub4a4\ubabd \ub4a4\ub974\ube4c \uc2dc\uac04", "DDUT",
"\ub4a4\ubabd \ub4a4\ub974\ube4c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "DDUST"}},
- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
- "Macquarie Island Summer Time", "MIST"}},
+ {"Antarctica/Macquarie", new String[] {"\uB9E4\uCF70\uB9AC \uC12C \uD45C\uC900\uC2DC", "MIST",
+ "\uB9E4\uCF70\uB9AC \uC12C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "MIST"}},
{"Antarctica/Mawson", new String[] {"\ubaa8\uc2a8 \uc2dc\uac04", "MAWT",
"\ubaa8\uc2a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MAWST"}},
{"Antarctica/McMurdo", NZST},
@@ -481,7 +479,7 @@
{"Asia/Aden", ARAST},
{"Asia/Almaty", new String[] {"\uc54c\ub9c8\uc544\ud0c0 \uc2dc\uac04", "ALMT",
"\uc54c\ub9c8\uc544\ud0c0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ALMST"}},
- {"Asia/Amman", EET},
+ {"Asia/Amman", ARAST},
{"Asia/Anadyr", new String[] {"\uc544\ub098\ub514\ub974 \uc2dc\uac04", "ANAT",
"\uc544\ub098\ub514\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ANAST"}},
{"Asia/Aqtau", new String[] {"\uc545\ud0c0\uc6b0 \uc2dc\uac04", "AQTT",
@@ -525,7 +523,7 @@
"\uc774\ub974\ucfe0\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IRKST"}},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "EIT",
+ {"Asia/Jayapura", new String[] {"\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIT",
"\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EIST"}},
{"Asia/Kabul", new String[] {"\uc544\ud504\uac00\ub2c8\uc2a4\ud0c4 \uc2dc\uac04", "AFT",
"\uc544\ud504\uac00\ub2c8\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "AFST"}},
@@ -535,8 +533,8 @@
{"Asia/Kashgar", CTT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
- "Khandyga Summer Time", "YAKST"}},
+ {"Asia/Khandyga", new String[] {"\uD55C\uB514\uAC00 \uD45C\uC900\uC2DC", "YAKT",
+ "\uD55C\uB514\uAC00 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "YAKST"}},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc2dc\uac04", "KRAT",
"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KRAST"}},
@@ -585,8 +583,8 @@
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT},
- {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT",
- "Ust-Nera Summer Time", "VLAST" }},
+ {"Asia/Ust-Nera", new String[] {"\uC6B0\uC2A4\uD2F0\uB124\uB77C \uD45C\uC900\uC2DC", "VLAT",
+ "\uC6B0\uC2A4\uD2F0\uB124\uB77C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "VLAST" }},
{"Asia/Vientiane", ICT},
{"Asia/Vladivostok", new String[] {"\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc2dc\uac04", "VLAT",
"\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VLAST"}},
@@ -618,8 +616,8 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"\uc911\uc11c\ubd80 \ud45c\uc900\uc2dc(\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CWST",
- "\uc911\uc11c\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CWST"}},
+ {"Australia/Eucla", new String[] {"\uC911\uC559 \uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CWST",
+ "\uC911\uC559 \uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CWST"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
@@ -675,6 +673,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
+ {"Europe/Busingen", CET},
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
diff --git a/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java b/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
index 124b8eb..d549c10 100644
--- a/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
+++ b/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
@@ -45,10 +45,8 @@
public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
- String ACT[] = new String[] {"Fuso hor\u00e1rio do Acre", "ACT",
- "Fuso hor\u00e1rio de ver\u00e3o do Acre", "ACST"};
- String ADELAIDE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Austr\u00e1lia do Sul)", "CST",
- "Fuso hor\u00e1rio de ver\u00e3o central (Austr\u00e1lia do Sul)", "CST"};
+ String ADELAIDE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul)", "CST",
+ "Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul)", "CST"};
String AGT[] = new String[] {"Fuso hor\u00e1rio da Argentina", "ART",
"Fuso hor\u00e1rio de ver\u00e3o da Argentina", "ARST"};
String AKST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Alaska", "AKST",
@@ -63,10 +61,10 @@
"Hor\u00e1rio de luz natural do Atl\u00e2ntico", "ADT"};
String BDT[] = new String[] {"Fuso hor\u00e1rio de Bangladesh", "BDT",
"Fuso hor\u00e1rio de ver\u00e3o de Bangladesh", "BDST"};
- String BRISBANE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Queensland)", "EST",
- "Fuso hor\u00e1rio de ver\u00e3o oriental (Queensland)", "EST"};
- String BROKEN_HILL[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Austr\u00e1lia do Sul/Nova Gales do Sul)", "CST",
- "Fuso hor\u00e1rio de ver\u00e3o central (Austr\u00e1lia do Sul/Nova Gales do Sul)", "CST"};
+ String BRISBANE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Queensland)", "EST",
+ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Queensland)", "EST"};
+ String BROKEN_HILL[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "CST",
+ "Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "CST"};
String BRT[] = new String[] {"Fuso hor\u00e1rio de Bras\u00edlia", "BRT",
"Fuso hor\u00e1rio de ver\u00e3o de Bras\u00edlia", "BRST"};
String BTT[] = new String[] {"Fuso hor\u00e1rio de But\u00e3o", "BTT",
@@ -77,7 +75,7 @@
"Fuso hor\u00e1rio de ver\u00e3o da Europa Central", "CEST"};
String CHAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chatham", "CHAST",
"Hor\u00e1rio de luz natural de Chatham", "CHADT"};
- String CIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Central", "CIT",
+ String CIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Central", "WITA",
"Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Central", "CIST"};
String CLT[] = new String[] {"Fuso hor\u00e1rio do Chile", "CLT",
"Fuso hor\u00e1rio de ver\u00e3o do Chile", "CLST"};
@@ -87,8 +85,8 @@
"Hor\u00e1rio de luz natural da China", "CDT"};
String CUBA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Cuba", "CST",
"Hor\u00e1rio de luz natural de Cuba", "CDT"};
- String DARWIN[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Territ\u00f3rio do Norte)", "CST",
- "Fuso hor\u00e1rio de ver\u00e3o central (Territ\u00f3rio do Norte)", "CST"};
+ String DARWIN[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Territ\u00F3rio do Norte)", "CST",
+ "Fuso Hor\u00E1rio de Ver\u00E3o Central (Territ\u00F3rio do Norte)", "CST"};
String DUBLIN[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT",
"Fuso hor\u00e1rio de ver\u00e3o da Irlanda", "IST"};
String EAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Oriental", "EAT",
@@ -101,10 +99,10 @@
"Fuso hor\u00e1rio de ver\u00e3o da Groenl\u00e2ndia Oriental", "EGST"};
String EST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental", "EST",
"Hor\u00e1rio de luz natural oriental", "EDT"};
- String EST_NSW[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Nova Gales do Sul)", "EST",
- "Fuso hor\u00e1rio de ver\u00e3o oriental (Nova Gales do Sul)", "EST"};
- String FET[] = new String[] {"Further-eastern European Time", "FET",
- "Further-eastern European Summer Time", "FEST"};
+ String EST_NSW[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Oriental (Nova Gales do Sul)", "EST",
+ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Nova Gales do Sul)", "EST"};
+ String FET[] = new String[] {"Hor\u00E1rio do Extremo Leste Europeu (FET)", "FET",
+ "Fuso Hor\u00E1rio de Ver\u00E3o do Extremo Leste Europeu", "FEST"};
String GHMT[] = new String[] {"Fuso hor\u00e1rio do meridiano de Gana", "GMT",
"Fuso hor\u00e1rio de ver\u00e3o de Gana", "GHST"};
String GAMBIER[] = new String[] {"Fuso hor\u00e1rio de Gambier", "GAMT",
@@ -157,8 +155,8 @@
"Hor\u00e1rio de luz natural de Pitcairn", "PDT"};
String PKT[] = new String[] {"Fuso hor\u00e1rio do Paquist\u00e3o", "PKT",
"Fuso hor\u00e1rio de ver\u00e3o do Paquist\u00e3o", "PKST"};
- String PONT[] = new String[] {"Fuso hor\u00e1rio de Pohnpei", "PONT",
- "Fuso hor\u00e1rio de ver\u00e3o de Pohnpei", "PONST"};
+ String PONT[] = new String[] {"Fuso Hor\u00E1rio de Pohnpei", "PONT",
+ "Fuso Hor\u00E1rio de Ver\u00E3o de Pohnpei", "PONST"};
String PST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Pac\u00edfico", "PST",
"Hor\u00e1rio de luz natural do Pac\u00edfico", "PDT"};
String SAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da \u00c1frica do Sul", "SAST",
@@ -169,30 +167,30 @@
"Fuso hor\u00e1rio de ver\u00e1 de Cingapura", "SGST"};
String SLST[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT",
"Fuso hor\u00e1rio de ver\u00e3o de Serra Leoa", "SLST"};
- String TASMANIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Tasm\u00e2nia)", "EST",
- "Fuso hor\u00e1rio de ver\u00e3o oriental (Tasm\u00e2nia)", "EST"};
+ String TASMANIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Tasm\u00E2nia)", "EST",
+ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Tasm\u00E2nia)", "EST"};
String TMT[] = new String[] {"Fuso hor\u00e1rio do Turcomenist\u00e3o", "TMT",
"Fuso hor\u00e1rio de ver\u00e3o do Turcomenist\u00e3o", "TMST"};
- String TRUT[] = new String[] {"Fuso hor\u00e1rio de Chuuk", "CHUT",
- "Fuso hor\u00e1rio de ver\u00e3o de Chuuk", "CHUST"};
+ String TRUT[] = new String[] {"Fuso Hor\u00E1rio de Chuuk", "CHUT",
+ "Fuso Hor\u00E1rio de Ver\u00E3o de Chuuk", "CHUST"};
String ULAT[]= new String[] {"Fuso hor\u00e1rio de Ulan Bator", "ULAT",
"Fuso hor\u00e1rio de ver\u00e3o de Ulan Bator", "ULAST"};
String WAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Ocidental", "WAT",
"Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica Ocidental", "WAST"};
String WET[] = new String[] {"Fuso hor\u00e1rio da Europa Ocidental", "WET",
"Fuso hor\u00e1rio de ver\u00e3o da Europa Ocidental", "WEST"};
- String WIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Ocidental", "WIT",
+ String WIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Ocidental", "WIB",
"Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Ocidental", "WIST"};
- String WST_AUS[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o ocidental (Austr\u00e1lia)", "WST",
- "Fuso hor\u00e1rio de ver\u00e3o ocidental (Austr\u00e1lia)", "WST"};
+ String WST_AUS[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Ocidental (Austr\u00E1lia)", "WST",
+ "Fuso Hor\u00E1rio de Ver\u00E3o Ocidental (Austr\u00E1lia)", "WST"};
String SAMOA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Samoa", "SST",
"Hor\u00e1rio de luz natural de Samoa", "SDT"};
String WST_SAMOA[] = new String[] {"Fuso hor\u00e1rio de Samoa Ocidental", "WST",
"Fuso hor\u00e1rio de ver\u00e3o de Samoa Ocidental", "WSDT"};
String ChST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chamorro", "ChST",
"Hor\u00e1rio de luz natural de Chamorro", "ChDT"};
- String VICTORIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Victoria)", "EST",
- "Fuso hor\u00e1rio de ver\u00e3o oriental (Victoria)", "EST"};
+ String VICTORIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Victoria)", "EST",
+ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Victoria)", "EST"};
String UTC[] = new String[] {"Tempo universal coordenado", "UTC",
"Tempo universal coordenado", "UTC"};
String UZT[] = new String[] {"Fuso hor\u00e1rio do Uzbequist\u00e3o", "UZT",
@@ -306,7 +304,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
- {"America/Argentina/San_Luis", WART},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -399,8 +397,8 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
- "Metlakatla Daylight Time", "MeDT"}},
+ {"America/Metlakatla", new String[] {"Hor\u00E1rio Padr\u00E3o de Metlakatla", "MeST",
+ "Hor\u00E1rio de Luz Natural de Metlakatla", "MeDT"}},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Fuso hor\u00e1rio padr\u00e3o de S\u00e3o Pedro e Miquelon", "PMST",
"Hor\u00e1rio de luz natural de S\u00e3o Pedro e Miquelon", "PMDT"}},
@@ -464,8 +462,8 @@
"Fuso hor\u00e1rio de ver\u00e3o de Davis", "DAVST"}},
{"Antarctica/DumontDUrville", new String[] {"Fuso hor\u00e1rio de Dumont-d'Urville", "DDUT",
"Fuso hor\u00e1rio de ver\u00e3o de Dumont-d'Urville", "DDUST"}},
- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
- "Macquarie Island Summer Time", "MIST"}},
+ {"Antarctica/Macquarie", new String[] {"Fuso Hor\u00E1rio da Ilha de Macquarie", "MIST",
+ "Fuso Hor\u00E1rio de Ver\u00E3o da Ilha de Macquarie", "MIST"}},
{"Antarctica/Mawson", new String[] {"Fuso hor\u00e1rio de Mawson", "MAWT",
"Fuso hor\u00e1rio de ver\u00e3o de Mawson", "MAWST"}},
{"Antarctica/McMurdo", NZST},
@@ -481,7 +479,7 @@
{"Asia/Aden", ARAST},
{"Asia/Almaty", new String[] {"Fuso hor\u00e1rio de Alma-Ata", "ALMT",
"Fuso hor\u00e1rio de ver\u00e3o de Alma-Ata", "ALMST"}},
- {"Asia/Amman", EET},
+ {"Asia/Amman", ARAST},
{"Asia/Anadyr", new String[] {"Fuso hor\u00e1rio de Anadyr", "ANAT",
"Fuso hor\u00e1rio de ver\u00e3o de Anadyr", "ANAST"}},
{"Asia/Aqtau", new String[] {"Fuso hor\u00e1rio de Aqtau", "AQTT",
@@ -525,7 +523,7 @@
"Fuso hor\u00e1rio de ver\u00e3o de Irkutsk", "IRKST"}},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Oriental", "EIT",
+ {"Asia/Jayapura", new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Oriental", "WIT",
"Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Oriental", "EIST"}},
{"Asia/Kabul", new String[] {"Fuso hor\u00e1rio do Afeganist\u00e3o", "AFT",
"Fuso hor\u00e1rio de ver\u00e3o do Afeganist\u00e3o", "AFST"}},
@@ -535,8 +533,8 @@
{"Asia/Kashgar", CTT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
- "Khandyga Summer Time", "YAKST"}},
+ {"Asia/Khandyga", new String[] {"Hor\u00E1rio de Khandyga", "YAKT",
+ "Hor\u00E1rio de Ver\u00E3o de Khandyga", "YAKST"}},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"Fuso hor\u00e1rio de Krasnoyarsk", "KRAT",
"Fuso hor\u00e1rio de ver\u00e3o de Krasnoyarsk", "KRAST"}},
@@ -585,8 +583,8 @@
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT},
- {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT",
- "Ust-Nera Summer Time", "VLAST"}},
+ {"Asia/Ust-Nera", new String[] {"Hor\u00E1rio de Ust-Nera", "VLAT",
+ "Hor\u00E1rio de Ver\u00E3o de Ust-Nera", "VLAST"}},
{"Asia/Vientiane", ICT},
{"Asia/Vladivostok", new String[] {"Fuso hor\u00e1rio de Vladivostok", "VLAT",
"Fuso hor\u00e1rio de ver\u00e3o de Vladivostok", "VLAST"}},
@@ -618,8 +616,8 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"Fuso hor\u00e1rio ocidental central (Austr\u00e1lia)", "CWST",
- "Fuso hor\u00e1rio de ver\u00e3o ocidental central (Austr\u00e1lia)", "CWST"}},
+ {"Australia/Eucla", new String[] {"Fuso Hor\u00E1rio Ocidental Central (Austr\u00E1lia)", "CWST",
+ "Fuso Hor\u00E1rio de Ver\u00E3o Ocidental Central (Austr\u00E1lia)", "CWST"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
@@ -675,6 +673,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
+ {"Europe/Busingen", CET},
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
diff --git a/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java b/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
index 0e54cea..667b103 100644
--- a/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
+++ b/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
@@ -45,10 +45,8 @@
public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
- String ACT[] = new String[] {"Acre, normaltid", "ACT",
- "Acre, sommartid", "ACST"};
- String ADELAIDE[] = new String[] {"Central normaltid (S\u00f6dra Australien)", "CST",
- "Central sommartid (S\u00f6dra Australien)", "CST"};
+ String ADELAIDE[] = new String[] {"Central standardtid (Sydaustralien)", "CST",
+ "Central sommartid (South Australia)", "CST"};
String AGT[] = new String[] {"Argentina, normaltid", "ART",
"Argentina, sommartid", "ARST"};
String AKST[] = new String[] {"Alaska, normaltid", "AKST",
@@ -63,10 +61,10 @@
"Atlantisk sommartid", "ADT"};
String BDT[] = new String[] {"Bangladesh, normaltid", "BDT",
"Bangladesh, sommartid", "BDST"};
- String BRISBANE[] = new String[] {"\u00d6stlig normaltid (Queensland)", "EST",
- "\u00d6stlig sommartid (Queensland)", "EST"};
- String BROKEN_HILL[] = new String[] {"Central normaltid (S\u00f6dra Australien/Nya Sydwales)", "CST",
- "Central sommartid (S\u00f6dra Australien/Nya Sydwales)", "CST"};
+ String BRISBANE[] = new String[] {"\u00D6stlig standardtid (Queensland)", "EST",
+ "\u00D6stlig sommartid (Queensland)", "EST"};
+ String BROKEN_HILL[] = new String[] {"Central standardtid (Sydaustralien)/New South Wales)", "CST",
+ "Central sommartid (South Australia/New South Wales)", "CST"};
String BRT[] = new String[] {"Brasilien, normaltid", "BRT",
"Brasilien, sommartid", "BRST"};
String BTT[] = new String[] {"Bhutan, normaltid", "BTT",
@@ -77,9 +75,9 @@
"Centraleuropeisk sommartid", "CEST"};
String CHAST[] = new String[] {"Chatham, normaltid", "CHAST",
"Chatham, sommartid", "CHADT"};
- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
- "Chuuk Summer Time", "CHUST"};
- String CIT[] = new String[] {"Centralindonesisk tid", "CIT",
+ String CHUT[] = new String[] {"Chuuk, normaltid", "CHUT",
+ "Chuuk, sommartid", "CHUST"};
+ String CIT[] = new String[] {"Centralindonesisk tid", "WITA",
"Centralindonesisk sommartid", "CIST"};
String CLT[] = new String[] {"Chile, normaltid", "CLT",
"Chile, sommartid", "CLST"};
@@ -89,7 +87,7 @@
"Kina, sommartid", "CDT"};
String CUBA[] = new String[] {"Kuba, normaltid", "CST",
"Kuba, sommartid", "CDT"};
- String DARWIN[] = new String[] {"Central normaltid (Nordterritoriet)", "CST",
+ String DARWIN[] = new String[] {"Central standardtid (Nordterritoriet)", "CST",
"Central sommartid (Nordterritoriet)", "CST"};
String DUBLIN[] = new String[] {"Greenwichtid", "GMT",
"Irland, sommartid", "IST"};
@@ -103,10 +101,10 @@
"\u00d6stgr\u00f6nl\u00e4ndsk sommartid", "EGST"};
String EST[] = new String[] {"Eastern, normaltid", "EST",
"Eastern, sommartid", "EDT"};
- String EST_NSW[] = new String[] {"Eastern, normaltid (Nya Sydwales)", "EST",
- "Eastern, sommartid (Nya Sydwales)", "EST"};
- String FET[] = new String[] {"Further-eastern European Time", "FET",
- "Further-eastern European Summer Time", "FEST"};
+ String EST_NSW[] = new String[] {"\u00D6stlig standardtid (New South Wales)", "EST",
+ "\u00D6stlig sommartid (New South Wales)", "EST"};
+ String FET[] = new String[] {"Kaliningradtid", "FET",
+ "\u00D6steuropeisk sommartid", "FEST"};
String GHMT[] = new String[] {"Ghana, normaltid", "GMT",
"Ghana, sommartid", "GHST"};
String GAMBIER[] = new String[] {"Gambier, normaltid", "GAMT",
@@ -159,8 +157,8 @@
"Pitcairn, sommartid", "PDT"};
String PKT[] = new String[] {"Pakistan, normaltid", "PKT",
"Pakistan, sommartid", "PKST"};
- String PONT[] = new String[] {"Pohnpei Time", "PONT",
- "Pohnpei Summer Time", "PONST"};
+ String PONT[] = new String[] {"Pohnpei, normaltid", "PONT",
+ "Pohnpei, sommartid", "PONST"};
String PST[] = new String[] {"Stilla havet, normaltid", "PST",
"Stilla havet, sommartid", "PDT"};
String SAST[] = new String[] {"Sydafrika, normaltid", "SAST",
@@ -171,8 +169,8 @@
"Singapore, sommartid", "SGST"};
String SLST[] = new String[] {"Greenwichtid", "GMT",
"Sierra Leone, sommartid", "SLST"};
- String TASMANIA[] = new String[] {"Eastern, normaltid (Tasmanien)", "EST",
- "Eastern, sommartid (Tasmanien)", "EST"};
+ String TASMANIA[] = new String[] {"\u00D6stlig standardtid (Tasmania)", "EST",
+ "\u00D6stlig sommartid (Tasmanien)", "EST"};
String TMT[] = new String[] {"Turkmenistan, normaltid", "TMT",
"Turkmenistan, sommartid", "TMST"};
String ULAT[]= new String[] {"Ulaanbaatar, normaltid", "ULAT",
@@ -183,18 +181,18 @@
"V\u00e4stafrikansk sommartid", "WAST"};
String WET[] = new String[] {"V\u00e4steuropeisk tid", "WET",
"V\u00e4steuropeisk sommartid", "WEST"};
- String WIT[] = new String[] {"V\u00e4stindonesisk tid", "WIT",
+ String WIT[] = new String[] {"V\u00e4stindonesisk tid", "WIB",
"V\u00e4stindonesisk sommartid", "WIST"};
- String WST_AUS[] = new String[] {"V\u00e4stlig normaltid (Australien)", "WST",
- "V\u00e4stlig sommartid (Australien)", "WST"};
+ String WST_AUS[] = new String[] {"Western Standard Time (Australien)", "WST",
+ "V\u00E4stlig sommartid (Australien)", "WST"};
String SAMOA[] = new String[] {"Samoa, normaltid", "SST",
"Samoa, sommartid", "SDT"};
String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WST",
"V\u00e4stsamoansk sommartid", "WSDT"};
String ChST[] = new String[] {"Chamorro, normaltid", "ChST",
"Chamorro, sommartid", "ChDT"};
- String VICTORIA[] = new String[] {"\u00d6stlig normaltid (Victoria)", "EST",
- "\u00d6stlig sommartid (Victoria)", "EST"};
+ String VICTORIA[] = new String[] {"\u00D6stlig standardtid (Victoria)", "EST",
+ "\u00D6stlig sommartid (Victoria)", "EST"};
String UTC[] = new String[] {"Koordinerad universell tid", "UTC",
"Koordinerad universell tid", "UTC"};
String UZT[] = new String[] {"Uzbekistan, normaltid", "UZT",
@@ -306,7 +304,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
- {"America/Argentina/San_Luis", WART},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -399,8 +397,8 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
- "Metlakatla Daylight Time", "MeDT"}},
+ {"America/Metlakatla", new String[] {"Metlakatla, normaltid", "MeST",
+ "Metlakatla, sommartid", "MeDT"}},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Saint-Pierre-et-Miquelon, normaltid", "PMST",
"Saint-Pierre-et-Miquelon, sommartid", "PMDT"}},
@@ -464,8 +462,8 @@
"Davis, sommartid", "DAVST"}},
{"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville, normaltid", "DDUT",
"Dumont-d'Urville, sommartid", "DDUST"}},
- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
- "Macquarie Island Summer Time", "MIST"}},
+ {"Antarctica/Macquarie", new String[] {"Macquarie\u00F6n, normaltid", "MIST",
+ "Macquarie\u00F6n, sommartid", "MIST"}},
{"Antarctica/Mawson", new String[] {"Mawson, normaltid", "MAWT",
"Mawson, sommartid", "MAWST"}},
{"Antarctica/McMurdo", NZST},
@@ -481,7 +479,7 @@
{"Asia/Aden", ARAST},
{"Asia/Almaty", new String[] {"Alma-Ata, normaltid", "ALMT",
"Alma-Ata, sommartid", "ALMST"}},
- {"Asia/Amman", EET},
+ {"Asia/Amman", ARAST},
{"Asia/Anadyr", new String[] {"Anadyr, normaltid", "ANAT",
"Anadyr, sommartid", "ANAST"}},
{"Asia/Aqtau", new String[] {"Aqtau, normaltid", "AQTT",
@@ -525,7 +523,7 @@
"Irkutsk, sommartid", "IRKST"}},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"\u00d6stindonesisk tid", "EIT",
+ {"Asia/Jayapura", new String[] {"\u00d6stindonesisk tid", "WIT",
"\u00d6stindonesisk sommartid", "EIST"}},
{"Asia/Kabul", new String[] {"Afghanistan, normaltid", "AFT",
"Afghanistan, sommartid", "AFST"}},
@@ -535,8 +533,8 @@
{"Asia/Kashgar", CTT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
- "Khandyga Summer Time", "YAKST"}},
+ {"Asia/Khandyga", new String[] {"Khandyga, normaltid", "YAKT",
+ "Khandyga, sommartid", "YAKST"}},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"Krasnojarsk, normaltid", "KRAT",
"Krasnojarsk, sommartid", "KRAST"}},
@@ -585,8 +583,8 @@
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT},
- {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT",
- "Ust-Nera Summer Time", "VLAST"}},
+ {"Asia/Ust-Nera", new String[] {"Ust-Nera, normaltid", "VLAT",
+ "Ust-Nera, sommartid", "VLAST"}},
{"Asia/Vientiane", ICT},
{"Asia/Vladivostok", new String[] {"Vladivostok, normaltid", "VLAT",
"Vladivostok, sommartid", "VLAST"}},
@@ -618,8 +616,8 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"Central v\u00e4stlig normaltid (Australien)", "CWST",
- "Central v\u00e4stlig sommartid (Australien)", "CWST"}},
+ {"Australia/Eucla", new String[] {"Central v\u00E4stlig normaltid (Australien)", "CWST",
+ "Central v\u00E4stlig sommartid (Australien)", "CWST"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
@@ -675,6 +673,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
+ {"Europe/Busingen", CET},
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
diff --git a/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java b/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
index 74777e3..a3bbb33 100644
--- a/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
+++ b/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
@@ -45,10 +45,8 @@
public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
- String ACT[] = new String[] {"Acre \u65f6\u95f4", "ACT",
- "Acre \u590f\u4ee4\u65f6", "ACST"};
- String ADELAIDE[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5357\u6fb3\u5927\u5229\u4e9a\uff09", "CST",
- "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5357\u6fb3\u5927\u5229\u4e9a\uff09", "CST"};
+ String ADELAIDE[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CST",
+ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CST"};
String AGT[] = new String[] {"\u963f\u6839\u5ef7\u65f6\u95f4", "ART",
"\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "ARST"};
String AKST[] = new String[] {"\u963f\u62c9\u65af\u52a0\u6807\u51c6\u65f6\u95f4", "AKST",
@@ -63,10 +61,10 @@
"\u5927\u897f\u6d0b\u590f\u4ee4\u65f6", "ADT"};
String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u65f6\u95f4", "BDT",
"\u5b5f\u52a0\u62c9\u590f\u4ee4\u65f6", "BDST"};
- String BRISBANE[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6606\u58eb\u5170\uff09", "EST",
- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u6606\u58eb\u5170\uff09", "EST"};
- String BROKEN_HILL[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5357\u6fb3\u5927\u5229\u4e9a/\u65b0\u5357\u5a01\u5c14\u65af\uff09", "CST",
- "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5357\u6fb3\u5927\u5229\u4e9a/\u65b0\u5357\u5a01\u5c14\u65af\uff09", "CST"};
+ String BRISBANE[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u6606\u58EB\u5170)", "EST",
+ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u6606\u58EB\u5170)", "EST"};
+ String BROKEN_HILL[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "CST",
+ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "CST"};
String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9a\u65f6\u95f4", "BRT",
"\u5df4\u897f\u5229\u4e9a\u590f\u4ee4\u65f6", "BRST"};
String BTT[] = new String[] {"\u4e0d\u4e39\u65f6\u95f4", "BTT",
@@ -77,9 +75,9 @@
"\u4e2d\u6b27\u590f\u4ee4\u65f6", "CEST"};
String CHAST[] = new String[] {"\u67e5\u8428\u59c6\u6807\u51c6\u65f6\u95f4", "CHAST",
"\u67e5\u8428\u59c6\u590f\u4ee4\u65f6", "CHADT"};
- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
- "Chuuk Summer Time", "CHUST"};
- String CIT[] = new String[] {"\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "CIT",
+ String CHUT[] = new String[] {"\u4E18\u514B\u65F6\u95F4", "CHUT",
+ "\u4E18\u514B\u590F\u4EE4\u65F6", "CHUST"};
+ String CIT[] = new String[] {"\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WITA",
"\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "CIST"};
String CLT[] = new String[] {"\u667a\u5229\u65f6\u95f4", "CLT",
"\u667a\u5229\u590f\u4ee4\u65f6", "CLST"};
@@ -89,8 +87,8 @@
"\u4e2d\u56fd\u590f\u4ee4\u65f6", "CDT"};
String CUBA[] = new String[] {"\u53e4\u5df4\u6807\u51c6\u65f6\u95f4", "CST",
"\u53e4\u5df4\u590f\u4ee4\u65f6", "CDT"};
- String DARWIN[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5317\u9886\u5730\uff09", "CST",
- "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5317\u9886\u5730\uff09", "CST"};
+ String DARWIN[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5317\u9886\u5730)", "CST",
+ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5317\u9886\u5730)", "CST"};
String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT",
"\u7231\u5c14\u5170\u590f\u4ee4\u65f6", "IST"};
String EAT[] = new String[] {"\u4e1c\u975e\u65f6\u95f4", "EAT",
@@ -103,10 +101,10 @@
"\u4e1c\u683c\u6797\u5c9b\u590f\u4ee4\u65f6", "EGST"};
String EST[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4", "EST",
"\u4e1c\u90e8\u590f\u4ee4\u65f6", "EDT"};
- String EST_NSW[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09", "EST",
- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09", "EST"};
- String FET[] = new String[] {"Further-eastern European Time", "FET",
- "Further-eastern European Summer Time", "FEST"};
+ String EST_NSW[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u65B0\u5357\u5A01\u5C14\u65AF)", "EST",
+ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u65B0\u5357\u5A01\u5C14\u65AF)", "EST"};
+ String FET[] = new String[] {"\u8FDC\u4E1C\u6B27\u65F6\u95F4", "FET",
+ "\u8FDC\u4E1C\u6B27\u590F\u4EE4\u65F6", "FEST"};
String GHMT[] = new String[] {"\u52a0\u7eb3\u65f6\u95f4", "GMT",
"\u52a0\u7eb3\u590f\u4ee4\u65f6", "GHST"};
String GAMBIER[] = new String[] {"\u5188\u6bd4\u4e9a\u65f6\u95f4", "GAMT",
@@ -159,8 +157,8 @@
"\u76ae\u7279\u5eb7\u5c9b\u590f\u4ee4\u65f6", "PDT"};
String PKT[] = new String[] {"\u5df4\u57fa\u65af\u5766\u65f6\u95f4", "PKT",
"\u5df4\u57fa\u65af\u5766\u590f\u4ee4\u65f6", "PKST"};
- String PONT[] = new String[] {"Pohnpei Time", "PONT",
- "Pohnpei Summer Time", "PONST"};
+ String PONT[] = new String[] {"\u6CE2\u7EB3\u4F69\u65F6\u95F4", "PONT",
+ "\u6CE2\u7EB3\u4F69\u590F\u4EE4\u65F6", "PONST"};
String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6807\u51c6\u65f6\u95f4", "PST",
"\u592a\u5e73\u6d0b\u590f\u4ee4\u65f6", "PDT"};
String SAST[] = new String[] {"\u5357\u975e\u6807\u51c6\u65f6\u95f4", "SAST",
@@ -171,8 +169,8 @@
"\u65b0\u52a0\u5761\u590f\u4ee4\u65f6", "SGST"};
String SLST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT",
"\u585e\u62c9\u5229\u6602\u590f\u4ee4\u65f6", "SLST"};
- String TASMANIA[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u5854\u65af\u9a6c\u5c3c\u4e9a\uff09", "EST",
- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u5854\u65af\u9a6c\u5c3c\u4e9a\uff09", "EST"};
+ String TASMANIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "EST",
+ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "EST"};
String TMT[] = new String[] {"\u571f\u5e93\u66fc\u65f6\u95f4", "TMT",
"\u571f\u5e93\u66fc\u590f\u4ee4\u65f6", "TMST"};
String ULAT[]= new String[] {"\u5e93\u4f26\u65f6\u95f4", "ULAT",
@@ -183,18 +181,18 @@
"\u897f\u975e\u590f\u4ee4\u65f6", "WAST"};
String WET[] = new String[] {"\u897f\u6b27\u65f6\u95f4", "WET",
"\u897f\u6b27\u590f\u4ee4\u65f6", "WEST"};
- String WIT[] = new String[] {"\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIT",
+ String WIT[] = new String[] {"\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIB",
"\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "WIST"};
- String WST_AUS[] = new String[] {"\u897f\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "WST",
- "\u897f\u90e8\u590f\u4ee4\u65f6\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "WST"};
+ String WST_AUS[] = new String[] {"\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "WST",
+ "\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "WST"};
String SAMOA[] = new String[] {"\u8428\u6469\u4e9a\u7fa4\u5c9b\u6807\u51c6\u65f6\u95f4", "SST",
"\u8428\u6469\u4e9a\u7fa4\u5c9b\u590f\u4ee4\u65f6", "SDT"};
String WST_SAMOA[] = new String[] {"\u897f\u8428\u6469\u4e9a\u65f6\u95f4", "WST",
"\u897f\u8428\u6469\u4e9a\u590f\u4ee4\u65f6", "WSDT"};
String ChST[] = new String[] {"Chamorro \u6807\u51c6\u65f6\u95f4", "ChST",
"Chamorro \u590f\u4ee4\u65f6", "ChDT"};
- String VICTORIA[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u7ef4\u591a\u5229\u4e9a\uff09", "EST",
- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u7ef4\u591a\u5229\u4e9a\uff09", "EST"};
+ String VICTORIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u7EF4\u591A\u5229\u4E9A)", "EST",
+ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u7EF4\u591A\u5229\u4E9A)", "EST"};
String UTC[] = new String[] {"\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC",
"\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC"};
String UZT[] = new String[] {"\u4e4c\u5179\u522b\u514b\u65af\u5766\u65f6\u95f4", "UZT",
@@ -306,7 +304,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
- {"America/Argentina/San_Luis", WART},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -399,8 +397,8 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
- "Metlakatla Daylight Time", "MeDT"}},
+ {"America/Metlakatla", new String[] {"\u6885\u7279\u62C9\u5361\u7279\u62C9\u6807\u51C6\u65F6\u95F4", "MeST",
+ "\u6885\u7279\u62C9\u5361\u7279\u62C9\u590F\u4EE4\u65F6", "MeDT"}},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u6807\u51c6\u65f6\u95f4", "PMST",
"\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u590f\u4ee4\u65f6", "PMDT"}},
@@ -464,8 +462,8 @@
"\u6234\u7ef4\u65af\u590f\u4ee4\u65f6", "DAVST"}},
{"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville \u65f6\u95f4", "DDUT",
"Dumont-d'Urville \u590f\u4ee4\u65f6", "DDUST"}},
- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
- "Macquarie Island Summer Time", "MIST"}},
+ {"Antarctica/Macquarie", new String[] {"\u9EA6\u5938\u91CC\u5C9B\u65F6\u95F4", "MIST",
+ "\u9EA6\u5938\u91CC\u5C9B\u590F\u4EE4\u65F6", "MIST"}},
{"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u65f6\u95f4", "MAWT",
"\u83ab\u68ee\u590f\u4ee4\u65f6", "MAWST"}},
{"Antarctica/McMurdo", NZST},
@@ -481,7 +479,7 @@
{"Asia/Aden", ARAST},
{"Asia/Almaty", new String[] {"Alma-Ata \u65f6\u95f4", "ALMT",
"Alma-Ata \u590f\u4ee4\u65f6", "ALMST"}},
- {"Asia/Amman", EET},
+ {"Asia/Amman", ARAST},
{"Asia/Anadyr", new String[] {"\u963f\u90a3\u5e95\u6cb3\u65f6\u95f4", "ANAT",
"\u963f\u90a3\u5e95\u6cb3\u590f\u4ee4\u65f6", "ANAST"}},
{"Asia/Aqtau", new String[] {"Aqtau \u65f6\u95f4", "AQTT",
@@ -525,7 +523,7 @@
"\u4f0a\u5c14\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "IRKST"}},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "EIT",
+ {"Asia/Jayapura", new String[] {"\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIT",
"\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "EIST"}},
{"Asia/Kabul", new String[] {"\u963f\u5bcc\u6c57\u65f6\u95f4", "AFT",
"\u963f\u5bcc\u6c57\u590f\u4ee4\u65f6", "AFST"}},
@@ -535,8 +533,8 @@
{"Asia/Kashgar", CTT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
- "Khandyga Summer Time", "YAKST"}},
+ {"Asia/Khandyga", new String[] {"\u6C49\u5FB7\u52A0\u65F6\u95F4", "YAKT",
+ "\u6C49\u5FB7\u52A0\u590F\u4EE4\u65F6", "YAKST"}},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u65f6\u95f4", "KRAT",
"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u590f\u4ee4\u65f6", "KRAST"}},
@@ -585,8 +583,8 @@
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT},
- {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT",
- "Ust-Nera Summer Time", "VLAST"}},
+ {"Asia/Ust-Nera", new String[] {"\u4E4C\u65AF\u5B63\u6D85\u62C9\u65F6\u95F4", "VLAT",
+ "\u4E4C\u65AF\u5B63\u6D85\u62C9\u590F\u4EE4\u65F6", "VLAST"}},
{"Asia/Vientiane", ICT},
{"Asia/Vladivostok", new String[] {"\u6d77\u53c2\u5d34\u65f6\u95f4", "VLAT",
"\u6d77\u53c2\u5d34\u590f\u4ee4\u65f6", "VLAST"}},
@@ -618,8 +616,8 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "CWST",
- "\u4e2d\u897f\u90e8\u590f\u4ee4\u65f6\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "CWST"}},
+ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "CWST",
+ "\u4E2D\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "CWST"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
@@ -675,6 +673,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
+ {"Europe/Busingen", CET},
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
diff --git a/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java b/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
index 66de2c3..322eecf 100644
--- a/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
+++ b/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
@@ -45,10 +45,8 @@
public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
- String ACT[] = new String[] {"Acre \u6642\u9593", "ACT",
- "Acre \u590f\u4ee4\u6642\u9593", "ACST"};
- String ADELAIDE[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340)", "CST",
- "\u4e2d\u90e8\u590f\u4ee4\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340)", "CST"};
+ String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u90E8)", "CST",
+ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340)", "CST"};
String AGT[] = new String[] {"\u963f\u6839\u5ef7\u6642\u9593", "ART",
"\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "ARST"};
String AKST[] = new String[] {"\u963f\u62c9\u65af\u52a0\u6a19\u6e96\u6642\u9593", "AKST",
@@ -63,10 +61,10 @@
"\u5927\u897f\u6d0b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ADT"};
String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u6642\u9593", "BDT",
"\u5b5f\u52a0\u62c9\u590f\u4ee4\u6642\u9593", "BDST"};
- String BRISBANE[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642\u9593 (\u6606\u58eb\u862d)", "EST",
- "\u6771\u90e8\u590f\u4ee4\u6642\u9593 (\u6606\u58eb\u862d)", "EST"};
- String BROKEN_HILL[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340/\u65b0\u5357\u5a01\u723e\u65af)", "CST",
- "\u4e2d\u90e8\u590f\u4ee4\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340/\u65b0\u5357\u5a01\u723e\u65af)", "CST"};
+ String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u6606\u58EB\u862D)", "EST",
+ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u6606\u58EB\u862D)", "EST"};
+ String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "CST",
+ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "CST"};
String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9e\u6642\u9593", "BRT",
"\u5df4\u897f\u5229\u4e9e\u590f\u4ee4\u6642\u9593", "BRST"};
String BTT[] = new String[] {"\u4e0d\u4e39\u6642\u9593", "BTT",
@@ -77,9 +75,9 @@
"\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "CEST"};
String CHAST[] = new String[] {"\u67e5\u5766\u6a19\u6e96\u6642\u9593", "CHAST",
"\u67e5\u5766\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CHADT"};
- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
- "Chuuk Summer Time", "CHUST"};
- String CIT[] = new String[] {"\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "CIT",
+ String CHUT[] = new String[] {"\u695A\u514B\u6642\u9593", "CHUT",
+ "\u695A\u514B\u590F\u4EE4\u6642\u9593", "CHUST"};
+ String CIT[] = new String[] {"\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "WITA",
"\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u590f\u4ee4\u6642\u9593", "CIST"};
String CLT[] = new String[] {"\u667a\u5229\u6642\u9593", "CLT",
"\u667a\u5229\u590f\u4ee4\u6642\u9593", "CLST"};
@@ -89,8 +87,8 @@
"\u4e2d\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"};
String CUBA[] = new String[] {"\u53e4\u5df4\u6a19\u6e96\u6642\u9593", "CST",
"\u53e4\u5df4\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"};
- String DARWIN[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642\u9593 (\u5317\u90e8\u5404\u5730\u5340)", "CST",
- "\u4e2d\u90e8\u590f\u4ee4\u6642\u9593 (\u5317\u90e8\u5404\u5730\u5340)", "CST"};
+ String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "CST",
+ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "CST"};
String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT",
"\u611b\u723e\u862d\u590f\u4ee4\u6642\u9593", "IST"};
String EAT[] = new String[] {"\u6771\u975e\u6642\u9593", "EAT",
@@ -103,10 +101,10 @@
"\u6771\u683c\u6797\u5cf6\u590f\u4ee4\u6642\u9593", "EGST"};
String EST[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593", "EST",
"\u6771\u65b9\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "EDT"};
- String EST_NSW[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593 (\u65b0\u5357\u5a01\u723e\u65af)", "EST",
- "\u6771\u65b9\u590f\u4ee4\u6642\u9593 (\u65b0\u5357\u5a01\u723e\u65af)", "EST"};
- String FET[] = new String[] {"Further-eastern European Time", "FET",
- "Further-eastern European Summer Time", "FEST"};
+ String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "EST",
+ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "EST"};
+ String FET[] = new String[] {"\u6771\u6B50\u5167\u9678\u6642\u9593", "FET",
+ "\u6771\u6B50\u5167\u9678\u590F\u4EE4\u6642\u9593", "FEST"};
String GHMT[] = new String[] {"\u8fe6\u7d0d\u5e73\u5747\u6642\u9593", "GMT",
"\u8fe6\u7d0d\u590f\u4ee4\u6642\u9593", "GHST"};
String GAMBIER[] = new String[] {"\u7518\u6bd4\u723e\u6642\u9593", "GAMT",
@@ -159,8 +157,8 @@
"\u76ae\u7279\u5eb7\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PDT"};
String PKT[] = new String[] {"\u5df4\u57fa\u65af\u5766\u6642\u9593", "PKT",
"\u5df4\u57fa\u65af\u5766\u590f\u4ee4\u6642\u9593", "PKST"};
- String PONT[] = new String[] {"Pohnpei Time", "PONT",
- "Pohnpei Summer Time", "PONST"};
+ String PONT[] = new String[] {"\u6CE2\u7D0D\u4F69\u6642\u9593", "PONT",
+ "\u6CE2\u7D0D\u4F69\u590F\u4EE4\u6642\u9593", "PONST"};
String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642\u9593", "PST",
"\u592a\u5e73\u6d0b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PDT"};
String SAST[] = new String[] {"\u5357\u975e\u6a19\u6e96\u6642\u9593", "SAST",
@@ -171,8 +169,8 @@
"\u65b0\u52a0\u5761\u590f\u4ee4\u6642\u9593", "SGST"};
String SLST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT",
"\u7345\u5b50\u5c71\u590f\u4ee4\u6642\u9593", "SLST"};
- String TASMANIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642\u9593 (\u5854\u65af\u6885\u5c3c\u4e9e\u5cf6)", "EST",
- "\u6771\u90e8\u590f\u4ee4\u6642\u9593 (\u5854\u65af\u6885\u5c3c\u4e9e\u5cf6)", "EST"};
+ String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "EST",
+ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "EST"};
String TMT[] = new String[] {"\u571f\u5eab\u66fc\u6642\u9593", "TMT",
"\u571f\u5eab\u66fc\u590f\u4ee4\u6642\u9593", "TMST"};
String ULAT[]= new String[] {"\u5eab\u502b\u6642\u9593", "ULAT",
@@ -183,18 +181,18 @@
"\u897f\u975e\u590f\u4ee4\u6642\u9593", "WAST"};
String WET[] = new String[] {"\u897f\u6b50\u6642\u9593", "WET",
"\u897f\u6b50\u590f\u4ee4\u6642\u9593", "WEST"};
- String WIT[] = new String[] {"\u897f\u5370\u5c3c\u6642\u9593", "WIT",
+ String WIT[] = new String[] {"\u897f\u5370\u5c3c\u6642\u9593", "WIB",
"\u897f\u5370\u5c3c\u590f\u4ee4\u6642\u9593", "WIST"};
- String WST_AUS[] = new String[] {"\u897f\u65b9\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "WST",
- "\u897f\u65b9\u590f\u4ee4\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "WST"};
+ String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "WST",
+ "\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "WST"};
String SAMOA[] = new String[] {"\u85a9\u6469\u4e9e\u6a19\u6e96\u6642\u9593", "SST",
"\u85a9\u6469\u4e9e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "SDT"};
String WST_SAMOA[] = new String[] {"\u897f\u85a9\u6469\u4e9e\u6642\u9593", "WST",
"\u897f\u85a9\u6469\u4e9e\u590f\u4ee4\u6642\u9593", "WSDT"};
String ChST[] = new String[] {"\u67e5\u83ab\u6d1b\u6a19\u6e96\u6642\u9593", "ChST",
"\u67e5\u83ab\u6d1b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ChDT"};
- String VICTORIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642\u9593 (\u7dad\u591a\u5229\u4e9e\u90a6)", "EST",
- "\u6771\u90e8\u590f\u4ee4\u6642\u9593 (\u7dad\u591a\u5229\u4e9e\u90a6)", "EST"};
+ String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "EST",
+ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "EST"};
String UTC[] = new String[] {"\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC",
"\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC"};
String UZT[] = new String[] {"\u70cf\u8332\u5225\u514b\u65af\u5766\u6642\u9593", "UZT",
@@ -306,7 +304,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
- {"America/Argentina/San_Luis", WART},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -399,8 +397,8 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
- "Metlakatla Daylight Time", "MeDT"}},
+ {"America/Metlakatla", new String[] {"\u6885\u7279\u62C9\u5361\u7279\u62C9\u6A19\u6E96\u6642\u9593", "MeST",
+ "\u6885\u7279\u62C9\u5361\u7279\u62C9\u65E5\u5149\u7BC0\u7D04\u6642\u9593", "MeDT"}},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u6a19\u6e96\u6642\u9593", "PMST",
"\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PMDT"}},
@@ -464,8 +462,8 @@
"\u81fa\u7dad\u65af\u590f\u4ee4\u6642\u9593", "DAVST"}},
{"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville \u6642\u9593", "DDUT",
"Dumont-d'Urville \u590f\u4ee4\u6642\u9593", "DDUST"}},
- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
- "Macquarie Island Summer Time", "MIST"}},
+ {"Antarctica/Macquarie", new String[] {"\u9EA5\u5938\u5229\u5CF6\u6642\u9593", "MIST",
+ "\u9EA5\u5938\u5229\u5CF6\u590F\u4EE4\u6642\u9593", "MIST"}},
{"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u6642\u9593", "MAWT",
"\u83ab\u68ee\u590f\u4ee4\u6642\u9593", "MAWST"}},
{"Antarctica/McMurdo", NZST},
@@ -481,7 +479,7 @@
{"Asia/Aden", ARAST},
{"Asia/Almaty", new String[] {"Alma-Ata \u6642\u9593", "ALMT",
"Alma-Ata \u590f\u4ee4\u6642\u9593", "ALMST"}},
- {"Asia/Amman", EET},
+ {"Asia/Amman", ARAST},
{"Asia/Anadyr", new String[] {"\u963f\u90a3\u5e95\u6cb3\u6642\u9593", "ANAT",
"\u963f\u90a3\u5e95\u6cb3\u590f\u4ee4\u6642\u9593", "ANAST"}},
{"Asia/Aqtau", new String[] {"Aqtau \u6642\u9593", "AQTT",
@@ -525,7 +523,7 @@
"Irkutsk \u590f\u4ee4\u6642\u9593", "IRKST"}},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "EIT",
+ {"Asia/Jayapura", new String[] {"\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "WIT",
"\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u590f\u65e5\u6642\u9593", "EIST"}},
{"Asia/Kabul", new String[] {"\u963f\u5bcc\u6c57\u6642\u9593", "AFT",
"\u963f\u5bcc\u6c57\u590f\u4ee4\u6642\u9593", "AFST"}},
@@ -535,8 +533,8 @@
{"Asia/Kashgar", CTT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
- "Khandyga Summer Time", "YAKST"}},
+ {"Asia/Khandyga", new String[] {"\u6F22\u5730\u52A0 (Khandyga) \u6642\u9593", "YAKT",
+ "\u6F22\u5730\u52A0 (Khandyga) \u590F\u4EE4\u6642\u9593", "YAKST"}},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u6642\u9593", "KRAT",
"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u590f\u4ee4\u6642\u9593", "KRAST"}},
@@ -586,8 +584,8 @@
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT},
- {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT",
- "Ust-Nera Summer Time", "VLAST"}},
+ {"Asia/Ust-Nera", new String[] {"\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u6642\u9593", "VLAT",
+ "\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u590F\u4EE4\u6642\u9593", "VLAST"}},
{"Asia/Vientiane", ICT},
{"Asia/Vladivostok", new String[] {"\u6d77\u53c3\u5d34\u6642\u9593", "VLAT",
"\u6d77\u53c3\u5d34\u590f\u4ee4\u6642\u9593", "VLAST"}},
@@ -619,8 +617,8 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "CWST",
- "\u4e2d\u897f\u90e8\u65e5\u5149\u7bc0\u7d04\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "CWST"}},
+ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "CWST",
+ "\u4E2D\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "CWST"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
@@ -676,6 +674,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
+ {"Europe/Busingen", CET},
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_class.c b/jdk/src/share/demo/jvmti/hprof/hprof_class.c
index f25f53a..fb16784 100644
--- a/jdk/src/share/demo/jvmti/hprof/hprof_class.c
+++ b/jdk/src/share/demo/jvmti/hprof/hprof_class.c
@@ -527,7 +527,12 @@
jmethodID method;
info = get_info(index);
- HPROF_ASSERT(mnum < info->method_count);
+ if (mnum >= info->method_count) {
+ jclass newExcCls = (*env)->FindClass(env, "java/lang/IllegalArgumentException");
+ (*env)->ThrowNew(env, newExcCls, "Illegal mnum");
+
+ return NULL;
+ }
method = info->method[mnum].method_id;
if ( method == NULL ) {
char * name;
@@ -535,7 +540,12 @@
jclass clazz;
name = (char *)string_get(info->method[mnum].name_index);
- HPROF_ASSERT(name!=NULL);
+ if (name==NULL) {
+ jclass newExcCls = (*env)->FindClass(env, "java/lang/IllegalArgumentException");
+ (*env)->ThrowNew(env, newExcCls, "Name not found");
+
+ return NULL;
+ }
sig = (char *)string_get(info->method[mnum].sig_index);
HPROF_ASSERT(sig!=NULL);
clazz = class_get_class(env, index);
diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_event.c b/jdk/src/share/demo/jvmti/hprof/hprof_event.c
index 15dd4dd..7892457 100644
--- a/jdk/src/share/demo/jvmti/hprof/hprof_event.c
+++ b/jdk/src/share/demo/jvmti/hprof/hprof_event.c
@@ -195,7 +195,12 @@
HPROF_ASSERT(env!=NULL);
HPROF_ASSERT(thread!=NULL);
- HPROF_ASSERT(cnum!=0 && cnum!=gdata->tracker_cnum);
+ if (cnum == 0 || cnum == gdata->tracker_cnum) {
+ jclass newExcCls = (*env)->FindClass(env, "java/lang/IllegalArgumentException");
+ (*env)->ThrowNew(env, newExcCls, "Illegal cnum.");
+
+ return;
+ }
/* Prevent recursion into any BCI function for this thread (pstatus). */
if ( tls_get_tracker_status(env, thread, JNI_FALSE,
@@ -204,8 +209,10 @@
(*pstatus) = 1;
method = class_get_methodID(env, cnum, mnum);
- HPROF_ASSERT(method!=NULL);
- tls_push_method(tls_index, method);
+ if (method != NULL) {
+ tls_push_method(tls_index, method);
+ }
+
(*pstatus) = 0;
}
}
@@ -248,7 +255,13 @@
HPROF_ASSERT(env!=NULL);
HPROF_ASSERT(thread!=NULL);
- HPROF_ASSERT(cnum!=0 && cnum!=gdata->tracker_cnum);
+
+ if (cnum == 0 || cnum == gdata->tracker_cnum) {
+ jclass newExcCls = (*env)->FindClass(env, "java/lang/IllegalArgumentException");
+ (*env)->ThrowNew(env, newExcCls, "Illegal cnum.");
+
+ return;
+ }
/* Prevent recursion into any BCI function for this thread (pstatus). */
if ( tls_get_tracker_status(env, thread, JNI_FALSE,
@@ -257,8 +270,10 @@
(*pstatus) = 1;
method = class_get_methodID(env, cnum, mnum);
- HPROF_ASSERT(method!=NULL);
- tls_pop_method(tls_index, thread, method);
+ if (method != NULL) {
+ tls_pop_method(tls_index, thread, method);
+ }
+
(*pstatus) = 0;
}
}
diff --git a/jdk/src/share/lib/security/java.security-macosx b/jdk/src/share/lib/security/java.security-macosx
index 44791b2..20d5c40 100644
--- a/jdk/src/share/lib/security/java.security-macosx
+++ b/jdk/src/share/lib/security/java.security-macosx
@@ -205,12 +205,12 @@
com.sun.org.glassfish.,\
com.oracle.xmlns.internal.,\
com.oracle.webservices.internal.,\
+ oracle.jrockit.jfr.,\
org.jcp.xml.dsig.internal.,\
jdk.internal.,\
jdk.nashorn.internal.,\
jdk.nashorn.tools.,\
- apple.,\
- oracle.jrockit.jfr.
+ apple.
#
# List of comma-separated packages that start with or equal this string
@@ -250,12 +250,12 @@
com.sun.org.glassfish.,\
com.oracle.xmlns.internal.,\
com.oracle.webservices.internal.,\
+ oracle.jrockit.jfr.,\
org.jcp.xml.dsig.internal.,\
jdk.internal.,\
jdk.nashorn.internal.,\
jdk.nashorn.tools.,\
- apple.,\
- oracle.jrockit.jfr.
+ apple.
#
# Determines whether this properties file can be appended to
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
index 93bf330..f7b95b4 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, 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
@@ -340,6 +340,10 @@
struct tm sbuf;
(void)memset((void*)&sbuf,0, sizeof(sbuf));
struct tm* s = gmtime_r(&t, &sbuf);
+ if (s == NULL) {
+ fprintf(u->errstrm, "Error: gmtime failure, invalid input archive\n");
+ exit(2);
+ }
modtime_cache = modtime;
dostime_cache = dostime(s->tm_year + 1900, s->tm_mon + 1, s->tm_mday,
s->tm_hour, s->tm_min, s->tm_sec);
@@ -384,7 +388,7 @@
}
deflated.empty();
- zs.next_out = (uchar*) deflated.grow(len + (len/2));
+ zs.next_out = (uchar*) deflated.grow(add_size(len, (len/2)));
zs.avail_out = (int)deflated.size();
zs.next_in = (uchar*)head.ptr;
diff --git a/jdk/src/share/native/java/lang/Class.c b/jdk/src/share/native/java/lang/Class.c
index e53d3f7..b0ba343 100644
--- a/jdk/src/share/native/java/lang/Class.c
+++ b/jdk/src/share/native/java/lang/Class.c
@@ -69,7 +69,7 @@
{"getDeclaredConstructors0","(Z)[" CTR, (void *)&JVM_GetClassDeclaredConstructors},
{"getProtectionDomain0", "()" PD, (void *)&JVM_GetProtectionDomain},
{"getDeclaredClasses0", "()[" CLS, (void *)&JVM_GetDeclaredClasses},
- {"getDeclaringClass", "()" CLS, (void *)&JVM_GetDeclaringClass},
+ {"getDeclaringClass0", "()" CLS, (void *)&JVM_GetDeclaringClass},
{"getGenericSignature0", "()" STR, (void *)&JVM_GetClassSignature},
{"getRawAnnotations", "()" BA, (void *)&JVM_GetClassAnnotations},
{"getConstantPool", "()" CPL, (void *)&JVM_GetClassConstantPool},
diff --git a/jdk/src/share/native/java/net/Inet6Address.c b/jdk/src/share/native/java/net/Inet6Address.c
index 1817807..54c4149 100644
--- a/jdk/src/share/native/java/net/Inet6Address.c
+++ b/jdk/src/share/native/java/net/Inet6Address.c
@@ -33,6 +33,8 @@
*/
jclass ia6_class;
+jfieldID ia6_holder6ID;
+
jfieldID ia6_ipaddressID;
jfieldID ia6_scopeidID;
jfieldID ia6_cachedscopeidID;
@@ -47,19 +49,24 @@
*/
JNIEXPORT void JNICALL
Java_java_net_Inet6Address_init(JNIEnv *env, jclass cls) {
+ jclass ia6h_class;
jclass c = (*env)->FindClass(env, "java/net/Inet6Address");
CHECK_NULL(c);
ia6_class = (*env)->NewGlobalRef(env, c);
CHECK_NULL(ia6_class);
- ia6_ipaddressID = (*env)->GetFieldID(env, ia6_class, "ipaddress", "[B");
+ ia6h_class = (*env)->FindClass(env, "java/net/Inet6Address$Inet6AddressHolder");
+ CHECK_NULL(ia6h_class);
+ ia6_holder6ID = (*env)->GetFieldID(env, ia6_class, "holder6", "Ljava/net/Inet6Address$Inet6AddressHolder;");
+ CHECK_NULL(ia6_holder6ID);
+ ia6_ipaddressID = (*env)->GetFieldID(env, ia6h_class, "ipaddress", "[B");
CHECK_NULL(ia6_ipaddressID);
- ia6_scopeidID = (*env)->GetFieldID(env, ia6_class, "scope_id", "I");
+ ia6_scopeidID = (*env)->GetFieldID(env, ia6h_class, "scope_id", "I");
CHECK_NULL(ia6_scopeidID);
ia6_cachedscopeidID = (*env)->GetFieldID(env, ia6_class, "cached_scope_id", "I");
CHECK_NULL(ia6_cachedscopeidID);
- ia6_scopeidsetID = (*env)->GetFieldID(env, ia6_class, "scope_id_set", "Z");
+ ia6_scopeidsetID = (*env)->GetFieldID(env, ia6h_class, "scope_id_set", "Z");
CHECK_NULL(ia6_scopeidID);
- ia6_scopeifnameID = (*env)->GetFieldID(env, ia6_class, "scope_ifname", "Ljava/net/NetworkInterface;");
+ ia6_scopeifnameID = (*env)->GetFieldID(env, ia6h_class, "scope_ifname", "Ljava/net/NetworkInterface;");
CHECK_NULL(ia6_scopeifnameID);
ia6_ctrID = (*env)->GetMethodID(env, ia6_class, "<init>", "()V");
CHECK_NULL(ia6_ctrID);
diff --git a/jdk/src/share/native/java/net/net_util.c b/jdk/src/share/native/java/net/net_util.c
index 2f99a34..54aef66 100644
--- a/jdk/src/share/native/java/net/net_util.c
+++ b/jdk/src/share/native/java/net/net_util.c
@@ -94,6 +94,92 @@
extern jfieldID iac_addressID;
extern jfieldID iac_familyID;
+/**
+ * set_ methods return JNI_TRUE on success JNI_FALSE on error
+ * get_ methods that return +ve int return -1 on error
+ * get_ methods that return objects return NULL on error.
+ */
+jobject getInet6Address_scopeifname(JNIEnv *env, jobject iaObj) {
+ jobject holder;
+
+ initInetAddrs(env);
+ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
+ CHECK_NULL_RETURN(holder, NULL);
+ return (*env)->GetObjectField(env, holder, ia6_scopeifnameID);
+}
+
+int setInet6Address_scopeifname(JNIEnv *env, jobject iaObj, jobject scopeifname) {
+ jobject holder;
+
+ initInetAddrs(env);
+ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
+ CHECK_NULL_RETURN(holder, JNI_FALSE);
+ (*env)->SetObjectField(env, holder, ia6_scopeifnameID, scopeifname);
+ return JNI_TRUE;
+}
+
+int getInet6Address_scopeid_set(JNIEnv *env, jobject iaObj) {
+ jobject holder;
+
+ initInetAddrs(env);
+ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
+ CHECK_NULL_RETURN(holder, -1);
+ return (*env)->GetBooleanField(env, holder, ia6_scopeidsetID);
+}
+
+int getInet6Address_scopeid(JNIEnv *env, jobject iaObj) {
+ jobject holder;
+
+ initInetAddrs(env);
+ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
+ CHECK_NULL_RETURN(holder, -1);
+ return (*env)->GetIntField(env, holder, ia6_scopeidID);
+}
+
+int setInet6Address_scopeid(JNIEnv *env, jobject iaObj, int scopeid) {
+ jobject holder;
+
+ initInetAddrs(env);
+ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
+ CHECK_NULL_RETURN(holder, JNI_FALSE);
+ (*env)->SetIntField(env, holder, ia6_scopeidID, scopeid);
+ if (scopeid > 0) {
+ (*env)->SetBooleanField(env, holder, ia6_scopeidsetID, JNI_TRUE);
+ }
+ return JNI_TRUE;
+}
+
+
+int getInet6Address_ipaddress(JNIEnv *env, jobject iaObj, char *dest) {
+ jobject holder, addr;
+ jbyteArray barr;
+
+ initInetAddrs(env);
+ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
+ CHECK_NULL_RETURN(holder, JNI_FALSE);
+ addr = (*env)->GetObjectField(env, holder, ia6_ipaddressID);
+ CHECK_NULL_RETURN(addr, JNI_FALSE);
+ (*env)->GetByteArrayRegion(env, addr, 0, 16, (jbyte *)dest);
+ return JNI_TRUE;
+}
+
+int setInet6Address_ipaddress(JNIEnv *env, jobject iaObj, char *address) {
+ jobject holder;
+ jbyteArray addr;
+
+ initInetAddrs(env);
+ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
+ CHECK_NULL_RETURN(holder, JNI_FALSE);
+ addr = (jbyteArray)(*env)->GetObjectField(env, holder, ia6_ipaddressID);
+ if (addr == NULL) {
+ addr = (*env)->NewByteArray(env, 16);
+ CHECK_NULL_RETURN(addr, JNI_FALSE);
+ (*env)->SetObjectField(env, holder, ia6_ipaddressID, addr);
+ }
+ (*env)->SetByteArrayRegion(env, addr, 0, 16, (jbyte *)address);
+ return JNI_TRUE;
+}
+
void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address) {
jobject holder;
initInetAddrs(env);
@@ -168,6 +254,7 @@
} else {
static jclass inet6Cls = 0;
jint scope;
+ int ret;
if (inet6Cls == 0) {
jclass c = (*env)->FindClass(env, "java/net/Inet6Address");
CHECK_NULL_RETURN(c, NULL);
@@ -177,18 +264,11 @@
}
iaObj = (*env)->NewObject(env, inet6Cls, ia6_ctrID);
CHECK_NULL_RETURN(iaObj, NULL);
- ipaddress = (*env)->NewByteArray(env, 16);
- CHECK_NULL_RETURN(ipaddress, NULL);
- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
- (jbyte *)&(him6->sin6_addr));
-
- (*env)->SetObjectField(env, iaObj, ia6_ipaddressID, ipaddress);
-
+ ret = setInet6Address_ipaddress(env, iaObj, (char *)&(him6->sin6_addr));
+ CHECK_NULL_RETURN(ret, NULL);
setInetAddress_family(env, iaObj, IPv6);
scope = getScopeID(him);
- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
- if (scope > 0)
- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
+ setInet6Address_scopeid(env, iaObj, scope);
}
*port = ntohs(him6->sin6_port);
} else
@@ -248,9 +328,8 @@
if (family == AF_INET) {
return JNI_FALSE;
}
- ipaddress = (*env)->GetObjectField(env, iaObj, ia6_ipaddressID);
- scope = (*env)->GetIntField(env, iaObj, ia6_scopeidID);
- (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddrCur);
+ scope = getInet6Address_scopeid(env, iaObj);
+ getInet6Address_ipaddress(env, iaObj, (char *)caddrCur);
if (NET_IsEqual(caddrNew, caddrCur) && cmpScopeID(scope, him)) {
return JNI_TRUE;
} else {
diff --git a/jdk/src/share/native/java/net/net_util.h b/jdk/src/share/native/java/net/net_util.h
index 0fd5b6c..d38a5f5 100644
--- a/jdk/src/share/native/java/net/net_util.h
+++ b/jdk/src/share/native/java/net/net_util.h
@@ -58,6 +58,19 @@
extern jfieldID iac_hostNameID;
extern jfieldID ia_preferIPv6AddressID;
+/** (Inet6Address accessors)
+ * set_ methods return JNI_TRUE on success JNI_FALSE on error
+ * get_ methods that return int/boolean, return -1 on error
+ * get_ methods that return objects return NULL on error.
+ */
+extern jobject getInet6Address_scopeifname(JNIEnv *env, jobject ia6Obj);
+extern int setInet6Address_scopeifname(JNIEnv *env, jobject ia6Obj, jobject scopeifname);
+extern int getInet6Address_scopeid_set(JNIEnv *env, jobject ia6Obj);
+extern int getInet6Address_scopeid(JNIEnv *env, jobject ia6Obj);
+extern int setInet6Address_scopeid(JNIEnv *env, jobject ia6Obj, int scopeid);
+extern int getInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *dest);
+extern int setInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *address);
+
extern void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address);
extern void setInetAddress_family(JNIEnv *env, jobject iaObj, int family);
extern void setInetAddress_hostName(JNIEnv *env, jobject iaObj, jobject h);
@@ -93,12 +106,12 @@
/* Inet6Address fields */
extern jclass ia6_class;
+extern jfieldID ia6_holder6ID;
extern jfieldID ia6_ipaddressID;
extern jfieldID ia6_scopeidID;
extern jfieldID ia6_cachedscopeidID;
extern jfieldID ia6_scopeidsetID;
extern jfieldID ia6_scopeifnameID;
-extern jfieldID ia6_scopeifnamesetID;
extern jmethodID ia6_ctrID;
/************************************************************************
diff --git a/jdk/src/share/native/sun/awt/image/awt_parseImage.c b/jdk/src/share/native/sun/awt/image/awt_parseImage.c
index e11a8db..8d6e9a3 100644
--- a/jdk/src/share/native/sun/awt/image/awt_parseImage.c
+++ b/jdk/src/share/native/sun/awt/image/awt_parseImage.c
@@ -873,363 +873,204 @@
return 1;
}
-/*
- * This routine will fill in a buffer of data for either 1 band or all
- * bands (if band == -1).
- */
#define MAX_TO_GRAB (10240)
-int awt_getPixelByte(JNIEnv *env, int band, RasterS_t *rasterP,
- unsigned char *bufferP) {
- int w = rasterP->width;
- int h = rasterP->height;
- int numBands = rasterP->numBands;
+typedef union {
+ void *pv;
+ unsigned char *pb;
+ unsigned short *ps;
+} PixelData_t;
+
+
+int awt_getPixels(JNIEnv *env, RasterS_t *rasterP, void *bufferP) {
+ const int w = rasterP->width;
+ const int h = rasterP->height;
+ const int numBands = rasterP->numBands;
int y;
int i;
- int maxLines = (h < MAX_TO_GRAB/w ? h : MAX_TO_GRAB/w);
+ int maxLines;
jobject jsm;
- int off;
+ int off = 0;
jarray jdata = NULL;
jobject jdatabuffer;
int *dataP;
- int maxBytes = w;
+ int maxSamples;
+ PixelData_t p;
+
+ if (bufferP == NULL) {
+ return -1;
+ }
+
+ if (rasterP->dataType != BYTE_DATA_TYPE &&
+ rasterP->dataType != SHORT_DATA_TYPE)
+ {
+ return -1;
+ }
+
+ p.pv = bufferP;
+
+ if (!SAFE_TO_MULT(w, numBands)) {
+ return -1;
+ }
+ maxSamples = w * numBands;
+
+ maxLines = maxSamples > MAX_TO_GRAB ? 1 : (MAX_TO_GRAB / maxSamples);
+ if (maxLines > h) {
+ maxLines = h;
+ }
+
+ if (!SAFE_TO_MULT(maxSamples, maxLines)) {
+ return -1;
+ }
+
+ maxSamples *= maxLines;
jsm = (*env)->GetObjectField(env, rasterP->jraster, g_RasterSampleModelID);
jdatabuffer = (*env)->GetObjectField(env, rasterP->jraster,
g_RasterDataBufferID);
- jdata = (*env)->NewIntArray(env, maxBytes*rasterP->numBands*maxLines);
+
+ jdata = (*env)->NewIntArray(env, maxSamples);
if (JNU_IsNull(env, jdata)) {
JNU_ThrowOutOfMemoryError(env, "Out of Memory");
return -1;
}
- /* Here is the generic code */
- if (band >= 0) {
- int dOff;
- if (band >= numBands) {
+ for (y = 0; y < h; y += maxLines) {
+ if (y + maxLines > h) {
+ maxLines = h - y;
+ maxSamples = w * numBands * maxLines;
+ }
+
+ (*env)->CallObjectMethod(env, jsm, g_SMGetPixelsMID,
+ 0, y, w,
+ maxLines, jdata, jdatabuffer);
+
+ if ((*env)->ExceptionOccurred(env)) {
(*env)->DeleteLocalRef(env, jdata);
- JNU_ThrowInternalError(env, "Band out of range.");
return -1;
}
- off = 0;
- for (y=0; y < h; ) {
- (*env)->CallObjectMethod(env, jsm, g_SMGetPixelsMID,
- 0, y, w,
- maxLines, jdata, jdatabuffer);
- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
- NULL);
- if (dataP == NULL) {
- (*env)->DeleteLocalRef(env, jdata);
- return -1;
- }
- dOff = band;
- for (i=0; i < maxBytes; i++, dOff += numBands) {
- bufferP[off++] = (unsigned char) dataP[dOff];
- }
- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
- JNI_ABORT);
-
- if (y+maxLines < h) {
- y += maxLines;
- }
- else {
- y++;
- maxBytes = w;
- }
- }
- }
- else {
- off = 0;
- maxBytes *= numBands;
- for (y=0; y < h; ) {
- (*env)->CallObjectMethod(env, jsm, g_SMGetPixelsMID,
- 0, y, w,
- maxLines, jdata, jdatabuffer);
- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
- NULL);
- if (dataP == NULL) {
- (*env)->DeleteLocalRef(env, jdata);
- return -1;
- }
- for (i=0; i < maxBytes; i++) {
- bufferP[off++] = (unsigned char) dataP[i];
- }
-
- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
- JNI_ABORT);
-
- if (y+maxLines < h) {
- y += maxLines;
- }
- else {
- y++;
- maxBytes = w*numBands;
- }
- }
-
- }
- (*env)->DeleteLocalRef(env, jdata);
-
- return 0;
-}
-int awt_setPixelByte(JNIEnv *env, int band, RasterS_t *rasterP,
- unsigned char *bufferP) {
- int w = rasterP->width;
- int h = rasterP->height;
- int numBands = rasterP->numBands;
- int y;
- int i;
- int maxLines = (h < MAX_TO_GRAB/w ? h : MAX_TO_GRAB/w);
- jobject jsm;
- int off;
- jarray jdata = NULL;
- jobject jdatabuffer;
- int *dataP;
- int maxBytes = w;
-
- jsm = (*env)->GetObjectField(env, rasterP->jraster, g_RasterSampleModelID);
- jdatabuffer = (*env)->GetObjectField(env, rasterP->jraster,
- g_RasterDataBufferID);
- /* Here is the generic code */
- jdata = (*env)->NewIntArray(env, maxBytes*rasterP->numBands*maxLines);
- if (JNU_IsNull(env, jdata)) {
- JNU_ThrowOutOfMemoryError(env, "Out of Memory");
- return -1;
- }
- if (band >= 0) {
- int dOff;
- if (band >= numBands) {
+ dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
+ NULL);
+ if (dataP == NULL) {
(*env)->DeleteLocalRef(env, jdata);
- JNU_ThrowInternalError(env, "Band out of range.");
return -1;
}
- off = 0;
- for (y=0; y < h; y+=maxLines) {
- if (y+maxLines > h) {
- maxBytes = w*numBands;
- maxLines = h - y;
- }
- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
- NULL);
- if (dataP == NULL) {
- (*env)->DeleteLocalRef(env, jdata);
- return -1;
- }
- dOff = band;
- for (i=0; i < maxBytes; i++, dOff += numBands) {
- dataP[dOff] = bufferP[off++];
- }
- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
- JNI_ABORT);
-
- (*env)->CallVoidMethod(env, jsm, g_SMSetPixelsMID,
- 0, y, w,
- maxLines, jdata, jdatabuffer);
- }
- }
- else {
- off = 0;
- maxBytes *= numBands;
- for (y=0; y < h; y+=maxLines) {
- if (y+maxLines > h) {
- maxBytes = w*numBands;
- maxLines = h - y;
+ switch (rasterP->dataType) {
+ case BYTE_DATA_TYPE:
+ for (i = 0; i < maxSamples; i ++) {
+ p.pb[off++] = (unsigned char) dataP[i];
}
- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
- NULL);
- if (dataP == NULL) {
- (*env)->DeleteLocalRef(env, jdata);
- return -1;
+ break;
+ case SHORT_DATA_TYPE:
+ for (i = 0; i < maxSamples; i ++) {
+ p.ps[off++] = (unsigned short) dataP[i];
}
- for (i=0; i < maxBytes; i++) {
- dataP[i] = bufferP[off++];
- }
-
- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
- JNI_ABORT);
-
- (*env)->CallVoidMethod(env, jsm, g_SMSetPixelsMID,
- 0, y, w,
- maxLines, jdata, jdatabuffer);
+ break;
}
+ (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
+ JNI_ABORT);
}
-
(*env)->DeleteLocalRef(env, jdata);
- return 0;
+ return 1;
}
-int awt_getPixelShort(JNIEnv *env, int band, RasterS_t *rasterP,
- unsigned short *bufferP) {
- int w = rasterP->width;
- int h = rasterP->height;
- int numBands = rasterP->numBands;
+
+int awt_setPixels(JNIEnv *env, RasterS_t *rasterP, void *bufferP) {
+ const int w = rasterP->width;
+ const int h = rasterP->height;
+ const int numBands = rasterP->numBands;
+
int y;
int i;
- int maxLines = (h < MAX_TO_GRAB/w ? h : MAX_TO_GRAB/w);
+ int maxLines;
jobject jsm;
- int off;
+ int off = 0;
jarray jdata = NULL;
jobject jdatabuffer;
int *dataP;
- int maxBytes = w*maxLines;
+ int maxSamples;
+ PixelData_t p;
+
+ if (bufferP == NULL) {
+ return -1;
+ }
+
+ if (rasterP->dataType != BYTE_DATA_TYPE &&
+ rasterP->dataType != SHORT_DATA_TYPE)
+ {
+ return -1;
+ }
+
+ p.pv = bufferP;
+
+ if (!SAFE_TO_MULT(w, numBands)) {
+ return -1;
+ }
+ maxSamples = w * numBands;
+
+ maxLines = maxSamples > MAX_TO_GRAB ? 1 : (MAX_TO_GRAB / maxSamples);
+ if (maxLines > h) {
+ maxLines = h;
+ }
+
+ if (!SAFE_TO_MULT(maxSamples, maxLines)) {
+ return -1;
+ }
+
+ maxSamples *= maxLines;
jsm = (*env)->GetObjectField(env, rasterP->jraster, g_RasterSampleModelID);
jdatabuffer = (*env)->GetObjectField(env, rasterP->jraster,
g_RasterDataBufferID);
- jdata = (*env)->NewIntArray(env, maxBytes*rasterP->numBands*maxLines);
+
+ jdata = (*env)->NewIntArray(env, maxSamples);
if (JNU_IsNull(env, jdata)) {
JNU_ThrowOutOfMemoryError(env, "Out of Memory");
return -1;
}
- /* Here is the generic code */
- if (band >= 0) {
- int dOff;
- if (band >= numBands) {
+
+ for (y = 0; y < h; y += maxLines) {
+ if (y + maxLines > h) {
+ maxLines = h - y;
+ maxSamples = w * numBands * maxLines;
+ }
+ dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
+ NULL);
+ if (dataP == NULL) {
(*env)->DeleteLocalRef(env, jdata);
- JNU_ThrowInternalError(env, "Band out of range.");
return -1;
}
- off = 0;
- for (y=0; y < h; y += maxLines) {
- if (y+maxLines > h) {
- maxBytes = w*numBands;
- maxLines = h - y;
- }
- (*env)->CallObjectMethod(env, jsm, g_SMGetPixelsMID,
- 0, y, w,
- maxLines, jdata, jdatabuffer);
- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
- NULL);
- if (dataP == NULL) {
- (*env)->DeleteLocalRef(env, jdata);
- return -1;
- }
- dOff = band;
- for (i=0; i < maxBytes; i++, dOff += numBands) {
- bufferP[off++] = (unsigned short) dataP[dOff];
+ switch (rasterP->dataType) {
+ case BYTE_DATA_TYPE:
+ for (i = 0; i < maxSamples; i ++) {
+ dataP[i] = p.pb[off++];
}
-
- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
- JNI_ABORT);
- }
- }
- else {
- off = 0;
- maxBytes *= numBands;
- for (y=0; y < h; y+=maxLines) {
- if (y+maxLines > h) {
- maxBytes = w*numBands;
- maxLines = h - y;
+ break;
+ case SHORT_DATA_TYPE:
+ for (i = 0; i < maxSamples; i ++) {
+ dataP[i] = p.ps[off++];
}
- (*env)->CallObjectMethod(env, jsm, g_SMGetPixelsMID,
- 0, y, w,
- maxLines, jdata, jdatabuffer);
- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
- NULL);
- if (dataP == NULL) {
- (*env)->DeleteLocalRef(env, jdata);
- return -1;
- }
- for (i=0; i < maxBytes; i++) {
- bufferP[off++] = (unsigned short) dataP[i];
- }
-
- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
- JNI_ABORT);
+ break;
}
+ (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
+ JNI_ABORT);
+
+ (*env)->CallVoidMethod(env, jsm, g_SMSetPixelsMID,
+ 0, y, w,
+ maxLines, jdata, jdatabuffer);
+
+ if ((*env)->ExceptionOccurred(env)) {
+ (*env)->DeleteLocalRef(env, jdata);
+ return -1;
+ }
}
(*env)->DeleteLocalRef(env, jdata);
- return 0;
-}
-int awt_setPixelShort(JNIEnv *env, int band, RasterS_t *rasterP,
- unsigned short *bufferP) {
- int w = rasterP->width;
- int h = rasterP->height;
- int numBands = rasterP->numBands;
- int y;
- int i;
- int maxLines = (h < MAX_TO_GRAB/w ? h : MAX_TO_GRAB/w);
- jobject jsm;
- int off;
- jarray jdata = NULL;
- jobject jdatabuffer;
- int *dataP;
- int maxBytes = w;
- jsm = (*env)->GetObjectField(env, rasterP->jraster, g_RasterSampleModelID);
- jdatabuffer = (*env)->GetObjectField(env, rasterP->jraster,
- g_RasterDataBufferID);
- if (band >= numBands) {
- JNU_ThrowInternalError(env, "Band out of range.");
- return -1;
- }
- /* Here is the generic code */
- jdata = (*env)->NewIntArray(env, maxBytes*rasterP->numBands*maxLines);
- if (JNU_IsNull(env, jdata)) {
- JNU_ThrowOutOfMemoryError(env, "Out of Memory");
- return -1;
- }
- if (band >= 0) {
- int dOff;
- off = 0;
- for (y=0; y < h; y+=maxLines) {
- if (y+maxLines > h) {
- maxBytes = w*numBands;
- maxLines = h - y;
- }
- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
- NULL);
- if (dataP == NULL) {
- (*env)->DeleteLocalRef(env, jdata);
- return -1;
- }
- dOff = band;
- for (i=0; i < maxBytes; i++, dOff += numBands) {
- dataP[dOff] = bufferP[off++];
- }
-
- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
- JNI_ABORT);
-
- (*env)->CallVoidMethod(env, jsm, g_SMSetPixelsMID,
- 0, y, w,
- maxLines, jdata, jdatabuffer);
- }
- }
- else {
- off = 0;
- maxBytes *= numBands;
- for (y=0; y < h; y+=maxLines) {
- if (y+maxLines > h) {
- maxBytes = w*numBands;
- maxLines = h - y;
- }
- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
- NULL);
- if (dataP == NULL) {
- (*env)->DeleteLocalRef(env, jdata);
- return -1;
- }
- for (i=0; i < maxBytes; i++) {
- dataP[i] = bufferP[off++];
- }
-
- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
- JNI_ABORT);
-
- (*env)->CallVoidMethod(env, jsm, g_SMSetPixelsMID,
- 0, y, w,
- maxLines, jdata, jdatabuffer);
- }
-
- }
-
- (*env)->DeleteLocalRef(env, jdata);
- return 0;
+ return 1;
}
diff --git a/jdk/src/share/native/sun/awt/image/awt_parseImage.h b/jdk/src/share/native/sun/awt/image/awt_parseImage.h
index b92bb0c..02dfd1a 100644
--- a/jdk/src/share/native/sun/awt/image/awt_parseImage.h
+++ b/jdk/src/share/native/sun/awt/image/awt_parseImage.h
@@ -188,13 +188,8 @@
void awt_freeParsedImage(BufImageS_t *imageP, int freeImageP);
-int awt_getPixelByte(JNIEnv *env, int band, RasterS_t *rasterP,
- unsigned char *bufferP);
-int awt_setPixelByte(JNIEnv *env, int band, RasterS_t *rasterP,
- unsigned char *bufferP);
-int awt_getPixelShort(JNIEnv *env, int band, RasterS_t *rasterP,
- unsigned short *bufferP);
-int awt_setPixelShort(JNIEnv *env, int band, RasterS_t *rasterP,
- unsigned short *bufferP);
+int awt_getPixels(JNIEnv *env, RasterS_t *rasterP, void *bufferP);
+
+int awt_setPixels(JNIEnv *env, RasterS_t *rasterP, void *bufferP);
#endif /* AWT_PARSE_IMAGE_H */
diff --git a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
index fce061d..d0f7278 100644
--- a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
+++ b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
@@ -2706,6 +2706,15 @@
bandSize = (*env)->GetIntArrayElements(env, bandSizes, NULL);
for (i = 0; i < numBands; i++) {
+ if (bandSize[i] <= 0 || bandSize[i] > JPEG_BAND_SIZE) {
+ (*env)->ReleaseIntArrayElements(env, bandSizes,
+ bandSize, JNI_ABORT);
+ JNU_ThrowByName(env, "javax/imageio/IIOException", "Invalid Image");
+ return JNI_FALSE;;
+ }
+ }
+
+ for (i = 0; i < numBands; i++) {
if (bandSize[i] != JPEG_BAND_SIZE) {
if (scale == NULL) {
scale = (UINT8**) calloc(numBands, sizeof(UINT8*));
diff --git a/jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c b/jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c
index 003ad8d..887c7bd 100644
--- a/jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c
+++ b/jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c
@@ -700,22 +700,7 @@
/* Means that we couldn't write directly into the destination buffer */
if (ddata == NULL) {
- unsigned char *bdataP;
- unsigned short *sdataP;
-
- /* Punt for now */
- switch (dstRasterP->dataType) {
- case BYTE_DATA_TYPE:
- bdataP = (unsigned char *) mlib_ImageGetData(dst);
- retStatus = (awt_setPixelByte(env, -1, dstRasterP, bdataP) >= 0) ;
- break;
- case SHORT_DATA_TYPE:
- sdataP = (unsigned short *) mlib_ImageGetData(dst);
- retStatus = (awt_setPixelShort(env, -1, dstRasterP, sdataP) >= 0) ;
- break;
- default:
- retStatus = 0;
- }
+ retStatus = awt_setPixels(env, dstRasterP, mlib_ImageGetData(dst));
}
/* Release the pinned memory */
@@ -1119,24 +1104,9 @@
/* Means that we couldn't write directly into the destination buffer */
if (ddata == NULL) {
- unsigned char *bdataP;
- unsigned short *sdataP;
-
/* Need to store it back into the array */
if (storeRasterArray(env, srcRasterP, dstRasterP, dst) < 0) {
- /* Punt for now */
- switch (dst->type) {
- case MLIB_BYTE:
- bdataP = (unsigned char *) mlib_ImageGetData(dst);
- retStatus = (awt_setPixelByte(env, -1, dstRasterP, bdataP) >= 0) ;
- break;
- case MLIB_SHORT:
- sdataP = (unsigned short *) mlib_ImageGetData(dst);
- retStatus = (awt_setPixelShort(env, -1, dstRasterP, sdataP) >= 0) ;
- break;
- default:
- retStatus = 0;
- }
+ retStatus = awt_setPixels(env, dstRasterP, mlib_ImageGetData(dst));
}
}
@@ -1704,21 +1674,7 @@
* the destination buffer
*/
if (ddata == NULL) {
- unsigned char* bdataP;
- unsigned short* sdataP;
-
- switch (dstRasterP->dataType) {
- case BYTE_DATA_TYPE:
- bdataP = (unsigned char *) mlib_ImageGetData(dst);
- retStatus = (awt_setPixelByte(env, -1, dstRasterP, bdataP) >= 0) ;
- break;
- case SHORT_DATA_TYPE:
- sdataP = (unsigned short *) mlib_ImageGetData(dst);
- retStatus = (awt_setPixelShort(env, -1, dstRasterP, sdataP) >= 0) ;
- break;
- default:
- retStatus = 0;
- }
+ retStatus = awt_setPixels(env, dstRasterP, mlib_ImageGetData(dst));
}
/* Release the LUT */
@@ -2029,21 +1985,25 @@
return 0;
}
+#define NUM_LINES 10
+
static int
cvtCustomToDefault(JNIEnv *env, BufImageS_t *imageP, int component,
unsigned char *dataP) {
- ColorModelS_t *cmP = &imageP->cmodel;
- RasterS_t *rasterP = &imageP->raster;
+ const RasterS_t *rasterP = &imageP->raster;
+ const int w = rasterP->width;
+ const int h = rasterP->height;
+
int y;
- jobject jpixels = NULL;
+ jintArray jpixels = NULL;
jint *pixels;
unsigned char *dP = dataP;
-#define NUM_LINES 10
- int numLines = NUM_LINES;
+ int numLines = h > NUM_LINES ? NUM_LINES : h;
+
/* it is safe to calculate the scan length, because width has been verified
* on creation of the mlib image
*/
- int scanLength = rasterP->width * 4;
+ const int scanLength = w * 4;
int nbytes = 0;
if (!SAFE_TO_MULT(numLines, scanLength)) {
@@ -2052,42 +2012,70 @@
nbytes = numLines * scanLength;
- for (y=0; y < rasterP->height; y+=numLines) {
- /* getData, one scanline at a time */
- if (y+numLines > rasterP->height) {
- numLines = rasterP->height - y;
+ jpixels = (*env)->NewIntArray(env, nbytes);
+ if (JNU_IsNull(env, jpixels)) {
+ JNU_ThrowOutOfMemoryError(env, "Out of Memory");
+ return -1;
+ }
+
+ for (y = 0; y < h; y += numLines) {
+ if (y + numLines > h) {
+ numLines = h - y;
nbytes = numLines * scanLength;
}
- jpixels = (*env)->CallObjectMethod(env, imageP->jimage,
- g_BImgGetRGBMID, 0, y,
- rasterP->width, numLines,
- jpixels,0, rasterP->width);
- if (jpixels == NULL) {
- JNU_ThrowInternalError(env, "Can't retrieve pixels.");
+
+ (*env)->CallObjectMethod(env, imageP->jimage,
+ g_BImgGetRGBMID, 0, y,
+ w, numLines,
+ jpixels, 0, w);
+ if ((*env)->ExceptionOccurred(env)) {
+ (*env)->DeleteLocalRef(env, jpixels);
return -1;
}
pixels = (*env)->GetPrimitiveArrayCritical(env, jpixels, NULL);
+ if (pixels == NULL) {
+ (*env)->DeleteLocalRef(env, jpixels);
+ return -1;
+ }
+
memcpy(dP, pixels, nbytes);
dP += nbytes;
+
(*env)->ReleasePrimitiveArrayCritical(env, jpixels, pixels,
JNI_ABORT);
}
+
+ /* Need to release the array */
+ (*env)->DeleteLocalRef(env, jpixels);
+
return 0;
}
static int
cvtDefaultToCustom(JNIEnv *env, BufImageS_t *imageP, int component,
unsigned char *dataP) {
- ColorModelS_t *cmP = &imageP->cmodel;
- RasterS_t *rasterP = &imageP->raster;
+ const RasterS_t *rasterP = &imageP->raster;
+ const int w = rasterP->width;
+ const int h = rasterP->height;
+
int y;
+ jintArray jpixels = NULL;
jint *pixels;
unsigned char *dP = dataP;
-#define NUM_LINES 10
- int numLines = NUM_LINES;
- int nbytes = rasterP->width*4*NUM_LINES;
- jintArray jpixels;
+ int numLines = h > NUM_LINES ? NUM_LINES : h;
+
+ /* it is safe to calculate the scan length, because width has been verified
+ * on creation of the mlib image
+ */
+ const int scanLength = w * 4;
+
+ int nbytes = 0;
+ if (!SAFE_TO_MULT(numLines, scanLength)) {
+ return -1;
+ }
+
+ nbytes = numLines * scanLength;
jpixels = (*env)->NewIntArray(env, nbytes);
if (JNU_IsNull(env, jpixels)) {
@@ -2095,14 +2083,15 @@
return -1;
}
- for (y=0; y < rasterP->height; y+=NUM_LINES) {
- if (y+numLines > rasterP->height) {
- numLines = rasterP->height - y;
- nbytes = rasterP->width*4*numLines;
+ for (y = 0; y < h; y += numLines) {
+ if (y + numLines > h) {
+ numLines = h - y;
+ nbytes = numLines * scanLength;
}
+
pixels = (*env)->GetPrimitiveArrayCritical(env, jpixels, NULL);
if (pixels == NULL) {
- /* JNI error */
+ (*env)->DeleteLocalRef(env, jpixels);
return -1;
}
@@ -2111,12 +2100,11 @@
(*env)->ReleasePrimitiveArrayCritical(env, jpixels, pixels, 0);
- /* setData, one scanline at a time */
- /* Fix 4223648, 4184283 */
(*env)->CallVoidMethod(env, imageP->jimage, g_BImgSetRGBMID, 0, y,
- rasterP->width, numLines, jpixels, 0,
- rasterP->width);
+ w, numLines, jpixels,
+ 0, w);
if ((*env)->ExceptionOccurred(env)) {
+ (*env)->DeleteLocalRef(env, jpixels);
return -1;
}
}
@@ -2298,7 +2286,6 @@
mlib_image **mlibImagePP, void **dataPP, int isSrc) {
void *dataP;
unsigned char *cDataP;
- unsigned short *sdataP;
int dataType = BYTE_DATA_TYPE;
int width;
int height;
@@ -2484,8 +2471,7 @@
return -1;
}
if (isSrc) {
- cDataP = (unsigned char *) mlib_ImageGetData(*mlibImagePP);
- if (awt_getPixelByte(env, -1, rasterP, cDataP) < 0) {
+ if (awt_getPixels(env, rasterP, mlib_ImageGetData(*mlibImagePP)) < 0) {
(*sMlibSysFns.deleteImageFP)(*mlibImagePP);
return -1;
}
@@ -2499,8 +2485,7 @@
return -1;
}
if (isSrc) {
- sdataP = (unsigned short *) mlib_ImageGetData(*mlibImagePP);
- if (awt_getPixelShort(env, -1, rasterP, sdataP) < 0) {
+ if (awt_getPixels(env, rasterP, mlib_ImageGetData(*mlibImagePP)) < 0) {
(*sMlibSysFns.deleteImageFP)(*mlibImagePP);
return -1;
}
@@ -2550,60 +2535,6 @@
}
}
-static int
-storeDstArray(JNIEnv *env, BufImageS_t *srcP, BufImageS_t *dstP,
- mlibHintS_t *hintP, mlib_image *mlibImP, void *ddata) {
- RasterS_t *rasterP = &dstP->raster;
-
- /* Nothing to do since it is the same image type */
- if (srcP->imageType == dstP->imageType
- && srcP->imageType != java_awt_image_BufferedImage_TYPE_CUSTOM
- && srcP->imageType != java_awt_image_BufferedImage_TYPE_BYTE_INDEXED
- && srcP->imageType != java_awt_image_BufferedImage_TYPE_BYTE_BINARY) {
- /* REMIND: Should check the ICM LUTS to see if it is the same */
- return 0;
- }
-
- /* These types are compatible with TYPE_INT_RGB */
- if (srcP->imageType == java_awt_image_BufferedImage_TYPE_INT_RGB
- && (dstP->imageType == java_awt_image_BufferedImage_TYPE_INT_ARGB ||
- dstP->imageType == java_awt_image_BufferedImage_TYPE_INT_ARGB_PRE)){
- return 0;
- }
-
- if (hintP->cvtSrcToDefault &&
- (srcP->cmodel.isAlphaPre == dstP->cmodel.isAlphaPre)) {
- if (srcP->cmodel.isAlphaPre) {
- if (dstP->imageType ==
- java_awt_image_BufferedImage_TYPE_INT_ARGB_PRE)
- {
- return 0;
- }
- if (!srcP->cmodel.supportsAlpha &&
- dstP->imageType == java_awt_image_BufferedImage_TYPE_INT_RGB){
- return 0;
- }
- }
- else {
- /* REMIND: */
- }
- }
-
- if (dstP->cmodel.cmType == DIRECT_CM_TYPE) {
- /* Just need to move bits */
- if (mlibImP->type == MLIB_BYTE) {
- return awt_setPixelByte(env, -1, &dstP->raster,
- (unsigned char *) mlibImP->data);
- }
- else if (mlibImP->type == MLIB_SHORT) {
- return awt_setPixelByte(env, -1, &dstP->raster,
- (unsigned char *) mlibImP->data);
- }
- }
-
- return 0;
-}
-
#define ERR_BAD_IMAGE_LAYOUT (-2)
#define CHECK_DST_ARRAY(start_offset, elements_per_scan, elements_per_pixel) \
@@ -2709,8 +2640,7 @@
}
}
else if (mlibImP->type == MLIB_SHORT) {
- return awt_setPixelShort(env, -1, rasterP,
- (unsigned short *) mlibImP->data);
+ return awt_setPixels(env, rasterP, mlibImP->data);
}
}
else {
diff --git a/jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp b/jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp
index 8036a64..20618cd 100644
--- a/jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp
+++ b/jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp
@@ -104,6 +104,10 @@
int putGV(JNIEnv* env, jint gmask, jint baseIndex, jobject gvdata, const LayoutEngine* engine, int glyphCount) {
int count = env->GetIntField(gvdata, gvdCountFID);
+ if (count < 0) {
+ JNU_ThrowInternalError(env, "count negative");
+ return 0;
+ }
jarray glyphArray = (jarray)env->GetObjectField(gvdata, gvdGlyphsFID);
if (IS_NULL(glyphArray)) {
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c b/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
index 5bad907..a18d75c 100644
--- a/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
+++ b/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
@@ -1074,6 +1074,27 @@
}
+static
+cmsBool SanityCheck(_cmsICCPROFILE* profile)
+{
+ cmsIOHANDLER* io = profile->IOhandler;
+ if (!io) {
+ return FALSE;
+ }
+
+ if (!io->Seek ||
+ !(io->Seek==NULLSeek || io->Seek==MemorySeek || io->Seek==FileSeek))
+ {
+ return FALSE;
+ }
+ if (!io->Read ||
+ !(io->Read==NULLRead || io->Read==MemoryRead || io->Read==FileRead))
+ {
+ return FALSE;
+ }
+
+ return TRUE;
+}
// Dump tag contents. If the profile is being modified, untouched tags are copied from FileOrig
static
@@ -1087,6 +1108,7 @@
cmsTagTypeSignature TypeBase;
cmsTagTypeHandler* TypeHandler;
+ if (!SanityCheck(FileOrig)) return FALSE;
for (i=0; i < Icc -> TagCount; i++) {
@@ -1292,8 +1314,8 @@
// Should we just calculate the needed space?
if (MemPtr == NULL) {
- *BytesNeeded = cmsSaveProfileToIOhandler(hProfile, NULL);
- return TRUE;
+ *BytesNeeded = cmsSaveProfileToIOhandler(hProfile, NULL);
+ return (*BytesNeeded == 0 ? FALSE : TRUE);
}
// That is a real write operation
diff --git a/jdk/src/share/native/sun/management/HotSpotDiagnostic.c b/jdk/src/share/native/sun/management/HotSpotDiagnostic.c
index 8d48b20..cfa9e9a 100644
--- a/jdk/src/share/native/sun/management/HotSpotDiagnostic.c
+++ b/jdk/src/share/native/sun/management/HotSpotDiagnostic.c
@@ -29,7 +29,7 @@
#include "sun_management_HotSpotDiagnostic.h"
JNIEXPORT void JNICALL
-Java_sun_management_HotSpotDiagnostic_dumpHeap
+Java_sun_management_HotSpotDiagnostic_dumpHeap0
(JNIEnv *env, jobject dummy, jstring outputfile, jboolean live)
{
jmm_interface->DumpHeap0(env, outputfile, live);
diff --git a/jdk/src/solaris/bin/java_md_solinux.c b/jdk/src/solaris/bin/java_md_solinux.c
index e5b9672..52f9cfe 100644
--- a/jdk/src/solaris/bin/java_md_solinux.c
+++ b/jdk/src/solaris/bin/java_md_solinux.c
@@ -957,9 +957,27 @@
void* SplashProcAddress(const char* name) {
if (!hSplashLib) {
- const char * splashLibPath;
- splashLibPath = SPLASHSCREEN_SO;
- hSplashLib = dlopen(splashLibPath, RTLD_LAZY | RTLD_GLOBAL);
+ int ret;
+ char jrePath[MAXPATHLEN];
+ char splashPath[MAXPATHLEN];
+
+ if (!GetJREPath(jrePath, sizeof(jrePath), GetArch(), JNI_FALSE)) {
+ JLI_ReportErrorMessage(JRE_ERROR1);
+ return NULL;
+ }
+ ret = JLI_Snprintf(splashPath, sizeof(splashPath), "%s/lib/%s/%s",
+ jrePath, GetArch(), SPLASHSCREEN_SO);
+
+ if (ret >= (int) sizeof(splashPath)) {
+ JLI_ReportErrorMessage(JRE_ERROR11);
+ return NULL;
+ }
+ if (ret < 0) {
+ JLI_ReportErrorMessage(JRE_ERROR13);
+ return NULL;
+ }
+ hSplashLib = dlopen(splashPath, RTLD_LAZY | RTLD_GLOBAL);
+ JLI_TraceLauncher("Info: loaded %s\n", splashPath);
}
if (hSplashLib) {
void* sym = dlsym(hSplashLib, name);
diff --git a/jdk/src/solaris/classes/com/sun/management/OSMBeanFactory.java b/jdk/src/solaris/classes/com/sun/management/OSMBeanFactory.java
index d73d4bd..cbd9aa2 100644
--- a/jdk/src/solaris/classes/com/sun/management/OSMBeanFactory.java
+++ b/jdk/src/solaris/classes/com/sun/management/OSMBeanFactory.java
@@ -35,6 +35,7 @@
* public API and its API may change in incompatable ways between dot dot
* releases and even patch releases. You should not rely on this class.
*/
+@jdk.Exported(false)
public class OSMBeanFactory {
/* static factory class */
private OSMBeanFactory() {};
diff --git a/jdk/src/solaris/native/java/lang/java_props_md.c b/jdk/src/solaris/native/java/lang/java_props_md.c
index dba053e..894973d 100644
--- a/jdk/src/solaris/native/java/lang/java_props_md.c
+++ b/jdk/src/solaris/native/java/lang/java_props_md.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, 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
@@ -158,6 +158,9 @@
temp = malloc(strlen(lc) + 1);
if (temp == NULL) {
+#ifdef MACOSX
+ free(lc); // malloced memory
+#endif
JNU_ThrowOutOfMemoryError(env, NULL);
return 0;
}
@@ -172,7 +175,6 @@
* the encoding - without it, we wouldn't get ISO-8859-15.
* Therefore, this code section is Solaris-specific.
*/
- lc = strdup(lc); /* keep a copy, setlocale trashes original. */
strcpy(temp, lc);
p = strstr(temp, "@euro");
if (p != NULL) {
diff --git a/jdk/src/solaris/native/java/net/Inet4AddressImpl.c b/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
index 3c75f78..6ef0aca4 100644
--- a/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
+++ b/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -51,7 +51,27 @@
#define HAS_GLIBC_GETHOSTBY_R 1
#endif
+static jclass ni_iacls;
+static jclass ni_ia4cls;
+static jmethodID ni_ia4ctrID;
+
+static void initializeInetClasses(JNIEnv *env)
+{
+ static int initialized = 0;
+ if (!initialized) {
+ ni_iacls = (*env)->FindClass(env, "java/net/InetAddress");
+ ni_iacls = (*env)->NewGlobalRef(env, ni_iacls);
+ ni_ia4cls = (*env)->FindClass(env, "java/net/Inet4Address");
+ ni_ia4cls = (*env)->NewGlobalRef(env, ni_ia4cls);
+ ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
+ initialized = 1;
+ }
+}
+
+
#if defined(_ALLBSD_SOURCE) && !defined(HAS_GLIBC_GETHOSTBY_R)
+extern jobjectArray lookupIfLocalhost(JNIEnv *env, const char *hostname, jboolean includeV6);
+
/* Use getaddrinfo(3), which is thread safe */
/************************************************************************
* Inet4AddressImpl
@@ -99,14 +119,6 @@
return (*env)->NewStringUTF(env, hostname);
}
-static jclass ni_iacls;
-static jclass ni_ia4cls;
-static jmethodID ni_ia4ctrID;
-static jfieldID ni_iaaddressID;
-static jfieldID ni_iahostID;
-static jfieldID ni_iafamilyID;
-static int initialized = 0;
-
/*
* Find an internet address for a given hostname. Note that this
* code only works for addresses of type INET. The translation
@@ -129,14 +141,7 @@
int error=0;
struct addrinfo hints, *res, *resNew = NULL;
- if (!initialized) {
- ni_iacls = (*env)->FindClass(env, "java/net/InetAddress");
- ni_iacls = (*env)->NewGlobalRef(env, ni_iacls);
- ni_ia4cls = (*env)->FindClass(env, "java/net/Inet4Address");
- ni_ia4cls = (*env)->NewGlobalRef(env, ni_ia4cls);
- ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
- initialized = 1;
- }
+ initializeInetClasses(env);
if (IS_NULL(host)) {
JNU_ThrowNullPointerException(env, "host is null");
@@ -160,12 +165,22 @@
return NULL;
}
+#ifdef MACOSX
+ /* If we're looking up the local machine, bypass DNS lookups and get
+ * address from getifaddrs.
+ */
+ ret = lookupIfLocalhost(env, hostname, JNI_FALSE);
+ if (ret != NULL || (*env)->ExceptionCheck(env)) {
+ JNU_ReleaseStringPlatformChars(env, host, hostname);
+ return ret;
+ }
+#endif
+
error = getaddrinfo(hostname, NULL, &hints, &res);
if (error) {
/* report error */
- JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException",
- (char *)hostname);
+ ThrowUnknownHostExceptionWithGaiError(env, hostname, error);
JNU_ReleaseStringPlatformChars(env, host, hostname);
return NULL;
} else {
@@ -365,11 +380,6 @@
return (*env)->NewStringUTF(env, hostname);
}
-static jclass ni_iacls;
-static jclass ni_ia4cls;
-static jmethodID ni_ia4ctrID;
-static int initialized = 0;
-
/*
* Find an internet address for a given hostname. Note that this
* code only works for addresses of type INET. The translation
@@ -390,14 +400,7 @@
int error = 0;
struct addrinfo hints, *res, *resNew = NULL;
- if (!initialized) {
- ni_iacls = (*env)->FindClass(env, "java/net/InetAddress");
- ni_iacls = (*env)->NewGlobalRef(env, ni_iacls);
- ni_ia4cls = (*env)->FindClass(env, "java/net/Inet4Address");
- ni_ia4cls = (*env)->NewGlobalRef(env, ni_ia4cls);
- ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
- initialized = 1;
- }
+ initializeInetClasses(env);
if (IS_NULL(host)) {
JNU_ThrowNullPointerException(env, "host is null");
diff --git a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c
index 4fc6486..d83db70 100644
--- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c
+++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -33,7 +33,9 @@
#include <strings.h>
#include <stdlib.h>
#include <ctype.h>
-#ifdef _ALLBSD_SOURCE
+#ifdef MACOSX
+#include <ifaddrs.h>
+#include <net/if.h>
#include <unistd.h> /* gethostname */
#endif
@@ -120,8 +122,146 @@
static jclass ni_ia6cls;
static jmethodID ni_ia4ctrID;
static jmethodID ni_ia6ctrID;
-static jfieldID ni_ia6ipaddressID;
-static int initialized = 0;
+static jboolean preferIPv6Address;
+
+static void initializeInetClasses(JNIEnv *env)
+{
+ jfieldID ni_preferIPv6AddressID;
+ static int initialized = 0;
+ if (!initialized) {
+ ni_iacls = (*env)->FindClass(env, "java/net/InetAddress");
+ ni_iacls = (*env)->NewGlobalRef(env, ni_iacls);
+ ni_ia4cls = (*env)->FindClass(env, "java/net/Inet4Address");
+ ni_ia4cls = (*env)->NewGlobalRef(env, ni_ia4cls);
+ ni_ia6cls = (*env)->FindClass(env, "java/net/Inet6Address");
+ ni_ia6cls = (*env)->NewGlobalRef(env, ni_ia6cls);
+ ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
+ ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
+ ni_preferIPv6AddressID =
+ (*env)->GetStaticFieldID(env, ni_iacls, "preferIPv6Address", "Z");
+ preferIPv6Address =
+ (*env)->GetStaticBooleanField(env, ia_class, ia_preferIPv6AddressID);
+ initialized = 1;
+ }
+}
+
+#ifdef MACOSX
+/* also called from Inet4AddressImpl.c */
+__private_extern__ jobjectArray
+lookupIfLocalhost(JNIEnv *env, const char *hostname, jboolean includeV6)
+{
+ jobjectArray result = NULL;
+ char myhostname[NI_MAXHOST+1];
+ struct ifaddrs *ifa = NULL;
+ int familyOrder = 0;
+ int count = 0, i, j;
+ int addrs4 = 0, addrs6 = 0, numV4Loopbacks = 0, numV6Loopbacks = 0;
+ jboolean includeLoopback = JNI_FALSE;
+ jobject name;
+
+ // Make sure static variables we need are set.
+ initializeInetClasses(env);
+
+ /* If the requested name matches this host's hostname, return IP addresses
+ * from all attached interfaces. (#2844683 et al) This prevents undesired
+ * PPP dialup, but may return addresses that don't actually correspond to
+ * the name (if the name actually matches something in DNS etc.
+ */
+ myhostname[0] = '\0';
+ if (JVM_GetHostName(myhostname, NI_MAXHOST)) {
+ /* Something went wrong, maybe networking is not setup? */
+ return NULL;
+ }
+ myhostname[NI_MAXHOST] = '\0';
+
+ if (strcmp(myhostname, hostname) != 0) {
+ // Non-self lookup
+ return NULL;
+ }
+
+ if (getifaddrs(&ifa) != 0) {
+ NET_ThrowNew(env, errno, "Can't get local interface addresses");
+ return NULL;
+ }
+
+ name = (*env)->NewStringUTF(env, hostname);
+
+ /* Iterate over the interfaces, and total up the number of IPv4 and IPv6
+ * addresses we have. Also keep a count of loopback addresses. We need to
+ * exclude them in the normal case, but return them if we don't get an IP
+ * address.
+ */
+ struct ifaddrs *iter = ifa;
+ while (iter) {
+ int family = iter->ifa_addr->sa_family;
+ if (iter->ifa_name[0] != '\0' && iter->ifa_addr)
+ {
+ jboolean isLoopback = iter->ifa_flags & IFF_LOOPBACK;
+ if (family == AF_INET) {
+ addrs4++;
+ if (isLoopback) numV4Loopbacks++;
+ } else if (family == AF_INET6 && includeV6) {
+ addrs6++;
+ if (isLoopback) numV6Loopbacks++;
+ } else {
+ /* We don't care e.g. AF_LINK */
+ }
+ }
+ iter = iter->ifa_next;
+ }
+
+ if (addrs4 == numV4Loopbacks && addrs6 == numV6Loopbacks) {
+ // We don't have a real IP address, just loopback. We need to include
+ // loopback in our results.
+ includeLoopback = JNI_TRUE;
+ }
+
+ /* Create and fill the Java array. */
+ int arraySize = addrs4 + addrs6 -
+ (includeLoopback ? 0 : (numV4Loopbacks + numV6Loopbacks));
+ result = (*env)->NewObjectArray(env, arraySize, ni_iacls, NULL);
+ if (!result) goto done;
+
+ if (preferIPv6Address) {
+ i = includeLoopback ? addrs6 : (addrs6 - numV6Loopbacks);
+ j = 0;
+ } else {
+ i = 0;
+ j = includeLoopback ? addrs4 : (addrs4 - numV4Loopbacks);
+ }
+
+ // Now loop around the ifaddrs
+ iter = ifa;
+ while (iter != NULL) {
+ jboolean isLoopback = iter->ifa_flags & IFF_LOOPBACK;
+ int family = iter->ifa_addr->sa_family;
+
+ if (iter->ifa_name[0] != '\0' && iter->ifa_addr
+ && (family == AF_INET || (family == AF_INET6 && includeV6))
+ && (!isLoopback || includeLoopback))
+ {
+ int port;
+ int index = (family == AF_INET) ? i++ : j++;
+ jobject o = NET_SockaddrToInetAddress(env, iter->ifa_addr, &port);
+ if (!o) {
+ freeifaddrs(ifa);
+ if (!(*env)->ExceptionCheck(env))
+ JNU_ThrowOutOfMemoryError(env, "Object allocation failed");
+ return NULL;
+ }
+ setInetAddress_hostName(env, o, name);
+ (*env)->SetObjectArrayElement(env, result, index, o);
+ (*env)->DeleteLocalRef(env, o);
+ }
+ iter = iter->ifa_next;
+ }
+
+ done:
+ freeifaddrs(ifa);
+
+ return result;
+}
+#endif
/*
* Find an internet address for a given hostname. Note that this
@@ -140,25 +280,13 @@
const char *hostname;
jobjectArray ret = 0;
int retLen = 0;
- jboolean preferIPv6Address;
int error=0;
#ifdef AF_INET6
struct addrinfo hints, *res, *resNew = NULL;
#endif /* AF_INET6 */
- if (!initialized) {
- ni_iacls = (*env)->FindClass(env, "java/net/InetAddress");
- ni_iacls = (*env)->NewGlobalRef(env, ni_iacls);
- ni_ia4cls = (*env)->FindClass(env, "java/net/Inet4Address");
- ni_ia4cls = (*env)->NewGlobalRef(env, ni_ia4cls);
- ni_ia6cls = (*env)->FindClass(env, "java/net/Inet6Address");
- ni_ia6cls = (*env)->NewGlobalRef(env, ni_ia6cls);
- ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
- ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
- ni_ia6ipaddressID = (*env)->GetFieldID(env, ni_ia6cls, "ipaddress", "[B");
- initialized = 1;
- }
+ initializeInetClasses(env);
if (IS_NULL(host)) {
JNU_ThrowNullPointerException(env, "host is null");
@@ -167,23 +295,20 @@
hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE);
CHECK_NULL_RETURN(hostname, NULL);
-#ifdef AF_INET6
- static jfieldID ia_preferIPv6AddressID;
- if (ia_preferIPv6AddressID == NULL) {
- jclass c = (*env)->FindClass(env,"java/net/InetAddress");
- if (c) {
- ia_preferIPv6AddressID =
- (*env)->GetStaticFieldID(env, c, "preferIPv6Address", "Z");
- }
- if (ia_preferIPv6AddressID == NULL) {
- JNU_ReleaseStringPlatformChars(env, host, hostname);
- return NULL;
- }
+#ifdef MACOSX
+ /*
+ * If we're looking up the local machine, attempt to get the address
+ * from getifaddrs. This ensures we get an IPv6 address for the local
+ * machine.
+ */
+ ret = lookupIfLocalhost(env, hostname, JNI_TRUE);
+ if (ret != NULL || (*env)->ExceptionCheck(env)) {
+ JNU_ReleaseStringPlatformChars(env, host, hostname);
+ return ret;
}
- /* get the address preference */
- preferIPv6Address
- = (*env)->GetStaticBooleanField(env, ia_class, ia_preferIPv6AddressID);
+#endif
+#ifdef AF_INET6
/* Try once, with our static buffer. */
memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_CANONNAME;
@@ -303,6 +428,7 @@
}
while (iterator != NULL) {
+ int ret1;
if (iterator->ai_family == AF_INET) {
jobject iaObj = (*env)->NewObject(env, ni_ia4cls, ni_ia4ctrID);
if (IS_NULL(iaObj)) {
@@ -315,26 +441,22 @@
inetIndex++;
} else if (iterator->ai_family == AF_INET6) {
jint scope = 0;
- jbyteArray ipaddress;
jobject iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
if (IS_NULL(iaObj)) {
ret = NULL;
goto cleanupAndReturn;
}
- ipaddress = (*env)->NewByteArray(env, 16);
- if (IS_NULL(ipaddress)) {
+ ret1 = setInet6Address_ipaddress(env, iaObj, (char *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
+ if (!ret1) {
ret = NULL;
goto cleanupAndReturn;
}
- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
- (jbyte *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
+
scope = ((struct sockaddr_in6*)iterator->ai_addr)->sin6_scope_id;
if (scope != 0) { /* zero is default value, no need to set */
- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
+ setInet6Address_scopeid(env, iaObj, scope);
}
- (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
setInetAddress_hostName(env, iaObj, host);
(*env)->SetObjectArrayElement(env, ret, inet6Index, iaObj);
inet6Index++;
diff --git a/jdk/src/solaris/native/java/net/NetworkInterface.c b/jdk/src/solaris/native/java/net/NetworkInterface.c
index bc1afe6..2596b3f 100644
--- a/jdk/src/solaris/native/java/net/NetworkInterface.c
+++ b/jdk/src/solaris/native/java/net/NetworkInterface.c
@@ -118,7 +118,6 @@
static jmethodID ni_ia4ctrID;
static jmethodID ni_ia6ctrID;
static jmethodID ni_ibctrID;
-static jfieldID ni_ia6ipaddressID;
static jfieldID ni_ibaddressID;
static jfieldID ni_ib4broadcastID;
static jfieldID ni_ib4maskID;
@@ -193,7 +192,6 @@
ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
ni_ibctrID = (*env)->GetMethodID(env, ni_ibcls, "<init>", "()V");
- ni_ia6ipaddressID = (*env)->GetFieldID(env, ni_ia6cls, "ipaddress", "[B");
ni_ibaddressID = (*env)->GetFieldID(env, ni_ibcls, "address", "Ljava/net/InetAddress;");
ni_ib4broadcastID = (*env)->GetFieldID(env, ni_ibcls, "broadcast", "Ljava/net/Inet4Address;");
ni_ib4maskID = (*env)->GetFieldID(env, ni_ibcls, "maskLength", "S");
@@ -332,11 +330,9 @@
#ifdef AF_INET6
if (family == AF_INET6) {
jbyte *bytes = (jbyte *)&(((struct sockaddr_in6*)addrP->addr)->sin6_addr);
- jbyteArray ipaddress = (*env)->GetObjectField(env, iaObj, ni_ia6ipaddressID);
jbyte caddr[16];
int i;
-
- (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddr);
+ getInet6Address_ipaddress(env, iaObj, (char *)caddr);
i = 0;
while (i < 16) {
if (caddr[i] != bytes[i]) {
@@ -668,21 +664,17 @@
int scope=0;
iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
if (iaObj) {
- jbyteArray ipaddress = (*env)->NewByteArray(env, 16);
- if (ipaddress == NULL) {
+ int ret = setInet6Address_ipaddress(env, iaObj, (char *)&(((struct sockaddr_in6*)addrP->addr)->sin6_addr));
+ if (ret == JNI_FALSE) {
return NULL;
}
- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
- (jbyte *)&(((struct sockaddr_in6*)addrP->addr)->sin6_addr));
scope = ((struct sockaddr_in6*)addrP->addr)->sin6_scope_id;
if (scope != 0) { /* zero is default value, no need to set */
- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
- (*env)->SetObjectField(env, iaObj, ia6_scopeifnameID, netifObj);
+ setInet6Address_scopeid(env, iaObj, scope);
+ setInet6Address_scopeifname(env, iaObj, netifObj);
}
- (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
}
ibObj = (*env)->NewObject(env, ni_ibcls, ni_ibctrID);
if (ibObj) {
diff --git a/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c b/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
index 981bf53..09f8e5d 100644
--- a/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+++ b/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
@@ -2148,8 +2148,7 @@
caddr[14] = ((address >> 8) & 0xff);
caddr[15] = (address & 0xff);
} else {
- ipaddress = (*env)->GetObjectField(env, iaObj, ia6_ipaddressID);
- (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddr);
+ getInet6Address_ipaddress(env, iaObj, caddr);
}
memcpy((void *)&(mname6.ipv6mr_multiaddr), caddr, sizeof(struct in6_addr));
diff --git a/jdk/src/solaris/native/java/net/net_util_md.c b/jdk/src/solaris/native/java/net/net_util_md.c
index 004b6aa..d7ebbd5 100644
--- a/jdk/src/solaris/native/java/net/net_util_md.c
+++ b/jdk/src/solaris/native/java/net/net_util_md.c
@@ -782,7 +782,6 @@
/* needs work. 1. family 2. clean up him6 etc deallocate memory */
if (ipv6_available() && !(family == IPv4 && v4MappedAddress == JNI_FALSE)) {
struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)him;
- jbyteArray ipaddress;
jbyte caddr[16];
jint address;
@@ -803,8 +802,7 @@
caddr[15] = (address & 0xff);
}
} else {
- ipaddress = (*env)->GetObjectField(env, iaObj, ia6_ipaddressID);
- (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddr);
+ getInet6Address_ipaddress(env, iaObj, (char *)caddr);
}
memset((char *)him6, 0, sizeof(struct sockaddr_in6));
him6->sin6_port = htons(port);
@@ -840,7 +838,7 @@
*/
if (!cached_scope_id) {
if (ia6_scopeidID) {
- scope_id = (int)(*env)->GetIntField(env,iaObj,ia6_scopeidID);
+ scope_id = getInet6Address_scopeid(env, iaObj);
}
if (scope_id != 0) {
/* check user-specified value for loopback case
@@ -884,7 +882,7 @@
if (family != IPv4) {
if (ia6_scopeidID) {
- him6->sin6_scope_id = (int)(*env)->GetIntField(env, iaObj, ia6_scopeidID);
+ him6->sin6_scope_id = getInet6Address_scopeid(env, iaObj);
}
}
#endif
diff --git a/jdk/src/windows/native/java/net/Inet4AddressImpl.c b/jdk/src/windows/native/java/net/Inet4AddressImpl.c
index d7cf8e5..97aab6f 100644
--- a/jdk/src/windows/native/java/net/Inet4AddressImpl.c
+++ b/jdk/src/windows/native/java/net/Inet4AddressImpl.c
@@ -241,6 +241,10 @@
addrp++;
i++;
}
+ } else if (WSAGetLastError() == WSATRY_AGAIN) {
+ NET_ThrowByNameWithLastError(env,
+ JNU_JAVANETPKG "UnknownHostException",
+ hostname);
} else {
JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException", hostname);
}
diff --git a/jdk/src/windows/native/java/net/Inet6AddressImpl.c b/jdk/src/windows/native/java/net/Inet6AddressImpl.c
index 6f46d7e..0e6fc30 100644
--- a/jdk/src/windows/native/java/net/Inet6AddressImpl.c
+++ b/jdk/src/windows/native/java/net/Inet6AddressImpl.c
@@ -77,7 +77,6 @@
static jclass ni_ia6cls;
static jmethodID ni_ia4ctrID;
static jmethodID ni_ia6ctrID;
-static jfieldID ni_ia6ipaddressID;
static int initialized = 0;
JNIEXPORT jobjectArray JNICALL
@@ -101,7 +100,6 @@
ni_ia6cls = (*env)->NewGlobalRef(env, ni_ia6cls);
ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
- ni_ia6ipaddressID = (*env)->GetFieldID(env, ni_ia6cls, "ipaddress", "[B");
initialized = 1;
}
if (IS_NULL(host)) {
@@ -133,7 +131,13 @@
error = getaddrinfo(hostname, NULL, &hints, &res);
- if (error) {
+ if (WSAGetLastError() == WSATRY_AGAIN) {
+ NET_ThrowByNameWithLastError(env,
+ JNU_JAVANETPKG "UnknownHostException",
+ hostname);
+ JNU_ReleaseStringPlatformChars(env, host, hostname);
+ return NULL;
+ } else if (error) {
/* report error */
JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException",
(char *)hostname);
@@ -242,26 +246,22 @@
(*env)->SetObjectArrayElement(env, ret, inetIndex, iaObj);
inetIndex ++;
} else if (iterator->ai_family == AF_INET6) {
- jint scope = 0;
- jbyteArray ipaddress;
+ jint scope = 0, ret1;
jobject iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
if (IS_NULL(iaObj)) {
ret = NULL;
goto cleanupAndReturn;
}
- ipaddress = (*env)->NewByteArray(env, 16);
- if (IS_NULL(ipaddress)) {
+ ret1 = setInet6Address_ipaddress(env, iaObj, (jbyte *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
+
+ if (ret1 == JNI_FALSE) {
ret = NULL;
goto cleanupAndReturn;
}
- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
- (jbyte *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
scope = ((struct sockaddr_in6*)iterator->ai_addr)->sin6_scope_id;
if (scope != 0) { /* zero is default value, no need to set */
- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
+ setInet6Address_scopeid(env, iaObj, scope);
}
- (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
setInetAddress_hostName(env, iaObj, host);
(*env)->SetObjectArrayElement(env, ret, inet6Index, iaObj);
inet6Index ++;
diff --git a/jdk/src/windows/native/java/net/NetworkInterface.c b/jdk/src/windows/native/java/net/NetworkInterface.c
index 98606fa..ad7bae7 100644
--- a/jdk/src/windows/native/java/net/NetworkInterface.c
+++ b/jdk/src/windows/native/java/net/NetworkInterface.c
@@ -72,8 +72,6 @@
jclass ni_ia6cls; /* Inet6Address */
jmethodID ni_ia6ctrID; /* Inet6Address() */
-jfieldID ni_ia6ipaddressID;
-jfieldID ni_ia6ipaddressID;
jclass ni_ibcls; /* InterfaceAddress */
jmethodID ni_ibctrID; /* InterfaceAddress() */
@@ -520,7 +518,6 @@
ni_ia6cls = (*env)->FindClass(env, "java/net/Inet6Address");
ni_ia6cls = (*env)->NewGlobalRef(env, ni_ia6cls);
ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
- ni_ia6ipaddressID = (*env)->GetFieldID(env, ni_ia6cls, "ipaddress", "[B");
ni_ibcls = (*env)->FindClass(env, "java/net/InterfaceAddress");
ni_ibcls = (*env)->NewGlobalRef(env, ni_ibcls);
@@ -621,19 +618,16 @@
int scope;
iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
if (iaObj) {
- jbyteArray ipaddress = (*env)->NewByteArray(env, 16);
- if (ipaddress == NULL) {
+ int ret = setInet6Address_ipaddress(env, iaObj, (jbyte *)&(addrs->addr.him6.sin6_addr.s6_addr));
+ if (ret == JNI_FALSE) {
return NULL;
}
- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
- (jbyte *)&(addrs->addr.him6.sin6_addr.s6_addr));
+
scope = addrs->addr.him6.sin6_scope_id;
if (scope != 0) { /* zero is default value, no need to set */
- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
- (*env)->SetObjectField(env, iaObj, ia6_scopeifnameID, netifObj);
+ setInet6Address_scopeid(env, iaObj, scope);
+ setInet6Address_scopeifname(env, iaObj, netifObj);
}
- (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
ibObj = (*env)->NewObject(env, ni_ibcls, ni_ibctrID);
if (ibObj == NULL) {
free_netaddr(netaddrP);
diff --git a/jdk/src/windows/native/java/net/NetworkInterface_winXP.c b/jdk/src/windows/native/java/net/NetworkInterface_winXP.c
index 414f5c7..7e3e79d 100644
--- a/jdk/src/windows/native/java/net/NetworkInterface_winXP.c
+++ b/jdk/src/windows/native/java/net/NetworkInterface_winXP.c
@@ -549,19 +549,15 @@
int scope;
iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
if (iaObj) {
- jbyteArray ipaddress = (*env)->NewByteArray(env, 16);
- if (ipaddress == NULL) {
+ int ret = setInet6Address_ipaddress(env, iaObj, (jbyte *)&(addrs->addr.him6.sin6_addr.s6_addr));
+ if (ret == JNI_FALSE) {
return NULL;
}
- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
- (jbyte *)&(addrs->addr.him6.sin6_addr.s6_addr));
scope = addrs->addr.him6.sin6_scope_id;
if (scope != 0) { /* zero is default value, no need to set */
- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
- (*env)->SetObjectField(env, iaObj, ia6_scopeifnameID, netifObj);
+ setInet6Address_scopeid(env, iaObj, scope);
+ setInet6Address_scopeifname(env, iaObj, netifObj);
}
- (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
ibObj = (*env)->NewObject(env, ni_ibcls, ni_ibctrID);
if (ibObj == NULL) {
free_netaddr(netaddrP);
diff --git a/jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c b/jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c
index 6823ddc..f535073 100644
--- a/jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c
+++ b/jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c
@@ -728,7 +728,6 @@
setInetAddress_family(env, socketAddressObj, IPv4);
(*env)->SetObjectField(env, socket, psi_addressID, socketAddressObj);
} else {
- jbyteArray addr;
/* AF_INET6 -> Inet6Address */
if (inet6Cls == 0) {
jclass c = (*env)->FindClass(env, "java/net/Inet6Address");
@@ -751,14 +750,10 @@
NET_SocketClose(fd);
return;
}
- addr = (*env)->GetObjectField (env, socketAddressObj, ia6_ipaddressID);
- (*env)->SetByteArrayRegion (env, addr, 0, 16, (const char *)&him.him6.sin6_addr);
+ setInet6Address_ipaddress(env, socketAddressObj, (const char *)&him.him6.sin6_addr);
setInetAddress_family(env, socketAddressObj, IPv6);
- scope = him.him6.sin6_scope_id;
- (*env)->SetIntField(env, socketAddressObj, ia6_scopeidID, scope);
- if(scope>0) {
- (*env)->SetBooleanField(env, socketAddressObj, ia6_scopeidsetID, JNI_TRUE);
- }
+ setInet6Address_scopeid(env, socketAddressObj, him.him6.sin6_scope_id);
+
}
/* fields common to AF_INET and AF_INET6 */
diff --git a/jdk/src/windows/native/java/net/net_util_md.c b/jdk/src/windows/native/java/net/net_util_md.c
index 4e5cb50..6ddb2bc 100644
--- a/jdk/src/windows/native/java/net/net_util_md.c
+++ b/jdk/src/windows/native/java/net/net_util_md.c
@@ -851,7 +851,6 @@
family = (iafam == IPv4)? AF_INET : AF_INET6;
if (ipv6_available() && !(family == AF_INET && v4MappedAddress == JNI_FALSE)) {
struct SOCKADDR_IN6 *him6 = (struct SOCKADDR_IN6 *)him;
- jbyteArray ipaddress;
jbyte caddr[16];
jint address, scopeid = 0;
jint cached_scope_id = 0;
@@ -872,10 +871,9 @@
caddr[15] = (address & 0xff);
}
} else {
- ipaddress = (*env)->GetObjectField(env, iaObj, ia6_ipaddressID);
- scopeid = (jint)(*env)->GetIntField(env, iaObj, ia6_scopeidID);
+ getInet6Address_ipaddress(env, iaObj, (char *)caddr);
+ scopeid = getInet6Address_scopeid(env, iaObj);
cached_scope_id = (jint)(*env)->GetIntField(env, iaObj, ia6_cachedscopeidID);
- (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddr);
}
memset((char *)him6, 0, sizeof(struct SOCKADDR_IN6));
diff --git a/jdk/test/Makefile b/jdk/test/Makefile
index 7a09964..c4a9b93 100644
--- a/jdk/test/Makefile
+++ b/jdk/test/Makefile
@@ -484,7 +484,8 @@
com/sun/org/apache/xerces \
com/sun/corba \
com/sun/tracing \
- sun/usagetracker)
+ sun/usagetracker \
+ misc)
$(call RunBatch)
JDK_ALL_TARGETS += jdk_net
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 484fbc7..cf4d9b8 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -138,6 +138,9 @@
java/lang/instrument/RetransformBigClass.sh generic-all
java/lang/instrument/RedefineBigClass.sh generic-all
+# 8026502
+java/lang/invoke/MethodHandleConstants.java generic-all
+
############################################################################
# jdk_management
@@ -322,18 +325,6 @@
# 8007410
tools/launcher/FXLauncherTest.java linux-all
-# 8025427
-sun/tools/jstat/jstatLineCounts1.sh generic-all
-sun/tools/jstat/jstatLineCounts2.sh generic-all
-sun/tools/jstat/jstatLineCounts3.sh generic-all
-sun/tools/jstat/jstatTimeStamp1.sh generic-all
-sun/tools/jstat/jstatGcCauseOutput1.sh generic-all
-sun/tools/jstat/jstatLineCounts4.sh generic-all
-sun/tools/jstatd/jstatdDefaults.sh generic-all
-sun/tools/jstatd/jstatdExternalRegistry.sh generic-all
-sun/tools/jstatd/jstatdPort.sh generic-all
-sun/tools/jstatd/jstatdServerName.sh generic-all
-
############################################################################
# jdk_jdi
diff --git a/jdk/test/TEST.groups b/jdk/test/TEST.groups
index 23c9a83..c680117 100644
--- a/jdk/test/TEST.groups
+++ b/jdk/test/TEST.groups
@@ -86,7 +86,6 @@
# java.util.stream (JSR-335)
jdk_stream = \
java/util/Optional \
- java/util/SummaryStatistics \
java/util/function \
java/util/stream
@@ -126,7 +125,6 @@
javax/security \
com/sun/security \
com/sun/org/apache/xml/internal/security \
- com/oracle/security \
sun/security \
lib/security
@@ -319,7 +317,6 @@
java/net/URLClassLoader/closetest/GetResourceAsStream.java \
java/util/Collections/EmptyIterator.java \
java/util/concurrent/locks/Lock/TimedAcquireLeak.java \
- java/util/jar/Manifest/CreateManifest.java \
java/util/jar/JarInputStream/ExtraFileInMetaInf.java \
java/util/logging/AnonLoggerWeakRefLeak.sh \
java/util/logging/LoggerWeakRefLeak.sh \
@@ -358,8 +355,10 @@
java/net/URLConnection/HandleContentTypeWithAttrs.java \
java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh \
java/security/Security/ClassLoaderDeadlock/Deadlock.sh \
+ java/util/jar/Manifest/CreateManifest.java \
java/util/logging/Listeners.java \
java/util/logging/ListenersWithSM.java \
+ java/util/logging/TestMainAppContext.java \
java/util/ResourceBundle/Control/Bug6530694.java \
java/text/Bidi/BidiConformance.java \
java/text/Bidi/BidiEmbeddingTest.java \
@@ -527,10 +526,10 @@
java/net/CookieHandler/EmptyCookieHeader.java \
java/net/HttpCookie/IllegalCookieNameTest.java \
java/net/HttpURLConnection/UnmodifiableMaps.java \
- java/net/HttpURLPermission/URLTest.java \
java/net/ResponseCache/Test.java \
java/net/URLClassLoader/ClassLoad.java \
java/net/URLClassLoader/closetest/CloseTest.java \
+ java/net/URLPermission/URLTest.java \
java/nio/Buffer/Chars.java \
java/nio/file/Files/StreamTest.java \
java/security/BasicPermission/Wildcard.java \
@@ -538,7 +537,6 @@
java/util/Arrays/SetAllTest.java \
java/util/BitSet/BitSetStreamTest.java \
java/util/Collection/CollectionDefaults.java \
- java/util/Collection/ListDefaults.java \
java/util/Collections/CheckedIdentityMap.java \
java/util/Collections/CheckedMapBash.java \
java/util/Collections/CheckedSetBash.java \
@@ -550,6 +548,7 @@
java/util/Comparator/TypeTest.java \
java/util/Iterator/IteratorDefaults.java \
java/util/Iterator/PrimitiveIteratorDefaults.java \
+ java/util/List/ListDefaults.java \
java/util/Map/BasicSerialization.java \
java/util/Map/Defaults.java \
java/util/Map/EntryComparators.java \
diff --git a/jdk/test/com/oracle/security/ucrypto/TestAES.java b/jdk/test/com/oracle/security/ucrypto/TestAES.java
deleted file mode 100644
index 9f280ae..0000000
--- a/jdk/test/com/oracle/security/ucrypto/TestAES.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 7088989
- * @summary Ensure the AES ciphers of OracleUcrypto provider works correctly
- */
-import java.io.*;
-import java.security.*;
-import java.security.spec.*;
-import java.util.*;
-import javax.crypto.*;
-import javax.crypto.spec.*;
-
-public class TestAES extends UcryptoTest {
-
- private static final String[] PADDEDCIPHER_ALGOS = {
- "AES/ECB/PKCS5Padding",
- "AES/CBC/PKCS5Padding",
- "AES/CFB128/PKCS5Padding"
- };
-
- private static final String[] CIPHER_ALGOS = {
- "AES/ECB/NoPadding",
- "AES/CBC/NoPadding",
- "AES/CFB128/NoPadding",
- "AES/CTR/NoPadding",
- };
-
- private static final SecretKey CIPHER_KEY =
- new SecretKeySpec(new byte[16], "AES");
-
- public static void main(String[] args) throws Exception {
- main(new TestAES(), null);
- }
-
- public void doTest(Provider prov) throws Exception {
- // Provider for testing Interoperability
- Provider sunJCEProv = Security.getProvider("SunJCE");
-
- testCipherInterop(CIPHER_ALGOS, CIPHER_KEY, prov, sunJCEProv);
- testCipherInterop(PADDEDCIPHER_ALGOS, CIPHER_KEY, prov, sunJCEProv);
-
- testCipherOffset(CIPHER_ALGOS, CIPHER_KEY, prov);
- testCipherOffset(PADDEDCIPHER_ALGOS, CIPHER_KEY, prov);
-
- testCipherKeyWrapping(PADDEDCIPHER_ALGOS, CIPHER_KEY, prov, sunJCEProv);
- testCipherGCM(CIPHER_KEY, prov);
- }
-
- private static void testCipherInterop(String[] algos, SecretKey key,
- Provider p,
- Provider interopP) {
- boolean testPassed = true;
- byte[] in = new byte[32];
- (new SecureRandom()).nextBytes(in);
-
- for (String algo : algos) {
- try {
- // check ENC
- Cipher c;
- try {
- c = Cipher.getInstance(algo, p);
- } catch (NoSuchAlgorithmException nsae) {
- System.out.println("Skipping Unsupported CIP algo: " + algo);
- continue;
- }
- c.init(Cipher.ENCRYPT_MODE, key, (AlgorithmParameters)null, null);
- byte[] eout = c.doFinal(in, 0, in.length);
-
- AlgorithmParameters params = c.getParameters();
- Cipher c2 = Cipher.getInstance(algo, interopP);
- c2.init(Cipher.ENCRYPT_MODE, key, params, null);
- byte[] eout2 = c2.doFinal(in, 0, in.length);
-
- if (!Arrays.equals(eout, eout2)) {
- System.out.println(algo + ": DIFF FAILED");
- testPassed = false;
- } else {
- System.out.println(algo + ": ENC Passed");
- }
-
- // check DEC
- c.init(Cipher.DECRYPT_MODE, key, params, null);
- byte[] dout = c.doFinal(eout);
- c2.init(Cipher.DECRYPT_MODE, key, params, null);
- byte[] dout2 = c2.doFinal(eout2);
-
- if (!Arrays.equals(dout, dout2)) {
- System.out.println(algo + ": DIFF FAILED");
- testPassed = false;
- } else {
- System.out.println(algo + ": DEC Passed");
- }
- } catch(Exception ex) {
- System.out.println("Unexpected Exception: " + algo);
- ex.printStackTrace();
- testPassed = false;
- }
- }
-
- if (!testPassed) {
- throw new RuntimeException("One or more CIPHER test failed!");
- } else {
- System.out.println("CIPHER Interop Tests Passed");
- }
- }
-
- private static void testCipherOffset(String[] algos, SecretKey key,
- Provider p) {
- boolean testPassed = true;
- byte[] in = new byte[16];
- (new SecureRandom()).nextBytes(in);
- int blockSize = 16;
-
- for (int j = 1; j < (in.length - 1); j++) {
- System.out.println("Input offset size: " + j);
- for (int i = 0; i < algos.length; i++) {
- try {
- // check ENC
- Cipher c;
- try {
- c = Cipher.getInstance(algos[i], p);
- } catch (NoSuchAlgorithmException nsae) {
- System.out.println("Skip Unsupported CIP algo: " + algos[i]);
- continue;
- }
- c.init(Cipher.ENCRYPT_MODE, key, (AlgorithmParameters)null, null);
- byte[] eout = new byte[c.getOutputSize(in.length)];
- int firstPartLen = in.length - j - 1;
- //System.out.print("1st UPDATE: " + firstPartLen);
- int k = c.update(in, 0, firstPartLen, eout, 0);
- k += c.update(in, firstPartLen, 1, eout, k);
- k += c.doFinal(in, firstPartLen+1, j, eout, k);
-
- AlgorithmParameters params = c.getParameters();
-
- Cipher c2 = Cipher.getInstance(algos[i], p);
- c2.init(Cipher.ENCRYPT_MODE, key, params, null);
- byte[] eout2 = new byte[c2.getOutputSize(in.length)];
- int k2 = c2.update(in, 0, j, eout2, 0);
- k2 += c2.update(in, j, 1, eout2, k2);
- k2 += c2.doFinal(in, j+1, firstPartLen, eout2, k2);
-
- if (!checkArrays(eout, k, eout2, k2)) testPassed = false;
-
- // check DEC
- c.init(Cipher.DECRYPT_MODE, key, params, null);
- byte[] dout = new byte[c.getOutputSize(eout.length)];
- k = c.update(eout, 0, firstPartLen, dout, 0);
- k += c.update(eout, firstPartLen, 1, dout, k);
- k += c.doFinal(eout, firstPartLen+1, eout.length - firstPartLen - 1, dout, k);
- if (!checkArrays(in, in.length, dout, k)) testPassed = false;
- } catch(Exception ex) {
- System.out.println("Unexpected Exception: " + algos[i]);
- ex.printStackTrace();
- testPassed = false;
- }
- }
- }
- if (!testPassed) {
- throw new RuntimeException("One or more CIPHER test failed!");
- } else {
- System.out.println("CIPHER Offset Tests Passed");
- }
- }
-
- private static void testCipherKeyWrapping(String[] algos, SecretKey key,
- Provider p, Provider interopP)
- throws NoSuchAlgorithmException {
- boolean testPassed = true;
-
- // Test SecretKey, PrivateKey and PublicKey
- Key[] tbwKeys = new Key[3];
- int[] tbwKeyTypes = { Cipher.SECRET_KEY, Cipher.PRIVATE_KEY, Cipher.PUBLIC_KEY };
- tbwKeys[0] = new SecretKeySpec(new byte[20], "Blowfish");
- KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
- kpg.initialize(1024);
- KeyPair kp = kpg.generateKeyPair();
- tbwKeys[1] = kp.getPrivate();
- tbwKeys[2] = kp.getPublic();
-
- for (int i = 0; i < algos.length; i++) {
- try {
- System.out.println(algos[i] + " - Native WRAP/Java UNWRAP");
-
- Cipher c1;
- try {
- c1 = Cipher.getInstance(algos[i], p);
- } catch (NoSuchAlgorithmException nsae) {
- System.out.println("Skipping Unsupported CIP algo: " + algos[i]);
- continue;
- }
- c1.init(Cipher.WRAP_MODE, key, (AlgorithmParameters)null, null);
- AlgorithmParameters params = c1.getParameters();
- Cipher c2 = Cipher.getInstance(algos[i], interopP);
- c2.init(Cipher.UNWRAP_MODE, key, params, null);
-
- for (int j = 0; j < tbwKeys.length ; j++) {
- byte[] wrappedKey = c1.wrap(tbwKeys[j]);
- Key recovered = c2.unwrap(wrappedKey,
- tbwKeys[j].getAlgorithm(), tbwKeyTypes[j]);
- if (!checkKeys(tbwKeys[j], recovered)) testPassed = false;
- }
-
- System.out.println(algos[i] + " - Java WRAP/Native UNWRAP");
- c1 = Cipher.getInstance(algos[i], interopP);
- c1.init(Cipher.WRAP_MODE, key, (AlgorithmParameters)null, null);
- params = c1.getParameters();
- c2 = Cipher.getInstance(algos[i], p);
- c2.init(Cipher.UNWRAP_MODE, key, params, null);
-
- for (int j = 0; j < tbwKeys.length ; j++) {
- byte[] wrappedKey = c1.wrap(tbwKeys[j]);
- Key recovered = c2.unwrap(wrappedKey,
- tbwKeys[j].getAlgorithm(), tbwKeyTypes[j]);
- if (!checkKeys(tbwKeys[j], recovered)) testPassed = false;
- }
-
- } catch(Exception ex) {
- System.out.println("Unexpected Exception: " + algos[i]);
- ex.printStackTrace();
- testPassed = false;
- }
- }
- if (!testPassed) {
- throw new RuntimeException("One or more CIPHER test failed!");
- } else {
- System.out.println("CIPHER KeyWrapping Tests Passed");
- }
- }
-
-
- private static void testCipherGCM(SecretKey key,
- Provider p) {
- boolean testPassed = true;
- byte[] in = new byte[16];
- (new SecureRandom()).nextBytes(in);
-
- byte[] iv = new byte[16];
- (new SecureRandom()).nextBytes(iv);
-
-
- String algo = "AES/GCM/NoPadding";
- int tagLen[] = { 128, 120, 112, 104, 96, 64, 32 };
-
- try {
- Cipher c;
- try {
- c = Cipher.getInstance(algo, p);
- } catch (NoSuchAlgorithmException nsae) {
- System.out.println("Skipping Unsupported CIP algo: " + algo);
- return;
- }
- for (int i = 0; i < tagLen.length; i++) {
- AlgorithmParameterSpec paramSpec = new GCMParameterSpec(tagLen[i], iv);
- // check ENC
- c.init(Cipher.ENCRYPT_MODE, key, paramSpec, null);
- c.updateAAD(iv);
- byte[] eout = c.doFinal(in, 0, in.length);
-
- AlgorithmParameters param = c.getParameters();
- // check DEC
- c.init(Cipher.DECRYPT_MODE, key, param, null);
- c.updateAAD(iv);
- byte[] dout = c.doFinal(eout, 0, eout.length);
-
- if (!Arrays.equals(dout, in)) {
- System.out.println(algo + ": PT and RT DIFF FAILED");
- testPassed = false;
- } else {
- System.out.println(algo + ": tagLen " + tagLen[i] + " done");
- }
- }
- } catch(Exception ex) {
- System.out.println("Unexpected Exception: " + algo);
- ex.printStackTrace();
- testPassed = false;
- }
- if (!testPassed) {
- throw new RuntimeException("One or more CIPHER test failed!");
- } else {
- System.out.println("CIPHER GCM Tests Passed");
- }
- }
-
- private static boolean checkArrays(byte[] a1, int a1Len, byte[] a2, int a2Len) {
- boolean equal = true;
- if (a1Len != a2Len) {
- System.out.println("DIFFERENT OUT LENGTH");
- equal = false;
- } else {
- for (int p = 0; p < a1Len; p++) {
- if (a1[p] != a2[p]) {
- System.out.println("DIFF FAILED");
- equal = false;
- break;
- }
- }
- }
- return equal;
- }
-
- private static boolean checkKeys(Key k1, Key k2) {
- boolean equal = true;
- if (!k1.getAlgorithm().equalsIgnoreCase(k2.getAlgorithm())) {
- System.out.println("DIFFERENT Key Algorithm");
- equal = false;
- } else if (!k1.getFormat().equalsIgnoreCase(k2.getFormat())) {
- System.out.println("DIFFERENT Key Format");
- equal = false;
- } else if (!Arrays.equals(k1.getEncoded(), k2.getEncoded())) {
- System.out.println("DIFFERENT Key Encoding");
- equal = false;
- }
- return equal;
- }
-}
diff --git a/jdk/test/com/oracle/security/ucrypto/TestDigest.java b/jdk/test/com/oracle/security/ucrypto/TestDigest.java
deleted file mode 100644
index 3bc85dc..0000000
--- a/jdk/test/com/oracle/security/ucrypto/TestDigest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 7088989
- * @summary Ensure the various message digests works correctly
- */
-import java.io.*;
-import java.security.*;
-import java.security.spec.*;
-import java.util.*;
-import javax.crypto.*;
-import javax.crypto.spec.*;
-
-public class TestDigest extends UcryptoTest {
-
- private static final String[] MD_ALGOS = {
- "MD5",
- "SHA",
- "SHA-256",
- "SHA-384",
- "SHA-512"
- };
-
- public static void main(String[] args) throws Exception {
- main(new TestDigest(), null);
- }
-
- public void doTest(Provider p) {
- boolean testPassed = true;
- byte[] msg = new byte[200];
- (new SecureRandom()).nextBytes(msg);
- String interopProvName = "SUN";
-
- for (String a : MD_ALGOS) {
- try {
- MessageDigest md, md2;
- try {
- md = MessageDigest.getInstance(a, p);
- } catch (NoSuchAlgorithmException nsae) {
- System.out.println("Skipping Unsupported MD algo: " + a);
- continue;
- }
- md2 = MessageDigest.getInstance(a, interopProvName);
- // Test Interoperability for update+digest calls
- for (int i = 0; i < 3; i++) {
- md.update(msg);
- byte[] digest = md.digest();
- md2.update(msg);
- byte[] digest2 = md2.digest();
- if (!Arrays.equals(digest, digest2)) {
- System.out.println("DIFF1 FAILED for: " + a + " at iter " + i);
- testPassed = false;
- }
- }
-
- // Test Interoperability for digest calls
- md = MessageDigest.getInstance(a, p);
- md2 = MessageDigest.getInstance(a, interopProvName);
-
- for (int i = 0; i < 3; i++) {
- byte[] digest = md.digest();
- byte[] digest2 = md2.digest();
- if (!Arrays.equals(digest, digest2)) {
- System.out.println("DIFF2 FAILED for: " + a + " at iter " + i);
- testPassed = false;
- }
- }
-
- // Test Cloning functionality
- md = MessageDigest.getInstance(a, p);
- md2 = (MessageDigest) md.clone(); // clone right after construction
- byte[] digest = md.digest();
- byte[] digest2 = md2.digest();
- if (!Arrays.equals(digest, digest2)) {
- System.out.println("DIFF-3.1 FAILED for: " + a);
- testPassed = false;
- }
- md.update(msg);
- md2 = (MessageDigest) md.clone(); // clone again after update call
- digest = md.digest();
- digest2 = md2.digest();
- if (!Arrays.equals(digest, digest2)) {
- System.out.println("DIFF-3.2 FAILED for: " + a);
- testPassed = false;
- }
- md2 = (MessageDigest) md.clone(); // clone after digest
- digest = md.digest();
- digest2 = md2.digest();
- if (!Arrays.equals(digest, digest2)) {
- System.out.println("DIFF-3.3 FAILED for: " + a);
- testPassed = false;
- }
- } catch(Exception ex) {
- System.out.println("Unexpected Exception: " + a);
- ex.printStackTrace();
- testPassed = false;
- }
- }
- if (!testPassed) {
- throw new RuntimeException("One or more MD test failed!");
- } else {
- System.out.println("MD Tests Passed");
- }
- }
-}
diff --git a/jdk/test/com/oracle/security/ucrypto/TestRSA.java b/jdk/test/com/oracle/security/ucrypto/TestRSA.java
deleted file mode 100644
index 3f4364e..0000000
--- a/jdk/test/com/oracle/security/ucrypto/TestRSA.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 7088989
- * @summary Ensure the RSA ciphers and signatures works correctly
- */
-import java.io.*;
-import java.security.*;
-import java.security.spec.*;
-import java.util.*;
-import java.math.*;
-import javax.crypto.*;
-
-public class TestRSA extends UcryptoTest {
-
- // KAT
- private static final byte PLAINTEXT[] = Arrays.copyOf
- (new String("Known plaintext message utilized" +
- "for RSA Encryption & Decryption" +
- "block, SHA1, SHA256, SHA384 and" +
- "SHA512 RSA Signature KAT tests.").getBytes(), 128);
-
- private static final byte MOD[] = {
- (byte)0xd5, (byte)0x84, (byte)0x95, (byte)0x07, (byte)0xf4, (byte)0xd0,
- (byte)0x1f, (byte)0x82, (byte)0xf3, (byte)0x79, (byte)0xf4, (byte)0x99,
- (byte)0x48, (byte)0x10, (byte)0xe1, (byte)0x71, (byte)0xa5, (byte)0x62,
- (byte)0x22, (byte)0xa3, (byte)0x4b, (byte)0x00, (byte)0xe3, (byte)0x5b,
- (byte)0x3a, (byte)0xcc, (byte)0x10, (byte)0x83, (byte)0xe0, (byte)0xaf,
- (byte)0x61, (byte)0x13, (byte)0x54, (byte)0x6a, (byte)0xa2, (byte)0x6a,
- (byte)0x2c, (byte)0x5e, (byte)0xb3, (byte)0xcc, (byte)0xa3, (byte)0x71,
- (byte)0x9a, (byte)0xb2, (byte)0x3e, (byte)0x78, (byte)0xec, (byte)0xb5,
- (byte)0x0e, (byte)0x6e, (byte)0x31, (byte)0x3b, (byte)0x77, (byte)0x1f,
- (byte)0x6e, (byte)0x94, (byte)0x41, (byte)0x60, (byte)0xd5, (byte)0x6e,
- (byte)0xd9, (byte)0xc6, (byte)0xf9, (byte)0x29, (byte)0xc3, (byte)0x40,
- (byte)0x36, (byte)0x25, (byte)0xdb, (byte)0xea, (byte)0x0b, (byte)0x07,
- (byte)0xae, (byte)0x76, (byte)0xfd, (byte)0x99, (byte)0x29, (byte)0xf4,
- (byte)0x22, (byte)0xc1, (byte)0x1a, (byte)0x8f, (byte)0x05, (byte)0xfe,
- (byte)0x98, (byte)0x09, (byte)0x07, (byte)0x05, (byte)0xc2, (byte)0x0f,
- (byte)0x0b, (byte)0x11, (byte)0x83, (byte)0x39, (byte)0xca, (byte)0xc7,
- (byte)0x43, (byte)0x63, (byte)0xff, (byte)0x33, (byte)0x80, (byte)0xe7,
- (byte)0xc3, (byte)0x78, (byte)0xae, (byte)0xf1, (byte)0x73, (byte)0x52,
- (byte)0x98, (byte)0x1d, (byte)0xde, (byte)0x5c, (byte)0x53, (byte)0x6e,
- (byte)0x01, (byte)0x73, (byte)0x0d, (byte)0x12, (byte)0x7e, (byte)0x77,
- (byte)0x03, (byte)0xf1, (byte)0xef, (byte)0x1b, (byte)0xc8, (byte)0xa8,
- (byte)0x0f, (byte)0x97
- };
-
- private static final byte PUB_EXP[] = {(byte)0x01, (byte)0x00, (byte)0x01};
-
- private static final byte PRIV_EXP[] = {
- (byte)0x85, (byte)0x27, (byte)0x47, (byte)0x61, (byte)0x4c, (byte)0xd4,
- (byte)0xb5, (byte)0xb2, (byte)0x0e, (byte)0x70, (byte)0x91, (byte)0x8f,
- (byte)0x3d, (byte)0x97, (byte)0xf9, (byte)0x5f, (byte)0xcc, (byte)0x09,
- (byte)0x65, (byte)0x1c, (byte)0x7c, (byte)0x5b, (byte)0xb3, (byte)0x6d,
- (byte)0x63, (byte)0x3f, (byte)0x7b, (byte)0x55, (byte)0x22, (byte)0xbb,
- (byte)0x7c, (byte)0x48, (byte)0x77, (byte)0xae, (byte)0x80, (byte)0x56,
- (byte)0xc2, (byte)0x10, (byte)0xd5, (byte)0x03, (byte)0xdb, (byte)0x31,
- (byte)0xaf, (byte)0x8d, (byte)0x54, (byte)0xd4, (byte)0x48, (byte)0x99,
- (byte)0xa8, (byte)0xc4, (byte)0x23, (byte)0x43, (byte)0xb8, (byte)0x48,
- (byte)0x0b, (byte)0xc7, (byte)0xbc, (byte)0xf5, (byte)0xcc, (byte)0x64,
- (byte)0x72, (byte)0xbf, (byte)0x59, (byte)0x06, (byte)0x04, (byte)0x1c,
- (byte)0x32, (byte)0xf5, (byte)0x14, (byte)0x2e, (byte)0x6e, (byte)0xe2,
- (byte)0x0f, (byte)0x5c, (byte)0xde, (byte)0x36, (byte)0x3c, (byte)0x6e,
- (byte)0x7c, (byte)0x4d, (byte)0xcc, (byte)0xd3, (byte)0x00, (byte)0x6e,
- (byte)0xe5, (byte)0x45, (byte)0x46, (byte)0xef, (byte)0x4d, (byte)0x25,
- (byte)0x46, (byte)0x6d, (byte)0x7f, (byte)0xed, (byte)0xbb, (byte)0x4f,
- (byte)0x4d, (byte)0x9f, (byte)0xda, (byte)0x87, (byte)0x47, (byte)0x8f,
- (byte)0x74, (byte)0x44, (byte)0xb7, (byte)0xbe, (byte)0x9d, (byte)0xf5,
- (byte)0xdd, (byte)0xd2, (byte)0x4c, (byte)0xa5, (byte)0xab, (byte)0x74,
- (byte)0xe5, (byte)0x29, (byte)0xa1, (byte)0xd2, (byte)0x45, (byte)0x3b,
- (byte)0x33, (byte)0xde, (byte)0xd5, (byte)0xae, (byte)0xf7, (byte)0x03,
- (byte)0x10, (byte)0x21
- };
-
- private static final byte PRIME_P[] = {
- (byte)0xf9, (byte)0x74, (byte)0x8f, (byte)0x16, (byte)0x02, (byte)0x6b,
- (byte)0xa0, (byte)0xee, (byte)0x7f, (byte)0x28, (byte)0x97, (byte)0x91,
- (byte)0xdc, (byte)0xec, (byte)0xc0, (byte)0x7c, (byte)0x49, (byte)0xc2,
- (byte)0x85, (byte)0x76, (byte)0xee, (byte)0x66, (byte)0x74, (byte)0x2d,
- (byte)0x1a, (byte)0xb8, (byte)0xf7, (byte)0x2f, (byte)0x11, (byte)0x5b,
- (byte)0x36, (byte)0xd8, (byte)0x46, (byte)0x33, (byte)0x3b, (byte)0xd8,
- (byte)0xf3, (byte)0x2d, (byte)0xa1, (byte)0x03, (byte)0x83, (byte)0x2b,
- (byte)0xec, (byte)0x35, (byte)0x43, (byte)0x32, (byte)0xff, (byte)0xdd,
- (byte)0x81, (byte)0x7c, (byte)0xfd, (byte)0x65, (byte)0x13, (byte)0x04,
- (byte)0x7c, (byte)0xfc, (byte)0x03, (byte)0x97, (byte)0xf0, (byte)0xd5,
- (byte)0x62, (byte)0xdc, (byte)0x0d, (byte)0xbf
- };
-
- private static final byte PRIME_Q[] = {
- (byte)0xdb, (byte)0x1e, (byte)0xa7, (byte)0x3d, (byte)0xe7, (byte)0xfa,
- (byte)0x8b, (byte)0x04, (byte)0x83, (byte)0x48, (byte)0xf3, (byte)0xa5,
- (byte)0x31, (byte)0x9d, (byte)0x35, (byte)0x5e, (byte)0x4d, (byte)0x54,
- (byte)0x77, (byte)0xcc, (byte)0x84, (byte)0x09, (byte)0xf3, (byte)0x11,
- (byte)0x0d, (byte)0x54, (byte)0xed, (byte)0x85, (byte)0x39, (byte)0xa9,
- (byte)0xca, (byte)0xa8, (byte)0xea, (byte)0xae, (byte)0x19, (byte)0x9c,
- (byte)0x75, (byte)0xdb, (byte)0x88, (byte)0xb8, (byte)0x04, (byte)0x8d,
- (byte)0x54, (byte)0xc6, (byte)0xa4, (byte)0x80, (byte)0xf8, (byte)0x93,
- (byte)0xf0, (byte)0xdb, (byte)0x19, (byte)0xef, (byte)0xd7, (byte)0x87,
- (byte)0x8a, (byte)0x8f, (byte)0x5a, (byte)0x09, (byte)0x2e, (byte)0x54,
- (byte)0xf3, (byte)0x45, (byte)0x24, (byte)0x29
- };
-
- private static final byte EXP_P[] = {
- (byte)0x6a, (byte)0xd1, (byte)0x25, (byte)0x80, (byte)0x18, (byte)0x33,
- (byte)0x3c, (byte)0x2b, (byte)0x44, (byte)0x19, (byte)0xfe, (byte)0xa5,
- (byte)0x40, (byte)0x03, (byte)0xc4, (byte)0xfc, (byte)0xb3, (byte)0x9c,
- (byte)0xef, (byte)0x07, (byte)0x99, (byte)0x58, (byte)0x17, (byte)0xc1,
- (byte)0x44, (byte)0xa3, (byte)0x15, (byte)0x7d, (byte)0x7b, (byte)0x22,
- (byte)0x22, (byte)0xdf, (byte)0x03, (byte)0x58, (byte)0x66, (byte)0xf5,
- (byte)0x24, (byte)0x54, (byte)0x52, (byte)0x91, (byte)0x2d, (byte)0x76,
- (byte)0xfe, (byte)0x63, (byte)0x64, (byte)0x4e, (byte)0x0f, (byte)0x50,
- (byte)0x2b, (byte)0x65, (byte)0x79, (byte)0x1f, (byte)0xf1, (byte)0xbf,
- (byte)0xc7, (byte)0x41, (byte)0x26, (byte)0xcc, (byte)0xc6, (byte)0x1c,
- (byte)0xa9, (byte)0x83, (byte)0x6f, (byte)0x03
- };
-
- private static final byte EXP_Q[] = {
- (byte)0x12, (byte)0x84, (byte)0x1a, (byte)0x99, (byte)0xce, (byte)0x9a,
- (byte)0x8b, (byte)0x58, (byte)0xcc, (byte)0x47, (byte)0x43, (byte)0xdf,
- (byte)0x77, (byte)0xbb, (byte)0xd3, (byte)0x20, (byte)0xae, (byte)0xe4,
- (byte)0x2e, (byte)0x63, (byte)0x67, (byte)0xdc, (byte)0xf7, (byte)0x5f,
- (byte)0x3f, (byte)0x83, (byte)0x27, (byte)0xb7, (byte)0x14, (byte)0x52,
- (byte)0x56, (byte)0xbf, (byte)0xc3, (byte)0x65, (byte)0x06, (byte)0xe1,
- (byte)0x03, (byte)0xcc, (byte)0x93, (byte)0x57, (byte)0x09, (byte)0x7b,
- (byte)0x6f, (byte)0xe8, (byte)0x81, (byte)0x4a, (byte)0x2c, (byte)0xb7,
- (byte)0x43, (byte)0xa9, (byte)0x20, (byte)0x1d, (byte)0xf6, (byte)0x56,
- (byte)0x8b, (byte)0xcc, (byte)0xe5, (byte)0x4c, (byte)0xd5, (byte)0x4f,
- (byte)0x74, (byte)0x67, (byte)0x29, (byte)0x51
- };
-
- private static final byte CRT_COEFF[] = {
- (byte)0x23, (byte)0xab, (byte)0xf4, (byte)0x03, (byte)0x2f, (byte)0x29,
- (byte)0x95, (byte)0x74, (byte)0xac, (byte)0x1a, (byte)0x33, (byte)0x96,
- (byte)0x62, (byte)0xed, (byte)0xf7, (byte)0xf6, (byte)0xae, (byte)0x07,
- (byte)0x2a, (byte)0x2e, (byte)0xe8, (byte)0xab, (byte)0xfb, (byte)0x1e,
- (byte)0xb9, (byte)0xb2, (byte)0x88, (byte)0x1e, (byte)0x85, (byte)0x05,
- (byte)0x42, (byte)0x64, (byte)0x03, (byte)0xb2, (byte)0x8b, (byte)0xc1,
- (byte)0x81, (byte)0x75, (byte)0xd7, (byte)0xba, (byte)0xaa, (byte)0xd4,
- (byte)0x31, (byte)0x3c, (byte)0x8a, (byte)0x96, (byte)0x23, (byte)0x9d,
- (byte)0x3f, (byte)0x06, (byte)0x3e, (byte)0x44, (byte)0xa9, (byte)0x62,
- (byte)0x2f, (byte)0x61, (byte)0x5a, (byte)0x51, (byte)0x82, (byte)0x2c,
- (byte)0x04, (byte)0x85, (byte)0x73, (byte)0xd1
- };
-
- private static KeyPair genRSAKey(int keyLength) throws Exception {
- KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
- kpg.initialize(keyLength);
- return kpg.generateKeyPair();
- }
-
- private static KeyPair genPredefinedRSAKeyPair() throws Exception {
- KeyFactory kf = KeyFactory.getInstance("RSA");
- BigInteger mod = new BigInteger(MOD);
- BigInteger pub = new BigInteger(PUB_EXP);
-
- PrivateKey privKey = kf.generatePrivate
- (new RSAPrivateCrtKeySpec
- (mod, pub, new BigInteger(PRIV_EXP),
- new BigInteger(PRIME_P), new BigInteger(PRIME_Q),
- new BigInteger(EXP_P), new BigInteger(EXP_Q),
- new BigInteger(CRT_COEFF)));
- PublicKey pubKey = kf.generatePublic(new RSAPublicKeySpec(mod, pub));
- return new KeyPair(pubKey, privKey);
- }
-
- private static final String CIP_ALGOS[] = {
- "RSA/ECB/NoPadding",
- "RSA/ECB/PKCS1Padding"
- };
- private static final int INPUT_SIZE_REDUCTION[] = {
- 0,
- 11,
- };
- private static final String SIG_ALGOS[] = {
- "MD5WithRSA",
- "SHA1WithRSA",
- "SHA256WithRSA",
- "SHA384WithRSA",
- "SHA512WithRSA"
- };
-
- private static KeyPair kp[] = null;
-
- public static void main(String argv[]) throws Exception {
- main(new TestRSA(), null);
- }
-
- public void doTest(Provider prov) throws Exception {
- // first test w/ predefine KeyPair
- KeyPair pkp = genPredefinedRSAKeyPair();
- System.out.println("Test against Predefined RSA Key Pair");
- testCipher(pkp, 128, true, prov);
- testSignature(pkp, true, prov);
-
- for (int i = 0; i < 10; i++) {
- // then test w/ various key lengths
- int keyLens[] = { 1024, 2048 };
- kp = new KeyPair[keyLens.length];
-
- testCipher(keyLens, false, prov);
- testSignature(keyLens, false, prov);
- }
- }
-
-
- private static void testCipher(KeyPair kp, int inputSizeInBytes,
- boolean checkInterop, Provider prov)
- throws Exception {
- Cipher c1, c2;
- for (int i = 0; i < CIP_ALGOS.length; i++) {
- String algo = CIP_ALGOS[i];
- try {
- c1 = Cipher.getInstance(algo, prov);
- } catch (NoSuchAlgorithmException nsae) {
- System.out.println("Skip unsupported Cipher algo: " + algo);
- continue;
- }
-
- if (checkInterop) {
- c2 = Cipher.getInstance(algo, "SunJCE");
- } else {
- c2 = Cipher.getInstance(algo, prov);
- }
- byte[] data = Arrays.copyOf
- (PLAINTEXT, inputSizeInBytes - INPUT_SIZE_REDUCTION[i]);
-
- testEncryption(c1, c2, kp, data);
- }
- }
-
- private static void testCipher(int keyLens[], boolean checkInterop,
- Provider prov)
- throws Exception {
- // RSA CipherText will always differ due to the random nonce in padding
- // so we check whether both
- // 1) Java Encrypt/C Decrypt
- // 2) C Encrypt/Java Decrypt
- // works
- Cipher c1, c2;
- for (int i = 0; i < CIP_ALGOS.length; i++) {
- String algo = CIP_ALGOS[i];
- try {
- c1 = Cipher.getInstance(algo, prov);
- } catch (NoSuchAlgorithmException nsae) {
- System.out.println("Skip unsupported Cipher algo: " + algo);
- continue;
- }
-
- if (checkInterop) {
- c2 = Cipher.getInstance(algo, "SunJCE");
- } else {
- c2 = Cipher.getInstance(algo, prov);
- }
-
- for (int h = 0; h < keyLens.length; h++) {
- // Defer key pair generation until now when it'll soon be used.
- if (kp[h] == null) {
- kp[h] = genRSAKey(keyLens[h]);
- }
- System.out.println("\tTesting Cipher " + algo + " w/ KeySize " + keyLens[h]);
- byte[] data = Arrays.copyOf
- (PLAINTEXT, keyLens[h]/8 - INPUT_SIZE_REDUCTION[i]);
- testEncryption(c1, c2, kp[h], data);
- }
- }
- }
-
- private static void testEncryption(Cipher c1, Cipher c2, KeyPair kp, byte[] data)
- throws Exception {
- // C1 Encrypt + C2 Decrypt
- byte[] out1 = null;
- byte[] recoveredText = null;
- try {
- c1.init(Cipher.ENCRYPT_MODE, kp.getPublic());
- out1 = c1.doFinal(data);
- c2.init(Cipher.DECRYPT_MODE, kp.getPrivate());
- recoveredText = c2.doFinal(out1);
- } catch (Exception ex) {
- System.out.println("\tDEC ERROR: unexpected exception");
- ex.printStackTrace();
- throw ex;
- }
- if(!Arrays.equals(recoveredText, data)) {
- throw new RuntimeException("\tDEC ERROR: different PT bytes!");
- }
- // C2 Encrypt + C1 Decrypt
- byte[] cipherText = null;
- try {
- c2.init(Cipher.ENCRYPT_MODE, kp.getPublic());
- cipherText = c2.doFinal(data);
- c1.init(Cipher.DECRYPT_MODE, kp.getPrivate());
- try {
- out1 = c1.doFinal(cipherText);
- } catch (Exception ex) {
- System.out.println("\tENC ERROR: invalid encrypted output");
- ex.printStackTrace();
- throw ex;
- }
- } catch (Exception ex) {
- System.out.println("\tENC ERROR: unexpected exception");
- ex.printStackTrace();
- throw ex;
- }
- if (!Arrays.equals(out1, data)) {
- throw new RuntimeException("\tENC ERROR: Decrypted result DIFF!");
- }
- System.out.println("\t=> PASS");
- }
-
- private static void testSignature(KeyPair kp, boolean checkInterop,
- Provider prov) throws Exception {
- byte[] data = PLAINTEXT;
- Signature sig1, sig2;
- for (int i = 0; i < SIG_ALGOS.length; i++) {
- String algo = SIG_ALGOS[i];
- try {
- sig1 = Signature.getInstance(algo, prov);
- } catch (NoSuchAlgorithmException nsae) {
- System.out.println("Skip unsupported Signature algo: " + algo);
- continue;
- }
-
- if (checkInterop) {
- sig2 = Signature.getInstance(algo, "SunRsaSign");
- } else {
- sig2 = Signature.getInstance(algo, prov);
- }
- testSigning(sig1, sig2, kp, data);
- }
- }
-
- private static void testSignature(int keyLens[], boolean checkInterop,
- Provider prov) throws Exception {
- byte[] data = PLAINTEXT;
- Signature sig1, sig2;
- for (int i = 0; i < SIG_ALGOS.length; i++) {
- String algo = SIG_ALGOS[i];
- try {
- sig1 = Signature.getInstance(algo, prov);
- } catch (NoSuchAlgorithmException nsae) {
- System.out.println("Skip unsupported Signature algo: " + algo);
- continue;
- }
-
- if (checkInterop) {
- sig2 = Signature.getInstance(algo, "SunRsaSign");
- } else {
- sig2 = Signature.getInstance(algo, prov);
- }
-
- for (int h = 0; h < keyLens.length; h++) {
- // Defer key pair generation until now when it'll soon be used.
- if (kp[h] == null) {
- kp[h] = genRSAKey(keyLens[h]);
- }
- System.out.println("\tTesting Signature " + algo + " w/ KeySize " + keyLens[h]);
-
- testSigning(sig1, sig2, kp[h], data);
- }
- }
- }
-
- private static void testSigning(Signature sig1, Signature sig2, KeyPair kp, byte[] data)
- throws Exception {
- boolean sameSig = false;
- byte[] out = null;
- try {
- sig1.initSign(kp.getPrivate());
- sig1.update(data);
- out = sig1.sign();
- } catch (Exception ex) {
- System.out.println("\tSIGN ERROR: unexpected exception!");
- ex.printStackTrace();
- }
-
- sig2.initSign(kp.getPrivate());
- sig2.update(data);
- byte[] out2 = sig2.sign();
- if (!Arrays.equals(out2, out)) {
- throw new RuntimeException("\tSIGN ERROR: Signature DIFF!");
- }
-
- boolean verify = false;
- try {
- System.out.println("\tVERIFY1 using native out");
- sig1.initVerify(kp.getPublic());
- sig1.update(data);
- verify = sig1.verify(out);
- if (!verify) {
- throw new RuntimeException("VERIFY1 FAIL!");
- }
- } catch (Exception ex) {
- System.out.println("\tVERIFY1 ERROR: unexpected exception!");
- ex.printStackTrace();
- throw ex;
- }
- System.out.println("\t=> PASS");
- }
-}
diff --git a/jdk/test/com/oracle/security/ucrypto/UcryptoTest.java b/jdk/test/com/oracle/security/ucrypto/UcryptoTest.java
deleted file mode 100644
index c2343c9..0000000
--- a/jdk/test/com/oracle/security/ucrypto/UcryptoTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-// common infrastructure for OracleUcrypto provider tests
-
-import java.io.*;
-import java.util.*;
-import java.lang.reflect.*;
-
-import java.security.*;
-
-public abstract class UcryptoTest {
-
- protected static final boolean hasUcrypto;
- static {
- hasUcrypto = (Security.getProvider("OracleUcrypto") != null);
- }
-
- private static Provider getCustomizedUcrypto(String config) throws Exception {
- Class clazz = Class.forName("com.oracle.security.ucrypto.OracleUcrypto");
- Constructor cons = clazz.getConstructor(new Class[] {String.class});
- Object obj = cons.newInstance(new Object[] {config});
- return (Provider)obj;
- }
-
- public abstract void doTest(Provider p) throws Exception;
-
- public static void main(UcryptoTest test, String config) throws Exception {
- Provider prov = null;
- if (hasUcrypto) {
- if (config != null) {
- prov = getCustomizedUcrypto(config);
- } else {
- prov = Security.getProvider("OracleUcrypto");
- }
- }
- if (prov == null) {
- // un-available, skip testing...
- System.out.println("No OracleUcrypto provider found, skipping test");
- return;
- }
- test.doTest(prov);
- }
-}
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestCICOWithGCMAndAAD.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestCICOWithGCMAndAAD.java
new file mode 100644
index 0000000..816f764
--- /dev/null
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestCICOWithGCMAndAAD.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2013, 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
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8012900
+ * @library ../UTIL
+ * @build TestUtil
+ * @run main TestCICOWithGCMAndAAD
+ * @summary Test CipherInputStream/OutputStream with AES GCM mode with AAD.
+ * @author Valerie Peng
+ */
+import java.io.*;
+import java.security.*;
+import java.util.*;
+import javax.crypto.*;
+
+public class TestCICOWithGCMAndAAD {
+ public static void main(String[] args) throws Exception {
+ //init Secret Key
+ KeyGenerator kg = KeyGenerator.getInstance("AES", "SunJCE");
+ kg.init(128);
+ SecretKey key = kg.generateKey();
+
+ //Do initialization of the plainText
+ byte[] plainText = new byte[700];
+ Random rdm = new Random();
+ rdm.nextBytes(plainText);
+
+ byte[] aad = new byte[128];
+ rdm.nextBytes(aad);
+ byte[] aad2 = aad.clone();
+ aad2[50]++;
+
+ Cipher encCipher = Cipher.getInstance("AES/GCM/NoPadding", "SunJCE");
+ encCipher.init(Cipher.ENCRYPT_MODE, key);
+ encCipher.updateAAD(aad);
+ Cipher decCipher = Cipher.getInstance("AES/GCM/NoPadding", "SunJCE");
+ decCipher.init(Cipher.DECRYPT_MODE, key, encCipher.getParameters());
+ decCipher.updateAAD(aad);
+
+ byte[] recovered = test(encCipher, decCipher, plainText);
+ if (!Arrays.equals(plainText, recovered)) {
+ throw new Exception("sameAAD: diff check failed!");
+ } else System.out.println("sameAAD: passed");
+
+ encCipher.init(Cipher.ENCRYPT_MODE, key);
+ encCipher.updateAAD(aad2);
+ recovered = test(encCipher, decCipher, plainText);
+ if (recovered != null && recovered.length != 0) {
+ throw new Exception("diffAAD: no data should be returned!");
+ } else System.out.println("diffAAD: passed");
+ }
+
+ private static byte[] test(Cipher encCipher, Cipher decCipher, byte[] plainText)
+ throws Exception {
+ //init cipher streams
+ ByteArrayInputStream baInput = new ByteArrayInputStream(plainText);
+ CipherInputStream ciInput = new CipherInputStream(baInput, encCipher);
+ ByteArrayOutputStream baOutput = new ByteArrayOutputStream();
+ CipherOutputStream ciOutput = new CipherOutputStream(baOutput, decCipher);
+
+ //do test
+ byte[] buffer = new byte[200];
+ int len = ciInput.read(buffer);
+ System.out.println("read " + len + " bytes from input buffer");
+
+ while (len != -1) {
+ ciOutput.write(buffer, 0, len);
+ System.out.println("wite " + len + " bytes to output buffer");
+ len = ciInput.read(buffer);
+ if (len != -1) {
+ System.out.println("read " + len + " bytes from input buffer");
+ } else {
+ System.out.println("finished reading");
+ }
+ }
+
+ ciOutput.flush();
+ ciInput.close();
+ ciOutput.close();
+
+ return baOutput.toByteArray();
+ }
+}
diff --git a/jdk/test/com/sun/jdi/NoLaunchOptionTest.java b/jdk/test/com/sun/jdi/NoLaunchOptionTest.java
index 6213b5f..f5b1865 100644
--- a/jdk/test/com/sun/jdi/NoLaunchOptionTest.java
+++ b/jdk/test/com/sun/jdi/NoLaunchOptionTest.java
@@ -142,7 +142,7 @@
NoLaunchOptionTest myTest = new NoLaunchOptionTest();
String results [] = myTest.run(VMConnection.insertDebuggeeVMOptions(cmds));
if ((results[RETSTAT].equals("1")) &&
- (results[STDERR].startsWith("ERROR:"))) {
+ (results[STDERR].contains("ERROR:"))) {
System.out.println("Test passed: status = 1 with warning messages " +
"is expected and normal for this test");
} else {
diff --git a/jdk/test/java/lang/Class/forName/arrayClass/Class1.java b/jdk/test/java/lang/Class/forName/arrayClass/Class1.java
new file mode 100644
index 0000000..c78bb65
--- /dev/null
+++ b/jdk/test/java/lang/Class/forName/arrayClass/Class1.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+public class Class1 {}
diff --git a/jdk/test/java/lang/Class/forName/arrayClass/Class2.java b/jdk/test/java/lang/Class/forName/arrayClass/Class2.java
new file mode 100644
index 0000000..d2bd477
--- /dev/null
+++ b/jdk/test/java/lang/Class/forName/arrayClass/Class2.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+public class Class2 {}
diff --git a/jdk/test/java/lang/Class/forName/arrayClass/Class3.java b/jdk/test/java/lang/Class/forName/arrayClass/Class3.java
new file mode 100644
index 0000000..d66a7de
--- /dev/null
+++ b/jdk/test/java/lang/Class/forName/arrayClass/Class3.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+public class Class3 {}
diff --git a/jdk/test/java/lang/Class/forName/arrayClass/Class4.java b/jdk/test/java/lang/Class/forName/arrayClass/Class4.java
new file mode 100644
index 0000000..72b98d6
--- /dev/null
+++ b/jdk/test/java/lang/Class/forName/arrayClass/Class4.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+public class Class4 {}
diff --git a/jdk/test/java/lang/Class/forName/arrayClass/ExceedMaxDim.java b/jdk/test/java/lang/Class/forName/arrayClass/ExceedMaxDim.java
new file mode 100644
index 0000000..258ee31
--- /dev/null
+++ b/jdk/test/java/lang/Class/forName/arrayClass/ExceedMaxDim.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2013, 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 7044282
+ * @build Class1 Class2 Class3 Class4
+ * @run main ExceedMaxDim
+ * @summary Make sure you can't get an array class of dimension > 255.
+ */
+
+// Class1, Class2, Class3 and Class4 should not have been loaded prior to the
+// calls to forName
+
+public class ExceedMaxDim {
+ //0123456789012345678901234567890123456789
+ private String brackets = "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[" +
+ "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[" +
+ "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[" +
+ "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[" +
+ "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[" +
+ "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[" +
+ "[[[[[[[[[[[[[[";
+ private String name254 = brackets + "Ljava.lang.String;";
+ private String name255 = "[" + name254;
+ private String name256 = "[" + name255;
+ private String name1 = "[Ljava.lang.String;";
+ private String bigName;
+ private int error = 0;
+
+ private static final ClassLoader IMPLICIT_LOADER = null;
+
+ public ExceedMaxDim() {
+ super();
+
+ StringBuilder sb = new StringBuilder(Short.MAX_VALUE + 50);
+ for (int i = 0; i < Short.MAX_VALUE + 20; i++)
+ sb.append('[');
+ sb.append("Ljava.lang.String;");
+ bigName = sb.toString();
+
+ if (name256.lastIndexOf('[') != 255) // 256:th [
+ throw new RuntimeException("Test broken");
+ }
+
+ public static void main(String[] args) throws Exception {
+ ExceedMaxDim test = new ExceedMaxDim();
+ test.testImplicitLoader();
+ test.testOtherLoader();
+
+ if (test.error != 0)
+ throw new RuntimeException("Test failed, was able to create array with dim > 255." +
+ " See log for details.");
+ }
+
+ private void testImplicitLoader() throws Exception {
+ // These four should succeed
+ assertSucceedForName(name1, IMPLICIT_LOADER);
+ assertSucceedForName(name254, IMPLICIT_LOADER);
+ assertSucceedForName(name255, IMPLICIT_LOADER);
+ assertSucceedForName(brackets + "[LClass1;", IMPLICIT_LOADER);
+
+ // The following three should fail
+ assertFailForName(name256, IMPLICIT_LOADER);
+ assertFailForName(bigName, IMPLICIT_LOADER);
+ assertFailForName(brackets + "[[LClass2;", IMPLICIT_LOADER);
+ }
+
+ private void testOtherLoader() throws Exception {
+ ClassLoader cl = ExceedMaxDim.class.getClassLoader();
+
+ // These four should succeed
+ assertSucceedForName(name1, cl);
+ assertSucceedForName(name254,cl);
+ assertSucceedForName(name255, cl);
+ assertSucceedForName(brackets + "[LClass3;", cl);
+
+ // The following three should fail
+ assertFailForName(name256, cl);
+ assertFailForName(bigName, cl);
+ assertFailForName(brackets + "[[Class4;", cl);
+ }
+
+ private void assertFailForName(String name, ClassLoader cl) {
+ Class<?> c;
+ try {
+ if (cl == null)
+ c = Class.forName(name);
+ else
+ c = Class.forName(name, true, cl);
+ error++;
+ System.err.println("ERROR: could create " + c);
+ } catch (ClassNotFoundException e) {
+ ;// ok
+ }
+ }
+
+ private void assertSucceedForName(String name, ClassLoader cl) {
+ Class<?> c;
+ try {
+ if (cl == null)
+ c = Class.forName(name);
+ else
+ c = Class.forName(name, true, cl);
+ } catch (ClassNotFoundException e) {
+ error++;
+ System.err.println("ERROR: could not create " + name);
+ }
+ }
+}
diff --git a/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java b/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java
index c6b9a1e..ba51e9d 100644
--- a/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java
+++ b/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java
@@ -47,6 +47,7 @@
/*
* This array should be updated whenever new packages are added to the
* package.access property in the java.security file
+ * NOTE: it should be in the same order as the java.security file
*/
private static final String[] packages = {
"sun.",
@@ -96,6 +97,16 @@
List<String> jspkgs =
getPackages(Security.getProperty("package.access"));
+ if (!isOpenJDKOnly()) {
+ String lastPkg = pkgs.get(pkgs.size() - 1);
+
+ // Remove any closed packages from list before comparing
+ int index = jspkgs.indexOf(lastPkg);
+ if (index != -1 && index != jspkgs.size() - 1) {
+ jspkgs.subList(index + 1, jspkgs.size()).clear();
+ }
+ }
+
// Sort to ensure lists are comparable
Collections.sort(pkgs);
Collections.sort(jspkgs);
@@ -151,4 +162,9 @@
}
return packages;
}
+
+ private static boolean isOpenJDKOnly() {
+ String prop = System.getProperty("java.runtime.name");
+ return prop != null && prop.startsWith("OpenJDK");
+ }
}
diff --git a/jdk/test/java/lang/invoke/MethodHandleConstants.java b/jdk/test/java/lang/invoke/MethodHandleConstants.java
new file mode 100644
index 0000000..57e041b
--- /dev/null
+++ b/jdk/test/java/lang/invoke/MethodHandleConstants.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2010, 2013, 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 8022066
+ * @summary smoke test for method handle constants
+ * @build indify.Indify
+ * @compile MethodHandleConstants.java
+ * @run main/othervm
+ * indify.Indify
+ * --verify-specifier-count=0
+ * --expand-properties --classpath ${test.classes}
+ * --java test.java.lang.invoke.MethodHandleConstants --check-output
+ * @run main/othervm
+ * indify.Indify
+ * --expand-properties --classpath ${test.classes}
+ * --java test.java.lang.invoke.MethodHandleConstants --security-manager
+ */
+
+package test.java.lang.invoke;
+
+import java.util.*;
+import java.io.*;
+import java.lang.invoke.*;
+import java.security.*;
+
+import static java.lang.invoke.MethodHandles.*;
+import static java.lang.invoke.MethodType.*;
+
+public class MethodHandleConstants {
+ public static void main(String... av) throws Throwable {
+ if (av.length > 0 && av[0].equals("--check-output")) openBuf();
+ if (av.length > 0 && av[0].equals("--security-manager")) setSM();
+ System.out.println("Obtaining method handle constants:");
+ testCase(MH_String_replace_C2(), String.class, "replace", String.class, String.class, char.class, char.class);
+ testCase(MH_MethodHandle_invokeExact_SC2(), MethodHandle.class, "invokeExact", String.class, MethodHandle.class, String.class, char.class, char.class);
+ testCase(MH_MethodHandle_invoke_SC2(), MethodHandle.class, "invoke", String.class, MethodHandle.class, String.class, char.class, char.class);
+ testCase(MH_Class_forName_S(), Class.class, "forName", Class.class, String.class);
+ testCase(MH_Class_forName_SbCL(), Class.class, "forName", Class.class, String.class, boolean.class, ClassLoader.class);
+ System.out.println("Done.");
+ closeBuf();
+ }
+
+ private static void testCase(MethodHandle mh, Class<?> defc, String name, Class<?> rtype, Class<?>... ptypes) throws Throwable {
+ System.out.println(mh);
+ // we include defc, because we assume it is a non-static MH:
+ MethodType mt = methodType(rtype, ptypes);
+ assertEquals(mh.type(), mt);
+ // FIXME: Use revealDirect to find out more
+ }
+ private static void assertEquals(Object exp, Object act) {
+ if (exp == act || (exp != null && exp.equals(act))) return;
+ throw new AssertionError("not equal: "+exp+", "+act);
+ }
+
+ private static void setSM() {
+ Policy.setPolicy(new TestPolicy());
+ System.setSecurityManager(new SecurityManager());
+ }
+
+ private static PrintStream oldOut;
+ private static ByteArrayOutputStream buf;
+ private static void openBuf() {
+ oldOut = System.out;
+ buf = new ByteArrayOutputStream();
+ System.setOut(new PrintStream(buf));
+ }
+ private static void closeBuf() {
+ if (buf == null) return;
+ System.out.flush();
+ System.setOut(oldOut);
+ String[] haveLines = new String(buf.toByteArray()).split("[\n\r]+");
+ for (String line : haveLines) System.out.println(line);
+ Iterator<String> iter = Arrays.asList(haveLines).iterator();
+ for (String want : EXPECT_OUTPUT) {
+ String have = iter.hasNext() ? iter.next() : "[EOF]";
+ if (want.equals(have)) continue;
+ System.err.println("want line: "+want);
+ System.err.println("have line: "+have);
+ throw new AssertionError("unexpected output: "+have);
+ }
+ if (iter.hasNext())
+ throw new AssertionError("unexpected output: "+iter.next());
+ }
+ private static final String[] EXPECT_OUTPUT = {
+ "Obtaining method handle constants:",
+ "MethodHandle(String,char,char)String",
+ "MethodHandle(MethodHandle,String,char,char)String",
+ "MethodHandle(MethodHandle,String,char,char)String",
+ "MethodHandle(String)Class",
+ "MethodHandle(String,boolean,ClassLoader)Class",
+ "Done."
+ };
+
+ // String.replace(String, char, char)
+ private static MethodType MT_String_replace_C2() {
+ shouldNotCallThis();
+ return methodType(String.class, char.class, char.class);
+ }
+ private static MethodHandle MH_String_replace_C2() throws ReflectiveOperationException {
+ shouldNotCallThis();
+ return lookup().findVirtual(String.class, "replace", MT_String_replace_C2());
+ }
+
+ // MethodHandle.invokeExact(...)
+ private static MethodType MT_MethodHandle_invokeExact_SC2() {
+ shouldNotCallThis();
+ return methodType(String.class, String.class, char.class, char.class);
+ }
+ private static MethodHandle MH_MethodHandle_invokeExact_SC2() throws ReflectiveOperationException {
+ shouldNotCallThis();
+ return lookup().findVirtual(MethodHandle.class, "invokeExact", MT_MethodHandle_invokeExact_SC2());
+ }
+
+ // MethodHandle.invoke(...)
+ private static MethodType MT_MethodHandle_invoke_SC2() {
+ shouldNotCallThis();
+ return methodType(String.class, String.class, char.class, char.class);
+ }
+ private static MethodHandle MH_MethodHandle_invoke_SC2() throws ReflectiveOperationException {
+ shouldNotCallThis();
+ return lookup().findVirtual(MethodHandle.class, "invoke", MT_MethodHandle_invoke_SC2());
+ }
+
+ // Class.forName(String)
+ private static MethodType MT_Class_forName_S() {
+ shouldNotCallThis();
+ return methodType(Class.class, String.class);
+ }
+ private static MethodHandle MH_Class_forName_S() throws ReflectiveOperationException {
+ shouldNotCallThis();
+ return lookup().findStatic(Class.class, "forName", MT_Class_forName_S());
+ }
+
+ // Class.forName(String, boolean, ClassLoader)
+ private static MethodType MT_Class_forName_SbCL() {
+ shouldNotCallThis();
+ return methodType(Class.class, String.class, boolean.class, ClassLoader.class);
+ }
+ private static MethodHandle MH_Class_forName_SbCL() throws ReflectiveOperationException {
+ shouldNotCallThis();
+ return lookup().findStatic(Class.class, "forName", MT_Class_forName_SbCL());
+ }
+
+ private static void shouldNotCallThis() {
+ // if this gets called, the transformation has not taken place
+ if (System.getProperty("MethodHandleConstants.allow-untransformed") != null) return;
+ throw new AssertionError("this code should be statically transformed away by Indify");
+ }
+
+ static class TestPolicy extends Policy {
+ final PermissionCollection permissions = new Permissions();
+ TestPolicy() {
+ permissions.add(new java.io.FilePermission("<<ALL FILES>>", "read"));
+ }
+ public PermissionCollection getPermissions(ProtectionDomain domain) {
+ return permissions;
+ }
+
+ public PermissionCollection getPermissions(CodeSource codesource) {
+ return permissions;
+ }
+
+ public boolean implies(ProtectionDomain domain, Permission perm) {
+ return permissions.implies(perm);
+ }
+ }
+}
diff --git a/jdk/test/java/lang/invoke/accessProtectedSuper/BogoLoader.java b/jdk/test/java/lang/invoke/accessProtectedSuper/BogoLoader.java
new file mode 100644
index 0000000..190761d
--- /dev/null
+++ b/jdk/test/java/lang/invoke/accessProtectedSuper/BogoLoader.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2013, 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.
+ *
+ */
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+import jdk.internal.org.objectweb.asm.*;
+// Compile with -XDignore.symbol.file=true
+
+public class BogoLoader extends ClassLoader {
+
+ static interface VisitorMaker {
+ ClassVisitor make(ClassVisitor visitor);
+ }
+
+
+ /**
+ * Use this property to verify that the desired classloading is happening.
+ */
+ private final boolean verbose = Boolean.getBoolean("bogoloader.verbose");
+ /**
+ * Use this property to disable replacement for testing purposes.
+ */
+ private final boolean noReplace = Boolean.getBoolean("bogoloader.noreplace");
+
+ /**
+ * Set of class names that should be loaded with this loader.
+ * Others are loaded with the system class loader, except for those
+ * that are transformed.
+ */
+ private Set<String> nonSystem;
+
+ /**
+ * Map from class names to a bytecode transformer factory.
+ */
+ private Map<String, VisitorMaker> replaced;
+
+ /**
+ * Keep track (not terribly efficiently) of which classes have already
+ * been loaded by this class loader.
+ */
+ private final Vector<String> history = new Vector<String>();
+
+ private boolean useSystemLoader(String name) {
+ return ! nonSystem.contains(name) && ! replaced.containsKey(name);
+ }
+
+ public BogoLoader(Set<String> non_system, Map<String, VisitorMaker> replaced) {
+ super(Thread.currentThread().getContextClassLoader());
+ this.nonSystem = non_system;
+ this.replaced = replaced;
+ }
+
+ private byte[] readResource(String className) throws IOException {
+ return readResource(className, "class");
+ }
+
+ private byte[] readResource(String className, String suffix) throws IOException {
+ // Note to the unwary -- "/" works on Windows, leave it alone.
+ String fileName = className.replace('.', '/') + "." + suffix;
+ InputStream origStream = getResourceAsStream(fileName);
+ if (origStream == null) {
+ throw new IOException("Resource not found : " + fileName);
+ }
+ BufferedInputStream stream = new java.io.BufferedInputStream(origStream);
+ byte[] data = new byte[stream.available()];
+ int how_many = stream.read(data);
+ // Really ought to deal with the corner cases of stream.available()
+ return data;
+ }
+
+ protected byte[] getClass(String name) throws ClassNotFoundException,
+ IOException {
+ return readResource(name, "class");
+ }
+
+ /**
+ * Loads the named class from the system class loader unless
+ * the name appears in either replaced or nonSystem.
+ * nonSystem classes are loaded into this classloader,
+ * and replaced classes get their content from the specified array
+ * of bytes (and are also loaded into this classloader).
+ */
+ protected Class<?> loadClass(String name, boolean resolve)
+ throws ClassNotFoundException {
+ Class<?> clazz;
+
+ if (history.contains(name)) {
+ Class<?> c = this.findLoadedClass(name);
+ return c;
+ }
+ if (useSystemLoader(name)) {
+ clazz = findSystemClass(name);
+ if (verbose) System.err.println("Loading system class " + name);
+ } else {
+ history.add(name);
+ try {
+ if (verbose) {
+ System.err.println("Loading classloader class " + name);
+ }
+ byte[] classData = getClass(name);;
+ boolean expanded = false;
+ if (!noReplace && replaced.containsKey(name)) {
+ if (verbose) {
+ System.err.println("Replacing class " + name);
+ }
+ ClassReader cr = new ClassReader(classData);
+ ClassWriter cw = new ClassWriter(0);
+ VisitorMaker vm = replaced.get(name);
+ cr.accept(vm.make(cw), 0);
+ classData = cw.toByteArray();
+ }
+ clazz = defineClass(name, classData, 0, classData.length);
+ } catch (java.io.EOFException ioe) {
+ throw new ClassNotFoundException(
+ "IO Exception in reading class : " + name + " ", ioe);
+ } catch (ClassFormatError ioe) {
+ throw new ClassNotFoundException(
+ "ClassFormatError in reading class file: ", ioe);
+ } catch (IOException ioe) {
+ throw new ClassNotFoundException(
+ "IO Exception in reading class file: ", ioe);
+ }
+ }
+ if (clazz == null) {
+ throw new ClassNotFoundException(name);
+ }
+ if (resolve) {
+ resolveClass(clazz);
+ }
+ return clazz;
+ }
+}
diff --git a/jdk/test/java/lang/invoke/accessProtectedSuper/MethodInvoker.java b/jdk/test/java/lang/invoke/accessProtectedSuper/MethodInvoker.java
new file mode 100644
index 0000000..d14e7ef
--- /dev/null
+++ b/jdk/test/java/lang/invoke/accessProtectedSuper/MethodInvoker.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2013, 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.
+ *
+ */
+
+import anotherpkg.MethodSupplierOuter;
+
+public class MethodInvoker extends MethodSupplierOuter.MethodSupplier {
+ public static void invoke() throws Exception {
+ MethodInvoker ms = new MethodInvoker();
+ ms.m();
+ ms.myfi().invokeMethodReference();
+ MyFunctionalInterface fi = ms::m; // Should not fail with modified bytecodes
+ fi.invokeMethodReference();
+ }
+
+ MyFunctionalInterface myfi() {
+ MyFunctionalInterface fi = this::m; // Should not fail with modified bytecodes
+ return fi;
+ }
+}
diff --git a/jdk/test/java/lang/invoke/accessProtectedSuper/Test.java b/jdk/test/java/lang/invoke/accessProtectedSuper/Test.java
new file mode 100644
index 0000000..3907ceb
--- /dev/null
+++ b/jdk/test/java/lang/invoke/accessProtectedSuper/Test.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2013, 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 8022718
+ * @summary Runtime accessibility checking: protected class, if extended, should be accessible from another package
+ *
+ * @compile -XDignore.symbol.file BogoLoader.java MethodInvoker.java Test.java anotherpkg/MethodSupplierOuter.java
+ * @run main/othervm Test
+ */
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.HashSet;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+interface MyFunctionalInterface {
+
+ void invokeMethodReference();
+}
+
+class MakeProtected implements BogoLoader.VisitorMaker, Opcodes {
+
+ final boolean whenVisitInner;
+
+ MakeProtected(boolean when_visit_inner) {
+ super();
+ whenVisitInner = when_visit_inner;
+ }
+
+ public ClassVisitor make(ClassVisitor cv) {
+ return new ClassVisitor(Opcodes.ASM5, cv) {
+
+ @Override
+ public void visitInnerClass(String name, String outerName,
+ String innerName, int access) {
+ if (whenVisitInner) {
+ int access_ = (ACC_PROTECTED | access) & ~(ACC_PRIVATE | ACC_PUBLIC);
+ System.out.println("visitInnerClass: name = " + name
+ + ", outerName = " + outerName
+ + ", innerName = " + innerName
+ + ", access original = 0x" + Integer.toHexString(access)
+ + ", access modified to 0x" + Integer.toHexString(access_));
+ access = access_;
+ }
+ super.visitInnerClass(name, outerName, innerName, access);
+ }
+ };
+ }
+};
+
+public class Test {
+
+ public static void main(String argv[]) throws Exception, Throwable {
+ BogoLoader.VisitorMaker makeProtectedNop = new MakeProtected(false);
+ BogoLoader.VisitorMaker makeProtectedMod = new MakeProtected(true);
+
+ int errors = 0;
+ errors += tryModifiedInvocation(makeProtectedNop);
+ errors += tryModifiedInvocation(makeProtectedMod);
+
+ if (errors > 0) {
+ throw new Error("FAIL; there were errors");
+ }
+ }
+
+ private static int tryModifiedInvocation(BogoLoader.VisitorMaker makeProtected)
+ throws Throwable, ClassNotFoundException {
+ HashMap<String, BogoLoader.VisitorMaker> replace
+ = new HashMap<String, BogoLoader.VisitorMaker>();
+ replace.put("anotherpkg.MethodSupplierOuter$MethodSupplier", makeProtected);
+ HashSet<String> in_bogus = new HashSet<String>();
+ in_bogus.add("MethodInvoker");
+ in_bogus.add("MyFunctionalInterface");
+ in_bogus.add("anotherpkg.MethodSupplierOuter"); // seems to be never loaded
+ in_bogus.add("anotherpkg.MethodSupplierOuter$MethodSupplier");
+
+ BogoLoader bl = new BogoLoader(in_bogus, replace);
+ try {
+ Class<?> isw = bl.loadClass("MethodInvoker");
+ Method meth = isw.getMethod("invoke");
+ Object result = meth.invoke(null);
+ } catch (Throwable th) {
+ System.out.flush();
+ Thread.sleep(250); // Let Netbeans get its I/O sorted out.
+ th.printStackTrace();
+ System.err.flush();
+ Thread.sleep(250); // Let Netbeans get its I/O sorted out.
+ return 1;
+ }
+ return 0;
+ }
+}
diff --git a/jdk/test/java/lang/invoke/accessProtectedSuper/anotherpkg/MethodSupplierOuter.java b/jdk/test/java/lang/invoke/accessProtectedSuper/anotherpkg/MethodSupplierOuter.java
new file mode 100644
index 0000000..314f8ea
--- /dev/null
+++ b/jdk/test/java/lang/invoke/accessProtectedSuper/anotherpkg/MethodSupplierOuter.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013, 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 anotherpkg;
+
+public class MethodSupplierOuter {
+ // MethodSupplier is "public" for javac compilation, modified to "protected" for test.
+ public static class MethodSupplier {
+ public void m() {
+ System.out.println("good");
+ }
+ }
+}
diff --git a/jdk/test/java/lang/invoke/lambda/LogGeneratedClassesTest.java b/jdk/test/java/lang/invoke/lambda/LogGeneratedClassesTest.java
new file mode 100644
index 0000000..dc34bba
--- /dev/null
+++ b/jdk/test/java/lang/invoke/lambda/LogGeneratedClassesTest.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2013, 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 8023524
+ * @summary tests logging generated classes for lambda
+ * @library /java/nio/file
+ * @run testng LogGeneratedClassesTest
+ */
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.PosixFileAttributeView;
+import java.util.stream.Stream;
+
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.testng.SkipException;
+
+import static java.nio.file.attribute.PosixFilePermissions.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+public class LogGeneratedClassesTest extends LUtils {
+ String longFQCN;
+
+ @BeforeClass
+ public void setup() throws IOException {
+ final List<String> scratch = new ArrayList<>();
+ scratch.clear();
+ scratch.add("package com.example;");
+ scratch.add("public class TestLambda {");
+ scratch.add(" interface I {");
+ scratch.add(" int foo();");
+ scratch.add(" }");
+ scratch.add(" public static void main(String[] args) {");
+ scratch.add(" I lam = () -> 10;");
+ scratch.add(" Runnable r = () -> {");
+ scratch.add(" System.out.println(\"Runnable\");");
+ scratch.add(" };");
+ scratch.add(" r.run();");
+ scratch.add(" System.out.println(\"Finish\");");
+ scratch.add(" }");
+ scratch.add("}");
+
+ File test = new File("TestLambda.java");
+ createFile(test, scratch);
+ compile("-d", ".", test.getName());
+
+ scratch.remove(0);
+ scratch.remove(0);
+ scratch.add(0, "public class LongPackageName {");
+ StringBuilder sb = new StringBuilder("com.example.");
+ // longer than 255 which exceed max length of most filesystems
+ for (int i = 0; i < 30; i++) {
+ sb.append("nonsense.");
+ }
+ sb.append("enough");
+ longFQCN = sb.toString() + ".LongPackageName";
+ sb.append(";");
+ sb.insert(0, "package ");
+ scratch.add(0, sb.toString());
+ test = new File("LongPackageName.java");
+ createFile(test, scratch);
+ compile("-d", ".", test.getName());
+
+ // create target
+ Files.createDirectory(Paths.get("dump"));
+ Files.createDirectories(Paths.get("dumpLong/com/example/nonsense"));
+ Files.createFile(Paths.get("dumpLong/com/example/nonsense/nonsense"));
+ Files.createFile(Paths.get("file"));
+ }
+
+ @AfterClass
+ public void cleanup() throws IOException {
+ Files.delete(Paths.get("TestLambda.java"));
+ Files.delete(Paths.get("LongPackageName.java"));
+ Files.delete(Paths.get("file"));
+ TestUtil.removeAll(Paths.get("com"));
+ TestUtil.removeAll(Paths.get("dump"));
+ TestUtil.removeAll(Paths.get("dumpLong"));
+ }
+
+ @Test
+ public void testNotLogging() {
+ TestResult tr = doExec(JAVA_CMD.getAbsolutePath(),
+ "-cp", ".",
+ "-Djava.security.manager",
+ "com.example.TestLambda");
+ tr.assertZero("Should still return 0");
+ }
+
+ @Test
+ public void testLogging() throws IOException {
+ assertTrue(Files.exists(Paths.get("dump")));
+ TestResult tr = doExec(JAVA_CMD.getAbsolutePath(),
+ "-cp", ".",
+ "-Djdk.internal.lambda.dumpProxyClasses=dump",
+ "-Djava.security.manager",
+ "com.example.TestLambda");
+ // dump/com/example + 2 class files
+ assertEquals(Files.walk(Paths.get("dump")).count(), 5, "Two lambda captured");
+ tr.assertZero("Should still return 0");
+ }
+
+ @Test
+ public void testDumpDirNotExist() throws IOException {
+ assertFalse(Files.exists(Paths.get("notExist")));
+ TestResult tr = doExec(JAVA_CMD.getAbsolutePath(),
+ "-cp", ".",
+ "-Djdk.internal.lambda.dumpProxyClasses=notExist",
+ "-Djava.security.manager",
+ "com.example.TestLambda");
+ assertEquals(tr.testOutput.stream()
+ .filter(s -> s.startsWith("WARNING"))
+ .peek(s -> assertTrue(s.contains("does not exist")))
+ .count(),
+ 1, "only show error once");
+ tr.assertZero("Should still return 0");
+ }
+
+ @Test
+ public void testDumpDirIsFile() throws IOException {
+ assertTrue(Files.isRegularFile(Paths.get("file")));
+ TestResult tr = doExec(JAVA_CMD.getAbsolutePath(),
+ "-cp", ".",
+ "-Djdk.internal.lambda.dumpProxyClasses=file",
+ "-Djava.security.manager",
+ "com.example.TestLambda");
+ assertEquals(tr.testOutput.stream()
+ .filter(s -> s.startsWith("WARNING"))
+ .peek(s -> assertTrue(s.contains("not a directory")))
+ .count(),
+ 1, "only show error once");
+ tr.assertZero("Should still return 0");
+ }
+
+ @Test
+ public void testDumpDirNotWritable() throws IOException {
+ if (! Files.getFileStore(Paths.get("."))
+ .supportsFileAttributeView(PosixFileAttributeView.class)) {
+ // No easy way to setup readonly directory without POSIX
+ // We would like to skip the test with a cause with
+ // throw new SkipException("Posix not supported");
+ // but jtreg will report failure so we just pass the test
+ // which we can look at if jtreg changed its behavior
+ return;
+ }
+
+ Files.createDirectory(Paths.get("readOnly"),
+ asFileAttribute(fromString("r-xr-xr-x")));
+
+ TestResult tr = doExec(JAVA_CMD.getAbsolutePath(),
+ "-cp", ".",
+ "-Djdk.internal.lambda.dumpProxyClasses=readOnly",
+ "-Djava.security.manager",
+ "com.example.TestLambda");
+ assertEquals(tr.testOutput.stream()
+ .filter(s -> s.startsWith("WARNING"))
+ .peek(s -> assertTrue(s.contains("not writable")))
+ .count(),
+ 1, "only show error once");
+ tr.assertZero("Should still return 0");
+
+ TestUtil.removeAll(Paths.get("readOnly"));
+ }
+
+ @Test
+ public void testLoggingException() throws IOException {
+ assertTrue(Files.exists(Paths.get("dumpLong")));
+ TestResult tr = doExec(JAVA_CMD.getAbsolutePath(),
+ "-cp", ".",
+ "-Djdk.internal.lambda.dumpProxyClasses=dumpLong",
+ "-Djava.security.manager",
+ longFQCN);
+ assertEquals(tr.testOutput.stream()
+ .filter(s -> s.startsWith("WARNING: Exception"))
+ .count(),
+ 2, "show error each capture");
+ // dumpLong/com/example/nosense/nosense
+ assertEquals(Files.walk(Paths.get("dumpLong")).count(), 5, "Two lambda captured failed to log");
+ tr.assertZero("Should still return 0");
+ }
+}
diff --git a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest2.java b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest2.java
index 059e45d..d0f9e9a 100644
--- a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest2.java
+++ b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest2.java
@@ -26,7 +26,7 @@
*
* The test set a listener to be notified when any of the non-heap pools
* exceed 80%. It then starts a thread that continuously loads classes.
- * In the HotSpot implementation this causes perm space to be consumed.
+ * In the HotSpot implementation this causes metaspace to be consumed.
* Test completes when we the notification is received or an OutOfMemory
* is generated.
*/
@@ -100,7 +100,14 @@
// TestNNNNNN
- String name = "Test" + Integer.toString(count++);
+ int load_count = count++;
+ if (load_count > 999999) {
+ // The test will create a corrupt class file if the count
+ // exceeds 999999. Fix the test if this exception is thrown.
+ throw new RuntimeException("Load count exceeded");
+ }
+
+ String name = "Test" + Integer.toString(load_count);
byte value[];
try {
@@ -133,8 +140,9 @@
* Note: Once the usage threshold has been exceeded the low memory
* detector thread will attempt to deliver its notification - this can
* potentially create a race condition with this thread contining to
- * fill up perm space. To avoid the low memory detector getting an OutOfMemory
- * we throttle this thread once the threshold has been exceeded.
+ * fill up metaspace. To avoid the low memory detector getting an
+ * OutOfMemory we throttle this thread once the threshold has been
+ * exceeded.
*/
public void run() {
List pools = ManagementFactory.getMemoryPoolMXBeans();
@@ -180,7 +188,7 @@
// Set threshold of 80% of all NON_HEAP memory pools
// In the Hotspot implementation this means we should get a notification
- // if the CodeCache or perm generation fills up.
+ // if the CodeCache or metaspace fills up.
while (iter.hasNext()) {
MemoryPoolMXBean p = (MemoryPoolMXBean) iter.next();
@@ -188,7 +196,12 @@
// set threshold
MemoryUsage mu = p.getUsage();
- long threshold = (mu.getMax() * 80) / 100;
+ long max = mu.getMax();
+ if (max < 0) {
+ throw new RuntimeException("There is no maximum set for "
+ + p.getName() + " memory pool so the test is invalid");
+ }
+ long threshold = (max * 80) / 100;
p.setUsageThreshold(threshold);
diff --git a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh
index 44b7572..3d97270 100644
--- a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh
+++ b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh
@@ -51,14 +51,17 @@
# Run test with each GC configuration
#
-# Notes: To ensure that perm gen fills up we disable class unloading.
-# Also we set the max perm space to 8MB - otherwise the test takes too
+# Notes: To ensure that metaspace fills up we disable class unloading.
+# Also we set the max metaspace to 8MB - otherwise the test takes too
# long to run.
-go -noclassgc -XX:PermSize=8m -XX:MaxPermSize=8m -XX:+UseSerialGC LowMemoryTest2
-go -noclassgc -XX:PermSize=8m -XX:MaxPermSize=8m -XX:+UseParallelGC LowMemoryTest2
-go -noclassgc -XX:PermSize=8m -XX:MaxPermSize=8m -XX:+UseParNewGC -XX:+UseConcMarkSweepGC \
- LowMemoryTest2
+go -noclassgc -XX:MaxMetaspaceSize=16m -XX:+UseSerialGC LowMemoryTest2
+go -noclassgc -XX:MaxMetaspaceSize=16m -XX:+UseParallelGC LowMemoryTest2
+go -noclassgc -XX:MaxMetaspaceSize=16m -XX:+UseParNewGC -XX:+UseConcMarkSweepGC LowMemoryTest2
+
+# Test class metaspace - might hit MaxMetaspaceSize instead if
+# UseCompressedClassPointers is off or if 32 bit.
+go -noclassgc -XX:MaxMetaspaceSize=16m -XX:CompressedClassSpaceSize=4m LowMemoryTest2
echo ''
if [ $failures -gt 0 ];
diff --git a/jdk/test/java/lang/reflect/Array/ExceedMaxDim.java b/jdk/test/java/lang/reflect/Array/ExceedMaxDim.java
index 3b1e8c1..67434b9 100644
--- a/jdk/test/java/lang/reflect/Array/ExceedMaxDim.java
+++ b/jdk/test/java/lang/reflect/Array/ExceedMaxDim.java
@@ -22,7 +22,7 @@
*/
/* @test
- * @bug 4100814
+ * @bug 4100814 7044282
* @summary Make sure you can't create an array of dimension > 256.
*/
diff --git a/jdk/test/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java b/jdk/test/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java
new file mode 100644
index 0000000..83ead89
--- /dev/null
+++ b/jdk/test/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2013, 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 8026213
+ * @summary Reflection support for private methods in interfaces
+ * @author Robert Field
+ * @run main TestPrivateInterfaceMethodReflect
+ */
+
+import java.lang.reflect.*;
+
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+public class TestPrivateInterfaceMethodReflect {
+
+ static final String INTERFACE_NAME = "PrivateInterfaceMethodReflectTest_Interface";
+ static final String CLASS_NAME = "PrivateInterfaceMethodReflectTest_Class";
+ static final int EXPECTED = 1234;
+
+ static class TestClassLoader extends ClassLoader implements Opcodes {
+
+ @Override
+ public Class findClass(String name) throws ClassNotFoundException {
+ byte[] b;
+ try {
+ b = loadClassData(name);
+ } catch (Throwable th) {
+ // th.printStackTrace();
+ throw new ClassNotFoundException("Loading error", th);
+ }
+ return defineClass(name, b, 0, b.length);
+ }
+
+ private byte[] loadClassData(String name) throws Exception {
+ ClassWriter cw = new ClassWriter(0);
+ MethodVisitor mv;
+ switch (name) {
+ case INTERFACE_NAME:
+ cw.visit(V1_8, ACC_ABSTRACT | ACC_INTERFACE | ACC_PUBLIC, INTERFACE_NAME, null, "java/lang/Object", null);
+ {
+ mv = cw.visitMethod(ACC_PRIVATE, "privInstance", "()I", null, null);
+ mv.visitCode();
+ mv.visitLdcInsn(EXPECTED);
+ mv.visitInsn(IRETURN);
+ mv.visitMaxs(1, 1);
+ mv.visitEnd();
+ }
+ break;
+ case CLASS_NAME:
+ cw.visit(52, ACC_SUPER | ACC_PUBLIC, CLASS_NAME, null, "java/lang/Object", new String[]{INTERFACE_NAME});
+ {
+ mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+ mv.visitCode();
+ mv.visitVarInsn(ALOAD, 0);
+ mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
+ mv.visitInsn(RETURN);
+ mv.visitMaxs(1, 1);
+ mv.visitEnd();
+ }
+ break;
+ default:
+ break;
+ }
+ cw.visitEnd();
+
+ return cw.toByteArray();
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ TestClassLoader tcl = new TestClassLoader();
+ Class<?> itf = tcl.loadClass(INTERFACE_NAME);
+ Class<?> k = tcl.loadClass(CLASS_NAME);
+ Object inst = k.newInstance();
+ Method[] meths = itf.getDeclaredMethods();
+ if (meths.length != 1) {
+ throw new Exception("Expected one method in " + INTERFACE_NAME + " instead " + meths.length);
+ }
+
+ Method m = meths[0];
+ int mod = m.getModifiers();
+ if ((mod & Modifier.PRIVATE) == 0) {
+ throw new Exception("Expected " + m + " to be private");
+ }
+ if ((mod & Modifier.STATIC) != 0) {
+ throw new Exception("Expected " + m + " to be instance method");
+ }
+
+ m.setAccessible(true);
+ for (int i = 1; i < 200; i++) {
+ if (!m.invoke(inst).equals(EXPECTED)) {
+ throw new Exception("Expected " + EXPECTED + " from " + m);
+ }
+ }
+
+ System.out.println("Passed.");
+ }
+}
diff --git a/jdk/test/java/net/HttpURLPermission/HttpURLPermissionTest.java b/jdk/test/java/net/HttpURLPermission/HttpURLPermissionTest.java
deleted file mode 100644
index 4f4ea85..0000000
--- a/jdk/test/java/net/HttpURLPermission/HttpURLPermissionTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-import java.net.HttpURLPermission;
-import java.io.*;
-
-/**
- * @test
- * @bug 8010464
- */
-
-public class HttpURLPermissionTest {
-
- // super class for all test types
- abstract static class Test {
- boolean expected;
- abstract boolean execute();
- };
-
- // Tests URL part of implies() method. This is the main test.
- static class URLImpliesTest extends Test {
- String arg1, arg2;
-
- URLImpliesTest(String arg1, String arg2, boolean expected) {
- this.arg1 = arg1;
- this.arg2 = arg2;
- this.expected = expected;
- }
-
- boolean execute() {
- HttpURLPermission p1 = new HttpURLPermission (arg1, "GET:*");
- HttpURLPermission p2 = new HttpURLPermission (arg2, "GET:*");
- boolean result = p1.implies(p2);
- return result == expected;
- }
- };
-
- static URLImpliesTest imtest(String arg1, String arg2, boolean expected) {
- return new URLImpliesTest(arg1, arg2, expected);
- }
-
- static class ActionImpliesTest extends Test {
- String arg1, arg2;
-
- ActionImpliesTest(String arg1, String arg2, boolean expected) {
- this.arg1 = arg1;
- this.arg2 = arg2;
- this.expected = expected;
- }
-
- boolean execute() {
- String url1 = "http://www.foo.com/-";
- String url2 = "http://www.foo.com/a/b";
- HttpURLPermission p1 = new HttpURLPermission(url1, arg1);
- HttpURLPermission p2 = new HttpURLPermission(url2, arg2);
- boolean result = p1.implies(p2);
- return result == expected;
- }
- }
-
- static ActionImpliesTest actest(String arg1, String arg2, boolean expected) {
- return new ActionImpliesTest(arg1, arg2, expected);
- }
-
- static Test[] pathImplies = {
- // single
- imtest("http://www.foo.com/", "http://www.foo.com/", true),
- imtest("http://www.bar.com/", "http://www.foo.com/", false),
- imtest("http://www.foo.com/a/b", "http://www.foo.com/", false),
- imtest("http://www.foo.com/a/b", "http://www.foo.com/a/b/c", false),
- // wildcard
- imtest("http://www.foo.com/a/b/*", "http://www.foo.com/a/b/c", true),
- imtest("http://www.foo.com/a/b/*", "http://www.foo.com/a/b/*", true),
- imtest("http://www.foo.com/a/b/*", "http://www.foo.com/a/b/c#frag", true),
- imtest("http://www.foo.com/a/b/*", "http://www.foo.com/a/b/c#frag?foo=foo", true),
- imtest("http://www.foo.com/a/b/*", "http://www.foo.com/b/b/c", false),
- imtest("http://www.foo.com/a/b/*", "http://www.foo.com/a/b/c.html", true),
- imtest("http://www.foo.com/a/b/*", "http://www.foo.com/a/b/c.html", true),
- imtest("http://www.foo.com/a/b/*", "https://www.foo.com/a/b/c", false),
- // recursive
- imtest("http://www.foo.com/a/b/-", "http://www.foo.com/a/b/-", true),
- imtest("http://www.foo.com/a/b/-", "http://www.foo.com/a/b/c", true),
- imtest("http://www.foo.com/a/b/-", "http://www.foo.com/a/b/c#frag", true),
- imtest("http://www.foo.com/a/b/-", "http://www.foo.com/a/b/c#frag?foo=foo", true),
- imtest("http://www.foo.com/a/b/-", "http://www.foo.com/b/b/c", false),
- imtest("http://www.foo.com/a/b/-", "http://www.foo.com/a/b/c.html", true),
- imtest("http://www.foo.com/a/b/-", "http://www.foo.com/a/b/c.html", true),
- imtest("http://www.foo.com/a/b/-", "http://www.foo.com/a/b/c/d/e.html", true),
- imtest("https://www.foo.com/a/b/-", "http://www.foo.com/a/b/c/d/e.html", false),
- imtest("http://www.foo.com/a/b/-", "http://www.foo.com/a/b/c/d/e#frag", true),
- imtest("http://www.foo.com/a/b/-", "https://www.foo.com/a/b/c", false),
- // special cases
- imtest("http:*", "https://www.foo.com/a/b/c", false),
- imtest("http:*", "http://www.foo.com/a/b/c", true),
- imtest("http:*", "http://foo/bar", true),
- imtest("http://foo/bar", "https://foo/bar", false)
- };
-
- static Test[] actionImplies = {
- actest("GET", "GET", true),
- actest("GET", "POST", false),
- actest("GET:", "PUT", false),
- actest("GET:", "GET", true),
- actest("GET,POST", "GET", true),
- actest("GET,POST:", "GET", true),
- actest("GET:X-Foo", "GET:x-foo", true),
- actest("GET:X-Foo,X-bar", "GET:x-foo", true),
- actest("GET:X-Foo", "GET:x-boo", false),
- actest("GET:X-Foo,X-Bar", "GET:x-bar,x-foo", true),
- actest("GET:X-Bar,X-Foo,X-Bar,Y-Foo", "GET:x-bar,x-foo", true),
- actest("GET:*", "GET:x-bar,x-foo", true),
- actest("*:*", "GET:x-bar,x-foo", true)
- };
-
- static boolean failed = false;
-
- public static void main(String args[]) throws Exception {
- for (int i=0; i<pathImplies.length ; i++) {
- URLImpliesTest test = (URLImpliesTest)pathImplies[i];
- Exception caught = null;
- boolean result = false;
- try {
- result = test.execute();
- } catch (Exception e) {
- caught = e;
- e.printStackTrace();
- }
- if (!result) {
- failed = true;
- System.out.println ("test failed: " + test.arg1 + ": " +
- test.arg2 + " Exception: " + caught);
- }
- System.out.println ("path test " + i + " OK");
-
- }
- for (int i=0; i<actionImplies.length ; i++) {
- ActionImpliesTest test = (ActionImpliesTest)actionImplies[i];
- Exception caught = null;
- boolean result = false;
- try {
- result = test.execute();
- } catch (Exception e) {
- caught = e;
- e.printStackTrace();
- }
- if (!result) {
- failed = true;
- System.out.println ("test failed: " + test.arg1 + ": " +
- test.arg2 + " Exception: " + caught);
- }
- System.out.println ("action test " + i + " OK");
- }
-
- serializationTest("http://www.foo.com/-", "GET,DELETE:*");
- serializationTest("https://www.foo.com/-", "POST:X-Foo");
- serializationTest("https:*", "*:*");
- serializationTest("http://www.foo.com/a/b/s/", "POST:X-Foo");
- serializationTest("http://www.foo.com/a/b/s/*", "POST:X-Foo");
-
- if (failed) {
- throw new RuntimeException("some tests failed");
- }
-
- }
-
- static void serializationTest(String name, String actions)
- throws Exception {
-
- HttpURLPermission out = new HttpURLPermission(name, actions);
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream o = new ObjectOutputStream(baos);
- o.writeObject(out);
- ByteArrayInputStream bain = new ByteArrayInputStream(baos.toByteArray());
- ObjectInputStream i = new ObjectInputStream(bain);
- HttpURLPermission in = (HttpURLPermission)i.readObject();
- if (!in.equals(out)) {
- System.out.println ("FAIL");
- System.out.println ("in = " + in);
- System.out.println ("out = " + out);
- failed = true;
- }
- }
-}
diff --git a/jdk/test/java/net/HttpURLPermission/policy.1 b/jdk/test/java/net/HttpURLPermission/policy.1
deleted file mode 100644
index 73fdb00..0000000
--- a/jdk/test/java/net/HttpURLPermission/policy.1
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// Copyright (c) 2013, 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.
-//
-
-grant {
- permission java.net.HttpURLPermission "http://127.0.0.1:12567/foo.html", "GET:X-Foo,Z-Bar";
- permission java.net.HttpURLPermission "https://127.0.0.1:12568/foo.html", "POST:X-Fob,T-Bar";
-
- // needed for HttpServer
- permission "java.net.SocketPermission" "localhost:1024-", "listen,resolve,accept";
- permission "java.util.PropertyPermission" "test.src", "read";
- permission java.io.FilePermission "${test.src}/../../../com/sun/net/httpserver/testkeys", "read";
-
- //permission "java.util.logging.LoggingPermission" "control";
- //permission "java.io.FilePermission" "/tmp/-", "read,write";
- permission "java.lang.RuntimePermission" "modifyThread";
- permission "java.lang.RuntimePermission" "setFactory";
-};
-
-// Normal permissions that aren't granted when run under jtreg
-
-grant codeBase "file:${{java.ext.dirs}}/*" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${{java.home}}/jre/lib/rt.jar" {
- permission java.security.AllPermission;
-};
-
diff --git a/jdk/test/java/net/Inet6Address/serialize/Serialize.java b/jdk/test/java/net/Inet6Address/serialize/Serialize.java
index c563c8b..f7c6fe7 100644
--- a/jdk/test/java/net/Inet6Address/serialize/Serialize.java
+++ b/jdk/test/java/net/Inet6Address/serialize/Serialize.java
@@ -94,7 +94,26 @@
} finally {
ois.close();
}
- System.out.println(nobj);
+
+ nobj = (Inet6Address)InetAddress.getByAddress("foo.com", new byte[] {
+ (byte)0xfe,(byte)0x80,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,
+ (byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)1
+ });
+ if (!test1(nobj, addr1)) {
+ throw new RuntimeException("failed with " + nobj.toString());
+ }
+ nobj = (Inet6Address)InetAddress.getByAddress("x.bar.com", new byte[] {
+ (byte)0xfe,(byte)0xC0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,
+ (byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)1
+ });
+ if (!test1(nobj, addr2)) {
+ throw new RuntimeException("failed with " + nobj.toString());
+ }
+ nobj = (Inet6Address)InetAddress.getByName("::1");
+ if (!test1(nobj, addr3)) {
+ throw new RuntimeException("failed with " + nobj.toString());
+ }
+
System.out.println("All tests passed");
}
@@ -113,4 +132,162 @@
return false;
}
}
- }
+
+ static boolean test1 (Inet6Address obj, byte[] buf) throws Exception {
+ ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(buf));
+ Inet6Address nobj = (Inet6Address) ois.readObject();
+ ois.close();
+
+ if (nobj.equals(obj)) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ // Inet6Address instances serialized with JDK 6
+
+ static byte[] addr1 = {
+ (byte)0xac,(byte)0xed,(byte)0x00,(byte)0x05,(byte)0x73,(byte)0x72,
+ (byte)0x00,(byte)0x15,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
+ (byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x2e,(byte)0x49,
+ (byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x36,(byte)0x41,(byte)0x64,
+ (byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,(byte)0x5f,
+ (byte)0x7c,(byte)0x20,(byte)0x81,(byte)0x52,(byte)0x2c,(byte)0x80,
+ (byte)0x21,(byte)0x03,(byte)0x00,(byte)0x05,(byte)0x49,(byte)0x00,
+ (byte)0x08,(byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,
+ (byte)0x5f,(byte)0x69,(byte)0x64,(byte)0x5a,(byte)0x00,(byte)0x0c,
+ (byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,(byte)0x5f,
+ (byte)0x69,(byte)0x64,(byte)0x5f,(byte)0x73,(byte)0x65,(byte)0x74,
+ (byte)0x5a,(byte)0x00,(byte)0x10,(byte)0x73,(byte)0x63,(byte)0x6f,
+ (byte)0x70,(byte)0x65,(byte)0x5f,(byte)0x69,(byte)0x66,(byte)0x6e,
+ (byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x5f,(byte)0x73,(byte)0x65,
+ (byte)0x74,(byte)0x4c,(byte)0x00,(byte)0x06,(byte)0x69,(byte)0x66,
+ (byte)0x6e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x74,(byte)0x00,
+ (byte)0x12,(byte)0x4c,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
+ (byte)0x2f,(byte)0x6c,(byte)0x61,(byte)0x6e,(byte)0x67,(byte)0x2f,
+ (byte)0x53,(byte)0x74,(byte)0x72,(byte)0x69,(byte)0x6e,(byte)0x67,
+ (byte)0x3b,(byte)0x5b,(byte)0x00,(byte)0x09,(byte)0x69,(byte)0x70,
+ (byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,
+ (byte)0x73,(byte)0x74,(byte)0x00,(byte)0x02,(byte)0x5b,(byte)0x42,
+ (byte)0x78,(byte)0x72,(byte)0x00,(byte)0x14,(byte)0x6a,(byte)0x61,
+ (byte)0x76,(byte)0x61,(byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,
+ (byte)0x2e,(byte)0x49,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x41,
+ (byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,
+ (byte)0x2d,(byte)0x9b,(byte)0x57,(byte)0xaf,(byte)0x9f,(byte)0xe3,
+ (byte)0xeb,(byte)0xdb,(byte)0x02,(byte)0x00,(byte)0x03,(byte)0x49,
+ (byte)0x00,(byte)0x07,(byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,
+ (byte)0x65,(byte)0x73,(byte)0x73,(byte)0x49,(byte)0x00,(byte)0x06,
+ (byte)0x66,(byte)0x61,(byte)0x6d,(byte)0x69,(byte)0x6c,(byte)0x79,
+ (byte)0x4c,(byte)0x00,(byte)0x08,(byte)0x68,(byte)0x6f,(byte)0x73,
+ (byte)0x74,(byte)0x4e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x71,
+ (byte)0x00,(byte)0x7e,(byte)0x00,(byte)0x01,(byte)0x78,(byte)0x70,
+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
+ (byte)0x00,(byte)0x02,(byte)0x74,(byte)0x00,(byte)0x07,(byte)0x66,
+ (byte)0x6f,(byte)0x6f,(byte)0x2e,(byte)0x63,(byte)0x6f,(byte)0x6d,
+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
+ (byte)0x70,(byte)0x75,(byte)0x72,(byte)0x00,(byte)0x02,(byte)0x5b,
+ (byte)0x42,(byte)0xac,(byte)0xf3,(byte)0x17,(byte)0xf8,(byte)0x06,
+ (byte)0x08,(byte)0x54,(byte)0xe0,(byte)0x02,(byte)0x00,(byte)0x00,
+ (byte)0x78,(byte)0x70,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x10,
+ (byte)0xfe,(byte)0x80,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x01,(byte)0x78
+ };
+
+ static byte[] addr2 = {
+ (byte)0xac,(byte)0xed,(byte)0x00,(byte)0x05,(byte)0x73,(byte)0x72,
+ (byte)0x00,(byte)0x15,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
+ (byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x2e,(byte)0x49,
+ (byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x36,(byte)0x41,(byte)0x64,
+ (byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,(byte)0x5f,
+ (byte)0x7c,(byte)0x20,(byte)0x81,(byte)0x52,(byte)0x2c,(byte)0x80,
+ (byte)0x21,(byte)0x03,(byte)0x00,(byte)0x05,(byte)0x49,(byte)0x00,
+ (byte)0x08,(byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,
+ (byte)0x5f,(byte)0x69,(byte)0x64,(byte)0x5a,(byte)0x00,(byte)0x0c,
+ (byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,(byte)0x5f,
+ (byte)0x69,(byte)0x64,(byte)0x5f,(byte)0x73,(byte)0x65,(byte)0x74,
+ (byte)0x5a,(byte)0x00,(byte)0x10,(byte)0x73,(byte)0x63,(byte)0x6f,
+ (byte)0x70,(byte)0x65,(byte)0x5f,(byte)0x69,(byte)0x66,(byte)0x6e,
+ (byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x5f,(byte)0x73,(byte)0x65,
+ (byte)0x74,(byte)0x4c,(byte)0x00,(byte)0x06,(byte)0x69,(byte)0x66,
+ (byte)0x6e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x74,(byte)0x00,
+ (byte)0x12,(byte)0x4c,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
+ (byte)0x2f,(byte)0x6c,(byte)0x61,(byte)0x6e,(byte)0x67,(byte)0x2f,
+ (byte)0x53,(byte)0x74,(byte)0x72,(byte)0x69,(byte)0x6e,(byte)0x67,
+ (byte)0x3b,(byte)0x5b,(byte)0x00,(byte)0x09,(byte)0x69,(byte)0x70,
+ (byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,
+ (byte)0x73,(byte)0x74,(byte)0x00,(byte)0x02,(byte)0x5b,(byte)0x42,
+ (byte)0x78,(byte)0x72,(byte)0x00,(byte)0x14,(byte)0x6a,(byte)0x61,
+ (byte)0x76,(byte)0x61,(byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,
+ (byte)0x2e,(byte)0x49,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x41,
+ (byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,
+ (byte)0x2d,(byte)0x9b,(byte)0x57,(byte)0xaf,(byte)0x9f,(byte)0xe3,
+ (byte)0xeb,(byte)0xdb,(byte)0x02,(byte)0x00,(byte)0x03,(byte)0x49,
+ (byte)0x00,(byte)0x07,(byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,
+ (byte)0x65,(byte)0x73,(byte)0x73,(byte)0x49,(byte)0x00,(byte)0x06,
+ (byte)0x66,(byte)0x61,(byte)0x6d,(byte)0x69,(byte)0x6c,(byte)0x79,
+ (byte)0x4c,(byte)0x00,(byte)0x08,(byte)0x68,(byte)0x6f,(byte)0x73,
+ (byte)0x74,(byte)0x4e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x71,
+ (byte)0x00,(byte)0x7e,(byte)0x00,(byte)0x01,(byte)0x78,(byte)0x70,
+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
+ (byte)0x00,(byte)0x02,(byte)0x74,(byte)0x00,(byte)0x09,(byte)0x78,
+ (byte)0x2e,(byte)0x62,(byte)0x61,(byte)0x72,(byte)0x2e,(byte)0x63,
+ (byte)0x6f,(byte)0x6d,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
+ (byte)0x00,(byte)0x00,(byte)0x70,(byte)0x75,(byte)0x72,(byte)0x00,
+ (byte)0x02,(byte)0x5b,(byte)0x42,(byte)0xac,(byte)0xf3,(byte)0x17,
+ (byte)0xf8,(byte)0x06,(byte)0x08,(byte)0x54,(byte)0xe0,(byte)0x02,
+ (byte)0x00,(byte)0x00,(byte)0x78,(byte)0x70,(byte)0x00,(byte)0x00,
+ (byte)0x00,(byte)0x10,(byte)0xfe,(byte)0xc0,(byte)0x00,(byte)0x00,
+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x01,
+ (byte)0x78
+ };
+
+ static byte[] addr3 = {
+ (byte)0xac,(byte)0xed,(byte)0x00,(byte)0x05,(byte)0x73,(byte)0x72,
+ (byte)0x00,(byte)0x15,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
+ (byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x2e,(byte)0x49,
+ (byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x36,(byte)0x41,(byte)0x64,
+ (byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,(byte)0x5f,
+ (byte)0x7c,(byte)0x20,(byte)0x81,(byte)0x52,(byte)0x2c,(byte)0x80,
+ (byte)0x21,(byte)0x03,(byte)0x00,(byte)0x05,(byte)0x49,(byte)0x00,
+ (byte)0x08,(byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,
+ (byte)0x5f,(byte)0x69,(byte)0x64,(byte)0x5a,(byte)0x00,(byte)0x0c,
+ (byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,(byte)0x5f,
+ (byte)0x69,(byte)0x64,(byte)0x5f,(byte)0x73,(byte)0x65,(byte)0x74,
+ (byte)0x5a,(byte)0x00,(byte)0x10,(byte)0x73,(byte)0x63,(byte)0x6f,
+ (byte)0x70,(byte)0x65,(byte)0x5f,(byte)0x69,(byte)0x66,(byte)0x6e,
+ (byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x5f,(byte)0x73,(byte)0x65,
+ (byte)0x74,(byte)0x4c,(byte)0x00,(byte)0x06,(byte)0x69,(byte)0x66,
+ (byte)0x6e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x74,(byte)0x00,
+ (byte)0x12,(byte)0x4c,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
+ (byte)0x2f,(byte)0x6c,(byte)0x61,(byte)0x6e,(byte)0x67,(byte)0x2f,
+ (byte)0x53,(byte)0x74,(byte)0x72,(byte)0x69,(byte)0x6e,(byte)0x67,
+ (byte)0x3b,(byte)0x5b,(byte)0x00,(byte)0x09,(byte)0x69,(byte)0x70,
+ (byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,
+ (byte)0x73,(byte)0x74,(byte)0x00,(byte)0x02,(byte)0x5b,(byte)0x42,
+ (byte)0x78,(byte)0x72,(byte)0x00,(byte)0x14,(byte)0x6a,(byte)0x61,
+ (byte)0x76,(byte)0x61,(byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,
+ (byte)0x2e,(byte)0x49,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x41,
+ (byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,
+ (byte)0x2d,(byte)0x9b,(byte)0x57,(byte)0xaf,(byte)0x9f,(byte)0xe3,
+ (byte)0xeb,(byte)0xdb,(byte)0x02,(byte)0x00,(byte)0x03,(byte)0x49,
+ (byte)0x00,(byte)0x07,(byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,
+ (byte)0x65,(byte)0x73,(byte)0x73,(byte)0x49,(byte)0x00,(byte)0x06,
+ (byte)0x66,(byte)0x61,(byte)0x6d,(byte)0x69,(byte)0x6c,(byte)0x79,
+ (byte)0x4c,(byte)0x00,(byte)0x08,(byte)0x68,(byte)0x6f,(byte)0x73,
+ (byte)0x74,(byte)0x4e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x71,
+ (byte)0x00,(byte)0x7e,(byte)0x00,(byte)0x01,(byte)0x78,(byte)0x70,
+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
+ (byte)0x00,(byte)0x02,(byte)0x70,(byte)0x00,(byte)0x00,(byte)0x00,
+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x70,(byte)0x75,(byte)0x72,
+ (byte)0x00,(byte)0x02,(byte)0x5b,(byte)0x42,(byte)0xac,(byte)0xf3,
+ (byte)0x17,(byte)0xf8,(byte)0x06,(byte)0x08,(byte)0x54,(byte)0xe0,
+ (byte)0x02,(byte)0x00,(byte)0x00,(byte)0x78,(byte)0x70,(byte)0x00,
+ (byte)0x00,(byte)0x00,(byte)0x10,(byte)0x00,(byte)0x00,(byte)0x00,
+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
+ (byte)0x01,(byte)0x78
+ };
+}
diff --git a/jdk/test/java/net/InetAddress/GetLocalHostWithSM.java b/jdk/test/java/net/InetAddress/GetLocalHostWithSM.java
index c8d06ac..9701a74 100644
--- a/jdk/test/java/net/InetAddress/GetLocalHostWithSM.java
+++ b/jdk/test/java/net/InetAddress/GetLocalHostWithSM.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, 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,9 +23,11 @@
/**
* @test
- * @bug 4531817
+ * @bug 4531817 8026245
* @summary Inet[46]Address.localHost need doPrivileged
* @run main/othervm GetLocalHostWithSM
+ * @run main/othervm -Djava.net.preferIPv4Stack=true GetLocalHostWithSM
+ * @run main/othervm -Djava.net.preferIPv6Addresses=true GetLocalHostWithSM
* files needed: GetLocalHostWithSM.java, MyPrincipal.java, and policy.file
*/
diff --git a/jdk/test/java/net/Socket/GetLocalAddress.java b/jdk/test/java/net/Socket/GetLocalAddress.java
index 606ba64..e9573d2 100644
--- a/jdk/test/java/net/Socket/GetLocalAddress.java
+++ b/jdk/test/java/net/Socket/GetLocalAddress.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, 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,10 @@
/*
* @test
- * @bug 4106601
+ * @bug 4106601 8026245
+ * @run main/othervm GetLocalAddress
+ * @run main/othervm -Djava.net.preferIPv4Stack=true GetLocalAddress
+ * @run main/othervm -Djava.net.preferIPv6Addresses=true GetLocalAddress
* @summary Test the java.net.socket.GetLocalAddress method
*
*/
diff --git a/jdk/test/java/net/Socks/SocksProxyVersion.java b/jdk/test/java/net/Socks/SocksProxyVersion.java
index bc46c42..27bd187 100644
--- a/jdk/test/java/net/Socks/SocksProxyVersion.java
+++ b/jdk/test/java/net/Socks/SocksProxyVersion.java
@@ -41,6 +41,10 @@
volatile boolean failed;
public static void main(String[] args) throws Exception {
+ if (InetAddress.getLocalHost().isLoopbackAddress()) {
+ System.out.println("Test cannot run. getLocalHost returns a loopback address");
+ return;
+ }
new SocksProxyVersion();
}
diff --git a/jdk/test/java/net/URLPermission/URLPermissionTest.java b/jdk/test/java/net/URLPermission/URLPermissionTest.java
new file mode 100644
index 0000000..07299b2
--- /dev/null
+++ b/jdk/test/java/net/URLPermission/URLPermissionTest.java
@@ -0,0 +1,388 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+import java.net.URLPermission;
+import java.io.*;
+
+/**
+ * @test
+ * @bug 8010464
+ */
+
+public class URLPermissionTest {
+
+ // super class for all test types
+ abstract static class Test {
+ boolean expected;
+ abstract boolean execute();
+ };
+
+ // Should throw an IAE on construction
+ static class ExTest extends Test {
+ String arg;
+ ExTest(String arg) {
+ this.arg = arg;
+ }
+
+ @Override
+ boolean execute() {
+ try {
+ URLPermission p = new URLPermission(arg);
+ return false;
+ } catch (IllegalArgumentException e) {
+ return true;
+ }
+ }
+ };
+
+ static ExTest extest(String arg) {
+ return new ExTest(arg);
+ }
+
+ // Tests URL part of implies() method. This is the main test.
+ static class URLImpliesTest extends Test {
+ String arg1, arg2;
+
+ URLImpliesTest(String arg1, String arg2, boolean expected) {
+ this.arg1 = arg1;
+ this.arg2 = arg2;
+ this.expected = expected;
+ }
+
+ boolean execute() {
+ URLPermission p1 = new URLPermission (arg1, "GET:*");
+ URLPermission p2 = new URLPermission (arg2, "GET:*");
+ boolean result = p1.implies(p2);
+ if (result != expected) {
+ System.out.println("p1 = " + p1);
+ System.out.println("p2 = " + p2);
+ }
+ return result == expected;
+ }
+ };
+
+ static URLImpliesTest imtest(String arg1, String arg2, boolean expected) {
+ return new URLImpliesTest(arg1, arg2, expected);
+ }
+
+ static class ActionImpliesTest extends Test {
+ String arg1, arg2;
+
+ ActionImpliesTest(String arg1, String arg2, boolean expected) {
+ this.arg1 = arg1;
+ this.arg2 = arg2;
+ this.expected = expected;
+ }
+
+ @Override
+ boolean execute() {
+ String url1 = "http://www.foo.com/-";
+ String url2 = "http://www.foo.com/a/b";
+ URLPermission p1 = new URLPermission(url1, arg1);
+ URLPermission p2 = new URLPermission(url2, arg2);
+ boolean result = p1.implies(p2);
+
+ return result == expected;
+ }
+ }
+
+ static ActionImpliesTest actest(String arg1, String arg2, boolean expected) {
+ return new ActionImpliesTest(arg1, arg2, expected);
+ }
+
+ static class URLEqualityTest extends Test {
+ String arg1, arg2;
+
+ URLEqualityTest(String arg1, String arg2, boolean expected) {
+ this.arg1 = arg1;
+ this.arg2 = arg2;
+ this.expected = expected;
+ }
+
+ @Override
+ boolean execute() {
+ URLPermission p1 = new URLPermission(arg1);
+ URLPermission p2 = new URLPermission(arg2);
+ boolean result = p1.equals(p2);
+
+ return result == expected;
+ }
+ }
+
+ static URLEqualityTest eqtest(String arg1, String arg2, boolean expected) {
+ return new URLEqualityTest(arg1, arg2, expected);
+ }
+
+ static Test[] pathImplies = {
+ // single
+ imtest("http://www.foo.com/", "http://www.foo.com/", true),
+ imtest("http://www.bar.com/", "http://www.foo.com/", false),
+ imtest("http://www.foo.com/a/b", "http://www.foo.com/", false),
+ imtest("http://www.foo.com/a/b", "http://www.foo.com/a/b/c", false),
+ // wildcard
+ imtest("http://www.foo.com/a/b/*", "http://www.foo.com/a/b/c", true),
+ imtest("http://www.foo.com/a/b/*", "http://www.foo.com/a/b/*", true),
+ imtest("http://www.foo.com/a/b/*", "http://www.foo.com/a/b/c#frag", true),
+ imtest("http://www.foo.com/a/b/*", "http://www.foo.com/a/b/c#frag?foo=foo", true),
+ imtest("http://www.foo.com/a/b/*", "http://www.foo.com/b/b/c", false),
+ imtest("http://www.foo.com/a/b/*", "http://www.foo.com/a/b/c.html", true),
+ imtest("http://www.foo.com/a/b/*", "http://www.foo.com/a/b/c.html", true),
+ imtest("http://www.foo.com/a/b/*", "https://www.foo.com/a/b/c", false),
+ // recursive
+ imtest("http://www.foo.com/a/b/-", "http://www.foo.com/a/b/-", true),
+ imtest("http://www.foo.com/a/b/-", "http://www.foo.com/a/b/c", true),
+ imtest("http://www.foo.com/a/b/-", "http://www.foo.com/a/b/c#frag", true),
+ imtest("http://www.foo.com/a/b/-", "http://www.foo.com/a/b/c#frag?foo=foo", true),
+ imtest("http://www.foo.com/a/b/-", "http://www.foo.com/b/b/c", false),
+ imtest("http://www.foo.com/a/b/-", "http://www.foo.com/a/b/c.html", true),
+ imtest("http://www.foo.com/a/b/-", "http://www.foo.com/a/b/c.html", true),
+ imtest("http://www.foo.com/a/b/-", "http://www.foo.com/a/b/c/d/e.html", true),
+ imtest("https://www.foo.com/a/b/-", "http://www.foo.com/a/b/c/d/e.html", false),
+ imtest("http://www.foo.com/a/b/-", "http://www.foo.com/a/b/c/d/e#frag", true),
+ imtest("http://www.foo.com/a/b/-", "https://www.foo.com/a/b/c", false),
+ // special cases
+ imtest("http:*", "https://www.foo.com/a/b/c", false),
+ imtest("http:*", "http://www.foo.com/a/b/c", true),
+ imtest("http:*", "http://foo/bar", true),
+ imtest("http://foo/bar", "https://foo/bar", false)
+ };
+
+ // new functionality
+
+ static Test[] exceptionTests = {
+ extest("http://1.2.3.4.5/a/b/c"),
+ extest("http://www.*.com"),
+ //extest("http://www.foo.com:1-X"),
+ extest("http://[foo.com]:99"),
+ extest("http://[fec0::X]:99"),
+ extest("http:")
+ };
+
+ static Test[] pathImplies2 = {
+ imtest("http://[FE80::]:99", "http://[fe80:0::]:99", true),
+
+ // hostnames
+ imtest("http://*.foo.com/a/b/-", "http://www.foo.com/a/b/c/d", true),
+ imtest("http://*.foo.com/a/b/-", "http://www.bar.com/a/b/c/d", false),
+ imtest("http://*.foo.com/a/b/-", "http://www.biz.bar.foo.com/a/b/c/d", true),
+ imtest("http://*.foo.com/a/b/-", "http://www.biz.bar.foo.como/a/b/c/d", false),
+ imtest("http://*/a/b/-", "http://www.biz.bar.foo.fuzz/a/b/c/d", true),
+ imtest("http://*/a/b/-", "http://*/a/b/c/d", true),
+ imtest("http://*.foo.com/a/b/-", "http://*/a/b/c/d", false),
+ imtest("http:*", "http://*/a/b/c/d", true),
+
+ // literal IPv4 addresses
+ imtest("http://1.2.3.4/a/b/-", "http://www.biz.bar.foo.com/a/b/c/d", false),
+ imtest("http://1.2.3.4/a/b/-", "http://1.2.3.4/a/b/c/d", true),
+ imtest("http://1.2.3.4/a/b/-", "http://1.2.88.4/a/b/c/d", false),
+ imtest("http:*", "http://1.2.88.4/a/b/c/d", true),
+
+ // literal IPv6 addresses
+ imtest("http://[fe80::]/a/b/-", "http://[fe80::0]/a/b/c", true),
+ imtest("http://[fe80::]/a/b/-", "http://[fe80::3]/a/b/c", false),
+ imtest("http://[1:2:3:4:5:6:7:8]/a/b/-","http://[1:002:03:4:0005:6:07:8]/a/b/c", true),
+ imtest("http://[1:2:3:4:5:6:7:8]/a/b/-","http://[1:002:03:4:0033:6:07:8]/a/b/c", false),
+ imtest("http://[1::2]/a/b/-", "http://[1:0:0:0::2]/a/b/c", true),
+ imtest("http://[1::2]/a/b/-", "http://[1:0:0:0::3]/a/b/c", false),
+ imtest("http://[FE80::]:99", "http://[fe80:0::]:99", true),
+ imtest("http:*", "http://[fe80:0::]:99", true),
+
+ // portranges
+ imtest("http://*.foo.com:1-2/a/b/-", "http://www.foo.com:1/a/b/c/d", true),
+ imtest("http://*.foo.com:1-2/a/b/-", "http://www.foo.com:3/a/b/c/d", false),
+ imtest("http://*.foo.com:3-/a/b/-", "http://www.foo.com:1/a/b/c/d", false),
+ imtest("http://*.foo.com:3-/a/b/-", "http://www.foo.com:4-5/a/b/c/d", true),
+ imtest("http://*.foo.com:3-/a/b/-", "http://www.foo.com:3-3/a/b/c/d", true),
+ imtest("http://*.foo.com:3-99/a/b/-", "http://www.foo.com:55-100/a/b/c/d", false),
+ imtest("http://*.foo.com:-44/a/b/-", "http://www.foo.com:1/a/b/c/d", true),
+ imtest("http://*.foo.com:-44/a/b/-", "http://www.foo.com:1-10/a/b/c/d", true),
+ imtest("http://*.foo.com:-44/a/b/-", "http://www.foo.com:44/a/b/c/d", true),
+ imtest("http://*.foo.com:-44/a/b/-", "http://www.foo.com:45/a/b/c/d", false),
+ imtest("http://www.foo.com:70-90/a/b", "http://www.foo.com/a/b", true),
+ imtest("https://www.foo.com/a/b", "https://www.foo.com:80/a/b", false),
+ imtest("https://www.foo.com:70-90/a/b", "https://www.foo.com/a/b", false),
+ imtest("https://www.foo.com/a/b", "https://www.foo.com:443/a/b", true),
+ imtest("https://www.foo.com:200-500/a/b", "https://www.foo.com/a/b", true),
+ imtest("http://www.foo.com:*/a/b", "http://www.foo.com:1-12345/a/b", true),
+
+ // misc
+ imtest("https:*", "http://www.foo.com", false),
+ imtest("https:*", "http:*", false)
+ };
+
+ static Test[] actionImplies = {
+ actest("GET", "GET", true),
+ actest("GET", "POST", false),
+ actest("GET:", "PUT", false),
+ actest("GET:", "GET", true),
+ actest("GET,POST", "GET", true),
+ actest("GET,POST:", "GET", true),
+ actest("GET:X-Foo", "GET:x-foo", true),
+ actest("GET:X-Foo,X-bar", "GET:x-foo", true),
+ actest("GET:X-Foo", "GET:x-boo", false),
+ actest("GET:X-Foo,X-Bar", "GET:x-bar,x-foo", true),
+ actest("GET:X-Bar,X-Foo,X-Bar,Y-Foo", "GET:x-bar,x-foo", true),
+ actest("GET:*", "GET:x-bar,x-foo", true),
+ actest("*:*", "GET:x-bar,x-foo", true)
+ };
+
+ static Test[] equalityTests = {
+ eqtest("http://www.foo.com", "http://www.FOO.CoM", true),
+ eqtest("http://[fe80:0:0::]:1-2", "HTTP://[FE80::]:1-2", true),
+ eqtest("HTTP://1.2.3.5/A/B/C", "http://1.2.3.5/A/b/C", false),
+ eqtest("HTTP://1.2.3.5/A/B/C", "HTTP://1.2.3.5/A/b/C", false),
+ eqtest("http:*", "http:*", true),
+ eqtest("http://www.foo.com/a/b", "https://www.foo.com/a/b", false),
+ eqtest("http://w.foo.com", "http://w.foo.com/", false),
+ eqtest("http://*.foo.com", "http://*.foo.com", true),
+ eqtest("http://www.foo.com/a/b", "http://www.foo.com:80/a/b", true),
+ eqtest("http://www.foo.com/a/b", "http://www.foo.com:82/a/b", false),
+ eqtest("https://www.foo.com/a/b", "https://www.foo.com:443/a/b", true),
+ eqtest("https://www.foo.com/a/b", "https://www.foo.com:444/a/b", false),
+ };
+
+ static boolean failed = false;
+
+ public static void main(String args[]) throws Exception {
+ for (int i=0; i<pathImplies.length ; i++) {
+ URLImpliesTest test = (URLImpliesTest)pathImplies[i];
+ Exception caught = null;
+ boolean result = false;
+ try {
+ result = test.execute();
+ } catch (Exception e) {
+ caught = e;
+ e.printStackTrace();
+ }
+ if (!result) {
+ failed = true;
+ System.out.printf("path test %d failed: %s : %s\n", i, test.arg1,
+ test.arg2);
+ } else {
+ System.out.println ("path test " + i + " OK");
+ }
+
+ }
+
+ // new tests for functionality added in revision of API
+
+ for (int i=0; i<pathImplies2.length ; i++) {
+ URLImpliesTest test = (URLImpliesTest)pathImplies2[i];
+ Exception caught = null;
+ boolean result = false;
+ try {
+ result = test.execute();
+ } catch (Exception e) {
+ caught = e;
+ e.printStackTrace();
+ }
+ if (!result) {
+ failed = true;
+ System.out.printf("path2 test %d failed: %s : %s\n", i, test.arg1,
+ test.arg2);
+ } else {
+ System.out.println ("path2 test " + i + " OK");
+ }
+
+ }
+
+ for (int i=0; i<equalityTests.length ; i++) {
+ URLEqualityTest test = (URLEqualityTest)equalityTests[i];
+ Exception caught = null;
+ boolean result = false;
+ try {
+ result = test.execute();
+ } catch (Exception e) {
+ caught = e;
+ e.printStackTrace();
+ }
+ if (!result) {
+ failed = true;
+ System.out.printf("equality test %d failed: %s : %s\n", i, test.arg1,
+ test.arg2);
+ } else {
+ System.out.println ("equality test " + i + " OK");
+ }
+
+ }
+
+ for (int i=0; i<exceptionTests.length; i++) {
+ ExTest test = (ExTest)exceptionTests[i];
+ boolean result = test.execute();
+ if (!result) {
+ System.out.println ("test failed: " + test.arg);
+ failed = true;
+ } else {
+ System.out.println ("exception test " + i + " OK");
+ }
+ }
+
+ for (int i=0; i<actionImplies.length ; i++) {
+ ActionImpliesTest test = (ActionImpliesTest)actionImplies[i];
+ Exception caught = null;
+ boolean result = false;
+ try {
+ result = test.execute();
+ } catch (Exception e) {
+ caught = e;
+ e.printStackTrace();
+ }
+ if (!result) {
+ failed = true;
+ System.out.println ("test failed: " + test.arg1 + ": " +
+ test.arg2 + " Exception: " + caught);
+ }
+ System.out.println ("action test " + i + " OK");
+ }
+
+ serializationTest("http://www.foo.com/-", "GET,DELETE:*");
+ serializationTest("https://www.foo.com/-", "POST:X-Foo");
+ serializationTest("https:*", "*:*");
+ serializationTest("http://www.foo.com/a/b/s/", "POST:X-Foo");
+ serializationTest("http://www.foo.com/a/b/s/*", "POST:X-Foo");
+
+ if (failed) {
+ throw new RuntimeException("some tests failed");
+ }
+
+ }
+
+ static void serializationTest(String name, String actions)
+ throws Exception {
+
+ URLPermission out = new URLPermission(name, actions);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream o = new ObjectOutputStream(baos);
+ o.writeObject(out);
+ ByteArrayInputStream bain = new ByteArrayInputStream(baos.toByteArray());
+ ObjectInputStream i = new ObjectInputStream(bain);
+ URLPermission in = (URLPermission)i.readObject();
+ if (!in.equals(out)) {
+ System.out.println ("FAIL");
+ System.out.println ("in = " + in);
+ System.out.println ("out = " + out);
+ failed = true;
+ }
+ }
+}
diff --git a/jdk/test/java/net/HttpURLPermission/URLTest.java b/jdk/test/java/net/URLPermission/URLTest.java
similarity index 99%
rename from jdk/test/java/net/HttpURLPermission/URLTest.java
rename to jdk/test/java/net/URLPermission/URLTest.java
index 8aef8a1..8318c01 100644
--- a/jdk/test/java/net/HttpURLPermission/URLTest.java
+++ b/jdk/test/java/net/URLPermission/URLTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-import java.net.HttpURLPermission;
+import java.net.URLPermission;
/*
* Run the tests once without security manager and once with
*
diff --git a/jdk/test/java/net/HttpURLPermission/policy.3 b/jdk/test/java/net/URLPermission/policy.1
similarity index 90%
copy from jdk/test/java/net/HttpURLPermission/policy.3
copy to jdk/test/java/net/URLPermission/policy.1
index 5f036c0..5816cdb 100644
--- a/jdk/test/java/net/HttpURLPermission/policy.3
+++ b/jdk/test/java/net/URLPermission/policy.1
@@ -22,8 +22,8 @@
//
grant {
- permission java.net.HttpURLPermission "http://127.0.0.1:12567/a/b/-", "DELETE,GET:X-Foo,Y-Foo";
- permission java.net.HttpURLPermission "https://127.0.0.1:12568/a/c/-", "POST:*";
+ permission java.net.URLPermission "http://127.0.0.1:12567/foo.html", "GET:X-Foo,Z-Bar";
+ permission java.net.URLPermission "https://127.0.0.1:12568/foo.html", "POST:X-Fob,T-Bar";
// needed for HttpServer
permission "java.net.SocketPermission" "localhost:1024-", "listen,resolve,accept";
diff --git a/jdk/test/java/net/HttpURLPermission/policy.2 b/jdk/test/java/net/URLPermission/policy.2
similarity index 91%
rename from jdk/test/java/net/HttpURLPermission/policy.2
rename to jdk/test/java/net/URLPermission/policy.2
index ad86840..d1d774f 100644
--- a/jdk/test/java/net/HttpURLPermission/policy.2
+++ b/jdk/test/java/net/URLPermission/policy.2
@@ -22,8 +22,8 @@
//
grant {
- permission java.net.HttpURLPermission "http://127.0.0.1:12567/*", "GET:X-Foo";
- permission java.net.HttpURLPermission "https://127.0.0.1:12568/*", "POST:X-Fob";
+ permission java.net.URLPermission "http://127.0.0.1:12567/*", "GET:X-Foo";
+ permission java.net.URLPermission "https://127.0.0.1:12568/*", "POST:X-Fob";
// needed for HttpServer
permission "java.net.SocketPermission" "localhost:1024-", "listen,resolve,accept";
diff --git a/jdk/test/java/net/HttpURLPermission/policy.3 b/jdk/test/java/net/URLPermission/policy.3
similarity index 90%
rename from jdk/test/java/net/HttpURLPermission/policy.3
rename to jdk/test/java/net/URLPermission/policy.3
index 5f036c0..47f213f 100644
--- a/jdk/test/java/net/HttpURLPermission/policy.3
+++ b/jdk/test/java/net/URLPermission/policy.3
@@ -22,8 +22,8 @@
//
grant {
- permission java.net.HttpURLPermission "http://127.0.0.1:12567/a/b/-", "DELETE,GET:X-Foo,Y-Foo";
- permission java.net.HttpURLPermission "https://127.0.0.1:12568/a/c/-", "POST:*";
+ permission java.net.URLPermission "http://127.0.0.1:12567/a/b/-", "DELETE,GET:X-Foo,Y-Foo";
+ permission java.net.URLPermission "https://127.0.0.1:12568/a/c/-", "POST:*";
// needed for HttpServer
permission "java.net.SocketPermission" "localhost:1024-", "listen,resolve,accept";
diff --git a/jdk/test/java/nio/file/Files/BytesAndLines.java b/jdk/test/java/nio/file/Files/BytesAndLines.java
index 6c36c12..c3a1db7 100644
--- a/jdk/test/java/nio/file/Files/BytesAndLines.java
+++ b/jdk/test/java/nio/file/Files/BytesAndLines.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, 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
@@ -22,262 +22,318 @@
*/
/* @test
- * @bug 7006126 8020669 8024788
+ * @bug 7006126 8020669 8024788 8019526
* @build BytesAndLines PassThroughFileSystem
- * @run main BytesAndLines
+ * @run testng BytesAndLines
* @summary Unit test for methods for Files readAllBytes, readAllLines and
* and write methods.
*/
-import java.nio.file.*;
-import static java.nio.file.Files.*;
-import java.io.*;
-import java.util.*;
-import java.nio.charset.*;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.OpenOption;
+import static java.nio.file.StandardOpenOption.*;
+import java.nio.charset.Charset;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.MalformedInputException;
+import java.nio.charset.UnmappableCharacterException;
+import static java.nio.charset.StandardCharsets.*;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.Callable;
+import java.io.IOException;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+@Test(groups = "unit")
public class BytesAndLines {
- static final Random rand = new Random();
- static final Charset US_ASCII = Charset.forName("US-ASCII");
+ // data for text files
+ private static final String EN_STRING = "The quick brown fox jumps over the lazy dog";
+ private static final String JA_STRING = "\u65e5\u672c\u8a9e\u6587\u5b57\u5217";
- public static void main(String[] args) throws IOException {
- testReadAndWriteBytes();
- testReadLines();
- testWriteLines();
+ // used for random byte content
+ private static Random RAND = new Random();
+
+ // file used by most tests
+ private Path tmpfile;
+
+ @BeforeClass
+ void setup() throws IOException {
+ tmpfile = Files.createTempFile("blah", null);
+ }
+
+ @AfterClass
+ void cleanup() throws IOException {
+ Files.deleteIfExists(tmpfile);
}
/**
- * Test readAllBytes(Path) and write(Path, byte[], OpenOption...)
+ * Returns a byte[] of the given size with random content
*/
- static void testReadAndWriteBytes() throws IOException {
- // exercise methods with various sizes
- testReadAndWriteBytes(0);
- for (int i=0; i<100; i++) {
- testReadAndWriteBytes(rand.nextInt(32000));
- }
+ private byte[] genBytes(int size) {
+ byte[] arr = new byte[size];
+ RAND.nextBytes(arr);
+ return arr;
+ }
- // NullPointerException
+ /**
+ * Exercise NullPointerException
+ */
+ public void testNulls() {
Path file = Paths.get("foo");
+ byte[] bytes = new byte[100];
List<String> lines = Collections.emptyList();
- try {
- readAllBytes(null);
- throw new RuntimeException("NullPointerException expected");
- } catch (NullPointerException ignore) { }
- try {
- write(null, lines, Charset.defaultCharset());
- throw new RuntimeException("NullPointerException expected");
- } catch (NullPointerException ignore) { }
- try {
- write(file, null, Charset.defaultCharset());
- throw new RuntimeException("NullPointerException expected");
- } catch (NullPointerException ignore) { }
- try {
- write(file, lines, null);
- throw new RuntimeException("NullPointerException expected");
- } catch (NullPointerException ignore) { }
- try {
- write(file, lines, Charset.defaultCharset(), (OpenOption[])null);
- throw new RuntimeException("NullPointerException expected");
- } catch (NullPointerException ignore) { }
- try {
- OpenOption[] opts = { null };
- write(file, lines, Charset.defaultCharset(), opts);
- throw new RuntimeException("NullPointerException expected");
- } catch (NullPointerException ignore) { }
+ checkNullPointerException(() -> Files.readAllBytes(null));
+
+ checkNullPointerException(() -> Files.write(null, bytes));
+ checkNullPointerException(() -> Files.write(file, (byte[])null));
+ checkNullPointerException(() -> Files.write(file, bytes, (OpenOption[])null));
+ checkNullPointerException(() -> Files.write(file, bytes, new OpenOption[] { null } ));
+
+ checkNullPointerException(() -> Files.readAllLines(null));
+ checkNullPointerException(() -> Files.readAllLines(file, (Charset)null));
+ checkNullPointerException(() -> Files.readAllLines(null, Charset.defaultCharset()));
+
+ checkNullPointerException(() -> Files.write(null, lines));
+ checkNullPointerException(() -> Files.write(file, (List<String>)null));
+ checkNullPointerException(() -> Files.write(file, lines, (OpenOption[])null));
+ checkNullPointerException(() -> Files.write(file, lines, new OpenOption[] { null } ));
+ checkNullPointerException(() -> Files.write(null, lines, Charset.defaultCharset()));
+ checkNullPointerException(() -> Files.write(file, null, Charset.defaultCharset()));
+ checkNullPointerException(() -> Files.write(file, lines, (Charset)null));
+ checkNullPointerException(() -> Files.write(file, lines, Charset.defaultCharset(), (OpenOption[])null));
+ checkNullPointerException(() -> Files.write(file, lines, Charset.defaultCharset(), new OpenOption[] { null } ));
+ }
+
+ private void checkNullPointerException(Callable<?> c) {
+ try {
+ c.call();
+ fail("NullPointerException expected");
+ } catch (NullPointerException ignore) {
+ } catch (Exception e) {
+ fail(e + " not expected");
+ }
+ }
+
+ /**
+ * Exercise Files.readAllBytes(Path) on varied file sizes
+ */
+ public void testReadAllBytes() throws IOException {
+ int size = 0;
+ while (size <= 16*1024) {
+ testReadAllBytes(size);
+ size += 512;
+ }
+ }
+
+ private void testReadAllBytes(int size) throws IOException {
+ // write bytes to file (random content)
+ byte[] expected = genBytes(size);
+ Files.write(tmpfile, expected);
+
+ // check expected bytes are read
+ byte[] read = Files.readAllBytes(tmpfile);
+ assertTrue(Arrays.equals(read, expected), "Bytes read not the same as written");
+ }
+
+ /**
+ * Linux specific test to exercise Files.readAllBytes on /proc. This is
+ * special because file sizes are reported as 0 even though the file
+ * has content.
+ */
+ public void testReadAllBytesOnProcFS() throws IOException {
// read from procfs
if (System.getProperty("os.name").equals("Linux")) {
- // Refer to the Linux proc(5) man page for details about /proc/self/stat file
- // procfs reports it to be zero sized, even though data can be read from it
- String statFile = "/proc/self/stat";
- Path pathStat = Paths.get(statFile);
- byte[] data = Files.readAllBytes(pathStat);
+ Path statFile = Paths.get("/proc/self/stat");
+ byte[] data = Files.readAllBytes(statFile);
assertTrue(data.length > 0, "Files.readAllBytes('" + statFile + "') failed to read");
}
-
- // test readAllBytes on custom file system
- Path myfile = PassThroughFileSystem.create().getPath(file.toString());
- for (int size=0; size<=1024; size+=512) {
- byte[] b1 = new byte[size];
- rand.nextBytes(b1);
- Files.write(myfile, b1);
- byte[] b2 = Files.readAllBytes(myfile);
- assertTrue(Arrays.equals(b1, b2), "bytes not equal");
- }
}
-
- static void testReadAndWriteBytes(int size) throws IOException {
- Path path = createTempFile("blah", null);
+ /**
+ * Exercise Files.readAllBytes(Path) on custom file system. This is special
+ * because readAllBytes was originally implemented to use FileChannel
+ * and so may not be supported by custom file system providers.
+ */
+ public void testReadAllBytesOnCustomFS() throws IOException {
+ Path myfile = PassThroughFileSystem.create().getPath("myfile");
try {
- boolean append = rand.nextBoolean();
-
- byte[] b1 = new byte[size];
- rand.nextBytes(b1);
-
- byte[] b2 = (append) ? new byte[size] : new byte[0];
- rand.nextBytes(b2);
-
- // write method should create file if it doesn't exist
- if (rand.nextBoolean())
- delete(path);
-
- // write bytes to file
- Path target = write(path, b1);
- assertTrue(target==path, "Unexpected path");
- assertTrue(size(path) == b1.length, "Unexpected file size");
-
- // append bytes to file (might be 0 bytes)
- write(path, b2, StandardOpenOption.APPEND);
- assertTrue(size(path) == b1.length + b2.length, "Unexpected file size");
-
- // read entire file
- byte[] read = readAllBytes(path);
-
- // check bytes are correct
- byte[] expected;
- if (append) {
- expected = new byte[b1.length + b2.length];
- System.arraycopy(b1, 0, expected, 0, b1.length);
- System.arraycopy(b2, 0, expected, b1.length, b2.length);
- } else {
- expected = b1;
+ int size = 0;
+ while (size <= 1024) {
+ byte[] b1 = genBytes(size);
+ Files.write(myfile, b1);
+ byte[] b2 = Files.readAllBytes(myfile);
+ assertTrue(Arrays.equals(b1, b2), "bytes not equal");
+ size += 512;
}
- assertTrue(Arrays.equals(read, expected),
- "Bytes read not the same as bytes written");
} finally {
- deleteIfExists(path);
+ Files.deleteIfExists(myfile);
}
}
/**
- * Test readAllLines(Path,Charset)
+ * Exercise Files.write(Path, byte[], OpenOption...) on various sizes
*/
- static void testReadLines() throws IOException {
- Path tmpfile = createTempFile("blah", "txt");
- try {
- List<String> lines;
+ public void testWriteBytes() throws IOException {
+ int size = 0;
+ while (size < 16*1024) {
+ testWriteBytes(size, false);
+ testWriteBytes(size, true);
+ size += 512;
+ }
+ }
- // zero lines
- assertTrue(size(tmpfile) == 0, "File should be empty");
- lines = readAllLines(tmpfile, US_ASCII);
+ private void testWriteBytes(int size, boolean append) throws IOException {
+ byte[] bytes = genBytes(size);
+ Path result = Files.write(tmpfile, bytes);
+ assertTrue(result == tmpfile);
+ if (append) {
+ Files.write(tmpfile, bytes, APPEND);
+ assertTrue(Files.size(tmpfile) == size*2);
+ }
+
+ byte[] expected;
+ if (append) {
+ expected = new byte[size << 1];
+ System.arraycopy(bytes, 0, expected, 0, bytes.length);
+ System.arraycopy(bytes, 0, expected, bytes.length, bytes.length);
+ } else {
+ expected = bytes;
+ }
+
+ byte[] read = Files.readAllBytes(tmpfile);
+ assertTrue(Arrays.equals(read, expected), "Bytes read not the same as written");
+ }
+
+ /**
+ * Exercise Files.readAllLines(Path, Charset)
+ */
+ public void testReadAllLines() throws IOException {
+ // zero lines
+ Files.write(tmpfile, new byte[0]);
+ List<String> lines = Files.readAllLines(tmpfile, US_ASCII);
assertTrue(lines.isEmpty(), "No line expected");
- // one line
- byte[] hi = { (byte)'h', (byte)'i' };
- write(tmpfile, hi);
- lines = readAllLines(tmpfile, US_ASCII);
- assertTrue(lines.size() == 1, "One line expected");
- assertTrue(lines.get(0).equals("hi"), "'Hi' expected");
+ // one line
+ byte[] hi = { (byte)'h', (byte)'i' };
+ Files.write(tmpfile, hi);
+ lines = Files.readAllLines(tmpfile, US_ASCII);
+ assertTrue(lines.size() == 1, "One line expected");
+ assertTrue(lines.get(0).equals("hi"), "'Hi' expected");
- // two lines using platform's line separator
- List<String> expected = Arrays.asList("hi", "there");
- write(tmpfile, expected, US_ASCII);
- assertTrue(size(tmpfile) > 0, "File is empty");
- lines = readAllLines(tmpfile, US_ASCII);
- assertTrue(lines.equals(expected), "Unexpected lines");
+ // two lines using platform's line separator
+ List<String> expected = Arrays.asList("hi", "there");
+ Files.write(tmpfile, expected, US_ASCII);
+ assertTrue(Files.size(tmpfile) > 0, "File is empty");
+ lines = Files.readAllLines(tmpfile, US_ASCII);
+ assertTrue(lines.equals(expected), "Unexpected lines");
- // MalformedInputException
- byte[] bad = { (byte)0xff, (byte)0xff };
- write(tmpfile, bad);
- try {
- readAllLines(tmpfile, US_ASCII);
- throw new RuntimeException("MalformedInputException expected");
- } catch (MalformedInputException ignore) { }
+ // MalformedInputException
+ byte[] bad = { (byte)0xff, (byte)0xff };
+ Files.write(tmpfile, bad);
+ try {
+ Files.readAllLines(tmpfile, US_ASCII);
+ fail("MalformedInputException expected");
+ } catch (MalformedInputException ignore) { }
+ }
-
- // NullPointerException
- try {
- readAllLines(null, US_ASCII);
- throw new RuntimeException("NullPointerException expected");
- } catch (NullPointerException ignore) { }
- try {
- readAllLines(tmpfile, null);
- throw new RuntimeException("NullPointerException expected");
- } catch (NullPointerException ignore) { }
-
- // read from procfs
- if (System.getProperty("os.name").equals("Linux")) {
- // Refer to the Linux proc(5) man page for details about /proc/self/status file
- // procfs reports this file to be zero sized, even though data can be read from it
- String statusFile = "/proc/self/status";
- Path pathStatus = Paths.get(statusFile);
- lines = Files.readAllLines(pathStatus, US_ASCII);
- assertTrue(lines.size() > 0, "Files.readAllLines('" + pathStatus + "') failed to read");
- }
-
- } finally {
- delete(tmpfile);
+ /**
+ * Linux specific test to exercise Files.readAllLines(Path) on /proc. This
+ * is special because file sizes are reported as 0 even though the file
+ * has content.
+ */
+ public void testReadAllLinesOnProcFS() throws IOException {
+ if (System.getProperty("os.name").equals("Linux")) {
+ Path statFile = Paths.get("/proc/self/stat");
+ List<String> lines = Files.readAllLines(statFile);
+ assertTrue(lines.size() > 0, "Files.readAllLines('" + statFile + "') failed to read");
}
}
/**
- * Test write(Path,Iterable<? extends CharSequence>,Charset,OpenOption...)
+ * Exercise Files.readAllLines(Path)
*/
- static void testWriteLines() throws IOException {
- Path tmpfile = createTempFile("blah", "txt");
- try {
- // write method should create file if it doesn't exist
- if (rand.nextBoolean())
- delete(tmpfile);
+ public void testReadAllLinesUTF8() throws IOException {
+ Files.write(tmpfile, encodeAsUTF8(EN_STRING + "\n" + JA_STRING));
- // zero lines
- Path result = write(tmpfile, Collections.<String>emptyList(), US_ASCII);
- assert(size(tmpfile) == 0);
- assert(result == tmpfile);
+ List<String> lines = Files.readAllLines(tmpfile);
+ assertTrue(lines.size() == 2, "Read " + lines.size() + " lines instead of 2");
+ assertTrue(lines.get(0).equals(EN_STRING));
+ assertTrue(lines.get(1).equals(JA_STRING));
- // two lines
- List<String> lines = Arrays.asList("hi", "there");
- write(tmpfile, lines, US_ASCII);
- List<String> actual = readAllLines(tmpfile, US_ASCII);
- assertTrue(actual.equals(lines), "Unexpected lines");
-
- // append two lines
- write(tmpfile, lines, US_ASCII, StandardOpenOption.APPEND);
- List<String> expected = new ArrayList<String>();
- expected.addAll(lines);
- expected.addAll(lines);
- assertTrue(expected.size() == 4, "List should have 4 elements");
- actual = readAllLines(tmpfile, US_ASCII);
- assertTrue(actual.equals(expected), "Unexpected lines");
-
- // UnmappableCharacterException
- try {
- String s = "\u00A0\u00A1";
- write(tmpfile, Arrays.asList(s), US_ASCII);
- throw new RuntimeException("UnmappableCharacterException expected");
- } catch (UnmappableCharacterException ignore) { }
-
- // NullPointerException
- try {
- write(null, lines, US_ASCII);
- throw new RuntimeException("NullPointerException expected");
- } catch (NullPointerException ignore) { }
- try {
- write(tmpfile, null, US_ASCII);
- throw new RuntimeException("NullPointerException expected");
- } catch (NullPointerException ignore) { }
- try {
- write(tmpfile, lines, null);
- throw new RuntimeException("NullPointerException expected");
- } catch (NullPointerException ignore) { }
- try {
- write(tmpfile, lines, US_ASCII, (OpenOption[])null);
- throw new RuntimeException("NullPointerException expected");
- } catch (NullPointerException ignore) { }
- try {
- OpenOption[] opts = { (OpenOption)null };
- write(tmpfile, lines, US_ASCII, opts);
- throw new RuntimeException("NullPointerException expected");
- } catch (NullPointerException ignore) { }
-
- } finally {
- delete(tmpfile);
- }
+ // a sample of malformed sequences
+ testReadAllLinesMalformedUTF8((byte)0xFF); // one-byte sequence
+ testReadAllLinesMalformedUTF8((byte)0xC0, (byte)0x80); // invalid first byte
+ testReadAllLinesMalformedUTF8((byte)0xC2, (byte)0x00); // invalid second byte
}
- static void assertTrue(boolean expr, String errmsg) {
- if (!expr)
- throw new RuntimeException(errmsg);
+ private byte[] encodeAsUTF8(String s) throws CharacterCodingException {
+ // not using s.getBytes here so as to catch unmappable characters
+ ByteBuffer bb = UTF_8.newEncoder().encode(CharBuffer.wrap(s));
+ byte[] result = new byte[bb.limit()];
+ bb.get(result);
+ assertTrue(bb.remaining() == 0);
+ return result;
+ }
+
+ private void testReadAllLinesMalformedUTF8(byte... bytes) throws IOException {
+ Files.write(tmpfile, bytes);
+ try {
+ Files.readAllLines(tmpfile);
+ fail("MalformedInputException expected");
+ } catch (MalformedInputException ignore) { }
+ }
+
+ /**
+ * Exercise Files.write(Path, Iterable<? extends CharSequence>, Charset, OpenOption...)
+ */
+ public void testWriteLines() throws IOException {
+ // zero lines
+ Path result = Files.write(tmpfile, Collections.<String>emptyList(), US_ASCII);
+ assert(Files.size(tmpfile) == 0);
+ assert(result == tmpfile);
+
+ // two lines
+ List<String> lines = Arrays.asList("hi", "there");
+ Files.write(tmpfile, lines, US_ASCII);
+ List<String> actual = Files.readAllLines(tmpfile, US_ASCII);
+ assertTrue(actual.equals(lines), "Unexpected lines");
+
+ // append two lines
+ Files.write(tmpfile, lines, US_ASCII, APPEND);
+ List<String> expected = new ArrayList<>();
+ expected.addAll(lines);
+ expected.addAll(lines);
+ assertTrue(expected.size() == 4, "List should have 4 elements");
+ actual = Files.readAllLines(tmpfile, US_ASCII);
+ assertTrue(actual.equals(expected), "Unexpected lines");
+
+ // UnmappableCharacterException
+ try {
+ String s = "\u00A0\u00A1";
+ Files.write(tmpfile, Arrays.asList(s), US_ASCII);
+ fail("UnmappableCharacterException expected");
+ } catch (UnmappableCharacterException ignore) { }
+ }
+
+ /**
+ * Exercise Files.write(Path, Iterable<? extends CharSequence>, OpenOption...)
+ */
+ public void testWriteLinesUTF8() throws IOException {
+ List<String> lines = Arrays.asList(EN_STRING, JA_STRING);
+ Files.write(tmpfile, lines);
+ List<String> actual = Files.readAllLines(tmpfile, UTF_8);
+ assertTrue(actual.equals(lines), "Unexpected lines");
}
}
diff --git a/jdk/test/java/nio/file/Files/StreamTest.java b/jdk/test/java/nio/file/Files/StreamTest.java
index 5304492..839b11f 100644
--- a/jdk/test/java/nio/file/Files/StreamTest.java
+++ b/jdk/test/java/nio/file/Files/StreamTest.java
@@ -22,11 +22,10 @@
*/
/* @test
- * @bug 8006884
- * @summary Unit test for java.nio.file.Files
- * @library ..
+ * @bug 8006884 8019526
* @build PassThroughFileSystem FaultyFileSystem
* @run testng StreamTest
+ * @summary Unit test for java.nio.file.Files methods that return a Stream
*/
import java.io.IOException;
@@ -43,11 +42,13 @@
import java.nio.file.Paths;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Arrays;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.TreeSet;
+import java.util.concurrent.Callable;
import java.util.function.BiPredicate;
import java.util.stream.Stream;
import java.util.stream.Collectors;
@@ -316,56 +317,80 @@
try {
// zero lines
assertTrue(Files.size(tmpfile) == 0, "File should be empty");
+ try (Stream<String> s = Files.lines(tmpfile)) {
+ checkLines(s, Collections.emptyList());
+ }
try (Stream<String> s = Files.lines(tmpfile, US_ASCII)) {
- assertEquals(s.mapToInt(l -> 1).reduce(0, Integer::sum), 0, "No line expected");
+ checkLines(s, Collections.emptyList());
}
// one line
- byte[] hi = { (byte)'h', (byte)'i' };
- Files.write(tmpfile, hi);
+ List<String> oneLine = Arrays.asList("hi");
+ Files.write(tmpfile, oneLine, US_ASCII);
+ try (Stream<String> s = Files.lines(tmpfile)) {
+ checkLines(s, oneLine);
+ }
try (Stream<String> s = Files.lines(tmpfile, US_ASCII)) {
- List<String> lines = s.collect(Collectors.toList());
- assertTrue(lines.size() == 1, "One line expected");
- assertTrue(lines.get(0).equals("hi"), "'Hi' expected");
+ checkLines(s, oneLine);
}
// two lines using platform's line separator
- List<String> expected = Arrays.asList("hi", "there");
- Files.write(tmpfile, expected, US_ASCII);
- assertTrue(Files.size(tmpfile) > 0, "File is empty");
+ List<String> twoLines = Arrays.asList("hi", "there");
+ Files.write(tmpfile, twoLines, US_ASCII);
+ try (Stream<String> s = Files.lines(tmpfile)) {
+ checkLines(s, twoLines);
+ }
try (Stream<String> s = Files.lines(tmpfile, US_ASCII)) {
- List<String> lines = s.collect(Collectors.toList());
- assertTrue(lines.equals(expected), "Unexpected lines");
+ checkLines(s, twoLines);
}
// MalformedInputException
byte[] bad = { (byte)0xff, (byte)0xff };
Files.write(tmpfile, bad);
+ try (Stream<String> s = Files.lines(tmpfile)) {
+ checkMalformedInputException(s);
+ }
try (Stream<String> s = Files.lines(tmpfile, US_ASCII)) {
- try {
- List<String> lines = s.collect(Collectors.toList());
- throw new RuntimeException("UncheckedIOException expected");
- } catch (UncheckedIOException ex) {
- assertTrue(ex.getCause() instanceof MalformedInputException,
- "MalformedInputException expected");
- }
+ checkMalformedInputException(s);
}
// NullPointerException
- try {
- Files.lines(null, US_ASCII);
- throw new RuntimeException("NullPointerException expected");
- } catch (NullPointerException ignore) { }
- try {
- Files.lines(tmpfile, null);
- throw new RuntimeException("NullPointerException expected");
- } catch (NullPointerException ignore) { }
+ checkNullPointerException(() -> Files.lines(null));
+ checkNullPointerException(() -> Files.lines(null, US_ASCII));
+ checkNullPointerException(() -> Files.lines(tmpfile, null));
} finally {
Files.delete(tmpfile);
}
}
+ private void checkLines(Stream<String> s, List<String> expected) {
+ List<String> lines = s.collect(Collectors.toList());
+ assertTrue(lines.size() == expected.size(), "Unexpected number of lines");
+ assertTrue(lines.equals(expected), "Unexpected content");
+ }
+
+ private void checkMalformedInputException(Stream<String> s) {
+ try {
+ List<String> lines = s.collect(Collectors.toList());
+ fail("UncheckedIOException expected");
+ } catch (UncheckedIOException ex) {
+ IOException cause = ex.getCause();
+ assertTrue(cause instanceof MalformedInputException,
+ "MalformedInputException expected");
+ }
+ }
+
+ private void checkNullPointerException(Callable<?> c) {
+ try {
+ c.call();
+ fail("NullPointerException expected");
+ } catch (NullPointerException ignore) {
+ } catch (Exception e) {
+ fail(e + " not expected");
+ }
+ }
+
public void testDirectoryIteratorException() throws IOException {
Path dir = testFolder.resolve("dir2");
Path trigger = dir.resolve("DirectoryIteratorException");
diff --git a/jdk/test/java/time/tck/java/time/TCKDayOfWeek.java b/jdk/test/java/time/tck/java/time/TCKDayOfWeek.java
index 3bf782ba..e3f0e71 100644
--- a/jdk/test/java/time/tck/java/time/TCKDayOfWeek.java
+++ b/jdk/test/java/time/tck/java/time/TCKDayOfWeek.java
@@ -77,6 +77,7 @@
import java.time.temporal.Temporal;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.util.ArrayList;
import java.util.Arrays;
@@ -215,13 +216,13 @@
@DataProvider(name="query")
Object[][] data_query() {
return new Object[][] {
- {DayOfWeek.FRIDAY, TemporalQuery.chronology(), null},
- {DayOfWeek.FRIDAY, TemporalQuery.zoneId(), null},
- {DayOfWeek.FRIDAY, TemporalQuery.precision(), ChronoUnit.DAYS},
- {DayOfWeek.FRIDAY, TemporalQuery.zone(), null},
- {DayOfWeek.FRIDAY, TemporalQuery.offset(), null},
- {DayOfWeek.FRIDAY, TemporalQuery.localDate(), null},
- {DayOfWeek.FRIDAY, TemporalQuery.localTime(), null},
+ {DayOfWeek.FRIDAY, TemporalQueries.chronology(), null},
+ {DayOfWeek.FRIDAY, TemporalQueries.zoneId(), null},
+ {DayOfWeek.FRIDAY, TemporalQueries.precision(), ChronoUnit.DAYS},
+ {DayOfWeek.FRIDAY, TemporalQueries.zone(), null},
+ {DayOfWeek.FRIDAY, TemporalQueries.offset(), null},
+ {DayOfWeek.FRIDAY, TemporalQueries.localDate(), null},
+ {DayOfWeek.FRIDAY, TemporalQueries.localTime(), null},
};
}
diff --git a/jdk/test/java/time/tck/java/time/TCKInstant.java b/jdk/test/java/time/tck/java/time/TCKInstant.java
index bf6ac9e..ee3898e 100644
--- a/jdk/test/java/time/tck/java/time/TCKInstant.java
+++ b/jdk/test/java/time/tck/java/time/TCKInstant.java
@@ -97,6 +97,7 @@
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
@@ -401,13 +402,13 @@
@DataProvider(name="query")
Object[][] data_query() {
return new Object[][] {
- {TEST_12345_123456789, TemporalQuery.chronology(), null},
- {TEST_12345_123456789, TemporalQuery.zoneId(), null},
- {TEST_12345_123456789, TemporalQuery.precision(), NANOS},
- {TEST_12345_123456789, TemporalQuery.zone(), null},
- {TEST_12345_123456789, TemporalQuery.offset(), null},
- {TEST_12345_123456789, TemporalQuery.localDate(), null},
- {TEST_12345_123456789, TemporalQuery.localTime(), null},
+ {TEST_12345_123456789, TemporalQueries.chronology(), null},
+ {TEST_12345_123456789, TemporalQueries.zoneId(), null},
+ {TEST_12345_123456789, TemporalQueries.precision(), NANOS},
+ {TEST_12345_123456789, TemporalQueries.zone(), null},
+ {TEST_12345_123456789, TemporalQueries.offset(), null},
+ {TEST_12345_123456789, TemporalQueries.localDate(), null},
+ {TEST_12345_123456789, TemporalQueries.localTime(), null},
};
}
diff --git a/jdk/test/java/time/tck/java/time/TCKLocalDate.java b/jdk/test/java/time/tck/java/time/TCKLocalDate.java
index cb41a70..02e2f07 100644
--- a/jdk/test/java/time/tck/java/time/TCKLocalDate.java
+++ b/jdk/test/java/time/tck/java/time/TCKLocalDate.java
@@ -113,6 +113,7 @@
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
@@ -693,13 +694,13 @@
@DataProvider(name="query")
Object[][] data_query() {
return new Object[][] {
- {TEST_2007_07_15, TemporalQuery.chronology(), IsoChronology.INSTANCE},
- {TEST_2007_07_15, TemporalQuery.zoneId(), null},
- {TEST_2007_07_15, TemporalQuery.precision(), ChronoUnit.DAYS},
- {TEST_2007_07_15, TemporalQuery.zone(), null},
- {TEST_2007_07_15, TemporalQuery.offset(), null},
- {TEST_2007_07_15, TemporalQuery.localDate(), TEST_2007_07_15},
- {TEST_2007_07_15, TemporalQuery.localTime(), null},
+ {TEST_2007_07_15, TemporalQueries.chronology(), IsoChronology.INSTANCE},
+ {TEST_2007_07_15, TemporalQueries.zoneId(), null},
+ {TEST_2007_07_15, TemporalQueries.precision(), ChronoUnit.DAYS},
+ {TEST_2007_07_15, TemporalQueries.zone(), null},
+ {TEST_2007_07_15, TemporalQueries.offset(), null},
+ {TEST_2007_07_15, TemporalQueries.localDate(), TEST_2007_07_15},
+ {TEST_2007_07_15, TemporalQueries.localTime(), null},
};
}
diff --git a/jdk/test/java/time/tck/java/time/TCKLocalDateTime.java b/jdk/test/java/time/tck/java/time/TCKLocalDateTime.java
index 62b53b3..6303f5a 100644
--- a/jdk/test/java/time/tck/java/time/TCKLocalDateTime.java
+++ b/jdk/test/java/time/tck/java/time/TCKLocalDateTime.java
@@ -134,6 +134,7 @@
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.util.ArrayList;
@@ -1017,13 +1018,13 @@
@DataProvider(name="query")
Object[][] data_query() {
return new Object[][] {
- {TEST_2007_07_15_12_30_40_987654321, TemporalQuery.chronology(), IsoChronology.INSTANCE},
- {TEST_2007_07_15_12_30_40_987654321, TemporalQuery.zoneId(), null},
- {TEST_2007_07_15_12_30_40_987654321, TemporalQuery.precision(), ChronoUnit.NANOS},
- {TEST_2007_07_15_12_30_40_987654321, TemporalQuery.zone(), null},
- {TEST_2007_07_15_12_30_40_987654321, TemporalQuery.offset(), null},
- {TEST_2007_07_15_12_30_40_987654321, TemporalQuery.localDate(), LocalDate.of(2007, 7, 15)},
- {TEST_2007_07_15_12_30_40_987654321, TemporalQuery.localTime(), LocalTime.of(12, 30, 40, 987654321)},
+ {TEST_2007_07_15_12_30_40_987654321, TemporalQueries.chronology(), IsoChronology.INSTANCE},
+ {TEST_2007_07_15_12_30_40_987654321, TemporalQueries.zoneId(), null},
+ {TEST_2007_07_15_12_30_40_987654321, TemporalQueries.precision(), ChronoUnit.NANOS},
+ {TEST_2007_07_15_12_30_40_987654321, TemporalQueries.zone(), null},
+ {TEST_2007_07_15_12_30_40_987654321, TemporalQueries.offset(), null},
+ {TEST_2007_07_15_12_30_40_987654321, TemporalQueries.localDate(), LocalDate.of(2007, 7, 15)},
+ {TEST_2007_07_15_12_30_40_987654321, TemporalQueries.localTime(), LocalTime.of(12, 30, 40, 987654321)},
};
}
diff --git a/jdk/test/java/time/tck/java/time/TCKLocalTime.java b/jdk/test/java/time/tck/java/time/TCKLocalTime.java
index bac3f85..704533a 100644
--- a/jdk/test/java/time/tck/java/time/TCKLocalTime.java
+++ b/jdk/test/java/time/tck/java/time/TCKLocalTime.java
@@ -116,6 +116,7 @@
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
@@ -143,7 +144,7 @@
private static final TemporalUnit[] INVALID_UNITS;
static {
EnumSet<ChronoUnit> set = EnumSet.range(DAYS, FOREVER);
- INVALID_UNITS = (TemporalUnit[]) set.toArray(new TemporalUnit[set.size()]);
+ INVALID_UNITS = set.toArray(new TemporalUnit[set.size()]);
}
@BeforeMethod
@@ -654,13 +655,13 @@
@DataProvider(name="query")
Object[][] data_query() {
return new Object[][] {
- {TEST_12_30_40_987654321, TemporalQuery.chronology(), null},
- {TEST_12_30_40_987654321, TemporalQuery.zoneId(), null},
- {TEST_12_30_40_987654321, TemporalQuery.precision(), ChronoUnit.NANOS},
- {TEST_12_30_40_987654321, TemporalQuery.zone(), null},
- {TEST_12_30_40_987654321, TemporalQuery.offset(), null},
- {TEST_12_30_40_987654321, TemporalQuery.localDate(), null},
- {TEST_12_30_40_987654321, TemporalQuery.localTime(), TEST_12_30_40_987654321},
+ {TEST_12_30_40_987654321, TemporalQueries.chronology(), null},
+ {TEST_12_30_40_987654321, TemporalQueries.zoneId(), null},
+ {TEST_12_30_40_987654321, TemporalQueries.precision(), ChronoUnit.NANOS},
+ {TEST_12_30_40_987654321, TemporalQueries.zone(), null},
+ {TEST_12_30_40_987654321, TemporalQueries.offset(), null},
+ {TEST_12_30_40_987654321, TemporalQueries.localDate(), null},
+ {TEST_12_30_40_987654321, TemporalQueries.localTime(), TEST_12_30_40_987654321},
};
}
diff --git a/jdk/test/java/time/tck/java/time/TCKMonth.java b/jdk/test/java/time/tck/java/time/TCKMonth.java
index 3bff8c9..df879e7 100644
--- a/jdk/test/java/time/tck/java/time/TCKMonth.java
+++ b/jdk/test/java/time/tck/java/time/TCKMonth.java
@@ -73,6 +73,7 @@
import java.time.temporal.JulianFields;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.util.ArrayList;
import java.util.Arrays;
@@ -207,13 +208,13 @@
@DataProvider(name="query")
Object[][] data_query() {
return new Object[][] {
- {Month.JUNE, TemporalQuery.chronology(), IsoChronology.INSTANCE},
- {Month.JUNE, TemporalQuery.zoneId(), null},
- {Month.JUNE, TemporalQuery.precision(), ChronoUnit.MONTHS},
- {Month.JUNE, TemporalQuery.zone(), null},
- {Month.JUNE, TemporalQuery.offset(), null},
- {Month.JUNE, TemporalQuery.localDate(), null},
- {Month.JUNE, TemporalQuery.localTime(), null},
+ {Month.JUNE, TemporalQueries.chronology(), IsoChronology.INSTANCE},
+ {Month.JUNE, TemporalQueries.zoneId(), null},
+ {Month.JUNE, TemporalQueries.precision(), ChronoUnit.MONTHS},
+ {Month.JUNE, TemporalQueries.zone(), null},
+ {Month.JUNE, TemporalQueries.offset(), null},
+ {Month.JUNE, TemporalQueries.localDate(), null},
+ {Month.JUNE, TemporalQueries.localTime(), null},
};
}
diff --git a/jdk/test/java/time/tck/java/time/TCKMonthDay.java b/jdk/test/java/time/tck/java/time/TCKMonthDay.java
index e9b1730..99a7116 100644
--- a/jdk/test/java/time/tck/java/time/TCKMonthDay.java
+++ b/jdk/test/java/time/tck/java/time/TCKMonthDay.java
@@ -86,6 +86,7 @@
import java.time.temporal.JulianFields;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.util.ArrayList;
import java.util.Arrays;
@@ -428,13 +429,13 @@
@DataProvider(name="query")
Object[][] data_query() {
return new Object[][] {
- {TEST_07_15, TemporalQuery.chronology(), IsoChronology.INSTANCE},
- {TEST_07_15, TemporalQuery.zoneId(), null},
- {TEST_07_15, TemporalQuery.precision(), null},
- {TEST_07_15, TemporalQuery.zone(), null},
- {TEST_07_15, TemporalQuery.offset(), null},
- {TEST_07_15, TemporalQuery.localDate(), null},
- {TEST_07_15, TemporalQuery.localTime(), null},
+ {TEST_07_15, TemporalQueries.chronology(), IsoChronology.INSTANCE},
+ {TEST_07_15, TemporalQueries.zoneId(), null},
+ {TEST_07_15, TemporalQueries.precision(), null},
+ {TEST_07_15, TemporalQueries.zone(), null},
+ {TEST_07_15, TemporalQueries.offset(), null},
+ {TEST_07_15, TemporalQueries.localDate(), null},
+ {TEST_07_15, TemporalQueries.localTime(), null},
};
}
diff --git a/jdk/test/java/time/tck/java/time/TCKOffsetDateTime.java b/jdk/test/java/time/tck/java/time/TCKOffsetDateTime.java
index 0ced814..b77b7a8 100644
--- a/jdk/test/java/time/tck/java/time/TCKOffsetDateTime.java
+++ b/jdk/test/java/time/tck/java/time/TCKOffsetDateTime.java
@@ -132,6 +132,7 @@
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.util.ArrayList;
@@ -635,13 +636,13 @@
@DataProvider(name="query")
Object[][] data_query() {
return new Object[][] {
- {TEST_2008_6_30_11_30_59_000000500, TemporalQuery.chronology(), IsoChronology.INSTANCE},
- {TEST_2008_6_30_11_30_59_000000500, TemporalQuery.zoneId(), null},
- {TEST_2008_6_30_11_30_59_000000500, TemporalQuery.precision(), ChronoUnit.NANOS},
- {TEST_2008_6_30_11_30_59_000000500, TemporalQuery.zone(), OFFSET_PONE},
- {TEST_2008_6_30_11_30_59_000000500, TemporalQuery.offset(), OFFSET_PONE},
- {TEST_2008_6_30_11_30_59_000000500, TemporalQuery.localDate(), LocalDate.of(2008, 6, 30)},
- {TEST_2008_6_30_11_30_59_000000500, TemporalQuery.localTime(), LocalTime.of(11, 30, 59, 500)},
+ {TEST_2008_6_30_11_30_59_000000500, TemporalQueries.chronology(), IsoChronology.INSTANCE},
+ {TEST_2008_6_30_11_30_59_000000500, TemporalQueries.zoneId(), null},
+ {TEST_2008_6_30_11_30_59_000000500, TemporalQueries.precision(), ChronoUnit.NANOS},
+ {TEST_2008_6_30_11_30_59_000000500, TemporalQueries.zone(), OFFSET_PONE},
+ {TEST_2008_6_30_11_30_59_000000500, TemporalQueries.offset(), OFFSET_PONE},
+ {TEST_2008_6_30_11_30_59_000000500, TemporalQueries.localDate(), LocalDate.of(2008, 6, 30)},
+ {TEST_2008_6_30_11_30_59_000000500, TemporalQueries.localTime(), LocalTime.of(11, 30, 59, 500)},
};
}
diff --git a/jdk/test/java/time/tck/java/time/TCKOffsetTime.java b/jdk/test/java/time/tck/java/time/TCKOffsetTime.java
index 5bc2312..d373be4 100644
--- a/jdk/test/java/time/tck/java/time/TCKOffsetTime.java
+++ b/jdk/test/java/time/tck/java/time/TCKOffsetTime.java
@@ -115,6 +115,7 @@
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.util.ArrayList;
@@ -605,13 +606,13 @@
@DataProvider(name="query")
Object[][] data_query() {
return new Object[][] {
- {TEST_11_30_59_500_PONE, TemporalQuery.chronology(), null},
- {TEST_11_30_59_500_PONE, TemporalQuery.zoneId(), null},
- {TEST_11_30_59_500_PONE, TemporalQuery.precision(), ChronoUnit.NANOS},
- {TEST_11_30_59_500_PONE, TemporalQuery.zone(), OFFSET_PONE},
- {TEST_11_30_59_500_PONE, TemporalQuery.offset(), OFFSET_PONE},
- {TEST_11_30_59_500_PONE, TemporalQuery.localDate(), null},
- {TEST_11_30_59_500_PONE, TemporalQuery.localTime(), LocalTime.of(11, 30, 59, 500)},
+ {TEST_11_30_59_500_PONE, TemporalQueries.chronology(), null},
+ {TEST_11_30_59_500_PONE, TemporalQueries.zoneId(), null},
+ {TEST_11_30_59_500_PONE, TemporalQueries.precision(), ChronoUnit.NANOS},
+ {TEST_11_30_59_500_PONE, TemporalQueries.zone(), OFFSET_PONE},
+ {TEST_11_30_59_500_PONE, TemporalQueries.offset(), OFFSET_PONE},
+ {TEST_11_30_59_500_PONE, TemporalQueries.localDate(), null},
+ {TEST_11_30_59_500_PONE, TemporalQueries.localTime(), LocalTime.of(11, 30, 59, 500)},
};
}
diff --git a/jdk/test/java/time/tck/java/time/TCKYear.java b/jdk/test/java/time/tck/java/time/TCKYear.java
index 59d464a..75ed80e 100644
--- a/jdk/test/java/time/tck/java/time/TCKYear.java
+++ b/jdk/test/java/time/tck/java/time/TCKYear.java
@@ -99,6 +99,7 @@
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
@@ -411,13 +412,13 @@
@DataProvider(name="query")
Object[][] data_query() {
return new Object[][] {
- {TEST_2008, TemporalQuery.chronology(), IsoChronology.INSTANCE},
- {TEST_2008, TemporalQuery.zoneId(), null},
- {TEST_2008, TemporalQuery.precision(), ChronoUnit.YEARS},
- {TEST_2008, TemporalQuery.zone(), null},
- {TEST_2008, TemporalQuery.offset(), null},
- {TEST_2008, TemporalQuery.localDate(), null},
- {TEST_2008, TemporalQuery.localTime(), null},
+ {TEST_2008, TemporalQueries.chronology(), IsoChronology.INSTANCE},
+ {TEST_2008, TemporalQueries.zoneId(), null},
+ {TEST_2008, TemporalQueries.precision(), ChronoUnit.YEARS},
+ {TEST_2008, TemporalQueries.zone(), null},
+ {TEST_2008, TemporalQueries.offset(), null},
+ {TEST_2008, TemporalQueries.localDate(), null},
+ {TEST_2008, TemporalQueries.localTime(), null},
};
}
@@ -596,7 +597,7 @@
}
@Test(dataProvider="plus_long_TemporalUnit")
- public void test_plus_long_TemporalUnit(Year base, long amount, TemporalUnit unit, Year expectedYear, Class expectedEx) {
+ public void test_plus_long_TemporalUnit(Year base, long amount, TemporalUnit unit, Year expectedYear, Class<?> expectedEx) {
if (expectedEx == null) {
assertEquals(base.plus(amount, unit), expectedYear);
} else {
@@ -728,7 +729,7 @@
}
@Test(dataProvider="minus_long_TemporalUnit")
- public void test_minus_long_TemporalUnit(Year base, long amount, TemporalUnit unit, Year expectedYear, Class expectedEx) {
+ public void test_minus_long_TemporalUnit(Year base, long amount, TemporalUnit unit, Year expectedYear, Class<?> expectedEx) {
if (expectedEx == null) {
assertEquals(base.minus(amount, unit), expectedYear);
} else {
diff --git a/jdk/test/java/time/tck/java/time/TCKYearMonth.java b/jdk/test/java/time/tck/java/time/TCKYearMonth.java
index bb16839..e922f72 100644
--- a/jdk/test/java/time/tck/java/time/TCKYearMonth.java
+++ b/jdk/test/java/time/tck/java/time/TCKYearMonth.java
@@ -100,6 +100,7 @@
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.time.temporal.UnsupportedTemporalTypeException;
@@ -476,13 +477,13 @@
@DataProvider(name="query")
Object[][] data_query() {
return new Object[][] {
- {TEST_2008_06, TemporalQuery.chronology(), IsoChronology.INSTANCE},
- {TEST_2008_06, TemporalQuery.zoneId(), null},
- {TEST_2008_06, TemporalQuery.precision(), ChronoUnit.MONTHS},
- {TEST_2008_06, TemporalQuery.zone(), null},
- {TEST_2008_06, TemporalQuery.offset(), null},
- {TEST_2008_06, TemporalQuery.localDate(), null},
- {TEST_2008_06, TemporalQuery.localTime(), null},
+ {TEST_2008_06, TemporalQueries.chronology(), IsoChronology.INSTANCE},
+ {TEST_2008_06, TemporalQueries.zoneId(), null},
+ {TEST_2008_06, TemporalQueries.precision(), ChronoUnit.MONTHS},
+ {TEST_2008_06, TemporalQueries.zone(), null},
+ {TEST_2008_06, TemporalQueries.offset(), null},
+ {TEST_2008_06, TemporalQueries.localDate(), null},
+ {TEST_2008_06, TemporalQueries.localTime(), null},
};
}
@@ -768,7 +769,7 @@
}
@Test(dataProvider="plus_long_TemporalUnit")
- public void test_plus_long_TemporalUnit(YearMonth base, long amount, TemporalUnit unit, YearMonth expectedYearMonth, Class expectedEx) {
+ public void test_plus_long_TemporalUnit(YearMonth base, long amount, TemporalUnit unit, YearMonth expectedYearMonth, Class<?> expectedEx) {
if (expectedEx == null) {
assertEquals(base.plus(amount, unit), expectedYearMonth);
} else {
@@ -820,7 +821,7 @@
}
@Test(dataProvider="plus_TemporalAmount")
- public void test_plus_TemporalAmount(YearMonth base, TemporalAmount temporalAmount, YearMonth expectedYearMonth, Class expectedEx) {
+ public void test_plus_TemporalAmount(YearMonth base, TemporalAmount temporalAmount, YearMonth expectedYearMonth, Class<?> expectedEx) {
if (expectedEx == null) {
assertEquals(base.plus(temporalAmount), expectedYearMonth);
} else {
@@ -983,7 +984,7 @@
}
@Test(dataProvider="minus_long_TemporalUnit")
- public void test_minus_long_TemporalUnit(YearMonth base, long amount, TemporalUnit unit, YearMonth expectedYearMonth, Class expectedEx) {
+ public void test_minus_long_TemporalUnit(YearMonth base, long amount, TemporalUnit unit, YearMonth expectedYearMonth, Class<?> expectedEx) {
if (expectedEx == null) {
assertEquals(base.minus(amount, unit), expectedYearMonth);
} else {
@@ -1035,7 +1036,7 @@
}
@Test(dataProvider="minus_TemporalAmount")
- public void test_minus_TemporalAmount(YearMonth base, TemporalAmount temporalAmount, YearMonth expectedYearMonth, Class expectedEx) {
+ public void test_minus_TemporalAmount(YearMonth base, TemporalAmount temporalAmount, YearMonth expectedYearMonth, Class<?> expectedEx) {
if (expectedEx == null) {
assertEquals(base.minus(temporalAmount), expectedYearMonth);
} else {
diff --git a/jdk/test/java/time/tck/java/time/TCKZoneId.java b/jdk/test/java/time/tck/java/time/TCKZoneId.java
index 0d47403..c036dee 100644
--- a/jdk/test/java/time/tck/java/time/TCKZoneId.java
+++ b/jdk/test/java/time/tck/java/time/TCKZoneId.java
@@ -76,6 +76,7 @@
import java.time.format.TextStyle;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.zone.ZoneRulesException;
import java.util.HashMap;
@@ -559,7 +560,7 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.zoneId()) {
+ if (query == TemporalQueries.zoneId()) {
return (R) ZoneId.of("Europe/Paris");
}
return TemporalAccessor.super.query(query);
diff --git a/jdk/test/java/time/tck/java/time/TCKZoneOffset.java b/jdk/test/java/time/tck/java/time/TCKZoneOffset.java
index cf9098a..c121079 100644
--- a/jdk/test/java/time/tck/java/time/TCKZoneOffset.java
+++ b/jdk/test/java/time/tck/java/time/TCKZoneOffset.java
@@ -81,6 +81,7 @@
import java.time.temporal.JulianFields;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.util.ArrayList;
import java.util.Arrays;
@@ -523,13 +524,13 @@
@DataProvider(name="query")
Object[][] data_query() {
return new Object[][] {
- {ZoneOffset.UTC, TemporalQuery.chronology(), null},
- {ZoneOffset.UTC, TemporalQuery.zoneId(), null},
- {ZoneOffset.UTC, TemporalQuery.precision(), null},
- {ZoneOffset.UTC, TemporalQuery.zone(), ZoneOffset.UTC},
- {ZoneOffset.UTC, TemporalQuery.offset(), ZoneOffset.UTC},
- {ZoneOffset.UTC, TemporalQuery.localDate(), null},
- {ZoneOffset.UTC, TemporalQuery.localTime(), null},
+ {ZoneOffset.UTC, TemporalQueries.chronology(), null},
+ {ZoneOffset.UTC, TemporalQueries.zoneId(), null},
+ {ZoneOffset.UTC, TemporalQueries.precision(), null},
+ {ZoneOffset.UTC, TemporalQueries.zone(), ZoneOffset.UTC},
+ {ZoneOffset.UTC, TemporalQueries.offset(), ZoneOffset.UTC},
+ {ZoneOffset.UTC, TemporalQueries.localDate(), null},
+ {ZoneOffset.UTC, TemporalQueries.localTime(), null},
};
}
diff --git a/jdk/test/java/time/tck/java/time/TCKZonedDateTime.java b/jdk/test/java/time/tck/java/time/TCKZonedDateTime.java
index 4c5319d..fb743e8 100644
--- a/jdk/test/java/time/tck/java/time/TCKZonedDateTime.java
+++ b/jdk/test/java/time/tck/java/time/TCKZonedDateTime.java
@@ -126,6 +126,7 @@
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAmount;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.time.temporal.TemporalUnit;
import java.util.ArrayList;
@@ -685,7 +686,7 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.zoneId()) {
+ if (query == TemporalQueries.zoneId()) {
return (R) TEST_DATE_TIME_PARIS.getZone();
}
return TemporalAccessor.super.query(query);
@@ -709,7 +710,7 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.zoneId()) {
+ if (query == TemporalQueries.zoneId()) {
return (R) TEST_DATE_TIME_PARIS.getZone();
}
return TemporalAccessor.super.query(query);
@@ -964,32 +965,32 @@
//-----------------------------------------------------------------------
@Test
public void test_query_chrono() {
- assertEquals(TEST_DATE_TIME.query(TemporalQuery.chronology()), IsoChronology.INSTANCE);
- assertEquals(TemporalQuery.chronology().queryFrom(TEST_DATE_TIME), IsoChronology.INSTANCE);
+ assertEquals(TEST_DATE_TIME.query(TemporalQueries.chronology()), IsoChronology.INSTANCE);
+ assertEquals(TemporalQueries.chronology().queryFrom(TEST_DATE_TIME), IsoChronology.INSTANCE);
}
@Test
public void test_query_zoneId() {
- assertEquals(TEST_DATE_TIME.query(TemporalQuery.zoneId()), TEST_DATE_TIME.getZone());
- assertEquals(TemporalQuery.zoneId().queryFrom(TEST_DATE_TIME), TEST_DATE_TIME.getZone());
+ assertEquals(TEST_DATE_TIME.query(TemporalQueries.zoneId()), TEST_DATE_TIME.getZone());
+ assertEquals(TemporalQueries.zoneId().queryFrom(TEST_DATE_TIME), TEST_DATE_TIME.getZone());
}
@Test
public void test_query_precision() {
- assertEquals(TEST_DATE_TIME.query(TemporalQuery.precision()), NANOS);
- assertEquals(TemporalQuery.precision().queryFrom(TEST_DATE_TIME), NANOS);
+ assertEquals(TEST_DATE_TIME.query(TemporalQueries.precision()), NANOS);
+ assertEquals(TemporalQueries.precision().queryFrom(TEST_DATE_TIME), NANOS);
}
@Test
public void test_query_offset() {
- assertEquals(TEST_DATE_TIME.query(TemporalQuery.offset()), TEST_DATE_TIME.getOffset());
- assertEquals(TemporalQuery.offset().queryFrom(TEST_DATE_TIME), TEST_DATE_TIME.getOffset());
+ assertEquals(TEST_DATE_TIME.query(TemporalQueries.offset()), TEST_DATE_TIME.getOffset());
+ assertEquals(TemporalQueries.offset().queryFrom(TEST_DATE_TIME), TEST_DATE_TIME.getOffset());
}
@Test
public void test_query_zone() {
- assertEquals(TEST_DATE_TIME.query(TemporalQuery.zone()), TEST_DATE_TIME.getZone());
- assertEquals(TemporalQuery.zone().queryFrom(TEST_DATE_TIME), TEST_DATE_TIME.getZone());
+ assertEquals(TEST_DATE_TIME.query(TemporalQueries.zone()), TEST_DATE_TIME.getZone());
+ assertEquals(TemporalQueries.zone().queryFrom(TEST_DATE_TIME), TEST_DATE_TIME.getZone());
}
@Test(expectedExceptions=NullPointerException.class)
diff --git a/jdk/test/java/time/tck/java/time/TestIsoChronology.java b/jdk/test/java/time/tck/java/time/TestIsoChronology.java
index c99ec2a..5b1a5c6 100644
--- a/jdk/test/java/time/tck/java/time/TestIsoChronology.java
+++ b/jdk/test/java/time/tck/java/time/TestIsoChronology.java
@@ -80,7 +80,7 @@
import java.time.chrono.IsoChronology;
import java.time.chrono.IsoEra;
import java.time.temporal.ChronoField;
-import java.time.temporal.TemporalAdjuster;
+import java.time.temporal.TemporalAdjusters;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
@@ -208,14 +208,14 @@
@Test
public void test_adjust1() {
LocalDate base = IsoChronology.INSTANCE.date(1728, 10, 28);
- LocalDate test = base.with(TemporalAdjuster.lastDayOfMonth());
+ LocalDate test = base.with(TemporalAdjusters.lastDayOfMonth());
assertEquals(test, IsoChronology.INSTANCE.date(1728, 10, 31));
}
@Test
public void test_adjust2() {
LocalDate base = IsoChronology.INSTANCE.date(1728, 12, 2);
- LocalDate test = base.with(TemporalAdjuster.lastDayOfMonth());
+ LocalDate test = base.with(TemporalAdjusters.lastDayOfMonth());
assertEquals(test, IsoChronology.INSTANCE.date(1728, 12, 31));
}
diff --git a/jdk/test/java/time/tck/java/time/chrono/CopticChronology.java b/jdk/test/java/time/tck/java/time/chrono/CopticChronology.java
index c111eed..c72b737 100644
--- a/jdk/test/java/time/tck/java/time/chrono/CopticChronology.java
+++ b/jdk/test/java/time/tck/java/time/chrono/CopticChronology.java
@@ -59,13 +59,11 @@
import static java.time.temporal.ChronoField.EPOCH_DAY;
import java.io.Serializable;
-
+import java.time.chrono.AbstractChronology;
+import java.time.chrono.Era;
import java.time.temporal.ChronoField;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.ValueRange;
-import java.time.chrono.Chronology;
-import java.time.chrono.Era;
-
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
@@ -95,7 +93,7 @@
* <h4>Implementation notes</h4>
* This class is immutable and thread-safe.
*/
-public final class CopticChronology extends Chronology implements Serializable {
+public final class CopticChronology extends AbstractChronology implements Serializable {
/**
* Singleton instance of the Coptic chronology.
diff --git a/jdk/test/java/time/tck/java/time/chrono/CopticDate.java b/jdk/test/java/time/tck/java/time/chrono/CopticDate.java
index c0da697..a296c59 100644
--- a/jdk/test/java/time/tck/java/time/chrono/CopticDate.java
+++ b/jdk/test/java/time/tck/java/time/chrono/CopticDate.java
@@ -308,7 +308,7 @@
@Override
public Period until(ChronoLocalDate endDate) {
// TODO: untested
- CopticDate end = (CopticDate) getChronology().date(endDate);
+ CopticDate end = getChronology().date(endDate);
long totalMonths = (end.prolepticYear - this.prolepticYear) * 13 + (end.month - this.month); // safe
int days = end.day - this.day;
if (totalMonths > 0 && days < 0) {
diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKChronoLocalDateTime.java b/jdk/test/java/time/tck/java/time/chrono/TCKChronoLocalDateTime.java
index 51b68bb..9f9de49 100644
--- a/jdk/test/java/time/tck/java/time/chrono/TCKChronoLocalDateTime.java
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKChronoLocalDateTime.java
@@ -346,7 +346,7 @@
//-----------------------------------------------------------------------
@Test(dataProvider="calendars")
public void test_getChronology(Chronology chrono) {
- ChronoLocalDateTime test = chrono.localDateTime(LocalDateTime.of(2010, 6, 30, 11, 30));
+ ChronoLocalDateTime<?> test = chrono.localDateTime(LocalDateTime.of(2010, 6, 30, 11, 30));
assertEquals(test.getChronology(), chrono);
}
diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKChronoZonedDateTime.java b/jdk/test/java/time/tck/java/time/chrono/TCKChronoZonedDateTime.java
index 0cabcca..c3a1d2d 100644
--- a/jdk/test/java/time/tck/java/time/chrono/TCKChronoZonedDateTime.java
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKChronoZonedDateTime.java
@@ -347,7 +347,7 @@
//-----------------------------------------------------------------------
@Test(dataProvider="calendars")
public void test_getChronology(Chronology chrono) {
- ChronoZonedDateTime test = chrono.zonedDateTime(ZonedDateTime.of(2010, 6, 30, 11, 30, 0, 0, ZoneOffset.UTC));
+ ChronoZonedDateTime<?> test = chrono.zonedDateTime(ZonedDateTime.of(2010, 6, 30, 11, 30, 0, 0, ZoneOffset.UTC));
assertEquals(test.getChronology(), chrono);
}
diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKIsoChronology.java b/jdk/test/java/time/tck/java/time/chrono/TCKIsoChronology.java
index a69f556..0cd8eed 100644
--- a/jdk/test/java/time/tck/java/time/chrono/TCKIsoChronology.java
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKIsoChronology.java
@@ -70,7 +70,9 @@
import java.time.format.ResolverStyle;
import java.time.temporal.ChronoField;
import java.time.temporal.TemporalAccessor;
+import java.time.temporal.TemporalAdjusters;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.util.HashMap;
import java.util.Map;
@@ -107,7 +109,7 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.chronology()) {
+ if (query == TemporalQueries.chronology()) {
return (R) IsoChronology.INSTANCE;
}
throw new UnsupportedOperationException();
@@ -130,7 +132,7 @@
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.chronology()) {
+ if (query == TemporalQueries.chronology()) {
return null;
}
throw new UnsupportedOperationException();
@@ -166,7 +168,7 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.localDate()) {
+ if (query == TemporalQueries.localDate()) {
return (R) LocalDate.of(2012, 6, 30);
}
throw new UnsupportedOperationException();
@@ -205,10 +207,10 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.localDate()) {
+ if (query == TemporalQueries.localDate()) {
return (R) LocalDate.of(2012, 6, 30);
}
- if (query == TemporalQuery.localTime()) {
+ if (query == TemporalQueries.localTime()) {
return (R) LocalTime.of(12, 30, 40);
}
throw new UnsupportedOperationException();
@@ -254,13 +256,13 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.localDate()) {
+ if (query == TemporalQueries.localDate()) {
return (R) LocalDate.of(2012, 6, 30);
}
- if (query == TemporalQuery.localTime()) {
+ if (query == TemporalQueries.localTime()) {
return (R) LocalTime.of(12, 30, 40);
}
- if (query == TemporalQuery.zoneId() || query == TemporalQuery.zone()) {
+ if (query == TemporalQueries.zoneId() || query == TemporalQueries.zone()) {
return (R) ZoneId.of("Europe/London");
}
throw new UnsupportedOperationException();
diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKJapaneseChronology.java b/jdk/test/java/time/tck/java/time/chrono/TCKJapaneseChronology.java
index fd53b0f..2bc1f4c 100644
--- a/jdk/test/java/time/tck/java/time/chrono/TCKJapaneseChronology.java
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKJapaneseChronology.java
@@ -92,10 +92,9 @@
import java.time.format.ResolverStyle;
import java.time.temporal.ChronoField;
import java.time.temporal.ChronoUnit;
-import java.time.temporal.Temporal;
-import java.time.temporal.TemporalAdjuster;
+import java.time.temporal.TemporalAdjusters;
import java.time.temporal.TemporalField;
-import java.time.temporal.TemporalQuery;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.ValueRange;
import java.util.HashMap;
@@ -229,7 +228,7 @@
@Test(dataProvider="createByEra")
public void test_createByEra_query(JapaneseEra era, int yoe, int moy, int dom, int doy, LocalDate iso) {
JapaneseDate test = JapaneseDate.of(era, yoe, moy, dom);
- assertEquals(test.query(TemporalQuery.localDate()), iso);
+ assertEquals(test.query(TemporalQueries.localDate()), iso);
}
@Test(dataProvider="createByEra")
@@ -297,7 +296,7 @@
@Test(dataProvider="createByProleptic")
public void test_createByProleptic_query(int y, int moy, int dom, int doy, LocalDate iso) {
JapaneseDate test = JapaneseDate.of(y, moy, dom);
- assertEquals(test.query(TemporalQuery.localDate()), iso);
+ assertEquals(test.query(TemporalQueries.localDate()), iso);
}
@Test(dataProvider="createByProleptic")
@@ -495,14 +494,14 @@
@Test
public void test_adjust1() {
JapaneseDate base = JapaneseChronology.INSTANCE.date(1928, 10, 29);
- JapaneseDate test = base.with(TemporalAdjuster.lastDayOfMonth());
+ JapaneseDate test = base.with(TemporalAdjusters.lastDayOfMonth());
assertEquals(test, JapaneseChronology.INSTANCE.date(1928, 10, 31));
}
@Test
public void test_adjust2() {
JapaneseDate base = JapaneseChronology.INSTANCE.date(1928, 12, 2);
- JapaneseDate test = base.with(TemporalAdjuster.lastDayOfMonth());
+ JapaneseDate test = base.with(TemporalAdjusters.lastDayOfMonth());
assertEquals(test, JapaneseChronology.INSTANCE.date(1928, 12, 31));
}
diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKMinguoChronology.java b/jdk/test/java/time/tck/java/time/chrono/TCKMinguoChronology.java
index ad98e91..53089a6 100644
--- a/jdk/test/java/time/tck/java/time/chrono/TCKMinguoChronology.java
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKMinguoChronology.java
@@ -82,15 +82,15 @@
import java.time.chrono.IsoChronology;
import java.time.chrono.JapaneseDate;
import java.time.chrono.MinguoChronology;
-import java.time.chrono.MinguoDate;
import java.time.chrono.MinguoEra;
+import java.time.chrono.MinguoDate;
import java.time.chrono.ThaiBuddhistChronology;
import java.time.chrono.ThaiBuddhistDate;
import java.time.format.ResolverStyle;
import java.time.temporal.ChronoField;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAccessor;
-import java.time.temporal.TemporalAdjuster;
+import java.time.temporal.TemporalAdjusters;
import java.time.temporal.TemporalField;
import java.util.HashMap;
import java.util.List;
@@ -360,14 +360,14 @@
@Test
public void test_adjust1() {
MinguoDate base = MinguoChronology.INSTANCE.date(2012, 10, 29);
- MinguoDate test = base.with(TemporalAdjuster.lastDayOfMonth());
+ MinguoDate test = base.with(TemporalAdjusters.lastDayOfMonth());
assertEquals(test, MinguoChronology.INSTANCE.date(2012, 10, 31));
}
@Test
public void test_adjust2() {
MinguoDate base = MinguoChronology.INSTANCE.date(1728, 12, 2);
- MinguoDate test = base.with(TemporalAdjuster.lastDayOfMonth());
+ MinguoDate test = base.with(TemporalAdjusters.lastDayOfMonth());
assertEquals(test, MinguoChronology.INSTANCE.date(1728, 12, 31));
}
diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKThaiBuddhistChronology.java b/jdk/test/java/time/tck/java/time/chrono/TCKThaiBuddhistChronology.java
index 5557641..955fdea 100644
--- a/jdk/test/java/time/tck/java/time/chrono/TCKThaiBuddhistChronology.java
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKThaiBuddhistChronology.java
@@ -88,7 +88,7 @@
import java.time.format.ResolverStyle;
import java.time.temporal.ChronoField;
import java.time.temporal.ChronoUnit;
-import java.time.temporal.TemporalAdjuster;
+import java.time.temporal.TemporalAdjusters;
import java.time.temporal.TemporalField;
import java.time.temporal.ValueRange;
import java.util.HashMap;
@@ -366,14 +366,14 @@
@Test
public void test_adjust1() {
ThaiBuddhistDate base = ThaiBuddhistChronology.INSTANCE.date(1728, 10, 29);
- ThaiBuddhistDate test = base.with(TemporalAdjuster.lastDayOfMonth());
+ ThaiBuddhistDate test = base.with(TemporalAdjusters.lastDayOfMonth());
assertEquals(test, ThaiBuddhistChronology.INSTANCE.date(1728, 10, 31));
}
@Test
public void test_adjust2() {
ThaiBuddhistDate base = ThaiBuddhistChronology.INSTANCE.date(1728, 12, 2);
- ThaiBuddhistDate test = base.with(TemporalAdjuster.lastDayOfMonth());
+ ThaiBuddhistDate test = base.with(TemporalAdjusters.lastDayOfMonth());
assertEquals(test, ThaiBuddhistChronology.INSTANCE.date(1728, 12, 31));
}
diff --git a/jdk/test/java/time/tck/java/time/format/TCKChronoPrinterParser.java b/jdk/test/java/time/tck/java/time/format/TCKChronoPrinterParser.java
index de3b91c..882bf9c 100644
--- a/jdk/test/java/time/tck/java/time/format/TCKChronoPrinterParser.java
+++ b/jdk/test/java/time/tck/java/time/format/TCKChronoPrinterParser.java
@@ -68,6 +68,7 @@
import java.time.chrono.ThaiBuddhistChronology;
import java.time.format.DateTimeFormatterBuilder;
import java.time.temporal.TemporalAccessor;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.util.Locale;
@@ -122,7 +123,7 @@
TemporalAccessor parsed = builder.toFormatter().parseUnresolved(text, pos);
assertEquals(pos.getIndex(), expected.getId().length());
assertEquals(pos.getErrorIndex(), -1);
- assertEquals(parsed.query(TemporalQuery.chronology()), expected);
+ assertEquals(parsed.query(TemporalQueries.chronology()), expected);
}
@Test(dataProvider="parseValid")
@@ -140,7 +141,7 @@
TemporalAccessor parsed = builder.toFormatter().parseUnresolved(text.toLowerCase(Locale.ENGLISH), pos);
assertEquals(pos.getIndex(), expected.getId().length());
assertEquals(pos.getErrorIndex(), -1);
- assertEquals(parsed.query(TemporalQuery.chronology()), expected);
+ assertEquals(parsed.query(TemporalQueries.chronology()), expected);
}
//-----------------------------------------------------------------------
diff --git a/jdk/test/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java b/jdk/test/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java
index cf2c3a1..59d2ca1 100644
--- a/jdk/test/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java
+++ b/jdk/test/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java
@@ -190,8 +190,69 @@
//-----------------------------------------------------------------------
@Test(expectedExceptions=NullPointerException.class)
- public void test_appendValueReduced_null() throws Exception {
- builder.appendValueReduced(null, 2, 2000);
+ public void test_appendValueReduced_int_nullField() throws Exception {
+ builder.appendValueReduced(null, 2, 2, 2000);
+ }
+
+ @Test(expectedExceptions=IllegalArgumentException.class)
+ public void test_appendValueReduced_int_minWidthTooSmall() throws Exception {
+ builder.appendValueReduced(YEAR, 0, 2, 2000);
+ }
+
+ @Test(expectedExceptions=IllegalArgumentException.class)
+ public void test_appendValueReduced_int_minWidthTooBig() throws Exception {
+ builder.appendValueReduced(YEAR, 11, 2, 2000);
+ }
+
+ @Test(expectedExceptions=IllegalArgumentException.class)
+ public void test_appendValueReduced_int_maxWidthTooSmall() throws Exception {
+ builder.appendValueReduced(YEAR, 2, 0, 2000);
+ }
+
+ @Test(expectedExceptions=IllegalArgumentException.class)
+ public void test_appendValueReduced_int_maxWidthTooBig() throws Exception {
+ builder.appendValueReduced(YEAR, 2, 11, 2000);
+ }
+
+ @Test(expectedExceptions=IllegalArgumentException.class)
+ public void test_appendValueReduced_int_maxWidthLessThanMin() throws Exception {
+ builder.appendValueReduced(YEAR, 2, 1, 2000);
+ }
+
+ //-----------------------------------------------------------------------
+ @Test(expectedExceptions=NullPointerException.class)
+ public void test_appendValueReduced_date_nullField() throws Exception {
+ builder.appendValueReduced(null, 2, 2, LocalDate.of(2000, 1, 1));
+ }
+
+ @Test(expectedExceptions=NullPointerException.class)
+ public void test_appendValueReduced_date_nullDate() throws Exception {
+ builder.appendValueReduced(YEAR, 2, 2, null);
+ }
+
+ @Test(expectedExceptions=IllegalArgumentException.class)
+ public void test_appendValueReduced_date_minWidthTooSmall() throws Exception {
+ builder.appendValueReduced(YEAR, 0, 2, LocalDate.of(2000, 1, 1));
+ }
+
+ @Test(expectedExceptions=IllegalArgumentException.class)
+ public void test_appendValueReduced_date_minWidthTooBig() throws Exception {
+ builder.appendValueReduced(YEAR, 11, 2, LocalDate.of(2000, 1, 1));
+ }
+
+ @Test(expectedExceptions=IllegalArgumentException.class)
+ public void test_appendValueReduced_date_maxWidthTooSmall() throws Exception {
+ builder.appendValueReduced(YEAR, 2, 0, LocalDate.of(2000, 1, 1));
+ }
+
+ @Test(expectedExceptions=IllegalArgumentException.class)
+ public void test_appendValueReduced_date_maxWidthTooBig() throws Exception {
+ builder.appendValueReduced(YEAR, 2, 11, LocalDate.of(2000, 1, 1));
+ }
+
+ @Test(expectedExceptions=IllegalArgumentException.class)
+ public void test_appendValueReduced_date_maxWidthLessThanMin() throws Exception {
+ builder.appendValueReduced(YEAR, 2, 1, LocalDate.of(2000, 1, 1));
}
//-----------------------------------------------------------------------
diff --git a/jdk/test/java/time/tck/java/time/format/TCKDateTimeFormatters.java b/jdk/test/java/time/tck/java/time/format/TCKDateTimeFormatters.java
index f30eb99..e370521 100644
--- a/jdk/test/java/time/tck/java/time/format/TCKDateTimeFormatters.java
+++ b/jdk/test/java/time/tck/java/time/format/TCKDateTimeFormatters.java
@@ -94,6 +94,7 @@
import java.time.temporal.IsoFields;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalQuery;
import java.util.HashMap;
import java.util.Iterator;
@@ -126,9 +127,10 @@
@Test
public void test_pattern_String() {
DateTimeFormatter test = DateTimeFormatter.ofPattern("d MMM yyyy");
+ Locale fmtLocale = Locale.getDefault(Locale.Category.FORMAT);
assertEquals(test.format(LocalDate.of(2012, 6, 30)), "30 " +
- Month.JUNE.getDisplayName(TextStyle.SHORT, Locale.getDefault()) + " 2012");
- assertEquals(test.getLocale(), Locale.getDefault());
+ Month.JUNE.getDisplayName(TextStyle.SHORT, fmtLocale) + " 2012");
+ assertEquals(test.getLocale(), fmtLocale, "Locale.Category.FORMAT");
}
@Test(expectedExceptions=IllegalArgumentException.class)
@@ -1404,8 +1406,8 @@
assertEquals(parsed.isSupported(field), true);
parsed.getLong(field);
}
- assertEquals(parsed.query(TemporalQuery.chronology()), expected.chrono);
- assertEquals(parsed.query(TemporalQuery.zoneId()), expected.zone);
+ assertEquals(parsed.query(TemporalQueries.chronology()), expected.chrono);
+ assertEquals(parsed.query(TemporalQueries.zoneId()), expected.zone);
}
//-------------------------------------------------------------------------
@@ -1470,7 +1472,7 @@
@SuppressWarnings("unchecked")
@Override
public <R> R query(TemporalQuery<R> query) {
- if (query == TemporalQuery.zoneId()) {
+ if (query == TemporalQueries.zoneId()) {
return (R) zoneId;
}
return TemporalAccessor.super.query(query);
diff --git a/jdk/test/java/time/tck/java/time/format/TCKDateTimeParseResolver.java b/jdk/test/java/time/tck/java/time/format/TCKDateTimeParseResolver.java
index 4ef0131..2efd8cd 100644
--- a/jdk/test/java/time/tck/java/time/format/TCKDateTimeParseResolver.java
+++ b/jdk/test/java/time/tck/java/time/format/TCKDateTimeParseResolver.java
@@ -113,7 +113,7 @@
import java.time.temporal.Temporal;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalField;
-import java.time.temporal.TemporalQuery;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalUnit;
import java.time.temporal.ValueRange;
import java.util.Map;
@@ -147,8 +147,8 @@
DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(field1).toFormatter();
TemporalAccessor accessor = f.parse(str);
- assertEquals(accessor.query(TemporalQuery.localDate()), null);
- assertEquals(accessor.query(TemporalQuery.localTime()), null);
+ assertEquals(accessor.query(TemporalQueries.localDate()), null);
+ assertEquals(accessor.query(TemporalQueries.localTime()), null);
assertEquals(accessor.isSupported(field1), true);
assertEquals(accessor.getLong(field1), value1);
}
@@ -186,8 +186,8 @@
.appendValue(field2).toFormatter();
TemporalAccessor accessor = f.parse(str);
- assertEquals(accessor.query(TemporalQuery.localDate()), null);
- assertEquals(accessor.query(TemporalQuery.localTime()), null);
+ assertEquals(accessor.query(TemporalQueries.localDate()), null);
+ assertEquals(accessor.query(TemporalQueries.localTime()), null);
assertEquals(accessor.isSupported(field1), true);
assertEquals(accessor.isSupported(field2), true);
assertEquals(accessor.getLong(field1), value1);
@@ -218,8 +218,8 @@
.appendValue(field3).toFormatter();
TemporalAccessor accessor = f.parse(str);
- assertEquals(accessor.query(TemporalQuery.localDate()), null);
- assertEquals(accessor.query(TemporalQuery.localTime()), null);
+ assertEquals(accessor.query(TemporalQueries.localDate()), null);
+ assertEquals(accessor.query(TemporalQueries.localTime()), null);
assertEquals(accessor.isSupported(field1), true);
assertEquals(accessor.isSupported(field2), true);
assertEquals(accessor.isSupported(field3), true);
@@ -252,8 +252,8 @@
DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(field1).toFormatter();
TemporalAccessor accessor = f.parse(str);
- assertEquals(accessor.query(TemporalQuery.localDate()), null);
- assertEquals(accessor.query(TemporalQuery.localTime()), null);
+ assertEquals(accessor.query(TemporalQueries.localDate()), null);
+ assertEquals(accessor.query(TemporalQueries.localTime()), null);
if (expectedField1 != null) {
assertEquals(accessor.isSupported(expectedField1), true);
assertEquals(accessor.getLong(expectedField1), expectedValue1.longValue());
@@ -278,8 +278,8 @@
DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(field1).toFormatter();
TemporalAccessor accessor = f.parse(str);
- assertEquals(accessor.query(TemporalQuery.localDate()), expectedDate);
- assertEquals(accessor.query(TemporalQuery.localTime()), null);
+ assertEquals(accessor.query(TemporalQueries.localDate()), expectedDate);
+ assertEquals(accessor.query(TemporalQueries.localTime()), null);
}
//-----------------------------------------------------------------------
@@ -303,8 +303,8 @@
DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(field1).toFormatter();
TemporalAccessor accessor = f.parse(str);
- assertEquals(accessor.query(TemporalQuery.localDate()), null);
- assertEquals(accessor.query(TemporalQuery.localTime()), expectedTime);
+ assertEquals(accessor.query(TemporalQueries.localDate()), null);
+ assertEquals(accessor.query(TemporalQueries.localTime()), expectedTime);
}
//-----------------------------------------------------------------------
@@ -334,8 +334,8 @@
.appendValue(field2).toFormatter();
TemporalAccessor accessor = f.parse(str);
- assertEquals(accessor.query(TemporalQuery.localDate()), null);
- assertEquals(accessor.query(TemporalQuery.localTime()), null);
+ assertEquals(accessor.query(TemporalQueries.localDate()), null);
+ assertEquals(accessor.query(TemporalQueries.localTime()), null);
if (expectedField1 != null) {
assertEquals(accessor.isSupported(expectedField1), true);
assertEquals(accessor.getLong(expectedField1), expectedValue1.longValue());
@@ -382,8 +382,8 @@
.appendValue(field2).toFormatter();
TemporalAccessor accessor = f.parse(str);
- assertEquals(accessor.query(TemporalQuery.localDate()), expectedDate);
- assertEquals(accessor.query(TemporalQuery.localTime()), null);
+ assertEquals(accessor.query(TemporalQueries.localDate()), expectedDate);
+ assertEquals(accessor.query(TemporalQueries.localTime()), null);
}
//-----------------------------------------------------------------------
@@ -469,8 +469,8 @@
.appendValue(field2).toFormatter();
TemporalAccessor accessor = f.parse(str);
- assertEquals(accessor.query(TemporalQuery.localDate()), null);
- assertEquals(accessor.query(TemporalQuery.localTime()), expectedTime);
+ assertEquals(accessor.query(TemporalQueries.localDate()), null);
+ assertEquals(accessor.query(TemporalQueries.localTime()), expectedTime);
}
//-----------------------------------------------------------------------
@@ -502,8 +502,8 @@
.appendValue(field3).toFormatter();
TemporalAccessor accessor = f.parse(str);
- assertEquals(accessor.query(TemporalQuery.localDate()), expectedDate);
- assertEquals(accessor.query(TemporalQuery.localTime()), null);
+ assertEquals(accessor.query(TemporalQueries.localDate()), expectedDate);
+ assertEquals(accessor.query(TemporalQueries.localTime()), null);
}
//-----------------------------------------------------------------------
@@ -535,8 +535,8 @@
.appendValue(field4).toFormatter();
TemporalAccessor accessor = f.parse(str);
- assertEquals(accessor.query(TemporalQuery.localDate()), expectedDate);
- assertEquals(accessor.query(TemporalQuery.localTime()), null);
+ assertEquals(accessor.query(TemporalQueries.localDate()), expectedDate);
+ assertEquals(accessor.query(TemporalQueries.localTime()), null);
}
//-----------------------------------------------------------------------
@@ -603,8 +603,8 @@
for (ResolverStyle s : styles) {
if (expectedTime != null) {
TemporalAccessor accessor = f.withResolverStyle(s).parse("");
- assertEquals(accessor.query(TemporalQuery.localDate()), null, "ResolverStyle: " + s);
- assertEquals(accessor.query(TemporalQuery.localTime()), expectedTime, "ResolverStyle: " + s);
+ assertEquals(accessor.query(TemporalQueries.localDate()), null, "ResolverStyle: " + s);
+ assertEquals(accessor.query(TemporalQueries.localTime()), expectedTime, "ResolverStyle: " + s);
assertEquals(accessor.query(DateTimeFormatter.parsedExcessDays()), excessPeriod, "ResolverStyle: " + s);
} else {
try {
@@ -629,8 +629,8 @@
for (ResolverStyle s : styles) {
if (expectedTime != null) {
TemporalAccessor accessor = f.withResolverStyle(s).parse("");
- assertEquals(accessor.query(TemporalQuery.localDate()), null, "ResolverStyle: " + s);
- assertEquals(accessor.query(TemporalQuery.localTime()), expectedTime.minusNanos(nano), "ResolverStyle: " + s);
+ assertEquals(accessor.query(TemporalQueries.localDate()), null, "ResolverStyle: " + s);
+ assertEquals(accessor.query(TemporalQueries.localTime()), expectedTime.minusNanos(nano), "ResolverStyle: " + s);
assertEquals(accessor.query(DateTimeFormatter.parsedExcessDays()), excessPeriod, "ResolverStyle: " + s);
} else {
try {
@@ -658,8 +658,8 @@
LocalDate expectedDate = LocalDate.of(2012, 6, 30).plus(excessPeriod);
for (ResolverStyle s : styles) {
TemporalAccessor accessor = f.withResolverStyle(s).parse("");
- assertEquals(accessor.query(TemporalQuery.localDate()), expectedDate, "ResolverStyle: " + s);
- assertEquals(accessor.query(TemporalQuery.localTime()), expectedTime, "ResolverStyle: " + s);
+ assertEquals(accessor.query(TemporalQueries.localDate()), expectedDate, "ResolverStyle: " + s);
+ assertEquals(accessor.query(TemporalQueries.localTime()), expectedTime, "ResolverStyle: " + s);
assertEquals(accessor.query(DateTimeFormatter.parsedExcessDays()), Period.ZERO, "ResolverStyle: " + s);
}
}
@@ -696,8 +696,8 @@
if (expectedSecond != null) {
TemporalAccessor accessor = f.withResolverStyle(style).parse(str);
- assertEquals(accessor.query(TemporalQuery.localDate()), null);
- assertEquals(accessor.query(TemporalQuery.localTime()), LocalTime.ofSecondOfDay(expectedSecond));
+ assertEquals(accessor.query(TemporalQueries.localDate()), null);
+ assertEquals(accessor.query(TemporalQueries.localTime()), LocalTime.ofSecondOfDay(expectedSecond));
assertEquals(accessor.query(DateTimeFormatter.parsedExcessDays()), Period.ofDays(expectedDays));
} else {
try {
@@ -740,8 +740,8 @@
if (expectedMinute != null) {
TemporalAccessor accessor = f.withResolverStyle(style).parse(str);
- assertEquals(accessor.query(TemporalQuery.localDate()), null);
- assertEquals(accessor.query(TemporalQuery.localTime()), LocalTime.ofSecondOfDay(expectedMinute * 60));
+ assertEquals(accessor.query(TemporalQueries.localDate()), null);
+ assertEquals(accessor.query(TemporalQueries.localTime()), LocalTime.ofSecondOfDay(expectedMinute * 60));
assertEquals(accessor.query(DateTimeFormatter.parsedExcessDays()), Period.ofDays(expectedDays));
} else {
try {
@@ -784,8 +784,8 @@
if (expectedHour != null) {
TemporalAccessor accessor = f.withResolverStyle(style).parse(str);
- assertEquals(accessor.query(TemporalQuery.localDate()), null);
- assertEquals(accessor.query(TemporalQuery.localTime()), LocalTime.of(expectedHour, 0));
+ assertEquals(accessor.query(TemporalQueries.localDate()), null);
+ assertEquals(accessor.query(TemporalQueries.localTime()), LocalTime.of(expectedHour, 0));
assertEquals(accessor.query(DateTimeFormatter.parsedExcessDays()), Period.ofDays(expectedDays));
} else {
try {
@@ -828,8 +828,8 @@
if (expectedValue != null) {
TemporalAccessor accessor = f.withResolverStyle(style).parse(str);
- assertEquals(accessor.query(TemporalQuery.localDate()), null);
- assertEquals(accessor.query(TemporalQuery.localTime()), null);
+ assertEquals(accessor.query(TemporalQueries.localDate()), null);
+ assertEquals(accessor.query(TemporalQueries.localTime()), null);
assertEquals(accessor.isSupported(CLOCK_HOUR_OF_AMPM), false);
assertEquals(accessor.isSupported(HOUR_OF_AMPM), true);
assertEquals(accessor.getLong(HOUR_OF_AMPM), expectedValue.longValue());
@@ -871,8 +871,8 @@
if (expectedValue != null) {
TemporalAccessor accessor = f.withResolverStyle(style).parse(str);
- assertEquals(accessor.query(TemporalQuery.localDate()), null);
- assertEquals(accessor.query(TemporalQuery.localTime()), null);
+ assertEquals(accessor.query(TemporalQueries.localDate()), null);
+ assertEquals(accessor.query(TemporalQueries.localTime()), null);
assertEquals(accessor.isSupported(AMPM_OF_DAY), true);
assertEquals(accessor.getLong(AMPM_OF_DAY), expectedValue.longValue());
} else {
@@ -927,15 +927,14 @@
}
@Override
public TemporalAccessor resolve(
- Map<TemporalField, Long> fieldValues, Chronology chronology,
- ZoneId zone, ResolverStyle resolverStyle) {
+ Map<TemporalField, Long> fieldValues, TemporalAccessor partialTemporal, ResolverStyle resolverStyle) {
return LocalTime.MIDNIGHT.plusNanos(fieldValues.remove(this));
}
};
DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(field).toFormatter();
TemporalAccessor accessor = f.parse("1234567890");
- assertEquals(accessor.query(TemporalQuery.localDate()), null);
- assertEquals(accessor.query(TemporalQuery.localTime()), LocalTime.of(0, 0, 1, 234_567_890));
+ assertEquals(accessor.query(TemporalQueries.localDate()), null);
+ assertEquals(accessor.query(TemporalQueries.localTime()), LocalTime.of(0, 0, 1, 234_567_890));
}
@Test
@@ -979,16 +978,15 @@
}
@Override
public TemporalAccessor resolve(
- Map<TemporalField, Long> fieldValues, Chronology chronology,
- ZoneId zone, ResolverStyle resolverStyle) {
+ Map<TemporalField, Long> fieldValues, TemporalAccessor partialTemporal, ResolverStyle resolverStyle) {
fieldValues.remove(this);
return LocalDateTime.of(2010, 6, 30, 12, 30);
}
};
DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(field).toFormatter();
TemporalAccessor accessor = f.parse("1234567890");
- assertEquals(accessor.query(TemporalQuery.localDate()), LocalDate.of(2010, 6, 30));
- assertEquals(accessor.query(TemporalQuery.localTime()), LocalTime.of(12, 30));
+ assertEquals(accessor.query(TemporalQueries.localDate()), LocalDate.of(2010, 6, 30));
+ assertEquals(accessor.query(TemporalQueries.localTime()), LocalTime.of(12, 30));
}
@Test(expectedExceptions = DateTimeParseException.class)
@@ -1032,8 +1030,7 @@
}
@Override
public TemporalAccessor resolve(
- Map<TemporalField, Long> fieldValues, Chronology chronology,
- ZoneId zone, ResolverStyle resolverStyle) {
+ Map<TemporalField, Long> fieldValues, TemporalAccessor partialTemporal, ResolverStyle resolverStyle) {
return ThaiBuddhistChronology.INSTANCE.dateNow();
}
};
@@ -1082,8 +1079,7 @@
}
@Override
public TemporalAccessor resolve(
- Map<TemporalField, Long> fieldValues, Chronology chronology,
- ZoneId zone, ResolverStyle resolverStyle) {
+ Map<TemporalField, Long> fieldValues, TemporalAccessor partialTemporal, ResolverStyle resolverStyle) {
return ZonedDateTime.of(2010, 6, 30, 12, 30, 0, 0, ZoneId.of("Europe/Paris"));
}
};
diff --git a/jdk/test/java/time/tck/java/time/format/TCKLocalizedPrinterParser.java b/jdk/test/java/time/tck/java/time/format/TCKLocalizedPrinterParser.java
index 075d862..27c0575 100644
--- a/jdk/test/java/time/tck/java/time/format/TCKLocalizedPrinterParser.java
+++ b/jdk/test/java/time/tck/java/time/format/TCKLocalizedPrinterParser.java
@@ -123,7 +123,7 @@
};
}
- @SuppressWarnings("deprecated")
+ @SuppressWarnings("deprecation")
@Test(dataProvider="date")
public void test_date_print(LocalDate date, FormatStyle dateStyle, int dateStyleOld, Locale locale) {
DateFormat old = DateFormat.getDateInstance(dateStyleOld, locale);
@@ -135,7 +135,7 @@
assertEquals(formatted, text);
}
- @SuppressWarnings("deprecated")
+ @SuppressWarnings("deprecation")
@Test(dataProvider="date")
public void test_date_parse(LocalDate date, FormatStyle dateStyle, int dateStyleOld, Locale locale) {
DateFormat old = DateFormat.getDateInstance(dateStyleOld, locale);
@@ -176,7 +176,7 @@
};
}
- @SuppressWarnings("deprecated")
+ @SuppressWarnings("deprecation")
@Test(dataProvider="time")
public void test_time_print(LocalTime time, FormatStyle timeStyle, int timeStyleOld, Locale locale) {
DateFormat old = DateFormat.getTimeInstance(timeStyleOld, locale);
@@ -188,7 +188,7 @@
assertEquals(formatted, text);
}
- @SuppressWarnings("deprecated")
+ @SuppressWarnings("deprecation")
@Test(dataProvider="time")
public void test_time_parse(LocalTime time, FormatStyle timeStyle, int timeStyleOld, Locale locale) {
DateFormat old = DateFormat.getTimeInstance(timeStyleOld, locale);
diff --git a/jdk/test/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java b/jdk/test/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java
index 414d390..122da86 100644
--- a/jdk/test/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java
+++ b/jdk/test/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java
@@ -71,7 +71,7 @@
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.temporal.TemporalAccessor;
-import java.time.temporal.TemporalQuery;
+import java.time.temporal.TemporalQueries;
import java.util.Locale;
import java.util.Objects;
@@ -214,9 +214,9 @@
assertEquals(pos.getErrorIndex(), expectedErrorIndex, "Incorrect error index parsing: " + text);
assertEquals(pos.getIndex(), expectedIndex, "Incorrect index parsing: " + text);
if (expected != null) {
- assertEquals(parsed.query(TemporalQuery.zoneId()), expected, "Incorrect zoneId parsing: " + text);
- assertEquals(parsed.query(TemporalQuery.offset()), null, "Incorrect offset parsing: " + text);
- assertEquals(parsed.query(TemporalQuery.zone()), expected, "Incorrect zone parsing: " + text);
+ assertEquals(parsed.query(TemporalQueries.zoneId()), expected, "Incorrect zoneId parsing: " + text);
+ assertEquals(parsed.query(TemporalQueries.offset()), null, "Incorrect offset parsing: " + text);
+ assertEquals(parsed.query(TemporalQueries.zone()), expected, "Incorrect zone parsing: " + text);
} else {
assertEquals(parsed, null);
}
@@ -231,9 +231,9 @@
assertEquals(pos.getErrorIndex(), expectedErrorIndex >= 0 ? expectedErrorIndex + 3 : expectedErrorIndex, "Incorrect error index parsing: " + prefixText);
assertEquals(pos.getIndex(), expectedIndex + 3, "Incorrect index parsing: " + prefixText);
if (expected != null) {
- assertEquals(parsed.query(TemporalQuery.zoneId()), expected, "Incorrect zoneId parsing: " + prefixText);
- assertEquals(parsed.query(TemporalQuery.offset()), null, "Incorrect offset parsing: " + prefixText);
- assertEquals(parsed.query(TemporalQuery.zone()), expected, "Incorrect zone parsing: " + prefixText);
+ assertEquals(parsed.query(TemporalQueries.zoneId()), expected, "Incorrect zoneId parsing: " + prefixText);
+ assertEquals(parsed.query(TemporalQueries.offset()), null, "Incorrect offset parsing: " + prefixText);
+ assertEquals(parsed.query(TemporalQueries.zone()), expected, "Incorrect zone parsing: " + prefixText);
} else {
assertEquals(parsed, null);
}
@@ -247,9 +247,9 @@
assertEquals(pos.getErrorIndex(), expectedErrorIndex, "Incorrect error index parsing: " + suffixText);
assertEquals(pos.getIndex(), expectedIndex, "Incorrect index parsing: " + suffixText);
if (expected != null) {
- assertEquals(parsed.query(TemporalQuery.zoneId()), expected, "Incorrect zoneId parsing: " + suffixText);
- assertEquals(parsed.query(TemporalQuery.offset()), null, "Incorrect offset parsing: " + suffixText);
- assertEquals(parsed.query(TemporalQuery.zone()), expected, "Incorrect zone parsing: " + suffixText);
+ assertEquals(parsed.query(TemporalQueries.zoneId()), expected, "Incorrect zoneId parsing: " + suffixText);
+ assertEquals(parsed.query(TemporalQueries.offset()), null, "Incorrect offset parsing: " + suffixText);
+ assertEquals(parsed.query(TemporalQueries.zone()), expected, "Incorrect zone parsing: " + suffixText);
} else {
assertEquals(parsed, null);
}
@@ -269,9 +269,9 @@
assertEquals(pos.getIndex(), expectedIndex, "Incorrect index parsing: " + lcText);
assertEquals(pos.getErrorIndex(), expectedErrorIndex, "Incorrect error index parsing: " + lcText);
if (expected != null) {
- assertEquals(parsed.query(TemporalQuery.zoneId()), expected);
- assertEquals(parsed.query(TemporalQuery.offset()), null);
- assertEquals(parsed.query(TemporalQuery.zone()), expected);
+ assertEquals(parsed.query(TemporalQueries.zoneId()), expected);
+ assertEquals(parsed.query(TemporalQueries.offset()), null);
+ assertEquals(parsed.query(TemporalQueries.zone()), expected);
} else {
assertEquals(parsed, null);
}
@@ -286,10 +286,10 @@
assertEquals(pos.getErrorIndex(), expectedErrorIndex, "Incorrect error index parsing: " + lcText);
assertEquals(pos.getIndex(), expectedIndex, "Incorrect index parsing: " + lcText);
if (expected != null) {
- ZoneId zid = parsed.query(TemporalQuery.zoneId());
- assertEquals(parsed.query(TemporalQuery.zoneId()), expected, "Incorrect zoneId parsing: " + lcText);
- assertEquals(parsed.query(TemporalQuery.offset()), null, "Incorrect offset parsing: " + lcText);
- assertEquals(parsed.query(TemporalQuery.zone()), expected, "Incorrect zone parsing: " + lcText);
+ ZoneId zid = parsed.query(TemporalQueries.zoneId());
+ assertEquals(parsed.query(TemporalQueries.zoneId()), expected, "Incorrect zoneId parsing: " + lcText);
+ assertEquals(parsed.query(TemporalQueries.offset()), null, "Incorrect offset parsing: " + lcText);
+ assertEquals(parsed.query(TemporalQueries.zone()), expected, "Incorrect zone parsing: " + lcText);
} else {
assertEquals(parsed, null);
}
diff --git a/jdk/test/java/time/tck/java/time/temporal/TCKTemporalAdjusters.java b/jdk/test/java/time/tck/java/time/temporal/TCKTemporalAdjusters.java
index 66f129c..b901125 100644
--- a/jdk/test/java/time/tck/java/time/temporal/TCKTemporalAdjusters.java
+++ b/jdk/test/java/time/tck/java/time/temporal/TCKTemporalAdjusters.java
@@ -73,12 +73,13 @@
import java.time.LocalDate;
import java.time.Month;
import java.time.temporal.TemporalAdjuster;
+import java.time.temporal.TemporalAdjusters;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
/**
- * Test TemporalAdjuster.
+ * Test TemporalAdjusters.
*/
@Test
public class TCKTemporalAdjusters {
@@ -88,13 +89,13 @@
//-----------------------------------------------------------------------
@Test
public void factory_ofDateAdjuster() {
- TemporalAdjuster test = TemporalAdjuster.ofDateAdjuster(date -> date.plusDays(2));
+ TemporalAdjuster test = TemporalAdjusters.ofDateAdjuster(date -> date.plusDays(2));
assertEquals(LocalDate.of(2012, 6, 30).with(test), LocalDate.of(2012, 7, 2));
}
@Test(expectedExceptions = NullPointerException.class)
public void factory_ofDateAdjuster_null() {
- TemporalAdjuster.ofDateAdjuster(null);
+ TemporalAdjusters.ofDateAdjuster(null);
}
@@ -103,7 +104,7 @@
//-----------------------------------------------------------------------
@Test
public void factory_firstDayOfMonth() {
- assertNotNull(TemporalAdjuster.firstDayOfMonth());
+ assertNotNull(TemporalAdjusters.firstDayOfMonth());
}
@Test
@@ -111,7 +112,7 @@
for (Month month : Month.values()) {
for (int i = 1; i <= month.length(false); i++) {
LocalDate date = date(2007, month, i);
- LocalDate test = (LocalDate) TemporalAdjuster.firstDayOfMonth().adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.firstDayOfMonth().adjustInto(date);
assertEquals(test.getYear(), 2007);
assertEquals(test.getMonth(), month);
assertEquals(test.getDayOfMonth(), 1);
@@ -124,7 +125,7 @@
for (Month month : Month.values()) {
for (int i = 1; i <= month.length(true); i++) {
LocalDate date = date(2008, month, i);
- LocalDate test = (LocalDate) TemporalAdjuster.firstDayOfMonth().adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.firstDayOfMonth().adjustInto(date);
assertEquals(test.getYear(), 2008);
assertEquals(test.getMonth(), month);
assertEquals(test.getDayOfMonth(), 1);
@@ -137,7 +138,7 @@
//-----------------------------------------------------------------------
@Test
public void factory_lastDayOfMonth() {
- assertNotNull(TemporalAdjuster.lastDayOfMonth());
+ assertNotNull(TemporalAdjusters.lastDayOfMonth());
}
@Test
@@ -145,7 +146,7 @@
for (Month month : Month.values()) {
for (int i = 1; i <= month.length(false); i++) {
LocalDate date = date(2007, month, i);
- LocalDate test = (LocalDate) TemporalAdjuster.lastDayOfMonth().adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.lastDayOfMonth().adjustInto(date);
assertEquals(test.getYear(), 2007);
assertEquals(test.getMonth(), month);
assertEquals(test.getDayOfMonth(), month.length(false));
@@ -158,7 +159,7 @@
for (Month month : Month.values()) {
for (int i = 1; i <= month.length(true); i++) {
LocalDate date = date(2008, month, i);
- LocalDate test = (LocalDate) TemporalAdjuster.lastDayOfMonth().adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.lastDayOfMonth().adjustInto(date);
assertEquals(test.getYear(), 2008);
assertEquals(test.getMonth(), month);
assertEquals(test.getDayOfMonth(), month.length(true));
@@ -171,7 +172,7 @@
//-----------------------------------------------------------------------
@Test
public void factory_firstDayOfNextMonth() {
- assertNotNull(TemporalAdjuster.firstDayOfNextMonth());
+ assertNotNull(TemporalAdjusters.firstDayOfNextMonth());
}
@Test
@@ -179,7 +180,7 @@
for (Month month : Month.values()) {
for (int i = 1; i <= month.length(false); i++) {
LocalDate date = date(2007, month, i);
- LocalDate test = (LocalDate) TemporalAdjuster.firstDayOfNextMonth().adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.firstDayOfNextMonth().adjustInto(date);
assertEquals(test.getYear(), month == DECEMBER ? 2008 : 2007);
assertEquals(test.getMonth(), month.plus(1));
assertEquals(test.getDayOfMonth(), 1);
@@ -192,7 +193,7 @@
for (Month month : Month.values()) {
for (int i = 1; i <= month.length(true); i++) {
LocalDate date = date(2008, month, i);
- LocalDate test = (LocalDate) TemporalAdjuster.firstDayOfNextMonth().adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.firstDayOfNextMonth().adjustInto(date);
assertEquals(test.getYear(), month == DECEMBER ? 2009 : 2008);
assertEquals(test.getMonth(), month.plus(1));
assertEquals(test.getDayOfMonth(), 1);
@@ -205,7 +206,7 @@
//-----------------------------------------------------------------------
@Test
public void factory_firstDayOfYear() {
- assertNotNull(TemporalAdjuster.firstDayOfYear());
+ assertNotNull(TemporalAdjusters.firstDayOfYear());
}
@Test
@@ -213,7 +214,7 @@
for (Month month : Month.values()) {
for (int i = 1; i <= month.length(false); i++) {
LocalDate date = date(2007, month, i);
- LocalDate test = (LocalDate) TemporalAdjuster.firstDayOfYear().adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.firstDayOfYear().adjustInto(date);
assertEquals(test.getYear(), 2007);
assertEquals(test.getMonth(), Month.JANUARY);
assertEquals(test.getDayOfMonth(), 1);
@@ -226,7 +227,7 @@
for (Month month : Month.values()) {
for (int i = 1; i <= month.length(true); i++) {
LocalDate date = date(2008, month, i);
- LocalDate test = (LocalDate) TemporalAdjuster.firstDayOfYear().adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.firstDayOfYear().adjustInto(date);
assertEquals(test.getYear(), 2008);
assertEquals(test.getMonth(), Month.JANUARY);
assertEquals(test.getDayOfMonth(), 1);
@@ -239,7 +240,7 @@
//-----------------------------------------------------------------------
@Test
public void factory_lastDayOfYear() {
- assertNotNull(TemporalAdjuster.lastDayOfYear());
+ assertNotNull(TemporalAdjusters.lastDayOfYear());
}
@Test
@@ -247,7 +248,7 @@
for (Month month : Month.values()) {
for (int i = 1; i <= month.length(false); i++) {
LocalDate date = date(2007, month, i);
- LocalDate test = (LocalDate) TemporalAdjuster.lastDayOfYear().adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.lastDayOfYear().adjustInto(date);
assertEquals(test.getYear(), 2007);
assertEquals(test.getMonth(), Month.DECEMBER);
assertEquals(test.getDayOfMonth(), 31);
@@ -260,7 +261,7 @@
for (Month month : Month.values()) {
for (int i = 1; i <= month.length(true); i++) {
LocalDate date = date(2008, month, i);
- LocalDate test = (LocalDate) TemporalAdjuster.lastDayOfYear().adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.lastDayOfYear().adjustInto(date);
assertEquals(test.getYear(), 2008);
assertEquals(test.getMonth(), Month.DECEMBER);
assertEquals(test.getDayOfMonth(), 31);
@@ -273,7 +274,7 @@
//-----------------------------------------------------------------------
@Test
public void factory_firstDayOfNextYear() {
- assertNotNull(TemporalAdjuster.firstDayOfNextYear());
+ assertNotNull(TemporalAdjusters.firstDayOfNextYear());
}
@Test
@@ -281,7 +282,7 @@
for (Month month : Month.values()) {
for (int i = 1; i <= month.length(false); i++) {
LocalDate date = date(2007, month, i);
- LocalDate test = (LocalDate) TemporalAdjuster.firstDayOfNextYear().adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.firstDayOfNextYear().adjustInto(date);
assertEquals(test.getYear(), 2008);
assertEquals(test.getMonth(), JANUARY);
assertEquals(test.getDayOfMonth(), 1);
@@ -294,7 +295,7 @@
for (Month month : Month.values()) {
for (int i = 1; i <= month.length(true); i++) {
LocalDate date = date(2008, month, i);
- LocalDate test = (LocalDate) TemporalAdjuster.firstDayOfNextYear().adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.firstDayOfNextYear().adjustInto(date);
assertEquals(test.getYear(), 2009);
assertEquals(test.getMonth(), JANUARY);
assertEquals(test.getDayOfMonth(), 1);
@@ -307,12 +308,12 @@
//-----------------------------------------------------------------------
@Test
public void factory_dayOfWeekInMonth() {
- assertNotNull(TemporalAdjuster.dayOfWeekInMonth(1, MONDAY));
+ assertNotNull(TemporalAdjusters.dayOfWeekInMonth(1, MONDAY));
}
@Test(expectedExceptions=NullPointerException.class)
public void factory_dayOfWeekInMonth_nullDayOfWeek() {
- TemporalAdjuster.dayOfWeekInMonth(1, null);
+ TemporalAdjusters.dayOfWeekInMonth(1, null);
}
@DataProvider(name = "dayOfWeekInMonth_positive")
@@ -338,7 +339,7 @@
for (int ordinal = 1; ordinal <= 5; ordinal++) {
for (int day = 1; day <= Month.of(month).length(false); day++) {
LocalDate date = date(year, month, day);
- LocalDate test = (LocalDate) TemporalAdjuster.dayOfWeekInMonth(ordinal, dow).adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.dayOfWeekInMonth(ordinal, dow).adjustInto(date);
assertEquals(test, expected.plusWeeks(ordinal - 1));
}
}
@@ -366,7 +367,7 @@
public void test_dayOfWeekInMonth_zero(int year, int month, DayOfWeek dow, LocalDate expected) {
for (int day = 1; day <= Month.of(month).length(false); day++) {
LocalDate date = date(year, month, day);
- LocalDate test = (LocalDate) TemporalAdjuster.dayOfWeekInMonth(0, dow).adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.dayOfWeekInMonth(0, dow).adjustInto(date);
assertEquals(test, expected);
}
}
@@ -394,7 +395,7 @@
for (int ordinal = 0; ordinal < 5; ordinal++) {
for (int day = 1; day <= Month.of(month).length(false); day++) {
LocalDate date = date(year, month, day);
- LocalDate test = (LocalDate) TemporalAdjuster.dayOfWeekInMonth(-1 - ordinal, dow).adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.dayOfWeekInMonth(-1 - ordinal, dow).adjustInto(date);
assertEquals(test, expected.minusWeeks(ordinal));
}
}
@@ -405,19 +406,19 @@
//-----------------------------------------------------------------------
@Test
public void factory_firstInMonth() {
- assertNotNull(TemporalAdjuster.firstInMonth(MONDAY));
+ assertNotNull(TemporalAdjusters.firstInMonth(MONDAY));
}
@Test(expectedExceptions=NullPointerException.class)
public void factory_firstInMonth_nullDayOfWeek() {
- TemporalAdjuster.firstInMonth(null);
+ TemporalAdjusters.firstInMonth(null);
}
@Test(dataProvider = "dayOfWeekInMonth_positive")
public void test_firstInMonth(int year, int month, DayOfWeek dow, LocalDate expected) {
for (int day = 1; day <= Month.of(month).length(false); day++) {
LocalDate date = date(year, month, day);
- LocalDate test = (LocalDate) TemporalAdjuster.firstInMonth(dow).adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.firstInMonth(dow).adjustInto(date);
assertEquals(test, expected, "day-of-month=" + day);
}
}
@@ -427,19 +428,19 @@
//-----------------------------------------------------------------------
@Test
public void factory_lastInMonth() {
- assertNotNull(TemporalAdjuster.lastInMonth(MONDAY));
+ assertNotNull(TemporalAdjusters.lastInMonth(MONDAY));
}
@Test(expectedExceptions=NullPointerException.class)
public void factory_lastInMonth_nullDayOfWeek() {
- TemporalAdjuster.lastInMonth(null);
+ TemporalAdjusters.lastInMonth(null);
}
@Test(dataProvider = "dayOfWeekInMonth_negative")
public void test_lastInMonth(int year, int month, DayOfWeek dow, LocalDate expected) {
for (int day = 1; day <= Month.of(month).length(false); day++) {
LocalDate date = date(year, month, day);
- LocalDate test = (LocalDate) TemporalAdjuster.lastInMonth(dow).adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.lastInMonth(dow).adjustInto(date);
assertEquals(test, expected, "day-of-month=" + day);
}
}
@@ -449,12 +450,12 @@
//-----------------------------------------------------------------------
@Test
public void factory_next() {
- assertNotNull(TemporalAdjuster.next(MONDAY));
+ assertNotNull(TemporalAdjusters.next(MONDAY));
}
@Test(expectedExceptions = NullPointerException.class)
public void factory_next_nullDayOfWeek() {
- TemporalAdjuster.next(null);
+ TemporalAdjusters.next(null);
}
@Test
@@ -464,7 +465,7 @@
LocalDate date = date(2007, month, i);
for (DayOfWeek dow : DayOfWeek.values()) {
- LocalDate test = (LocalDate) TemporalAdjuster.next(dow).adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.next(dow).adjustInto(date);
assertSame(test.getDayOfWeek(), dow, date + " " + test);
@@ -488,12 +489,12 @@
//-----------------------------------------------------------------------
@Test
public void factory_nextOrCurrent() {
- assertNotNull(TemporalAdjuster.nextOrSame(MONDAY));
+ assertNotNull(TemporalAdjusters.nextOrSame(MONDAY));
}
@Test(expectedExceptions = NullPointerException.class)
public void factory_nextOrCurrent_nullDayOfWeek() {
- TemporalAdjuster.nextOrSame(null);
+ TemporalAdjusters.nextOrSame(null);
}
@Test
@@ -503,7 +504,7 @@
LocalDate date = date(2007, month, i);
for (DayOfWeek dow : DayOfWeek.values()) {
- LocalDate test = (LocalDate) TemporalAdjuster.nextOrSame(dow).adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.nextOrSame(dow).adjustInto(date);
assertSame(test.getDayOfWeek(), dow);
@@ -529,12 +530,12 @@
//-----------------------------------------------------------------------
@Test
public void factory_previous() {
- assertNotNull(TemporalAdjuster.previous(MONDAY));
+ assertNotNull(TemporalAdjusters.previous(MONDAY));
}
@Test(expectedExceptions = NullPointerException.class)
public void factory_previous_nullDayOfWeek() {
- TemporalAdjuster.previous(null);
+ TemporalAdjusters.previous(null);
}
@Test
@@ -544,7 +545,7 @@
LocalDate date = date(2007, month, i);
for (DayOfWeek dow : DayOfWeek.values()) {
- LocalDate test = (LocalDate) TemporalAdjuster.previous(dow).adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.previous(dow).adjustInto(date);
assertSame(test.getDayOfWeek(), dow, date + " " + test);
@@ -568,12 +569,12 @@
//-----------------------------------------------------------------------
@Test
public void factory_previousOrCurrent() {
- assertNotNull(TemporalAdjuster.previousOrSame(MONDAY));
+ assertNotNull(TemporalAdjusters.previousOrSame(MONDAY));
}
@Test(expectedExceptions = NullPointerException.class)
public void factory_previousOrCurrent_nullDayOfWeek() {
- TemporalAdjuster.previousOrSame(null);
+ TemporalAdjusters.previousOrSame(null);
}
@Test
@@ -583,7 +584,7 @@
LocalDate date = date(2007, month, i);
for (DayOfWeek dow : DayOfWeek.values()) {
- LocalDate test = (LocalDate) TemporalAdjuster.previousOrSame(dow).adjustInto(date);
+ LocalDate test = (LocalDate) TemporalAdjusters.previousOrSame(dow).adjustInto(date);
assertSame(test.getDayOfWeek(), dow);
diff --git a/jdk/test/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java b/jdk/test/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java
index 05a6d4b..9fbe6d1 100644
--- a/jdk/test/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java
+++ b/jdk/test/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java
@@ -60,7 +60,7 @@
import java.time.temporal.ChronoField;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAccessor;
-import java.time.temporal.TemporalAdjuster;
+import java.time.temporal.TemporalAdjusters;
import java.time.temporal.ValueRange;
import java.time.temporal.WeekFields;
import java.util.Locale;
@@ -357,12 +357,12 @@
@Test
public void test_temporalDayAdjustments() {
HijrahDate date = HijrahDate.of(1554, 7, 21);
- assertEquals(date.with(TemporalAdjuster.firstDayOfMonth()), HijrahDate.of(1554, 7, 1));
- assertEquals(date.with(TemporalAdjuster.lastDayOfMonth()), HijrahDate.of(1554, 7, 29));
- assertEquals(date.with(TemporalAdjuster.firstDayOfNextMonth()), HijrahDate.of(1554, 8, 1));
- assertEquals(date.with(TemporalAdjuster.firstDayOfNextYear()), HijrahDate.of(1555, 1, 1));
- assertEquals(date.with(TemporalAdjuster.firstDayOfYear()), HijrahDate.of(1554, 1, 1));
- assertEquals(date.with(TemporalAdjuster.lastDayOfYear()), HijrahDate.of(1554, 12, 30));
+ assertEquals(date.with(TemporalAdjusters.firstDayOfMonth()), HijrahDate.of(1554, 7, 1));
+ assertEquals(date.with(TemporalAdjusters.lastDayOfMonth()), HijrahDate.of(1554, 7, 29));
+ assertEquals(date.with(TemporalAdjusters.firstDayOfNextMonth()), HijrahDate.of(1554, 8, 1));
+ assertEquals(date.with(TemporalAdjusters.firstDayOfNextYear()), HijrahDate.of(1555, 1, 1));
+ assertEquals(date.with(TemporalAdjusters.firstDayOfYear()), HijrahDate.of(1554, 1, 1));
+ assertEquals(date.with(TemporalAdjusters.lastDayOfYear()), HijrahDate.of(1554, 12, 30));
}
// Data provider for string representation of the date instances
@@ -412,7 +412,7 @@
@Test(dataProvider="monthDays")
public void test_lastDayOfMonth(int year, int month, int numDays) {
HijrahDate hDate = HijrahChronology.INSTANCE.date(year, month, 1);
- hDate = hDate.with(TemporalAdjuster.lastDayOfMonth());
+ hDate = hDate.with(TemporalAdjusters.lastDayOfMonth());
assertEquals(hDate.get(ChronoField.DAY_OF_MONTH), numDays);
}
diff --git a/jdk/test/java/time/test/java/time/format/TestCharLiteralParser.java b/jdk/test/java/time/test/java/time/format/TestCharLiteralParser.java
index 92cd6f8..696aab0 100644
--- a/jdk/test/java/time/test/java/time/format/TestCharLiteralParser.java
+++ b/jdk/test/java/time/test/java/time/format/TestCharLiteralParser.java
@@ -66,7 +66,7 @@
import java.text.ParsePosition;
import java.time.temporal.TemporalAccessor;
-import java.time.temporal.TemporalQuery;
+import java.time.temporal.TemporalQueries;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -111,8 +111,8 @@
} else {
assertEquals(ppos.getIndex(), expectedPos);
assertEquals(parsed.isSupported(YEAR), false);
- assertEquals(parsed.query(TemporalQuery.chronology()), null);
- assertEquals(parsed.query(TemporalQuery.zoneId()), null);
+ assertEquals(parsed.query(TemporalQueries.chronology()), null);
+ assertEquals(parsed.query(TemporalQueries.zoneId()), null);
}
}
diff --git a/jdk/test/java/time/test/java/time/format/TestDateTimeFormatter.java b/jdk/test/java/time/test/java/time/format/TestDateTimeFormatter.java
index 540a0e8..1bfa479 100644
--- a/jdk/test/java/time/test/java/time/format/TestDateTimeFormatter.java
+++ b/jdk/test/java/time/test/java/time/format/TestDateTimeFormatter.java
@@ -61,12 +61,32 @@
import static java.time.temporal.ChronoField.DAY_OF_MONTH;
import static org.testng.Assert.assertSame;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
-import java.time.format.DecimalStyle;
+import java.time.DateTimeException;
+import java.time.DayOfWeek;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.Month;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.chrono.ThaiBuddhistChronology;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.DecimalStyle;
import java.time.format.SignStyle;
+import java.time.temporal.TemporalAccessor;
import java.util.Locale;
+import java.util.function.Function;
import org.testng.annotations.Test;
@@ -87,4 +107,93 @@
assertSame(test, base);
}
+ @Test
+ public void test_parse_errorMessage() throws Exception {
+ assertGoodErrorDate(DayOfWeek::from, "DayOfWeek");
+ assertGoodErrorDate(Month::from, "Month");
+ assertGoodErrorDate(YearMonth::from, "YearMonth");
+ assertGoodErrorDate(MonthDay::from, "MonthDay");
+ assertGoodErrorDate(LocalDate::from, "LocalDate");
+ assertGoodErrorDate(LocalTime::from, "LocalTime");
+ assertGoodErrorDate(LocalDateTime::from, "LocalDateTime");
+ assertGoodErrorDate(OffsetTime::from, "OffsetTime");
+ assertGoodErrorDate(OffsetDateTime::from, "OffsetDateTime");
+ assertGoodErrorDate(ZonedDateTime::from, "ZonedDateTime");
+ assertGoodErrorDate(Instant::from, "Instant");
+ assertGoodErrorDate(ZoneOffset::from, "ZoneOffset");
+ assertGoodErrorDate(ZoneId::from, "ZoneId");
+ assertGoodErrorDate(ThaiBuddhistChronology.INSTANCE::date, "");
+
+ assertGoodErrorTime(DayOfWeek::from, "DayOfWeek");
+ assertGoodErrorTime(Month::from, "Month");
+ assertGoodErrorTime(Year::from, "Year");
+ assertGoodErrorTime(YearMonth::from, "YearMonth");
+ assertGoodErrorTime(MonthDay::from, "MonthDay");
+ assertGoodErrorTime(LocalDate::from, "LocalDate");
+ assertGoodErrorTime(LocalTime::from, "LocalTime");
+ assertGoodErrorTime(LocalDateTime::from, "LocalDateTime");
+ assertGoodErrorTime(OffsetTime::from, "OffsetTime");
+ assertGoodErrorTime(OffsetDateTime::from, "OffsetDateTime");
+ assertGoodErrorTime(ZonedDateTime::from, "ZonedDateTime");
+ assertGoodErrorTime(Instant::from, "Instant");
+ assertGoodErrorTime(ZoneOffset::from, "ZoneOffset");
+ assertGoodErrorTime(ZoneId::from, "ZoneId");
+ assertGoodErrorTime(ThaiBuddhistChronology.INSTANCE::date, "");
+ }
+
+ private void assertGoodErrorDate(Function<TemporalAccessor, Object> function, String expectedText) {
+ DateTimeFormatter f = DateTimeFormatter.ofPattern("yyyy-mm-dd");
+ TemporalAccessor temporal = f.parse("2010-06-30");
+ try {
+ function.apply(temporal);
+ fail("Should have failed");
+ } catch (DateTimeException ex) {
+ String msg = ex.getMessage();
+ assertTrue(msg.contains(expectedText), msg);
+ assertTrue(msg.contains("Year"), msg);
+ assertTrue(msg.contains("MinuteOfHour"), msg);
+ assertTrue(msg.contains("DayOfMonth"), msg);
+ }
+ }
+
+ private void assertGoodErrorTime(Function<TemporalAccessor, Object> function, String expectedText) {
+ DateTimeFormatter f = DateTimeFormatter.ofPattern("HH:MM:ss");
+ TemporalAccessor temporal = f.parse("11:30:56");
+ try {
+ function.apply(temporal);
+ fail("Should have failed");
+ } catch (DateTimeException ex) {
+ String msg = ex.getMessage();
+ assertTrue(msg.contains(expectedText), msg);
+ assertTrue(msg.contains("HourOfDay"), msg);
+ assertTrue(msg.contains("MonthOfYear"), msg);
+ assertTrue(msg.contains("SecondOfMinute"), msg);
+ }
+ }
+
+ @Test
+ public void test_parsed_toString_resolvedTime() {
+ DateTimeFormatter f = DateTimeFormatter.ofPattern("HH:mm:ss");
+ TemporalAccessor temporal = f.parse("11:30:56");
+ String msg = temporal.toString();
+ assertTrue(msg.contains("11:30:56"), msg);
+ }
+
+ @Test
+ public void test_parsed_toString_resolvedDate() {
+ DateTimeFormatter f = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ TemporalAccessor temporal = f.parse("2010-06-30");
+ String msg = temporal.toString();
+ assertTrue(msg.contains("2010-06-30"), msg);
+ }
+
+ @Test
+ public void test_parsed_toString_resolvedDateTime() {
+ DateTimeFormatter f = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ TemporalAccessor temporal = f.parse("2010-06-30 11:30:56");
+ String msg = temporal.toString();
+ assertTrue(msg.contains("2010-06-30"), msg);
+ assertTrue(msg.contains("11:30:56"), msg);
+ }
+
}
diff --git a/jdk/test/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java b/jdk/test/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java
index bdaf22b..16a7d6e 100644
--- a/jdk/test/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java
+++ b/jdk/test/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java
@@ -267,12 +267,12 @@
//-----------------------------------------------------------------------
@Test(expectedExceptions=NullPointerException.class)
public void test_appendValueReduced_null() throws Exception {
- builder.appendValueReduced(null, 2, 2000);
+ builder.appendValueReduced(null, 2, 2, 2000);
}
@Test
public void test_appendValueReduced() throws Exception {
- builder.appendValueReduced(YEAR, 2, 2000);
+ builder.appendValueReduced(YEAR, 2, 2, 2000);
DateTimeFormatter f = builder.toFormatter();
assertEquals(f.toString(), "ReducedValue(Year,2,2,2000)");
TemporalAccessor parsed = f.parseUnresolved("12", new ParsePosition(0));
@@ -281,7 +281,7 @@
@Test
public void test_appendValueReduced_subsequent_parse() throws Exception {
- builder.appendValue(MONTH_OF_YEAR, 1, 2, SignStyle.NORMAL).appendValueReduced(YEAR, 2, 2000);
+ builder.appendValue(MONTH_OF_YEAR, 1, 2, SignStyle.NORMAL).appendValueReduced(YEAR, 2, 2, 2000);
DateTimeFormatter f = builder.toFormatter();
assertEquals(f.toString(), "Value(MonthOfYear,1,2,NORMAL)ReducedValue(Year,2,2,2000)");
ParsePosition ppos = new ParsePosition(0);
@@ -654,19 +654,19 @@
{"GGGGG", "Text(Era,NARROW)"},
{"u", "Value(Year)"},
- {"uu", "ReducedValue(Year,2,2,2000)"},
+ {"uu", "ReducedValue(Year,2,2,2000-01-01)"},
{"uuu", "Value(Year,3,19,NORMAL)"},
{"uuuu", "Value(Year,4,19,EXCEEDS_PAD)"},
{"uuuuu", "Value(Year,5,19,EXCEEDS_PAD)"},
{"y", "Value(YearOfEra)"},
- {"yy", "ReducedValue(YearOfEra,2,2,2000)"},
+ {"yy", "ReducedValue(YearOfEra,2,2,2000-01-01)"},
{"yyy", "Value(YearOfEra,3,19,NORMAL)"},
{"yyyy", "Value(YearOfEra,4,19,EXCEEDS_PAD)"},
{"yyyyy", "Value(YearOfEra,5,19,EXCEEDS_PAD)"},
{"Y", "Localized(WeekBasedYear)"},
- {"YY", "Localized(ReducedValue(WeekBasedYear,2,2000))"},
+ {"YY", "Localized(ReducedValue(WeekBasedYear,2,2,2000-01-01))"},
{"YYY", "Localized(WeekBasedYear,3,19,NORMAL)"},
{"YYYY", "Localized(WeekBasedYear,4,19,EXCEEDS_PAD)"},
{"YYYYY", "Localized(WeekBasedYear,5,19,EXCEEDS_PAD)"},
diff --git a/jdk/test/java/time/test/java/time/format/TestNonIsoFormatter.java b/jdk/test/java/time/test/java/time/format/TestNonIsoFormatter.java
index 7246a82..6747cdc 100644
--- a/jdk/test/java/time/test/java/time/format/TestNonIsoFormatter.java
+++ b/jdk/test/java/time/test/java/time/format/TestNonIsoFormatter.java
@@ -39,7 +39,7 @@
import java.time.format.FormatStyle;
import java.time.format.TextStyle;
import java.time.temporal.TemporalAccessor;
-import java.time.temporal.TemporalQuery;
+import java.time.temporal.TemporalQueries;
import java.util.Locale;
import org.testng.annotations.BeforeMethod;
@@ -163,7 +163,7 @@
String text = dtf.format(chrono.dateNow());
assertEquals(text, expected);
TemporalAccessor ta = dtf.parse(text);
- Chronology cal = ta.query(TemporalQuery.chronology());
+ Chronology cal = ta.query(TemporalQueries.chronology());
assertEquals(cal, chrono);
}
}
diff --git a/jdk/test/java/time/test/java/time/format/TestNumberParser.java b/jdk/test/java/time/test/java/time/format/TestNumberParser.java
index 3e657582..f3ac13b 100644
--- a/jdk/test/java/time/test/java/time/format/TestNumberParser.java
+++ b/jdk/test/java/time/test/java/time/format/TestNumberParser.java
@@ -72,7 +72,7 @@
import java.time.format.SignStyle;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalField;
-import java.time.temporal.TemporalQuery;
+import java.time.temporal.TemporalQueries;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -178,8 +178,8 @@
assertTrue(subsequentWidth >= 0);
assertEquals(ppos.getIndex(), expectedPos + subsequentWidth);
assertEquals(parsed.getLong(DAY_OF_MONTH), expectedValue);
- assertEquals(parsed.query(TemporalQuery.chronology()), null);
- assertEquals(parsed.query(TemporalQuery.zoneId()), null);
+ assertEquals(parsed.query(TemporalQueries.chronology()), null);
+ assertEquals(parsed.query(TemporalQueries.zoneId()), null);
}
}
@@ -198,8 +198,8 @@
assertTrue(subsequentWidth >= 0);
assertEquals(ppos.getIndex(), expectedPos + subsequentWidth);
assertEquals(parsed.getLong(DAY_OF_WEEK), expectedValue);
- assertEquals(parsed.query(TemporalQuery.chronology()), null);
- assertEquals(parsed.query(TemporalQuery.zoneId()), null);
+ assertEquals(parsed.query(TemporalQueries.chronology()), null);
+ assertEquals(parsed.query(TemporalQueries.zoneId()), null);
}
}
@@ -313,8 +313,8 @@
} else {
assertEquals(pos.getIndex(), parseLen);
assertEquals(parsed.getLong(DAY_OF_MONTH), (long)parseVal);
- assertEquals(parsed.query(TemporalQuery.chronology()), null);
- assertEquals(parsed.query(TemporalQuery.zoneId()), null);
+ assertEquals(parsed.query(TemporalQueries.chronology()), null);
+ assertEquals(parsed.query(TemporalQueries.zoneId()), null);
}
}
@@ -423,8 +423,8 @@
} else {
assertEquals(pos.getIndex(), parseLen);
assertEquals(parsed.getLong(DAY_OF_MONTH), (long)parseVal);
- assertEquals(parsed.query(TemporalQuery.chronology()), null);
- assertEquals(parsed.query(TemporalQuery.zoneId()), null);
+ assertEquals(parsed.query(TemporalQueries.chronology()), null);
+ assertEquals(parsed.query(TemporalQueries.zoneId()), null);
}
}
@@ -514,8 +514,8 @@
} else {
assertEquals(pos.getIndex(), parseLen);
assertEquals(parsed.getLong(DAY_OF_MONTH), (long)parseVal);
- assertEquals(parsed.query(TemporalQuery.chronology()), null);
- assertEquals(parsed.query(TemporalQuery.zoneId()), null);
+ assertEquals(parsed.query(TemporalQueries.chronology()), null);
+ assertEquals(parsed.query(TemporalQueries.zoneId()), null);
}
}
@@ -552,8 +552,8 @@
assertEquals(pos.getIndex(), parseLen);
assertEquals(parsed.getLong(MONTH_OF_YEAR), (long) parseMonth);
assertEquals(parsed.getLong(DAY_OF_MONTH), (long) parsedDay);
- assertEquals(parsed.query(TemporalQuery.chronology()), null);
- assertEquals(parsed.query(TemporalQuery.zoneId()), null);
+ assertEquals(parsed.query(TemporalQueries.chronology()), null);
+ assertEquals(parsed.query(TemporalQueries.zoneId()), null);
}
}
diff --git a/jdk/test/java/time/test/java/time/format/TestReducedParser.java b/jdk/test/java/time/test/java/time/format/TestReducedParser.java
index 237b5b9..ae4ff98 100644
--- a/jdk/test/java/time/test/java/time/format/TestReducedParser.java
+++ b/jdk/test/java/time/test/java/time/format/TestReducedParser.java
@@ -64,11 +64,20 @@
import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
import static java.time.temporal.ChronoField.YEAR;
import static java.time.temporal.ChronoField.YEAR_OF_ERA;
+import static java.time.temporal.ChronoUnit.YEARS;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.assertNotNull;
import java.text.ParsePosition;
+import java.time.LocalDate;
+import java.time.chrono.Chronology;
+import java.time.chrono.ChronoLocalDate;
+import java.time.chrono.HijrahChronology;
+import java.time.chrono.IsoChronology;
+import java.time.chrono.JapaneseChronology;
+import java.time.chrono.MinguoChronology;
+import java.time.chrono.ThaiBuddhistChronology;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.temporal.TemporalAccessor;
@@ -86,13 +95,17 @@
private static final boolean LENIENT = false;
private DateTimeFormatter getFormatter0(TemporalField field, int width, int baseValue) {
- return builder.appendValueReduced(field, width, baseValue).toFormatter(locale).withDecimalStyle(decimalStyle);
+ return builder.appendValueReduced(field, width, width, baseValue).toFormatter(locale).withDecimalStyle(decimalStyle);
}
private DateTimeFormatter getFormatter0(TemporalField field, int minWidth, int maxWidth, int baseValue) {
return builder.appendValueReduced(field, minWidth, maxWidth, baseValue).toFormatter(locale).withDecimalStyle(decimalStyle);
}
+ private DateTimeFormatter getFormatterBaseDate(TemporalField field, int minWidth, int maxWidth, int baseValue) {
+ return builder.appendValueReduced(field, minWidth, maxWidth, LocalDate.of(baseValue, 1, 1)).toFormatter(locale).withDecimalStyle(decimalStyle);
+ }
+
//-----------------------------------------------------------------------
@DataProvider(name="error")
Object[][] data_error() {
@@ -243,6 +256,10 @@
// Negative baseValue
{YEAR, 2, 4, -2005, "123", 0, strict(3, 123), lenient(3, 123)},
+
+ // Basics
+ {YEAR, 2, 4, 2010, "10", 0, strict(2, 2010), lenient(2, 2010)},
+ {YEAR, 2, 4, 2010, "09", 0, strict(2, 2109), lenient(2, 2109)},
};
}
@@ -264,6 +281,21 @@
}
}
+ @Test(dataProvider="ParseLenientSensitive")
+ public void test_parseStrict_baseDate(TemporalField field, int minWidth, int maxWidth, int baseValue, String input, int pos,
+ Pair strict, Pair lenient) {
+ ParsePosition ppos = new ParsePosition(pos);
+ setStrict(true);
+ TemporalAccessor parsed = getFormatterBaseDate(field, minWidth, maxWidth, baseValue).parseUnresolved(input, ppos);
+ if (ppos.getErrorIndex() != -1) {
+ assertEquals(ppos.getErrorIndex(), strict.parseLen, "error case parse position");
+ assertEquals(parsed, strict.parseVal, "unexpected parse result");
+ } else {
+ assertEquals(ppos.getIndex(), strict.parseLen, "parse position");
+ assertParsed(parsed, YEAR, strict.parseVal != null ? (long) strict.parseVal : null);
+ }
+ }
+
//-----------------------------------------------------------------------
// Parsing tests for lenient mode
//-----------------------------------------------------------------------
@@ -282,6 +314,21 @@
}
}
+ @Test(dataProvider="ParseLenientSensitive")
+ public void test_parseLenient_baseDate(TemporalField field, int minWidth, int maxWidth, int baseValue, String input, int pos,
+ Pair strict, Pair lenient) {
+ ParsePosition ppos = new ParsePosition(pos);
+ setStrict(false);
+ TemporalAccessor parsed = getFormatterBaseDate(field, minWidth, maxWidth, baseValue).parseUnresolved(input, ppos);
+ if (ppos.getErrorIndex() != -1) {
+ assertEquals(ppos.getErrorIndex(), lenient.parseLen, "error case parse position");
+ assertEquals(parsed, lenient.parseVal, "unexpected parse result");
+ } else {
+ assertEquals(ppos.getIndex(), lenient.parseLen, "parse position");
+ assertParsed(parsed, YEAR, lenient.parseVal != null ? (long) lenient.parseVal : null);
+ }
+ }
+
private void assertParsed(TemporalAccessor parsed, TemporalField field, Long value) {
if (value == null) {
assertEquals(parsed, null, "Parsed Value");
@@ -335,6 +382,68 @@
}
//-----------------------------------------------------------------------
+ // Cases and values in reduced value parsing mode
+ //-----------------------------------------------------------------------
+ @DataProvider(name="ReducedWithChrono")
+ Object[][] provider_reducedWithChrono() {
+ LocalDate baseYear = LocalDate.of(2000, 1, 1);
+ return new Object[][] {
+ {IsoChronology.INSTANCE.date(baseYear)},
+ {IsoChronology.INSTANCE.date(baseYear).plus(1, YEARS)},
+ {IsoChronology.INSTANCE.date(baseYear).plus(99, YEARS)},
+ {HijrahChronology.INSTANCE.date(baseYear)},
+ {HijrahChronology.INSTANCE.date(baseYear).plus(1, YEARS)},
+ {HijrahChronology.INSTANCE.date(baseYear).plus(99, YEARS)},
+ {JapaneseChronology.INSTANCE.date(baseYear)},
+ {JapaneseChronology.INSTANCE.date(baseYear).plus(1, YEARS)},
+ {JapaneseChronology.INSTANCE.date(baseYear).plus(99, YEARS)},
+ {MinguoChronology.INSTANCE.date(baseYear)},
+ {MinguoChronology.INSTANCE.date(baseYear).plus(1, YEARS)},
+ {MinguoChronology.INSTANCE.date(baseYear).plus(99, YEARS)},
+ {ThaiBuddhistChronology.INSTANCE.date(baseYear)},
+ {ThaiBuddhistChronology.INSTANCE.date(baseYear).plus(1, YEARS)},
+ {ThaiBuddhistChronology.INSTANCE.date(baseYear).plus(99, YEARS)},
+ };
+ }
+
+ @Test(dataProvider="ReducedWithChrono")
+ public void test_reducedWithChronoYear(ChronoLocalDate date) {
+ Chronology chrono = date.getChronology();
+ DateTimeFormatter df
+ = new DateTimeFormatterBuilder().appendValueReduced(YEAR, 2, 2, LocalDate.of(2000, 1, 1))
+ .toFormatter()
+ .withChronology(chrono);
+ int expected = date.get(YEAR);
+ String input = df.format(date);
+
+ ParsePosition pos = new ParsePosition(0);
+ TemporalAccessor parsed = df.parseUnresolved(input, pos);
+ int actual = parsed.get(YEAR);
+ assertEquals(actual, expected,
+ String.format("Wrong date parsed, chrono: %s, input: %s",
+ chrono, input));
+
+ }
+ @Test(dataProvider="ReducedWithChrono")
+ public void test_reducedWithChronoYearOfEra(ChronoLocalDate date) {
+ Chronology chrono = date.getChronology();
+ DateTimeFormatter df
+ = new DateTimeFormatterBuilder().appendValueReduced(YEAR_OF_ERA, 2, 2, LocalDate.of(2000, 1, 1))
+ .toFormatter()
+ .withChronology(chrono);
+ int expected = date.get(YEAR_OF_ERA);
+ String input = df.format(date);
+
+ ParsePosition pos = new ParsePosition(0);
+ TemporalAccessor parsed = df.parseUnresolved(input, pos);
+ int actual = parsed.get(YEAR_OF_ERA);
+ assertEquals(actual, expected,
+ String.format("Wrong date parsed, chrono: %s, input: %s",
+ chrono, input));
+
+ }
+
+ //-----------------------------------------------------------------------
// Class to structure the test data
//-----------------------------------------------------------------------
diff --git a/jdk/test/java/time/test/java/time/format/TestReducedPrinter.java b/jdk/test/java/time/test/java/time/format/TestReducedPrinter.java
index c23cff2..c4b6cf4 100644
--- a/jdk/test/java/time/test/java/time/format/TestReducedPrinter.java
+++ b/jdk/test/java/time/test/java/time/format/TestReducedPrinter.java
@@ -59,19 +59,15 @@
*/
package test.java.time.format;
-import java.text.ParsePosition;
import static java.time.temporal.ChronoField.YEAR;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.fail;
import java.time.DateTimeException;
import java.time.LocalDate;
+import java.time.chrono.MinguoDate;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
-import static java.time.temporal.ChronoField.DAY_OF_MONTH;
-import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
-import static java.time.temporal.ChronoField.YEAR_OF_ERA;
-import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalField;
import org.testng.annotations.DataProvider;
@@ -85,13 +81,17 @@
public class TestReducedPrinter extends AbstractTestPrinterParser {
private DateTimeFormatter getFormatter0(TemporalField field, int width, int baseValue) {
- return builder.appendValueReduced(field, width, baseValue).toFormatter(locale).withDecimalStyle(decimalStyle);
+ return builder.appendValueReduced(field, width, width, baseValue).toFormatter(locale).withDecimalStyle(decimalStyle);
}
private DateTimeFormatter getFormatter0(TemporalField field, int minWidth, int maxWidth, int baseValue) {
return builder.appendValueReduced(field, minWidth, maxWidth, baseValue).toFormatter(locale).withDecimalStyle(decimalStyle);
}
+ private DateTimeFormatter getFormatterBaseDate(TemporalField field, int minWidth, int maxWidth, int baseValue) {
+ return builder.appendValueReduced(field, minWidth, maxWidth, LocalDate.of(baseValue, 1, 1)).toFormatter(locale).withDecimalStyle(decimalStyle);
+ }
+
//-----------------------------------------------------------------------
@Test(expectedExceptions=DateTimeException.class)
public void test_print_emptyCalendrical() throws Exception {
@@ -192,6 +192,58 @@
}
}
+ @Test(dataProvider="Pivot")
+ public void test_pivot_baseDate(int minWidth, int maxWidth, int baseValue, int value, String result) throws Exception {
+ try {
+ getFormatterBaseDate(YEAR, minWidth, maxWidth, baseValue).formatTo(new MockFieldValue(YEAR, value), buf);
+ if (result == null) {
+ fail("Expected exception");
+ }
+ assertEquals(buf.toString(), result);
+ } catch (DateTimeException ex) {
+ if (result == null || value < 0) {
+ assertEquals(ex.getMessage().contains(YEAR.toString()), true);
+ } else {
+ throw ex;
+ }
+ }
+ }
+
+ //-----------------------------------------------------------------------
+ public void test_minguoChrono_fixedWidth() throws Exception {
+ // ISO 2021 is Minguo 110
+ DateTimeFormatter f = getFormatterBaseDate(YEAR, 2, 2, 2021);
+ MinguoDate date = MinguoDate.of(109, 6, 30);
+ assertEquals(f.format(date), "09");
+ date = MinguoDate.of(110, 6, 30);
+ assertEquals(f.format(date), "10");
+ date = MinguoDate.of(199, 6, 30);
+ assertEquals(f.format(date), "99");
+ date = MinguoDate.of(200, 6, 30);
+ assertEquals(f.format(date), "00");
+ date = MinguoDate.of(209, 6, 30);
+ assertEquals(f.format(date), "09");
+ date = MinguoDate.of(210, 6, 30);
+ assertEquals(f.format(date), "10");
+ }
+
+ public void test_minguoChrono_extendedWidth() throws Exception {
+ // ISO 2021 is Minguo 110
+ DateTimeFormatter f = getFormatterBaseDate(YEAR, 2, 4, 2021);
+ MinguoDate date = MinguoDate.of(109, 6, 30);
+ assertEquals(f.format(date), "109");
+ date = MinguoDate.of(110, 6, 30);
+ assertEquals(f.format(date), "10");
+ date = MinguoDate.of(199, 6, 30);
+ assertEquals(f.format(date), "99");
+ date = MinguoDate.of(200, 6, 30);
+ assertEquals(f.format(date), "00");
+ date = MinguoDate.of(209, 6, 30);
+ assertEquals(f.format(date), "09");
+ date = MinguoDate.of(210, 6, 30);
+ assertEquals(f.format(date), "210");
+ }
+
//-----------------------------------------------------------------------
public void test_toString() throws Exception {
assertEquals(getFormatter0(YEAR, 2, 2, 2005).toString(), "ReducedValue(Year,2,2,2005)");
diff --git a/jdk/test/java/time/test/java/time/format/TestStringLiteralParser.java b/jdk/test/java/time/test/java/time/format/TestStringLiteralParser.java
index 8b62441..f8f5147 100644
--- a/jdk/test/java/time/test/java/time/format/TestStringLiteralParser.java
+++ b/jdk/test/java/time/test/java/time/format/TestStringLiteralParser.java
@@ -66,7 +66,7 @@
import java.text.ParsePosition;
import java.time.temporal.TemporalAccessor;
-import java.time.temporal.TemporalQuery;
+import java.time.temporal.TemporalQueries;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -114,8 +114,8 @@
} else {
assertEquals(ppos.getIndex(), expectedPos);
assertEquals(parsed.isSupported(YEAR), false);
- assertEquals(parsed.query(TemporalQuery.chronology()), null);
- assertEquals(parsed.query(TemporalQuery.zoneId()), null);
+ assertEquals(parsed.query(TemporalQueries.chronology()), null);
+ assertEquals(parsed.query(TemporalQueries.zoneId()), null);
}
}
diff --git a/jdk/test/java/time/test/java/time/format/TestZoneTextPrinterParser.java b/jdk/test/java/time/test/java/time/format/TestZoneTextPrinterParser.java
index 7ab8804..6e37235 100644
--- a/jdk/test/java/time/test/java/time/format/TestZoneTextPrinterParser.java
+++ b/jdk/test/java/time/test/java/time/format/TestZoneTextPrinterParser.java
@@ -33,7 +33,7 @@
import java.time.format.DateTimeFormatterBuilder;
import java.time.format.TextStyle;
import java.time.temporal.ChronoField;
-import java.time.temporal.TemporalQuery;
+import java.time.temporal.TemporalQueries;
import java.time.zone.ZoneRulesProvider;
import java.util.Arrays;
import java.util.Date;
@@ -150,7 +150,7 @@
.toFormatter(locale)
.withDecimalStyle(DecimalStyle.of(locale));
- String ret = fmt.parse(text, TemporalQuery.zone()).getId();
+ String ret = fmt.parse(text, TemporalQueries.zone()).getId();
System.out.printf("[%-5s %s] %24s -> %s(%s)%n",
locale.toString(),
@@ -186,7 +186,7 @@
if (ci) {
text = text.toUpperCase();
}
- String ret = fmt.parse(text, TemporalQuery.zone()).getId();
+ String ret = fmt.parse(text, TemporalQueries.zone()).getId();
// TBD: need an excluding list
// assertEquals(...);
if (ret.equals(expected) ||
diff --git a/jdk/test/java/time/test/java/util/TestFormatter.java b/jdk/test/java/time/test/java/util/TestFormatter.java
index 4c3ac4b..ac183ba 100644
--- a/jdk/test/java/time/test/java/util/TestFormatter.java
+++ b/jdk/test/java/time/test/java/util/TestFormatter.java
@@ -36,7 +36,7 @@
import java.time.chrono.Chronology;
import java.time.temporal.ChronoField;
-import java.time.temporal.TemporalQuery;
+import java.time.temporal.TemporalQueries;
import java.time.temporal.TemporalAccessor;
import java.util.*;
@@ -134,7 +134,7 @@
Class<?> c = o.getClass();
String clname = c.getName().substring(c.getPackage().getName().length() + 1);
if (o instanceof TemporalAccessor) {
- Chronology chrono = ((TemporalAccessor)o).query(TemporalQuery.chronology());
+ Chronology chrono = ((TemporalAccessor)o).query(TemporalQueries.chronology());
if (chrono != null) {
clname = clname + "(" + chrono.getId() + ")";
}
diff --git a/jdk/test/java/util/Collection/MOAT.java b/jdk/test/java/util/Collection/MOAT.java
index 945335a..ea53e5e 100644
--- a/jdk/test/java/util/Collection/MOAT.java
+++ b/jdk/test/java/util/Collection/MOAT.java
@@ -26,7 +26,7 @@
* @bug 6207984 6272521 6192552 6269713 6197726 6260652 5073546 4137464
* 4155650 4216399 4294891 6282555 6318622 6355327 6383475 6420753
* 6431845 4802633 6570566 6570575 6570631 6570924 6691185 6691215
- * 4802647 7123424
+ * 4802647 7123424 8024709
* @summary Run many tests on many Collection and Map implementations
* @author Martin Buchholz
* @run main MOAT
@@ -1171,8 +1171,45 @@
THROWS(NoSuchElementException.class,
new Fun(){void f(){it.next();}});
}
- }
+ prepMapForDescItrTests(m);
+ checkDescItrRmFirst(m.keySet(), m.navigableKeySet().descendingIterator());
+ prepMapForDescItrTests(m);
+ checkDescItrRmMid(m.keySet(), m.navigableKeySet().descendingIterator());
+ prepMapForDescItrTests(m);
+ checkDescItrRmLast(m.keySet(), m.navigableKeySet().descendingIterator());
+
+ prepMapForDescItrTests(m);
+ checkDescItrRmFirst(m.keySet(), m.descendingMap().keySet().iterator());
+ prepMapForDescItrTests(m);
+ checkDescItrRmMid(m.keySet(), m.descendingMap().keySet().iterator());
+ prepMapForDescItrTests(m);
+ checkDescItrRmLast(m.keySet(), m.descendingMap().keySet().iterator());
+
+ prepMapForDescItrTests(m);
+ checkDescItrRmFirst(m.keySet(), m.descendingKeySet().iterator());
+ prepMapForDescItrTests(m);
+ checkDescItrRmMid(m.keySet(), m.descendingKeySet().iterator());
+ prepMapForDescItrTests(m);
+ checkDescItrRmLast(m.keySet(), m.descendingKeySet().iterator());
+
+ prepMapForDescItrTests(m);
+ checkDescItrRmFirst(m.values(), m.descendingMap().values().iterator());
+ prepMapForDescItrTests(m);
+ checkDescItrRmMid(m.values(), m.descendingMap().values().iterator());
+ prepMapForDescItrTests(m);
+ checkDescItrRmLast(m.values(), m.descendingMap().values().iterator());
+
+ prepMapForDescItrTests(m);
+ checkDescItrRmFirst((Collection)m.entrySet(),
+ m.descendingMap().entrySet().iterator());
+ prepMapForDescItrTests(m);
+ checkDescItrRmMid((Collection)m.entrySet(),
+ m.descendingMap().entrySet().iterator());
+ prepMapForDescItrTests(m);
+ checkDescItrRmLast((Collection)m.entrySet(),
+ m.descendingMap().entrySet().iterator());
+ }
private static void testNavigableSet(NavigableSet<Integer> s) {
clear(s);
@@ -1205,6 +1242,87 @@
THROWS(NoSuchElementException.class,
new Fun(){void f(){it.next();}});
}
+
+ prepSetForDescItrTests(s);
+ checkDescItrRmFirst(s, s.descendingIterator());
+ prepSetForDescItrTests(s);
+ checkDescItrRmMid(s, s.descendingIterator());
+ prepSetForDescItrTests(s);
+ checkDescItrRmLast(s, s.descendingIterator());
+
+ prepSetForDescItrTests(s);
+ checkDescItrRmFirst(s, s.descendingSet().iterator());
+ prepSetForDescItrTests(s);
+ checkDescItrRmMid(s, s.descendingSet().iterator());
+ prepSetForDescItrTests(s);
+ checkDescItrRmLast(s, s.descendingSet().iterator());
+ }
+
+ private static void prepSetForDescItrTests(Set s) {
+ clear(s);
+ check(s.add(1));
+ check(s.add(3));
+ check(s.add(5));
+ }
+
+ private static void prepMapForDescItrTests(Map m) {
+ clear(m);
+ equal(m.put(1, 2), null);
+ equal(m.put(3, 4), null);
+ equal(m.put(5, 9), null);
+ }
+
+ //--------------------------------------------------------------------
+ // Check behavior of descending iterator when first element is removed
+ //--------------------------------------------------------------------
+ private static <T> void checkDescItrRmFirst(Collection<T> ascColl,
+ Iterator<T> descItr) {
+ T[] expected = (T[]) ascColl.toArray();
+ int idx = expected.length -1;
+
+ equalNext(descItr, expected[idx--]);
+ descItr.remove();
+ while(idx >= 0 && descItr.hasNext()) {
+ equalNext(descItr, expected[idx--]);
+ }
+ equal(descItr.hasNext(), false);
+ equal(idx, -1);
+ }
+
+ //-----------------------------------------------------------------------
+ // Check behavior of descending iterator when a middle element is removed
+ //-----------------------------------------------------------------------
+ private static <T> void checkDescItrRmMid(Collection<T> ascColl,
+ Iterator<T> descItr) {
+ T[] expected = (T[]) ascColl.toArray();
+ int idx = expected.length -1;
+
+ while (idx >= expected.length / 2) {
+ equalNext(descItr, expected[idx--]);
+ }
+ descItr.remove();
+ while (idx >= 0 && descItr.hasNext()) {
+ equalNext(descItr, expected[idx--]);
+ }
+ equal(descItr.hasNext(), false);
+ equal(idx, -1);
+ }
+
+ //-----------------------------------------------------------------------
+ // Check behavior of descending iterator when the last element is removed
+ //-----------------------------------------------------------------------
+ private static <T> void checkDescItrRmLast(Collection<T> ascColl,
+ Iterator<T> descItr) {
+ T[] expected = (T[]) ascColl.toArray();
+ int idx = expected.length -1;
+
+ while (idx >= 0 && descItr.hasNext()) {
+ equalNext(descItr, expected[idx--]);
+ }
+ equal(idx, -1);
+ equal(descItr.hasNext(), false);
+ descItr.remove();
+ equal(ascColl.contains(expected[0]), false);
}
//--------------------- Infrastructure ---------------------------
diff --git a/jdk/test/java/util/HashSet/Serialization.java b/jdk/test/java/util/HashSet/Serialization.java
new file mode 100644
index 0000000..7597ae1
--- /dev/null
+++ b/jdk/test/java/util/HashSet/Serialization.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.HashSet;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+
+/*
+ * @test
+ * @bug 8016252
+ * @summary Verify that a serialized HashSet may successfully be deserialized.
+ */
+public class Serialization {
+
+ private static final int NUM_SETS = 43;
+ private static final int MAX_CAPACITY = 257;
+ private static final float MAX_LOAD_FACTOR = 100.0F;
+
+ private static final Random rnd = ThreadLocalRandom.current();
+
+ private static HashSet<Integer> createHashSet() {
+ int capacity = rnd.nextInt(MAX_CAPACITY);
+ float loadFactor = Float.MIN_VALUE + rnd.nextFloat()*MAX_LOAD_FACTOR;
+ HashSet<Integer> hashSet = new HashSet<Integer>(capacity, loadFactor);
+ float multiplier = 2*rnd.nextFloat(); // range [0,2]
+ int size = (int)(capacity*loadFactor*multiplier);
+ for (int i = 0; i < size; i++) {
+ hashSet.add(rnd.nextInt());
+ }
+ return hashSet;
+ }
+
+ private static HashSet<Integer> serDeser(HashSet<Integer> hashSet) throws IOException, ClassNotFoundException {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(hashSet);
+ oos.flush();
+
+ ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+ ObjectInputStream ois = new ObjectInputStream(bais);
+ HashSet<Integer> result = (HashSet<Integer>)ois.readObject();
+
+ oos.close();
+ ois.close();
+
+ return result;
+ }
+
+ private static void printHashSet(HashSet<Integer> hashSet) {
+ System.err.println("Size: "+hashSet.size());
+ for (Object o : hashSet) {
+ System.err.println(o);
+ }
+ }
+
+ public static void main(String[] args) {
+ int failures = 0;
+
+ for (int i = 0; i < NUM_SETS; i++) {
+ HashSet<Integer> hashSet = createHashSet();
+
+ HashSet<Integer> result = null;
+ try {
+ result = serDeser(hashSet);
+ } catch (IOException ioe) {
+ System.err.println(ioe);
+ failures++;
+ } catch (ClassNotFoundException cnfe) {
+ System.err.println(cnfe);
+ failures++;
+ }
+
+ if (!hashSet.equals(result)) {
+ System.err.println("Unequal HashSets!");
+ printHashSet(hashSet);
+ System.err.println();
+ failures++;
+ }
+ }
+
+ if (failures != 0) {
+ throw new RuntimeException("HashSet/Serialzation failed with "+
+ failures+" failures!");
+ }
+ }
+}
diff --git a/jdk/test/java/util/Locale/Bug8025703.java b/jdk/test/java/util/Locale/Bug8025703.java
new file mode 100644
index 0000000..8a694ae
--- /dev/null
+++ b/jdk/test/java/util/Locale/Bug8025703.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2013, 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 8025703
+ * @summary Verify implementation for Locale matching.
+ * @run main Bug8025703
+ */
+
+import java.util.*;
+import java.util.Locale.LanguageRange;
+
+public class Bug8025703 {
+
+ public static void main(String[] args) {
+ boolean err = false;
+
+ String[][] mappings = {{"ilw", "gal"},
+ {"meg", "cir"},
+ {"pcr", "adx"},
+ {"xia", "acn"},
+ {"yos", "zom"}};
+
+ for (int i = 0; i < mappings.length; i++) {
+ List<LanguageRange> got = LanguageRange.parse(mappings[i][0]);
+ ArrayList<LanguageRange> expected = new ArrayList<>();
+ expected.add(new LanguageRange(mappings[i][0], 1.0));
+ expected.add(new LanguageRange(mappings[i][1], 1.0));
+
+ if (!expected.equals(got)) {
+ err = true;
+ System.err.println("Incorrect language ranges. ");
+ for (LanguageRange lr : expected) {
+ System.err.println(" Expected: range="
+ + lr.getRange() + ", weight=" + lr.getWeight());
+ }
+ for (LanguageRange lr : got) {
+ System.err.println(" Got: range="
+ + lr.getRange() + ", weight=" + lr.getWeight());
+ }
+ }
+ }
+
+ if (err) {
+ throw new RuntimeException("Failed.");
+ }
+ }
+
+}
+
diff --git a/jdk/test/java/util/Locale/tools/language-subtag-registry.txt b/jdk/test/java/util/Locale/tools/language-subtag-registry.txt
index d7e1d33..916cb10 100644
--- a/jdk/test/java/util/Locale/tools/language-subtag-registry.txt
+++ b/jdk/test/java/util/Locale/tools/language-subtag-registry.txt
@@ -1,4 +1,4 @@
-File-Date: 2012-09-04
+File-Date: 2013-09-23
%%
Type: language
Subtag: aa
@@ -3103,7 +3103,7 @@
%%
Type: language
Subtag: asj
-Description: Nsari
+Description: Sari
Added: 2009-07-29
%%
Type: language
@@ -3622,13 +3622,18 @@
Added: 2009-07-29
%%
Type: language
+Subtag: axl
+Description: Lower Southern Aranda
+Added: 2013-09-10
+%%
+Type: language
Subtag: axm
Description: Middle Armenian
Added: 2009-07-29
%%
Type: language
Subtag: axx
-Description: Xaragure
+Description: Xârâgurè
Added: 2009-07-29
%%
Type: language
@@ -5021,6 +5026,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: bjp
+Description: Fanamaket
+Added: 2013-09-10
+%%
+Type: language
Subtag: bjq
Description: Southern Betsimisaraka Malagasy
Added: 2009-07-29
@@ -5705,7 +5715,7 @@
%%
Type: language
Subtag: bpa
-Description: Dakaka
+Description: Daakaka
Added: 2009-07-29
%%
Type: language
@@ -5741,6 +5751,7 @@
Type: language
Subtag: bpk
Description: Orowe
+Description: 'Ôrôê
Added: 2009-07-29
%%
Type: language
@@ -5831,6 +5842,7 @@
Type: language
Subtag: bqc
Description: Boko (Benin)
+Description: Boo
Added: 2009-07-29
%%
Type: language
@@ -6523,6 +6535,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: bvp
+Description: Bumang
+Added: 2013-09-10
+%%
+Type: language
Subtag: bvq
Description: Birri
Added: 2009-07-29
@@ -6696,7 +6713,7 @@
%%
Type: language
Subtag: bxa
-Description: Bauro
+Description: Tairaha
Added: 2009-07-29
%%
Type: language
@@ -6722,7 +6739,9 @@
Type: language
Subtag: bxf
Description: Bilur
+Description: Minigir
Added: 2009-07-29
+Comments: see also vmg
%%
Type: language
Subtag: bxg
@@ -7054,7 +7073,7 @@
%%
Type: language
Subtag: bzv
-Description: Bebe
+Description: Naami
Added: 2009-07-29
%%
Type: language
@@ -7700,6 +7719,8 @@
Type: language
Subtag: cir
Description: Tiri
+Description: Haméa
+Description: Méa
Added: 2009-07-29
%%
Type: language
@@ -7805,6 +7826,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: ckn
+Description: Kaang Chin
+Added: 2013-09-10
+%%
+Type: language
Subtag: cko
Description: Anufo
Added: 2009-07-29
@@ -8229,6 +8255,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: cpo
+Description: Kpeego
+Added: 2013-09-10
+%%
+Type: language
Subtag: cpp
Description: Portuguese-based creoles and pidgins
Added: 2005-10-16
@@ -8441,6 +8472,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: csj
+Description: Songlai Chin
+Added: 2013-09-10
+%%
+Type: language
Subtag: csk
Description: Jola-Kasa
Added: 2009-07-29
@@ -8800,6 +8836,8 @@
Subtag: daf
Description: Dan
Added: 2009-07-29
+Deprecated: 2013-09-10
+Comments: see dnj, lda
%%
Type: language
Subtag: dag
@@ -8897,7 +8935,7 @@
%%
Type: language
Subtag: dba
-Description: Bangi Me
+Description: Bangime
Added: 2009-07-29
%%
Type: language
@@ -9221,7 +9259,7 @@
%%
Type: language
Subtag: dgt
-Description: Ndrag'ngith
+Description: Ndra'ngith
Added: 2012-08-12
%%
Type: language
@@ -9258,6 +9296,7 @@
%%
Type: language
Subtag: dhg
+Description: Djangu
Description: Dhangu
Added: 2009-07-29
%%
@@ -9304,6 +9343,7 @@
Type: language
Subtag: dhv
Description: Dehu
+Description: Drehu
Added: 2009-07-29
%%
Type: language
@@ -9312,6 +9352,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: dhx
+Description: Dhungaloo
+Added: 2013-09-10
+%%
+Type: language
Subtag: dia
Description: Dia
Added: 2009-07-29
@@ -9489,6 +9534,8 @@
Subtag: djl
Description: Djiwarli
Added: 2009-07-29
+Deprecated: 2013-09-10
+Comments: see dze, iin
%%
Type: language
Subtag: djm
@@ -9559,6 +9606,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: dlk
+Description: Dahalik
+Added: 2013-09-10
+%%
+Type: language
Subtag: dlm
Description: Dalmatian
Added: 2009-07-29
@@ -9580,7 +9632,7 @@
%%
Type: language
Subtag: dmc
-Description: Dimir
+Description: Gavak
Added: 2009-07-29
%%
Type: language
@@ -9646,6 +9698,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: dmw
+Description: Mudburra
+Added: 2013-09-10
+%%
+Type: language
Subtag: dmx
Description: Dema
Added: 2009-07-29
@@ -9682,6 +9739,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: dnj
+Description: Dan
+Added: 2013-09-10
+%%
+Type: language
Subtag: dnk
Description: Dengka
Added: 2009-07-29
@@ -10067,6 +10129,7 @@
Type: language
Subtag: duf
Description: Dumbea
+Description: Drubea
Added: 2009-07-29
%%
Type: language
@@ -10259,6 +10322,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: dze
+Description: Djiwarli
+Added: 2013-09-10
+%%
+Type: language
Subtag: dzg
Description: Dazaga
Added: 2009-07-29
@@ -10274,6 +10342,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: eaa
+Description: Karenggapa
+Added: 2013-09-10
+%%
+Type: language
Subtag: ebg
Description: Ebughu
Added: 2009-07-29
@@ -10392,6 +10465,11 @@
Added: 2005-10-16
%%
Type: language
+Subtag: ekc
+Description: Eastern Karnic
+Added: 2013-09-10
+%%
+Type: language
Subtag: eke
Description: Ekit
Added: 2009-07-29
@@ -10859,6 +10937,11 @@
Macrolanguage: kln
%%
Type: language
+Subtag: eza
+Description: Ezaa
+Added: 2013-09-10
+%%
+Type: language
Subtag: eze
Description: Uzekwe
Added: 2009-07-29
@@ -10870,7 +10953,7 @@
%%
Type: language
Subtag: fab
-Description: Fa D'ambu
+Description: Fa d'Ambu
Added: 2009-07-29
%%
Type: language
@@ -11374,7 +11457,7 @@
%%
Type: language
Subtag: gal
-Description: Galoli
+Description: Galolen
Added: 2009-07-29
%%
Type: language
@@ -11564,6 +11647,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: gbw
+Description: Gabi-Gabi
+Added: 2013-09-10
+%%
+Type: language
Subtag: gbx
Description: Eastern Xwla Gbe
Added: 2009-07-29
@@ -11710,6 +11798,11 @@
Added: 2012-08-12
%%
Type: language
+Subtag: gdt
+Description: Kungardutyi
+Added: 2013-09-10
+%%
+Type: language
Subtag: gdu
Description: Gudu
Added: 2009-07-29
@@ -11872,6 +11965,8 @@
Subtag: ggr
Description: Aghu Tharnggalu
Added: 2009-07-29
+Deprecated: 2013-09-10
+Comments: see ggm, gtu, ikr
%%
Type: language
Subtag: ggt
@@ -11881,6 +11976,7 @@
Type: language
Subtag: ggu
Description: Gagu
+Description: Gban
Added: 2009-07-29
%%
Type: language
@@ -11970,6 +12066,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: gih
+Description: Githabul
+Added: 2013-09-10
+%%
+Type: language
Subtag: gil
Description: Gilbertese
Added: 2005-10-16
@@ -12052,6 +12153,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: gjm
+Description: Gunditjmara
+Added: 2013-09-10
+%%
+Type: language
Subtag: gjn
Description: Gonja
Added: 2009-07-29
@@ -12119,6 +12225,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: gll
+Description: Garlali
+Added: 2013-09-10
+%%
+Type: language
Subtag: glo
Description: Galambu
Added: 2009-07-29
@@ -12218,6 +12329,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: gmz
+Description: Mgbolizhia
+Added: 2013-09-10
+%%
+Type: language
Subtag: gna
Description: Kaansa
Added: 2009-07-29
@@ -12651,6 +12767,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: gtu
+Description: Aghu-Tharnggala
+Added: 2013-09-10
+%%
+Type: language
Subtag: gua
Description: Shiki
Added: 2009-07-29
@@ -13703,6 +13824,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: hrc
+Description: Niwer Mil
+Added: 2013-09-10
+%%
+Type: language
Subtag: hre
Description: Hre
Added: 2009-07-29
@@ -13724,6 +13850,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: hrp
+Description: Nhirrpi
+Added: 2013-09-10
+%%
+Type: language
Subtag: hrr
Description: Horuru
Added: 2009-07-29
@@ -13741,6 +13872,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: hrw
+Description: Warwar Feni
+Added: 2013-09-10
+%%
+Type: language
Subtag: hrx
Description: Hunsrik
Added: 2009-07-29
@@ -13957,6 +14093,7 @@
Type: language
Subtag: hwc
Description: Hawai'i Creole English
+Description: Hawai'i Pidgin
Added: 2009-07-29
%%
Type: language
@@ -14092,6 +14229,7 @@
Type: language
Subtag: idc
Description: Idon
+Description: Ajiya
Added: 2009-07-29
%%
Type: language
@@ -14236,6 +14374,11 @@
Added: 2012-08-12
%%
Type: language
+Subtag: iin
+Description: Thiin
+Added: 2013-09-10
+%%
+Type: language
Subtag: iir
Description: Indo-Iranian languages
Added: 2009-07-29
@@ -14304,6 +14447,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: ikr
+Description: Ikaranggal
+Added: 2013-09-10
+%%
+Type: language
Subtag: ikt
Description: Inuinnaqtun
Description: Western Canadian Inuktitut
@@ -14384,6 +14532,8 @@
Subtag: ilw
Description: Talur
Added: 2009-07-29
+Deprecated: 2013-09-10
+Preferred-Value: gal
%%
Type: language
Subtag: ima
@@ -14533,6 +14683,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: iqw
+Description: Ikwo
+Added: 2013-09-10
+%%
+Type: language
Subtag: ira
Description: Iranian languages
Added: 2005-10-16
@@ -14809,6 +14964,8 @@
Subtag: izi
Description: Izi-Ezaa-Ikwo-Mgbo
Added: 2009-07-29
+Deprecated: 2013-09-10
+Comments: see eza, gmz, iqw, izz
%%
Type: language
Subtag: izr
@@ -14816,6 +14973,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: izz
+Description: Izii
+Added: 2013-09-10
+%%
+Type: language
Subtag: jaa
Description: Jamamadí
Added: 2009-07-29
@@ -14932,6 +15094,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: jbi
+Description: Badjiri
+Added: 2013-09-10
+%%
+Type: language
Subtag: jbj
Description: Arandai
Added: 2009-07-29
@@ -15902,7 +16069,8 @@
%%
Type: language
Subtag: kdk
-Description: Numee
+Description: Numèè
+Description: Kwényi
Added: 2009-07-29
%%
Type: language
@@ -19073,8 +19241,6 @@
Subtag: lcq
Description: Luhu
Added: 2009-07-29
-Deprecated: 2012-08-12
-Preferred-Value: ppr
%%
Type: language
Subtag: lcs
@@ -19082,6 +19248,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: lda
+Description: Kla-Dan
+Added: 2013-09-10
+%%
+Type: language
Subtag: ldb
Description: Dũya
Added: 2009-07-29
@@ -19526,6 +19697,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: lja
+Description: Golpa
+Added: 2013-09-10
+%%
+Type: language
Subtag: lje
Description: Rampi
Added: 2009-07-29
@@ -19546,6 +19722,16 @@
Added: 2009-07-29
%%
Type: language
+Subtag: ljw
+Description: Yirandali
+Added: 2013-09-10
+%%
+Type: language
+Subtag: ljx
+Description: Yuru
+Added: 2013-09-10
+%%
+Type: language
Subtag: lka
Description: Lakalei
Added: 2009-07-29
@@ -19593,6 +19779,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: lkm
+Description: Kalaamaya
+Added: 2013-09-10
+%%
+Type: language
Subtag: lkn
Description: Lakon
Description: Vure
@@ -19623,6 +19814,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: lku
+Description: Kungkari
+Added: 2013-09-10
+%%
+Type: language
Subtag: lky
Description: Lokoya
Added: 2009-07-29
@@ -19914,6 +20110,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: lnw
+Description: Lanima
+Added: 2013-09-10
+%%
+Type: language
Subtag: lnz
Description: Lonzo
Added: 2009-07-29
@@ -20432,6 +20633,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: lwu
+Description: Lawu
+Added: 2013-09-10
+%%
+Type: language
Subtag: lww
Description: Lewo
Added: 2009-07-29
@@ -20526,6 +20732,7 @@
Type: language
Subtag: man
Description: Mandingo
+Description: Manding
Added: 2005-10-16
Scope: macrolanguage
%%
@@ -20990,6 +21197,8 @@
Subtag: meg
Description: Mea
Added: 2009-07-29
+Deprecated: 2013-09-10
+Preferred-Value: cir
%%
Type: language
Subtag: meh
@@ -21065,7 +21274,7 @@
%%
Type: language
Subtag: mev
-Description: Mann
+Description: Mano
Added: 2009-07-29
%%
Type: language
@@ -21117,7 +21326,7 @@
%%
Type: language
Subtag: mfg
-Description: Mixifore
+Description: Mogofin
Added: 2009-07-29
%%
Type: language
@@ -21525,6 +21734,7 @@
Type: language
Subtag: mij
Description: Abar
+Description: Mungbam
Added: 2009-07-29
%%
Type: language
@@ -21871,6 +22081,7 @@
Subtag: mld
Description: Malakhel
Added: 2009-07-29
+Deprecated: 2013-09-10
%%
Type: language
Subtag: mle
@@ -22199,6 +22410,8 @@
Subtag: mnt
Description: Maykulan
Added: 2009-07-29
+Deprecated: 2013-09-10
+Comments: see wnn, xyj, xyk, xyt
%%
Type: language
Subtag: mnu
@@ -22996,7 +23209,7 @@
%%
Type: language
Subtag: muc
-Description: Mbu'
+Description: Ajumbu
Added: 2009-07-29
%%
Type: language
@@ -23250,6 +23463,8 @@
Subtag: mwd
Description: Mudbura
Added: 2009-07-29
+Deprecated: 2013-09-10
+Comments: see dmw, xrq
%%
Type: language
Subtag: mwe
@@ -23577,6 +23792,7 @@
Subtag: myq
Description: Forest Maninka
Added: 2009-07-29
+Deprecated: 2013-09-10
Macrolanguage: man
%%
Type: language
@@ -23990,6 +24206,8 @@
Subtag: nbx
Description: Ngura
Added: 2009-07-29
+Deprecated: 2013-09-10
+Comments: see ekc, gll, jbi, xpt, xwk
%%
Type: language
Subtag: nby
@@ -24428,7 +24646,7 @@
%%
Type: language
Subtag: ngk
-Description: Ngalkbun
+Description: Dalabon
Added: 2009-07-29
%%
Type: language
@@ -25011,9 +25229,16 @@
Added: 2009-07-29
%%
Type: language
+Subtag: nlq
+Description: Lao Naga
+Added: 2013-09-10
+%%
+Type: language
Subtag: nlr
Description: Ngarla
Added: 2009-07-29
+Deprecated: 2013-09-10
+Comments: see nrk, ywg
%%
Type: language
Subtag: nlu
@@ -25026,6 +25251,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: nlw
+Description: Walangama
+Added: 2013-09-10
+%%
+Type: language
Subtag: nlx
Description: Nahali
Added: 2009-07-29
@@ -25348,6 +25578,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: nol
+Description: Nomlaki
+Added: 2013-09-10
+%%
+Type: language
Subtag: nom
Description: Nocamán
Added: 2009-07-29
@@ -25493,6 +25728,11 @@
Suppress-Script: Nkoo
%%
Type: language
+Subtag: nqq
+Description: Kyan-Karyaw Naga
+Added: 2013-09-10
+%%
+Type: language
Subtag: nqy
Description: Akyaung Ari Naga
Added: 2012-08-12
@@ -25528,6 +25768,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: nrk
+Description: Ngarla
+Added: 2013-09-10
+%%
+Type: language
Subtag: nrl
Description: Ngarluma
Added: 2009-07-29
@@ -25550,6 +25795,7 @@
Type: language
Subtag: nrr
Description: Norra
+Description: Nora
Added: 2009-07-29
%%
Type: language
@@ -25701,6 +25947,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: ntg
+Description: Ngantangarra
+Added: 2013-09-10
+%%
+Type: language
Subtag: nti
Description: Natioro
Added: 2009-07-29
@@ -25768,7 +26019,7 @@
%%
Type: language
Subtag: nua
-Description: Yuaga
+Description: Yuanga
Added: 2009-07-29
%%
Type: language
@@ -26517,6 +26768,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: olk
+Description: Olkol
+Added: 2013-09-10
+%%
+Type: language
Subtag: olm
Description: Oloma
Added: 2009-07-29
@@ -27339,6 +27595,8 @@
Subtag: pcr
Description: Panang
Added: 2009-07-29
+Deprecated: 2013-09-10
+Preferred-Value: adx
%%
Type: language
Subtag: pcw
@@ -28086,11 +28344,22 @@
Added: 2009-07-29
%%
Type: language
+Subtag: pnj
+Description: Pinjarup
+Added: 2013-09-10
+%%
+Type: language
Subtag: pnk
Description: Paunaka
Added: 2012-08-12
%%
Type: language
+Subtag: pnl
+Description: Paleni
+Added: 2013-09-10
+Comments: see also wbf
+%%
+Type: language
Subtag: pnm
Description: Punan Batu 1
Added: 2009-07-29
@@ -28219,7 +28488,7 @@
%%
Type: language
Subtag: pop
-Description: Pwapwa
+Description: Pwapwâ
Added: 2009-07-29
%%
Type: language
@@ -28318,6 +28587,8 @@
Subtag: ppr
Description: Piru
Added: 2009-07-29
+Deprecated: 2013-09-10
+Preferred-Value: lcq
%%
Type: language
Subtag: pps
@@ -28758,6 +29029,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: pwi
+Description: Patwin
+Added: 2013-09-10
+%%
+Type: language
Subtag: pwm
Description: Molbog
Added: 2009-07-29
@@ -29532,6 +29808,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: rkw
+Description: Arakwal
+Added: 2013-09-10
+%%
+Type: language
Subtag: rma
Description: Rama
Added: 2009-07-29
@@ -29941,6 +30222,16 @@
Macrolanguage: mwr
%%
Type: language
+Subtag: rxd
+Description: Ngardi
+Added: 2013-09-10
+%%
+Type: language
+Subtag: rxw
+Description: Karuwali
+Added: 2013-09-10
+%%
+Type: language
Subtag: ryn
Description: Northern Amami-Oshima
Added: 2009-07-29
@@ -30840,6 +31131,7 @@
Type: language
Subtag: sih
Description: Zire
+Description: Sîshëë
Added: 2009-07-29
%%
Type: language
@@ -32117,6 +32409,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: sty
+Description: Siberian Tatar
+Added: 2013-09-10
+%%
+Type: language
Subtag: sua
Description: Sulka
Added: 2009-07-29
@@ -32241,6 +32538,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: svm
+Description: Slavomolisano
+Added: 2013-09-10
+%%
+Type: language
Subtag: svr
Description: Savara
Added: 2009-07-29
@@ -33213,6 +33515,8 @@
Subtag: tgg
Description: Tangga
Added: 2009-07-29
+Deprecated: 2013-09-10
+Comments: see bjp, hrc, hrw
%%
Type: language
Subtag: tgh
@@ -33570,6 +33874,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: tjw
+Description: Djabwurrung
+Added: 2013-09-10
+%%
+Type: language
Subtag: tka
Description: Truká
Added: 2009-07-29
@@ -34004,7 +34313,7 @@
%%
Type: language
Subtag: tnr
-Description: Bedik
+Description: Ménik
Added: 2009-07-29
%%
Type: language
@@ -35088,7 +35397,7 @@
%%
Type: language
Subtag: tye
-Description: Kyenga
+Description: Kyanga
Added: 2009-07-29
%%
Type: language
@@ -35172,6 +35481,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: tzl
+Description: Talossan
+Added: 2013-09-10
+%%
+Type: language
Subtag: tzm
Description: Central Atlas Tamazight
Added: 2009-07-29
@@ -35409,6 +35723,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: ule
+Description: Lule
+Added: 2013-09-10
+%%
+Type: language
Subtag: ulf
Description: Usku
Description: Afra
@@ -35548,6 +35867,11 @@
Macrolanguage: del
%%
Type: language
+Subtag: unn
+Description: Kurnai
+Added: 2013-09-10
+%%
+Type: language
Subtag: unp
Description: Worora
Added: 2009-07-29
@@ -35560,6 +35884,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: unu
+Description: Unubahe
+Added: 2013-09-10
+%%
+Type: language
Subtag: unx
Description: Munda
Added: 2009-07-29
@@ -35781,6 +36110,7 @@
Type: language
Subtag: uve
Description: West Uvean
+Description: Fagauvea
Added: 2009-07-29
%%
Type: language
@@ -36071,7 +36401,7 @@
%%
Type: language
Subtag: vmb
-Description: Mbabaram
+Description: Barbaram
Added: 2009-07-29
%%
Type: language
@@ -36096,8 +36426,9 @@
%%
Type: language
Subtag: vmg
-Description: Minigir
+Description: Lungalunga
Added: 2009-07-29
+Comments: see also bxf
%%
Type: language
Subtag: vmh
@@ -36389,6 +36720,7 @@
Type: language
Subtag: wax
Description: Watam
+Description: Marangis
Added: 2009-07-29
%%
Type: language
@@ -36420,6 +36752,7 @@
Subtag: wbf
Description: Wara
Added: 2009-07-29
+Comments: see also pnl
%%
Type: language
Subtag: wbh
@@ -36508,11 +36841,21 @@
Added: 2009-07-29
%%
Type: language
+Subtag: wdk
+Description: Wadikali
+Added: 2013-09-10
+%%
+Type: language
Subtag: wdu
Description: Wadjigu
Added: 2009-07-29
%%
Type: language
+Subtag: wdy
+Description: Wadjabangayi
+Added: 2013-09-10
+%%
+Type: language
Subtag: wea
Description: Wewaw
Added: 2009-07-29
@@ -36528,6 +36871,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: weg
+Description: Wergaia
+Added: 2013-09-10
+%%
+Type: language
Subtag: weh
Description: Weh
Added: 2009-07-29
@@ -36720,6 +37068,8 @@
Subtag: wit
Description: Wintu
Added: 2009-07-29
+Deprecated: 2013-09-10
+Comments: see nol, pwi, wnw
%%
Type: language
Subtag: wiu
@@ -36785,6 +37135,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: wky
+Description: Wangkayutyuru
+Added: 2013-09-10
+%%
+Type: language
Subtag: wla
Description: Walio
Added: 2009-07-29
@@ -36975,6 +37330,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: wnn
+Description: Wunumara
+Added: 2013-09-10
+%%
+Type: language
Subtag: wno
Description: Wano
Added: 2009-07-29
@@ -36990,6 +37350,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: wnw
+Description: Wintu
+Added: 2013-09-10
+%%
+Type: language
Subtag: wny
Description: Wanyi
Added: 2012-08-12
@@ -37221,6 +37586,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: wth
+Description: Wathawurrung
+Added: 2013-09-10
+%%
+Type: language
Subtag: wti
Description: Berta
Added: 2009-07-29
@@ -37338,6 +37708,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: wxw
+Description: Wardandi
+Added: 2013-09-10
+%%
+Type: language
Subtag: wya
Description: Wyandot
Added: 2009-07-29
@@ -37348,6 +37723,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: wyi
+Description: Woiwurrung
+Added: 2013-09-10
+%%
+Type: language
Subtag: wym
Description: Wymysorys
Added: 2009-07-29
@@ -37479,11 +37859,31 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xbd
+Description: Bindal
+Added: 2013-09-10
+%%
+Type: language
+Subtag: xbe
+Description: Bigambal
+Added: 2013-09-10
+%%
+Type: language
+Subtag: xbg
+Description: Bunganditj
+Added: 2013-09-10
+%%
+Type: language
Subtag: xbi
Description: Kombio
Added: 2009-07-29
%%
Type: language
+Subtag: xbj
+Description: Birrpayi
+Added: 2013-09-10
+%%
+Type: language
Subtag: xbm
Description: Middle Breton
Added: 2009-07-29
@@ -37499,6 +37899,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xbp
+Description: Bibbulman
+Added: 2013-09-10
+%%
+Type: language
Subtag: xbr
Description: Kambera
Added: 2009-07-29
@@ -37514,6 +37919,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xby
+Description: Batyala
+Added: 2013-09-10
+%%
+Type: language
Subtag: xcb
Description: Cumbric
Added: 2009-07-29
@@ -37590,11 +38000,21 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xda
+Description: Darkinyung
+Added: 2013-09-10
+%%
+Type: language
Subtag: xdc
Description: Dacian
Added: 2009-07-29
%%
Type: language
+Subtag: xdk
+Description: Dharuk
+Added: 2013-09-10
+%%
+Type: language
Subtag: xdm
Description: Edomite
Added: 2009-07-29
@@ -37670,16 +38090,36 @@
Added: 2012-08-12
%%
Type: language
+Subtag: xgd
+Description: Gudang
+Added: 2013-09-10
+%%
+Type: language
Subtag: xgf
Description: Gabrielino-Fernandeño
Added: 2009-07-29
%%
Type: language
+Subtag: xgg
+Description: Goreng
+Added: 2013-09-10
+%%
+Type: language
+Subtag: xgi
+Description: Garingbal
+Added: 2013-09-10
+%%
+Type: language
Subtag: xgl
Description: Galindan
Added: 2009-07-29
%%
Type: language
+Subtag: xgm
+Description: Guwinmal
+Added: 2013-09-10
+%%
+Type: language
Subtag: xgn
Description: Mongolian languages
Added: 2009-07-29
@@ -37696,6 +38136,11 @@
Added: 2012-08-12
%%
Type: language
+Subtag: xgw
+Description: Guwa
+Added: 2013-09-10
+%%
+Type: language
Subtag: xha
Description: Harami
Added: 2009-07-29
@@ -37740,6 +38185,8 @@
Subtag: xia
Description: Xiandao
Added: 2009-07-29
+Deprecated: 2013-09-10
+Preferred-Value: acn
%%
Type: language
Subtag: xib
@@ -37782,6 +38229,16 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xjb
+Description: Minjungbal
+Added: 2013-09-10
+%%
+Type: language
+Subtag: xjt
+Description: Jaitmatang
+Added: 2013-09-10
+%%
+Type: language
Subtag: xka
Description: Kalkoti
Added: 2009-07-29
@@ -38127,6 +38584,16 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xni
+Description: Ngarigu
+Added: 2013-09-10
+%%
+Type: language
+Subtag: xnk
+Description: Nganakarti
+Added: 2013-09-10
+%%
+Type: language
Subtag: xnn
Description: Northern Kankanay
Added: 2009-07-29
@@ -38153,6 +38620,16 @@
Added: 2010-03-11
%%
Type: language
+Subtag: xnu
+Description: Nukunul
+Added: 2013-09-10
+%%
+Type: language
+Subtag: xny
+Description: Nyiyaparli
+Added: 2013-09-10
+%%
+Type: language
Subtag: xnz
Description: Kenzi
Description: Mattoki
@@ -38214,6 +38691,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xpa
+Description: Pirriya
+Added: 2013-09-10
+%%
+Type: language
Subtag: xpc
Description: Pecheneg
Added: 2009-07-29
@@ -38280,6 +38762,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xpt
+Description: Punthamara
+Added: 2013-09-10
+%%
+Type: language
Subtag: xpu
Description: Punic
Added: 2009-07-29
@@ -38310,11 +38797,21 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xrd
+Description: Gundungurra
+Added: 2013-09-10
+%%
+Type: language
Subtag: xre
Description: Kreye
Added: 2009-07-29
%%
Type: language
+Subtag: xrg
+Description: Minang
+Added: 2013-09-10
+%%
+Type: language
Subtag: xri
Description: Krikati-Timbira
Added: 2009-07-29
@@ -38330,6 +38827,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xrq
+Description: Karranga
+Added: 2013-09-10
+%%
+Type: language
Subtag: xrr
Description: Raetic
Added: 2009-07-29
@@ -38476,6 +38978,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xth
+Description: Yitha Yitha
+Added: 2013-09-10
+%%
+Type: language
Subtag: xti
Description: Sinicahua Mixtec
Added: 2009-07-29
@@ -38536,6 +39043,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xtv
+Description: Thawa
+Added: 2013-09-10
+%%
+Type: language
Subtag: xtw
Description: Tawandê
Added: 2009-07-29
@@ -38576,13 +39088,18 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xul
+Description: Ngunawal
+Added: 2013-09-10
+%%
+Type: language
Subtag: xum
Description: Umbrian
Added: 2009-07-29
%%
Type: language
Subtag: xun
-Description: Unggarranggu
+Description: Unggaranggu
Added: 2012-08-12
%%
Type: language
@@ -38646,6 +39163,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xwd
+Description: Wadi Wadi
+Added: 2013-09-10
+%%
+Type: language
Subtag: xwe
Description: Xwela Gbe
Added: 2009-07-29
@@ -38656,6 +39178,16 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xwj
+Description: Wajuk
+Added: 2013-09-10
+%%
+Type: language
+Subtag: xwk
+Description: Wangkumara
+Added: 2013-09-10
+%%
+Type: language
Subtag: xwl
Description: Western Xwla Gbe
Added: 2009-07-29
@@ -38671,6 +39203,16 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xwt
+Description: Wotjobaluk
+Added: 2013-09-10
+%%
+Type: language
+Subtag: xww
+Description: Wemba Wemba
+Added: 2013-09-10
+%%
+Type: language
Subtag: xxb
Description: Boro (Ghana)
Added: 2009-07-29
@@ -38681,6 +39223,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xxm
+Description: Minkin
+Added: 2013-09-10
+%%
+Type: language
Subtag: xxr
Description: Koropó
Added: 2009-07-29
@@ -38691,11 +39238,36 @@
Added: 2009-07-29
%%
Type: language
+Subtag: xya
+Description: Yaygir
+Added: 2013-09-10
+%%
+Type: language
+Subtag: xyb
+Description: Yandjibara
+Added: 2013-09-10
+%%
+Type: language
+Subtag: xyj
+Description: Mayi-Yapi
+Added: 2013-09-10
+%%
+Type: language
+Subtag: xyk
+Description: Mayi-Kulan
+Added: 2013-09-10
+%%
+Type: language
Subtag: xyl
Description: Yalakalore
Added: 2009-07-29
%%
Type: language
+Subtag: xyt
+Description: Mayi-Thakurti
+Added: 2013-09-10
+%%
+Type: language
Subtag: xyy
Description: Yorta Yorta
Added: 2012-08-12
@@ -38938,6 +39510,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: yda
+Description: Yanda
+Added: 2013-09-10
+%%
+Type: language
Subtag: ydd
Description: Eastern Yiddish
Added: 2009-07-29
@@ -39036,6 +39613,11 @@
Added: 2012-08-12
%%
Type: language
+Subtag: ygi
+Description: Yiningayi
+Added: 2013-09-10
+%%
+Type: language
Subtag: ygl
Description: Yangum Gel
Added: 2009-07-29
@@ -39056,6 +39638,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: ygu
+Description: Yugul
+Added: 2013-09-10
+%%
+Type: language
Subtag: ygw
Description: Yagwoia
Added: 2009-07-29
@@ -39171,6 +39758,8 @@
Subtag: yiy
Description: Yir Yoront
Added: 2009-07-29
+Deprecated: 2013-09-10
+Comments: see yrm, yyr
%%
Type: language
Subtag: yiz
@@ -39295,6 +39884,7 @@
Type: language
Subtag: yly
Description: Nyâlayu
+Description: Nyelâyu
Added: 2009-07-29
%%
Type: language
@@ -39499,6 +40089,8 @@
Subtag: yos
Description: Yos
Added: 2009-07-29
+Deprecated: 2013-09-10
+Preferred-Value: zom
%%
Type: language
Subtag: yot
@@ -39597,6 +40189,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: yrm
+Description: Yirrk-Mel
+Added: 2013-09-10
+%%
+Type: language
Subtag: yrn
Description: Yerong
Added: 2009-07-29
@@ -39612,6 +40209,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: yry
+Description: Yarluyandi
+Added: 2013-09-10
+%%
+Type: language
Subtag: ysc
Description: Yassic
Added: 2009-07-29
@@ -39682,6 +40284,11 @@
Added: 2010-03-11
%%
Type: language
+Subtag: yty
+Description: Yatay
+Added: 2013-09-10
+%%
+Type: language
Subtag: yua
Description: Yucateco
Description: Yucatec Maya
@@ -39810,6 +40417,11 @@
Added: 2009-07-29
%%
Type: language
+Subtag: ywg
+Description: Yinhawangka
+Added: 2013-09-10
+%%
+Type: language
Subtag: ywl
Description: Western Lalu
Added: 2009-07-29
@@ -39846,16 +40458,41 @@
Added: 2009-07-29
%%
Type: language
+Subtag: yxa
+Description: Mayawali
+Added: 2013-09-10
+%%
+Type: language
Subtag: yxg
Description: Yagara
Added: 2012-08-12
%%
Type: language
+Subtag: yxl
+Description: Yardliyawarra
+Added: 2013-09-10
+%%
+Type: language
+Subtag: yxm
+Description: Yinwum
+Added: 2013-09-10
+%%
+Type: language
+Subtag: yxu
+Description: Yuyu
+Added: 2013-09-10
+%%
+Type: language
Subtag: yxy
Description: Yabula Yabula
Added: 2012-08-12
%%
Type: language
+Subtag: yyr
+Description: Yir Yoront
+Added: 2013-09-03
+%%
+Type: language
Subtag: yyu
Description: Yau (Sandaun Province)
Added: 2009-07-29
@@ -40096,6 +40733,11 @@
Macrolanguage: za
%%
Type: language
+Subtag: zgh
+Description: Standard Moroccan Tamazight
+Added: 2013-01-25
+%%
+Type: language
Subtag: zgm
Description: Minz Zhuang
Added: 2009-07-29
@@ -40859,7 +41501,7 @@
%%
Type: language
Subtag: zyp
-Description: Zyphe
+Description: Zyphe Chin
Added: 2009-07-29
%%
Type: language
@@ -42574,6 +43216,11 @@
Added: 2011-01-07
%%
Type: script
+Subtag: Aghb
+Description: Caucasian Albanian
+Added: 2012-11-01
+%%
+Type: script
Subtag: Arab
Description: Arabic
Added: 2005-10-16
@@ -42844,6 +43491,7 @@
Type: script
Subtag: Hung
Description: Old Hungarian
+Description: Hungarian Runic
Added: 2005-10-16
%%
Type: script
@@ -42986,6 +43634,11 @@
Added: 2006-07-21
%%
Type: script
+Subtag: Mahj
+Description: Mahajani
+Added: 2012-11-01
+%%
+Type: script
Subtag: Mand
Description: Mandaic
Description: Mandaean
@@ -44404,7 +45057,7 @@
%%
Type: region
Subtag: PS
-Description: Occupied Palestinian Territory
+Description: State of Palestine
Added: 2005-10-16
%%
Type: region
diff --git a/jdk/test/java/util/ResourceBundle/getBaseBundleName/TestGetBaseBundleName.java b/jdk/test/java/util/ResourceBundle/getBaseBundleName/TestGetBaseBundleName.java
new file mode 100644
index 0000000..aca4017
--- /dev/null
+++ b/jdk/test/java/util/ResourceBundle/getBaseBundleName/TestGetBaseBundleName.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
+
+/**
+ * @test
+ * @bug 4814565
+ * @summary tests ResourceBundle.getBaseBundleName();
+ * @build TestGetBaseBundleName resources.ListBundle resources.ListBundle_fr
+ * @run main TestGetBaseBundleName
+ * @author danielfuchs
+ */
+public class TestGetBaseBundleName {
+
+ final static String PROPERTY_BUNDLE_NAME = "resources/PropertyBundle";
+ final static String LIST_BUNDLE_NAME = "resources.ListBundle";
+
+ public static String getBaseName(ResourceBundle bundle) {
+ return bundle == null ? null : bundle.getBaseBundleName();
+ }
+
+ public static void main(String... args) throws Exception {
+
+ Locale defaultLocale = Locale.getDefault();
+ System.out.println("Default locale is: " + defaultLocale);
+ for (String baseName : new String[] {
+ PROPERTY_BUNDLE_NAME,
+ LIST_BUNDLE_NAME
+ }) {
+ ResourceBundle bundle = ResourceBundle.getBundle(baseName);
+ System.out.println(getBaseName(bundle));
+ if (!Locale.ROOT.equals(bundle.getLocale())) {
+ throw new RuntimeException("Unexpected locale: "
+ + bundle.getLocale());
+ }
+ if (!baseName.equals(getBaseName(bundle))) {
+ throw new RuntimeException("Unexpected base name: "
+ + getBaseName(bundle));
+ }
+ Locale.setDefault(Locale.FRENCH);
+ try {
+ ResourceBundle bundle_fr = ResourceBundle.getBundle(baseName);
+ if (!Locale.FRENCH.equals(bundle_fr.getLocale())) {
+ throw new RuntimeException("Unexpected locale: "
+ + bundle_fr.getLocale());
+ }
+ if (!baseName.equals(getBaseName(bundle_fr))) {
+ throw new RuntimeException("Unexpected base name: "
+ + getBaseName(bundle_fr));
+ }
+ } finally {
+ Locale.setDefault(defaultLocale);
+ }
+ }
+
+ final ResourceBundle bundle = new ResourceBundle() {
+ @Override
+ protected Object handleGetObject(String key) {
+ if ("dummy".equals(key)) return "foo";
+ throw new MissingResourceException("Missing key",
+ this.getClass().getName(), key);
+ }
+ @Override
+ public Enumeration<String> getKeys() {
+ return Collections.enumeration(java.util.Arrays.asList(
+ new String[] {"dummy"}));
+ }
+ };
+
+ if (getBaseName(bundle) != null) {
+ throw new RuntimeException("Expected null baseName, got "
+ + getBaseName(bundle));
+ }
+
+ final ResourceBundle bundle2 = new ResourceBundle() {
+ @Override
+ protected Object handleGetObject(String key) {
+ if ("dummy".equals(key)) return "foo";
+ throw new MissingResourceException("Missing key",
+ this.getClass().getName(), key);
+ }
+ @Override
+ public Enumeration<String> getKeys() {
+ return Collections.enumeration(java.util.Arrays.asList(
+ new String[] {"dummy"}));
+ }
+
+ @Override
+ public String getBaseBundleName() {
+ return this.getClass().getName();
+ }
+
+
+ };
+
+ if (!bundle2.getClass().getName().equals(getBaseName(bundle2))) {
+ throw new RuntimeException("Expected "
+ + bundle2.getClass().getName() + ", got "
+ + getBaseName(bundle2));
+ }
+
+ ResourceBundle propertyBundle = new PropertyResourceBundle(
+ TestGetBaseBundleName.class.getResourceAsStream(
+ PROPERTY_BUNDLE_NAME+".properties"));
+
+ if (getBaseName(propertyBundle) != null) {
+ throw new RuntimeException("Expected null baseName, got "
+ + getBaseName(propertyBundle));
+ }
+
+ ResourceBundle listBundle = new resources.ListBundle_fr();
+ if (getBaseName(listBundle) != null) {
+ throw new RuntimeException("Expected null baseName, got "
+ + getBaseName(listBundle));
+ }
+
+
+ }
+}
diff --git a/jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/ListBundle.java b/jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/ListBundle.java
new file mode 100644
index 0000000..121db29
--- /dev/null
+++ b/jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/ListBundle.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2013, 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 resources;
+
+import java.util.ListResourceBundle;
+
+/**
+ *
+ * @author danielfuchs
+ */
+public class ListBundle extends ListResourceBundle {
+
+ @Override
+ protected Object[][] getContents() {
+ return new Object[][] {
+ { "dummy", "foo" },
+ };
+
+ }
+
+}
diff --git a/jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/ListBundle_fr.java b/jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/ListBundle_fr.java
new file mode 100644
index 0000000..b168bf7
--- /dev/null
+++ b/jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/ListBundle_fr.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2013, 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 resources;
+
+import java.util.ListResourceBundle;
+
+/**
+ *
+ * @author danielfuchs
+ */
+public class ListBundle_fr extends ListResourceBundle {
+
+ @Override
+ protected Object[][] getContents() {
+ return new Object[][] {
+ { "dummy", "toto" },
+ };
+
+ }
+
+}
diff --git a/jdk/make/sun/awt/FILES_c_macosx.gmk b/jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/PropertyBundle.properties
similarity index 72%
copy from jdk/make/sun/awt/FILES_c_macosx.gmk
copy to jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/PropertyBundle.properties
index d6bef30..343c648 100644
--- a/jdk/make/sun/awt/FILES_c_macosx.gmk
+++ b/jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/PropertyBundle.properties
@@ -1,12 +1,10 @@
#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 20013, 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.
+# 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
@@ -22,7 +20,5 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-
-FILES_AWT_objc = \
- $(TARGDIR)MacOSXResourceBundle.m
+dummy=foo
diff --git a/jdk/make/sun/awt/FILES_c_macosx.gmk b/jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/PropertyBundle_fr.properties
similarity index 72%
rename from jdk/make/sun/awt/FILES_c_macosx.gmk
rename to jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/PropertyBundle_fr.properties
index d6bef30..3120271 100644
--- a/jdk/make/sun/awt/FILES_c_macosx.gmk
+++ b/jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/PropertyBundle_fr.properties
@@ -1,12 +1,10 @@
#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 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.
+# 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
@@ -22,7 +20,5 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-
-FILES_AWT_objc = \
- $(TARGDIR)MacOSXResourceBundle.m
+dummy=toto
diff --git a/jdk/test/java/util/TimeZone/SetDefaultSecurityTest.java b/jdk/test/java/util/TimeZone/SetDefaultSecurityTest.java
new file mode 100644
index 0000000..e749ffe
--- /dev/null
+++ b/jdk/test/java/util/TimeZone/SetDefaultSecurityTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+/*
+ * @test
+ * @bug 8001029
+ * @summary Make sure that TimeZone.setDefault throws a SecurityException if the
+ * security manager doesn't permit.
+ * @run main/othervm SetDefaultSecurityTest
+ */
+
+import java.util.SimpleTimeZone;
+import java.util.TimeZone;
+
+public class SetDefaultSecurityTest {
+ static final TimeZone NOWHERE = new SimpleTimeZone(Integer.MAX_VALUE, "Nowhere");
+
+ public static void main(String[] args) {
+ TimeZone defaultZone = TimeZone.getDefault();
+
+ // Make sure that TimeZone.setDefault works for trusted code
+ TimeZone.setDefault(NOWHERE);
+ if (!NOWHERE.equals(TimeZone.getDefault())) {
+ new RuntimeException("TimeZone.setDefault doesn't work for trusted code.");
+ }
+ // Restore defaultZone
+ TimeZone.setDefault(defaultZone);
+ if (!defaultZone.equals(TimeZone.getDefault())) {
+ new RuntimeException("TimeZone.setDefault doesn't restore defaultZone.");
+ }
+
+ // Install a SecurityManager.
+ System.setSecurityManager(new SecurityManager());
+ try {
+ TimeZone.setDefault(NOWHERE);
+ throw new RuntimeException("TimeZone.setDefault doesn't throw a SecurityException.");
+ } catch (SecurityException se) {
+ // OK
+ }
+ TimeZone tz = TimeZone.getDefault();
+ if (!defaultZone.equals(tz)) {
+ throw new RuntimeException("Default TimeZone changed: " + tz);
+ }
+ }
+}
diff --git a/jdk/test/java/util/concurrent/forkjoin/FJExceptionTableLeak.java b/jdk/test/java/util/concurrent/forkjoin/FJExceptionTableLeak.java
new file mode 100644
index 0000000..f2780a56
--- /dev/null
+++ b/jdk/test/java/util/concurrent/forkjoin/FJExceptionTableLeak.java
@@ -0,0 +1,73 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/*
+ * @test
+ * @author Doug Lea
+ * @bug 8004138
+ * @summary Check if ForkJoinPool table leaks thrown exceptions.
+ * @run main/othervm -Xmx32m FJExceptionTableLeak
+ */
+import java.util.concurrent.*;
+
+public class FJExceptionTableLeak {
+
+ // Run with TASKS_PER_STEP * 40 < Xmx < STEPS * TASKS_PER_STEP * 40
+ // These work for Xmx32m:
+ static final int STEPS = 2000;
+ static final int TASKS_PER_STEP = 1000;
+
+ static class FailingTaskException extends RuntimeException {}
+ static class FailingTask extends RecursiveAction {
+ public void compute() {
+ throw new FailingTaskException();
+ }
+ }
+
+ public static void main(String[] args) throws InterruptedException {
+ ForkJoinPool pool = new ForkJoinPool(4);
+ FailingTask[] tasks = new FailingTask[TASKS_PER_STEP];
+ for (int k = 0; k < STEPS; ++k) {
+ for (int i = 0; i < tasks.length; ++i)
+ tasks[i] = new FailingTask();
+ for (int i = 0; i < tasks.length; ++i)
+ pool.execute(tasks[i]);
+ for (int i = 0; i < tasks.length; ++i) {
+ try {
+ tasks[i].join();
+ throw new AssertionError("should throw");
+ } catch (FailingTaskException success) {}
+ }
+ }
+ }
+}
diff --git a/jdk/test/java/util/logging/Level/CustomLevel.java b/jdk/test/java/util/logging/Level/CustomLevel.java
new file mode 100644
index 0000000..a3c452a
--- /dev/null
+++ b/jdk/test/java/util/logging/Level/CustomLevel.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+import java.io.*;
+import java.util.*;
+import java.util.logging.*;
+
+/*
+ * @test
+ * @bug 8026027
+ * @summary Test Level.parse to look up custom levels by name and its
+ * localized name
+ *
+ * @run main/othervm CustomLevel
+ */
+
+public class CustomLevel extends Level {
+ public CustomLevel(String name, int value, String resourceBundleName) {
+ super(name, value, resourceBundleName);
+ }
+
+ private static final List<Level> levels = new ArrayList<>();
+ private static final String RB_NAME = "myresource";
+ public static void main(String[] args) throws Exception {
+ setupCustomLevels();
+
+ // Level.parse will return the custom Level instance
+ ResourceBundle rb = ResourceBundle.getBundle(RB_NAME);
+ for (Level level : levels) {
+ String name = level.getName();
+ if (!name.equals("WARNING") && !name.equals("INFO")) {
+ // custom level whose name doesn't conflict with any standard one
+ checkCustomLevel(Level.parse(name), level);
+ }
+ String localizedName = rb.getString(level.getName());
+ Level l = Level.parse(localizedName);
+ if (l != level) {
+ throw new RuntimeException("Unexpected level " + l + " " + l.getClass());
+ }
+ }
+ }
+
+ private static void setupCustomLevels() throws IOException {
+ levels.add(new CustomLevel("EMERGENCY", 1090, RB_NAME));
+ levels.add(new CustomLevel("ALERT", 1060, RB_NAME));
+ levels.add(new CustomLevel("CRITICAL", 1030, RB_NAME));
+ levels.add(new CustomLevel("WARNING", 1010, RB_NAME));
+ levels.add(new CustomLevel("INFO", 1000, RB_NAME));
+ }
+ static void checkCustomLevel(Level level, Level expected) {
+ // Level value must be the same
+ if (!level.equals(expected)) {
+ throw new RuntimeException(formatLevel(level) + " != " + formatLevel(expected));
+ }
+
+ if (!level.getName().equals(expected.getName())) {
+ throw new RuntimeException(formatLevel(level) + " != " + formatLevel(expected));
+ }
+
+ // Level.parse is expected to return the custom Level
+ if (level != expected) {
+ throw new RuntimeException(formatLevel(level) + " != " + formatLevel(expected));
+ }
+
+ ResourceBundle rb = ResourceBundle.getBundle(RB_NAME);
+ String name = rb.getString(level.getName());
+ if (!level.getLocalizedName().equals(name)) {
+ // must have the same localized name
+ throw new RuntimeException(level.getLocalizedName() + " != " + name);
+ }
+ }
+
+ static String formatLevel(Level l) {
+ return l + ":" + l.intValue() + ":" + l.getClass().getName();
+ }
+}
diff --git a/jdk/test/java/util/logging/Level/myresource.properties b/jdk/test/java/util/logging/Level/myresource.properties
new file mode 100644
index 0000000..2c8c412
--- /dev/null
+++ b/jdk/test/java/util/logging/Level/myresource.properties
@@ -0,0 +1,5 @@
+EMERGENCY=localized.emergency
+ALERT=localized.alert
+CRITICAL=localized.critical
+WARNING=localized.warning
+INFO=localized.info
diff --git a/jdk/test/java/util/logging/Logger/logrb/TestLogrbResourceBundle.java b/jdk/test/java/util/logging/Logger/logrb/TestLogrbResourceBundle.java
new file mode 100644
index 0000000..f472194
--- /dev/null
+++ b/jdk/test/java/util/logging/Logger/logrb/TestLogrbResourceBundle.java
@@ -0,0 +1,381 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.ResourceBundle;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+import resources.ListBundle;
+
+/**
+ * @test
+ * @bug 8013839
+ * @summary tests Logger.logrb(..., ResourceBundle);
+ * @build TestLogrbResourceBundle resources.ListBundle resources.ListBundle_fr
+ * @run main TestLogrbResourceBundle
+ * @author danielfuchs
+ */
+public class TestLogrbResourceBundle {
+
+ final static String LIST_BUNDLE_NAME = "resources.ListBundle";
+ final static String PROPERTY_BUNDLE_NAME = "resources.PropertyBundle";
+
+ /**
+ * A dummy handler class that we can use to check the bundle/bundle name
+ * that was present in the last LogRecord instance published.
+ */
+ static final class TestHandler extends Handler {
+ ResourceBundle lastBundle = null;
+ String lastBundleName = null;
+ Object[] lastParams = null;
+ Throwable lastThrown = null;
+ String lastMessage = null;
+ @Override
+ public void publish(LogRecord record) {
+ lastBundle = record.getResourceBundle();
+ lastBundleName = record.getResourceBundleName();
+ lastParams = record.getParameters();
+ lastThrown = record.getThrown();
+ lastMessage = record.getMessage();
+ }
+
+ @Override
+ public void flush() {
+ }
+
+ @Override
+ public void close() throws SecurityException {
+ }
+ }
+
+ /**
+ * We're going to do the same test with each of the different new logrb
+ * forms.
+ * <ul>
+ * <li> LOGRB_NO_ARGS: calling logrb with no message argument.
+ * <li> LOGRB_SINGLE_ARG: calling logrb with a single message argument.
+ * <li> LOGRB_ARG_ARRAY: calling logrb with an array of message arguments.
+ * <li> LOGRB_VARARGS: calling logrb with a variable list of message arguments.
+ * <li> LOGRB_THROWABLE: calling logrb with an exception.
+ * </ul>
+ */
+ private static enum TestCase {
+ LOGRB_NO_ARGS, LOGRB_SINGLE_ARG, LOGRB_ARG_ARRAY, LOGRB_VARARGS, LOGRB_THROWABLE;
+
+ public void logrb(Logger logger, ResourceBundle bundle) {
+ switch(this) {
+ case LOGRB_NO_ARGS:
+ logger.logrb(Level.CONFIG,
+ TestLogrbResourceBundle.class.getName(),
+ "main", bundle, "dummy");
+ break;
+ case LOGRB_SINGLE_ARG:
+ logger.logrb(Level.CONFIG,
+ TestLogrbResourceBundle.class.getName(),
+ "main", bundle, "dummy", "bar");
+ break;
+ case LOGRB_ARG_ARRAY:
+ logger.logrb(Level.CONFIG,
+ TestLogrbResourceBundle.class.getName(),
+ "main", bundle, "dummy",
+ new Object[] { "bar", "baz"} );
+ break;
+ case LOGRB_VARARGS:
+ logger.logrb(Level.CONFIG,
+ TestLogrbResourceBundle.class.getName(),
+ "main", bundle, "dummy",
+ "bar", "baz" );
+ break;
+ case LOGRB_THROWABLE:
+ logger.logrb(Level.CONFIG,
+ TestLogrbResourceBundle.class.getName(),
+ "main", bundle, "dummy",
+ new Exception("dummy exception") );
+ break;
+ default:
+ }
+ }
+
+ /**
+ * Checks that the last published logged record had the expected data.
+ * @param handler the TestHandler through which the record was published.
+ */
+ public void checkLogged(TestHandler handler) {
+ checkLogged(handler.lastMessage, handler.lastParams, handler.lastThrown);
+ }
+
+ private void checkLogged(String message, Object[] parameters, Throwable thrown) {
+ switch(this) {
+ case LOGRB_NO_ARGS:
+ if ("dummy".equals(message) && thrown == null
+ && (parameters == null || parameters.length == 0)) {
+ return; // OK: all was as expected.
+ }
+ break;
+ case LOGRB_SINGLE_ARG:
+ if ("dummy".equals(message) && thrown == null
+ && parameters != null
+ && parameters.length == 1
+ && "bar".equals(parameters[0])) {
+ return; // OK: all was as expected.
+ }
+ break;
+ case LOGRB_VARARGS:
+ case LOGRB_ARG_ARRAY:
+ if ("dummy".equals(message) && thrown == null
+ && parameters != null
+ && parameters.length > 1
+ && Arrays.deepEquals(new Object[] { "bar", "baz"},
+ parameters)) {
+ return; // OK: all was as expected.
+ }
+ break;
+ case LOGRB_THROWABLE:
+ if ("dummy".equals(message) && thrown != null
+ && thrown.getClass() == Exception.class
+ && "dummy exception".equals(thrown.getMessage())) {
+ return; // OK: all was as expected.
+ }
+ break;
+ default:
+ }
+
+ // We had some unexpected stuff: throw exception.
+ throw new RuntimeException(this + ": "
+ + "Unexpected content in last published log record: "
+ + "\n\tmessage=\"" + message + "\""
+ + "\n\tparameters=" + Arrays.toString(parameters)
+ + "\n\tthrown=" + thrown);
+ }
+ }
+
+ static String getBaseName(ResourceBundle bundle) {
+ return bundle == null ? null : bundle.getBaseBundleName();
+ }
+
+ public static void main(String... args) throws Exception {
+
+ Locale defaultLocale = Locale.getDefault();
+
+ final ResourceBundle bundle = ResourceBundle.getBundle(LIST_BUNDLE_NAME);
+ final ResourceBundle bundle_fr =
+ ResourceBundle.getBundle(LIST_BUNDLE_NAME, Locale.FRENCH);
+ final ResourceBundle propertyBundle = ResourceBundle.getBundle(PROPERTY_BUNDLE_NAME);
+ final ResourceBundle propertyBundle_fr =
+ ResourceBundle.getBundle(PROPERTY_BUNDLE_NAME, Locale.FRENCH);
+ Logger foobar = Logger.getLogger("foo.bar");
+ final TestHandler handler = new TestHandler();
+ foobar.addHandler(handler);
+ foobar.setLevel(Level.CONFIG);
+
+ final ResourceBundle anonBundle = new ListBundle();
+ try {
+ // First we're going to call logrb on a logger that
+ // has no bundle set...
+
+ // For each possible logrb form...
+ for (TestCase test : TestCase.values()) {
+ // For various resource bundles
+ for (ResourceBundle b : new ResourceBundle[] {
+ anonBundle, bundle, bundle_fr, propertyBundle,
+ anonBundle, null, propertyBundle_fr,
+ }) {
+ // Prints the resource bundle base name (can be null,
+ // we don't enforce non-null names in logrb.
+ final String baseName = getBaseName(b);
+ System.out.println("Testing " + test + " with " + baseName);
+
+ // log in the 'foobar' logger using bundle 'b'
+ test.logrb(foobar, b);
+
+ // check that the correct bundle was set in the published
+ // LogRecord
+ if (handler.lastBundle != b) {
+ throw new RuntimeException("Unexpected bundle: "
+ + handler.lastBundle);
+ }
+
+ // check that the correct bundle name was set in the published
+ // LogRecord
+ if (!Objects.equals(handler.lastBundleName, baseName)) {
+ throw new RuntimeException("Unexpected bundle name: "
+ + handler.lastBundleName);
+ }
+
+ // check that calling foobar.logrb() had no side effect on
+ // the bundle used by foobar. foobar should still have no
+ // bundle set.
+ if (foobar.getResourceBundle() != null) {
+ throw new RuntimeException("Unexpected bundle: "
+ + foobar.getResourceBundle());
+ }
+ if (foobar.getResourceBundleName() != null) {
+ throw new RuntimeException("Unexpected bundle: "
+ + foobar.getResourceBundleName());
+ }
+
+ // Test that the last published log record had all the
+ // data that this test case had logged (message, parameters,
+ // thrown...
+ test.checkLogged(handler);
+ }
+ }
+
+ // No we're going to set a resource bundle on the foobar logger
+ // and do it all again...
+
+ // For the same bundle in two different locales
+ for (ResourceBundle propBundle : new ResourceBundle[] {
+ propertyBundle, propertyBundle_fr,
+ }) {
+
+ // set the bundle on foobar...
+ foobar.setResourceBundle(propBundle);
+
+ // check the bundle was correctly set...
+ if (!propBundle.equals(foobar.getResourceBundle())) {
+ throw new RuntimeException("Unexpected bundle: "
+ + foobar.getResourceBundle());
+ }
+ if (!Objects.equals(getBaseName(propBundle), foobar.getResourceBundleName())) {
+ throw new RuntimeException("Unexpected bundle name: "
+ + foobar.getResourceBundleName());
+ }
+
+ System.out.println("Configuring " + foobar.getName() + " with "
+ + propBundle);
+
+ // for each possible logrb form...
+ for (TestCase test : TestCase.values()) {
+
+ // for various resource bundles
+ for (ResourceBundle b : new ResourceBundle[] {
+ anonBundle, bundle, null, bundle_fr, propertyBundle,
+ anonBundle, propertyBundle_fr,
+ }) {
+
+ final String baseName = getBaseName(b);
+ System.out.println("Testing " + test + " with " + baseName);
+
+ // call foobar.logrb
+ test.logrb(foobar, b);
+
+ // check which resource bundle was used (should be
+ // the one passed to logrb)
+ if (handler.lastBundle != b) {
+ throw new RuntimeException("Unexpected bundle: "
+ + handler.lastBundle);
+ }
+ if (!Objects.equals(handler.lastBundleName, baseName)) {
+ throw new RuntimeException("Unexpected bundle name: "
+ + handler.lastBundleName);
+ }
+
+ // Verify there was no side effect on the bundle that
+ // had been previously set on the logger...
+ if (foobar.getResourceBundle() != propBundle) {
+ throw new RuntimeException("Unexpected bundle: "
+ + foobar.getResourceBundle());
+ }
+ if (!Objects.equals(getBaseName(propBundle),
+ foobar.getResourceBundleName())) {
+ throw new RuntimeException("Unexpected bundle name: "
+ + foobar.getResourceBundleName());
+ }
+
+ // Checked that the published LogRecord had the
+ // expected content logged by this test case.
+ test.checkLogged(handler);
+ }
+ }
+ }
+
+ // Now we're going to the same thing, but with a logger which
+ // has an inherited resource bundle.
+ Logger foobaz = Logger.getLogger("foo.bar.baz");
+
+ // check that foobaz has no bundle set locally.
+ if (foobaz.getResourceBundle() != null) {
+ throw new RuntimeException("Unexpected bundle: "
+ + foobaz.getResourceBundle());
+ }
+ if (foobaz.getResourceBundleName() != null) {
+ throw new RuntimeException("Unexpected bundle: "
+ + foobaz.getResourceBundle());
+ }
+
+ // The current locale should have no effect on logrb.
+ Locale.setDefault(Locale.GERMAN); // shouldn't change anything...
+
+ // for each possible logrb form
+ for (TestCase test : TestCase.values()) {
+
+ // for various resource bundle
+ for (ResourceBundle b : new ResourceBundle[] {
+ anonBundle, bundle, bundle_fr, propertyBundle, null,
+ anonBundle, propertyBundle_fr,
+ }) {
+ final String baseName = getBaseName(b);
+ System.out.println("Testing " + test + " with "
+ + foobaz.getName() + " and "
+ + baseName);
+
+ // call foobaz.logrb with the bundle
+ test.logrb(foobaz, b);
+
+ // check that the bundle passed to logrb was used.
+ if (handler.lastBundle != b) {
+ throw new RuntimeException("Unexpected bundle: "
+ + handler.lastBundle);
+ }
+ if (!Objects.equals(handler.lastBundleName, baseName)) {
+ throw new RuntimeException("Unexpected bundle name: "
+ + handler.lastBundleName);
+ }
+
+ // check that there was no effect on the bundle set
+ // on foobaz: it should still be null.
+ if (foobaz.getResourceBundle() != null) {
+ throw new RuntimeException("Unexpected bundle: "
+ + foobaz.getResourceBundle());
+ }
+ if (foobaz.getResourceBundleName() != null) {
+ throw new RuntimeException("Unexpected bundle: "
+ + foobaz.getResourceBundleName());
+ }
+
+ // check that the last published log record had all the
+ // data that was logged by this testcase.
+ test.checkLogged(handler);
+ }
+ }
+
+ } finally {
+ Locale.setDefault(defaultLocale);
+ }
+
+ }
+}
diff --git a/jdk/test/java/util/logging/Logger/logrb/resources/ListBundle.java b/jdk/test/java/util/logging/Logger/logrb/resources/ListBundle.java
new file mode 100644
index 0000000..121db29
--- /dev/null
+++ b/jdk/test/java/util/logging/Logger/logrb/resources/ListBundle.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2013, 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 resources;
+
+import java.util.ListResourceBundle;
+
+/**
+ *
+ * @author danielfuchs
+ */
+public class ListBundle extends ListResourceBundle {
+
+ @Override
+ protected Object[][] getContents() {
+ return new Object[][] {
+ { "dummy", "foo" },
+ };
+
+ }
+
+}
diff --git a/jdk/test/java/util/logging/Logger/logrb/resources/ListBundle_fr.java b/jdk/test/java/util/logging/Logger/logrb/resources/ListBundle_fr.java
new file mode 100644
index 0000000..b168bf7
--- /dev/null
+++ b/jdk/test/java/util/logging/Logger/logrb/resources/ListBundle_fr.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2013, 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 resources;
+
+import java.util.ListResourceBundle;
+
+/**
+ *
+ * @author danielfuchs
+ */
+public class ListBundle_fr extends ListResourceBundle {
+
+ @Override
+ protected Object[][] getContents() {
+ return new Object[][] {
+ { "dummy", "toto" },
+ };
+
+ }
+
+}
diff --git a/jdk/make/sun/awt/FILES_c_macosx.gmk b/jdk/test/java/util/logging/Logger/logrb/resources/PropertyBundle.properties
similarity index 72%
copy from jdk/make/sun/awt/FILES_c_macosx.gmk
copy to jdk/test/java/util/logging/Logger/logrb/resources/PropertyBundle.properties
index d6bef30..343c648 100644
--- a/jdk/make/sun/awt/FILES_c_macosx.gmk
+++ b/jdk/test/java/util/logging/Logger/logrb/resources/PropertyBundle.properties
@@ -1,12 +1,10 @@
#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 20013, 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.
+# 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
@@ -22,7 +20,5 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-
-FILES_AWT_objc = \
- $(TARGDIR)MacOSXResourceBundle.m
+dummy=foo
diff --git a/jdk/make/sun/awt/FILES_c_macosx.gmk b/jdk/test/java/util/logging/Logger/logrb/resources/PropertyBundle_fr.properties
similarity index 72%
copy from jdk/make/sun/awt/FILES_c_macosx.gmk
copy to jdk/test/java/util/logging/Logger/logrb/resources/PropertyBundle_fr.properties
index d6bef30..3120271 100644
--- a/jdk/make/sun/awt/FILES_c_macosx.gmk
+++ b/jdk/test/java/util/logging/Logger/logrb/resources/PropertyBundle_fr.properties
@@ -1,12 +1,10 @@
#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 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.
+# 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
@@ -22,7 +20,5 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-
-FILES_AWT_objc = \
- $(TARGDIR)MacOSXResourceBundle.m
+dummy=toto
diff --git a/jdk/test/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java b/jdk/test/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java
new file mode 100644
index 0000000..3ba69e7
--- /dev/null
+++ b/jdk/test/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java
@@ -0,0 +1,393 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+import java.security.AccessControlException;
+import java.security.Permission;
+import java.security.Permissions;
+import java.security.Policy;
+import java.security.ProtectionDomain;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.PropertyPermission;
+import java.util.ResourceBundle;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+import java.util.logging.LoggingPermission;
+import resources.ListBundle;
+
+/**
+ * @test
+ * @bug 8013839
+ * @summary tests Logger.setResourceBundle;
+ * @build TestSetResourceBundle resources.ListBundle resources.ListBundle_fr
+ * @run main/othervm TestSetResourceBundle UNSECURE
+ * @run main/othervm TestSetResourceBundle PERMISSION
+ * @run main/othervm TestSetResourceBundle SECURE
+ * @author danielfuchs
+ */
+public class TestSetResourceBundle {
+
+ final static String LIST_BUNDLE_NAME = "resources.ListBundle";
+ final static String PROPERTY_BUNDLE_NAME = "resources.PropertyBundle";
+
+ /**
+ * A dummy handler class that we can use to check the bundle/bundle name
+ * that was present in the last LogRecord instance published.
+ */
+ static final class TestHandler extends Handler {
+ ResourceBundle lastBundle = null;
+ String lastBundleName = null;
+ @Override
+ public void publish(LogRecord record) {
+ lastBundle = record.getResourceBundle();
+ lastBundleName = record.getResourceBundleName();
+ }
+
+ @Override
+ public void flush() {
+ }
+
+ @Override
+ public void close() throws SecurityException {
+ }
+ }
+
+ /**
+ * We will test setResourceBundle() in 3 configurations.
+ * UNSECURE: No security manager.
+ * SECURE: With the security manager present - and the required
+ * LoggingPermission("control") granted.
+ * PERMISSION: With the security manager present - and the required
+ * LoggingPermission("control") *not* granted. Here we will
+ * test that the expected security permission is thrown.
+ */
+ public static enum TestCase {
+ UNSECURE, SECURE, PERMISSION;
+ public void run(String name) throws Exception {
+ System.out.println("Running test case: " + name());
+ switch (this) {
+ case UNSECURE:
+ testUnsecure(name);
+ break;
+ case SECURE:
+ testSecure(name);
+ break;
+ case PERMISSION:
+ testPermission(name);
+ break;
+ default:
+ throw new Error("Unknown test case: "+this);
+ }
+ }
+ public String loggerName(String name) {
+ return name().toLowerCase(Locale.ROOT) + "." + name;
+ }
+ }
+
+ public static void main(String... args) throws Exception {
+
+ Locale defaultLocale = Locale.getDefault();
+
+ if (args == null || args.length == 0) {
+ args = new String[] {
+ TestCase.UNSECURE.name(),
+ TestCase.SECURE.name()
+ };
+ }
+
+ for (String testName : args) {
+ TestCase test = TestCase.valueOf(testName);
+ try {
+ test.run(test.loggerName("foo.bar"));
+ } finally {
+ Locale.setDefault(defaultLocale);
+ }
+ }
+ }
+
+ /**
+ * Test without security manager.
+ * @param loggerName The logger to use.
+ * @throws Exception if the test fails.
+ */
+ public static void testUnsecure(String loggerName) throws Exception {
+ if (System.getSecurityManager() != null) {
+ throw new Error("Security manager is set");
+ }
+ test(loggerName);
+ }
+
+ /**
+ * Test with security manager.
+ * @param loggerName The logger to use.
+ * @throws Exception if the test fails.
+ */
+ public static void testSecure(String loggerName) throws Exception {
+ if (System.getSecurityManager() != null) {
+ throw new Error("Security manager is already set");
+ }
+ Policy.setPolicy(new SimplePolicy(TestCase.SECURE));
+ System.setSecurityManager(new SecurityManager());
+ test(loggerName);
+ }
+
+ /**
+ * Test the LoggingPermission("control") is required.
+ * @param loggerName The logger to use.
+ */
+ public static void testPermission(String loggerName) {
+ if (System.getSecurityManager() != null) {
+ throw new Error("Security manager is already set");
+ }
+ Policy.setPolicy(new SimplePolicy(TestCase.PERMISSION));
+ System.setSecurityManager(new SecurityManager());
+ final ResourceBundle bundle = ResourceBundle.getBundle(LIST_BUNDLE_NAME);
+ Logger foobar = Logger.getLogger(loggerName);
+ try {
+ foobar.setResourceBundle(bundle);
+ throw new RuntimeException("Permission not checked!");
+ } catch (AccessControlException x) {
+ if (x.getPermission() instanceof LoggingPermission) {
+ if ("control".equals(x.getPermission().getName())) {
+ System.out.println("Got expected exception: " + x);
+ return;
+ }
+ }
+ throw new RuntimeException("Unexpected exception: "+x, x);
+ }
+
+ }
+
+ static String getBaseName(ResourceBundle bundle) {
+ return bundle == null ? null : bundle.getBaseBundleName();
+ }
+
+ public static void test(String loggerName) throws Exception {
+
+ final ResourceBundle bundle = ResourceBundle.getBundle(LIST_BUNDLE_NAME);
+ Logger foobar = Logger.getLogger(loggerName);
+
+ // Checks that IAE is thrown if the bundle has a null base name.
+ try {
+ foobar.setResourceBundle(new ListBundle());
+ throw new RuntimeException("Expected exception not raised!");
+ } catch (IllegalArgumentException x) {
+ System.out.println("Got expected exception: " + x);
+ }
+
+ // Verify that resource bundle was not set.
+ if (foobar.getResourceBundle() != null) {
+ throw new RuntimeException("Unexpected bundle: "
+ + foobar.getResourceBundle());
+ }
+ if (foobar.getResourceBundleName() != null) {
+ throw new RuntimeException("Unexpected bundle: "
+ + foobar.getResourceBundleName());
+ }
+
+ // Set acceptable resource bundle on logger.
+ foobar.setResourceBundle(bundle);
+
+ // check that the bundle has been set correctly
+ if (bundle != foobar.getResourceBundle()) {
+ throw new RuntimeException("Unexpected bundle: "
+ + foobar.getResourceBundle());
+ }
+ if (!Objects.equals(getBaseName(bundle), foobar.getResourceBundleName())) {
+ throw new RuntimeException("Unexpected bundle name: "
+ + foobar.getResourceBundleName());
+ }
+
+ // Check that we can replace the bundle with a bundle of the same name.
+ final ResourceBundle bundle_fr =
+ ResourceBundle.getBundle(LIST_BUNDLE_NAME, Locale.FRENCH);
+ foobar.setResourceBundle(bundle_fr);
+
+ if (bundle_fr != foobar.getResourceBundle()) {
+ throw new RuntimeException("Unexpected bundle: "
+ + foobar.getResourceBundle());
+ }
+ if (!Objects.equals(getBaseName(bundle_fr), foobar.getResourceBundleName())) {
+ throw new RuntimeException("Unexpected bundle name: "
+ + foobar.getResourceBundleName());
+ }
+
+ // Create a child logger
+ Logger foobaz = Logger.getLogger(loggerName + ".baz");
+
+ // Check that the child logger does not have a bundle set locally
+ if (foobaz.getResourceBundle() != null) {
+ throw new RuntimeException("Unexpected bundle: "
+ + foobar.getResourceBundle());
+ }
+ if (foobaz.getResourceBundleName() != null) {
+ throw new RuntimeException("Unexpected bundle: "
+ + foobar.getResourceBundleName());
+ }
+
+
+ // Add a handler on the child logger.
+ final TestHandler handler = new TestHandler();
+ foobaz.addHandler(handler);
+
+ // log a message on the child logger
+ foobaz.severe("dummy");
+
+ // checks that the message has been logged with the bundle
+ // inherited from the parent logger
+ if (!LIST_BUNDLE_NAME.equals(handler.lastBundleName)) {
+ throw new RuntimeException("Unexpected bundle name: "
+ + handler.lastBundleName);
+ }
+ if (!bundle_fr.equals(handler.lastBundle)) {
+ throw new RuntimeException("Unexpected bundle: "
+ + handler.lastBundle);
+ }
+
+ // Check that we can get set a bundle on the child logger
+ // using Logger.getLogger.
+ foobaz = Logger.getLogger(loggerName + ".baz", PROPERTY_BUNDLE_NAME);
+
+ // check that the child logger has the correct bundle.
+ // it should no longer inherit it from its parent.
+ if (!PROPERTY_BUNDLE_NAME.equals(foobaz.getResourceBundleName())) {
+ throw new RuntimeException("Unexpected bundle name: "
+ + foobaz.getResourceBundleName());
+ }
+ if (!PROPERTY_BUNDLE_NAME.equals(foobaz.getResourceBundle().getBaseBundleName())) {
+ throw new RuntimeException("Unexpected bundle name: "
+ + foobaz.getResourceBundle().getBaseBundleName());
+ }
+
+ // log a message on the child logger
+ foobaz.severe("dummy");
+
+ // check that the last published log record has the appropriate
+ // bundle.
+ if (!PROPERTY_BUNDLE_NAME.equals(handler.lastBundleName)) {
+ throw new RuntimeException("Unexpected bundle name: "
+ + handler.lastBundleName);
+ }
+ if (foobaz.getResourceBundle() != handler.lastBundle) {
+ throw new RuntimeException("Unexpected bundle: "
+ + handler.lastBundle);
+ }
+
+ // try to set a bundle that has a different name, and checks that
+ // it fails in IAE.
+ try {
+ foobaz.setResourceBundle(bundle_fr);
+ throw new RuntimeException("Expected exception not raised!");
+ } catch (IllegalArgumentException x) {
+ System.out.println("Got expected exception: " + x);
+ }
+
+ // Test with a subclass of logger which overrides
+ // getResourceBundle() and getResourceBundleName()
+ Logger customLogger = new Logger(foobar.getName()+".bie", null) {
+ @Override
+ public ResourceBundle getResourceBundle() {
+ return bundle_fr;
+ }
+
+ @Override
+ public String getResourceBundleName() {
+ return PROPERTY_BUNDLE_NAME;
+ }
+ };
+
+ final TestHandler handler2 = new TestHandler();
+ customLogger.addHandler(handler2);
+ customLogger.setLevel(Level.FINE);
+ LogManager.getLogManager().addLogger(customLogger);
+
+ Logger l = Logger.getLogger(customLogger.getName());
+ if (l != customLogger) {
+ throw new RuntimeException("Wrong logger: " + l);
+ }
+
+ // log on the custom logger.
+ customLogger.fine("dummy");
+
+ // check that the log record had the correct bundle.
+ if (! PROPERTY_BUNDLE_NAME.equals(handler2.lastBundleName)) {
+ throw new RuntimeException("Unexpected bundle name: "
+ + handler2.lastBundleName);
+ }
+ if (! PROPERTY_BUNDLE_NAME.equals(customLogger.getResourceBundleName())) {
+ throw new RuntimeException("Unexpected bundle name: "
+ + customLogger.getResourceBundleName());
+ }
+ if (bundle_fr != handler2.lastBundle) {
+ throw new RuntimeException("Unexpected bundle: "
+ + handler2.lastBundle);
+ }
+ if (bundle_fr != customLogger.getResourceBundle()) {
+ throw new RuntimeException("Unexpected bundle: "
+ + customLogger.getResourceBundle());
+ }
+
+ // Do the same thing again with a child of the custom logger.
+ Logger biebar = Logger.getLogger(customLogger.getName() + ".bar");
+ biebar.fine("dummy");
+
+ // because getResourceBundleName() is called on parent logger
+ // we will have handler2.lastBundleName = PROPERTY_BUNDLE_NAME
+ if (!PROPERTY_BUNDLE_NAME.equals(handler2.lastBundleName)) {
+ throw new RuntimeException("Unexpected bundle name: "
+ + handler2.lastBundleName);
+ }
+ // because getResourceBundle() is not called on parent logger
+ // we will have getBaseName(handler2.lastBundle) = PROPERTY_BUNDLE_NAME
+ // and not handler2.lastBundle = bundle_fr
+ if (handler2.lastBundle == null) {
+ throw new RuntimeException("Unexpected bundle: "
+ + handler2.lastBundle);
+ }
+ if (!PROPERTY_BUNDLE_NAME.equals(getBaseName(handler2.lastBundle))) {
+ throw new RuntimeException("Unexpected bundle name: "
+ + getBaseName(handler2.lastBundle));
+ }
+ }
+
+ public static class SimplePolicy extends Policy {
+
+ final Permissions permissions;
+ public SimplePolicy(TestCase test) {
+ permissions = new Permissions();
+ if (test != TestCase.PERMISSION) {
+ permissions.add(new LoggingPermission("control", null));
+ }
+ // required for calling Locale.setDefault in the test.
+ permissions.add(new PropertyPermission("user.language", "write"));
+ }
+
+ @Override
+ public boolean implies(ProtectionDomain domain, Permission permission) {
+ return permissions.implies(permission);
+ }
+ }
+
+}
diff --git a/jdk/test/java/util/logging/Logger/setResourceBundle/resources/ListBundle.java b/jdk/test/java/util/logging/Logger/setResourceBundle/resources/ListBundle.java
new file mode 100644
index 0000000..121db29
--- /dev/null
+++ b/jdk/test/java/util/logging/Logger/setResourceBundle/resources/ListBundle.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2013, 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 resources;
+
+import java.util.ListResourceBundle;
+
+/**
+ *
+ * @author danielfuchs
+ */
+public class ListBundle extends ListResourceBundle {
+
+ @Override
+ protected Object[][] getContents() {
+ return new Object[][] {
+ { "dummy", "foo" },
+ };
+
+ }
+
+}
diff --git a/jdk/test/java/util/logging/Logger/setResourceBundle/resources/ListBundle_fr.java b/jdk/test/java/util/logging/Logger/setResourceBundle/resources/ListBundle_fr.java
new file mode 100644
index 0000000..b168bf7
--- /dev/null
+++ b/jdk/test/java/util/logging/Logger/setResourceBundle/resources/ListBundle_fr.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2013, 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 resources;
+
+import java.util.ListResourceBundle;
+
+/**
+ *
+ * @author danielfuchs
+ */
+public class ListBundle_fr extends ListResourceBundle {
+
+ @Override
+ protected Object[][] getContents() {
+ return new Object[][] {
+ { "dummy", "toto" },
+ };
+
+ }
+
+}
diff --git a/jdk/make/sun/awt/FILES_c_macosx.gmk b/jdk/test/java/util/logging/Logger/setResourceBundle/resources/PropertyBundle.properties
similarity index 72%
copy from jdk/make/sun/awt/FILES_c_macosx.gmk
copy to jdk/test/java/util/logging/Logger/setResourceBundle/resources/PropertyBundle.properties
index d6bef30..343c648 100644
--- a/jdk/make/sun/awt/FILES_c_macosx.gmk
+++ b/jdk/test/java/util/logging/Logger/setResourceBundle/resources/PropertyBundle.properties
@@ -1,12 +1,10 @@
#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 20013, 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.
+# 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
@@ -22,7 +20,5 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-
-FILES_AWT_objc = \
- $(TARGDIR)MacOSXResourceBundle.m
+dummy=foo
diff --git a/jdk/make/sun/awt/FILES_c_macosx.gmk b/jdk/test/java/util/logging/Logger/setResourceBundle/resources/PropertyBundle_fr.properties
similarity index 72%
copy from jdk/make/sun/awt/FILES_c_macosx.gmk
copy to jdk/test/java/util/logging/Logger/setResourceBundle/resources/PropertyBundle_fr.properties
index d6bef30..3120271 100644
--- a/jdk/make/sun/awt/FILES_c_macosx.gmk
+++ b/jdk/test/java/util/logging/Logger/setResourceBundle/resources/PropertyBundle_fr.properties
@@ -1,12 +1,10 @@
#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 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.
+# 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
@@ -22,7 +20,5 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-
-FILES_AWT_objc = \
- $(TARGDIR)MacOSXResourceBundle.m
+dummy=toto
diff --git a/jdk/test/java/util/logging/TestMainAppContext.java b/jdk/test/java/util/logging/TestMainAppContext.java
new file mode 100644
index 0000000..28c3fc1
--- /dev/null
+++ b/jdk/test/java/util/logging/TestMainAppContext.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+import java.util.logging.Logger;
+import sun.awt.AppContext;
+import sun.awt.SunToolkit;
+
+
+/**
+ * @test
+ * @bug 8026404
+ * @summary checks that calling getLogger() from a Thread whose ThreadGroup is
+ * a child of the main root group doesn't throw an exception.
+ * @build TestMainAppContext
+ * @run main/othervm TestMainAppContext
+ * @author danielfuchs
+ */
+public class TestMainAppContext {
+
+ static volatile Throwable thrown = null;
+
+ public static void main(String... args) throws Exception {
+ ThreadGroup rootTG = Thread.currentThread().getThreadGroup();
+ while (rootTG.getParent() != null) {
+ rootTG = rootTG.getParent();
+ }
+
+ ThreadGroup tg = new ThreadGroup(rootTG, "FakeApplet");
+ final Thread t1 = new Thread(tg, "createNewAppContext") {
+ @Override
+ public void run() {
+ try {
+ AppContext context = SunToolkit.createNewAppContext();
+ } catch(Throwable t) {
+ thrown = t;
+ }
+ }
+ };
+ t1.start();
+ t1.join();
+ if (thrown != null) {
+ throw new RuntimeException("Unexpected exception: " + thrown, thrown);
+ }
+ Thread t2 = new Thread(tg, "BugDetector") {
+
+ @Override
+ public void run() {
+ try {
+ Logger.getLogger("foo").info("Done");
+ } catch (Throwable x) {
+ thrown = x;
+ }
+ }
+
+ };
+
+ System.setSecurityManager(new SecurityManager());
+ t2.start();
+ t2.join();
+ if (thrown != null) {
+ throw new RuntimeException("Test failed: " + thrown, thrown);
+ }
+
+ }
+
+}
diff --git a/jdk/test/java/util/stream/boottest/java/util/stream/SpinedBufferTest.java b/jdk/test/java/util/stream/boottest/java/util/stream/SpinedBufferTest.java
index 8f9c4ff..26a62ca 100644
--- a/jdk/test/java/util/stream/boottest/java/util/stream/SpinedBufferTest.java
+++ b/jdk/test/java/util/stream/boottest/java/util/stream/SpinedBufferTest.java
@@ -109,7 +109,7 @@
List<Integer> end = Arrays.stream(array)
.boxed()
- .substream(array.length - lastSplitSize)
+ .skip(array.length - lastSplitSize)
.collect(Collectors.toList());
assertEquals(contentOfLastSplit, end);
}
@@ -184,7 +184,7 @@
List<Integer> end = Arrays.stream(array)
.boxed()
- .substream(array.length - lastSplitSize)
+ .skip(array.length - lastSplitSize)
.collect(Collectors.toList());
assertEquals(contentOfLastSplit, end);
}
@@ -259,7 +259,7 @@
List<Long> end = Arrays.stream(array)
.boxed()
- .substream(array.length - lastSplitSize)
+ .skip(array.length - lastSplitSize)
.collect(Collectors.toList());
assertEquals(contentOfLastSplit, end);
}
@@ -335,7 +335,7 @@
List<Double> end = Arrays.stream(array)
.boxed()
- .substream(array.length - lastSplitSize)
+ .skip(array.length - lastSplitSize)
.collect(Collectors.toList());
assertEquals(contentOfLastSplit, end);
}
diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/InfiniteStreamWithLimitOpTest.java b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/InfiniteStreamWithLimitOpTest.java
index 0915839..e082e9d 100644
--- a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/InfiniteStreamWithLimitOpTest.java
+++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/InfiniteStreamWithLimitOpTest.java
@@ -63,10 +63,8 @@
data.add(new Object[]{f.apply("Stream.limit(%d)"),
(UnaryOperator<Stream>) s -> s.limit(SKIP_LIMIT_SIZE)});
- data.add(new Object[]{f.apply("Stream.substream(%d)"),
- (UnaryOperator<Stream>) s -> s.substream(SKIP_LIMIT_SIZE, SKIP_LIMIT_SIZE * 2)});
- data.add(new Object[]{f.apply("Stream.substream(%1$d).limit(%1$d)"),
- (UnaryOperator<Stream>) s -> s.substream(SKIP_LIMIT_SIZE).limit(SKIP_LIMIT_SIZE)});
+ data.add(new Object[]{f.apply("Stream.skip(%1$d).limit(%1$d)"),
+ (UnaryOperator<Stream>) s -> s.skip(SKIP_LIMIT_SIZE).limit(SKIP_LIMIT_SIZE)});
return data.toArray(new Object[0][]);
}
@@ -79,10 +77,8 @@
data.add(new Object[]{f.apply("IntStream.limit(%d)"),
(UnaryOperator<IntStream>) s -> s.limit(SKIP_LIMIT_SIZE)});
- data.add(new Object[]{f.apply("IntStream.substream(%d)"),
- (UnaryOperator<IntStream>) s -> s.substream(SKIP_LIMIT_SIZE, SKIP_LIMIT_SIZE * 2)});
- data.add(new Object[]{f.apply("IntStream.substream(%1$d).limit(%1$d)"),
- (UnaryOperator<IntStream>) s -> s.substream(SKIP_LIMIT_SIZE).limit(SKIP_LIMIT_SIZE)});
+ data.add(new Object[]{f.apply("IntStream.skip(%1$d).limit(%1$d)"),
+ (UnaryOperator<IntStream>) s -> s.skip(SKIP_LIMIT_SIZE).limit(SKIP_LIMIT_SIZE)});
return data.toArray(new Object[0][]);
}
@@ -95,10 +91,8 @@
data.add(new Object[]{f.apply("LongStream.limit(%d)"),
(UnaryOperator<LongStream>) s -> s.limit(SKIP_LIMIT_SIZE)});
- data.add(new Object[]{f.apply("LongStream.substream(%d)"),
- (UnaryOperator<LongStream>) s -> s.substream(SKIP_LIMIT_SIZE, SKIP_LIMIT_SIZE * 2)});
- data.add(new Object[]{f.apply("LongStream.substream(%1$d).limit(%1$d)"),
- (UnaryOperator<LongStream>) s -> s.substream(SKIP_LIMIT_SIZE).limit(SKIP_LIMIT_SIZE)});
+ data.add(new Object[]{f.apply("LongStream.skip(%1$d).limit(%1$d)"),
+ (UnaryOperator<LongStream>) s -> s.skip(SKIP_LIMIT_SIZE).limit(SKIP_LIMIT_SIZE)});
return data.toArray(new Object[0][]);
}
@@ -111,10 +105,8 @@
data.add(new Object[]{f.apply("DoubleStream.limit(%d)"),
(UnaryOperator<DoubleStream>) s -> s.limit(SKIP_LIMIT_SIZE)});
- data.add(new Object[]{f.apply("DoubleStream.substream(%d)"),
- (UnaryOperator<DoubleStream>) s -> s.substream(SKIP_LIMIT_SIZE, SKIP_LIMIT_SIZE * 2)});
- data.add(new Object[]{f.apply("DoubleStream.substream(%1$d).limit(%1$d)"),
- (UnaryOperator<DoubleStream>) s -> s.substream(SKIP_LIMIT_SIZE).limit(SKIP_LIMIT_SIZE)});
+ data.add(new Object[]{f.apply("DoubleStream.skip(%1$d).limit(%1$d)"),
+ (UnaryOperator<DoubleStream>) s -> s.skip(SKIP_LIMIT_SIZE).limit(SKIP_LIMIT_SIZE)});
return data.toArray(new Object[0][]);
}
diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/IntSliceOpTest.java b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/IntSliceOpTest.java
index 0d74f48..51d1362 100644
--- a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/IntSliceOpTest.java
+++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/IntSliceOpTest.java
@@ -44,27 +44,27 @@
private static final int[] EMPTY_INT_ARRAY = new int[0];
public void testSkip() {
- assertCountSum(IntStream.range(0, 0).substream(0).boxed(), 0, 0);
- assertCountSum(IntStream.range(0, 0).substream(4).boxed(), 0, 0);
- assertCountSum(IntStream.range(1, 5).substream(4).boxed(), 0, 0);
- assertCountSum(IntStream.range(1, 5).substream(2).boxed(), 2, 7);
- assertCountSum(IntStream.range(1, 5).substream(0).boxed(), 4, 10);
+ assertCountSum(IntStream.range(0, 0).skip(0).boxed(), 0, 0);
+ assertCountSum(IntStream.range(0, 0).skip(4).boxed(), 0, 0);
+ assertCountSum(IntStream.range(1, 5).skip(4).boxed(), 0, 0);
+ assertCountSum(IntStream.range(1, 5).skip(2).boxed(), 2, 7);
+ assertCountSum(IntStream.range(1, 5).skip(0).boxed(), 4, 10);
- assertCountSum(IntStream.range(0, 0).parallel().substream(0).boxed(), 0, 0);
- assertCountSum(IntStream.range(0, 0).parallel().substream(4).boxed(), 0, 0);
- assertCountSum(IntStream.range(1, 5).parallel().substream(4).boxed(), 0, 0);
- assertCountSum(IntStream.range(1, 5).parallel().substream(2).boxed(), 2, 7);
- assertCountSum(IntStream.range(1, 5).parallel().substream(0).boxed(), 4, 10);
+ assertCountSum(IntStream.range(0, 0).parallel().skip(0).boxed(), 0, 0);
+ assertCountSum(IntStream.range(0, 0).parallel().skip(4).boxed(), 0, 0);
+ assertCountSum(IntStream.range(1, 5).parallel().skip(4).boxed(), 0, 0);
+ assertCountSum(IntStream.range(1, 5).parallel().skip(2).boxed(), 2, 7);
+ assertCountSum(IntStream.range(1, 5).parallel().skip(0).boxed(), 4, 10);
- exerciseOps(EMPTY_INT_ARRAY, s -> s.substream(0), EMPTY_INT_ARRAY);
- exerciseOps(EMPTY_INT_ARRAY, s -> s.substream(10), EMPTY_INT_ARRAY);
+ exerciseOps(EMPTY_INT_ARRAY, s -> s.skip(0), EMPTY_INT_ARRAY);
+ exerciseOps(EMPTY_INT_ARRAY, s -> s.skip(10), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 2).toArray(), s -> s.substream(0), IntStream.range(1, 2).toArray());
- exerciseOps(IntStream.range(1, 2).toArray(), s -> s.substream(1), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(0), IntStream.range(1, 101).toArray());
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(10), IntStream.range(11, 101).toArray());
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(100), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(200), EMPTY_INT_ARRAY);
+ exerciseOps(IntStream.range(1, 2).toArray(), s -> s.skip(0), IntStream.range(1, 2).toArray());
+ exerciseOps(IntStream.range(1, 2).toArray(), s -> s.skip(1), EMPTY_INT_ARRAY);
+ exerciseOps(IntStream.range(1, 101).toArray(), s -> s.skip(0), IntStream.range(1, 101).toArray());
+ exerciseOps(IntStream.range(1, 101).toArray(), s -> s.skip(10), IntStream.range(11, 101).toArray());
+ exerciseOps(IntStream.range(1, 101).toArray(), s -> s.skip(100), EMPTY_INT_ARRAY);
+ exerciseOps(IntStream.range(1, 101).toArray(), s -> s.skip(200), EMPTY_INT_ARRAY);
}
public void testLimit() {
@@ -92,41 +92,23 @@
}
public void testSkipLimit() {
- exerciseOps(EMPTY_INT_ARRAY, s -> s.substream(0).limit(0), EMPTY_INT_ARRAY);
- exerciseOps(EMPTY_INT_ARRAY, s -> s.substream(0).limit(10), EMPTY_INT_ARRAY);
- exerciseOps(EMPTY_INT_ARRAY, s -> s.substream(10).limit(0), EMPTY_INT_ARRAY);
- exerciseOps(EMPTY_INT_ARRAY, s -> s.substream(10).limit(10), EMPTY_INT_ARRAY);
+ exerciseOps(EMPTY_INT_ARRAY, s -> s.skip(0).limit(0), EMPTY_INT_ARRAY);
+ exerciseOps(EMPTY_INT_ARRAY, s -> s.skip(0).limit(10), EMPTY_INT_ARRAY);
+ exerciseOps(EMPTY_INT_ARRAY, s -> s.skip(10).limit(0), EMPTY_INT_ARRAY);
+ exerciseOps(EMPTY_INT_ARRAY, s -> s.skip(10).limit(10), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(0).limit(100), IntStream.range(1, 101).toArray());
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(0).limit(10), IntStream.range(1, 11).toArray());
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(0).limit(0), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(10).limit(100), IntStream.range(11, 101).toArray());
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(10).limit(10), IntStream.range(11, 21).toArray());
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(10).limit(0), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(100).limit(100), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(100).limit(10), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(100).limit(0), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(200).limit(100), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(200).limit(10), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(200).limit(0), EMPTY_INT_ARRAY);
- }
-
- public void testSlice() {
- exerciseOps(EMPTY_INT_ARRAY, s -> s.substream(0, 0), EMPTY_INT_ARRAY);
- exerciseOps(EMPTY_INT_ARRAY, s -> s.substream(10, 10), EMPTY_INT_ARRAY);
-
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(0, 100), IntStream.range(1, 101).toArray());
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(0, 10), IntStream.range(1, 11).toArray());
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(0, 0), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(10, 110), IntStream.range(11, 101).toArray());
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(10, 20), IntStream.range(11, 21).toArray());
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(10, 10), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(100, 200), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(100, 110), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(100, 100), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(200, 300), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(200, 210), EMPTY_INT_ARRAY);
- exerciseOps(IntStream.range(1, 101).toArray(), s -> s.substream(200, 200), EMPTY_INT_ARRAY);
+ exerciseOps(IntStream.range(1, 101).toArray(), s -> s.skip(0).limit(100), IntStream.range(1, 101).toArray());
+ exerciseOps(IntStream.range(1, 101).toArray(), s -> s.skip(0).limit(10), IntStream.range(1, 11).toArray());
+ exerciseOps(IntStream.range(1, 101).toArray(), s -> s.skip(0).limit(0), EMPTY_INT_ARRAY);
+ exerciseOps(IntStream.range(1, 101).toArray(), s -> s.skip(10).limit(100), IntStream.range(11, 101).toArray());
+ exerciseOps(IntStream.range(1, 101).toArray(), s -> s.skip(10).limit(10), IntStream.range(11, 21).toArray());
+ exerciseOps(IntStream.range(1, 101).toArray(), s -> s.skip(10).limit(0), EMPTY_INT_ARRAY);
+ exerciseOps(IntStream.range(1, 101).toArray(), s -> s.skip(100).limit(100), EMPTY_INT_ARRAY);
+ exerciseOps(IntStream.range(1, 101).toArray(), s -> s.skip(100).limit(10), EMPTY_INT_ARRAY);
+ exerciseOps(IntStream.range(1, 101).toArray(), s -> s.skip(100).limit(0), EMPTY_INT_ARRAY);
+ exerciseOps(IntStream.range(1, 101).toArray(), s -> s.skip(200).limit(100), EMPTY_INT_ARRAY);
+ exerciseOps(IntStream.range(1, 101).toArray(), s -> s.skip(200).limit(10), EMPTY_INT_ARRAY);
+ exerciseOps(IntStream.range(1, 101).toArray(), s -> s.skip(200).limit(0), EMPTY_INT_ARRAY);
}
private int sliceSize(int dataSize, int skip, int limit) {
@@ -146,10 +128,10 @@
for (int s : skips) {
setContext("skip", s);
- Collection<Integer> sr = exerciseOps(data, st -> st.substream(s));
+ Collection<Integer> sr = exerciseOps(data, st -> st.skip(s));
assertEquals(sr.size(), sliceSize(data.size(), s));
- sr = exerciseOps(data, st -> st.substream(s).substream(s / 2));
+ sr = exerciseOps(data, st -> st.skip(s).skip(s / 2));
assertEquals(sr.size(), sliceSize(sliceSize(data.size(), s), s / 2));
}
}
@@ -163,10 +145,10 @@
setContext("skip", s);
for (int limit : limits) {
setContext("limit", limit);
- Collection<Integer> sr = exerciseOps(data, st -> st.substream(s).limit(limit));
+ Collection<Integer> sr = exerciseOps(data, st -> st.skip(s).limit(limit));
assertEquals(sr.size(), sliceSize(sliceSize(data.size(), s), 0, limit));
- sr = exerciseOps(data, st -> st.substream(s, limit+s));
+ sr = exerciseOps(data, st -> st.skip(s).limit(limit));
assertEquals(sr.size(), sliceSize(data.size(), s, limit));
}
}
@@ -204,7 +186,7 @@
}
public void testSkipParallel() {
- int[] l = IntStream.range(1, 1001).parallel().substream(200).limit(200).sequential().toArray();
+ int[] l = IntStream.range(1, 1001).parallel().skip(200).limit(200).sequential().toArray();
assertEquals(l.length, 200);
assertEquals(l[l.length - 1], 400);
}
diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SliceOpTest.java b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SliceOpTest.java
index a023486..44499d0 100644
--- a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SliceOpTest.java
+++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SliceOpTest.java
@@ -50,27 +50,27 @@
public class SliceOpTest extends OpTestCase {
public void testSkip() {
- assertCountSum(countTo(0).stream().substream(0), 0, 0);
- assertCountSum(countTo(0).stream().substream(4), 0, 0);
- assertCountSum(countTo(4).stream().substream(4), 0, 0);
- assertCountSum(countTo(4).stream().substream(2), 2, 7);
- assertCountSum(countTo(4).stream().substream(0), 4, 10);
+ assertCountSum(countTo(0).stream().skip(0), 0, 0);
+ assertCountSum(countTo(0).stream().skip(4), 0, 0);
+ assertCountSum(countTo(4).stream().skip(4), 0, 0);
+ assertCountSum(countTo(4).stream().skip(2), 2, 7);
+ assertCountSum(countTo(4).stream().skip(0), 4, 10);
- assertCountSum(countTo(0).parallelStream().substream(0), 0, 0);
- assertCountSum(countTo(0).parallelStream().substream(4), 0, 0);
- assertCountSum(countTo(4).parallelStream().substream(4), 0, 0);
- assertCountSum(countTo(4).parallelStream().substream(2), 2, 7);
- assertCountSum(countTo(4).parallelStream().substream(0), 4, 10);
+ assertCountSum(countTo(0).parallelStream().skip(0), 0, 0);
+ assertCountSum(countTo(0).parallelStream().skip(4), 0, 0);
+ assertCountSum(countTo(4).parallelStream().skip(4), 0, 0);
+ assertCountSum(countTo(4).parallelStream().skip(2), 2, 7);
+ assertCountSum(countTo(4).parallelStream().skip(0), 4, 10);
- exerciseOps(Collections.emptyList(), s -> s.substream(0), Collections.emptyList());
- exerciseOps(Collections.emptyList(), s -> s.substream(10), Collections.emptyList());
+ exerciseOps(Collections.emptyList(), s -> s.skip(0), Collections.emptyList());
+ exerciseOps(Collections.emptyList(), s -> s.skip(10), Collections.emptyList());
- exerciseOps(countTo(1), s -> s.substream(0), countTo(1));
- exerciseOps(countTo(1), s -> s.substream(1), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(0), countTo(100));
- exerciseOps(countTo(100), s -> s.substream(10), range(11, 100));
- exerciseOps(countTo(100), s -> s.substream(100), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(200), Collections.emptyList());
+ exerciseOps(countTo(1), s -> s.skip(0), countTo(1));
+ exerciseOps(countTo(1), s -> s.skip(1), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(0), countTo(100));
+ exerciseOps(countTo(100), s -> s.skip(10), range(11, 100));
+ exerciseOps(countTo(100), s -> s.skip(100), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(200), Collections.emptyList());
}
public void testLimit() {
@@ -97,43 +97,43 @@
}
public void testSkipLimit() {
- exerciseOps(Collections.emptyList(), s -> s.substream(0).limit(0), Collections.emptyList());
- exerciseOps(Collections.emptyList(), s -> s.substream(0).limit(10), Collections.emptyList());
- exerciseOps(Collections.emptyList(), s -> s.substream(10).limit(0), Collections.emptyList());
- exerciseOps(Collections.emptyList(), s -> s.substream(10).limit(10), Collections.emptyList());
+ exerciseOps(Collections.emptyList(), s -> s.skip(0).limit(0), Collections.emptyList());
+ exerciseOps(Collections.emptyList(), s -> s.skip(0).limit(10), Collections.emptyList());
+ exerciseOps(Collections.emptyList(), s -> s.skip(10).limit(0), Collections.emptyList());
+ exerciseOps(Collections.emptyList(), s -> s.skip(10).limit(10), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(0).limit(100), countTo(100));
- exerciseOps(countTo(100), s -> s.substream(0).limit(10), countTo(10));
- exerciseOps(countTo(100), s -> s.substream(0).limit(0), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(10).limit(100), range(11, 100));
- exerciseOps(countTo(100), s -> s.substream(10).limit(10), range(11, 20));
- exerciseOps(countTo(100), s -> s.substream(10).limit(0), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(100).limit(100), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(100).limit(10), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(100).limit(0), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(200).limit(100), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(200).limit(10), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(200).limit(0), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(0).limit(100), countTo(100));
+ exerciseOps(countTo(100), s -> s.skip(0).limit(10), countTo(10));
+ exerciseOps(countTo(100), s -> s.skip(0).limit(0), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(10).limit(100), range(11, 100));
+ exerciseOps(countTo(100), s -> s.skip(10).limit(10), range(11, 20));
+ exerciseOps(countTo(100), s -> s.skip(10).limit(0), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(100).limit(100), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(100).limit(10), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(100).limit(0), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(200).limit(100), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(200).limit(10), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(200).limit(0), Collections.emptyList());
}
public void testSlice() {
- exerciseOps(Collections.emptyList(), s -> s.substream(0, 0), Collections.emptyList());
- exerciseOps(Collections.emptyList(), s -> s.substream(0, 10), Collections.emptyList());
- exerciseOps(Collections.emptyList(), s -> s.substream(10, 10), Collections.emptyList());
- exerciseOps(Collections.emptyList(), s -> s.substream(10, 20), Collections.emptyList());
+ exerciseOps(Collections.emptyList(), s -> s.skip(0).limit(0), Collections.emptyList());
+ exerciseOps(Collections.emptyList(), s -> s.skip(0).limit(10), Collections.emptyList());
+ exerciseOps(Collections.emptyList(), s -> s.skip(10).limit(10), Collections.emptyList());
+ exerciseOps(Collections.emptyList(), s -> s.skip(10).limit(20), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(0, 100), countTo(100));
- exerciseOps(countTo(100), s -> s.substream(0, 10), countTo(10));
- exerciseOps(countTo(100), s -> s.substream(0, 0), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(10, 110), range(11, 100));
- exerciseOps(countTo(100), s -> s.substream(10, 20), range(11, 20));
- exerciseOps(countTo(100), s -> s.substream(10, 10), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(100, 200), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(100, 110), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(100, 100), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(200, 300), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(200, 210), Collections.emptyList());
- exerciseOps(countTo(100), s -> s.substream(200, 200), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(0).limit(100), countTo(100));
+ exerciseOps(countTo(100), s -> s.skip(0).limit(10), countTo(10));
+ exerciseOps(countTo(100), s -> s.skip(0).limit(0), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(10).limit(100), range(11, 100));
+ exerciseOps(countTo(100), s -> s.skip(10).limit(10), range(11, 20));
+ exerciseOps(countTo(100), s -> s.skip(10).limit(0), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(100).limit(100), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(100).limit(10), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(100).limit(0), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(200).limit(100), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(200).limit(10), Collections.emptyList());
+ exerciseOps(countTo(100), s -> s.skip(200).limit(0), Collections.emptyList());
}
private int sliceSize(int dataSize, int skip, int limit) {
@@ -156,17 +156,17 @@
setContext("skip", s);
testSliceMulti(data,
sliceSize(data.size(), s),
- st -> st.substream(s),
- st -> st.substream(s),
- st -> st.substream(s),
- st -> st.substream(s));
+ st -> st.skip(s),
+ st -> st.skip(s),
+ st -> st.skip(s),
+ st -> st.skip(s));
testSliceMulti(data,
sliceSize(sliceSize(data.size(), s), s/2),
- st -> st.substream(s).substream(s / 2),
- st -> st.substream(s).substream(s / 2),
- st -> st.substream(s).substream(s / 2),
- st -> st.substream(s).substream(s / 2));
+ st -> st.skip(s).skip(s / 2),
+ st -> st.skip(s).skip(s / 2),
+ st -> st.skip(s).skip(s / 2),
+ st -> st.skip(s).skip(s / 2));
}
}
@@ -182,17 +182,10 @@
setContext("limit", l);
testSliceMulti(data,
sliceSize(sliceSize(data.size(), s), 0, l),
- st -> st.substream(s).limit(l),
- st -> st.substream(s).limit(l),
- st -> st.substream(s).limit(l),
- st -> st.substream(s).limit(l));
-
- testSliceMulti(data,
- sliceSize(data.size(), s, l),
- st -> st.substream(s, l+s),
- st -> st.substream(s, l+s),
- st -> st.substream(s, l+s),
- st -> st.substream(s, l+s));
+ st -> st.skip(s).limit(l),
+ st -> st.skip(s).limit(l),
+ st -> st.skip(s).limit(l),
+ st -> st.skip(s).limit(l));
}
}
}
diff --git a/jdk/test/java/util/zip/GZIP/GZIPInZip.java b/jdk/test/java/util/zip/GZIP/GZIPInZip.java
index 558ad96..fab869a 100644
--- a/jdk/test/java/util/zip/GZIP/GZIPInZip.java
+++ b/jdk/test/java/util/zip/GZIP/GZIPInZip.java
@@ -22,12 +22,15 @@
*/
/* @test
- * @bug 7021870
- * @summary Reading last gzip chain member must not close the input stream
+ * @bug 7021870 8023431
+ * @summary Reading last gzip chain member must not close the input stream.
+ * Garbage following gzip entry must be ignored.
*/
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
import java.util.zip.ZipEntry;
@@ -40,6 +43,15 @@
private static volatile Throwable trouble;
public static void main(String[] args) throws Throwable {
+ doTest(false, false);
+ doTest(false, true);
+ doTest(true, false);
+ doTest(true, true);
+ }
+
+ private static void doTest(final boolean appendGarbage,
+ final boolean limitGISBuff)
+ throws Throwable {
final PipedOutputStream pos = new PipedOutputStream();
final PipedInputStream pis = new PipedInputStream(pos);
@@ -47,17 +59,23 @@
Thread compressor = new Thread() {
public void run() {
final byte[] xbuf = { 'x' };
- try {
- ZipOutputStream zos = new ZipOutputStream(pos);
+ try (ZipOutputStream zos = new ZipOutputStream(pos)) {
zos.putNextEntry(new ZipEntry("a.gz"));
- GZIPOutputStream gos1 = new GZIPOutputStream(zos);
- gos1.write(xbuf); gos1.finish();
+ try (GZIPOutputStream gos1 = new GZIPOutputStream(zos)) {
+ gos1.write(xbuf);
+ gos1.finish();
+ }
+ if (appendGarbage)
+ zos.write(xbuf);
+
zos.closeEntry();
zos.putNextEntry(new ZipEntry("b.gz"));
- GZIPOutputStream gos2 = new GZIPOutputStream(zos);
- gos2.write(xbuf); gos2.finish();
+ try (GZIPOutputStream gos2 = new GZIPOutputStream(zos)) {
+ gos2.write(xbuf);
+ gos2.finish();
+ }
zos.closeEntry();
} catch (Throwable t) {
@@ -68,19 +86,20 @@
Thread uncompressor = new Thread() {
public void run() {
- try {
- ZipInputStream zis = new ZipInputStream(pis);
+ try (ZipInputStream zis = new ZipInputStream(pis)) {
zis.getNextEntry();
- InputStream gis = new GZIPInputStream(zis);
- // try to read more than the entry has
- gis.skip(2);
+ try (InputStream gis = limitGISBuff ?
+ new GZIPInputStream(zis, 4) :
+ new GZIPInputStream(zis)) {
+ // try to read more than the entry has
+ gis.skip(2);
+ }
try {
zis.getNextEntry();
} catch (IOException e) {
throw new AssertionError("ZIP stream was prematurely closed");
}
-
} catch (Throwable t) {
trouble = t;
}
diff --git a/jdk/test/javax/management/monitor/CounterMonitorThresholdTest.java b/jdk/test/javax/management/monitor/CounterMonitorThresholdTest.java
index a1f93d8..b56d314 100644
--- a/jdk/test/javax/management/monitor/CounterMonitorThresholdTest.java
+++ b/jdk/test/javax/management/monitor/CounterMonitorThresholdTest.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 6229368
+ * @bug 6229368 8025207
* @summary Wrong threshold value in CounterMonitor with offset and modulus.
* @author Luis-Miguel Alventosa
* @run clean CounterMonitorThresholdTest
@@ -144,16 +144,14 @@
for (int i = 0; i < counter.length; i++) {
mbean.setCounter(counter[i]);
System.out.println("\nCounter = " + mbean.getCounter());
- Thread.sleep(300);
- Integer derivedGaugeValue = (Integer) cm.getDerivedGauge(name);
- System.out.println("Derived Gauge = " + derivedGaugeValue);
- if (derivedGaugeValue.intValue() != derivedGauge[i]) {
- System.out.println("Wrong derived gauge! Current value = " +
- derivedGaugeValue + " Expected value = " + derivedGauge[i]);
- System.out.println("\nStop monitoring...");
- cm.stop();
- throw new IllegalArgumentException("wrong derived gauge");
- }
+ Integer derivedGaugeValue;
+ // either pass or test timeout (killed by test harness)
+ // see 8025207
+ do {
+ Thread.sleep(150);
+ derivedGaugeValue = (Integer) cm.getDerivedGauge(name);
+ } while (derivedGaugeValue.intValue() != derivedGauge[i]);
+
Number thresholdValue = cm.getThreshold(name);
System.out.println("Threshold = " + thresholdValue);
if (thresholdValue.intValue() != threshold[i]) {
@@ -163,7 +161,6 @@
cm.stop();
throw new IllegalArgumentException("wrong threshold");
}
- Thread.sleep(300);
}
// Stop the monitor
diff --git a/jdk/test/javax/management/monitor/NullAttributeValueTest.java b/jdk/test/javax/management/monitor/NullAttributeValueTest.java
index e166118..01ab275 100644
--- a/jdk/test/javax/management/monitor/NullAttributeValueTest.java
+++ b/jdk/test/javax/management/monitor/NullAttributeValueTest.java
@@ -23,11 +23,12 @@
/*
* @test
- * @bug 6200031
+ * @bug 6200031 8025206
* @summary Test that the counter/gauge/string monitors emit a
* jmx.monitor.error.type notification when the attribute
* being monitored returns a null value.
* @author Luis-Miguel Alventosa
+ * @author Shanliang JIANG
* @run clean NullAttributeValueTest
* @run build NullAttributeValueTest
* @run main NullAttributeValueTest
@@ -39,7 +40,7 @@
public class NullAttributeValueTest implements NotificationListener {
// Flag to notify that a message has been received
- private boolean messageReceived = false;
+ private volatile boolean messageReceived = false;
// MBean class
public class ObservedObject implements ObservedObjectMBean {
@@ -83,7 +84,6 @@
* Update the counter and check for notifications
*/
public int counterMonitorNotification() throws Exception {
-
CounterMonitor counterMonitor = null;
try {
MBeanServer server = MBeanServerFactory.newMBeanServer();
@@ -134,31 +134,17 @@
echo(">>> START the CounterMonitor");
counterMonitor.start();
- // Wait for granularity period (multiplied by 2 for sure)
- //
- Thread.sleep(granularityperiod * 2);
-
- // Check if notification was received
- //
- if (messageReceived) {
- echo("\tOK: CounterMonitor notification received");
- } else {
- echo("\tKO: CounterMonitor notification missed or not emitted");
- return 1;
- }
+ return checkReceived(granularityperiod, "CounterMonitor");
} finally {
if (counterMonitor != null)
counterMonitor.stop();
}
-
- return 0;
}
/**
* Update the gauge and check for notifications
*/
public int gaugeMonitorNotification() throws Exception {
-
GaugeMonitor gaugeMonitor = null;
try {
MBeanServer server = MBeanServerFactory.newMBeanServer();
@@ -212,31 +198,17 @@
echo(">>> START the GaugeMonitor");
gaugeMonitor.start();
- // Wait for granularity period (multiplied by 2 for sure)
- //
- Thread.sleep(granularityperiod * 2);
-
- // Check if notification was received
- //
- if (messageReceived) {
- echo("\tOK: GaugeMonitor notification received");
- } else {
- echo("\tKO: GaugeMonitor notification missed or not emitted");
- return 1;
- }
+ return checkReceived(granularityperiod, "GaugeMonitor");
} finally {
if (gaugeMonitor != null)
gaugeMonitor.stop();
}
-
- return 0;
}
/**
* Update the string and check for notifications
*/
public int stringMonitorNotification() throws Exception {
-
StringMonitor stringMonitor = null;
try {
MBeanServer server = MBeanServerFactory.newMBeanServer();
@@ -289,24 +261,11 @@
echo(">>> START the StringMonitor");
stringMonitor.start();
- // Wait for granularity period (multiplied by 2 for sure)
- //
- Thread.sleep(granularityperiod * 2);
-
- // Check if notification was received
- //
- if (messageReceived) {
- echo("\tOK: StringMonitor notification received");
- } else {
- echo("\tKO: StringMonitor notification missed or not emitted");
- return 1;
- }
+ return checkReceived(granularityperiod, "StringMonitor");
} finally {
if (stringMonitor != null)
stringMonitor.stop();
}
-
- return 0;
}
/**
@@ -326,6 +285,21 @@
return error;
}
+ private int checkReceived(long granularityperiod, String caller) throws InterruptedException {
+ int i = 100;
+ do {
+ Thread.sleep(granularityperiod);
+ } while (!messageReceived && i-- > 0);
+
+ if (messageReceived) {
+ echo("\tOK: " + caller + " notification received");
+ } else {
+ echo("\tKO: " + caller + " notification missed or not emitted");
+ }
+
+ return messageReceived ? 0 : 1;
+ }
+
/*
* Print message
*/
diff --git a/jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java b/jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java
index 1ada5fb..42bed85 100644
--- a/jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java
+++ b/jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4940957
+ * @bug 4940957 8025205
* @summary Tests behaviour when connections break
* @author Eamonn McManus
* @run clean BrokenConnectionTest
@@ -485,14 +485,13 @@
}
if (thisok) {
System.out.println("Waiting for failure notif");
- long deadline = System.currentTimeMillis() + 5000;
- while (failureListener.count < 1
- && System.currentTimeMillis() < deadline)
- Thread.sleep(500);
- if (failureListener.count < 1) {
- System.out.println("Did not get failure notif!");
- thisok = false;
- } else if (failureListener.count > 1) {
+ // pass or test timeout. see 8025205
+ do {
+ Thread.sleep(100);
+ } while (failureListener.count < 1);
+
+ Thread.sleep(1000); // if more notif coming ...
+ if (failureListener.count > 1) {
System.out.println("Got too many failure notifs: " +
failureListener.count);
thisok = false;
diff --git a/jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java b/jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java
index 854a211..9bd9a74 100644
--- a/jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java
+++ b/jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4886838 4886830
+ * @bug 4886838 4886830 8025204
* @summary Tests that idle timeouts happen at appropriate times
* @author Eamonn McManus
* @run clean IdleTimeoutTest
@@ -278,19 +278,11 @@
}
System.out.println("Waiting for id list to drop ours");
- deadline = System.currentTimeMillis() + timeout*2 + 10000;
- while (true) {
- ids = Arrays.asList(server.getConnectionIds());
- if (!ids.contains(connId)
- || System.currentTimeMillis() >= deadline)
- break;
- Thread.sleep(500);
- }
- if (ids.contains(connId)) {
- System.out.println("Client id still in list after " +
- "deadline: " + ids);
- return false;
- }
+ // pass or timed out by test harness - see 8025204
+ do {
+ Thread.sleep(100);
+ ids = Arrays.asList(server.getConnectionIds());
+ } while (ids.contains(connId));
conn.getDefaultDomain();
if (connId.equals(client.getConnectionId())) {
diff --git a/jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java b/jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java
index e70d0ad..98eead8 100644
--- a/jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java
+++ b/jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4915825 4921009 4934965 4977469
+ * @bug 4915825 4921009 4934965 4977469 8019584
* @summary Tests behavior when client or server gets object of unknown class
* @author Eamonn McManus
* @run clean MissingClassTest SingleClassLoader
diff --git a/jdk/test/javax/xml/jaxp/validation/8015092/XPathWhiteSpaceTest.java b/jdk/test/javax/xml/jaxp/validation/8015092/XPathWhiteSpaceTest.java
new file mode 100644
index 0000000..c4c4fa2
--- /dev/null
+++ b/jdk/test/javax/xml/jaxp/validation/8015092/XPathWhiteSpaceTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2013, 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 8015092
+ * @summary whitespace within patterns in Selector XPath expression is accepted
+ * @run main/othervm XPathWhiteSpaceTest
+ */
+
+import java.io.*;
+import javax.xml.XMLConstants;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import org.xml.sax.SAXException;
+
+/**
+ * http://www.w3.org/TR/xmlschema-1/#coss-identity-constraint
+ * For readability, whitespace may be used in selector XPath expressions even though
+ * not explicitly allowed by the grammar:
+ * whitespace may be freely added within patterns before or after any token.
+ *
+ * @author huizhe.wang@oracle.com
+ */
+public class XPathWhiteSpaceTest {
+ static final String XSDFILE = "idJ029.xsd";
+
+ public static void main(String[] args) throws Exception {
+ try{
+ SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ Schema schema = schemaFactory.newSchema(new File(System.getProperty("test.src", "."), XSDFILE));
+ } catch (SAXException e) {
+ throw new RuntimeException(e.getMessage());
+ }
+
+
+ }
+
+}
diff --git a/jdk/test/javax/xml/jaxp/validation/8015092/idIxpns.xsd b/jdk/test/javax/xml/jaxp/validation/8015092/idIxpns.xsd
new file mode 100644
index 0000000..941695f
--- /dev/null
+++ b/jdk/test/javax/xml/jaxp/validation/8015092/idIxpns.xsd
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="xpns.org" xmlns:xpns="xpns.org">
+ <xsd:element name="xsid" type="xsd:string"/>
+ <xsd:element name="xiid">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="xiid2" type="xsd:string" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="val" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+</xsd:schema>
diff --git a/jdk/test/javax/xml/jaxp/validation/8015092/idIxpns1.xsd b/jdk/test/javax/xml/jaxp/validation/8015092/idIxpns1.xsd
new file mode 100644
index 0000000..d0ff89a
--- /dev/null
+++ b/jdk/test/javax/xml/jaxp/validation/8015092/idIxpns1.xsd
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="xpns1.org" xmlns:xpns="xpns1.org">
+ <xsd:element name="xsid" type="xsd:string"/>
+ <xsd:element name="xiid">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="xiid2" type="xsd:string" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="val" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+</xsd:schema>
diff --git a/jdk/test/javax/xml/jaxp/validation/8015092/idJ029.xsd b/jdk/test/javax/xml/jaxp/validation/8015092/idJ029.xsd
new file mode 100644
index 0000000..9b83e29
--- /dev/null
+++ b/jdk/test/javax/xml/jaxp/validation/8015092/idJ029.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xpns="xpns.org" xmlns:xpns1="xpns1.org" xmlns:xpns2="xpns2.org" xmlns:imp="importNS">
+ <xsd:import namespace="importNS" schemaLocation="idJimp.xsd"/>
+ <xsd:import namespace="xpns.org" schemaLocation="idIxpns.xsd"/>
+ <xsd:import namespace="xpns1.org" schemaLocation="idIxpns1.xsd"/>
+ <xsd:element name="root">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="tid" maxOccurs="unbounded"/>
+ <xsd:element ref="imp:iid1" maxOccurs="unbounded"/>
+ <xsd:element ref="imp:sid" maxOccurs="unbounded"/>
+ <xsd:element ref="xpns:xiid" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:unique id="foo123" name="uid">
+ <xsd:selector xpath=".//tid"/>
+ <xsd:field xpath=". //."/>
+ </xsd:unique>
+ </xsd:element>
+ <xsd:element name="tid" type="xsd:string"/>
+</xsd:schema>
diff --git a/jdk/test/javax/xml/jaxp/validation/8015092/idJimp.xsd b/jdk/test/javax/xml/jaxp/validation/8015092/idJimp.xsd
new file mode 100644
index 0000000..c2b966a
--- /dev/null
+++ b/jdk/test/javax/xml/jaxp/validation/8015092/idJimp.xsd
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="importNS" xmlns:imp="importNS">
+ <xsd:element name="sid" type="xsd:string"/>
+ <xsd:element name="iid1">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="iid2" type="xsd:string" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+</xsd:schema>
diff --git a/jdk/test/javax/xml/jaxp/validation/8015243/AnyURITest.java b/jdk/test/javax/xml/jaxp/validation/8015243/AnyURITest.java
new file mode 100644
index 0000000..437610c
--- /dev/null
+++ b/jdk/test/javax/xml/jaxp/validation/8015243/AnyURITest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2013, 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 8015243
+ * @summary verifies that illegal URI such as // is rejected
+ * @run main/othervm AnyURITest
+ */
+
+import java.io.*;
+import javax.xml.XMLConstants;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import org.xml.sax.SAXException;
+
+/**
+ * Similar to java.net.URI, allow empty authority prior to non-empty
+ * path, query component or fragment identifier
+ *
+ * @author huizhe.wang@oracle.com
+ */
+public class AnyURITest {
+ static final String XSDFILE = "anyURI_b006.xsd";
+
+ public static void main(String[] args) throws Exception {
+ try{
+ SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ Schema schema = schemaFactory.newSchema(new File(System.getProperty("test.src", "."), XSDFILE));
+ throw new RuntimeException("Illegal URI // should be rejected.");
+ } catch (SAXException e) {
+ //expected:
+ //Enumeration value '//' is not in the value space of the base type, anyURI.
+ }
+
+
+ }
+
+}
diff --git a/jdk/test/javax/xml/jaxp/validation/8015243/anyURI_b006.xsd b/jdk/test/javax/xml/jaxp/validation/8015243/anyURI_b006.xsd
new file mode 100644
index 0000000..ba131d9
--- /dev/null
+++ b/jdk/test/javax/xml/jaxp/validation/8015243/anyURI_b006.xsd
@@ -0,0 +1,32 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+ <xsd:element name="root">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element ref="foo"/>
+ <xsd:element ref="bar"/>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element type="xsd:anyURI" name="foo"></xsd:element>
+ <xsd:element type="st" name="bar"></xsd:element>
+
+ <xsd:simpleType name="st">
+ <xsd:restriction base="xsd:anyURI">
+ <xsd:enumeration value="/"/>
+ <xsd:enumeration value="//"/>
+ <xsd:enumeration value="///"/>
+ <xsd:enumeration value="//a\\b"/>
+ <xsd:enumeration value="\"/>
+ <xsd:enumeration value="\\"/>
+ <xsd:enumeration value="\\\"/>
+ <xsd:enumeration value="\\/"/>
+ <xsd:enumeration value="\\a\b"/>
+ <xsd:enumeration value="\a\b"/>
+ <xsd:enumeration value="/a\b"/>
+ <xsd:enumeration value="..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\a"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+</xsd:schema>
diff --git a/jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java b/jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java
index 07c9bcc..442f2b4 100644
--- a/jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java
+++ b/jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java
@@ -29,10 +29,10 @@
* @author Luis-Miguel Alventosa
* @run clean JvmstatCountersTest
* @run build JvmstatCountersTest
- * @run main/othervm JvmstatCountersTest 1
- * @run main/othervm -Dcom.sun.management.jmxremote JvmstatCountersTest 2
- * @run main/othervm -Dcom.sun.management.jmxremote.port=0 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false JvmstatCountersTest 3
- * @run main/othervm JvmstatCountersTest 4
+ * @run main/othervm/timeout=600 JvmstatCountersTest 1
+ * @run main/othervm/timeout=600 -Dcom.sun.management.jmxremote JvmstatCountersTest 2
+ * @run main/othervm/timeout=600 -Dcom.sun.management.jmxremote.port=0 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false JvmstatCountersTest 3
+ * @run main/othervm/timeout=600 JvmstatCountersTest 4
*/
import java.io.*;
diff --git a/jdk/test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java b/jdk/test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java
index 135dfff..868addd 100644
--- a/jdk/test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java
+++ b/jdk/test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java
@@ -128,7 +128,7 @@
{
ExecutorService pool = Executors.newFixedThreadPool(numThreads);
for (Path path : classes) {
- ClassFileReader reader = ClassFileReader.newInstance(path.toFile());
+ ClassFileReader reader = ClassFileReader.newInstance(path);
for (ClassFile cf : reader.getClassFiles()) {
String classFileName = cf.getName();
// for each ClassFile
diff --git a/jdk/test/sun/security/pkcs11/KeyPairGenerator/TestDH2048.java b/jdk/test/sun/security/pkcs11/KeyPairGenerator/TestDH2048.java
new file mode 100644
index 0000000..c11911a
--- /dev/null
+++ b/jdk/test/sun/security/pkcs11/KeyPairGenerator/TestDH2048.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2013, 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 7196382
+ * @summary Ensure that 2048-bit DH key pairs can be generated
+ * @author Valerie Peng
+ * @library ..
+ */
+
+import java.io.*;
+import java.util.*;
+
+import java.security.*;
+
+import javax.crypto.*;
+
+public class TestDH2048 extends PKCS11Test {
+
+ private static void checkUnsupportedKeySize(KeyPairGenerator kpg, int ks)
+ throws Exception {
+ try {
+ kpg.initialize(ks);
+ throw new Exception("Expected IPE not thrown for " + ks);
+ } catch (InvalidParameterException ipe) {
+ }
+ }
+
+ public void main(Provider p) throws Exception {
+ if (p.getService("KeyPairGenerator", "DH") == null) {
+ System.out.println("KPG for DH not supported, skipping");
+ return;
+ }
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance("DH", p);
+ kpg.initialize(2048);
+ KeyPair kp1 = kpg.generateKeyPair();
+ checkUnsupportedKeySize(kpg, 1536);
+ checkUnsupportedKeySize(kpg, 2176);
+ checkUnsupportedKeySize(kpg, 3072);
+ }
+
+ public static void main(String[] args) throws Exception {
+ main(new TestDH2048());
+ }
+}
diff --git a/jdk/test/sun/security/provider/KeyStore/DKSTest.java b/jdk/test/sun/security/provider/KeyStore/DKSTest.java
index c2b6baf..d1c4f18 100644
--- a/jdk/test/sun/security/provider/KeyStore/DKSTest.java
+++ b/jdk/test/sun/security/provider/KeyStore/DKSTest.java
@@ -81,8 +81,7 @@
int expected;
KeyStore keystore = KeyStore.getInstance("DKS");
// load entries
- keystore.load(
- new KeyStore.DomainLoadStoreParameter(config, PASSWORDS));
+ keystore.load(new DomainLoadStoreParameter(config, PASSWORDS));
cacertsCount = expected = keystore.size();
System.out.println("\nLoading domain keystore: " + config + "\t[" +
expected + " entries]");
@@ -95,8 +94,7 @@
expected = cacertsCount + 1;
keystore = KeyStore.getInstance("DKS");
// load entries
- keystore.load(
- new KeyStore.DomainLoadStoreParameter(config, PASSWORDS));
+ keystore.load(new DomainLoadStoreParameter(config, PASSWORDS));
System.out.println("\nLoading domain keystore: " + config + "\t[" +
expected + " entries]");
checkEntries(keystore, expected);
@@ -109,7 +107,7 @@
keystore = KeyStore.getInstance("DKS");
// load entries
keystore.load(
- new KeyStore.DomainLoadStoreParameter(config,
+ new DomainLoadStoreParameter(config,
Collections.<String, KeyStore.ProtectionParameter>emptyMap()));
System.out.println("\nLoading domain keystore: " + config + "\t[" +
expected + " entries]");
@@ -129,8 +127,7 @@
expected = 0;
keystore = KeyStore.getInstance("DKS");
// load entries
- keystore.load(
- new KeyStore.DomainLoadStoreParameter(config, PASSWORDS));
+ keystore.load(new DomainLoadStoreParameter(config, PASSWORDS));
System.out.println("\nLoading domain keystore: " + config + "\t[" +
expected + " entries]");
checkEntries(keystore, expected);
@@ -142,8 +139,7 @@
expected = 2 + 1 + 1 + 1;
keystore = KeyStore.getInstance("DKS");
// load entries
- keystore.load(
- new KeyStore.DomainLoadStoreParameter(config, PASSWORDS));
+ keystore.load(new DomainLoadStoreParameter(config, PASSWORDS));
System.out.println("\nLoading domain keystore: " + config + "\t[" +
expected + " entries]");
checkEntries(keystore, expected);
@@ -158,12 +154,10 @@
config = new URI(CONFIG + "#keystores_tmp");
System.out.println("Storing domain keystore: " + config + "\t[" +
expected + " entries]");
- keystore.store(
- new KeyStore.DomainLoadStoreParameter(config, PASSWORDS));
+ keystore.store(new DomainLoadStoreParameter(config, PASSWORDS));
keystore = KeyStore.getInstance("DKS");
// reload entries
- keystore.load(
- new KeyStore.DomainLoadStoreParameter(config, PASSWORDS));
+ keystore.load(new DomainLoadStoreParameter(config, PASSWORDS));
System.out.println("Reloading domain keystore: " + config + "\t[" +
expected + " entries]");
checkEntries(keystore, expected);
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/DHKeyExchange/DHEKeySizing.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/DHKeyExchange/DHEKeySizing.java
index 3c61f76..ec61b30 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/DHKeyExchange/DHEKeySizing.java
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/DHKeyExchange/DHEKeySizing.java
@@ -111,7 +111,15 @@
public class DHEKeySizing {
- private static boolean debug = true;
+ private final static boolean debug = true;
+
+ // key length bias because of the stripping of leading zero bytes of
+ // negotiated DH keys.
+ //
+ // This is an effort to mimum intermittent failure when we cannot
+ // estimate what's the exact number of leading zero bytes of
+ // negotiated DH keys.
+ private final static int KEY_LEN_BIAS = 6;
private SSLContext sslc;
private SSLEngine ssle1; // client
@@ -269,7 +277,8 @@
twoToOne.flip();
log("Message length of ServerHello series: " + twoToOne.remaining());
- if (lenServerKeyEx != twoToOne.remaining()) {
+ if (twoToOne.remaining() < (lenServerKeyEx - KEY_LEN_BIAS) ||
+ twoToOne.remaining() > lenServerKeyEx) {
throw new Exception(
"Expected to generate ServerHello series messages of " +
lenServerKeyEx + " bytes, but not " + twoToOne.remaining());
@@ -289,7 +298,8 @@
oneToTwo.flip();
log("Message length of ClientKeyExchange: " + oneToTwo.remaining());
- if (lenClientKeyEx != oneToTwo.remaining()) {
+ if (oneToTwo.remaining() < (lenClientKeyEx - KEY_LEN_BIAS) ||
+ oneToTwo.remaining() > lenClientKeyEx) {
throw new Exception(
"Expected to generate ClientKeyExchange message of " +
lenClientKeyEx + " bytes, but not " + oneToTwo.remaining());
diff --git a/jdk/test/sun/security/tools/keytool/StorePasswords.java b/jdk/test/sun/security/tools/keytool/StorePasswords.java
index e1f0c27..573947f 100644
--- a/jdk/test/sun/security/tools/keytool/StorePasswords.java
+++ b/jdk/test/sun/security/tools/keytool/StorePasswords.java
@@ -77,6 +77,8 @@
}
System.out.println("\nStored " + storeCount + " user passwords, " +
"recovered " + recoverCount + " user passwords");
+
+ new File(KEYSTORE).delete();
}
private static int store() throws Exception {
@@ -144,7 +146,9 @@
// Store the PKCS#12 keystore
System.out.println("Storing PKCS#12 keystore to: " + KEYSTORE);
- keystore.store(new FileOutputStream(KEYSTORE), KEYSTORE_PWD);
+ try (FileOutputStream out = new FileOutputStream(KEYSTORE)) {
+ keystore.store(out, KEYSTORE_PWD);
+ }
return count;
}
@@ -154,7 +158,9 @@
// Load the PKCS#12 keystore
KeyStore keystore = KeyStore.getInstance("PKCS12");
System.out.println("\nLoading PKCS#12 keystore from: " + KEYSTORE);
- keystore.load(new FileInputStream(KEYSTORE), KEYSTORE_PWD);
+ try (FileInputStream in = new FileInputStream(KEYSTORE)) {
+ keystore.load(in, KEYSTORE_PWD);
+ }
SecretKey key;
SecretKeyFactory factory;
diff --git a/jdk/test/sun/security/tools/keytool/autotest.sh b/jdk/test/sun/security/tools/keytool/autotest.sh
index 1d69107..0d8e57c 100644
--- a/jdk/test/sun/security/tools/keytool/autotest.sh
+++ b/jdk/test/sun/security/tools/keytool/autotest.sh
@@ -53,6 +53,15 @@
done
}
+FS="/"
+${TESTJAVA}${FS}bin${FS}java -XshowSettings:properties -version 2> allprop
+cat allprop | grep sun.arch.data.model | grep 32
+if [ "$?" != "0" ]; then
+ B32=false
+else
+ B32=true
+fi
+
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
@@ -61,17 +70,16 @@
LIBNAME="/usr/lib/mps/`isainfo -n`/libsoftokn3.so"
;;
Linux )
- FS="/"
- ${TESTJAVA}${FS}bin${FS}java -XshowSettings:properties -version 2> allprop
- cat allprop | grep os.arch | grep 64
- if [ "$?" != "0" ]; then
+ if [ $B32 = true ]; then
LIBNAME=`find_one \
"/usr/lib/libsoftokn3.so" \
- "/usr/lib/i386-linux-gnu/nss/libsoftokn3.so"`
+ "/usr/lib/i386-linux-gnu/nss/libsoftokn3.so" \
+ "/usr/lib/nss/libsoftokn3.so"`
else
LIBNAME=`find_one \
"/usr/lib64/libsoftokn3.so" \
- "/usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so"`
+ "/usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so" \
+ "/usr/lib/nss/libsoftokn3.so"`
fi
;;
* )
@@ -82,7 +90,7 @@
if [ "$LIBNAME" = "" ]; then
echo "Cannot find libsoftokn3.so"
- exit 1
+ exit 0
fi
${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . -XDignore.symbol.file \
diff --git a/jdk/test/sun/security/tools/policytool/Alias.html b/jdk/test/sun/security/tools/policytool/Alias.html
index 7434726..ee67609 100644
--- a/jdk/test/sun/security/tools/policytool/Alias.html
+++ b/jdk/test/sun/security/tools/policytool/Alias.html
@@ -23,12 +23,10 @@
Warning: Principal name 'myalias' specified without a Principal class.
<li> Click on "OK"
<li> Open the "File" menu, and "Save As"
-<li> Enter "p1" as the file name
-<li> Click on "OK"
-<li> Click on "OK" in the message window
+<li> Save using the file name "p1"
+<li> Click on "OK" in the status message window
<li> Open the "File" menu and "Open Policy"
-<li> Enter "p1" as the file name
-<li> Click on "OK"
+<li> Open the file named "p1"
<li> If the file opens successfully, the test passed.
Otherwise, the test failed.
</ol>
diff --git a/jdk/test/sun/security/tools/policytool/OpenPolicy.html b/jdk/test/sun/security/tools/policytool/OpenPolicy.html
index 2d12c7d..19a8a60 100644
--- a/jdk/test/sun/security/tools/policytool/OpenPolicy.html
+++ b/jdk/test/sun/security/tools/policytool/OpenPolicy.html
@@ -9,8 +9,9 @@
First, policytool will be invoked.<br><br>
-On Windows, if PolicyTool tries to open the default Policy File<br>
-and it has the File separator character pointing the wrong way, like:<br><br>
+Pull down 'File' menu and select 'View Warning Log', which shows that
+the default Policy File is not found. On Windows, if the file name
+has the File separator character pointing the wrong way, like:<br><br>
C:\windows/java.policy<br><br>
diff --git a/jdk/test/sun/security/tools/policytool/UpdatePermissions.html b/jdk/test/sun/security/tools/policytool/UpdatePermissions.html
index 31e6fcf..c840c32 100644
--- a/jdk/test/sun/security/tools/policytool/UpdatePermissions.html
+++ b/jdk/test/sun/security/tools/policytool/UpdatePermissions.html
@@ -12,6 +12,7 @@
Then, follow these steps:<br>
0) Find (or create) a temporary directory that you have write access to.
(Example: 'C:\foo\tmp' on Windows or '/tmp' on other systems)<br><br>
+
1) Click on the "Add Policy Entry" button in the
main policytool window.<br><br>
@@ -31,7 +32,7 @@
select "Save As".<br><br>
8) In the SaveAs window, enter "/tmp/ptool.test" as the file name
-and click "OK".<br>
+and save it. If the file already exists, just replace it.<br>
(Or use the temporary directory mentioned in Step 0 if it's not '/tmp'.
For example, "C:\foo\tmp\ptool.test" on Windows)<br><br>
diff --git a/jdk/test/sun/tools/jstat/gcCauseOutput1.awk b/jdk/test/sun/tools/jstat/gcCauseOutput1.awk
index f6127e4..3041291 100644
--- a/jdk/test/sun/tools/jstat/gcCauseOutput1.awk
+++ b/jdk/test/sun/tools/jstat/gcCauseOutput1.awk
@@ -23,7 +23,7 @@
# or more letters and spaces. It also provides for the ".", "(", and ")"
# characters to allow for the string "System.gc()".
#
-/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[a-zA-Z]+[a-zA-Z \.\(\)]*[ ]*[a-zA-Z]+[a-zA-Z \.\(\)]*$/ {
+/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[a-zA-Z]+[a-zA-Z \.\(\)]*[ ]*[a-zA-Z]+[a-zA-Z \.\(\)]*$/ {
datalines++;
}
diff --git a/jdk/test/sun/tools/jstat/lineCounts1.awk b/jdk/test/sun/tools/jstat/lineCounts1.awk
index b5cb1cd..dd6d5f8 100644
--- a/jdk/test/sun/tools/jstat/lineCounts1.awk
+++ b/jdk/test/sun/tools/jstat/lineCounts1.awk
@@ -18,7 +18,7 @@
headerlines++;
}
-/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
+/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
datalines++;
}
diff --git a/jdk/test/sun/tools/jstat/lineCounts2.awk b/jdk/test/sun/tools/jstat/lineCounts2.awk
index 1309d04..adecd0a 100644
--- a/jdk/test/sun/tools/jstat/lineCounts2.awk
+++ b/jdk/test/sun/tools/jstat/lineCounts2.awk
@@ -14,7 +14,7 @@
headerlines++;
}
-/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
+/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
datalines++;
}
diff --git a/jdk/test/sun/tools/jstat/lineCounts3.awk b/jdk/test/sun/tools/jstat/lineCounts3.awk
index 2d8d4bf..24788b4 100644
--- a/jdk/test/sun/tools/jstat/lineCounts3.awk
+++ b/jdk/test/sun/tools/jstat/lineCounts3.awk
@@ -23,7 +23,7 @@
headerlines++;
}
-/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
+/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
datalines++;
}
diff --git a/jdk/test/sun/tools/jstat/lineCounts4.awk b/jdk/test/sun/tools/jstat/lineCounts4.awk
index 5ec4ac7..c4ea918 100644
--- a/jdk/test/sun/tools/jstat/lineCounts4.awk
+++ b/jdk/test/sun/tools/jstat/lineCounts4.awk
@@ -26,7 +26,7 @@
headerlines++;
}
-/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
+/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
if (headerlines == 2) {
datalines2++;
}
diff --git a/jdk/test/sun/tools/jstat/timeStamp1.awk b/jdk/test/sun/tools/jstat/timeStamp1.awk
index 1d90a18..cce381c 100644
--- a/jdk/test/sun/tools/jstat/timeStamp1.awk
+++ b/jdk/test/sun/tools/jstat/timeStamp1.awk
@@ -14,7 +14,7 @@
headerlines++;
}
-/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
+/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
datalines++;
}
diff --git a/jdk/test/sun/tools/jstatd/jstatGcutilOutput1.awk b/jdk/test/sun/tools/jstatd/jstatGcutilOutput1.awk
index 76b355e..9456f19 100644
--- a/jdk/test/sun/tools/jstatd/jstatGcutilOutput1.awk
+++ b/jdk/test/sun/tools/jstatd/jstatGcutilOutput1.awk
@@ -18,7 +18,7 @@
headerlines++;
}
-/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
+/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
datalines++;
}
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/VERSION b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
index e50b6f3..ea1c49a 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION
+++ b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2013d
+tzdata2013g
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/africa b/jdk/test/sun/util/calendar/zi/tzdata/africa
index 6b19b98..19bc98a 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/africa
+++ b/jdk/test/sun/util/calendar/zi/tzdata/africa
@@ -881,13 +881,23 @@
# transitions would be 2013-07-07 and 2013-08-10; see:
# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10
-# From Paul Eggert (2013-07-03):
+# From Steffen Thorsen (2013-09-28):
+# Morocco extends DST by one month, on very short notice, just 1 day
+# before it was going to end. There is a new decree (2.13.781) for
+# this, where DST from now on goes from last Sunday of March at 02:00
+# to last Sunday of October at 03:00, similar to EU rules. Official
+# source (French):
+# http://www.maroc.gov.ma/fr/actualites/lhoraire-dete-gmt1-maintenu-jusquau-27-octobre-2013
+# Another source (specifying the time for start and end in the decree):
+# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
+
+# From Paul Eggert (2013-09-30):
# To estimate what the Moroccan government will do in future years,
-# transition dates for 2014 through 2021 were determined by running
+# transition dates for 2014 through 2037 were determined by running
# the following program under GNU Emacs 24.3:
#
# (let ((islamic-year 1435))
-# (while (< islamic-year 1444)
+# (while (< islamic-year 1460)
# (let ((a
# (calendar-gregorian-from-absolute
# (calendar-islamic-to-absolute (list 9 1 islamic-year))))
@@ -902,13 +912,14 @@
# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
# (setq islamic-year (+ 1 islamic-year))))
#
-# with the results hand-edited for 2020-2022, when the normal spring-forward
-# date falls during the estimated Ramadan.
-#
-# From 2023 through 2038 Ramadan is not predicted to overlap with
-# daylight saving time. Starting in 2039 there will be overlap again,
+# with spring-forward transitions removed for 2023-2025, when the
+# normal spring-forward date falls during the estimated Ramadan; with
+# all transitions removed for 2026-2035, where the estimated Ramadan
+# falls entirely outside daylight-saving time; and with fall-back
+# transitions removed for 2036-2037, where the normal fall-back
+# date falls during the estimated Ramadan. Problems continue after that,
# but 32-bit time_t values roll around in 2038 so for now do not worry
-# about dates after 2038.
+# about dates after 2037.
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -935,12 +946,14 @@
Rule Morocco 2010 only - Aug 8 0:00 0 -
Rule Morocco 2011 only - Apr 3 0:00 1:00 S
Rule Morocco 2011 only - Jul 31 0 0 -
-Rule Morocco 2012 2019 - Apr lastSun 2:00 1:00 S
-Rule Morocco 2012 max - Sep lastSun 3:00 0 -
+Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 S
+Rule Morocco 2012 only - Sep 30 3:00 0 -
Rule Morocco 2012 only - Jul 20 3:00 0 -
Rule Morocco 2012 only - Aug 20 2:00 1:00 S
Rule Morocco 2013 only - Jul 7 3:00 0 -
Rule Morocco 2013 only - Aug 10 2:00 1:00 S
+Rule Morocco 2013 2035 - Oct lastSun 3:00 0 -
+Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S
Rule Morocco 2014 only - Jun 29 3:00 0 -
Rule Morocco 2014 only - Jul 29 2:00 1:00 S
Rule Morocco 2015 only - Jun 18 3:00 0 -
@@ -953,10 +966,21 @@
Rule Morocco 2018 only - Jun 15 2:00 1:00 S
Rule Morocco 2019 only - May 6 3:00 0 -
Rule Morocco 2019 only - Jun 5 2:00 1:00 S
+Rule Morocco 2020 only - Apr 24 3:00 0 -
Rule Morocco 2020 only - May 24 2:00 1:00 S
+Rule Morocco 2021 only - Apr 13 3:00 0 -
Rule Morocco 2021 only - May 13 2:00 1:00 S
+Rule Morocco 2022 only - Apr 3 3:00 0 -
Rule Morocco 2022 only - May 3 2:00 1:00 S
-Rule Morocco 2023 max - Apr lastSun 2:00 1:00 S
+Rule Morocco 2023 only - Apr 22 2:00 1:00 S
+Rule Morocco 2024 only - Apr 10 2:00 1:00 S
+Rule Morocco 2025 only - Mar 31 2:00 1:00 S
+Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S
+Rule Morocco 2036 only - Oct 21 3:00 0 -
+Rule Morocco 2037 only - Oct 11 3:00 0 -
+Rule Morocco 2038 only - Sep 30 3:00 0 -
+Rule Morocco 2038 only - Oct 30 2:00 1:00 S
+Rule Morocco 2038 max - Oct lastSun 3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
@@ -1123,9 +1147,7 @@
3:00 - EAT
# South Sudan
-Zone Africa/Juba 2:06:24 - LMT 1931
- 2:00 Sudan CA%sT 2000 Jan 15 12:00
- 3:00 - EAT
+Link Africa/Khartoum Africa/Juba
# Swaziland
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/antarctica b/jdk/test/sun/util/calendar/zi/tzdata/antarctica
index 4344326..f30cf74 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/antarctica
+++ b/jdk/test/sun/util/calendar/zi/tzdata/antarctica
@@ -39,9 +39,9 @@
#
# Except for the French entries,
# I made up all time zone abbreviations mentioned here; corrections welcome!
-# FORMAT is `zzz' and GMTOFF is 0 for locations while uninhabited.
+# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited.
-# These rules are stolen from the `southamerica' file.
+# These rules are stolen from the 'southamerica' file.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule ArgAQ 1964 1966 - Mar 1 0:00 0 -
Rule ArgAQ 1964 1966 - Oct 15 0:00 1:00 S
@@ -251,9 +251,10 @@
# Scott Island (never inhabited)
#
# year-round base
-# Scott, Ross Island, since 1957-01, is like Antarctica/McMurdo.
+# Scott Base, Ross Island, since 1957-01.
+# See Pacific/Auckland.
#
-# These rules for New Zealand are stolen from the `australasia' file.
+# These rules for New Zealand are stolen from the 'australasia' file.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D
Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D
@@ -291,11 +292,11 @@
# From Lee Hotz (2001-03-08):
# I queried the folks at Columbia who spent the summer at Vostok and this is
# what they had to say about time there:
-# ``in the US Camp (East Camp) we have been on New Zealand (McMurdo)
+# "in the US Camp (East Camp) we have been on New Zealand (McMurdo)
# time, which is 12 hours ahead of GMT. The Russian Station Vostok was
# 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead
# of GMT). This is a time zone I think two hours east of Moscow. The
-# natural time zone is in between the two: 8 hours ahead of GMT.''
+# natural time zone is in between the two: 8 hours ahead of GMT."
#
# From Paul Eggert (2001-05-04):
# This seems to be hopelessly confusing, so I asked Lee Hotz about it
@@ -360,16 +361,8 @@
-4:00 ChileAQ CL%sT
#
#
-# McMurdo, Ross Island, since 1955-12
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Antarctica/McMurdo 0 - zzz 1956
- 12:00 NZAQ NZ%sT
-#
-# Amundsen-Scott, South Pole, continuously occupied since 1956-11-20
-#
-# From Paul Eggert (1996-09-03):
-# Normally it wouldn't have a separate entry, since it's like the
-# larger Antarctica/McMurdo since 1970, but it's too famous to omit.
+# McMurdo Station, Ross Island, since 1955-12
+# Amundsen-Scott South Pole Station, continuously occupied since 1956-11-20
#
# From Chris Carrier (1996-06-27):
# Siple, the first commander of the South Pole station,
@@ -391,4 +384,4 @@
# we have to go around and set them back 5 minutes or so.
# Maybe if we let them run fast all of the time, we'd get to leave here sooner!!
#
-Link Antarctica/McMurdo Antarctica/South_Pole
+# See 'australasia' for Antarctica/McMurdo.
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/asia b/jdk/test/sun/util/calendar/zi/tzdata/asia
index f0931b3..fd278e5 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/asia
+++ b/jdk/test/sun/util/calendar/zi/tzdata/asia
@@ -29,7 +29,7 @@
# go ahead and edit the file (and please send any changes to
# tz@iana.org for general use in the future).
-# From Paul Eggert (2013-02-21):
+# From Paul Eggert (2013-08-11):
#
# A good source for time zone historical data outside the U.S. is
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -67,11 +67,11 @@
# 4:00 GST Gulf*
# 5:30 IST India
# 7:00 ICT Indochina*
-# 7:00 WIT west Indonesia
-# 8:00 CIT central Indonesia
+# 7:00 WIB west Indonesia (Waktu Indonesia Barat)
+# 8:00 WITA central Indonesia (Waktu Indonesia Tengah)
# 8:00 CST China
# 9:00 CJT Central Japanese Time (1896/1937)*
-# 9:00 EIT east Indonesia
+# 9:00 WIT east Indonesia (Waktu Indonesia Timur)
# 9:00 JST JDT Japan
# 9:00 KST KDT Korea
# 9:30 CST (Australian) Central Standard Time
@@ -779,7 +779,7 @@
8:00 - TLT 1942 Feb 21 23:00 # E Timor Time
9:00 - JST 1945 Sep 23
9:00 - TLT 1976 May 3
- 8:00 - CIT 2000 Sep 17 00:00
+ 8:00 - WITA 2000 Sep 17 00:00
9:00 - TLT
# India
@@ -816,36 +816,53 @@
# (Hollandia). For now, assume all Indonesian locations other than Jayapura
# switched on 1945-09-23.
#
+# From Paul Eggert (2013-08-11):
+# Normally the tz database uses English-language abbreviations, but in
+# Indonesia it's typical to use Indonesian-language abbreviations even
+# when writing in English. For example, see the English-language
+# summary published by the Time and Frequency Laboratory of the
+# Research Center for Calibration, Instrumentation and Metrology,
+# Indonesia, <http://time.kim.lipi.go.id/time-eng.php> (2006-09-29).
+# The abbreviations are:
+#
+# WIB - UTC+7 - Waktu Indonesia Barat (Indonesia western time)
+# WITA - UTC+8 - Waktu Indonesia Tengah (Indonesia central time)
+# WIT - UTC+9 - Waktu Indonesia Timur (Indonesia eastern time)
+#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Java, Sumatra
Zone Asia/Jakarta 7:07:12 - LMT 1867 Aug 10
# Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13,
# but this must be a typo.
- 7:07:12 - JMT 1923 Dec 31 23:47:12 # Jakarta
+ 7:07:12 - BMT 1923 Dec 31 23:47:12 # Batavia
7:20 - JAVT 1932 Nov # Java Time
- 7:30 - WIT 1942 Mar 23
+ 7:30 - WIB 1942 Mar 23
9:00 - JST 1945 Sep 23
- 7:30 - WIT 1948 May
- 8:00 - WIT 1950 May
- 7:30 - WIT 1964
- 7:00 - WIT
+ 7:30 - WIB 1948 May
+ 8:00 - WIB 1950 May
+ 7:30 - WIB 1964
+ 7:00 - WIB
+# west and central Borneo
Zone Asia/Pontianak 7:17:20 - LMT 1908 May
7:17:20 - PMT 1932 Nov # Pontianak MT
- 7:30 - WIT 1942 Jan 29
+ 7:30 - WIB 1942 Jan 29
9:00 - JST 1945 Sep 23
- 7:30 - WIT 1948 May
- 8:00 - WIT 1950 May
- 7:30 - WIT 1964
- 8:00 - CIT 1988 Jan 1
- 7:00 - WIT
+ 7:30 - WIB 1948 May
+ 8:00 - WIB 1950 May
+ 7:30 - WIB 1964
+ 8:00 - WITA 1988 Jan 1
+ 7:00 - WIB
+# Sulawesi, Lesser Sundas, east and south Borneo
Zone Asia/Makassar 7:57:36 - LMT 1920
7:57:36 - MMT 1932 Nov # Macassar MT
- 8:00 - CIT 1942 Feb 9
+ 8:00 - WITA 1942 Feb 9
9:00 - JST 1945 Sep 23
- 8:00 - CIT
+ 8:00 - WITA
+# Maluku Islands, West Papua, Papua
Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov
- 9:00 - EIT 1944 Sep 1
+ 9:00 - WIT 1944 Sep 1
9:30 - CST 1964
- 9:00 - EIT
+ 9:00 - WIT
# Iran
@@ -1387,9 +1404,11 @@
# until about the same time next year (at least).
# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950
#
-# From Paul Eggert (2012-10-25):
-# For now, assume this is just a one-year measure. If it becomes
-# permanent, we should move Jordan from EET to AST effective tomorrow.
+# From Paul Eggert (2013-09-21):
+# It's looking like this change will be permanent; see
+# Petra News Agency, Cancelling winter saved Jordan $7 million (2013-02-20)
+# <http://www.albawaba.com/business/jordan-winter-electricity--472005>.
+# So move Jordan to UTC+3 as of the abovementioned date.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Jordan 1973 only - Jun 6 0:00 1:00 S
@@ -1415,15 +1434,15 @@
Rule Jordan 1999 only - Jul 1 0:00s 1:00 S
Rule Jordan 1999 2002 - Sep lastFri 0:00s 0 -
Rule Jordan 2000 2001 - Mar lastThu 0:00s 1:00 S
-Rule Jordan 2002 max - Mar lastThu 24:00 1:00 S
+Rule Jordan 2002 2012 - Mar lastThu 24:00 1:00 S
Rule Jordan 2003 only - Oct 24 0:00s 0 -
Rule Jordan 2004 only - Oct 15 0:00s 0 -
Rule Jordan 2005 only - Sep lastFri 0:00s 0 -
-Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 -
-Rule Jordan 2013 max - Oct lastFri 0:00s 0 -
+Rule Jordan 2006 2012 - Oct lastFri 0:00s 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Amman 2:23:44 - LMT 1931
- 2:00 Jordan EE%sT
+ 2:00 Jordan EE%sT 2012 Oct 26 0:00s
+ 3:00 - AST
# Kazakhstan
@@ -2303,9 +2322,18 @@
# http://www.samanews.com/index.php?act=Show&id=154120
# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html
-# From Paul Eggert (2013-04-15):
+# From Steffen Thorsen (2013-09-24):
+# The Gaza and West Bank are ending DST Thursday at midnight
+# (2013-09-27 00:00:00) (one hour earlier than last year...).
+# This source in English, says "that winter time will go into effect
+# at midnight on Thursday in the West Bank and Gaza Strip":
+# http://english.wafa.ps/index.php?action=detail&id=23246
+# official source...:
+# http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252
+
+# From Paul Eggert (2013-09-24):
# For future dates, guess the last Thursday in March at 24:00 through
-# the first Friday on or after September 21 at 01:00. This is consistent with
+# the first Friday on or after September 21 at 00:00. This is consistent with
# the predictions in today's editions of the following URLs,
# which are for Gaza and Hebron respectively:
# http://www.timeanddate.com/worldclock/timezone.html?n=702
@@ -2336,7 +2364,8 @@
Rule Palestine 2011 only - Aug 30 0:00 1:00 S
Rule Palestine 2011 only - Sep 30 0:00 0 -
Rule Palestine 2012 max - Mar lastThu 24:00 1:00 S
-Rule Palestine 2012 max - Sep Fri>=21 1:00 0 -
+Rule Palestine 2012 only - Sep 21 1:00 0 -
+Rule Palestine 2013 max - Sep Fri>=21 0:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/australasia b/jdk/test/sun/util/calendar/zi/tzdata/australasia
index 11a3cb9..cd6b724 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/australasia
+++ b/jdk/test/sun/util/calendar/zi/tzdata/australasia
@@ -375,16 +375,25 @@
# today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st
# October 2012 and end at 3 am on Sunday 20th January 2013.
# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155
+
+# From the Fijian Government Media Center (2013-08-30) via David Wheeler:
+# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am
+# on Sunday 19th January, 2014.... move clocks forward by one hour from 2am
+# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx
#
-# From Paul Eggert (2012-08-31):
-# For now, guess a pattern of the penultimate Sundays in October and January.
+# From Paul Eggert (2013-09-09):
+# For now, guess that Fiji springs forward the Sunday before the fourth
+# Monday in October. This matches both recent practice and
+# timeanddate.com's current spring-forward prediction.
+# For the January 2014 transition we guessed right while timeanddate.com
+# guessed wrong, so leave the fall-back prediction alone.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S
Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
Rule Fiji 2009 only - Nov 29 2:00 1:00 S
Rule Fiji 2010 only - Mar lastSun 3:00 0 -
-Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S
+Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S
Rule Fiji 2011 only - Mar Sun>=1 3:00 0 -
Rule Fiji 2012 max - Jan Sun>=18 3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -510,6 +519,7 @@
Zone Pacific/Chatham 12:13:48 - LMT 1957 Jan 1
12:45 Chatham CHA%sT
+Link Pacific/Auckland Antarctica/McMurdo
# Auckland Is
# uninhabited; Maori and Moriori, colonial settlers, pastoralists, sealers,
@@ -759,7 +769,7 @@
# 1886-1891; Baker was similar but exact dates are not known.
# Inhabited by civilians 1935-1942; U.S. military bases 1943-1944;
# uninhabited thereafter.
-# Howland observed Hawaii Standard Time (UTC-10:30) in 1937;
+# Howland observed Hawaii Standard Time (UT-10:30) in 1937;
# see page 206 of Elgen M. Long and Marie K. Long,
# Amelia Earhart: the Mystery Solved, Simon & Schuster (2000).
# So most likely Howland and Baker observed Hawaii Time from 1935
@@ -772,8 +782,17 @@
# no information; was probably like Pacific/Kiritimati
# Johnston
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Pacific/Johnston -10:00 - HST
+#
+# From Paul Eggert (2013-09-03):
+# In his memoirs of June 6th to October 4, 1945
+# <http://www.315bw.org/Herb_Bach.htm> (2005), Herbert C. Bach writes,
+# "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM
+# Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and
+# confirms that Johnston kept the same time as Honolulu in summer 1945.
+# We have no better information, so for now, assume this has been true
+# indefinitely into the past.
+#
+# See 'northamerica' for Pacific/Johnston.
# Kingman
# uninhabited
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/backward b/jdk/test/sun/util/calendar/zi/tzdata/backward
index ca4c437..5afe9a3 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/backward
+++ b/jdk/test/sun/util/calendar/zi/tzdata/backward
@@ -45,15 +45,17 @@
Link America/Argentina/Mendoza America/Mendoza
Link America/Rio_Branco America/Porto_Acre
Link America/Argentina/Cordoba America/Rosario
-Link America/St_Thomas America/Virgin
+Link America/Denver America/Shiprock
+Link America/Port_of_Spain America/Virgin
+Link Pacific/Auckland Antarctica/South_Pole
Link Asia/Ashgabat Asia/Ashkhabad
+Link Asia/Kolkata Asia/Calcutta
Link Asia/Chongqing Asia/Chungking
Link Asia/Dhaka Asia/Dacca
Link Asia/Kathmandu Asia/Katmandu
-Link Asia/Kolkata Asia/Calcutta
Link Asia/Macau Asia/Macao
-Link Asia/Jerusalem Asia/Tel_Aviv
Link Asia/Ho_Chi_Minh Asia/Saigon
+Link Asia/Jerusalem Asia/Tel_Aviv
Link Asia/Thimphu Asia/Thimbu
Link Asia/Makassar Asia/Ujung_Pandang
Link Asia/Ulaanbaatar Asia/Ulan_Bator
@@ -111,10 +113,10 @@
Link Pacific/Chatham NZ-CHAT
Link America/Denver Navajo
Link Asia/Shanghai PRC
-Link Pacific/Pago_Pago Pacific/Samoa
-Link Pacific/Chuuk Pacific/Yap
-Link Pacific/Chuuk Pacific/Truk
Link Pacific/Pohnpei Pacific/Ponape
+Link Pacific/Pago_Pago Pacific/Samoa
+Link Pacific/Chuuk Pacific/Truk
+Link Pacific/Chuuk Pacific/Yap
Link Europe/Warsaw Poland
Link Europe/Lisbon Portugal
Link Asia/Taipei ROC
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/etcetera b/jdk/test/sun/util/calendar/zi/tzdata/etcetera
index d557e30..ebaa5fd 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/etcetera
+++ b/jdk/test/sun/util/calendar/zi/tzdata/etcetera
@@ -54,9 +54,9 @@
# even though this is the opposite of what many people expect.
# POSIX has positive signs west of Greenwich, but many people expect
# positive signs east of Greenwich. For example, TZ='Etc/GMT+4' uses
-# the abbreviation "GMT+4" and corresponds to 4 hours behind UTC
+# the abbreviation "GMT+4" and corresponds to 4 hours behind UT
# (i.e. west of Greenwich) even though many people would expect it to
-# mean 4 hours ahead of UTC (i.e. east of Greenwich).
+# mean 4 hours ahead of UT (i.e. east of Greenwich).
#
# In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for
# TZ='<GMT-4>+4'; if you want time zone abbreviations conforming to
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/europe b/jdk/test/sun/util/calendar/zi/tzdata/europe
index 688136c..9f574a3 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/europe
+++ b/jdk/test/sun/util/calendar/zi/tzdata/europe
@@ -65,7 +65,7 @@
# </a> (1998-09-21, in Portuguese)
#
-# I invented the abbreviations marked `*' in the following table;
+# I invented the abbreviations marked '*' in the following table;
# the rest are from earlier versions of this file, or from other sources.
# Corrections are welcome!
# std dst 2dst
@@ -119,7 +119,7 @@
# and a sketch map showing some of the sightlines involved. One paragraph
# of the text said:
#
-# `An old stone obelisk marking a forgotten terrestrial meridian stands
+# 'An old stone obelisk marking a forgotten terrestrial meridian stands
# beside the river at Kew. In the 18th century, before time and longitude
# was standardised by the Royal Observatory in Greenwich, scholars observed
# this stone and the movement of stars from Kew Observatory nearby. They
@@ -163,7 +163,7 @@
# From Paul Eggert (2003-09-27):
# Summer Time was first seriously proposed by William Willett (1857-1915),
# a London builder and member of the Royal Astronomical Society
-# who circulated a pamphlet ``The Waste of Daylight'' (1907)
+# who circulated a pamphlet "The Waste of Daylight" (1907)
# that proposed advancing clocks 20 minutes on each of four Sundays in April,
# and retarding them by the same amount on four Sundays in September.
# A bill was drafted in 1909 and introduced in Parliament several times,
@@ -188,10 +188,10 @@
# </a>
# From Paul Eggert (1996-09-03):
-# The OED Supplement says that the English originally said ``Daylight Saving''
+# The OED Supplement says that the English originally said "Daylight Saving"
# when they were debating the adoption of DST in 1908; but by 1916 this
# term appears only in quotes taken from DST's opponents, whereas the
-# proponents (who eventually won the argument) are quoted as using ``Summer''.
+# proponents (who eventually won the argument) are quoted as using "Summer".
# From Arthur David Olson (1989-01-19):
#
@@ -231,9 +231,9 @@
# which could not be said to run counter to any official description.
# From Paul Eggert (2000-10-02):
-# Howse writes (p 157) `DBST' too, but `BDST' seems to have been common
+# Howse writes (p 157) 'DBST' too, but 'BDST' seems to have been common
# and follows the more usual convention of putting the location name first,
-# so we use `BDST'.
+# so we use 'BDST'.
# Peter Ilieve (1998-04-19) described at length
# the history of summer time legislation in the United Kingdom.
@@ -454,6 +454,8 @@
Rule GB-Eire 1990 1995 - Oct Sun>=22 1:00u 0 GMT
# Summer Time Order 1997 (S.I. 1997/2982)
# See EU for rules starting in 1996.
+#
+# Use Europe/London for Jersey, Guernsey, and the Isle of Man.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Europe/London -0:01:15 - LMT 1847 Dec 1 0:00s
@@ -820,7 +822,7 @@
1:00 EU CE%sT
# Bosnia and Herzegovina
-# see Serbia
+# See Europe/Belgrade.
# Bulgaria
#
@@ -848,10 +850,10 @@
2:00 EU EE%sT
# Croatia
-# see Serbia
+# See Europe/Belgrade.
# Cyprus
-# Please see the `asia' file for Asia/Nicosia.
+# Please see the 'asia' file for Asia/Nicosia.
# Czech Republic
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -868,6 +870,7 @@
1:00 C-Eur CE%sT 1944 Sep 17 2:00s
1:00 Czech CE%sT 1979
1:00 EU CE%sT
+# Use Europe/Prague also for Slovakia.
# Denmark, Faroe Islands, and Greenland
@@ -1031,12 +1034,12 @@
# From Peter Ilieve (1996-10-28):
# [IATA SSIM (1992/1996) claims that the Baltic republics switch at 01:00s,
# but a relative confirms that Estonia still switches at 02:00s, writing:]
-# ``I do not [know] exactly but there are some little different
+# "I do not [know] exactly but there are some little different
# (confusing) rules for International Air and Railway Transport Schedules
# conversion in Sunday connected with end of summer time in Estonia....
# A discussion is running about the summer time efficiency and effect on
# human physiology. It seems that Estonia maybe will not change to
-# summer time next spring.''
+# summer time next spring."
# From Peter Ilieve (1998-11-04), heavily edited:
# <a href="http://trip.rk.ee/cgi-bin/thw?${BASE}=akt&${OOHTML}=rtd&TA=1998&TO=1&AN=1390">
@@ -1091,7 +1094,7 @@
# Well, here in Helsinki we're just changing from summer time to regular one,
# and it's supposed to change at 4am...
-# From Janne Snabb (2010-0715):
+# From Janne Snabb (2010-07-15):
#
# I noticed that the Finland data is not accurate for years 1981 and 1982.
# During these two first trial years the DST adjustment was made one hour
@@ -1148,7 +1151,7 @@
#
-# Shank & Pottenger seem to use `24:00' ambiguously; resolve it with Whitman.
+# Shank & Pottenger seem to use '24:00' ambiguously; resolve it with Whitman.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule France 1916 only - Jun 14 23:00s 1:00 S
Rule France 1916 1919 - Oct Sun>=1 23:00s 0 -
@@ -1438,7 +1441,7 @@
# <a href="http://toi.iriti.cnr.it/uk/ienitlt.html">
# Day-light Saving Time in Italy (2006-02-03)
# </a>
-# (`FP' below), taken from an Italian National Electrotechnical Institute
+# ('FP' below), taken from an Italian National Electrotechnical Institute
# publication. When the three sources disagree, guess who's right, as follows:
#
# year FP Shanks&P. (S) Whitman (W) Go with:
@@ -1584,10 +1587,22 @@
2:00 EU EE%sT
# Liechtenstein
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Europe/Vaduz 0:38:04 - LMT 1894 Jun
- 1:00 - CET 1981
- 1:00 EU CE%sT
+
+# From Paul Eggert (2013-09-09):
+# Shanks & Pottenger say Vaduz is like Zurich.
+
+# From Alois Treindl (2013-09-18):
+# http://www.eliechtensteinensia.li/LIJ/1978/1938-1978/1941.pdf
+# ... confirms on p. 6 that Liechtenstein followed Switzerland in 1941 and 1942.
+# I ... translate only the last two paragraphs:
+# ... during second world war, in the years 1941 and 1942, Liechtenstein
+# introduced daylight saving time, adapting to Switzerland. From 1943 on
+# central European time was in force throughout the year.
+# From a report of the duke's government to the high council,
+# regarding the introduction of a time law, of 31 May 1977.
+
+Link Europe/Zurich Europe/Vaduz
+
# Lithuania
@@ -1675,7 +1690,7 @@
1:00 EU CE%sT
# Macedonia
-# see Serbia
+# See Europe/Belgrade.
# Malta
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -1768,7 +1783,7 @@
1:00 EU CE%sT
# Montenegro
-# see Serbia
+# See Europe/Belgrade.
# Netherlands
@@ -1883,7 +1898,7 @@
# before 1895, and therefore probably changed the local time somewhere
# between 1895 and 1925 (inclusive).
-# From Paul Eggert (2001-05-01):
+# From Paul Eggert (2013-09-04):
#
# Actually, Jan Mayen was never occupied by Germany during World War II,
# so it must have diverged from Oslo time during the war, as Oslo was
@@ -1894,7 +1909,7 @@
# 1941 with a small Norwegian garrison and continued operations despite
# frequent air ttacks from Germans. In 1943 the Americans established a
# radiolocating station on the island, called "Atlantic City". Possibly
-# the UTC offset changed during the war, but I think it unlikely that
+# the UT offset changed during the war, but I think it unlikely that
# Jan Mayen used German daylight-saving rules.
#
# Svalbard is more complicated, as it was raided in August 1941 by an
@@ -1907,9 +1922,8 @@
# the German armed forces at the Svalbard weather station code-named
# Haudegen did not surrender to the Allies until September 1945.
#
-# All these events predate our cutoff date of 1970. Unless we can
-# come up with more definitive info about the timekeeping during the
-# war years it's probably best just do...the following for now:
+# All these events predate our cutoff date of 1970, so use Europe/Oslo
+# for these regions.
Link Europe/Oslo Arctic/Longyearbyen
# Poland
@@ -2167,7 +2181,7 @@
# so we (Novosibirsk) simply did not switch.
#
# From Andrey A. Chernov (1996-10-04):
-# `MSK' and `MSD' were born and used initially on Moscow computers with
+# 'MSK' and 'MSD' were born and used initially on Moscow computers with
# UNIX-like OSes by several developer groups (e.g. Demos group, Kiae group)....
# The next step was the UUCP network, the Relcom predecessor
# (used mainly for mail), and MSK/MSD was actively used there.
@@ -2466,6 +2480,9 @@
11:00 Russia ANA%sT 2011 Mar 27 2:00s
12:00 - ANAT
+# San Marino
+# See Europe/Rome.
+
# Serbia
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Europe/Belgrade 1:22:00 - LMT 1884
@@ -2488,7 +2505,7 @@
Link Europe/Prague Europe/Bratislava
# Slovenia
-# see Serbia
+# See Europe/Belgrade.
# Spain
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -2622,7 +2639,7 @@
# and their performance improved enormously. Communities began to keep
# mean time in preference to apparent time -- Geneva from 1780 ....
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-# From Whitman (who writes ``Midnight?''):
+# From Whitman (who writes "Midnight?"):
# Rule Swiss 1940 only - Nov 2 0:00 1:00 S
# Rule Swiss 1940 only - Dec 31 0:00 0 -
# From Shanks & Pottenger:
@@ -2667,23 +2684,53 @@
# The 1940 rules must be deleted.
#
# One further detail for Switzerland, which is probably out of scope for
-# most users of tzdata:
-# The zone file
-# Zone Europe/Zurich 0:34:08 - LMT 1848 Sep 12
-# 0:29:44 - BMT 1894 Jun #Bern Mean Time
-# 1:00 Swiss CE%sT 1981
-# 1:00 EU CE%sT
+# most users of tzdata: The [Europe/Zurich zone] ...
# describes all of Switzerland correctly, with the exception of
# the Cantone Geneve (Geneva, Genf). Between 1848 and 1894 Geneve did not
# follow Bern Mean Time but kept its own local mean time.
# To represent this, an extra zone would be needed.
+#
+# From Alois Treindl (2013-09-11):
+# The Federal regulations say
+# http://www.admin.ch/opc/de/classified-compilation/20071096/index.html
+# ... the meridian for Bern mean time ... is 7 degrees 26'22.50".
+# Expressed in time, it is 0h29m45.5s.
+
+# From Pierre-Yves Berger (2013-09-11):
+# the "Circulaire du conseil federal" (December 11 1893)
+# <http://www.amtsdruckschriften.bar.admin.ch/viewOrigDoc.do?id=10071353> ...
+# clearly states that the [1894-06-01] change should be done at midnight
+# but if no one is present after 11 at night, could be postponed until one
+# hour before the beginning of service.
+
+# From Paul Eggert (2013-09-11):
+# Round BMT to the nearest even second, 0:29:46.
+#
+# We can find no reliable source for Shanks's assertion that all of Switzerland
+# except Geneva switched to Bern Mean Time at 00:00 on 1848-09-12. This book:
+#
+# Jakob Messerli. Gleichmassig, punktlich, schnell: Zeiteinteilung und
+# Zeitgebrauch in der Schweiz im 19. Jahrhundert. Chronos, Zurich 1995,
+# ISBN 3-905311-68-2, OCLC 717570797.
+#
+# suggests that the transition was more gradual, and that the Swiss did not
+# agree about civil time during the transition. The timekeeping it gives the
+# most detail for is postal and telegraph time: here, federal legislation (the
+# "Bundesgesetz uber die Erstellung von elektrischen Telegraphen") passed on
+# 1851-11-23, and an official implementation notice was published 1853-07-16
+# (Bundesblatt 1853, Bd. II, S. 859). On p 72 Messerli writes that in
+# practice since July 1853 Bernese time was used in "all postal and telegraph
+# offices in Switzerland from Geneva to St. Gallen and Basel to Chiasso"
+# (Google translation). For now, model this transition as occurring on
+# 1853-07-16, though it probably occurred at some other date in Zurich, and
+# legal civil time probably changed at still some other transition date.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Swiss 1941 1942 - May Mon>=1 1:00 1:00 S
Rule Swiss 1941 1942 - Oct Mon>=1 2:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Europe/Zurich 0:34:08 - LMT 1848 Sep 12
- 0:29:44 - BMT 1894 Jun # Bern Mean Time
+Zone Europe/Zurich 0:34:08 - LMT 1853 Jul 16 # See above comment.
+ 0:29:46 - BMT 1894 Jun # Bern Mean Time
1:00 Swiss CE%sT 1981
1:00 EU CE%sT
@@ -2907,7 +2954,7 @@
# From Paul Eggert (2006-03-22):
# The _Economist_ (1994-05-28, p 45) reports that central Crimea switched
# from Kiev to Moscow time sometime after the January 1994 elections.
-# Shanks (1999) says ``date of change uncertain'', but implies that it happened
+# Shanks (1999) says "date of change uncertain", but implies that it happened
# sometime between the 1994 DST switches. Shanks & Pottenger simply say
# 1994-09-25 03:00, but that can't be right. For now, guess it
# changed in May.
@@ -2921,6 +2968,9 @@
3:00 - MSK 1997 Mar lastSun 1:00u
2:00 EU EE%sT
+# Vatican City
+# See Europe/Rome.
+
###############################################################################
# One source shows that Bulgaria, Cyprus, Finland, and Greece observe DST from
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/iso3166.tab b/jdk/test/sun/util/calendar/zi/tzdata/iso3166.tab
index c6b2d0a..28fb64b 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/iso3166.tab
+++ b/jdk/test/sun/util/calendar/zi/tzdata/iso3166.tab
@@ -32,7 +32,7 @@
# 1. ISO 3166-1 alpha-2 country code, current as of
# ISO 3166-1 Newsletter VI-15 (2013-05-10). See: Updates on ISO 3166
# http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
-# 2. The usual English name for the country,
+# 2. The usual English name for the coded region,
# chosen so that alphabetic sorting of subsets produces helpful lists.
# This is not the same as the English name in the ISO 3166 tables.
#
@@ -46,7 +46,7 @@
# to take or endorse any position on legal or territorial claims.
#
#country-
-#code country name
+#code name of country, territory, area, or subdivision
AD Andorra
AE United Arab Emirates
AF Afghanistan
@@ -76,7 +76,7 @@
BM Bermuda
BN Brunei
BO Bolivia
-BQ Bonaire, St Eustatius & Saba
+BQ Caribbean Netherlands
BR Brazil
BS Bahamas
BT Bhutan
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/leapseconds b/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
index 9128012..faf5319 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
+++ b/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
@@ -20,18 +20,24 @@
# 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.
-#
-# <pre>
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
# Allowance for leapseconds added to each timezone file.
+# This file is in the public domain.
+
+# This file is generated automatically from the data in the public-domain
+# leap-seconds.list file available from most NIST time servers.
+# If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,
+# you should be able to pick up leap-seconds.list from a secondary NIST server.
+# For more about leap-seconds.list, please see
+# The NTP Timescale and Leap Seconds
+# <http://www.eecis.udel.edu/~mills/leap.html>.
+
# The International Earth Rotation Service periodically uses leap seconds
# to keep UTC to within 0.9 s of UT1
# (which measures the true angular orientation of the earth in space); see
# Terry J Quinn, The BIPM and the accurate measure of time,
-# Proc IEEE 79, 7 (July 1991), 894-905.
+# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>.
# There were no leap seconds before 1972, because the official mechanism
# accounting for the discrepancy between atomic time and the earth's rotation
# did not exist until the early 1970s.
@@ -42,8 +48,8 @@
# or
# Leap YEAR MON DAY 23:59:59 - R/S
-# If the leapsecond is Rolling (R) the given time is local time
-# If the leapsecond is Stationary (S) the given time is UTC
+# If the leapsecond is Rolling (R) the given time is local time.
+# If the leapsecond is Stationary (S) the given time is UTC.
# Leap YEAR MONTH DAY HH:MM:SS CORR R/S
Leap 1972 Jun 30 23:59:60 + S
@@ -71,53 +77,3 @@
Leap 2005 Dec 31 23:59:60 + S
Leap 2008 Dec 31 23:59:60 + S
Leap 2012 Jun 30 23:59:60 + S
-
-# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
-#
-# SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
-#
-#
-# SERVICE DE LA ROTATION TERRESTRE
-# OBSERVATOIRE DE PARIS
-# 61, Av. de l'Observatoire 75014 PARIS (France)
-# Tel. : 33 (0) 1 40 51 22 26
-# FAX : 33 (0) 1 40 51 22 91
-# e-mail : (E-Mail Removed)
-# http://hpiers.obspm.fr/eop-pc
-#
-# Paris, 5 January 2012
-#
-#
-# Bulletin C 43
-#
-# To authorities responsible
-# for the measurement and
-# distribution of time
-#
-#
-# UTC TIME STEP
-# on the 1st of July 2012
-#
-#
-# A positive leap second will be introduced at the end of June 2012.
-# The sequence of dates of the UTC second markers will be:
-#
-# 2012 June 30, 23h 59m 59s
-# 2012 June 30, 23h 59m 60s
-# 2012 July 1, 0h 0m 0s
-#
-# The difference between UTC and the International Atomic Time TAI is:
-#
-# from 2009 January 1, 0h UTC, to 2012 July 1 0h UTC : UTC-TAI = - 34s
-# from 2012 July 1, 0h UTC, until further notice : UTC-TAI = - 35s
-#
-# Leap seconds can be introduced in UTC at the end of the months of December
-# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
-# six months, either to announce a time step in UTC or to confirm that there
-# will be no time step at the next possible date.
-#
-#
-# Daniel GAMBIS
-# Head
-# Earth Orientation Center of IERS
-# Observatoire de Paris, France
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/northamerica b/jdk/test/sun/util/calendar/zi/tzdata/northamerica
index 43a0b22..b8caf6d 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/northamerica
+++ b/jdk/test/sun/util/calendar/zi/tzdata/northamerica
@@ -43,7 +43,7 @@
# Howse writes (pp 121-125) that time zones were invented by
# Professor Charles Ferdinand Dowd (1825-1904),
# Principal of Temple Grove Ladies' Seminary (Saratoga Springs, NY).
-# His pamphlet ``A System of National Time for Railroads'' (1870)
+# His pamphlet "A System of National Time for Railroads" (1870)
# was the result of his proposals at the Convention of Railroad Trunk Lines
# in New York City (1869-10). His 1870 proposal was based on Washington, DC,
# but in 1872-05 he moved the proposed origin to Greenwich.
@@ -63,8 +63,8 @@
# From Paul Eggert (2001-03-06):
# Daylight Saving Time was first suggested as a joke by Benjamin Franklin
-# in his whimsical essay ``An Economical Project for Diminishing the Cost
-# of Light'' published in the Journal de Paris (1784-04-26).
+# in his whimsical essay "An Economical Project for Diminishing the Cost
+# of Light" published in the Journal de Paris (1784-04-26).
# Not everyone is happy with the results:
#
# I don't really care how time is reckoned so long as there is some
@@ -190,8 +190,8 @@
# of the Aleutian islands. No DST.
# From Paul Eggert (1995-12-19):
-# The tables below use `NST', not `NT', for Nome Standard Time.
-# I invented `CAWT' for Central Alaska War Time.
+# The tables below use 'NST', not 'NT', for Nome Standard Time.
+# I invented 'CAWT' for Central Alaska War Time.
# From U. S. Naval Observatory (1989-01-19):
# USA EASTERN 5 H BEHIND UTC NEW YORK, WASHINGTON
@@ -260,9 +260,9 @@
# H.R. 6, Energy Policy Act of 2005, SEC. 110. DAYLIGHT SAVINGS.
# (a) Amendment- Section 3(a) of the Uniform Time Act of 1966 (15
# U.S.C. 260a(a)) is amended--
-# (1) by striking `first Sunday of April' and inserting `second
+# (1) by striking 'first Sunday of April' and inserting 'second
# Sunday of March'; and
-# (2) by striking `last Sunday of October' and inserting `first
+# (2) by striking 'last Sunday of October' and inserting 'first
# Sunday of November'.
# (b) Effective Date- Subsection (a) shall take effect 1 year after the
# date of enactment of this Act or March 1, 2007, whichever is later.
@@ -623,6 +623,8 @@
-10:30 - HST 1947 Jun 8 2:00 #Schmitt&Cox+2
-10:00 - HST
+Link Pacific/Honolulu Pacific/Johnston
+
# Now we turn to US areas that have diverged from the consensus since 1970.
# Arizona mostly uses MST.
@@ -659,8 +661,9 @@
# Navajo Nation participates in the Daylight Saving Time policy, due to its
# large size and location in three states." (The "only" means that other
# tribal nations don't use DST.)
-
-Link America/Denver America/Shiprock
+#
+# From Paul Eggert (2013-08-26):
+# See America/Denver for a zone appropriate for the Navajo Nation.
# Southern Idaho (Ada, Adams, Bannock, Bear Lake, Bingham, Blaine,
# Boise, Bonneville, Butte, Camas, Canyon, Caribou, Cassia, Clark,
@@ -700,13 +703,13 @@
# and Switzerland counties have their own time zone histories as noted below.
#
# Shanks partitioned Indiana into 345 regions, each with its own time history,
-# and wrote ``Even newspaper reports present contradictory information.''
+# and wrote "Even newspaper reports present contradictory information."
# Those Hoosiers! Such a flighty and changeable people!
# Fortunately, most of the complexity occurred before our cutoff date of 1970.
#
# Other than Indianapolis, the Indiana place names are so nondescript
-# that they would be ambiguous if we left them at the `America' level.
-# So we reluctantly put them all in a subdirectory `America/Indiana'.
+# that they would be ambiguous if we left them at the 'America' level.
+# So we reluctantly put them all in a subdirectory 'America/Indiana'.
# From Paul Eggert (2005-08-16):
# http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006.
@@ -970,8 +973,8 @@
# This story is too entertaining to be false, so go with Howse over Shanks.
#
# From Paul Eggert (2001-03-06):
-# Garland (1927) writes ``Cleveland and Detroit advanced their clocks
-# one hour in 1914.'' This change is not in Shanks. We have no more
+# Garland (1927) writes "Cleveland and Detroit advanced their clocks
+# one hour in 1914." This change is not in Shanks. We have no more
# info, so omit this for now.
#
# Most of Michigan observed DST from 1973 on, but was a bit late in 1975.
@@ -1011,7 +1014,7 @@
# occupied 1857/1900 by the Navassa Phosphate Co
# US lighthouse 1917/1996-09
# currently uninhabited
-# see Mark Fineman, ``An Isle Rich in Guano and Discord'',
+# see Mark Fineman, "An Isle Rich in Guano and Discord",
# _Los Angeles Times_ (1998-11-10), A1, A10; it cites
# Jimmy Skaggs, _The Great Guano Rush_ (1994).
@@ -1045,7 +1048,7 @@
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
# <http://www.jstor.org/stable/1774359>.
#
-# See the `europe' file for Greenland.
+# See the 'europe' file for Greenland.
# Canada
@@ -1246,7 +1249,7 @@
# most of east Labrador
-# The name `Happy Valley-Goose Bay' is too long; use `Goose Bay'.
+# The name 'Happy Valley-Goose Bay' is too long; use 'Goose Bay'.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Goose_Bay -4:01:40 - LMT 1884 # Happy Valley-Goose Bay
-3:30:52 - NST 1918
@@ -1363,25 +1366,27 @@
# Quebec
-# From Paul Eggert (2006-07-09):
-# Shanks & Pottenger write that since 1970 most of Quebec has been
-# like Montreal.
+# From Paul Eggert (2013-08-30):
+# Since 1970 most of Quebec has been like Toronto.
+# However, because earlier versions of the tz database mistakenly relied on data
+# from Shanks & Pottenger saying that Quebec differed from Ontario after 1970,
+# a separate entry was created for most of Quebec. We're loath to lose
+# its pre-1970 info, even though the tz database is normally limited to
+# zones that differ after 1970, so keep this otherwise out-of-scope entry.
-# From Paul Eggert (2006-06-27):
# Matthews and Vincent (1998) also write that Quebec east of the -63
# meridian is supposed to observe AST, but residents as far east as
# Natashquan use EST/EDT, and residents east of Natashquan use AST.
-# In "Official time in Quebec" the Quebec department of justice writes in
-# http://www.justice.gouv.qc.ca/english/publications/generale/temps-regl-1-a.htm
-# that "The residents of the Municipality of the
-# Cote-Nord-du-Golfe-Saint-Laurent and the municipalities of Saint-Augustin,
-# Bonne-Esperance and Blanc-Sablon apply the Official Time Act as it is
-# written and use Atlantic standard time all year round. The same applies to
-# the residents of the Native facilities along the lower North Shore."
-# <http://www.assnat.qc.ca/eng/37legislature2/Projets-loi/Publics/06-a002.htm>
+# The Quebec department of justice writes in
+# "The situation in Minganie and Basse-Cote-Nord"
+# http://www.justice.gouv.qc.ca/english/publications/generale/temps-minganie-a.htm
+# that the coastal strip from just east of Natashquan to Blanc-Sablon
+# observes Atlantic standard time all year round.
+# http://www.assnat.qc.ca/Media/Process.aspx?MediaId=ANQ.Vigie.Bll.DocumentGenerique_8845en
# says this common practice was codified into law as of 2007.
# For lack of better info, guess this practice began around 1970, contra to
# Shanks & Pottenger who have this region observing AST/ADT.
+# for post-1970 data America/Puerto_Rico.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Mont 1917 only - Mar 25 2:00 1:00 D
@@ -1425,7 +1430,6 @@
-5:00 Mont E%sT 1974
-5:00 Canada E%sT
-
# Ontario
# From Paul Eggert (2006-07-09):
@@ -1644,7 +1648,7 @@
-6:00 - CST 1910
-5:00 - EST 1942
-5:00 Canada E%sT 1970
- -5:00 Mont E%sT 1973
+ -5:00 Toronto E%sT 1973
-5:00 - EST 1974
-5:00 Canada E%sT
Zone America/Nipigon -5:53:04 - LMT 1895
@@ -2231,7 +2235,7 @@
# From Paul Eggert (1996-06-12):
# For an English translation of the decree, see
# <a href="http://mexico-travel.com/extra/timezone_eng.html">
-# ``Diario Oficial: Time Zone Changeover'' (1996-01-04).
+# "Diario Oficial: Time Zone Changeover" (1996-01-04).
# </a>
# From Rives McDow (1998-10-08):
@@ -2568,9 +2572,7 @@
###############################################################################
# Anguilla
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Anguilla -4:12:16 - LMT 1912 Mar 2
- -4:00 - AST
+# See 'southamerica'.
# Antigua and Barbuda
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -2639,13 +2641,13 @@
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton
-4:00 - AST 1974 Apr 28 2:00
- -4:00 Bahamas A%sT 1976
+ -4:00 Canada A%sT 1976
-4:00 US A%sT
# Cayman Is
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown
- -5:07:12 - KMT 1912 Feb # Kingston Mean Time
+ -5:07:11 - KMT 1912 Feb # Kingston Mean Time
-5:00 - EST
# Costa Rica
@@ -2660,7 +2662,7 @@
# go with Shanks & Pottenger.
Rule CR 1991 only - Jul 1 0:00 0 S
Rule CR 1992 only - Mar 15 0:00 0 S
-# There are too many San Joses elsewhere, so we'll use `Costa Rica'.
+# There are too many San Joses elsewhere, so we'll use 'Costa Rica'.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Costa_Rica -5:36:13 - LMT 1890 # San Jose
-5:36:13 - SJMT 1921 Jan 15 # San Jose Mean Time
@@ -2892,9 +2894,7 @@
-5:00 Cuba C%sT
# Dominica
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Dominica -4:05:36 - LMT 1911 Jul 1 0:01 # Roseau
- -4:00 - AST
+# See 'southamerica'.
# Dominican Republic
@@ -2943,18 +2943,10 @@
-6:00 Salv C%sT
# Grenada
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Grenada -4:07:00 - LMT 1911 Jul # St George's
- -4:00 - AST
-
# Guadeloupe
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Guadeloupe -4:06:08 - LMT 1911 Jun 8 # Pointe a Pitre
- -4:00 - AST
# St Barthelemy
-Link America/Guadeloupe America/St_Barthelemy
# St Martin (French part)
-Link America/Guadeloupe America/Marigot
+# See 'southamerica'.
# Guatemala
#
@@ -3097,17 +3089,12 @@
# Great Swan I ceded by US to Honduras in 1972
# Jamaica
-
-# From Bob Devine (1988-01-28):
-# Follows US rules.
-
-# From U. S. Naval Observatory (1989-01-19):
-# JAMAICA 5 H BEHIND UTC
-
-# From Shanks & Pottenger:
+# Shanks & Pottenger give -5:07:12, but Milne records -5:07:10.41 from an
+# unspecified official document, and says "This time is used throughout the
+# island". Go with Milne. Round to the nearest second as required by zic.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Jamaica -5:07:12 - LMT 1890 # Kingston
- -5:07:12 - KMT 1912 Feb # Kingston Mean Time
+Zone America/Jamaica -5:07:11 - LMT 1890 # Kingston
+ -5:07:11 - KMT 1912 Feb # Kingston Mean Time
-5:00 - EST 1974 Apr 28 2:00
-5:00 US E%sT 1984
-5:00 - EST
@@ -3121,12 +3108,7 @@
-4:00 - AST
# Montserrat
-# From Paul Eggert (2006-03-22):
-# In 1995 volcanic eruptions forced evacuation of Plymouth, the capital.
-# world.gazetteer.com says Cork Hill is the most populous location now.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Montserrat -4:08:52 - LMT 1911 Jul 1 0:01 # Cork Hill
- -4:00 - AST
+# See 'southamerica'.
# Nicaragua
#
@@ -3200,7 +3182,7 @@
-5:00 - EST
# Puerto Rico
-# There are too many San Juans elsewhere, so we'll use `Puerto_Rico'.
+# There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Puerto_Rico -4:24:25 - LMT 1899 Mar 28 12:00 # San Juan
-4:00 - AST 1942 May 3
@@ -3208,18 +3190,11 @@
-4:00 - AST
# St Kitts-Nevis
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/St_Kitts -4:10:52 - LMT 1912 Mar 2 # Basseterre
- -4:00 - AST
-
# St Lucia
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/St_Lucia -4:04:00 - LMT 1890 # Castries
- -4:04:00 - CMT 1912 # Castries Mean Time
- -4:00 - AST
+# See 'southamerica'.
# St Pierre and Miquelon
-# There are too many St Pierres elsewhere, so we'll use `Miquelon'.
+# There are too many St Pierres elsewhere, so we'll use 'Miquelon'.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Miquelon -3:44:40 - LMT 1911 May 15 # St Pierre
-4:00 - AST 1980 May
@@ -3227,10 +3202,7 @@
-3:00 Canada PM%sT
# St Vincent and the Grenadines
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/St_Vincent -4:04:56 - LMT 1890 # Kingstown
- -4:04:56 - KMT 1912 # Kingstown Mean Time
- -4:00 - AST
+# See 'southamerica'.
# Turks and Caicos
#
@@ -3260,15 +3232,9 @@
Rule TC 2007 max - Nov Sun>=1 2:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Grand_Turk -4:44:32 - LMT 1890
- -5:07:12 - KMT 1912 Feb # Kingston Mean Time
+ -5:07:11 - KMT 1912 Feb # Kingston Mean Time
-5:00 TC E%sT
# British Virgin Is
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Tortola -4:18:28 - LMT 1911 Jul # Road Town
- -4:00 - AST
-
# Virgin Is
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/St_Thomas -4:19:44 - LMT 1911 Jul # Charlotte Amalie
- -4:00 - AST
+# See 'southamerica'.
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/southamerica b/jdk/test/sun/util/calendar/zi/tzdata/southamerica
index e7df18a..2230d06 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/southamerica
+++ b/jdk/test/sun/util/calendar/zi/tzdata/southamerica
@@ -474,6 +474,17 @@
# rules...San Luis is still using "Western ARgentina Time" and it got
# stuck on Summer daylight savings time even though the summer is over.
+# From Paul Eggert (2013-09-05):
+# Perhaps San Luis operates on the legal fiction that it is at UTC-4
+# with perpetual summer time, but ordinary usage typically seems to
+# just say it's at UTC-3; see, for example,
+# <http://es.wikipedia.org/wiki/Hora_oficial_argentina>.
+# We've documented similar situations as being plain changes to
+# standard time, so let's do that here too. This does not change UTC
+# offsets, only tm_isdst and the time zone abbreviations. One minor
+# plus is that this silences a zic complaint that there's no POSIX TZ
+# setting for time stamps past 2038.
+
# From Paul Eggert (2013-02-21):
# Milne says Cordoba time was -4:16:48.2. Round to the nearest second.
@@ -611,7 +622,7 @@
# San Luis (SL)
Rule SanLuis 2008 2009 - Mar Sun>=8 0:00 0 -
-Rule SanLuis 2007 2009 - Oct Sun>=8 0:00 1:00 S
+Rule SanLuis 2007 2008 - Oct Sun>=8 0:00 1:00 S
Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31
-4:16:48 - CMT 1920 May
@@ -627,7 +638,8 @@
-3:00 - ART 2004 May 31
-4:00 - WART 2004 Jul 25
-3:00 Arg AR%sT 2008 Jan 21
- -4:00 SanLuis WAR%sT
+ -4:00 SanLuis WAR%sT 2009 Oct 11
+ -3:00 - ART
#
# Santa Cruz (SC)
Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31
@@ -654,10 +666,7 @@
-3:00 - ART
# Aruba
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Aruba -4:40:24 - LMT 1912 Feb 12 # Oranjestad
- -4:30 - ANT 1965 # Netherlands Antilles Time
- -4:00 - AST
+Link America/Curacao America/Aruba
# Bolivia
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -859,6 +868,12 @@
# Tocantins state will have DST.
# http://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306.html
+# From Steffen Thorsen (2013-09-20):
+# Tocantins in Brazil is very likely not to observe DST from October....
+# http://conexaoto.com.br/2013/09/18/ministerio-confirma-que-tocantins-esta-fora-do-horario-de-verao-em-2013-mas-falta-publicacao-de-decreto
+# We will keep this article updated when this is confirmed:
+# http://www.timeanddate.com/news/time/brazil-starts-dst-2013.html
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
# Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
# Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
@@ -1078,7 +1093,8 @@
-3:00 - BRT 1995 Sep 14
-3:00 Brazil BR%sT 2003 Sep 24
-3:00 - BRT 2012 Oct 21
- -3:00 Brazil BR%sT
+ -3:00 Brazil BR%sT 2013 Sep
+ -3:00 - BRT
#
# Alagoas (AL), Sergipe (SE)
Zone America/Maceio -2:22:52 - LMT 1914
@@ -1373,12 +1389,12 @@
-4:00 - AST
# From Arthur David Olson (2011-06-15):
-# At least for now, use links for places with new iso3166 codes.
+# use links for places with new iso3166 codes.
# The name "Lower Prince's Quarter" is both longer than fourteen charaters
# and contains an apostrophe; use "Lower_Princes" below.
-Link America/Curacao America/Lower_Princes # Sint Maarten
-Link America/Curacao America/Kralendijk # Bonaire, Sint Estatius and Saba
+Link America/Curacao America/Lower_Princes # Sint Maarten
+Link America/Curacao America/Kralendijk # Caribbean Netherlands
# Ecuador
#
@@ -1519,10 +1535,16 @@
-4:00 - GYT
# Paraguay
+#
# From Paul Eggert (2006-03-22):
# Shanks & Pottenger say that spring transitions are from 01:00 -> 02:00,
# and autumn transitions are from 00:00 -> 23:00. Go with pre-1999
# editions of Shanks, and with the IATA, who say transitions occur at 00:00.
+#
+# From Waldemar Villamayor-Venialbo (2013-09-20):
+# No time of the day is established for the adjustment, so people normally
+# adjust their clocks at 0 hour of the given dates.
+#
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Para 1975 1988 - Oct 1 0:00 1:00 S
Rule Para 1975 1978 - Mar 1 0:00 0 -
@@ -1656,6 +1678,19 @@
Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2
-4:00 - AST
+Link America/Port_of_Spain America/Anguilla
+Link America/Port_of_Spain America/Dominica
+Link America/Port_of_Spain America/Grenada
+Link America/Port_of_Spain America/Guadeloupe
+Link America/Port_of_Spain America/Marigot
+Link America/Port_of_Spain America/Montserrat
+Link America/Port_of_Spain America/St_Barthelemy
+Link America/Port_of_Spain America/St_Kitts
+Link America/Port_of_Spain America/St_Lucia
+Link America/Port_of_Spain America/St_Thomas
+Link America/Port_of_Spain America/St_Vincent
+Link America/Port_of_Spain America/Tortola
+
# Uruguay
# From Paul Eggert (1993-11-18):
# Uruguay wins the prize for the strangest peacetime manipulation of the rules.
@@ -1673,7 +1708,7 @@
# Whitman gives 1937 Oct 3; go with Shanks & Pottenger.
Rule Uruguay 1937 1940 - Oct lastSun 0:00 0:30 HS
# Whitman gives 1941 Oct 24 - 1942 Mar 27, 1942 Dec 14 - 1943 Apr 13,
-# and 1943 Apr 13 ``to present time''; go with Shanks & Pottenger.
+# and 1943 Apr 13 "to present time"; go with Shanks & Pottenger.
Rule Uruguay 1941 only - Aug 1 0:00 0:30 HS
Rule Uruguay 1942 only - Jan 1 0:00 0 -
Rule Uruguay 1942 only - Dec 14 0:00 1:00 S
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
index aa247c2..b34cdb0d 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
+++ b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
@@ -26,27 +26,30 @@
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
#
-# From Paul Eggert (2013-05-27):
+# From Paul Eggert (2013-08-14):
#
-# This file contains a table with the following columns:
-# 1. ISO 3166 2-character country code. See the file `iso3166.tab'.
-# This identifies a country that overlaps the zone. The country may
-# overlap other zones and the zone may overlap other countries.
-# 2. Latitude and longitude of the zone's principal location
+# This file contains a table where each row stands for an area that is
+# the intersection of a region identified by a country code and of a
+# zone where civil clocks have agreed since 1970. The columns of the
+# table are as follows:
+#
+# 1. ISO 3166 2-character country code. See the file 'iso3166.tab'.
+# 2. Latitude and longitude of the area's principal location
# in ISO 6709 sign-degrees-minutes-seconds format,
# either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
# first latitude (+ is north), then longitude (+ is east).
-# This location need not lie within the column-1 country.
# 3. Zone name used in value of TZ environment variable.
# Please see the 'Theory' file for how zone names are chosen.
+# If multiple zones overlap a country, each has a row in the
+# table, with column 1 being duplicated.
# 4. Comments; present if and only if the country has multiple rows.
#
# Columns are separated by a single tab.
# The table is sorted first by country, then an order within the country that
# (1) makes some geographical sense, and
-# (2) puts the most populous zones first, where that does not contradict (1).
+# (2) puts the most populous areas first, where that does not contradict (1).
#
-# Lines beginning with `#' are comments.
+# Lines beginning with '#' are comments.
#
# This table is intended as an aid for users, to help them select time
# zone data appropriate for their practical needs. It is not intended
@@ -62,8 +65,7 @@
AL +4120+01950 Europe/Tirane
AM +4011+04430 Asia/Yerevan
AO -0848+01314 Africa/Luanda
-AQ -7750+16636 Antarctica/McMurdo McMurdo Station, Ross Island
-AQ -9000+00000 Antarctica/South_Pole Amundsen-Scott Station, South Pole
+AQ -7750+16636 Antarctica/McMurdo McMurdo, South Pole, Scott (New Zealand time)
AQ -6734-06808 Antarctica/Rothera Rothera Station, Adelaide Island
AQ -6448-06406 Antarctica/Palmer Palmer Station, Anvers Island
AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay
@@ -143,8 +145,7 @@
CA +4606-06447 America/Moncton Atlantic Time - New Brunswick
CA +5320-06025 America/Goose_Bay Atlantic Time - Labrador - most locations
CA +5125-05707 America/Blanc-Sablon Atlantic Standard Time - Quebec - Lower North Shore
-CA +4531-07334 America/Montreal Eastern Time - Quebec - most locations
-CA +4339-07923 America/Toronto Eastern Time - Ontario - most locations
+CA +4339-07923 America/Toronto Eastern Time - Ontario & Quebec - most locations
CA +4901-08816 America/Nipigon Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario
CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut - most locations
@@ -255,7 +256,7 @@
IS +6409-02151 Atlantic/Reykjavik
IT +4154+01229 Europe/Rome
JE +4912-00207 Europe/Jersey
-JM +1800-07648 America/Jamaica
+JM +175805-0764736 America/Jamaica
JO +3157+03556 Asia/Amman
JP +353916+1394441 Asia/Tokyo
KE -0117+03649 Africa/Nairobi
@@ -444,8 +445,7 @@
US +471551-1014640 America/North_Dakota/Beulah Central Time - North Dakota - Mercer County
US +394421-1045903 America/Denver Mountain Time
US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon
-US +364708-1084111 America/Shiprock Mountain Time - Navajo
-US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona
+US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo)
US +340308-1181434 America/Los_Angeles Pacific Time
US +611305-1495401 America/Anchorage Alaska Time
US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle
diff --git a/jdk/test/sun/util/logging/PlatformLoggerTest.java b/jdk/test/sun/util/logging/PlatformLoggerTest.java
index ac399c09..3fdab49 100644
--- a/jdk/test/sun/util/logging/PlatformLoggerTest.java
+++ b/jdk/test/sun/util/logging/PlatformLoggerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, 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 6882376 6985460 8010309
+ * @bug 6882376 6985460 8010309 8011638
* @summary Test if java.util.logging.Logger is created before and after
* logging is enabled. Also validate some basic PlatformLogger
* operations. othervm mode to make sure java.util.logging
@@ -34,8 +34,10 @@
*/
import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
import java.util.logging.*;
import sun.util.logging.PlatformLogger;
+import sun.util.logging.LoggingSupport;
import static sun.util.logging.PlatformLogger.Level.*;
public class PlatformLoggerTest {
@@ -104,17 +106,6 @@
throw new RuntimeException("logger " + logger.getName() + ": " + level +
(expected ? " not loggable" : " loggable"));
}
-
- if (logger.isLoggable(level.intValue()) != expected) {
- throw new RuntimeException("logger " + logger.getName() + ": " + level.intValue() +
- (expected ? " not loggable" : " loggable"));
- }
-
- int value = level.intValue() + 5; // custom level value
- if (expected && !logger.isLoggable(value)) {
- throw new RuntimeException("logger " + logger.getName() + ": " + value +
- " not loggable");
- }
}
private static void checkLevel(PlatformLogger logger, PlatformLogger.Level level) {
@@ -122,11 +113,6 @@
throw new RuntimeException("Invalid level for logger " +
logger.getName() + ": " + logger.level() + " != " + level);
}
-
- if (logger.getLevel() != level.intValue()) {
- throw new RuntimeException("Invalid level for logger " +
- logger.getName() + ": " + logger.getLevel() + " != " + level.intValue());
- }
}
private static void checkLogger(String name, Level level) {
@@ -177,6 +163,11 @@
checkLoggerLevel(logger, Level.ALL);
}
}
+
+ Logger javaLogger = Logger.getLogger("foo.bar.baz");
+ for (Level level : levels) {
+ checkJavaLoggerLevel(javaLogger, level);
+ }
}
private static void checkLoggerLevel(PlatformLogger logger, Level level) {
@@ -196,6 +187,50 @@
}
}
+ private static void checkJavaLoggerLevel(Logger logger, Level level) {
+ // This method exercise the mapping of java level to platform level
+ // when the java level is not one of the standard levels...
+
+ System.out.println("Testing Java Level with: " + level.getName());
+
+ // create a brand new java logger
+ Logger javaLogger = (Logger) LoggingSupport.getLogger(logger.getName()+"."+level.getName());
+
+ // Set a non standard java.util.logging.Level on the java logger
+ // (except for OFF & ALL - which will remain unchanged)
+ int intValue = level.intValue();
+ if (level != Level.ALL && level != Level.OFF) {
+ intValue -= 7;
+ }
+ javaLogger.setLevel(Level.parse(String.valueOf(intValue)));
+
+ // check the level set in java.util.logging.Logger
+ Level effectiveLevel = javaLogger.getLevel();
+ System.out.println("Effective Java Level used is: " + effectiveLevel);
+
+ if (effectiveLevel.intValue() != intValue) {
+ throw new RuntimeException("Retrieved backing java.util.logging.Logger level.intValue() "
+ + effectiveLevel.intValue() + " is not the expected " + intValue);
+ }
+ if (intValue != level.intValue() && javaLogger.getLevel() == level) {
+ throw new RuntimeException("Retrieved backing java.util.logging.Logger level "
+ + effectiveLevel + " is " + level);
+ }
+ if (intValue == level.intValue() && javaLogger.getLevel() != level) {
+ throw new RuntimeException("Retrieved backing java.util.logging.Logger level "
+ + effectiveLevel + " is not " + level);
+ }
+
+ // check the level set in the PlatformLogger
+ PlatformLogger plogger = PlatformLogger.getLogger(javaLogger.getName());
+ PlatformLogger.Level expected = PlatformLogger.Level.valueOf(level.getName());
+ if (plogger.level() != expected) {
+ throw new RuntimeException("Retrieved backing PlatformLogger level "
+ + plogger.level() + " is not the expected " + expected);
+
+ }
+ }
+
private static void checkPlatformLoggerLevelMapping(Level level) {
// map the given level to PlatformLogger.Level of the same name and value
PlatformLogger.Level platformLevel = PlatformLogger.Level.valueOf(level.getName());
@@ -203,26 +238,10 @@
throw new RuntimeException("Mismatched level: " + level
+ " PlatformLogger.Level" + platformLevel);
}
-
- try {
- // validate if there is a public static final field in PlatformLogger
- Field constantField = PlatformLogger.class.getField(level.getName());
- int l = (int) constantField.get(null);
- if (l != platformLevel.intValue()) {
- throw new RuntimeException("static final " + level.getName() + " (" +
- l + ") != " + platformLevel.intValue());
- }
- } catch (Exception e) {
- throw new RuntimeException("No public static PlatformLogger." + level.getName() +
- " field", e);
- }
- if (!platformLevel.name().equals(level.getName()))
+ if (!platformLevel.name().equals(level.getName())) {
throw new RuntimeException("The value of PlatformLogger." + level.getName() + ".name() is "
+ platformLevel.name() + " but expected " + level.getName());
-
- if (platformLevel.intValue() != level.intValue())
- throw new RuntimeException("The value of PlatformLogger." + level.intValue() + ".intValue() is "
- + platformLevel.intValue() + " but expected " + level.intValue());
+ }
}
static Point[] getPoints() {
diff --git a/jdk/test/tools/launcher/RunpathTest.java b/jdk/test/tools/launcher/RunpathTest.java
index 7738c4b..26233b2 100644
--- a/jdk/test/tools/launcher/RunpathTest.java
+++ b/jdk/test/tools/launcher/RunpathTest.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 7190813
+ * @bug 7190813 8022719
* @summary Check for extended RPATHs on *nixes
* @compile -XDignore.symbol.file RunpathTest.java
* @run main RunpathTest
@@ -64,8 +64,7 @@
}
void testRpath() {
- String expectedRpath = ".*RPATH.*\\$ORIGIN/../lib/" + getJreArch()
- + ":\\$ORIGIN/../jre/lib/" + getJreArch() + ".*";
+ String expectedRpath = ".*RPATH.*\\$ORIGIN/../lib/" + getJreArch() + ".*";
elfCheck(javaCmd, expectedRpath);
}
diff --git a/make/jprt.properties b/make/jprt.properties
index 3860e92..5768ed2 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -36,9 +36,7 @@
# Standard list of jprt build targets for this source tree
jprt.build.targets= \
- solaris_sparc_5.10-{product|fastdebug}, \
solaris_sparcv9_5.10-{product|fastdebug}, \
- solaris_i586_5.10-{product|fastdebug}, \
solaris_x64_5.10-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \
@@ -51,9 +49,7 @@
# Test target list (no fastdebug & limited c2 testing)
jprt.my.test.target.set= \
- solaris_sparc_5.10-product-c1-TESTNAME, \
solaris_sparcv9_5.10-product-c2-TESTNAME, \
- solaris_i586_5.10-product-c1-TESTNAME, \
solaris_x64_5.10-product-c2-TESTNAME, \
linux_i586_2.6-product-{c1|c2}-TESTNAME, \
linux_x64_2.6-product-c2-TESTNAME, \
@@ -114,9 +110,7 @@
# JCK test targets in test/Makefile (no windows)
jprt.my.jck.test.target.set= \
- solaris_sparc_5.10-product-c1-JCK7TESTRULE, \
solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, \
- solaris_i586_5.10-product-c1-JCK7TESTRULE, \
solaris_x64_5.10-product-c2-JCK7TESTRULE, \
linux_i586_2.6-product-c1-JCK7TESTRULE, \
linux_x64_2.6-product-c2-JCK7TESTRULE
diff --git a/make/scripts/webrev.ksh b/make/scripts/webrev.ksh
index d36e62b..9571697 100644
--- a/make/scripts/webrev.ksh
+++ b/make/scripts/webrev.ksh
@@ -27,7 +27,7 @@
# Documentation is available via 'webrev -h'.
#
-WEBREV_UPDATED=24.1-hg+openjdk.java.net
+WEBREV_UPDATED=25.0-hg+openjdk.java.net
HTML='<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -39,7 +39,8 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n'
-STDHEAD='<meta http-equiv="cache-control" content="no-cache" />
+STDHEAD='<meta charset="utf-8">
+<meta http-equiv="cache-control" content="no-cache" />
<meta http-equiv="Pragma" content="no-cache" />
<meta http-equiv="Expires" content="-1" />
<!--
@@ -136,7 +137,19 @@
#
html_quote()
{
- sed -e "s/&/\&/g" -e "s/</\</g" -e "s/>/\>/g" "$@" | expand
+ sed -e "s/&/\&/g" -e "s/&#\([x]*[0-9A-Fa-f]\{2,5\}\);/\&#\1;/g" -e "s/</\</g" -e "s/>/\>/g" "$@" | expand
+}
+
+#
+# input_cmd | html_quote | output_cmd
+# or
+# html_dequote filename | output_cmd
+#
+# Replace HTML entities with literals
+#
+html_dequote()
+{
+ sed -e "s/"/\"/g" -e "s/'/\'/g" -e "s/&/\&/g" -e "s/</<'/g" -e "s/>/>/g" "$@" | expand
}
#
@@ -150,23 +163,6 @@
}
#
-# input_cmd | sac2url | output_cmd
-#
-# Scan for ARC cases and insert <a> links to the relevent SAC database.
-# This is slightly complicated because inside the SWAN, SAC cases are
-# grouped by ARC: PSARC/2006/123. But on OpenSolaris.org, they are
-# referenced as 2006/123 (without labelling the ARC).
-#
-sac2url()
-{
- if [[ -z $Oflag ]]; then
- sed -e 's|\([A-Z]\{1,2\}ARC\)[ /]\([0-9]\{4\}\)/\([0-9]\{3\}\)|<a href=\"'$SACURL'\1/\2/\3\">\1 \2/\3</a>|g'
- else
- sed -e 's|\([A-Z]\{1,2\}ARC\)[ /]\([0-9]\{4\}\)/\([0-9]\{3\}\)|<a href=\"'$SACURL'/\2/\3\">\1 \2/\3</a>|g'
- fi
-}
-
-#
# strip_unchanged <infile> | output_cmd
#
# Removes chunks of sdiff documents that have not changed. This makes it
@@ -1055,79 +1051,6 @@
print "</pre></body></html>"
}
-#
-# teamwarecomments {text|html} parent-file child-file
-#
-# Find the first delta in the child that's not in the parent. Get the
-# newest delta from the parent, get all deltas from the child starting
-# with that delta, and then get all info starting with the second oldest
-# delta in that list (the first delta unique to the child).
-#
-# This code adapted from Bill Shannon's "spc" script
-#
-comments_from_teamware()
-{
- fmt=$1
- pfile=$PWS/$2
- cfile=$CWS/$3
-
- psid=$($SCCS prs -d:I: $pfile 2>/dev/null)
- if [[ -z "$psid" ]]; then
- psid=1.1
- fi
-
- set -A sids $($SCCS prs -l -r$psid -d:I: $cfile 2>/dev/null)
- N=${#sids[@]}
-
- nawkprg='
- /^COMMENTS:/ {p=1; next}
- /^D [0-9]+\.[0-9]+/ {printf "--- %s ---\n", $2; p=0; }
- NF == 0u { next }
- {if (p==0) next; print $0 }'
-
- if [[ $N -ge 2 ]]; then
- sid1=${sids[$((N-2))]} # Gets 2nd to last sid
-
- if [[ $fmt == "text" ]]; then
- $SCCS prs -l -r$sid1 $cfile 2>/dev/null | \
- $AWK "$nawkprg"
- return
- fi
-
- $SCCS prs -l -r$sid1 $cfile 2>/dev/null | \
- html_quote | bug2url | sac2url | $AWK "$nawkprg"
- fi
-}
-
-#
-# wxcomments {text|html} filepath
-#
-# Given the pathname of a file, find its location in a "wx" active file
-# list and print the following sccs comment. Output is either text or
-# HTML; if the latter, embedded bugids (sequence of 5 or more digits) are
-# turned into URLs.
-#
-comments_from_wx()
-{
- typeset fmt=$1
- typeset p=$2
-
- comm=`$AWK '
- $1 == "'$p'" {
- do getline ; while (NF > 0)
- getline
- while (NF > 0) { print ; getline }
- exit
- }' < $wxfile`
-
- if [[ $fmt == "text" ]]; then
- print "$comm"
- return
- fi
-
- print "$comm" | html_quote | bug2url | sac2url
-}
-
comments_from_mercurial()
{
fmt=$1
@@ -1161,7 +1084,7 @@
return
fi
- print "$comm" | html_quote | bug2url | sac2url
+ print "$comm" | html_quote | bug2url
)
fi
}
@@ -1178,15 +1101,7 @@
typeset p=$2
typeset pp=$3
- if [[ -n $wxfile ]]; then
- comments_from_wx $fmt $p
- else
- if [[ $SCM_MODE == "teamware" ]]; then
- comments_from_teamware $fmt $pp $p
- elif [[ $SCM_MODE == "mercurial" ]]; then
- comments_from_mercurial $fmt $pp $p
- fi
- fi
+ comments_from_mercurial $fmt $pp $p
}
#
@@ -1333,74 +1248,6 @@
print "</span>"
}
-
-#
-# flist_from_wx
-#
-# Sets up webrev to source its information from a wx-formatted file.
-# Sets the global 'wxfile' variable.
-#
-function flist_from_wx
-{
- typeset argfile=$1
- if [[ -n ${argfile%%/*} ]]; then
- #
- # If the wx file pathname is relative then make it absolute
- # because the webrev does a "cd" later on.
- #
- wxfile=$PWD/$argfile
- else
- wxfile=$argfile
- fi
-
- $AWK '{ c = 1; print;
- while (getline) {
- if (NF == 0) { c = -c; continue }
- if (c > 0) print
- }
- }' $wxfile > $FLIST
-
- print " Done."
-}
-
-#
-# flist_from_teamware [ <args-to-putback-n> ]
-#
-# Generate the file list by extracting file names from a putback -n. Some
-# names may come from the "update/create" messages and others from the
-# "currently checked out" warning. Renames are detected here too. Extract
-# values for CODEMGR_WS and CODEMGR_PARENT from the output of the putback
-# -n as well, but remove them if they are already defined.
-#
-function flist_from_teamware
-{
- if [[ -n $codemgr_parent ]]; then
- if [[ ! -d $codemgr_parent/Codemgr_wsdata ]]; then
- print -u2 "parent $codemgr_parent doesn't look like a" \
- "valid teamware workspace"
- exit 1
- fi
- parent_args="-p $codemgr_parent"
- fi
-
- print " File list from: 'putback -n $parent_args $*' ... \c"
-
- putback -n $parent_args $* 2>&1 |
- $AWK '
- /^update:|^create:/ {print $2}
- /^Parent workspace:/ {printf("CODEMGR_PARENT=%s\n",$3)}
- /^Child workspace:/ {printf("CODEMGR_WS=%s\n",$3)}
- /^The following files are currently checked out/ {p = 1; next}
- NF == 0 {p=0 ; next}
- /^rename/ {old=$3}
- $1 == "to:" {print $2, old}
- /^"/ {next}
- p == 1 {print $1}' |
- sort -r -k 1,1 -u | sort > $FLIST
-
- print " Done."
-}
-
function outgoing_from_mercurial_forest
{
hg foutgoing --template 'rev: {rev}\n' $OUTPWS | $FILTER | $AWK '
@@ -1710,47 +1557,13 @@
#
function detect_scm
{
- #
- # If CODEMGR_WS is specified in the flist file, we assume teamware.
- #
- if [[ -r $FLIST ]]; then
- egrep '^CODEMGR_WS=' $FLIST > /dev/null 2>&1
- if [[ $? -eq 0 ]]; then
- print "teamware"
- return
- fi
- fi
-
- #
- # The presence of $CODEMGR_WS and a Codemgr_wsdata directory
- # is our clue that this is a teamware workspace.
- # Same if true if current directory has a Codemgr_wsdata sub-dir
- #
- if [[ -z "$CODEMGR_WS" ]]; then
- CODEMGR_WS=`workspace name 2>/dev/null`
- fi
-
- if [[ -n $CODEMGR_WS && -d "$CODEMGR_WS/Codemgr_wsdata" ]]; then
- print "teamware"
- elif [[ -d $PWD/Codemgr_wsdata ]]; then
- print "teamware"
- elif hg root >/dev/null ; then
+ if hg root >/dev/null ; then
print "mercurial"
else
print "unknown"
fi
}
-#
-# Extract the parent workspace from the Codemgr_wsdata/parent file
-#
-function parent_from_teamware
-{
- if [[ -f "$1/Codemgr_wsdata/parent" ]]; then
- tail -1 "$1/Codemgr_wsdata/parent"
- fi
-}
-
function look_for_prog
{
typeset path
@@ -1777,48 +1590,6 @@
fi
}
-function build_old_new_teamware
-{
- # If the child's version doesn't exist then
- # get a readonly copy.
-
- if [[ ! -f $F && -f SCCS/s.$F ]]; then
- $SCCS get -s $F
- fi
-
- #
- # Snag new version of file.
- #
- rm -f $newdir/$DIR/$F
- cp $F $newdir/$DIR/$F
-
- #
- # Get the parent's version of the file. First see whether the
- # child's version is checked out and get the parent's version
- # with keywords expanded or unexpanded as appropriate.
- #
- if [ -f $PWS/$PDIR/SCCS/s.$PF -o \
- -f $PWS/$PDIR/SCCS/p.$PF ]; then
- rm -f $olddir/$PDIR/$PF
- if [ -f SCCS/p.$F ]; then
- $SCCS get -s -p -k $PWS/$PDIR/$PF \
- > $olddir/$PDIR/$PF
- else
- $SCCS get -s -p $PWS/$PDIR/$PF \
- > $olddir/$PDIR/$PF
- fi
- else
- if [[ -f $PWS/$PDIR/$PF ]]; then
- # Parent is not a real workspace, but just a raw
- # directory tree - use the file that's there as
- # the old file.
-
- rm -f $olddir/$DIR/$F
- cp $PWS/$PDIR/$PF $olddir/$DIR/$F
- fi
- fi
-}
-
#
# Find the parent for $1
#
@@ -1938,10 +1709,6 @@
function build_old_new
{
- if [[ $SCM_MODE == "teamware" ]]; then
- build_old_new_teamware $@
- fi
-
if [[ $SCM_MODE == "mercurial" ]]; then
build_old_new_mercurial $@
fi
@@ -1953,37 +1720,31 @@
#
function usage
{
- print "Usage:\twebrev [common-options]
- webrev [common-options] ( <file> | - )
- webrev [common-options] -w <wx file>
- webrev [common-options] -l [arguments to 'putback']
+ print "Usage:\twebrev [options]
+ webrev [options] ( <file> | - )
Options:
-v: Print the version of this tool.
-b: Do not ignore changes in the amount of white space.
-c <CR#>: Include link to CR (aka bugid) in the main page.
- -O: Print bugids/arc cases suitable for OpenJDK.
-i <filename>: Include <filename> in the index.html file.
-o <outdir>: Output webrev to specified directory.
-p <compare-against>: Use specified parent wkspc or basis for comparison
- -w <wxfile>: Use specified wx active file.
-u <username>: Use that username instead of 'guessing' one.
-m: Forces the use of Mercurial
- -t: Forces the use of Teamware
Mercurial only options:
-r rev: Compare against a specified revision
-N: Skip 'hg outgoing', use only 'hg status'
-f: Use the forest extension
+Arguments:
+ <file>: Optional file containing list of files to include in webrev
+ -: read list of files to include in webrev from standard input
+
Environment:
WDIR: Control the output directory.
WEBREV_BUGURL: Control the URL prefix for bugids.
- WEBREV_SACURL: Control the URL prefix for ARC cases.
-
-SCM Environment:
- Teamware: CODEMGR_WS: Workspace location.
- Teamware: CODEMGR_PARENT: Parent workspace location.
"
@@ -2003,7 +1764,6 @@
set +o noclobber
[[ -z $WDIFF ]] && WDIFF=`look_for_prog wdiff`
-[[ -z $WX ]] && WX=`look_for_prog wx`
[[ -z $CODEREVIEW ]] && CODEREVIEW=`look_for_prog codereview`
[[ -z $PS2PDF ]] && PS2PDF=`look_for_prog ps2pdf`
[[ -z $PERL ]] && PERL=`look_for_prog perl`
@@ -2011,7 +1771,6 @@
[[ -z $AWK ]] && AWK=`look_for_prog nawk`
[[ -z $AWK ]] && AWK=`look_for_prog gawk`
[[ -z $AWK ]] && AWK=`look_for_prog awk`
-[[ -z $WSPACE ]] && WSPACE=`look_for_prog workspace`
[[ -z $JAR ]] && JAR=`look_for_prog jar`
[[ -z $ZIP ]] && ZIP=`look_for_prog zip`
[[ -z $GETENT ]] && GETENT=`look_for_prog getent`
@@ -2033,8 +1792,6 @@
#
# These aren't fatal, but we want to note them to the user.
-# We don't warn on the absence of 'wx' until later when we've
-# determined that we actually need to try to invoke it.
#
# [[ ! -x $CODEREVIEW ]] && print -u2 "WARNING: codereview(1) not found."
# [[ ! -x $PS2PDF ]] && print -u2 "WARNING: ps2pdf(1) not found."
@@ -2050,13 +1807,11 @@
oflag=
pflag=
uflag=
-lflag=
-wflag=
Oflag=
rflag=
Nflag=
forestflag=
-while getopts "c:i:o:p:r:u:lmtwONvfb" opt
+while getopts "c:i:o:p:r:u:mONvfb" opt
do
case $opt in
b) bflag=1;;
@@ -2081,19 +1836,7 @@
m) SCM_MODE="mercurial";;
- t) SCM_MODE="teamware";;
-
- #
- # If -l has been specified, we need to abort further options
- # processing, because subsequent arguments are going to be
- # arguments to 'putback -n'.
- #
- l) lflag=1
- break;;
-
- w) wflag=1;;
-
- O) Oflag=1;;
+ O) Oflag=1;; # ignored (bugs are now all visible at bugs.openjdk.java.net)
N) Nflag=1;;
@@ -2112,10 +1855,6 @@
FLIST=/tmp/$$.flist
HG_LIST_FROM_COMMIT=
-if [[ -n $wflag && -n $lflag ]]; then
- usage
-fi
-
if [[ -n $forestflag && -n $rflag ]]; then
print "The -r <rev> flag is incompatible with the use of forests"
exit 2
@@ -2130,27 +1869,25 @@
codemgr_parent="$codemgr_parent/raw_files/new"
fi
-if [[ -z $wflag && -z $lflag ]]; then
- shift $(($OPTIND - 1))
+shift $(($OPTIND - 1))
- if [[ $1 == "-" ]]; then
- cat > $FLIST
- flist_mode="stdin"
- flist_done=1
- shift
- elif [[ -n $1 ]]; then
- if [[ ! -r $1 ]]; then
- print -u2 "$1: no such file or not readable"
- usage
- fi
- cat $1 > $FLIST
- flist_mode="file"
- flist_file=$1
- flist_done=1
- shift
- else
- flist_mode="auto"
+if [[ $1 == "-" ]]; then
+ cat > $FLIST
+ flist_mode="stdin"
+ flist_done=1
+ shift
+elif [[ -n $1 ]]; then
+ if [[ ! -r $1 ]]; then
+ print -u2 "$1: no such file or not readable"
+ usage
fi
+ cat $1 > $FLIST
+ flist_mode="file"
+ flist_file=$1
+ flist_done=1
+ shift
+else
+ flist_mode="auto"
fi
#
@@ -2161,11 +1898,9 @@
SCM_MODE=`detect_scm $FLIST`
fi
if [[ $SCM_MODE == "unknown" ]]; then
- print -u2 "Unable to determine SCM type currently in use."
- print -u2 "For teamware: webrev looks for \$CODEMGR_WS either in"
- print -u2 " the environment or in the file list."
- print -u2 "For mercurial: webrev runs 'hg root'."
- exit 1
+ print -u2 "Unable to determine SCM type currently in use."
+ print -u2 "For mercurial: webrev runs 'hg root'."
+ exit 1
fi
print -u2 " SCM detected: $SCM_MODE"
@@ -2199,7 +1934,7 @@
#
# for forest we have to rely on properly set default and
# default-push because they can be different from the top one.
- # unless of course it was explicitely speficied with -p
+ # unless of course it was explicitly specified with -p
if [[ -z $pflag ]]; then
OUTPWS=
fi
@@ -2281,46 +2016,7 @@
fi
fi
-if [[ -n $lflag ]]; then
- #
- # If the -l flag is given instead of the name of a file list,
- # then generate the file list by extracting file names from a
- # putback -n.
- #
- shift $(($OPTIND - 1))
- if [[ $SCM_MODE == "teamware" ]]; then
- flist_from_teamware "$*"
- elif [[ $SCM_MODE == "mercurial" ]]; then
- flist_from_mercurial
- fi
- flist_done=1
- shift $#
-
-elif [[ -n $wflag ]]; then
- #
- # If the -w is given then assume the file list is in Bonwick's "wx"
- # command format, i.e. pathname lines alternating with SCCS comment
- # lines with blank lines as separators. Use the SCCS comments later
- # in building the index.html file.
- #
- shift $(($OPTIND - 1))
- wxfile=$1
- if [[ -z $wxfile && -n $CODEMGR_WS ]]; then
- if [[ -r $CODEMGR_WS/wx/active ]]; then
- wxfile=$CODEMGR_WS/wx/active
- fi
- fi
-
- [[ -z $wxfile ]] && print -u2 "wx file not specified, and could not " \
- "be auto-detected (check \$CODEMGR_WS)" && exit 1
-
- print -u2 " File list from: wx 'active' file '$wxfile' ... \c"
- flist_from_wx $wxfile
- flist_done=1
- if [[ -n "$*" ]]; then
- shift
- fi
-elif [[ $flist_mode == "stdin" ]]; then
+if [[ $flist_mode == "stdin" ]]; then
print -u2 " File list from: standard input"
elif [[ $flist_mode == "file" ]]; then
print -u2 " File list from: $flist_file"
@@ -2330,110 +2026,7 @@
print -u2 "WARNING: unused arguments: $*"
fi
-if [[ $SCM_MODE == "teamware" ]]; then
- #
- # Parent (internally $codemgr_parent) and workspace ($codemgr_ws) can
- # be set in a number of ways, in decreasing precedence:
- #
- # 1) on the command line (only for the parent)
- # 2) in the user environment
- # 3) in the flist
- # 4) automatically based on the workspace (only for the parent)
- #
-
- #
- # Here is case (2): the user environment
- #
- [[ -z $codemgr_ws && -n $CODEMGR_WS ]] && codemgr_ws=$CODEMGR_WS
- [[ -z $codemgr_ws && -n $WSPACE ]] && codemgr_ws=`$WSPACE name`
-
- if [[ -n $codemgr_ws && ! -d $codemgr_ws ]]; then
- print -u2 "$codemgr_ws: no such workspace"
- exit 1
- fi
-
- [[ -z $codemgr_parent && -n $CODEMGR_PARENT ]] && \
- codemgr_parent=$CODEMGR_PARENT
-
- if [[ -n $codemgr_parent && ! -d $codemgr_parent ]]; then
- print -u2 "$codemgr_parent: no such directory"
- exit 1
- fi
-
- #
- # If we're in auto-detect mode and we haven't already gotten the file
- # list, then see if we can get it by probing for wx.
- #
- if [[ -z $flist_done && $flist_mode == "auto" && -n $codemgr_ws ]]; then
- if [[ ! -x $WX ]]; then
- print -u2 "WARNING: wx not found!"
- fi
-
- #
- # We need to use wx list -w so that we get renamed files, etc.
- # but only if a wx active file exists-- otherwise wx will
- # hang asking us to initialize our wx information.
- #
- if [[ -x $WX && -f $codemgr_ws/wx/active ]]; then
- print -u2 " File list from: 'wx list -w' ... \c"
- $WX list -w > $FLIST
- $WX comments > /tmp/$$.wx_comments
- wxfile=/tmp/$$.wx_comments
- print -u2 "done"
- flist_done=1
- fi
- fi
-
- #
- # If by hook or by crook we've gotten a file list by now (perhaps
- # from the command line), eval it to extract environment variables from
- # it: This is step (3).
- #
- env_from_flist
-
- #
- # Continuing step (3): If we still have no file list, we'll try to get
- # it from teamware.
- #
- if [[ -z $flist_done ]]; then
- flist_from_teamware
- env_from_flist
- fi
-
- if [[ -z $codemgr_ws && -d $PWD/Codemgr_wsdata ]]; then
- codemgr_ws=$PWD
- fi
- #
- # Observe true directory name of CODEMGR_WS, as used later in
- # webrev title.
- #
- if [[ -n $codemgr_ws ]]; then
- codemgr_ws=$(cd $codemgr_ws;print $PWD)
- fi
-
- if [[ -n $codemgr_parent ]]; then
- codemgr_parent=$(cd $codemgr_parent;print $PWD)
- fi
-
- #
- # (4) If we still don't have a value for codemgr_parent, get it
- # from workspace.
- #
- [[ -z $codemgr_parent && -n $WSPACE ]] && codemgr_parent=`$WSPACE parent`
- [[ -z $codemgr_parent ]] && codemgr_parent=`parent_from_teamware $codemgr_ws`
-
- if [[ ! -d $codemgr_parent ]]; then
- print -u2 "$CODEMGR_PARENT: no such parent workspace"
- exit 1
- fi
-
- #
- # Reset CODEMGR_WS to make sure teamware commands are happy.
- #
- CODEMGR_WS=$codemgr_ws
- CWS=$codemgr_ws
- PWS=$codemgr_parent
-elif [[ $SCM_MODE == "mercurial" ]]; then
+if [[ $SCM_MODE == "mercurial" ]]; then
if [[ -z $flist_done ]]; then
flist_from_mercurial $PWS
fi
@@ -2527,31 +2120,13 @@
#
# Bug IDs will be replaced by a URL. Order of precedence
-# is: default location, $WEBREV_BUGURL, the -O flag.
+# is: default location, $WEBREV_BUGURL
#
BUGURL='https://bugs.openjdk.java.net/browse/'
[[ -n $WEBREV_BUGURL ]] && BUGURL="$WEBREV_BUGURL"
-if [[ -n "$Oflag" ]]; then
- CRID=`echo $CRID | sed -e 's/JDK-//'`
- BUGURL='http://bugs.sun.com/bugdatabase/view_bug.do?bug_id='
- IDPREFIX=''
-else
- IDPREFIX='JDK-'
-fi
+IDPREFIX='JDK-'
-#
-# Likewise, ARC cases will be replaced by a URL. Order of precedence
-# is: default, $WEBREV_SACURL, the -O flag.
-#
-# Note that -O also triggers different substitution behavior for
-# SACURL. See sac2url().
-#
-SACURL='http://sac.eng.sun.com'
-[[ -n $WEBREV_SACURL ]] && SACURL="$WEBREV_SACURL"
-[[ -n $Oflag ]] && \
- SACURL='http://www.opensolaris.org/os/community/arc/caselog'
-
rm -f $WDIR/$WNAME.patch
rm -f $WDIR/$WNAME.changeset
rm -f $WDIR/$WNAME.ps
@@ -2651,20 +2226,6 @@
cd $CWS/$DIR
#
- # If we're in OpenSolaris mode, we enforce a minor policy:
- # help to make sure the reviewer doesn't accidentally publish
- # source which is in usr/closed/*
- #
- if [[ -n $Oflag ]]; then
- pclosed=${P##usr/closed/}
- if [[ $pclosed != $P ]]; then
- print "*** Omitting closed source for OpenSolaris" \
- "mode review"
- continue
- fi
- fi
-
- #
# We stash old and new files into parallel directories in /tmp
# and do our diffs there. This makes it possible to generate
# clean looking diffs which don't have absolute paths present.
@@ -2968,18 +2529,15 @@
print "<table>"
-if [[ -z $uflag ]]
-then
- if [[ $SCM_MODE == "mercurial" ]]
- then
+if [[ -z $uflag ]]; then
+ if [[ $SCM_MODE == "mercurial" ]]; then
#
# Let's try to extract the user name from the .hgrc file
#
username=`grep '^username' $HOME/.hgrc | sed 's/^username[ ]*=[ ]*\(.*\)/\1/'`
fi
- if [[ -z $username ]]
- then
+ if [[ -z $username ]]; then
#
# Figure out the username and gcos name. To maintain compatibility
# with passwd(4), we must support '&' substitutions.
@@ -3047,27 +2605,21 @@
print "</div></td></tr>"
fi
# Add links to referenced CRs, if any
-# external URL has a <title> like:
-# <title>Bug ID: 6641309 Wrong Cookie separator used in HttpURLConnection</title>
-# while internal URL has <title> like:
-# <title>[#JDK-6641309] Wrong Cookie separator used in HttpURLConnection</title>
-#
+# URL has a <title> like:
+# <title>[#JDK-8024688] b106-lambda: j.u.Map.merge doesn't work as specified if contains key:null pair - Java Bug System</title>
+# we format this to:
+# JDK-8024688: b106-lambda: j.u.Map.merge doesn't work as specified if contains key:null pair
if [[ -n $CRID ]]; then
for id in $CRID
do
- if [[ -z "$Oflag" ]]; then
- #add "JDK-" to raw bug id for openjdk.java.net links.
- id=`echo ${id} | sed 's/^\([0-9]\{5,\}\)$/JDK-\1/'`
- fi
+ #add "JDK-" to raw bug id for openjdk.java.net links.
+ id=`echo ${id} | sed 's/^\([0-9]\{5,\}\)$/JDK-\1/'`
+
print "<tr><th>Bug id:</th><td>"
url="${BUGURL}${id}"
- if [[ -n "$Oflag" ]]; then
- cleanup='s/Bug ID: \([0-9]\{5,\}\) \(.*\)/JDK-\1 : \2/'
- else
- cleanup='s|\[#\(JDK-[0-9]\{5,\}\)\] \(.*\)|\1 : \2|'
- fi
+
if [[ -n $WGET ]]; then
- msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed "$cleanup" | html_quote`
+ msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\[#\(.*\)\] \(.*\) - Java Bug System<\/title>/\1 : \2/' | html_dequote | html_quote`
fi
if [[ -z $msg ]]; then
msg="${id}"
@@ -3184,16 +2736,6 @@
print "<b>$P</b> $oldname"
fi
- #
- # Check for usr/closed
- #
- if [ ! -z "$Oflag" ]; then
- if [[ $P == usr/closed/* ]]; then
- print " <i>Closed source: omitted from" \
- "this review</i>"
- fi
- fi
-
print "</p><blockquote>\c"
# Insert delta comments if any
comments=`getcomments html $P $PP`
diff --git a/nashorn/.hgtags b/nashorn/.hgtags
index b833819..76c9213 100644
--- a/nashorn/.hgtags
+++ b/nashorn/.hgtags
@@ -221,3 +221,4 @@
6ec2f9e5ed5bd60c2900976e6a54fdcac2f37e9e jdk8-b109
d49a8c2173f5f90c9a39cc4af8e03cfa8f35ee4c jdk8-b110
75fd3486e584f20475c064a2cd4d01ac6406a511 jdk8-b111
+6a4fdb3bb4e34af4c5bb8db467bb01e13b1a7e31 jdk8-b112
diff --git a/nashorn/src/jdk/internal/dynalink/beans/SingleDynamicMethod.java b/nashorn/src/jdk/internal/dynalink/beans/SingleDynamicMethod.java
index d15fab9..6b55d81 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/SingleDynamicMethod.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/SingleDynamicMethod.java
@@ -91,6 +91,7 @@
import jdk.internal.dynalink.CallSiteDescriptor;
import jdk.internal.dynalink.linker.LinkerServices;
import jdk.internal.dynalink.support.Guards;
+import jdk.internal.dynalink.support.Lookup;
/**
* Base class for dynamic methods that dispatch to a single target Java method or constructor. Handles adaptation of the
@@ -100,6 +101,9 @@
* @version $Id: $
*/
abstract class SingleDynamicMethod extends DynamicMethod {
+
+ private static final MethodHandle CAN_CONVERT_TO = Lookup.findOwnStatic(MethodHandles.lookup(), "canConvertTo", boolean.class, LinkerServices.class, Class.class, Object.class);
+
SingleDynamicMethod(String name) {
super(name);
}
@@ -201,23 +205,69 @@
return createConvertingInvocation(target, linkerServices, callSiteType).asVarargsCollector(
callSiteLastArgType);
}
- if(!linkerServices.canConvert(callSiteLastArgType, varArgType)) {
- // Call site signature guarantees the argument can definitely not be an array (i.e. it is primitive);
- // link immediately to a vararg-packing method handle.
- return createConvertingInvocation(collectArguments(fixTarget, argsLen), linkerServices, callSiteType);
+
+ // This method handle takes the single argument and packs it into a newly allocated single-element array. It
+ // will be used when the incoming argument can't be converted to the vararg array type (the "vararg packer"
+ // method).
+ final MethodHandle varArgCollectingInvocation = createConvertingInvocation(collectArguments(fixTarget,
+ argsLen), linkerServices, callSiteType);
+
+ // Is call site type assignable from an array type (e.g. Object:int[], or Object[]:String[])
+ final boolean isAssignableFromArray = callSiteLastArgType.isAssignableFrom(varArgType);
+ // Do we have a custom conversion that can potentially convert the call site type to an array?
+ final boolean isCustomConvertible = linkerServices.canConvert(callSiteLastArgType, varArgType);
+ if(!isAssignableFromArray && !isCustomConvertible) {
+ // Call site signature guarantees the argument can definitely not be converted to an array (i.e. it is
+ // primitive), and no conversion can help with it either. Link immediately to a vararg-packing method
+ // handle.
+ return varArgCollectingInvocation;
}
- // Call site signature makes no guarantees that the single argument in the vararg position will be
- // compatible across all invocations. Need to insert an appropriate guard and fall back to generic vararg
- // method when it is not.
- return MethodHandles.guardWithTest(Guards.isInstance(varArgType, fixParamsLen, callSiteType),
- createConvertingInvocation(fixTarget, linkerServices, callSiteType),
- createConvertingInvocation(collectArguments(fixTarget, argsLen), linkerServices, callSiteType));
+
+ // This method handle employs language-specific conversions to convert the last argument into an array of
+ // vararg type.
+ final MethodHandle arrayConvertingInvocation = createConvertingInvocation(MethodHandles.filterArguments(
+ fixTarget, fixParamsLen, linkerServices.getTypeConverter(callSiteLastArgType, varArgType)),
+ linkerServices, callSiteType);
+
+ // This method handle determines whether the value can be converted to the array of vararg type using a
+ // language-specific conversion.
+ final MethodHandle canConvertArgToArray = MethodHandles.insertArguments(CAN_CONVERT_TO, 0, linkerServices,
+ varArgType);
+
+ // This one adjusts the previous one for the location of the argument and the call site type.
+ final MethodHandle canConvertLastArgToArray = MethodHandles.dropArguments(canConvertArgToArray, 0,
+ MethodType.genericMethodType(fixParamsLen).parameterList()).asType(callSiteType.changeReturnType(boolean.class));
+
+ // This one takes the previous ones and combines them into a method handle that converts the argument into
+ // a vararg array when it can, otherwise falls back to the vararg packer.
+ final MethodHandle convertToArrayWhenPossible = MethodHandles.guardWithTest(canConvertLastArgToArray,
+ arrayConvertingInvocation, varArgCollectingInvocation);
+
+ if(isAssignableFromArray) {
+ return MethodHandles.guardWithTest(
+ // Is incoming parameter already a compatible array?
+ Guards.isInstance(varArgType, fixParamsLen, callSiteType),
+ // Yes: just pass it to the method
+ createConvertingInvocation(fixTarget, linkerServices, callSiteType),
+ // No: either go through a custom conversion, or if it is not possible, go directly to the
+ // vararg packer.
+ isCustomConvertible ? convertToArrayWhenPossible : varArgCollectingInvocation);
+ }
+
+ // Just do the custom conversion with fallback to the vararg packer logic.
+ assert isCustomConvertible;
+ return convertToArrayWhenPossible;
}
// Remaining case: more than one vararg.
return createConvertingInvocation(collectArguments(fixTarget, argsLen), linkerServices, callSiteType);
}
+ @SuppressWarnings("unused")
+ private static boolean canConvertTo(final LinkerServices linkerServices, Class<?> to, Object obj) {
+ return obj == null ? false : linkerServices.canConvert(obj.getClass(), to);
+ }
+
/**
* Creates a method handle out of the original target that will collect the varargs for the exact component type of
* the varArg array. Note that this will nicely trigger language-specific type converters for exactly those varargs
diff --git a/nashorn/src/jdk/internal/dynalink/support/Guards.java b/nashorn/src/jdk/internal/dynalink/support/Guards.java
index 661cf33..42aa675 100644
--- a/nashorn/src/jdk/internal/dynalink/support/Guards.java
+++ b/nashorn/src/jdk/internal/dynalink/support/Guards.java
@@ -88,6 +88,7 @@
import java.lang.invoke.MethodType;
import java.util.logging.Level;
import java.util.logging.Logger;
+import jdk.internal.dynalink.DynamicLinker;
import jdk.internal.dynalink.linker.LinkerServices;
/**
@@ -115,11 +116,11 @@
public static MethodHandle isOfClass(Class<?> clazz, MethodType type) {
final Class<?> declaredType = type.parameterType(0);
if(clazz == declaredType) {
- LOG.log(Level.WARNING, "isOfClassGuardAlwaysTrue", new Object[] { clazz.getName(), 0, type });
+ LOG.log(Level.WARNING, "isOfClassGuardAlwaysTrue", new Object[] { clazz.getName(), 0, type, DynamicLinker.getLinkedCallSiteLocation() });
return constantTrue(type);
}
if(!declaredType.isAssignableFrom(clazz)) {
- LOG.log(Level.WARNING, "isOfClassGuardAlwaysFalse", new Object[] { clazz.getName(), 0, type });
+ LOG.log(Level.WARNING, "isOfClassGuardAlwaysFalse", new Object[] { clazz.getName(), 0, type, DynamicLinker.getLinkedCallSiteLocation() });
return constantFalse(type);
}
return getClassBoundArgumentTest(IS_OF_CLASS, clazz, 0, type);
@@ -152,11 +153,11 @@
public static MethodHandle isInstance(Class<?> clazz, int pos, MethodType type) {
final Class<?> declaredType = type.parameterType(pos);
if(clazz.isAssignableFrom(declaredType)) {
- LOG.log(Level.WARNING, "isInstanceGuardAlwaysTrue", new Object[] { clazz.getName(), pos, type });
+ LOG.log(Level.WARNING, "isInstanceGuardAlwaysTrue", new Object[] { clazz.getName(), pos, type, DynamicLinker.getLinkedCallSiteLocation() });
return constantTrue(type);
}
if(!declaredType.isAssignableFrom(clazz)) {
- LOG.log(Level.WARNING, "isInstanceGuardAlwaysFalse", new Object[] { clazz.getName(), pos, type });
+ LOG.log(Level.WARNING, "isInstanceGuardAlwaysFalse", new Object[] { clazz.getName(), pos, type, DynamicLinker.getLinkedCallSiteLocation() });
return constantFalse(type);
}
return getClassBoundArgumentTest(IS_INSTANCE, clazz, pos, type);
@@ -174,11 +175,11 @@
public static MethodHandle isArray(int pos, MethodType type) {
final Class<?> declaredType = type.parameterType(pos);
if(declaredType.isArray()) {
- LOG.log(Level.WARNING, "isArrayGuardAlwaysTrue", new Object[] { pos, type });
+ LOG.log(Level.WARNING, "isArrayGuardAlwaysTrue", new Object[] { pos, type, DynamicLinker.getLinkedCallSiteLocation() });
return constantTrue(type);
}
if(!declaredType.isAssignableFrom(Object[].class)) {
- LOG.log(Level.WARNING, "isArrayGuardAlwaysFalse", new Object[] { pos, type });
+ LOG.log(Level.WARNING, "isArrayGuardAlwaysFalse", new Object[] { pos, type, DynamicLinker.getLinkedCallSiteLocation() });
return constantFalse(type);
}
return asType(IS_ARRAY, pos, type);
diff --git a/nashorn/src/jdk/internal/dynalink/support/messages.properties b/nashorn/src/jdk/internal/dynalink/support/messages.properties
index eaf1f63..88d5990 100644
--- a/nashorn/src/jdk/internal/dynalink/support/messages.properties
+++ b/nashorn/src/jdk/internal/dynalink/support/messages.properties
@@ -76,11 +76,11 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-isInstanceGuardAlwaysTrue=isInstance guard for {0} in position {1} in method type {2} will always return true
-isInstanceGuardAlwaysFalse=isInstance guard for {0} in position {1} in method type {2} will always return false
+isInstanceGuardAlwaysTrue=isInstance guard for {0} in position {1} in method type {2} at {3} will always return true
+isInstanceGuardAlwaysFalse=isInstance guard for {0} in position {1} in method type {2} at {3} will always return false
-isOfClassGuardAlwaysTrue=isOfClass guard for {0} in position {1} in method type {2} will always return true
-isOfClassGuardAlwaysFalse=isOfClass guard for {0} in position {1} in method type {2} will always return false
+isOfClassGuardAlwaysTrue=isOfClass guard for {0} in position {1} in method type {2} at {3} will always return true
+isOfClassGuardAlwaysFalse=isOfClass guard for {0} in position {1} in method type {2} at {3} will always return false
-isArrayGuardAlwaysTrue=isArray guard in position {0} in method type {1} will always return true
-isArrayGuardAlwaysFalse=isArray guard in position {0} in method type {1} will always return false
\ No newline at end of file
+isArrayGuardAlwaysTrue=isArray guard in position {0} in method type {1} at {2} will always return true
+isArrayGuardAlwaysFalse=isArray guard in position {0} in method type {1} at {2} will always return false
\ No newline at end of file
diff --git a/nashorn/src/jdk/nashorn/api/scripting/JSObject.java b/nashorn/src/jdk/nashorn/api/scripting/JSObject.java
index 53b5790..a2d761b 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/JSObject.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/JSObject.java
@@ -46,7 +46,7 @@
* @param args arguments to method
* @return result of call
*/
- public Object call(Object thiz, Object... args) {
+ public Object call(final Object thiz, final Object... args) {
throw new UnsupportedOperationException("call");
}
@@ -57,7 +57,7 @@
* @param args arguments to method
* @return result of constructor call
*/
- public Object newObject(Object... args) {
+ public Object newObject(final Object... args) {
throw new UnsupportedOperationException("newObject");
}
@@ -67,7 +67,7 @@
* @param s JavaScript expression to evaluate
* @return evaluation result
*/
- public Object eval(String s) {
+ public Object eval(final String s) {
throw new UnsupportedOperationException("eval");
}
@@ -78,7 +78,7 @@
* @param args arguments to be passed to the member function
* @return result of call
*/
- public Object callMember(String name, Object... args) {
+ public Object callMember(final String name, final Object... args) {
throw new UnsupportedOperationException("call");
}
@@ -88,7 +88,7 @@
* @param name of member
* @return member
*/
- public Object getMember(String name) {
+ public Object getMember(final String name) {
return null;
}
@@ -98,7 +98,7 @@
* @param index index slot to retrieve
* @return member
*/
- public Object getSlot(int index) {
+ public Object getSlot(final int index) {
return null;
}
@@ -108,7 +108,7 @@
* @param name name of member
* @return true if this object has a member of the given name
*/
- public boolean hasMember(String name) {
+ public boolean hasMember(final String name) {
return false;
}
@@ -118,7 +118,7 @@
* @param slot index to check
* @return true if this object has a slot
*/
- public boolean hasSlot(int slot) {
+ public boolean hasSlot(final int slot) {
return false;
}
@@ -127,7 +127,8 @@
*
* @param name name of the member
*/
- public void removeMember(String name) {
+ public void removeMember(final String name) {
+ //empty
}
/**
@@ -136,7 +137,8 @@
* @param name name of the member
* @param value value of the member
*/
- public void setMember(String name, Object value) {
+ public void setMember(final String name, final Object value) {
+ //empty
}
/**
@@ -145,7 +147,8 @@
* @param index index of the member slot
* @param value value of the member
*/
- public void setSlot(int index, Object value) {
+ public void setSlot(final int index, final Object value) {
+ //empty
}
// property and value iteration
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
index 36e79b5..d0fb0c3 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -285,11 +285,10 @@
final URL url = ((URLReader)reader).getURL();
final Charset cs = ((URLReader)reader).getCharset();
return new Source(url.toString(), url, cs);
- } else {
- return new Source(getScriptName(ctxt), Source.readFully(reader));
}
- } catch (final IOException ioExp) {
- throw new ScriptException(ioExp);
+ return new Source(getScriptName(ctxt), Source.readFully(reader));
+ } catch (final IOException e) {
+ throw new ScriptException(e);
}
}
@@ -576,15 +575,14 @@
return new CompiledScript() {
@Override
public Object eval(final ScriptContext ctxt) throws ScriptException {
- final ScriptObject global = getNashornGlobalFrom(ctxt);
+ final ScriptObject globalObject = getNashornGlobalFrom(ctxt);
// Are we running the script in the correct global?
- if (func.getScope() == global) {
- return evalImpl(func, ctxt, global);
- } else {
- // ScriptContext with a different global. Compile again!
- // Note that we may still hit per-global compilation cache.
- return evalImpl(compileImpl(source, ctxt), ctxt, global);
+ if (func.getScope() == globalObject) {
+ return evalImpl(func, ctxt, globalObject);
}
+ // ScriptContext with a different global. Compile again!
+ // Note that we may still hit per-global compilation cache.
+ return evalImpl(compileImpl(source, ctxt), ctxt, globalObject);
}
@Override
public ScriptEngine getEngine() {
diff --git a/nashorn/src/jdk/nashorn/api/scripting/ScriptUtils.java b/nashorn/src/jdk/nashorn/api/scripting/ScriptUtils.java
index ccd5879..48045e1 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/ScriptUtils.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/ScriptUtils.java
@@ -25,6 +25,7 @@
package jdk.nashorn.api.scripting;
+import jdk.nashorn.internal.runtime.ScriptFunction;
import jdk.nashorn.internal.runtime.ScriptRuntime;
/**
@@ -57,4 +58,17 @@
public static String format(final String format, final Object[] args) {
return Formatter.format(format, args);
}
+
+ /**
+ * Create a wrapper function that calls {@code func} synchronized on {@code sync} or, if that is undefined,
+ * {@code self}. Used to implement "sync" function in resources/mozilla_compat.js.
+ *
+ * @param func the function to invoke
+ * @param sync the object to synchronize on
+ * @return a synchronizing wrapper function
+ */
+ public static Object makeSynchronizedFunction(final ScriptFunction func, final Object sync) {
+ return func.makeSynchronizedFunction(sync);
+ }
+
}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Attr.java b/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
index 7aef460..5415a06 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
@@ -480,6 +480,10 @@
}
//unknown parameters are promoted to object type.
+ if (newFunctionNode.hasLazyChildren()) {
+ //the final body has already been assigned as we have left the function node block body by now
+ objectifySymbols(body);
+ }
newFunctionNode = finalizeParameters(newFunctionNode);
newFunctionNode = finalizeTypes(newFunctionNode);
for (final Symbol symbol : newFunctionNode.getDeclaredSymbols()) {
@@ -489,11 +493,6 @@
}
}
- if (newFunctionNode.hasLazyChildren()) {
- //the final body has already been assigned as we have left the function node block body by now
- objectifySymbols(body);
- }
-
List<VarNode> syntheticInitializers = null;
if (body.getFlag(Block.NEEDS_SELF_SYMBOL)) {
@@ -503,8 +502,8 @@
syntheticInitializers.add(createSyntheticInitializer(newFunctionNode.getIdent(), CALLEE, newFunctionNode));
}
- if(newFunctionNode.needsArguments()) {
- if(syntheticInitializers == null) {
+ if (newFunctionNode.needsArguments()) {
+ if (syntheticInitializers == null) {
syntheticInitializers = new ArrayList<>(1);
}
// "var arguments = :arguments"
@@ -512,12 +511,12 @@
ARGUMENTS, newFunctionNode));
}
- if(syntheticInitializers != null) {
- final List<Statement> stmts = body.getStatements();
+ if (syntheticInitializers != null) {
+ final List<Statement> stmts = newFunctionNode.getBody().getStatements();
final List<Statement> newStatements = new ArrayList<>(stmts.size() + syntheticInitializers.size());
newStatements.addAll(syntheticInitializers);
newStatements.addAll(stmts);
- newFunctionNode = newFunctionNode.setBody(lc, body.setStatements(lc, newStatements));
+ newFunctionNode = newFunctionNode.setBody(lc, newFunctionNode.getBody().setStatements(lc, newStatements));
}
if (returnTypes.peek().isUnknown()) {
@@ -558,12 +557,6 @@
}
@Override
- public Node leaveCONVERT(final UnaryNode unaryNode) {
- assert false : "There should be no convert operators in IR during Attribution";
- return end(unaryNode);
- }
-
- @Override
public Node leaveIdentNode(final IdentNode identNode) {
final String name = identNode.getName();
@@ -991,7 +984,7 @@
@Override
public Node leaveNEW(final UnaryNode unaryNode) {
- return end(ensureSymbol(Type.OBJECT, unaryNode));
+ return end(ensureSymbol(Type.OBJECT, unaryNode.setRHS(((CallNode)unaryNode.rhs()).setIsNew())));
}
@Override
@@ -1287,7 +1280,9 @@
private Node leaveCmp(final BinaryNode binaryNode) {
ensureTypeNotUnknown(binaryNode.lhs());
ensureTypeNotUnknown(binaryNode.rhs());
-
+ Type widest = Type.widest(binaryNode.lhs().getType(), binaryNode.rhs().getType());
+ ensureSymbol(widest, binaryNode.lhs());
+ ensureSymbol(widest, binaryNode.rhs());
return end(ensureSymbol(Type.BOOLEAN, binaryNode));
}
@@ -1630,7 +1625,7 @@
if (!Type.areEquivalent(from, to) && Type.widest(from, to) == to) {
LOG.fine("Had to post pass widen '", node, "' ", Debug.id(node), " from ", node.getType(), " to ", to);
Symbol symbol = node.getSymbol();
- if(symbol.isShared() && symbol.wouldChangeType(to)) {
+ if (symbol.isShared() && symbol.wouldChangeType(to)) {
symbol = temporarySymbols.getTypedTemporarySymbol(to);
}
newType(symbol, to);
@@ -1646,40 +1641,105 @@
return !node.isLazy();
}
- /**
- * Eg.
- *
- * var d = 17;
- * var e;
- * e = d; //initially typed as int for node type, should retype as double
- * e = object;
- *
- * var d = 17;
- * var e;
- * e -= d; //initially type number, should number remain with a final conversion supplied by Store. ugly, but the computation result of the sub is numeric
- * e = object;
- *
- */
+ //
+ // Eg.
+ //
+ // var d = 17;
+ // var e;
+ // e = d; //initially typed as int for node type, should retype as double
+ // e = object;
+ //
+ // var d = 17;
+ // var e;
+ // e -= d; //initially type number, should number remain with a final conversion supplied by Store. ugly, but the computation result of the sub is numeric
+ // e = object;
+ //
@SuppressWarnings("fallthrough")
@Override
public Node leaveBinaryNode(final BinaryNode binaryNode) {
final Type widest = Type.widest(binaryNode.lhs().getType(), binaryNode.rhs().getType());
BinaryNode newBinaryNode = binaryNode;
- switch (binaryNode.tokenType()) {
- default:
- if (!binaryNode.isAssignment() || binaryNode.isSelfModifying()) {
+
+ if (isAdd(binaryNode)) {
+ newBinaryNode = (BinaryNode)widen(newBinaryNode, widest);
+ if (newBinaryNode.getType().isObject() && !isAddString(newBinaryNode)) {
+ return new RuntimeNode(newBinaryNode, Request.ADD);
+ }
+ } else if (binaryNode.isComparison()) {
+ final Expression lhs = newBinaryNode.lhs();
+ final Expression rhs = newBinaryNode.rhs();
+
+ Type cmpWidest = Type.widest(lhs.getType(), rhs.getType());
+
+ boolean newRuntimeNode = false, finalized = false;
+ switch (newBinaryNode.tokenType()) {
+ case EQ_STRICT:
+ case NE_STRICT:
+ if (lhs.getType().isBoolean() != rhs.getType().isBoolean()) {
+ newRuntimeNode = true;
+ cmpWidest = Type.OBJECT;
+ finalized = true;
+ }
+ //fallthru
+ default:
+ if (newRuntimeNode || cmpWidest.isObject()) {
+ return new RuntimeNode(newBinaryNode, Request.requestFor(binaryNode)).setIsFinal(finalized);
+ }
break;
}
+
+ return newBinaryNode;
+ } else {
+ if (!binaryNode.isAssignment() || binaryNode.isSelfModifying()) {
+ return newBinaryNode;
+ }
+ checkThisAssignment(binaryNode);
newBinaryNode = newBinaryNode.setLHS(widen(newBinaryNode.lhs(), widest));
- case ADD:
newBinaryNode = (BinaryNode)widen(newBinaryNode, widest);
}
+
return newBinaryNode;
+
+ }
+
+ private boolean isAdd(final Node node) {
+ return node.isTokenType(TokenType.ADD);
+ }
+
+ /**
+ * Determine if the outcome of + operator is a string.
+ *
+ * @param node Node to test.
+ * @return true if a string result.
+ */
+ private boolean isAddString(final Node node) {
+ if (node instanceof BinaryNode && isAdd(node)) {
+ final BinaryNode binaryNode = (BinaryNode)node;
+ final Node lhs = binaryNode.lhs();
+ final Node rhs = binaryNode.rhs();
+
+ return isAddString(lhs) || isAddString(rhs);
+ }
+
+ return node instanceof LiteralNode<?> && ((LiteralNode<?>)node).isString();
+ }
+
+ private void checkThisAssignment(final BinaryNode binaryNode) {
+ if (binaryNode.isAssignment()) {
+ if (binaryNode.lhs() instanceof AccessNode) {
+ final AccessNode accessNode = (AccessNode) binaryNode.lhs();
+
+ if (accessNode.getBase().getSymbol().isThis()) {
+ lc.getCurrentFunction().addThisProperty(accessNode.getProperty().getName());
+ }
+ }
+ }
}
});
lc.replace(currentFunctionNode, newFunctionNode);
currentFunctionNode = newFunctionNode;
} while (!changed.isEmpty());
+
return currentFunctionNode;
}
@@ -1692,7 +1752,6 @@
final Expression lhs = binaryNode.lhs();
newType(lhs.getSymbol(), destType); //may not narrow if dest is already wider than destType
-// ensureSymbol(destType, binaryNode); //for OP= nodes, the node can carry a narrower types than its lhs rhs. This is perfectly fine
return end(ensureSymbol(destType, binaryNode));
}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java b/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java
index 02ea95f..bf01de0 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java
@@ -56,10 +56,6 @@
branchOptimizer(node, label, state);
}
- private void load(final Expression node) {
- codegen.load(node);
- }
-
private void branchOptimizer(final UnaryNode unaryNode, final Label label, final boolean state) {
final Expression rhs = unaryNode.rhs();
@@ -67,18 +63,16 @@
case NOT:
branchOptimizer(rhs, label, !state);
return;
- case CONVERT:
+ default:
if (unaryNode.getType().isBoolean()) {
branchOptimizer(rhs, label, state);
return;
}
break;
- default:
- break;
}
// convert to boolean
- load(unaryNode);
+ codegen.load(unaryNode);
method.convert(Type.BOOLEAN);
if (state) {
method.ifne(label);
@@ -118,45 +112,33 @@
case EQ:
case EQ_STRICT:
- assert rhs.getType().isEquivalentTo(lhs.getType()) : "type mismatch: " + lhs.getSymbol() + " to " + rhs.getSymbol();
- load(lhs);
- load(rhs);
+ codegen.loadBinaryOperands(lhs, rhs, Type.widest(lhs.getType(), rhs.getType()));
method.conditionalJump(state ? EQ : NE, true, label);
return;
case NE:
case NE_STRICT:
- assert rhs.getType().isEquivalentTo(lhs.getType()) : "type mismatch: " + lhs.getSymbol() + " to " + rhs.getSymbol();
- load(lhs);
- load(rhs);
+ codegen.loadBinaryOperands(lhs, rhs, Type.widest(lhs.getType(), rhs.getType()));
method.conditionalJump(state ? NE : EQ, true, label);
return;
case GE:
- assert rhs.getType().isEquivalentTo(lhs.getType()) : "type mismatch: " + lhs.getSymbol() + " to " + rhs.getSymbol();
- load(lhs);
- load(rhs);
+ codegen.loadBinaryOperands(lhs, rhs, Type.widest(lhs.getType(), rhs.getType()));
method.conditionalJump(state ? GE : LT, !state, label);
return;
case GT:
- assert rhs.getType().isEquivalentTo(lhs.getType()) : "type mismatch: " + lhs.getSymbol() + " to " + rhs.getSymbol();
- load(lhs);
- load(rhs);
+ codegen.loadBinaryOperands(lhs, rhs, Type.widest(lhs.getType(), rhs.getType()));
method.conditionalJump(state ? GT : LE, !state, label);
return;
case LE:
- assert rhs.getType().isEquivalentTo(lhs.getType()) : "type mismatch: " + lhs.getSymbol() + " to " + rhs.getSymbol();
- load(lhs);
- load(rhs);
+ codegen.loadBinaryOperands(lhs, rhs, Type.widest(lhs.getType(), rhs.getType()));
method.conditionalJump(state ? LE : GT, state, label);
return;
case LT:
- assert rhs.getType().isEquivalentTo(lhs.getType()) : "type mismatch: " + lhs.getSymbol() + " to " + rhs.getSymbol() + " in " + binaryNode;
- load(lhs);
- load(rhs);
+ codegen.loadBinaryOperands(lhs, rhs, Type.widest(lhs.getType(), rhs.getType()));
method.conditionalJump(state ? LT : GE, state, label);
return;
@@ -164,7 +146,7 @@
break;
}
- load(binaryNode);
+ codegen.load(binaryNode);
method.convert(Type.BOOLEAN);
if (state) {
method.ifne(label);
@@ -187,7 +169,7 @@
}
}
- load(node);
+ codegen.load(node);
method.convert(Type.BOOLEAN);
if (state) {
method.ifne(label);
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 5f7f596..e709357 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -43,7 +43,6 @@
import static jdk.nashorn.internal.codegen.CompilerConstants.interfaceCallNoLookup;
import static jdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticField;
import static jdk.nashorn.internal.codegen.CompilerConstants.typeDescriptor;
import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
import static jdk.nashorn.internal.ir.Symbol.IS_INTERNAL;
@@ -60,7 +59,6 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.Locale;
import java.util.Set;
import java.util.TreeMap;
import jdk.nashorn.internal.codegen.ClassEmitter.Flag;
@@ -111,7 +109,6 @@
import jdk.nashorn.internal.ir.VarNode;
import jdk.nashorn.internal.ir.WhileNode;
import jdk.nashorn.internal.ir.WithNode;
-import jdk.nashorn.internal.ir.debug.ASTWriter;
import jdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
import jdk.nashorn.internal.ir.visitor.NodeVisitor;
import jdk.nashorn.internal.objects.Global;
@@ -217,12 +214,12 @@
* @param identNode an identity node to load
* @return the method generator used
*/
- private MethodEmitter loadIdent(final IdentNode identNode) {
+ private MethodEmitter loadIdent(final IdentNode identNode, final Type type) {
final Symbol symbol = identNode.getSymbol();
if (!symbol.isScope()) {
assert symbol.hasSlot() || symbol.isParam();
- return method.load(symbol);
+ return method.load(symbol).convert(type);
}
final String name = symbol.getName();
@@ -243,11 +240,11 @@
if (isFastScope(symbol)) {
// Only generate shared scope getter for fast-scope symbols so we know we can dial in correct scope.
if (symbol.getUseCount() > SharedScopeCall.FAST_SCOPE_GET_THRESHOLD) {
- return loadSharedScopeVar(identNode.getType(), symbol, flags);
+ return loadSharedScopeVar(type, symbol, flags);
}
- return loadFastScopeVar(identNode.getType(), symbol, flags, identNode.isFunction());
+ return loadFastScopeVar(type, symbol, flags, identNode.isFunction());
}
- return method.dynamicGet(identNode.getType(), identNode.getName(), flags, identNode.isFunction());
+ return method.dynamicGet(type, identNode.getName(), flags, identNode.isFunction());
}
}
@@ -313,9 +310,9 @@
return method.dynamicGet(valueType, symbol.getName(), flags | CALLSITE_FAST_SCOPE, isMethod);
}
- private MethodEmitter storeFastScopeVar(final Type valueType, final Symbol symbol, final int flags) {
+ private MethodEmitter storeFastScopeVar(final Symbol symbol, final int flags) {
loadFastScopeProto(symbol, true);
- method.dynamicSet(valueType, symbol.getName(), flags | CALLSITE_FAST_SCOPE);
+ method.dynamicSet(symbol.getName(), flags | CALLSITE_FAST_SCOPE);
return method;
}
@@ -359,14 +356,61 @@
* @return the method emitter used
*/
MethodEmitter load(final Expression node) {
- return load(node, false);
+ return load(node, node.hasType() ? node.getType() : null, false);
}
- private MethodEmitter load(final Expression node, final boolean baseAlreadyOnStack) {
+ private static boolean safeLiteral(final Expression rhs) {
+ return rhs instanceof LiteralNode && !(rhs instanceof ArrayLiteralNode);
+ }
+
+ MethodEmitter loadBinaryOperands(final Expression lhs, final Expression rhs, final Type type) {
+ return loadBinaryOperands(lhs, rhs, type, false);
+ }
+
+ private MethodEmitter loadBinaryOperands(final Expression lhs, final Expression rhs, final Type type, final boolean baseAlreadyOnStack) {
+ // ECMAScript 5.1 specification (sections 11.5-11.11 and 11.13) prescribes that when evaluating a binary
+ // expression "LEFT op RIGHT", the order of operations must be: LOAD LEFT, LOAD RIGHT, CONVERT LEFT, CONVERT
+ // RIGHT, EXECUTE OP. Unfortunately, doing it in this order defeats potential optimizations that arise when we
+ // can combine a LOAD with a CONVERT operation (e.g. use a dynamic getter with the conversion target type as its
+ // return value). What we do here is reorder LOAD RIGHT and CONVERT LEFT when possible; it is possible only when
+ // we can prove that executing CONVERT LEFT can't have a side effect that changes the value of LOAD RIGHT.
+ // Basically, if we know that either LEFT is not an object, or RIGHT is a constant literal, then we can do the
+ // reordering and collapse LOAD/CONVERT into a single operation; otherwise we need to do the more costly
+ // separate operations to preserve specification semantics.
+ final Type lhsType = lhs.getType();
+ if (lhsType.isObject() && !safeLiteral(rhs)) {
+ // Can't reorder. Load and convert separately.
+ load(lhs, lhsType, baseAlreadyOnStack);
+ load(rhs, rhs.getType(), false);
+ // Avoid empty SWAP, SWAP bytecode sequence if CONVERT LEFT is a no-op
+ if (!lhsType.isEquivalentTo(type)) {
+ method.swap();
+ method.convert(type);
+ method.swap();
+ }
+ method.convert(type);
+ } else {
+ // Can reorder. Combine load and convert into single operations.
+ load(lhs, type, baseAlreadyOnStack);
+ load(rhs, type, false);
+ }
+
+ return method;
+ }
+
+ MethodEmitter loadBinaryOperands(final BinaryNode node) {
+ return loadBinaryOperands(node.lhs(), node.rhs(), node.getType(), false);
+ }
+
+ private MethodEmitter load(final Expression node, final Type type) {
+ return load(node, type, false);
+ }
+
+ private MethodEmitter load(final Expression node, final Type type, final boolean baseAlreadyOnStack) {
final Symbol symbol = node.getSymbol();
// If we lack symbols, we just generate what we see.
- if (symbol == null) {
+ if (symbol == null || type == null) {
node.accept(this);
return method;
}
@@ -378,10 +422,10 @@
*/
final CodeGenerator codegen = this;
- node.accept(new NodeVisitor<LexicalContext>(new LexicalContext()) {
+ node.accept(new NodeVisitor<LexicalContext>(lc) {
@Override
public boolean enterIdentNode(final IdentNode identNode) {
- loadIdent(identNode);
+ loadIdent(identNode, type);
return false;
}
@@ -391,7 +435,7 @@
load(accessNode.getBase()).convert(Type.OBJECT);
}
assert method.peekType().isObject();
- method.dynamicGet(node.getType(), accessNode.getProperty().getName(), getCallSiteFlags(), accessNode.isFunction());
+ method.dynamicGet(type, accessNode.getProperty().getName(), getCallSiteFlags(), accessNode.isFunction());
return false;
}
@@ -401,7 +445,7 @@
load(indexNode.getBase()).convert(Type.OBJECT);
load(indexNode.getIndex());
}
- method.dynamicGetIndex(node.getType(), getCallSiteFlags(), indexNode.isFunction());
+ method.dynamicGetIndex(type, getCallSiteFlags(), indexNode.isFunction());
return false;
}
@@ -409,14 +453,36 @@
public boolean enterFunctionNode(FunctionNode functionNode) {
// function nodes will always leave a constructed function object on stack, no need to load the symbol
// separately as in enterDefault()
+ lc.pop(functionNode);
functionNode.accept(codegen);
+ // NOTE: functionNode.accept() will produce a different FunctionNode that we discard. This incidentally
+ // doesn't cause problems as we're never touching FunctionNode again after it's visited here - codegen
+ // is the last element in the compilation pipeline, the AST it produces is not used externally. So, we
+ // re-push the original functionNode.
+ lc.push(functionNode);
+ method.convert(type);
return false;
}
@Override
+ public boolean enterCallNode(CallNode callNode) {
+ return codegen.enterCallNode(callNode, type);
+ }
+
+ @Override
+ public boolean enterLiteralNode(LiteralNode<?> literalNode) {
+ return codegen.enterLiteralNode(literalNode, type);
+ }
+
+ @Override
public boolean enterDefault(final Node otherNode) {
+ final Node currentDiscard = codegen.lc.getCurrentDiscard();
otherNode.accept(codegen); // generate code for whatever we are looking at.
- method.load(symbol); // load the final symbol to the stack (or nop if no slot, then result is already there)
+ if(currentDiscard != otherNode) {
+ method.load(symbol); // load the final symbol to the stack (or nop if no slot, then result is already there)
+ assert method.peekType() != null;
+ method.convert(type);
+ }
return false;
}
});
@@ -583,15 +649,19 @@
return argCount;
}
+
@Override
public boolean enterCallNode(final CallNode callNode) {
+ return enterCallNode(callNode, callNode.getType());
+ }
+
+ private boolean enterCallNode(final CallNode callNode, final Type callNodeType) {
lineNumber(callNode.getLineNumber());
final List<Expression> args = callNode.getArgs();
final Expression function = callNode.getFunction();
final Block currentBlock = lc.getCurrentBlock();
final CodeGeneratorLexicalContext codegenLexicalContext = lc;
- final Type callNodeType = callNode.getType();
function.accept(new NodeVisitor<LexicalContext>(new LexicalContext()) {
@@ -612,16 +682,14 @@
}
private void scopeCall(final IdentNode node, final int flags) {
- load(node);
- method.convert(Type.OBJECT); // foo() makes no sense if foo == 3
+ load(node, Type.OBJECT); // Type.OBJECT as foo() makes no sense if foo == 3
// ScriptFunction will see CALLSITE_SCOPE and will bind scope accordingly.
method.loadNull(); //the 'this'
method.dynamicCall(callNodeType, 2 + loadArgs(args), flags);
}
private void evalCall(final IdentNode node, final int flags) {
- load(node);
- method.convert(Type.OBJECT); // foo() makes no sense if foo == 3
+ load(node, Type.OBJECT); // Type.OBJECT as foo() makes no sense if foo == 3
final Label not_eval = new Label("not_eval");
final Label eval_done = new Label("eval_done");
@@ -638,8 +706,7 @@
final CallNode.EvalArgs evalArgs = callNode.getEvalArgs();
// load evaluated code
- load(evalArgs.getCode());
- method.convert(Type.OBJECT);
+ load(evalArgs.getCode(), Type.OBJECT);
// special/extra 'eval' arguments
load(evalArgs.getThis());
method.load(evalArgs.getLocation());
@@ -690,13 +757,11 @@
@Override
public boolean enterAccessNode(final AccessNode node) {
- load(node.getBase());
- method.convert(Type.OBJECT);
+ load(node.getBase(), Type.OBJECT);
method.dup();
method.dynamicGet(node.getType(), node.getProperty().getName(), getCallSiteFlags(), true);
method.swap();
method.dynamicCall(callNodeType, 2 + loadArgs(args), getCallSiteFlags());
- assert method.peekType().equals(callNodeType);
return false;
}
@@ -727,18 +792,17 @@
@Override
public boolean enterIndexNode(final IndexNode node) {
- load(node.getBase());
- method.convert(Type.OBJECT);
+ load(node.getBase(), Type.OBJECT);
method.dup();
- load(node.getIndex());
final Type indexType = node.getIndex().getType();
if (indexType.isObject() || indexType.isBoolean()) {
- method.convert(Type.OBJECT); //TODO
+ load(node.getIndex(), Type.OBJECT); //TODO
+ } else {
+ load(node.getIndex());
}
method.dynamicGetIndex(node.getType(), getCallSiteFlags(), true);
method.swap();
method.dynamicCall(callNodeType, 2 + loadArgs(args), getCallSiteFlags());
- assert method.peekType().equals(callNode.getType());
return false;
}
@@ -746,11 +810,9 @@
@Override
protected boolean enterDefault(final Node node) {
// Load up function.
- load(function);
- method.convert(Type.OBJECT); //TODO, e.g. booleans can be used as functions
+ load(function, Type.OBJECT); //TODO, e.g. booleans can be used as functions
method.loadNull(); // ScriptFunction will figure out the correct this when it sees CALLSITE_SCOPE
method.dynamicCall(callNodeType, 2 + loadArgs(args), getCallSiteFlags() | CALLSITE_SCOPE);
- assert method.peekType().equals(callNode.getType());
return false;
}
@@ -853,8 +915,7 @@
final Expression init = forNode.getInit();
- load(modify);
- assert modify.getType().isObject();
+ load(modify, Type.OBJECT);
method.invoke(forNode.isForEach() ? ScriptRuntime.TO_VALUE_ITERATOR : ScriptRuntime.TO_PROPERTY_ITERATOR);
method.store(iter);
method._goto(forNode.getContinueLabel());
@@ -1203,8 +1264,7 @@
if (element == null) {
method.loadEmpty(elementType);
} else {
- assert elementType.isEquivalentTo(element.getType()) : "array element type doesn't match array type";
- load(element);
+ load(element, elementType);
}
method.arraystore();
@@ -1274,7 +1334,7 @@
}
// literal values
- private MethodEmitter load(final LiteralNode<?> node) {
+ private MethodEmitter loadLiteral(final LiteralNode<?> node, final Type type) {
final Object value = node.getValue();
if (value == null) {
@@ -1294,15 +1354,26 @@
} else if (value instanceof Boolean) {
method.load((Boolean)value);
} else if (value instanceof Integer) {
- method.load((Integer)value);
+ if(type.isEquivalentTo(Type.NUMBER)) {
+ method.load(((Integer)value).doubleValue());
+ } else if(type.isEquivalentTo(Type.LONG)) {
+ method.load(((Integer)value).longValue());
+ } else {
+ method.load((Integer)value);
+ }
} else if (value instanceof Long) {
- method.load((Long)value);
+ if(type.isEquivalentTo(Type.NUMBER)) {
+ method.load(((Long)value).doubleValue());
+ } else {
+ method.load((Long)value);
+ }
} else if (value instanceof Double) {
method.load((Double)value);
} else if (node instanceof ArrayLiteralNode) {
- final ArrayType type = (ArrayType)node.getType();
- loadArray((ArrayLiteralNode)node, type);
- globalAllocateArray(type);
+ final ArrayLiteralNode arrayLiteral = (ArrayLiteralNode)node;
+ final ArrayType atype = arrayLiteral.getArrayType();
+ loadArray(arrayLiteral, atype);
+ globalAllocateArray(atype);
} else {
assert false : "Unknown literal for " + node.getClass() + " " + value.getClass() + " " + value;
}
@@ -1346,8 +1417,12 @@
@Override
public boolean enterLiteralNode(final LiteralNode<?> literalNode) {
+ return enterLiteralNode(literalNode, literalNode.getType());
+ }
+
+ private boolean enterLiteralNode(final LiteralNode<?> literalNode, final Type type) {
assert literalNode.getSymbol() != null : literalNode + " has no symbol";
- load(literalNode).store(literalNode.getSymbol());
+ loadLiteral(literalNode, type).convert(type).store(literalNode.getSymbol());
return false;
}
@@ -1622,10 +1697,8 @@
return enterCmp(lhs, rhs, Condition.GT, type, symbol);
case ADD:
Type widest = Type.widest(lhs.getType(), rhs.getType());
- load(lhs);
- method.convert(widest);
- load(rhs);
- method.convert(widest);
+ load(lhs, widest);
+ load(rhs, widest);
method.add();
method.convert(type);
method.store(symbol);
@@ -1638,15 +1711,15 @@
}
if (nullCheck(runtimeNode, args, new FunctionSignature(false, false, runtimeNode.getType(), args).toString())) {
- return false;
+ return false;
}
if (!runtimeNode.isFinal() && specializationCheck(runtimeNode.getRequest(), runtimeNode, args)) {
- return false;
+ return false;
}
for (final Expression arg : args) {
- load(arg).convert(Type.OBJECT); //TODO this should not be necessary below Lower
+ load(arg).convert(Type.OBJECT);
}
method.invokestatic(
@@ -1903,24 +1976,15 @@
method.lookupswitch(defaultLabel, ints, labels);
}
} else {
- load(expression);
-
- if (expression.getType().isInteger()) {
- method.convert(Type.NUMBER).dup();
- method.store(tag);
- method.conditionalJump(Condition.NE, true, defaultLabel);
- } else {
- assert tag.getSymbolType().isObject();
- method.convert(Type.OBJECT); //e.g. 1 literal pushed and tag is object
- method.store(tag);
- }
+ load(expression, Type.OBJECT);
+ method.store(tag);
for (final CaseNode caseNode : cases) {
final Expression test = caseNode.getTest();
if (test != null) {
method.load(tag);
- load(test);
+ load(test, Type.OBJECT);
method.invoke(ScriptRuntime.EQ_STRICT);
method.ifne(caseNode.getEntry());
}
@@ -1961,8 +2025,7 @@
final int line = throwNode.getLineNumber();
final int column = source.getColumn(position);
- load(expression);
- assert expression.getType().isObject();
+ load(expression, Type.OBJECT);
method.load(source.getName());
method.load(line);
@@ -2087,29 +2150,28 @@
lineNumber(varNode);
- final Symbol varSymbol = varNode.getName().getSymbol();
- assert varSymbol != null : "variable node " + varNode + " requires a name with a symbol";
+ final IdentNode identNode = varNode.getName();
+ final Symbol identSymbol = identNode.getSymbol();
+ assert identSymbol != null : "variable node " + varNode + " requires a name with a symbol";
assert method != null;
- final boolean needsScope = varSymbol.isScope();
+ final boolean needsScope = identSymbol.isScope();
if (needsScope) {
method.loadCompilerConstant(SCOPE);
}
- load(init);
if (needsScope) {
+ load(init);
int flags = CALLSITE_SCOPE | getCallSiteFlags();
- final IdentNode identNode = varNode.getName();
- final Type type = identNode.getType();
- if (isFastScope(varSymbol)) {
- storeFastScopeVar(type, varSymbol, flags);
+ if (isFastScope(identSymbol)) {
+ storeFastScopeVar(identSymbol, flags);
} else {
- method.dynamicSet(type, identNode.getName(), flags);
+ method.dynamicSet(identNode.getName(), flags);
}
} else {
- method.convert(varNode.getName().getType()); // aw: convert moved here
- method.store(varSymbol);
+ load(init, identNode.getType());
+ method.store(identSymbol);
}
return false;
@@ -2168,8 +2230,7 @@
tryLabel = null;
}
- load(expression);
- assert expression.getType().isObject() : "with expression needs to be object: " + expression;
+ load(expression, Type.OBJECT);
if (hasScope) {
// Construct a WithObject if we have a scope
@@ -2211,54 +2272,15 @@
@Override
public boolean enterADD(final UnaryNode unaryNode) {
- load(unaryNode.rhs());
- assert unaryNode.rhs().getType().isNumber() : unaryNode.rhs().getType() + " "+ unaryNode.getSymbol();
+ load(unaryNode.rhs(), unaryNode.getType());
+ assert unaryNode.getType().isNumeric();
method.store(unaryNode.getSymbol());
-
return false;
}
@Override
public boolean enterBIT_NOT(final UnaryNode unaryNode) {
- load(unaryNode.rhs()).convert(Type.INT).load(-1).xor().store(unaryNode.getSymbol());
- return false;
- }
-
- // do this better with convert calls to method. TODO
- @Override
- public boolean enterCONVERT(final UnaryNode unaryNode) {
- final Expression rhs = unaryNode.rhs();
- final Type to = unaryNode.getType();
-
- if (to.isObject() && rhs instanceof LiteralNode) {
- final LiteralNode<?> literalNode = (LiteralNode<?>)rhs;
- final Object value = literalNode.getValue();
-
- if (value instanceof Number) {
- assert !to.isArray() : "type hygiene - cannot convert number to array: (" + to.getTypeClass().getSimpleName() + ')' + value;
- if (value instanceof Integer) {
- method.load((Integer)value);
- } else if (value instanceof Long) {
- method.load((Long)value);
- } else if (value instanceof Double) {
- method.load((Double)value);
- } else {
- assert false;
- }
- method.convert(Type.OBJECT);
- } else if (value instanceof Boolean) {
- method.getField(staticField(Boolean.class, value.toString().toUpperCase(Locale.ENGLISH), Boolean.class));
- } else {
- load(rhs);
- method.convert(unaryNode.getType());
- }
- } else {
- load(rhs);
- method.convert(unaryNode.getType());
- }
-
- method.store(unaryNode.getSymbol());
-
+ load(unaryNode.rhs(), Type.INT).load(-1).xor().store(unaryNode.getSymbol());
return false;
}
@@ -2276,9 +2298,7 @@
@Override
protected void evaluate() {
- load(rhs, true);
-
- method.convert(type);
+ load(rhs, type, true);
if (!isPostfix) {
if (type.isInteger()) {
method.load(isIncrement ? 1 : -1);
@@ -2344,12 +2364,11 @@
public boolean enterNOT(final UnaryNode unaryNode) {
final Expression rhs = unaryNode.rhs();
- load(rhs);
+ load(rhs, Type.BOOLEAN);
final Label trueLabel = new Label("true");
final Label afterLabel = new Label("after");
- method.convert(Type.BOOLEAN);
method.ifne(trueLabel);
method.load(true);
method._goto(afterLabel);
@@ -2363,8 +2382,8 @@
@Override
public boolean enterSUB(final UnaryNode unaryNode) {
- load(unaryNode.rhs()).neg().store(unaryNode.getSymbol());
-
+ assert unaryNode.getType().isNumeric();
+ load(unaryNode.rhs()).convert(unaryNode.getType()).neg().store(unaryNode.getSymbol());
return false;
}
@@ -2377,9 +2396,7 @@
}
private void enterNumericAdd(final Expression lhs, final Expression rhs, final Type type, final Symbol symbol) {
- assert lhs.getType().equals(rhs.getType()) && lhs.getType().equals(type) : lhs.getType() + " != " + rhs.getType() + " != " + type + " " + new ASTWriter(lhs) + " " + new ASTWriter(rhs);
- load(lhs);
- load(rhs);
+ loadBinaryOperands(lhs, rhs, type);
method.add(); //if the symbol is optimistic, it always needs to be written, not on the stack?
method.store(symbol);
}
@@ -2393,8 +2410,7 @@
if (type.isNumeric()) {
enterNumericAdd(lhs, rhs, type, binaryNode.getSymbol());
} else {
- load(lhs).convert(Type.OBJECT);
- load(rhs).convert(Type.OBJECT);
+ loadBinaryOperands(binaryNode);
method.add();
method.store(binaryNode.getSymbol());
}
@@ -2439,13 +2455,16 @@
if (!lhsType.isEquivalentTo(rhsType)) {
//this is OK if scoped, only locals are wrong
- assert !(lhs instanceof IdentNode) || lhs.getSymbol().isScope() : new ASTWriter(binaryNode);
}
new Store<BinaryNode>(binaryNode, lhs) {
@Override
protected void evaluate() {
- load(rhs);
+ if ((lhs instanceof IdentNode) && !lhs.getSymbol().isScope()) {
+ load(rhs, lhsType);
+ } else {
+ load(rhs);
+ }
}
}.store();
@@ -2484,8 +2503,7 @@
@Override
protected void evaluate() {
- load(assignNode.lhs(), true).convert(opType);
- load(assignNode.rhs()).convert(opType);
+ loadBinaryOperands(assignNode.lhs(), assignNode.rhs(), opType, true);
op();
method.convert(assignNode.getType());
}
@@ -2656,8 +2674,7 @@
protected abstract void op();
protected void evaluate(final BinaryNode node) {
- load(node.lhs());
- load(node.rhs());
+ loadBinaryOperands(node);
op();
method.store(node.getSymbol());
}
@@ -2739,11 +2756,7 @@
final Type widest = Type.widest(lhsType, rhsType);
assert widest.isNumeric() || widest.isBoolean() : widest;
- load(lhs);
- method.convert(widest);
- load(rhs);
- method.convert(widest);
-
+ loadBinaryOperands(lhs, rhs, widest);
final Label trueLabel = new Label("trueLabel");
final Label afterLabel = new Label("skip");
@@ -2862,6 +2875,12 @@
public boolean enterSHR(final BinaryNode binaryNode) {
new BinaryArith() {
@Override
+ protected void evaluate(final BinaryNode node) {
+ loadBinaryOperands(node.lhs(), node.rhs(), Type.INT);
+ op();
+ method.store(node.getSymbol());
+ }
+ @Override
protected void op() {
method.shr();
method.convert(Type.LONG).load(JSType.MAX_UINT).and();
@@ -2893,26 +2912,22 @@
final Label falseLabel = new Label("ternary_false");
final Label exitLabel = new Label("ternary_exit");
- Type widest = Type.widest(trueExpr.getType(), falseExpr.getType());
+ Type widest = Type.widest(ternaryNode.getType(), Type.widest(trueExpr.getType(), falseExpr.getType()));
if (trueExpr.getType().isArray() || falseExpr.getType().isArray()) { //loadArray creates a Java array type on the stack, calls global allocate, which creates a native array type
widest = Type.OBJECT;
}
- load(test);
- assert test.getType().isBoolean() : "lhs in ternary must be boolean";
-
+ load(test, Type.BOOLEAN);
// we still keep the conversion here as the AccessSpecializer can have separated the types, e.g. var y = x ? x=55 : 17
// will left as (Object)x=55 : (Object)17 by Lower. Then the first term can be {I}x=55 of type int, which breaks the
// symmetry for the temporary slot for this TernaryNode. This is evidence that we assign types and explicit conversions
- // to early, or Apply the AccessSpecializer too late. We are mostly probably looking for a separate type pass to
+ // too early, or Apply the AccessSpecializer too late. We are mostly probably looking for a separate type pass to
// do this property. Then we never need any conversions in CodeGenerator
method.ifeq(falseLabel);
- load(trueExpr);
- method.convert(widest);
+ load(trueExpr, widest);
method._goto(exitLabel);
method.label(falseLabel);
- load(falseExpr);
- method.convert(widest);
+ load(falseExpr, widest);
method.label(exitLabel);
method.store(symbol);
@@ -3044,8 +3059,7 @@
final BaseNode baseNode = (BaseNode)target;
final Expression base = baseNode.getBase();
- load(base);
- method.convert(Type.OBJECT);
+ load(base, Type.OBJECT);
depth += Type.OBJECT.getSlots();
if (isSelfModifying()) {
@@ -3064,10 +3078,11 @@
enterBaseNode();
final Expression index = node.getIndex();
- // could be boolean here as well
- load(index);
if (!index.getType().isNumeric()) {
- method.convert(Type.OBJECT);
+ // could be boolean here as well
+ load(index, Type.OBJECT);
+ } else {
+ load(index);
}
depth += index.getType().getSlots();
@@ -3136,8 +3151,6 @@
* need to do a conversion on non-equivalent types exists, but is
* very rare. See for example test/script/basic/access-specializer.js
*/
- method.convert(target.getType());
-
target.accept(new NodeVisitor<LexicalContext>(new LexicalContext()) {
@Override
protected boolean enterDefault(Node node) {
@@ -3145,24 +3158,17 @@
}
@Override
- public boolean enterUnaryNode(final UnaryNode node) {
- if (node.tokenType() == TokenType.CONVERT && node.getSymbol() != null) {
- method.convert(node.rhs().getType());
- }
- return true;
- }
-
- @Override
public boolean enterIdentNode(final IdentNode node) {
final Symbol symbol = node.getSymbol();
assert symbol != null;
if (symbol.isScope()) {
if (isFastScope(symbol)) {
- storeFastScopeVar(node.getType(), symbol, CALLSITE_SCOPE | getCallSiteFlags());
+ storeFastScopeVar(symbol, CALLSITE_SCOPE | getCallSiteFlags());
} else {
- method.dynamicSet(node.getType(), node.getName(), CALLSITE_SCOPE | getCallSiteFlags());
+ method.dynamicSet(node.getName(), CALLSITE_SCOPE | getCallSiteFlags());
}
} else {
+ method.convert(node.getType());
method.store(symbol);
}
return false;
@@ -3171,7 +3177,7 @@
@Override
public boolean enterAccessNode(final AccessNode node) {
- method.dynamicSet(node.getProperty().getType(), node.getProperty().getName(), getCallSiteFlags());
+ method.dynamicSet(node.getProperty().getName(), getCallSiteFlags());
return false;
}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java b/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
index be8faab..6c0a673 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
@@ -162,7 +162,7 @@
LOWERING_PHASE(EnumSet.of(INITIALIZED, PARSED, CONSTANT_FOLDED)) {
@Override
FunctionNode transform(final Compiler compiler, final FunctionNode fn) {
- return (FunctionNode)fn.accept(new Lower());
+ return (FunctionNode)fn.accept(new Lower(compiler.getCodeInstaller()));
}
@Override
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java b/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java
index 0156716..7312725 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java
@@ -28,7 +28,7 @@
/**
* Used to track split class compilation.
*/
-public class CompileUnit {
+public class CompileUnit implements Comparable<CompileUnit> {
/** Current class name */
private final String className;
@@ -116,4 +116,9 @@
public String toString() {
return "[classname=" + className + " weight=" + weight + '/' + Splitter.SPLIT_THRESHOLD + ']';
}
+
+ @Override
+ public int compareTo(CompileUnit o) {
+ return className.compareTo(o.className);
+ }
}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
index a31358f..24173c3 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
@@ -36,8 +36,6 @@
import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
import static jdk.nashorn.internal.codegen.CompilerConstants.VARARGS;
-import jdk.nashorn.internal.ir.TemporarySymbols;
-
import java.io.File;
import java.lang.reflect.Field;
import java.security.AccessController;
@@ -48,18 +46,20 @@
import java.util.Comparator;
import java.util.EnumSet;
import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.TreeSet;
import java.util.logging.Level;
import jdk.internal.dynalink.support.NameCodec;
import jdk.nashorn.internal.codegen.ClassEmitter.Flag;
import jdk.nashorn.internal.codegen.types.Type;
import jdk.nashorn.internal.ir.FunctionNode;
import jdk.nashorn.internal.ir.FunctionNode.CompilationState;
+import jdk.nashorn.internal.ir.TemporarySymbols;
import jdk.nashorn.internal.ir.debug.ClassHistogramElement;
import jdk.nashorn.internal.ir.debug.ObjectSizeCalculator;
import jdk.nashorn.internal.runtime.CodeInstaller;
@@ -256,8 +256,8 @@
this.sequence = sequence;
this.installer = installer;
this.constantData = new ConstantData();
- this.compileUnits = new HashSet<>();
- this.bytecode = new HashMap<>();
+ this.compileUnits = new TreeSet<>();
+ this.bytecode = new LinkedHashMap<>();
}
private void initCompiler(final FunctionNode functionNode) {
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java b/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java
index 63c1fdb..1534148 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java
@@ -28,49 +28,22 @@
import static jdk.nashorn.internal.codegen.CompilerConstants.CALLEE;
import static jdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.AccessNode;
-import jdk.nashorn.internal.ir.Assignment;
import jdk.nashorn.internal.ir.BinaryNode;
import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.CallNode;
-import jdk.nashorn.internal.ir.CaseNode;
-import jdk.nashorn.internal.ir.CatchNode;
import jdk.nashorn.internal.ir.Expression;
import jdk.nashorn.internal.ir.ExpressionStatement;
import jdk.nashorn.internal.ir.ForNode;
import jdk.nashorn.internal.ir.FunctionNode;
import jdk.nashorn.internal.ir.FunctionNode.CompilationState;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.IfNode;
-import jdk.nashorn.internal.ir.IndexNode;
import jdk.nashorn.internal.ir.LexicalContext;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.ReturnNode;
-import jdk.nashorn.internal.ir.RuntimeNode;
-import jdk.nashorn.internal.ir.RuntimeNode.Request;
-import jdk.nashorn.internal.ir.SwitchNode;
import jdk.nashorn.internal.ir.Symbol;
import jdk.nashorn.internal.ir.TemporarySymbols;
-import jdk.nashorn.internal.ir.TernaryNode;
-import jdk.nashorn.internal.ir.ThrowNode;
-import jdk.nashorn.internal.ir.TypeOverride;
import jdk.nashorn.internal.ir.UnaryNode;
-import jdk.nashorn.internal.ir.VarNode;
-import jdk.nashorn.internal.ir.WhileNode;
-import jdk.nashorn.internal.ir.WithNode;
import jdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
import jdk.nashorn.internal.parser.Token;
import jdk.nashorn.internal.parser.TokenType;
-import jdk.nashorn.internal.runtime.Debug;
import jdk.nashorn.internal.runtime.DebugLogger;
-import jdk.nashorn.internal.runtime.JSType;
/**
* Lower to more primitive operations. After lowering, an AST has symbols and
@@ -97,272 +70,32 @@
}
@Override
- public Node leaveCallNode(final CallNode callNode) {
- // AccessSpecializer - call return type may change the access for this location
- final Node function = callNode.getFunction();
- if (function instanceof FunctionNode) {
- return setTypeOverride(callNode, ((FunctionNode)function).getReturnType());
- }
- return callNode;
- }
-
- private Node leaveUnary(final UnaryNode unaryNode) {
- return unaryNode.setRHS(convert(unaryNode.rhs(), unaryNode.getType()));
- }
-
- @Override
- public Node leaveADD(final UnaryNode unaryNode) {
- return leaveUnary(unaryNode);
- }
-
- @Override
- public Node leaveBIT_NOT(final UnaryNode unaryNode) {
- return leaveUnary(unaryNode);
- }
-
- @Override
- public Node leaveCONVERT(final UnaryNode unaryNode) {
- assert unaryNode.rhs().tokenType() != TokenType.CONVERT : "convert(convert encountered. check its origin and remove it";
- return unaryNode;
- }
-
- @Override
- public Node leaveDECINC(final UnaryNode unaryNode) {
- return specialize(unaryNode).node;
- }
-
- @Override
- public Node leaveNEW(final UnaryNode unaryNode) {
- assert unaryNode.getSymbol() != null && unaryNode.getSymbol().getSymbolType().isObject();
- return unaryNode.setRHS(((CallNode)unaryNode.rhs()).setIsNew());
- }
-
- @Override
- public Node leaveSUB(final UnaryNode unaryNode) {
- return leaveUnary(unaryNode);
- }
-
- /**
- * Add is a special binary, as it works not only on arithmetic, but for
- * strings etc as well.
- */
- @Override
- public Expression leaveADD(final BinaryNode binaryNode) {
- final Expression lhs = binaryNode.lhs();
- final Expression rhs = binaryNode.rhs();
-
- final Type type = binaryNode.getType();
-
- if (type.isObject()) {
- if (!isAddString(binaryNode)) {
- return new RuntimeNode(binaryNode, Request.ADD);
- }
+ public Node leaveForNode(final ForNode forNode) {
+ if (forNode.isForIn()) {
+ return forNode;
}
- return binaryNode.setLHS(convert(lhs, type)).setRHS(convert(rhs, type));
- }
+ final Expression init = forNode.getInit();
+ final Expression test = forNode.getTest();
+ final Expression modify = forNode.getModify();
- @Override
- public Node leaveAND(final BinaryNode binaryNode) {
- return binaryNode;
- }
+ assert test != null || forNode.hasGoto() : "forNode " + forNode + " needs goto and is missing it in " + lc.getCurrentFunction();
- @Override
- public Node leaveASSIGN(final BinaryNode binaryNode) {
- final SpecializedNode specialized = specialize(binaryNode);
- final BinaryNode specBinaryNode = (BinaryNode)specialized.node;
- Type destType = specialized.type;
- if (destType == null) {
- destType = specBinaryNode.getType();
- }
- // Register assignments to this object in case this is used as constructor
- if (binaryNode.lhs() instanceof AccessNode) {
- AccessNode accessNode = (AccessNode) binaryNode.lhs();
-
- if (accessNode.getBase().getSymbol().isThis()) {
- lc.getCurrentFunction().addThisProperty(accessNode.getProperty().getName());
- }
- }
- return specBinaryNode.setRHS(convert(specBinaryNode.rhs(), destType));
- }
-
- @Override
- public Node leaveASSIGN_ADD(final BinaryNode binaryNode) {
- return leaveASSIGN(binaryNode);
- }
-
- @Override
- public Node leaveASSIGN_BIT_AND(final BinaryNode binaryNode) {
- return leaveASSIGN(binaryNode);
- }
-
- @Override
- public Node leaveASSIGN_BIT_OR(final BinaryNode binaryNode) {
- return leaveASSIGN(binaryNode);
- }
-
- @Override
- public Node leaveASSIGN_BIT_XOR(final BinaryNode binaryNode) {
- return leaveASSIGN(binaryNode);
- }
-
- @Override
- public Node leaveASSIGN_DIV(final BinaryNode binaryNode) {
- return leaveASSIGN(binaryNode);
- }
-
- @Override
- public Node leaveASSIGN_MOD(final BinaryNode binaryNode) {
- return leaveASSIGN(binaryNode);
- }
-
- @Override
- public Node leaveASSIGN_MUL(final BinaryNode binaryNode) {
- return leaveASSIGN(binaryNode);
- }
-
- @Override
- public Node leaveASSIGN_SAR(final BinaryNode binaryNode) {
- return leaveASSIGN(binaryNode);
- }
-
- @Override
- public Node leaveASSIGN_SHL(final BinaryNode binaryNode) {
- return leaveASSIGN(binaryNode);
- }
-
- @Override
- public Node leaveASSIGN_SHR(final BinaryNode binaryNode) {
- return leaveASSIGN(binaryNode);
- }
-
- @Override
- public Node leaveASSIGN_SUB(final BinaryNode binaryNode) {
- return leaveASSIGN(binaryNode);
- }
-
- private boolean symbolIsInteger(final Expression node) {
- final Symbol symbol = node.getSymbol();
- assert symbol != null && symbol.getSymbolType().isInteger() : "int coercion expected: " + Debug.id(symbol) + " " + symbol + " " + lc.getCurrentFunction().getSource();
- return true;
- }
-
- @Override
- public Node leaveBIT_AND(final BinaryNode binaryNode) {
- assert symbolIsInteger(binaryNode);
- return leaveBinary(binaryNode, Type.INT, Type.INT);
- }
-
- @Override
- public Node leaveBIT_OR(final BinaryNode binaryNode) {
- assert symbolIsInteger(binaryNode);
- return leaveBinary(binaryNode, Type.INT, Type.INT);
- }
-
- @Override
- public Node leaveBIT_XOR(final BinaryNode binaryNode) {
- assert symbolIsInteger(binaryNode);
- return leaveBinary(binaryNode, Type.INT, Type.INT);
+ return forNode.
+ setInit(lc, init == null ? null : discard(init)).
+ setModify(lc, modify == null ? null : discard(modify));
}
@Override
public Node leaveCOMMALEFT(final BinaryNode binaryNode) {
assert binaryNode.getSymbol() != null;
- final BinaryNode newBinaryNode = binaryNode.setRHS(discard(binaryNode.rhs()));
- // AccessSpecializer - the type of lhs, which is the remaining value of this node may have changed
- // in that case, update the node type as well
- return propagateType(newBinaryNode, newBinaryNode.lhs().getType());
+ return binaryNode.setRHS(discard(binaryNode.rhs()));
}
@Override
public Node leaveCOMMARIGHT(final BinaryNode binaryNode) {
assert binaryNode.getSymbol() != null;
- final BinaryNode newBinaryNode = binaryNode.setLHS(discard(binaryNode.lhs()));
- // AccessSpecializer - the type of rhs, which is the remaining value of this node may have changed
- // in that case, update the node type as well
- return propagateType(newBinaryNode, newBinaryNode.rhs().getType());
- }
-
- @Override
- public Node leaveDIV(final BinaryNode binaryNode) {
- return leaveBinaryArith(binaryNode);
- }
-
-
- @Override
- public Node leaveEQ(final BinaryNode binaryNode) {
- return leaveCmp(binaryNode, Request.EQ);
- }
-
- @Override
- public Node leaveEQ_STRICT(final BinaryNode binaryNode) {
- return leaveCmp(binaryNode, Request.EQ_STRICT);
- }
-
- @Override
- public Node leaveGE(final BinaryNode binaryNode) {
- return leaveCmp(binaryNode, Request.GE);
- }
-
- @Override
- public Node leaveGT(final BinaryNode binaryNode) {
- return leaveCmp(binaryNode, Request.GT);
- }
-
- @Override
- public Node leaveLE(final BinaryNode binaryNode) {
- return leaveCmp(binaryNode, Request.LE);
- }
-
- @Override
- public Node leaveLT(final BinaryNode binaryNode) {
- return leaveCmp(binaryNode, Request.LT);
- }
-
- @Override
- public Node leaveMOD(final BinaryNode binaryNode) {
- return leaveBinaryArith(binaryNode);
- }
-
- @Override
- public Node leaveMUL(final BinaryNode binaryNode) {
- return leaveBinaryArith(binaryNode);
- }
-
- @Override
- public Node leaveNE(final BinaryNode binaryNode) {
- return leaveCmp(binaryNode, Request.NE);
- }
-
- @Override
- public Node leaveNE_STRICT(final BinaryNode binaryNode) {
- return leaveCmp(binaryNode, Request.NE_STRICT);
- }
-
- @Override
- public Node leaveOR(final BinaryNode binaryNode) {
- return binaryNode;
- }
-
- @Override
- public Node leaveSAR(final BinaryNode binaryNode) {
- return leaveBinary(binaryNode, Type.INT, Type.INT);
- }
-
- @Override
- public Node leaveSHL(final BinaryNode binaryNode) {
- return leaveBinary(binaryNode, Type.INT, Type.INT);
- }
-
- @Override
- public Node leaveSHR(final BinaryNode binaryNode) {
- assert binaryNode.getSymbol() != null && binaryNode.getSymbol().getSymbolType().isLong() : "long coercion expected: " + binaryNode.getSymbol();
- return leaveBinary(binaryNode, Type.INT, Type.INT);
- }
-
- @Override
- public Node leaveSUB(final BinaryNode binaryNode) {
- return leaveBinaryArith(binaryNode);
+ return binaryNode.setLHS(discard(binaryNode.lhs()));
}
@Override
@@ -372,38 +105,12 @@
}
@Override
- public Node leaveCatchNode(final CatchNode catchNode) {
- final Expression exceptionCondition = catchNode.getExceptionCondition();
- if (exceptionCondition != null) {
- return catchNode.setExceptionCondition(convert(exceptionCondition, Type.BOOLEAN));
- }
- return catchNode;
- }
-
- @Override
public Node leaveExpressionStatement(final ExpressionStatement expressionStatement) {
temporarySymbols.reuse();
return expressionStatement.setExpression(discard(expressionStatement.getExpression()));
}
@Override
- public Node leaveForNode(final ForNode forNode) {
- final Expression init = forNode.getInit();
- final Expression test = forNode.getTest();
- final Expression modify = forNode.getModify();
-
- if (forNode.isForIn()) {
- return forNode.setModify(lc, convert(forNode.getModify(), Type.OBJECT)); // NASHORN-400
- }
- assert test != null || forNode.hasGoto() : "forNode " + forNode + " needs goto and is missing it in " + lc.getCurrentFunction();
-
- return forNode.
- setInit(lc, init == null ? null : discard(init)).
- setTest(lc, test == null ? null : convert(test, Type.BOOLEAN)).
- setModify(lc, modify == null ? null : discard(modify));
- }
-
- @Override
public boolean enterFunctionNode(final FunctionNode functionNode) {
if (functionNode.isLazy()) {
return false;
@@ -430,113 +137,6 @@
return functionNode.setState(lc, CompilationState.FINALIZED);
}
- @Override
- public Node leaveIfNode(final IfNode ifNode) {
- return ifNode.setTest(convert(ifNode.getTest(), Type.BOOLEAN));
- }
-
- @SuppressWarnings("rawtypes")
- @Override
- public boolean enterLiteralNode(final LiteralNode literalNode) {
- if (literalNode instanceof ArrayLiteralNode) {
- final ArrayLiteralNode arrayLiteralNode = (ArrayLiteralNode)literalNode;
- final Expression[] array = arrayLiteralNode.getValue();
- final Type elementType = arrayLiteralNode.getElementType();
-
- for (int i = 0; i < array.length; i++) {
- final Node element = array[i];
- if (element != null) {
- array[i] = convert((Expression)element.accept(this), elementType);
- }
- }
- }
-
- return false;
- }
-
- @Override
- public Node leaveReturnNode(final ReturnNode returnNode) {
- final Expression expr = returnNode.getExpression();
- if (expr != null) {
- return returnNode.setExpression(convert(expr, lc.getCurrentFunction().getReturnType()));
- }
- return returnNode;
- }
-
- @Override
- public Node leaveRuntimeNode(final RuntimeNode runtimeNode) {
- final List<Expression> args = runtimeNode.getArgs();
- for (final Expression arg : args) {
- assert !arg.getType().isUnknown();
- }
- return runtimeNode;
- }
-
- @Override
- public Node leaveSwitchNode(final SwitchNode switchNode) {
- final boolean allInteger = switchNode.getTag().getSymbolType().isInteger();
-
- if (allInteger) {
- return switchNode;
- }
-
- final Expression expression = switchNode.getExpression();
- final List<CaseNode> cases = switchNode.getCases();
- final List<CaseNode> newCases = new ArrayList<>();
-
- for (final CaseNode caseNode : cases) {
- final Expression test = caseNode.getTest();
- newCases.add(test != null ? caseNode.setTest(convert(test, Type.OBJECT)) : caseNode);
- }
-
- return switchNode.
- setExpression(lc, convert(expression, Type.OBJECT)).
- setCases(lc, newCases);
- }
-
- @Override
- public Node leaveTernaryNode(final TernaryNode ternaryNode) {
- return ternaryNode.setTest(convert(ternaryNode.getTest(), Type.BOOLEAN));
- }
-
- @Override
- public Node leaveThrowNode(final ThrowNode throwNode) {
- return throwNode.setExpression(convert(throwNode.getExpression(), Type.OBJECT));
- }
-
- @Override
- public Node leaveVarNode(final VarNode varNode) {
- final Expression init = varNode.getInit();
- if (init != null) {
- final SpecializedNode specialized = specialize(varNode);
- final VarNode specVarNode = (VarNode)specialized.node;
- Type destType = specialized.type;
- if (destType == null) {
- destType = specVarNode.getName().getType();
- }
- assert specVarNode.getName().hasType() : specVarNode + " doesn't have a type";
- final Expression convertedInit = convert(init, destType);
- temporarySymbols.reuse();
- return specVarNode.setInit(convertedInit);
- }
- temporarySymbols.reuse();
- return varNode;
- }
-
- @Override
- public Node leaveWhileNode(final WhileNode whileNode) {
- final Expression test = whileNode.getTest();
- if (test != null) {
- return whileNode.setTest(lc, convert(test, Type.BOOLEAN));
- }
- return whileNode;
- }
-
- @Override
- public Node leaveWithNode(final WithNode withNode) {
- return withNode.setExpression(lc, convert(withNode.getExpression(), Type.OBJECT));
- }
-
private static void updateSymbolsLog(final FunctionNode functionNode, final Symbol symbol, final boolean loseSlot) {
if (LOG.isEnabled()) {
if (!symbol.isScope()) {
@@ -583,260 +183,6 @@
}
}
- /**
- * Exit a comparison node and do the appropriate replacements. We need to introduce runtime
- * nodes late for comparisons as types aren't known until the last minute
- *
- * Both compares and adds may turn into runtimes node at this level as when we first bump
- * into the op in Attr, we may type it according to what we know there, which may be wrong later
- *
- * e.g. i (int) < 5 -> normal compare
- * i = object
- * then the post pass that would add the conversion to the 5 needs to
- *
- * @param binaryNode binary node to leave
- * @param request runtime request
- * @return lowered cmp node
- */
- @SuppressWarnings("fallthrough")
- private Node leaveCmp(final BinaryNode binaryNode, final RuntimeNode.Request request) {
- final Expression lhs = binaryNode.lhs();
- final Expression rhs = binaryNode.rhs();
-
- Type widest = Type.widest(lhs.getType(), rhs.getType());
-
- boolean newRuntimeNode = false, finalized = false;
- switch (request) {
- case EQ_STRICT:
- case NE_STRICT:
- if (lhs.getType().isBoolean() != rhs.getType().isBoolean()) {
- newRuntimeNode = true;
- widest = Type.OBJECT;
- finalized = true;
- }
- //fallthru
- default:
- if (newRuntimeNode || widest.isObject()) {
- return new RuntimeNode(binaryNode, request).setIsFinal(finalized);
- }
- break;
- }
-
- return binaryNode.setLHS(convert(lhs, widest)).setRHS(convert(rhs, widest));
- }
-
- /**
- * Compute the binary arithmetic type given the lhs and an rhs of a binary expression
- * @param lhsType the lhs type
- * @param rhsType the rhs type
- * @return the correct binary type
- */
- private static Type binaryArithType(final Type lhsType, final Type rhsType) {
- if (!Compiler.shouldUseIntegerArithmetic()) {
- return Type.NUMBER;
- }
- return Type.widest(lhsType, rhsType, Type.NUMBER);
- }
-
- private Node leaveBinaryArith(final BinaryNode binaryNode) {
- final Type type = binaryArithType(binaryNode.lhs().getType(), binaryNode.rhs().getType());
- return leaveBinary(binaryNode, type, type);
- }
-
- private Node leaveBinary(final BinaryNode binaryNode, final Type lhsType, final Type rhsType) {
- Node b = binaryNode.setLHS(convert(binaryNode.lhs(), lhsType)).setRHS(convert(binaryNode.rhs(), rhsType));
- return b;
- }
-
- /**
- * A symbol (and {@link jdk.nashorn.internal.runtime.Property}) can be tagged as "may be primitive".
- * This is used a hint for dual fields that it is even worth it to try representing this
- * field as something other than java.lang.Object.
- *
- * @param node node in which to tag symbols as primitive
- * @param to which primitive type to use for tagging
- */
- private static void setCanBePrimitive(final Node node, final Type to) {
- final HashSet<Node> exclude = new HashSet<>();
-
- node.accept(new NodeVisitor<LexicalContext>(new LexicalContext()) {
- private void setCanBePrimitive(final Symbol symbol) {
- LOG.info("*** can be primitive symbol ", symbol, " ", Debug.id(symbol));
- symbol.setCanBePrimitive(to);
- }
-
- @Override
- public boolean enterIdentNode(final IdentNode identNode) {
- if (!exclude.contains(identNode)) {
- setCanBePrimitive(identNode.getSymbol());
- }
- return false;
- }
-
- @Override
- public boolean enterAccessNode(final AccessNode accessNode) {
- setCanBePrimitive(accessNode.getProperty().getSymbol());
- return false;
- }
-
- @Override
- public boolean enterIndexNode(final IndexNode indexNode) {
- exclude.add(indexNode.getBase()); //prevent array base node to be flagged as primitive, but k in a[k++] is fine
- return true;
- }
- });
- }
-
- private static class SpecializedNode {
- final Node node;
- final Type type;
-
- SpecializedNode(Node node, Type type) {
- this.node = node;
- this.type = type;
- }
- }
-
- <T extends Expression> SpecializedNode specialize(final Assignment<T> assignment) {
- final Node node = ((Node)assignment);
- final T lhs = assignment.getAssignmentDest();
- final Expression rhs = assignment.getAssignmentSource();
-
- if (!canHaveCallSiteType(lhs)) {
- return new SpecializedNode(node, null);
- }
-
- final Type to;
- if (node.isSelfModifying()) {
- to = node.getWidestOperationType();
- } else {
- to = rhs.getType();
- }
-
- if (!isSupportedCallSiteType(to)) {
- //meaningless to specialize to boolean or object
- return new SpecializedNode(node, null);
- }
-
- final Node newNode = assignment.setAssignmentDest(setTypeOverride(lhs, to));
- final Node typePropagatedNode;
- if(newNode instanceof Expression) {
- typePropagatedNode = propagateType((Expression)newNode, to);
- } else if(newNode instanceof VarNode) {
- // VarNode, being a statement, doesn't have its own symbol; it uses the symbol of its name instead.
- final VarNode varNode = (VarNode)newNode;
- typePropagatedNode = varNode.setName((IdentNode)propagateType(varNode.getName(), to));
- } else {
- throw new AssertionError();
- }
- return new SpecializedNode(typePropagatedNode, to);
- }
-
-
- /**
- * Is this a node that can have its type overridden. This is true for
- * AccessNodes, IndexNodes and IdentNodes
- *
- * @param node the node to check
- * @return true if node can have a callsite type
- */
- private static boolean canHaveCallSiteType(final Node node) {
- return node instanceof TypeOverride && ((TypeOverride<?>)node).canHaveCallSiteType();
- }
-
- /**
- * Is the specialization type supported. Currently we treat booleans as objects
- * and have no special boolean type accessor, thus booleans are ignored.
- * TODO - support booleans? NASHORN-590
- *
- * @param castTo the type to check
- * @return true if call site type is supported
- */
- private static boolean isSupportedCallSiteType(final Type castTo) {
- return castTo.isNumeric(); // don't specializable for boolean
- }
-
- /**
- * Override the type of a node for e.g. access specialization of scope
- * objects. Normally a variable can only get a wider type and narrower type
- * sets are ignored. Not that a variable can still be on object type as
- * per the type analysis, but a specific access may be narrower, e.g. if it
- * is used in an arithmetic op. This overrides a type, regardless of
- * type environment and is used primarily by the access specializer
- *
- * @param node node for which to change type
- * @param to new type
- */
- @SuppressWarnings("unchecked")
- <T extends Expression> T setTypeOverride(final T node, final Type to) {
- final Type from = node.getType();
- if (!node.getType().equals(to)) {
- LOG.info("Changing call override type for '", node, "' from ", node.getType(), " to ", to);
- if (!to.isObject() && from.isObject()) {
- setCanBePrimitive(node, to);
- }
- }
- LOG.info("Type override for lhs in '", node, "' => ", to);
- return ((TypeOverride<T>)node).setType(temporarySymbols, lc, to);
- }
-
- /**
- * Add an explicit conversion. This is needed when attribution has created types
- * that do not mesh into an op type, e.g. a = b, where b is object and a is double
- * at the end of Attr, needs explicit conversion logic.
- *
- * An explicit conversion can be one of the following:
- * + Convert a literal - just replace it with another literal
- * + Convert a scope object - just replace the type of the access, e.g. get()D->get()I
- * + Explicit convert placement, e.g. a = (double)b - all other cases
- *
- * No other part of the world after {@link Attr} may introduce new symbols. This
- * is the only place.
- *
- * @param node node to convert
- * @param to destination type
- * @return conversion node
- */
- private Expression convert(final Expression node, final Type to) {
- assert !to.isUnknown() : "unknown type for " + node + " class=" + node.getClass();
- assert node != null : "node is null";
- assert node.getSymbol() != null : "node " + node + " " + node.getClass() + " has no symbol! " + lc.getCurrentFunction();
- assert node.tokenType() != TokenType.CONVERT : "assert convert in convert " + node + " in " + lc.getCurrentFunction();
-
- final Type from = node.getType();
-
- if (Type.areEquivalent(from, to)) {
- return node;
- }
-
- if (from.isObject() && to.isObject()) {
- return node;
- }
-
- Expression resultNode = node;
-
- if (node instanceof LiteralNode && !(node instanceof ArrayLiteralNode) && !to.isObject()) {
- final LiteralNode<?> newNode = new LiteralNodeConstantEvaluator((LiteralNode<?>)node, to).eval();
- if (newNode != null) {
- resultNode = newNode;
- }
- } else {
- if (canHaveCallSiteType(node) && isSupportedCallSiteType(to)) {
- assert node instanceof TypeOverride;
- return setTypeOverride(node, to);
- }
- resultNode = new UnaryNode(Token.recast(node.getToken(), TokenType.CONVERT), node);
- }
-
- LOG.info("CONVERT('", node, "', ", to, ") => '", resultNode, "'");
-
- assert !node.isTerminal();
-
- //This is the only place in this file that can create new temporaries
- //FinalizeTypes may not introduce ANY node that is not a conversion.
- return temporarySymbols.ensureSymbol(lc, to, resultNode);
- }
-
private static Expression discard(final Expression node) {
if (node.getSymbol() != null) {
final UnaryNode discard = new UnaryNode(Token.recast(node.getToken(), TokenType.DISCARD), node);
@@ -849,82 +195,5 @@
return node;
}
- /**
- * Whenever an expression like an addition or an assignment changes type, it
- * may be that case that {@link Attr} created a symbol for an intermediate
- * result of the expression, say for an addition. This also has to be updated
- * if the expression type changes.
- *
- * Assignments use their lhs as node symbol, and in this case we can't modify
- * it. Then {@link CodeGenerator.Store} needs to do an explicit conversion.
- * This is happens very rarely.
- *
- * @param node
- * @param to
- */
- private Expression propagateType(final Expression node, final Type to) {
- Symbol symbol = node.getSymbol();
- if (symbol.isTemp() && symbol.getSymbolType() != to) {
- symbol = symbol.setTypeOverrideShared(to, temporarySymbols);
- LOG.info("Type override for temporary in '", node, "' => ", to);
- }
- return node.setSymbol(lc, symbol);
- }
- /**
- * Determine if the outcome of + operator is a string.
- *
- * @param node Node to test.
- * @return true if a string result.
- */
- private boolean isAddString(final Node node) {
- if (node instanceof BinaryNode && node.isTokenType(TokenType.ADD)) {
- final BinaryNode binaryNode = (BinaryNode)node;
- final Node lhs = binaryNode.lhs();
- final Node rhs = binaryNode.rhs();
-
- return isAddString(lhs) || isAddString(rhs);
- }
-
- return node instanceof LiteralNode<?> && ((LiteralNode<?>)node).isString();
- }
-
- /**
- * Whenever an explicit conversion is needed and the convertee is a literal, we can
- * just change the literal
- */
- class LiteralNodeConstantEvaluator extends FoldConstants.ConstantEvaluator<LiteralNode<?>> {
- private final Type type;
-
- LiteralNodeConstantEvaluator(final LiteralNode<?> parent, final Type type) {
- super(parent);
- this.type = type;
- }
-
- @Override
- protected LiteralNode<?> eval() {
- final Object value = ((LiteralNode<?>)parent).getValue();
-
- LiteralNode<?> literalNode = null;
-
- if (type.isString()) {
- literalNode = LiteralNode.newInstance(token, finish, JSType.toString(value));
- } else if (type.isBoolean()) {
- literalNode = LiteralNode.newInstance(token, finish, JSType.toBoolean(value));
- } else if (type.isInteger()) {
- literalNode = LiteralNode.newInstance(token, finish, JSType.toInt32(value));
- } else if (type.isLong()) {
- literalNode = LiteralNode.newInstance(token, finish, JSType.toLong(value));
- } else if (type.isNumber() || parent.getType().isNumeric() && !parent.getType().isNumber()) {
- literalNode = LiteralNode.newInstance(token, finish, JSType.toNumber(value));
- }
-
- if (literalNode != null) {
- //inherit literal symbol for attr.
- literalNode = (LiteralNode<?>)literalNode.setSymbol(lc, parent.getSymbol());
- }
-
- return literalNode;
- }
- }
}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FoldConstants.java b/nashorn/src/jdk/nashorn/internal/codegen/FoldConstants.java
index 9a2aafa..59362fa 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/FoldConstants.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/FoldConstants.java
@@ -25,6 +25,8 @@
package jdk.nashorn.internal.codegen;
+import java.util.ArrayList;
+import java.util.List;
import jdk.nashorn.internal.codegen.types.Type;
import jdk.nashorn.internal.ir.BinaryNode;
import jdk.nashorn.internal.ir.Block;
@@ -37,8 +39,10 @@
import jdk.nashorn.internal.ir.LiteralNode;
import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.Statement;
import jdk.nashorn.internal.ir.TernaryNode;
import jdk.nashorn.internal.ir.UnaryNode;
+import jdk.nashorn.internal.ir.VarNode;
import jdk.nashorn.internal.ir.visitor.NodeVisitor;
import jdk.nashorn.internal.runtime.DebugLogger;
import jdk.nashorn.internal.runtime.JSType;
@@ -89,11 +93,21 @@
public Node leaveIfNode(final IfNode ifNode) {
final Node test = ifNode.getTest();
if (test instanceof LiteralNode.PrimitiveLiteralNode) {
- final Block shortCut = ((LiteralNode.PrimitiveLiteralNode<?>)test).isTrue() ? ifNode.getPass() : ifNode.getFail();
- if (shortCut != null) {
- return new BlockStatement(ifNode.getLineNumber(), shortCut);
+ final boolean isTrue = ((LiteralNode.PrimitiveLiteralNode<?>)test).isTrue();
+ final Block executed = isTrue ? ifNode.getPass() : ifNode.getFail();
+ final Block dropped = isTrue ? ifNode.getFail() : ifNode.getPass();
+ final List<Statement> statements = new ArrayList<>();
+
+ if (executed != null) {
+ statements.addAll(executed.getStatements()); // Get statements form executed branch
}
- return new EmptyNode(ifNode);
+ if (dropped != null) {
+ extractVarNodes(dropped, statements); // Get var-nodes from non-executed branch
+ }
+ if (statements.isEmpty()) {
+ return new EmptyNode(ifNode);
+ }
+ return BlockStatement.createReplacement(ifNode, ifNode.getFinish(), statements);
}
return ifNode;
}
@@ -131,6 +145,17 @@
protected abstract LiteralNode<?> eval();
}
+ private static void extractVarNodes(final Block block, final List<Statement> statements) {
+ final LexicalContext lc = new LexicalContext();
+ block.accept(lc, new NodeVisitor<LexicalContext>(lc) {
+ @Override
+ public boolean enterVarNode(VarNode varNode) {
+ statements.add(varNode.setInit(null));
+ return false;
+ }
+ });
+ }
+
private static class UnaryNodeConstantEvaluator extends ConstantEvaluator<UnaryNode> {
UnaryNodeConstantEvaluator(final UnaryNode parent) {
super(parent);
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
index 032d27b..82e9890 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
@@ -68,6 +68,7 @@
import jdk.nashorn.internal.ir.visitor.NodeVisitor;
import jdk.nashorn.internal.parser.Token;
import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.runtime.CodeInstaller;
import jdk.nashorn.internal.runtime.DebugLogger;
import jdk.nashorn.internal.runtime.ScriptRuntime;
import jdk.nashorn.internal.runtime.Source;
@@ -86,10 +87,13 @@
private static final DebugLogger LOG = new DebugLogger("lower");
+ // needed only to get unique eval id
+ private final CodeInstaller installer;
+
/**
* Constructor.
*/
- Lower() {
+ Lower(final CodeInstaller installer) {
super(new BlockLexicalContext() {
@Override
@@ -132,6 +136,7 @@
return block.setIsTerminal(this, false);
}
});
+ this.installer = installer;
}
@Override
@@ -529,11 +534,17 @@
*/
private String evalLocation(final IdentNode node) {
final Source source = lc.getCurrentFunction().getSource();
+ final int pos = node.position();
+ // Code installer is null when running with --compile-only, use 0 as id in that case
+ final long id = installer == null ? 0 : installer.getUniqueEvalId();
return new StringBuilder().
append(source.getName()).
append('#').
- append(source.getLine(node.position())).
- append("<eval>").
+ append(source.getLine(pos)).
+ append(':').
+ append(source.getColumn(pos)).
+ append("<eval>@").
+ append(id).
toString();
}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
index 8a012cc..9b6d12a 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
@@ -69,7 +69,6 @@
import java.lang.reflect.Array;
import java.util.EnumSet;
import java.util.List;
-
import jdk.internal.dynalink.support.NameCodec;
import jdk.internal.org.objectweb.asm.Handle;
import jdk.internal.org.objectweb.asm.MethodVisitor;
@@ -1560,7 +1559,7 @@
MethodEmitter convert(final Type to) {
final Type type = peekType().convert(method, to);
if (type != null) {
- if (peekType() != to) {
+ if (!peekType().isEquivalentTo(to)) {
debug("convert", peekType(), "->", to);
}
popType();
@@ -1790,15 +1789,14 @@
* @param name name of property
* @param flags call site flags
*/
- void dynamicSet(final Type valueType, final String name, final int flags) {
+ void dynamicSet(final String name, final int flags) {
debug("dynamic_set", name, peekType());
- Type type = valueType;
+ Type type = peekType();
if (type.isObject() || type.isBoolean()) { //promote strings to objects etc
type = Type.OBJECT;
convert(Type.OBJECT); //TODO bad- until we specialize boolean setters,
}
-
popType(type);
popType(Type.SCOPE);
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Namespace.java b/nashorn/src/jdk/nashorn/internal/codegen/Namespace.java
index 5de2fdf..72f77a5 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Namespace.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Namespace.java
@@ -81,7 +81,7 @@
final int count = counter + 1;
namespaceDirectory.put(base, count);
- return base + "$" + count;
+ return base + '-' + count;
}
}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java b/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
index 9ecfccd..f594048 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
@@ -297,11 +297,6 @@
}
@Override
- public Node leaveCONVERT(final UnaryNode unaryNode) {
- return unaryNodeWeight(unaryNode);
- }
-
- @Override
public Node leaveDECINC(final UnaryNode unaryNode) {
return unaryNodeWeight(unaryNode);
}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java
index 4331cb5..840b291 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java
@@ -136,8 +136,7 @@
invokeStatic(method, JSType.TO_LONG);
} else if (to.isString()) {
invokeStatic(method, VALUE_OF);
- invokeStatic(method, JSType.TO_PRIMITIVE);
- invokeStatic(method, JSType.TO_STRING);
+ invokeStatic(method, JSType.TO_PRIMITIVE_TO_STRING);
} else if (to.isObject()) {
invokeStatic(method, VALUE_OF);
} else {
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java
index cb2f876..1f7a022 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java
@@ -153,8 +153,7 @@
} else if (to.isBoolean()) {
invokeStatic(method, JSType.TO_BOOLEAN);
} else if (to.isString()) {
- invokeStatic(method, JSType.TO_PRIMITIVE);
- invokeStatic(method, JSType.TO_STRING);
+ invokeStatic(method, JSType.TO_PRIMITIVE_TO_STRING);
} else {
assert false : "Illegal conversion " + this + " -> " + to + " " + isString() + " " + toString;
}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java b/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java
index c1e8bfb..2fa2c31 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java
@@ -441,7 +441,12 @@
if (type0.isArray() && type1.isArray()) {
return ((ArrayType)type0).getElementType() == ((ArrayType)type1).getElementType() ? type0 : Type.OBJECT;
} else if (type0.isArray() != type1.isArray()) {
- return Type.OBJECT; //array and non array is always object, widest(Object[], int) NEVER returns Object[], which has most weight. that does not make sense
+ //array and non array is always object, widest(Object[], int) NEVER returns Object[], which has most weight. that does not make sense
+ return Type.OBJECT;
+ } else if (type0.isObject() && type1.isObject() && ((ObjectType)type0).getTypeClass() != ((ObjectType)type1).getTypeClass()) {
+ // Object<type=String> and Object<type=ScriptFunction> will produce Object
+ // TODO: maybe find most specific common superclass?
+ return Type.OBJECT;
}
return type0.weight() > type1.weight() ? type0 : type1;
}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java b/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java
index 55b0aa3..957adf6 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java
@@ -25,7 +25,6 @@
package jdk.nashorn.internal.ir;
-import jdk.nashorn.internal.codegen.types.Type;
import jdk.nashorn.internal.ir.annotations.Immutable;
import jdk.nashorn.internal.ir.visitor.NodeVisitor;
@@ -46,12 +45,12 @@
* @param property property
*/
public AccessNode(final long token, final int finish, final Expression base, final IdentNode property) {
- super(token, finish, base, false, false);
+ super(token, finish, base, false);
this.property = property.setIsPropertyName();
}
- private AccessNode(final AccessNode accessNode, final Expression base, final IdentNode property, final boolean isFunction, final boolean hasCallSiteType) {
- super(accessNode, base, isFunction, hasCallSiteType);
+ private AccessNode(final AccessNode accessNode, final Expression base, final IdentNode property, final boolean isFunction) {
+ super(accessNode, base, isFunction);
this.property = property;
}
@@ -73,13 +72,6 @@
public void toString(final StringBuilder sb) {
final boolean needsParen = tokenType().needsParens(getBase().tokenType(), true);
- if (hasCallSiteType()) {
- sb.append('{');
- final String desc = getType().getDescriptor();
- sb.append(desc.charAt(desc.length() - 1) == ';' ? "O" : getType().getDescriptor());
- sb.append('}');
- }
-
if (needsParen) {
sb.append('(');
}
@@ -107,21 +99,14 @@
if (this.base == base) {
return this;
}
- return new AccessNode(this, base, property, isFunction(), hasCallSiteType());
+ return new AccessNode(this, base, property, isFunction());
}
private AccessNode setProperty(final IdentNode property) {
if (this.property == property) {
return this;
}
- return new AccessNode(this, base, property, isFunction(), hasCallSiteType());
- }
-
- @Override
- public AccessNode setType(final TemporarySymbols ts, final LexicalContext lc, final Type type) {
- logTypeChange(type);
- final AccessNode newAccessNode = (AccessNode)setSymbol(lc, getSymbol().setTypeOverrideShared(type, ts));
- return new AccessNode(newAccessNode, base, property.setType(ts, lc, type), isFunction(), hasCallSiteType());
+ return new AccessNode(this, base, property, isFunction());
}
@Override
@@ -129,7 +114,7 @@
if (isFunction()) {
return this;
}
- return new AccessNode(this, base, property, true, hasCallSiteType());
+ return new AccessNode(this, base, property, true);
}
}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java b/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java
index f945ef3..96f155d 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java
@@ -25,10 +25,6 @@
package jdk.nashorn.internal.ir;
-import static jdk.nashorn.internal.codegen.ObjectClassGenerator.DEBUG_FIELDS;
-
-import jdk.nashorn.internal.codegen.ObjectClassGenerator;
-import jdk.nashorn.internal.codegen.types.Type;
import jdk.nashorn.internal.ir.annotations.Immutable;
/**
@@ -38,15 +34,13 @@
* @see IndexNode
*/
@Immutable
-public abstract class BaseNode extends Expression implements FunctionCall, TypeOverride<BaseNode> {
+public abstract class BaseNode extends Expression implements FunctionCall {
/** Base Node. */
protected final Expression base;
private final boolean isFunction;
- private final boolean hasCallSiteType;
-
/**
* Constructor
*
@@ -54,13 +48,11 @@
* @param finish finish
* @param base base node
* @param isFunction is this a function
- * @param hasCallSiteType does this access have a callsite type
*/
- public BaseNode(final long token, final int finish, final Expression base, final boolean isFunction, final boolean hasCallSiteType) {
+ public BaseNode(final long token, final int finish, final Expression base, final boolean isFunction) {
super(token, base.getStart(), finish);
this.base = base;
this.isFunction = isFunction;
- this.hasCallSiteType = hasCallSiteType;
}
/**
@@ -68,13 +60,11 @@
* @param baseNode node to inherit from
* @param base base
* @param isFunction is this a function
- * @param hasCallSiteType does this access have a callsite type
*/
- protected BaseNode(final BaseNode baseNode, final Expression base, final boolean isFunction, final boolean hasCallSiteType) {
+ protected BaseNode(final BaseNode baseNode, final Expression base, final boolean isFunction) {
super(baseNode);
this.base = base;
this.isFunction = isFunction;
- this.hasCallSiteType = hasCallSiteType;
}
/**
@@ -96,26 +86,4 @@
*/
public abstract BaseNode setIsFunction();
- @Override
- public boolean canHaveCallSiteType() {
- return true; //carried by the symbol and always the same nodetype==symboltype
- }
-
- /**
- * Does the access have a call site type override?
- * @return true if overridden
- */
- protected boolean hasCallSiteType() {
- return hasCallSiteType;
- }
-
- /**
- * Debug type change
- * @param type new type
- */
- protected final void logTypeChange(final Type type) {
- if (DEBUG_FIELDS && !Type.areEquivalent(getSymbol().getSymbolType(), type)) {
- ObjectClassGenerator.LOG.info(getClass().getName(), " ", this, " => ", type, " instead of ", getType());
- }
- }
}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/CallNode.java b/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
index ffaae07..0d38f24 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
@@ -36,9 +36,7 @@
* IR representation for a function call.
*/
@Immutable
-public final class CallNode extends LexicalContextExpression implements TypeOverride<CallNode> {
-
- private final Type type;
+public final class CallNode extends LexicalContextExpression {
/** Function identifier or function body. */
private final Expression function;
@@ -150,18 +148,16 @@
this.function = function;
this.args = args;
this.flags = 0;
- this.type = null;
this.evalArgs = null;
this.lineNumber = lineNumber;
}
- private CallNode(final CallNode callNode, final Expression function, final List<Expression> args, final int flags, final Type type, final EvalArgs evalArgs) {
+ private CallNode(final CallNode callNode, final Expression function, final List<Expression> args, final int flags, final EvalArgs evalArgs) {
super(callNode);
this.lineNumber = callNode.lineNumber;
this.function = function;
this.args = args;
this.flags = flags;
- this.type = type;
this.evalArgs = evalArgs;
}
@@ -175,29 +171,9 @@
@Override
public Type getType() {
- if (hasCallSiteType()) {
- return type;
- }
return function instanceof FunctionNode ? ((FunctionNode)function).getReturnType() : Type.OBJECT;
}
- @Override
- public CallNode setType(final TemporarySymbols ts, final LexicalContext lc, final Type type) {
- if (this.type == type) {
- return this;
- }
- return new CallNode(this, function, args, flags, type, evalArgs);
- }
-
- private boolean hasCallSiteType() {
- return this.type != null;
- }
-
- @Override
- public boolean canHaveCallSiteType() {
- return true;
- }
-
/**
* Assist in IR navigation.
*
@@ -212,7 +188,6 @@
setFunction((Expression)function.accept(visitor)).
setArgs(Node.accept(visitor, Expression.class, args)).
setFlags(flags).
- setType(null, lc, type).
setEvalArgs(evalArgs == null ?
null :
evalArgs.setCode((Expression)evalArgs.getCode().accept(visitor)).
@@ -229,13 +204,6 @@
@Override
public void toString(final StringBuilder sb) {
- if (hasCallSiteType()) {
- sb.append('{');
- final String desc = getType().getDescriptor();
- sb.append(desc.charAt(desc.length() - 1) == ';' ? 'O' : getType().getDescriptor());
- sb.append('}');
- }
-
function.toString(sb);
sb.append('(');
@@ -271,7 +239,7 @@
if (this.args == args) {
return this;
}
- return new CallNode(this, function, args, flags, type, evalArgs);
+ return new CallNode(this, function, args, flags, evalArgs);
}
/**
@@ -293,7 +261,7 @@
if (this.evalArgs == evalArgs) {
return this;
}
- return new CallNode(this, function, args, flags, type, evalArgs);
+ return new CallNode(this, function, args, flags, evalArgs);
}
/**
@@ -321,7 +289,7 @@
if (this.function == function) {
return this;
}
- return new CallNode(this, function, args, flags, type, evalArgs);
+ return new CallNode(this, function, args, flags, evalArgs);
}
/**
@@ -344,6 +312,6 @@
if (this.flags == flags) {
return this;
}
- return new CallNode(this, function, args, flags, type, evalArgs);
+ return new CallNode(this, function, args, flags, evalArgs);
}
}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java b/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java
index 6060899..631153b 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java
@@ -28,9 +28,7 @@
import static jdk.nashorn.internal.codegen.CompilerConstants.__DIR__;
import static jdk.nashorn.internal.codegen.CompilerConstants.__FILE__;
import static jdk.nashorn.internal.codegen.CompilerConstants.__LINE__;
-import static jdk.nashorn.internal.codegen.ObjectClassGenerator.DEBUG_FIELDS;
-import jdk.nashorn.internal.codegen.ObjectClassGenerator;
import jdk.nashorn.internal.codegen.types.Type;
import jdk.nashorn.internal.ir.annotations.Immutable;
import jdk.nashorn.internal.ir.visitor.NodeVisitor;
@@ -39,7 +37,7 @@
* IR representation for an identifier.
*/
@Immutable
-public final class IdentNode extends Expression implements PropertyKey, TypeOverride<IdentNode>, FunctionCall {
+public final class IdentNode extends Expression implements PropertyKey, FunctionCall {
private static final int PROPERTY_NAME = 1 << 0;
private static final int INITIALIZED_HERE = 1 << 1;
private static final int FUNCTION = 1 << 2;
@@ -101,19 +99,6 @@
return callSiteType != null;
}
- @Override
- public IdentNode setType(final TemporarySymbols ts, final LexicalContext lc, final Type type) {
- // do NOT, repeat NOT touch the symbol here. it might be a local variable or whatever. This is the override if it isn't
- if (this.callSiteType == type) {
- return this;
- }
- if (DEBUG_FIELDS && getSymbol() != null && !Type.areEquivalent(getSymbol().getSymbolType(), type)) {
- ObjectClassGenerator.LOG.info(getClass().getName(), " ", this, " => ", type, " instead of ", getType());
- }
-
- return new IdentNode(this, name, type, flags);
- }
-
/**
* Assist in IR navigation.
*
@@ -154,31 +139,6 @@
}
/**
- * We can only override type if the symbol lives in the scope, as otherwise
- * it is strongly determined by the local variable already allocated.
- *
- * <p>We also return true if the symbol represents the return value of a function with a
- * non-generic return type as in this case we need to propagate the type instead of
- * converting to object, for example if the symbol is used as the left hand side of an
- * assignment such as in the code below.</p>
- *
- * <pre>
- * try {
- * return 2;
- * } finally {
- * return 3;
- * }
- * }
- * </pre>
- *
- * @return true if can have callsite type
- */
- @Override
- public boolean canHaveCallSiteType() {
- return getSymbol() != null && (getSymbol().isScope() || getSymbol().isNonGenericReturn());
- }
-
- /**
* Check if this IdentNode is a property name
* @return true if this is a property name
*/
diff --git a/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java b/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java
index 2799e9b..83f58ff 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java
@@ -25,7 +25,6 @@
package jdk.nashorn.internal.ir;
-import jdk.nashorn.internal.codegen.types.Type;
import jdk.nashorn.internal.ir.annotations.Immutable;
import jdk.nashorn.internal.ir.visitor.NodeVisitor;
@@ -46,12 +45,12 @@
* @param index index for access
*/
public IndexNode(final long token, final int finish, final Expression base, final Expression index) {
- super(token, finish, base, false, false);
+ super(token, finish, base, false);
this.index = index;
}
- private IndexNode(final IndexNode indexNode, final Expression base, final Expression index, final boolean isFunction, final boolean hasCallSiteType) {
- super(indexNode, base, isFunction, hasCallSiteType);
+ private IndexNode(final IndexNode indexNode, final Expression base, final Expression index, final boolean isFunction) {
+ super(indexNode, base, isFunction);
this.index = index;
}
@@ -69,13 +68,6 @@
public void toString(final StringBuilder sb) {
final boolean needsParen = tokenType().needsParens(base.tokenType(), true);
- if (hasCallSiteType()) {
- sb.append('{');
- final String desc = getType().getDescriptor();
- sb.append(desc.charAt(desc.length() - 1) == ';' ? "O" : getType().getDescriptor());
- sb.append('}');
- }
-
if (needsParen) {
sb.append('(');
}
@@ -103,7 +95,7 @@
if (this.base == base) {
return this;
}
- return new IndexNode(this, base, index, isFunction(), hasCallSiteType());
+ return new IndexNode(this, base, index, isFunction());
}
/**
@@ -115,7 +107,7 @@
if(this.index == index) {
return this;
}
- return new IndexNode(this, base, index, isFunction(), hasCallSiteType());
+ return new IndexNode(this, base, index, isFunction());
}
@Override
@@ -123,14 +115,7 @@
if (isFunction()) {
return this;
}
- return new IndexNode(this, base, index, true, hasCallSiteType());
- }
-
- @Override
- public IndexNode setType(final TemporarySymbols ts, final LexicalContext lc, final Type type) {
- logTypeChange(type);
- final IndexNode newIndexNode = (IndexNode)setSymbol(lc, getSymbol().setTypeOverrideShared(type, ts));
- return new IndexNode(newIndexNode, base, index, isFunction(), true);
+ return new IndexNode(this, base, index, true);
}
}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java b/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java
index 618182c..fcdf55c 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java
@@ -28,10 +28,13 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+
import jdk.nashorn.internal.codegen.CompileUnit;
+import jdk.nashorn.internal.codegen.types.ArrayType;
import jdk.nashorn.internal.codegen.types.Type;
import jdk.nashorn.internal.ir.annotations.Immutable;
import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.objects.NativeArray;
import jdk.nashorn.internal.parser.Lexer.LexerToken;
import jdk.nashorn.internal.parser.Token;
import jdk.nashorn.internal.parser.TokenType;
@@ -526,12 +529,6 @@
return object;
} else if (object instanceof LiteralNode) {
return objectAsConstant(((LiteralNode<?>)object).getValue());
- } else if (object instanceof UnaryNode) {
- final UnaryNode unaryNode = (UnaryNode)object;
-
- if (unaryNode.isTokenType(TokenType.CONVERT) && unaryNode.getType().isObject()) {
- return objectAsConstant(unaryNode.rhs());
- }
}
return POSTSET_MARKER;
@@ -782,8 +779,11 @@
return value;
}
- @Override
- public Type getType() {
+ /**
+ * Get the array element type as Java format, e.g. [I
+ * @return array element type
+ */
+ public ArrayType getArrayType() {
if (elementType.isInteger()) {
return Type.INT_ARRAY;
} else if (elementType.isLong()) {
@@ -795,6 +795,11 @@
}
}
+ @Override
+ public Type getType() {
+ return Type.typeFor(NativeArray.class);
+ }
+
/**
* Get the element type of this array literal
* @return element type
diff --git a/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java b/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
index d100b408..269cb90 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
@@ -38,7 +38,7 @@
* IR representation for a runtime call.
*/
@Immutable
-public class RuntimeNode extends Expression implements TypeOverride<RuntimeNode> {
+public class RuntimeNode extends Expression {
/**
* Request enum used for meta-information about the runtime request
@@ -159,6 +159,36 @@
}
/**
+ * Derive a runtime node request type for a node
+ * @param node the node
+ * @return request type
+ */
+ public static Request requestFor(final Node node) {
+ assert node.isComparison();
+ switch (node.tokenType()) {
+ case EQ_STRICT:
+ return Request.EQ_STRICT;
+ case NE_STRICT:
+ return Request.NE_STRICT;
+ case EQ:
+ return Request.EQ;
+ case NE:
+ return Request.NE;
+ case LT:
+ return Request.LT;
+ case LE:
+ return Request.LE;
+ case GT:
+ return Request.GT;
+ case GE:
+ return Request.GE;
+ default:
+ assert false;
+ return null;
+ }
+ }
+
+ /**
* Is this an EQ or EQ_STRICT?
*
* @param request a request
@@ -268,9 +298,6 @@
/** Call arguments. */
private final List<Expression> args;
- /** Call site override - e.g. we know that a ScriptRuntime.ADD will return an int */
- private final Type callSiteType;
-
/** is final - i.e. may not be removed again, lower in the code pipeline */
private final boolean isFinal;
@@ -287,16 +314,14 @@
this.request = request;
this.args = args;
- this.callSiteType = null;
this.isFinal = false;
}
- private RuntimeNode(final RuntimeNode runtimeNode, final Request request, final Type callSiteType, final boolean isFinal, final List<Expression> args) {
+ private RuntimeNode(final RuntimeNode runtimeNode, final Request request, final boolean isFinal, final List<Expression> args) {
super(runtimeNode);
this.request = request;
this.args = args;
- this.callSiteType = callSiteType;
this.isFinal = isFinal;
}
@@ -335,7 +360,6 @@
this.request = request;
this.args = args;
- this.callSiteType = null;
this.isFinal = false;
}
@@ -376,7 +400,7 @@
if (this.isFinal == isFinal) {
return this;
}
- return new RuntimeNode(this, request, callSiteType, isFinal, args);
+ return new RuntimeNode(this, request, isFinal, args);
}
/**
@@ -384,24 +408,7 @@
*/
@Override
public Type getType() {
- return hasCallSiteType() ? callSiteType : request.getReturnType();
- }
-
- @Override
- public RuntimeNode setType(final TemporarySymbols ts, final LexicalContext lc, final Type type) {
- if (this.callSiteType == type) {
- return this;
- }
- return new RuntimeNode(this, request, type, isFinal, args);
- }
-
- @Override
- public boolean canHaveCallSiteType() {
- return request == Request.ADD;
- }
-
- private boolean hasCallSiteType() {
- return callSiteType != null;
+ return request.getReturnType();
}
@Override
@@ -450,7 +457,7 @@
if (this.args == args) {
return this;
}
- return new RuntimeNode(this, request, callSiteType, isFinal, args);
+ return new RuntimeNode(this, request, isFinal, args);
}
/**
diff --git a/nashorn/src/jdk/nashorn/internal/ir/TypeOverride.java b/nashorn/src/jdk/nashorn/internal/ir/TypeOverride.java
deleted file mode 100644
index 929d012..0000000
--- a/nashorn/src/jdk/nashorn/internal/ir/TypeOverride.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, 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 jdk.nashorn.internal.ir;
-
-import jdk.nashorn.internal.codegen.types.Type;
-
-/**
- * A type override makes it possible to change the return type of a node, if we know
- * that the linker can provide it directly. For example, an identity node that is
- * in the scope, can very well look like an object to the compiler of the method it
- * is in, but if someone does (int)x, it make senses to ask for it directly
- * with an int getter instead of loading it as an object and explicitly converting it
- * by using JSType.toInt32. Especially in scenarios where the field is already stored
- * as a primitive, this will be much faster than the "object is all I see" scope
- * available in the method
- * @param <T> the type of the node implementing the interface
- */
-
-public interface TypeOverride<T extends Node> {
- /**
- * Set the override type
- *
- * @param ts temporary symbols
- * @param lc the current lexical context
- * @param type the type
- * @return a node equivalent to this one except for the requested change.
- */
- public T setType(final TemporarySymbols ts, final LexicalContext lc, final Type type);
-
- /**
- * Returns true if this node can have a callsite override, e.g. all scope ident nodes
- * which lead to dynamic getters can have it, local variable nodes (slots) can't.
- * Call nodes can have it unconditionally and so on
- *
- * @return true if it is possible to assign a type override to this node
- */
- public boolean canHaveCallSiteType();
-
-}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java b/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java
index 2de2ca5..3857dd3 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java
@@ -26,7 +26,6 @@
package jdk.nashorn.internal.ir;
import static jdk.nashorn.internal.parser.TokenType.BIT_NOT;
-import static jdk.nashorn.internal.parser.TokenType.CONVERT;
import static jdk.nashorn.internal.parser.TokenType.DECPOSTFIX;
import static jdk.nashorn.internal.parser.TokenType.INCPOSTFIX;
@@ -150,19 +149,10 @@
final TokenType type = tokenType();
final String name = type.getName();
final boolean isPostfix = type == DECPOSTFIX || type == INCPOSTFIX;
- final boolean isConvert = type == CONVERT && getSymbol() != null;
boolean rhsParen = type.needsParens(rhs().tokenType(), false);
- int convertPos = 0;
- if (isConvert) {
- convertPos = sb.length();
- sb.append("(");
- sb.append(getType());
- sb.append(")(");
- }
-
- if (!isPostfix && !isConvert) {
+ if (!isPostfix) {
if (name == null) {
sb.append(type.name());
rhsParen = true;
@@ -186,16 +176,6 @@
if (isPostfix) {
sb.append(type == DECPOSTFIX ? "--" : "++");
}
-
- if (isConvert) {
- // strip extra cast parenthesis which makes the printout harder to read
- final boolean endsWithParenthesis = sb.charAt(sb.length() - 1) == ')';
- if (!endsWithParenthesis) {
- sb.append(')');
- } else {
- sb.setCharAt(convertPos, ' ');
- }
- }
}
/**
diff --git a/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java b/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
index 7160039..2b1de7c 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
@@ -51,8 +51,6 @@
return enterADD(unaryNode);
case BIT_NOT:
return enterBIT_NOT(unaryNode);
- case CONVERT:
- return enterCONVERT(unaryNode);
case DELETE:
return enterDELETE(unaryNode);
case DISCARD:
@@ -84,8 +82,6 @@
return leaveADD(unaryNode);
case BIT_NOT:
return leaveBIT_NOT(unaryNode);
- case CONVERT:
- return leaveCONVERT(unaryNode);
case DELETE:
return leaveDELETE(unaryNode);
case DISCARD:
@@ -323,26 +319,6 @@
}
/**
- * Unary enter - callback for entering a conversion
- *
- * @param unaryNode the node
- * @return true if traversal should continue and node children be traversed, false otherwise
- */
- public boolean enterCONVERT(final UnaryNode unaryNode) {
- return enterDefault(unaryNode);
- }
-
- /**
- * Unary leave - callback for leaving a conversion
- *
- * @param unaryNode the node
- * @return processed node, which will replace the original one, or the original node
- */
- public Node leaveCONVERT(final UnaryNode unaryNode) {
- return leaveDefault(unaryNode);
- }
-
- /**
* Unary enter - callback for entering a ++ or -- operator
*
* @param unaryNode the node
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index 161909b..f2fd08a 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -491,8 +491,8 @@
// GlobalObject interface implementation
@Override
- public boolean isOfContext(final Context context) {
- return this.context == context;
+ public boolean isOfContext(final Context ctxt) {
+ return this.context == ctxt;
}
@Override
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
index fa32575..37b6355 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
@@ -851,6 +851,10 @@
@Function(attributes = Attribute.NOT_ENUMERABLE)
public static Object slice(final Object self, final Object start, final Object end) {
final Object obj = Global.toObject(self);
+ if (!(obj instanceof ScriptObject)) {
+ return ScriptRuntime.UNDEFINED;
+ }
+
final ScriptObject sobj = (ScriptObject)obj;
final long len = JSType.toUint32(sobj.getLength());
final long relativeStart = JSType.toLong(start);
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
index 194c6d8..d3e2eff 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
@@ -30,6 +30,7 @@
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
+
import jdk.nashorn.api.scripting.NashornException;
import jdk.nashorn.internal.objects.annotations.Attribute;
import jdk.nashorn.internal.objects.annotations.Constructor;
@@ -135,11 +136,12 @@
* @param errorObj the error object
* @return undefined
*/
+ @SuppressWarnings("unused")
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object captureStackTrace(final Object self, final Object errorObj) {
Global.checkObject(errorObj);
final ScriptObject sobj = (ScriptObject)errorObj;
- final ECMAException exp = new ECMAException(sobj, null);
+ new ECMAException(sobj, null); //constructor has side effects
sobj.delete("stack", false);
final ScriptFunction getStack = ScriptFunctionImpl.makeFunction("getStack", GET_STACK);
final ScriptFunction setStack = ScriptFunctionImpl.makeFunction("setStack", SET_STACK);
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
index 88421a7..638d18a 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
@@ -25,6 +25,7 @@
package jdk.nashorn.internal.objects;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
import java.lang.invoke.MethodHandle;
@@ -255,6 +256,12 @@
return makeFunction(name, methodHandle, null);
}
+ @Override
+ public ScriptFunction makeSynchronizedFunction(final Object sync) {
+ final MethodHandle mh = MH.insertArguments(ScriptFunction.INVOKE_SYNC, 0, this, sync);
+ return makeFunction(getName(), mh);
+ }
+
/**
* Same as {@link ScriptFunction#makeBoundFunction(Object, Object[])}. The only reason we override it is so that we
* can expose it to methods in this package.
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
index 61c70d9..869746c 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Parser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
@@ -2107,13 +2107,13 @@
final String ident = (String)expectValue(IDENT);
if (type != COLON) {
- final long getSetToken = token;
+ final long getSetToken = propertyToken;
switch (ident) {
case "get":
final PropertyKey getIdent = propertyName();
final String getterName = getIdent.getPropertyName();
- final IdentNode getNameNode = new IdentNode(((Node)getIdent).getToken(), finish, "get " + NameCodec.encode(getterName));
+ final IdentNode getNameNode = new IdentNode(((Node)getIdent).getToken(), finish, NameCodec.encode("get " + getterName));
expect(LPAREN);
expect(RPAREN);
functionNode = functionBody(getSetToken, getNameNode, new ArrayList<IdentNode>(), FunctionNode.Kind.GETTER);
@@ -2122,7 +2122,7 @@
case "set":
final PropertyKey setIdent = propertyName();
final String setterName = setIdent.getPropertyName();
- final IdentNode setNameNode = new IdentNode(((Node)setIdent).getToken(), finish, "set " + NameCodec.encode(setterName));
+ final IdentNode setNameNode = new IdentNode(((Node)setIdent).getToken(), finish, NameCodec.encode("set " + setterName));
expect(LPAREN);
final IdentNode argIdent = getIdent();
verifyStrictIdent(argIdent, "setter argument");
diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java b/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
index a976215..6287a23 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
@@ -178,7 +178,6 @@
ARRAY (LITERAL, null),
COMMALEFT (IR, null),
- CONVERT (IR, null),
DISCARD (IR, null),
DECPOSTFIX (IR, null),
INCPOSTFIX (IR, null);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java b/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
index be9976e..28c9630 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
@@ -68,4 +68,10 @@
* @return unique script id
*/
public long getUniqueScriptId();
+
+ /**
+ * Get next unique eval id
+ * @return unique eval id
+ */
+ public long getUniqueEvalId();
}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index 91a905a..c9deee3 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -139,6 +139,11 @@
public long getUniqueScriptId() {
return context.getUniqueScriptId();
}
+
+ @Override
+ public long getUniqueEvalId() {
+ return context.getUniqueEvalId();
+ }
}
/** Is Context global debug mode enabled ? */
@@ -238,10 +243,14 @@
/** Unique id for script. Used only when --loader-per-compile=false */
private final AtomicLong uniqueScriptId;
+ /** Unique id for 'eval' */
+ private final AtomicLong uniqueEvalId;
+
private static final ClassLoader myLoader = Context.class.getClassLoader();
private static final StructureLoader sharedLoader;
- /*package-private*/ ClassLoader getSharedLoader() {
+ /*package-private*/ @SuppressWarnings("static-method")
+ ClassLoader getSharedLoader() {
return sharedLoader;
}
@@ -320,6 +329,7 @@
this.uniqueScriptId = new AtomicLong();
}
this.errors = errors;
+ this.uniqueEvalId = new AtomicLong();
// if user passed -classpath option, make a class loader with that and set it as
// thread context class loader so that script can access classes from that path.
@@ -625,11 +635,11 @@
* @param clazz Class object
* @throw SecurityException if not accessible
*/
- public static void checkPackageAccess(final Class clazz) {
+ public static void checkPackageAccess(final Class<?> clazz) {
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- Class bottomClazz = clazz;
- while(bottomClazz.isArray()) {
+ Class<?> bottomClazz = clazz;
+ while (bottomClazz.isArray()) {
bottomClazz = bottomClazz.getComponentType();
}
checkPackageAccess(sm, bottomClazz.getName());
@@ -664,7 +674,7 @@
* @param clazz Class object
* @return true if package is accessible, false otherwise
*/
- private static boolean isAccessiblePackage(final Class clazz) {
+ private static boolean isAccessiblePackage(final Class<?> clazz) {
try {
checkPackageAccess(clazz);
return true;
@@ -838,7 +848,7 @@
return Context.getContextTrusted();
}
- private URL getResourceURL(final String resName) throws IOException {
+ private URL getResourceURL(final String resName) {
// try the classPathLoader if we have and then
// try the appLoader if non-null.
if (classPathLoader != null) {
@@ -954,6 +964,10 @@
}, CREATE_LOADER_ACC_CTXT);
}
+ private long getUniqueEvalId() {
+ return uniqueEvalId.getAndIncrement();
+ }
+
private long getUniqueScriptId() {
return uniqueScriptId.getAndIncrement();
}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java b/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
index fa0dbed..e832c86 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
@@ -65,7 +65,17 @@
} else {
this.logger = Logging.getLogger(loggerName);
}
- this.isEnabled = logger.getLevel() != Level.OFF;
+ assert logger != null;
+ this.isEnabled = getLevel() != Level.OFF;
+ }
+
+ /**
+ * Do not currently support chaining this with parent logger. Logger level null
+ * means disabled
+ * @return level
+ */
+ private Level getLevel() {
+ return logger.getLevel() == null ? Level.OFF : logger.getLevel();
}
/**
@@ -126,7 +136,7 @@
* @return true if level is above the given one
*/
public boolean levelAbove(final Level level) {
- return logger.getLevel().intValue() > level.intValue();
+ return getLevel().intValue() > level.intValue();
}
/**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java b/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
index 7e01fd6..3779f3b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
@@ -38,9 +38,10 @@
public interface GlobalObject {
/**
* Is this global of the given Context?
+ * @param ctxt the context
* @return true if this global belongs to the given Context
*/
- public boolean isOfContext(Context context);
+ public boolean isOfContext(final Context ctxt);
/**
* Does this global belong to a strict Context?
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSType.java b/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
index 93f0835..774295a 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
@@ -31,6 +31,8 @@
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Array;
+import java.util.Deque;
+import java.util.List;
import jdk.internal.dynalink.beans.StaticClass;
import jdk.nashorn.api.scripting.JSObject;
import jdk.nashorn.internal.codegen.CompilerConstants.Call;
@@ -104,14 +106,20 @@
/** JavaScript compliant conversion function from number to int64 */
public static final Call TO_INT64_D = staticCall(myLookup, JSType.class, "toInt64", long.class, double.class);
- /** JavaScript compliant conversion function from Object to String */
- public static final Call TO_STRING = staticCall(myLookup, JSType.class, "toString", String.class, Object.class);
-
/** JavaScript compliant conversion function from number to String */
public static final Call TO_STRING_D = staticCall(myLookup, JSType.class, "toString", String.class, double.class);
- /** JavaScript compliant conversion function from Object to primitive */
- public static final Call TO_PRIMITIVE = staticCall(myLookup, JSType.class, "toPrimitive", Object.class, Object.class);
+ /** Combined call to toPrimitive followed by toString. */
+ public static final Call TO_PRIMITIVE_TO_STRING = staticCall(myLookup, JSType.class, "toPrimitiveToString", String.class, Object.class);
+
+ /** Method handle to convert a JS Object to a Java array. */
+ public static final Call TO_JAVA_ARRAY = staticCall(myLookup, JSType.class, "toJavaArray", Object.class, Object.class, Class.class);
+
+ /** Method handle to convert a JS Object to a Java List. */
+ public static final Call TO_JAVA_LIST = staticCall(myLookup, JSType.class, "toJavaList", List.class, Object.class);
+
+ /** Method handle to convert a JS Object to a Java deque. */
+ public static final Call TO_JAVA_DEQUE = staticCall(myLookup, JSType.class, "toJavaDeque", Deque.class, Object.class);
private static final double INT32_LIMIT = 4294967296.0;
@@ -273,6 +281,17 @@
}
/**
+ * Combines a hintless toPrimitive and a toString call.
+ *
+ * @param obj an object
+ *
+ * @return the string form of the primitive form of the object
+ */
+ public static String toPrimitiveToString(Object obj) {
+ return toString(toPrimitive(obj));
+ }
+
+ /**
* JavaScript compliant conversion of number to boolean
*
* @param num a number
@@ -874,7 +893,7 @@
if (obj instanceof ScriptObject) {
return convertArray(((ScriptObject)obj).getArray().asObjectArray(), componentType);
} else if (obj instanceof JSObject) {
- final ArrayLikeIterator itr = ArrayLikeIterator.arrayLikeIterator(obj);
+ final ArrayLikeIterator<?> itr = ArrayLikeIterator.arrayLikeIterator(obj);
final int len = (int) itr.getLength();
final Object[] res = new Object[len];
int idx = 0;
@@ -882,6 +901,8 @@
res[idx++] = itr.next();
}
return convertArray(res, componentType);
+ } else if(obj == null) {
+ return null;
} else {
throw new IllegalArgumentException("not a script object");
}
@@ -911,6 +932,24 @@
}
/**
+ * Converts a JavaScript object to a Java List. See {@link ListAdapter} for details.
+ * @param obj the object to convert. Can be any array-like object.
+ * @return a List that is live-backed by the JavaScript object.
+ */
+ public static List<?> toJavaList(final Object obj) {
+ return ListAdapter.create(obj);
+ }
+
+ /**
+ * Converts a JavaScript object to a Java Deque. See {@link ListAdapter} for details.
+ * @param obj the object to convert. Can be any array-like object.
+ * @return a Deque that is live-backed by the JavaScript object.
+ */
+ public static Deque<?> toJavaDeque(final Object obj) {
+ return ListAdapter.create(obj);
+ }
+
+ /**
* Check if an object is null or undefined
*
* @param obj object to check
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ListAdapter.java b/nashorn/src/jdk/nashorn/internal/runtime/ListAdapter.java
index 41d3460..4430246 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ListAdapter.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ListAdapter.java
@@ -119,10 +119,11 @@
});
}
+ /** wrapped object */
protected final Object obj;
// allow subclasses only in this package
- ListAdapter(Object obj) {
+ ListAdapter(final Object obj) {
this.obj = obj;
}
@@ -143,22 +144,32 @@
}
@Override
- public final Object get(int index) {
+ public final Object get(final int index) {
checkRange(index);
return getAt(index);
}
+ /**
+ * Get object at an index
+ * @param index index in list
+ * @return object
+ */
protected abstract Object getAt(final int index);
@Override
- public Object set(int index, Object element) {
+ public Object set(final int index, final Object element) {
checkRange(index);
final Object prevValue = getAt(index);
setAt(index, element);
return prevValue;
}
- protected abstract void setAt(int index, Object element);
+ /**
+ * Set object at an index
+ * @param index index in list
+ * @param element element
+ */
+ protected abstract void setAt(final int index, final Object element);
private void checkRange(int index) {
if(index < 0 || index >= size()) {
@@ -167,18 +178,18 @@
}
@Override
- public final void push(Object e) {
+ public final void push(final Object e) {
addFirst(e);
}
@Override
- public final boolean add(Object e) {
+ public final boolean add(final Object e) {
addLast(e);
return true;
}
@Override
- public final void addFirst(Object e) {
+ public final void addFirst(final Object e) {
try {
final InvokeByName unshiftInvoker = getUNSHIFT();
final Object fn = unshiftInvoker.getGetter().invokeExact(obj);
@@ -192,7 +203,7 @@
}
@Override
- public final void addLast(Object e) {
+ public final void addLast(final Object e) {
try {
final InvokeByName pushInvoker = getPUSH();
final Object fn = pushInvoker.getGetter().invokeExact(obj);
@@ -206,7 +217,7 @@
}
@Override
- public final void add(int index, Object e) {
+ public final void add(final int index, final Object e) {
try {
if(index < 0) {
throw invalidIndex(index);
@@ -225,35 +236,35 @@
throw invalidIndex(index);
}
}
- } catch(RuntimeException | Error ex) {
+ } catch(final RuntimeException | Error ex) {
throw ex;
- } catch(Throwable t) {
+ } catch(final Throwable t) {
throw new RuntimeException(t);
}
}
- private static void checkFunction(Object fn, InvokeByName invoke) {
+ private static void checkFunction(final Object fn, final InvokeByName invoke) {
if(!(Bootstrap.isCallable(fn))) {
throw new UnsupportedOperationException("The script object doesn't have a function named " + invoke.getName());
}
}
- private static IndexOutOfBoundsException invalidIndex(int index) {
+ private static IndexOutOfBoundsException invalidIndex(final int index) {
return new IndexOutOfBoundsException(String.valueOf(index));
}
@Override
- public final boolean offer(Object e) {
+ public final boolean offer(final Object e) {
return offerLast(e);
}
@Override
- public final boolean offerFirst(Object e) {
+ public final boolean offerFirst(final Object e) {
addFirst(e);
return true;
}
@Override
- public final boolean offerLast(Object e) {
+ public final boolean offerLast(final Object e) {
addLast(e);
return true;
}
@@ -287,7 +298,7 @@
}
@Override
- public final Object remove(int index) {
+ public final Object remove(final int index) {
if(index < 0) {
throw invalidIndex(index);
} else if (index == 0) {
@@ -333,11 +344,11 @@
}
@Override
- protected final void removeRange(int fromIndex, int toIndex) {
+ protected final void removeRange(final int fromIndex, final int toIndex) {
invokeSpliceRemove(fromIndex, toIndex - fromIndex);
}
- private void invokeSpliceRemove(int fromIndex, int count) {
+ private void invokeSpliceRemove(final int fromIndex, final int count) {
try {
final InvokeByName spliceRemoveInvoker = getSPLICE_REMOVE();
final Object fn = spliceRemoveInvoker.getGetter().invokeExact(obj);
@@ -419,16 +430,16 @@
}
@Override
- public final boolean removeFirstOccurrence(Object o) {
+ public final boolean removeFirstOccurrence(final Object o) {
return removeOccurrence(o, iterator());
}
@Override
- public final boolean removeLastOccurrence(Object o) {
+ public final boolean removeLastOccurrence(final Object o) {
return removeOccurrence(o, descendingIterator());
}
- private static boolean removeOccurrence(Object o, Iterator<Object> it) {
+ private static boolean removeOccurrence(final Object o, final Iterator<Object> it) {
while(it.hasNext()) {
final Object e = it.next();
if(o == null ? e == null : o.equals(e)) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java b/nashorn/src/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
index fee0497..e5ca3c9 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
@@ -33,6 +33,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedList;
+import jdk.internal.dynalink.support.NameCodec;
import jdk.nashorn.internal.codegen.Compiler;
import jdk.nashorn.internal.codegen.CompilerConstants;
@@ -52,7 +53,7 @@
public final class RecompilableScriptFunctionData extends ScriptFunctionData {
/** FunctionNode with the code for this ScriptFunction */
- private volatile FunctionNode functionNode;
+ private FunctionNode functionNode;
/** Source from which FunctionNode was parsed. */
private final Source source;
@@ -64,7 +65,7 @@
private final PropertyMap allocatorMap;
/** Code installer used for all further recompilation/specialization of this ScriptFunction */
- private volatile CodeInstaller<ScriptEnvironment> installer;
+ private CodeInstaller<ScriptEnvironment> installer;
/** Name of class where allocator function resides */
private final String allocatorClassName;
@@ -100,9 +101,7 @@
* @param allocatorMap allocator map to seed instances with, when constructing
*/
public RecompilableScriptFunctionData(final FunctionNode functionNode, final CodeInstaller<ScriptEnvironment> installer, final String allocatorClassName, final PropertyMap allocatorMap) {
- super(functionNode.isAnonymous() ?
- "" :
- functionNode.getIdent().getName(),
+ super(functionName(functionNode),
functionNode.getParameters().size(),
functionNode.isStrict(),
false,
@@ -139,6 +138,20 @@
return sb.toString() + super.toString();
}
+ private static String functionName(final FunctionNode fn) {
+ if (fn.isAnonymous()) {
+ return "";
+ } else {
+ final FunctionNode.Kind kind = fn.getKind();
+ if (kind == FunctionNode.Kind.GETTER || kind == FunctionNode.Kind.SETTER) {
+ final String name = NameCodec.decode(fn.getIdent().getName());
+ return name.substring(4); // 4 is "get " or "set "
+ } else {
+ return fn.getIdent().getName();
+ }
+ }
+ }
+
private static long tokenFor(final FunctionNode fn) {
final int position = Token.descPosition(fn.getFirstToken());
final int length = Token.descPosition(fn.getLastToken()) - position + Token.descLength(fn.getLastToken());
@@ -165,7 +178,7 @@
}
@Override
- protected void ensureCodeGenerated() {
+ protected synchronized void ensureCodeGenerated() {
if (!code.isEmpty()) {
return; // nothing to do, we have code, at least some.
}
@@ -323,7 +336,7 @@
}
@Override
- MethodHandle getBestInvoker(final MethodType callSiteType, final Object[] args) {
+ synchronized MethodHandle getBestInvoker(final MethodType callSiteType, final Object[] args) {
final MethodType runtimeType = runtimeType(callSiteType, args);
assert runtimeType.parameterCount() == callSiteType.parameterCount();
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index 14aab75..ae59855 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -59,6 +59,9 @@
/** Method handle for name getter for this ScriptFunction */
public static final MethodHandle G$NAME = findOwnMH("G$name", Object.class, Object.class);
+ /** Method handle used for implementing sync() in mozilla_compat */
+ public static final MethodHandle INVOKE_SYNC = findOwnMH("invokeSync", Object.class, ScriptFunction.class, Object.class, Object.class, Object[].class);
+
/** Method handle for allocate function for this ScriptFunction */
static final MethodHandle ALLOCATE = findOwnMH("allocate", Object.class);
@@ -301,6 +304,14 @@
public abstract void setPrototype(Object prototype);
/**
+ * Create a function that invokes this function synchronized on {@code sync} or the self object
+ * of the invocation.
+ * @param sync the Object to synchronize on, or undefined
+ * @return synchronized function
+ */
+ public abstract ScriptFunction makeSynchronizedFunction(Object sync);
+
+ /**
* Return the most appropriate invoke handle if there are specializations
* @param type most specific method type to look for invocation with
* @param args args for trampoline invocation
@@ -326,7 +337,7 @@
* @param self self reference
* @return bound invoke handle
*/
- public final MethodHandle getBoundInvokeHandle(final ScriptObject self) {
+ public final MethodHandle getBoundInvokeHandle(final Object self) {
return MH.bindTo(bindToCalleeIfNeeded(data.getGenericInvoker()), self);
}
@@ -614,6 +625,15 @@
return result;
}
+ @SuppressWarnings("unused")
+ private static Object invokeSync(final ScriptFunction func, final Object sync, final Object self, final Object... args)
+ throws Throwable {
+ final Object syncObj = sync == UNDEFINED ? self : sync;
+ synchronized (syncObj) {
+ return func.invoke(self, args);
+ }
+ }
+
private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
final Class<?> own = ScriptFunction.class;
final MethodType mt = MH.type(rtype, types);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
index 06a12c0..04c3ae8 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
@@ -675,7 +675,7 @@
/**
* Heuristic to figure out if the method handle has a callee argument. If it's type is either
- * {@code (boolean, Object, ScriptFunction, ...)} or {@code (Object, ScriptFunction, ...)}, then we'll assume it has
+ * {@code (boolean, ScriptFunction, ...)} or {@code (ScriptFunction, ...)}, then we'll assume it has
* a callee argument. We need this as the constructor above is not passed this information, and can't just blindly
* assume it's false (notably, it's being invoked for creation of new scripts, and scripts have scopes, therefore
* they also always receive a callee).
@@ -692,11 +692,11 @@
return false;
}
- if (type.parameterType(0) == boolean.class) {
- return length > 1 && type.parameterType(1) == ScriptFunction.class;
+ if (type.parameterType(0) == ScriptFunction.class) {
+ return true;
}
- return type.parameterType(0) == ScriptFunction.class;
+ return length > 1 && type.parameterType(0) == boolean.class && type.parameterType(1) == ScriptFunction.class;
}
/**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java
index 736932e..42c8fb4 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java
@@ -64,6 +64,7 @@
return context.getSharedLoader().loadClass(name);
}
} catch (final ClassNotFoundException ignored) {
+ //ignored
}
// throw the original exception from here
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index a4ca601..59b50eb 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -37,6 +37,8 @@
import static jdk.nashorn.internal.runtime.PropertyDescriptor.VALUE;
import static jdk.nashorn.internal.runtime.PropertyDescriptor.WRITABLE;
import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndex;
+import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.isValidArrayIndex;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
@@ -131,6 +133,7 @@
static final MethodHandle GETPROTO = findOwnMH("getProto", ScriptObject.class);
static final MethodHandle SETPROTOCHECK = findOwnMH("setProtoCheck", void.class, Object.class);
+ static final MethodHandle MEGAMORPHIC_GET = findOwnMH("megamorphicGet", Object.class, String.class, boolean.class);
static final MethodHandle SETFIELD = findOwnMH("setField", void.class, CallSiteDescriptor.class, PropertyMap.class, PropertyMap.class, MethodHandle.class, Object.class, Object.class);
static final MethodHandle SETSPILL = findOwnMH("setSpill", void.class, CallSiteDescriptor.class, PropertyMap.class, PropertyMap.class, int.class, Object.class, Object.class);
@@ -388,7 +391,7 @@
return global.newDataDescriptor(getWithProperty(property), configurable, enumerable, writable);
}
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -592,7 +595,7 @@
* @param value value to define
*/
protected final void defineOwnProperty(final int index, final Object value) {
- assert ArrayIndex.isValidArrayIndex(index) : "invalid array index";
+ assert isValidArrayIndex(index) : "invalid array index";
final long longIndex = ArrayIndex.toLongIndex(index);
if (longIndex >= getArray().length()) {
// make array big enough to hold..
@@ -602,9 +605,9 @@
}
private void checkIntegerKey(final String key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
final ArrayData data = getArray();
if (data.has(index)) {
@@ -614,7 +617,7 @@
}
private void removeArraySlot(final String key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -717,6 +720,28 @@
}
/**
+ * Low level property API. This is similar to {@link #findProperty(String, boolean)} but returns a
+ * {@code boolean} value instead of a {@link FindProperty} object.
+ * @param key Property key.
+ * @param deep Whether the search should look up proto chain.
+ * @return true if the property was found.
+ */
+ boolean hasProperty(final String key, final boolean deep) {
+ if (getMap().findProperty(key) != null) {
+ return true;
+ }
+
+ if (deep) {
+ final ScriptObject myProto = getProto();
+ if (myProto != null) {
+ return myProto.hasProperty(key, deep);
+ }
+ }
+
+ return false;
+ }
+
+ /**
* Add a new property to the object.
* <p>
* This a more "low level" way that doesn't involve {@link PropertyDescriptor}s
@@ -1708,8 +1733,11 @@
*/
protected GuardedInvocation findGetMethod(final CallSiteDescriptor desc, final LinkRequest request, final String operator) {
final String name = desc.getNameToken(CallSiteDescriptor.NAME_OPERAND);
- final FindProperty find = findProperty(name, true);
+ if (request.isCallSiteUnstable()) {
+ return findMegaMorphicGetMethod(desc, name, "getMethod".equals(operator));
+ }
+ final FindProperty find = findProperty(name, true);
MethodHandle methodHandle;
if (find == null) {
@@ -1727,10 +1755,6 @@
throw new AssertionError(); // never invoked with any other operation
}
- if (request.isCallSiteUnstable()) {
- return findMegaMorphicGetMethod(desc, name);
- }
-
final Class<?> returnType = desc.getMethodType().returnType();
final Property property = find.getProperty();
methodHandle = find.getGetter(returnType);
@@ -1757,11 +1781,21 @@
return new GuardedInvocation(Lookup.emptyGetter(returnType), getMap().getProtoGetSwitchPoint(proto, name), guard);
}
- private static GuardedInvocation findMegaMorphicGetMethod(final CallSiteDescriptor desc, final String name) {
- final MethodType mhType = desc.getMethodType().insertParameterTypes(1, Object.class);
- final GuardedInvocation inv = findGetIndexMethod(mhType);
+ private static GuardedInvocation findMegaMorphicGetMethod(final CallSiteDescriptor desc, final String name, final boolean isMethod) {
+ final MethodHandle invoker = MH.insertArguments(MEGAMORPHIC_GET, 1, name, isMethod);
+ final MethodHandle guard = getScriptObjectGuard(desc.getMethodType());
+ return new GuardedInvocation(invoker, guard);
+ }
- return inv.replaceMethods(MH.insertArguments(inv.getInvocation(), 1, name), inv.getGuard());
+ @SuppressWarnings("unused")
+ private Object megamorphicGet(final String key, final boolean isMethod) {
+ final FindProperty find = findProperty(key, true);
+
+ if (find != null) {
+ return getObjectValue(find);
+ }
+
+ return isMethod ? getNoSuchMethod(key) : invokeNoSuchProperty(key);
}
/**
@@ -1810,7 +1844,7 @@
*/
protected GuardedInvocation findSetMethod(final CallSiteDescriptor desc, final LinkRequest request) {
final String name = desc.getNameToken(CallSiteDescriptor.NAME_OPERAND);
- if(request.isCallSiteUnstable()) {
+ if (request.isCallSiteUnstable()) {
return findMegaMorphicSetMethod(desc, name);
}
@@ -2045,6 +2079,26 @@
return UNDEFINED;
}
+ /**
+ * Get __noSuchMethod__ as a function bound to this object and {@code name} if it is defined.
+ * @param name the method name
+ * @return the bound function, or undefined
+ */
+ private Object getNoSuchMethod(final String name) {
+ final FindProperty find = findProperty(NO_SUCH_METHOD_NAME, true);
+
+ if (find == null) {
+ return invokeNoSuchProperty(name);
+ }
+
+ final Object value = getObjectValue(find);
+ if (! (value instanceof ScriptFunction)) {
+ return UNDEFINED;
+ }
+
+ return ((ScriptFunction)value).makeBoundFunction(this, new Object[] {name});
+ }
+
private GuardedInvocation createEmptyGetter(final CallSiteDescriptor desc, final String name) {
return new GuardedInvocation(Lookup.emptyGetter(desc.getMethodType().returnType()), getMap().getProtoGetSwitchPoint(proto, name), NashornGuards.getMapGuard(getMap()));
}
@@ -2308,7 +2362,7 @@
}
private int getInt(final int index, final String key) {
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
for (ScriptObject object = this; ; ) {
final FindProperty find = object.findProperty(key, false, false, this);
@@ -2339,7 +2393,7 @@
@Override
public int getInt(final Object key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -2351,7 +2405,7 @@
@Override
public int getInt(final double key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -2363,7 +2417,7 @@
@Override
public int getInt(final long key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -2385,7 +2439,7 @@
}
private long getLong(final int index, final String key) {
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
for (ScriptObject object = this; ; ) {
final FindProperty find = object.findProperty(key, false, false, this);
@@ -2416,7 +2470,7 @@
@Override
public long getLong(final Object key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -2428,7 +2482,7 @@
@Override
public long getLong(final double key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -2440,7 +2494,7 @@
@Override
public long getLong(final long key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -2462,7 +2516,7 @@
}
private double getDouble(final int index, final String key) {
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
for (ScriptObject object = this; ; ) {
final FindProperty find = object.findProperty(key, false, false, this);
@@ -2493,7 +2547,7 @@
@Override
public double getDouble(final Object key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -2505,7 +2559,7 @@
@Override
public double getDouble(final double key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -2517,7 +2571,7 @@
@Override
public double getDouble(final long key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -2539,7 +2593,7 @@
}
private Object get(final int index, final String key) {
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
for (ScriptObject object = this; ; ) {
final FindProperty find = object.findProperty(key, false, false, this);
@@ -2570,7 +2624,7 @@
@Override
public Object get(final Object key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -2582,7 +2636,7 @@
@Override
public Object get(final double key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -2594,7 +2648,7 @@
@Override
public Object get(final long key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -2710,9 +2764,9 @@
@Override
public void set(final Object key, final int value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
setArray(getArray().set(index, value, strict));
} else {
@@ -2722,14 +2776,15 @@
return;
}
- set(key, JSType.toObject(value), strict);
+ final String propName = JSType.toString(key);
+ setObject(findProperty(propName, true), strict, propName, JSType.toObject(value));
}
@Override
public void set(final Object key, final long value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
setArray(getArray().set(index, value, strict));
} else {
@@ -2739,14 +2794,15 @@
return;
}
- set(key, JSType.toObject(value), strict);
+ final String propName = JSType.toString(key);
+ setObject(findProperty(propName, true), strict, propName, JSType.toObject(value));
}
@Override
public void set(final Object key, final double value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
setArray(getArray().set(index, value, strict));
} else {
@@ -2756,14 +2812,15 @@
return;
}
- set(key, JSType.toObject(value), strict);
+ final String propName = JSType.toString(key);
+ setObject(findProperty(propName, true), strict, propName, JSType.toObject(value));
}
@Override
public void set(final Object key, final Object value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
setArray(getArray().set(index, value, strict));
} else {
@@ -2773,17 +2830,15 @@
return;
}
- final String propName = JSType.toString(key);
- final FindProperty find = findProperty(propName, true);
-
- setObject(find, strict, propName, value);
+ final String propName = JSType.toString(key);
+ setObject(findProperty(propName, true), strict, propName, value);
}
@Override
public void set(final double key, final int value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
setArray(getArray().set(index, value, strict));
} else {
@@ -2793,14 +2848,15 @@
return;
}
- set(JSType.toObject(key), JSType.toObject(value), strict);
+ final String propName = JSType.toString(key);
+ setObject(findProperty(propName, true), strict, propName, JSType.toObject(value));
}
@Override
public void set(final double key, final long value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
setArray(getArray().set(index, value, strict));
} else {
@@ -2810,14 +2866,15 @@
return;
}
- set(JSType.toObject(key), JSType.toObject(value), strict);
+ final String propName = JSType.toString(key);
+ setObject(findProperty(propName, true), strict, propName, JSType.toObject(value));
}
@Override
public void set(final double key, final double value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
setArray(getArray().set(index, value, strict));
} else {
@@ -2827,14 +2884,15 @@
return;
}
- set(JSType.toObject(key), JSType.toObject(value), strict);
+ final String propName = JSType.toString(key);
+ setObject(findProperty(propName, true), strict, propName, JSType.toObject(value));
}
@Override
public void set(final double key, final Object value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
setArray(getArray().set(index, value, strict));
} else {
@@ -2844,14 +2902,15 @@
return;
}
- set(JSType.toObject(key), value, strict);
+ final String propName = JSType.toString(key);
+ setObject(findProperty(propName, true), strict, propName, value);
}
@Override
public void set(final long key, final int value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
setArray(getArray().set(index, value, strict));
} else {
@@ -2861,14 +2920,15 @@
return;
}
- set(JSType.toObject(key), JSType.toObject(value), strict);
+ final String propName = JSType.toString(key);
+ setObject(findProperty(propName, true), strict, propName, JSType.toObject(value));
}
@Override
public void set(final long key, final long value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
setArray(getArray().set(index, value, strict));
} else {
@@ -2878,14 +2938,15 @@
return;
}
- set(JSType.toObject(key), JSType.toObject(value), strict);
+ final String propName = JSType.toString(key);
+ setObject(findProperty(propName, true), strict, propName, JSType.toObject(value));
}
@Override
public void set(final long key, final double value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
setArray(getArray().set(index, value, strict));
} else {
@@ -2895,14 +2956,15 @@
return;
}
- set(JSType.toObject(key), JSType.toObject(value), strict);
+ final String propName = JSType.toString(key);
+ setObject(findProperty(propName, true), strict, propName, JSType.toObject(value));
}
@Override
public void set(final long key, final Object value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
setArray(getArray().set(index, value, strict));
} else {
@@ -2912,14 +2974,15 @@
return;
}
- set(JSType.toObject(key), value, strict);
+ final String propName = JSType.toString(key);
+ setObject(findProperty(propName, true), strict, propName, value);
}
@Override
public void set(final int key, final int value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
setArray(getArray().set(index, value, strict));
} else {
@@ -2929,14 +2992,15 @@
return;
}
- set(JSType.toObject(key), JSType.toObject(value), strict);
+ final String propName = JSType.toString(key);
+ setObject(findProperty(propName, true), strict, propName, JSType.toObject(value));
}
@Override
public void set(final int key, final long value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
setArray(getArray().set(index, value, strict));
} else {
@@ -2946,14 +3010,15 @@
return;
}
- set(JSType.toObject(key), JSType.toObject(value), strict);
+ final String propName = JSType.toString(key);
+ setObject(findProperty(propName, true), strict, propName, JSType.toObject(value));
}
@Override
public void set(final int key, final double value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
setArray(getArray().set(index, value, strict));
} else {
@@ -2963,14 +3028,15 @@
return;
}
- set(JSType.toObject(key), JSType.toObject(value), strict);
+ final String propName = JSType.toString(key);
+ setObject(findProperty(propName, true), strict, propName, JSType.toObject(value));
}
@Override
public void set(final int key, final Object value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
setArray(getArray().set(index, value, strict));
} else {
@@ -2980,14 +3046,15 @@
return;
}
- set(JSType.toObject(key), value, strict);
+ final String propName = JSType.toString(key);
+ setObject(findProperty(propName, true), strict, propName, value);
}
@Override
public boolean has(final Object key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
for (ScriptObject self = this; self != null; self = self.getProto()) {
if (self.getArray().has(index)) {
return true;
@@ -2995,16 +3062,14 @@
}
}
- final FindProperty find = findProperty(JSType.toString(key), true);
-
- return find != null;
+ return hasProperty(JSType.toString(key), true);
}
@Override
public boolean has(final double key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
for (ScriptObject self = this; self != null; self = self.getProto()) {
if (self.getArray().has(index)) {
return true;
@@ -3012,16 +3077,14 @@
}
}
- final FindProperty find = findProperty(JSType.toString(key), true);
-
- return find != null;
+ return hasProperty(JSType.toString(key), true);
}
@Override
public boolean has(final long key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
for (ScriptObject self = this; self != null; self = self.getProto()) {
if (self.getArray().has(index)) {
return true;
@@ -3029,16 +3092,14 @@
}
}
- final FindProperty find = findProperty(JSType.toString(key), true);
-
- return find != null;
+ return hasProperty(JSType.toString(key), true);
}
@Override
public boolean has(final int key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
- if (ArrayIndex.isValidArrayIndex(index)) {
+ if (isValidArrayIndex(index)) {
for (ScriptObject self = this; self != null; self = self.getProto()) {
if (self.getArray().has(index)) {
return true;
@@ -3046,66 +3107,32 @@
}
}
- final FindProperty find = findProperty(JSType.toString(key), true);
-
- return find != null;
+ return hasProperty(JSType.toString(key), true);
}
@Override
public boolean hasOwnProperty(final Object key) {
- final int index = ArrayIndex.getArrayIndex(key);
-
- if (getArray().has(index)) {
- return true;
- }
-
- final FindProperty find = findProperty(JSType.toString(key), false);
-
- return find != null;
+ return getArray().has(getArrayIndex(key)) || hasProperty(JSType.toString(key), false);
}
@Override
public boolean hasOwnProperty(final int key) {
- final int index = ArrayIndex.getArrayIndex(key);
-
- if (getArray().has(index)) {
- return true;
- }
-
- final FindProperty find = findProperty(JSType.toString(key), false);
-
- return find != null;
+ return getArray().has(getArrayIndex(key)) || hasProperty(JSType.toString(key), false);
}
@Override
public boolean hasOwnProperty(final long key) {
- final int index = ArrayIndex.getArrayIndex(key);
-
- if (getArray().has(index)) {
- return true;
- }
-
- final FindProperty find = findProperty(JSType.toString(key), false);
-
- return find != null;
+ return getArray().has(getArrayIndex(key)) || hasProperty(JSType.toString(key), false);
}
@Override
public boolean hasOwnProperty(final double key) {
- final int index = ArrayIndex.getArrayIndex(key);
-
- if (getArray().has(index)) {
- return true;
- }
-
- final FindProperty find = findProperty(JSType.toString(key), false);
-
- return find != null;
+ return getArray().has(getArrayIndex(key)) || hasProperty(JSType.toString(key), false);
}
@Override
public boolean delete(final int key, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -3121,7 +3148,7 @@
@Override
public boolean delete(final long key, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -3137,7 +3164,7 @@
@Override
public boolean delete(final double key, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -3153,7 +3180,7 @@
@Override
public boolean delete(final Object key, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
if (array.has(index)) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
index 7dc8307..6e03dc6 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
@@ -316,6 +316,10 @@
return expression;
}
+ /**
+ * Get the parent scope for this {@code WithObject}
+ * @return the parent scope
+ */
public ScriptObject getParentScope() {
return getProto();
}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java
index 92a8002..a6b6bb9 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java
@@ -77,4 +77,4 @@
public void remove() {
throw new UnsupportedOperationException("remove");
}
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java
index dcb37cf..b90bae6 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java
@@ -55,4 +55,4 @@
protected long bumpIndex() {
return index--;
}
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
index 45451a8..f9491de 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
@@ -140,7 +140,7 @@
@SuppressWarnings("unused")
private static Object get(final Object jsobj, final Object key) {
if (key instanceof Integer) {
- return ((JSObject)jsobj).getSlot((int)(Integer)key);
+ return ((JSObject)jsobj).getSlot((Integer)key);
} else if (key instanceof Number) {
final int index = getIndex((Number)key);
if (index > -1) {
@@ -155,7 +155,7 @@
@SuppressWarnings("unused")
private static void put(final Object jsobj, final Object key, final Object value) {
if (key instanceof Integer) {
- ((JSObject)jsobj).setSlot((int)(Integer)key, value);
+ ((JSObject)jsobj).setSlot((Integer)key, value);
} else if (key instanceof Number) {
((JSObject)jsobj).setSlot(getIndex((Number)key), value);
} else if (key instanceof String) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
index 8ebdc81..5b8d4cf 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
@@ -93,7 +93,7 @@
* its last argument preceded by original constructor arguments. This constructor will use the passed function as the
* implementation for all abstract methods. For consistency, any concrete methods sharing the single abstract method
* name will also be overridden by the function. When methods on the adapter instance are invoked, the ScriptFunction is
- * invoked with {@code null} as its "this".
+ * invoked with global or UNDEFINED as its "this" depending whether the function is non-strict or not.
* </li>
* <li>
* If the adapter being generated can have class-level overrides, constructors taking same arguments as the superclass
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java
index 6614304..06ae1b1 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java
@@ -29,6 +29,7 @@
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodType;
+import jdk.nashorn.internal.runtime.Context;
import jdk.nashorn.internal.runtime.ScriptFunction;
import jdk.nashorn.internal.runtime.ScriptObject;
import jdk.nashorn.internal.runtime.ScriptRuntime;
@@ -53,8 +54,8 @@
* @return the appropriately adapted method handle for invoking the script function.
*/
public static MethodHandle getHandle(final ScriptFunction fn, final MethodType type) {
- // JS "this" will be null for SAMs
- return adaptHandle(fn.getBoundInvokeHandle(null), type);
+ // JS "this" will be global object or undefined depending on if 'fn' is strict or not
+ return adaptHandle(fn.getBoundInvokeHandle(fn.isStrict()? ScriptRuntime.UNDEFINED : Context.getGlobal()), type);
}
/**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
index f035071..984d0f4 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
@@ -25,9 +25,9 @@
package jdk.nashorn.internal.runtime.linker;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.lookup.Lookup.MH;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
@@ -211,6 +211,20 @@
return null;
} else if (obj instanceof Long) {
return (Long) obj;
+ } else if (obj instanceof Integer) {
+ return ((Integer)obj).longValue();
+ } else if (obj instanceof Double) {
+ final Double d = (Double)obj;
+ if(Double.isInfinite(d.doubleValue())) {
+ return 0L;
+ }
+ return d.longValue();
+ } else if (obj instanceof Float) {
+ final Float f = (Float)obj;
+ if(Float.isInfinite(f.floatValue())) {
+ return 0L;
+ }
+ return f.longValue();
} else if (obj instanceof Number) {
return ((Number)obj).longValue();
} else if (obj instanceof String || obj instanceof ConsString) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
index 3a23b14..a760c60 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
@@ -30,6 +30,8 @@
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Modifier;
+import java.util.Deque;
+import java.util.List;
import jdk.internal.dynalink.CallSiteDescriptor;
import jdk.internal.dynalink.linker.ConversionComparator;
import jdk.internal.dynalink.linker.GuardedInvocation;
@@ -38,6 +40,8 @@
import jdk.internal.dynalink.linker.LinkerServices;
import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
import jdk.internal.dynalink.support.Guards;
+import jdk.nashorn.internal.objects.NativeArray;
+import jdk.nashorn.internal.runtime.JSType;
import jdk.nashorn.internal.runtime.ScriptFunction;
import jdk.nashorn.internal.runtime.ScriptObject;
import jdk.nashorn.internal.runtime.Undefined;
@@ -47,6 +51,13 @@
* includes {@link ScriptFunction} and its subclasses) as well as {@link Undefined}.
*/
final class NashornLinker implements TypeBasedGuardingDynamicLinker, GuardingTypeConverterFactory, ConversionComparator {
+ private static final ClassValue<MethodHandle> ARRAY_CONVERTERS = new ClassValue<MethodHandle>() {
+ @Override
+ protected MethodHandle computeValue(Class<?> type) {
+ return createArrayConverter(type);
+ }
+ };
+
/**
* Returns true if {@code ScriptObject} is assignable from {@code type}, or it is {@code Undefined}.
*/
@@ -103,6 +114,12 @@
if (mh != null) {
return new GuardedInvocation(mh, canLinkTypeStatic(sourceType) ? null : IS_NASHORN_OR_UNDEFINED_TYPE);
}
+
+ GuardedInvocation inv = getArrayConverter(sourceType, targetType);
+ if(inv != null) {
+ return inv;
+ }
+
return getSamTypeConverter(sourceType, targetType);
}
@@ -129,6 +146,41 @@
return null;
}
+ /**
+ * Returns a guarded invocation that converts from a source type that is NativeArray to a Java array or List or
+ * Deque type.
+ * @param sourceType the source type (presumably NativeArray a superclass of it)
+ * @param targetType the target type (presumably an array type, or List or Deque)
+ * @return a guarded invocation that converts from the source type to the target type. null is returned if
+ * either the source type is neither NativeArray, nor a superclass of it, or if the target type is not an array
+ * type, List, or Deque.
+ */
+ private static GuardedInvocation getArrayConverter(final Class<?> sourceType, final Class<?> targetType) {
+ final boolean isSourceTypeNativeArray = sourceType == NativeArray.class;
+ // If source type is more generic than ScriptFunction class, we'll need to use a guard
+ final boolean isSourceTypeGeneric = !isSourceTypeNativeArray && sourceType.isAssignableFrom(NativeArray.class);
+
+ if (isSourceTypeNativeArray || isSourceTypeGeneric) {
+ final MethodHandle guard = isSourceTypeGeneric ? IS_NATIVE_ARRAY : null;
+ if(targetType.isArray()) {
+ return new GuardedInvocation(ARRAY_CONVERTERS.get(targetType), guard);
+ }
+ if(targetType == List.class) {
+ return new GuardedInvocation(JSType.TO_JAVA_LIST.methodHandle(), guard);
+ }
+ if(targetType == Deque.class) {
+ return new GuardedInvocation(JSType.TO_JAVA_DEQUE.methodHandle(), guard);
+ }
+ }
+ return null;
+ }
+
+ private static MethodHandle createArrayConverter(final Class<?> type) {
+ assert type.isArray();
+ final MethodHandle converter = MH.insertArguments(JSType.TO_JAVA_ARRAY.methodHandle(), 1, type.getComponentType());
+ return MH.asType(converter, converter.type().changeReturnType(type));
+ }
+
private static boolean isAutoConvertibleFromFunction(final Class<?> clazz) {
return isAbstractClass(clazz) && !ScriptObject.class.isAssignableFrom(clazz) &&
JavaAdapterFactory.isAutoConvertibleFromFunction(clazz);
@@ -148,7 +200,26 @@
@Override
public Comparison compareConversion(final Class<?> sourceType, final Class<?> targetType1, final Class<?> targetType2) {
+ if(sourceType == NativeArray.class) {
+ // Prefer lists, as they're less costly to create than arrays.
+ if(isList(targetType1)) {
+ if(!isList(targetType2)) {
+ return Comparison.TYPE_1_BETTER;
+ }
+ } else if(isList(targetType2)) {
+ return Comparison.TYPE_2_BETTER;
+ }
+ // Then prefer arrays
+ if(targetType1.isArray()) {
+ if(!targetType2.isArray()) {
+ return Comparison.TYPE_1_BETTER;
+ }
+ } else if(targetType2.isArray()) {
+ return Comparison.TYPE_2_BETTER;
+ }
+ }
if(ScriptObject.class.isAssignableFrom(sourceType)) {
+ // Prefer interfaces
if(targetType1.isInterface()) {
if(!targetType2.isInterface()) {
return Comparison.TYPE_1_BETTER;
@@ -160,7 +231,12 @@
return Comparison.INDETERMINATE;
}
+ private static boolean isList(Class<?> clazz) {
+ return clazz == List.class || clazz == Deque.class;
+ }
+
private static final MethodHandle IS_SCRIPT_FUNCTION = Guards.isInstance(ScriptFunction.class, MH.type(Boolean.TYPE, Object.class));
+ private static final MethodHandle IS_NATIVE_ARRAY = Guards.isOfClass(NativeArray.class, MH.type(Boolean.TYPE, Object.class));
private static final MethodHandle IS_NASHORN_OR_UNDEFINED_TYPE = findOwnMH("isNashornTypeOrUndefined",
Boolean.TYPE, Object.class);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js b/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
index 6b934ad..85e2161 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
@@ -41,7 +41,12 @@
}
});
+
// importPackage
+// avoid unnecessary chaining of __noSuchProperty__ again
+// in case user loads this script more than once.
+if (typeof importPackage == 'undefined') {
+
Object.defineProperty(this, "importPackage", {
configurable: true, enumerable: false, writable: true,
value: (function() {
@@ -91,6 +96,19 @@
})()
});
+}
+
+// sync
+Object.defineProperty(this, "sync", {
+ configurable: true, enumerable: false, writable: true,
+ value: function(func, syncobj) {
+ if (arguments.length < 1 || arguments.length > 2 ) {
+ throw "sync(function [,object]) parameter count mismatch";
+ }
+ return Packages.jdk.nashorn.api.scripting.ScriptUtils.makeSynchronizedFunction(func, syncobj);
+ }
+});
+
// Object.prototype.__defineGetter__
Object.defineProperty(Object.prototype, "__defineGetter__", {
configurable: true, enumerable: false, writable: true,
@@ -344,13 +362,16 @@
// Rhino: global.importClass
Object.defineProperty(this, "importClass", {
configurable: true, enumerable: false, writable: true,
- value: function(clazz) {
- if (Java.isType(clazz)) {
- var className = Java.typeName(clazz);
- var simpleName = className.substring(className.lastIndexOf('.') + 1);
- this[simpleName] = clazz;
- } else {
- throw new TypeError(clazz + " is not a Java class");
+ value: function() {
+ for (var arg in arguments) {
+ var clazz = arguments[arg];
+ if (Java.isType(clazz)) {
+ var className = Java.typeName(clazz);
+ var simpleName = className.substring(className.lastIndexOf('.') + 1);
+ this[simpleName] = clazz;
+ } else {
+ throw new TypeError(clazz + " is not a Java class");
+ }
}
}
});
diff --git a/nashorn/test/script/assert.js b/nashorn/test/script/assert.js
index 25bc259..3656f86 100644
--- a/nashorn/test/script/assert.js
+++ b/nashorn/test/script/assert.js
@@ -61,3 +61,22 @@
}
}
});
+
+Object.defineProperty(this, "printError", {
+ configuable: true,
+ enumerable: false,
+ writable: true,
+ value: function (e) {
+ var msg = e.message;
+ var str = e.name + ':';
+ if (e.lineNumber > 0) {
+ str += e.lineNumber + ':';
+ }
+ if (e.columnNumber > 0) {
+ str += e.columnNumber + ':';
+ }
+ str += msg.substring(msg.indexOf(' ') + 1);
+ print(str);
+ }
+});
+
diff --git a/nashorn/test/script/basic/JDK-8019508.js b/nashorn/test/script/basic/JDK-8019508.js
index d23035c..88ecbec 100644
--- a/nashorn/test/script/basic/JDK-8019508.js
+++ b/nashorn/test/script/basic/JDK-8019508.js
@@ -36,7 +36,7 @@
if (! (e instanceof SyntaxError)) {
fail("expected SyntaxError, got " + e);
}
- print(e.message.replace(/\\/g, '/'));
+ printError(e);
}
}
diff --git a/nashorn/test/script/basic/JDK-8019508.js.EXPECTED b/nashorn/test/script/basic/JDK-8019508.js.EXPECTED
index d5f8140..a3d883f 100644
--- a/nashorn/test/script/basic/JDK-8019508.js.EXPECTED
+++ b/nashorn/test/script/basic/JDK-8019508.js.EXPECTED
@@ -1,12 +1,12 @@
-test/script/basic/JDK-8019508.js#33<eval>:1:2 Expected property id but found ,
+SyntaxError:33:Expected property id but found ,
({,})
^
-test/script/basic/JDK-8019508.js#33<eval>:1:2 Expected property id but found ,
+SyntaxError:33:Expected property id but found ,
({, a:2 })
^
-test/script/basic/JDK-8019508.js#33<eval>:1:6 Expected property id but found ,
+SyntaxError:33:Expected property id but found ,
({a:3,,})
^
-test/script/basic/JDK-8019508.js#33<eval>:1:6 Expected comma but found ident
+SyntaxError:33:Expected comma but found ident
({a:3 b:2}
^
diff --git a/nashorn/test/script/basic/JDK-8019553.js b/nashorn/test/script/basic/JDK-8019553.js
index d754618..bec3a52 100644
--- a/nashorn/test/script/basic/JDK-8019553.js
+++ b/nashorn/test/script/basic/JDK-8019553.js
@@ -33,7 +33,7 @@
eval(str);
fail("SyntaxError expected for: " + str);
} catch (e) {
- print(e.toString().replace(/\\/g, '/'));
+ printError(e);
}
}
diff --git a/nashorn/test/script/basic/JDK-8019553.js.EXPECTED b/nashorn/test/script/basic/JDK-8019553.js.EXPECTED
index 78d22be..38e5286 100644
--- a/nashorn/test/script/basic/JDK-8019553.js.EXPECTED
+++ b/nashorn/test/script/basic/JDK-8019553.js.EXPECTED
@@ -1,12 +1,12 @@
-SyntaxError: test/script/basic/JDK-8019553.js#33<eval>:1:3 Expected l-value but found +
+SyntaxError:33:Expected l-value but found +
++ +3
^
-SyntaxError: test/script/basic/JDK-8019553.js#33<eval>:1:3 Expected l-value but found -
+SyntaxError:33:Expected l-value but found -
++ -7
^
-SyntaxError: test/script/basic/JDK-8019553.js#33<eval>:1:3 Expected l-value but found +
+SyntaxError:33:Expected l-value but found +
-- +2
^
-SyntaxError: test/script/basic/JDK-8019553.js#33<eval>:1:3 Expected l-value but found -
+SyntaxError:33:Expected l-value but found -
-- -8
^
diff --git a/nashorn/test/script/basic/JDK-8019791.js b/nashorn/test/script/basic/JDK-8019791.js
index 75e9281..ad32ce3 100644
--- a/nashorn/test/script/basic/JDK-8019791.js
+++ b/nashorn/test/script/basic/JDK-8019791.js
@@ -33,7 +33,7 @@
eval('"" ~ ""');
print("FAILED: SyntaxError expected for: \"\" ~ \"\"");
} catch (e) {
- print(e.toString().replace(/\\/g, '/'));
+ printError(e);
}
// Used to crash instead of SyntaxError
@@ -41,7 +41,7 @@
eval("function() { if (1~0) return 0; return 1 }");
print("FAILED: SyntaxError expected for: if (1~0) ");
} catch (e) {
- print(e.toString().replace(/\\/g, '/'));
+ printError(e);
}
// The following are valid, but used to crash
diff --git a/nashorn/test/script/basic/JDK-8019791.js.EXPECTED b/nashorn/test/script/basic/JDK-8019791.js.EXPECTED
index 5aec590..b214b2c 100644
--- a/nashorn/test/script/basic/JDK-8019791.js.EXPECTED
+++ b/nashorn/test/script/basic/JDK-8019791.js.EXPECTED
@@ -1,6 +1,6 @@
-SyntaxError: test/script/basic/JDK-8019791.js#33<eval>:1:3 Expected ; but found ~
+SyntaxError:33:Expected ; but found ~
"" ~ ""
^
-SyntaxError: test/script/basic/JDK-8019791.js#41<eval>:1:18 Expected ) but found ~
+SyntaxError:41:Expected ) but found ~
function() { if (1~0) return 0; return 1 }
^
diff --git a/nashorn/test/script/basic/JDK-8019805.js b/nashorn/test/script/basic/JDK-8019805.js
index 70371fb..7e3e25b 100644
--- a/nashorn/test/script/basic/JDK-8019805.js
+++ b/nashorn/test/script/basic/JDK-8019805.js
@@ -32,5 +32,5 @@
eval("for each(var v=0;false;);");
print("FAILED: for each(var v=0; false;); should have thrown error");
} catch (e) {
- print(e.toString().replace(/\\/g, '/'));
+ printError(e);
}
diff --git a/nashorn/test/script/basic/JDK-8019805.js.EXPECTED b/nashorn/test/script/basic/JDK-8019805.js.EXPECTED
index 154c332..76d335e 100644
--- a/nashorn/test/script/basic/JDK-8019805.js.EXPECTED
+++ b/nashorn/test/script/basic/JDK-8019805.js.EXPECTED
@@ -1,3 +1,3 @@
-SyntaxError: test/script/basic/JDK-8019805.js#32<eval>:1:16 for each can only be used with for..in
+SyntaxError:32:for each can only be used with for..in
for each(var v=0;false;);
^
diff --git a/nashorn/test/script/basic/JDK-8025488.js b/nashorn/test/script/basic/JDK-8025488.js
index a3697f4..8229b9f 100644
--- a/nashorn/test/script/basic/JDK-8025488.js
+++ b/nashorn/test/script/basic/JDK-8025488.js
@@ -40,4 +40,4 @@
}
var e = new MyError();
-print(e.stack);
+print(e.stack.replace(/\\/g, '/'));
diff --git a/nashorn/test/script/basic/JDK-8026008.js b/nashorn/test/script/basic/JDK-8026008.js
new file mode 100644
index 0000000..20c1d5f
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026008.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2013, 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.
+ */
+
+/**
+ * JDK-8026008: Constant folding removes var statement
+ *
+ * @test
+ * @run
+ */
+
+if (false) {
+ var x1 = 10;
+ if (false) {
+ var x2;
+ }
+} else {
+ print(x1, x2);
+}
+
+if (undefined) {
+ var z1;
+ if (null) {
+ var z2;
+ }
+}
+
+print(z1, z2);
+
+if (1) {
+ print(y1, y2);
+} else if (0) {
+ var y1 = 1;
+} else {
+ var y2 = 2
+}
diff --git a/nashorn/test/script/basic/JDK-8026008.js.EXPECTED b/nashorn/test/script/basic/JDK-8026008.js.EXPECTED
new file mode 100644
index 0000000..6bbb6d9
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026008.js.EXPECTED
@@ -0,0 +1,3 @@
+undefined undefined
+undefined undefined
+undefined undefined
diff --git a/nashorn/test/script/basic/JDK-8026016.js b/nashorn/test/script/basic/JDK-8026016.js
new file mode 100644
index 0000000..43f268d
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026016.js
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2010, 2013, 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.
+ */
+
+/**
+ * JDK-8026016: too many relinks dominate avatar.js http benchmark
+ *
+ * @test
+ * @run
+ */
+
+function accessMegamorphic() {
+ for (var i = 0; i < 26; i++) {
+ var o = {};
+ o[String.fromCharCode(i + 97)] = 1;
+ o._;
+ }
+}
+
+function invokeMegamorphic() {
+ for (var i = 0; i < 26; i++) {
+ var o = {};
+ o[String.fromCharCode(i + 97)] = 1;
+ try {
+ o._(i);
+ } catch (e) {
+ print(e);
+ }
+ }
+}
+
+Object.prototype.__noSuchProperty__ = function() {
+ print("no such property", Array.prototype.slice.call(arguments));
+};
+
+invokeMegamorphic();
+accessMegamorphic();
+
+Object.prototype.__noSuchMethod__ = function() {
+ print("no such method", Array.prototype.slice.call(arguments));
+};
+
+invokeMegamorphic();
+accessMegamorphic();
+
+Object.prototype.__noSuchMethod__ = "nofunction";
+
+invokeMegamorphic();
+accessMegamorphic();
diff --git a/nashorn/test/script/basic/JDK-8026016.js.EXPECTED b/nashorn/test/script/basic/JDK-8026016.js.EXPECTED
new file mode 100644
index 0000000..a2d2383
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026016.js.EXPECTED
@@ -0,0 +1,182 @@
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+TypeError: Cannot call undefined
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such method _,0
+no such method _,1
+no such method _,2
+no such method _,3
+no such method _,4
+no such method _,5
+no such method _,6
+no such method _,7
+no such method _,8
+no such method _,9
+no such method _,10
+no such method _,11
+no such method _,12
+no such method _,13
+no such method _,14
+no such method _,15
+no such method _,16
+no such method _,17
+no such method _,18
+no such method _,19
+no such method _,20
+no such method _,21
+no such method _,22
+no such method _,23
+no such method _,24
+no such method _,25
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+TypeError: Cannot call undefined
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
+no such property _
diff --git a/nashorn/test/script/basic/JDK-8026112.js b/nashorn/test/script/basic/JDK-8026112.js
new file mode 100644
index 0000000..0e869f7
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026112.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2010, 2013, 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.
+ */
+
+/**
+ * JDK-8026112: Function("with(x ? 1e81 : (x2.constructor = 0.1)){}") throws AssertionError: double is not compatible with object
+ *
+ * @test
+ * @run
+ */
+
+Function("with(x ? 1e81 : (x2.constructor = 0.1)){}")
diff --git a/nashorn/test/script/basic/JDK-8026125.js b/nashorn/test/script/basic/JDK-8026125.js
new file mode 100644
index 0000000..bb3a43d
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026125.js
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010, 2013, 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.
+ */
+
+/**
+ * JDK-8026125: Array.prototype.slice.call(Java.type("java.util.HashMap")) throws ClassCastException: jdk.internal.dynalink.beans.StaticClass cannot be cast to jdk.nashorn.internal.runtime.ScriptObject
+ *
+ * @test
+ * @run
+ */
+
+Array.prototype.splice.call(Java.type("java.util.HashMap"))
+Array.prototype.slice.call(Java.type("java.util.HashMap"))
diff --git a/nashorn/test/script/basic/JDK-8026137.js b/nashorn/test/script/basic/JDK-8026137.js
new file mode 100644
index 0000000..4a19643
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026137.js
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2013, 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.
+ */
+
+/**
+ * JDK-8026137: Binary evaluation order in JavaScript is load load
+ * convert convert, not load convert load convert.
+ *
+ * @test
+ * @run
+ */
+
+try {
+ (function f() { Object.defineProperty({},"x",{get: function(){return {valueOf:function(){throw 0}}}}).x - Object.defineProperty({},"x",{get: function(){throw 1}}).x })()
+}
+catch (e) {
+ print(e);
+}
+
+try {
+ ({valueOf: function(){throw 0}}) - ({valueOf: function(){throw 1}} - 1)
+} catch (e) {
+ print(e);
+}
+
diff --git a/nashorn/test/script/basic/JDK-8026137.js.EXPECTED b/nashorn/test/script/basic/JDK-8026137.js.EXPECTED
new file mode 100644
index 0000000..6ed281c
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026137.js.EXPECTED
@@ -0,0 +1,2 @@
+1
+1
diff --git a/nashorn/test/script/basic/JDK-8026162.js b/nashorn/test/script/basic/JDK-8026162.js
new file mode 100644
index 0000000..ccd6ee7
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026162.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2013, 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.
+ */
+
+/**
+ * JDK-8026162: "this" in SAM adapter functions is wrong
+ *
+ * @test
+ * @run
+ */
+
+var global = this;
+
+new java.lang.Runnable(
+ function func() {
+ if (this !== global) {
+ fail("Expected 'this' to be global instance");
+ }
+ }
+).run();
+
+new java.lang.Runnable(
+ function func() {
+ 'use strict';
+ if (typeof this != 'undefined') {
+ fail("Expected 'undefined' to be global instance");
+ }
+ }
+).run();
diff --git a/nashorn/test/script/basic/JDK-8026167.js b/nashorn/test/script/basic/JDK-8026167.js
new file mode 100644
index 0000000..4959e62
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026167.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, 2013, 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.
+ */
+
+/**
+ * JDK-8026167: Class cache/reuse of 'eval' scripts results in ClassCastException in some cases.
+ *
+ * @test
+ * @run
+ */
+
+var m = new javax.script.ScriptEngineManager();
+var e = m.getEngineByName('js');
+
+// leave the whitespace - need both eval("e") at same column for this test!
+
+e.eval('function f(e) { eval("e") } f()');
+e.eval('function f() { var e = 33; eval("e") } f()');
+
+function f() {
+ Function.call.call(function x() { eval("x") }); eval("x")
+}
+
+try {
+ f();
+ fail("Should have thrown ReferenceError");
+} catch (e) {
+ if (! (e instanceof ReferenceError)) {
+ fail("ReferenceError expected but got " + e);
+ }
+}
diff --git a/nashorn/test/script/basic/JDK-8026248.js b/nashorn/test/script/basic/JDK-8026248.js
new file mode 100644
index 0000000..e54d338
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026248.js
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2013, 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.
+ */
+
+/**
+ * JDK-8026248: importClass has to be a varargs function
+ *
+ * @test
+ * @run
+ */
+
+load('nashorn:mozilla_compat.js')
+
+importClass(java.io.File, java.io.InputStream)
+
+print(File)
+print(InputStream)
+
+importClass(java.util.Map, java.util.HashMap, java.io.PrintStream)
+
+print(HashMap)
+print(Map)
+print(PrintStream)
+
+importClass.call(this, java.util.Collections, java.util.List);
+print(Collections)
+print(List)
+
+importClass.apply(this, [ java.util.Queue, java.math.BigInteger, java.math.BigDecimal ]);
+print(Queue)
+print(BigInteger)
+print(BigDecimal)
diff --git a/nashorn/test/script/basic/JDK-8026248.js.EXPECTED b/nashorn/test/script/basic/JDK-8026248.js.EXPECTED
new file mode 100644
index 0000000..361b8e1
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026248.js.EXPECTED
@@ -0,0 +1,10 @@
+[JavaClass java.io.File]
+[JavaClass java.io.InputStream]
+[JavaClass java.util.HashMap]
+[JavaClass java.util.Map]
+[JavaClass java.io.PrintStream]
+[JavaClass java.util.Collections]
+[JavaClass java.util.List]
+[JavaClass java.util.Queue]
+[JavaClass java.math.BigInteger]
+[JavaClass java.math.BigDecimal]
diff --git a/nashorn/test/script/basic/JDK-8026264.js b/nashorn/test/script/basic/JDK-8026264.js
new file mode 100644
index 0000000..b4de01d
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026264.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2013, 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.
+ */
+
+/**
+ * JDK-8026264: Getter, setter function name mangling issues
+ *
+ * @test
+ * @run
+ */
+
+var obj = {
+ get ":"(){},
+ set ":"(x){},
+ get ""(){},
+ set ""(x){}
+};
+
+var desc = Object.getOwnPropertyDescriptor(obj, ":");
+if (desc.get.name != ':') {
+ fail("getter name is expected to be ':' got " + desc.get.name);
+}
+
+if (desc.set.name != ':') {
+ fail("setter name is expected to be ':' got " + desc.set.name);
+}
+
+desc = Object.getOwnPropertyDescriptor(obj, "");
+if (desc.get.name != '') {
+ fail("getter name is expected to be '' got " + desc.get.name);
+}
+
+if (desc.set.name != '') {
+ fail("setter name is expected to be '' got " + desc.set.name);
+}
diff --git a/nashorn/test/script/basic/JDK-8026292.js b/nashorn/test/script/basic/JDK-8026292.js
new file mode 100644
index 0000000..740895f
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026292.js
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2010, 2013, 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.
+ */
+
+/**
+ * JDK-8026292: Megamorphic setter fails with boolean value
+ *
+ * @test
+ * @run
+ */
+
+function megamorphic(o) {
+ o.w = true;
+ if (!o.w)
+ throw new Error();
+}
+
+// Calls below must exceed megamorphic callsite threshhold
+for (var i = 0; i < 10; i++) {
+ megamorphic({a: 1});
+ megamorphic({b: 1});
+ megamorphic({c: 1});
+ megamorphic({d: 1});
+ megamorphic({e: 1});
+ megamorphic({f: 1});
+ megamorphic({g: 1});
+ megamorphic({h: 1});
+ megamorphic({i: 1});
+ megamorphic({j: 1});
+ megamorphic({k: 1});
+ megamorphic({l: 1});
+ megamorphic({m: 1});
+ megamorphic({n: 1});
+ megamorphic({o: 1});
+ megamorphic({p: 1});
+ megamorphic({q: 1});
+ megamorphic({r: 1});
+ megamorphic({s: 1});
+ megamorphic({t: 1});
+ megamorphic({u: 1});
+ megamorphic({v: 1});
+ megamorphic({w: 1});
+ megamorphic({x: 1});
+ megamorphic({y: 1});
+ megamorphic({z: 1});
+}
diff --git a/nashorn/test/script/basic/JDK-8026302.js b/nashorn/test/script/basic/JDK-8026302.js
new file mode 100644
index 0000000..786cc11
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026302.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2013, 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.
+ */
+
+/**
+ * JDK-8026302: source representation of getter and setter methods is wrong
+ *
+ * @test
+ * @run
+ */
+
+var obj = {
+ get "foo"() {},
+ set "foo"(x) {},
+ get bar() {},
+ set bar(x) {},
+ get ":"() {},
+ set ":"(x) {},
+ get 12() {},
+ set 12(x) {},
+ get 1.8e-8() {},
+ set 1.8e-8(x) {}
+}
+
+for (var prop in obj) {
+ var desc = Object.getOwnPropertyDescriptor(obj, prop);
+ print(desc.get);
+ print(desc.set);
+}
diff --git a/nashorn/test/script/basic/JDK-8026302.js.EXPECTED b/nashorn/test/script/basic/JDK-8026302.js.EXPECTED
new file mode 100644
index 0000000..232edc0
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026302.js.EXPECTED
@@ -0,0 +1,10 @@
+get "foo"() {}
+set "foo"(x) {}
+get bar() {}
+set bar(x) {}
+get ":"() {}
+set ":"(x) {}
+get 12() {}
+set 12(x) {}
+get 1.8e-8() {}
+set 1.8e-8(x) {}
diff --git a/nashorn/test/script/basic/JDK-8026317.js b/nashorn/test/script/basic/JDK-8026317.js
new file mode 100644
index 0000000..57bea9c
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026317.js
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2010, 2013, 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.
+ */
+
+/**
+ * JDK-8026317: $ in the function name results in wrong function being invoked
+ *
+ * @test
+ * @run
+ */
+
+function case1() {
+ function g() {
+ return 0
+ }
+ function g() {
+ return 1
+ }
+ function g$1() {
+ return 2
+ }
+
+ return g$1()
+}
+
+print(case1());
+
+function case2() {
+ function g() {
+ return 0
+ }
+
+ var h = function g() {
+ return 1
+ }
+
+ function g$1() {
+ return 2
+ }
+
+ return h()
+}
+
+print(case2());
diff --git a/nashorn/test/script/basic/JDK-8026317.js.EXPECTED b/nashorn/test/script/basic/JDK-8026317.js.EXPECTED
new file mode 100644
index 0000000..5f1d0ec
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026317.js.EXPECTED
@@ -0,0 +1,2 @@
+2
+1
diff --git a/nashorn/test/script/basic/JDK-8026367.js b/nashorn/test/script/basic/JDK-8026367.js
new file mode 100644
index 0000000..c5e1235
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026367.js
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2010, 2013, 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.
+ */
+
+/**
+ * JDK-8026367: Add a sync keyword to mozilla_compat
+ *
+ * @test
+ * @run
+ */
+
+if (typeof sync === "undefined") {
+ load("nashorn:mozilla_compat.js");
+}
+
+var obj = {
+ count: 0,
+ // Sync called with one argument will synchronize on this-object of invocation
+ inc: sync(function(d) {
+ this.count += d;
+ }),
+ // Pass explicit object to synchronize on as second argument
+ dec: sync(function(d) {
+ this.count -= d;
+ }, obj)
+};
+
+var t1 = new java.lang.Thread(function() {
+ for (var i = 0; i < 100000; i++) obj.inc(1);
+});
+var t2 = new java.lang.Thread(function() {
+ for (var i = 0; i < 100000; i++) obj.dec(1);
+});
+
+t1.start();
+t2.start();
+t1.join();
+t2.join();
+
+if (obj.count !== 0) {
+ throw new Error("Expected count == 0, got " + obj.count);
+}
diff --git a/nashorn/test/script/basic/JDK-8026692.js b/nashorn/test/script/basic/JDK-8026692.js
new file mode 100644
index 0000000..f9f0f38
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026692.js
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010, 2013, 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.
+ */
+
+/**
+ * JDK-8026692: eval() throws NullPointerException with --compile-only
+ *
+ * @test
+ * @option --compile-only
+ * @run
+ */
+
+eval("");
diff --git a/nashorn/test/script/basic/JDK-8026693.js b/nashorn/test/script/basic/JDK-8026693.js
new file mode 100644
index 0000000..fd1dd5f
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8026693.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2013, 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.
+ */
+
+/**
+ * JDK-8026693: getType() called on DISCARD node
+ *
+ * @test
+ * @run
+ */
+
+function f() {
+ if(x, y) z;
+}
diff --git a/nashorn/test/script/basic/NASHORN-100.js b/nashorn/test/script/basic/NASHORN-100.js
index fdea1cf..df81284 100644
--- a/nashorn/test/script/basic/NASHORN-100.js
+++ b/nashorn/test/script/basic/NASHORN-100.js
@@ -35,5 +35,5 @@
if (! (e instanceof SyntaxError)) {
fail("#2 expected SyntaxError got " + e);
}
- print(e.toString().replace(/\\/g, '/'));
+ printError(e);
}
diff --git a/nashorn/test/script/basic/NASHORN-100.js.EXPECTED b/nashorn/test/script/basic/NASHORN-100.js.EXPECTED
index d183bb3..e9c5a25 100644
--- a/nashorn/test/script/basic/NASHORN-100.js.EXPECTED
+++ b/nashorn/test/script/basic/NASHORN-100.js.EXPECTED
@@ -1,3 +1,3 @@
-SyntaxError: test/script/basic/NASHORN-100.js#32<eval>:1:0 Invalid return statement
+SyntaxError:32:Invalid return statement
return;
^
diff --git a/nashorn/test/script/basic/NASHORN-293.js b/nashorn/test/script/basic/NASHORN-293.js
index cd83ec4..013714b 100644
--- a/nashorn/test/script/basic/NASHORN-293.js
+++ b/nashorn/test/script/basic/NASHORN-293.js
@@ -40,15 +40,13 @@
try {
eval(src);
} catch (e) {
- var location = e.fileName ? e.fileName.slice(-9) : "unknown source";
- print(e.name, "@", location);
+ printError(e);
}
}
for (var i = 0; i < 3; i++) {
try {
eval(src);
} catch (e) {
- var location = e.fileName ? e.fileName.slice(-9) : "unknown source";
- print(e.name, "@", location);
+ printError(e);
}
}
diff --git a/nashorn/test/script/basic/NASHORN-293.js.EXPECTED b/nashorn/test/script/basic/NASHORN-293.js.EXPECTED
index 6827810..90fe5f0 100644
--- a/nashorn/test/script/basic/NASHORN-293.js.EXPECTED
+++ b/nashorn/test/script/basic/NASHORN-293.js.EXPECTED
@@ -1,9 +1,9 @@
hello
hello
hello
-TypeError @ #41<eval>
-TypeError @ #41<eval>
-TypeError @ #41<eval>
-TypeError @ #49<eval>
-TypeError @ #49<eval>
-TypeError @ #49<eval>
+TypeError:1:read property "foo" from undefined
+TypeError:1:read property "foo" from undefined
+TypeError:1:read property "foo" from undefined
+TypeError:1:read property "foo" from undefined
+TypeError:1:read property "foo" from undefined
+TypeError:1:read property "foo" from undefined
diff --git a/nashorn/test/script/basic/NASHORN-40.js b/nashorn/test/script/basic/NASHORN-40.js
index f031730..34331ef 100644
--- a/nashorn/test/script/basic/NASHORN-40.js
+++ b/nashorn/test/script/basic/NASHORN-40.js
@@ -31,11 +31,11 @@
try {
eval("print(.foo)");
} catch (e) {
- print(e.toString().replace(/\\/g, '/'));
+ printError(e);
}
try {
eval(".bar = 3423;");
} catch (e) {
- print(e.toString().replace(/\\/g, '/'));
+ printError(e);
}
diff --git a/nashorn/test/script/basic/NASHORN-40.js.EXPECTED b/nashorn/test/script/basic/NASHORN-40.js.EXPECTED
index 0e03cab..94f1598 100644
--- a/nashorn/test/script/basic/NASHORN-40.js.EXPECTED
+++ b/nashorn/test/script/basic/NASHORN-40.js.EXPECTED
@@ -1,6 +1,6 @@
-SyntaxError: test/script/basic/NASHORN-40.js#32<eval>:1:6 Expected an operand but found .
+SyntaxError:32:Expected an operand but found .
print(.foo)
^
-SyntaxError: test/script/basic/NASHORN-40.js#38<eval>:1:0 Expected an operand but found .
+SyntaxError:38:Expected an operand but found .
.bar = 3423;
^
diff --git a/nashorn/test/script/basic/NASHORN-51.js b/nashorn/test/script/basic/NASHORN-51.js
index bc41d79..45d00e9 100644
--- a/nashorn/test/script/basic/NASHORN-51.js
+++ b/nashorn/test/script/basic/NASHORN-51.js
@@ -35,28 +35,28 @@
eval(literals[i] + "++");
print("ERROR!! post increment : " + literals[i]);
} catch (e) {
- print(e.toString().replace(/\\/g, '/'));
+ printError(e);
}
try {
eval(literals[i] + "--");
print("ERROR!! post decrement : " + literals[i]);
} catch (e) {
- print(e.toString().replace(/\\/g, '/'));
+ printError(e);
}
try {
eval("++" + literals[i]);
print("ERROR!! pre increment : " + literals[i]);
} catch (e) {
- print(e.toString().replace(/\\/g, '/'));
+ printError(e);
}
try {
eval("--" + literals[i]);
print("ERROR!! pre decrement : " + literals[i]);
} catch (e) {
- print(e.toString().replace(/\\/g, '/'));
+ printError(e);
}
}
diff --git a/nashorn/test/script/basic/NASHORN-51.js.EXPECTED b/nashorn/test/script/basic/NASHORN-51.js.EXPECTED
index 9479f7e..5201385 100644
--- a/nashorn/test/script/basic/NASHORN-51.js.EXPECTED
+++ b/nashorn/test/script/basic/NASHORN-51.js.EXPECTED
@@ -1,72 +1,72 @@
-ReferenceError: test/script/basic/NASHORN-51.js#35<eval>:1:0 Invalid left hand side for assignment
+ReferenceError:35:Invalid left hand side for assignment
1++
^
-ReferenceError: test/script/basic/NASHORN-51.js#42<eval>:1:0 Invalid left hand side for assignment
+ReferenceError:42:Invalid left hand side for assignment
1--
^
-ReferenceError: test/script/basic/NASHORN-51.js#49<eval>:1:2 Invalid left hand side for assignment
+ReferenceError:49:Invalid left hand side for assignment
++1
^
-ReferenceError: test/script/basic/NASHORN-51.js#56<eval>:1:2 Invalid left hand side for assignment
+ReferenceError:56:Invalid left hand side for assignment
--1
^
-ReferenceError: test/script/basic/NASHORN-51.js#35<eval>:1:0 Invalid left hand side for assignment
+ReferenceError:35:Invalid left hand side for assignment
0++
^
-ReferenceError: test/script/basic/NASHORN-51.js#42<eval>:1:0 Invalid left hand side for assignment
+ReferenceError:42:Invalid left hand side for assignment
0--
^
-ReferenceError: test/script/basic/NASHORN-51.js#49<eval>:1:2 Invalid left hand side for assignment
+ReferenceError:49:Invalid left hand side for assignment
++0
^
-ReferenceError: test/script/basic/NASHORN-51.js#56<eval>:1:2 Invalid left hand side for assignment
+ReferenceError:56:Invalid left hand side for assignment
--0
^
-ReferenceError: test/script/basic/NASHORN-51.js#35<eval>:1:0 Invalid left hand side for assignment
+ReferenceError:35:Invalid left hand side for assignment
3.14++
^
-ReferenceError: test/script/basic/NASHORN-51.js#42<eval>:1:0 Invalid left hand side for assignment
+ReferenceError:42:Invalid left hand side for assignment
3.14--
^
-ReferenceError: test/script/basic/NASHORN-51.js#49<eval>:1:2 Invalid left hand side for assignment
+ReferenceError:49:Invalid left hand side for assignment
++3.14
^
-ReferenceError: test/script/basic/NASHORN-51.js#56<eval>:1:2 Invalid left hand side for assignment
+ReferenceError:56:Invalid left hand side for assignment
--3.14
^
-ReferenceError: test/script/basic/NASHORN-51.js#35<eval>:1:0 Invalid left hand side for assignment
+ReferenceError:35:Invalid left hand side for assignment
true++
^
-ReferenceError: test/script/basic/NASHORN-51.js#42<eval>:1:0 Invalid left hand side for assignment
+ReferenceError:42:Invalid left hand side for assignment
true--
^
-ReferenceError: test/script/basic/NASHORN-51.js#49<eval>:1:2 Invalid left hand side for assignment
+ReferenceError:49:Invalid left hand side for assignment
++true
^
-ReferenceError: test/script/basic/NASHORN-51.js#56<eval>:1:2 Invalid left hand side for assignment
+ReferenceError:56:Invalid left hand side for assignment
--true
^
-ReferenceError: test/script/basic/NASHORN-51.js#35<eval>:1:0 Invalid left hand side for assignment
+ReferenceError:35:Invalid left hand side for assignment
false++
^
-ReferenceError: test/script/basic/NASHORN-51.js#42<eval>:1:0 Invalid left hand side for assignment
+ReferenceError:42:Invalid left hand side for assignment
false--
^
-ReferenceError: test/script/basic/NASHORN-51.js#49<eval>:1:2 Invalid left hand side for assignment
+ReferenceError:49:Invalid left hand side for assignment
++false
^
-ReferenceError: test/script/basic/NASHORN-51.js#56<eval>:1:2 Invalid left hand side for assignment
+ReferenceError:56:Invalid left hand side for assignment
--false
^
-ReferenceError: test/script/basic/NASHORN-51.js#35<eval>:1:0 Invalid left hand side for assignment
+ReferenceError:35:Invalid left hand side for assignment
null++
^
-ReferenceError: test/script/basic/NASHORN-51.js#42<eval>:1:0 Invalid left hand side for assignment
+ReferenceError:42:Invalid left hand side for assignment
null--
^
-ReferenceError: test/script/basic/NASHORN-51.js#49<eval>:1:2 Invalid left hand side for assignment
+ReferenceError:49:Invalid left hand side for assignment
++null
^
-ReferenceError: test/script/basic/NASHORN-51.js#56<eval>:1:2 Invalid left hand side for assignment
+ReferenceError:56:Invalid left hand side for assignment
--null
^
diff --git a/nashorn/test/script/basic/NASHORN-98.js b/nashorn/test/script/basic/NASHORN-98.js
index 3e50cf5..9e341e0 100644
--- a/nashorn/test/script/basic/NASHORN-98.js
+++ b/nashorn/test/script/basic/NASHORN-98.js
@@ -34,7 +34,7 @@
if (! (e instanceof SyntaxError)) {
fail("syntax error expected here got " + e);
}
- print(e.toString().replace(/\\/g, '/'));
+ printError(e);
}
try {
@@ -43,5 +43,5 @@
if (! (e instanceof SyntaxError)) {
fail("syntax error expected here got " + e);
}
- print(e.toString().replace(/\\/g, '/'));
+ printError(e);
}
diff --git a/nashorn/test/script/basic/NASHORN-98.js.EXPECTED b/nashorn/test/script/basic/NASHORN-98.js.EXPECTED
index 93a8936..a43935b 100644
--- a/nashorn/test/script/basic/NASHORN-98.js.EXPECTED
+++ b/nashorn/test/script/basic/NASHORN-98.js.EXPECTED
@@ -1,6 +1,6 @@
-SyntaxError: test/script/basic/NASHORN-98.js#32<eval>:1:13 Expected comma but found decimal
+SyntaxError:32:Expected comma but found decimal
var x = [ 23 34 ]
^
-SyntaxError: test/script/basic/NASHORN-98.js#41<eval>:1:18 Expected comma but found ident
+SyntaxError:41:Expected comma but found ident
var x = { foo: 33 bar: 'hello' }
^
diff --git a/nashorn/test/script/basic/eval.js b/nashorn/test/script/basic/eval.js
index bd63068..3d66c02 100644
--- a/nashorn/test/script/basic/eval.js
+++ b/nashorn/test/script/basic/eval.js
@@ -69,5 +69,5 @@
eval("print('hello)");
} catch (e) {
print("is syntax error? " + (e instanceof SyntaxError));
- print(e.toString().replace(/\\/g, '/'));
+ printError(e);
}
diff --git a/nashorn/test/script/basic/eval.js.EXPECTED b/nashorn/test/script/basic/eval.js.EXPECTED
index 3ab2f3d..7fe97ef 100644
--- a/nashorn/test/script/basic/eval.js.EXPECTED
+++ b/nashorn/test/script/basic/eval.js.EXPECTED
@@ -10,6 +10,6 @@
100
3300
is syntax error? true
-SyntaxError: test/script/basic/eval.js#69<eval>:1:13 Missing close quote
+SyntaxError:69:Missing close quote
print('hello)
^
diff --git a/nashorn/test/script/basic/objects.js.EXPECTED b/nashorn/test/script/basic/objects.js.EXPECTED
index a6bedc0..d59daa8 100644
--- a/nashorn/test/script/basic/objects.js.EXPECTED
+++ b/nashorn/test/script/basic/objects.js.EXPECTED
@@ -29,18 +29,18 @@
abc is configurable? true
abc is enumerable? true
abc's value = undefined
-abc's get = abc() { return "abc"; }
+abc's get = get abc() { return "abc"; }
abc's set = undefined
xyz is writable? undefined
xyz is configurable? true
xyz is enumerable? true
xyz's value = undefined
xyz's get = undefined
-xyz's set = xyz(val) { print(val); }
+xyz's set = set xyz(val) { print(val); }
hey is writable? undefined
hey is configurable? true
hey is enumerable? true
hey's value = undefined
-hey's get = hey() { return "hey"; }
-hey's set = hey(val) { print(val); }
+hey's get = get hey() { return "hey"; }
+hey's set = set hey(val) { print(val); }
undefined
diff --git a/nashorn/test/script/sandbox/loadcompat.js b/nashorn/test/script/sandbox/loadcompat.js
index e99f67f..f0338df 100644
--- a/nashorn/test/script/sandbox/loadcompat.js
+++ b/nashorn/test/script/sandbox/loadcompat.js
@@ -48,3 +48,7 @@
if (typeof importPackage != 'function') {
fail("importPackage function is missing in compatibility script");
}
+
+if (typeof sync != 'function') {
+ fail("sync function is missing in compatibility script");
+}
diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/ArrayConversionTest.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/ArrayConversionTest.java
new file mode 100644
index 0000000..4a1d8d5
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/ArrayConversionTest.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright (c) 2010, 2013, 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 jdk.nashorn.api.javaaccess;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.script.ScriptContext;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import org.testng.TestNG;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class ArrayConversionTest {
+ private static ScriptEngine e = null;
+
+ public static void main(final String[] args) {
+ TestNG.main(args);
+ }
+
+ @BeforeClass
+ public static void setUpClass() throws ScriptException {
+ e = new ScriptEngineManager().getEngineByName("nashorn");
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ e = null;
+ }
+
+ @Test
+ public void testIntArrays() throws ScriptException {
+ runTest("assertNullIntArray", "null");
+ runTest("assertEmptyIntArray", "[]");
+ runTest("assertSingle42IntArray", "[42]");
+ runTest("assertSingle42IntArray", "['42']");
+ runTest("assertIntArrayConversions", "[false, true, NaN, Infinity, -Infinity, 0.4, 0.6, null, undefined, [], {}, [1], [1, 2]]");
+ }
+
+ @Test
+ public void testIntIntArrays() throws ScriptException {
+ runTest("assertNullIntIntArray", "null");
+ runTest("assertEmptyIntIntArray", "[]");
+ runTest("assertSingleEmptyIntIntArray", "[[]]");
+ runTest("assertSingleNullIntIntArray", "[null]");
+ runTest("assertLargeIntIntArray", "[[false], [1], [2, 3], [4, 5, 6], ['7', {valueOf: function() { return 8 }}]]");
+ }
+
+ @Test
+ public void testObjectObjectArrays() throws ScriptException {
+ runTest("assertLargeObjectObjectArray", "[[false], [1], ['foo', 42.3], [{x: 17}]]");
+ }
+
+ @Test
+ public void testBooleanArrays() throws ScriptException {
+ runTest("assertBooleanArrayConversions", "[false, true, '', 'false', 0, 1, 0.4, 0.6, {}, [], [false], [true], NaN, Infinity, null, undefined]");
+ }
+
+ @Test
+ public void testArrayAmbiguity() throws ScriptException {
+ runTest("x", "'abc'");
+ runTest("x", "['foo', 'bar']");
+ }
+
+ @Test
+ public void testListArrays() throws ScriptException {
+ runTest("assertListArray", "[['foo', 'bar'], ['apple', 'orange']]");
+ }
+
+ @Test
+ public void testVarArgs() throws ScriptException {
+ // Sole NativeArray in vararg position becomes vararg array itself
+ runTest("assertVarArg_42_17", "[42, 17]");
+ // NativeArray in vararg position becomes an argument if there are more arguments
+ runTest("assertVarArg_array_17", "[42], 18");
+ // Only NativeArray is converted to vararg array, other objects (e.g. a function) aren't
+ runTest("assertVarArg_function", "function() { return 'Hello' }");
+ }
+
+ private static void runTest(final String testMethodName, final String argument) throws ScriptException {
+ e.eval("Java.type('" + ArrayConversionTest.class.getName() + "')." + testMethodName + "(" + argument + ")");
+ }
+
+ public static void assertNullIntArray(int[] array) {
+ assertNull(array);
+ }
+
+ public static void assertNullIntIntArray(int[][] array) {
+ assertNull(array);
+ }
+
+ public static void assertEmptyIntArray(int[] array) {
+ assertEquals(0, array.length);
+ }
+
+ public static void assertSingle42IntArray(int[] array) {
+ assertEquals(1, array.length);
+ assertEquals(42, array[0]);
+ }
+
+
+ public static void assertIntArrayConversions(int[] array) {
+ assertEquals(13, array.length);
+ assertEquals(0, array[0]); // false
+ assertEquals(1, array[1]); // true
+ assertEquals(0, array[2]); // NaN
+ assertEquals(0, array[3]); // Infinity
+ assertEquals(0, array[4]); // -Infinity
+ assertEquals(0, array[5]); // 0.4
+ assertEquals(0, array[6]); // 0.6 - floor, not round
+ assertEquals(0, array[7]); // null
+ assertEquals(0, array[8]); // undefined
+ assertEquals(0, array[9]); // []
+ assertEquals(0, array[10]); // {}
+ assertEquals(1, array[11]); // [1]
+ assertEquals(0, array[12]); // [1, 2]
+ }
+
+ public static void assertEmptyIntIntArray(int[][] array) {
+ assertEquals(0, array.length);
+ }
+
+ public static void assertSingleEmptyIntIntArray(int[][] array) {
+ assertEquals(1, array.length);
+ assertTrue(Arrays.equals(new int[0], array[0]));
+ }
+
+ public static void assertSingleNullIntIntArray(int[][] array) {
+ assertEquals(1, array.length);
+ assertNull(null, array[0]);
+ }
+
+ public static void assertLargeIntIntArray(int[][] array) {
+ assertEquals(5, array.length);
+ assertTrue(Arrays.equals(new int[] { 0 }, array[0]));
+ assertTrue(Arrays.equals(new int[] { 1 }, array[1]));
+ assertTrue(Arrays.equals(new int[] { 2, 3 }, array[2]));
+ assertTrue(Arrays.equals(new int[] { 4, 5, 6 }, array[3]));
+ assertTrue(Arrays.equals(new int[] { 7, 8 }, array[4]));
+ }
+
+ public static void assertLargeObjectObjectArray(Object[][] array) throws ScriptException {
+ assertEquals(4, array.length);
+ assertTrue(Arrays.equals(new Object[] { Boolean.FALSE }, array[0]));
+ assertTrue(Arrays.equals(new Object[] { 1 }, array[1]));
+ assertTrue(Arrays.equals(new Object[] { "foo", 42.3d }, array[2]));
+ assertEquals(1, array[3].length);
+ e.getBindings(ScriptContext.ENGINE_SCOPE).put("obj", array[3][0]);
+ assertEquals(17, e.eval("obj.x"));
+ }
+
+ public static void assertBooleanArrayConversions(boolean[] array) {
+ assertEquals(16, array.length);
+ assertFalse(array[0]); // false
+ assertTrue(array[1]); // true
+ assertFalse(array[2]); // ''
+ assertTrue(array[3]); // 'false' (yep, every non-empty string converts to true)
+ assertFalse(array[4]); // 0
+ assertTrue(array[5]); // 1
+ assertTrue(array[6]); // 0.4
+ assertTrue(array[7]); // 0.6
+ assertTrue(array[8]); // {}
+ assertTrue(array[9]); // []
+ assertTrue(array[10]); // [false]
+ assertTrue(array[11]); // [true]
+ assertFalse(array[12]); // NaN
+ assertTrue(array[13]); // Infinity
+ assertFalse(array[14]); // null
+ assertFalse(array[15]); // undefined
+ }
+
+ public static void assertListArray(List<?>[] array) {
+ assertEquals(2, array.length);
+ assertEquals(Arrays.asList("foo", "bar"), array[0]);
+ assertEquals(Arrays.asList("apple", "orange"), array[1]);
+ }
+
+ public static void assertVarArg_42_17(Object... args) throws ScriptException {
+ assertEquals(2, args.length);
+ assertEquals(42, ((Number)args[0]).intValue());
+ assertEquals(17, ((Number)args[1]).intValue());
+ }
+
+ public static void assertVarArg_array_17(Object... args) throws ScriptException {
+ assertEquals(2, args.length);
+ e.getBindings(ScriptContext.ENGINE_SCOPE).put("arr", args[0]);
+ assertTrue((Boolean)e.eval("arr instanceof Array && arr.length == 1 && arr[0] == 42"));
+ assertEquals(18, ((Number)args[1]).intValue());
+ }
+
+ public static void assertVarArg_function(Object... args) throws ScriptException {
+ assertEquals(1, args.length);
+ e.getBindings(ScriptContext.ENGINE_SCOPE).put("fn", args[0]);
+ assertEquals("Hello", e.eval("fn()"));
+ }
+
+
+
+ public static void x(String y) {
+ assertEquals("abc", y);
+ }
+ public static void x(String[] y) {
+ assertTrue(Arrays.equals(new String[] { "foo", "bar"}, y));
+ }
+}
