--- a/.hgtags Thu Jan 04 22:47:38 2018 -0800
+++ b/.hgtags Fri Jan 05 22:02:20 2018 +0100
@@ -462,3 +462,4 @@
d8c634b016c628622c9abbdc6bf50509e5dedbec jdk-10+35
0ee20aad71c4f33c426372b4c8bcc1235ce2ec08 jdk-11+0
959f2f7cbaa6d2ee45d50029744efb219721576c jdk-10+36
+4f830b447edf04fb4a52151a5ad44d9bb60723cd jdk-10+37
--- a/make/Images.gmk Thu Jan 04 22:47:38 2018 -0800
+++ b/make/Images.gmk Fri Jan 05 22:02:20 2018 +0100
@@ -210,7 +210,6 @@
jarsigner.1 \
javac.1 \
javadoc.1 \
- javah.1 \
javap.1 \
jconsole.1 \
jcmd.1 \
--- a/make/RunTestsPrebuiltSpec.gmk Thu Jan 04 22:47:38 2018 -0800
+++ b/make/RunTestsPrebuiltSpec.gmk Fri Jan 05 22:02:20 2018 +0100
@@ -110,7 +110,6 @@
# Java executable definitions
JAVA_CMD := $(BOOT_JDK)/bin/java
JAVAC_CMD := $(BOOT_JDK)/bin/javac
-JAVAH_CMD := $(BOOT_JDK)/bin/javah
JAR_CMD := $(BOOT_JDK)/bin/jar
JLINK_CMD := $(JDK_OUTPUTDIR)/bin/jlink
JMOD_CMD := $(JDK_OUTPUTDIR)/bin/jmod
@@ -120,7 +119,6 @@
JAVA_SMALL := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
JAVA_JAVAC := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
JAVAC := $(FIXPATH) $(JAVAC_CMD)
-JAVAH := $(FIXPATH) $(JAVAH_CMD)
JAR := $(FIXPATH) $(JAR_CMD)
JLINK := $(FIXPATH) $(JLINK_CMD)
JMOD := $(FIXPATH) $(JMOD_CMD)
--- a/make/autoconf/boot-jdk.m4 Thu Jan 04 22:47:38 2018 -0800
+++ b/make/autoconf/boot-jdk.m4 Fri Jan 05 22:02:20 2018 +0100
@@ -295,7 +295,6 @@
# Setup tools from the Boot JDK.
BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA, java)
BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC, javac)
- BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAH, javah)
BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVADOC, javadoc)
BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR, jar)
BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JARSIGNER, jarsigner)
--- a/make/autoconf/bootcycle-spec.gmk.in Thu Jan 04 22:47:38 2018 -0800
+++ b/make/autoconf/bootcycle-spec.gmk.in Fri Jan 05 22:02:20 2018 +0100
@@ -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.
#
# This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,6 @@
JAVA_CMD:=$(BOOT_JDK)/bin/java
JAVAC_CMD:=$(BOOT_JDK)/bin/javac
-JAVAH_CMD:=$(BOOT_JDK)/bin/javah
JAR_CMD:=$(BOOT_JDK)/bin/jar
JARSIGNER_CMD:=$(BOOT_JDK)/bin/jarsigner
SJAVAC_SERVER_JAVA_CMD:=$(JAVA_CMD)
--- a/make/autoconf/generated-configure.sh Thu Jan 04 22:47:38 2018 -0800
+++ b/make/autoconf/generated-configure.sh Fri Jan 05 22:02:20 2018 +0100
@@ -881,7 +881,6 @@
JARSIGNER
JAR
JAVADOC
-JAVAH
JAVAC
JAVA
BOOT_JDK
@@ -903,10 +902,10 @@
VERSION_UPDATE
VERSION_INTERIM
VERSION_FEATURE
+COMPANY_NAME
MACOSX_BUNDLE_ID_BASE
MACOSX_BUNDLE_NAME_BASE
HOTSPOT_VM_DISTRO
-COMPANY_NAME
JDK_RC_PLATFORM_NAME
PRODUCT_SUFFIX
PRODUCT_NAME
@@ -1150,6 +1149,7 @@
with_version_major
with_version_minor
with_version_security
+with_vendor_name
with_version_string
with_version_pre
with_version_opt
@@ -1302,7 +1302,6 @@
PKG_CONFIG
JAVA
JAVAC
-JAVAH
JAVADOC
JAR
JARSIGNER
@@ -2075,6 +2074,7 @@
compatibility and is ignored
--with-version-security Deprecated. Option is kept for backwards
compatibility and is ignored
+ --with-vendor-name Set vendor name [not specified]
--with-version-string Set version string [calculated]
--with-version-pre Set the base part of the version 'PRE' field
(pre-release identifier) ['internal']
@@ -2261,7 +2261,6 @@
PKG_CONFIG path to pkg-config utility
JAVA Override default value for JAVA
JAVAC Override default value for JAVAC
- JAVAH Override default value for JAVAH
JAVADOC Override default value for JAVADOC
JAR Override default value for JAR
JARSIGNER Override default value for JARSIGNER
@@ -5177,7 +5176,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1513362567
+DATE_WHEN_GENERATED=1513805283
###############################################################################
#
@@ -25063,6 +25062,21 @@
+ # The vendor name, if any
+
+# Check whether --with-vendor-name was given.
+if test "${with_vendor_name+set}" = set; then :
+ withval=$with_vendor_name;
+fi
+
+ if test "x$with_vendor_name" = xyes; then
+ as_fn_error $? "--with-vendor-name must have a value" "$LINENO" 5
+ elif ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ; then
+ as_fn_error $? "--with--vendor-name contains non-printing characters: $with_vendor_name" "$LINENO" 5
+ else
+ COMPANY_NAME="$with_vendor_name"
+ fi
+
# Override version from arguments
@@ -30923,144 +30937,6 @@
# Publish this variable in the help.
- if [ -z "${JAVAH+x}" ]; then
- # The variable is not set by user, try to locate tool using the code snippet
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for javah in Boot JDK" >&5
-$as_echo_n "checking for javah in Boot JDK... " >&6; }
- JAVAH=$BOOT_JDK/bin/javah
- if test ! -x $JAVAH; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&5
-$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&6;}
- as_fn_error $? "Could not find javah in the Boot JDK" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-
-
- else
- # The variable is set, but is it from the command line or the environment?
-
- # Try to remove the string !JAVAH! from our list.
- try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!JAVAH!/}
- if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
- # If it failed, the variable was not from the command line. Ignore it,
- # but warn the user (except for BASH, which is always set by the calling BASH).
- if test "xJAVAH" != xBASH; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of JAVAH from the environment. Use command line variables instead." >&5
-$as_echo "$as_me: WARNING: Ignoring value of JAVAH from the environment. Use command line variables instead." >&2;}
- fi
- # Try to locate tool using the code snippet
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for javah in Boot JDK" >&5
-$as_echo_n "checking for javah in Boot JDK... " >&6; }
- JAVAH=$BOOT_JDK/bin/javah
- if test ! -x $JAVAH; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&5
-$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&6;}
- as_fn_error $? "Could not find javah in the Boot JDK" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-
-
- else
- # If it succeeded, then it was overridden by the user. We will use it
- # for the tool.
-
- # First remove it from the list of overridden variables, so we can test
- # for unknown variables in the end.
- CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
-
- # Check if we try to supply an empty value
- if test "x$JAVAH" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Setting user supplied tool JAVAH= (no value)" >&5
-$as_echo "$as_me: Setting user supplied tool JAVAH= (no value)" >&6;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAVAH" >&5
-$as_echo_n "checking for JAVAH... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
-$as_echo "disabled" >&6; }
- else
- # Check if the provided tool contains a complete path.
- tool_specified="$JAVAH"
- tool_basename="${tool_specified##*/}"
- if test "x$tool_basename" = "x$tool_specified"; then
- # A command without a complete path is provided, search $PATH.
- { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool JAVAH=$tool_basename" >&5
-$as_echo "$as_me: Will search for user supplied tool JAVAH=$tool_basename" >&6;}
- # Extract the first word of "$tool_basename", so it can be a program name with args.
-set dummy $tool_basename; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVAH+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $JAVAH in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_JAVAH="$JAVAH" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-JAVAH=$ac_cv_path_JAVAH
-if test -n "$JAVAH"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAH" >&5
-$as_echo "$JAVAH" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- if test "x$JAVAH" = x; then
- as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
- fi
- else
- # Otherwise we believe it is a complete path. Use it as it is.
- { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool JAVAH=$tool_specified" >&5
-$as_echo "$as_me: Will use user supplied tool JAVAH=$tool_specified" >&6;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAVAH" >&5
-$as_echo_n "checking for JAVAH... " >&6; }
- if test ! -x "$tool_specified"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
- as_fn_error $? "User supplied tool JAVAH=$tool_specified does not exist or is not executable" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
-$as_echo "$tool_specified" >&6; }
- fi
- fi
- fi
-
- fi
-
-
-
- # Use user overridden value if available, otherwise locate tool in the Boot JDK.
-
- # Publish this variable in the help.
-
-
if [ -z "${JAVADOC+x}" ]; then
# The variable is not set by user, try to locate tool using the code snippet
--- a/make/autoconf/jdk-version.m4 Thu Jan 04 22:47:38 2018 -0800
+++ b/make/autoconf/jdk-version.m4 Fri Jan 05 22:02:20 2018 +0100
@@ -74,11 +74,22 @@
AC_SUBST(PRODUCT_NAME)
AC_SUBST(PRODUCT_SUFFIX)
AC_SUBST(JDK_RC_PLATFORM_NAME)
- AC_SUBST(COMPANY_NAME)
AC_SUBST(HOTSPOT_VM_DISTRO)
AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
AC_SUBST(MACOSX_BUNDLE_ID_BASE)
+ # The vendor name, if any
+ AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name],
+ [Set vendor name @<:@not specified@:>@])])
+ if test "x$with_vendor_name" = xyes; then
+ AC_MSG_ERROR([--with-vendor-name must have a value])
+ elif [ ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ]; then
+ AC_MSG_ERROR([--with--vendor-name contains non-printing characters: $with_vendor_name])
+ else
+ COMPANY_NAME="$with_vendor_name"
+ fi
+ AC_SUBST(COMPANY_NAME)
+
# Override version from arguments
# If --with-version-string is set, process it first. It is possible to
--- a/make/autoconf/spec.gmk.in Thu Jan 04 22:47:38 2018 -0800
+++ b/make/autoconf/spec.gmk.in Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2018, 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
@@ -549,7 +549,6 @@
# versions of the variables directly.
JAVA_CMD:=@JAVA@
JAVAC_CMD:=@JAVAC@
-JAVAH_CMD:=@JAVAH@
JAVADOC_CMD:=@JAVADOC@
JAR_CMD:=@JAR@
JLINK_CMD := @JLINK@
@@ -562,7 +561,6 @@
JAVA_SMALL=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
JAVA_JAVAC=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_JAVAC) $(JAVA_FLAGS)
JAVAC=@FIXPATH@ $(JAVAC_CMD)
-JAVAH=@FIXPATH@ $(JAVAH_CMD)
JAVADOC=@FIXPATH@ $(JAVADOC_CMD)
JAR=@FIXPATH@ $(JAR_CMD)
JLINK = @FIXPATH@ $(JLINK_CMD) $(JAVA_TOOL_FLAGS_SMALL)
@@ -587,6 +585,8 @@
INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES))
INTERIM_LANGTOOLS_ADD_EXPORTS := \
--add-exports java.base/sun.reflect.annotation=jdk.compiler.interim \
+ --add-exports java.base/jdk.internal.jmod=jdk.compiler.interim \
+ --add-exports java.base/jdk.internal.misc=jdk.compiler.interim \
#
INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \
$(INTERIM_LANGTOOLS_MODULES))))
@@ -726,7 +726,7 @@
# Directories containing architecture-dependent files should be relative to exec_prefix
INSTALL_EXECPREFIX=@exec_prefix@
-# java,javac,javah,javap etc are installed here.
+# java,javac,javap etc are installed here.
INSTALL_BINDIR=@bindir@
# Read only architecture-independent data
--- a/make/common/JavaCompilation.gmk Thu Jan 04 22:47:38 2018 -0800
+++ b/make/common/JavaCompilation.gmk Fri Jan 05 22:02:20 2018 +0100
@@ -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.
#
# This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
# passed to SetupJavaCompilation. This name is used as variable prefix.
#
# Remaining parameters are named arguments. These include:
-# JVM:=The jvm used to run the javac/javah command
+# JVM:=The jvm used to run the javac command
# JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out
# FLAGS:=Flags to be supplied to javac
# SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here
--- a/make/conf/jib-profiles.js Thu Jan 04 22:47:38 2018 -0800
+++ b/make/conf/jib-profiles.js Fri Jan 05 22:02:20 2018 +0100
@@ -829,7 +829,7 @@
jtreg: {
server: "javare",
revision: "4.2",
- build_number: "b10",
+ build_number: "b11",
checksum_file: "MD5_VALUES",
file: "jtreg_bin-4.2.zip",
environment_name: "JT_HOME",
--- a/make/gensrc/Gensrc-jdk.compiler.gmk Thu Jan 04 22:47:38 2018 -0800
+++ b/make/gensrc/Gensrc-jdk.compiler.gmk Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -28,11 +28,8 @@
$(eval $(call SetupVersionProperties,JAVAC_VERSION, \
com/sun/tools/javac/resources/version.properties))
-$(eval $(call SetupVersionProperties,JAVAH_VERSION, \
- com/sun/tools/javah/resources/version.properties))
-
$(eval $(call SetupCompileProperties,COMPILE_PROPERTIES, \
- $(JAVAC_VERSION) $(JAVAH_VERSION)))
+ $(JAVAC_VERSION)))
$(eval $(call SetupParseProperties,PARSE_PROPERTIES, \
com/sun/tools/javac/resources/compiler.properties))
--- a/make/jdk/src/classes/build/tools/blacklistedcertsconverter/BlacklistedCertsConverter.java Thu Jan 04 22:47:38 2018 -0800
+++ b/make/jdk/src/classes/build/tools/blacklistedcertsconverter/BlacklistedCertsConverter.java Fri Jan 05 22:02:20 2018 +0100
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/make/jdk/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java Thu Jan 04 22:47:38 2018 -0800
+++ b/make/jdk/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java Fri Jan 05 22:02:20 2018 +0100
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/make/langtools/build.properties Thu Jan 04 22:47:38 2018 -0800
+++ b/make/langtools/build.properties Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,6 @@
tool.javac.main.class=com.sun.tools.javac.Main
tool.javadoc.main.class=jdk.javadoc.internal.tool.Main
tool.javap.main.class=com.sun.tools.javap.Main
-tool.javah.main.class=com.sun.tools.javah.Main
tool.sjavac.main.class=com.sun.tools.sjavac.Main
tool.jshell.main.class=jdk.internal.jshell.tool.JShellToolProvider
--- a/make/langtools/build.xml Thu Jan 04 22:47:38 2018 -0800
+++ b/make/langtools/build.xml Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ ~ Copyright (c) 2007, 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
@@ -41,7 +41,7 @@
The output of the build is as follows:
build
- |-bin (scripts to invoke various tools, javac, javah etc.)
+ |-bin (scripts to invoke various tools, javac etc.)
|-genrsc (generated sources - i.e. properties)
|-modules (compiled classes in a modular layout)
|-jtreg (test work/results)
@@ -254,7 +254,6 @@
<build-tool name="javac"/>
<build-tool name="javadoc"/>
<build-tool name="javap"/>
- <build-tool name="javah"/>
<build-tool name="jdeps"/>
<build-tool name="sjavac"/>
<build-tool name="jshell"/>
--- a/make/langtools/intellij/runConfigurations/javah.xml Thu Jan 04 22:47:38 2018 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="javah" type="Application" factoryName="Application">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <option name="MAIN_CLASS_NAME" value="com.sun.tools.javah.Main" />
- <option name="VM_PARAMETERS" value='@XPATCH@ --add-exports=jdk.compiler/com.sun.tools.javah=ALL-UNNAMED' />
- <option name="PROGRAM_PARAMETERS" value="" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
- <option name="ALTERNATIVE_JRE_PATH" value="@IDEA_TARGET_JDK@" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <module name="langtools" />
- <envs />
- <RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Run" />
- <method>
- <option name="Make" enabled="false" />
- <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/.idea/build.xml" target="build-all-classes" />
- </method>
- </configuration>
-</component>
--- a/make/langtools/netbeans/README Thu Jan 04 22:47:38 2018 -0800
+++ b/make/langtools/netbeans/README Fri Jan 05 22:02:20 2018 +0100
@@ -7,7 +7,7 @@
repository.
The repository contains a number of tools:
- javac, javadoc and its doclets, javah and javap.
+ javac, javadoc and its doclets, and javap.
Build Properties.
--- a/make/langtools/test/HelloWorld.apt.gold.txt Thu Jan 04 22:47:38 2018 -0800
+++ b/make/langtools/test/HelloWorld.apt.gold.txt Fri Jan 05 22:02:20 2018 +0100
@@ -11,9 +11,4 @@
* @param args The parameters are ignored.
*/
public static void main(java.lang.String... args);
-
- /**
- * This declaration is for the benefit of javah tests.
- */
- public native void test();
}
--- a/make/langtools/test/HelloWorld.java Thu Jan 04 22:47:38 2018 -0800
+++ b/make/langtools/test/HelloWorld.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,9 +37,4 @@
public static void main(String... args) {
System.out.println("Hello World!");
}
-
- /**
- * This declaration is for the benefit of javah tests.
- */
- public native void test();
}
--- a/make/langtools/test/bootstrap/javah.sh Thu Jan 04 22:47:38 2018 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# 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
-# @summary Verify the basic execution of the bootstrap javah tool.
-
-TESTSRC=${TESTSRC:-.}
-TOPDIR=${TESTSRC}/../../..
-
-${TOPDIR}/dist/bootstrap/bin/javac -d . "${TESTSRC}"/../HelloWorld.java
-${TOPDIR}/dist/bootstrap/bin/javah -classpath . -d . HelloWorld
-
-if diff ${TESTSRC}/../HelloWorld.gold.h HelloWorld.h ; then
- echo "Test passed."
-else
- echo "Test failed."
- exit 1
-fi
--- a/make/langtools/test/contents.gold.txt Thu Jan 04 22:47:38 2018 -0800
+++ b/make/langtools/test/contents.gold.txt Fri Jan 05 22:02:20 2018 +0100
@@ -1,9 +1,7 @@
./bootstrap/bin/javac
./bootstrap/bin/javadoc
-./bootstrap/bin/javah
./bootstrap/lib/doclets.jar
./bootstrap/lib/javac.jar
./bootstrap/lib/javadoc.jar
-./bootstrap/lib/javah.jar
./lib/classes.jar
./lib/src.zip
--- a/make/langtools/test/lib/classes.gold.txt Thu Jan 04 22:47:38 2018 -0800
+++ b/make/langtools/test/lib/classes.gold.txt Fri Jan 05 22:02:20 2018 +0100
@@ -1,9 +1,4 @@
META-INF/MANIFEST.MF
-com/sun/tools/apt/Main.class
-com/sun/tools/apt/main/Main.class
-com/sun/tools/apt/resources/apt.class
-com/sun/tools/apt/resources/apt_ja.class
-com/sun/tools/apt/resources/apt_zh_CN.class
com/sun/tools/doclets/formats/html/resources/standard.class
com/sun/tools/doclets/formats/html/resources/standard_ja.class
com/sun/tools/doclets/formats/html/resources/standard_zh_CN.class
@@ -26,13 +21,3 @@
com/sun/tools/javadoc/resources/javadoc.class
com/sun/tools/javadoc/resources/javadoc_ja.class
com/sun/tools/javadoc/resources/javadoc_zh_CN.class
-com/sun/tools/javah/Main.class
-com/sun/tools/javah/resources/Linux_ppc.class
-com/sun/tools/javah/resources/Linux_sparc.class
-com/sun/tools/javah/resources/SunOS_sparc.class
-com/sun/tools/javah/resources/SunOS_sparcv9.class
-com/sun/tools/javah/resources/l10n.class
-com/sun/tools/javah/resources/l10n_ja.class
-com/sun/tools/javah/resources/l10n_zh_CN.class
-com/sun/tools/javah/resources/win32_x86.class
-sun/tools/javap/Main.class
--- a/make/langtools/test/lib/javah.sh Thu Jan 04 22:47:38 2018 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# 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
-# @summary Verify the basic execution of the javah classes in classes.jar.
-
-TESTSRC=${TESTSRC:-.}
-TOPDIR=${TESTSRC}/../../..
-TESTJAVAEXE="${TESTJAVA:+${TESTJAVA}/bin/}java"
-
-"${TESTJAVAEXE}" -Xbootclasspath/p:${TOPDIR}/dist/lib/classes.jar \
- com.sun.tools.javac.Main \
- -d . "${TESTSRC}"/../HelloWorld.java
-
-"${TESTJAVAEXE}" -Xbootclasspath/p:${TOPDIR}/dist/lib/classes.jar \
- com.sun.tools.javah.Main \
- -classpath . -d . HelloWorld
-
-if diff ${TESTSRC}/../HelloWorld.gold.h HelloWorld.h ; then
- echo "Test passed."
-else
- echo "Test failed."
- exit 1
-fi
--- a/make/langtools/test/lib/src.gold.txt Thu Jan 04 22:47:38 2018 -0800
+++ b/make/langtools/test/lib/src.gold.txt Fri Jan 05 22:02:20 2018 +0100
@@ -29,15 +29,5 @@
com/sun/tools/javadoc/resources/javadoc.properties
com/sun/tools/javadoc/resources/javadoc_ja.properties
com/sun/tools/javadoc/resources/javadoc_zh_CN.properties
-com/sun/tools/javah/Main.java
-com/sun/tools/javah/resources/Linux_ppc.properties
-com/sun/tools/javah/resources/Linux_sparc.properties
-com/sun/tools/javah/resources/SunOS_sparc.properties
-com/sun/tools/javah/resources/SunOS_sparcv9.properties
-com/sun/tools/javah/resources/l10n.properties
-com/sun/tools/javah/resources/l10n_ja.properties
-com/sun/tools/javah/resources/l10n_zh_CN.properties
-com/sun/tools/javah/resources/win32_x86.properties
javax/lang/model/overview.html
javax/tools/overview.html
-sun/tools/javap/Main.java
--- a/make/langtools/tools/anttasks/SelectToolTask.java Thu Jan 04 22:47:38 2018 -0800
+++ b/make/langtools/tools/anttasks/SelectToolTask.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -76,7 +76,6 @@
NONE(""),
JAVAC("javac"),
JAVADOC("javadoc"),
- JAVAH("javah"),
JAVAP("javap"),
JSHELL("jshell");
--- a/make/nb_native/nbproject/configurations.xml Thu Jan 04 22:47:38 2018 -0800
+++ b/make/nb_native/nbproject/configurations.xml Fri Jan 05 22:02:20 2018 +0100
@@ -6670,18 +6670,6 @@
<in>examples.not-yet.txt</in>
</df>
</df>
- <df name="javah">
- <df name="6572945">
- <df name="gold">
- <df name="jni.dir.1">
- <in>TestClass1.h</in>
- <in>TestClass1_Inner1.h</in>
- <in>TestClass1_Inner2.h</in>
- <in>TestClass2.h</in>
- </df>
- </df>
- </df>
- </df>
<df name="jdeprscan">
<df name="tests">
<df name="jdk">
@@ -40851,26 +40839,6 @@
tool="3"
flavor2="0">
</item>
- <item path="../../test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1.h"
- ex="false"
- tool="3"
- flavor2="0">
- </item>
- <item path="../../test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner1.h"
- ex="false"
- tool="3"
- flavor2="0">
- </item>
- <item path="../../test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner2.h"
- ex="false"
- tool="3"
- flavor2="0">
- </item>
- <item path="../../test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass2.h"
- ex="false"
- tool="3"
- flavor2="0">
- </item>
<item path="../../test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestScanExpected.txt"
ex="false"
tool="3"
--- a/make/scripts/compare_exceptions.sh.incl Thu Jan 04 22:47:38 2018 -0800
+++ b/make/scripts/compare_exceptions.sh.incl Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,6 @@
./bin/java
./bin/javac
./bin/javadoc
- ./bin/javah
./bin/javap
./bin/jdeps
./bin/jcmd
@@ -197,7 +196,6 @@
./bin/java
./bin/javac
./bin/javadoc
- ./bin/javah
./bin/javap
./bin/jdeps
./bin/jcmd
@@ -306,7 +304,6 @@
./bin/java
./bin/javac
./bin/javadoc
- ./bin/javah
./bin/javap
./bin/jdeps
./bin/jcmd
@@ -394,7 +391,6 @@
./bin/java.exe
./bin/javac.exe
./bin/javadoc.exe
- ./bin/javah.exe
./bin/javap.exe
./bin/jdeps.exe
./bin/javaw.exe
@@ -486,7 +482,6 @@
./bin/java
./bin/javac
./bin/javadoc
- ./bin/javah
./bin/javap
./bin/javaws
./bin/jdeps
--- a/src/hotspot/cpu/s390/templateTable_s390.cpp Thu Jan 04 22:47:38 2018 -0800
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp Fri Jan 05 22:02:20 2018 +0100
@@ -3722,7 +3722,6 @@
Label slow_case;
Label done;
Label initialize_header;
- Label initialize_object; // Including clearing the fields.
Label allocate_shared;
BLOCK_COMMENT("TemplateTable::_new {");
@@ -3760,65 +3759,41 @@
// Allocate the instance
// 1) Try to allocate in the TLAB.
- // 2) If fail and the object is large allocate in the shared Eden.
- // 3) If the above fails (or is not applicable), go to a slow case
+ // 2) If the above fails (or is not applicable), go to a slow case
// (creates a new TLAB, etc.).
-
- // Always go the slow path. See comment above this template.
- const bool allow_shared_alloc = false;
-
+ // Note: compared to other architectures, s390's implementation always goes
+ // to the slow path if TLAB is used and fails.
if (UseTLAB) {
Register RoldTopValue = RallocatedObject;
Register RnewTopValue = tmp;
__ z_lg(RoldTopValue, Address(Z_thread, JavaThread::tlab_top_offset()));
__ load_address(RnewTopValue, Address(RoldTopValue, Rsize));
__ z_cg(RnewTopValue, Address(Z_thread, JavaThread::tlab_end_offset()));
- __ z_brh(allow_shared_alloc ? allocate_shared : slow_case);
+ __ z_brh(slow_case);
__ z_stg(RnewTopValue, Address(Z_thread, JavaThread::tlab_top_offset()));
- if (ZeroTLAB) {
- // The fields have been already cleared.
- __ z_bru(initialize_header);
- } else {
- // Initialize both the header and fields.
- if (allow_shared_alloc) {
- __ z_bru(initialize_object);
- } else {
- // Fallthrough to initialize_object, but assert that it is on fall through path.
- prev_instr_address = __ pc();
- }
- }
- }
-
- if (allow_shared_alloc) {
- // Allocation in shared Eden not implemented, because sapjvm allocation trace does not allow it.
- Unimplemented();
- }
-
- if (UseTLAB) {
+
Register RobjectFields = tmp;
Register Rzero = Z_R1_scratch;
-
- assert(ZeroTLAB || prev_instr_address == __ pc(),
- "must not omit jump to initialize_object above, as it is not on the fall through path");
__ clear_reg(Rzero, true /*whole reg*/, false); // Load 0L into Rzero. Don't set CC.
- // The object is initialized before the header. If the object size is
- // zero, go directly to the header initialization.
- __ bind(initialize_object);
- __ z_aghi(Rsize, (int)-sizeof(oopDesc)); // Subtract header size, set CC.
- __ z_bre(initialize_header); // Jump if size of fields is zero.
-
- // Initialize object fields.
- // See documentation for MVCLE instruction!!!
- assert(RobjectFields->encoding() % 2 == 0, "RobjectFields must be an even register");
- assert(Rsize->encoding() == (RobjectFields->encoding()+1),
- "RobjectFields and Rsize must be a register pair");
- assert(Rzero->encoding() % 2 == 1, "Rzero must be an odd register");
-
- // Set Rzero to 0 and use it as src length, then mvcle will copy nothing
- // and fill the object with the padding value 0.
- __ add2reg(RobjectFields, sizeof(oopDesc), RallocatedObject);
- __ move_long_ext(RobjectFields, as_Register(Rzero->encoding() - 1), 0);
+ if (!ZeroTLAB) {
+ // The object is initialized before the header. If the object size is
+ // zero, go directly to the header initialization.
+ __ z_aghi(Rsize, (int)-sizeof(oopDesc)); // Subtract header size, set CC.
+ __ z_bre(initialize_header); // Jump if size of fields is zero.
+
+ // Initialize object fields.
+ // See documentation for MVCLE instruction!!!
+ assert(RobjectFields->encoding() % 2 == 0, "RobjectFields must be an even register");
+ assert(Rsize->encoding() == (RobjectFields->encoding()+1),
+ "RobjectFields and Rsize must be a register pair");
+ assert(Rzero->encoding() % 2 == 1, "Rzero must be an odd register");
+
+ // Set Rzero to 0 and use it as src length, then mvcle will copy nothing
+ // and fill the object with the padding value 0.
+ __ add2reg(RobjectFields, sizeof(oopDesc), RallocatedObject);
+ __ move_long_ext(RobjectFields, as_Register(Rzero->encoding() - 1), 0);
+ }
// Initialize object header only.
__ bind(initialize_header);
--- a/src/hotspot/cpu/x86/x86_64.ad Thu Jan 04 22:47:38 2018 -0800
+++ b/src/hotspot/cpu/x86/x86_64.ad Fri Jan 05 22:02:20 2018 +0100
@@ -547,8 +547,12 @@
#define __ _masm.
+static bool generate_vzeroupper(Compile* C) {
+ return (VM_Version::supports_vzeroupper() && (C->max_vector_size() > 16 || C->clear_upper_avx() == true)) ? true: false; // Generate vzeroupper
+}
+
static int clear_avx_size() {
- return (VM_Version::supports_vzeroupper()) ? 3: 0; // vzeroupper
+ return generate_vzeroupper(Compile::current()) ? 3: 0; // vzeroupper
}
// !!!!! Special hack to get all types of calls to specify the byte offset
@@ -931,7 +935,7 @@
void MachEpilogNode::format(PhaseRegAlloc* ra_, outputStream* st) const
{
Compile* C = ra_->C;
- if (VM_Version::supports_vzeroupper()) {
+ if (generate_vzeroupper(C)) {
st->print("vzeroupper");
st->cr(); st->print("\t");
}
@@ -971,9 +975,11 @@
Compile* C = ra_->C;
MacroAssembler _masm(&cbuf);
- // Clear upper bits of YMM registers when current compiled code uses
- // wide vectors to avoid AVX <-> SSE transition penalty during call.
- __ vzeroupper();
+ if (generate_vzeroupper(C)) {
+ // Clear upper bits of YMM registers when current compiled code uses
+ // wide vectors to avoid AVX <-> SSE transition penalty during call.
+ __ vzeroupper();
+ }
int framesize = C->frame_size_in_bytes();
assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned");
@@ -2112,11 +2118,13 @@
enc_class clear_avx %{
debug_only(int off0 = cbuf.insts_size());
- // Clear upper bits of YMM registers to avoid AVX <-> SSE transition penalty
- // Clear upper bits of YMM registers when current compiled code uses
- // wide vectors to avoid AVX <-> SSE transition penalty during call.
- MacroAssembler _masm(&cbuf);
- __ vzeroupper();
+ if (generate_vzeroupper(Compile::current())) {
+ // Clear upper bits of YMM registers to avoid AVX <-> SSE transition penalty
+ // Clear upper bits of YMM registers when current compiled code uses
+ // wide vectors to avoid AVX <-> SSE transition penalty during call.
+ MacroAssembler _masm(&cbuf);
+ __ vzeroupper();
+ }
debug_only(int off1 = cbuf.insts_size());
assert(off1 - off0 == clear_avx_size(), "correct size prediction");
%}
--- a/src/hotspot/share/ci/ciField.cpp Thu Jan 04 22:47:38 2018 -0800
+++ b/src/hotspot/share/ci/ciField.cpp Fri Jan 05 22:02:20 2018 +0100
@@ -234,7 +234,9 @@
// Get the flags, offset, and canonical holder of the field.
_flags = ciFlags(fd->access_flags());
_offset = fd->offset();
- _holder = CURRENT_ENV->get_instance_klass(fd->field_holder());
+ Klass* field_holder = fd->field_holder();
+ assert(field_holder != NULL, "null field_holder");
+ _holder = CURRENT_ENV->get_instance_klass(field_holder);
// Check to see if the field is constant.
Klass* k = _holder->get_Klass();
--- a/src/hotspot/share/classfile/classLoaderData.cpp Thu Jan 04 22:47:38 2018 -0800
+++ b/src/hotspot/share/classfile/classLoaderData.cpp Fri Jan 05 22:02:20 2018 +0100
@@ -831,9 +831,10 @@
}
// This is distinct from free_deallocate_list. For class loader data that are
-// unloading, this frees the C heap memory for constant pools on the list. If there
-// were C heap memory allocated for methods, it would free that too. The C heap memory
-// for InstanceKlasses on this list is freed in the ClassLoaderData destructor.
+// unloading, this frees the C heap memory for items on the list, and unlinks
+// scratch or error classes so that unloading events aren't triggered for these
+// classes. The metadata is removed with the unloading metaspace.
+// There isn't C heap memory allocated for methods, so nothing is done for them.
void ClassLoaderData::unload_deallocate_list() {
// Don't need lock, at safepoint
assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
@@ -846,9 +847,15 @@
Metadata* m = _deallocate_list->at(i);
assert (!m->on_stack(), "wouldn't be unloading if this were so");
_deallocate_list->remove_at(i);
- // Only constant pool entries have C heap memory to free.
if (m->is_constantPool()) {
((ConstantPool*)m)->release_C_heap_structures();
+ } else if (m->is_klass()) {
+ InstanceKlass* ik = (InstanceKlass*)m;
+ // also releases ik->constants() C heap memory
+ InstanceKlass::release_C_heap_structures(ik);
+ // Remove the class so unloading events aren't triggered for
+ // this class (scratch or error class) in do_unloading().
+ remove_class(ik);
}
}
}
--- a/src/hotspot/share/opto/compile.cpp Thu Jan 04 22:47:38 2018 -0800
+++ b/src/hotspot/share/opto/compile.cpp Fri Jan 05 22:02:20 2018 +0100
@@ -1094,6 +1094,7 @@
_major_progress = true; // start out assuming good things will happen
set_has_unsafe_access(false);
set_max_vector_size(0);
+ set_clear_upper_avx(false); //false as default for clear upper bits of ymm registers
Copy::zero_to_bytes(_trap_hist, sizeof(_trap_hist));
set_decompile_count(0);
--- a/src/hotspot/share/opto/compile.hpp Thu Jan 04 22:47:38 2018 -0800
+++ b/src/hotspot/share/opto/compile.hpp Fri Jan 05 22:02:20 2018 +0100
@@ -378,7 +378,8 @@
bool _has_stringbuilder; // True StringBuffers or StringBuilders are allocated
bool _has_boxed_value; // True if a boxed object is allocated
bool _has_reserved_stack_access; // True if the method or an inlined method is annotated with ReservedStackAccess
- int _max_vector_size; // Maximum size of generated vectors
+ uint _max_vector_size; // Maximum size of generated vectors
+ bool _clear_upper_avx; // Clear upper bits of ymm registers using vzeroupper
uint _trap_hist[trapHistLength]; // Cumulative traps
bool _trap_can_recompile; // Have we emitted a recompiling trap?
uint _decompile_count; // Cumulative decompilation counts.
@@ -656,8 +657,10 @@
void set_has_boxed_value(bool z) { _has_boxed_value = z; }
bool has_reserved_stack_access() const { return _has_reserved_stack_access; }
void set_has_reserved_stack_access(bool z) { _has_reserved_stack_access = z; }
- int max_vector_size() const { return _max_vector_size; }
- void set_max_vector_size(int s) { _max_vector_size = s; }
+ uint max_vector_size() const { return _max_vector_size; }
+ void set_max_vector_size(uint s) { _max_vector_size = s; }
+ bool clear_upper_avx() const { return _clear_upper_avx; }
+ void set_clear_upper_avx(bool s) { _clear_upper_avx = s; }
void set_trap_count(uint r, uint c) { assert(r < trapHistLength, "oob"); _trap_hist[r] = c; }
uint trap_count(uint r) const { assert(r < trapHistLength, "oob"); return _trap_hist[r]; }
bool trap_can_recompile() const { return _trap_can_recompile; }
--- a/src/hotspot/share/opto/library_call.cpp Thu Jan 04 22:47:38 2018 -0800
+++ b/src/hotspot/share/opto/library_call.cpp Fri Jan 05 22:02:20 2018 +0100
@@ -328,6 +328,13 @@
bool inline_profileBoolean();
bool inline_isCompileConstant();
+ void clear_upper_avx() {
+#ifdef X86
+ if (UseAVX >= 2) {
+ C->set_clear_upper_avx(true);
+ }
+#endif
+ }
};
//---------------------------make_vm_intrinsic----------------------------
@@ -1082,6 +1089,7 @@
// All these intrinsics have checks.
C->set_has_split_ifs(true); // Has chance for split-if optimization
+ clear_upper_avx();
return _gvn.transform(result);
}
@@ -1156,6 +1164,8 @@
const TypeAryPtr* mtype = (ae == StrIntrinsicNode::UU) ? TypeAryPtr::CHARS : TypeAryPtr::BYTES;
set_result(_gvn.transform(new AryEqNode(control(), memory(mtype), arg1, arg2, ae)));
+ clear_upper_avx();
+
return true;
}
@@ -1227,6 +1237,7 @@
result = _gvn.transform(result);
set_result(result);
replace_in_map(index, result);
+ clear_upper_avx();
return true;
}
@@ -1325,6 +1336,7 @@
set_control(_gvn.transform(region));
record_for_igvn(region);
set_result(_gvn.transform(phi));
+ clear_upper_avx();
return true;
}
@@ -1488,6 +1500,8 @@
if (compress) {
set_result(_gvn.transform(count));
}
+ clear_upper_avx();
+
return true;
}
@@ -1585,6 +1599,8 @@
if (!stopped()) {
set_result(newcopy);
}
+ clear_upper_avx();
+
return true;
}
@@ -5295,6 +5311,8 @@
assert(validated, "shouldn't transform if all arguments not validated");
set_all_memory(n);
}
+ clear_upper_avx();
+
return true;
}
@@ -5415,6 +5433,8 @@
Node* res_mem = _gvn.transform(new SCMemProjNode(enc));
set_memory(res_mem, mtype);
set_result(enc);
+ clear_upper_avx();
+
return true;
}
--- a/src/hotspot/share/opto/superword.cpp Thu Jan 04 22:47:38 2018 -0800
+++ b/src/hotspot/share/opto/superword.cpp Fri Jan 05 22:02:20 2018 +0100
@@ -2442,7 +2442,9 @@
}
}//for (int i = 0; i < _block.length(); i++)
- C->set_max_vector_size(max_vlen_in_bytes);
+ if (max_vlen_in_bytes > C->max_vector_size()) {
+ C->set_max_vector_size(max_vlen_in_bytes);
+ }
if (max_vlen_in_bytes > 0) {
cl->mark_loop_vectorized();
}
--- a/src/hotspot/share/runtime/compilationPolicy.cpp Thu Jan 04 22:47:38 2018 -0800
+++ b/src/hotspot/share/runtime/compilationPolicy.cpp Fri Jan 05 22:02:20 2018 +0100
@@ -470,8 +470,12 @@
if (bci != InvocationEntryBci) {
MethodData* mdo = m->method_data();
if (mdo != NULL) {
- int count = mdo->bci_to_data(branch_bci)->as_JumpData()->taken();
- tty->print_cr("back branch count = %d", count);
+ ProfileData *pd = mdo->bci_to_data(branch_bci);
+ if (pd == NULL) {
+ tty->print_cr("back branch count = N/A (missing ProfileData)");
+ } else {
+ tty->print_cr("back branch count = %d", pd->as_JumpData()->taken());
+ }
}
}
}
--- a/src/hotspot/share/runtime/thread.cpp Thu Jan 04 22:47:38 2018 -0800
+++ b/src/hotspot/share/runtime/thread.cpp Fri Jan 05 22:02:20 2018 +0100
@@ -2946,8 +2946,9 @@
if (ct->env() != NULL) {
ct->env()->metadata_do(f);
}
- if (ct->task() != NULL) {
- ct->task()->metadata_do(f);
+ CompileTask* task = ct->task();
+ if (task != NULL) {
+ task->metadata_do(f);
}
}
}
@@ -3001,10 +3002,10 @@
_safepoint_state->print_on(st);
#endif // PRODUCT
if (is_Compiler_thread()) {
- CompilerThread* ct = (CompilerThread*)this;
- if (ct->task() != NULL) {
+ CompileTask *task = ((CompilerThread*)this)->task();
+ if (task != NULL) {
st->print(" Compiling: ");
- ct->task()->print(st, NULL, true, false);
+ task->print(st, NULL, true, false);
} else {
st->print(" No compile task");
}
@@ -4719,9 +4720,15 @@
ALL_JAVA_THREADS(thread) {
if (thread->is_Compiler_thread()) {
CompilerThread* ct = (CompilerThread*) thread;
- if (ct->task() != NULL) {
+
+ // Keep task in local variable for NULL check.
+ // ct->_task might be set to NULL by concurring compiler thread
+ // because it completed the compilation. The task is never freed,
+ // though, just returned to a free list.
+ CompileTask* task = ct->task();
+ if (task != NULL) {
thread->print_name_on_error(st, buf, buflen);
- ct->task()->print(st, NULL, true, true);
+ task->print(st, NULL, true, true);
}
}
}
--- a/src/hotspot/share/runtime/thread.hpp Thu Jan 04 22:47:38 2018 -0800
+++ b/src/hotspot/share/runtime/thread.hpp Fri Jan 05 22:02:20 2018 +0100
@@ -2064,13 +2064,13 @@
private:
CompilerCounters* _counters;
- ciEnv* _env;
- CompileLog* _log;
- CompileTask* _task;
- CompileQueue* _queue;
- BufferBlob* _buffer_blob;
+ ciEnv* _env;
+ CompileLog* _log;
+ CompileTask* volatile _task; // print_threads_compiling can read this concurrently.
+ CompileQueue* _queue;
+ BufferBlob* _buffer_blob;
- AbstractCompiler* _compiler;
+ AbstractCompiler* _compiler;
public:
--- a/src/java.base/share/classes/java/io/InputStream.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.base/share/classes/java/io/InputStream.java Fri Jan 05 22:02:20 2018 +0100
@@ -25,7 +25,9 @@
package java.io;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import java.util.Objects;
/**
@@ -229,30 +231,55 @@
* @since 9
*/
public byte[] readAllBytes() throws IOException {
- byte[] buf = new byte[DEFAULT_BUFFER_SIZE];
- int capacity = buf.length;
- int nread = 0;
+ List<byte[]> bufs = null;
+ byte[] result = null;
+ int total = 0;
int n;
- for (;;) {
- // read to EOF which may read more or less than initial buffer size
- while ((n = read(buf, nread, capacity - nread)) > 0)
+ do {
+ byte[] buf = new byte[DEFAULT_BUFFER_SIZE];
+ int nread = 0;
+
+ // read to EOF which may read more or less than buffer size
+ while ((n = read(buf, nread, buf.length - nread)) > 0) {
nread += n;
+ }
- // if the last call to read returned -1, then we're done
- if (n < 0)
- break;
+ if (nread > 0) {
+ if (MAX_BUFFER_SIZE - total < nread) {
+ throw new OutOfMemoryError("Required array size too large");
+ }
+ total += nread;
+ if (result == null) {
+ result = buf;
+ } else {
+ if (bufs == null) {
+ bufs = new ArrayList<>();
+ bufs.add(result);
+ }
+ bufs.add(buf);
+ }
+ }
+ } while (n >= 0); // if the last call to read returned -1, then break
- // need to allocate a larger buffer
- if (capacity <= MAX_BUFFER_SIZE - capacity) {
- capacity = capacity << 1;
- } else {
- if (capacity == MAX_BUFFER_SIZE)
- throw new OutOfMemoryError("Required array size too large");
- capacity = MAX_BUFFER_SIZE;
+ if (bufs == null) {
+ if (result == null) {
+ return new byte[0];
}
- buf = Arrays.copyOf(buf, capacity);
+ return result.length == total ?
+ result : Arrays.copyOf(result, total);
}
- return (capacity == nread) ? buf : Arrays.copyOf(buf, nread);
+
+ result = new byte[total];
+ int offset = 0;
+ int remaining = total;
+ for (byte[] b : bufs) {
+ int len = Math.min(b.length, remaining);
+ System.arraycopy(b, 0, result, offset, len);
+ offset += len;
+ remaining -= len;
+ }
+
+ return result;
}
/**
--- a/src/java.base/share/classes/java/lang/PublicMethods.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.base/share/classes/java/lang/PublicMethods.java Fri Jan 05 22:02:20 2018 +0100
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/src/java.base/share/classes/java/lang/StringConcatHelper.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.base/share/classes/java/lang/StringConcatHelper.java Fri Jan 05 22:02:20 2018 +0100
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/src/java.base/share/classes/java/lang/invoke/StringConcatException.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.base/share/classes/java/lang/invoke/StringConcatException.java Fri Jan 05 22:02:20 2018 +0100
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java Fri Jan 05 22:02:20 2018 +0100
@@ -2521,7 +2521,7 @@
* the {@code packageFinder} throws an {@link UncheckedIOException} then
* {@link IOException} cause will be re-thrown. </p>
*
- * <p> The module descriptor is read from the buffer stating at index
+ * <p> The module descriptor is read from the buffer starting at index
* {@code p}, where {@code p} is the buffer's {@link ByteBuffer#position()
* position} when this method is invoked. Upon return the buffer's position
* will be equal to {@code p + n} where {@code n} is the number of bytes
--- a/src/java.base/share/classes/java/lang/ref/Reference.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.base/share/classes/java/lang/ref/Reference.java Fri Jan 05 22:02:20 2018 +0100
@@ -141,14 +141,6 @@
}
/*
- * system property to disable clearing before enqueuing.
- */
- private static final class ClearBeforeEnqueue {
- static final boolean DISABLE =
- Boolean.getBoolean("jdk.lang.ref.disableClearBeforeEnqueue");
- }
-
- /*
* Atomically get and clear (set to null) the VM's pending list.
*/
private static native Reference<Object> getAndClearReferencePendingList();
@@ -299,8 +291,7 @@
* it was not registered with a queue when it was created
*/
public boolean enqueue() {
- if (!ClearBeforeEnqueue.DISABLE)
- this.referent = null;
+ this.referent = null;
return this.queue.enqueue(this);
}
--- a/src/java.base/share/classes/java/util/ResourceBundle.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.base/share/classes/java/util/ResourceBundle.java Fri Jan 05 22:02:20 2018 +0100
@@ -204,58 +204,70 @@
* known concrete subclasses {@code ListResourceBundle} and
* {@code PropertyResourceBundle} are thread-safe.
*
- * <h3><a id="bundleprovider">Resource Bundles in Named Modules</a></h3>
+ * <h3><a id="resource-bundle-modules">Resource Bundles and Named Modules</a></h3>
+ *
+ * Resource bundles can be deployed in modules in the following ways:
+ *
+ * <h4>Resource bundles together with an application</h4>
+ *
+ * Resource bundles can be deployed together with an application in the same
+ * module. In that case, the resource bundles are loaded
+ * by code in the module by calling the {@link #getBundle(String)}
+ * or {@link #getBundle(String, Locale)} method.
+ *
+ * <h4><a id="service-providers">Resource bundles as service providers</a></h4>
*
- * When resource bundles are deployed in named modules, the following
- * module-specific requirements and restrictions are applied.
+ * Resource bundles can be deployed in one or more <em>service provider modules</em>
+ * and they can be located using {@link ServiceLoader}.
+ * A {@linkplain ResourceBundleProvider service} interface or class must be
+ * defined. The caller module declares that it uses the service, the service
+ * provider modules declare that they provide implementations of the service.
+ * Refer to {@link ResourceBundleProvider} for developing resource bundle
+ * services and deploying resource bundle providers.
+ * The module obtaining the resource bundle can be a resource bundle
+ * provider itself; in which case this module only locates the resource bundle
+ * via service provider mechanism.
+ *
+ * <p>A {@linkplain ResourceBundleProvider resource bundle provider} can
+ * provide resource bundles in any format such XML which replaces the need
+ * of {@link Control ResourceBundle.Control}.
+ *
+ * <h4><a id="other-modules">Resource bundles in other modules and class path</a></h4>
*
- * <ul>
- * <li>Code in a named module that calls {@link #getBundle(String, Locale)}
- * will locate resource bundles in the caller's module (<em>caller module</em>).</li>
- * <li>If resource bundles are deployed in named modules separate from
- * the caller module, those resource bundles need to be loaded from service
- * providers of {@link ResourceBundleProvider}. The caller module must declare
- * "{@code uses}" and the service interface name is the concatenation of the
- * package name of the base name, string "{@code .spi.}", the simple class
- * name of the base name, and the string "{@code Provider}". The
- * <em>bundle provider modules</em> containing resource bundles must
- * declare "{@code provides}" with the service interface name and
- * its implementation class name. For example, if the base name is
- * "{@code com.example.app.MyResources}", the caller module must declare
- * "{@code uses com.example.app.spi.MyResourcesProvider;}" and a module containing resource
- * bundles must declare "{@code provides com.example.app.spi.MyResourcesProvider
- * with com.example.app.internal.MyResourcesProviderImpl;}"
- * where {@code com.example.app.internal.MyResourcesProviderImpl} is an
- * implementation class of {@code com.example.app.spi.MyResourcesProvider}.</li>
- * <li>If you want to use non-standard formats in named modules, such as XML,
- * {@link ResourceBundleProvider} needs to be used.</li>
- * <li>The {@code getBundle} method with a {@code ClassLoader} may not be able to
- * find resource bundles using the given {@code ClassLoader} in named modules.
- * The {@code getBundle} method with a {@code Module} can be used, instead.</li>
- * <li>{@code ResourceBundle.Control} is <em>not</em> supported in named modules.
- * If the {@code getBundle} method with a {@code ResourceBundle.Control} is called
- * in a named module, the method will throw an {@code UnsupportedOperationException}.
- * Any service providers of {@link ResourceBundleControlProvider} are ignored in
- * named modules.
- * </li>
- * </ul>
+ * Resource bundles in a named module may be <em>encapsulated</em> so that
+ * it cannot be located by code in other modules. Resource bundles
+ * in unnamed modules and class path are open for any module to access.
+ * Resource bundle follows the resource encapsulation rules as specified
+ * in {@link Module#getResourceAsStream(String)}.
+ *
+ * <p>The {@code getBundle} factory methods with no {@code Control} parameter
+ * locate and load resource bundles from
+ * {@linkplain ResourceBundleProvider service providers}.
+ * It may continue the search as if calling {@link Module#getResourceAsStream(String)}
+ * to find the named resource from a given module and calling
+ * {@link ClassLoader#getResourceAsStream(String)}; refer to
+ * the specification of the {@code getBundle} method for details.
+ * Only non-encapsulated resource bundles of "{@code java.class}"
+ * or "{@code java.properties}" format are searched.
*
- * <h3><a id="RBP_support">ResourceBundleProvider Service Providers</a></h3>
+ * <p>If the caller module is a
+ * <a href="{@docRoot}/java/util/spi/ResourceBundleProvider.html#obtain-resource-bundle">
+ * resource bundle provider</a>, it does not fall back to the
+ * class loader search.
+ *
+ * <h4>Resource bundles in automatic modules</h4>
*
- * The {@code getBundle} factory methods load service providers of
- * {@link ResourceBundleProvider}, if available, using {@link ServiceLoader}.
- * The service type is designated by
- * {@code <package name> + ".spi." + <simple name> + "Provider"}. For
- * example, if the base name is "{@code com.example.app.MyResources}", the service
- * type is {@code com.example.app.spi.MyResourcesProvider}.
- * <p>
- * In named modules, the loaded service providers for the given base name are
- * used to load resource bundles. If no service provider is available, or if
- * none of the service providers returns a resource bundle and the caller module
- * doesn't have its own service provider, the {@code getBundle} factory method
- * searches for resource bundles that are local in the caller module and that
- * are visible to the class loader of the caller module. The resource bundle
- * formats for local module searching are "java.class" and "java.properties".
+ * A common format of resource bundles is in {@linkplain PropertyResourceBundle
+ * .properties} file format. Typically {@code .properties} resource bundles
+ * are packaged in a JAR file. Resource bundle only JAR file can be readily
+ * deployed as an <a href="{@docRoot}/java/lang/module/ModuleFinder.html#automatic-modules">
+ * automatic module</a>. For example, if the JAR file contains the
+ * entry "{@code p/q/Foo_ja.properties}" and no {@code .class} entry,
+ * when resolved and defined as an automatic module, no package is derived
+ * for this module. This allows resource bundles in {@code .properties}
+ * format packaged in one or more JAR files that may contain entries
+ * in the same directory and can be resolved successfully as
+ * automatic modules.
*
* <h3>ResourceBundle.Control</h3>
*
@@ -268,6 +280,14 @@
* {@link #getBundle(String, Locale, ClassLoader, Control) getBundle}
* factory method for details.
*
+ * <p> {@link ResourceBundle.Control} is designed for an application deployed
+ * in an unnamed module, for example to support resource bundles in
+ * non-standard formats or package localized resources in a non-traditional
+ * convention. {@link ResourceBundleProvider} is the replacement for
+ * {@code ResourceBundle.Control} when migrating to modules.
+ * {@code UnsupportedOperationException} will be thrown when a factory
+ * method that takes the {@code ResourceBundle.Control} parameter is called.
+ *
* <p><a id="modify_default_behavior">For the {@code getBundle} factory</a>
* methods that take no {@link Control} instance, their <a
* href="#default_behavior"> default behavior</a> of resource bundle loading
@@ -815,14 +835,10 @@
/**
* Gets a resource bundle using the specified base name, the default locale,
- * and the caller's class loader. Calling this method is equivalent to calling
+ * and the caller module. Calling this method is equivalent to calling
* <blockquote>
- * <code>getBundle(baseName, Locale.getDefault(), this.getClass().getClassLoader())</code>,
+ * <code>getBundle(baseName, Locale.getDefault(), callerModule)</code>,
* </blockquote>
- * except that <code>getClassLoader()</code> is run with the security
- * privileges of <code>ResourceBundle</code>.
- * See {@link #getBundle(String, Locale, ClassLoader) getBundle}
- * for a complete description of the search and instantiation strategy.
*
* @param baseName the base name of the resource bundle, a fully qualified class name
* @exception java.lang.NullPointerException
@@ -830,6 +846,9 @@
* @exception MissingResourceException
* if no resource bundle for the specified base name can be found
* @return a resource bundle for the given base name and the default locale
+ *
+ * @see <a href="#default_behavior">Resource Bundle Search and Loading Strategy</a>
+ * @see <a href="#resource-bundle-modules">Resource Bundles and Named Modules</a>
*/
@CallerSensitive
public static final ResourceBundle getBundle(String baseName)
@@ -887,14 +906,10 @@
/**
* Gets a resource bundle using the specified base name and locale,
- * and the caller's class loader. Calling this method is equivalent to calling
+ * and the caller module. Calling this method is equivalent to calling
* <blockquote>
- * <code>getBundle(baseName, locale, this.getClass().getClassLoader())</code>,
+ * <code>getBundle(baseName, locale, callerModule)</code>,
* </blockquote>
- * except that <code>getClassLoader()</code> is run with the security
- * privileges of <code>ResourceBundle</code>.
- * See {@link #getBundle(String, Locale, ClassLoader) getBundle}
- * for a complete description of the search and instantiation strategy.
*
* @param baseName
* the base name of the resource bundle, a fully qualified class name
@@ -905,6 +920,9 @@
* @exception MissingResourceException
* if no resource bundle for the specified base name can be found
* @return a resource bundle for the given base name and locale
+ *
+ * @see <a href="#default_behavior">Resource Bundle Search and Loading Strategy</a>
+ * @see <a href="#resource-bundle-modules">Resource Bundles and Named Modules</a>
*/
@CallerSensitive
public static final ResourceBundle getBundle(String baseName,
@@ -922,19 +940,6 @@
* <code>getBundle(baseName, Locale.getDefault(), module)</code>
* </blockquote>
*
- * <p> Resource bundles in named modules may be encapsulated. When
- * the resource bundle is loaded from a provider, the caller module
- * must have an appropriate <i>uses</i> clause in its <i>module descriptor</i>
- * to declare that the module uses implementations of
- * {@code <package name> + ".spi." + <simple name> + "Provider"}.
- * Otherwise, it will load the resource bundles that are local in the
- * given module or that are visible to the class loader of the given module
- * (refer to the <a href="#bundleprovider">Resource Bundles in Named Modules</a>
- * section for details).
- * When the resource bundle is loaded from the specified module, it is
- * subject to the encapsulation rules specified by
- * {@link Module#getResourceAsStream Module.getResourceAsStream}.
- *
* @param baseName the base name of the resource bundle,
* a fully qualified class name
* @param module the module for which the resource bundle is searched
@@ -950,6 +955,8 @@
* @since 9
* @spec JPMS
* @see ResourceBundleProvider
+ * @see <a href="#default_behavior">Resource Bundle Search and Loading Strategy</a>
+ * @see <a href="#resource-bundle-modules">Resource Bundles and Named Modules</a>
*/
@CallerSensitive
public static ResourceBundle getBundle(String baseName, Module module) {
@@ -963,14 +970,15 @@
* on behalf of the specified module.
*
* <p> Resource bundles in named modules may be encapsulated. When
- * the resource bundle is loaded from a provider, the caller module
+ * the resource bundle is loaded from a
+ * {@linkplain ResourceBundleProvider service provider}, the caller module
* must have an appropriate <i>uses</i> clause in its <i>module descriptor</i>
- * to declare that the module uses implementations of
- * {@code <package name> + ".spi." + <simple name> + "Provider"}.
+ * to declare that the module uses of {@link ResourceBundleProvider}
+ * for the named resource bundle.
* Otherwise, it will load the resource bundles that are local in the
- * given module or that are visible to the class loader of the given module
- * (refer to the <a href="#bundleprovider">Resource Bundles in Named Modules</a>
- * section for details).
+ * given module as if calling {@link Module#getResourceAsStream(String)}
+ * or that are visible to the class loader of the given module
+ * as if calling {@link ClassLoader#getResourceAsStream(String)}.
* When the resource bundle is loaded from the specified module, it is
* subject to the encapsulation rules specified by
* {@link Module#getResourceAsStream Module.getResourceAsStream}.
@@ -1000,6 +1008,8 @@
* @return a resource bundle for the given base name and locale in the module
* @since 9
* @spec JPMS
+ * @see <a href="#default_behavior">Resource Bundle Search and Loading Strategy</a>
+ * @see <a href="#resource-bundle-modules">Resource Bundles and Named Modules</a>
*/
@CallerSensitive
public static ResourceBundle getBundle(String baseName, Locale targetLocale, Module module) {
@@ -1060,28 +1070,25 @@
* Gets a resource bundle using the specified base name, locale, and class
* loader.
*
- * <p>This method behaves the same as calling
- * {@link #getBundle(String, Locale, ClassLoader, Control)} passing a
- * default instance of {@link Control} unless another {@link Control} is
- * provided with the {@link ResourceBundleControlProvider} SPI. Refer to the
+ * <p>When this method is called from a named module and the given
+ * loader is the class loader of the caller module, this is equivalent
+ * to calling:
+ * <blockquote><pre>
+ * getBundle(baseName, targetLocale, callerModule)
+ * </pre></blockquote>
+ *
+ * otherwise, this is equivalent to calling:
+ * <blockquote><pre>
+ * getBundle(baseName, targetLocale, loader, control)
+ * </pre></blockquote>
+ * where {@code control} is the default instance of {@link Control} unless
+ * a {@code Control} instance is provided by
+ * {@link ResourceBundleControlProvider} SPI. Refer to the
* description of <a href="#modify_default_behavior">modifying the default
- * behavior</a>.
- *
- * <p><a id="default_behavior">The following describes the default
- * behavior</a>.
+ * behavior</a>. The following describes the default behavior.
*
* <p>
- * Resource bundles in a named module are private to that module. If
- * the caller is in a named module, this method will find resource bundles
- * from the service providers of {@link java.util.spi.ResourceBundleProvider}
- * if any. Otherwise, it will load the resource bundles that are visible to
- * the given {@code loader} (refer to the
- * <a href="#bundleprovider">Resource Bundles in Named Modules</a> section
- * for details).
- * If the caller is in a named module and the given {@code loader} is
- * different than the caller's class loader, or if the caller is not in
- * a named module, this method will not find resource bundles from named
- * modules.
+ * <b><a id="default_behavior">Resource Bundle Search and Loading Strategy</a></b>
*
* <p><code>getBundle</code> uses the base name, the specified locale, and
* the default locale (obtained from {@link java.util.Locale#getDefault()
@@ -1201,7 +1208,7 @@
*
* <p><b>Note:</b>The <code>baseName</code> argument should be a fully
* qualified class name. However, for compatibility with earlier versions,
- * Sun's Java SE Runtime Environments do not verify this, and so it is
+ * Java SE Runtime Environments do not verify this, and so it is
* possible to access <code>PropertyResourceBundle</code>s by specifying a
* path name (using "/") instead of a fully qualified class name (using
* ".").
@@ -1248,7 +1255,7 @@
*
* @apiNote If the caller module is a named module and the given
* {@code loader} is the caller module's class loader, this method is
- * equivalent to {@code getBundle(baseName, locale)}; otherwise, it will not
+ * equivalent to {@code getBundle(baseName, locale)}; otherwise, it may not
* find resource bundles from named modules.
* Use {@link #getBundle(String, Locale, Module)} to load resource bundles
* on behalf on a specific module instead.
@@ -1264,6 +1271,7 @@
* @since 1.2
* @revised 9
* @spec JPMS
+ * @see <a href="#resource-bundle-modules">Resource Bundles and Named Modules</a>
*/
@CallerSensitive
public static ResourceBundle getBundle(String baseName, Locale locale,
@@ -1278,9 +1286,9 @@
/**
* Returns a resource bundle using the specified base name, target
- * locale, class loader and control. Unlike the {@linkplain
- * #getBundle(String, Locale, ClassLoader) <code>getBundle</code>
- * factory methods with no <code>control</code> argument}, the given
+ * locale, class loader and control. Unlike the {@link
+ * #getBundle(String, Locale, ClassLoader) getBundle}
+ * factory methods with no {@code control} argument, the given
* <code>control</code> specifies how to locate and instantiate resource
* bundles. Conceptually, the bundle loading process with the given
* <code>control</code> is performed in the following steps.
@@ -2365,7 +2373,14 @@
* the callback methods provides the information necessary for the
* factory methods to perform the <a
* href="./ResourceBundle.html#default_behavior">default behavior</a>.
- * <a href="#note">Note that this class is not supported in named modules.</a>
+ *
+ * <p> {@link ResourceBundle.Control} is designed for an application deployed
+ * in an unnamed module, for example to support resource bundles in
+ * non-standard formats or package localized resources in a non-traditional
+ * convention. {@link ResourceBundleProvider} is the replacement for
+ * {@code ResourceBundle.Control} when migrating to modules.
+ * {@code UnsupportedOperationException} will be thrown when a factory
+ * method that takes the {@code ResourceBundle.Control} parameter is called.
*
* <p>In addition to the callback methods, the {@link
* #toBundleName(String, Locale) toBundleName} and {@link
@@ -2501,8 +2516,8 @@
* }
* </pre>
*
- * @apiNote <a id="note">{@code ResourceBundle.Control} is not supported
- * in named modules.</a> If the {@code ResourceBundle.getBundle} method with
+ * @apiNote {@code ResourceBundle.Control} is not supported
+ * in named modules. If the {@code ResourceBundle.getBundle} method with
* a {@code ResourceBundle.Control} is called in a named module, the method
* will throw an {@link UnsupportedOperationException}. Any service providers
* of {@link ResourceBundleControlProvider} are ignored in named modules.
--- a/src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java Fri Jan 05 22:02:20 2018 +0100
@@ -45,42 +45,46 @@
*
* <p>
* Resource bundles can be packaged in one or more
- * named modules, <em>bundle modules</em>. The <em>consumer</em> of the
+ * named modules, <em>service provider modules</em>. The <em>consumer</em> of the
* resource bundle is the one calling {@link ResourceBundle#getBundle(String)}.
* In order for the consumer module to load a resource bundle
* "{@code com.example.app.MyResources}" provided by another module,
* it will use the {@linkplain java.util.ServiceLoader service loader}
- * mechanism. A service interface named "{@code com.example.app.MyResourcesProvider}"
- * must be defined and a <em>bundle provider module</em> will provide an
- * implementation class of "{@code com.example.app.MyResourcesProvider}"
+ * mechanism. A service interface named "{@code com.example.app.spi.MyResourcesProvider}"
+ * must be defined and a <em>service provider module</em> will provide an
+ * implementation class of "{@code com.example.app.spi.MyResourcesProvider}"
* as follows:
*
- * <pre><code>
- * import com.example.app.MyResourcesProvider;
+ * <blockquote><pre>
+ * {@code import com.example.app.spi.MyResourcesProvider;
* class MyResourcesProviderImpl extends AbstractResourceBundleProvider
* implements MyResourcesProvider
* {
+ * public MyResourcesProviderImpl() {
+ * super("java.properties");
+ * }
+ * // this provider maps the resource bundle to per-language package
* protected String toBundleName(String baseName, Locale locale) {
- * // return the bundle name per the naming of the resource bundle
- * :
+ * return "p." + locale.getLanguage() + "." + baseName;
* }
*
* public ResourceBundle getBundle(String baseName, Locale locale) {
- * // this module only provides bundles in french
+ * // this module only provides bundles in French
* if (locale.equals(Locale.FRENCH)) {
* return super.getBundle(baseName, locale);
* }
+ * // otherwise return null
* return null;
* }
- * }</code></pre>
+ * }}</pre></blockquote>
*
- * @see <a href="../ResourceBundle.html#bundleprovider">
- * Resource Bundles in Named Modules</a>
- * @see <a href="../ResourceBundle.html#RBP_support">
- * ResourceBundleProvider Service Providers</a>
+ * Refer to {@link ResourceBundleProvider} for details.
*
+ * @see <a href="../ResourceBundle.html#resource-bundle-modules">
+ * Resource Bundles and Named Modules</a>
* @since 9
* @spec JPMS
+
*/
public abstract class AbstractResourceBundleProvider implements ResourceBundleProvider {
private static final JavaUtilResourceBundleAccess RB_ACCESS =
--- a/src/java.base/share/classes/java/util/spi/ResourceBundleProvider.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.base/share/classes/java/util/spi/ResourceBundleProvider.java Fri Jan 05 22:02:20 2018 +0100
@@ -29,33 +29,117 @@
import java.util.ResourceBundle;
/**
- * {@code ResourceBundleProvider} is a provider interface that is used for
- * loading resource bundles for named modules. Implementation classes of
- * this interface are loaded with {@link java.util.ServiceLoader ServiceLoader}
- * during a call to the
- * {@link ResourceBundle#getBundle(String, Locale, ClassLoader)
- * ResourceBundle.getBundle} method. The provider service type is determined by
- * {@code <package name> + ".spi." + <simple name> + "Provider"}.
+ * {@code ResourceBundleProvider} is a service provider interface for
+ * resource bundles. It is used by
+ * {@link ResourceBundle#getBundle(String) ResourceBundle.getBundle}
+ * factory methods to locate and load the service providers that are deployed as
+ * modules via {@link java.util.ServiceLoader ServiceLoader}.
+ *
+ * <h3>Developing resource bundle services</h3>
*
- * <p>
- * For example, if the base name is "com.example.app.MyResources",
- * {@code com.example.app.spi.MyResourcesProvider} will be the provider service type:
- * <pre>{@code
+ * A service for a resource bundle of a given <em>{@code baseName}</em> must have
+ * a fully-qualified class name of the form:
+ * <blockquote>
+ * {@code <package of baseName> + ".spi." + <simple name of baseName> + "Provider"}
+ * </blockquote>
+ *
+ * The service type is in a {@code spi} subpackage as it may be packaged in
+ * a module separate from the resource bundle providers.
+ * For example, the service for a resource bundle named
+ * {@code com.example.app.MyResources} must be
+ * {@code com.example.app.spi.MyResourcesProvider}:
+ *
+ * <blockquote><pre>
+ * {@code package com.example.app.spi;
* public interface MyResourcesProvider extends ResourceBundleProvider {
* }
- * }</pre>
+ * }</pre></blockquote>
+ *
+ * <h3>Deploying resource bundle service providers</h3>
+ *
+ * Resource bundles can be deployed in one or more service providers
+ * in modules. For example, a provider for a service
+ * named "{@code com.example.app.spi.MyResourcesProvider}"
+ * has the following implementation class:
+ *
+ * <blockquote><pre>
+ * {@code import com.example.app.spi.MyResourcesProvider;
+ * class MyResourcesProviderImpl extends AbstractResourceBundleProvider
+ * implements MyResourcesProvider
+ * {
+ * public MyResourcesProviderImpl() {
+ * super("java.properties");
+ * }
+ * // this provider maps the resource bundle to per-language package
+ * protected String toBundleName(String baseName, Locale locale) {
+ * return "p." + locale.getLanguage() + "." + baseName;
+ * }
+ *
+ * public ResourceBundle getBundle(String baseName, Locale locale) {
+ * // this module only provides bundles in French
+ * if (locale.equals(Locale.FRENCH)) {
+ * return super.getBundle(baseName, locale);
+ * }
+ * // otherwise return null
+ * return null;
+ * }
+ * }}</pre></blockquote>
+ *
+ * This example provides "{@code com.example.app.MyResources}"
+ * resource bundle of the French locale. Traditionally resource bundles of
+ * all locales are packaged in the same package as the resource bundle base name.
+ * When deploying resource bundles in more than one modules and two modules
+ * containing a package of the same name, <em>split package</em>,
+ * is not supported, resource bundles in each module can be packaged in
+ * a different package as shown in this example where this provider packages
+ * the resource bundles in per-language package, i.e. {@code com.example.app.fr}
+ * for French locale.
*
- * <p>
- * This providers's {@link #getBundle(String, Locale) getBundle} method is called
- * through the resource bundle loading process instead of {@link
- * java.util.ResourceBundle.Control#newBundle(String, Locale, String, ClassLoader, boolean)
- * ResourceBundle.Control.newBundle()}. Refer to {@link ResourceBundle} for
- * details.
+ * <p> A provider can provide more than one services, each of which is a service
+ * for a resource bundle of a different base name.
+ *
+ * <p>{@link AbstractResourceBundleProvider}
+ * provides the basic implementation for {@code ResourceBundleProvider}
+ * and a subclass can override the {@link
+ * AbstractResourceBundleProvider#toBundleName(String, Locale) toBundleName}
+ * method to return a provider-specific location of the resource to be loaded,
+ * for example, per-language package.
+ * A provider can override {@link #getBundle ResourceBundleProvider.getBundle}
+ * method for example to only search the known supported locales or
+ * return resource bundles in other formats such as XML.
+ *
+ * <p>The module declaration of this provider module specifies the following
+ * directive:
+ * <pre>
+ * provides com.example.app.spi.MyResourcesProvider with com.example.impl.MyResourcesProviderImpl;
+ * </pre>
+ *
+ * <h3><a id="obtain-resource-bundle">Obtaining resource bundles from providers</a></h3>
*
- * @see <a href="../ResourceBundle.html#bundleprovider">
- * Resource Bundles in Named Modules</a>
- * @see <a href="../ResourceBundle.html#RBP_support">
- * ResourceBundleProvider Service Providers</a>
+ * The module declaration of the <em>consumer module</em> that calls one of the
+ * {@code ResourceBundle.getBundle} factory methods to obtain a resource
+ * bundle from service providers must specify the following directive:
+ * <pre>
+ * uses com.example.app.spi.MyResourcesProvider;
+ * </pre>
+ *
+ * {@link ResourceBundle#getBundle(String, Locale)
+ * ResourceBundle.getBundle("com.example.app.MyResource", locale)}
+ * locates and loads the providers for {@code com.example.app.spi.MyResourcesProvider}
+ * service and then invokes {@link #getBundle(String, Locale)
+ * ResourceBundleProvider.getBundle("com.example.app.MyResource", locale)} to
+ * find the resource bundle of the given base name and locale.
+ * If the consumer module is a resource bundle service provider for
+ * {@code com.example.app.spi.MyResourcesProvider}, {@code ResourceBundle.getBundle}
+ * will locate resource bundles only from service providers.
+ * Otherwise, {@code ResourceBundle.getBundle} may continue the search of
+ * the resource bundle in other modules and class path per the specification
+ * of the {@code ResourceBundle.getBundle} method being called.
+ *
+ * @see AbstractResourceBundleProvider
+ * @see <a href="../ResourceBundle.html#resource-bundle-modules">
+ * Resource Bundles and Named Modules</a>
+ * @see java.util.ServiceLoader
* @since 9
* @spec JPMS
*/
--- a/src/java.base/share/classes/java/util/stream/WhileOps.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.base/share/classes/java/util/stream/WhileOps.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -95,7 +95,7 @@
@Override
public void accept(T t) {
- if (take = predicate.test(t)) {
+ if (take && (take = predicate.test(t))) {
downstream.accept(t);
}
}
@@ -152,7 +152,7 @@
@Override
public void accept(int t) {
- if (take = predicate.test(t)) {
+ if (take && (take = predicate.test(t))) {
downstream.accept(t);
}
}
@@ -209,7 +209,7 @@
@Override
public void accept(long t) {
- if (take = predicate.test(t)) {
+ if (take && (take = predicate.test(t))) {
downstream.accept(t);
}
}
@@ -266,7 +266,7 @@
@Override
public void accept(double t) {
- if (take = predicate.test(t)) {
+ if (take && (take = predicate.test(t))) {
downstream.accept(t);
}
}
--- a/src/java.base/share/classes/jdk/internal/loader/AbstractClassLoaderValue.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.base/share/classes/jdk/internal/loader/AbstractClassLoaderValue.java Fri Jan 05 22:02:20 2018 +0100
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/src/java.base/share/classes/jdk/internal/loader/ClassLoaderValue.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.base/share/classes/jdk/internal/loader/ClassLoaderValue.java Fri Jan 05 22:02:20 2018 +0100
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/src/java.base/share/classes/module-info.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.base/share/classes/module-info.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -142,7 +142,7 @@
java.instrument,
java.logging;
exports jdk.internal.jmod to
- jdk.compiler, // reflective dependency
+ jdk.compiler,
jdk.jlink;
exports jdk.internal.logger to
java.logging;
@@ -172,7 +172,7 @@
java.xml,
jdk.attach,
jdk.charsets,
- jdk.compiler, // reflective dependency
+ jdk.compiler,
jdk.incubator.httpclient,
jdk.jdeps,
jdk.jlink,
--- a/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,11 +1,12 @@
/*
* Copyright (c) 2017, Red Hat, Inc. and/or its affiliates.
- *
* 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.
+ * 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
--- a/src/java.base/share/classes/sun/security/ssl/HandshakeHash.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.base/share/classes/sun/security/ssl/HandshakeHash.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -108,7 +108,29 @@
* a hash for the certificate verify message is required.
*/
HandshakeHash(boolean needCertificateVerify) {
- clonesNeeded = needCertificateVerify ? 4 : 3;
+ // We may rework the code later, but for now we use hard-coded number
+ // of clones if the underlying MessageDigests are not cloneable.
+ //
+ // The number used here is based on the current handshake protocols and
+ // implementation. It may be changed if the handshake processe gets
+ // changed in the future, for example adding a new extension that
+ // requires handshake hash. Please be careful about the number of
+ // clones if additional handshak hash is required in the future.
+ //
+ // For the current implementation, the handshake hash is required for
+ // the following items:
+ // . CertificateVerify handshake message (optional)
+ // . client Finished handshake message
+ // . server Finished Handshake message
+ // . the extended Master Secret extension [RFC 7627]
+ //
+ // Note that a late call to server setNeedClientAuth dose not update
+ // the number of clones. We may address the issue later.
+ //
+ // Note for safety, we allocate one more clone for the current
+ // implementation. We may consider it more carefully in the future
+ // for the exact number or rework the code in a different way.
+ clonesNeeded = needCertificateVerify ? 5 : 4;
}
void reserve(ByteBuffer input) {
@@ -335,7 +357,8 @@
if (finMD != null) return;
try {
- finMD = CloneableDigest.getDigest(normalizeAlgName(s), 2);
+ // See comment in the contructor.
+ finMD = CloneableDigest.getDigest(normalizeAlgName(s), 4);
} catch (NoSuchAlgorithmException e) {
throw new Error(e);
}
--- a/src/java.desktop/share/classes/sun/awt/SunToolkit.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.desktop/share/classes/sun/awt/SunToolkit.java Fri Jan 05 22:02:20 2018 +0100
@@ -868,25 +868,10 @@
java.security.Permission perm =
URLUtil.getConnectPermission(url);
if (perm != null) {
- try {
- sm.checkPermission(perm);
- } catch (SecurityException se) {
- // fallback to checkRead/checkConnect for pre 1.2
- // security managers
- if ((perm instanceof java.io.FilePermission) &&
- perm.getActions().indexOf("read") != -1) {
- sm.checkRead(perm.getName());
- } else if ((perm instanceof
- java.net.SocketPermission) &&
- perm.getActions().indexOf("connect") != -1) {
- sm.checkConnect(url.getHost(), url.getPort());
- } else {
- throw se;
- }
- }
+ sm.checkPermission(perm);
}
} catch (java.io.IOException ioe) {
- sm.checkConnect(url.getHost(), url.getPort());
+ sm.checkConnect(url.getHost(), url.getPort());
}
}
}
--- a/src/java.desktop/share/classes/sun/awt/image/URLImageSource.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.desktop/share/classes/sun/awt/image/URLImageSource.java Fri Jan 05 22:02:20 2018 +0100
@@ -46,25 +46,10 @@
java.security.Permission perm =
URLUtil.getConnectPermission(u);
if (perm != null) {
- try {
- sm.checkPermission(perm);
- } catch (SecurityException se) {
- // fallback to checkRead/checkConnect for pre 1.2
- // security managers
- if ((perm instanceof java.io.FilePermission) &&
- perm.getActions().indexOf("read") != -1) {
- sm.checkRead(perm.getName());
- } else if ((perm instanceof
- java.net.SocketPermission) &&
- perm.getActions().indexOf("connect") != -1) {
- sm.checkConnect(u.getHost(), u.getPort());
- } else {
- throw se;
- }
- }
+ sm.checkPermission(perm);
}
} catch (java.io.IOException ioe) {
- sm.checkConnect(u.getHost(), u.getPort());
+ sm.checkConnect(u.getHost(), u.getPort());
}
}
this.url = u;
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-fallback.hh Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-fallback.hh Fri Jan 05 22:02:20 2018 +0100
@@ -77,7 +77,13 @@
/* Bubble-sort or something equally good!
* May not be good-enough for presidential candidate interviews, but good-enough for us... */
+
+#if defined(_AIX)
+ /* Workaround AIX xlC 12 compilation problems caused by the overloaded versions of 'cmp' in IntType */
+ hb_stable_sort (&glyphs[0], num_glyphs, (int(*)(const OT::GlyphID*, const OT::GlyphID *)) OT::GlyphID::cmp, &substitutes[0]);
+#else
hb_stable_sort (&glyphs[0], num_glyphs, OT::GlyphID::cmp, &substitutes[0]);
+#endif
OT::Supplier<OT::GlyphID> glyphs_supplier (glyphs, num_glyphs);
OT::Supplier<OT::GlyphID> substitutes_supplier (substitutes, num_glyphs);
@@ -126,7 +132,13 @@
first_glyphs_indirection[num_first_glyphs] = first_glyph_idx;
num_first_glyphs++;
}
+
+#if defined(_AIX)
+ /* Workaround AIX xlC 12 compilation problems caused by the overloaded versions of 'cmp' in IntType */
+ hb_stable_sort (&first_glyphs[0], num_first_glyphs, (int(*)(const OT::GlyphID *, const OT::GlyphID *)) OT::GlyphID::cmp, &first_glyphs_indirection[0]);
+#else
hb_stable_sort (&first_glyphs[0], num_first_glyphs, OT::GlyphID::cmp, &first_glyphs_indirection[0]);
+#endif
/* Now that the first-glyphs are sorted, walk again, populate ligatures. */
for (unsigned int i = 0; i < num_first_glyphs; i++)
--- a/src/java.desktop/unix/native/common/awt/systemscale/systemScale.c Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.desktop/unix/native/common/awt/systemscale/systemScale.c Fri Jan 05 22:02:20 2018 +0100
@@ -1,25 +1,27 @@
/*
-* 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.
-*/
+ * 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. 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.
+ */
#include "systemScale.h"
#include "jni.h"
--- a/src/java.desktop/unix/native/common/awt/systemscale/systemScale.h Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.desktop/unix/native/common/awt/systemscale/systemScale.h Fri Jan 05 22:02:20 2018 +0100
@@ -1,25 +1,27 @@
/*
-* 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.
-*/
+ * 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. 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.
+ */
#ifndef _AWT_SYSTEMSCALE_H
#define _AWT_SYSTEMSCALE_H
--- a/src/java.desktop/windows/native/common/awt/systemscale/systemScale.cpp Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.desktop/windows/native/common/awt/systemscale/systemScale.cpp Fri Jan 05 22:02:20 2018 +0100
@@ -1,25 +1,27 @@
/*
-* 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.
-*/
+ * 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. 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.
+ */
#include "systemScale.h"
#include <d2d1.h>
#pragma comment(lib, "d2d1")
--- a/src/java.desktop/windows/native/common/awt/systemscale/systemScale.h Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.desktop/windows/native/common/awt/systemscale/systemScale.h Fri Jan 05 22:02:20 2018 +0100
@@ -1,25 +1,27 @@
/*
-* 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.
-*/
+ * 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. 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.
+ */
#ifndef _AWT_SYSTEM_SCALE_H
#define _AWT_SYSTEM_SCALE_H
#include <windows.h>
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/ExceptionConst.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/ExceptionConst.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,6 +23,7 @@
/**
* Exception constants.
* @since 6.0 (intended to replace the InstructionConstant interface)
+ * @LastModified: Oct 2017
*/
public final class ExceptionConst {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Utility.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Utility.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -44,6 +43,7 @@
* Utility functions that do not really belong to any class in particular.
*
* @version $Id: Utility.java 1751107 2016-07-03 02:41:18Z dbrosius $
+ * @LastModified: Oct 2017
*/
// @since 6.0 methods are no longer final
public abstract class Utility {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
* <PRE>Stack: ..., arrayref -> ..., length</PRE>
*
* @version $Id: ARRAYLENGTH.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class ARRAYLENGTH extends Instruction
implements ExceptionThrower, StackProducer, StackConsumer /* since 6.0 */ {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
* <PRE>Stack: ..., objectref -> objectref</PRE>
*
* @version $Id: ATHROW.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class ATHROW extends Instruction implements UnconditionalBranch, ExceptionThrower {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
* <PRE>Stack: ..., value1, value2 -> result</PRE>
*
* @version $Id: IDIV.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class IDIV extends ArithmeticInstruction implements ExceptionThrower {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
* <PRE>Stack: ..., value1, value2 -> result</PRE>
*
* @version $Id: IREM.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class IREM extends ArithmeticInstruction implements ExceptionThrower {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
* ..., result.word1, result.word2
*
* @version $Id: LDIV.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class LDIV extends ArithmeticInstruction implements ExceptionThrower {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
* <PRE>Stack: ..., value1, value2 -> result</PRE>
*
* @version $Id: LREM.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class LREM extends ArithmeticInstruction implements ExceptionThrower {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
* <PRE>Stack: ..., objectref -> ...</PRE>
*
* @version $Id: MONITORENTER.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class MONITORENTER extends Instruction implements ExceptionThrower, StackConsumer {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
* <PRE>Stack: ..., objectref -> ...</PRE>
*
* @version $Id: MONITOREXIT.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class MONITOREXIT extends Instruction implements ExceptionThrower, StackConsumer {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -59,6 +58,7 @@
* @version $Id: MethodGen.java 1749603 2016-06-21 20:50:19Z ggregory $
* @see InstructionList
* @see Method
+ * @LastModified: Oct 2017
*/
public class MethodGen extends FieldGenOrMethodGen {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
* type must be one of T_INT, T_SHORT, ...
*
* @version $Id: NEWARRAY.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class NEWARRAY extends Instruction implements AllocationInstruction, ExceptionThrower,
StackProducer {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
* Super class for the xRETURN family of instructions.
*
* @version $Id: ReturnInstruction.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public abstract class ReturnInstruction extends Instruction implements ExceptionThrower,
TypedInstruction, StackConsumer {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -66,6 +65,7 @@
*
* @see BCELifier
* @version $Id: BCELFactory.java 1749603 2016-06-21 20:50:19Z ggregory $
+ * @LastModified: Oct 2017
*/
class BCELFactory extends EmptyVisitor {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/InstructionFinder.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/InstructionFinder.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -66,6 +65,7 @@
* @version $Id: InstructionFinder.java 1749603 2016-06-21 20:50:19Z ggregory $
* @see com.sun.org.apache.bcel.internal.generic.Instruction
* @see InstructionList
+ * @LastModified: Oct 2017
*/
public class InstructionFinder {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -45,6 +44,7 @@
*
* @see <a href="http://www.exslt.org/">EXSLT</a>
* @xsl.usage general
+ * @LastModified: Nov 2017
*/
public class ExsltDatetime
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLMessages.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLMessages.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
* be called XalanMessages, or some such.
*
* @xsl.usage internal
+ * @LastModified: Sep 2017
*/
public class XSLMessages extends XPATHMessages {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,6 +22,8 @@
/**
* A configuration error. This was an internal class in ObjectFactory previously
+ *
+ * @LastModified: Oct 2017
*/
public final class ConfigurationError
extends Error {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
* class and modified to be used as a general utility for creating objects
* dynamically.
*
+ * @LastModified: Oct 2017
*/
public class ObjectFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/Translet.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/Translet.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,6 +26,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public interface Translet {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class ApplyTemplates extends Instruction {
private Expression _select;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Nov 2017
*/
final class AttributeSet extends TopLevelElement {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class AttributeValueTemplate extends AttributeValue {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
*/
final class BinOpExpr extends Expression {
public static final int PLUS = 0;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class BooleanCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
*/
final class CallTemplate extends Instruction {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
/**
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class CastCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class CeilingCall extends FunctionCall {
public CeilingCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -45,6 +44,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class Choose extends Instruction {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class ConcatCall extends FunctionCall {
public ConcatCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class ContainsCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
/**
* @author Jacek Ambroziak
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class DocumentCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class ElementAvailableCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
*/
abstract class Expression extends SyntaxTreeNode {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Nov 2017
*/
class FilterExpr extends Expression {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class FloorCall extends FunctionCall {
public FloorCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class FlowList {
private List<InstructionHandle> _elements;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -48,6 +47,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class ForEach extends Instruction {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class FormatNumberCall extends FunctionCall {
private Expression _value;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
/**
* @author G. Todd Miller
* @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
*/
final class FunctionAvailableCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,7 @@
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
* @author Todd Miller
+ * @LastModified: Nov 2017
*/
class FunctionCall extends Expression {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class GenerateIdCall extends FunctionCall {
public GenerateIdCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
* @author Gunnlaugur Briem <gthb@dimon.is>
+ * @LastModified: Sep 2017
*/
final class Import extends TopLevelElement {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
* @author Gunnlaugur Briem <gthb@dimon.is>
+ * @LastModified: Sep 2017
*/
final class Include extends TopLevelElement {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -52,6 +51,7 @@
/**
* @author Morten Jorgensen
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class Key extends TopLevelElement {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
/**
* @author Morten Jorgensen
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class KeyCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
/**
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class LangCall extends FunctionCall {
private Expression _lang;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class LiteralElement extends Instruction {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class LocalNameCall extends NameBase {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Nov 2017
*/
final class LogicalExpr extends Expression {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Nov 2017
*/
final class Message extends Instruction {
private boolean _terminate = false;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,7 @@
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
* @author G. Todd Miller
+ * @LastModified: Nov 2017
*/
final class Mode implements Constants {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
/**
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
*/
class NameBase extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class NameCall extends NameBase {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
/**
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class NamespaceUriCall extends NameBase {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class NotCall extends FunctionCall {
public NotCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -54,6 +53,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
*/
final class Number extends Instruction implements Closure {
private static final int LEVEL_SINGLE = 0;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class NumberCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -67,6 +66,7 @@
* @author G. Todd Miller
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Nov 2017
*/
public class Parser implements Constants, ContentHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -52,6 +51,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class Predicate extends Expression implements Closure {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
/**
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class ProcessingInstructionPattern extends StepPattern {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -44,6 +43,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class RelationalExpr extends Expression {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class RoundCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -59,6 +58,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Nov 2017
*/
final class Sort extends Instruction implements Closure {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class StartsWithCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -48,6 +47,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class Step extends RelativeLocationPath {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -58,6 +57,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
*/
class StepPattern extends RelativePathPattern {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class StringCall extends FunctionCall {
public StringCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class StringLengthCall extends FunctionCall {
public StringLengthCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -66,6 +65,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
public final class Stylesheet extends SyntaxTreeNode {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class SymbolTable {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -58,6 +57,7 @@
* @author Morten Jorensen
* @author Erwin Bolwidt <ejb@klomp.org>
* @author John Howard <JohnH@schemasoft.com>
+ * @LastModified: Nov 2017
*/
public abstract class SyntaxTreeNode implements Constants {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
*/
public final class Template extends TopLevelElement {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -47,7 +46,8 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Erwin Bolwidt <ejb@klomp.org>
- * @author Morten Jorgensen <morten.jorgensen@sun.com>
+ * @author Morten Jorgensen
+ * @LastModified: Nov 2017
*/
final class TestSeq {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,9 @@
import java.util.ArrayList;
import java.util.List;
+/**
+ * @LastModified: Oct 2017
+ */
class TopLevelElement extends SyntaxTreeNode {
/*
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class UnaryOpExpr extends Expression {
private Expression _left;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
*/
final class UnionPathExpr extends Expression {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class UnparsedEntityUriCall extends FunctionCall {
private Expression _entity;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
/**
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class UnsupportedElement extends SyntaxTreeNode {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class UseAttributeSets extends Instruction {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -48,6 +47,7 @@
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
* @author John Howard <JohnH@schemasoft.com>
+ * @LastModified: Oct 2017
*/
class VariableBase extends TopLevelElement {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
/**
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class Whitespace extends TopLevelElement {
// Three possible actions for the translet:
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,9 @@
import com.sun.java_cup.internal.runtime.Symbol;
+/**
+ * @LastModified: Oct 2017
+ */
class XPathLexer implements com.sun.java_cup.internal.runtime.Scanner {
private final int YY_BUFFER_SIZE = 512;
private final int YY_F = -1;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -59,6 +58,7 @@
* @author G. Todd Miller
* @author Morten Jorgensen
* @author John Howard (johnh@schemasoft.com)
+ * @LastModified: Oct 2017
*/
public final class XSLTC {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -50,6 +49,7 @@
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
* @author Gunnlaugur Briem <gthb@dimon.is>
+ * @LastModified: Oct 2017
*/
final class XslAttribute extends Instruction {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -48,6 +47,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class BooleanType extends Type {
protected BooleanType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
* @author G. Todd Miller
* @author Erwin Bolwidt <ejb@klomp.org>
* @author Morten Jorgensen
+ * @LastModified: Sep 2017
*/
public final class ErrorMsg {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -50,6 +49,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class IntType extends NumberType {
protected IntType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,6 +23,8 @@
/**
* Marks a class of errors in which XSLTC has reached some incorrect internal
* state from which it cannot recover.
+ *
+ * @LastModified: Oct 2017
*/
public class InternalError extends Error {
private static final long serialVersionUID = -6690855975016554786L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -76,6 +75,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
*/
public class MethodGenerator extends MethodGen
implements com.sun.org.apache.xalan.internal.xsltc.compiler.Constants {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,6 +26,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class MethodType extends Type {
private final Type _resultType;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class NodeSetType extends Type {
protected NodeSetType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class NodeType extends Type {
private final int _type;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
/**
* @author Todd Miller
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class ObjectType extends Type {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class RealType extends NumberType {
protected RealType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
*/
public final class ReferenceType extends Type {
protected ReferenceType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
public final class ResultTreeType extends Type {
private final String _methodName;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,6 +25,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class StringStack extends Stack<String> {
static final long serialVersionUID = -1506910875640317898L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public class StringType extends Type {
protected StringType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
public abstract class Type implements Constants {
public static final Type Int = new IntType();
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Sep 2017
*/
public final class Util {
private static char filesep;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class VoidType extends Type {
protected VoidType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
* <b>deprecated.</b></em>
* @author Morten Jorgensen
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public class KeyIndex extends DTMAxisIteratorBase {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
/**
* @author Morten Jorgensen
+ * @LastModified: Sep 2017
*/
public final class LoadDocument {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
public abstract class NodeCounter {
public static final int END = DTM.NULL;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,8 @@
/**
* Base class for sort records containing application specific sort keys
+ *
+ * @LastModified: Oct 2017
*/
public abstract class NodeSortRecord {
public static final int COMPARE_STRING = 0;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,9 @@
import java.text.Collator;
import java.util.Locale;
+/**
+ * @LastModified: Oct 2017
+ */
public class NodeSortRecordFactory {
private static int DESCENDING = "descending".length();
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -69,6 +68,7 @@
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
* @author Douglas Sellers <douglasjsellers@hotmail.com>
+ * @LastModified: Oct 2017
*/
public final class SAXImpl extends SAX2DTM2
implements DOMEnhancedForDTM, DOMBuilder
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -55,6 +54,7 @@
* @author Morten Jorgensen
* @author G. Todd Miller
* @author John Howard, JohnH@schemasoft.com
+ * @LastModified: Oct 2017
*/
public abstract class AbstractTranslet implements Translet {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -61,6 +60,8 @@
/**
* Standard XSLT functions. All standard functions expect the current node
* and the DOM as their last two arguments.
+ *
+ * @LastModified: Sep 2017
*/
public final class BasisLibrary {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,6 +24,8 @@
/**
* Class to express failed assertions and similar for the xsltc runtime.
* As java.lang.AssertionError was introduced in JDK 1.4 we can't use that yet.
+ *
+ * @LastModified: Oct 2017
*/
public class InternalRuntimeError extends Error {
private static final long serialVersionUID = 2802784919179095307L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -49,6 +48,7 @@
/**
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public class TransletOutputHandlerFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
/**
* @author Santiago Pericas-Geertsen
+ * @LastModified: Sep 2017
*/
class WriterOutputBuffer implements OutputBuffer {
private static final int KB = 1024;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -46,6 +45,7 @@
/**
* @author G. Todd Miller
+ * @LastModified: Oct 2017
*/
public class DOM2SAX implements XMLReader, Locator {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -46,6 +45,7 @@
* @author G. Todd Miller
* @author Sunitha Reddy
* @author Huizhe Wang
+ * @LastModified: Nov 2017
*/
public class SAX2DOM implements ContentHandler, LexicalHandler, Constants {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -69,6 +68,7 @@
* @author G. Todd Millerj
* @author Jochen Cordes <Jochen.Cordes@t-online.de>
* @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
*/
public final class TemplatesImpl implements Templates, Serializable {
static final long serialVersionUID = 673094361519270707L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -89,6 +88,7 @@
* @author G. Todd Miller
* @author Morten Jorgensen
* @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
*/
@SuppressWarnings("deprecation") //org.xml.sax.helpers.XMLReaderFactory
public class TransformerFactoryImpl
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -95,6 +94,7 @@
* @author Morten Jorgensen
* @author G. Todd Miller
* @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
*/
public final class TransformerImpl extends Transformer
implements DOMCache, ErrorListener
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
/**
* @author Morten Jorgensen
+ * @LastModified: Nov 2017
*/
public final class XSLTCSource implements Source {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttributeMap.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttributeMap.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
*
* @xerces.internal
*
+ * @LastModified: Oct 2017
*/
public class AttributeMap extends NamedNodeMapImpl {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -84,6 +83,7 @@
* @author Andy Clark, IBM
* @author Ralf Pfeiffer, IBM
* @since PR-DOM-Level-1-19980818.
+ * @LastModified: Nov 2017
*/
public class CoreDocumentImpl
extends ParentNode implements Document {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -71,6 +70,7 @@
*
* @author Elena Litani, IBM
* @author Neeraj Bajaj, Sun Microsystems.
+ * @LastModified: Oct 2017
*/
public class DOMConfigurationImpl extends ParserConfigurationSettings
implements XMLParserConfiguration, DOMConfiguration {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
*
* @author Neil Delima, IBM
* @since DOM Level 3 Core
+ * @LastModified: Oct 2017
*/
public class DOMImplementationListImpl implements DOMImplementationList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
*
* @xerces.internal
*
+ * @LastModified: Oct 2017
*/
public class DOMImplementationSourceImpl
implements DOMImplementationSource {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
* @xerces.internal
*
* @author Sandy Gao, IBM
+ * @LastModified: Sep 2017
*/
public class DOMMessageFormatter {
public static final String DOM_DOMAIN = "http://www.w3.org/dom/DOMTR";
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -97,6 +96,7 @@
*
* @author Elena Litani, IBM
* @author Neeraj Bajaj, Sun Microsystems, inc.
+ * @LastModified: Nov 2017
*/
public class DOMNormalizer implements XMLDocumentHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
* @xerces.internal
*
* @author Neil Delima, IBM
+ * @LastModified: Nov 2017
*/
public class DOMStringListImpl implements DOMStringList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
* @xerces.internal
*
* @author Elena Litani, IBM
+ * @LastModified: Oct 2017
*/
public class DOMXSImplementationSourceImpl
extends DOMImplementationSourceImpl {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -72,6 +71,7 @@
* @xerces.internal
*
* @since PR-DOM-Level-1-19980818.
+ * @LastModified: Oct 2017
*/
public class DeepNodeListImpl
implements NodeList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
* @xerces.internal
*
* @since PR-DOM-Level-1-19980818.
+ * @LastModified: Oct 2017
*/
public class DeferredDocumentImpl
extends DocumentImpl
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
* @xerces.internal
*
* @since PR-DOM-Level-1-19980818.
+ * @LastModified: Oct 2017
*/
public class DeferredDocumentTypeImpl
extends DocumentTypeImpl
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -85,6 +84,7 @@
* @author Andy Clark, IBM
* @author Ralf Pfeiffer, IBM
* @since PR-DOM-Level-1-19980818.
+ * @LastModified: Nov 2017
*/
public class DocumentImpl
extends CoreDocumentImpl
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -682,7 +682,6 @@
// If the new name has a different prefix, the list may become unsorted.
// Maybe it would be better to resort the list, but the simplest
// fix seems to be to remove the old attribute and re-insert it.
- // -- Norman.Walsh@Sun.COM, 2 Feb 2007
newAttr = (Attr) attributes.removeItem(newAttr, false);
attributes.addItem(newAttr);
}
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -57,6 +56,7 @@
* @xerces.internal
*
* @since PR-DOM-Level-1-19980818.
+ * @LastModified: Oct 2017
*/
public class NamedNodeMapImpl
implements NamedNodeMap, Serializable {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
*
* @xerces.internal
*
+ * @LastModified: Oct 2017
*/
public class RangeImpl implements Range {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
*
* @author Andy Clark, IBM
*
+ * @LastModified: Oct 2017
*/
public final class Constants {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java Fri Jan 05 22:02:20 2018 +0100
@@ -37,13 +37,13 @@
import jdk.xml.internal.JdkXmlUtils;
/**
- * This class manages different properties related to Stax specification and its implementation.
+ * This class manages different properties related to Stax specification and its implementation.
* This class constructor also takes itself (PropertyManager object) as parameter and initializes the
* object with the property taken from the object passed.
*
- * @author Neeraj Bajaj, neeraj.bajaj@sun.com
- * @author K.Venugopal@sun.com
- * @author Sunitha Reddy, sunitha.reddy@sun.com
+ * @author Neeraj Bajaj
+ * @author K Venugopal
+ * @author Sunitha Reddy
*/
public class PropertyManager {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -741,7 +741,7 @@
// Take advantage of the fact that next string _should_ be "fElementQName.rawName",
//In scanners most of the time is consumed on checks done for XML characters, we can
// optimize on it and avoid the checks done for endElement,
- //we will also avoid symbol table lookup - neeraj.bajaj@sun.com
+ //we will also avoid symbol table lookup.
// this should work both for namespace processing true or false...
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -64,6 +63,7 @@
* @author Glenn Marcy, IBM
* @author Eric Ye, IBM
*
+ * @LastModified: Nov 2017
*/
public class XMLDTDScannerImpl
extends XMLScanner
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
@@ -72,6 +71,7 @@
* @author Eric Ye, IBM
* @author Sunitha Reddy, SUN Microsystems
*
+ * @LastModified: Sep 2017
*/
public class XMLDocumentFragmentScannerImpl
extends XMLScanner
@@ -1670,7 +1670,7 @@
// Take advantage of the fact that next string _should_ be "fElementQName.rawName",
//In scanners most of the time is consumed on checks done for XML characters, we can
// optimize on it and avoid the checks done for endElement,
- //we will also avoid symbol table lookup - neeraj.bajaj@sun.com
+ //we will also avoid symbol table lookup.
// this should work both for namespace processing true or false...
@@ -2461,7 +2461,6 @@
* we dont need to set the value for every end element encouterd.
* For Well formedness checks we can have the same QName object that was pushed.
* the values will be set only if application need to know about the endElement
- * -- neeraj.bajaj@sun.com
*/
public QName getLastPoppedElement(){
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
@@ -65,6 +64,7 @@
* Refer to the table in unit-test javax.xml.stream.XMLStreamReaderTest.SupportDTD for changes
* related to property SupportDTD.
* @author Joe Wang, Sun Microsystems
+ * @LastModified: Sep 2017
*/
public class XMLDocumentScannerImpl
extends XMLDocumentFragmentScannerImpl{
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -90,6 +89,7 @@
* @author K.Venugopal SUN Microsystems
* @author Neeraj Bajaj SUN Microsystems
* @author Sunitha Reddy SUN Microsystems
+ * @LastModified: Oct 2017
*/
public class XMLEntityManager implements XMLComponent, XMLEntityResolver {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -71,6 +70,7 @@
* @author Eric Ye, IBM
* @author Andy Clark, IBM
*
+ * @LastModified: Nov 2017
*/
public class XMLErrorReporter
implements XMLComponent {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -57,6 +56,7 @@
*
* @author Andy Clark, IBM
*
+ * @LastModified: Nov 2017
*/
public class XMLNamespaceBinder
implements XMLComponent, XMLDocumentFilter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -68,6 +67,7 @@
* @author Eric Ye, IBM
* @author K.Venugopal SUN Microsystems
* @author Sunitha Reddy, SUN Microsystems
+ * @LastModified: Nov 2017
*/
public abstract class XMLScanner
implements XMLComponent {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,7 @@
* @author Andy Clark, IBM
* @author Neil Graham, IBM
*
+ * @LastModified: Oct 2017
*/
public class DTDGrammar
implements XMLDTDHandler, XMLDTDContentModelHandler, EntityState, Grammar {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
* @xerces.internal
*
* @author Neil Graham, IBM
+ * @LastModified: Oct 2017
*/
public class XMLDTDDescription extends XMLResourceIdentifierImpl
implements com.sun.org.apache.xerces.internal.xni.grammars.XMLDTDDescription {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -68,6 +67,7 @@
* @author Neil Graham, IBM
* @author Michael Glavassevich, IBM
*
+ * @LastModified: Nov 2017
*/
public class XMLDTDLoader
extends XMLDTDProcessor
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -72,6 +71,7 @@
*
* @author Neil Graham, IBM
*
+ * @LastModified: Nov 2017
*/
public class XMLDTDProcessor
implements XMLComponent, XMLDTDFilter, XMLDTDContentModelFilter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -85,6 +84,7 @@
* @author Jeffrey Rodriguez IBM
* @author Neil Graham, IBM
*
+ * @LastModified: Nov 2017
*/
public class XMLDTDValidator
implements XMLComponent, XMLDocumentFilter, XMLDTDValidatorFilter, RevalidationHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,6 +40,7 @@
*
* @xerces.internal
*
+ * @LastModified: Oct 2017
*/
public class DFAContentModel
implements ContentModelValidator {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Sep 2017
*/
public class DatatypeException extends Exception {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
public class XSFacets {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
*
* @author Jeffrey Rodriguez
* @author Sandy Gao
+ * @LastModified: Nov 2017
*/
public final class Base64 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
*
* @author Ankit Pasricha, IBM
*
+ * @LastModified: Oct 2017
*/
public class ByteListImpl extends AbstractList<Byte> implements ByteList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
* @author Neeraj Bajaj, Sun Microsystems, inc.
* @author Sandy Gao, IBM
*
+ * @LastModified: Nov 2017
*/
public class BaseDVFactory extends SchemaDVFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
*
* @author Khaled Noaman, IBM
*
+ * @LastModified: Nov 2017
*/
public class ExtendedSchemaDVFactoryImpl extends BaseSchemaDVFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
* @author Neeraj Bajaj, Sun Microsystems, inc.
* @author Sandy Gao, IBM
*
+ * @LastModified: Nov 2017
*/
public class FullDVFactory extends BaseDVFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
* @author Neeraj Bajaj, Sun Microsystems, inc.
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
public class ListDV extends TypeValidator{
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
* @author Neeraj Bajaj, Sun Microsystems, inc.
* @author Sandy Gao, IBM
*
+ * @LastModified: Nov 2017
*/
public class SchemaDVFactoryImpl extends BaseSchemaDVFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -64,6 +63,7 @@
* @author Sandy Gao, IBM
* @author Neeraj Bajaj, Sun Microsystems, inc.
*
+ * @LastModified: Nov 2017
*/
public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_de implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_es implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_fr implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_it implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_ja implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_ko implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_pt_BR implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_sv implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_zh_CN implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_zh_TW implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ConfigurableValidationState.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ConfigurableValidationState.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
* @xerces.internal
*
* @author Peter McCracken, IBM
+ * @LastModified: Oct 2017
*/
public final class ConfigurableValidationState extends ValidationState {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
* @xerces.internal
*
* @author Elena Litani, IBM
+ * @LastModified: Oct 2017
*/
public class ValidationManager {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
* @xerces.internal
*
* @author Elena Litani, IBM
+ * @LastModified: Oct 2017
*/
public class ValidationState implements ValidationContext {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
*
* @xerces.internal
*
+ * @LastModified: Sep 2017
*/
class RegexParser {
static final int T_CHAR = 0;
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
* @xerces.internal
*
* @author Elena Litani IBM
+ * @LastModified: Nov 2017
*/
public class AttributePSVImpl implements AttributePSVI {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -47,6 +46,7 @@
* @xerces.internal
*
* @author Elena Litani IBM
+ * @LastModified: Nov 2017
*/
public class ElementPSVImpl implements ElementPSVI {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/PSVIErrorList.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/PSVIErrorList.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
*
* @author Michael Glavassevich, IBM
*
+ * @LastModified: Oct 2017
*/
final class PSVIErrorList extends AbstractList<String> implements StringList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -78,6 +77,7 @@
* @author Sandy Gao, IBM
* @author Elena Litani, IBM
*
+ * @LastModified: Oct 2017
*/
public class SchemaGrammar implements XSGrammar, XSNamespaceItem {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Nov 2017
*/
public class SubstitutionGroupHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -102,6 +101,7 @@
* @xerces.internal
*
* @author Neil Graham, IBM
+ * @LastModified: Sep 2017
*/
public class XMLSchemaLoader implements XMLGrammarLoader, XMLComponent, XSElementDeclHelper,
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -112,6 +111,7 @@
* @author Elena Litani IBM
* @author Andy Clark IBM
* @author Neeraj Bajaj, Sun Microsystems, inc.
+ * @LastModified: Nov 2017
*/
public class XMLSchemaValidator
implements XMLComponent, XMLDocumentFilter, FieldActivator, RevalidationHandler, XSElementDeclHelper {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
*
* @author Elena Litani, IBM
* @author Sandy Gao, IBM
+ * @LastModified: Nov 2017
*/
public class XSComplexTypeDecl implements XSComplexTypeDefinition, TypeInfo {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -46,6 +45,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Nov 2017
*/
public class XSConstraints {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
* @xerces.internal
*
* @author Sandy Gao, IBM
+ * @LastModified: Nov 2017
*/
public class XSGrammarBucket {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
* @xerces.internal
*
* @author Elena Litani, IBM
+ * @LastModified: Sep 2017
*/
public class XSMessageFormatter implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -58,6 +57,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
@SuppressWarnings("unchecked") // method <T>toArray(T[])
public final class XSModelImpl extends AbstractList<XSNamespaceItem> implements XSModel, XSNamespaceItemList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
* @author Elena Litani, IBM
* @author Sandy Gao, IBM
*
+ * @LastModified: Nov 2017
*/
public class CMBuilder {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
* @xerces.internal
*
* @author Pavani Mukthipudi, Sun Microsystems Inc.
+ * @LastModified: Oct 2017
*/
public class XSAllCM implements XSCMValidator {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
*
* @author Sandy Gao, IBM
* @author Elena Litani, IBM
+ * @LastModified: Oct 2017
*/
public interface XSCMValidator {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -46,6 +45,7 @@
* @xerces.internal
*
* @author Neil Graham, IBM
+ * @LastModified: Oct 2017
*/
public class XSDFACM
implements XSCMValidator {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
*
* @author Elena Litani, Lisa Martin
* @author IBM
+ * @LastModified: Oct 2017
*/
public class XSEmptyCM implements XSCMValidator {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,6 +40,7 @@
* @author Rahul Srivastava, Sun Microsystems Inc.
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
public class SchemaDOM extends DefaultDocument {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -59,6 +58,7 @@
*
* @author Rahul Srivastava, Sun Microsystems Inc.
*
+ * @LastModified: Sep 2017
*/
public class SchemaParsingConfig extends BasicParserConfiguration
implements XMLPullParserConfiguration {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -53,6 +52,7 @@
*
* @xerces.internal
*
+ * @LastModified: Oct 2017
*/
final class StAXSchemaParser {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -68,6 +67,7 @@
* @xerces.internal
*
* @author Sandy Gao, IBM
+ * @LastModified: Nov 2017
*/
public class XSAttributeChecker {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -60,6 +59,7 @@
* @author Rahul Srivastava, Sun Microsystems Inc.
* @author Neeraj Bajaj, Sun Microsystems Inc.
*
+ * @LastModified: Oct 2017
*/
abstract class XSDAbstractTraverser {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -70,6 +69,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
class XSDElementTraverser extends XSDAbstractTraverser {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -131,6 +130,7 @@
* @author Neil Graham, IBM
* @author Pavani Mukthipudi, Sun Microsystems
*
+ * @LastModified: Nov 2017
*/
@SuppressWarnings("deprecation") //org.xml.sax.helpers.XMLReaderFactory
public class XSDHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -77,6 +76,7 @@
* @author Neeraj Bajaj, Sun Microsystems, Inc.
* @author Sandy Gao, IBM
*
+ * @LastModified: Nov 2017
*/
class XSDSimpleTypeTraverser extends XSDAbstractTraverser {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
* @xerces.internal
*
* @author Neil Graham, IBM
+ * @LastModified: Nov 2017
*/
class XSDUniqueOrKeyTraverser extends XSDAbstractIDConstraintTraverser {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -44,6 +43,7 @@
* @xerces.internal
*
* @author Neil Graham, IBM
+ * @LastModified: Oct 2017
*/
class XSDocumentInfo {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
*
* @author Michael Glavassevich, IBM
*
+ * @LastModified: Oct 2017
*/
@SuppressWarnings("unchecked") // method <T>toArray(T[])
public final class LSInputListImpl extends AbstractList<LSInput> implements LSInputList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
*
* @xerces.internal
*
+ * @LastModified: Oct 2017
*/
@SuppressWarnings("unchecked") // method <T>toArray(T[])
public final class ObjectListImpl extends AbstractList<Object> implements ObjectList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
public final class ShortListImpl extends AbstractList<Short> implements ShortList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
@SuppressWarnings("unchecked") // method <T>toArray(T[])
public final class StringListImpl extends AbstractList<String> implements StringList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
*
* @xerces.internal
*
+ * @LastModified: Nov 2017
*/
public class XSGrammarPool extends XMLGrammarPoolImpl {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
public class XSNamedMapImpl extends AbstractMap<QName, XSObject> implements XSNamedMap {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
@SuppressWarnings("unchecked") // method <T>toArray(T[])
public class XSObjectListImpl extends AbstractList<XSObject> implements XSObjectList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java Fri Jan 05 22:02:20 2018 +0100
@@ -82,7 +82,7 @@
* only those events that need to go through Validator will go the 1st route,
* and other events go the 2nd direct route.
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*/
final class JAXPValidatorComponent
extends TeeXMLDocumentFilterImpl implements XMLComponent {
@@ -344,7 +344,7 @@
* to reuse its default {@link com.sun.org.apache.xerces.internal.xni.XMLDocumentHandler}
* implementation.
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*/
private final class XNI2SAX extends DefaultXMLDocumentHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -62,6 +61,7 @@
* @author Rajiv Mordani
* @author Edwin Goei
*
+ * @LastModified: Oct 2017
*/
@SuppressWarnings("deprecation")
public class SAXParserImpl extends javax.xml.parsers.SAXParser
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -36,7 +36,7 @@
/**
* <p>XMLDocumentHandler which forks the pipeline to two other components.</p>
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*/
class TeeXMLDocumentFilterImpl implements XMLDocumentFilter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
* Events are forwarded to the registered XMLDTDHandler without modification.</p>
*
* @author Michael Glavassevich, IBM
+ * @LastModified: Oct 2017
*/
final class UnparsedEntityHandler implements XMLDTDFilter, EntityState {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -57,8 +57,8 @@
* </li>
* </ol>
*
- * @author <a href="mailto:Joseph.Fialli@Sun.COM">Joseph Fialli</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Joseph Fialli
+ * @author Jeff Suttor
*/
public class DatatypeFactoryImpl
extends DatatypeFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -41,9 +41,7 @@
* </p>
*
*
- * @author <a href="mailto:Vikram.Aroskar@Sun.COM">Vikram Aroskar</a>
- * @author <a href="mailto:Huizhe.wang@oracle.com">Joe Wang</a>
-
+ * @author Vikram Aroskar
* @see XMLGregorianCalendar#add(Duration)
*/
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -95,9 +95,8 @@
* The impacted methods document their dependency on {@link Calendar}.
*
*
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
- * @author <a href="mailto:Joseph.Fialli@Sun.com">Joseph Fialli</a>
-
+ * @author Kohsuke Kawaguchi
+ * @author Joseph Fialli
* @see XMLGregorianCalendar#add(Duration)
*/
class DurationImpl
@@ -1863,7 +1862,7 @@
/**
* Representation of {@link Duration} in the object stream.
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*/
private static class DurationStream implements Serializable {
private final String lexical;
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -40,9 +40,7 @@
* </p>
*
*
- * @author <a href="mailto:Vikram.Aroskar@Sun.COM">Vikram Aroskar</a>
- * @author <a href="mailto:Huizhe.wang@oracle.com">Joe Wang</a>
-
+ * @author Vikram Aroskar
* @see XMLGregorianCalendar#add(Duration)
*/
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -185,9 +185,9 @@
* </ul>
* </p>
*
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
- * @author <a href="mailto:Joseph.Fialli@Sun.com">Joseph Fialli</a>
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Kohsuke Kawaguchi
+ * @author Joseph Fialli
+ * @author Sunitha Reddy
* @see javax.xml.datatype.Duration
* @since 1.5
*/
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
* <p>Abstract implementation of Schema for W3C XML Schemas.</p>
*
* @author Michael Glavassevich, IBM
+ * @LastModified: Oct 2017
*/
abstract class AbstractXMLSchema extends Schema implements
XSGrammarPoolContainer {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -66,6 +65,7 @@
* <p>DOM result builder.</p>
*
* @author Michael Glavassevich, IBM
+ * @LastModified: Oct 2017
*/
final class DOMResultBuilder implements DOMDocumentHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -62,6 +61,7 @@
* <p>A validator helper for <code>DOMSource</code>s.</p>
*
* @author Michael Glavassevich, IBM
+ * @LastModified: Oct 2017
*/
final class DOMValidatorHelper implements ValidatorHelper, EntityState {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java Fri Jan 05 22:02:20 2018 +0100
@@ -28,7 +28,7 @@
/**
* {@link ErrorHandler} that throws all errors and fatal errors.
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*/
final class DraconianErrorHandler implements ErrorHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java Fri Jan 05 22:02:20 2018 +0100
@@ -31,7 +31,7 @@
* and pass them down to SAX {@link ErrorHandler}.
*
* @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * Kohsuke Kawaguchi
*/
public abstract class ErrorHandlerAdaptor implements XMLErrorHandler
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
* <p>Used to format JAXP Validation API error messages using a specified locale.</p>
*
* @author Michael Glavassevich, IBM
+ * @LastModified: Sep 2017
*/
final class JAXPValidationMessageFormatter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java Fri Jan 05 22:02:20 2018 +0100
@@ -29,7 +29,7 @@
* <p>Filter {@link XMLGrammarPool} that exposes a
* read-only view of the underlying pool.</p>
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*/
final class ReadOnlyGrammarPool implements XMLGrammarPool {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
* contains schema components from one target namespace.</p>
*
* @author Michael Glavassevich, IBM
+ * @LastModified: Nov 2017
*/
final class SimpleXMLSchema extends AbstractXMLSchema implements XMLGrammarPool {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
* the target namespace for the schema and schema location.</p>
*
* @author Michael Glavassevich, IBM
+ * @LastModified: Nov 2017
*/
final class SoftReferenceGrammarPool implements XMLGrammarPool {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java Fri Jan 05 22:02:20 2018 +0100
@@ -47,7 +47,7 @@
/**
* <p>A validator helper for <code>StAXSource</code>s.</p>
*
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Sunitha Reddy
*/
public final class StAXValidatorHelper implements ValidatorHelper {
private static final String DEFAULT_TRANSFORMER_IMPL = "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl";
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java Fri Jan 05 22:02:20 2018 +0100
@@ -50,7 +50,7 @@
* A validator helper for <code>StreamSource</code>s.</p>
*
* @author Michael Glavassevich, IBM
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Sunitha Reddy
*/
final class StreamValidatorHelper implements ValidatorHelper {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java Fri Jan 05 22:02:20 2018 +0100
@@ -32,7 +32,7 @@
/**
* <p>Static utility methods for the Validation API implementation.</p>
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*/
final class Util {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -92,9 +91,10 @@
* <p>Implementation of ValidatorHandler for W3C XML Schemas and
* also a validator helper for <code>SAXSource</code>s.</p>
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
* @author Michael Glavassevich, IBM
*
+ * @LastModified: Oct 2017
*/
final class ValidatorHandlerImpl extends ValidatorHandler implements
DTDHandler, EntityState, PSVIProvider, ValidatorHelper, XMLDocumentHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -46,9 +46,9 @@
/**
* <p>Implementation of Validator for W3C XML Schemas.</p>
*
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
* @author Michael Glavassevich, IBM
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Sunitha Reddy
*/
final class ValidatorImpl extends Validator implements PSVIProvider {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
* its memory.</p>
*
* @author Michael Glavassevich, IBM
+ * @LastModified: Oct 2017
*/
final class WeakReferenceXMLSchema extends AbstractXMLSchema {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,7 +36,9 @@
* kind of SAXException tunneling.
*
* @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * Kohsuke Kawaguchi
+ *
+ * @LastModified: Oct 2017
*/
public class WrappedSAXException extends RuntimeException {
private static final long serialVersionUID = -3201986204982729962L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -64,7 +64,7 @@
/**
* {@link SchemaFactory} for XML Schema.
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*/
public final class XMLSchemaFactory extends SchemaFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -85,6 +84,7 @@
* @author Andy Clark, IBM
* @author Elena Litani, IBM
*
+ * @LastModified: Nov 2017
*/
public class AbstractDOMParser extends AbstractXMLDocumentParser {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -95,6 +94,7 @@
* @author Arnaud Le Hors, IBM
* @author Andy Clark, IBM
*
+ * @LastModified: Oct 2017
*/
public abstract class BasicParserConfiguration
extends ParserConfigurationSettings
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -79,6 +78,7 @@
* @author Pavani Mukthipudi, Sun Microsystems Inc.
* @author Elena Litani, IBM
* @author Rahul Srivastava, Sun Microsystems Inc.
+ * @LastModified: Oct 2017
*/
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -78,6 +77,7 @@
* @author Neil Graham, IBM
* @author Michael Glavassevich, IBM
*
+ * @LastModified: Oct 2017
*/
public class XML11Configuration extends ParserConfigurationSettings
implements XMLPullParserConfiguration, XML11Configurable {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -104,6 +103,7 @@
* @author Michael Glavassevich, IBM
* @author John Kim, IBM
*
+ * @LastModified: Oct 2017
*/
public class XML11DTDConfiguration extends ParserConfigurationSettings
implements XMLPullParserConfiguration, XML11Configurable {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -77,6 +76,7 @@
* @author John Kim, IBM
* @author Michael Glavassevich, IBM
*
+ * @LastModified: Oct 2017
*/
public class XML11NonValidatingConfiguration extends ParserConfigurationSettings
implements XMLPullParserConfiguration, XML11Configurable {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -50,6 +49,7 @@
*
* @author Neil Graham, IBM
*
+ * @LastModified: Oct 2017
*/
public class XMLGrammarPreparser {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
* <p>
*
* @author Elena Litani, IBM
+ * @LastModified: Oct 2017
*/
public class AugmentationsImpl implements Augmentations{
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -45,6 +44,7 @@
* @author Gopal Sharma, SUN MicroSystems Inc.
* @author Elena Litani, IBM
* @author Ramesh Mandava, Sun Microsystems
+ * @LastModified: Nov 2017
*/
public class DOMEntityResolverWrapper
implements XMLEntityResolver {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
* <p>Used to format JAXP 1.3 Datatype API error messages using a specified locale.</p>
*
* @author Neeraj Bajaj, Sun Microsystems
+ * @LastModified: Sep 2017
*/
public class DatatypeMessageFormatter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java Fri Jan 05 22:02:20 2018 +0100
@@ -29,7 +29,7 @@
* {@link ErrorHandler} that throws all errors and fatal errors.
*
* @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * Kohsuke Kawaguchi
*/
public class DraconianErrorHandler implements ErrorHandler {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java Fri Jan 05 22:02:20 2018 +0100
@@ -40,7 +40,7 @@
* rather than copying it into every component that needs an error handler
* and update all of them whenever it is changed, IMO.
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*
*/
public abstract class ErrorHandlerProxy implements ErrorHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
*
* @author Michael Glavassevich, IBM
*
+ * @LastModified: Oct 2017
*/
public final class JAXPNamespaceContextWrapper implements NamespaceContext {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java Fri Jan 05 22:02:20 2018 +0100
@@ -28,7 +28,7 @@
* Wraps SAX {@link Locator} into Xerces {@link XMLLocator}.
*
* @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * Kohsuke Kawaguchi
*/
public class LocatorWrapper implements XMLLocator {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java Fri Jan 05 22:02:20 2018 +0100
@@ -39,8 +39,8 @@
* can be exposed to the application, we must intern all Strings before
* calling NamespaceSupport methods.
*
- * @author Neeraj Bajaj, Sun Microsystems, inc.
- * @author Santiago.PericasGeertsen@sun.com
+ * @author Neeraj Bajaj
+ * @author Santiago PericasGeertsen
*
*/
public class NamespaceContextWrapper implements NamespaceContext {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Andy Clark, IBM
*
+ * @LastModified: Oct 2017
*/
public class NamespaceSupport implements NamespaceContext {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAX2XNI.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAX2XNI.java Fri Jan 05 22:02:20 2018 +0100
@@ -39,7 +39,7 @@
* and produces the equivalent {@link XMLDocumentHandler} events.
*
* @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * Kohsuke Kawaguchi
*/
public class SAX2XNI implements ContentHandler, XMLDocumentSource {
public SAX2XNI( XMLDocumentHandler core ) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
*
* @author Michael Glavassevich, IBM
*
+ * @LastModified: Sep 2017
*/
public class SAXMessageFormatter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolHash.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolHash.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
* The hash code uses the same algorithm as SymbolTable class.
*
* @author Elena Litani
+ * @LastModified: Nov 2017
*/
public class SymbolHash {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -37,7 +37,7 @@
*
*
* @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * Kohsuke Kawaguchi
*/
public class TeeXMLDocumentFilterImpl implements XMLDocumentFilter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -42,7 +42,7 @@
* {@link XMLDocumentFilter}s.
*
* @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * Kohsuke Kawaguchi
*/
public class XMLDocumentFilterImpl implements XMLDocumentFilter {
private XMLDocumentHandler next;
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java Fri Jan 05 22:02:20 2018 +0100
@@ -41,7 +41,7 @@
* get rid of this awkward adaptor class.
*
* @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * Kohsuke Kawaguchi
*/
public final class XMLInputSourceAdaptor implements Source {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,6 +22,8 @@
/**
* A configuration error. This was an internal class in ObjectFactory previously
+ *
+ * @LastModified: Oct 2017
*/
public final class ConfigurationError extends Error {
private static final long serialVersionUID = 8095902236393167968L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
* when bundled as part of the JDK.
* <p>
*
+ * @LastModified: Oct 2017
*/
public final class ObjectFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
*
* @author Peter McCracken, IBM
*
+ * @LastModified: Oct 2017
*/
public class MultipleScopeNamespaceSupport extends NamespaceSupport {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -128,6 +127,7 @@
*
*
* @see XIncludeNamespaceSupport
+ * @LastModified: Nov 2017
*/
public class XIncludeHandler
implements XMLComponent, XMLDocumentFilter, XMLDTDFilter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
*
* @author Peter McCracken, IBM
*
+ * @LastModified: Sep 2017
*/
public class XIncludeMessageFormatter implements MessageFormatter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,7 @@
*
*
* @see XIncludeHandler
+ * @LastModified: Oct 2017
*/
public class XIncludeTextReader {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/Augmentations.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/Augmentations.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
* should not save any reference to the structure.
*
* @author Elena Litani, IBM
+ * @LastModified: Oct 2017
*/
public interface Augmentations {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
*
* @author Andy Clark, IBM
*
+ * @LastModified: Oct 2017
*/
public interface NamespaceContext {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
*
* @xerces.internal
*
+ * @LastModified: Sep 2017
*/
final class XPointerMessageFormatter implements MessageFormatter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/LSInputList.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/LSInputList.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,8 @@
* The <code>LSInputList</code> interface provides the abstraction of an
* ordered collection of <code>LSInput</code>s, without defining or
* constraining how this collection is implemented.
+ *
+ * @LastModified: Oct 2017
*/
public interface LSInputList extends List<LSInput> {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ShortList.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ShortList.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,6 +25,8 @@
/**
* The <code>ShortList</code> is an immutable ordered collection of
* <code>unsigned short</code>.
+ *
+ * @LastModified: Oct 2017
*/
public interface ShortList extends List<Short> {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/StringList.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/StringList.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,6 +25,8 @@
/**
* The <code>StringList</code> is an immutable ordered collection of
* <code>GenericString</code>.
+ *
+ * @LastModified: Oct 2017
*/
public interface StringList extends List<String> {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,8 @@
* accessed by name. Note that <code>XSNamedMap</code> does not inherit from
* <code>XSObjectList</code>. The <code>XSObject</code>s in
* <code>XSNamedMap</code>s are not maintained in any particular order.
+ *
+ * @LastModified: Oct 2017
*/
public interface XSNamedMap extends Map<QName, XSObject> {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,6 +26,8 @@
* The <code>XSNamesaceItemList</code> interface provides the abstraction of
* an immutable ordered collection of <code>XSNamespaceItem</code>s, without
* defining or constraining how this collection is implemented.
+ *
+ * @LastModified: Oct 2017
*/
public interface XSNamespaceItemList extends List<XSNamespaceItem> {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObjectList.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObjectList.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,6 +26,8 @@
* The <code>XSObjectList</code> interface provides the abstraction of an
* immutable ordered collection of <code>XSObject</code>s, without defining
* or constraining how this collection is implemented.
+ *
+ * @LastModified: Oct 2017
*/
public interface XSObjectList extends List<XSObject> {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
*
* @author Ankit Pasricha, IBM
*
+ * @LastModified: Oct 2017
*/
public interface ByteList extends List<Byte> {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
*
* @author Ankit Pasricha, IBM
*
+ * @LastModified: Oct 2017
*/
public interface ObjectList extends List<Object> {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -45,6 +44,7 @@
* <p>
* Status: In progress, under discussion.
*
+ * @LastModified: Oct 2017
*/
public class CustomStringPool extends DTMStringPool {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,8 @@
* The <code>DTMDefaultBase</code> class serves as a helper base for DTMs.
* It sets up structures for navigation and type, while leaving data
* management and construction to the derived classes.
+ *
+ * @LastModified: Oct 2017
*/
public abstract class DTMDefaultBase implements DTM
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -60,6 +59,8 @@
*
* <p>Origin: the implemention is a composite logic based on the DTM of XalanJ1 and
* DocImpl, DocumentImpl, ElementImpl, TextImpl, etc. of XalanJ2</p>
+ *
+ * @LastModified: Oct 2017
*/
public class DTMDocumentImpl
implements DTM, org.xml.sax.ContentHandler, org.xml.sax.ext.LexicalHandler
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -71,7 +70,9 @@
* activity (eg, when getDTM() is invoked). The downside of that solution
* would be a greater delay before the DTM's storage is actually released
* for reuse.
- * */
+ *
+ * @LastModified: Nov 2017
+ */
public class DTMManagerDefault extends DTMManager
{
//static final boolean JKESS_XNI_EXPERIMENT=true;
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -53,7 +52,9 @@
* </ul>
*
* <p>State: In progress!!</p>
- * */
+ *
+ * @LastModified: Nov 2017
+ */
public class DTMNodeList extends DTMNodeListBase {
private DTMIterator m_iter;
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -61,6 +60,7 @@
* DTMNodeProxy may be subclassed further to present specific DOM node types.
*
* @see org.w3c.dom
+ * @LastModified: Nov 2017
*/
public class DTMNodeProxy
implements Node, Document, Text, Element, Attr,
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -53,7 +52,9 @@
* ObjectPool if one was needed.</p>
*
* <p>Status: Passed basic test in main().</p>
- * */
+ *
+ * @LastModified: Oct 2017
+ */
public class DTMStringPool
{
List<String> m_intToString;
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,7 +39,9 @@
* <p>Usage example: See main().</p>
*
* <p>Status: Passes simple main() unit-test. NEEDS JAVADOC.</p>
- * */
+ *
+ * @LastModified: Oct 2017
+ */
public class IncrementalSAXSource_Xerces
implements IncrementalSAXSource
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -62,7 +61,9 @@
* Note too that we do not currently attempt to track document
* mutation. If you alter the DOM after wrapping DOM2DTM around it,
* all bets are off.
- * */
+ *
+ * @LastModified: Oct 2017
+ */
public class DOM2DTM extends DTMDefaultBaseIterators
{
static final boolean JJK_DEBUG=false;
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,8 @@
/**
* This class implements a DTM that tends to be optimized more for speed than
* for compactness, that is constructed via SAX2 ContentHandler events.
+ *
+ * @LastModified: Oct 2017
*/
public class SAX2DTM extends DTMDefaultBaseIterators
implements EntityResolver, DTDHandler, ContentHandler, ErrorHandler,
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -62,6 +61,8 @@
* <p>
* %MK% The code in this class is critical to the XSLTC_DTM performance. Be very careful
* when making changes here!
+ *
+ * @LastModified: Oct 2017
*/
public class SAX2DTM2 extends SAX2DTM
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -58,7 +57,9 @@
* %REVIEW% In fact, since the differences are so minor, I think it
* may be possible/practical to fold them back into the base
* SAX2DTM. Consider that as a future code-size optimization.
- * */
+ *
+ * @LastModified: Oct 2017
+ */
public class SAX2RTFDTM extends SAX2DTM
{
/** Set true to monitor SAX events and similar diagnostic info. */
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLMessages.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLMessages.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
/**
* A utility class for issuing XML error messages.
* @xsl.usage internal
+ * @LastModified: Sep 2017
*/
public class XMLMessages
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -119,9 +118,9 @@
*
*
* @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a>
- * @author <a href="mailto:rahul.srivastava@sun.com">Rahul Srivastava</a>
+ * @author Rahul Srivastava
* @author Elena Litani, IBM
- * @author Sunitha Reddy, Sun Microsystems
+ * @author Sunitha Reddy
* @see Serializer
* @see org.w3c.dom.ls.LSSerializer
*
@@ -129,6 +128,8 @@
* is replaced by that of Xalan. Main class
* {@link com.sun.org.apache.xml.internal.serialize.DOMSerializerImpl} is replaced
* by {@link com.sun.org.apache.xml.internal.serializer.dom3.LSSerializerImpl}.
+ *
+ * @LastModified: Nov 2017
*/
@Deprecated
public abstract class BaseMarkupSerializer
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -75,6 +74,8 @@
*
* @deprecated As of JDK 9, Xerces 2.9.0, replaced by
* {@link com.sun.org.apache.xml.internal.serializer.dom3.LSSerializerImpl}
+ *
+ * @LastModified: Oct 2017
*/
@Deprecated
public class DOMSerializerImpl implements LSSerializer, DOMConfiguration {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Encodings.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Encodings.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,8 @@
* is replaced by that of Xalan. Main class
* {@link com.sun.org.apache.xml.internal.serialize.DOMSerializerImpl} is replaced
* by {@link com.sun.org.apache.xml.internal.serializer.dom3.LSSerializerImpl}.
+ *
+ * @LastModified: Oct 2017
*/
@Deprecated
class Encodings
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,8 @@
* is replaced by that of Xalan. Main class
* {@link com.sun.org.apache.xml.internal.serialize.DOMSerializerImpl} is replaced
* by {@link com.sun.org.apache.xml.internal.serializer.dom3.LSSerializerImpl}.
+ *
+ * @LastModified: Oct 2017
*/
@Deprecated
public abstract class SerializerFactory
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java Fri Jan 05 22:02:20 2018 +0100
@@ -74,7 +74,7 @@
* spaces at beginning of line will be stripped.
*
* @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a>
- * @author <a href="mailto:rahul.srivastava@sun.com">Rahul Srivastava</a>
+ * @author Rahul Srivastava
* @author Elena Litani IBM
* @see Serializer
*
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -84,7 +83,7 @@
* spaces at beginning of line will be stripped.
*
* @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a>
- * @author <a href="mailto:rahul.srivastava@sun.com">Rahul Srivastava</a>
+ * @author Rahul Srivastava
* @author Elena Litani IBM
* @see Serializer
*
@@ -92,6 +91,8 @@
* is replaced by that of Xalan. Main class
* {@link com.sun.org.apache.xml.internal.serialize.DOMSerializerImpl} is replaced
* by {@link com.sun.org.apache.xml.internal.serializer.dom3.LSSerializerImpl}.
+ *
+ * @LastModified: Oct 2017
*/
@Deprecated
public class XMLSerializer
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/CharInfo.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/CharInfo.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -48,6 +47,7 @@
* DEVELOPERS: See Known Issue in the constructor.
*
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
final class CharInfo
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
* across package boundaries.
*
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
public class EmptySerializer implements SerializationHandler
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -49,6 +48,7 @@
* for each encoding.
*
* @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a>
+ * @LastModified: Oct 2017
*/
public final class Encodings extends Object
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -61,6 +60,7 @@
* This class is public only because it is used by Xalan. It is not a public API
*
* @xsl.usage internal
+ * @LastModified: Nov 2017
*/
public class NamespaceMappings
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -80,6 +79,7 @@
* @see SerializerFactory
* @see Method
* @see Serializer
+ * @LastModified: Oct 2017
*/
public final class OutputPropertiesFactory
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -56,6 +55,7 @@
* @see OutputPropertiesFactory
* @see Method
* @see Serializer
+ * @LastModified: Oct 2017
*/
public final class SerializerFactory
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
* This class is not a public API.
*
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
public abstract class ToSAXHandler extends SerializerBase {
public ToSAXHandler() { }
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -53,6 +52,7 @@
* serializers (xml, html, text ...) that write output to a stream.
*
* @xsl.usage internal
+ * @LastModified: Nov 2017
*/
abstract public class ToStream extends SerializerBase {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -49,6 +48,7 @@
*
* This class is not a public API, it is public because it is used within Xalan.
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
public final class ToUnknownStream extends SerializerBase
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -51,6 +50,7 @@
* This interface is only used internally within Xalan.
*
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
interface XSLOutputAttributes {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,7 @@
* parameters and filters if any during serialization.
*
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
final class DOM3TreeWalker {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -31,6 +30,7 @@
* This class implemets the DOM Level 3 Core interface DOMStringList.
*
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
final class DOMStringListImpl implements DOMStringList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -36,6 +35,7 @@
* @author Andy Clark, IBM
*
* @version $Id: Exp $
+ * @LastModified: Oct 2017
*/
public class NamespaceSupport {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Messages.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Messages.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -90,6 +89,7 @@
* used in com.sun.org.apache.xml.internal.serializer.
*
* @xsl.usage internal
+ * @LastModified: Sep 2017
*/
public final class Messages
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -62,6 +61,7 @@
* the class is no longer "public".
*
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
final class URI
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMBuilder.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMBuilder.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
* that SAX doesn't handle yet) and adds the result to a document
* or document fragment.
* @xsl.usage general
+ * @LastModified: Oct 2017
*/
public class DOMBuilder
implements ContentHandler, LexicalHandler
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectPool.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectPool.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
/**
* Pool of object of a given type to pick from to help memory usage
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
public class ObjectPool implements java.io.Serializable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/QName.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/QName.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
* is used as the name of the object. The default namespace is not used for
* unprefixed names."
* @xsl.usage general
+ * @LastModified: Oct 2017
*/
public class QName implements java.io.Serializable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
/**
* International friendly string comparison with case-order
* @author Igor Hersht, igorh@ca.ibm.com
+ * @LastModified: Oct 2017
*/
public class StringComparable implements Comparable<StringComparable> {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,8 @@
* Search for the xml-stylesheet processing instructions in an XML document.
* @see <a href="http://www.w3.org/TR/xml-stylesheet/">
* Associating Style Sheets with XML documents, Version 1.0</a>
+ *
+ * @LastModified: Oct 2017
*/
public class StylesheetPIHandler extends DefaultHandler
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -58,6 +57,7 @@
* grammar and basic set of operations that can be applied to a URI.
*
*
+ * @LastModified: Oct 2017
*/
public class URI implements Serializable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,8 @@
/**
* Creates XMLReader objects and caches them for re-use.
* This class follows the singleton pattern.
+ *
+ * @LastModified: Sep 2017
*/
@SuppressWarnings("deprecation") //org.xml.sax.helpers.XMLReaderFactory
public class XMLReaderManager {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Expression.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Expression.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,8 @@
* construction has completed. An exception to the immutibility rule is iterators
* and walkers, which must be cloned in order to be used -- the original must
* still be immutable.
+ *
+ * @LastModified: Oct 2017
*/
public abstract class Expression implements java.io.Serializable, ExpressionNode, XPathVisitable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExtensionsProvider.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExtensionsProvider.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
* Interface that XPath objects can call to obtain access to an
* ExtensionsTable.
*
+ * @LastModified: Oct 2017
*/
public interface ExtensionsProvider
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSet.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSet.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -56,6 +55,7 @@
* to the same calls; the disadvantage is that some of them may return
* less-than-enlightening results when you do so.</p>
* @xsl.usage advanced
+ * @LastModified: Nov 2017
*/
public class NodeSet
implements NodeList, NodeIterator, Cloneable, ContextNodeList
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,8 @@
* This class bottlenecks all management of source trees. The methods
* in this class should allow easy garbage collection of source
* trees (not yet!), and should centralize parsing for those source trees.
+ *
+ * @LastModified: Oct 2017
*/
@SuppressWarnings("deprecation")
public class SourceTreeManager
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/VariableStack.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/VariableStack.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
* <p>This has been changed from the previous incarnations of this
* class to be fairly low level.</p>
* @xsl.usage internal
+ * @LastModified: Nov 2017
*/
public class VariableStack implements Cloneable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPath.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPath.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,6 +40,7 @@
* The XPath class wraps an expression object and provides general services
* for execution of that expression.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class XPath implements Serializable, ExpressionOwner
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathContext.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathContext.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -57,6 +56,7 @@
*
* <p>This class extends DTMManager but does not directly implement it.</p>
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class XPathContext extends DTMManager // implements ExpressionContext
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathException.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathException.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
* all the traces of the nested exceptions, not just the trace
* of this object.
* @xsl.usage general
+ * @LastModified: Oct 2017
*/
public class XPathException extends TransformerException
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AxesWalker.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AxesWalker.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,8 @@
/**
* Serves as common interface for axes Walkers, and stores common
* state variables.
+ *
+ * @LastModified: Oct 2017
*/
public class AxesWalker extends PredicatedNodeTest
implements Cloneable, PathComponent, ExpressionOwner
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,9 @@
import com.sun.org.apache.xpath.internal.objects.XNodeSet;
import java.util.List;
+/**
+ * @LastModified: Oct 2017
+ */
public class FilterExprIterator extends BasicTestIterator
{
static final long serialVersionUID = 2552176105165737614L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,8 @@
/**
* Class to use for one-step iteration that doesn't have a predicate, and
* doesn't need to set the context.
+ *
+ * @LastModified: Oct 2017
*/
public class FilterExprIteratorSimple extends LocPathIterator
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
* Walker for the OP_VARIABLE, or OP_EXTFUNCTION, or OP_FUNCTION, or OP_GROUP,
* op codes.
* @see <a href="http://www.w3.org/TR/xpath#NT-FilterExpr">XPath FilterExpr descriptions</a>
+ * @LastModified: Oct 2017
*/
public class FilterExprWalker extends AxesWalker
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/IteratorPool.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/IteratorPool.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
/**
* Pool of object of a given type to pick from to help memory usage
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
public final class IteratorPool implements java.io.Serializable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -46,6 +45,7 @@
* the case where the LocPathIterator is "owned" by a UnionPathIterator,
* in which case the UnionPathIterator will cache the nodes.</p>
* @xsl.usage advanced
+ * @LastModified: Nov 2017
*/
public abstract class LocPathIterator extends PredicatedNodeTest
implements Cloneable, DTMIterator, java.io.Serializable, PathComponent
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,8 @@
* traversal against the LocationPath interpreted as a match pattern. This
* class is useful to find nodes in document order that are complex paths
* whose steps probably criss-cross each other.
+ *
+ * @LastModified: Oct 2017
*/
public class MatchPatternIterator extends LocPathIterator
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,8 @@
/**
* This class is the dynamic wrapper for a Xalan DTMIterator instance, and
* provides random access capabilities.
+ *
+ * @LastModified: Oct 2017
*/
public class NodeSequence extends XObject
implements DTMIterator, Cloneable, PathComponent
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,9 @@
import com.sun.org.apache.xpath.internal.patterns.NodeTest;
import java.util.List;
+/**
+ * @LastModified: Oct 2017
+ */
public abstract class PredicatedNodeTest extends NodeTest implements SubContextList
{
static final long serialVersionUID = -6193530757296377351L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,8 @@
* This class defines a simplified type of union iterator that only
* tests along the child axes. If the conditions are right, it is
* much faster than using a UnionPathIterator.
+ *
+ * @LastModified: Oct 2017
*/
public class UnionChildIterator extends ChildTestIterator
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
* As each node is iterated via nextNode(), the node is also stored
* in the NodeVector, so that previousNode() can easily be done.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class UnionPathIterator extends LocPathIterator
implements Cloneable, DTMIterator, java.io.Serializable, PathComponent
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,6 +40,8 @@
* This class is both a factory for XPath location path expressions,
* which are built from the opcode map output, and an analysis engine
* for the location path expressions in order to provide optimization hints.
+ *
+ * @LastModified: Oct 2017
*/
public class WalkerFactory
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,8 @@
/**
* Location path iterator that uses Walkers.
+ *
+ * @LastModified: Oct 2017
*/
public class WalkingIterator extends LocPathIterator implements ExpressionOwner
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
/**
* This class iterates over set of nodes that needs to be sorted.
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
public class WalkingIteratorSorted extends WalkingIterator
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/**
* Licensed to the Apache Software Foundation (ASF) under one
@@ -31,6 +30,8 @@
/**
* The function table for XPath.
+ *
+ * @LastModified: Oct 2017
*/
public class FunctionTable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,8 @@
/**
* This class is in charge of lexical processing of the XPath
* expression into tokens.
+ *
+ * @LastModified: Nov 2017
*/
class Lexer
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMap.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMap.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,8 @@
/**
* This class represents the data structure basics of the XPath
* object.
+ *
+ * @LastModified: Nov 2017
*/
public class OpMap
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
/**
* Execute the current() function.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FuncCurrent extends Function
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,6 +40,7 @@
* the expression executes, it calls ExtensionsTable#extFunction, and then
* converts the result to the appropriate XObject.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FuncExtFunction extends Function
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFalse.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFalse.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
/**
* Execute the False() function.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FuncFalse extends Function
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncHere.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncHere.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/**
* Licensed to the Apache Software Foundation (ASF) under one
@@ -36,6 +35,8 @@
/**
* Execute the XML Signature here() function.
+ *
+ * @LastModified: Oct 2017
*/
public final class FuncHere extends Function {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLast.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLast.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
/**
* Execute the Last() function.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FuncLast extends Function
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncPosition.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncPosition.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
/**
* Execute the Position() function.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FuncPosition extends Function
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
/**
* Execute the SystemProperty() function.
* @xsl.usage advanced
+ * @LastModified: Sep 2017
*/
public class FuncSystemProperty extends FunctionOneArg
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTrue.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTrue.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
/**
* Execute the True() function.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FuncTrue extends Function
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function2Args.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function2Args.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* Base class for functions that accept two arguments.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class Function2Args extends FunctionOneArg
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function3Args.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function3Args.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* Base class for functions that accept three arguments.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class Function3Args extends Function2Args
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
* Base class for functions that accept an undetermined number of multiple
* arguments.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FunctionMultiArgs extends Function3Args
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* Base class for functions that accept one argument.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FunctionOneArg extends Function implements ExpressionOwner
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,7 +36,8 @@
/**
*
- * @author Ramesh Mandava ( ramesh.mandava@sun.com )
+ * @author Ramesh Mandava
+ * @LastModified: Nov 2017
*/
public class JAXPExtensionsProvider implements ExtensionsProvider {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java Fri Jan 05 22:02:20 2018 +0100
@@ -37,7 +37,7 @@
* Overrides {@link VariableStack} and delegates the call to
* {@link javax.xml.xpath.XPathVariableResolver}.
*
- * @author Ramesh Mandava ( ramesh.mandava@sun.com )
+ * @author Ramesh Mandava
*/
public class JAXPVariableStack extends VariableStack {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSet.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSet.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
* This class represents an XPath nodeset object, and is capable of
* converting the nodeset to other types, such as a string.
* @xsl.usage general
+ * @LastModified: Oct 2017
*/
public class XNodeSet extends NodeSequence
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObject.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObject.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -45,6 +44,7 @@
* This class acts as the base class to other XPath type objects,
* such as XString, and provides polymorphic casting capabilities.
* @xsl.usage general
+ * @LastModified: Oct 2017
*/
public class XObject extends Expression implements Serializable, Cloneable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,8 @@
/**
* This class makes an select statement act like an result tree fragment.
+ *
+ * @LastModified: Oct 2017
*/
public class XRTreeFragSelectWrapper extends XRTreeFrag implements Cloneable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Operation.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Operation.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,8 @@
/**
* The baseclass for a binary operation.
+ *
+ * @LastModified: Oct 2017
*/
public class Operation extends Expression implements ExpressionOwner
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,8 @@
/**
* The unary operation base class.
+ *
+ * @LastModified: Oct 2017
*/
public abstract class UnaryOperation extends Expression implements ExpressionOwner
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Variable.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Variable.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,8 @@
/**
* The variable reference expression executer.
+ *
+ * @LastModified: Oct 2017
*/
public class Variable extends Expression implements PathComponent
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,8 @@
import com.sun.org.apache.xpath.internal.objects.XObject;
/**
* Special context node pattern matcher.
+ *
+ * @LastModified: Oct 2017
*/
public class ContextMatchStepPattern extends StepPattern
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
/**
* Match pattern step that contains a function.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FunctionPattern extends StepPattern
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTest.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTest.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
* This is the basic node test class for both match patterns and location path
* steps.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class NodeTest extends Expression
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/StepPattern.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/StepPattern.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
/**
* This class represents a single pattern match step.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class StepPattern extends NodeTest implements SubContextList, ExpressionOwner
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
* This class represents a union pattern, which can have multiple individual
* StepPattern patterns.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class UnionPattern extends Expression
{
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLBufferListener.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLBufferListener.java Fri Jan 05 22:02:20 2018 +0100
@@ -29,8 +29,8 @@
* XMLBufferListerner should be implemented by classes which wish to receive
* call backs from XMLEntityReader.
*
- * @author k.venugopal@sun.com,
- * @author Neeraj.bajaj@sun.com
+ * @author k venugopal,
+ * @author Neeraj bajaj
*/
public interface XMLBufferListener {
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -48,7 +48,7 @@
* This class provides the implementation of XMLOutputFactory.
*
* @author Neeraj Bajaj,
- * @author k.venugopal@sun.com
+ * @author k venugopal
*/
public class XMLOutputFactoryImpl extends XMLOutputFactory {
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/events/LocationImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/LocationImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -30,7 +30,7 @@
/**
*Implementation of Location interface to be used by
*event readers.
- *@author Neeraj.bajaj@sun.com,k.venugopal@sun.com
+ *@author Neeraj bajaj,k venugopal
*/
public class LocationImpl implements Location{
String systemId;
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamespaceImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamespaceImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -32,7 +32,7 @@
import javax.xml.XMLConstants;
/**
*
- * @author Neeraj Bajaj,K.Venugopal@sun.com Sun Microsystems.
+ * @author Neeraj Bajaj,K Venugopal
*/
public class NamespaceImpl extends AttributeImpl implements Namespace{
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -32,7 +32,7 @@
/**
* Implementation of NotationDeclaration event.
*
- * @author k.venugopal@sun.com
+ * @author k venugopal
*/
public class NotationDeclarationImpl extends DummyEvent implements NotationDeclaration {
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -38,7 +38,7 @@
/**
* Implementation of XMLEvent Allocator.
*
- * @author Neeraj.bajaj@sun.com, k.venugopal@sun.com
+ * @author Neeraj bajaj, k venugopal
*/
public class XMLEventAllocatorImpl implements XMLEventAllocator {
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -42,7 +42,7 @@
/**
*
- * @author Neeraj Bajaj, k.venugopal@sun.com
+ * @author Neeraj Bajaj, k venugopal
*/
public class XMLEventFactoryImpl extends XMLEventFactory {
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/util/BufferAllocator.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/util/BufferAllocator.java Fri Jan 05 22:02:20 2018 +0100
@@ -31,8 +31,8 @@
* Buffer allocator for buffers of sizes 128 B, 2 KB and 8 KB. Includes
* methods for allocating and freeing buffers.
*
- * @author Binu.John@sun.com
- * @author Santiago.PericasGeertsen@sun.com
+ * @author Binu John
+ * @author Santiago PericasGeertsen
*/
public class BufferAllocator {
private static final int SMALL_SIZE_LIMIT = 128;
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java Fri Jan 05 22:02:20 2018 +0100
@@ -35,8 +35,8 @@
* The local storage is activated on the return of the buffer.
* The buffer returns null if it is already allocated.
*
- * @author Binu.John@sun.com
- * @author Santiago.PericasGeertsen@sun.com
+ * @author Binu John
+ * @author Santiago PericasGeertsen
*/
public class ThreadLocalBufferAllocator {
private static ThreadLocal<SoftReference<BufferAllocator>> tlba = new ThreadLocal<>();
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java Fri Jan 05 22:02:20 2018 +0100
@@ -42,7 +42,7 @@
* of <code>java.io.BufferedWriter</code> has been shown to be very
* expensive in JAX-WS.</p>
*
- * @author Santiago.PericasGeertsen@sun.com
+ * @author Santiago PericasGeertsen
*/
public final class UTF8OutputStreamWriter extends Writer {
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -47,7 +47,7 @@
/**
* This class provides support to build a DOM tree using XMLStreamWriter API's.
- * @author K.Venugopal@sun.com
+ * @author K Venugopal
*/
/*
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -64,8 +64,8 @@
*
* @author Neeraj Bajaj
* @author K.Venugopal
- * @author Santiago.Pericas-Geertsen@sun.com
- * @author Sunitha.Reddy@sun.com
+ * @author Santiago Pericas-Geertsen
+ * @author Sunitha Reddy
*/
public final class XMLStreamWriterImpl extends AbstractMap<Object, Object>
implements XMLStreamWriterBase {
@@ -2041,7 +2041,6 @@
* we dont need to set the value for every end element we encouter.
* For Well formedness checks we can have the same QName object that was pushed.
* the values will be set only if application need to know about the endElement
- * -- neeraj.bajaj@sun.com
*/
public ElementState peek() {
return fElements[fDepth - 1];
--- a/src/java.xml/share/classes/javax/xml/XMLConstants.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/XMLConstants.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,13 +28,12 @@
/**
* <p>Utility class to contain basic XML values as constants.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @see <a href="http://www.w3.org/TR/xml11/">Extensible Markup Language (XML) 1.1</a>
* @see <a href="http://www.w3.org/TR/REC-xml">Extensible Markup Language (XML) 1.0 (Second Edition)</a>
* @see <a href="http://www.w3.org/XML/xml-V10-2e-errata">XML 1.0 Second Edition Specification Errata</a>
* @see <a href="http://www.w3.org/TR/xml-names11/">Namespaces in XML 1.1</a>
* @see <a href="http://www.w3.org/TR/REC-xml-names">Namespaces in XML</a>
- * @see <a href="http://www.w3.org/XML/xml-names-19990114-errata">Namespaces in XML Errata</a>
* @see <a href="http://www.w3.org/TR/xmlschema-1/">XML Schema Part 1: Structures</a>
* @since 1.5
**/
@@ -103,9 +102,6 @@
* @see <a
* href="http://www.w3.org/TR/REC-xml-names/#ns-qualnames">
* Namespaces in XML, 3. Qualified Names</a>
- * @see <a
- * href="http://www.w3.org/XML/xml-names-19990114-errata">
- * Namespaces in XML Errata</a>
*/
public static final String XMLNS_ATTRIBUTE_NS_URI =
"http://www.w3.org/2000/xmlns/";
--- a/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java Fri Jan 05 22:02:20 2018 +0100
@@ -28,7 +28,7 @@
/**
* <p>Indicates a serious configuration error.</p>
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/datatype/DatatypeConstants.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/datatype/DatatypeConstants.java Fri Jan 05 22:02:20 2018 +0100
@@ -31,7 +31,7 @@
/**
* <p>Utility class to contain basic Datatype values as constants.</p>
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -80,9 +80,9 @@
* </li>
* </ol>
*
- * @author <a href="mailto:Joseph.Fialli@Sun.COM">Joseph Fialli</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
+ * @author Joseph Fialli
+ * @author Jeff Suttor
+ * @author Neeraj Bajaj
*
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/datatype/Duration.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/datatype/Duration.java Fri Jan 05 22:02:20 2018 +0100
@@ -89,10 +89,10 @@
* some of the methods may not work correctly on such {@code Duration}s.
* The impacted methods document their dependency on {@link Calendar}.
*
- * @author <a href="mailto:Joseph.Fialli@Sun.COM">Joseph Fialli</a>
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Joseph Fialli
+ * @author Kohsuke Kawaguchi
+ * @author Jeff Suttor
+ * @author Sunitha Reddy
* @see XMLGregorianCalendar#add(Duration)
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java Fri Jan 05 22:02:20 2018 +0100
@@ -41,7 +41,7 @@
* <p>This class is duplicated for each JAXP subpackage so keep it in
* sync. It is package private for secure class loading.</p>
*
- * @author Santiago.PericasGeertsen@sun.com
+ * @author Santiago PericasGeertsen
*/
class FactoryFinder {
private static final String DEFAULT_PACKAGE = "com.sun.org.apache.xerces.internal";
--- a/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java Fri Jan 05 22:02:20 2018 +0100
@@ -165,10 +165,10 @@
* </li>
* </ul>
*
- * @author <a href="mailto:Joseph.Fialli@Sun.com">Joseph Fialli</a>
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Joseph Fialli
+ * @author Kohsuke Kawaguchi
+ * @author Jeff Suttor
+ * @author Sunitha Reddy
* @see Duration
* @see DatatypeFactory
* @since 1.5
--- a/src/java.xml/share/classes/javax/xml/datatype/package-info.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/datatype/package-info.java Fri Jan 05 22:02:20 2018 +0100
@@ -149,7 +149,7 @@
* <li>xs:unsignedShort</li>
* </ul>
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @see <a href="http://www.w3.org/TR/xmlschema-2/#dateTime">
* W3C XML Schema 1.0 Part 2, Section 3.2.7-14</a>
* @see <a href="http://www.w3.org/TR/xpath-datamodel#dt-dayTimeDuration">
--- a/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -67,15 +67,13 @@
* <p>A prefix can only be bound to a <strong>single</strong>
* Namespace URI in the current scope.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @see javax.xml.XMLConstants
* javax.xml.XMLConstants for declarations of common XML values
* @see <a href="http://www.w3.org/TR/xmlschema-2/#QName">
* XML Schema Part2: Datatypes</a>
- * @see <a href="http://www.w3.org/TR/REC-xml-names/#ns-qualnames">
+ * @see <a href="http://www.w3.org/TR/REC-xml-names/">
* Namespaces in XML</a>
- * @see <a href="http://www.w3.org/XML/xml-names-19990114-errata">
- * Namespaces in XML Errata</a>
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/namespace/QName.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/namespace/QName.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,9 +35,7 @@
* href="http://www.w3.org/TR/xmlschema-2/#QName">XML Schema Part2:
* Datatypes specification</a>, <a
* href="http://www.w3.org/TR/REC-xml-names/#ns-qualnames">Namespaces
- * in XML</a>, <a
- * href="http://www.w3.org/XML/xml-names-19990114-errata">Namespaces
- * in XML Errata</a>.</p>
+ * in XML</a>.
*
* <p>The value of a <code>QName</code> contains a <strong>Namespace
* URI</strong>, <strong>local part</strong> and
@@ -59,13 +57,11 @@
*
* <p><code>QName</code> is immutable.</p>
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @see <a href="http://www.w3.org/TR/xmlschema-2/#QName">
* XML Schema Part2: Datatypes specification</a>
* @see <a href="http://www.w3.org/TR/REC-xml-names/#ns-qualnames">
* Namespaces in XML</a>
- * @see <a href="http://www.w3.org/XML/xml-names-19990114-errata">
- * Namespaces in XML Errata</a>
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilder.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilder.java Fri Jan 05 22:02:20 2018 +0100
@@ -56,7 +56,7 @@
* <code>Document</code>. It merely requires that the implementation
* communicate with the application using these existing APIs.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
--- a/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -32,8 +32,8 @@
* Defines a factory API that enables applications to obtain a
* parser that produces DOM object trees from XML documents.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
+ * @author Jeff Suttor
+ * @author Neeraj Bajaj
*
* @since 1.4
*/
--- a/src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java Fri Jan 05 22:02:20 2018 +0100
@@ -31,7 +31,7 @@
* parser factory specified in the system properties cannot be found
* or instantiated.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
--- a/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java Fri Jan 05 22:02:20 2018 +0100
@@ -41,8 +41,7 @@
* <p>This class is duplicated for each JAXP subpackage so keep it in
* sync. It is package private for secure class loading.</p>
*
- * @author Santiago.PericasGeertsen@sun.com
- * @author Huizhe.Wang@oracle.com
+ * @author Santiago PericasGeertsen
*/
class FactoryFinder {
private static final String DEFAULT_PACKAGE = "com.sun.org.apache.xerces.internal";
--- a/src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java Fri Jan 05 22:02:20 2018 +0100
@@ -28,7 +28,7 @@
/**
* Indicates a serious configuration error.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
--- a/src/java.xml/share/classes/javax/xml/parsers/SAXParser.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/parsers/SAXParser.java Fri Jan 05 22:02:20 2018 +0100
@@ -74,7 +74,7 @@
* class to initially adapt their SAX1 implementation to work under
* this revised class.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
@SuppressWarnings("deprecation")
--- a/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -35,8 +35,8 @@
* Defines a factory API that enables applications to configure and
* obtain a SAX based parser to parse XML documents.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
+ * @author Jeff Suttor
+ * @author Neeraj Bajaj
*
* @since 1.4
*/
--- a/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java Fri Jan 05 22:02:20 2018 +0100
@@ -41,7 +41,7 @@
* <p>This class is duplicated for each JAXP subpackage so keep it in
* sync. It is package private for secure class loading.</p>
*
- * @author Santiago.PericasGeertsen@sun.com
+ * @author Santiago PericasGeertsen
*/
class FactoryFinder {
// Check we have access to package.
--- a/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java Fri Jan 05 22:02:20 2018 +0100
@@ -43,8 +43,7 @@
* <p>This class is duplicated for each JAXP subpackage so keep it in
* sync. It is package private for secure class loading.</p>
*
- * @author Santiago.PericasGeertsen@sun.com
- * @author Huizhe.Wang@oracle.com
+ * @author Santiago PericasGeertsen
*/
class FactoryFinder {
private static final String DEFAULT_PACKAGE = "com.sun.org.apache.xalan.internal.";
--- a/src/java.xml/share/classes/javax/xml/transform/Result.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/transform/Result.java Fri Jan 05 22:02:20 2018 +0100
@@ -29,7 +29,7 @@
* <p>An object that implements this interface contains the information
* needed to build a transformation result tree.
*
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
public interface Result {
--- a/src/java.xml/share/classes/javax/xml/transform/Transformer.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/transform/Transformer.java Fri Jan 05 22:02:20 2018 +0100
@@ -44,7 +44,7 @@
* <p>A <code>Transformer</code> may be used multiple times. Parameters and
* output properties are preserved across transformations.</p>
*
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
public abstract class Transformer {
--- a/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -38,8 +38,8 @@
* {@code TransformerFactory} abstract class. If the property is not
* defined, a platform default is be used.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
+ * @author Jeff Suttor
+ * @author Neeraj Bajaj
*
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/transform/dom/DOMResult.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/transform/dom/DOMResult.java Fri Jan 05 22:02:20 2018 +0100
@@ -36,7 +36,7 @@
* a Document node as the holder for the result of the transformation,
* which may be retrieved with {@link #getNode()}.
*
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
public class DOMResult implements Result {
--- a/src/java.xml/share/classes/javax/xml/transform/dom/DOMSource.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/transform/dom/DOMSource.java Fri Jan 05 22:02:20 2018 +0100
@@ -38,7 +38,7 @@
* Parsers can be made namespace aware by calling
* {@link javax.xml.parsers.DocumentBuilderFactory#setNamespaceAware(boolean awareness)}.</p>
*
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @see <a href="http://www.w3.org/TR/DOM-Level-2">Document Object Model (DOM) Level 2 Specification</a>
* @since 1.4
*/
--- a/src/java.xml/share/classes/javax/xml/transform/overview.html Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/transform/overview.html Fri Jan 05 22:02:20 2018 +0100
@@ -36,7 +36,7 @@
<meta name="CVS"
content="$Id: overview.html,v 1.2 2005/06/10 03:50:39 jeffsuttor Exp $" />
<meta name="AUTHOR"
- content="Jeff.Suttor@Sun.com" />
+ content="Jeff Suttor" />
</head>
<body>
--- a/src/java.xml/share/classes/javax/xml/transform/sax/SAXResult.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/transform/sax/SAXResult.java Fri Jan 05 22:02:20 2018 +0100
@@ -33,7 +33,7 @@
/**
* <p>Acts as an holder for a transformation Result.</p>
*
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
public class SAXResult implements Result {
--- a/src/java.xml/share/classes/javax/xml/transform/sax/SAXSource.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/transform/sax/SAXSource.java Fri Jan 05 22:02:20 2018 +0100
@@ -40,7 +40,7 @@
* Parsers can be made namespace aware by calling the
* {@link javax.xml.parsers.SAXParserFactory#setNamespaceAware(boolean awareness)} method.</p>
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
public class SAXSource implements Source {
--- a/src/java.xml/share/classes/javax/xml/transform/stax/StAXResult.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/transform/stax/StAXResult.java Fri Jan 05 22:02:20 2018 +0100
@@ -38,8 +38,8 @@
* {@link javax.xml.validation.Validator} which accept
* <code>Result</code> as input.
*
- * @author <a href="mailto:Neeraj.Bajaj@Sun.com">Neeraj Bajaj</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Neeraj Bajaj
+ * @author Jeff Suttor
*
* @see <a href="http://jcp.org/en/jsr/detail?id=173">
* JSR 173: Streaming API for XML</a>
--- a/src/java.xml/share/classes/javax/xml/transform/stax/StAXSource.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/transform/stax/StAXSource.java Fri Jan 05 22:02:20 2018 +0100
@@ -44,8 +44,8 @@
* <p><code>StAXSource</code>s are consumed during processing
* and are not reusable.</p>
*
- * @author <a href="mailto:Neeraj.Bajaj@Sun.com">Neeraj Bajaj</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Neeraj Bajaj
+ * @author Jeff Suttor
*
* @see <a href="http://jcp.org/en/jsr/detail?id=173">
* JSR 173: Streaming API for XML</a>
--- a/src/java.xml/share/classes/javax/xml/transform/stream/StreamResult.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/transform/stream/StreamResult.java Fri Jan 05 22:02:20 2018 +0100
@@ -36,7 +36,7 @@
* <p>Acts as an holder for a transformation result,
* which may be XML, plain Text, HTML, or some other form of markup.</p>
*
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
public class StreamResult implements Result {
--- a/src/java.xml/share/classes/javax/xml/transform/stream/StreamSource.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/transform/stream/StreamSource.java Fri Jan 05 22:02:20 2018 +0100
@@ -40,7 +40,7 @@
* <p><em>Note:</em> Due to their internal use of either a {@link Reader} or {@link InputStream} instance,
* <code>StreamSource</code> instances may only be used once.</p>
*
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
public class StreamSource implements Source {
--- a/src/java.xml/share/classes/javax/xml/validation/Schema.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/validation/Schema.java Fri Jan 05 22:02:20 2018 +0100
@@ -58,7 +58,7 @@
* In other words, if you parse the same schema twice, you may
* still get <code>!schemaA.equals(schemaB)</code>.
*
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
* @see <a href="http://www.w3.org/TR/xmlschema-1/">XML Schema Part 1: Structures</a>
* @see <a href="http://www.w3.org/TR/xml11/">Extensible Markup Language (XML) 1.1</a>
* @see <a href="http://www.w3.org/TR/REC-xml">Extensible Markup Language (XML) 1.0 (Second Edition)</a>
--- a/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -105,8 +105,8 @@
* </tbody>
* </table>
*
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
- * @author <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
+ * @author Kohsuke Kawaguchi
+ * @author Neeraj Bajaj
*
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java Fri Jan 05 22:02:20 2018 +0100
@@ -41,7 +41,7 @@
/**
* Implementation of {@link SchemaFactory#newInstance(String)}.
*
- * @author <a href="Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
* @since 1.5
*/
class SchemaFactoryFinder {
--- a/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java Fri Jan 05 22:02:20 2018 +0100
@@ -40,7 +40,7 @@
* It must not be used by users or JAXP implementations.
* </p>
*
- * @author <a href="Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
* @since 1.5
*/
public abstract class SchemaFactoryLoader {
--- a/src/java.xml/share/classes/javax/xml/validation/TypeInfoProvider.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/validation/TypeInfoProvider.java Fri Jan 05 22:02:20 2018 +0100
@@ -41,7 +41,7 @@
* Implementation of this "interface" can be obtained through the
* {@link ValidatorHandler#getTypeInfoProvider()} method.
*
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
* @see org.w3c.dom.TypeInfo
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/validation/Validator.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/validation/Validator.java Fri Jan 05 22:02:20 2018 +0100
@@ -48,7 +48,7 @@
* the {@code validate} method.
*
*
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
* @since 1.5
*/
public abstract class Validator {
--- a/src/java.xml/share/classes/javax/xml/validation/ValidatorHandler.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/validation/ValidatorHandler.java Fri Jan 05 22:02:20 2018 +0100
@@ -107,7 +107,7 @@
*
* <p>This feature is set to <code>false</code> by default.</p>
*
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
* @since 1.5
*/
public abstract class ValidatorHandler implements ContentHandler {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPath.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPath.java Fri Jan 05 22:02:20 2018 +0100
@@ -98,8 +98,8 @@
* method is invoked, applications may not recursively call
* the {@code evaluate} method.
*
- * @author <a href="Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @see <a href="http://www.w3.org/TR/xpath">XML Path Language (XPath) Version 1.0</a>
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathConstants.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathConstants.java Fri Jan 05 22:02:20 2018 +0100
@@ -30,8 +30,8 @@
/**
* <p>XPath constants.</p>
*
- * @author <a href="mailto:Norman.Walsh@Sun.COM">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.COM">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @see <a href="http://www.w3.org/TR/xpath">XML Path Language (XPath) Version 1.0</a>
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathException.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathException.java Fri Jan 05 22:02:20 2018 +0100
@@ -35,8 +35,8 @@
/**
* {@code XPathException} represents a generic XPath exception.
*
- * @author <a href="Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.COM">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @since 1.5
*/
public class XPathException extends Exception {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java Fri Jan 05 22:02:20 2018 +0100
@@ -94,8 +94,8 @@
* method is invoked, applications may not recursively call
* the {@code evaluate} method.
*
- * @author <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @see <a href="http://www.w3.org/TR/xpath#section-Expressions">XML Path Language (XPath) Version 1.0, Expressions</a>
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathExpressionException.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathExpressionException.java Fri Jan 05 22:02:20 2018 +0100
@@ -28,8 +28,8 @@
/**
* {@code XPathExpressionException} represents an error in an XPath expression.
*
- * @author <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @since 1.5
*/
public class XPathExpressionException extends XPathException {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java Fri Jan 05 22:02:20 2018 +0100
@@ -45,8 +45,8 @@
* may not attempt to recursively invoke a <code>newInstance</code> method,
* even from the same thread.
*
- * @author <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
*
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryConfigurationException.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryConfigurationException.java Fri Jan 05 22:02:20 2018 +0100
@@ -29,8 +29,8 @@
* {@code XPathFactoryConfigurationException} represents
* a configuration error in a {@code XPathFactory} environment.
*
- * @author <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @since 1.5
*/
public class XPathFactoryConfigurationException extends XPathException {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java Fri Jan 05 22:02:20 2018 +0100
@@ -41,7 +41,7 @@
/**
* Implementation of {@link XPathFactory#newInstance(String)}.
*
- * @author <a href="Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
* @since 1.5
*/
class XPathFactoryFinder {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFunction.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFunction.java Fri Jan 05 22:02:20 2018 +0100
@@ -32,8 +32,8 @@
*
* <p>Functions are identified by QName and arity in XPath.</p>
*
- * @author <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @since 1.5
*/
public interface XPathFunction {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionException.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionException.java Fri Jan 05 22:02:20 2018 +0100
@@ -28,8 +28,8 @@
/**
* {@code XPathFunctionException} represents an error with an XPath function.
*
- * @author <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @since 1.5
*/
public class XPathFunctionException extends XPathExpressionException {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionResolver.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionResolver.java Fri Jan 05 22:02:20 2018 +0100
@@ -44,8 +44,8 @@
* <p>If you wish to implement additional built-in functions, you will have to
* extend the underlying implementation directly.</p>
*
- * @author <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @see <a href="http://www.w3.org/TR/xpath#corelib">XML Path Language (XPath) Version 1.0, Core Function Library</a>
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathVariableResolver.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathVariableResolver.java Fri Jan 05 22:02:20 2018 +0100
@@ -37,8 +37,8 @@
* single XPath expression, a variable's value <strong><em>must</em></strong>
* not change.</p>
*
- * @author <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @since 1.5
*/
public interface XPathVariableResolver {
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskPool.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskPool.java Fri Jan 05 22:02:20 2018 +0100
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Directive.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Directive.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,13 @@
import java.util.Collections;
import java.util.EnumSet;
+import java.util.Locale;
import java.util.Set;
import javax.lang.model.element.ModuleElement;
import javax.lang.model.element.ModuleElement.DirectiveVisitor;
+import com.sun.tools.javac.api.Messages;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
import com.sun.tools.javac.code.Symbol.ModuleSymbol;
import com.sun.tools.javac.code.Symbol.PackageSymbol;
@@ -71,6 +73,11 @@
}
public final int value;
+
+ @Override
+ public String toString() {
+ return String.format("ACC_%s (0x%04x", name(), value);
+ }
}
/** Flags for ExportsDirective. */
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -421,6 +421,12 @@
// We are seeing a member class.
c = syms.enterClass(env.toplevel.modle, tree.name, (TypeSymbol)owner);
if (c.owner != owner) {
+ if (c.name != tree.name) {
+ log.error(tree.pos(), Errors.SameBinaryName(c.name, tree.name));
+ result = types.createErrorType(tree.name, (TypeSymbol)owner, Type.noType);
+ tree.sym = (ClassSymbol)result.tsym;
+ return;
+ }
//anonymous class loaded from a classfile may be recreated from source (see below)
//if this class is a member of such an anonymous class, fix the owner:
Assert.check(owner.owner.kind != TYP, owner::toString);
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2018, 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
@@ -63,6 +63,7 @@
import com.sun.tools.javac.code.Directive.RequiresFlag;
import com.sun.tools.javac.code.Directive.UsesDirective;
import com.sun.tools.javac.code.Flags;
+import com.sun.tools.javac.code.Flags.Flag;
import com.sun.tools.javac.code.Lint.LintCategory;
import com.sun.tools.javac.code.ModuleFinder;
import com.sun.tools.javac.code.Source;
@@ -109,11 +110,15 @@
import static com.sun.tools.javac.code.Flags.ENUM;
import static com.sun.tools.javac.code.Flags.PUBLIC;
import static com.sun.tools.javac.code.Flags.UNATTRIBUTED;
+
import com.sun.tools.javac.code.Kinds;
+
import static com.sun.tools.javac.code.Kinds.Kind.ERR;
import static com.sun.tools.javac.code.Kinds.Kind.MDL;
import static com.sun.tools.javac.code.Kinds.Kind.MTH;
+
import com.sun.tools.javac.code.Symbol.ModuleResolutionFlags;
+
import static com.sun.tools.javac.code.TypeTag.CLASS;
/**
@@ -775,10 +780,20 @@
} else {
allRequires.add(msym);
Set<RequiresFlag> flags = EnumSet.noneOf(RequiresFlag.class);
- if (tree.isTransitive)
- flags.add(RequiresFlag.TRANSITIVE);
- if (tree.isStaticPhase)
- flags.add(RequiresFlag.STATIC_PHASE);
+ if (tree.isTransitive) {
+ if (msym == syms.java_base && source.compareTo(Source.JDK10) >= 0) {
+ log.error(tree.pos(), Errors.ModifierNotAllowedHere(names.transitive));
+ } else {
+ flags.add(RequiresFlag.TRANSITIVE);
+ }
+ }
+ if (tree.isStaticPhase) {
+ if (msym == syms.java_base && source.compareTo(Source.JDK10) >= 0) {
+ log.error(tree.pos(), Errors.ModNotAllowedHere(EnumSet.of(Flag.STATIC)));
+ } else {
+ flags.add(RequiresFlag.STATIC_PHASE);
+ }
+ }
RequiresDirective d = new RequiresDirective(msym, flags);
tree.directive = d;
sym.requires = sym.requires.prepend(d);
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
import java.io.File;
import java.io.IOException;
+import java.lang.module.Configuration;
+import java.lang.module.ModuleFinder;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -77,11 +79,6 @@
import com.sun.tools.javac.util.DefinedBy.Api;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.ListBuffer;
-import com.sun.tools.javac.util.JDK9Wrappers.Configuration;
-import com.sun.tools.javac.util.JDK9Wrappers.Layer;
-import com.sun.tools.javac.util.JDK9Wrappers.ModuleFinder;
-import com.sun.tools.javac.util.JDK9Wrappers.Module;
-import com.sun.tools.javac.util.JDK9Wrappers.ServiceLoaderHelper;
import static java.nio.file.FileVisitOption.FOLLOW_LINKS;
@@ -980,14 +977,14 @@
public <S> ServiceLoader<S> getServiceLoader(Location location, Class<S> service) throws IOException {
nullCheck(location);
nullCheck(service);
- Module.getModule(getClass()).addUses(service);
+ getClass().getModule().addUses(service);
if (location.isModuleOrientedLocation()) {
Collection<Path> paths = locations.getLocation(location);
ModuleFinder finder = ModuleFinder.of(paths.toArray(new Path[paths.size()]));
- Layer bootLayer = Layer.boot();
+ ModuleLayer bootLayer = ModuleLayer.boot();
Configuration cf = bootLayer.configuration().resolveAndBind(ModuleFinder.of(), finder, Collections.emptySet());
- Layer layer = bootLayer.defineModulesWithOneLoader(cf, ClassLoader.getSystemClassLoader());
- return ServiceLoaderHelper.load(layer, service);
+ ModuleLayer layer = bootLayer.defineModulesWithOneLoader(cf, ClassLoader.getSystemClassLoader());
+ return ServiceLoader.load(layer, service);
} else {
return ServiceLoader.load(service, getClassLoader(location));
}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -77,6 +77,8 @@
import javax.tools.StandardJavaFileManager.PathFactory;
import javax.tools.StandardLocation;
+import jdk.internal.jmod.JmodFile;
+
import com.sun.tools.javac.code.Lint;
import com.sun.tools.javac.code.Lint.LintCategory;
import com.sun.tools.javac.main.Option;
@@ -84,7 +86,6 @@
import com.sun.tools.javac.resources.CompilerProperties.Warnings;
import com.sun.tools.javac.util.DefinedBy;
import com.sun.tools.javac.util.DefinedBy.Api;
-import com.sun.tools.javac.util.JDK9Wrappers;
import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.jvm.ModuleNameReader;
@@ -1451,7 +1452,7 @@
if (p.getFileName().toString().endsWith(".jmod")) {
try {
// check if the JMOD file is valid
- JDK9Wrappers.JmodFile.checkMagic(p);
+ JmodFile.checkMagic(p);
// No JMOD file system. Use JarFileSystem to
// workaround for now
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -1339,7 +1339,8 @@
throw badClassFile("module.name.mismatch", moduleName, currentModule.name);
}
- msym.flags.addAll(readModuleFlags(nextChar()));
+ Set<ModuleFlags> moduleFlags = readModuleFlags(nextChar());
+ msym.flags.addAll(moduleFlags);
msym.version = readName(nextChar());
ListBuffer<RequiresDirective> requires = new ListBuffer<>();
@@ -1347,6 +1348,14 @@
for (int i = 0; i < nrequires; i++) {
ModuleSymbol rsym = syms.enterModule(readModuleName(nextChar()));
Set<RequiresFlag> flags = readRequiresFlags(nextChar());
+ if (rsym == syms.java_base && majorVersion >= V54.major) {
+ if (flags.contains(RequiresFlag.TRANSITIVE)) {
+ throw badClassFile("bad.requires.flag", RequiresFlag.TRANSITIVE);
+ }
+ if (flags.contains(RequiresFlag.STATIC_PHASE)) {
+ throw badClassFile("bad.requires.flag", RequiresFlag.STATIC_PHASE);
+ }
+ }
nextChar(); // skip compiled version
requires.add(new RequiresDirective(rsym, flags));
}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
import java.io.FileWriter;
import java.io.PrintWriter;
+import java.lang.module.ModuleDescriptor;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -47,6 +48,8 @@
import javax.lang.model.SourceVersion;
+import jdk.internal.misc.VM;
+
import com.sun.tools.doclint.DocLint;
import com.sun.tools.javac.code.Lint;
import com.sun.tools.javac.code.Lint.LintCategory;
@@ -57,7 +60,6 @@
import com.sun.tools.javac.platform.PlatformProvider;
import com.sun.tools.javac.processing.JavacProcessingEnvironment;
import com.sun.tools.javac.util.Assert;
-import com.sun.tools.javac.util.JDK9Wrappers;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.Log.PrefixKind;
import com.sun.tools.javac.util.Log.WriterKind;
@@ -650,21 +652,11 @@
if (arg.isEmpty()) {
throw helper.newInvalidValueException("err.no.value.for.option", option);
} else {
+ // use official parser if available
try {
- Class.forName(JDK9Wrappers.ModuleDescriptor.Version.CLASSNAME);
- // use official parser if available
- try {
- JDK9Wrappers.ModuleDescriptor.Version.parse(arg);
- } catch (IllegalArgumentException e) {
- throw helper.newInvalidValueException("err.bad.value.for.option", option, arg);
- }
- } catch (ClassNotFoundException ex) {
- // fall-back to simplistic rules when running on older platform
- if (!(arg.charAt(0) >= '0' && arg.charAt(0) <= '9') ||
- arg.endsWith("-") ||
- arg.endsWith("+")) {
- throw helper.newInvalidValueException("err.bad.value.for.option", option, arg);
- }
+ ModuleDescriptor.Version.parse(arg);
+ } catch (IllegalArgumentException e) {
+ throw helper.newInvalidValueException("err.bad.value.for.option", option, arg);
}
}
super.process(helper, option, arg);
@@ -717,41 +709,36 @@
HIDDEN, BASIC) {
@Override
public void process(OptionHelper helper, String option) throws InvalidValueException {
- try {
- Class.forName(JDK9Wrappers.VMHelper.CLASSNAME);
- String[] runtimeArgs = JDK9Wrappers.VMHelper.getRuntimeArguments();
- for (String arg : runtimeArgs) {
- // Handle any supported runtime options; ignore all others.
- // The runtime arguments always use the single token form, e.g. "--name=value".
- for (Option o : getSupportedRuntimeOptions()) {
- if (o.matches(arg)) {
- switch (o) {
- case ADD_MODULES:
- int eq = arg.indexOf('=');
- Assert.check(eq > 0, () -> ("invalid runtime option:" + arg));
- // --add-modules=ALL-DEFAULT is not supported at compile-time
- // so remove it from list, and only process the rest
- // if the set is non-empty.
- // Note that --add-modules=ALL-DEFAULT is automatically added
- // by the standard javac launcher.
- String mods = Arrays.stream(arg.substring(eq + 1).split(","))
- .filter(s -> !s.isEmpty() && !s.equals("ALL-DEFAULT"))
- .collect(Collectors.joining(","));
- if (!mods.isEmpty()) {
- String updatedArg = arg.substring(0, eq + 1) + mods;
- o.handleOption(helper, updatedArg, Collections.emptyIterator());
- }
- break;
- default:
- o.handleOption(helper, arg, Collections.emptyIterator());
- break;
- }
- break;
+ String[] runtimeArgs = VM.getRuntimeArguments();
+ for (String arg : runtimeArgs) {
+ // Handle any supported runtime options; ignore all others.
+ // The runtime arguments always use the single token form, e.g. "--name=value".
+ for (Option o : getSupportedRuntimeOptions()) {
+ if (o.matches(arg)) {
+ switch (o) {
+ case ADD_MODULES:
+ int eq = arg.indexOf('=');
+ Assert.check(eq > 0, () -> ("invalid runtime option:" + arg));
+ // --add-modules=ALL-DEFAULT is not supported at compile-time
+ // so remove it from list, and only process the rest
+ // if the set is non-empty.
+ // Note that --add-modules=ALL-DEFAULT is automatically added
+ // by the standard javac launcher.
+ String mods = Arrays.stream(arg.substring(eq + 1).split(","))
+ .filter(s -> !s.isEmpty() && !s.equals("ALL-DEFAULT"))
+ .collect(Collectors.joining(","));
+ if (!mods.isEmpty()) {
+ String updatedArg = arg.substring(0, eq + 1) + mods;
+ o.handleOption(helper, updatedArg, Collections.emptyIterator());
+ }
+ break;
+ default:
+ o.handleOption(helper, arg, Collections.emptyIterator());
+ break;
}
+ break;
}
}
- } catch (ClassNotFoundException | SecurityException e) {
- throw helper.newInvalidValueException("err.cannot.access.runtime.env");
}
}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2018, 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
@@ -394,6 +394,7 @@
comment_reader.putChar('\\', false);
}
comment_reader.scanCommentChar();
+ break;
case ' ':
case '\t':
comment_reader.putChar(comment_reader.ch, false);
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java Fri Jan 05 22:02:20 2018 +0100
@@ -712,20 +712,20 @@
}
private void checkNameAndExistence(ModuleSymbol mod, String typename, boolean allowUnnamedPackageInfo) throws FilerException {
- // TODO: Check if type already exists on source or class path?
- // If so, use warning message key proc.type.already.exists
checkName(typename, allowUnnamedPackageInfo);
- ClassSymbol existing;
+ ClassSymbol existing = elementUtils.getTypeElement(typename);
boolean alreadySeen = aggregateGeneratedSourceNames.contains(Pair.of(mod, typename)) ||
aggregateGeneratedClassNames.contains(Pair.of(mod, typename)) ||
initialClassNames.contains(typename) ||
- ((existing = elementUtils.getTypeElement(typename)) != null &&
- initialInputs.contains(existing.sourcefile));
+ (existing != null && initialInputs.contains(existing.sourcefile));
if (alreadySeen) {
if (lint)
log.warning(Warnings.ProcTypeRecreate(typename));
throw new FilerException("Attempt to recreate a file for type " + typename);
}
+ if (lint && existing != null) {
+ log.warning("proc.type.already.exists", typename);
+ }
if (!mod.isUnnamed() && !typename.contains(".")) {
throw new FilerException("Attempt to create a type in unnamed package of a named module: " + typename);
}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -82,7 +82,6 @@
import com.sun.tools.javac.util.DefinedBy.Api;
import com.sun.tools.javac.util.Iterators;
import com.sun.tools.javac.util.JCDiagnostic;
-import com.sun.tools.javac.util.JDK9Wrappers.Module;
import com.sun.tools.javac.util.JavacMessages;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.Log;
@@ -267,7 +266,7 @@
: fileManager.getClassLoader(CLASS_PATH);
if (options.isSet("accessInternalAPI"))
- ModuleHelper.addExports(Module.getModule(getClass()), Module.getUnnamedModule(processorClassLoader));
+ ModuleHelper.addExports(getClass().getModule(), processorClassLoader.getUnnamedModule());
if (processorClassLoader != null && processorClassLoader instanceof Closeable) {
compiler.closeables = compiler.closeables.prepend((Closeable) processorClassLoader);
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2018, 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
@@ -443,6 +443,10 @@
compiler.err.duplicate.class=\
duplicate class: {0}
+# 0: name, 1: name
+compiler.err.same.binary.name=\
+ classes: {0} and {1} have the same binary name
+
compiler.err.duplicate.case.label=\
duplicate case label
@@ -753,6 +757,10 @@
compiler.err.mod.not.allowed.here=\
modifier {0} not allowed here
+# 0: name
+compiler.err.modifier.not.allowed.here=\
+ modifier {0} not allowed here
+
compiler.err.intf.not.allowed.here=\
interface not allowed here
@@ -3136,6 +3144,9 @@
compiler.misc.cant.resolve.modules=\
cannot resolve modules
+compiler.misc.bad.requires.flag=\
+ bad requires flag: {0}
+
# 0: string
compiler.err.invalid.module.specifier=\
module specifier not allowed: {0}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2018, 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
@@ -374,8 +374,6 @@
not a directory: {0}
javac.err.file.not.file=\
not a file: {0}
-javac.err.cannot.access.runtime.env=\
- cannot access runtime environment
javac.err.two.class.loaders.1=\
javac is split between multiple class loaders: check your configuration
javac.err.two.class.loaders.2=\
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java Thu Jan 04 22:47:38 2018 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,460 +0,0 @@
-/*
- * Copyright (c) 2015, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.javac.util;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.nio.file.Path;
-import java.util.Collection;
-import java.util.ServiceLoader;
-
-/**
- * This class provides wrappers for classes and methods that are new in JDK 9, and which are not
- * available on older versions of the platform on which javac may be compiled and run.
- * In future releases, when javac is always compiled on JDK 9 or later, the use of these wrappers
- * can be replaced by use of the real underlying classes.
- *
- * <p>Wrapper classes provide a subset of the API of the wrapped classes, as needed for use
- * in javac. Wrapper objects contain an {@code Object} reference to the underlying runtime object,
- * and {@code Class} and {@code Method} objects for obtaining or using such instances via
- * runtime reflection. The {@code Class} and {@code Method} objects are set up on a per-class
- * basis, by an {@code init} method, which is called from static methods on the wrapper class,
- * or in the constructor, when instances are created.
- * <p>
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.</b>
- */
-public class JDK9Wrappers {
-
- /**
- * Helper class for new method in java.util.ServiceLoader.
- */
- public static final class ServiceLoaderHelper {
- @SuppressWarnings("unchecked")
- public static <S> ServiceLoader<S> load(Layer layer, Class<S> service) {
- try {
- init();
- Object result = loadMethod.invoke(null, layer.theRealLayer, service);
- return (ServiceLoader<S>)result;
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- // -----------------------------------------------------------------------------------------
-
- private static Method loadMethod = null;
-
- private static void init() {
- if (loadMethod == null) {
- try {
- Class<?> layerClass = Layer.layerClass;
- loadMethod = ServiceLoader.class.getDeclaredMethod("load", layerClass, Class.class);
- } catch (NoSuchMethodException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
- }
- }
-
- /**
- * Wrapper class for java.lang.module.ModuleDescriptor and ModuleDescriptor.Version.
- */
- public static class ModuleDescriptor {
- public static class Version {
- public static final String CLASSNAME = "java.lang.module.ModuleDescriptor$Version";
- private final Object theRealVersion;
-
- private Version(Object version) {
- this.theRealVersion = version;
- }
-
- public static Version parse(String v) {
- try {
- init();
- Object result = parseMethod.invoke(null, v);
- Version version = new Version(result);
- return version;
- } catch (InvocationTargetException ex) {
- if (ex.getCause() instanceof IllegalArgumentException) {
- throw (IllegalArgumentException) ex.getCause();
- } else {
- throw new Abort(ex);
- }
- } catch (IllegalAccessException | IllegalArgumentException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- @Override
- public String toString() {
- return theRealVersion.toString();
- }
-
- // -----------------------------------------------------------------------------------------
-
- private static Class<?> versionClass = null;
- private static Method parseMethod = null;
-
- private static void init() {
- if (versionClass == null) {
- try {
- versionClass = Class.forName(CLASSNAME, false, null);
- parseMethod = versionClass.getDeclaredMethod("parse", String.class);
- } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
- }
- }
- }
-
- /**
- * Wrapper class for java.lang.module.ModuleFinder.
- */
- public static class ModuleFinder {
- private final Object theRealModuleFinder;
-
- private ModuleFinder(Object moduleFinder) {
- this.theRealModuleFinder = moduleFinder;
- init();
- }
-
- public static ModuleFinder of(Path... dirs) {
- try {
- init();
- Object result = ofMethod.invoke(null, (Object)dirs);
- ModuleFinder mFinder = new ModuleFinder(result);
- return mFinder;
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- // -----------------------------------------------------------------------------------------
-
- private static Class<?> moduleFinderClass = null;
- private static Method ofMethod;
-
- static final Class<?> getModuleFinderClass() {
- init();
- return moduleFinderClass;
- }
-
- private static void init() {
- if (moduleFinderClass == null) {
- try {
- moduleFinderClass = Class.forName("java.lang.module.ModuleFinder", false, null);
- ofMethod = moduleFinderClass.getDeclaredMethod("of", Path[].class);
- } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
- }
- }
-
- /**
- * Wrapper class for java.lang.Module. To materialize a handle use the static factory
- * methods Module#getModule(Class<?>) or Module#getUnnamedModule(ClassLoader).
- */
- public static class Module {
-
- private final Object theRealModule;
-
- private Module(Object module) {
- this.theRealModule = module;
- init();
- }
-
- public static Module getModule(Class<?> clazz) {
- try {
- init();
- Object result = getModuleMethod.invoke(clazz, new Object[0]);
- return new Module(result);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- public static Module getUnnamedModule(ClassLoader classLoader) {
- try {
- init();
- Object result = getUnnamedModuleMethod.invoke(classLoader, new Object[0]);
- return new Module(result);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- public Module addExports(String pn, Module other) {
- try {
- addExportsMethod.invoke(theRealModule, new Object[] { pn, other.theRealModule});
- } catch (IllegalAccessException | InvocationTargetException ex) {
- throw new Abort(ex);
- }
- return this;
- }
-
- public Module addUses(Class<?> st) {
- try {
- addUsesMethod.invoke(theRealModule, new Object[] { st });
- } catch (IllegalAccessException | InvocationTargetException ex) {
- throw new Abort(ex);
- }
- return this;
- }
-
- // -----------------------------------------------------------------------------------------
- // on java.lang.Module
- private static Method addExportsMethod = null;
- // on java.lang.Module
- private static Method addUsesMethod = null;
- // on java.lang.Class
- private static Method getModuleMethod;
- // on java.lang.ClassLoader
- private static Method getUnnamedModuleMethod;
-
- private static void init() {
- if (addExportsMethod == null) {
- try {
- Class<?> moduleClass = Class.forName("java.lang.Module", false, null);
- addUsesMethod = moduleClass.getDeclaredMethod("addUses", new Class<?>[] { Class.class });
- addExportsMethod = moduleClass.getDeclaredMethod("addExports",
- new Class<?>[] { String.class, moduleClass });
- getModuleMethod = Class.class.getDeclaredMethod("getModule", new Class<?>[0]);
- getUnnamedModuleMethod = ClassLoader.class.getDeclaredMethod("getUnnamedModule", new Class<?>[0]);
- } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
- }
- }
-
- /**
- * Wrapper class for java.lang.module.Configuration.
- */
- public static final class Configuration {
- private final Object theRealConfiguration;
-
- private Configuration(Object configuration) {
- this.theRealConfiguration = configuration;
- init();
- }
-
- public Configuration resolveAndBind(
- ModuleFinder beforeFinder,
- ModuleFinder afterFinder,
- Collection<String> roots) {
- try {
- Object result = resolveAndBindMethod.invoke(theRealConfiguration,
- beforeFinder.theRealModuleFinder,
- afterFinder.theRealModuleFinder,
- roots
- );
- Configuration configuration = new Configuration(result);
- return configuration;
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- // -----------------------------------------------------------------------------------------
-
- private static Class<?> configurationClass = null;
- private static Method resolveAndBindMethod;
-
- static final Class<?> getConfigurationClass() {
- init();
- return configurationClass;
- }
-
- private static void init() {
- if (configurationClass == null) {
- try {
- configurationClass = Class.forName("java.lang.module.Configuration", false, null);
- Class<?> moduleFinderInterface = ModuleFinder.getModuleFinderClass();
- resolveAndBindMethod = configurationClass.getDeclaredMethod("resolveAndBind",
- moduleFinderInterface,
- moduleFinderInterface,
- Collection.class
- );
- } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
- }
- }
-
- /**
- * Wrapper class for java.lang.ModuleLayer.
- */
- public static final class Layer {
- private final Object theRealLayer;
-
- private Layer(Object layer) {
- this.theRealLayer = layer;
- }
-
- public static Layer boot() {
- try {
- init();
- Object result = bootMethod.invoke(null);
- Layer layer = new Layer(result);
- return layer;
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- public Configuration configuration() {
- try {
- Object result = configurationMethod.invoke(theRealLayer);
- Configuration configuration = new Configuration(result);
- return configuration;
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- public Layer defineModulesWithOneLoader(Configuration configuration, ClassLoader parentClassLoader) {
- try {
- Object result = defineModulesWithOneLoaderMethod.invoke(
- theRealLayer, configuration.theRealConfiguration, parentClassLoader);
- Layer layer = new Layer(result);
- return layer;
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- // -----------------------------------------------------------------------------------------
-
- private static Class<?> layerClass = null;
- private static Method bootMethod;
- private static Method defineModulesWithOneLoaderMethod;
- private static Method configurationMethod;
-
- private static void init() {
- if (layerClass == null) {
- try {
- layerClass = Class.forName("java.lang.ModuleLayer", false, null);
- bootMethod = layerClass.getDeclaredMethod("boot");
- defineModulesWithOneLoaderMethod = layerClass.getDeclaredMethod("defineModulesWithOneLoader",
- Configuration.getConfigurationClass(),
- ClassLoader.class);
- configurationMethod = layerClass.getDeclaredMethod("configuration");
- } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
- }
- }
-
-
- /**
- * Helper class for new method in jdk.internal.misc.VM.
- */
- public static final class VMHelper {
- public static final String CLASSNAME = "jdk.internal.misc.VM";
-
- @SuppressWarnings("unchecked")
- public static String[] getRuntimeArguments() {
- try {
- init();
- Object result = getRuntimeArgumentsMethod.invoke(null);
- return (String[])result;
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- // -----------------------------------------------------------------------------------------
-
- private static Class<?> vmClass = null;
- private static Method getRuntimeArgumentsMethod = null;
-
- private static void init() {
- if (vmClass == null) {
- try {
- vmClass = Class.forName(CLASSNAME, false, null);
- getRuntimeArgumentsMethod = vmClass.getDeclaredMethod("getRuntimeArguments");
- } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
- }
- }
-
- /**
- * Helper class for new method in jdk.internal.jmod.JmodFile
- */
- public static final class JmodFile {
- public static final String JMOD_FILE_CLASSNAME = "jdk.internal.jmod.JmodFile";
-
- public static void checkMagic(Path file) throws IOException {
- try {
- init();
- checkMagicMethod.invoke(null, file);
- } catch (InvocationTargetException ex) {
- if (ex.getCause() instanceof IOException) {
- throw IOException.class.cast(ex.getCause());
- }
- throw new Abort(ex);
- } catch (IllegalAccessException | IllegalArgumentException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- // -----------------------------------------------------------------------------------------
-
- private static Class<?> jmodFileClass = null;
- private static Method checkMagicMethod = null;
-
- private static void init() {
- if (jmodFileClass == null) {
- try {
- jmodFileClass = Class.forName(JMOD_FILE_CLASSNAME, false, null);
- checkMagicMethod = jmodFileClass.getDeclaredMethod("checkMagic", Path.class);
- } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
- }
- }
-}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ModuleHelper.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ModuleHelper.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
package com.sun.tools.javac.util;
-import com.sun.tools.javac.util.JDK9Wrappers.Module;
-
public class ModuleHelper {
private static final String[] javacInternalPackages = new String[] {
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/BufferingSubscriber.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/BufferingSubscriber.java Fri Jan 05 22:02:20 2018 +0100
@@ -80,7 +80,7 @@
BufferingSubscriber(HttpResponse.BodySubscriber<T> downstreamSubscriber,
int bufferSize) {
- this.downstreamSubscriber = downstreamSubscriber;
+ this.downstreamSubscriber = Objects.requireNonNull(downstreamSubscriber);
this.bufferSize = bufferSize;
synchronized (buffersLock) {
internalBuffers = new ArrayList<>();
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Exchange.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Exchange.java Fri Jan 05 22:02:20 2018 +0100
@@ -373,13 +373,16 @@
client.client2(),
this, e::drainLeftOverBytes)
.thenCompose((Http2Connection c) -> {
- c.putConnection();
+ boolean cached = c.offerConnection();
Stream<T> s = c.getStream(1);
+
if (s == null) {
// s can be null if an exception occurred
// asynchronously while sending the preface.
Throwable t = c.getRecordedCause();
if (t != null) {
+ if (!cached)
+ c.close();
return MinimalFuture.failedFuture(
new IOException("Can't get stream 1: " + t, t));
}
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExchangeImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExchangeImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -98,6 +98,7 @@
HttpConnection connection)
{
DEBUG_LOGGER.log(Level.DEBUG, "handling HTTP/2 connection creation result");
+ boolean secure = exchange.request().secure();
if (t != null) {
DEBUG_LOGGER.log(Level.DEBUG,
"handling HTTP/2 connection creation failed: %s",
@@ -116,6 +117,12 @@
return CompletableFuture.failedFuture(t);
}
}
+ if (secure && c== null) {
+ DEBUG_LOGGER.log(Level.DEBUG, "downgrading to HTTP/1.1 ");
+ CompletableFuture<? extends ExchangeImpl<U>> ex =
+ createHttp1Exchange(exchange, null);
+ return ex;
+ }
if (c == null) {
// no existing connection. Send request with HTTP 1 and then
// upgrade if successful
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2ClientImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2ClientImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -65,96 +65,78 @@
/* Map key is "scheme:host:port" */
private final Map<String,Http2Connection> connections = new ConcurrentHashMap<>();
- private final Set<String> opening = Collections.synchronizedSet(new HashSet<>());
- private final Map<String,Set<CompletableFuture<Http2Connection>>> waiting =
- Collections.synchronizedMap(new HashMap<>());
-
- private void addToWaiting(String key, CompletableFuture<Http2Connection> cf) {
- synchronized (waiting) {
- Set<CompletableFuture<Http2Connection>> waiters = waiting.get(key);
- if (waiters == null) {
- waiters = new HashSet<>();
- waiting.put(key, waiters);
- }
- waiters.add(cf);
- }
- }
+ private final Set<String> failures = Collections.synchronizedSet(new HashSet<>());
/**
- * If a https request then async waits until a connection is opened.
- * Returns null if the request is 'http' as a different (upgrade)
- * mechanism is used.
+ * When HTTP/2 requested only. The following describes the aggregate behavior including the
+ * calling code. In all cases, the HTTP2 connection cache
+ * is checked first for a suitable connection and that is returned if available.
+ * If not, a new connection is opened, except in https case when a previous negotiate failed.
+ * In that case, we want to continue using http/1.1. When a connection is to be opened and
+ * if multiple requests are sent in parallel then each will open a new connection.
+ *
+ * If negotiation/upgrade succeeds then
+ * one connection will be put in the cache and the others will be closed
+ * after the initial request completes (not strictly necessary for h2, only for h2c)
*
- * Only one connection per destination is created. Blocks when opening
- * connection, or when waiting for connection to be opened.
- * First thread opens the connection and notifies the others when done.
+ * If negotiate/upgrade fails, then any opened connections remain open (as http/1.1)
+ * and will be used and cached in the http/1 cache. Note, this method handles the
+ * https failure case only (by completing the CF with an ALPN exception, handled externally)
+ * The h2c upgrade is handled externally also.
*
- * If the request is secure (https) then we open the connection here.
- * If not, then the more complicated upgrade from 1.1 to 2 happens (not here)
- * In latter case, when the Http2Connection is connected, putConnection() must
- * be called to store it.
+ * Specific CF behavior of this method.
+ * 1. completes with ALPN exception: h2 negotiate failed for first time. failure recorded.
+ * 2. completes with other exception: failure not recorded. Caller must handle
+ * 3. completes normally with null: no connection in cache for h2c or h2 failed previously
+ * 4. completes normally with connection: h2 or h2c connection in cache. Use it.
*/
CompletableFuture<Http2Connection> getConnectionFor(HttpRequestImpl req) {
URI uri = req.uri();
InetSocketAddress proxy = req.proxy();
String key = Http2Connection.keyFor(uri, proxy);
- synchronized (opening) {
+ synchronized (this) {
Http2Connection connection = connections.get(key);
if (connection != null) { // fast path if connection already exists
return CompletableFuture.completedFuture(connection);
}
- if (!req.secure()) {
+ if (!req.secure() || failures.contains(key)) {
+ // secure: negotiate failed before. Use http/1.1
+ // !secure: no connection available in cache. Attempt upgrade
return MinimalFuture.completedFuture(null);
}
-
- if (!opening.contains(key)) {
- debug.log(Level.DEBUG, "Opening: %s", key);
- opening.add(key);
- } else {
- CompletableFuture<Http2Connection> cf = new MinimalFuture<>();
- addToWaiting(key, cf);
- return cf;
- }
}
return Http2Connection
.createAsync(req, this)
.whenComplete((conn, t) -> {
- debug.log(Level.DEBUG,
- "waking up dependents with created connection");
- synchronized (opening) {
- Set<CompletableFuture<Http2Connection>> waiters = waiting.remove(key);
- debug.log(Level.DEBUG, "Opening completed: %s", key);
- opening.remove(key);
- if (t == null && conn != null)
- putConnection(conn);
- final Throwable cause = Utils.getCompletionCause(t);
- if (waiters == null) {
- debug.log(Level.DEBUG, "no dependent to wake up");
- return;
- } else if (cause instanceof Http2Connection.ALPNException) {
- waiters.forEach((cf1) -> cf1.completeAsync(() -> null,
- client.theExecutor()));
- } else if (cause != null) {
- debug.log(Level.DEBUG,
- () -> "waking up dependants: failed: " + cause);
- waiters.forEach((cf1) -> cf1.completeExceptionally(cause));
- } else {
- debug.log(Level.DEBUG, "waking up dependants: succeeded");
- waiters.forEach((cf1) -> cf1.completeAsync(() -> conn,
- client.theExecutor()));
+ synchronized (Http2ClientImpl.this) {
+ if (conn != null) {
+ offerConnection(conn);
+ } else {
+ Throwable cause = Utils.getCompletionCause(t);
+ if (cause instanceof Http2Connection.ALPNException)
+ failures.add(key);
}
}
});
}
/*
- * TODO: If there isn't a connection to the same destination, then
- * store it. If there is already a connection, then close it
+ * Cache the given connection, if no connection to the same
+ * destination exists. If one exists, then we let the initial stream
+ * complete but allow it to close itself upon completion.
+ * This situation should not arise with https because the request
+ * has not been sent as part of the initial alpn negotiation
*/
- void putConnection(Http2Connection c) {
- connections.put(c.key(), c);
+ boolean offerConnection(Http2Connection c) {
+ String key = c.key();
+ Http2Connection c1 = connections.putIfAbsent(key, c);
+ if (c1 != null) {
+ c.setSingleStream(true);
+ return false;
+ }
+ return true;
}
void deleteConnection(Http2Connection c) {
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2Connection.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2Connection.java Fri Jan 05 22:02:20 2018 +0100
@@ -116,6 +116,8 @@
Utils.getHpackLogger(this::dbgString, DEBUG_HPACK);
static final ByteBuffer EMPTY_TRIGGER = ByteBuffer.allocate(0);
+ private boolean singleStream; // used only for stream 1, then closed
+
/*
* ByteBuffer pooling strategy for HTTP/2 protocol:
*
@@ -202,7 +204,6 @@
prefaceSent = true;
}
}
-
}
volatile boolean closed;
@@ -397,6 +398,14 @@
return aconn.getALPN().thenCompose(checkAlpnCF);
}
+ synchronized boolean singleStream() {
+ return singleStream;
+ }
+
+ synchronized void setSingleStream(boolean use) {
+ singleStream = use;
+ }
+
static String keyFor(HttpConnection connection) {
boolean isProxy = connection.isProxied();
boolean isSecure = connection.isSecure();
@@ -429,6 +438,10 @@
// P indicates proxy
// Eg: "S:H:foo.com:80"
static String keyString(boolean secure, boolean proxy, String host, int port) {
+ if (secure && port == -1)
+ port = 443;
+ else if (!secure && port == -1)
+ port = 80;
return (secure ? "S:" : "C:") + (proxy ? "P:" : "H:") + host + ":" + port;
}
@@ -436,8 +449,8 @@
return this.key;
}
- void putConnection() {
- client2.putConnection(this);
+ boolean offerConnection() {
+ return client2.offerConnection(this);
}
private HttpPublisher publisher() {
@@ -464,6 +477,7 @@
}
void close() {
+ Log.logTrace("Closing HTTP/2 connection: to {0}", connection.address());
GoAwayFrame f = new GoAwayFrame(0, ErrorFrame.NO_ERROR, "Requested by user".getBytes());
// TODO: set last stream. For now zero ok.
sendFrame(f);
@@ -680,7 +694,12 @@
// corresponding entry in the window controller.
windowController.removeStream(streamid);
}
+ if (singleStream() && streams.isEmpty()) {
+ // should be only 1 stream, but there might be more if server push
+ close();
+ }
}
+
/**
* Increments this connection's send Window by the amount in the given frame.
*/
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequest.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequest.java Fri Jan 05 22:02:20 2018 +0100
@@ -622,6 +622,49 @@
public interface BodyPublisher extends Flow.Publisher<ByteBuffer> {
/**
+ * Returns a request body publisher whose body is retrieved from the
+ * given {@code Flow.Publisher}. The returned request body publisher
+ * has an unknown content length.
+ *
+ * @apiNote This method can be used as an adapter between {@code
+ * BodyPublisher} and {@code Flow.Publisher}, where the amount of
+ * request body that the publisher will publish is unknown.
+ *
+ * @param publisher the publisher responsible for publishing the body
+ * @return a BodyPublisher
+ */
+ static BodyPublisher fromPublisher(Flow.Publisher<? extends ByteBuffer> publisher) {
+ return new RequestPublishers.PublisherAdapter(publisher, -1L);
+ }
+
+ /**
+ * Returns a request body publisher whose body is retrieved from the
+ * given {@code Flow.Publisher}. The returned request body publisher
+ * has the given content length.
+ *
+ * <p> The given {@code contentLength} is a positive number, that
+ * represents the exact amount of bytes the {@code publisher} must
+ * publish.
+ *
+ * @apiNote This method can be used as an adapter between {@code
+ * BodyPublisher} and {@code Flow.Publisher}, where the amount of
+ * request body that the publisher will publish is known.
+ *
+ * @param publisher the publisher responsible for publishing the body
+ * @param contentLength a positive number representing the exact
+ * amount of bytes the publisher will publish
+ * @throws IllegalArgumentException if the content length is
+ * non-positive
+ * @return a BodyPublisher
+ */
+ static BodyPublisher fromPublisher(Flow.Publisher<? extends ByteBuffer> publisher,
+ long contentLength) {
+ if (contentLength < 1)
+ throw new IllegalArgumentException("non-positive contentLength: " + contentLength);
+ return new RequestPublishers.PublisherAdapter(publisher, contentLength);
+ }
+
+ /**
* Returns a request body publisher whose body is the given {@code
* String}, converted using the {@link StandardCharsets#UTF_8 UTF_8}
* character set.
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponse.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponse.java Fri Jan 05 22:02:20 2018 +0100
@@ -46,6 +46,7 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.Flow;
+import java.util.concurrent.Flow.Subscriber;
import java.util.function.Consumer;
import java.util.function.Function;
import javax.net.ssl.SSLParameters;
@@ -329,6 +330,75 @@
public BodySubscriber<T> apply(int statusCode, HttpHeaders responseHeaders);
/**
+ * Returns a response body handler that returns a {@link BodySubscriber
+ * BodySubscriber}{@code <Void>} obtained from {@linkplain
+ * BodySubscriber#fromSubscriber(Subscriber)}, with the given
+ * {@code subscriber}.
+ *
+ * <p> The response body is not available through this, or the {@code
+ * HttpResponse} API, but instead all response body is forwarded to the
+ * given {@code subscriber}, which should make it available, if
+ * appropriate, through some other mechanism, e.g. an entry in a
+ * database, etc.
+ *
+ * @apiNote This method can be used as an adapter between {@code
+ * BodySubscriber} and {@code Flow.Subscriber}.
+ *
+ * <p> For example:
+ * <pre> {@code
+ * TextSubscriber subscriber = new TextSubscriber();
+ * HttpResponse<Void> response = client.sendAsync(request,
+ * BodyHandler.fromSubscriber(subscriber)).join();
+ * System.out.println(response.statusCode());
+ * }</pre>
+ *
+ * @param subscriber the subscriber
+ * @return a response body handler
+ */
+ public static BodyHandler<Void>
+ fromSubscriber(Subscriber<? super List<ByteBuffer>> subscriber) {
+ Objects.requireNonNull(subscriber);
+ return (status, headers) -> BodySubscriber.fromSubscriber(subscriber,
+ s -> null);
+ }
+
+ /**
+ * Returns a response body handler that returns a {@link BodySubscriber
+ * BodySubscriber}{@code <T>} obtained from {@link
+ * BodySubscriber#fromSubscriber(Subscriber, Function)}, with the
+ * given {@code subscriber} and {@code finisher} function.
+ *
+ * <p> The given {@code finisher} function is applied after the given
+ * subscriber's {@code onComplete} has been invoked. The {@code finisher}
+ * function is invoked with the given subscriber, and returns a value
+ * that is set as the response's body.
+ *
+ * @apiNote This method can be used as an adapter between {@code
+ * BodySubscriber} and {@code Flow.Subscriber}.
+ *
+ * <p> For example:
+ * <pre> {@code
+ * TextSubscriber subscriber = ...; // accumulates bytes and transforms them into a String
+ * HttpResponse<String> response = client.sendAsync(request,
+ * BodyHandler.fromSubscriber(subscriber, TextSubscriber::getTextResult)).join();
+ * String text = response.body();
+ * }</pre>
+ *
+ * @param <S> the type of the Subscriber
+ * @param <T> the type of the response body
+ * @param subscriber the subscriber
+ * @param finisher a function to be applied after the subscriber has completed
+ * @return a response body handler
+ */
+ public static <S extends Subscriber<? super List<ByteBuffer>>,T> BodyHandler<T>
+ fromSubscriber(S subscriber, Function<S,T> finisher) {
+ Objects.requireNonNull(subscriber);
+ Objects.requireNonNull(finisher);
+ return (status, headers) -> BodySubscriber.fromSubscriber(subscriber,
+ finisher);
+ }
+
+ /**
* Returns a response body handler which discards the response body and
* uses the given value as a replacement for it.
*
@@ -344,24 +414,14 @@
* Returns a {@code BodyHandler<String>} that returns a
* {@link BodySubscriber BodySubscriber}{@code <String>} obtained from
* {@link BodySubscriber#asString(Charset) BodySubscriber.asString(Charset)}.
- * If a charset is provided, the body is decoded using it. If charset is
- * {@code null} then the handler tries to determine the character set
- * from the {@code Content-encoding} header. If that charset is not
- * supported then {@link java.nio.charset.StandardCharsets#UTF_8 UTF_8}
- * is used.
+ * The body is decoded using the given character set.
*
- * @param charset The name of the charset to interpret the body as. If
- * {@code null} then the charset is determined from the
- * <i>Content-encoding</i> header.
+ * @param charset the character set to convert the body with
* @return a response body handler
*/
public static BodyHandler<String> asString(Charset charset) {
- return (status, headers) -> {
- if (charset != null) {
- return BodySubscriber.asString(charset);
- }
- return BodySubscriber.asString(charsetFrom(headers));
- };
+ Objects.requireNonNull(charset);
+ return (status, headers) -> BodySubscriber.asString(charset);
}
/**
@@ -386,11 +446,11 @@
*/
public static BodyHandler<Path> asFile(Path file, OpenOption... openOptions) {
Objects.requireNonNull(file);
+ List<OpenOption> opts = List.of(openOptions);
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
String fn = pathForSecurityCheck(file);
sm.checkWrite(fn);
- List<OpenOption> opts = Arrays.asList(openOptions);
if (opts.contains(StandardOpenOption.DELETE_ON_CLOSE))
sm.checkDelete(fn);
if (opts.contains(StandardOpenOption.READ))
@@ -450,11 +510,11 @@
public static BodyHandler<Path> asFileDownload(Path directory,
OpenOption... openOptions) {
Objects.requireNonNull(directory);
+ List<OpenOption> opts = List.of(openOptions);
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
String fn = pathForSecurityCheck(directory);
sm.checkWrite(fn);
- List<OpenOption> opts = Arrays.asList(openOptions);
if (opts.contains(StandardOpenOption.DELETE_ON_CLOSE))
sm.checkDelete(fn);
if (opts.contains(StandardOpenOption.READ))
@@ -494,6 +554,7 @@
* @return a response body handler
*/
public static BodyHandler<Void> asByteArrayConsumer(Consumer<Optional<byte[]>> consumer) {
+ Objects.requireNonNull(consumer);
return (status, headers) -> BodySubscriber.asByteArrayConsumer(consumer);
}
@@ -547,6 +608,7 @@
*/
public static <T> BodyHandler<T> buffering(BodyHandler<T> downstreamHandler,
int bufferSize) {
+ Objects.requireNonNull(downstreamHandler);
if (bufferSize <= 0)
throw new IllegalArgumentException("must be greater than 0");
return (status, headers) -> BodySubscriber
@@ -603,6 +665,53 @@
public CompletionStage<T> getBody();
/**
+ * Returns a body subscriber that forwards all response body to the
+ * given {@code Flow.Subscriber}. The {@linkplain #getBody()} completion
+ * stage} of the returned body subscriber completes after one of the
+ * given subscribers {@code onComplete} or {@code onError} has been
+ * invoked.
+ *
+ * @apiNote This method can be used as an adapter between {@code
+ * BodySubscriber} and {@code Flow.Subscriber}.
+ *
+ * @param <S> the type of the Subscriber
+ * @param subscriber the subscriber
+ * @return a body subscriber
+ */
+ public static <S extends Subscriber<? super List<ByteBuffer>>> BodySubscriber<Void>
+ fromSubscriber(S subscriber) {
+ return new ResponseSubscribers.SubscriberAdapter<S,Void>(subscriber, s -> null);
+ }
+
+ /**
+ * Returns a body subscriber that forwards all response body to the
+ * given {@code Flow.Subscriber}. The {@linkplain #getBody()} completion
+ * stage} of the returned body subscriber completes after one of the
+ * given subscribers {@code onComplete} or {@code onError} has been
+ * invoked.
+ *
+ * <p> The given {@code finisher} function is applied after the given
+ * subscriber's {@code onComplete} has been invoked. The {@code finisher}
+ * function is invoked with the given subscriber, and returns a value
+ * that is set as the response's body.
+ *
+ * @apiNote This method can be used as an adapter between {@code
+ * BodySubscriber} and {@code Flow.Subscriber}.
+ *
+ * @param <S> the type of the Subscriber
+ * @param <T> the type of the response body
+ * @param subscriber the subscriber
+ * @param finisher a function to be applied after the subscriber has
+ * completed
+ * @return a body subscriber
+ */
+ public static <S extends Subscriber<? super List<ByteBuffer>>,T> BodySubscriber<T>
+ fromSubscriber(S subscriber,
+ Function<S,T> finisher) {
+ return new ResponseSubscribers.SubscriberAdapter<S,T>(subscriber, finisher);
+ }
+
+ /**
* Returns a body subscriber which stores the response body as a {@code
* String} converted using the given {@code Charset}.
*
@@ -613,6 +722,7 @@
* @return a body subscriber
*/
public static BodySubscriber<String> asString(Charset charset) {
+ Objects.requireNonNull(charset);
return new ResponseSubscribers.ByteArraySubscriber<>(
bytes -> new String(bytes, charset)
);
@@ -662,11 +772,11 @@
*/
public static BodySubscriber<Path> asFile(Path file, OpenOption... openOptions) {
Objects.requireNonNull(file);
+ List<OpenOption> opts = List.of(openOptions);
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
String fn = pathForSecurityCheck(file);
sm.checkWrite(fn);
- List<OpenOption> opts = Arrays.asList(openOptions);
if (opts.contains(StandardOpenOption.DELETE_ON_CLOSE))
sm.checkDelete(fn);
if (opts.contains(StandardOpenOption.READ))
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainHttpConnection.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainHttpConnection.java Fri Jan 05 22:02:20 2018 +0100
@@ -84,7 +84,7 @@
boolean finished = chan.finishConnect();
assert finished : "Expected channel to be connected";
debug.log(Level.DEBUG,
- "ConnectEvent: connect finished: %s", finished);
+ "ConnectEvent: connect finished: %s Local addr: %s", finished, chan.getLocalAddress());
connected = true;
// complete async since the event runs on the SelectorManager thread
cf.completeAsync(() -> null, client().theExecutor());
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RequestPublishers.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RequestPublishers.java Fri Jan 05 22:02:20 2018 +0100
@@ -43,8 +43,10 @@
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
+import java.util.Objects;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Flow;
+import java.util.concurrent.Flow.Publisher;
import java.util.function.Supplier;
import jdk.incubator.http.HttpRequest.BodyPublisher;
import jdk.incubator.http.internal.common.Utils;
@@ -109,7 +111,7 @@
private volatile long contentLength;
IterablePublisher(Iterable<byte[]> content) {
- this.content = content;
+ this.content = Objects.requireNonNull(content);
}
// The ByteBufferIterator will iterate over the byte[] arrays in
@@ -323,7 +325,7 @@
private final Supplier<? extends InputStream> streamSupplier;
InputStreamPublisher(Supplier<? extends InputStream> streamSupplier) {
- this.streamSupplier = streamSupplier;
+ this.streamSupplier = Objects.requireNonNull(streamSupplier);
}
@Override
@@ -348,4 +350,26 @@
return -1;
}
}
+
+ static final class PublisherAdapter implements BodyPublisher {
+
+ private final Publisher<? extends ByteBuffer> publisher;
+ private final long contentLength;
+
+ PublisherAdapter(Publisher<? extends ByteBuffer> publisher,
+ long contentLength) {
+ this.publisher = Objects.requireNonNull(publisher);
+ this.contentLength = contentLength;
+ }
+
+ @Override
+ public final long contentLength() {
+ return contentLength;
+ }
+
+ @Override
+ public final void subscribe(Flow.Subscriber<? super ByteBuffer> subscriber) {
+ publisher.subscribe(subscriber);
+ }
+ }
}
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseContent.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseContent.java Fri Jan 05 22:02:20 2018 +0100
@@ -401,8 +401,8 @@
pusher.onSubscribe(this.sub = sub);
try {
if (contentLength == 0) {
+ onFinished.run();
pusher.onComplete();
- onFinished.run();
onComplete.accept(null);
}
} catch (Throwable t) {
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseSubscribers.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseSubscribers.java Fri Jan 05 22:02:20 2018 +0100
@@ -47,6 +47,8 @@
import java.util.concurrent.CompletionStage;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Flow;
+import java.util.concurrent.Flow.Subscriber;
+import java.util.concurrent.Flow.Subscription;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
import java.util.function.Function;
@@ -62,7 +64,7 @@
private final AtomicBoolean subscribed = new AtomicBoolean();
ConsumerSubscriber(Consumer<Optional<byte[]>> consumer) {
- this.consumer = consumer;
+ this.consumer = Objects.requireNonNull(consumer);
}
@Override
@@ -558,4 +560,69 @@
return cf;
}
}
+
+ /** An adapter between {@code BodySubscriber} and {@code Flow.Subscriber}. */
+ static final class SubscriberAdapter<S extends Subscriber<? super List<ByteBuffer>>,R>
+ implements HttpResponse.BodySubscriber<R>
+ {
+ private final CompletableFuture<R> cf = new MinimalFuture<>();
+ private final S subscriber;
+ private final Function<S,R> finisher;
+ private volatile Subscription subscription;
+
+ SubscriberAdapter(S subscriber, Function<S,R> finisher) {
+ this.subscriber = Objects.requireNonNull(subscriber);
+ this.finisher = Objects.requireNonNull(finisher);
+ }
+
+ @Override
+ public void onSubscribe(Subscription subscription) {
+ Objects.requireNonNull(subscription);
+ if (this.subscription != null) {
+ subscription.cancel();
+ } else {
+ this.subscription = subscription;
+ subscriber.onSubscribe(subscription);
+ }
+ }
+
+ @Override
+ public void onNext(List<ByteBuffer> item) {
+ Objects.requireNonNull(item);
+ try {
+ subscriber.onNext(item);
+ } catch (Throwable throwable) {
+ subscription.cancel();
+ onError(throwable);
+ }
+ }
+
+ @Override
+ public void onError(Throwable throwable) {
+ Objects.requireNonNull(throwable);
+ try {
+ subscriber.onError(throwable);
+ } finally {
+ cf.completeExceptionally(throwable);
+ }
+ }
+
+ @Override
+ public void onComplete() {
+ try {
+ subscriber.onComplete();
+ } finally {
+ try {
+ cf.complete(finisher.apply(subscriber));
+ } catch (Throwable throwable) {
+ cf.completeExceptionally(throwable);
+ }
+ }
+ }
+
+ @Override
+ public CompletionStage<R> getBody() {
+ return cf;
+ }
+ }
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -264,8 +264,7 @@
.addTab(resources.getText("doclet.Abstract_Methods"), utils::isAbstract)
.addTab(resources.getText("doclet.Concrete_Methods"),
e -> !utils.isAbstract(e) && !utils.isInterface(e.getEnclosingElement()))
- .addTab(resources.getText("doclet.Default_Methods"),
- e -> !utils.isAbstract(e) && utils.isInterface(e.getEnclosingElement()))
+ .addTab(resources.getText("doclet.Default_Methods"), utils::isDefault)
.addTab(resources.getText("doclet.Deprecated_Methods"),
e -> utils.isDeprecated(e) || utils.isDeprecated(typeElement))
.setTabScriptVariable("methods")
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/debug/InternalDebugControl.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/debug/InternalDebugControl.java Fri Jan 05 22:02:20 2018 +0100
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java Fri Jan 05 22:02:20 2018 +0100
@@ -1286,7 +1286,7 @@
}
boolean useOptimisticTypes() {
- return !lc.inSplitNode() && compiler.useOptimisticTypes();
+ return !lc.inSplitLiteral() && compiler.useOptimisticTypes();
}
@Override
@@ -2924,12 +2924,12 @@
// to synthetic functions, and FunctionNode.needsCallee() will no longer need to test for isSplit().
final int literalSlot = fixScopeSlot(currentFunction, 3);
- lc.enterSplitNode();
+ lc.enterSplitLiteral();
creator.populateRange(method, literalType, literalSlot, splitRange.getLow(), splitRange.getHigh());
method._return();
- lc.exitSplitNode();
+ lc.exitSplitLiteral();
method.end();
lc.releaseSlots();
popMethodEmitter();
@@ -4708,10 +4708,12 @@
this.optimistic = optimistic;
this.expression = (Expression)optimistic;
this.resultBounds = resultBounds;
- this.isOptimistic = isOptimistic(optimistic) && useOptimisticTypes() &&
+ this.isOptimistic = isOptimistic(optimistic)
// Operation is only effectively optimistic if its type, after being coerced into the result bounds
// is narrower than the upper bound.
- resultBounds.within(Type.generic(((Expression)optimistic).getType())).narrowerThan(resultBounds.widest);
+ && resultBounds.within(Type.generic(((Expression)optimistic).getType())).narrowerThan(resultBounds.widest);
+ // Optimistic operations need to be executed in optimistic context, else unwarranted optimism will go unnoticed
+ assert !this.isOptimistic || useOptimisticTypes();
}
MethodEmitter emit() {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java Fri Jan 05 22:02:20 2018 +0100
@@ -68,7 +68,7 @@
private final Deque<Map<String, Collection<Label>>> unwarrantedOptimismHandlers = new ArrayDeque<>();
private final Deque<StringBuilder> slotTypesDescriptors = new ArrayDeque<>();
- private final IntDeque splitNodes = new IntDeque();
+ private final IntDeque splitLiterals = new IntDeque();
/** A stack tracking the next free local variable slot in the blocks. There's one entry for every block
* currently on the lexical context stack. */
@@ -89,18 +89,18 @@
if (((FunctionNode)node).inDynamicContext()) {
dynamicScopeCount++;
}
- splitNodes.push(0);
+ splitLiterals.push(0);
}
return super.push(node);
}
- void enterSplitNode() {
- splitNodes.getAndIncrement();
+ void enterSplitLiteral() {
+ splitLiterals.getAndIncrement();
pushFreeSlots(methodEmitters.peek().getUsedSlotsWithLiveTemporaries());
}
- void exitSplitNode() {
- final int count = splitNodes.decrementAndGet();
+ void exitSplitLiteral() {
+ final int count = splitLiterals.decrementAndGet();
assert count >= 0;
}
@@ -115,8 +115,8 @@
dynamicScopeCount--;
assert dynamicScopeCount >= 0;
}
- assert splitNodes.peek() == 0;
- splitNodes.pop();
+ assert splitLiterals.peek() == 0;
+ splitLiterals.pop();
}
return popped;
}
@@ -125,8 +125,8 @@
return dynamicScopeCount > 0;
}
- boolean inSplitNode() {
- return !splitNodes.isEmpty() && splitNodes.peek() > 0;
+ boolean inSplitLiteral() {
+ return !splitLiterals.isEmpty() && splitLiterals.peek() > 0;
}
MethodEmitter pushMethodEmitter(final MethodEmitter newMethod) {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java Fri Jan 05 22:02:20 2018 +0100
@@ -42,8 +42,10 @@
import jdk.nashorn.internal.ir.IfNode;
import jdk.nashorn.internal.ir.IndexNode;
import jdk.nashorn.internal.ir.JoinPredecessorExpression;
+import jdk.nashorn.internal.ir.LiteralNode;
import jdk.nashorn.internal.ir.LoopNode;
import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.ObjectNode;
import jdk.nashorn.internal.ir.Optimistic;
import jdk.nashorn.internal.ir.PropertyNode;
import jdk.nashorn.internal.ir.Symbol;
@@ -190,6 +192,23 @@
}
@Override
+ public boolean enterObjectNode(ObjectNode objectNode) {
+ if (objectNode.getSplitRanges() != null) {
+ return false;
+ }
+ return super.enterObjectNode(objectNode);
+ }
+
+ @Override
+ public boolean enterLiteralNode(LiteralNode<?> literalNode) {
+ if (literalNode.isArray() && ((LiteralNode.ArrayLiteralNode) literalNode).getSplitRanges() != null) {
+ return false;
+ }
+
+ return super.enterLiteralNode(literalNode);
+ }
+
+ @Override
public boolean enterWhileNode(final WhileNode whileNode) {
// Test is never optimistic (always coerced to boolean).
tagNeverOptimisticLoopTest(whileNode);
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Splitter.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Splitter.java Fri Jan 05 22:02:20 2018 +0100
@@ -112,7 +112,7 @@
assert lc.isEmpty() : "LexicalContext not empty";
if (weight >= SPLIT_THRESHOLD) {
- log.info("Splitting '", functionNode.getName(), "' as its weight ", weight, " exceeds split threshold ", SPLIT_THRESHOLD);
+ log.info("Splitting function '", functionNode.getName(), "' as its weight ", weight, " exceeds split threshold ", SPLIT_THRESHOLD);
functionNode = (FunctionNode)functionNode.accept(this);
if (functionNode.isSplit()) {
@@ -287,7 +287,7 @@
@SuppressWarnings("rawtypes")
@Override
public Node leaveLiteralNode(final LiteralNode literal) {
- long weight = WeighNodes.weigh(literal);
+ final long weight = WeighNodes.weigh(literal);
if (weight < SPLIT_THRESHOLD) {
return literal;
@@ -310,14 +310,14 @@
final int postset = postsets[i];
final Node element = value[postset];
- weight = WeighNodes.weigh(element);
- totalWeight += WeighNodes.AASTORE_WEIGHT + weight;
+ final long elementWeight = WeighNodes.weigh(element);
+ totalWeight += WeighNodes.AASTORE_WEIGHT + elementWeight;
if (totalWeight >= SPLIT_THRESHOLD) {
- final CompileUnit unit = compiler.findUnit(totalWeight - weight);
+ final CompileUnit unit = compiler.findUnit(totalWeight - elementWeight);
ranges.add(new Splittable.SplitRange(unit, lo, i));
lo = i;
- totalWeight = weight;
+ totalWeight = elementWeight;
}
}
@@ -326,6 +326,8 @@
ranges.add(new Splittable.SplitRange(unit, lo, postsets.length));
}
+ log.info("Splitting array literal in '", functionNode.getName(), "' as its weight ", weight, " exceeds split threshold ", SPLIT_THRESHOLD);
+
return arrayLiteralNode.setSplitRanges(lc, ranges);
}
@@ -334,7 +336,7 @@
@Override
public Node leaveObjectNode(final ObjectNode objectNode) {
- long weight = WeighNodes.weigh(objectNode);
+ final long weight = WeighNodes.weigh(objectNode);
if (weight < SPLIT_THRESHOLD) {
return objectNode;
@@ -355,14 +357,14 @@
final boolean isConstant = LiteralNode.isConstant(property.getValue());
if (!isConstant || !isSpillObject) {
- weight = isConstant ? 0 : WeighNodes.weigh(property.getValue());
- totalWeight += WeighNodes.AASTORE_WEIGHT + weight;
+ final long propertyWeight = isConstant ? 0 : WeighNodes.weigh(property.getValue());
+ totalWeight += WeighNodes.AASTORE_WEIGHT + propertyWeight;
if (totalWeight >= SPLIT_THRESHOLD) {
- final CompileUnit unit = compiler.findUnit(totalWeight - weight);
+ final CompileUnit unit = compiler.findUnit(totalWeight - propertyWeight);
ranges.add(new Splittable.SplitRange(unit, lo, i));
lo = i;
- totalWeight = weight;
+ totalWeight = propertyWeight;
}
}
}
@@ -372,6 +374,8 @@
ranges.add(new Splittable.SplitRange(unit, lo, properties.size()));
}
+ log.info("Splitting object node in '", functionNode.getName(), "' as its weight ", weight, " exceeds split threshold ", SPLIT_THRESHOLD);
+
return objectNode.setSplitRanges(lc, ranges);
}
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/GetSplitState.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/GetSplitState.java Fri Jan 05 22:02:20 2018 +0100
@@ -27,6 +27,7 @@
import jdk.nashorn.internal.codegen.CompilerConstants;
import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.annotations.Ignore;
import jdk.nashorn.internal.ir.visitor.NodeVisitor;
import jdk.nashorn.internal.runtime.Scope;
@@ -39,6 +40,7 @@
private static final long serialVersionUID = 1L;
/** The sole instance of this AST node. */
+ @Ignore
public final static GetSplitState INSTANCE = new GetSplitState();
private GetSplitState() {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java Fri Jan 05 22:02:20 2018 +0100
@@ -30,6 +30,7 @@
import java.util.List;
import jdk.nashorn.internal.codegen.types.ArrayType;
import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.annotations.Ignore;
import jdk.nashorn.internal.ir.annotations.Immutable;
import jdk.nashorn.internal.ir.visitor.NodeVisitor;
import jdk.nashorn.internal.objects.NativeArray;
@@ -633,6 +634,7 @@
private final int[] postsets;
/** Ranges for splitting up large literals in code generation */
+ @Ignore
private final List<Splittable.SplitRange> splitRanges;
/** Does this array literal have a spread element? */
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ObjectNode.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ObjectNode.java Fri Jan 05 22:02:20 2018 +0100
@@ -29,6 +29,7 @@
import java.util.List;
import java.util.RandomAccess;
import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.annotations.Ignore;
import jdk.nashorn.internal.ir.annotations.Immutable;
import jdk.nashorn.internal.ir.visitor.NodeVisitor;
@@ -43,6 +44,7 @@
private final List<PropertyNode> elements;
/** Ranges for splitting large literals over multiple compile units in codegen. */
+ @Ignore
private final List<Splittable.SplitRange> splitRanges;
/**
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJavaImporter.java Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJavaImporter.java Fri Jan 05 22:02:20 2018 +0100
@@ -25,26 +25,14 @@
package jdk.nashorn.internal.objects;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
-
-import jdk.dynalink.CallSiteDescriptor;
import jdk.dynalink.beans.StaticClass;
-import jdk.dynalink.linker.GuardedInvocation;
-import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.internal.objects.annotations.Attribute;
import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
import jdk.nashorn.internal.objects.annotations.ScriptClass;
import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.FindProperty;
import jdk.nashorn.internal.runtime.NativeJavaPackage;
import jdk.nashorn.internal.runtime.PropertyMap;
import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
-import jdk.nashorn.internal.runtime.WithObject;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
/**
* This is "JavaImporter" constructor. This constructor allows you to use Java types omitting explicit package names.
@@ -98,88 +86,19 @@
return new NativeJavaImporter(args);
}
- /**
- * "No such property" handler.
- *
- * @param self self reference
- * @param name property name
- * @return value of the missing property
- */
- @Function(attributes = Attribute.NOT_ENUMERABLE)
- public static Object __noSuchProperty__(final Object self, final Object name) {
- final NativeJavaImporter javaImporter = getJavaImporter(self);
- if (javaImporter != null) {
- return javaImporter.createProperty(JSType.toString(name));
- }
- throw typeError("not.a.java.importer", ScriptRuntime.safeToString(self));
- }
-
- private static NativeJavaImporter getJavaImporter(Object self) {
- final NativeJavaImporter expression;
- if (self instanceof NativeJavaImporter) {
- expression = (NativeJavaImporter)self;
- } else if (self instanceof ScriptObject) {
- expression = getJavaImporterInScope((ScriptObject)self);
- } else {
- expression = null;
- }
- return expression;
- }
-
- private static NativeJavaImporter getJavaImporterInScope(ScriptObject self) {
- for (ScriptObject obj = self; obj != null; obj = obj.getProto()) {
- if (obj instanceof WithObject) {
- final ScriptObject expression = ((WithObject)obj).getExpression();
- if (expression instanceof NativeJavaImporter) {
- return (NativeJavaImporter)expression;
- }
+ @Override
+ protected FindProperty findProperty(final Object key, final boolean deep, final boolean isScope, final ScriptObject start) {
+ final FindProperty find = super.findProperty(key, deep, isScope, start);
+ if (find == null && key instanceof String) {
+ final String name = (String) key;
+ final Object value = createProperty(name);
+ if(value != null) {
+ // We must avoid calling findProperty recursively, so we pass null as first argument
+ setObject(null, 0, key, value);
+ return super.findProperty(key, deep, isScope, start);
}
}
- return null;
- }
-
- /**
- * "No such method call" handler
- *
- * @param self self reference
- * @param args arguments to method
- * @return never returns always throw TypeError
- */
- @Function(attributes = Attribute.NOT_ENUMERABLE)
- public static Object __noSuchMethod__(final Object self, final Object... args) {
- throw typeError("not.a.function", ScriptRuntime.safeToString(args[0]));
- }
-
- @Override
- public GuardedInvocation noSuchProperty(final CallSiteDescriptor desc, final LinkRequest request) {
- return createAndSetProperty(desc) ? super.lookup(desc, request) : super.noSuchProperty(desc, request);
- }
-
- @Override
- public GuardedInvocation noSuchMethod(final CallSiteDescriptor desc, final LinkRequest request) {
- return createAndSetProperty(desc) ? super.lookup(desc, request) : super.noSuchMethod(desc, request);
- }
-
- @Override
- protected Object invokeNoSuchProperty(final Object key, final boolean isScope, final int programPoint) {
- if (!(key instanceof String)) {
- return super.invokeNoSuchProperty(key, isScope, programPoint);
- }
- final Object retval = createProperty((String) key);
- if (isValid(programPoint)) {
- throw new UnwarrantedOptimismException(retval, programPoint);
- }
- return retval;
- }
-
- private boolean createAndSetProperty(final CallSiteDescriptor desc) {
- final String name = NashornCallSiteDescriptor.getOperand(desc);
- final Object value = createProperty(name);
- if(value != null) {
- set(name, value, 0);
- return true;
- }
- return false;
+ return find;
}
private Object createProperty(final String name) {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js Fri Jan 05 22:02:20 2018 +0100
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js Thu Jan 04 22:47:38 2018 -0800
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js Fri Jan 05 22:02:20 2018 +0100
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/test/hotspot/jtreg/TEST.ROOT Thu Jan 04 22:47:38 2018 -0800
+++ b/test/hotspot/jtreg/TEST.ROOT Fri Jan 05 22:02:20 2018 +0100
@@ -58,7 +58,7 @@
docker.support
# Minimum jtreg version
-requiredVersion=4.2 b08
+requiredVersion=4.2 b11
# Path to libraries in the topmost test directory. This is needed so @library
# does not need ../../../ notation to reach them
--- a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java Fri Jan 05 22:02:20 2018 +0100
@@ -47,10 +47,6 @@
{"InitialRAMFraction", "64"},
{"AssumeMP", "false"},
{"UseMembar", "true"},
- {"FastTLABRefill", "false"},
- {"DeferPollingPageLoopCount", "-1"},
- {"SafepointSpinBeforeYield", "2000"},
- {"DeferThrSuspendLoopCount", "4000"},
// deprecated alias flags (see also aliased_jvm_flags):
{"DefaultMaxRAMFraction", "4"},
@@ -110,6 +106,5 @@
testDeprecated(DEPRECATED_OPTIONS); // Make sure that each deprecated option is mentioned in the output.
testDeprecatedDiagnostic("UnsyncloadClass", "false");
testDeprecatedDiagnostic("IgnoreUnverifiableClassesDuringDump", "false");
- testDeprecatedExperimental("UseCGroupMemoryLimitForHeap", "true");
}
}
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java Fri Jan 05 22:02:20 2018 +0100
@@ -58,7 +58,7 @@
"Abstract_VM_Version::_vm_major_version",
"ClassLoaderDataGraph::_head", "SymbolTable::_the_table",
"JNIHandles::_weak_global_handles", "PerfMemory::_top",
- "_jfr_checkpoints", "ObjectSynchronizer::gBlockList",
+ "ObjectSynchronizer::gBlockList",
"java_lang_Class::_oop_size_offset",
"CodeCache::_scavenge_root_nmethods"));
expStrMap.put("printstatics SystemDictionary", List.of(
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java Fri Jan 05 22:02:20 2018 +0100
@@ -51,7 +51,7 @@
Map<String, List<String>> expStrMap = new HashMap<>();
expStrMap.put("symboldump", List.of(
- "java/lang/String", "java/util/HashMap", "UsageTracker",
+ "java/lang/String", "java/util/HashMap",
"Ljava/io/InputStream", "LambdaMetafactory", "PerfCounter",
"isAnonymousClass", "JVMTI_THREAD_STATE_TERMINATED", "jdi",
"checkGetClassLoaderPermission", "lockCreationTime",
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbWhere.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbWhere.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,7 @@
"private static void processPendingReferences",
"private static native void waitForReferencePendingList",
"Java Stack Trace for main",
- "public static native void sleep"));
+ "public static void main"));
test.run(theApp.getPid(), cmds, expStrMap, null);
} catch (Exception ex) {
--- a/test/hotspot/jtreg/serviceability/sa/TestClassDump.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/hotspot/jtreg/serviceability/sa/TestClassDump.java Fri Jan 05 22:02:20 2018 +0100
@@ -76,8 +76,8 @@
if (Files.notExists(Paths.get("jtreg_classes2", "sun", "util", "calendar", "BaseCalendar.class"))) {
throw new RuntimeException("jtreg_classes2/sun/util/calendar/BaseCalendar.class not found");
}
- if (Files.notExists(Paths.get("jtreg_classes2", "jdk", "internal", "vm", "PostVMInitHook.class"))) {
- throw new RuntimeException("jtreg_classes2/jdk/internal/vm/PostVMInitHook.class not found");
+ if (Files.notExists(Paths.get("jtreg_classes2", "jdk", "internal", "loader", "BootLoader.class"))) {
+ throw new RuntimeException("jtreg_classes2/jdk/internal/loader/BootLoader.class not found");
}
}
--- a/test/jaxp/TEST.ROOT Thu Jan 04 22:47:38 2018 -0800
+++ b/test/jaxp/TEST.ROOT Fri Jan 05 22:02:20 2018 +0100
@@ -23,7 +23,7 @@
groups=TEST.groups
# Minimum jtreg version
-requiredVersion=4.2 b08
+requiredVersion=4.2 b11
# Path to libraries in the topmost test directory. This is needed so @library
# does not need ../../ notation to reach them
--- a/test/jdk/TEST.ROOT Thu Jan 04 22:47:38 2018 -0800
+++ b/test/jdk/TEST.ROOT Fri Jan 05 22:02:20 2018 +0100
@@ -40,7 +40,7 @@
vm.cds
# Minimum jtreg version
-requiredVersion=4.2 b09
+requiredVersion=4.2 b11
# Path to libraries in the topmost test directory. This is needed so @library
# does not need ../../ notation to reach them
--- a/test/jdk/java/awt/FileDialog/MoveToTrashTest.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/jdk/java/awt/FileDialog/MoveToTrashTest.java Fri Jan 05 22:02:20 2018 +0100
@@ -23,7 +23,7 @@
/*
@test
- @bug 8190515
+ @bug 8190515 8193468
@summary java.awt.Desktop.moveToTrash(File) prompts on Windows 7 but not on Mac.
@run main MoveToTrashTest
*/
@@ -39,18 +39,23 @@
private static boolean fileStatus = false;
public static void main(String[] args) {
- try {
- file = File.createTempFile("TestFile","txt");
- } catch (IOException ex) {
- throw new RuntimeException("Test failed. Exception thrown: ", ex);
- }
+ if (!Desktop.getDesktop().isSupported(Desktop.Action.MOVE_TO_TRASH)) {
+ System.out.println("Move to trash action is not supported on the"+
+ " platform under test. Marking the test passed");
+ } else {
+ try {
+ file = File.createTempFile("TestFile","txt");
+ } catch (IOException ex) {
+ throw new RuntimeException("Test failed. Exception thrown: ", ex);
+ }
- // In case any UI that may pop up while deleting the file would
- // block this thread until the user actions them. Hence do file
- // check in a different thread and we assume it takes about sometime
- // till it deletes the file(or popup) on the main thread.
- new Thread(null, MoveToTrashTest::checkFileExistence, "FileCheck", 0, false).start();
- fileStatus = Desktop.getDesktop().moveToTrash(file);
+ // In case any UI that may pop up while deleting the file would
+ // block this thread until the user actions them. Hence do file
+ // check in a different thread and we assume it takes about sometime
+ // till it deletes the file(or popup) on the main thread.
+ new Thread(null, MoveToTrashTest::checkFileExistence, "FileCheck", 0, false).start();
+ fileStatus = Desktop.getDesktop().moveToTrash(file);
+ }
}
private static void checkFileExistence() {
@@ -63,10 +68,10 @@
robot.delay(1500);
- if(!fileStatus) {
+ if (!fileStatus) {
throw new RuntimeException("Test failed due to error while deleting the file");
} else {
- if(file.exists()) {
+ if (file.exists()) {
throw new RuntimeException("Test failed");
} else {
System.out.println("Test passed");
--- a/test/jdk/java/io/InputStream/ReadAllBytes.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/jdk/java/io/InputStream/ReadAllBytes.java Fri Jan 05 22:02:20 2018 +0100
@@ -31,7 +31,7 @@
/*
* @test
- * @bug 8080835
+ * @bug 8080835 8193832
* @library /test/lib
* @build jdk.test.lib.RandomFactory
* @run main ReadAllBytes
@@ -47,15 +47,11 @@
test(new byte[]{});
test(new byte[]{1, 2, 3});
test(createRandomBytes(1024));
- test(createRandomBytes((1 << 13) - 1));
- test(createRandomBytes((1 << 13)));
- test(createRandomBytes((1 << 13) + 1));
- test(createRandomBytes((1 << 15) - 1));
- test(createRandomBytes((1 << 15)));
- test(createRandomBytes((1 << 15) + 1));
- test(createRandomBytes((1 << 17) - 1));
- test(createRandomBytes((1 << 17)));
- test(createRandomBytes((1 << 17) + 1));
+ for (int shift : new int[] {13, 14, 15, 17}) {
+ for (int offset : new int[] {-1, 0, 1}) {
+ test(createRandomBytes((1 << shift) + offset));
+ }
+ }
}
static void test(byte[] expectedBytes) throws IOException {
--- a/test/jdk/java/lang/ref/ReferenceEnqueue.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/jdk/java/lang/ref/ReferenceEnqueue.java Fri Jan 05 22:02:20 2018 +0100
@@ -25,7 +25,6 @@
* @bug 4268317 8132306 8175797
* @summary Test if Reference.enqueue() works properly with GC
* @run main ReferenceEnqueue
- * @run main/othervm -Djdk.lang.ref.disableClearBeforeEnqueue=true ReferenceEnqueue
*/
import java.lang.ref.*;
@@ -87,8 +86,6 @@
final ReferenceQueue<Object> queue = new ReferenceQueue<>();
final List<Reference<Object>> refs = new ArrayList<>();
final int iterations = 1000;
- final boolean disableClearBeforeEnqueue =
- Boolean.getBoolean("jdk.lang.ref.disableClearBeforeEnqueue");
ExplicitEnqueue() {
this.refs.add(new SoftReference<>(new Object(), queue));
@@ -101,10 +98,7 @@
if (ref.enqueue() == false) {
throw new RuntimeException("Error: enqueue failed");
}
- if (disableClearBeforeEnqueue && ref.get() == null) {
- throw new RuntimeException("Error: clearing should be disabled");
- }
- if (!disableClearBeforeEnqueue && ref.get() != null) {
+ if (ref.get() != null) {
throw new RuntimeException("Error: referent must be cleared");
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java Fri Jan 05 22:02:20 2018 +0100
@@ -0,0 +1,394 @@
+/*
+ * 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.
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.nio.MappedByteBuffer;
+import java.util.Arrays;
+import java.util.concurrent.Flow;
+import java.util.concurrent.Flow.Publisher;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.incubator.http.HttpClient;
+import jdk.incubator.http.HttpRequest;
+import jdk.incubator.http.HttpResponse;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import javax.net.ssl.SSLContext;
+import static java.util.stream.Collectors.joining;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static jdk.incubator.http.HttpRequest.BodyPublisher.fromPublisher;
+import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+/*
+ * @test
+ * @summary Basic tests for Flow adapter Publishers
+ * @modules java.base/sun.net.www.http
+ * jdk.incubator.httpclient/jdk.incubator.http.internal.common
+ * jdk.incubator.httpclient/jdk.incubator.http.internal.frame
+ * jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ * java.logging
+ * jdk.httpserver
+ * @library /lib/testlibrary http2/server
+ * @build Http2TestServer
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @run testng/othervm FlowAdapterPublisherTest
+ */
+
+public class FlowAdapterPublisherTest {
+
+ SSLContext sslContext;
+ HttpServer httpTestServer; // HTTP/1.1 [ 4 servers ]
+ HttpsServer httpsTestServer; // HTTPS/1.1
+ Http2TestServer http2TestServer; // HTTP/2 ( h2c )
+ Http2TestServer https2TestServer; // HTTP/2 ( h2 )
+ String httpURI;
+ String httpsURI;
+ String http2URI;
+ String https2URI;
+
+ @DataProvider(name = "uris")
+ public Object[][] variants() {
+ return new Object[][]{
+ { httpURI },
+ { httpsURI },
+ { http2URI },
+ { https2URI },
+ };
+ }
+
+ static final Class<NullPointerException> NPE = NullPointerException.class;
+ static final Class<IllegalArgumentException> IAE = IllegalArgumentException.class;
+
+ @Test
+ public void testAPIExceptions() {
+ assertThrows(NPE, () -> fromPublisher(null));
+ assertThrows(NPE, () -> fromPublisher(null, 1));
+ assertThrows(IAE, () -> fromPublisher(new BBPublisher(), 0));
+ assertThrows(IAE, () -> fromPublisher(new BBPublisher(), -1));
+ assertThrows(IAE, () -> fromPublisher(new BBPublisher(), Long.MIN_VALUE));
+
+ Publisher publisher = fromPublisher(new BBPublisher());
+ assertThrows(NPE, () -> publisher.subscribe(null));
+ }
+
+ // Flow.Publisher<ByteBuffer>
+
+ @Test(dataProvider = "uris")
+ void testByteBufferPublisherUnknownLength(String url) {
+ String[] body = new String[] { "You know ", "it's summer ", "in Ireland ",
+ "when the ", "rain gets ", "warmer." };
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromPublisher(new BBPublisher(body))).build();
+
+ HttpResponse<String> response = client.sendAsync(request, asString(UTF_8)).join();
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, Arrays.stream(body).collect(joining()));
+ }
+
+ @Test(dataProvider = "uris")
+ void testByteBufferPublisherFixedLength(String url) {
+ String[] body = new String[] { "You know ", "it's summer ", "in Ireland ",
+ "when the ", "rain gets ", "warmer." };
+ int cl = Arrays.stream(body).mapToInt(String::length).sum();
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromPublisher(new BBPublisher(body), cl)).build();
+
+ HttpResponse<String> response = client.sendAsync(request, asString(UTF_8)).join();
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, Arrays.stream(body).collect(joining()));
+ }
+
+ // Flow.Publisher<MappedByteBuffer>
+
+ @Test(dataProvider = "uris")
+ void testMappedByteBufferPublisherUnknownLength(String url) {
+ String[] body = new String[] { "God invented ", "whiskey to ", "keep the ",
+ "Irish from ", "ruling the ", "world." };
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromPublisher(new MBBPublisher(body))).build();
+
+ HttpResponse<String> response = client.sendAsync(request, asString(UTF_8)).join();
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, Arrays.stream(body).collect(joining()));
+ }
+
+ @Test(dataProvider = "uris")
+ void testMappedByteBufferPublisherFixedLength(String url) {
+ String[] body = new String[] { "God invented ", "whiskey to ", "keep the ",
+ "Irish from ", "ruling the ", "world." };
+ int cl = Arrays.stream(body).mapToInt(String::length).sum();
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromPublisher(new MBBPublisher(body), cl)).build();
+
+ HttpResponse<String> response = client.sendAsync(request, asString(UTF_8)).join();
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, Arrays.stream(body).collect(joining()));
+ }
+
+ // The following two tests depend on Exception detail messages, which is
+ // not ideal, but necessary to discern correct behavior. They should be
+ // updated if the exception message is updated.
+
+ @Test(dataProvider = "uris")
+ void testPublishTooFew(String url) throws InterruptedException {
+ String[] body = new String[] { "You know ", "it's summer ", "in Ireland ",
+ "when the ", "rain gets ", "warmer." };
+ int cl = Arrays.stream(body).mapToInt(String::length).sum() + 1; // length + 1
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromPublisher(new BBPublisher(body), cl)).build();
+
+ try {
+ HttpResponse<String> response = client.send(request, asString(UTF_8));
+ fail("Unexpected response: " + response);
+ } catch (IOException expected) {
+ assertTrue(expected.getMessage().contains("Too few bytes returned"),
+ "Exception message:[" + expected.toString() + "]");
+ }
+ }
+
+ @Test(dataProvider = "uris")
+ void testPublishTooMany(String url) throws InterruptedException {
+ String[] body = new String[] { "You know ", "it's summer ", "in Ireland ",
+ "when the ", "rain gets ", "warmer." };
+ int cl = Arrays.stream(body).mapToInt(String::length).sum() - 1; // length - 1
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromPublisher(new BBPublisher(body), cl)).build();
+
+ try {
+ HttpResponse<String> response = client.send(request, asString(UTF_8));
+ fail("Unexpected response: " + response);
+ } catch (IOException expected) {
+ assertTrue(expected.getMessage().contains("Too many bytes in request body"),
+ "Exception message:[" + expected.toString() + "]");
+ }
+ }
+
+ static class BBPublisher extends AbstractPublisher
+ implements Flow.Publisher<ByteBuffer>
+ {
+ BBPublisher(String... bodyParts) { super(bodyParts); }
+
+ @Override
+ public void subscribe(Flow.Subscriber<? super ByteBuffer> subscriber) {
+ this.subscriber = subscriber;
+ subscriber.onSubscribe(new InternalSubscription());
+ }
+ }
+
+ static class MBBPublisher extends AbstractPublisher
+ implements Flow.Publisher<MappedByteBuffer>
+ {
+ MBBPublisher(String... bodyParts) { super(bodyParts); }
+
+ @Override
+ public void subscribe(Flow.Subscriber<? super MappedByteBuffer> subscriber) {
+ this.subscriber = subscriber;
+ subscriber.onSubscribe(new InternalSubscription());
+ }
+ }
+
+ static abstract class AbstractPublisher {
+ private final String[] bodyParts;
+ protected volatile Flow.Subscriber subscriber;
+
+ AbstractPublisher(String... bodyParts) {
+ this.bodyParts = bodyParts;
+ }
+
+ class InternalSubscription implements Flow.Subscription {
+
+ private final AtomicLong demand = new AtomicLong();
+ private final AtomicBoolean cancelled = new AtomicBoolean();
+ private volatile int position;
+
+ private static final int IDLE = 1;
+ private static final int PUSHING = 2;
+ private static final int AGAIN = 4;
+ private final AtomicInteger state = new AtomicInteger(IDLE);
+
+ @Override
+ public void request(long n) {
+ if (n <= 0L) {
+ subscriber.onError(new IllegalArgumentException(
+ "non-positive subscription request"));
+ return;
+ }
+ if (cancelled.get()) {
+ return;
+ }
+
+ while (true) {
+ long prev = demand.get(), d;
+ if ((d = prev + n) < prev) // saturate
+ d = Long.MAX_VALUE;
+ if (demand.compareAndSet(prev, d))
+ break;
+ }
+
+ while (true) {
+ int s = state.get();
+ if (s == IDLE) {
+ if (state.compareAndSet(IDLE, PUSHING)) {
+ while (true) {
+ push();
+ if (state.compareAndSet(PUSHING, IDLE))
+ return;
+ else if (state.compareAndSet(AGAIN, PUSHING))
+ continue;
+ }
+ }
+ } else if (s == PUSHING) {
+ if (state.compareAndSet(PUSHING, AGAIN))
+ return;
+ } else if (s == AGAIN){
+ // do nothing, the pusher will already rerun
+ return;
+ } else {
+ throw new AssertionError("Unknown state:" + s);
+ }
+ }
+ }
+
+ private void push() {
+ long prev;
+ while ((prev = demand.get()) > 0) {
+ if (!demand.compareAndSet(prev, prev -1))
+ continue;
+
+ int index = position;
+ if (index < bodyParts.length) {
+ position++;
+ subscriber.onNext(ByteBuffer.wrap(bodyParts[index].getBytes(UTF_8)));
+ }
+ }
+
+ if (position == bodyParts.length && !cancelled.get()) {
+ cancelled.set(true);
+ subscriber.onComplete();
+ }
+ }
+
+ @Override
+ public void cancel() {
+ if (cancelled.compareAndExchange(false, true))
+ return; // already cancelled
+ }
+ }
+ }
+
+ @BeforeTest
+ public void setup() throws Exception {
+ sslContext = new SimpleSSLContext().get();
+ if (sslContext == null)
+ throw new AssertionError("Unexpected null sslContext");
+
+ InetSocketAddress sa = new InetSocketAddress("localhost", 0);
+ httpTestServer = HttpServer.create(sa, 0);
+ httpTestServer.createContext("/http1/echo", new Http1EchoHandler());
+ httpURI = "http://127.0.0.1:" + httpTestServer.getAddress().getPort() + "/http1/echo";
+
+ httpsTestServer = HttpsServer.create(sa, 0);
+ httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+ httpsTestServer.createContext("/https1/echo", new Http1EchoHandler());
+ httpsURI = "https://127.0.0.1:" + httpsTestServer.getAddress().getPort() + "/https1/echo";
+
+ http2TestServer = new Http2TestServer("127.0.0.1", false, 0);
+ http2TestServer.addHandler(new Http2EchoHandler(), "/http2/echo");
+ int port = http2TestServer.getAddress().getPort();
+ http2URI = "http://127.0.0.1:" + port + "/http2/echo";
+
+ https2TestServer = new Http2TestServer("127.0.0.1", true, 0);
+ https2TestServer.addHandler(new Http2EchoHandler(), "/https2/echo");
+ port = https2TestServer.getAddress().getPort();
+ https2URI = "https://127.0.0.1:" + port + "/https2/echo";
+
+ httpTestServer.start();
+ httpsTestServer.start();
+ http2TestServer.start();
+ https2TestServer.start();
+ }
+
+ @AfterTest
+ public void teardown() throws Exception {
+ httpTestServer.stop(0);
+ httpsTestServer.stop(0);
+ http2TestServer.stop();
+ https2TestServer.stop();
+ }
+
+ static class Http1EchoHandler implements HttpHandler {
+ @Override
+ public void handle(HttpExchange t) throws IOException {
+ try (InputStream is = t.getRequestBody();
+ OutputStream os = t.getResponseBody()) {
+ byte[] bytes = is.readAllBytes();
+ t.sendResponseHeaders(200, bytes.length);
+ os.write(bytes);
+ }
+ }
+ }
+
+ static class Http2EchoHandler implements Http2Handler {
+ @Override
+ public void handle(Http2TestExchange t) throws IOException {
+ try (InputStream is = t.getRequestBody();
+ OutputStream os = t.getResponseBody()) {
+ byte[] bytes = is.readAllBytes();
+ t.sendResponseHeaders(200, bytes.length);
+ os.write(bytes);
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java Fri Jan 05 22:02:20 2018 +0100
@@ -0,0 +1,500 @@
+/*
+ * 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.
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UncheckedIOException;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Flow;
+import java.util.concurrent.Flow.Subscriber;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.incubator.http.HttpClient;
+import jdk.incubator.http.HttpRequest;
+import jdk.incubator.http.HttpResponse;
+import jdk.incubator.http.HttpResponse.BodyHandler;
+import jdk.incubator.http.HttpResponse.BodySubscriber;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import javax.net.ssl.SSLContext;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
+import static org.testng.Assert.assertTrue;
+
+/*
+ * @test
+ * @summary Basic tests for Flow adapter Subscribers
+ * @modules java.base/sun.net.www.http
+ * jdk.incubator.httpclient/jdk.incubator.http.internal.common
+ * jdk.incubator.httpclient/jdk.incubator.http.internal.frame
+ * jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ * java.logging
+ * jdk.httpserver
+ * @library /lib/testlibrary http2/server
+ * @build Http2TestServer
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @run testng/othervm FlowAdapterSubscriberTest
+ */
+
+public class FlowAdapterSubscriberTest {
+
+ SSLContext sslContext;
+ HttpServer httpTestServer; // HTTP/1.1 [ 4 servers ]
+ HttpsServer httpsTestServer; // HTTPS/1.1
+ Http2TestServer http2TestServer; // HTTP/2 ( h2c )
+ Http2TestServer https2TestServer; // HTTP/2 ( h2 )
+ String httpURI;
+ String httpsURI;
+ String http2URI;
+ String https2URI;
+
+ @DataProvider(name = "uris")
+ public Object[][] variants() {
+ return new Object[][]{
+ { httpURI },
+ { httpsURI },
+ { http2URI },
+ { https2URI },
+ };
+ }
+
+ static final Class<NullPointerException> NPE = NullPointerException.class;
+
+ @Test
+ public void testNull() {
+ assertThrows(NPE, () -> BodyHandler.fromSubscriber(null));
+ assertThrows(NPE, () -> BodyHandler.fromSubscriber(null, Function.identity()));
+ assertThrows(NPE, () -> BodyHandler.fromSubscriber(new ListSubscriber(), null));
+ assertThrows(NPE, () -> BodyHandler.fromSubscriber(null, null));
+
+ assertThrows(NPE, () -> BodySubscriber.fromSubscriber(null));
+ assertThrows(NPE, () -> BodySubscriber.fromSubscriber(null, Function.identity()));
+ assertThrows(NPE, () -> BodySubscriber.fromSubscriber(new ListSubscriber(), null));
+ assertThrows(NPE, () -> BodySubscriber.fromSubscriber(null, null));
+
+ Subscriber subscriber = BodySubscriber.fromSubscriber(new ListSubscriber());
+ assertThrows(NPE, () -> subscriber.onSubscribe(null));
+ assertThrows(NPE, () -> subscriber.onNext(null));
+ assertThrows(NPE, () -> subscriber.onError(null));
+ }
+
+ // List<ByteBuffer>
+
+ @Test(dataProvider = "uris")
+ void testListWithFinisher(String url) {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("May the luck of the Irish be with you!")).build();
+
+ ListSubscriber subscriber = new ListSubscriber();
+ HttpResponse<String> response = client.sendAsync(request,
+ BodyHandler.fromSubscriber(subscriber, Supplier::get)).join();
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "May the luck of the Irish be with you!");
+ }
+
+ @Test(dataProvider = "uris")
+ void testListWithoutFinisher(String url) {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("May the luck of the Irish be with you!")).build();
+
+ ListSubscriber subscriber = new ListSubscriber();
+ HttpResponse<Void> response = client.sendAsync(request,
+ BodyHandler.fromSubscriber(subscriber)).join();
+ String text = subscriber.get();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "May the luck of the Irish be with you!");
+ }
+
+ @Test(dataProvider = "uris")
+ void testListWithFinisherBlocking(String url) throws Exception {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("May the luck of the Irish be with you!")).build();
+
+ ListSubscriber subscriber = new ListSubscriber();
+ HttpResponse<String> response = client.send(request,
+ BodyHandler.fromSubscriber(subscriber, Supplier::get));
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "May the luck of the Irish be with you!");
+ }
+
+ @Test(dataProvider = "uris")
+ void testListWithoutFinisherBlocking(String url) throws Exception {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("May the luck of the Irish be with you!")).build();
+
+ ListSubscriber subscriber = new ListSubscriber();
+ HttpResponse<Void> response = client.send(request,
+ BodyHandler.fromSubscriber(subscriber));
+ String text = subscriber.get();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "May the luck of the Irish be with you!");
+ }
+
+ // Collection<ByteBuffer>
+
+ @Test(dataProvider = "uris")
+ void testCollectionWithFinisher(String url) {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("What's the craic?")).build();
+
+ CollectionSubscriber subscriber = new CollectionSubscriber();
+ HttpResponse<String> response = client.sendAsync(request,
+ BodyHandler.fromSubscriber(subscriber, CollectionSubscriber::get)).join();
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "What's the craic?");
+ }
+
+ @Test(dataProvider = "uris")
+ void testCollectionWithoutFinisher(String url) {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("What's the craic?")).build();
+
+ CollectionSubscriber subscriber = new CollectionSubscriber();
+ HttpResponse<Void> response = client.sendAsync(request,
+ BodyHandler.fromSubscriber(subscriber)).join();
+ String text = subscriber.get();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "What's the craic?");
+ }
+
+ @Test(dataProvider = "uris")
+ void testCollectionWithFinisherBlocking(String url) throws Exception {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("What's the craic?")).build();
+
+ CollectionSubscriber subscriber = new CollectionSubscriber();
+ HttpResponse<String> response = client.send(request,
+ BodyHandler.fromSubscriber(subscriber, CollectionSubscriber::get));
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "What's the craic?");
+ }
+
+ @Test(dataProvider = "uris")
+ void testCollectionWithoutFinisheBlocking(String url) throws Exception {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("What's the craic?")).build();
+
+ CollectionSubscriber subscriber = new CollectionSubscriber();
+ HttpResponse<Void> response = client.send(request,
+ BodyHandler.fromSubscriber(subscriber));
+ String text = subscriber.get();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "What's the craic?");
+ }
+
+ // Iterable<ByteBuffer>
+
+ @Test(dataProvider = "uris")
+ void testIterableWithFinisher(String url) {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("We're sucking diesel now!")).build();
+
+ IterableSubscriber subscriber = new IterableSubscriber();
+ HttpResponse<String> response = client.sendAsync(request,
+ BodyHandler.fromSubscriber(subscriber, Supplier::get)).join();
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "We're sucking diesel now!");
+ }
+
+ @Test(dataProvider = "uris")
+ void testIterableWithoutFinisher(String url) {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("We're sucking diesel now!")).build();
+
+ IterableSubscriber subscriber = new IterableSubscriber();
+ HttpResponse<Void> response = client.sendAsync(request,
+ BodyHandler.fromSubscriber(subscriber)).join();
+ String text = subscriber.get();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "We're sucking diesel now!");
+ }
+
+ @Test(dataProvider = "uris")
+ void testIterableWithFinisherBlocking(String url) throws Exception {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("We're sucking diesel now!")).build();
+
+ IterableSubscriber subscriber = new IterableSubscriber();
+ HttpResponse<String> response = client.send(request,
+ BodyHandler.fromSubscriber(subscriber, Supplier::get));
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "We're sucking diesel now!");
+ }
+
+ @Test(dataProvider = "uris")
+ void testIterableWithoutFinisherBlocking(String url) throws Exception{
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("We're sucking diesel now!")).build();
+
+ IterableSubscriber subscriber = new IterableSubscriber();
+ HttpResponse<Void> response = client.send(request,
+ BodyHandler.fromSubscriber(subscriber));
+ String text = subscriber.get();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "We're sucking diesel now!");
+ }
+
+ // Subscriber<Object>
+
+ @Test(dataProvider = "uris")
+ void testObjectWithFinisher(String url) {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("May the wind always be at your back.")).build();
+
+ ObjectSubscriber subscriber = new ObjectSubscriber();
+ HttpResponse<String> response = client.sendAsync(request,
+ BodyHandler.fromSubscriber(subscriber, ObjectSubscriber::get)).join();
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertTrue(text.length() != 0); // what else can be asserted!
+ }
+
+ @Test(dataProvider = "uris")
+ void testObjectWithoutFinisher(String url) {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("May the wind always be at your back.")).build();
+
+ ObjectSubscriber subscriber = new ObjectSubscriber();
+ HttpResponse<Void> response = client.sendAsync(request,
+ BodyHandler.fromSubscriber(subscriber)).join();
+ String text = subscriber.get();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertTrue(text.length() != 0); // what else can be asserted!
+ }
+
+ @Test(dataProvider = "uris")
+ void testObjectWithFinisherBlocking(String url) throws Exception {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("May the wind always be at your back.")).build();
+
+ ObjectSubscriber subscriber = new ObjectSubscriber();
+ HttpResponse<String> response = client.send(request,
+ BodyHandler.fromSubscriber(subscriber, ObjectSubscriber::get));
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertTrue(text.length() != 0); // what else can be asserted!
+ }
+
+ @Test(dataProvider = "uris")
+ void testObjectWithoutFinisherBlocking(String url) throws Exception {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("May the wind always be at your back.")).build();
+
+ ObjectSubscriber subscriber = new ObjectSubscriber();
+ HttpResponse<Void> response = client.send(request,
+ BodyHandler.fromSubscriber(subscriber));
+ String text = subscriber.get();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertTrue(text.length() != 0); // what else can be asserted!
+ }
+
+ /** An abstract Subscriber that converts all received data into a String. */
+ static abstract class AbstractSubscriber implements Supplier<String> {
+ protected volatile Flow.Subscription subscription;
+ protected volatile ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ protected volatile String text;
+
+ public void onSubscribe(Flow.Subscription subscription) {
+ this.subscription = subscription;
+ subscription.request(Long.MAX_VALUE);
+ }
+ public void onError(Throwable throwable) {
+ throw new RuntimeException(throwable);
+ }
+ public void onComplete() {
+ text = new String(baos.toByteArray(), UTF_8);
+ }
+ @Override public String get() { return text; }
+ }
+
+ static class ListSubscriber extends AbstractSubscriber
+ implements Flow.Subscriber<List<ByteBuffer>>, Supplier<String>
+ {
+ @Override public void onNext(List<ByteBuffer> item) {
+ for (ByteBuffer bb : item) {
+ byte[] ba = new byte[bb.remaining()];
+ bb.get(ba);
+ uncheckedWrite(baos, ba);
+ }
+ }
+ }
+
+ static class CollectionSubscriber extends AbstractSubscriber
+ implements Flow.Subscriber<Collection<ByteBuffer>>, Supplier<String>
+ {
+ @Override public void onNext(Collection<ByteBuffer> item) {
+ for (ByteBuffer bb : item) {
+ byte[] ba = new byte[bb.remaining()];
+ bb.get(ba);
+ uncheckedWrite(baos, ba);
+ }
+ }
+ }
+
+ static class IterableSubscriber extends AbstractSubscriber
+ implements Flow.Subscriber<Iterable<ByteBuffer>>, Supplier<String>
+ {
+ @Override public void onNext(Iterable<ByteBuffer> item) {
+ for (ByteBuffer bb : item) {
+ byte[] ba = new byte[bb.remaining()];
+ bb.get(ba);
+ uncheckedWrite(baos, ba);
+ }
+ }
+ }
+
+ static class ObjectSubscriber extends AbstractSubscriber
+ implements Flow.Subscriber<Object>, Supplier<String>
+ {
+ @Override public void onNext(Object item) {
+ // What can anyone do with Object, cast or toString it ?
+ uncheckedWrite(baos, item.toString().getBytes(UTF_8));
+ }
+ }
+
+ static void uncheckedWrite(ByteArrayOutputStream baos, byte[] ba) {
+ try {
+ baos.write(ba);
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ }
+
+ @BeforeTest
+ public void setup() throws Exception {
+ sslContext = new SimpleSSLContext().get();
+ if (sslContext == null)
+ throw new AssertionError("Unexpected null sslContext");
+
+ InetSocketAddress sa = new InetSocketAddress("localhost", 0);
+ httpTestServer = HttpServer.create(sa, 0);
+ httpTestServer.createContext("/http1/echo", new Http1EchoHandler());
+ httpURI = "http://127.0.0.1:" + httpTestServer.getAddress().getPort() + "/http1/echo";
+
+ httpsTestServer = HttpsServer.create(sa, 0);
+ httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+ httpsTestServer.createContext("/https1/echo", new Http1EchoHandler());
+ httpsURI = "https://127.0.0.1:" + httpsTestServer.getAddress().getPort() + "/https1/echo";
+
+ http2TestServer = new Http2TestServer("127.0.0.1", false, 0);
+ http2TestServer.addHandler(new Http2EchoHandler(), "/http2/echo");
+ int port = http2TestServer.getAddress().getPort();
+ http2URI = "http://127.0.0.1:" + port + "/http2/echo";
+
+ https2TestServer = new Http2TestServer("127.0.0.1", true, 0);
+ https2TestServer.addHandler(new Http2EchoHandler(), "/https2/echo");
+ port = https2TestServer.getAddress().getPort();
+ https2URI = "https://127.0.0.1:" + port + "/https2/echo";
+
+ httpTestServer.start();
+ httpsTestServer.start();
+ http2TestServer.start();
+ https2TestServer.start();
+ }
+
+ @AfterTest
+ public void teardown() throws Exception {
+ httpTestServer.stop(0);
+ httpsTestServer.stop(0);
+ http2TestServer.stop();
+ https2TestServer.stop();
+ }
+
+ static class Http1EchoHandler implements HttpHandler {
+ @Override
+ public void handle(HttpExchange t) throws IOException {
+ try (InputStream is = t.getRequestBody();
+ OutputStream os = t.getResponseBody()) {
+ byte[] bytes = is.readAllBytes();
+ t.sendResponseHeaders(200, bytes.length);
+ os.write(bytes);
+ }
+ }
+ }
+
+ static class Http2EchoHandler implements Http2Handler {
+ @Override
+ public void handle(Http2TestExchange t) throws IOException {
+ try (InputStream is = t.getRequestBody();
+ OutputStream os = t.getResponseBody()) {
+ byte[] bytes = is.readAllBytes();
+ t.sendResponseHeaders(200, bytes.length);
+ os.write(bytes);
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/httpclient/FlowAdaptersCompileOnly.java Fri Jan 05 22:02:20 2018 +0100
@@ -0,0 +1,107 @@
+/*
+ * 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.
+ */
+
+import java.nio.ByteBuffer;
+import java.nio.MappedByteBuffer;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Flow;
+import java.util.function.Function;
+import jdk.incubator.http.HttpRequest.BodyPublisher;
+import jdk.incubator.http.HttpResponse.BodyHandler;
+import jdk.incubator.http.HttpResponse.BodySubscriber;
+
+/*
+ * @test
+ * @summary Basic test for Flow adapters with generic type parameters
+ * @compile FlowAdaptersCompileOnly.java
+ */
+
+public class FlowAdaptersCompileOnly {
+
+ static void makesSureDifferentGenericSignaturesCompile() {
+ BodyPublisher.fromPublisher(new BBPublisher());
+ BodyPublisher.fromPublisher(new MBBPublisher());
+
+ BodyHandler.fromSubscriber(new ListSubscriber());
+ BodyHandler.fromSubscriber(new CollectionSubscriber());
+ BodyHandler.fromSubscriber(new IterableSubscriber());
+ BodyHandler.fromSubscriber(new ObjectSubscriber());
+
+ BodySubscriber.fromSubscriber(new ListSubscriber());
+ BodySubscriber.fromSubscriber(new CollectionSubscriber());
+ BodySubscriber.fromSubscriber(new IterableSubscriber());
+ BodySubscriber.fromSubscriber(new ObjectSubscriber());
+
+ BodyPublisher.fromPublisher(new BBPublisher(), 1);
+ BodyPublisher.fromPublisher(new MBBPublisher(), 1);
+
+ BodyHandler.fromSubscriber(new ListSubscriber(), Function.identity());
+ BodyHandler.fromSubscriber(new CollectionSubscriber(), Function.identity());
+ BodyHandler.fromSubscriber(new IterableSubscriber(), Function.identity());
+ BodyHandler.fromSubscriber(new ObjectSubscriber(), Function.identity());
+
+ BodySubscriber.fromSubscriber(new ListSubscriber(), Function.identity());
+ BodySubscriber.fromSubscriber(new CollectionSubscriber(), Function.identity());
+ BodySubscriber.fromSubscriber(new IterableSubscriber(), Function.identity());
+ BodySubscriber.fromSubscriber(new ObjectSubscriber(), Function.identity());
+ }
+
+ static class BBPublisher implements Flow.Publisher<ByteBuffer> {
+ @Override
+ public void subscribe(Flow.Subscriber<? super ByteBuffer> subscriber) { }
+ }
+
+ static class MBBPublisher implements Flow.Publisher<MappedByteBuffer> {
+ @Override
+ public void subscribe(Flow.Subscriber<? super MappedByteBuffer> subscriber) { }
+ }
+
+ static class ListSubscriber implements Flow.Subscriber<List<ByteBuffer>> {
+ @Override public void onSubscribe(Flow.Subscription subscription) { }
+ @Override public void onNext(List<ByteBuffer> item) { }
+ @Override public void onError(Throwable throwable) { }
+ @Override public void onComplete() { }
+ }
+
+ static class CollectionSubscriber implements Flow.Subscriber<Collection<ByteBuffer>> {
+ @Override public void onSubscribe(Flow.Subscription subscription) { }
+ @Override public void onNext(Collection<ByteBuffer> item) { }
+ @Override public void onError(Throwable throwable) { }
+ @Override public void onComplete() { }
+ }
+
+ static class IterableSubscriber implements Flow.Subscriber<Iterable<ByteBuffer>> {
+ @Override public void onSubscribe(Flow.Subscription subscription) { }
+ @Override public void onNext(Iterable<ByteBuffer> item) { }
+ @Override public void onError(Throwable throwable) { }
+ @Override public void onComplete() { }
+ }
+
+ static class ObjectSubscriber implements Flow.Subscriber<Object> {
+ @Override public void onSubscribe(Flow.Subscription subscription) { }
+ @Override public void onNext(Object item) { }
+ @Override public void onError(Throwable throwable) { }
+ @Override public void onComplete() { }
+ }
+}
--- a/test/jdk/java/net/httpclient/RequestProcessorExceptions.java Thu Jan 04 22:47:38 2018 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @run testng RequestProcessorExceptions
- */
-
-import java.io.FileNotFoundException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromByteArray;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromFile;
-
-public class RequestProcessorExceptions {
-
- @DataProvider(name = "byteArrayOOBs")
- public Object[][] byteArrayOOBs() {
- return new Object[][] {
- { new byte[100], 1, 100 },
- { new byte[100], -1, 10 },
- { new byte[100], 99, 2 },
- { new byte[1], -100, 1 } };
- }
-
- @Test(dataProvider = "byteArrayOOBs", expectedExceptions = IndexOutOfBoundsException.class)
- public void fromByteArrayCheck(byte[] buf, int offset, int length) {
- fromByteArray(buf, offset, length);
- }
-
- @DataProvider(name = "nonExistentFiles")
- public Object[][] nonExistentFiles() {
- List<Path> paths = List.of(Paths.get("doesNotExist"),
- Paths.get("tsixEtoNseod"),
- Paths.get("doesNotExist2"));
- paths.forEach(p -> {
- if (Files.exists(p))
- throw new AssertionError("Unexpected " + p);
- });
-
- return paths.stream().map(p -> new Object[] { p }).toArray(Object[][]::new);
- }
-
- @Test(dataProvider = "nonExistentFiles", expectedExceptions = FileNotFoundException.class)
- public void fromFileCheck(Path path) throws Exception {
- fromFile(path);
- }
-
- // ---
-
- /* Main entry point for standalone testing of the main functional test. */
- public static void main(String... args) throws Exception {
- RequestProcessorExceptions t = new RequestProcessorExceptions();
- for (Object[] objs : t.byteArrayOOBs()) {
- try {
- t.fromByteArrayCheck((byte[]) objs[0], (int) objs[1], (int) objs[2]);
- throw new RuntimeException("fromByteArrayCheck failed");
- } catch (IndexOutOfBoundsException expected) { /* Ok */ }
- }
- for (Object[] objs : t.nonExistentFiles()) {
- try {
- t.fromFileCheck((Path) objs[0]);
- throw new RuntimeException("fromFileCheck failed");
- } catch (FileNotFoundException expected) { /* Ok */ }
- }
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/httpclient/SubscriberPublisherAPIExceptions.java Fri Jan 05 22:02:20 2018 +0100
@@ -0,0 +1,146 @@
+/*
+ * 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.
+ */
+
+import java.io.FileNotFoundException;
+import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.OpenOption;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Flow;
+import jdk.incubator.http.HttpHeaders;
+import jdk.incubator.http.HttpRequest.BodyPublisher;
+import jdk.incubator.http.HttpResponse.BodyHandler;
+import jdk.incubator.http.HttpResponse.BodySubscriber;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.nio.file.StandardOpenOption.CREATE;
+import static java.nio.file.StandardOpenOption.WRITE;
+import static org.testng.Assert.assertThrows;
+
+/*
+ * @test
+ * @summary Basic tests for API specified exceptions from Publisher, Handler,
+ * and Subscriber convenience static factory methods.
+ * @run testng SubscriberPublisherAPIExceptions
+ */
+
+public class SubscriberPublisherAPIExceptions {
+
+ static final Class<NullPointerException> NPE = NullPointerException.class;
+ static final Class<IllegalArgumentException> IAE = IllegalArgumentException.class;
+ static final Class<IndexOutOfBoundsException> IOB = IndexOutOfBoundsException.class;
+
+ @Test
+ public void publisherAPIExceptions() {
+ assertThrows(NPE, () -> BodyPublisher.fromByteArray(null));
+ assertThrows(NPE, () -> BodyPublisher.fromByteArray(null, 0, 1));
+ assertThrows(IOB, () -> BodyPublisher.fromByteArray(new byte[100], 0, 101));
+ assertThrows(IOB, () -> BodyPublisher.fromByteArray(new byte[100], 1, 100));
+ assertThrows(IOB, () -> BodyPublisher.fromByteArray(new byte[100], -1, 10));
+ assertThrows(IOB, () -> BodyPublisher.fromByteArray(new byte[100], 99, 2));
+ assertThrows(IOB, () -> BodyPublisher.fromByteArray(new byte[1], -100, 1));
+ assertThrows(NPE, () -> BodyPublisher.fromByteArrays(null));
+ assertThrows(NPE, () -> BodyPublisher.fromFile(null));
+ assertThrows(NPE, () -> BodyPublisher.fromInputStream(null));
+ assertThrows(NPE, () -> BodyPublisher.fromString(null));
+ assertThrows(NPE, () -> BodyPublisher.fromString("A", null));
+ assertThrows(NPE, () -> BodyPublisher.fromString(null, UTF_8));
+ assertThrows(NPE, () -> BodyPublisher.fromString(null, null));
+ }
+
+ @DataProvider(name = "nonExistentFiles")
+ public Object[][] nonExistentFiles() {
+ List<Path> paths = List.of(Paths.get("doesNotExist"),
+ Paths.get("tsixEtoNseod"),
+ Paths.get("doesNotExist2"));
+ paths.forEach(p -> {
+ if (Files.exists(p))
+ throw new AssertionError("Unexpected " + p);
+ });
+
+ return paths.stream().map(p -> new Object[] { p }).toArray(Object[][]::new);
+ }
+
+ @Test(dataProvider = "nonExistentFiles", expectedExceptions = FileNotFoundException.class)
+ public void fromFileCheck(Path path) throws Exception {
+ BodyPublisher.fromFile(path);
+ }
+
+ @Test
+ public void handlerAPIExceptions() {
+ Path path = Paths.get(".").resolve("tt");
+ assertThrows(NPE, () -> BodyHandler.asByteArrayConsumer(null));
+ assertThrows(NPE, () -> BodyHandler.asFile(null));
+ assertThrows(NPE, () -> BodyHandler.asFile(null, CREATE, WRITE));
+ assertThrows(NPE, () -> BodyHandler.asFile(path, (OpenOption[])null));
+ assertThrows(NPE, () -> BodyHandler.asFile(path, new OpenOption[] {null}));
+ assertThrows(NPE, () -> BodyHandler.asFile(path, new OpenOption[] {CREATE, null}));
+ assertThrows(NPE, () -> BodyHandler.asFile(path, new OpenOption[] {null, CREATE}));
+ assertThrows(NPE, () -> BodyHandler.asFile(null, (OpenOption[])null));
+ assertThrows(NPE, () -> BodyHandler.asFileDownload(null, CREATE, WRITE));
+ assertThrows(NPE, () -> BodyHandler.asFileDownload(path, (OpenOption[])null));
+ assertThrows(NPE, () -> BodyHandler.asFileDownload(path, new OpenOption[] {null}));
+ assertThrows(NPE, () -> BodyHandler.asFileDownload(path, new OpenOption[] {CREATE, null}));
+ assertThrows(NPE, () -> BodyHandler.asFileDownload(path, new OpenOption[] {null, CREATE}));
+ assertThrows(NPE, () -> BodyHandler.asFileDownload(null, (OpenOption[])null));
+ assertThrows(NPE, () -> BodyHandler.asString(null));
+ assertThrows(NPE, () -> BodyHandler.buffering(null, 1));
+ assertThrows(IAE, () -> BodyHandler.buffering(new NoOpHandler(), 0));
+ assertThrows(IAE, () -> BodyHandler.buffering(new NoOpHandler(), -1));
+ assertThrows(IAE, () -> BodyHandler.buffering(new NoOpHandler(), Integer.MIN_VALUE));
+ }
+
+ @Test
+ public void subscriberAPIExceptions() {
+ Path path = Paths.get(".").resolve("tt");
+ assertThrows(NPE, () -> BodySubscriber.asByteArrayConsumer(null));
+ assertThrows(NPE, () -> BodySubscriber.asFile(null));
+ assertThrows(NPE, () -> BodySubscriber.asFile(null, CREATE, WRITE));
+ assertThrows(NPE, () -> BodySubscriber.asFile(path, (OpenOption[])null));
+ assertThrows(NPE, () -> BodySubscriber.asFile(path, new OpenOption[] {null}));
+ assertThrows(NPE, () -> BodySubscriber.asFile(path, new OpenOption[] {CREATE, null}));
+ assertThrows(NPE, () -> BodySubscriber.asFile(path, new OpenOption[] {null, CREATE}));
+ assertThrows(NPE, () -> BodySubscriber.asFile(null, (OpenOption[])null));
+ assertThrows(NPE, () -> BodySubscriber.asString(null));
+ assertThrows(NPE, () -> BodySubscriber.buffering(null, 1));
+ assertThrows(IAE, () -> BodySubscriber.buffering(new NoOpSubscriber(), 0));
+ assertThrows(IAE, () -> BodySubscriber.buffering(new NoOpSubscriber(), -1));
+ assertThrows(IAE, () -> BodySubscriber.buffering(new NoOpSubscriber(), Integer.MIN_VALUE));
+ }
+
+ static class NoOpHandler implements BodyHandler<Void> {
+ @Override public BodySubscriber<Void> apply(int code, HttpHeaders hrds) { return null; }
+ }
+
+ static class NoOpSubscriber implements BodySubscriber<Void> {
+ @Override public void onSubscribe(Flow.Subscription subscription) { }
+ @Override public void onNext(List<ByteBuffer> item) { }
+ @Override public void onError(Throwable throwable) { }
+ @Override public void onComplete() { }
+ @Override public CompletableFuture<Void> getBody() { return null; }
+ }
+}
--- a/test/jdk/java/net/httpclient/http2/server/Http2TestServer.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/jdk/java/net/httpclient/http2/server/Http2TestServer.java Fri Jan 05 22:02:20 2018 +0100
@@ -170,7 +170,7 @@
return new ServerSocket(port);
}
- public void stop() {
+ public synchronized void stop() {
// TODO: clean shutdown GoAway
stopping = true;
System.err.printf("Server stopping %d connections\n", connections.size());
@@ -205,6 +205,15 @@
return serverName;
}
+ private synchronized void putConnection(InetSocketAddress addr, Http2TestServerConnection c) {
+ if (!stopping)
+ connections.put(addr, c);
+ }
+
+ private synchronized void removeConnection(InetSocketAddress addr, Http2TestServerConnection c) {
+ connections.remove(addr, c);
+ }
+
/**
* Starts a thread which waits for incoming connections.
*/
@@ -216,7 +225,7 @@
InetSocketAddress addr = (InetSocketAddress) socket.getRemoteSocketAddress();
Http2TestServerConnection c =
new Http2TestServerConnection(this, socket, exchangeSupplier);
- connections.put(addr, c);
+ putConnection(addr, c);
try {
c.run();
} catch (Throwable e) {
@@ -224,7 +233,7 @@
// the connection might not have been closed
// and if so then the client might wait
// forever.
- connections.remove(addr, c);
+ removeConnection(addr, c);
c.close(ErrorFrame.PROTOCOL_ERROR);
System.err.println("TestServer: start exception: " + e);
//throw e;
--- a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
/*
* @test
- * @bug 8071597
+ * @bug 8071597 8193856
*/
@Test
public class WhileOpTest extends OpTestCase {
@@ -361,4 +361,33 @@
}
assertTrue(isClosed.get());
}
+
+ @Test(groups = { "serialization-hostile" })
+ public void testFlatMapThenTake() {
+ TestData.OfRef<Integer> range = TestData.Factory.ofSupplier(
+ "range", () -> IntStream.range(0, 100).boxed());
+
+ exerciseOpsMulti(range,
+ // Reference result
+ s -> s.takeWhile(e -> e != 50),
+ // For other results collect into array,
+ // stream the single array (not the elements),
+ // then flat map to stream the array elements
+ s -> Stream.<Integer[]>of(s.toArray(Integer[]::new)).
+ flatMap(Stream::of).
+ takeWhile(e -> e != 50),
+ s -> Stream.of(s.mapToInt(e -> e).toArray()).
+ flatMapToInt(IntStream::of).
+ takeWhile(e -> e != 50).
+ mapToObj(e -> e),
+ s -> Stream.of(s.mapToLong(e -> e).toArray()).
+ flatMapToLong(LongStream::of).
+ takeWhile(e -> e != 50L).
+ mapToObj(e -> (int) e),
+ s -> Stream.of(s.mapToDouble(e -> e).toArray()).
+ flatMapToDouble(DoubleStream::of).
+ takeWhile(e -> e != 50.0).
+ mapToObj(e -> (int) e)
+ );
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sanity/releaseFile/NegativeSOURCETest.java Fri Jan 05 22:02:20 2018 +0100
@@ -0,0 +1,106 @@
+
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8192837
+ * @summary Test to verify release file does not contain closed repo info if it's open bundle
+ * @run main NegativeSOURCETest
+ */
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+public class NegativeSOURCETest {
+
+ NegativeSOURCETest(String dataFile) {
+ // Read data files
+ readFile(dataFile);
+ }
+
+ private void readFile(String fileName) {
+ String fishForSOURCE = null;
+
+ File file = new File(fileName);
+
+ // open the stream to read in for Entries
+ try (BufferedReader buffRead =
+ new BufferedReader(new FileReader(fileName))) {
+
+ // this is the string read
+ String readIn;
+
+ // let's read some strings!
+ while ((readIn = buffRead.readLine()) != null) {
+ readIn = readIn.trim();
+
+ // throw out blank lines
+ if (readIn.length() == 0)
+ continue;
+
+ // grab SOURCE line
+ if (readIn.startsWith("SOURCE=")) {
+ fishForSOURCE = readIn;
+ break;
+ }
+ }
+ } catch (FileNotFoundException fileExcept) {
+ throw new RuntimeException("File " + fileName +
+ " not found reading data!", fileExcept);
+ } catch (IOException ioExcept) {
+ throw new RuntimeException("Unexpected problem reading data!",
+ ioExcept);
+ }
+
+ // was SOURCE even found?
+ if (fishForSOURCE == null) {
+ throw new RuntimeException("SOURCE line was not found!");
+ } else {
+ // OK it was found, did it have closed/open in it?
+ if (fishForSOURCE.contains("closed") || fishForSOURCE.contains("open")) {
+ System.out.println("The offending string: " + fishForSOURCE);
+ throw new RuntimeException("The test failed, closed/open found!");
+ }
+ }
+
+ // Everything was fine
+ System.out.println("The test passed!");
+ }
+
+ public static void main(String args[]) {
+ String jdkPath = System.getProperty("test.jdk");
+ String runtime = System.getProperty("java.runtime.name");
+
+ System.out.println("JDK Path : " + jdkPath);
+ System.out.println("Runtime Name : " + runtime);
+
+ if (runtime.contains("OpenJDK"))
+ new NegativeSOURCETest(jdkPath + "/release");
+ else
+ System.out.println("Test skipped: not an OpenJDK build.");
+ }
+}
--- a/test/jdk/sun/security/ssl/CertPathRestrictions/JSSEServer.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/jdk/sun/security/ssl/CertPathRestrictions/JSSEServer.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,8 +36,6 @@
private SSLServerSocket server = null;
- private Exception exception = null;
-
public JSSEServer(SSLContext context, String constraint,
boolean needClientAuth) throws Exception {
TLSRestrictions.setConstraint("Server", constraint);
@@ -49,35 +47,28 @@
System.out.println("Server: port=" + getPort());
}
- public void start() {
- new Thread(new Runnable() {
+ public Exception start() {
+ System.out.println("Server: started");
+ Exception exception = null;
+ try (SSLSocket socket = (SSLSocket) server.accept()) {
+ System.out.println("Server: accepted connection");
+ socket.setSoTimeout(TLSRestrictions.TIMEOUT);
+ InputStream sslIS = socket.getInputStream();
+ OutputStream sslOS = socket.getOutputStream();
+ sslIS.read();
+ sslOS.write('S');
+ sslOS.flush();
+ System.out.println("Server: finished");
+ } catch (Exception e) {
+ exception = e;
+ e.printStackTrace(System.out);
+ System.out.println("Server: failed");
+ }
- @Override
- public void run() {
- try {
- System.out.println("Server: started");
- try (SSLSocket socket = (SSLSocket) server.accept()) {
- socket.setSoTimeout(TLSRestrictions.TIMEOUT);
- InputStream sslIS = socket.getInputStream();
- OutputStream sslOS = socket.getOutputStream();
- sslIS.read();
- sslOS.write('S');
- sslOS.flush();
- System.out.println("Server: finished");
- }
- } catch (Exception e) {
- e.printStackTrace(System.out);
- exception = e;
- }
- }
- }).start();
+ return exception;
}
public int getPort() {
return server.getLocalPort();
}
-
- public Exception getException() {
- return exception;
- }
}
--- a/test/jdk/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/jdk/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,10 @@
import java.security.cert.CertificateFactory;
import java.security.spec.PKCS8EncodedKeySpec;
import java.util.Base64;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import javax.net.ssl.KeyManagerFactory;
@@ -216,59 +220,59 @@
needClientAuth,
pass);
- JSSEServer server = new JSSEServer(
- createSSLContext(trustNames, certNames),
- serverConstraint,
- needClientAuth);
- int port = server.getPort();
- server.start();
-
- // Run client on another JVM so that its properties cannot be in conflict
- // with server's.
- OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJvm(
- "-Dcert.dir=" + CERT_DIR,
- "-Djava.security.debug=certpath",
- "-classpath",
- TEST_CLASSES,
- "JSSEClient",
- port + "",
- trustNameStr,
- certNameStr,
- clientConstraint);
- int exitValue = outputAnalyzer.getExitValue();
- String clientOut = outputAnalyzer.getOutput();
+ ExecutorService executor = Executors.newFixedThreadPool(1);
+ try {
+ JSSEServer server = new JSSEServer(
+ createSSLContext(trustNames, certNames),
+ serverConstraint,
+ needClientAuth);
+ int port = server.getPort();
+ Future<Exception> serverFuture = executor.submit(() -> server.start());
- Exception serverException = server.getException();
- if (serverException != null) {
- System.out.println("Server: failed");
- }
-
- System.out.println("---------- Client output start ----------");
- System.out.println(clientOut);
- System.out.println("---------- Client output end ----------");
+ // Run client on another JVM so that its properties cannot be in conflict
+ // with server's.
+ OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJvm(
+ "-Dcert.dir=" + CERT_DIR,
+ "-Djava.security.debug=certpath",
+ "-classpath",
+ TEST_CLASSES,
+ "JSSEClient",
+ port + "",
+ trustNameStr,
+ certNameStr,
+ clientConstraint);
+ int clientExitValue = outputAnalyzer.getExitValue();
+ String clientOut = outputAnalyzer.getOutput();
+ System.out.println("---------- Client output start ----------");
+ System.out.println(clientOut);
+ System.out.println("---------- Client output end ----------");
- if (serverException instanceof SocketTimeoutException
- || clientOut.contains("SocketTimeoutException")) {
- System.out.println("The communication gets timeout and skips the test.");
- return;
- }
-
- if (pass) {
- if (serverException != null || exitValue != 0) {
- throw new RuntimeException(
- "Unexpected failure. Operation was blocked.");
- }
- } else {
- if (serverException == null && exitValue == 0) {
- throw new RuntimeException(
- "Unexpected pass. Operation was allowed.");
+ Exception serverException = serverFuture.get(TIMEOUT, TimeUnit.MILLISECONDS);
+ if (serverException instanceof SocketTimeoutException
+ || clientOut.contains("SocketTimeoutException")) {
+ System.out.println("The communication gets timeout and skips the test.");
+ return;
}
- // The test may encounter non-SSL issues, like network problem.
- if (!(serverException instanceof SSLHandshakeException
- || clientOut.contains("SSLHandshakeException"))) {
- throw new RuntimeException("Failure with unexpected exception.");
+ if (pass) {
+ if (serverException != null || clientExitValue != 0) {
+ throw new RuntimeException(
+ "Unexpected failure. Operation was blocked.");
+ }
+ } else {
+ if (serverException == null && clientExitValue == 0) {
+ throw new RuntimeException(
+ "Unexpected pass. Operation was allowed.");
+ }
+
+ // The test may encounter non-SSL issues, like network problem.
+ if (!(serverException instanceof SSLHandshakeException
+ || clientOut.contains("SSLHandshakeException"))) {
+ throw new RuntimeException("Failure with unexpected exception.");
+ }
}
+ } finally {
+ executor.shutdown();
}
}
@@ -520,7 +524,6 @@
true);
break;
}
-
System.out.println("Case passed");
System.out.println("========================================");
}
--- a/test/langtools/TEST.ROOT Thu Jan 04 22:47:38 2018 -0800
+++ b/test/langtools/TEST.ROOT Fri Jan 05 22:02:20 2018 +0100
@@ -15,7 +15,7 @@
groups=TEST.groups
# Minimum jtreg version
-requiredVersion=4.2 b08
+requiredVersion=4.2 b11
# Use new module options
useNewOptions=true
--- a/test/langtools/jdk/javadoc/doclet/testMethodTypes/TestMethodTypes.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/langtools/jdk/javadoc/doclet/testMethodTypes/TestMethodTypes.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
/*
* @test
- * @bug 8002304 8024096
- * @summary Test for various method types in the method summary table
+ * @bug 8002304 8024096 8193671
+ * @summary Test for various method type tabs in the method summary table
* @author Bhavesh Patel
* @library ../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -62,13 +62,18 @@
"<tr id=\"i0\" class=\"altColor\">");
checkOutput("pkg1/B.html", true,
- "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All "
- + "Methods</span><span class=\"tabEnd\"> </span></span>"
- + "<span id=\"t2\" class=\"tableTab\"><span><a href=\"javascript:show(2);\">"
- + "Instance Methods</a></span><span class=\"tabEnd\"> </span></span>"
- + "<span id=\"t3\" class=\"tableTab\"><span><a href=\"javascript:show(4);\">"
- + "Abstract Methods</a></span><span class=\"tabEnd\"> </span></span>"
- + "</caption>");
+ "var methods = {\"i0\":6,\"i1\":18,\"i2\":18,\"i3\":1,\"i4\":1,"
+ + "\"i5\":6,\"i6\":6,\"i7\":6,\"i8\":6};\n",
+ "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All Methods</span>"
+ + "<span class=\"tabEnd\"> </span></span><span id=\"t1\" class=\"tableTab\">"
+ + "<span><a href=\"javascript:show(1);\">Static Methods</a></span>"
+ + "<span class=\"tabEnd\"> </span></span><span id=\"t2\" class=\"tableTab\">"
+ + "<span><a href=\"javascript:show(2);\">Instance Methods</a></span>"
+ + "<span class=\"tabEnd\"> </span></span><span id=\"t3\" class=\"tableTab\">"
+ + "<span><a href=\"javascript:show(4);\">Abstract Methods</a></span>"
+ + "<span class=\"tabEnd\"> </span></span><span id=\"t5\" class=\"tableTab\">"
+ + "<span><a href=\"javascript:show(16);\">Default Methods</a></span>"
+ + "<span class=\"tabEnd\"> </span></span></caption>\n");
checkOutput("pkg1/D.html", true,
"var methods = {",
--- a/test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/A.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/A.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,7 @@
/**
* This is the third concrete instance method.
+ * @return a string
*/
public String getParameter() {
return "test";
--- a/test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/B.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/B.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,8 @@
package pkg1;
/**
- * This interface has different types of methods such as "Instance Methods" and
- * "Abstract Methods". All the tabs will display same list of methods.
+ * This interface has different types of methods such as "Static Methods",
+ * "Instance Methods", "Abstract Methods", "Default Methods".
*/
public interface B {
@@ -36,21 +36,45 @@
/**
* This is the second abstract instance method.
+ * @return a string
*/
public String getName();
/**
* This is the third abstract instance method.
+ * @return a boolean value
*/
public boolean addEntry();
/**
* This is the fourth abstract instance method.
+ * @return a boolean value
*/
public boolean removeEntry();
/**
* This is the fifth abstract instance method.
+ * @return a string
*/
public String getPermissions();
+
+ /**
+ * A static interface method.
+ */
+ public static void aStaticMethod() {}
+
+ /**
+ * Another static interface method.
+ */
+ public static void anotherStaticMethod() {}
+
+ /**
+ * A default method.
+ */
+ public default void aDefaultMethod() {}
+
+ /**
+ * Another default method.
+ */
+ public default void anotherDefaultMethod() {}
}
--- a/test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/D.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/D.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -46,6 +46,7 @@
/**
* This is the second concrete instance method.
+ * @return a string
*/
public String getParameter() {
return "test";
--- a/test/langtools/tools/javac/NestedInnerClassNames.out Thu Jan 04 22:47:38 2018 -0800
+++ b/test/langtools/tools/javac/NestedInnerClassNames.out Fri Jan 05 22:02:20 2018 +0100
@@ -6,7 +6,7 @@
NestedInnerClassNames.java:59:9: compiler.err.already.defined: kindname.class, NestedInnerClassNames.foo$bar, kindname.class, NestedInnerClassNames
NestedInnerClassNames.java:76:13: compiler.err.already.defined: kindname.class, NestedInnerClassNames.$bar, kindname.class, NestedInnerClassNames
NestedInnerClassNames.java:90:13: compiler.err.already.defined: kindname.class, NestedInnerClassNames.bar$bar.bar, kindname.class, NestedInnerClassNames.bar$bar
-NestedInnerClassNames.java:109:5: compiler.err.duplicate.class: NestedInnerClassNames.foo.foo
+NestedInnerClassNames.java:109:5: compiler.err.same.binary.name: foo, foo$foo
NestedInnerClassNames.java:19:9: compiler.err.already.defined: kindname.class, NestedInnerClassNames, kindname.package, compiler.misc.unnamed.package
NestedInnerClassNames.java:28:13: compiler.err.already.defined: kindname.class, foo, kindname.method, m2()
NestedInnerClassNames.java:40:13: compiler.err.already.defined: kindname.class, NestedInnerClassNames, kindname.package, compiler.misc.unnamed.package
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/T8187487/CrashWithDuplicateClassNamesTest.java Fri Jan 05 22:02:20 2018 +0100
@@ -0,0 +1,20 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8187487
+ * @summary crash with duplicate class name
+ * @compile/fail/ref=CrashWithDuplicateClassNamesTest.out -XDrawDiagnostics CrashWithDuplicateClassNamesTest.java
+ */
+
+class CrashWithDuplicateClassNamesTest {
+ static class C1$C2 {}
+
+ static class C1 {
+ static class C2 {}
+ }
+
+ static class C3 {
+ static class C4 {}
+ }
+
+ static class C3$C4 {}
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/T8187487/CrashWithDuplicateClassNamesTest.out Fri Jan 05 22:02:20 2018 +0100
@@ -0,0 +1,3 @@
+CrashWithDuplicateClassNamesTest.java:12:16: compiler.err.same.binary.name: C1$C2, C2
+CrashWithDuplicateClassNamesTest.java:19:12: compiler.err.same.binary.name: C4, C3$C4
+2 errors
--- a/test/langtools/tools/javac/diags/examples.not-yet.txt Thu Jan 04 22:47:38 2018 -0800
+++ b/test/langtools/tools/javac/diags/examples.not-yet.txt Fri Jan 05 22:02:20 2018 +0100
@@ -52,6 +52,7 @@
compiler.misc.bad.enclosing.method # bad class file
compiler.misc.bad.runtime.invisible.param.annotations # bad class file
compiler.misc.bad.signature # bad class file
+compiler.misc.bad.requires.flag # bad class file
compiler.misc.bad.type.annotation.value
compiler.misc.base.membership # UNUSED
compiler.misc.class.file.not.found # ClassReader
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/diags/examples/ModifierNotAllowed/module-info.java Fri Jan 05 22:02:20 2018 +0100
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.modifier.not.allowed.here
+
+module m {
+ requires transitive java.base;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/diags/examples/SameBinaryName.java Fri Jan 05 22:02:20 2018 +0100
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.same.binary.name
+
+class SameBinaryName {
+ private static final class Foo$Bar {}
+
+ private static final class Foo {
+ private static final class Bar {}
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/modules/JavaBaseTest.java Fri Jan 05 22:02:20 2018 +0100
@@ -0,0 +1,257 @@
+/*
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8193125
+ * @summary test modifiers with java.base
+ * @library /tools/lib
+ * @modules
+ * jdk.compiler/com.sun.tools.javac.api
+ * jdk.compiler/com.sun.tools.javac.main
+ * jdk.jdeps/com.sun.tools.classfile
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run main JavaBaseTest
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.sun.tools.classfile.Attribute;
+import com.sun.tools.classfile.Attributes;
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.ClassWriter;
+import com.sun.tools.classfile.Module_attribute;
+
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.Task.Expect;
+import toolbox.ToolBox;
+
+public class JavaBaseTest {
+
+ public static void main(String... args) throws Exception {
+ JavaBaseTest t = new JavaBaseTest();
+ t.run();
+ }
+
+ final List<List<String>> modifiers = List.of(
+ List.of("static"),
+ List.of("transitive"),
+ List.of("static", "transitive")
+ );
+
+ final String specVersion = System.getProperty("java.specification.version");
+ final List<String> targets = specVersion.equals("10")
+ ? List.of("9", "10")
+ : List.of("9", "10", specVersion);
+
+ enum Mode { SOURCE, CLASS };
+
+ ToolBox tb = new ToolBox();
+ int testCount = 0;
+ int errorCount = 0;
+
+ void run() throws Exception {
+ for (List<String> mods : modifiers) {
+ for (String target : targets) {
+ for (Mode mode : Mode.values()) {
+ test(mods, target, mode);
+ }
+ }
+ }
+
+ System.err.println(testCount + " tests");
+ if (errorCount > 0) {
+ throw new Exception(errorCount + " errors found");
+ }
+ }
+
+ void test(List<String> mods, String target, Mode mode) {
+ System.err.println("Test " + mods + " " + target + " " + mode);
+ testCount++;
+ try {
+ Path base = Paths.get(String.join("-", mods))
+ .resolve(target).resolve(mode.name().toLowerCase());
+ Files.createDirectories(base);
+ switch (mode) {
+ case SOURCE:
+ testSource(base, mods, target);
+ break;
+ case CLASS:
+ testClass(base, mods, target);
+ break;
+ }
+ } catch (Exception e) {
+ error("Exception: " + e);
+ e.printStackTrace();
+ }
+ System.err.println();
+ }
+
+ void testSource(Path base, List<String> mods, String target) throws Exception {
+ Path src = base.resolve("src");
+ tb.writeJavaFiles(src,
+ "module m { requires " + String.join(" ", mods) + " java.base; }");
+ Path modules = Files.createDirectories(base.resolve("modules"));
+ boolean expectOK = target.equals("9");
+
+ String log = new JavacTask(tb)
+ .outdir(modules)
+ .options("-XDrawDiagnostics", "--release", target)
+ .files(tb.findJavaFiles(src))
+ .run(expectOK ? Task.Expect.SUCCESS : Task.Expect.FAIL)
+ .writeAll()
+ .getOutput(Task.OutputKind.DIRECT);
+
+ if (!expectOK) {
+ boolean foundErrorMessage = false;
+ for (String mod : mods) {
+ String key = mod.equals("static")
+ ? "compiler.err.mod.not.allowed.here"
+ : "compiler.err.modifier.not.allowed.here";
+ String message = "module-info.java:1:12: " + key + ": " + mod;
+ if (log.contains(message)) {
+ foundErrorMessage = true;
+ }
+ }
+ if (!foundErrorMessage) {
+ throw new Exception("expected error message not found");
+ }
+ }
+ }
+
+ void testClass(Path base, List<String> mods, String target) throws Exception {
+ createClass(base, mods, target);
+
+ Path src = base.resolve("src");
+ tb.writeJavaFiles(src,
+ "module mx { requires m; }");
+ Path modules = Files.createDirectories(base.resolve("modules"));
+
+ boolean expectOK = target.equals("9");
+ String log = new JavacTask(tb)
+ .outdir(modules)
+ .options("-XDrawDiagnostics",
+ "--module-path", base.resolve("test-modules").toString())
+ .files(tb.findJavaFiles(src))
+ .run(expectOK ? Task.Expect.SUCCESS : Task.Expect.FAIL)
+ .writeAll()
+ .getOutput(Task.OutputKind.DIRECT);
+
+ if (!expectOK) {
+ boolean foundErrorMessage = false;
+ for (String mod : mods) {
+ String flag = mod.equals("static")
+ ? "ACC_STATIC_PHASE (0x0040)"
+ : "ACC_TRANSITIVE (0x0020)";
+ String message = "- compiler.err.cant.access: m.module-info,"
+ + " (compiler.misc.bad.class.file.header: module-info.class,"
+ + " (compiler.misc.bad.requires.flag: " + flag + ")";
+ if (log.contains(message)) {
+ foundErrorMessage = true;
+ }
+ }
+ if (!foundErrorMessage) {
+ throw new Exception("expected error message not found");
+ }
+ }
+ }
+
+ void createClass(Path base, List<String> mods, String target) throws Exception {
+ Path src1 = base.resolve("interim-src");
+ tb.writeJavaFiles(src1,
+ "module m { requires java.base; }");
+ Path modules1 = Files.createDirectories(base.resolve("interim-modules"));
+
+ new JavacTask(tb)
+ .outdir(modules1)
+ .options("--release", target)
+ .files(tb.findJavaFiles(src1))
+ .run(Task.Expect.SUCCESS)
+ .writeAll();
+
+ ClassFile cf1 = ClassFile.read(modules1.resolve("module-info.class"));
+
+ Map<String,Attribute> attrMap = new LinkedHashMap<>(cf1.attributes.map);
+ Module_attribute modAttr1 = (Module_attribute) attrMap.get("Module");
+ Module_attribute.RequiresEntry[] requires =
+ new Module_attribute.RequiresEntry[modAttr1.requires_count];
+ for (int i = 0; i < modAttr1.requires_count; i++) {
+ Module_attribute.RequiresEntry e1 = modAttr1.requires[i];
+ int flags = e1.requires_flags;
+ Module_attribute.RequiresEntry e2;
+ if (e1.getRequires(cf1.constant_pool).equals("java.base")) {
+ for (String mod : mods) {
+ switch (mod) {
+ case "static":
+ flags |= Module_attribute.ACC_STATIC_PHASE;
+ break;
+ case "transitive":
+ flags |= Module_attribute.ACC_TRANSITIVE;
+ break;
+ }
+ }
+ e2 = new Module_attribute.RequiresEntry(
+ e1.requires_index,
+ flags,
+ e1.requires_version_index);
+ } else {
+ e2 = e1;
+ }
+ requires[i] = e2;
+ }
+ Module_attribute modAttr2 = new Module_attribute(
+ modAttr1.attribute_name_index,
+ modAttr1.module_name,
+ modAttr1.module_flags,
+ modAttr1.module_version_index,
+ requires,
+ modAttr1.exports,
+ modAttr1.opens,
+ modAttr1.uses_index,
+ modAttr1.provides);
+ attrMap.put("Module", modAttr2);
+ Attributes attributes = new Attributes(attrMap);
+
+ ClassFile cf2 = new ClassFile(
+ cf1.magic, cf1.minor_version, cf1.major_version,
+ cf1.constant_pool, cf1.access_flags,
+ cf1.this_class, cf1.super_class, cf1.interfaces,
+ cf1.fields, cf1.methods, attributes);
+ Path modInfo = base.resolve("test-modules").resolve("module-info.class");
+ Files.createDirectories(modInfo.getParent());
+ new ClassWriter().write(cf2, modInfo.toFile());
+ }
+
+ private void error(String message) {
+ System.err.println("Error: " + message);
+ errorCount++;
+ }
+}
+
--- a/test/langtools/tools/javac/parser/T4910483.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/langtools/tools/javac/parser/T4910483.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4910483
+ * @bug 4910483 8183961
* @summary Javadoc renders the string ".*\\.pdf" as ".\*\.pdf"
* @modules jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
@@ -41,7 +41,12 @@
import javax.tools.JavaFileObject;
-/**Test comment abc*\\def*/
+// Test the original issue ("\\") as well as other appearances of '\',
+// including a vanilla Unicode escape (U+0021, '!'), and a sequence
+// which is not a Unicode escape
+
+/**Test comment abc*\\def\
+ *xyz\u0021\\u0021*/
public class T4910483 {
public static void main(String... args) {
JavaCompiler compiler = JavaCompiler.instance(new Context());
@@ -55,7 +60,7 @@
JCTree classDef = cu.getTypeDecls().head;
String commentText = cu.docComments.getCommentText(classDef);
- String expected = "Test comment abc*\\\\def"; // 4 '\' escapes to 2 in a string literal
+ String expected = "Test comment abc*\\\\def\\\nxyz!\\\\u0021"; // 4 '\' escapes to 2 in a string literal
if (!expected.equals(commentText)) {
throw new AssertionError("Incorrect comment text: [" + commentText + "], expected [" + expected + "]");
}
--- a/test/langtools/tools/javac/processing/model/util/printing/module-info.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/langtools/tools/javac/processing/model/util/printing/module-info.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
/*
* @test
* @bug 8173609
@@ -10,7 +33,7 @@
*/
@Deprecated
module printing {
- requires static transitive java.base;
+ requires static transitive java.compiler;
exports p to m.m1, m.m2;
opens p to m.m1, m.m2;
uses p.P;
--- a/test/langtools/tools/javac/processing/model/util/printing/module-info.out Thu Jan 04 22:47:38 2018 -0800
+++ b/test/langtools/tools/javac/processing/model/util/printing/module-info.out Fri Jan 05 22:02:20 2018 +0100
@@ -19,7 +19,8 @@
*/
@java.lang.Deprecated
module printing {
- requires static transitive java.base;
+ requires java.base;
+ requires static transitive java.compiler;
exports p to m.m1, m.m2;
opens p to m.m1, m.m2;
uses p.P;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/processing/warnings/TypeAlreadyExists/A.java Fri Jan 05 22:02:20 2018 +0100
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2017, Google Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+public class A {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/processing/warnings/TypeAlreadyExists/B.java Fri Jan 05 22:02:20 2018 +0100
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2017, Google Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+class B {
+ A a;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/processing/warnings/TypeAlreadyExists/TestProcTypeAlreadyExistsWarning.java Fri Jan 05 22:02:20 2018 +0100
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2017, Google Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8193216
+ * @summary Filer should warn if processors redefine symbols from the classpath or sourcepath
+ * @library /tools/javac/lib
+ * @modules java.compiler
+ * jdk.compiler
+ * @build JavacTestingAbstractProcessor TestProcTypeAlreadyExistsWarning
+ * @compile A.java
+ * @compile/ref=warn.out -XDrawDiagnostics -Xlint:processing -processor TestProcTypeAlreadyExistsWarning B.java
+ */
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import java.io.IOError;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Set;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.element.TypeElement;
+
+@SupportedAnnotationTypes("*")
+public class TestProcTypeAlreadyExistsWarning extends JavacTestingAbstractProcessor {
+
+ int round = 0;
+
+ @Override
+ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+ round++;
+
+ if (round == 1) {
+ try (OutputStream os =
+ processingEnv.getFiler().createSourceFile("A").openOutputStream()) {
+ os.write("class A {}".getBytes(UTF_8));
+ } catch (IOException e) {
+ throw new IOError(e);
+ }
+ }
+
+ return false;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/processing/warnings/TypeAlreadyExists/warn.out Fri Jan 05 22:02:20 2018 +0100
@@ -0,0 +1,2 @@
+- compiler.warn.proc.type.already.exists: A
+1 warning
--- a/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java Thu Jan 04 22:47:38 2018 -0800
+++ b/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java Fri Jan 05 22:02:20 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -88,6 +88,8 @@
public Object[][] jdkModules() {
return new Object[][]{
{"jdk.compiler", new String[]{
+ "java.base/jdk.internal.jmod",
+ "java.base/jdk.internal.misc",
"java.base/sun.reflect.annotation",
"java.compiler",
}
--- a/test/nashorn/TEST.ROOT Thu Jan 04 22:47:38 2018 -0800
+++ b/test/nashorn/TEST.ROOT Fri Jan 05 22:02:20 2018 +0100
@@ -8,7 +8,7 @@
groups=TEST.groups
# Minimum jtreg version
-requiredVersion=4.2 b08
+requiredVersion=4.2 b11
# Use new module options
useNewOptions=true
--- a/test/nashorn/script/basic/JDK-8011555.js.EXPECTED Thu Jan 04 22:47:38 2018 -0800
+++ b/test/nashorn/script/basic/JDK-8011555.js.EXPECTED Fri Jan 05 22:02:20 2018 +0100
@@ -1,1 +1,1 @@
-TypeError: function __noSuchMethod__() { [native code] } is not a constructor function
+ReferenceError: "X" is not defined
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/nashorn/script/basic/JDK-8193491.js Fri Jan 05 22:02:20 2018 +0100
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8193491 : JavaImporter fails to resolve method elements within functions, that contain too many statements
+ *
+ * @test
+ * @run
+ * @option -Dnashorn.compiler.splitter.threshold=200
+ * @fork
+ */
+
+var imports = new JavaImporter(java.lang, java.util, java.io);
+with (imports) {
+ function func() {
+ var m = new HashMap();
+ var f = new File(".");
+ var i = new Integer(2);
+ System.out.println(i);
+ System.out.println('a');
+ };
+ func();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/nashorn/script/basic/JDK-8193491.js.EXPECTED Fri Jan 05 22:02:20 2018 +0100
@@ -0,0 +1,2 @@
+2
+a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/nashorn/script/basic/JDK-8193508.js Fri Jan 05 22:02:20 2018 +0100
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8193508: Expressions in split literals must never be optimistic
+ *
+ * @test
+ * @run
+ * @option -Dnashorn.compiler.splitter.threshold=100
+ * @fork
+ */
+
+function f() {
+ return 'a';
+}
+
+var o = {
+ a: f(),
+ b: 1,
+ c: 2,
+ d: 3,
+ e: 4,
+ f: 5,
+ g: f(),
+ h: 1,
+ i: 2,
+ j: 3,
+ k: 4,
+ l: 5,
+ m: f(),
+ n: 1,
+ o: 2,
+ p: 3,
+ q: 4,
+ r: 5,
+ s: f(),
+ t: 1,
+ u: 2,
+ v: 3,
+ w: 4,
+ x: 5,
+ y: f(),
+ z: 1,
+ A: 2,
+ B: 3,
+ C: 4,
+ D: 5,
+ E: f(),
+ F: 1,
+ G: 2,
+ H: 3,
+ I: 4,
+ J: 5,
+ K: f(),
+ L: 1,
+ M: 2,
+ N: 3,
+ O: 4,
+ P: 5,
+ Q: f(),
+ R: 1,
+ S: 2,
+ T: 3,
+ U: 4,
+ V: 5,
+ W: f(),
+ X: 1,
+ Y: 2,
+ Z: 3
+};
+
+Assert.assertTrue(o.a === 'a');
+
--- a/test/nashorn/script/nosecurity/JDK-8165198.js Thu Jan 04 22:47:38 2018 -0800
+++ b/test/nashorn/script/nosecurity/JDK-8165198.js Fri Jan 05 22:02:20 2018 +0100
@@ -30,8 +30,11 @@
var NashornScriptEngineFactory = Java.type("jdk.nashorn.api.scripting.NashornScriptEngineFactory");
var e = new NashornScriptEngineFactory().getScriptEngine("-ot=false");
-var output = e.eval("with(new JavaImporter(java.util)){x}");
-print(output);
+try {
+ e.eval("with(new JavaImporter(java.util)){x}");
+} catch (e) {
+ print(e);
+}
e.eval("with(new JavaImporter(java.util)){x=1}");
var output2 = e.eval("with(new JavaImporter(java.util)){x}");
print(output2);
--- a/test/nashorn/script/nosecurity/JDK-8165198.js.EXPECTED Thu Jan 04 22:47:38 2018 -0800
+++ b/test/nashorn/script/nosecurity/JDK-8165198.js.EXPECTED Fri Jan 05 22:02:20 2018 +0100
@@ -1,2 +1,2 @@
-null
+javax.script.ScriptException: ReferenceError: "x" is not defined in <eval> at line number 1
1
--- a/test/nashorn/script/trusted/classfilter_mozilla_compat.js.EXPECTED Thu Jan 04 22:47:38 2018 -0800
+++ b/test/nashorn/script/trusted/classfilter_mozilla_compat.js.EXPECTED Fri Jan 05 22:02:20 2018 +0100
@@ -1,12 +1,12 @@
class jdk.nashorn.javaadapters.javax_script_ScriptContext
-TypeError: Java.extend needs at least one type argument. in nashorn:mozilla_compat.js at line number 39
+TypeError: Java.extend needs at least one type argument. in nashorn:mozilla_compat.js at line number 41
class jdk.nashorn.javaadapters.java_util_ArrayList
class jdk.nashorn.javaadapters.java_util_ArrayList
[JavaClass java.lang.Integer]
-TypeError: [object JavaPackage] is not a Java class in nashorn:mozilla_compat.js at line number 373 at column number 16
+TypeError: [object JavaPackage] is not a Java class in nashorn:mozilla_compat.js at line number 375 at column number 16
[JavaClass java.util.HashSet]
[JavaClass java.util.HashSet]
[JavaClass java.lang.Integer]
-ReferenceError: "Integer" is not defined in nashorn:mozilla_compat.js at line number 67
+ReferenceError: "Integer" is not defined in nashorn:mozilla_compat.js at line number 69
[JavaClass java.util.HashMap]
[JavaClass java.util.HashMap]