archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-16 17:14:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Lana Steuck 2017-03-13 19:59:41 +00:00
commit b636d90917
1125 changed files with 28416 additions and 14962 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.hgtags
View file

@ -1,3 +1,5 @@
fa3e76b477829afc4476f0b725cfaa440a6fd917 jdk-9+157
b5015f742ba648184bb7fc547197bd33ebfde30d jdk-9+158
1cc8dd79fd1cd13d36b385196271a29632c67c3b jdk7-b24 1cc8dd79fd1cd13d36b385196271a29632c67c3b jdk7-b24
bf2517e15f0c0f950e5b3143c4ca11e2df73dcc1 jdk7-b25 bf2517e15f0c0f950e5b3143c4ca11e2df73dcc1 jdk7-b25
5ae7db536e3fcf6be78e45b240a9058095e0ed38 jdk7-b26 5ae7db536e3fcf6be78e45b240a9058095e0ed38 jdk7-b26
@ -399,3 +401,5 @@ d7034ff7f8e257e81c9f95c7785dd4eaaa3c2afc jdk-9+153
8c70d170e62c0c58b5bc3ba666bd140399b98c9c jdk-10+0 8c70d170e62c0c58b5bc3ba666bd140399b98c9c jdk-10+0
45b751afd11e6c05991cf4913c5a0ac3304fcc4e jdk-9+154 45b751afd11e6c05991cf4913c5a0ac3304fcc4e jdk-9+154
f4aff695ffe05cfdb69d8af25a4ddc6a029754ea jdk-9+155 f4aff695ffe05cfdb69d8af25a4ddc6a029754ea jdk-9+155
06bce0388880b5ff8e040e4a9d72a3ea11dac321 jdk-9+156
74116beae88a8f17a80301aa6c83865c82f10ece jdk-10+1

4
.hgtags-top-repo
View file

@ -396,5 +396,9 @@ b119012d1c2ab2570fe8718633840d0c1f1f441d jdk-9+149
71a766d4c18041a7f833ee22823125b02e1a7f1e jdk-9+151 71a766d4c18041a7f833ee22823125b02e1a7f1e jdk-9+151
ef056360ddf3977d7d2ddbeb456a4d612d19ea05 jdk-9+152 ef056360ddf3977d7d2ddbeb456a4d612d19ea05 jdk-9+152
816a6d03a7c44edfbd8780110529f1bdc3964fb9 jdk-9+153 816a6d03a7c44edfbd8780110529f1bdc3964fb9 jdk-9+153
8d22611ffb6540bc1ace64a00c048c8b82d8c69a jdk-10+0
8d26916eaa21b689835ffc1c0dbf12470aa9be61 jdk-9+154 8d26916eaa21b689835ffc1c0dbf12470aa9be61 jdk-9+154
688a3863c00ebc089ab17ee1fc46272cbbd96815 jdk-9+155 688a3863c00ebc089ab17ee1fc46272cbbd96815 jdk-9+155
783ec7542cf7154e5d2b87f55bb97d28f81e9ada jdk-9+156
4eb77fb98952dc477a4229575c81d2263a9ce711 jdk-9+157
a4087bc10a88a43ea3ad0919b5b4af1c86977221 jdk-9+158

2
.jcheck/conf
View file

@ -1 +1 @@
project=jdk9 project=jdk10

12
common/autoconf/basics.m4
View file

@ -1202,6 +1202,18 @@ AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES],
# Check for support for specific options in bash # Check for support for specific options in bash
AC_DEFUN_ONCE([BASIC_CHECK_BASH_OPTIONS], AC_DEFUN_ONCE([BASIC_CHECK_BASH_OPTIONS],
[ [
# Check bash version
# Extra [ ] to stop m4 mangling
[ BASH_VER=`$BASH --version | $SED -n -e 's/^.*bash.*ersion *\([0-9.]*\).*$/\1/ p'` ]
AC_MSG_CHECKING([bash version])
AC_MSG_RESULT([$BASH_VER])
BASH_MAJOR=`$ECHO $BASH_VER | $CUT -d . -f 1`
BASH_MINOR=`$ECHO $BASH_VER | $CUT -d . -f 2`
if test $BASH_MAJOR -lt 3 || (test $BASH_MAJOR -eq 3 && test $BASH_MINOR -lt 2); then
AC_MSG_ERROR([bash version 3.2 or better is required])
fi
# Test if bash supports pipefail. # Test if bash supports pipefail.
AC_MSG_CHECKING([if bash supports pipefail]) AC_MSG_CHECKING([if bash supports pipefail])
if ${BASH} -c 'set -o pipefail'; then if ${BASH} -c 'set -o pipefail'; then

16
common/autoconf/generated-configure.sh
View file

@ -5170,7 +5170,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1486175373 DATE_WHEN_GENERATED=1486679715
############################################################################### ###############################################################################
# #
@ -24092,6 +24092,20 @@ $as_echo "$tool_specified" >&6; }
fi fi
# Check bash version
# Extra [ ] to stop m4 mangling
BASH_VER=`$BASH --version | $SED -n -e 's/^.*bash.*ersion *\([0-9.]*\).*$/\1/ p'`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking bash version" >&5
$as_echo_n "checking bash version... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASH_VER" >&5
$as_echo "$BASH_VER" >&6; }
BASH_MAJOR=`$ECHO $BASH_VER | $CUT -d . -f 1`
BASH_MINOR=`$ECHO $BASH_VER | $CUT -d . -f 2`
if test $BASH_MAJOR -lt 3 || (test $BASH_MAJOR -eq 3 && test $BASH_MINOR -lt 2); then
as_fn_error $? "bash version 3.2 or better is required" "$LINENO" 5
fi
# Test if bash supports pipefail. # Test if bash supports pipefail.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if bash supports pipefail" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if bash supports pipefail" >&5
$as_echo_n "checking if bash supports pipefail... " >&6; } $as_echo_n "checking if bash supports pipefail... " >&6; }

4
common/autoconf/version-numbers
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -25,7 +25,7 @@
# Default version numbers to use unless overridden by configure # Default version numbers to use unless overridden by configure
DEFAULT_VERSION_MAJOR=9 DEFAULT_VERSION_MAJOR=10
DEFAULT_VERSION_MINOR=0 DEFAULT_VERSION_MINOR=0
DEFAULT_VERSION_SECURITY=0 DEFAULT_VERSION_SECURITY=0
DEFAULT_VERSION_PATCH=0 DEFAULT_VERSION_PATCH=0

4
common/bin/unshuffle_list.txt
View file

@ -361,8 +361,8 @@ jdk/src/java.base/share/native/libverify/check_code.c : jdk/src/share/native/com
jdk/src/java.base/share/native/libverify/check_format.c : jdk/src/share/native/common/check_format.c jdk/src/java.base/share/native/libverify/check_format.c : jdk/src/share/native/common/check_format.c
jdk/src/java.base/share/native/libverify/opcodes.in_out : jdk/src/share/native/common/opcodes.in_out jdk/src/java.base/share/native/libverify/opcodes.in_out : jdk/src/share/native/common/opcodes.in_out
jdk/src/java.base/share/native/libzip : jdk/src/share/native/java/util/zip jdk/src/java.base/share/native/libzip : jdk/src/share/native/java/util/zip
jdk/src/java.base/share/native/libzip/zlib-1.2.8 : jdk/src/share/native/java/util/zip/zlib-1.2.8 jdk/src/java.base/share/native/libzip/zlib : jdk/src/share/native/java/util/zip/zlib
jdk/src/java.base/share/native/libzip/zlib-1.2.8/patches/ChangeLog_java : jdk/src/share/native/java/util/zip/zlib-1.2.8/patches/ChangeLog_java jdk/src/java.base/share/native/libzip/zlib/patches/ChangeLog_java : jdk/src/share/native/java/util/zip/zlib/patches/ChangeLog_java
jdk/src/java.base/unix/classes/java/io : jdk/src/solaris/classes/java/io jdk/src/java.base/unix/classes/java/io : jdk/src/solaris/classes/java/io
jdk/src/java.base/unix/classes/java/lang : jdk/src/solaris/classes/java/lang jdk/src/java.base/unix/classes/java/lang : jdk/src/solaris/classes/java/lang
jdk/src/java.base/unix/classes/java/net : jdk/src/solaris/classes/java/net jdk/src/java.base/unix/classes/java/net : jdk/src/solaris/classes/java/net

2
common/conf/jib-profiles.js
View file

@ -1080,7 +1080,7 @@ var getVersion = function (major, minor, security, patch) {
+ "." + (minor != null ? minor : version_numbers.get("DEFAULT_VERSION_MINOR")) + "." + (minor != null ? minor : version_numbers.get("DEFAULT_VERSION_MINOR"))
+ "." + (security != null ? security : version_numbers.get("DEFAULT_VERSION_SECURITY")) + "." + (security != null ? security : version_numbers.get("DEFAULT_VERSION_SECURITY"))
+ "." + (patch != null ? patch : version_numbers.get("DEFAULT_VERSION_PATCH")); + "." + (patch != null ? patch : version_numbers.get("DEFAULT_VERSION_PATCH"));
while (version.match(".*\.0$")) { while (version.match(".*\\.0$")) {
version = version.substring(0, version.length - 2); version = version.substring(0, version.length - 2);
} }
return version; return version;

144
common/nb_native/nbproject/configurations.xml
View file

@ -1223,7 +1223,7 @@
<in>check_format.c</in> <in>check_format.c</in>
</df> </df>
<df name="libzip"> <df name="libzip">
<df name="zlib-1.2.8"> <df name="zlib">
<in>compress.c</in> <in>compress.c</in>
<in>deflate.c</in> <in>deflate.c</in>
<in>gzclose.c</in> <in>gzclose.c</in>
@ -38283,7 +38283,7 @@
<pElem>../../jdk/src/java.base/unix/native/include</pElem> <pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../build/support/headers/java.base</pElem> <pElem>../../build/support/headers/java.base</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
@ -38304,7 +38304,7 @@
<pElem>../../jdk/src/java.base/unix/native/include</pElem> <pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../build/support/headers/java.base</pElem> <pElem>../../build/support/headers/java.base</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
@ -38325,7 +38325,7 @@
<pElem>../../jdk/src/java.base/unix/native/include</pElem> <pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../build/support/headers/java.base</pElem> <pElem>../../build/support/headers/java.base</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
@ -38346,7 +38346,7 @@
<pElem>../../jdk/src/java.base/unix/native/include</pElem> <pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../build/support/headers/java.base</pElem> <pElem>../../build/support/headers/java.base</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
@ -38367,7 +38367,7 @@
<pElem>../../jdk/src/java.base/unix/native/include</pElem> <pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../build/support/headers/java.base</pElem> <pElem>../../build/support/headers/java.base</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
@ -38377,14 +38377,14 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/java.base/share/native/libzip/zlib-1.2.8/compress.c" <item path="../../jdk/src/java.base/share/native/libzip/zlib/compress.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
<cTool flags="4"> <cTool flags="4">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/java.base/share/native/libzip/zlib-1.2.8/deflate.c" <item path="../../jdk/src/java.base/share/native/libzip/zlib/deflate.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -38394,7 +38394,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/java.base/share/native/libzip/zlib-1.2.8/gzclose.c" <item path="../../jdk/src/java.base/share/native/libzip/zlib/gzclose.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -38404,7 +38404,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/java.base/share/native/libzip/zlib-1.2.8/gzlib.c" <item path="../../jdk/src/java.base/share/native/libzip/zlib/gzlib.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -38414,7 +38414,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/java.base/share/native/libzip/zlib-1.2.8/gzread.c" <item path="../../jdk/src/java.base/share/native/libzip/zlib/gzread.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -38424,7 +38424,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/java.base/share/native/libzip/zlib-1.2.8/gzwrite.c" <item path="../../jdk/src/java.base/share/native/libzip/zlib/gzwrite.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -38434,7 +38434,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/java.base/share/native/libzip/zlib-1.2.8/infback.c" <item path="../../jdk/src/java.base/share/native/libzip/zlib/infback.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -38444,7 +38444,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/java.base/share/native/libzip/zlib-1.2.8/inffast.c" <item path="../../jdk/src/java.base/share/native/libzip/zlib/inffast.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -38454,7 +38454,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/java.base/share/native/libzip/zlib-1.2.8/inflate.c" <item path="../../jdk/src/java.base/share/native/libzip/zlib/inflate.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -38464,7 +38464,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/java.base/share/native/libzip/zlib-1.2.8/inftrees.c" <item path="../../jdk/src/java.base/share/native/libzip/zlib/inftrees.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -38474,7 +38474,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/java.base/share/native/libzip/zlib-1.2.8/trees.c" <item path="../../jdk/src/java.base/share/native/libzip/zlib/trees.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -38484,7 +38484,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/java.base/share/native/libzip/zlib-1.2.8/uncompr.c" <item path="../../jdk/src/java.base/share/native/libzip/zlib/uncompr.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -38494,7 +38494,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/java.base/share/native/libzip/zlib-1.2.8/zadler32.c" <item path="../../jdk/src/java.base/share/native/libzip/zlib/zadler32.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -38504,7 +38504,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/java.base/share/native/libzip/zlib-1.2.8/zcrc32.c" <item path="../../jdk/src/java.base/share/native/libzip/zlib/zcrc32.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -38514,7 +38514,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/java.base/share/native/libzip/zlib-1.2.8/zutil.c" <item path="../../jdk/src/java.base/share/native/libzip/zlib/zutil.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -41203,7 +41203,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41232,7 +41232,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41261,7 +41261,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41290,7 +41290,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41319,7 +41319,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41348,7 +41348,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41377,7 +41377,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41406,7 +41406,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41435,7 +41435,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41464,7 +41464,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41493,7 +41493,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41522,7 +41522,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41551,7 +41551,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41580,7 +41580,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41609,7 +41609,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41638,7 +41638,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41667,7 +41667,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41696,7 +41696,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41725,7 +41725,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41754,7 +41754,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41783,7 +41783,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41812,7 +41812,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41841,7 +41841,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41870,7 +41870,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41899,7 +41899,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41928,7 +41928,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41957,7 +41957,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -41986,7 +41986,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -42015,7 +42015,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -42044,7 +42044,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -42073,7 +42073,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -42102,7 +42102,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -42131,7 +42131,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -42160,7 +42160,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -42189,7 +42189,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -42218,7 +42218,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -42247,7 +42247,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -42276,7 +42276,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -42305,7 +42305,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -42334,7 +42334,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -42363,7 +42363,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -42413,7 +42413,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -42442,7 +42442,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -42471,7 +42471,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -46557,7 +46557,7 @@
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjli</pElem> <pElem>../../jdk/src/java.base/unix/native/libjli</pElem>
<pElem>../../jdk/src/java.base/share/native/libjli</pElem> <pElem>../../jdk/src/java.base/share/native/libjli</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
<preprocessorList> <preprocessorList>
@ -46639,7 +46639,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</folder> </folder>
<folder path="0/jdk/src/java.base/share/native/libzip/zlib-1.2.8"> <folder path="0/jdk/src/java.base/share/native/libzip/zlib">
<cTool> <cTool>
<incDir> <incDir>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/giflib</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/giflib</pElem>
@ -46647,7 +46647,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -46712,7 +46712,7 @@
<incDir> <incDir>
<pElem>../../jdk/src/java.base/unix/native/libjli</pElem> <pElem>../../jdk/src/java.base/unix/native/libjli</pElem>
<pElem>../../jdk/src/java.base/share/native/libjli</pElem> <pElem>../../jdk/src/java.base/share/native/libjli</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
<preprocessorList> <preprocessorList>
@ -47250,7 +47250,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -47598,7 +47598,7 @@
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem> <pElem>../../jdk/src/java.desktop/share/native/libsplashscreen/libpng</pElem>
<pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem> <pElem>../../jdk/src/java.desktop/unix/native/libsplashscreen</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
@ -47996,7 +47996,7 @@
<pElem>../../jdk/src/jdk.pack/share/native/common-unpack</pElem> <pElem>../../jdk/src/jdk.pack/share/native/common-unpack</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem> <pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/linux/native/include</pElem> <pElem>../../jdk/src/java.base/linux/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem> <pElem>../../jdk/src/java.base/unix/native/include</pElem>

4
corba/.hgtags
View file

@ -396,5 +396,9 @@ f95cc86b6ac22ec1ade5d4f825dc7782adeea228 jdk-9+148
77f827f5bbad3ef795664bc675f72d98d156b9f8 jdk-9+151 77f827f5bbad3ef795664bc675f72d98d156b9f8 jdk-9+151
ff8cb43c07c069b1debdee44cb88ca22db1ec757 jdk-9+152 ff8cb43c07c069b1debdee44cb88ca22db1ec757 jdk-9+152
68a8e8658511093b322a46ed04b2a321e1da2a43 jdk-9+153 68a8e8658511093b322a46ed04b2a321e1da2a43 jdk-9+153
d66f97a610a6beac987740edc2bf6a70f46ba574 jdk-10+0
078ebe23b584466dc8346e620d7821d91751e5a9 jdk-9+154 078ebe23b584466dc8346e620d7821d91751e5a9 jdk-9+154
a545f54babfa31aa7eb611f36031609acd617cbc jdk-9+155 a545f54babfa31aa7eb611f36031609acd617cbc jdk-9+155
907c26240cd481579e919bfd23740797ff8ce1c8 jdk-9+156
9383da04b385cca46b7ca67f3a39ac1b673e09fe jdk-9+157
de6bdf38935fa753183ca288bed5c06a23c0bb12 jdk-9+158

2
corba/.jcheck/conf
View file

@ -1 +1 @@
project=jdk9 project=jdk10

2
corba/src/java.corba/share/classes/module-info.java
View file

@ -25,6 +25,8 @@
/** /**
* Defines the Java binding of the OMG CORBA APIs, and the RMI-IIOP API. * Defines the Java binding of the OMG CORBA APIs, and the RMI-IIOP API.
*
* @since 9
*/ */
@Deprecated(since="9", forRemoval=true) @Deprecated(since="9", forRemoval=true)
module java.corba { module java.corba {

37
corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java
View file

@ -106,13 +106,13 @@ import java.security.PrivilegedAction;
* *
* <LI>check in properties parameter, if any * <LI>check in properties parameter, if any
* *
* <LI>check in the System properties * <LI>check in the System properties, if any
* *
* <LI>check in the orb.properties file located in the user.home * <LI>check in the orb.properties file located in the user.home
* directory (if any) * directory, if any
* *
* <LI>check in the orb.properties file located in the java.home/lib * <LI>check in the orb.properties file located in the run-time image,
* directory (if any) * if any
* *
* <LI>fall back on a hardcoded default behavior (use the Java&nbsp;IDL * <LI>fall back on a hardcoded default behavior (use the Java&nbsp;IDL
* implementation) * implementation)
@ -170,9 +170,15 @@ import java.security.PrivilegedAction;
* Thus, where appropriate, it is necessary that * Thus, where appropriate, it is necessary that
* the classes for this alternative ORBSingleton are available on the application's class path. * the classes for this alternative ORBSingleton are available on the application's class path.
* It should be noted that the singleton ORB is system wide. * It should be noted that the singleton ORB is system wide.
* * <P>
* When a per-application ORB is created via the 2-arg init methods, * When a per-application ORB is created via the 2-arg init methods,
* then it will be located using the thread context class loader. * then it will be located using the thread context class loader.
* <P>
* The IDL to Java Language OMG specification documents the ${java.home}/lib directory as the location,
* in the Java run-time image, to search for orb.properties.
* This location is not intended for user editable configuration files.
* Therefore, the implementation first checks the ${java.home}/conf directory for orb.properties,
* and thereafter the ${java.home}/lib directory.
* *
* @since JDK1.2 * @since JDK1.2
*/ */
@ -271,14 +277,25 @@ abstract public class ORB {
} }
String javaHome = System.getProperty("java.home"); String javaHome = System.getProperty("java.home");
fileName = javaHome + File.separator
+ "lib" + File.separator + "orb.properties"; fileName = javaHome + File.separator + "conf"
props = getFileProperties( fileName ) ; + File.separator + "orb.properties";
props = getFileProperties(fileName);
if (props != null) {
String value = props.getProperty(name);
if (value != null)
return value;
}
fileName = javaHome + File.separator + "lib"
+ File.separator + "orb.properties";
props = getFileProperties(fileName);
if (props == null) if (props == null)
return null ; return null;
else else
return props.getProperty( name ) ; return props.getProperty(name);
} }
} }
); );

1
hotspot/.hgtags
View file

@ -556,6 +556,7 @@ a82cb5350cad96a0b4de496afebe3ded89f27efa jdk-9+146
2a2ac7d9f52c8cb2b80077e515b5840b947e640c jdk-9+151 2a2ac7d9f52c8cb2b80077e515b5840b947e640c jdk-9+151
31f1d26c60df7b2e516a4f84160d76ba017d4e09 jdk-9+152 31f1d26c60df7b2e516a4f84160d76ba017d4e09 jdk-9+152
217ba81b9a4ce8698200370175aa2db86a39f66c jdk-9+153 217ba81b9a4ce8698200370175aa2db86a39f66c jdk-9+153
fc7e94cb748507366b839e859f865f724467446a jdk-10+0
a9fdfd55835ef9dccb7f317b07249bd66653b874 jdk-9+154 a9fdfd55835ef9dccb7f317b07249bd66653b874 jdk-9+154
f3b3d77a1751897413aae43ac340a130b6fa2ae1 jdk-9+155 f3b3d77a1751897413aae43ac340a130b6fa2ae1 jdk-9+155
43139c588ea48b6504e52b6c3dec530b17b1fdb4 jdk-9+156 43139c588ea48b6504e52b6c3dec530b17b1fdb4 jdk-9+156

2
hotspot/.jcheck/conf
View file

@ -1 +1 @@
project=jdk9 project=jdk10

6
hotspot/src/cpu/aarch64/vm/c1_globals_aarch64.hpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved. * Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
@ -45,10 +45,8 @@ define_pd_global(bool, TieredCompilation, false);
// We compile very aggressively with the builtin simulator because // We compile very aggressively with the builtin simulator because
// doing so greatly reduces run times and tests more code. // doing so greatly reduces run times and tests more code.
define_pd_global(intx, CompileThreshold, 150 ); define_pd_global(intx, CompileThreshold, 150 );
define_pd_global(intx, BackEdgeThreshold, 500);
#else #else
define_pd_global(intx, CompileThreshold, 1500 ); define_pd_global(intx, CompileThreshold, 1500 );
define_pd_global(intx, BackEdgeThreshold, 100000);
#endif #endif
define_pd_global(intx, OnStackReplacePercentage, 933 ); define_pd_global(intx, OnStackReplacePercentage, 933 );
@ -76,6 +74,4 @@ define_pd_global(bool, OptimizeSinglePrecision, true );
define_pd_global(bool, CSEArrayLength, false); define_pd_global(bool, CSEArrayLength, false);
define_pd_global(bool, TwoOperandLIRForm, false ); define_pd_global(bool, TwoOperandLIRForm, false );
define_pd_global(intx, SafepointPollOffset, 0 );
#endif // CPU_AARCH64_VM_C1_GLOBALS_AARCH64_HPP #endif // CPU_AARCH64_VM_C1_GLOBALS_AARCH64_HPP

3
hotspot/src/cpu/aarch64/vm/c2_globals_aarch64.hpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved. * Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
@ -43,7 +43,6 @@ define_pd_global(bool, UseOnStackReplacement, true);
define_pd_global(bool, ProfileInterpreter, true); define_pd_global(bool, ProfileInterpreter, true);
define_pd_global(bool, TieredCompilation, trueInTiered); define_pd_global(bool, TieredCompilation, trueInTiered);
define_pd_global(intx, CompileThreshold, 10000); define_pd_global(intx, CompileThreshold, 10000);
define_pd_global(intx, BackEdgeThreshold, 100000);
define_pd_global(intx, OnStackReplacePercentage, 140); define_pd_global(intx, OnStackReplacePercentage, 140);
define_pd_global(intx, ConditionalMoveLimit, 3); define_pd_global(intx, ConditionalMoveLimit, 3);

10
hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -150,13 +150,7 @@ public class HeapSummary extends Tool {
// Helper methods // Helper methods
private void printGCAlgorithm(Map flagMap) { private void printGCAlgorithm(Map flagMap) {
// print about new generation long l = getFlagValue("UseTLAB", flagMap);
long l = getFlagValue("UseParNewGC", flagMap);
if (l == 1L) {
System.out.println("using parallel threads in the new generation.");
}
l = getFlagValue("UseTLAB", flagMap);
if (l == 1L) { if (l == 1L) {
System.out.println("using thread-local object allocation."); System.out.println("using thread-local object allocation.");
} }

13
hotspot/src/os/solaris/vm/os_solaris.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -3050,15 +3050,12 @@ void os::naked_yield() {
thr_yield(); thr_yield();
} }
// Interface for setting lwp priorities. If we are using T2 libthread, // Interface for setting lwp priorities. We are using T2 libthread,
// which forces the use of BoundThreads or we manually set UseBoundThreads, // which forces the use of bound threads, so all of our threads will
// all of our threads will be assigned to real lwp's. Using the thr_setprio // be assigned to real lwp's. Using the thr_setprio function is
// function is meaningless in this mode so we must adjust the real lwp's priority // meaningless in this mode so we must adjust the real lwp's priority.
// The routines below implement the getting and setting of lwp priorities. // The routines below implement the getting and setting of lwp priorities.
// //
// Note: T2 is now the only supported libthread. UseBoundThreads flag is
// being deprecated and all threads are now BoundThreads
//
// Note: There are three priority scales used on Solaris. Java priotities // Note: There are three priority scales used on Solaris. Java priotities
// which range from 1 to 10, libthread "thr_setprio" scale which range // which range from 1 to 10, libthread "thr_setprio" scale which range
// from 0 to 127, and the current scheduling class of the process we // from 0 to 127, and the current scheduling class of the process we

17
hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -488,9 +488,6 @@ CMSCollector::CMSCollector(ConcurrentMarkSweepGeneration* cmsGen,
_gc_timer_cm(new (ResourceObj::C_HEAP, mtGC) ConcurrentGCTimer()), _gc_timer_cm(new (ResourceObj::C_HEAP, mtGC) ConcurrentGCTimer()),
_cms_start_registered(false) _cms_start_registered(false)
{ {
if (ExplicitGCInvokesConcurrentAndUnloadsClasses) {
ExplicitGCInvokesConcurrent = true;
}
// Now expand the span and allocate the collection support structures // Now expand the span and allocate the collection support structures
// (MUT, marking bit map etc.) to cover both generations subject to // (MUT, marking bit map etc.) to cover both generations subject to
// collection. // collection.
@ -2559,10 +2556,8 @@ void CMSCollector::verify_overflow_empty() const {
// Decide if we want to enable class unloading as part of the // Decide if we want to enable class unloading as part of the
// ensuing concurrent GC cycle. We will collect and // ensuing concurrent GC cycle. We will collect and
// unload classes if it's the case that: // unload classes if it's the case that:
// (1) an explicit gc request has been made and the flag // (a) class unloading is enabled at the command line, and
// ExplicitGCInvokesConcurrentAndUnloadsClasses is set, OR // (b) old gen is getting really full
// (2) (a) class unloading is enabled at the command line, and
// (b) old gen is getting really full
// NOTE: Provided there is no change in the state of the heap between // NOTE: Provided there is no change in the state of the heap between
// calls to this method, it should have idempotent results. Moreover, // calls to this method, it should have idempotent results. Moreover,
// its results should be monotonically increasing (i.e. going from 0 to 1, // its results should be monotonically increasing (i.e. going from 0 to 1,
@ -2575,11 +2570,7 @@ void CMSCollector::verify_overflow_empty() const {
// below. // below.
void CMSCollector::update_should_unload_classes() { void CMSCollector::update_should_unload_classes() {
_should_unload_classes = false; _should_unload_classes = false;
// Condition 1 above if (CMSClassUnloadingEnabled) {
if (_full_gc_requested && ExplicitGCInvokesConcurrentAndUnloadsClasses) {
_should_unload_classes = true;
} else if (CMSClassUnloadingEnabled) { // Condition 2.a above
// Disjuncts 2.b.(i,ii,iii) above
_should_unload_classes = (concurrent_cycles_since_last_unload() >= _should_unload_classes = (concurrent_cycles_since_last_unload() >=
CMSClassUnloadingMaxInterval) CMSClassUnloadingMaxInterval)
|| _cmsGen->is_too_full(); || _cmsGen->is_too_full();

3
hotspot/src/share/vm/oops/method.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -2199,7 +2199,6 @@ void Method::print_on(outputStream* st) const {
ResourceMark rm; ResourceMark rm;
assert(is_method(), "must be method"); assert(is_method(), "must be method");
st->print_cr("%s", internal_name()); st->print_cr("%s", internal_name());
// get the effect of PrintOopAddress, always, for methods:
st->print_cr(" - this oop: " INTPTR_FORMAT, p2i(this)); st->print_cr(" - this oop: " INTPTR_FORMAT, p2i(this));
st->print (" - method holder: "); method_holder()->print_value_on(st); st->cr(); st->print (" - method holder: "); method_holder()->print_value_on(st); st->cr();
st->print (" - constants: " INTPTR_FORMAT " ", p2i(constants())); st->print (" - constants: " INTPTR_FORMAT " ", p2i(constants()));

22
hotspot/src/share/vm/prims/jvm.cpp
View file

@ -2967,14 +2967,7 @@ JVM_ENTRY(void, JVM_Yield(JNIEnv *env, jclass threadClass))
JVMWrapper("JVM_Yield"); JVMWrapper("JVM_Yield");
if (os::dont_yield()) return; if (os::dont_yield()) return;
HOTSPOT_THREAD_YIELD(); HOTSPOT_THREAD_YIELD();
os::naked_yield();
// When ConvertYieldToSleep is off (default), this matches the classic VM use of yield.
// Critical for similar threading behaviour
if (ConvertYieldToSleep) {
os::sleep(thread, MinSleepInterval, false);
} else {
os::naked_yield();
}
JVM_END JVM_END
@ -2998,18 +2991,7 @@ JVM_ENTRY(void, JVM_Sleep(JNIEnv* env, jclass threadClass, jlong millis))
EventThreadSleep event; EventThreadSleep event;
if (millis == 0) { if (millis == 0) {
// When ConvertSleepToYield is on, this matches the classic VM implementation of os::naked_yield();
// JVM_Sleep. Critical for similar threading behaviour (Win32)
// It appears that in certain GUI contexts, it may be beneficial to do a short sleep
// for SOLARIS
if (ConvertSleepToYield) {
os::naked_yield();
} else {
ThreadState old_state = thread->osthread()->get_state();
thread->osthread()->set_state(SLEEPING);
os::sleep(thread, MinSleepInterval, false);
thread->osthread()->set_state(old_state);
}
} else { } else {
ThreadState old_state = thread->osthread()->get_state(); ThreadState old_state = thread->osthread()->get_state();
thread->osthread()->set_state(SLEEPING); thread->osthread()->set_state(SLEEPING);

93
hotspot/src/share/vm/runtime/arguments.cpp
View file

@ -375,53 +375,17 @@ static SpecialFlag const special_jvm_flags[] = {
// -------------- Deprecated Flags -------------- // -------------- Deprecated Flags --------------
// --- Non-alias flags - sorted by obsolete_in then expired_in: // --- Non-alias flags - sorted by obsolete_in then expired_in:
{ "MaxGCMinorPauseMillis", JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() }, { "MaxGCMinorPauseMillis", JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() },
{ "AutoGCSelectPauseMillis", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(10) },
{ "UseAutoGCSelectPolicy", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(10) },
{ "UseParNewGC", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(10) },
{ "ExplicitGCInvokesConcurrentAndUnloadsClasses", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(10) },
{ "ConvertSleepToYield", JDK_Version::jdk(9), JDK_Version::jdk(10), JDK_Version::jdk(11) },
{ "ConvertYieldToSleep", JDK_Version::jdk(9), JDK_Version::jdk(10), JDK_Version::jdk(11) },
// --- Deprecated alias flags (see also aliased_jvm_flags) - sorted by obsolete_in then expired_in: // --- Deprecated alias flags (see also aliased_jvm_flags) - sorted by obsolete_in then expired_in:
{ "DefaultMaxRAMFraction", JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() }, { "DefaultMaxRAMFraction", JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() },
{ "CreateMinidumpOnCrash", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::undefined() }, { "CreateMinidumpOnCrash", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::undefined() },
{ "CMSMarkStackSizeMax", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(10) },
{ "CMSMarkStackSize", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(10) },
{ "G1MarkStackSize", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(10) },
{ "ParallelMarkingThreads", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(10) },
{ "ParallelCMSThreads", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(10) },
// -------------- Obsolete Flags - sorted by expired_in -------------- // -------------- Obsolete Flags - sorted by expired_in --------------
{ "UseOldInlining", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) }, { "ConvertSleepToYield", JDK_Version::jdk(9), JDK_Version::jdk(10), JDK_Version::jdk(11) },
{ "SafepointPollOffset", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) }, { "ConvertYieldToSleep", JDK_Version::jdk(9), JDK_Version::jdk(10), JDK_Version::jdk(11) },
{ "UseBoundThreads", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) }, { "MinSleepInterval", JDK_Version::jdk(9), JDK_Version::jdk(10), JDK_Version::jdk(11) },
{ "DefaultThreadPriority", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) }, { "PermSize", JDK_Version::undefined(), JDK_Version::jdk(8), JDK_Version::undefined() },
{ "NoYieldsInMicrolock", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) }, { "MaxPermSize", JDK_Version::undefined(), JDK_Version::jdk(8), JDK_Version::undefined() },
{ "BackEdgeThreshold", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "UseNewReflection", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "ReflectionWrapResolutionErrors",JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "VerifyReflectionBytecodes", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "AutoShutdownNMT", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "NmethodSweepFraction", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "NmethodSweepCheckInterval", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "CodeCacheMinimumFreeSpace", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
#ifndef ZERO
{ "UseFastAccessorMethods", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "UseFastEmptyMethods", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
#endif // ZERO
{ "UseCompilerSafepoints", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "AdaptiveSizePausePolicy", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "ParallelGCRetainPLAB", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "ThreadSafetyMargin", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "LazyBootClassLoader", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "StarvationMonitorInterval", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "PreInflateSpin", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "JNIDetachReleasesMonitors", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "UseAltSigs", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "SegmentedHeapDumpThreshold", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "PrintOopAddress", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "PermSize", JDK_Version::undefined(), JDK_Version::jdk(8), JDK_Version::jdk(10) },
{ "MaxPermSize", JDK_Version::undefined(), JDK_Version::jdk(8), JDK_Version::jdk(10) },
#ifdef TEST_VERIFY_SPECIAL_JVM_FLAGS #ifdef TEST_VERIFY_SPECIAL_JVM_FLAGS
{ "dep > obs", JDK_Version::jdk(9), JDK_Version::jdk(8), JDK_Version::undefined() }, { "dep > obs", JDK_Version::jdk(9), JDK_Version::jdk(8), JDK_Version::undefined() },
@ -444,11 +408,6 @@ typedef struct {
static AliasedFlag const aliased_jvm_flags[] = { static AliasedFlag const aliased_jvm_flags[] = {
{ "DefaultMaxRAMFraction", "MaxRAMFraction" }, { "DefaultMaxRAMFraction", "MaxRAMFraction" },
{ "CMSMarkStackSizeMax", "MarkStackSizeMax" },
{ "CMSMarkStackSize", "MarkStackSize" },
{ "G1MarkStackSize", "MarkStackSize" },
{ "ParallelMarkingThreads", "ConcGCThreads" },
{ "ParallelCMSThreads", "ConcGCThreads" },
{ "CreateMinidumpOnCrash", "CreateCoredumpOnCrash" }, { "CreateMinidumpOnCrash", "CreateCoredumpOnCrash" },
{ NULL, NULL} { NULL, NULL}
}; };
@ -1547,7 +1506,6 @@ void Arguments::set_parnew_gc_flags() {
assert(!UseSerialGC && !UseParallelOldGC && !UseParallelGC && !UseG1GC, assert(!UseSerialGC && !UseParallelOldGC && !UseParallelGC && !UseG1GC,
"control point invariant"); "control point invariant");
assert(UseConcMarkSweepGC, "CMS is expected to be on here"); assert(UseConcMarkSweepGC, "CMS is expected to be on here");
assert(UseParNewGC, "ParNew should always be used with CMS");
if (FLAG_IS_DEFAULT(ParallelGCThreads)) { if (FLAG_IS_DEFAULT(ParallelGCThreads)) {
FLAG_SET_DEFAULT(ParallelGCThreads, Abstract_VM_Version::parallel_worker_threads()); FLAG_SET_DEFAULT(ParallelGCThreads, Abstract_VM_Version::parallel_worker_threads());
@ -1588,7 +1546,6 @@ void Arguments::set_parnew_gc_flags() {
void Arguments::set_cms_and_parnew_gc_flags() { void Arguments::set_cms_and_parnew_gc_flags() {
assert(!UseSerialGC && !UseParallelOldGC && !UseParallelGC, "Error"); assert(!UseSerialGC && !UseParallelOldGC && !UseParallelGC, "Error");
assert(UseConcMarkSweepGC, "CMS is expected to be on here"); assert(UseConcMarkSweepGC, "CMS is expected to be on here");
assert(UseParNewGC, "ParNew should always be used with CMS");
// Turn off AdaptiveSizePolicy by default for cms until it is complete. // Turn off AdaptiveSizePolicy by default for cms until it is complete.
disable_adaptive_size_policy("UseConcMarkSweepGC"); disable_adaptive_size_policy("UseConcMarkSweepGC");
@ -1728,16 +1685,6 @@ size_t Arguments::max_heap_for_compressed_oops() {
NOT_LP64(ShouldNotReachHere(); return 0); NOT_LP64(ShouldNotReachHere(); return 0);
} }
bool Arguments::should_auto_select_low_pause_collector() {
if (UseAutoGCSelectPolicy &&
!FLAG_IS_DEFAULT(MaxGCPauseMillis) &&
(MaxGCPauseMillis <= AutoGCSelectPauseMillis)) {
log_trace(gc)("Automatic selection of the low pause collector based on pause goal of %d (ms)", (int) MaxGCPauseMillis);
return true;
}
return false;
}
void Arguments::set_use_compressed_oops() { void Arguments::set_use_compressed_oops() {
#ifndef ZERO #ifndef ZERO
#ifdef _LP64 #ifdef _LP64
@ -1841,16 +1788,7 @@ void Arguments::select_compilation_mode_ergonomically() {
void Arguments::select_gc_ergonomically() { void Arguments::select_gc_ergonomically() {
#if INCLUDE_ALL_GCS #if INCLUDE_ALL_GCS
if (os::is_server_class_machine()) { if (os::is_server_class_machine()) {
if (!UseAutoGCSelectPolicy) { FLAG_SET_ERGO_IF_DEFAULT(bool, UseG1GC, true);
FLAG_SET_ERGO_IF_DEFAULT(bool, UseG1GC, true);
} else {
if (should_auto_select_low_pause_collector()) {
FLAG_SET_ERGO_IF_DEFAULT(bool, UseConcMarkSweepGC, true);
FLAG_SET_ERGO_IF_DEFAULT(bool, UseParNewGC, true);
} else {
FLAG_SET_ERGO_IF_DEFAULT(bool, UseParallelGC, true);
}
}
} else { } else {
FLAG_SET_ERGO_IF_DEFAULT(bool, UseSerialGC, true); FLAG_SET_ERGO_IF_DEFAULT(bool, UseSerialGC, true);
} }
@ -1859,7 +1797,6 @@ void Arguments::select_gc_ergonomically() {
UNSUPPORTED_OPTION(UseParallelGC); UNSUPPORTED_OPTION(UseParallelGC);
UNSUPPORTED_OPTION(UseParallelOldGC); UNSUPPORTED_OPTION(UseParallelOldGC);
UNSUPPORTED_OPTION(UseConcMarkSweepGC); UNSUPPORTED_OPTION(UseConcMarkSweepGC);
UNSUPPORTED_OPTION(UseParNewGC);
FLAG_SET_ERGO_IF_DEFAULT(bool, UseSerialGC, true); FLAG_SET_ERGO_IF_DEFAULT(bool, UseSerialGC, true);
#endif // INCLUDE_ALL_GCS #endif // INCLUDE_ALL_GCS
} }
@ -2078,7 +2015,6 @@ void Arguments::set_gc_specific_flags() {
if (!ClassUnloading) { if (!ClassUnloading) {
FLAG_SET_CMDLINE(bool, CMSClassUnloadingEnabled, false); FLAG_SET_CMDLINE(bool, CMSClassUnloadingEnabled, false);
FLAG_SET_CMDLINE(bool, ClassUnloadingWithConcurrentMark, false); FLAG_SET_CMDLINE(bool, ClassUnloadingWithConcurrentMark, false);
FLAG_SET_CMDLINE(bool, ExplicitGCInvokesConcurrentAndUnloadsClasses, false);
} }
#endif // INCLUDE_ALL_GCS #endif // INCLUDE_ALL_GCS
} }
@ -2433,18 +2369,6 @@ bool Arguments::check_gc_consistency() {
return false; return false;
} }
if (UseConcMarkSweepGC && !UseParNewGC) {
jio_fprintf(defaultStream::error_stream(),
"It is not possible to combine the DefNew young collector with the CMS collector.\n");
return false;
}
if (UseParNewGC && !UseConcMarkSweepGC) {
jio_fprintf(defaultStream::error_stream(),
"It is not possible to combine the ParNew young collector with any collector other than CMS.\n");
return false;
}
return true; return true;
} }
@ -3731,11 +3655,6 @@ jint Arguments::finalize_vm_init_args() {
} }
} }
if (UseConcMarkSweepGC && FLAG_IS_DEFAULT(UseParNewGC) && !UseParNewGC) {
// CMS can only be used with ParNew
FLAG_SET_ERGO(bool, UseParNewGC, true);
}
if (!check_vm_args_consistency()) { if (!check_vm_args_consistency()) {
return JNI_ERR; return JNI_ERR;
} }

5
hotspot/src/share/vm/runtime/arguments.hpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -480,9 +480,6 @@ class Arguments : AllStatic {
static julong limit_by_allocatable_memory(julong size); static julong limit_by_allocatable_memory(julong size);
// Setup heap size // Setup heap size
static void set_heap_size(); static void set_heap_size();
// Based on automatic selection criteria, should the
// low pause collector be used.
static bool should_auto_select_low_pause_collector();
// Bytecode rewriting // Bytecode rewriting
static void set_bytecode_flags(); static void set_bytecode_flags();

28
hotspot/src/share/vm/runtime/globals.hpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -1158,13 +1158,6 @@ public:
product_pd(bool, DontYieldALot, \ product_pd(bool, DontYieldALot, \
"Throw away obvious excess yield calls") \ "Throw away obvious excess yield calls") \
\ \
product(bool, ConvertSleepToYield, true, \
"Convert sleep(0) to thread yield ") \
\
product(bool, ConvertYieldToSleep, false, \
"Convert yield to a sleep of MinSleepInterval to simulate Win32 " \
"behavior") \
\
develop(bool, UseDetachedThreads, true, \ develop(bool, UseDetachedThreads, true, \
"Use detached threads that are recycled upon termination " \ "Use detached threads that are recycled upon termination " \
"(for Solaris only)") \ "(for Solaris only)") \
@ -1478,11 +1471,6 @@ public:
"A System.gc() request invokes a concurrent collection; " \ "A System.gc() request invokes a concurrent collection; " \
"(effective only when using concurrent collectors)") \ "(effective only when using concurrent collectors)") \
\ \
product(bool, ExplicitGCInvokesConcurrentAndUnloadsClasses, false, \
"A System.gc() request invokes a concurrent collection and " \
"also unloads classes during such a concurrent gc cycle " \
"(effective only when UseConcMarkSweepGC)") \
\
product(bool, GCLockerInvokesConcurrent, false, \ product(bool, GCLockerInvokesConcurrent, false, \
"The exit of a JNI critical section necessitating a scavenge, " \ "The exit of a JNI critical section necessitating a scavenge, " \
"also kicks off a background concurrent collection") \ "also kicks off a background concurrent collection") \
@ -1500,9 +1488,6 @@ public:
product(bool, UseCMSBestFit, true, \ product(bool, UseCMSBestFit, true, \
"Use CMS best fit allocation strategy") \ "Use CMS best fit allocation strategy") \
\ \
product(bool, UseParNewGC, false, \
"Use parallel threads in the new generation") \
\
product(uintx, ParallelGCBufferWastePct, 10, \ product(uintx, ParallelGCBufferWastePct, 10, \
"Wasted fraction of parallel allocation buffer") \ "Wasted fraction of parallel allocation buffer") \
range(0, 100) \ range(0, 100) \
@ -2058,13 +2043,6 @@ public:
"Maximum fraction (1/n) of virtual memory used for ergonomically "\ "Maximum fraction (1/n) of virtual memory used for ergonomically "\
"determining maximum heap size") \ "determining maximum heap size") \
\ \
product(bool, UseAutoGCSelectPolicy, false, \
"Use automatic collection selection policy") \
\
product(uintx, AutoGCSelectPauseMillis, 5000, \
"Automatic GC selection pause threshold in milliseconds") \
range(0, max_uintx) \
\
product(bool, UseAdaptiveSizePolicy, true, \ product(bool, UseAdaptiveSizePolicy, true, \
"Use adaptive generation sizing policies") \ "Use adaptive generation sizing policies") \
\ \
@ -3002,10 +2980,6 @@ public:
develop(intx, DontYieldALotInterval, 10, \ develop(intx, DontYieldALotInterval, 10, \
"Interval between which yields will be dropped (milliseconds)") \ "Interval between which yields will be dropped (milliseconds)") \
\ \
develop(intx, MinSleepInterval, 1, \
"Minimum sleep() interval (milliseconds) when " \
"ConvertSleepToYield is off (used for Solaris)") \
\
develop(intx, ProfilerPCTickThreshold, 15, \ develop(intx, ProfilerPCTickThreshold, 15, \
"Number of ticks in a PC buckets to be a hotspot") \ "Number of ticks in a PC buckets to be a hotspot") \
\ \

5
hotspot/test/TEST.groups
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -209,11 +209,8 @@ needs_full_vm_compact1 = \
gc/g1/TestShrinkToOneRegion.java \ gc/g1/TestShrinkToOneRegion.java \
gc/metaspace/G1AddMetaspaceDependency.java \ gc/metaspace/G1AddMetaspaceDependency.java \
gc/startup_warnings/TestCMS.java \ gc/startup_warnings/TestCMS.java \
gc/startup_warnings/TestDefNewCMS.java \
gc/startup_warnings/TestParallelGC.java \ gc/startup_warnings/TestParallelGC.java \
gc/startup_warnings/TestParallelScavengeSerialOld.java \ gc/startup_warnings/TestParallelScavengeSerialOld.java \
gc/startup_warnings/TestParNewCMS.java \
gc/startup_warnings/TestParNewSerialOld.java \
runtime/SharedArchiveFile/SharedArchiveFile.java runtime/SharedArchiveFile/SharedArchiveFile.java
# Minimal VM on Compact 2 adds in some compact2 tests # Minimal VM on Compact 2 adds in some compact2 tests

2
hotspot/test/compiler/jsr292/patches/java.base/java/lang/invoke/MethodHandleHelper.java
View file

@ -99,7 +99,7 @@ public class MethodHandleHelper {
public static MethodHandle make(MethodHandle target) { public static MethodHandle make(MethodHandle target) {
LambdaForm lform = DelegatingMethodHandle.makeReinvokerForm( LambdaForm lform = DelegatingMethodHandle.makeReinvokerForm(
target, -1, DelegatingMethodHandle.class, "reinvoker.dontInline", target, -1, DelegatingMethodHandle.class,
/*forceInline=*/false, DelegatingMethodHandle.NF_getTarget, null); /*forceInline=*/false, DelegatingMethodHandle.NF_getTarget, null);
return new NonInlinedReinvoker(target, lform); return new NonInlinedReinvoker(target, lform);
} }

48
hotspot/test/gc/arguments/TestExplicitGCInvokesConcurrentAndUnloadsClasses.java
View file

@ -1,48 +0,0 @@
/*
* Copyright (c) 2016, 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 TestExplicitGCInvokesConcurrentAndUnloadsClasses
* @summary Test that the flag ExplicitGCInvokesConcurrentAndUnloadsClasses is deprecated
* @bug 8170388
* @key gc
* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run driver TestExplicitGCInvokesConcurrentAndUnloadsClasses
*/
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
public class TestExplicitGCInvokesConcurrentAndUnloadsClasses {
public static void main(String[] args) throws Exception {
ProcessBuilder pb =
ProcessTools.createJavaProcessBuilder("-XX:+ExplicitGCInvokesConcurrentAndUnloadsClasses",
"-Xlog:gc",
"-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldContain("ExplicitGCInvokesConcurrentAndUnloadsClasses was deprecated");
output.shouldHaveExitValue(0);
}
}

3
hotspot/test/gc/arguments/TestSelectDefaultGC.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -66,7 +66,6 @@ public class TestSelectDefaultGC {
assertVMOption(output, "UseSerialGC", !isServer); assertVMOption(output, "UseSerialGC", !isServer);
// CMS is never default // CMS is never default
assertVMOption(output, "UseConcMarkSweepGC", false); assertVMOption(output, "UseConcMarkSweepGC", false);
assertVMOption(output, "UseParNewGC", false);
} }
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {

47
hotspot/test/gc/startup_warnings/TestDefNewCMS.java
View file

@ -1,47 +0,0 @@
/*
* Copyright (c) 2013, 2016, 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 TestDefNewCMS
* @key gc
* @bug 8065972
* @summary Test that the unsupported DefNew+CMS combination does not start
* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
public class TestDefNewCMS {
public static void main(String args[]) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:-UseParNewGC", "-XX:+UseConcMarkSweepGC", "-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldContain("It is not possible to combine the DefNew young collector with the CMS collector.");
output.shouldContain("Error");
output.shouldHaveExitValue(1);
}
}

48
hotspot/test/gc/startup_warnings/TestParNewCMS.java
View file

@ -1,48 +0,0 @@
/*
* Copyright (c) 2013, 2016, 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 TestParNewCMS
* @key gc
* @bug 8065972
* @summary Test that specifying -XX:+UseParNewGC on the command line logs a warning message
* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
public class TestParNewCMS {
public static void main(String args[]) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseParNewGC", "-XX:+UseConcMarkSweepGC", "-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldContain("warning: Option UseParNewGC was deprecated in version");
output.shouldNotContain("error");
output.shouldHaveExitValue(0);
}
}

48
hotspot/test/gc/startup_warnings/TestParNewSerialOld.java
View file

@ -1,48 +0,0 @@
/*
* Copyright (c) 2013, 2016, 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 TestParNewSerialOld
* @key gc
* @bug 8065972
* @summary Test that the unsupported ParNew+SerialOld combination does not start
* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
public class TestParNewSerialOld {
public static void main(String args[]) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseParNewGC", "-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldContain("It is not possible to combine the ParNew young collector with any collector other than CMS.");
output.shouldContain("Error");
output.shouldHaveExitValue(1);
}
}

12
hotspot/test/runtime/CommandLine/ObsoleteFlagErrorMessage.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -37,18 +37,18 @@ public class ObsoleteFlagErrorMessage {
// Case 1: Newly obsolete flags with extra junk appended should not be treated as newly obsolete (8060449) // Case 1: Newly obsolete flags with extra junk appended should not be treated as newly obsolete (8060449)
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder( ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-XX:UseOldInliningPlusJunk", "-version"); "-XX:ConvertSleepToYieldPlusJunk", "-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start()); OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldContain("Unrecognized VM option 'UseOldInliningPlusJunk'"); // Must identify bad option. output.shouldContain("Unrecognized VM option 'ConvertSleepToYieldPlusJunk'"); // Must identify bad option.
output.shouldHaveExitValue(1); output.shouldHaveExitValue(1);
// Case 2: Newly obsolete integer-valued flags should be recognized as newly obsolete (8073989) // Case 2: Newly obsolete flags should be recognized as newly obsolete (8073989)
ProcessBuilder pb2 = ProcessTools.createJavaProcessBuilder( ProcessBuilder pb2 = ProcessTools.createJavaProcessBuilder(
"-XX:NmethodSweepFraction=10", "-version"); "-XX:+ConvertSleepToYield", "-version");
OutputAnalyzer output2 = new OutputAnalyzer(pb2.start()); OutputAnalyzer output2 = new OutputAnalyzer(pb2.start());
output2.shouldContain("Ignoring option").shouldContain("support was removed"); output2.shouldContain("Ignoring option").shouldContain("support was removed");
output2.shouldContain("NmethodSweepFraction"); output2.shouldContain("ConvertSleepToYield");
} }
} }

7
hotspot/test/runtime/CommandLine/VMAliasOptions.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -40,11 +40,6 @@ public class VMAliasOptions {
*/ */
public static final String[][] ALIAS_OPTIONS = { public static final String[][] ALIAS_OPTIONS = {
{"DefaultMaxRAMFraction", "MaxRAMFraction", "1032"}, {"DefaultMaxRAMFraction", "MaxRAMFraction", "1032"},
{"CMSMarkStackSizeMax", "MarkStackSizeMax", "1032"},
{"CMSMarkStackSize", "MarkStackSize", "1032"},
{"G1MarkStackSize", "MarkStackSize", "1032"},
{"ParallelMarkingThreads", "ConcGCThreads", "2"},
{"ParallelCMSThreads", "ConcGCThreads", "2"},
{"CreateMinidumpOnCrash", "CreateCoredumpOnCrash", "false" }, {"CreateMinidumpOnCrash", "CreateCoredumpOnCrash", "false" },
}; };

10
hotspot/test/runtime/CommandLine/VMDeprecatedOptions.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -41,17 +41,9 @@ public class VMDeprecatedOptions {
public static final String[][] DEPRECATED_OPTIONS = { public static final String[][] DEPRECATED_OPTIONS = {
// deprecated non-alias flags: // deprecated non-alias flags:
{"MaxGCMinorPauseMillis", "1032"}, {"MaxGCMinorPauseMillis", "1032"},
{"UseParNewGC", "false"},
{"ConvertSleepToYield", "false" },
{"ConvertYieldToSleep", "false" },
// deprecated alias flags (see also aliased_jvm_flags): // deprecated alias flags (see also aliased_jvm_flags):
{"DefaultMaxRAMFraction", "4"}, {"DefaultMaxRAMFraction", "4"},
{"CMSMarkStackSizeMax", "1032"},
{"CMSMarkStackSize", "1032"},
{"G1MarkStackSize", "1032"},
{"ParallelMarkingThreads", "2"},
{"ParallelCMSThreads", "2"},
{"CreateMinidumpOnCrash", "false"} {"CreateMinidumpOnCrash", "false"}
}; };

47
hotspot/test/runtime/NMT/AutoshutdownNMT.java
View file

@ -1,47 +0,0 @@
/*
* Copyright (c) 2014, 2016, 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
* @key nmt
* @summary Test for deprecated message if -XX:-AutoShutdownNMT is specified
* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
public class AutoshutdownNMT {
public static void main(String args[]) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-XX:NativeMemoryTracking=detail",
"-XX:-AutoShutdownNMT",
"-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldContain("Ignoring option AutoShutdownNMT");
}
}

4
jaxp/.hgtags
View file

@ -396,5 +396,9 @@ f85154af719f99a3b4d81b67a8b4c18a650d10f9 jdk-9+150
13c6906bfc861d99dc35a19c80b7a99f0b0ac58d jdk-9+151 13c6906bfc861d99dc35a19c80b7a99f0b0ac58d jdk-9+151
7e3da313b1746578da648155e37dd8526e83153d jdk-9+152 7e3da313b1746578da648155e37dd8526e83153d jdk-9+152
1384504d2cd0e55c5e0becaeaf40ab05cae959d6 jdk-9+153 1384504d2cd0e55c5e0becaeaf40ab05cae959d6 jdk-9+153
0908877116d17c6e59092ec7d53ef687a96d3278 jdk-10+0
7fa738305436d14c0926df0f04892890cacc766b jdk-9+154 7fa738305436d14c0926df0f04892890cacc766b jdk-9+154
48fa77af153288b08ba794e1616a7b0685f3b67e jdk-9+155 48fa77af153288b08ba794e1616a7b0685f3b67e jdk-9+155
e930c373aaa4e0e712c9a25ba4b03d473b48c294 jdk-9+156
412df235a8a229469a2cb9e7bb274d43277077d2 jdk-9+157
60e670a65e07cc309951bd838b484401e6dd7847 jdk-9+158

2
jaxp/.jcheck/conf
View file

@ -1 +1 @@
project=jdk9 project=jdk10

11
jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java
View file

@ -438,7 +438,7 @@ public final class TemplatesImpl implements Templates, Serializable {
Layer bootLayer = Layer.boot(); Layer bootLayer = Layer.boot();
Configuration cf = bootLayer.configuration() Configuration cf = bootLayer.configuration()
.resolveRequires(finder, ModuleFinder.of(), Set.of(mn)); .resolve(finder, ModuleFinder.of(), Set.of(mn));
PrivilegedAction<Layer> pa = () -> bootLayer.defineModules(cf, name -> loader); PrivilegedAction<Layer> pa = () -> bootLayer.defineModules(cf, name -> loader);
Layer layer = AccessController.doPrivileged(pa); Layer layer = AccessController.doPrivileged(pa);
@ -483,10 +483,11 @@ public final class TemplatesImpl implements Templates, Serializable {
String pn = _tfactory.getPackageName(); String pn = _tfactory.getPackageName();
assert pn != null && pn.length() > 0; assert pn != null && pn.length() > 0;
ModuleDescriptor descriptor = ModuleDescriptor.module(mn) ModuleDescriptor descriptor =
.requires("java.xml") ModuleDescriptor.newModule(mn, Set.of(ModuleDescriptor.Modifier.SYNTHETIC))
.exports(pn) .requires("java.xml")
.build(); .exports(pn)
.build();
Module m = createModule(descriptor, loader); Module m = createModule(descriptor, loader);

4
jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
*/ */
/* /*
@ -743,7 +743,7 @@ public class XMLDocumentScannerImpl
// scan XMLDecl // scan XMLDecl
try { try {
if (fEntityScanner.skipString(XMLDECL)) { if (fEntityScanner.skipString(XMLDECL)) {
if (fEntityScanner.peekChar() == ' ') { if (XMLChar.isSpace(fEntityScanner.peekChar())) {
fMarkupDepth++; fMarkupDepth++;
scanXMLDeclOrTextDecl(false); scanXMLDeclOrTextDecl(false);
} else { } else {

57
jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java
View file

@ -415,9 +415,15 @@ public class XML11Configuration extends ParserConfigurationSettings
/** Current DTD scanner. */ /** Current DTD scanner. */
protected XMLDTDScanner fCurrentDTDScanner; protected XMLDTDScanner fCurrentDTDScanner;
/** Flag indiciating whether XML11 components have been initialized. */ /** Flag indicating whether XML11 components have been initialized. */
private boolean f11Initialized = false; private boolean f11Initialized = false;
/** Flag indicating whether the symbol table instance was specified during construction **/
private boolean fSymbolTableProvided = false;
/** Flag indicating if the symbol table was initialized and never used before that **/
private boolean fSymbolTableJustInitialized = true;
// //
// Constructors // Constructors
// //
@ -566,15 +572,18 @@ public class XML11Configuration extends ParserConfigurationSettings
}; };
addRecognizedProperties(recognizedProperties); addRecognizedProperties(recognizedProperties);
if (symbolTable == null) { // Remember if symbolTable was provided from outside
symbolTable = new SymbolTable(); fSymbolTableProvided = symbolTable != null;
if (!fSymbolTableProvided) {
fSymbolTable = new SymbolTable();
} else {
fSymbolTable = symbolTable;
} }
fSymbolTable = symbolTable;
fProperties.put(SYMBOL_TABLE, fSymbolTable); fProperties.put(SYMBOL_TABLE, fSymbolTable);
fGrammarPool = grammarPool; fGrammarPool = grammarPool;
if (fGrammarPool != null) { if (fGrammarPool != null) {
fProperties.put(XMLGRAMMAR_POOL, fGrammarPool); fProperties.put(XMLGRAMMAR_POOL, fGrammarPool);
} }
fEntityManager = new XMLEntityManager(); fEntityManager = new XMLEntityManager();
@ -840,6 +849,7 @@ public class XML11Configuration extends ParserConfigurationSettings
fValidationManager.reset(); fValidationManager.reset();
fVersionDetector.reset(this); fVersionDetector.reset(this);
fConfigUpdated = true; fConfigUpdated = true;
resetSymbolTable();
resetCommon(); resetCommon();
short version = fVersionDetector.determineDocVersion(fInputSource); short version = fVersionDetector.determineDocVersion(fInputSource);
@ -858,15 +868,7 @@ public class XML11Configuration extends ParserConfigurationSettings
// resets and sets the pipeline. // resets and sets the pipeline.
fVersionDetector.startDocumentParsing((XMLEntityHandler) fCurrentScanner, version); fVersionDetector.startDocumentParsing((XMLEntityHandler) fCurrentScanner, version);
fInputSource = null; fInputSource = null;
} catch (XNIException ex) { } catch (IOException | RuntimeException ex) {
if (PRINT_EXCEPTION_STACK_TRACE)
ex.printStackTrace();
throw ex;
} catch (IOException ex) {
if (PRINT_EXCEPTION_STACK_TRACE)
ex.printStackTrace();
throw ex;
} catch (RuntimeException ex) {
if (PRINT_EXCEPTION_STACK_TRACE) if (PRINT_EXCEPTION_STACK_TRACE)
ex.printStackTrace(); ex.printStackTrace();
throw ex; throw ex;
@ -879,15 +881,7 @@ public class XML11Configuration extends ParserConfigurationSettings
try { try {
return fCurrentScanner.scanDocument(complete); return fCurrentScanner.scanDocument(complete);
} catch (XNIException ex) { } catch (IOException | RuntimeException ex) {
if (PRINT_EXCEPTION_STACK_TRACE)
ex.printStackTrace();
throw ex;
} catch (IOException ex) {
if (PRINT_EXCEPTION_STACK_TRACE)
ex.printStackTrace();
throw ex;
} catch (RuntimeException ex) {
if (PRINT_EXCEPTION_STACK_TRACE) if (PRINT_EXCEPTION_STACK_TRACE)
ex.printStackTrace(); ex.printStackTrace();
throw ex; throw ex;
@ -1589,6 +1583,23 @@ public class XML11Configuration extends ParserConfigurationSettings
} }
} }
/**
* Reset the symbol table if it wasn't provided during construction
* and its not the first time when parse is called after initialization
*/
private void resetSymbolTable() {
if (!fSymbolTableProvided) {
if (fSymbolTableJustInitialized) {
// Skip symbol table reallocation for the first parsing process
fSymbolTableJustInitialized = false;
} else {
fSymbolTable = new SymbolTable();
fProperties.put(SYMBOL_TABLE, fSymbolTable);
}
}
}
/** /**
* Returns the state of a feature. This method calls getFeature() * Returns the state of a feature. This method calls getFeature()
* on ParserConfigurationSettings, bypassing getFeature() on this * on ParserConfigurationSettings, bypassing getFeature() on this

52
jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java
View file

@ -717,7 +717,9 @@ public final class ToHTMLStream extends ToStream
*/ */
public final void endDocument() throws org.xml.sax.SAXException public final void endDocument() throws org.xml.sax.SAXException
{ {
flushCharactersBuffer(); if (m_doIndent) {
flushCharactersBuffer();
}
flushPending(); flushPending();
if (m_doIndent && !m_isprevtext) if (m_doIndent && !m_isprevtext)
{ {
@ -776,9 +778,11 @@ public final class ToHTMLStream extends ToStream
Attributes atts) Attributes atts)
throws SAXException throws SAXException
{ {
// will add extra one if having namespace but no matter if (m_doIndent) {
m_childNodeNum++; // will add extra one if having namespace but no matter
flushCharactersBuffer(); m_childNodeNum++;
flushCharactersBuffer();
}
ElemContext elemContext = m_elemContext; ElemContext elemContext = m_elemContext;
// clean up any pending things first // clean up any pending things first
@ -839,8 +843,10 @@ public final class ToHTMLStream extends ToStream
writer.write('<'); writer.write('<');
writer.write(name); writer.write(name);
m_childNodeNumStack.push(m_childNodeNum); if (m_doIndent) {
m_childNodeNum = 0; m_childNodeNumStack.add(m_childNodeNum);
m_childNodeNum = 0;
}
if (m_tracer != null) if (m_tracer != null)
firePseudoAttributes(); firePseudoAttributes();
@ -915,7 +921,9 @@ public final class ToHTMLStream extends ToStream
final String name) final String name)
throws org.xml.sax.SAXException throws org.xml.sax.SAXException
{ {
flushCharactersBuffer(); if (m_doIndent) {
flushCharactersBuffer();
}
// deal with any pending issues // deal with any pending issues
if (m_cdataTagOpen) if (m_cdataTagOpen)
closeCDATA(); closeCDATA();
@ -997,12 +1005,11 @@ public final class ToHTMLStream extends ToStream
} }
} }
m_childNodeNum = m_childNodeNumStack.pop(); if (m_doIndent) {
// clean up because the element has ended m_childNodeNum = m_childNodeNumStack.remove(m_childNodeNumStack.size() - 1);
if ((elemFlags & ElemDesc.WHITESPACESENSITIVE) != 0) // clean up because the element has ended
m_ispreserve = true; m_isprevtext = false;
m_isprevtext = false; }
// fire off the end element event // fire off the end element event
if (m_tracer != null) if (m_tracer != null)
super.fireEndElem(name); super.fireEndElem(name);
@ -1018,11 +1025,6 @@ public final class ToHTMLStream extends ToStream
} }
// some more clean because the element has ended. // some more clean because the element has ended.
if (!elemContext.m_startTagOpen)
{
if (m_doIndent && !m_preserves.isEmpty())
m_preserves.pop();
}
m_elemContext = elemContext.m_prev; m_elemContext = elemContext.m_prev;
// m_isRawStack.pop(); // m_isRawStack.pop();
} }
@ -1525,7 +1527,6 @@ public final class ToHTMLStream extends ToStream
closeStartTag(); closeStartTag();
m_elemContext.m_startTagOpen = false; m_elemContext.m_startTagOpen = false;
} }
m_ispreserve = true;
// With m_ispreserve just set true it looks like shouldIndent() // With m_ispreserve just set true it looks like shouldIndent()
// will always return false, so drop any possible indentation. // will always return false, so drop any possible indentation.
@ -1602,8 +1603,6 @@ public final class ToHTMLStream extends ToStream
m_elemContext.m_startTagOpen = false; m_elemContext.m_startTagOpen = false;
} }
m_ispreserve = true;
if (shouldIndent()) if (shouldIndent())
indent(); indent();
@ -1640,8 +1639,10 @@ public final class ToHTMLStream extends ToStream
public void processingInstruction(String target, String data) public void processingInstruction(String target, String data)
throws org.xml.sax.SAXException throws org.xml.sax.SAXException
{ {
m_childNodeNum++; if (m_doIndent) {
flushCharactersBuffer(); m_childNodeNum++;
flushCharactersBuffer();
}
// Process any pending starDocument and startElement first. // Process any pending starDocument and startElement first.
flushPending(); flushPending();
@ -1790,11 +1791,6 @@ public final class ToHTMLStream extends ToStream
*/ */
if (m_StringOfCDATASections != null) if (m_StringOfCDATASections != null)
m_elemContext.m_isCdataSection = isCdataSection(); m_elemContext.m_isCdataSection = isCdataSection();
if (m_doIndent)
{
m_isprevtext = false;
m_preserves.push(m_ispreserve);
}
} }
catch(IOException e) catch(IOException e)

270
jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java
View file

@ -20,34 +20,36 @@
package com.sun.org.apache.xml.internal.serializer; package com.sun.org.apache.xml.internal.serializer;
import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
import com.sun.org.apache.xml.internal.serializer.utils.MsgKey;
import com.sun.org.apache.xml.internal.serializer.utils.Utils;
import com.sun.org.apache.xml.internal.serializer.utils.WrappedRuntimeException;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.io.Writer; import java.io.Writer;
import java.util.ArrayDeque;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Deque;
import java.util.EmptyStackException; import java.util.EmptyStackException;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
import java.util.Properties; import java.util.Properties;
import java.util.Queue;
import java.util.Set; import java.util.Set;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import javax.xml.transform.ErrorListener; import javax.xml.transform.ErrorListener;
import javax.xml.transform.OutputKeys; import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer; import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerException;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.xml.sax.Attributes; import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler; import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
import com.sun.org.apache.xml.internal.serializer.utils.MsgKey;
import com.sun.org.apache.xml.internal.serializer.utils.Utils;
import com.sun.org.apache.xml.internal.serializer.utils.WrappedRuntimeException;
/** /**
* This abstract class is a base class for other stream * This abstract class is a base class for other stream
* serializers (xml, html, text ...) that write output to a stream. * serializers (xml, html, text ...) that write output to a stream.
@ -103,7 +105,7 @@ abstract public class ToStream extends SerializerBase {
* If m_childNodeNum > 1, the text node will be indented. * If m_childNodeNum > 1, the text node will be indented.
* *
*/ */
protected Deque<Integer> m_childNodeNumStack = new ArrayDeque<>(); protected List<Integer> m_childNodeNumStack = new ArrayList<>();
protected int m_childNodeNum = 0; protected int m_childNodeNum = 0;
@ -115,26 +117,6 @@ abstract public class ToStream extends SerializerBase {
protected boolean m_ispreserveSpace = false; protected boolean m_ispreserveSpace = false;
/**
* Stack to keep track of whether or not we need to
* preserve whitespace.
*
* Used to push/pop values used for the field m_ispreserve, but
* m_ispreserve is only relevant if m_doIndent is true.
* If m_doIndent is false this field has no impact.
*
*/
protected BoolStack m_preserves = new BoolStack();
/**
* State flag to tell if preservation of whitespace
* is important.
*
* Used only in shouldIndent() but only if m_doIndent is true.
* If m_doIndent is false this flag has no impact.
*
*/
protected boolean m_ispreserve = false;
/** /**
* State flag that tells if the previous node processed * State flag that tells if the previous node processed
@ -1267,7 +1249,6 @@ abstract public class ToStream extends SerializerBase {
closeStartTag(); closeStartTag();
m_elemContext.m_startTagOpen = false; m_elemContext.m_startTagOpen = false;
} }
m_ispreserve = true;
if (shouldIndent()) if (shouldIndent())
indent(); indent();
@ -1357,8 +1338,6 @@ abstract public class ToStream extends SerializerBase {
m_elemContext.m_startTagOpen = false; m_elemContext.m_startTagOpen = false;
} }
m_ispreserve = true;
m_writer.write(ch, start, length); m_writer.write(ch, start, length);
} }
catch (IOException e) catch (IOException e)
@ -1405,8 +1384,8 @@ abstract public class ToStream extends SerializerBase {
if (length == 0 || (isInEntityRef())) if (length == 0 || (isInEntityRef()))
return; return;
final boolean shouldFormat = shouldFormatOutput(); final boolean shouldNotFormat = !shouldFormatOutput();
if (m_elemContext.m_startTagOpen && !shouldFormat) if (m_elemContext.m_startTagOpen)
{ {
closeStartTag(); closeStartTag();
m_elemContext.m_startTagOpen = false; m_elemContext.m_startTagOpen = false;
@ -1432,8 +1411,12 @@ abstract public class ToStream extends SerializerBase {
if (m_disableOutputEscapingStates.peekOrFalse() || (!m_escaping)) if (m_disableOutputEscapingStates.peekOrFalse() || (!m_escaping))
{ {
charactersRaw(chars, start, length); if (shouldNotFormat) {
m_isprevtext = true; charactersRaw(chars, start, length);
m_isprevtext = true;
} else {
m_charactersBuffer.addRawText(chars, start, length);
}
// time to fire off characters generation event // time to fire off characters generation event
if (m_tracer != null) if (m_tracer != null)
super.fireCharEvent(chars, start, length); super.fireCharEvent(chars, start, length);
@ -1441,16 +1424,16 @@ abstract public class ToStream extends SerializerBase {
return; return;
} }
if (m_elemContext.m_startTagOpen && !shouldFormat) if (m_elemContext.m_startTagOpen)
{ {
closeStartTag(); closeStartTag();
m_elemContext.m_startTagOpen = false; m_elemContext.m_startTagOpen = false;
} }
if (shouldFormat) { if (shouldNotFormat) {
m_charactersBuffer.addText(chars, start, length);
} else {
outputCharacters(chars, start, length); outputCharacters(chars, start, length);
} else {
m_charactersBuffer.addText(chars, start, length);
} }
// time to fire off characters generation event // time to fire off characters generation event
@ -1465,7 +1448,14 @@ abstract public class ToStream extends SerializerBase {
* @return True if the content should be formatted. * @return True if the content should be formatted.
*/ */
protected boolean shouldFormatOutput() { protected boolean shouldFormatOutput() {
return !m_ispreserveSpace && m_doIndent; return m_doIndent && !m_ispreserveSpace;
}
/**
* @return True if the content in current element should be formatted.
*/
public boolean getIndent() {
return shouldFormatOutput();
} }
/** /**
@ -1506,12 +1496,6 @@ abstract public class ToStream extends SerializerBase {
i = lastDirty; i = lastDirty;
} }
} }
/* If there is some non-whitespace, mark that we may need
* to preserve this. This is only important if we have indentation on.
*/
if (i < end)
m_ispreserve = true;
// int lengthClean; // number of clean characters in a row // int lengthClean; // number of clean characters in a row
// final boolean[] isAsciiClean = m_charInfo.getASCIIClean(); // final boolean[] isAsciiClean = m_charInfo.getASCIIClean();
@ -1577,12 +1561,7 @@ abstract public class ToStream extends SerializerBase {
*/ */
final protected void flushCharactersBuffer() throws SAXException { final protected void flushCharactersBuffer() throws SAXException {
try { try {
if (shouldFormatOutput() && m_charactersBuffer.hasContent()) { if (shouldFormatOutput() && m_charactersBuffer.isAnyCharactersBuffered()) {
if (m_elemContext.m_startTagOpen) {
closeStartTag();
m_elemContext.m_startTagOpen = false;
}
if (m_elemContext.m_isCdataSection) { if (m_elemContext.m_isCdataSection) {
/* /*
* due to cdata-section-elements atribute, we need this as * due to cdata-section-elements atribute, we need this as
@ -1594,11 +1573,16 @@ abstract public class ToStream extends SerializerBase {
} }
m_childNodeNum++; m_childNodeNum++;
boolean skipBeginningNewlines = false;
if (shouldIndentForText()) { if (shouldIndentForText()) {
indent(); indent();
m_startNewLine = true; m_startNewLine = true;
// newline has always been added here because if this is the
// text before the first element, shouldIndent() won't
// return true.
skipBeginningNewlines = true;
} }
m_charactersBuffer.flush(); m_charactersBuffer.flush(skipBeginningNewlines);
} }
} catch (IOException e) { } catch (IOException e) {
throw new SAXException(e); throw new SAXException(e);
@ -1858,8 +1842,10 @@ abstract public class ToStream extends SerializerBase {
if (isInEntityRef()) if (isInEntityRef())
return; return;
m_childNodeNum++; if (m_doIndent) {
flushCharactersBuffer(); m_childNodeNum++;
flushCharactersBuffer();
}
if (m_needToCallStartDocument) if (m_needToCallStartDocument)
{ {
@ -1890,8 +1876,6 @@ abstract public class ToStream extends SerializerBase {
if (namespaceURI != null) if (namespaceURI != null)
ensurePrefixIsDeclared(namespaceURI, name); ensurePrefixIsDeclared(namespaceURI, name);
m_ispreserve = false;
if (shouldIndent() && m_startNewLine) if (shouldIndent() && m_startNewLine)
{ {
indent(); indent();
@ -1912,11 +1896,13 @@ abstract public class ToStream extends SerializerBase {
if (atts != null) if (atts != null)
addAttributes(atts); addAttributes(atts);
m_ispreserveSpace = m_preserveSpaces.peekOrFalse(); if (m_doIndent) {
m_preserveSpaces.push(m_ispreserveSpace); m_ispreserveSpace = m_preserveSpaces.peekOrFalse();
m_preserveSpaces.push(m_ispreserveSpace);
m_childNodeNumStack.push(m_childNodeNum); m_childNodeNumStack.add(m_childNodeNum);
m_childNodeNum = 0; m_childNodeNum = 0;
}
m_elemContext = m_elemContext.push(namespaceURI,localName,name); m_elemContext = m_elemContext.push(namespaceURI,localName,name);
m_isprevtext = false; m_isprevtext = false;
@ -2128,7 +2114,9 @@ abstract public class ToStream extends SerializerBase {
if (isInEntityRef()) if (isInEntityRef())
return; return;
flushCharactersBuffer(); if (m_doIndent) {
flushCharactersBuffer();
}
// namespaces declared at the current depth are no longer valid // namespaces declared at the current depth are no longer valid
// so get rid of them // so get rid of them
m_prefixMap.popNamespaces(m_elemContext.m_currentElemDepth, null); m_prefixMap.popNamespaces(m_elemContext.m_currentElemDepth, null);
@ -2175,16 +2163,13 @@ abstract public class ToStream extends SerializerBase {
throw new SAXException(e); throw new SAXException(e);
} }
if (!m_elemContext.m_startTagOpen && m_doIndent) if (m_doIndent) {
{ m_ispreserveSpace = m_preserveSpaces.popAndTop();
m_ispreserve = m_preserves.isEmpty() ? false : m_preserves.pop(); m_childNodeNum = m_childNodeNumStack.remove(m_childNodeNumStack.size() - 1);
m_isprevtext = false;
} }
m_ispreserveSpace = m_preserveSpaces.popAndTop();
m_childNodeNum = m_childNodeNumStack.pop();
m_isprevtext = false;
// fire off the end element event // fire off the end element event
if (m_tracer != null) if (m_tracer != null)
super.fireEndElem(name); super.fireEndElem(name);
@ -2320,8 +2305,10 @@ abstract public class ToStream extends SerializerBase {
int start_old = start; int start_old = start;
if (isInEntityRef()) if (isInEntityRef())
return; return;
m_childNodeNum++; if (m_doIndent) {
flushCharactersBuffer(); m_childNodeNum++;
flushCharactersBuffer();
}
if (m_elemContext.m_startTagOpen) if (m_elemContext.m_startTagOpen)
{ {
closeStartTag(); closeStartTag();
@ -2501,8 +2488,10 @@ abstract public class ToStream extends SerializerBase {
*/ */
public void startCDATA() throws org.xml.sax.SAXException public void startCDATA() throws org.xml.sax.SAXException
{ {
m_childNodeNum++; if (m_doIndent) {
flushCharactersBuffer(); m_childNodeNum++;
flushCharactersBuffer();
}
m_cdataStartCalled = true; m_cdataStartCalled = true;
} }
@ -2588,12 +2577,6 @@ abstract public class ToStream extends SerializerBase {
*/ */
if (m_StringOfCDATASections != null) if (m_StringOfCDATASections != null)
m_elemContext.m_isCdataSection = isCdataSection(); m_elemContext.m_isCdataSection = isCdataSection();
if (m_doIndent)
{
m_isprevtext = false;
m_preserves.push(m_ispreserve);
}
} }
} }
@ -2943,7 +2926,9 @@ abstract public class ToStream extends SerializerBase {
String value, String value,
boolean xslAttribute) boolean xslAttribute)
{ {
if (m_charactersBuffer.isAnyCharactersBuffered()) { if (!m_charactersBuffer.isAnyCharactersBuffered()) {
return doAddAttributeAlways(uri, localName, rawName, type, value, xslAttribute);
} else {
/* /*
* If stylesheet includes xsl:copy-of an attribute node, XSLTC will * If stylesheet includes xsl:copy-of an attribute node, XSLTC will
* fire an addAttribute event. When a text node is handling in * fire an addAttribute event. When a text node is handling in
@ -2954,8 +2939,6 @@ abstract public class ToStream extends SerializerBase {
* *
*/ */
return m_attributes.getIndex(rawName) < 0; return m_attributes.getIndex(rawName) < 0;
} else {
return doAddAttributeAlways(uri, localName, rawName, type, value, xslAttribute);
} }
} }
@ -3086,7 +3069,7 @@ abstract public class ToStream extends SerializerBase {
} }
} }
if (rawName.equals("xml:space")) { if (m_doIndent && rawName.equals("xml:space")) {
if (value.equals("preserve")) { if (value.equals("preserve")) {
m_ispreserveSpace = true; m_ispreserveSpace = true;
if (m_preserveSpaces.size() > 0) if (m_preserveSpaces.size() > 0)
@ -3227,8 +3210,6 @@ abstract public class ToStream extends SerializerBase {
// Leave m_format alone for now - Brian M. // Leave m_format alone for now - Brian M.
// this.m_format = null; // this.m_format = null;
this.m_inDoctype = false; this.m_inDoctype = false;
this.m_ispreserve = false;
this.m_preserves.clear();
this.m_ispreserveSpace = false; this.m_ispreserveSpace = false;
this.m_preserveSpaces.clear(); this.m_preserveSpaces.clear();
this.m_childNodeNum = 0; this.m_childNodeNum = 0;
@ -3411,6 +3392,7 @@ abstract public class ToStream extends SerializerBase {
} }
} }
/** /**
* This inner class is used to buffer the text nodes and the entity * This inner class is used to buffer the text nodes and the entity
* reference nodes if indentation is on. There is only one CharacterBuffer * reference nodes if indentation is on. There is only one CharacterBuffer
@ -3425,20 +3407,21 @@ abstract public class ToStream extends SerializerBase {
*/ */
private abstract class GenericCharacters { private abstract class GenericCharacters {
/** /**
* @return True if having any character other than whitespace or * @return True if all characters in this Text are newlines.
* line feed.
*/ */
abstract boolean hasContent(); abstract boolean flush(boolean skipBeginningNewlines) throws SAXException;
abstract void flush() throws SAXException;
/** /**
* Converts this GenericCharacters to a new character array. * Converts this GenericCharacters to a new character array. This
* method is used to handle cdata-section-elements attribute in
* xsl:output. Therefore it doesn't need to consider
* skipBeginningNewlines because the text will be involved with CDATA
* tag.
*/ */
abstract char[] toChars(); abstract char[] toChars();
} }
private Queue<GenericCharacters> bufferedCharacters = new ArrayDeque<>(); private List<GenericCharacters> bufferedCharacters = new ArrayList<>();
/** /**
* Append a text node to the buffer. * Append a text node to the buffer.
@ -3451,27 +3434,21 @@ abstract public class ToStream extends SerializerBase {
text = Arrays.copyOfRange(chars, start, start + length); text = Arrays.copyOfRange(chars, start, start + length);
} }
boolean hasContent() { boolean flush(boolean skipBeginningNewlines) throws SAXException {
for (int i = 0; i < text.length; i++) { int start = 0;
if (!isWhiteSpace(text[i])) { while (skipBeginningNewlines && text[start] == '\n') {
start++;
if (start == text.length) {
return true; return true;
} }
} }
outputCharacters(text, start, text.length - start);
return false; return false;
} }
void flush() throws SAXException {
outputCharacters(text, 0, text.length);
}
char[] toChars() { char[] toChars() {
return text; return text;
} }
boolean isWhiteSpace(char ch) {
return ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r';
}
}); });
} }
@ -3480,12 +3457,22 @@ abstract public class ToStream extends SerializerBase {
*/ */
public void addEntityReference(String entityName) { public void addEntityReference(String entityName) {
bufferedCharacters.add(new GenericCharacters() { bufferedCharacters.add(new GenericCharacters() {
boolean hasContent() { boolean flush(boolean skipBeginningNewlines) throws SAXException {
return true; if (m_elemContext.m_startTagOpen)
} {
closeStartTag();
void flush() throws SAXException { m_elemContext.m_startTagOpen = false;
outputEntityReference(entityName); }
if (m_cdataTagOpen)
closeCDATA();
char[] cs = toChars();
try {
m_writer.write(cs, 0, cs.length);
m_isprevtext = true;
} catch (IOException e) {
throw new SAXException(e);
}
return false;
} }
char[] toChars() { char[] toChars() {
@ -3495,35 +3482,69 @@ abstract public class ToStream extends SerializerBase {
} }
/** /**
* @return True if any GenericCharacters is already buffered. * Append a raw text to the buffer. Used to handle raw characters event.
*/ */
public boolean isAnyCharactersBuffered() { public void addRawText(final char chars[], final int start, final int length) {
return !bufferedCharacters.isEmpty(); bufferedCharacters.add(new GenericCharacters() {
char[] text;
{
text = Arrays.copyOfRange(chars, start, start + length);
}
boolean flush(boolean skipBeginningNewlines) throws SAXException {
try {
int start = 0;
while (skipBeginningNewlines && text[start] == '\n') {
start++;
if (start == text.length) {
return true;
}
}
m_writer.write(text, start, text.length - start);
m_isprevtext = true;
} catch (IOException e) {
throw new SAXException(e);
}
return false;
}
char[] toChars() {
return text;
}
});
} }
/** /**
* @return True if any buffered GenericCharacters has content. * @return True if any GenericCharacters are buffered.
*/ */
public boolean hasContent() { public boolean isAnyCharactersBuffered() {
return bufferedCharacters.stream().anyMatch(GenericCharacters::hasContent); return bufferedCharacters.size() > 0;
} }
/** /**
* Flush all buffered GenericCharacters. * Flush all buffered GenericCharacters.
*/ */
public void flush() throws SAXException { public void flush(boolean skipBeginningNewlines) throws SAXException {
GenericCharacters element; Iterator<GenericCharacters> itr = bufferedCharacters.iterator();
while ((element = bufferedCharacters.poll()) != null)
element.flush(); boolean continueSkipBeginningNewlines = skipBeginningNewlines;
while (itr.hasNext()) {
GenericCharacters element = itr.next();
continueSkipBeginningNewlines = element.flush(continueSkipBeginningNewlines);
itr.remove();
}
} }
/** /**
* Converts all buffered GenericCharacters to a new character array. * Converts all buffered GenericCharacters to a new character array.
*/ */
public char[] toChars() { public char[] toChars() {
return bufferedCharacters.stream().map(GenericCharacters::toChars) StringBuilder sb = new StringBuilder();
.collect(StringBuilder::new, StringBuilder::append, StringBuilder::append).toString() for (GenericCharacters element : bufferedCharacters) {
.toCharArray(); sb.append(element.toChars());
}
return sb.toString().toCharArray();
} }
/** /**
@ -3534,6 +3555,7 @@ abstract public class ToStream extends SerializerBase {
} }
} }
// Implement DTDHandler // Implement DTDHandler
/** /**
* If this method is called, the serializer is used as a * If this method is called, the serializer is used as a

20
jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java
View file

@ -88,8 +88,6 @@ public final class ToXMLStream extends ToStream
setOmitXMLDeclaration(xmlListener.getOmitXMLDeclaration()); setOmitXMLDeclaration(xmlListener.getOmitXMLDeclaration());
m_ispreserve = xmlListener.m_ispreserve;
m_preserves = xmlListener.m_preserves;
m_ispreserveSpace = xmlListener.m_ispreserveSpace; m_ispreserveSpace = xmlListener.m_ispreserveSpace;
m_preserveSpaces = xmlListener.m_preserveSpaces; m_preserveSpaces = xmlListener.m_preserveSpaces;
m_childNodeNum = xmlListener.m_childNodeNum; m_childNodeNum = xmlListener.m_childNodeNum;
@ -201,7 +199,9 @@ public final class ToXMLStream extends ToStream
*/ */
public void endDocument() throws org.xml.sax.SAXException public void endDocument() throws org.xml.sax.SAXException
{ {
flushCharactersBuffer(); if (m_doIndent) {
flushCharactersBuffer();
}
flushPending(); flushPending();
if (m_doIndent && !m_isprevtext) if (m_doIndent && !m_isprevtext)
{ {
@ -235,11 +235,6 @@ public final class ToXMLStream extends ToStream
*/ */
public void startPreserving() throws org.xml.sax.SAXException public void startPreserving() throws org.xml.sax.SAXException
{ {
// Not sure this is really what we want. -sb
m_preserves.push(true);
m_ispreserve = true;
} }
/** /**
@ -251,9 +246,6 @@ public final class ToXMLStream extends ToStream
*/ */
public void endPreserving() throws org.xml.sax.SAXException public void endPreserving() throws org.xml.sax.SAXException
{ {
// Not sure this is really what we want. -sb
m_ispreserve = m_preserves.isEmpty() ? false : m_preserves.pop();
} }
/** /**
@ -273,8 +265,10 @@ public final class ToXMLStream extends ToStream
if (isInEntityRef()) if (isInEntityRef())
return; return;
m_childNodeNum++; if (m_doIndent) {
flushCharactersBuffer(); m_childNodeNum++;
flushCharactersBuffer();
}
flushPending(); flushPending();
if (target.equals(Result.PI_DISABLE_OUTPUT_ESCAPING)) if (target.equals(Result.PI_DISABLE_OUTPUT_ESCAPING))

3
jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java
View file

@ -1024,7 +1024,8 @@ final class DOM3TreeWalker {
return; return;
} }
if (bDispatch) { if (bDispatch
&& (!fSerializer.getIndent() || !node.getData().replace('\n', ' ').trim().isEmpty())) {
dispatachChars(node); dispatachChars(node);
} }
} }

10
jaxp/src/java.xml/share/classes/module-info.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -26,6 +26,8 @@
/** /**
* Defines the Java API for XML Processing (JAXP), the Streaming API for XML (StAX), * Defines the Java API for XML Processing (JAXP), the Streaming API for XML (StAX),
* the Simple API for XML (SAX), and the W3C Document Object Model (DOM) API. * the Simple API for XML (SAX), and the W3C Document Object Model (DOM) API.
*
* @since 9
*/ */
module java.xml { module java.xml {
exports javax.xml; exports javax.xml;
@ -53,12 +55,6 @@ module java.xml {
exports org.xml.sax; exports org.xml.sax;
exports org.xml.sax.ext; exports org.xml.sax.ext;
exports org.xml.sax.helpers; exports org.xml.sax.helpers;
exports com.sun.org.apache.xerces.internal.dom to
java.xml.ws;
exports com.sun.org.apache.xerces.internal.jaxp to
java.xml.ws;
exports com.sun.org.apache.xerces.internal.util to
java.xml.ws;
exports com.sun.org.apache.xml.internal.dtm to exports com.sun.org.apache.xml.internal.dtm to
java.xml.crypto; java.xml.crypto;
exports com.sun.org.apache.xml.internal.utils to exports com.sun.org.apache.xml.internal.utils to

5
jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java
View file

@ -22,6 +22,7 @@
*/ */
package org.w3c.dom.ptests; package org.w3c.dom.ptests;
import static jaxp.library.JAXPTestUtilities.USER_DIR;
import static jaxp.library.JAXPTestUtilities.compareWithGold; import static jaxp.library.JAXPTestUtilities.compareWithGold;
import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission; import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
@ -157,7 +158,7 @@ public class NodeTest {
Element element = (Element) document.getElementsByTagName("sender").item(0); Element element = (Element) document.getElementsByTagName("sender").item(0);
parentElement.insertBefore(createTestDocumentFragment(document), element); parentElement.insertBefore(createTestDocumentFragment(document), element);
String outputfile = "InsertBefore.out"; String outputfile = USER_DIR + "InsertBefore.out";
String goldfile = GOLDEN_DIR + "InsertBeforeGF.out"; String goldfile = GOLDEN_DIR + "InsertBeforeGF.out";
tryRunWithTmpPermission(() -> outputXml(document, outputfile), new PropertyPermission("user.dir", "read")); tryRunWithTmpPermission(() -> outputXml(document, outputfile), new PropertyPermission("user.dir", "read"));
assertTrue(compareWithGold(goldfile, outputfile)); assertTrue(compareWithGold(goldfile, outputfile));
@ -175,7 +176,7 @@ public class NodeTest {
Element element = (Element) document.getElementsByTagName("sender").item(0); Element element = (Element) document.getElementsByTagName("sender").item(0);
parentElement.replaceChild(createTestDocumentFragment(document), element); parentElement.replaceChild(createTestDocumentFragment(document), element);
String outputfile = "ReplaceChild3.out"; String outputfile = USER_DIR + "ReplaceChild3.out";
String goldfile = GOLDEN_DIR + "ReplaceChild3GF.out"; String goldfile = GOLDEN_DIR + "ReplaceChild3GF.out";
tryRunWithTmpPermission(() -> outputXml(document, outputfile), new PropertyPermission("user.dir", "read")); tryRunWithTmpPermission(() -> outputXml(document, outputfile), new PropertyPermission("user.dir", "read"));
assertTrue(compareWithGold(goldfile, outputfile)); assertTrue(compareWithGold(goldfile, outputfile));

3
jaxp/test/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java
View file

@ -22,6 +22,7 @@
*/ */
package test.astro; package test.astro;
import static jaxp.library.JAXPTestUtilities.USER_DIR;
import static jaxp.library.JAXPTestUtilities.filenameToURL; import static jaxp.library.JAXPTestUtilities.filenameToURL;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNotNull;
@ -130,7 +131,7 @@ public class DocumentLSTest {
impl = (DOMImplementationLS) db.getDOMImplementation(); impl = (DOMImplementationLS) db.getDOMImplementation();
LSSerializer domSerializer = impl.createLSSerializer(); LSSerializer domSerializer = impl.createLSSerializer();
MyDOMOutput mydomoutput = new MyDOMOutput(); MyDOMOutput mydomoutput = new MyDOMOutput();
try (OutputStream os = new FileOutputStream("test.out")) { try (OutputStream os = new FileOutputStream(USER_DIR + "test.out")) {
mydomoutput.setByteStream(os); mydomoutput.setByteStream(os);
mydomoutput.setEncoding("UTF-8"); mydomoutput.setEncoding("UTF-8");
assertTrue(domSerializer.write(doc, mydomoutput)); assertTrue(domSerializer.write(doc, mydomoutput));

10
jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/LayerModularXMLParserTest.java
View file

@ -96,7 +96,7 @@ public class LayerModularXMLParserTest {
public void testOneLayer() throws Exception { public void testOneLayer() throws Exception {
ModuleFinder finder1 = ModuleFinder.of(MOD_DIR1); ModuleFinder finder1 = ModuleFinder.of(MOD_DIR1);
Configuration cf1 = Layer.boot().configuration() Configuration cf1 = Layer.boot().configuration()
.resolveRequiresAndUses(finder1, ModuleFinder.of(), Set.of("test")); .resolveAndBind(finder1, ModuleFinder.of(), Set.of("test"));
ClassLoader scl = ClassLoader.getSystemClassLoader(); ClassLoader scl = ClassLoader.getSystemClassLoader();
Layer layer1 = Layer.boot().defineModulesWithManyLoaders(cf1, scl); Layer layer1 = Layer.boot().defineModulesWithManyLoaders(cf1, scl);
ClassLoader cl1 = layer1.findLoader("test"); ClassLoader cl1 = layer1.findLoader("test");
@ -126,12 +126,12 @@ public class LayerModularXMLParserTest {
public void testTwoLayer() throws Exception { public void testTwoLayer() throws Exception {
ModuleFinder finder1 = ModuleFinder.of(MOD_DIR1); ModuleFinder finder1 = ModuleFinder.of(MOD_DIR1);
Configuration cf1 = Layer.boot().configuration() Configuration cf1 = Layer.boot().configuration()
.resolveRequiresAndUses(finder1, ModuleFinder.of(), Set.of("test")); .resolveAndBind(finder1, ModuleFinder.of(), Set.of("test"));
ClassLoader scl = ClassLoader.getSystemClassLoader(); ClassLoader scl = ClassLoader.getSystemClassLoader();
Layer layer1 = Layer.boot().defineModulesWithManyLoaders(cf1, scl); Layer layer1 = Layer.boot().defineModulesWithManyLoaders(cf1, scl);
ModuleFinder finder2 = ModuleFinder.of(MOD_DIR2); ModuleFinder finder2 = ModuleFinder.of(MOD_DIR2);
Configuration cf2 = cf1.resolveRequiresAndUses(finder2, ModuleFinder.of(), Set.of("test")); Configuration cf2 = cf1.resolveAndBind(finder2, ModuleFinder.of(), Set.of("test"));
Layer layer2 = layer1.defineModulesWithOneLoader(cf2, layer1.findLoader("test")); Layer layer2 = layer1.defineModulesWithOneLoader(cf2, layer1.findLoader("test"));
ClassLoader cl2 = layer2.findLoader("test"); ClassLoader cl2 = layer2.findLoader("test");
@ -160,12 +160,12 @@ public class LayerModularXMLParserTest {
public void testTwoLayerWithDuplicate() throws Exception { public void testTwoLayerWithDuplicate() throws Exception {
ModuleFinder finder1 = ModuleFinder.of(MOD_DIR1, MOD_DIR2); ModuleFinder finder1 = ModuleFinder.of(MOD_DIR1, MOD_DIR2);
Configuration cf1 = Layer.boot().configuration() Configuration cf1 = Layer.boot().configuration()
.resolveRequiresAndUses(finder1, ModuleFinder.of(), Set.of("test")); .resolveAndBind(finder1, ModuleFinder.of(), Set.of("test"));
ClassLoader scl = ClassLoader.getSystemClassLoader(); ClassLoader scl = ClassLoader.getSystemClassLoader();
Layer layer1 = Layer.boot().defineModulesWithManyLoaders(cf1, scl); Layer layer1 = Layer.boot().defineModulesWithManyLoaders(cf1, scl);
ModuleFinder finder2 = ModuleFinder.of(MOD_DIR2); ModuleFinder finder2 = ModuleFinder.of(MOD_DIR2);
Configuration cf2 = cf1.resolveRequiresAndUses(finder2, ModuleFinder.of(), Set.of("test")); Configuration cf2 = cf1.resolveAndBind(finder2, ModuleFinder.of(), Set.of("test"));
Layer layer2 = layer1.defineModulesWithOneLoader(cf2, layer1.findLoader("test")); Layer layer2 = layer1.defineModulesWithOneLoader(cf2, layer1.findLoader("test"));
ClassLoader cl2 = layer2.findLoader("test"); ClassLoader cl2 = layer2.findLoader("test");

165
jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java
View file

@ -60,7 +60,7 @@ import org.xml.sax.SAXException;
/* /*
* @test * @test
* @bug 6439439 8087303 * @bug 6439439 8087303 8174025
* @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
* @run testng/othervm -DrunSecMngr=true common.prettyprint.PrettyPrintTest * @run testng/othervm -DrunSecMngr=true common.prettyprint.PrettyPrintTest
* @run testng/othervm common.prettyprint.PrettyPrintTest * @run testng/othervm common.prettyprint.PrettyPrintTest
@ -69,29 +69,30 @@ import org.xml.sax.SAXException;
@Listeners({jaxp.library.FilePolicy.class}) @Listeners({jaxp.library.FilePolicy.class})
public class PrettyPrintTest { public class PrettyPrintTest {
/* /*
* test CDATA, elements only, text and element, whitespace and element, * test CDATA, elements only, text and element, xml:space property, mixed
* xml:space property and nested xml:space property, mixed node types. * node types.
*/ */
@DataProvider(name = "xml-data") @DataProvider(name = "xml-data")
public Object[][] xmlData() throws Exception { public Object[][] xmlData() throws Exception {
return new Object[][] { return new Object[][] {
{ read("xmltest1.xml"), read("xmltest1.out") }, { "xmltest1.xml", "xmltest1.out" },
{ read("xmltest2.xml"), read("xmltest2.out") }, { "xmltest2.xml", "xmltest2.out" },
{ read("xmltest3.xml"), read("xmltest3.out") }, { "xmltest3.xml", "xmltest3.out" },
{ read("xmltest4.xml"), read("xmltest4.out") }, { "xmltest4.xml", "xmltest4.out" },
{ read("xmltest5.xml"), read("xmltest5.out") }, { "xmltest6.xml", "xmltest6.out" },
{ read("xmltest6.xml"), read("xmltest6.out") }, { "xmltest8.xml", "xmltest8.out" } };
{ read("xmltest7.xml"), read("xmltest7.out") },
{ read("xmltest8.xml"), read("xmltest8.out") } };
} }
/* /*
* @bug 8087303 * @bug 8087303
* Test the whitespace text nodes are serialized with pretty-print by LSSerializer and transformer correctly * Test the xml document are serialized with pretty-print by
* LSSerializer and transformer correctly
* *
*/ */
@Test(dataProvider = "xml-data") @Test(dataProvider = "xml-data")
public void testXMLPrettyPrint(String source, String expected) throws Exception { public void testXMLPrettyPrint(String sourceFile, String expectedFile) throws Exception {
String source = read(sourceFile);
String expected = read(expectedFile);
// test it's no change if no pretty-print // test it's no change if no pretty-print
String result = serializerWrite(toXmlDocument(source), false); String result = serializerWrite(toXmlDocument(source), false);
assertTrue(toXmlDocument(source).isEqualNode(toXmlDocument(result)), "The actual is: " + result); assertTrue(toXmlDocument(source).isEqualNode(toXmlDocument(result)), "The actual is: " + result);
@ -104,40 +105,116 @@ public class PrettyPrintTest {
assertEquals(transform(toXmlDocument(source), true).replaceAll("\r\n", "\n"), expected); assertEquals(transform(toXmlDocument(source), true).replaceAll("\r\n", "\n"), expected);
} }
/* /*
* test pure text content, and sequent Text nodes. * @bug 8087303
* Test a single text node is serialized with pretty-print by
* LSSerializer and transformer correctly
*
*/ */
@DataProvider(name = "xml-node-data") @Test
public Object[][] xmlNodeData() throws Exception { public void testSingleTextNode() throws Exception {
return new Object[][] { Node xml = newTextNode(read("nodetest1.txt"));
{ newTextNode(read("nodetest1.txt")), read("nodetest1.out") }, String expected = read("nodetest1.out");
{ createDocWithSequentTextNodes(), read("nodetest2.out") } }; assertEquals(serializerWrite(xml, true), expected);
assertEquals(transform(xml, true).replaceAll("\r\n", "\n"), expected);
} }
/* /*
* @bug 8087303 * @bug 8087303
* Test the whitespace text nodes are serialized with pretty-print by LSSerializer and transformer correctly, * Test the transformer shall keep all whitespace text node in
* doesn't compare with the source because the test data is Node object * sequent text nodes
* *
*/ */
@Test(dataProvider = "xml-node-data") @Test
public void testXMLNodePrettyPrint(Node xml, String expected) throws Exception { public void testSequentTextNodesWithTransformer() throws Exception {
assertEquals(serializerWrite(xml, true), expected); Node xml = createDocWithSequentTextNodes();
String expected = read("nodetest2.out");
assertEquals(transform(xml, true).replaceAll("\r\n", "\n"), expected); assertEquals(transform(xml, true).replaceAll("\r\n", "\n"), expected);
} }
/*
* @bug 8087303
* Test LSSerializer shall eliminate the whitespace text node
* in sequent text nodes
*
*/
@Test
public void testSequentTextNodesWithLSSerializer() throws Exception {
Node xml = createDocWithSequentTextNodes();
String expected = read("nodetest2ls.out");
assertEquals(serializerWrite(xml, true), expected);
}
/*
* test whitespace and element, nested xml:space property.
*/
@DataProvider(name = "xml-data-whitespace-ls")
public Object[][] whitespaceLS() throws Exception {
return new Object[][] {
{ "xmltest5.xml", "xmltest5ls.out" },
{ "xmltest7.xml", "xmltest7ls.out" } };
}
/*
* @bug 8087303
* Test LSSerializer shall eliminate the whitespace text node
* unless xml:space="preserve"
*
*/
@Test(dataProvider = "xml-data-whitespace-ls")
public void testWhitespaceWithLSSerializer(String sourceFile, String expectedFile) throws Exception {
String source = read(sourceFile);
String expected = read(expectedFile);
// test it's no change if no pretty-print
String result = serializerWrite(toXmlDocument(source), false);
assertTrue(toXmlDocument(source).isEqualNode(toXmlDocument(result)), "The actual is: " + result);
// test pretty-print
assertEquals(serializerWrite(toXmlDocument(source), true), expected);
}
/*
* test whitespace and element, nested xml:space property.
*/
@DataProvider(name = "xml-data-whitespace-xslt")
public Object[][] whitespaceXSLT() throws Exception {
return new Object[][] {
{ "xmltest5.xml", "xmltest5xslt.out" },
{ "xmltest7.xml", "xmltest7xslt.out" } };
}
/*
* @bug 8087303
* Test the transformer shall format the output but keep all
* whitespace text node even if xml:space="preserve"
*
*/
@Test(dataProvider = "xml-data-whitespace-xslt")
public void testWhitespaceWithTransformer(String sourceFile, String expectedFile) throws Exception {
String source = read(sourceFile);
String expected = read(expectedFile);
// test it's no change if no pretty-print
String result = transform(toXmlDocument(source), false);
assertTrue(toXmlDocument(source).isEqualNode(toXmlDocument(result)), "The actual is: " + result);
// test pretty-print
assertEquals(transform(toXmlDocument(source), true).replaceAll("\r\n", "\n"), expected);
}
/* /*
* test block element, inline element, text, and mixed elements. * test block element, inline element, text, and mixed elements.
*/ */
@DataProvider(name = "html-data") @DataProvider(name = "html-data")
public Object[][] htmlData() throws Exception { public Object[][] htmlData() throws Exception {
return new Object[][] { return new Object[][] {
{ read("htmltest1.xml"), read("htmltest1.out") }, { "htmltest1.xml", "htmltest1.out" },
{ read("htmltest2.xml"), read("htmltest2.out") }, { "htmltest2.xml", "htmltest2.out" },
{ read("htmltest3.xml"), read("htmltest3.out") }, { "htmltest3.xml", "htmltest3.out" },
{ read("htmltest4.xml"), read("htmltest4.out") }, { "htmltest4.xml", "htmltest4.out" },
{ read("htmltest5.xml"), read("htmltest5.out") }, { "htmltest5.xml", "htmltest5.out" },
{ read("htmltest6.xml"), read("htmltest6.out") } }; { "htmltest6.xml", "htmltest6.out" },
/* @bug 8174025, test whitespace between inline elements */
{ "htmltest7.xml", "htmltest7.out" } };
} }
/* /*
@ -146,7 +223,9 @@ public class PrettyPrintTest {
* *
*/ */
@Test(dataProvider = "html-data") @Test(dataProvider = "html-data")
public void testTransformToHTML(String source, String expected) throws Exception { public void testTransformToHTML(String sourceFile, String expectedFile) throws Exception {
String source = read(sourceFile);
String expected = read(expectedFile);
// test it's no change if no pretty-print // test it's no change if no pretty-print
StringWriter writer = new StringWriter(); StringWriter writer = new StringWriter();
getTransformer(true, false).transform(new StreamSource(new StringReader(source)), new StreamResult(writer)); getTransformer(true, false).transform(new StreamSource(new StringReader(source)), new StreamResult(writer));
@ -158,6 +237,27 @@ public class PrettyPrintTest {
assertEquals(writer.toString().replaceAll("\r\n", "\n"), expected); assertEquals(writer.toString().replaceAll("\r\n", "\n"), expected);
} }
/*
* @bug 8174025
* Test the serializer can handle <xsl:text disable-output-escaping="yes"> correctly.
*
*/
@Test
public void testDisableOutputEscaping() throws Exception {
final String xsl ="generate-catalog.xsl";
final String xml ="simple-entity-resolver-config.xml";
final String expectedOutput ="simple-entity-resolver-config-transformed.xml";
TransformerFactory factory = TransformerFactory.newInstance();
Transformer transformer = factory.newTemplates(new StreamSource(new StringReader(read(xsl)))).newTransformer();
String key = "schemaBase";
String value = "schemas";
transformer.setParameter(key, value);
StringWriter writer = new StringWriter();
transformer.transform(new StreamSource(new StringReader(read(xml))), new StreamResult(writer));
assertEquals(writer.toString().replaceAll("\r\n", "\n"), read(expectedOutput));
}
@Test @Test
public void testLSSerializerFormatPrettyPrint() { public void testLSSerializerFormatPrettyPrint() {
@ -298,6 +398,9 @@ public class PrettyPrintTest {
Document doc = db.newDocument(); Document doc = db.newDocument();
Node root = doc.createElement("root"); Node root = doc.createElement("root");
doc.appendChild(root); doc.appendChild(root);
root.appendChild(doc.createTextNode("\n"));
root.appendChild(doc.createTextNode("\n"));
root.appendChild(doc.createTextNode("\n"));
root.appendChild(doc.createTextNode(" ")); root.appendChild(doc.createTextNode(" "));
root.appendChild(doc.createTextNode("t")); root.appendChild(doc.createTextNode("t"));
root.appendChild(doc.createTextNode("\n")); root.appendChild(doc.createTextNode("\n"));

23
jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/generate-catalog.xsl Normal file
View file

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8" ?>
<!-- Stylesheet for generating the entity-resolver document in XCatalog format -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="xml" indent="yes"/>
<xsl:param name="schemaBase"/>
<xsl:template match="entity-resolver-config">
<catalog xmlns="xmlns:xml:catalog"
prefer="system"
xml:base="{$schemaBase}" >
<xsl:for-each select="entity">
<!-- Generate System Id -->
<xsl:text disable-output-escaping="yes">&lt;system systemId="</xsl:text>
<xsl:value-of select="system-id/text()"/>
<xsl:text>" uri="</xsl:text>
<xsl:value-of select="location/text()"/>
<xsl:text disable-output-escaping="yes">" /&gt;&#10;</xsl:text>
</xsl:for-each>
</catalog>
</xsl:template>
</xsl:stylesheet>

2
jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest1.xml
View file

@ -1 +1 @@
<rss version="2.0"><channel xml:space="preserve"><title>Java Tutorials and Examples 1</title> <language>en-us</language></channel></rss> <rss version="2.0"><channel xml:space="preserve"><title>Java Tutorials and Examples 1</title><language>en-us</language></channel></rss>

7
jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest7.out Normal file
View file

@ -0,0 +1,7 @@
<html>
<body>
<p>
<span>this</span> <span>is</span> <span>a</span> <span>whitespace</span> <span>inline element</span> <span>test</span>
</p>
</body>
</html>

1
jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/htmltest7.xml Normal file
View file

@ -0,0 +1 @@
<html><body><p> <span>this</span> <span>is</span> <span>a</span> <span>whitespace</span> <span>inline element</span> <span>test</span> </p></body></html>

19
jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest2.out
View file

@ -1,19 +1,30 @@
<root> <root>
t t
t t
<child1/> <child1>
</child1>
t t
<child2/> <child2> </child2>
<child3/>
<child4/> <child3> </child3>
<child4> </child4>
<child5> <child5>
t t
<child51> <child51>
<child511>t</child511> <child511>t</child511>
</child51> </child51>
t t
</child5> </child5>
<!-- test comment --> <!-- test comment -->
<!-- --> <!-- -->
<?target1 test?> <?target1 test?>
</root> </root>

18
jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/nodetest2ls.out Normal file
View file

@ -0,0 +1,18 @@
<root>
tt
<child1/>
t
<child2/>
<child3/>
<child4/>
<child5>
t
<child51>
<child511>t</child511>
</child51>
t
</child5>
<!-- test comment -->
<!-- -->
<?target1 test?>
</root>

3
jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/simple-entity-resolver-config-transformed.xml Normal file
View file

@ -0,0 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?><catalog prefer="system" xml:base="schemas" xmlns="xmlns:xml:catalog"><system systemId="http://www.example.test/oracle/schema/example1.xsd" uri="META-INF/example1.xsd" />
<system systemId="http://www.example.test/oracle/schema/example2.xsd" uri="META-INF/example2.xsd" />
</catalog>

20
jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/simple-entity-resolver-config.xml Normal file
View file

@ -0,0 +1,20 @@
<?xml version="1.0"?>
<entity-resolver-config
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.example.test/schema.xsd"
schema-major-version="1"
schema-minor-version="1">
<entity>
<description>Example 1 Schema Type library 10.0 </description>
<public-id>>-//Oracle//Example 1 Schema Type library 10.0//EN</public-id>
<system-id>http://www.example.test/oracle/schema/example1.xsd</system-id>
<location>META-INF/example1.xsd</location>
</entity>
<entity>
<description>Example 2 Schema Type library 10.0 </description>
<public-id>>-//Oracle//Example 2 Schema Type library 10.0//EN</public-id>
<system-id>http://www.example.test/oracle/schema/example2.xsd</system-id>
<location>META-INF/example2.xsd</location>
</entity>
</entity-resolver-config>

0
jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest5.out → jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest5ls.out
View file

15
jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest5xslt.out Normal file
View file

@ -0,0 +1,15 @@
<rss version="2.0">
<channel>
<title>Java Tutorials and Examples 1</title>
<language>en-us</language>
</channel>
<a>
<b> </b>
</a>
<c>
</c>
</rss>

0
jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest7.out → jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest7ls.out
View file

17
jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest7xslt.out Normal file
View file

@ -0,0 +1,17 @@
<rss>
<layer1 xml:space="preserve"> <title>Java </title> <layer2 xml:space="asfsa"> <layer3> <layer4 xml:space="default">
<l5>5</l5>
</layer4> </layer3> </layer2> <layer2 xml:space="default">
<layer3>
<l4> </l4>
</layer3>
<layer3 xml:space="preserve"> <l4> </l4> </layer3>
</layer2> </layer1>
</rss>

15
jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest8.out
View file

@ -1,25 +1,20 @@
<root> <root>
t
t
<![CDATA[ ]]> <![CDATA[ ]]>
t
t
<child1/> <child1/>
t
t
<!-- test comment --> <!-- test comment -->
<child2/> <child2/>
<child5> <child5>
t
t
<?target1 test?> <?target1 test?>
<child51> <child51>
<child511>t</child511> <child511>t</child511>
</child51> </child51>
<?target1 test?> <?target1 test?>
t
t
</child5> </child5>
</root> </root>

13
jaxp/test/javax/xml/jaxp/unittest/common/prettyprint/xmltest8.xml
View file

@ -2,14 +2,7 @@
t<![CDATA[ ]]> t<![CDATA[ ]]>
t t
<child1/> <child1/>
t<!-- test comment --> t<!-- test comment --><child2/><child5>
<child2/> t<?target1 test?><child51><child511>t</child511></child51><?target1 test?>
<child5>
t<?target1 test?>
<child51>
<child511>t</child511>
</child51><?target1 test?>
t t
</child5> </child5></root>
</root>

8
jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java
View file

@ -279,11 +279,11 @@ public class LSSerializerTest {
"<author>\n" + "<author>\n" +
" <a>&name1;Jo Smith</a>\n" + " <a>&name1;Jo Smith</a>\n" +
" <b>b &name2;Jo Smith &name1;Jo Smith b</b>\n" + " <b>b &name2;Jo Smith &name1;Jo Smith b</b>\n" +
" <c> &name;Jo Smith </c>\n" + " <c>&name;Jo Smith </c>\n" +
" <d>&ele1;d</d>\n" + " <d>&ele1;d</d>\n" +
" <e> &ele2;eee </e>\n" + " <e>&ele2;eee </e>\n" +
" <f>&lt;att&gt;</f>\n" + " <f>&lt;att&gt;</f>\n" +
" <g> &ele; g</g>\n" + " <g>&ele; g</g>\n" +
" <h>&ele2;</h>\n" + " <h>&ele2;</h>\n" +
"</author>\n"); "</author>\n");
@ -301,7 +301,7 @@ public class LSSerializerTest {
"<author>\n" + "<author>\n" +
" <a>&name;Jo Smith</a>\n" + " <a>&name;Jo Smith</a>\n" +
" <b>b &name;Jo Smith &name;Jo Smith b</b>\n" + " <b>b &name;Jo Smith &name;Jo Smith b</b>\n" +
" <c> &name;Jo Smith </c>\n" + " <c>&name;Jo Smith </c>\n" +
" <d>\n" + " <d>\n" +
" <aa>\n" + " <aa>\n" +
" <bb>text</bb>\n" + " <bb>text</bb>\n" +

158
jaxp/test/javax/xml/jaxp/unittest/parsers/BaseParsingTest.java Normal file
View file

@ -0,0 +1,158 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package parsers;
import java.io.StringReader;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Listeners;
import org.testng.annotations.Test;
import org.xml.sax.InputSource;
/**
* @test
* @bug 8169450
* @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
* @run testng/othervm -DrunSecMngr=true parsers.BaseParsingTest
* @run testng/othervm parsers.BaseParsingTest
* @summary Tests that verify base parsing
*/
@Listeners({jaxp.library.BasePolicy.class})
public class BaseParsingTest {
@DataProvider(name = "xmlDeclarations")
public static Object[][] xmlDeclarations() {
return new Object[][]{
{"<?xml version=\"1.0\"?><root><test>t</test></root>"},
{"<?xml version=\"1.0\" encoding=\"UTF-8\"?><root><test>t</test></root>"},
{"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone='yes'?><root><test>t</test></root>"},
{"<?xml\n"
+ " version=\"1.0\"?>\n"
+ "<root>\n"
+ " <test>t</test>\n"
+ "</root>"},
{"<?xml\n"
+ " version=\"1.0\"\n"
+ " encoding=\"UTF-8\"?>\n"
+ "<root>\n"
+ " <test>t</test>\n"
+ "</root>"},
{"<?xml\n"
+ " version=\"1.0\"\n"
+ " encoding=\"UTF-8\"\n"
+ " standalone=\"yes\"?>\n"
+ "<root>\n"
+ " <test>t</test>\n"
+ "</root>"},
{"<?xml\n"
+ " version\n"
+ "=\n"
+ "\"1.0\"\n"
+ " encoding\n"
+ "=\n"
+ "\"UTF-8\"\n"
+ " standalone\n"
+ "=\n"
+ "\"yes\"?>\n"
+ "<root>\n"
+ " <test>t</test>\n"
+ "</root>"},
{"<?xml version=\"1.1\"?><root><test>t</test></root>"},
{"<?xml version=\"1.1\" encoding=\"UTF-8\"?><root><test>t</test></root>"},
{"<?xml version=\"1.1\" encoding=\"UTF-8\" standalone='yes'?><root><test>t</test></root>"},
{"<?xml\n"
+ " version=\"1.1\"?>\n"
+ "<root>\n"
+ " <test>t</test>\n"
+ "</root>"},
{"<?xml\n"
+ " version=\"1.1\"\n"
+ " encoding=\"UTF-8\"?>\n"
+ "<root>\n"
+ " <test>t</test>\n"
+ "</root>"},
{"<?xml\n"
+ " version=\"1.1\"\n"
+ " encoding=\"UTF-8\"\n"
+ " standalone=\"yes\"?>\n"
+ "<root>\n"
+ " <test>t</test>\n"
+ "</root>"},
{"<?xml\n"
+ " version\n"
+ "=\n"
+ "\"1.1\"\n"
+ " encoding\n"
+ "=\n"
+ "\"UTF-8\"\n"
+ " standalone\n"
+ "=\n"
+ "\"yes\"?>\n"
+ "<root>\n"
+ " <test>t</test>\n"
+ "</root>"}
};
}
/**
* @bug 8169450
* Verifies that the parser successfully parses the declarations provided in
* xmlDeclarations. Exception would otherwise be thrown as reported in 8169450.
*
* XML Declaration according to https://www.w3.org/TR/REC-xml/#NT-XMLDecl
* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>'
* [24] VersionInfo ::= S 'version' Eq ("'" VersionNum "'" | '"' VersionNum '"')
* [25] Eq ::= S? '=' S? [26] VersionNum ::= '1.' [0-9]+
*
* @param xml the test xml
* @throws Exception if the parser fails to parse the xml
*/
@Test(dataProvider = "xmlDeclarations")
public void test(String xml) throws Exception {
XMLInputFactory xif = XMLInputFactory.newDefaultFactory();
XMLStreamReader xsr = xif.createXMLStreamReader(new StringReader(xml));
while (xsr.hasNext()) {
xsr.next();
}
}
/**
* @bug 8169450
* This particular issue does not appear in DOM parsing since the spaces are
* normalized during version detection. This test case then serves as a guard
* against such an issue from occuring in the version detection.
*
* @param xml the test xml
* @throws Exception if the parser fails to parse the xml
*/
@Test(dataProvider = "xmlDeclarations")
public void testWithDOM(String xml) throws Exception {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setValidating(true);
DocumentBuilder db = dbf.newDocumentBuilder();
db.parse(new InputSource(new StringReader(xml)));
}
}

3
jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java
View file

@ -23,6 +23,7 @@
package parsers; package parsers;
import static jaxp.library.JAXPTestUtilities.USER_DIR;
import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission; import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission;
import java.io.File; import java.io.File;
@ -61,7 +62,7 @@ public class Bug6341770 {
return; return;
} }
try { try {
File dir = new File(ALPHA); File dir = new File(USER_DIR + ALPHA);
dir.delete(); dir.delete();
dir.mkdir(); dir.mkdir();
File main = new File(dir, "main.xml"); File main = new File(dir, "main.xml");

3
jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java
View file

@ -23,6 +23,7 @@
package sax; package sax;
import static jaxp.library.JAXPTestUtilities.USER_DIR;
import static jaxp.library.JAXPTestUtilities.getSystemProperty; import static jaxp.library.JAXPTestUtilities.getSystemProperty;
import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission; import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission;
@ -69,7 +70,7 @@ public class Bug7057778Test {
@Test @Test
public void testParse() { public void testParse() {
File src = new File(getClass().getResource(xml).getFile()); File src = new File(getClass().getResource(xml).getFile());
File dst = new File(xml1); File dst = new File(USER_DIR + xml1);
try { try {
copyFile(src, dst); copyFile(src, dst);
SAXParserFactory spf = SAXParserFactory.newInstance(); SAXParserFactory spf = SAXParserFactory.newInstance();

78
jaxp/test/javax/xml/jaxp/unittest/sax/SymbolTableResetTest.java Normal file
View file

@ -0,0 +1,78 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package sax;
import java.io.StringReader;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.testng.Assert;
import org.testng.annotations.Listeners;
import org.testng.annotations.Test;
import org.xml.sax.InputSource;
import org.xml.sax.helpers.DefaultHandler;
/*
* @test
* @bug 8173390
* @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
* @run testng/othervm -DrunSecMngr=true sax.SymbolTableResetTest
* @run testng/othervm sax.SymbolTableResetTest
* @summary Test that SAXParser reallocates symbol table during
* subsequent parse operations
*/
@Listeners({jaxp.library.BasePolicy.class})
public class SymbolTableResetTest {
/*
* Test mimics the SAXParser usage in SAAJ-RI that reuses the
* parsers from the internal pool. To avoid memory leaks, symbol
* table associated with the parser should be reallocated during each
* parse() operation.
*/
@Test
public void testReset() throws Exception {
// Dummy xml input for parser
String input = "<dummy>Test</dummy>";
// Create SAXParser
SAXParserFactory spf = SAXParserFactory.newInstance();
SAXParser p = spf.newSAXParser();
// First parse iteration
p.parse(new InputSource(new StringReader(input)), new DefaultHandler());
// Get first symbol table reference
Object symTable1 = p.getProperty(SYMBOL_TABLE_PROPERTY);
p.reset();
// Second parse iteration
p.parse(new InputSource(new StringReader(input)), new DefaultHandler());
// Get second symbol table reference
Object symTable2 = p.getProperty(SYMBOL_TABLE_PROPERTY);
// Symbol table references should be different
Assert.assertNotSame(symTable1, symTable2, "Symbol table references");
}
// Symbol table property
private static final String SYMBOL_TABLE_PROPERTY = "http://apache.org/xml/properties/internal/symbol-table";
}

10
jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java
View file

@ -23,6 +23,8 @@
package stream; package stream;
import static jaxp.library.JAXPTestUtilities.USER_DIR;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.InputStream; import java.io.InputStream;
@ -67,15 +69,15 @@ public class Bug6688002Test {
} }
public class MyRunnable implements Runnable { public class MyRunnable implements Runnable {
final int no; final String no;
MyRunnable(int no) { MyRunnable(int no) {
this.no = no; this.no = String.valueOf(no);
} }
public void run() { public void run() {
try { try {
FileOutputStream fos = new FileOutputStream("" + no); FileOutputStream fos = new FileOutputStream(USER_DIR + no);
XMLStreamWriter w = getWriter(fos); XMLStreamWriter w = getWriter(fos);
// System.out.println("Writer="+w+" Thread="+Thread.currentThread()); // System.out.println("Writer="+w+" Thread="+Thread.currentThread());
w.writeStartDocument(); w.writeStartDocument();
@ -89,7 +91,7 @@ public class Bug6688002Test {
w.close(); w.close();
fos.close(); fos.close();
FileInputStream fis = new FileInputStream("" + no); FileInputStream fis = new FileInputStream(USER_DIR + no);
XMLStreamReader r = getReader(fis); XMLStreamReader r = getReader(fis);
while (r.hasNext()) { while (r.hasNext()) {
r.next(); r.next();

6
jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java
View file

@ -23,6 +23,8 @@
package stream.XMLEventWriterTest; package stream.XMLEventWriterTest;
import static jaxp.library.JAXPTestUtilities.USER_DIR;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@ -58,7 +60,7 @@ public class ReaderToWriterTest {
private static final XMLOutputFactory XML_OUTPUT_FACTORY = XMLOutputFactory.newInstance(); private static final XMLOutputFactory XML_OUTPUT_FACTORY = XMLOutputFactory.newInstance();
private static final String INPUT_FILE = "W2JDLR4002TestService.wsdl.data"; private static final String INPUT_FILE = "W2JDLR4002TestService.wsdl.data";
private static final String OUTPUT_FILE = "Encoded.wsdl"; private static final String OUTPUT_FILE = USER_DIR + "Encoded.wsdl";
/** /**
* Unit test for writing namespaces when namespaceURI == null. * Unit test for writing namespaces when namespaceURI == null.
@ -126,7 +128,7 @@ public class ReaderToWriterTest {
try { try {
InputStream in = getClass().getResourceAsStream("ReaderToWriterTest.wsdl"); InputStream in = getClass().getResourceAsStream("ReaderToWriterTest.wsdl");
OutputStream out = new FileOutputStream("ReaderToWriterTest-out.xml"); OutputStream out = new FileOutputStream(USER_DIR + "ReaderToWriterTest-out.xml");
XMLEventReader reader = XML_INPUT_FACTORY.createXMLEventReader(in); XMLEventReader reader = XML_INPUT_FACTORY.createXMLEventReader(in);
XMLEventWriter writer = XML_OUTPUT_FACTORY.createXMLEventWriter(out, "UTF-8"); XMLEventWriter writer = XML_OUTPUT_FACTORY.createXMLEventWriter(out, "UTF-8");

48
jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java
View file

@ -23,6 +23,8 @@
package stream.XMLStreamWriterTest; package stream.XMLStreamWriterTest;
import static jaxp.library.JAXPTestUtilities.USER_DIR;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
@ -84,7 +86,7 @@ public class WriterTest {
System.out.println("Test StreamWriter with out any namespace functionality"); System.out.println("Test StreamWriter with out any namespace functionality");
try { try {
String outputFile = files[0] + ".out"; String outputFile = USER_DIR + files[0] + ".out";
System.out.println("Writing output to " + outputFile); System.out.println("Writing output to " + outputFile);
xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING); xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING);
@ -98,7 +100,7 @@ public class WriterTest {
xtw.flush(); xtw.flush();
xtw.close(); xtw.close();
Assert.assertTrue(checkResults(files[0] + ".out", files[0] + ".org")); Assert.assertTrue(checkResults(outputFile, files[0] + ".org"));
} catch (Exception ex) { } catch (Exception ex) {
Assert.fail("testOne Failed " + ex); Assert.fail("testOne Failed " + ex);
@ -113,7 +115,7 @@ public class WriterTest {
System.out.println("Test StreamWriter's Namespace Context"); System.out.println("Test StreamWriter's Namespace Context");
try { try {
String outputFile = files[1] + ".out"; String outputFile = USER_DIR + files[1] + ".out";
System.out.println("Writing output to " + outputFile); System.out.println("Writing output to " + outputFile);
xtw = outputFactory.createXMLStreamWriter(System.out); xtw = outputFactory.createXMLStreamWriter(System.out);
@ -157,7 +159,7 @@ public class WriterTest {
System.out.println("Test StreamWriter for proper element sequence."); System.out.println("Test StreamWriter for proper element sequence.");
try { try {
String outputFile = files[2] + ".out"; String outputFile = USER_DIR + files[2] + ".out";
System.out.println("Writing output to " + outputFile); System.out.println("Writing output to " + outputFile);
xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING); xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING);
@ -172,7 +174,7 @@ public class WriterTest {
xtw.flush(); xtw.flush();
xtw.close(); xtw.close();
Assert.assertTrue(checkResults(files[2] + ".out", files[2] + ".org")); Assert.assertTrue(checkResults(outputFile, files[2] + ".org"));
} catch (Exception ex) { } catch (Exception ex) {
Assert.fail("testThree Failed " + ex); Assert.fail("testThree Failed " + ex);
@ -188,7 +190,7 @@ public class WriterTest {
try { try {
String outputFile = files[3] + ".out"; String outputFile = USER_DIR + files[3] + ".out";
System.out.println("Writing output to " + outputFile); System.out.println("Writing output to " + outputFile);
xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING); xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING);
@ -205,7 +207,7 @@ public class WriterTest {
xtw.flush(); xtw.flush();
xtw.close(); xtw.close();
Assert.assertTrue(checkResults(files[3] + ".out", files[3] + ".org")); Assert.assertTrue(checkResults(outputFile, files[3] + ".org"));
} catch (Exception ex) { } catch (Exception ex) {
Assert.fail("testFour Failed " + ex); Assert.fail("testFour Failed " + ex);
@ -221,7 +223,7 @@ public class WriterTest {
try { try {
String outputFile = files[4] + ".out"; String outputFile = USER_DIR + files[4] + ".out";
System.out.println("Writing output to " + outputFile); System.out.println("Writing output to " + outputFile);
xtw = outputFactory.createXMLStreamWriter(System.out); xtw = outputFactory.createXMLStreamWriter(System.out);
@ -265,7 +267,7 @@ public class WriterTest {
xtw.writeEndDocument(); xtw.writeEndDocument();
xtw.flush(); xtw.flush();
xtw.close(); xtw.close();
Assert.assertTrue(checkResults(files[4] + ".out", files[4] + ".org")); Assert.assertTrue(checkResults(outputFile, files[4] + ".org"));
System.out.println("Done"); System.out.println("Done");
} catch (Exception ex) { } catch (Exception ex) {
Assert.fail("testFive Failed " + ex); Assert.fail("testFive Failed " + ex);
@ -281,7 +283,7 @@ public class WriterTest {
try { try {
String outputFile = files[5] + ".out"; String outputFile = USER_DIR + files[5] + ".out";
System.out.println("Writing output to " + outputFile); System.out.println("Writing output to " + outputFile);
xtw = outputFactory.createXMLStreamWriter(System.out); xtw = outputFactory.createXMLStreamWriter(System.out);
@ -325,7 +327,7 @@ public class WriterTest {
xtw.writeEndDocument(); xtw.writeEndDocument();
xtw.flush(); xtw.flush();
xtw.close(); xtw.close();
Assert.assertTrue(checkResults(files[5] + ".out", files[5] + ".org")); Assert.assertTrue(checkResults(outputFile, files[5] + ".org"));
System.out.println("Done"); System.out.println("Done");
} catch (Exception ex) { } catch (Exception ex) {
Assert.fail("testSix Failed " + ex); Assert.fail("testSix Failed " + ex);
@ -341,7 +343,7 @@ public class WriterTest {
try { try {
String outputFile = files[6] + ".out"; String outputFile = USER_DIR + files[6] + ".out";
System.out.println("Writing output to " + outputFile); System.out.println("Writing output to " + outputFile);
xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING); xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING);
@ -374,7 +376,7 @@ public class WriterTest {
xtw.writeEndDocument(); xtw.writeEndDocument();
xtw.flush(); xtw.flush();
xtw.close(); xtw.close();
Assert.assertTrue(checkResults(files[6] + ".out", files[6] + ".org")); Assert.assertTrue(checkResults(outputFile, files[6] + ".org"));
System.out.println("Done"); System.out.println("Done");
} catch (Exception ex) { } catch (Exception ex) {
Assert.fail("testSeven Failed " + ex); Assert.fail("testSeven Failed " + ex);
@ -390,7 +392,7 @@ public class WriterTest {
try { try {
String outputFile = files[7] + ".out"; String outputFile = USER_DIR + files[7] + ".out";
System.out.println("Writing output to " + outputFile); System.out.println("Writing output to " + outputFile);
outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, new Boolean(true)); outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, new Boolean(true));
xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING); xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING);
@ -424,7 +426,7 @@ public class WriterTest {
xtw.flush(); xtw.flush();
xtw.close(); xtw.close();
// check against testSeven.xml.org // check against testSeven.xml.org
Assert.assertTrue(checkResults(files[7] + ".out", files[7] + ".org")); Assert.assertTrue(checkResults(outputFile, files[7] + ".org"));
System.out.println("Done"); System.out.println("Done");
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
@ -442,7 +444,7 @@ public class WriterTest {
try { try {
String outputFile = files[8] + ".out"; String outputFile = USER_DIR + files[8] + ".out";
System.out.println("Writing output to " + outputFile); System.out.println("Writing output to " + outputFile);
outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, new Boolean(true)); outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, new Boolean(true));
xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING); xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING);
@ -476,7 +478,7 @@ public class WriterTest {
xtw.flush(); xtw.flush();
xtw.close(); xtw.close();
// check against testSeven.xml.org // check against testSeven.xml.org
Assert.assertTrue(checkResults(files[8] + ".out", files[7] + ".org")); Assert.assertTrue(checkResults(outputFile, files[7] + ".org"));
System.out.println("Done"); System.out.println("Done");
} catch (Exception ex) { } catch (Exception ex) {
Assert.fail("testNine Failed " + ex); Assert.fail("testNine Failed " + ex);
@ -491,7 +493,7 @@ public class WriterTest {
System.out.println("Test StreamWriter supplied with no namespace information and" + "isRepairingNamespace is set to true."); System.out.println("Test StreamWriter supplied with no namespace information and" + "isRepairingNamespace is set to true.");
try { try {
String outputFile = files[9] + ".out"; String outputFile = USER_DIR + files[9] + ".out";
System.out.println("Writing output to " + outputFile); System.out.println("Writing output to " + outputFile);
outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, new Boolean(true)); outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, new Boolean(true));
xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING); xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING);
@ -542,7 +544,7 @@ public class WriterTest {
System.out.println("Test StreamWriter supplied with namespace information passed through startElement and" + "isRepairingNamespace is set to true."); System.out.println("Test StreamWriter supplied with namespace information passed through startElement and" + "isRepairingNamespace is set to true.");
try { try {
String outputFile = files[10] + ".out"; String outputFile = USER_DIR + files[10] + ".out";
System.out.println("Writing output to " + outputFile); System.out.println("Writing output to " + outputFile);
outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, new Boolean(true)); outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, new Boolean(true));
xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING); xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING);
@ -576,7 +578,7 @@ public class WriterTest {
xtw.flush(); xtw.flush();
xtw.close(); xtw.close();
// check against testSeven.xml.org // check against testSeven.xml.org
Assert.assertTrue(checkResults(files[10] + ".out", files[7] + ".org")); Assert.assertTrue(checkResults(outputFile, files[7] + ".org"));
System.out.println("Done"); System.out.println("Done");
} catch (Exception ex) { } catch (Exception ex) {
Assert.fail("testEleven Failed " + ex); Assert.fail("testEleven Failed " + ex);
@ -592,7 +594,7 @@ public class WriterTest {
try { try {
String outputFile = files[11] + ".out"; String outputFile = USER_DIR + files[11] + ".out";
System.out.println("Writing output to " + outputFile); System.out.println("Writing output to " + outputFile);
outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, new Boolean(true)); outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, new Boolean(true));
xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING); xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING);
@ -643,7 +645,7 @@ public class WriterTest {
try { try {
String outputFile = files[12] + ".out"; String outputFile = USER_DIR + files[12] + ".out";
System.out.println("Writing output to " + outputFile); System.out.println("Writing output to " + outputFile);
outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, new Boolean(true)); outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, new Boolean(true));
xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING); xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING);
@ -695,7 +697,7 @@ public class WriterTest {
try { try {
String outputFile = files[14] + ".out"; String outputFile = USER_DIR + files[14] + ".out";
System.out.println("Writing output to " + outputFile); System.out.println("Writing output to " + outputFile);
outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, new Boolean(true)); outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, new Boolean(true));
xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING); xtw = outputFactory.createXMLStreamWriter(new FileOutputStream(outputFile), ENCODING);

6
jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java
View file

@ -23,6 +23,8 @@
package transform; package transform;
import static jaxp.library.JAXPTestUtilities.USER_DIR;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@ -55,7 +57,7 @@ public class Bug4693341Test {
// save dtd file to current working directory to avoid writing into source repository // save dtd file to current working directory to avoid writing into source repository
public void copyDTDtoWorkDir() throws IOException { public void copyDTDtoWorkDir() throws IOException {
try (FileInputStream dtdres = new FileInputStream(getClass().getResource("Bug4693341.dtd").getPath()); try (FileInputStream dtdres = new FileInputStream(getClass().getResource("Bug4693341.dtd").getPath());
FileOutputStream dtdwork = new FileOutputStream("Bug4693341.dtd");) { FileOutputStream dtdwork = new FileOutputStream(USER_DIR + "Bug4693341.dtd");) {
int n; int n;
byte[] buffer = new byte[1024]; byte[] buffer = new byte[1024];
while((n = dtdres.read(buffer)) > -1) { while((n = dtdres.read(buffer)) > -1) {
@ -71,7 +73,7 @@ public class Bug4693341Test {
copyDTDtoWorkDir(); copyDTDtoWorkDir();
File outf = new File("Bug4693341.out"); File outf = new File(USER_DIR + "Bug4693341.out");
StreamResult result = new StreamResult(new FileOutputStream(outf)); StreamResult result = new StreamResult(new FileOutputStream(outf));
String in = getClass().getResource("Bug4693341.xml").getPath(); String in = getClass().getResource("Bug4693341.xml").getPath();

4
jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java
View file

@ -23,6 +23,8 @@
package transform; package transform;
import static jaxp.library.JAXPTestUtilities.USER_DIR;
import java.io.File; import java.io.File;
import javax.xml.transform.Source; import javax.xml.transform.Source;
@ -58,7 +60,7 @@ public class Bug4892774 {
private final String XML_FILE = "catalog.xml"; private final String XML_FILE = "catalog.xml";
private final String XML10_FILE = "catalog_10.xml"; // 1.0 version document private final String XML10_FILE = "catalog_10.xml"; // 1.0 version document
private final String TEMP_FILE = "tmp.xml"; private final String TEMP_FILE = USER_DIR + "tmp.xml";
private final String EXPECTED_VERSION = "1.1"; private final String EXPECTED_VERSION = "1.1";
static private Transformer idTransform = null; static private Transformer idTransform = null;

3
jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java
View file

@ -23,6 +23,7 @@
package transform; package transform;
import static jaxp.library.JAXPTestUtilities.USER_DIR;
import static jaxp.library.JAXPTestUtilities.runWithTmpPermission; import static jaxp.library.JAXPTestUtilities.runWithTmpPermission;
import java.io.File; import java.io.File;
@ -52,7 +53,7 @@ public class Bug6216226Test {
@Test @Test
public final void test() { public final void test() {
try { try {
File test = new File("bug6216226.txt"); File test = new File(USER_DIR + "bug6216226.txt");
TransformerFactory tf = TransformerFactory.newInstance(); TransformerFactory tf = TransformerFactory.newInstance();
Transformer xformer = tf.newTransformer(); Transformer xformer = tf.newTransformer();
StringReader st = new StringReader("<?xml version=\"1.0\" encoding=\"UTF-8\"?><doc></doc>"); StringReader st = new StringReader("<?xml version=\"1.0\" encoding=\"UTF-8\"?><doc></doc>");

4
jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java
View file

@ -23,6 +23,8 @@
package transform; package transform;
import static jaxp.library.JAXPTestUtilities.USER_DIR;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import javax.xml.transform.Result; import javax.xml.transform.Result;
@ -65,7 +67,7 @@ public class CR6935697Test {
Transformer xformer = template.newTransformer(); Transformer xformer = template.newTransformer();
// Prepare the input and output files // Prepare the input and output files
Source source = new StreamSource(getClass().getResourceAsStream(inFilename)); Source source = new StreamSource(getClass().getResourceAsStream(inFilename));
Result result = new StreamResult(new FileOutputStream(outFilename)); Result result = new StreamResult(new FileOutputStream(USER_DIR + outFilename));
// Apply the xsl file to the source file and write the result to the // Apply the xsl file to the source file and write the result to the
// output file // output file
xformer.transform(source, result); xformer.transform(source, result);

6
jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java
View file

@ -23,6 +23,7 @@
package transform; package transform;
import java.io.FilePermission;
import java.io.IOException; import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
import java.io.StringWriter; import java.io.StringWriter;
@ -46,6 +47,7 @@ import static org.testng.Assert.assertEquals;
import static jaxp.library.JAXPTestUtilities.runWithAllPerm; import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
import static jaxp.library.JAXPTestUtilities.clearSystemProperty; import static jaxp.library.JAXPTestUtilities.clearSystemProperty;
import static jaxp.library.JAXPTestUtilities.setSystemProperty; import static jaxp.library.JAXPTestUtilities.setSystemProperty;
import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission;
import static jaxp.library.JAXPTestUtilities.getSystemProperty; import static jaxp.library.JAXPTestUtilities.getSystemProperty;
/* /*
@ -77,7 +79,9 @@ public class XSLTFunctionsTest {
Transformer t = tf.newTransformer(new StreamSource(new StringReader(xsl))); Transformer t = tf.newTransformer(new StreamSource(new StringReader(xsl)));
//Transform the xml //Transform the xml
t.transform(new StreamSource(new StringReader(xml)), new StreamResult(new StringWriter())); tryRunWithTmpPermission(
() -> t.transform(new StreamSource(new StringReader(xml)), new StreamResult(new StringWriter())),
new FilePermission(output, "write"), new FilePermission(redirect, "write"));
// Verifies that the output is redirected successfully // Verifies that the output is redirected successfully
String userDir = getSystemProperty("user.dir"); String userDir = getSystemProperty("user.dir");

4
jaxp/test/javax/xml/jaxp/unittest/transform/util/TransformerUtil.java
View file

@ -23,6 +23,8 @@
package transform.util; package transform.util;
import static jaxp.library.JAXPTestUtilities.USER_DIR;
import java.io.InputStream; import java.io.InputStream;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
@ -34,7 +36,7 @@ public abstract class TransformerUtil {
protected String type; protected String type;
protected final String TEMP_FILE = "tmp.xml"; protected final String TEMP_FILE = USER_DIR + "tmp.xml";
public abstract Source prepareSource(InputStream is) throws Exception; public abstract Source prepareSource(InputStream is) throws Exception;

4
jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java
View file

@ -23,6 +23,8 @@
package validation; package validation;
import static jaxp.library.JAXPTestUtilities.USER_DIR;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;
@ -122,7 +124,7 @@ public class CR6708840Test {
Validator schemaValidator = schemaGrammar.newValidator(); Validator schemaValidator = schemaGrammar.newValidator();
Source staxSrc = new StAXSource(staxReader); Source staxSrc = new StAXSource(staxReader);
File resultFile = new File("gMonths.result.xml"); File resultFile = new File(USER_DIR + "gMonths.result.xml");
if (resultFile.exists()) { if (resultFile.exists()) {
resultFile.delete(); resultFile.delete();
} }

9
jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java
View file

@ -23,6 +23,7 @@
package validation; package validation;
import static jaxp.library.JAXPTestUtilities.USER_DIR;
import static jaxp.library.JAXPTestUtilities.runWithTmpPermission; import static jaxp.library.JAXPTestUtilities.runWithTmpPermission;
import java.io.File; import java.io.File;
@ -61,7 +62,7 @@ public class ValidatorTest {
File resultFile = null; File resultFile = null;
try { try {
resultFile = new File("stax.result"); resultFile = new File(USER_DIR + "stax.result");
if (resultFile.exists()) { if (resultFile.exists()) {
resultFile.delete(); resultFile.delete();
} }
@ -88,7 +89,7 @@ public class ValidatorTest {
File resultFile = null; File resultFile = null;
try { try {
resultFile = new File("stax.result"); resultFile = new File(USER_DIR + "stax.result");
if (resultFile.exists()) { if (resultFile.exists()) {
resultFile.delete(); resultFile.delete();
} }
@ -117,7 +118,7 @@ public class ValidatorTest {
// test valid gMonths // test valid gMonths
File resultFile = null; File resultFile = null;
try { try {
resultFile = new File("gMonths.result.xml"); resultFile = new File(USER_DIR + "gMonths.result.xml");
if (resultFile.exists()) { if (resultFile.exists()) {
resultFile.delete(); resultFile.delete();
} }
@ -144,7 +145,7 @@ public class ValidatorTest {
// test invalid gMonths // test invalid gMonths
File invalidResultFile = null; File invalidResultFile = null;
try { try {
invalidResultFile = new File("gMonths-invalid.result.xml"); invalidResultFile = new File(USER_DIR + "gMonths-invalid.result.xml");
if (invalidResultFile.exists()) { if (invalidResultFile.exists()) {
invalidResultFile.delete(); invalidResultFile.delete();
} }

4
jaxws/.hgtags
View file

@ -399,5 +399,9 @@ c8c9c334743caf8155c9809b6b4ac315d3a66476 jdk-9+148
c48b4d4768b1c2b8fe5d1a844ca13732e5dfbe2a jdk-9+151 c48b4d4768b1c2b8fe5d1a844ca13732e5dfbe2a jdk-9+151
6f8fb1cf7e5f61c40dcc3654f9a623c505f6de1f jdk-9+152 6f8fb1cf7e5f61c40dcc3654f9a623c505f6de1f jdk-9+152
7a532a9a227137155b905341d4b99939db51220e jdk-9+153 7a532a9a227137155b905341d4b99939db51220e jdk-9+153
34af95c7dbff74f3448fcdb7d745524e8a1cc88a jdk-10+0
34af95c7dbff74f3448fcdb7d745524e8a1cc88a jdk-9+154 34af95c7dbff74f3448fcdb7d745524e8a1cc88a jdk-9+154
9b9918656c97724fd89c04a8547043bbd37f5935 jdk-9+155 9b9918656c97724fd89c04a8547043bbd37f5935 jdk-9+155
7c829eba781409b4fe15392639289af1553dcf63 jdk-9+156
b7e70e1e0154e1d2c69f814e03a8800ef8634fe0 jdk-9+157
e53b322357382209fb553b9a1541ccfd12cbcb6c jdk-9+158

2
jaxws/.jcheck/conf
View file

@ -1 +1 @@
project=jdk9 project=jdk10

1
jaxws/src/java.activation/share/classes/META-INF/mimetypes.default
View file

@ -7,6 +7,7 @@ image/gif gif GIF
image/ief ief image/ief ief
image/jpeg jpeg jpg jpe JPG image/jpeg jpeg jpg jpe JPG
image/tiff tiff tif image/tiff tiff tif
image/png png PNG
image/x-xwindowdump xwd image/x-xwindowdump xwd
application/postscript ai eps ps application/postscript ai eps ps
application/rtf rtf application/rtf rtf

2
jaxws/src/java.activation/share/classes/module-info.java
View file

@ -25,6 +25,8 @@
/** /**
* Defines the JavaBeans Activation Framework (JAF) API. * Defines the JavaBeans Activation Framework (JAF) API.
*
* @since 9
*/ */
module java.activation { module java.activation {
requires transitive java.datatransfer; requires transitive java.datatransfer;

6
jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/Localizable.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -54,9 +54,7 @@ public interface Localizable {
public Object[] getArguments(); public Object[] getArguments();
public String getResourceBundleName(); public String getResourceBundleName();
public default ResourceBundle getResourceBundle(Locale locale) { public ResourceBundle getResourceBundle(Locale locale);
return null;
}
/** /**
* Special constant that represents a message that * Special constant that represents a message that

15
jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/LocalizableMessage.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -31,6 +31,7 @@ import java.util.Arrays;
import java.util.Locale; import java.util.Locale;
import java.util.ResourceBundle; import java.util.ResourceBundle;
/** /**
* @author WS Development Team * @author WS Development Team
*/ */
@ -42,13 +43,9 @@ public final class LocalizableMessage implements Localizable {
private final String _key; private final String _key;
private final Object[] _args; private final Object[] _args;
@Deprecated
public LocalizableMessage(String bundlename, String key, Object... args) { public LocalizableMessage(String bundlename, String key, Object... args) {
_bundlename = bundlename; this(bundlename, null, key, args);
_rbSupplier = null;
_key = key;
if(args==null)
args = new Object[0];
_args = args;
} }
public LocalizableMessage(String bundlename, ResourceBundleSupplier rbSupplier, public LocalizableMessage(String bundlename, ResourceBundleSupplier rbSupplier,
@ -61,15 +58,17 @@ public final class LocalizableMessage implements Localizable {
_args = args; _args = args;
} }
@Override
public String getKey() { public String getKey() {
return _key; return _key;
} }
@Override
public Object[] getArguments() { public Object[] getArguments() {
return Arrays.copyOf(_args, _args.length); return Arrays.copyOf(_args, _args.length);
} }
@Override
public String getResourceBundleName() { public String getResourceBundleName() {
return _bundlename; return _bundlename;
} }

4
jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -36,6 +36,7 @@ public class LocalizableMessageFactory {
private final String _bundlename; private final String _bundlename;
private final ResourceBundleSupplier _rbSupplier; private final ResourceBundleSupplier _rbSupplier;
@Deprecated
public LocalizableMessageFactory(String bundlename) { public LocalizableMessageFactory(String bundlename) {
_bundlename = bundlename; _bundlename = bundlename;
_rbSupplier = null; _rbSupplier = null;
@ -58,4 +59,5 @@ public class LocalizableMessageFactory {
*/ */
ResourceBundle getResourceBundle(Locale locale); ResourceBundle getResourceBundle(Locale locale);
} }
} }

7
jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/Localizer.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -25,7 +25,6 @@
package com.sun.istack.internal.localization; package com.sun.istack.internal.localization;
import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
@ -41,7 +40,7 @@ import java.util.ResourceBundle;
public class Localizer { public class Localizer {
private final Locale _locale; private final Locale _locale;
private final HashMap _resourceBundles; private final HashMap<String, ResourceBundle> _resourceBundles;
public Localizer() { public Localizer() {
this(Locale.getDefault()); this(Locale.getDefault());
@ -49,7 +48,7 @@ public class Localizer {
public Localizer(Locale l) { public Localizer(Locale l) {
_locale = l; _locale = l;
_resourceBundles = new HashMap(); _resourceBundles = new HashMap<>();
} }
public Locale getLocale() { public Locale getLocale() {

12
jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization/NullLocalizable.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -25,6 +25,9 @@
package com.sun.istack.internal.localization; package com.sun.istack.internal.localization;
import java.util.Locale;
import java.util.ResourceBundle;
/** /**
* {@link Localizable} that wraps a non-localizable string. * {@link Localizable} that wraps a non-localizable string.
* *
@ -39,13 +42,20 @@ public final class NullLocalizable implements Localizable {
this.msg = msg; this.msg = msg;
} }
@Override
public String getKey() { public String getKey() {
return Localizable.NOT_LOCALIZABLE; return Localizable.NOT_LOCALIZABLE;
} }
@Override
public Object[] getArguments() { public Object[] getArguments() {
return new Object[]{msg}; return new Object[]{msg};
} }
@Override
public String getResourceBundleName() { public String getResourceBundleName() {
return ""; return "";
} }
@Override
public ResourceBundle getResourceBundle(Locale locale) {
return null;
}
} }

12
jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -533,4 +533,14 @@ public abstract class JAXBRIContext extends JAXBContext {
* @since 2.2.6 * @since 2.2.6
*/ */
public static final String DISABLE_XML_SECURITY = "com.sun.xml.internal.bind.disableXmlSecurity"; public static final String DISABLE_XML_SECURITY = "com.sun.xml.internal.bind.disableXmlSecurity";
/**
* If true and element namespace is not specified, namespace of parent element will be used.
* The default value is false.
*
* Boolean
* @since 2.3.0
*/
public static final String BACKUP_WITH_PARENT_NAMESPACE = "com.sun.xml.internal.bind.backupWithParentNamespace";
} }

5
jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -112,6 +112,8 @@ public class ContextFactory {
"is not active. Using JAXB's implementation"); "is not active. Using JAXB's implementation");
} }
Boolean backupWithParentNamespace = getPropertyValue(properties, JAXBRIContext.BACKUP_WITH_PARENT_NAMESPACE, Boolean.class);
RuntimeAnnotationReader ar = getPropertyValue(properties,JAXBRIContext.ANNOTATION_READER,RuntimeAnnotationReader.class); RuntimeAnnotationReader ar = getPropertyValue(properties,JAXBRIContext.ANNOTATION_READER,RuntimeAnnotationReader.class);
Collection<TypeReference> tr = getPropertyValue(properties, JAXBRIContext.TYPE_REFERENCES, Collection.class); Collection<TypeReference> tr = getPropertyValue(properties, JAXBRIContext.TYPE_REFERENCES, Collection.class);
@ -144,6 +146,7 @@ public class ContextFactory {
builder.setSupressAccessorWarnings(supressAccessorWarnings); builder.setSupressAccessorWarnings(supressAccessorWarnings);
builder.setImprovedXsiTypeHandling(improvedXsiTypeHandling); builder.setImprovedXsiTypeHandling(improvedXsiTypeHandling);
builder.setDisableSecurityProcessing(disablesecurityProcessing); builder.setDisableSecurityProcessing(disablesecurityProcessing);
builder.setBackupWithParentNamespace(backupWithParentNamespace);
return builder.build(); return builder.build();
} }

13
jdk/src/jdk.desktop/share/classes/module-info.java → jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/package-info.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -23,12 +23,7 @@
* questions. * questions.
*/ */
/* /**
* Provides non-SE desktop APIs. * Code that deals with low level byte code manipulation.
*/ */
package com.sun.xml.internal.bind.v2.bytecode;
module jdk.desktop {
requires transitive java.desktop;
exports jdk.awt;
}

32
jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/bytecode/package.html
View file

@ -1,32 +0,0 @@
<!--
Copyright (c) 1997, 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.
-->
<html>
<body>
Code that deals with low level byte code manipulation.
</body>
</html>

29
jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/package-info.java Normal file
View file

@ -0,0 +1,29 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* Abstraction around reading annotations, to support internal/external annotations.
*/
package com.sun.xml.internal.bind.v2.model.annotation;

30
jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/annotation/package.html
View file

@ -1,30 +0,0 @@
<!--
Copyright (c) 1997, 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.
-->
<html><body>
Abstraction around reading annotations, to support internal/external annotations.
</body></html>

11
jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -29,24 +29,25 @@ import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException;
/** /**
* listen to static errors found during building a JAXB model from a set of classes. * listen to static errors found during building a JAXB model from a set of classes.
* Implemented by the client of {@link com.sun.xml.internal.bind.v2.model.impl.ModelBuilder}. * Implemented by the client of {@link com.sun.xml.internal.bind.v2.model.impl.ModelBuilderI}.
* *
* <p> * <p>
* All the static errors have to be reported while constructing a * All the static errors have to be reported while constructing a
* model, not when a model is used (IOW, until the {@link com.sun.xml.internal.bind.v2.model.impl.ModelBuilder#link} completes. * model, not when a model is used (IOW, until the {@link com.sun.xml.internal.bind.v2.model.impl.ModelBuilderI} completes.
* Internally, {@link com.sun.xml.internal.bind.v2.model.impl.ModelBuilder} wraps an {@link ErrorHandler} and all the model * Internally, {@link com.sun.xml.internal.bind.v2.model.impl.ModelBuilderI} wraps an {@link ErrorHandler} and all the model
* components should report errors through it. * components should report errors through it.
* *
* <p> * <p>
* {@link IllegalAnnotationException} is a checked exception to remind * {@link IllegalAnnotationException} is a checked exception to remind
* the model classes to report it rather than to throw it. * the model classes to report it rather than to throw it.
* *
* @see com.sun.xml.internal.bind.v2.model.impl.ModelBuilder * @see com.sun.xml.internal.bind.v2.model.impl.ModelBuilderI
* @author Kohsuke Kawaguchi * @author Kohsuke Kawaguchi
*/ */
public interface ErrorHandler { public interface ErrorHandler {
/** /**
* Receives a notification for an error in the annotated code. * Receives a notification for an error in the annotated code.
* @param e
*/ */
void error( IllegalAnnotationException e ); void error( IllegalAnnotationException e );
} }

4
jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -57,7 +57,7 @@ public enum PropertyKind {
public final boolean isOrdered; public final boolean isOrdered;
/** /**
* {@link com.sun.xml.internal.bind.v2.runtime.property.PropertyFactory} benefits from having index numbers assigned to * {@code com.sun.xml.internal.bind.v2.runtime.property.PropertyFactory} benefits from having index numbers assigned to
* {@link #ELEMENT}, {@link #REFERENCE}, and {@link #MAP} in this order. * {@link #ELEMENT}, {@link #REFERENCE}, and {@link #MAP} in this order.
*/ */
public final int propertyIndex; public final int propertyIndex;

8
jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -34,18 +34,22 @@ import javax.xml.bind.annotation.XmlRegistry;
* *
* <p> * <p>
* This interface is only meant to be used as a return type from * This interface is only meant to be used as a return type from
* {@link com.sun.xml.internal.bind.v2.model.impl.ModelBuilder}. * {@link com.sun.xml.internal.bind.v2.model.impl.ModelBuilderI}.
* *
* @author Kohsuke Kawaguchi * @author Kohsuke Kawaguchi
* @param <T>
* @param <C>
*/ */
public interface RegistryInfo<T,C> { public interface RegistryInfo<T,C> {
/** /**
* Returns all the references to other types in this registry. * Returns all the references to other types in this registry.
* @return
*/ */
Set<TypeInfo<T,C>> getReferences(); Set<TypeInfo<T,C>> getReferences();
/** /**
* Returns the class with {@link XmlRegistry}. * Returns the class with {@link XmlRegistry}.
* @return
*/ */
C getClazz(); C getClazz();
} }

29
jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/package-info.java Normal file
View file

@ -0,0 +1,29 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* Implementation of the com.sun.xml.internal.bind.j2s.model package.
*/
package com.sun.xml.internal.bind.v2.model.impl;

32
jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/package.html
View file

@ -1,32 +0,0 @@
<!--
Copyright (c) 1997, 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.
-->
<html>
<body>
Implementation of the com.sun.xml.internal.bind.j2s.model package.
</body>
</html>

Some files were not shown because too many files have changed in this diff Show more