diff --git a/.hgtags b/.hgtags index 7a1ef94c809..d1af44ccacc 100644 --- a/.hgtags +++ b/.hgtags @@ -287,3 +287,4 @@ b409bc51bc23cfd51f2bd04ea919ec83535af9d0 jdk9-b37 3107be2ba9c6e208a0b86bc7100a141abbc5b5fb jdk9-b42 6494b13f88a867026ee316b444d9a4fa589dd6bd jdk9-b43 abbfccd659b91a7bb815d5e36fed635dcdd40f31 jdk9-b44 +bfc24ae2b900187585079bb11e66e459d1e525fe jdk9-b45 diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 1c8881b0d18..0ad3d644f11 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -287,3 +287,4 @@ cf136458ee747e151a27aa9ea0c1492ea55ef3e7 jdk9-b40 f7c11da0b0481d49cc7a65a453336c108191e821 jdk9-b42 02ee8c65622e8bd97496d584e22fc7dcf0edc4ae jdk9-b43 8994f5d87b3bb5e8d317d4e8ccb326da1a73684a jdk9-b44 +3dd628fde2086218d548841022ee8436b6b88185 jdk9-b45 diff --git a/Makefile b/Makefile index 1eff79b2194..0814d3867c6 100644 --- a/Makefile +++ b/Makefile @@ -54,8 +54,11 @@ ifneq ($(findstring qp,$(MAKEFLAGS)),) # Duplication of global targets, needed before ParseConfAndSpec in case we have # no configurations. help: - # If CONF is not set, look for all available configurations - CONF?= + # If both CONF and SPEC are unset, look for all available configurations by + # setting CONF to the empty string. + ifeq ($(SPEC), ) + CONF?= + endif endif # ... and then we can include our helper functions diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 59c1a8ae9e8..21ab1f47ecd 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -4329,7 +4329,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++" #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1418395009 +DATE_WHEN_GENERATED=1420811523 ############################################################################### # @@ -27408,8 +27408,8 @@ $as_echo "$as_me: Trying to extract Visual Studio environment variables" >&6;} # The trailing space for everyone except PATH is no typo, but is needed due # to trailing \ in the Windows paths. These will be stripped later. $ECHO "$WINPATH_BASH -c 'echo VS_PATH="'\"$PATH\" > set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE - $ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE - $ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE + $ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE\;$include \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE + $ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB\;$lib \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE $ECHO "$WINPATH_BASH -c 'echo VCINSTALLDIR="'\"$VCINSTALLDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE $ECHO "$WINPATH_BASH -c 'echo WindowsSdkDir="'\"$WindowsSdkDir \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE $ECHO "$WINPATH_BASH -c 'echo WINDOWSSDKDIR="'\"$WINDOWSSDKDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in index 60d70886925..1c6c1c40132 100644 --- a/common/autoconf/spec.gmk.in +++ b/common/autoconf/spec.gmk.in @@ -690,10 +690,15 @@ OS_VERSION_MICRO:=@OS_VERSION_MICRO@ # Images directory definitions JDK_IMAGE_SUBDIR:=jdk JRE_IMAGE_SUBDIR:=jre + # Colon left out to be able to override output dir for bootcycle-images JDK_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR) JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR) +# Test image, as above +TEST_IMAGE_SUBDIR:=test +TEST_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(TEST_IMAGE_SUBDIR) + # Macosx bundles directory definitions JDK_BUNDLE_SUBDIR=jdk-bundle/jdk$(JDK_VERSION).jdk/Contents JRE_BUNDLE_SUBDIR=jre-bundle/jre$(JDK_VERSION).jre/Contents diff --git a/common/autoconf/toolchain_windows.m4 b/common/autoconf/toolchain_windows.m4 index 231d2e837f2..e1ec6f3db5b 100644 --- a/common/autoconf/toolchain_windows.m4 +++ b/common/autoconf/toolchain_windows.m4 @@ -173,8 +173,8 @@ AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV], # The trailing space for everyone except PATH is no typo, but is needed due # to trailing \ in the Windows paths. These will be stripped later. $ECHO "$WINPATH_BASH -c 'echo VS_PATH="'\"$PATH\" > set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE - $ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE - $ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE + $ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE\;$include \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE + $ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB\;$lib \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE $ECHO "$WINPATH_BASH -c 'echo VCINSTALLDIR="'\"$VCINSTALLDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE $ECHO "$WINPATH_BASH -c 'echo WindowsSdkDir="'\"$WindowsSdkDir \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE $ECHO "$WINPATH_BASH -c 'echo WINDOWSSDKDIR="'\"$WINDOWSSDKDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE diff --git a/common/bin/unshuffle_list.txt b/common/bin/unshuffle_list.txt index cd0749c7aa8..0219bd7b005 100644 --- a/common/bin/unshuffle_list.txt +++ b/common/bin/unshuffle_list.txt @@ -26,10 +26,8 @@ corba/src/java.corba/share/classes/com/sun/org/omg : corba/src/share/classes/com corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl : corba/src/share/classes/com/sun/tools/corba/se/idl corba/src/java.corba/share/classes/javax/activity : corba/src/share/classes/javax/activity corba/src/java.corba/share/classes/javax/rmi : corba/src/share/classes/javax/rmi -corba/src/java.corba/share/classes/javax/transaction : corba/src/share/classes/javax/transaction corba/src/java.corba/share/classes/org/omg : corba/src/share/classes/org/omg corba/src/java.corba/share/classes/sun/corba : corba/src/share/classes/sun/corba -corba/src/java.sql/share/classes/javax/transaction/xa : corba/src/share/classes/javax/transaction/xa corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop : corba/src/share/classes/sun/rmi/rmic/iiop jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime : jaxp/src/com/sun/java_cup/internal/runtime jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal : jaxp/src/com/sun/org/apache/bcel/internal @@ -66,8 +64,8 @@ jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset : jaxws/s jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org : jaxws/src/share/jaxws_classes/com/sun/xml/internal/org jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2 : jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2 jaxws/src/java.xml.bind/share/classes/javax/xml/bind : jaxws/src/share/jaxws_classes/javax/xml/bind -jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging : jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging -jaxws/src/java.xml.soap/share/classes/javax/xml/soap : jaxws/src/share/jaxws_classes/javax/xml/soap +jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging : jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging +jaxws/src/java.xml.ws/share/classes/javax/xml/soap : jaxws/src/share/jaxws_classes/javax/xml/soap jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal : jaxws/src/share/jaxws_classes/com/oracle/webservices/internal jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal : jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish : jaxws/src/share/jaxws_classes/com/sun/org/glassfish @@ -1245,6 +1243,8 @@ jdk/src/java.sql.rowset/share/classes/com/sun/rowset : jdk/src/share/classes/com jdk/src/java.sql.rowset/share/classes/javax/sql/rowset : jdk/src/share/classes/javax/sql/rowset jdk/src/java.sql/share/classes/java/sql : jdk/src/share/classes/java/sql jdk/src/java.sql/share/classes/javax/sql : jdk/src/share/classes/javax/sql +jdk/src/java.sql/share/classes/javax/transaction/xa : corba/src/share/classes/javax/transaction/xa +jdk/src/java.transaction/share/classes/javax/transaction : corba/src/share/classes/javax/transaction jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security : jdk/src/share/classes/com/sun/org/apache/xml/internal/security jdk/src/java.xml.crypto/share/classes/javax/xml/crypto : jdk/src/share/classes/javax/xml/crypto jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal : jdk/src/share/classes/org/jcp/xml/dsig/internal diff --git a/corba/.hgtags b/corba/.hgtags index 3c3ea198849..859c412f8a7 100644 --- a/corba/.hgtags +++ b/corba/.hgtags @@ -287,3 +287,4 @@ e27c725d6c9d155667b35255f442d4ceb8c3c084 jdk9-b40 078bb11af876fe528d4b516f33ad4dd9bb60549e jdk9-b42 9645e35616b60c5c07b4fdf11a132afc8081dfa8 jdk9-b43 1f57bd728c9e6865ccb9d43ccd80a1c11230a32f jdk9-b44 +9e3f2bed80c0e5a84a256ce41f1d10c5ade48466 jdk9-b45 diff --git a/corba/src/java.sql/share/classes/javax/transaction/xa/XAResource.java b/corba/src/java.sql/share/classes/javax/transaction/xa/XAResource.java deleted file mode 100644 index ffb7226a446..00000000000 --- a/corba/src/java.sql/share/classes/javax/transaction/xa/XAResource.java +++ /dev/null @@ -1,314 +0,0 @@ -/* - * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved. - * 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 javax.transaction.xa; - -/**

The XAResource interface is a Java mapping of the industry standard - * XA interface based on the X/Open CAE Specification (Distributed - * Transaction Processing: The XA Specification). - * - *

The XA interface defines the contract between a Resource Manager - * and a Transaction Manager in a distributed transaction processing - * (DTP) environment. A JDBC driver or a JMS provider implements - * this interface to support the association between a global transaction - * and a database or message service connection. - * - *

The XAResource interface can be supported by any transactional - * resource that is intended to be used by application programs in an - * environment where transactions are controlled by an external - * transaction manager. An example of such a resource is a database - * management system. An application may access data through multiple - * database connections. Each database connection is enlisted with - * the transaction manager as a transactional resource. The transaction - * manager obtains an XAResource for each connection participating - * in a global transaction. The transaction manager uses the - * start method - * to associate the global transaction with the resource, and it uses the - * end method to disassociate the transaction from - * the resource. The resource - * manager is responsible for associating the global transaction to all - * work performed on its data between the start and end method invocations. - * - *

At transaction commit time, the resource managers are informed by - * the transaction manager to prepare, commit, or rollback a transaction - * according to the two-phase commit protocol.

- * - */ - -public interface XAResource -{ - /** Commits the global transaction specified by xid. - * - * @param xid A global transaction identifier - * - * @param onePhase If true, the resource manager should use a one-phase - * commit protocol to commit the work done on behalf of xid. - * - * @exception XAException An error has occurred. Possible XAExceptions - * are XA_HEURHAZ, XA_HEURCOM, XA_HEURRB, XA_HEURMIX, XAER_RMERR, - * XAER_RMFAIL, XAER_NOTA, XAER_INVAL, or XAER_PROTO. - * - *

If the resource manager did not commit the transaction and the - * paramether onePhase is set to true, the resource manager may throw - * one of the XA_RB* exceptions. Upon return, the resource manager has - * rolled back the branch's work and has released all held resources. - */ - - void commit(Xid xid, boolean onePhase) throws XAException; - - - /** Ends the work performed on behalf of a transaction branch. - * The resource manager disassociates the XA resource from the - * transaction branch specified and lets the transaction - * complete. - * - *

If TMSUSPEND is specified in the flags, the transaction branch - * is temporarily suspended in an incomplete state. The transaction - * context is in a suspended state and must be resumed via the - * start method with TMRESUME specified.

- * - *

If TMFAIL is specified, the portion of work has failed. - * The resource manager may mark the transaction as rollback-only

- * - *

If TMSUCCESS is specified, the portion of work has completed - * successfully.

- * - * @param xid A global transaction identifier that is the same as - * the identifier used previously in the start method. - * - * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND. - * - * @exception XAException An error has occurred. Possible XAException - * values are XAER_RMERR, XAER_RMFAILED, XAER_NOTA, XAER_INVAL, - * XAER_PROTO, or XA_RB*. - */ - - void end(Xid xid, int flags) throws XAException; - - - /** Tells the resource manager to forget about a heuristically - * completed transaction branch. - * - * @param xid A global transaction identifier. - * - * @exception XAException An error has occurred. Possible exception - * values are XAER_RMERR, XAER_RMFAIL, XAER_NOTA, XAER_INVAL, or - * XAER_PROTO. - */ - - void forget(Xid xid) throws XAException; - - /** Obtains the current transaction timeout value set for this - * XAResource instance. If XAResource.setTransactionTimeout - * was not used prior to invoking this method, the return value - * is the default timeout set for the resource manager; otherwise, - * the value used in the previous setTransactionTimeout - * call is returned. - * - * @return the transaction timeout value in seconds. - * - * @exception XAException An error has occurred. Possible exception - * values are XAER_RMERR and XAER_RMFAIL. - */ - int getTransactionTimeout() throws XAException; - - /** This method is called to determine if the resource manager - * instance represented by the target object is the same as the - * resouce manager instance represented by the parameter xares. - * - * @param xares An XAResource object whose resource manager instance - * is to be compared with the resource manager instance of the - * target object. - * - * @return true if it's the same RM instance; otherwise - * false. - * - * @exception XAException An error has occurred. Possible exception - * values are XAER_RMERR and XAER_RMFAIL. - * - */ - boolean isSameRM(XAResource xares) throws XAException; - - /** Ask the resource manager to prepare for a transaction commit - * of the transaction specified in xid. - * - * @param xid A global transaction identifier. - * - * @exception XAException An error has occurred. Possible exception - * values are: XA_RB*, XAER_RMERR, XAER_RMFAIL, XAER_NOTA, XAER_INVAL, - * or XAER_PROTO. - * - * @return A value indicating the resource manager's vote on the - * outcome of the transaction. The possible values are: XA_RDONLY - * or XA_OK. If the resource manager wants to roll back the - * transaction, it should do so by raising an appropriate XAException - * in the prepare method. - */ - - int prepare(Xid xid) throws XAException; - - - /** Obtains a list of prepared transaction branches from a resource - * manager. The transaction manager calls this method during recovery - * to obtain the list of transaction branches that are currently in - * prepared or heuristically completed states. - * - * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS - * must be used when no other flags are set in the parameter. - * - * @exception XAException An error has occurred. Possible values are - * XAER_RMERR, XAER_RMFAIL, XAER_INVAL, and XAER_PROTO. - * - * @return The resource manager returns zero or more XIDs of the - * transaction branches that are currently in a prepared or - * heuristically completed state. If an error occurs during the - * operation, the resource manager should throw the appropriate - * XAException. - * - */ - - Xid[] recover(int flag) throws XAException; - - - /** Informs the resource manager to roll back work done on behalf - * of a transaction branch. - * - * @param xid A global transaction identifier. - * - * @exception XAException An error has occurred. - */ - - void rollback(Xid xid) throws XAException; - - - /**

Sets the current transaction timeout value for this XAResource - * instance. Once set, this timeout value is effective until - * setTransactionTimeout is invoked again with a different - * value. To reset the timeout value to the default value used by the resource - * manager, set the value to zero. - * - * If the timeout operation is performed successfully, the method returns - * true; otherwise false. If a resource manager does not - * support explicitly setting the transaction timeout value, this method - * returns false. - * - * @param seconds The transaction timeout value in seconds. - * - * @return true if the transaction timeout value is set successfully; - * otherwise false. - * - * @exception XAException An error has occurred. Possible exception values - * are XAER_RMERR, XAER_RMFAIL, or XAER_INVAL. - */ - boolean setTransactionTimeout(int seconds) throws XAException; - - - /** Starts work on behalf of a transaction branch specified in - * xid. - * - * If TMJOIN is specified, the start applies to joining a transaction - * previously seen by the resource manager. If TMRESUME is specified, - * the start applies to resuming a suspended transaction specified in the - * parameter xid. - * - * If neither TMJOIN nor TMRESUME is specified and the transaction - * specified by xid has previously been seen by the resource - * manager, the resource manager throws the XAException exception with - * XAER_DUPID error code. - * - * @param xid A global transaction identifier to be associated - * with the resource. - * - * @param flags One of TMNOFLAGS, TMJOIN, or TMRESUME. - * - * @exception XAException An error has occurred. Possible exceptions - * are XA_RB*, XAER_RMERR, XAER_RMFAIL, XAER_DUPID, XAER_OUTSIDE, - * XAER_NOTA, XAER_INVAL, or XAER_PROTO. - * - */ - void start(Xid xid, int flags) throws XAException; - - - /** - * Ends a recovery scan. - */ - public final static int TMENDRSCAN = 0x00800000; - - /** - * Disassociates the caller and marks the transaction branch - * rollback-only. - */ - public final static int TMFAIL = 0x20000000; - - /** - * Caller is joining existing transaction branch. - */ - public final static int TMJOIN = 0x00200000; - - /** - * Use TMNOFLAGS to indicate no flags value is selected. - */ - public final static int TMNOFLAGS = 0x00000000; - - /** - * Caller is using one-phase optimization. - */ - public final static int TMONEPHASE = 0x40000000; - - /** - * Caller is resuming association with a suspended - * transaction branch. - */ - public final static int TMRESUME = 0x08000000; - - /** - * Starts a recovery scan. - */ - public final static int TMSTARTRSCAN = 0x01000000; - - - /** - * Disassociates caller from a transaction branch. - */ - public final static int TMSUCCESS = 0x04000000; - - - /** - * Caller is suspending (not ending) its association with - * a transaction branch. - */ - public final static int TMSUSPEND = 0x02000000; - - /** - * The transaction branch has been read-only and has been committed. - */ - public final static int XA_RDONLY = 0x00000003; - - /** - * The transaction work has been prepared normally. - */ - public final static int XA_OK = 0; - -} diff --git a/hotspot/.hgtags b/hotspot/.hgtags index ed88a27ff49..b4e518b36eb 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -447,3 +447,4 @@ c363a8b87e477ee45d6d3cb2a36cb365141bc596 jdk9-b38 38cb4fbd47e3472bd1b5ebac83bda96fe4869c4f jdk9-b42 65a9747147b8090037541040ba67156ec914db6a jdk9-b43 43a44b56dca61a4d766a20f0528fdd8b5ceff873 jdk9-b44 +5dc8184af1e2bb30b0103113d1f1a58a21a80c37 jdk9-b45 diff --git a/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp b/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp index 2a58b36d420..432a96d8268 100644 --- a/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp +++ b/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp @@ -264,11 +264,11 @@ void TemplateInterpreterGenerator::generate_counter_incr(Label* overflow, Label* __ cmpdi(CCR0, Rmdo, 0); __ beq(CCR0, no_mdo); - // Increment backedge counter in the MDO. - const int mdo_bc_offs = in_bytes(MethodData::backedge_counter_offset()) + in_bytes(InvocationCounter::counter_offset()); - __ lwz(Rscratch2, mdo_bc_offs, Rmdo); + // Increment invocation counter in the MDO. + const int mdo_ic_offs = in_bytes(MethodData::invocation_counter_offset()) + in_bytes(InvocationCounter::counter_offset()); + __ lwz(Rscratch2, mdo_ic_offs, Rmdo); __ addi(Rscratch2, Rscratch2, increment); - __ stw(Rscratch2, mdo_bc_offs, Rmdo); + __ stw(Rscratch2, mdo_ic_offs, Rmdo); __ load_const_optimized(Rscratch1, mask, R0); __ and_(Rscratch1, Rscratch2, Rscratch1); __ bne(CCR0, done); @@ -276,12 +276,12 @@ void TemplateInterpreterGenerator::generate_counter_incr(Label* overflow, Label* } // Increment counter in MethodCounters*. - const int mo_bc_offs = in_bytes(MethodCounters::backedge_counter_offset()) + in_bytes(InvocationCounter::counter_offset()); + const int mo_ic_offs = in_bytes(MethodCounters::invocation_counter_offset()) + in_bytes(InvocationCounter::counter_offset()); __ bind(no_mdo); __ get_method_counters(R19_method, R3_counters, done); - __ lwz(Rscratch2, mo_bc_offs, R3_counters); + __ lwz(Rscratch2, mo_ic_offs, R3_counters); __ addi(Rscratch2, Rscratch2, increment); - __ stw(Rscratch2, mo_bc_offs, R3_counters); + __ stw(Rscratch2, mo_ic_offs, R3_counters); __ load_const_optimized(Rscratch1, mask, R0); __ and_(Rscratch1, Rscratch2, Rscratch1); __ beq(CCR0, *overflow); diff --git a/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp b/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp index 60969caa962..4e7e702ad66 100644 --- a/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp +++ b/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp @@ -1,6 +1,6 @@ /* * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. - * Copyright 2007, 2008, 2011 Red Hat, Inc. + * Copyright 2007, 2008, 2011, 2015, Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -237,7 +237,13 @@ inline jint Atomic::xchg(jint exchange_value, volatile jint* dest) { // operation. Note that some platforms only support this with the // limitation that the only valid value to store is the immediate // constant 1. There is a test for this in JNI_CreateJavaVM(). - return __sync_lock_test_and_set (dest, exchange_value); + jint result = __sync_lock_test_and_set (dest, exchange_value); + // All atomic operations are expected to be full memory barriers + // (see atomic.hpp). However, __sync_lock_test_and_set is not + // a full memory barrier, but an acquire barrier. Hence, this added + // barrier. + __sync_synchronize(); + return result; #endif // M68K #endif // ARM } @@ -250,7 +256,9 @@ inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, #ifdef M68K return m68k_lock_test_and_set(dest, exchange_value); #else - return __sync_lock_test_and_set (dest, exchange_value); + intptr_t result = __sync_lock_test_and_set (dest, exchange_value); + __sync_synchronize(); + return result; #endif // M68K #endif // ARM } diff --git a/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp b/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp index d9df41034d4..266c950422b 100644 --- a/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp +++ b/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp @@ -1,6 +1,6 @@ /* * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. - * Copyright 2007, 2008, 2011 Red Hat, Inc. + * Copyright 2007, 2008, 2011, 2015, Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -231,7 +231,13 @@ inline jint Atomic::xchg(jint exchange_value, volatile jint* dest) { // operation. Note that some platforms only support this with the // limitation that the only valid value to store is the immediate // constant 1. There is a test for this in JNI_CreateJavaVM(). - return __sync_lock_test_and_set (dest, exchange_value); + jint result = __sync_lock_test_and_set (dest, exchange_value); + // All atomic operations are expected to be full memory barriers + // (see atomic.hpp). However, __sync_lock_test_and_set is not + // a full memory barrier, but an acquire barrier. Hence, this added + // barrier. + __sync_synchronize(); + return result; #endif // M68K #endif // ARM } @@ -244,7 +250,9 @@ inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, #ifdef M68K return m68k_lock_test_and_set(dest, exchange_value); #else - return __sync_lock_test_and_set (dest, exchange_value); + intptr_t result = __sync_lock_test_and_set (dest, exchange_value); + __sync_synchronize(); + return result; #endif // M68K #endif // ARM } diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp index 6bb8b5de63c..0119858fe5b 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp @@ -1910,7 +1910,6 @@ public: } void work(uint worker_id) { - double start = os::elapsedTime(); FreeRegionList local_cleanup_list("Local Cleanup List"); HRRSCleanupTask hrrs_cleanup_task; G1NoteEndOfConcMarkClosure g1_note_end(_g1h, &local_cleanup_list, diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp index 335ba2265d5..0d81bbfec83 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp @@ -1229,7 +1229,6 @@ bool G1CollectedHeap::do_collection(bool explicit_gc, TraceCollectorStats tcs(g1mm()->full_collection_counters()); TraceMemoryManagerStats tms(true /* fullGC */, gc_cause()); - double start = os::elapsedTime(); g1_policy()->record_full_collection_start(); // Note: When we have a more flexible GC logging framework that @@ -1436,7 +1435,6 @@ bool G1CollectedHeap::do_collection(bool explicit_gc, _allocator->init_mutator_alloc_region(); - double end = os::elapsedTime(); g1_policy()->record_full_collection_end(); if (G1Log::fine()) { diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp index ab79bcd05ad..3286453095c 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp @@ -56,7 +56,6 @@ class HRRSCleanupTask; class GenerationSpec; class OopsInHeapRegionClosure; class G1KlassScanClosure; -class G1ScanHeapEvacClosure; class ObjectClosure; class SpaceClosure; class CompactibleSpaceClosure; diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp index 5cc47a24964..175c5eb9448 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -153,14 +153,6 @@ G1CollectorPolicy::G1CollectorPolicy() : _inc_cset_predicted_elapsed_time_ms(0.0), _inc_cset_predicted_elapsed_time_ms_diffs(0.0), -#ifdef _MSC_VER // the use of 'this' below gets a warning, make it go away -#pragma warning( disable:4355 ) // 'this' : used in base member initializer list -#endif // _MSC_VER - - _short_lived_surv_rate_group(new SurvRateGroup(this, "Short Lived", - G1YoungSurvRateNumRegionsSummary)), - _survivor_surv_rate_group(new SurvRateGroup(this, "Survivor", - G1YoungSurvRateNumRegionsSummary)), // add here any more surv rate groups _recorded_survivor_regions(0), _recorded_survivor_head(NULL), @@ -169,6 +161,22 @@ G1CollectorPolicy::G1CollectorPolicy() : _gc_overhead_perc(0.0) { + uintx confidence_perc = G1ConfidencePercent; + // Put an artificial ceiling on this so that it's not set to a silly value. + if (confidence_perc > 100) { + confidence_perc = 100; + warning("G1ConfidencePercent is set to a value that is too large, " + "it's been updated to %u", confidence_perc); + } + // '_sigma' must be initialized before the SurvRateGroups below because they + // indirecty access '_sigma' trough the 'this' pointer in their constructor. + _sigma = (double) confidence_perc / 100.0; + + _short_lived_surv_rate_group = + new SurvRateGroup(this, "Short Lived", G1YoungSurvRateNumRegionsSummary); + _survivor_surv_rate_group = + new SurvRateGroup(this, "Survivor", G1YoungSurvRateNumRegionsSummary); + // Set up the region size and associated fields. Given that the // policy is created before the heap, we have to set this up here, // so it's done as soon as possible. @@ -283,15 +291,6 @@ G1CollectorPolicy::G1CollectorPolicy() : double time_slice = (double) GCPauseIntervalMillis / 1000.0; _mmu_tracker = new G1MMUTrackerQueue(time_slice, max_gc_time); - uintx confidence_perc = G1ConfidencePercent; - // Put an artificial ceiling on this so that it's not set to a silly value. - if (confidence_perc > 100) { - confidence_perc = 100; - warning("G1ConfidencePercent is set to a value that is too large, " - "it's been updated to %u", confidence_perc); - } - _sigma = (double) confidence_perc / 100.0; - // start conservatively (around 50ms is about right) _concurrent_mark_remark_times_ms->add(0.05); _concurrent_mark_cleanup_times_ms->add(0.20); diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.hpp index cdde980d306..e8d8c307676 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.hpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.hpp @@ -46,9 +46,6 @@ class ReferenceProcessor; class G1PrepareCompactClosure; class G1MarkSweep : AllStatic { - friend class VM_G1MarkSweep; - friend class Scavenge; - public: static void invoke_at_safepoint(ReferenceProcessor* rp, diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp index d972b5cc71c..008002566da 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp @@ -45,7 +45,8 @@ #include "utilities/bitMap.inline.hpp" G1PageBasedVirtualSpace::G1PageBasedVirtualSpace() : _low_boundary(NULL), - _high_boundary(NULL), _committed(), _page_size(0), _special(false), _executable(false) { + _high_boundary(NULL), _committed(), _page_size(0), _special(false), + _dirty(), _executable(false) { } bool G1PageBasedVirtualSpace::initialize_with_granularity(ReservedSpace rs, size_t page_size) { @@ -66,6 +67,9 @@ bool G1PageBasedVirtualSpace::initialize_with_granularity(ReservedSpace rs, size assert(_committed.size() == 0, "virtual space initialized more than once"); uintx size_in_bits = rs.size() / page_size; _committed.resize(size_in_bits, /* in_resource_area */ false); + if (_special) { + _dirty.resize(size_in_bits, /* in_resource_area */ false); + } return true; } @@ -84,6 +88,7 @@ void G1PageBasedVirtualSpace::release() { _executable = false; _page_size = 0; _committed.resize(0, false); + _dirty.resize(0, false); } size_t G1PageBasedVirtualSpace::committed_size() const { @@ -120,34 +125,43 @@ size_t G1PageBasedVirtualSpace::byte_size_for_pages(size_t num) { return num * _page_size; } -MemRegion G1PageBasedVirtualSpace::commit(uintptr_t start, size_t size_in_pages) { +bool G1PageBasedVirtualSpace::commit(uintptr_t start, size_t size_in_pages) { // We need to make sure to commit all pages covered by the given area. guarantee(is_area_uncommitted(start, size_in_pages), "Specified area is not uncommitted"); - if (!_special) { + bool zero_filled = true; + uintptr_t end = start + size_in_pages; + + if (_special) { + // Check for dirty pages and update zero_filled if any found. + if (_dirty.get_next_one_offset(start,end) < end) { + zero_filled = false; + _dirty.clear_range(start, end); + } + } else { os::commit_memory_or_exit(page_start(start), byte_size_for_pages(size_in_pages), _executable, err_msg("Failed to commit pages from "SIZE_FORMAT" of length "SIZE_FORMAT, start, size_in_pages)); } - _committed.set_range(start, start + size_in_pages); + _committed.set_range(start, end); - MemRegion result((HeapWord*)page_start(start), byte_size_for_pages(size_in_pages) / HeapWordSize); if (AlwaysPreTouch) { - os::pretouch_memory((char*)result.start(), (char*)result.end()); + os::pretouch_memory(page_start(start), page_start(end)); } - return result; + return zero_filled; } -MemRegion G1PageBasedVirtualSpace::uncommit(uintptr_t start, size_t size_in_pages) { +void G1PageBasedVirtualSpace::uncommit(uintptr_t start, size_t size_in_pages) { guarantee(is_area_committed(start, size_in_pages), "checking"); - if (!_special) { + if (_special) { + // Mark that memory is dirty. If committed again the memory might + // need to be cleared explicitly. + _dirty.set_range(start, start + size_in_pages); + } else { os::uncommit_memory(page_start(start), byte_size_for_pages(size_in_pages)); } _committed.clear_range(start, start + size_in_pages); - - MemRegion result((HeapWord*)page_start(start), byte_size_for_pages(size_in_pages) / HeapWordSize); - return result; } bool G1PageBasedVirtualSpace::contains(const void* p) const { @@ -157,7 +171,7 @@ bool G1PageBasedVirtualSpace::contains(const void* p) const { #ifndef PRODUCT void G1PageBasedVirtualSpace::print_on(outputStream* out) { out->print ("Virtual space:"); - if (special()) out->print(" (pinned in memory)"); + if (_special) out->print(" (pinned in memory)"); out->cr(); out->print_cr(" - committed: " SIZE_FORMAT, committed_size()); out->print_cr(" - reserved: " SIZE_FORMAT, reserved_size()); diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp index 972a69b2e8f..fb2c78415f9 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp @@ -49,6 +49,12 @@ class G1PageBasedVirtualSpace VALUE_OBJ_CLASS_SPEC { // Bitmap used for verification of commit/uncommit operations. BitMap _committed; + // Bitmap used to keep track of which pages are dirty or not for _special + // spaces. This is needed because for those spaces the underlying memory + // will only be zero filled the first time it is committed. Calls to commit + // will use this bitmap and return whether or not the memory is zero filled. + BitMap _dirty; + // Indicates that the entire space has been committed and pinned in memory, // os::commit_memory() or os::uncommit_memory() have no function. bool _special; @@ -71,12 +77,11 @@ class G1PageBasedVirtualSpace VALUE_OBJ_CLASS_SPEC { public: // Commit the given area of pages starting at start being size_in_pages large. - MemRegion commit(uintptr_t start, size_t size_in_pages); + // Returns true if the given area is zero filled upon completion. + bool commit(uintptr_t start, size_t size_in_pages); // Uncommit the given area of pages starting at start being size_in_pages large. - MemRegion uncommit(uintptr_t start, size_t size_in_pages); - - bool special() const { return _special; } + void uncommit(uintptr_t start, size_t size_in_pages); // Initialization G1PageBasedVirtualSpace(); diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RegionToSpaceMapper.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1RegionToSpaceMapper.cpp index 41eb0265dbf..68d967c764a 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1RegionToSpaceMapper.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1RegionToSpaceMapper.cpp @@ -67,9 +67,9 @@ class G1RegionsLargerThanCommitSizeMapper : public G1RegionToSpaceMapper { } virtual void commit_regions(uintptr_t start_idx, size_t num_regions) { - _storage.commit(start_idx * _pages_per_region, num_regions * _pages_per_region); + bool zero_filled = _storage.commit(start_idx * _pages_per_region, num_regions * _pages_per_region); _commit_map.set_range(start_idx, start_idx + num_regions); - fire_on_commit(start_idx, num_regions, true); + fire_on_commit(start_idx, num_regions, zero_filled); } virtual void uncommit_regions(uintptr_t start_idx, size_t num_regions) { @@ -117,8 +117,7 @@ class G1RegionsSmallerThanCommitSizeMapper : public G1RegionToSpaceMapper { uint old_refcount = _refcounts.get_by_index(idx); bool zero_filled = false; if (old_refcount == 0) { - _storage.commit(idx, 1); - zero_filled = true; + zero_filled = _storage.commit(idx, 1); } _refcounts.set_by_index(idx, old_refcount + 1); _commit_map.set_bit(i); diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp index 468d109803b..fb9d348789e 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp @@ -31,7 +31,6 @@ // collection set. class G1CollectedHeap; -class CardTableModRefBarrierSet; class ConcurrentG1Refine; class G1ParPushHeapRSClosure; diff --git a/hotspot/src/share/vm/memory/metaspace.cpp b/hotspot/src/share/vm/memory/metaspace.cpp index fd802d92671..7ef45f4bb25 100644 --- a/hotspot/src/share/vm/memory/metaspace.cpp +++ b/hotspot/src/share/vm/memory/metaspace.cpp @@ -3170,7 +3170,9 @@ void Metaspace::global_initialize() { } // the min_misc_data_size and min_misc_code_size estimates are based on - // MetaspaceShared::generate_vtable_methods() + // MetaspaceShared::generate_vtable_methods(). + // The minimum size only accounts for the vtable methods. Any size less than the + // minimum required size would cause vm crash when allocating the vtable methods. uint min_misc_data_size = align_size_up( MetaspaceShared::num_virtuals * MetaspaceShared::vtbl_list_size * sizeof(void*), max_alignment); @@ -3336,6 +3338,10 @@ void Metaspace::initialize(Mutex* lock, MetaspaceType type) { Metachunk* new_chunk = get_initialization_chunk(NonClassType, word_size, vsm()->medium_chunk_bunch()); + // For dumping shared archive, report error if allocation has failed. + if (DumpSharedSpaces && new_chunk == NULL) { + report_insufficient_metaspace(MetaspaceAux::committed_bytes() + word_size * BytesPerWord); + } assert(!DumpSharedSpaces || new_chunk != NULL, "should have enough space for both chunks"); if (new_chunk != NULL) { // Add to this manager's list of chunks in use and current_chunk(). @@ -3349,6 +3355,11 @@ void Metaspace::initialize(Mutex* lock, MetaspaceType type) { class_vsm()->medium_chunk_bunch()); if (class_chunk != NULL) { class_vsm()->add_chunk(class_chunk, true); + } else { + // For dumping shared archive, report error if allocation has failed. + if (DumpSharedSpaces) { + report_insufficient_metaspace(MetaspaceAux::committed_bytes() + class_word_size * BytesPerWord); + } } } diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp index 7e29670fb18..6d56c2f93d6 100644 --- a/hotspot/src/share/vm/runtime/globals.hpp +++ b/hotspot/src/share/vm/runtime/globals.hpp @@ -2951,10 +2951,6 @@ class CommandLineFlags { develop(intx, MallocCatchPtr, -1, \ "Hit breakpoint when mallocing/freeing this pointer") \ \ - notproduct(intx, AssertRepeat, 1, \ - "number of times to evaluate expression in assert " \ - "(to estimate overhead); only works with -DUSE_REPEATED_ASSERTS") \ - \ notproduct(ccstrlist, SuppressErrorAt, "", \ "List of assertions (file:line) to muzzle") \ \ diff --git a/hotspot/src/share/vm/runtime/os.cpp b/hotspot/src/share/vm/runtime/os.cpp index 665688b6808..31cffe27467 100644 --- a/hotspot/src/share/vm/runtime/os.cpp +++ b/hotspot/src/share/vm/runtime/os.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -547,20 +547,16 @@ static void verify_memory(void* ptr) { // This function supports testing of the malloc out of memory // condition without really running the system out of memory. // -static u_char* testMalloc(size_t alloc_size) { - assert(MallocMaxTestWords > 0, "sanity check"); +static bool has_reached_max_malloc_test_peak(size_t alloc_size) { + if (MallocMaxTestWords > 0) { + jint words = (jint)(alloc_size / BytesPerWord); - if ((cur_malloc_words + (alloc_size / BytesPerWord)) > MallocMaxTestWords) { - return NULL; + if ((cur_malloc_words + words) > MallocMaxTestWords) { + return true; + } + Atomic::add(words, (volatile jint *)&cur_malloc_words); } - - u_char* ptr = (u_char*)::malloc(alloc_size); - - if (ptr != NULL) { - Atomic::add(((jint) (alloc_size / BytesPerWord)), - (volatile jint *) &cur_malloc_words); - } - return ptr; + return false; } void* os::malloc(size_t size, MEMFLAGS flags) { @@ -608,13 +604,14 @@ void* os::malloc(size_t size, MEMFLAGS memflags, const NativeCallStack& stack) { NOT_PRODUCT(if (MallocVerifyInterval > 0) check_heap()); - u_char* ptr; - if (MallocMaxTestWords > 0) { - ptr = testMalloc(alloc_size); - } else { - ptr = (u_char*)::malloc(alloc_size); + // For the test flag -XX:MallocMaxTestWords + if (has_reached_max_malloc_test_peak(size)) { + return NULL; } + u_char* ptr; + ptr = (u_char*)::malloc(alloc_size); + #ifdef ASSERT if (ptr == NULL) { return NULL; @@ -642,6 +639,11 @@ void* os::realloc(void *memblock, size_t size, MEMFLAGS flags) { void* os::realloc(void *memblock, size_t size, MEMFLAGS memflags, const NativeCallStack& stack) { + // For the test flag -XX:MallocMaxTestWords + if (has_reached_max_malloc_test_peak(size)) { + return NULL; + } + #ifndef ASSERT NOT_PRODUCT(inc_stat_counter(&num_mallocs, 1)); NOT_PRODUCT(inc_stat_counter(&alloc_bytes, size)); diff --git a/hotspot/src/share/vm/shark/llvmHeaders.hpp b/hotspot/src/share/vm/shark/llvmHeaders.hpp index 05ef7fea1d3..b4bd45b8f52 100644 --- a/hotspot/src/share/vm/shark/llvmHeaders.hpp +++ b/hotspot/src/share/vm/shark/llvmHeaders.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -87,30 +87,7 @@ #undef assert #endif -// from hotspot/src/share/vm/utilities/debug.hpp -#ifdef ASSERT -#ifndef USE_REPEATED_ASSERTS -#define assert(p, msg) \ -do { \ - if (!(p)) { \ - report_vm_error(__FILE__, __LINE__, "assert(" #p ") failed", msg); \ - BREAKPOINT; \ - } \ -} while (0) -#else // #ifndef USE_REPEATED_ASSERTS -#define assert(p, msg) -do { \ - for (int __i = 0; __i < AssertRepeat; __i++) { \ - if (!(p)) { \ - report_vm_error(__FILE__, __LINE__, "assert(" #p ") failed", msg); \ - BREAKPOINT; \ - } \ - } \ -} while (0) -#endif // #ifndef USE_REPEATED_ASSERTS -#else - #define assert(p, msg) -#endif +#define assert(p, msg) vmassert(p, msg) #ifdef DEBUG #undef DEBUG diff --git a/hotspot/src/share/vm/utilities/debug.cpp b/hotspot/src/share/vm/utilities/debug.cpp index adacdc4233f..260aadfb7b2 100644 --- a/hotspot/src/share/vm/utilities/debug.cpp +++ b/hotspot/src/share/vm/utilities/debug.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -273,6 +273,14 @@ void report_out_of_shared_space(SharedSpaceType shared_space) { exit(2); } +void report_insufficient_metaspace(size_t required_size) { + warning("\nThe MaxMetaspaceSize of " UINTX_FORMAT " bytes is not large enough.\n" + "Either don't specify the -XX:MaxMetaspaceSize=\n" + "or increase the size to at least " SIZE_FORMAT ".\n", + MaxMetaspaceSize, required_size); + exit(2); +} + void report_java_out_of_memory(const char* message) { static jint out_of_memory_reported = 0; @@ -326,9 +334,9 @@ void test_error_handler() { // Keep this in sync with test/runtime/6888954/vmerrors.sh. switch (n) { - case 1: assert(str == NULL, "expected null"); - case 2: assert(num == 1023 && *str == 'X', - err_msg("num=" SIZE_FORMAT " str=\"%s\"", num, str)); + case 1: vmassert(str == NULL, "expected null"); + case 2: vmassert(num == 1023 && *str == 'X', + err_msg("num=" SIZE_FORMAT " str=\"%s\"", num, str)); case 3: guarantee(str == NULL, "expected null"); case 4: guarantee(num == 1023 && *str == 'X', err_msg("num=" SIZE_FORMAT " str=\"%s\"", num, str)); diff --git a/hotspot/src/share/vm/utilities/debug.hpp b/hotspot/src/share/vm/utilities/debug.hpp index 7995e6c085d..85fae1733a5 100644 --- a/hotspot/src/share/vm/utilities/debug.hpp +++ b/hotspot/src/share/vm/utilities/debug.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -105,58 +105,42 @@ void FormatBuffer::append(const char* format, ...) { va_end(argp); } -// Used to format messages for assert(), guarantee(), fatal(), etc. +// Used to format messages for vmassert(), guarantee(), fatal(), etc. typedef FormatBuffer<> err_msg; typedef FormatBufferResource err_msg_res; // assertions -#ifdef ASSERT -#ifndef USE_REPEATED_ASSERTS -#define assert(p, msg) \ +#ifndef ASSERT +#define vmassert(p, msg) +#else +// Note: message says "assert" rather than "vmassert" for backward +// compatibility with tools that parse/match the message text. +#define vmassert(p, msg) \ do { \ if (!(p)) { \ report_vm_error(__FILE__, __LINE__, "assert(" #p ") failed", msg); \ BREAKPOINT; \ } \ } while (0) -#else // #ifndef USE_REPEATED_ASSERTS -#define assert(p, msg) -do { \ - for (int __i = 0; __i < AssertRepeat; __i++) { \ - if (!(p)) { \ - report_vm_error(__FILE__, __LINE__, "assert(" #p ") failed", msg); \ - BREAKPOINT; \ - } \ - } \ -} while (0) -#endif // #ifndef USE_REPEATED_ASSERTS +#endif -// This version of assert is for use with checking return status from +// For backward compatibility. +#define assert(p, msg) vmassert(p, msg) + +// This version of vmassert is for use with checking return status from // library calls that return actual error values eg. EINVAL, // ENOMEM etc, rather than returning -1 and setting errno. // When the status is not what is expected it is very useful to know // what status was actually returned, so we pass the status variable as // an extra arg and use strerror to convert it to a meaningful string // like "Invalid argument", "out of memory" etc -#define assert_status(p, status, msg) \ -do { \ - if (!(p)) { \ - report_vm_error(__FILE__, __LINE__, "assert(" #p ") failed", \ - err_msg("error %s(%d) %s", strerror(status), \ - status, msg)); \ - BREAKPOINT; \ - } \ -} while (0) +#define vmassert_status(p, status, msg) \ + vmassert(p, err_msg("error %s(%d), %s", strerror(status), status, msg)) -// Do not assert this condition if there's already another error reported. -#define assert_if_no_error(cond,msg) assert((cond) || is_error_reported(), msg) -#else // #ifdef ASSERT - #define assert(p,msg) - #define assert_status(p,status,msg) - #define assert_if_no_error(cond,msg) -#endif // #ifdef ASSERT +// For backward compatibility. +#define assert_status(p, status, msg) vmassert_status(p, status, msg) -// guarantee is like assert except it's always executed -- use it for +// guarantee is like vmassert except it's always executed -- use it for // cheap tests that catch errors that would otherwise be hard to find. // guarantee is also used for Verify options. #define guarantee(p, msg) \ @@ -225,21 +209,22 @@ void report_untested(const char* file, int line, const char* message); void warning(const char* format, ...) ATTRIBUTE_PRINTF(1, 2); -#ifdef ASSERT -// Compile-time asserts. -template struct StaticAssert; -template <> struct StaticAssert {}; +// Compile-time asserts. Cond must be a compile-time constant expression that +// is convertible to bool. STATIC_ASSERT() can be used anywhere a declaration +// may appear. +// +// Implementation Note: STATIC_ASSERT_FAILURE provides a value member +// rather than type member that could be used directly in the typedef, because +// a type member would require conditional use of "typename", depending on +// whether Cond is dependent or not. The use of a value member leads to the +// use of an array type. -// Only StaticAssert is defined, so if cond evaluates to false we get -// a compile time exception when trying to use StaticAssert. -#define STATIC_ASSERT(cond) \ - do { \ - StaticAssert<(cond)> DUMMY_STATIC_ASSERT; \ - (void)DUMMY_STATIC_ASSERT; /* ignore */ \ - } while (false) -#else -#define STATIC_ASSERT(cond) -#endif +template struct STATIC_ASSERT_FAILURE; +template<> struct STATIC_ASSERT_FAILURE { enum { value = 1 }; }; + +#define STATIC_ASSERT(Cond) \ + typedef char STATIC_ASSERT_FAILURE_ ## __LINE__ [ \ + STATIC_ASSERT_FAILURE< (Cond) >::value ] // out of shared space reporting enum SharedSpaceType { @@ -251,6 +236,8 @@ enum SharedSpaceType { void report_out_of_shared_space(SharedSpaceType space_type); +void report_insufficient_metaspace(size_t required_size); + // out of memory reporting void report_java_out_of_memory(const char* message); @@ -258,7 +245,7 @@ void report_java_out_of_memory(const char* message); bool is_error_reported(); void set_error_reported(); -/* Test assert(), fatal(), guarantee(), etc. */ +/* Test vmassert(), fatal(), guarantee(), etc. */ NOT_PRODUCT(void test_error_handler();) void pd_ps(frame f); diff --git a/hotspot/src/share/vm/utilities/xmlstream.cpp b/hotspot/src/share/vm/utilities/xmlstream.cpp index dc1fd1e599a..394c063e8b4 100644 --- a/hotspot/src/share/vm/utilities/xmlstream.cpp +++ b/hotspot/src/share/vm/utilities/xmlstream.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,6 +33,10 @@ #include "runtime/vmThread.hpp" #include "utilities/xmlstream.hpp" +// Do not assert this condition if there's already another error reported. +#define assert_if_no_error(cond, msg) \ + vmassert((cond) || is_error_reported(), msg) + void xmlStream::initialize(outputStream* out) { _out = out; _last_flush = 0; diff --git a/hotspot/test/TEST.groups b/hotspot/test/TEST.groups index 7ece82fabe5..8c52e3ac175 100644 --- a/hotspot/test/TEST.groups +++ b/hotspot/test/TEST.groups @@ -1,5 +1,5 @@ # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -69,7 +69,6 @@ needs_jdk = \ gc/metaspace/TestPerfCountersAndMemoryPools.java \ runtime/6819213/TestBootNativeLibraryPath.java \ runtime/7158988/FieldMonitor.java \ - runtime/7194254/Test7194254.java \ runtime/Metaspace/FragmentMetaspace.java \ runtime/NMT/BaselineWithParameter.java \ runtime/NMT/JcmdBaselineDetail.java \ @@ -94,6 +93,7 @@ needs_jdk = \ runtime/NMT/VirtualAllocTestType.java \ runtime/RedefineObject/TestRedefineObject.java \ runtime/Thread/TestThreadDumpMonitorContention.java \ + runtime/Thread/ThreadPriorities.java \ runtime/XCheckJniJsig/XCheckJSig.java \ serviceability/attach/AttachWithStalePidFile.java \ serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java \ @@ -232,7 +232,8 @@ needs_g1gc = \ gc/g1/ \ gc/metaspace/G1AddMetaspaceDependency.java \ gc/metaspace/TestMetaspacePerfCounters.java \ - gc/startup_warnings/TestG1.java + gc/startup_warnings/TestG1.java \ + gc/whitebox/TestConcMarkCycleWB.java # All tests that explicitly set the serial GC # diff --git a/hotspot/test/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java b/hotspot/test/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java index 1695c35558a..920431525a8 100644 --- a/hotspot/test/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java +++ b/hotspot/test/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java @@ -26,6 +26,7 @@ * @bug 8042235 * @summary redefining method used by multiple MethodHandles crashes VM * @compile -XDignore.symbol.file RedefineMethodUsedByMultipleMethodHandles.java + * @ignore 7076820 * @run main RedefineMethodUsedByMultipleMethodHandles */ diff --git a/hotspot/test/compiler/profiling/spectrapredefineclass/Launcher.java b/hotspot/test/compiler/profiling/spectrapredefineclass/Launcher.java index 7a645ab0b8f..3c4f6b92bb4 100644 --- a/hotspot/test/compiler/profiling/spectrapredefineclass/Launcher.java +++ b/hotspot/test/compiler/profiling/spectrapredefineclass/Launcher.java @@ -28,6 +28,7 @@ import com.oracle.java.testlibrary.*; * @bug 8038636 * @library /testlibrary * @build Agent + * @ignore 7076820 * @run main ClassFileInstaller Agent * @run main Launcher * @run main/othervm -XX:-TieredCompilation -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:TypeProfileLevel=222 -XX:ReservedCodeCacheSize=3M Agent diff --git a/hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java b/hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java index 3c49cd58ea7..443f11e6c16 100644 --- a/hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java +++ b/hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java @@ -28,6 +28,7 @@ import com.oracle.java.testlibrary.*; * @bug 8040237 * @library /testlibrary * @build Agent Test A B + * @ignore 7076820 * @run main ClassFileInstaller Agent * @run main Launcher * @run main/othervm -XX:-TieredCompilation -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:TypeProfileLevel=222 -XX:ReservedCodeCacheSize=3M Agent diff --git a/hotspot/test/gc/TestSmallHeap.java b/hotspot/test/gc/TestSmallHeap.java index 321e33bf3b6..170b5397740 100644 --- a/hotspot/test/gc/TestSmallHeap.java +++ b/hotspot/test/gc/TestSmallHeap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,34 +26,46 @@ * @bug 8067438 * @requires vm.gc=="null" * @summary Verify that starting the VM with a small heap works - * @library /testlibrary - * @run main/othervm -Xmx4m -XX:+UseParallelGC TestSmallHeap - * @run main/othervm -Xmx4m -XX:+UseSerialGC TestSmallHeap - * @run main/othervm -Xmx4m -XX:+UseG1GC TestSmallHeap - * @run main/othervm -Xmx4m -XX:+UseConcMarkSweepGC -XX:CMSMarkStackSizeMax=1032 TestSmallHeap + * @library /testlibrary /../../test/lib + * @build TestSmallHeap + * @run main ClassFileInstaller sun.hotspot.WhiteBox + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx2m -XX:+UseParallelGC TestSmallHeap + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx2m -XX:+UseSerialGC TestSmallHeap + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx2m -XX:+UseG1GC TestSmallHeap + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx2m -XX:+UseConcMarkSweepGC TestSmallHeap + * + * Note: It would be nice to verify the minimal supported heap size (2m) here, + * but we align the heap size based on the card table size. And the card table + * size is aligned based on the minimal pages size provided by the os. This + * means that on most platforms, where the minimal page size is 4k, we get a + * minimal heap size of 2m but on Solaris/Sparc we have a page size of 8k and + * get a minimal heap size of 4m. And on platforms where the page size is 64k + * we get a minimal heap size of 32m. We never use large pages for the card table. * - * Note: It would be nice to verify the minimal supported heap size here, - * but that turns out to be quite tricky since we align the heap size based - * on the card table size. And the card table size is aligned based on the - * minimal pages size provided by the os. This means that on most platforms, - * where the minimal page size is 4k, we get a minimal heap size of 2m but - * on Solaris/Sparc we have a page size of 8k and get a minimal heap size - * of 8m. * There is also no check in the VM for verifying that the maximum heap size * is larger than the supported minimal heap size. This means that specifying - * -Xmx1m on the command line is fine but will give a heap of 2m (or 4m). - * To work around these rather strange behaviors this test uses 4m for all - * platforms. + * -Xmx1m on the command line is fine but will give a heap of 2m (or 4m or 32m). + * + * To work around these rather strange behaviors this test uses -Xmx2m but then + * calculates what the expected heap size should be. The calculation is a + * simplified version of the code in the VM. We assume that the card table will + * use one page. Each byte in the card table corresponds to 512 bytes on the heap. + * So, the expected heap size is page_size * 512. */ -import sun.management.ManagementFactoryHelper; +import com.oracle.java.testlibrary.*; import static com.oracle.java.testlibrary.Asserts.*; +import sun.hotspot.WhiteBox; +import sun.management.ManagementFactoryHelper; public class TestSmallHeap { public static void main(String[] args) { + WhiteBox wb = WhiteBox.getWhiteBox(); + int pageSize = wb.getVMPageSize(); + int heapBytesPerCard = 512; + long expectedMaxHeap = pageSize * heapBytesPerCard; String maxHeap = ManagementFactoryHelper.getDiagnosticMXBean().getVMOption("MaxHeapSize").getValue(); - String expectedMaxHeap = "4194304"; - assertEQ(maxHeap, expectedMaxHeap); + assertEQ(Long.parseLong(maxHeap), expectedMaxHeap); } } diff --git a/hotspot/test/runtime/NMT/ChangeTrackingLevel.java b/hotspot/test/runtime/NMT/ChangeTrackingLevel.java index 2794b05a833..d0df079cb66 100644 --- a/hotspot/test/runtime/NMT/ChangeTrackingLevel.java +++ b/hotspot/test/runtime/NMT/ChangeTrackingLevel.java @@ -27,6 +27,7 @@ * @summary Test that you can decrease NMT tracking level but not increase it. * @key nmt * @library /testlibrary /../../test/lib + * @ignore 8067167 * @build ChangeTrackingLevel * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission diff --git a/hotspot/test/runtime/NMT/PrintNMTStatistics.java b/hotspot/test/runtime/NMT/PrintNMTStatistics.java index 4b77303e026..ba46c20ec6f 100644 --- a/hotspot/test/runtime/NMT/PrintNMTStatistics.java +++ b/hotspot/test/runtime/NMT/PrintNMTStatistics.java @@ -27,6 +27,7 @@ * @bug 8005936 8058606 * @summary Verify PrintNMTStatistics on normal JVM exit for detail and summary tracking level * @library /testlibrary + * @ignore 8067167 */ import com.oracle.java.testlibrary.*; diff --git a/hotspot/test/runtime/SharedArchiveFile/MaxMetaspaceSize.java b/hotspot/test/runtime/SharedArchiveFile/MaxMetaspaceSize.java new file mode 100644 index 00000000000..9d8c4984377 --- /dev/null +++ b/hotspot/test/runtime/SharedArchiveFile/MaxMetaspaceSize.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 8067187 + * @summary Testing CDS dumping with the -XX:MaxMetaspaceSize= option + * @library /testlibrary + */ + +import com.oracle.java.testlibrary.*; + +public class MaxMetaspaceSize { + public static void main(String[] args) throws Exception { + ProcessBuilder pb = ProcessTools.createJavaProcessBuilder( + "-XX:MaxMetaspaceSize=20m", "-Xshare:dump"); + OutputAnalyzer output = new OutputAnalyzer(pb.start()); + output.shouldContain("is not large enough.\nEither don't specify the -XX:MaxMetaspaceSize=\nor increase the size to at least"); + output.shouldHaveExitValue(2); + } +} diff --git a/hotspot/test/runtime/7194254/Test7194254.java b/hotspot/test/runtime/Thread/ThreadPriorities.java similarity index 50% rename from hotspot/test/runtime/7194254/Test7194254.java rename to hotspot/test/runtime/Thread/ThreadPriorities.java index 08f55e55b22..18a75c1d35e 100644 --- a/hotspot/test/runtime/7194254/Test7194254.java +++ b/hotspot/test/runtime/Thread/ThreadPriorities.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2015 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,23 +27,21 @@ * @summary Creates several threads with different java priorities and checks * whether jstack reports correct priorities for them. * - * @ignore 8060219 - * @run main Test7194254 + * @library /testlibrary + * @run main ThreadPriorities */ -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.lang.management.ManagementFactory; -import java.lang.management.RuntimeMXBean; import java.util.ArrayList; -import java.util.List; import java.util.concurrent.CyclicBarrier; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class Test7194254 { +import com.oracle.java.testlibrary.*; +import static com.oracle.java.testlibrary.Asserts.*; - public static void main(String[] args) throws Exception { +public class ThreadPriorities { + + public static void main(String[] args) throws Throwable { final int NUMBER_OF_JAVA_PRIORITIES = Thread.MAX_PRIORITY - Thread.MIN_PRIORITY + 1; final CyclicBarrier barrier = @@ -68,53 +66,31 @@ public class Test7194254 { barrier.await(); // 1st int matches = 0; - List failed = new ArrayList<>(); - try { - String pid = getPid(); - String jstack = System.getProperty("java.home") + "/../bin/jstack"; - Process process = new ProcessBuilder(jstack, pid) - .redirectErrorStream(true).start(); - Pattern pattern = Pattern.compile( - "\\\"Priority=(\\d+)\\\".* prio=(\\d+).*"); - try (BufferedReader reader = new BufferedReader( - new InputStreamReader(process.getInputStream()))) { - String line; - while((line = reader.readLine()) != null) { - Matcher matcher = pattern.matcher(line); - if (matcher.matches()) { - matches += 1; - String expected = matcher.group(1); - String actual = matcher.group(2); - if (!expected.equals(actual)) { - failed.add(line); - } - } + ArrayList failed = new ArrayList<>(); + ProcessBuilder pb = new ProcessBuilder( + JDKToolFinder.getJDKTool("jstack"), + String.valueOf(ProcessTools.getProcessId())); + + String[] output = new OutputAnalyzer(pb.start()).getOutput().split("\\n+"); + + Pattern pattern = Pattern.compile( + "\\\"Priority=(\\d+)\\\".* prio=(\\d+).*"); + for (String line : output) { + Matcher matcher = pattern.matcher(line); + if (matcher.matches()) { + matches += 1; + String expected = matcher.group(1); + String actual = matcher.group(2); + if (!expected.equals(actual)) { + failed.add(line); } } - barrier.await(); // 2nd - } finally { - barrier.reset(); } + barrier.await(); // 2nd + barrier.reset(); - if (matches != NUMBER_OF_JAVA_PRIORITIES) { - throw new AssertionError("matches: expected " + - NUMBER_OF_JAVA_PRIORITIES + ", but was " + matches); - } - if (!failed.isEmpty()) { - throw new AssertionError(failed.size() + ":" + failed); - } - System.out.println("Test passes."); + assertEquals(matches, NUMBER_OF_JAVA_PRIORITIES); + assertTrue(failed.isEmpty(), failed.size() + ":" + failed); } - - static String getPid() { - RuntimeMXBean runtimebean = ManagementFactory.getRuntimeMXBean(); - String vmname = runtimebean.getName(); - int i = vmname.indexOf('@'); - if (i != -1) { - vmname = vmname.substring(0, i); - } - return vmname; - } - } diff --git a/hotspot/test/runtime/Unsafe/Reallocate.java b/hotspot/test/runtime/Unsafe/Reallocate.java new file mode 100644 index 00000000000..19442038374 --- /dev/null +++ b/hotspot/test/runtime/Unsafe/Reallocate.java @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 8058897 + * @library /testlibrary + * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:MallocMaxTestWords=100m Reallocate + */ + +import com.oracle.java.testlibrary.*; +import sun.misc.Unsafe; +import static com.oracle.java.testlibrary.Asserts.*; + +public class Reallocate { + public static void main(String args[]) throws Exception { + Unsafe unsafe = Utils.getUnsafe(); + + long address = unsafe.allocateMemory(1); + assertNotEquals(address, 0L); + + // Make sure we reallocate correctly + unsafe.putByte(address, Byte.MAX_VALUE); + address = unsafe.reallocateMemory(address, 2); + assertNotEquals(address, 0L); + assertEquals(unsafe.getByte(address), Byte.MAX_VALUE); + + // Reallocating with a 0 size should return a null pointer + address = unsafe.reallocateMemory(address, 0); + assertEquals(address, 0L); + + // Reallocating with a null pointer should result in a normal allocation + address = unsafe.reallocateMemory(0L, 1); + assertNotEquals(address, 0L); + unsafe.putByte(address, Byte.MAX_VALUE); + assertEquals(unsafe.getByte(address), Byte.MAX_VALUE); + + // Make sure we can throw an OOME when we fail to reallocate due to OOM + try { + unsafe.reallocateMemory(address, 100 * 1024 * 1024 * 8); + } catch (OutOfMemoryError e) { + // Expected + return; + } + throw new RuntimeException("Did not get expected OOM"); + } +} diff --git a/jaxp/.hgtags b/jaxp/.hgtags index bd9d0889f34..cf9a1867715 100644 --- a/jaxp/.hgtags +++ b/jaxp/.hgtags @@ -287,3 +287,4 @@ a12d347f84176200593999f4da91ae2bb86865b2 jdk9-b39 47b0d3fa4118b9d56870cf4004987438c501f5c0 jdk9-b42 40b242363040229a05224fbc5dc203a3f46a8f8f jdk9-b43 0cb0844b58924d6086d2850c22087d06679d5eef jdk9-b44 +0dab3e848229127c7aca4c58b98e2d90ba70372f jdk9-b45 diff --git a/jaxws/.hgtags b/jaxws/.hgtags index 7e1244a3c4b..e529fdaecfb 100644 --- a/jaxws/.hgtags +++ b/jaxws/.hgtags @@ -290,3 +290,4 @@ dd4ba422dba858b1c3c4b38f49a3e514be4e2790 jdk9-b38 301ddb4478fb36d1f025d14e7e48c2a434e9e6ff jdk9-b42 edc13d27dc871be57d7ca77eef77e6d04972fee2 jdk9-b43 2a03baa4d849818ff6d635f110c2813b12fc2326 jdk9-b44 +e529374fbe526dbd668e5e98fc047b42b3bc6d33 jdk9-b45 diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/LazyEnvelopeSource.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/LazyEnvelopeSource.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/LazyEnvelopeSource.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/LazyEnvelopeSource.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_de.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_de.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_es.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_es.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_fr.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_it.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_it.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ja.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_ko.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_pt_BR.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_CN.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings_zh_TW.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LazyEnvelope.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LazyEnvelope.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LazyEnvelope.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LazyEnvelope.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_de.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_de.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_es.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_es.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_fr.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_it.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_it.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ja.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_ko.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_pt_BR.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_CN.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings_zh_TW.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxBridge.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxBridge.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxBridge.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxBridge.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_de.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_de.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_es.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_es.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_fr.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_it.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_it.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ja.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_ko.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_pt_BR.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_CN.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings_zh_TW.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_de.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_de.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_es.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_es.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_fr.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_it.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_it.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ja.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_ko.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_pt_BR.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_CN.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings_zh_TW.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_de.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_de.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_es.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_es.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_fr.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_it.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_it.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ja.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_ko.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_pt_BR.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_CN.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings_zh_TW.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_de.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_de.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_es.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_es.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_fr.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_it.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_it.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ja.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_ko.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_pt_BR.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_CN.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings_zh_TW.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_de.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_de.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_de.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_es.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_es.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_es.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_fr.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_fr.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_fr.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_it.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_it.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_it.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ja.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ja.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ja.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ko.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ko.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_ko.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_pt_BR.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_pt_BR.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_pt_BR.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_CN.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_CN.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_CN.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_TW.properties similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_TW.properties rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings_zh_TW.properties diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/SAAJUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/SAAJUtil.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/SAAJUtil.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/SAAJUtil.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxReaderEx.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxReaderEx.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxReaderEx.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxReaderEx.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java diff --git a/jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java rename to jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/AttachmentPart.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/AttachmentPart.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/AttachmentPart.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/AttachmentPart.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/Detail.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Detail.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/Detail.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Detail.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/DetailEntry.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/DetailEntry.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/DetailEntry.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/DetailEntry.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/FactoryFinder.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/FactoryFinder.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/FactoryFinder.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/FactoryFinder.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/MessageFactory.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/MessageFactory.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/MessageFactory.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/MessageFactory.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/MimeHeader.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/MimeHeader.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/MimeHeader.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/MimeHeader.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/MimeHeaders.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/MimeHeaders.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/MimeHeaders.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/MimeHeaders.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/Name.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Name.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/Name.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Name.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/Node.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Node.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/Node.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Node.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SAAJMetaFactory.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SAAJMetaFactory.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SAAJMetaFactory.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SAAJMetaFactory.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SAAJResult.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SAAJResult.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SAAJResult.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SAAJResult.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPBody.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPBody.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPBody.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPBody.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPBodyElement.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPBodyElement.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPBodyElement.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPBodyElement.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPConnection.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPConnection.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPConnection.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPConnection.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPConnectionFactory.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPConnectionFactory.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPConnectionFactory.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPConnectionFactory.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPConstants.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPConstants.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPConstants.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPConstants.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPElement.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElement.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPElement.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElement.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPElementFactory.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElementFactory.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPElementFactory.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElementFactory.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPEnvelope.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPEnvelope.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPEnvelope.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPEnvelope.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPException.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPException.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPException.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPException.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPFactory.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFactory.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPFactory.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFactory.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPFault.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFault.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPFault.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFault.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPFaultElement.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFaultElement.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPFaultElement.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFaultElement.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPHeader.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPHeader.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPHeader.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPHeader.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPHeaderElement.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPHeaderElement.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPHeaderElement.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPHeaderElement.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPMessage.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPMessage.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPMessage.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPMessage.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPPart.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPPart.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/SOAPPart.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPPart.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/Text.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Text.java similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/Text.java rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Text.java diff --git a/jaxws/src/java.xml.soap/share/classes/javax/xml/soap/package.html b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/package.html similarity index 100% rename from jaxws/src/java.xml.soap/share/classes/javax/xml/soap/package.html rename to jaxws/src/java.xml.ws/share/classes/javax/xml/soap/package.html diff --git a/jdk/.hgtags b/jdk/.hgtags index bcf97a6c401..7a8ce5643e2 100644 --- a/jdk/.hgtags +++ b/jdk/.hgtags @@ -287,3 +287,4 @@ e336cbd8b15e959e70ed02f0f5e93fa76ebd4c07 jdk9-b41 6b2314173433467245261364a52fb8e347fe6342 jdk9-b42 8c6ad41974f9ab6c33d544b088648314963f2a50 jdk9-b43 8cc4dc300041eb70a7a40e4b2431a8f4d4965ea4 jdk9-b44 +9acaa4f57b0b9e3757a7b4576ca9418a75ea8287 jdk9-b45 diff --git a/jdk/make/lib/LibCommon.gmk b/jdk/make/lib/LibCommon.gmk index f8eb27a1139..250f8f44b2c 100644 --- a/jdk/make/lib/LibCommon.gmk +++ b/jdk/make/lib/LibCommon.gmk @@ -53,24 +53,21 @@ endif # Find the default set of src dirs for a native library. # Param 1 - module name # Param 2 - library name -define FindSrcDirsForLib +FindSrcDirsForLib = \ $(call uniq, $(wildcard \ $(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/lib$(strip $2) \ $(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/lib$(strip $2) \ $(JDK_TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2))) -endef ################################################################################ # Find lib dir for module # Param 1 - module name ifeq ($(OPENJDK_TARGET_OS_TYPE), unix) - define FindLibDirForModule - $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)$(OPENJDK_TARGET_CPU_LIBDIR) - endef + FindLibDirForModule = \ + $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)$(OPENJDK_TARGET_CPU_LIBDIR) else - define FindLibDirForModule - $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1) - endef + FindLibDirForModule = \ + $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1) endif ################################################################################ @@ -78,11 +75,10 @@ endif # Param 1 - module name # Param 2 - library name # Param 3 - subdir for library -define FindLib -$(strip \ - $(call FindLibDirForModule, $(strip $1))$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(SHARED_LIBRARY_SUFFIX) \ -) -endef +FindLib = \ + $(call FindLibDirForModule, \ + $(strip $1))$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(SHARED_LIBRARY_SUFFIX) + ################################################################################ # Define the header include flags needed to compile against it. diff --git a/jdk/make/src/classes/build/tools/module/boot.modules b/jdk/make/src/classes/build/tools/module/boot.modules index 396e13c4db3..9763b9287d4 100644 --- a/jdk/make/src/classes/build/tools/module/boot.modules +++ b/jdk/make/src/classes/build/tools/module/boot.modules @@ -17,10 +17,10 @@ java.security.sasl java.smartcardio java.sql java.sql.rowset +java.transaction java.xml java.xml.bind java.xml.crypto -java.xml.soap java.xml.ws jdk.charsets jdk.deploy diff --git a/jdk/src/java.base/share/classes/java/io/FilterOutputStream.java b/jdk/src/java.base/share/classes/java/io/FilterOutputStream.java index 7d5b0c9c074..85e4dd1b281 100644 --- a/jdk/src/java.base/share/classes/java/io/FilterOutputStream.java +++ b/jdk/src/java.base/share/classes/java/io/FilterOutputStream.java @@ -48,6 +48,8 @@ class FilterOutputStream extends OutputStream { */ protected OutputStream out; + private boolean closed; + /** * Creates an output stream filter built on top of the specified * underlying output stream. @@ -144,9 +146,9 @@ class FilterOutputStream extends OutputStream { * Closes this output stream and releases any system resources * associated with the stream. *

- * The close method of FilterOutputStream - * calls its flush method, and then calls the - * close method of its underlying output stream. + * When not already closed, the {@code close} method of {@code + * FilterOutputStream} calls its {@code flush} method, and then + * calls the {@code close} method of its underlying output stream. * * @exception IOException if an I/O error occurs. * @see java.io.FilterOutputStream#flush() @@ -154,6 +156,9 @@ class FilterOutputStream extends OutputStream { */ @SuppressWarnings("try") public void close() throws IOException { + if (closed) + return; + closed = true; try (OutputStream ostream = out) { flush(); } diff --git a/jdk/src/java.base/share/classes/java/lang/Deprecated.java b/jdk/src/java.base/share/classes/java/lang/Deprecated.java index 58a0691f054..7adc22edaf5 100644 --- a/jdk/src/java.base/share/classes/java/lang/Deprecated.java +++ b/jdk/src/java.base/share/classes/java/lang/Deprecated.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,9 +34,13 @@ import static java.lang.annotation.ElementType.*; * or because a better alternative exists. Compilers warn when a * deprecated program element is used or overridden in non-deprecated code. * + *

Use of the @Deprecated annotation on a local variable + * declaration or on a parameter declaration or a package declaration + * has no effect. + * * @author Neal Gafter * @since 1.5 - * @jls 9.6.3.6 @Deprecated + * @jls 9.6.4.6 @Deprecated */ @Documented @Retention(RetentionPolicy.RUNTIME) diff --git a/jdk/src/java.base/share/classes/java/math/BigInteger.java b/jdk/src/java.base/share/classes/java/math/BigInteger.java index 487ed224352..2088f63fca1 100644 --- a/jdk/src/java.base/share/classes/java/math/BigInteger.java +++ b/jdk/src/java.base/share/classes/java/math/BigInteger.java @@ -265,24 +265,41 @@ public class BigInteger extends Number implements Comparable { // Constructors /** - * Translates a byte array containing the two's-complement binary - * representation of a BigInteger into a BigInteger. The input array is + * Translates a byte sub-array containing the two's-complement binary + * representation of a BigInteger into a BigInteger. The sub-array is + * specified via an offset into the array and a length. The sub-array is * assumed to be in big-endian byte-order: the most significant - * byte is in the zeroth element. + * byte is the element at index {@code off}. The {@code val} array is + * assumed to be unchanged for the duration of the constructor call. * - * @param val big-endian two's-complement binary representation of - * BigInteger. + * An {@code IndexOutOfBoundsException} is thrown if the length of the array + * {@code val} is non-zero and either {@code off} is negative, {@code len} + * is negative, or {@code off+len} is greater than the length of + * {@code val}. + * + * @param val byte array containing a sub-array which is the big-endian + * two's-complement binary representation of a BigInteger. + * @param off the start offset of the binary representation. + * @param len the number of bytes to use. * @throws NumberFormatException {@code val} is zero bytes long. + * @throws IndexOutOfBoundsException if the provided array offset and + * length would cause an index into the byte array to be + * negative or greater than or equal to the array length. + * @since 1.9 */ - public BigInteger(byte[] val) { - if (val.length == 0) + public BigInteger(byte[] val, int off, int len) { + if (val.length == 0) { throw new NumberFormatException("Zero length BigInteger"); + } else if ((off < 0) || (off >= val.length) || (len < 0) || + (len > val.length - off)) { // 0 <= off < val.length + throw new IndexOutOfBoundsException(); + } - if (val[0] < 0) { - mag = makePositive(val); + if (val[off] < 0) { + mag = makePositive(val, off, len); signum = -1; } else { - mag = stripLeadingZeroBytes(val); + mag = stripLeadingZeroBytes(val, off, len); signum = (mag.length == 0 ? 0 : 1); } if (mag.length >= MAX_MAG_LENGTH) { @@ -290,11 +307,28 @@ public class BigInteger extends Number implements Comparable { } } + /** + * Translates a byte array containing the two's-complement binary + * representation of a BigInteger into a BigInteger. The input array is + * assumed to be in big-endian byte-order: the most significant + * byte is in the zeroth element. The {@code val} array is assumed to be + * unchanged for the duration of the constructor call. + * + * @param val big-endian two's-complement binary representation of a + * BigInteger. + * @throws NumberFormatException {@code val} is zero bytes long. + */ + public BigInteger(byte[] val) { + this(val, 0, val.length); + } + /** * This private constructor translates an int array containing the * two's-complement binary representation of a BigInteger into a * BigInteger. The input array is assumed to be in big-endian - * int-order: the most significant int is in the zeroth element. + * int-order: the most significant int is in the zeroth element. The + * {@code val} array is assumed to be unchanged for the duration of + * the constructor call. */ private BigInteger(int[] val) { if (val.length == 0) @@ -315,24 +349,44 @@ public class BigInteger extends Number implements Comparable { /** * Translates the sign-magnitude representation of a BigInteger into a * BigInteger. The sign is represented as an integer signum value: -1 for - * negative, 0 for zero, or 1 for positive. The magnitude is a byte array - * in big-endian byte-order: the most significant byte is in the - * zeroth element. A zero-length magnitude array is permissible, and will - * result in a BigInteger value of 0, whether signum is -1, 0 or 1. + * negative, 0 for zero, or 1 for positive. The magnitude is a sub-array of + * a byte array in big-endian byte-order: the most significant byte + * is the element at index {@code off}. A zero value of the length + * {@code len} is permissible, and will result in a BigInteger value of 0, + * whether signum is -1, 0 or 1. The {@code magnitude} array is assumed to + * be unchanged for the duration of the constructor call. + * + * An {@code IndexOutOfBoundsException} is thrown if the length of the array + * {@code magnitude} is non-zero and either {@code off} is negative, + * {@code len} is negative, or {@code off+len} is greater than the length of + * {@code magnitude}. * * @param signum signum of the number (-1 for negative, 0 for zero, 1 * for positive). * @param magnitude big-endian binary representation of the magnitude of * the number. + * @param off the start offset of the binary representation. + * @param len the number of bytes to use. * @throws NumberFormatException {@code signum} is not one of the three * legal values (-1, 0, and 1), or {@code signum} is 0 and * {@code magnitude} contains one or more non-zero bytes. + * @throws IndexOutOfBoundsException if the provided array offset and + * length would cause an index into the byte array to be + * negative or greater than or equal to the array length. + * @since 1.9 */ - public BigInteger(int signum, byte[] magnitude) { - this.mag = stripLeadingZeroBytes(magnitude); - - if (signum < -1 || signum > 1) + public BigInteger(int signum, byte[] magnitude, int off, int len) { + if (signum < -1 || signum > 1) { throw(new NumberFormatException("Invalid signum value")); + } else if ((off < 0) || (len < 0) || + (len > 0 && + ((off >= magnitude.length) || + (len > magnitude.length - off)))) { // 0 <= off < magnitude.length + throw new IndexOutOfBoundsException(); + } + + // stripLeadingZeroBytes() returns a zero length array if len == 0 + this.mag = stripLeadingZeroBytes(magnitude, off, len); if (this.mag.length == 0) { this.signum = 0; @@ -346,11 +400,34 @@ public class BigInteger extends Number implements Comparable { } } + /** + * Translates the sign-magnitude representation of a BigInteger into a + * BigInteger. The sign is represented as an integer signum value: -1 for + * negative, 0 for zero, or 1 for positive. The magnitude is a byte array + * in big-endian byte-order: the most significant byte is the + * zeroth element. A zero-length magnitude array is permissible, and will + * result in a BigInteger value of 0, whether signum is -1, 0 or 1. The + * {@code magnitude} array is assumed to be unchanged for the duration of + * the constructor call. + * + * @param signum signum of the number (-1 for negative, 0 for zero, 1 + * for positive). + * @param magnitude big-endian binary representation of the magnitude of + * the number. + * @throws NumberFormatException {@code signum} is not one of the three + * legal values (-1, 0, and 1), or {@code signum} is 0 and + * {@code magnitude} contains one or more non-zero bytes. + */ + public BigInteger(int signum, byte[] magnitude) { + this(signum, magnitude, 0, magnitude.length); + } + /** * A constructor for internal use that translates the sign-magnitude * representation of a BigInteger into a BigInteger. It checks the * arguments and copies the magnitude so this constructor would be - * safe for external use. + * safe for external use. The {@code magnitude} array is assumed to be + * unchanged for the duration of the constructor call. */ private BigInteger(int signum, int[] magnitude) { this.mag = stripLeadingZeroInts(magnitude); @@ -467,7 +544,9 @@ public class BigInteger extends Number implements Comparable { /* * Constructs a new BigInteger using a char array with radix=10. - * Sign is precalculated outside and not allowed in the val. + * Sign is precalculated outside and not allowed in the val. The {@code val} + * array is assumed to be unchanged for the duration of the constructor + * call. */ BigInteger(char[] val, int sign, int len) { int cursor = 0, numDigits; @@ -1035,11 +1114,12 @@ public class BigInteger extends Number implements Comparable { /** * This private constructor is for internal use and assumes that its - * arguments are correct. + * arguments are correct. The {@code magnitude} array is assumed to be + * unchanged for the duration of the constructor call. */ private BigInteger(byte[] magnitude, int signum) { this.signum = (magnitude.length == 0 ? 0 : signum); - this.mag = stripLeadingZeroBytes(magnitude); + this.mag = stripLeadingZeroBytes(magnitude, 0, magnitude.length); if (mag.length >= MAX_MAG_LENGTH) { checkRange(); } @@ -3977,18 +4057,18 @@ public class BigInteger extends Number implements Comparable { /** * Returns a copy of the input array stripped of any leading zero bytes. */ - private static int[] stripLeadingZeroBytes(byte a[]) { - int byteLength = a.length; + private static int[] stripLeadingZeroBytes(byte a[], int off, int len) { + int indexBound = off + len; int keep; // Find first nonzero byte - for (keep = 0; keep < byteLength && a[keep] == 0; keep++) + for (keep = off; keep < indexBound && a[keep] == 0; keep++) ; // Allocate new array and copy relevant part of input array - int intLength = ((byteLength - keep) + 3) >>> 2; + int intLength = ((indexBound - keep) + 3) >>> 2; int[] result = new int[intLength]; - int b = byteLength - 1; + int b = indexBound - 1; for (int i = intLength-1; i >= 0; i--) { result[i] = a[b--] & 0xff; int bytesRemaining = b - keep + 1; @@ -4003,27 +4083,27 @@ public class BigInteger extends Number implements Comparable { * Takes an array a representing a negative 2's-complement number and * returns the minimal (no leading zero bytes) unsigned whose value is -a. */ - private static int[] makePositive(byte a[]) { + private static int[] makePositive(byte a[], int off, int len) { int keep, k; - int byteLength = a.length; + int indexBound = off + len; // Find first non-sign (0xff) byte of input - for (keep=0; keep < byteLength && a[keep] == -1; keep++) + for (keep=off; keep < indexBound && a[keep] == -1; keep++) ; /* Allocate output array. If all non-sign bytes are 0x00, we must * allocate space for one extra output byte. */ - for (k=keep; k < byteLength && a[k] == 0; k++) + for (k=keep; k < indexBound && a[k] == 0; k++) ; - int extraByte = (k == byteLength) ? 1 : 0; - int intLength = ((byteLength - keep + extraByte) + 3) >>> 2; + int extraByte = (k == indexBound) ? 1 : 0; + int intLength = ((indexBound - keep + extraByte) + 3) >>> 2; int result[] = new int[intLength]; /* Copy one's complement of input into output, leaving extra * byte (if it exists) == 0x00 */ - int b = byteLength - 1; + int b = indexBound - 1; for (int i = intLength-1; i >= 0; i--) { result[i] = a[b--] & 0xff; int numBytesToTransfer = Math.min(3, b-keep+1); @@ -4248,7 +4328,7 @@ public class BigInteger extends Number implements Comparable { message = "BigInteger: Signum not present in stream"; throw new java.io.StreamCorruptedException(message); } - int[] mag = stripLeadingZeroBytes(magnitude); + int[] mag = stripLeadingZeroBytes(magnitude, 0, magnitude.length); if ((mag.length == 0) != (sign == 0)) { String message = "BigInteger: signum-magnitude mismatch"; if (fields.defaulted("magnitude")) diff --git a/jdk/src/java.base/share/classes/java/util/Formatter.java b/jdk/src/java.base/share/classes/java/util/Formatter.java index 70298d5b59f..a973ee6889e 100644 --- a/jdk/src/java.base/share/classes/java/util/Formatter.java +++ b/jdk/src/java.base/share/classes/java/util/Formatter.java @@ -3727,29 +3727,29 @@ public final class Formatter implements Closeable, Flushable { exp = new StringBuilder("+00"); } } - return; - } - long adjusted = -(long) scale + (len - 1); - if (form == BigDecimalLayoutForm.DECIMAL_FLOAT) { + } else if (form == BigDecimalLayoutForm.DECIMAL_FLOAT) { // count of padding zeros - int pad = scale - len; - if (pad >= 0) { + + if (scale >= len) { // 0.xxx form mant.append("0."); dot = true; - trailingZeros(mant, pad); + trailingZeros(mant, scale - len); mant.append(coeff); } else { - if (-pad < len) { + if (scale > 0) { // xx.xx form - mant.append(coeff, 0, -pad); + int pad = len - scale; + mant.append(coeff, 0, pad); mant.append('.'); dot = true; - mant.append(coeff, -pad, -pad + scale); - } else { + mant.append(coeff, pad, len); + } else { // scale < 0 // xx form mant.append(coeff, 0, len); - trailingZeros(mant, -scale); + if (intVal.signum() != 0) { + trailingZeros(mant, -scale); + } this.scale = 0; } } @@ -3762,6 +3762,7 @@ public final class Formatter implements Closeable, Flushable { mant.append(coeff, 1, len); } exp = new StringBuilder(); + long adjusted = -(long) scale + (len - 1); if (adjusted != 0) { long abs = Math.abs(adjusted); // require sign diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java b/jdk/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java index 0eddb61f1de..5d8f09f4567 100644 --- a/jdk/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java +++ b/jdk/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,7 +29,7 @@ import java.security.spec.AlgorithmParameterSpec; /** * This class specifies the parameters used with the - * RC5 + * RC5 * algorithm. * *

The parameters consist of a version number, a rounds count, a word @@ -37,7 +37,7 @@ import java.security.spec.AlgorithmParameterSpec; * *

This class can be used to initialize a Cipher object that * implements the RC5 algorithm as supplied by - * RSA Security Inc., + * RSA Security LLC, * or any parties authorized by RSA Security. * * @author Jan Luehe diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java b/jdk/src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java index c767a34cc08..a8c20e2bb58 100644 --- a/jdk/src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java +++ b/jdk/src/java.base/windows/classes/sun/nio/ch/FileDispatcherImpl.java @@ -123,7 +123,7 @@ class FileDispatcherImpl extends FileDispatcher { new PrivilegedAction() { @Override public String run() { - return System.getProperty("jdk.net.enableFastFileTransfer"); + return System.getProperty("jdk.nio.enableFastFileTransfer"); } }); boolean enable; diff --git a/jdk/src/java.base/windows/native/libnet/NetworkInterface_winXP.c b/jdk/src/java.base/windows/native/libnet/NetworkInterface_winXP.c index e5580c6f3dc..2308a59b44b 100644 --- a/jdk/src/java.base/windows/native/libnet/NetworkInterface_winXP.c +++ b/jdk/src/java.base/windows/native/libnet/NetworkInterface_winXP.c @@ -81,9 +81,17 @@ static int getAdapters (JNIEnv *env, IP_ADAPTER_ADDRESSES **adapters) { DWORD ret, flags; IP_ADAPTER_ADDRESSES *adapterInfo; ULONG len; + char *error_msg_buf = NULL; + size_t error_msg_buf_size = + strlen("IP Helper Library GetAdaptersAddresses function failed" + " with error == ") + 10; + int _ret = 0; + + adapterInfo = (IP_ADAPTER_ADDRESSES *)malloc (bufsize); if (adapterInfo == NULL) { - JNU_ThrowByName(env, "java/lang/OutOfMemoryError", "Native heap allocation failure"); + JNU_ThrowByName(env, "java/lang/OutOfMemoryError", + "Native heap allocation failure"); return -1; } @@ -94,10 +102,12 @@ static int getAdapters (JNIEnv *env, IP_ADAPTER_ADDRESSES **adapters) { ret = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, adapterInfo, &len); if (ret == ERROR_BUFFER_OVERFLOW) { - IP_ADAPTER_ADDRESSES * newAdapterInfo = (IP_ADAPTER_ADDRESSES *) realloc (adapterInfo, len); + IP_ADAPTER_ADDRESSES * newAdapterInfo = + (IP_ADAPTER_ADDRESSES *) realloc (adapterInfo, len); if (newAdapterInfo == NULL) { free(adapterInfo); - JNU_ThrowByName(env, "java/lang/OutOfMemoryError", "Native heap allocation failure"); + JNU_ThrowByName(env, "java/lang/OutOfMemoryError", + "Native heap allocation failure"); return -1; } @@ -109,8 +119,32 @@ static int getAdapters (JNIEnv *env, IP_ADAPTER_ADDRESSES **adapters) { if (ret != ERROR_SUCCESS) { free (adapterInfo); - JNU_ThrowByName(env, "java/lang/Error", - "IP Helper Library GetAdaptersAddresses function failed"); + if (ret == ERROR_INSUFFICIENT_BUFFER) { + JNU_ThrowByName(env, "java/lang/Error", + "IP Helper Library GetAdaptersAddresses function failed " + "with ERROR_INSUFFICIENT_BUFFER"); + } else if (ret == ERROR_ADDRESS_NOT_ASSOCIATED ) { + JNU_ThrowByName(env, "java/lang/Error", + "IP Helper Library GetAdaptersAddresses function failed " + "with ERROR_ADDRESS_NOT_ASSOCIATED"); + } else { + error_msg_buf = (char *)malloc(error_msg_buf_size); + if (error_msg_buf != NULL) { + memset(error_msg_buf, 0, error_msg_buf_size); + _ret = _snprintf_s(error_msg_buf, error_msg_buf_size, + _TRUNCATE, "IP Helper Library GetAdaptersAddresses " + "function failed with error == %d", ret); + if (_ret != -1) { + JNU_ThrowByName(env, "java/lang/Error", error_msg_buf); + } else { + JNU_ThrowByName(env, "java/lang/Error", + "IP Helper Library GetAdaptersAddresses function failure"); + } + } else { + JNU_ThrowByName(env, "java/lang/Error", + "IP Helper Library GetAdaptersAddresses function failed"); + } + } return -1; } *adapters = adapterInfo; @@ -126,9 +160,14 @@ IP_ADAPTER_ADDRESSES *getAdapter (JNIEnv *env, jint index) { DWORD flags, val; IP_ADAPTER_ADDRESSES *adapterInfo, *ptr, *ret; ULONG len; + char *error_msg_buf = NULL; + size_t error_msg_buf_size = + strlen("IP Helper Library GetAdaptersAddresses function failed with error == ") + 10; + int _ret = 0; adapterInfo = (IP_ADAPTER_ADDRESSES *)malloc (bufsize); if (adapterInfo == NULL) { - JNU_ThrowByName(env, "java/lang/OutOfMemoryError", "Native heap allocation failure"); + JNU_ThrowByName(env, "java/lang/OutOfMemoryError", + "Native heap allocation failure"); return NULL; } len = bufsize; @@ -137,10 +176,12 @@ IP_ADAPTER_ADDRESSES *getAdapter (JNIEnv *env, jint index) { flags |= GAA_FLAG_INCLUDE_PREFIX; val = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, adapterInfo, &len); if (val == ERROR_BUFFER_OVERFLOW) { - IP_ADAPTER_ADDRESSES * newAdapterInfo = (IP_ADAPTER_ADDRESSES *) realloc (adapterInfo, len); + IP_ADAPTER_ADDRESSES * newAdapterInfo = + (IP_ADAPTER_ADDRESSES *) realloc (adapterInfo, len); if (newAdapterInfo == NULL) { free(adapterInfo); - JNU_ThrowByName(env, "java/lang/OutOfMemoryError", "Native heap allocation failure"); + JNU_ThrowByName(env, "java/lang/OutOfMemoryError", + "Native heap allocation failure"); return NULL; } @@ -152,10 +193,35 @@ IP_ADAPTER_ADDRESSES *getAdapter (JNIEnv *env, jint index) { if (val != ERROR_SUCCESS) { free (adapterInfo); - JNU_ThrowByName(env, "java/lang/Error", - "IP Helper Library GetAdaptersAddresses function failed"); + if (val == ERROR_INSUFFICIENT_BUFFER) { + JNU_ThrowByName(env, "java/lang/Error", + "IP Helper Library GetAdaptersAddresses function failed " + "with ERROR_INSUFFICIENT_BUFFER"); + } else if (val == ERROR_ADDRESS_NOT_ASSOCIATED ) { + JNU_ThrowByName(env, "java/lang/Error", + "IP Helper Library GetAdaptersAddresses function failed " + "with ERROR_ADDRESS_NOT_ASSOCIATED"); + } else { + error_msg_buf = (char *)malloc(error_msg_buf_size); + if (error_msg_buf != NULL) { + memset(error_msg_buf, 0, error_msg_buf_size); + _ret = _snprintf_s(error_msg_buf, error_msg_buf_size, + _TRUNCATE, "IP Helper Library GetAdaptersAddresses function failed " + "with error == %d", val); + if (_ret != -1) { + JNU_ThrowByName(env, "java/lang/Error", error_msg_buf); + } else { + JNU_ThrowByName(env, "java/lang/Error", + "IP Helper Library GetAdaptersAddresses function failure"); + } + } else { + JNU_ThrowByName(env, "java/lang/Error", + "IP Helper Library GetAdaptersAddresses function failed"); + } + } return NULL; } + ptr = adapterInfo; ret = NULL; while (ptr != NULL) { @@ -168,7 +234,8 @@ IP_ADAPTER_ADDRESSES *getAdapter (JNIEnv *env, jint index) { ret = (IP_ADAPTER_ADDRESSES *) malloc(sizeof(IP_ADAPTER_ADDRESSES)); if (ret == NULL) { free(adapterInfo); - JNU_ThrowByName(env, "java/lang/OutOfMemoryError", "Native heap allocation failure"); + JNU_ThrowByName(env, "java/lang/OutOfMemoryError", + "Native heap allocation failure"); return NULL; } diff --git a/jdk/src/java.scripting/share/classes/javax/script/ScriptEngineFactory.java b/jdk/src/java.scripting/share/classes/javax/script/ScriptEngineFactory.java index e73c99f5203..7692a0aaec7 100644 --- a/jdk/src/java.scripting/share/classes/javax/script/ScriptEngineFactory.java +++ b/jdk/src/java.scripting/share/classes/javax/script/ScriptEngineFactory.java @@ -85,7 +85,7 @@ public interface ScriptEngineFactory { public List getNames(); /** - * Returns the name of the scripting langauge supported by this + * Returns the name of the scripting language supported by this * ScriptEngine. * @return The name of the supported language. */ @@ -104,14 +104,15 @@ public interface ScriptEngineFactory { *

*

* The values for these keys are the Strings returned by getEngineName, - * getEngineVersion, getName, getLanguageName and - * getLanguageVersion respectively.

+ * getEngineVersion, getLanguageName, + * getLanguageVersion for the first four keys respectively. For NAME, one of the Strings + * returned by getNames is returned.

* A reserved key, THREADING, whose value describes the behavior of the engine * with respect to concurrent execution of scripts and maintenance of state is also defined. * These values for the THREADING key are:

diff --git a/corba/src/java.sql/share/classes/javax/transaction/xa/XAException.java b/jdk/src/java.sql/share/classes/javax/transaction/xa/XAException.java similarity index 93% rename from corba/src/java.sql/share/classes/javax/transaction/xa/XAException.java rename to jdk/src/java.sql/share/classes/javax/transaction/xa/XAException.java index 7941e98995b..62ae7e5e8d9 100644 --- a/corba/src/java.sql/share/classes/javax/transaction/xa/XAException.java +++ b/jdk/src/java.sql/share/classes/javax/transaction/xa/XAException.java @@ -30,21 +30,20 @@ package javax.transaction.xa; * Transaction Manager of an error encountered by the involved transaction. * */ -public class XAException extends java.lang.Exception { +public class XAException extends Exception { + //private static final long serialVersionUID = -8249683284832867751L; /** - * The error code with which to create the SystemException. - * - * @serial The error code for the exception + * The error code with which to create the SystemException. + * + * @serial The error code for the exception */ - public int errorCode; /** * Create an XAException. */ - public XAException() - { + public XAException() { super(); } @@ -54,8 +53,7 @@ public class XAException extends java.lang.Exception { * @param s The String object containing the exception * message. */ - public XAException(String s) - { + public XAException(String s) { super(s); } @@ -64,8 +62,7 @@ public class XAException extends java.lang.Exception { * * @param errcode The error code identifying the exception. */ - public XAException(int errcode) - { + public XAException(int errcode) { super(); errorCode = errcode; } @@ -196,6 +193,4 @@ public class XAException extends java.lang.Exception { * The resource manager is doing work outside a global transaction. */ public final static int XAER_OUTSIDE = -9; - - } diff --git a/jdk/src/java.sql/share/classes/javax/transaction/xa/XAResource.java b/jdk/src/java.sql/share/classes/javax/transaction/xa/XAResource.java new file mode 100644 index 00000000000..489818e98a5 --- /dev/null +++ b/jdk/src/java.sql/share/classes/javax/transaction/xa/XAResource.java @@ -0,0 +1,305 @@ +/* + * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved. + * 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 javax.transaction.xa; + +/** + * The XAResource interface is a Java mapping of the industry standard + * XA interface based on the X/Open CAE Specification (Distributed + * Transaction Processing: The XA Specification). + * + *

The XA interface defines the contract between a Resource Manager + * and a Transaction Manager in a distributed transaction processing + * (DTP) environment. A JDBC driver or a JMS provider implements + * this interface to support the association between a global transaction + * and a database or message service connection. + * + *

The XAResource interface can be supported by any transactional + * resource that is intended to be used by application programs in an + * environment where transactions are controlled by an external + * transaction manager. An example of such a resource is a database + * management system. An application may access data through multiple + * database connections. Each database connection is enlisted with + * the transaction manager as a transactional resource. The transaction + * manager obtains an XAResource for each connection participating + * in a global transaction. The transaction manager uses the + * start method + * to associate the global transaction with the resource, and it uses the + * end method to disassociate the transaction from + * the resource. The resource + * manager is responsible for associating the global transaction to all + * work performed on its data between the start and end method invocations. + * + *

At transaction commit time, the resource managers are informed by + * the transaction manager to prepare, commit, or rollback a transaction + * according to the two-phase commit protocol.

+ * + */ +public interface XAResource { + + /** + * Commits the global transaction specified by xid. + * + * @param xid A global transaction identifier + * + * @param onePhase If true, the resource manager should use a one-phase + * commit protocol to commit the work done on behalf of xid. + * + * @exception XAException An error has occurred. Possible XAExceptions + * are XA_HEURHAZ, XA_HEURCOM, XA_HEURRB, XA_HEURMIX, XAER_RMERR, + * XAER_RMFAIL, XAER_NOTA, XAER_INVAL, or XAER_PROTO. + * + *

If the resource manager did not commit the transaction and the + * paramether onePhase is set to true, the resource manager may throw + * one of the XA_RB* exceptions. Upon return, the resource manager has + * rolled back the branch's work and has released all held resources. + */ + void commit(Xid xid, boolean onePhase) throws XAException; + + /** + * Ends the work performed on behalf of a transaction branch. + * The resource manager disassociates the XA resource from the + * transaction branch specified and lets the transaction + * complete. + * + *

If TMSUSPEND is specified in the flags, the transaction branch + * is temporarily suspended in an incomplete state. The transaction + * context is in a suspended state and must be resumed via the + * start method with TMRESUME specified.

+ * + *

If TMFAIL is specified, the portion of work has failed. + * The resource manager may mark the transaction as rollback-only

+ * + *

If TMSUCCESS is specified, the portion of work has completed + * successfully.

+ * + * @param xid A global transaction identifier that is the same as + * the identifier used previously in the start method. + * + * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND. + * + * @exception XAException An error has occurred. Possible XAException + * values are XAER_RMERR, XAER_RMFAILED, XAER_NOTA, XAER_INVAL, + * XAER_PROTO, or XA_RB*. + */ + void end(Xid xid, int flags) throws XAException; + + /** + * Tells the resource manager to forget about a heuristically + * completed transaction branch. + * + * @param xid A global transaction identifier. + * + * @exception XAException An error has occurred. Possible exception + * values are XAER_RMERR, XAER_RMFAIL, XAER_NOTA, XAER_INVAL, or + * XAER_PROTO. + */ + void forget(Xid xid) throws XAException; + + /** + * Obtains the current transaction timeout value set for this + * XAResource instance. If XAResource.setTransactionTimeout + * was not used prior to invoking this method, the return value + * is the default timeout set for the resource manager; otherwise, + * the value used in the previous setTransactionTimeout + * call is returned. + * + * @return the transaction timeout value in seconds. + * + * @exception XAException An error has occurred. Possible exception + * values are XAER_RMERR and XAER_RMFAIL. + */ + int getTransactionTimeout() throws XAException; + + /** + * This method is called to determine if the resource manager + * instance represented by the target object is the same as the + * resouce manager instance represented by the parameter xares. + * + * @param xares An XAResource object whose resource manager instance + * is to be compared with the resource manager instance of the + * target object. + * + * @return true if it's the same RM instance; otherwise + * false. + * + * @exception XAException An error has occurred. Possible exception + * values are XAER_RMERR and XAER_RMFAIL. + */ + boolean isSameRM(XAResource xares) throws XAException; + + /** + * Ask the resource manager to prepare for a transaction commit + * of the transaction specified in xid. + * + * @param xid A global transaction identifier. + * + * @exception XAException An error has occurred. Possible exception + * values are: XA_RB*, XAER_RMERR, XAER_RMFAIL, XAER_NOTA, XAER_INVAL, + * or XAER_PROTO. + * + * @return A value indicating the resource manager's vote on the + * outcome of the transaction. The possible values are: XA_RDONLY + * or XA_OK. If the resource manager wants to roll back the + * transaction, it should do so by raising an appropriate XAException + * in the prepare method. + */ + int prepare(Xid xid) throws XAException; + + /** + * Obtains a list of prepared transaction branches from a resource + * manager. The transaction manager calls this method during recovery + * to obtain the list of transaction branches that are currently in + * prepared or heuristically completed states. + * + * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS + * must be used when no other flags are set in the parameter. + * + * @exception XAException An error has occurred. Possible values are + * XAER_RMERR, XAER_RMFAIL, XAER_INVAL, and XAER_PROTO. + * + * @return The resource manager returns zero or more XIDs of the + * transaction branches that are currently in a prepared or + * heuristically completed state. If an error occurs during the + * operation, the resource manager should throw the appropriate + * XAException. + */ + Xid[] recover(int flag) throws XAException; + + /** + * Informs the resource manager to roll back work done on behalf + * of a transaction branch. + * + * @param xid A global transaction identifier. + * + * @exception XAException An error has occurred. + */ + void rollback(Xid xid) throws XAException; + + /** + * Sets the current transaction timeout value for this XAResource + * instance. Once set, this timeout value is effective until + * setTransactionTimeout is invoked again with a different + * value. To reset the timeout value to the default value used by the resource + * manager, set the value to zero. + * + * If the timeout operation is performed successfully, the method returns + * true; otherwise false. If a resource manager does not + * support explicitly setting the transaction timeout value, this method + * returns false. + * + * @param seconds The transaction timeout value in seconds. + * + * @return true if the transaction timeout value is set successfully; + * otherwise false. + * + * @exception XAException An error has occurred. Possible exception values + * are XAER_RMERR, XAER_RMFAIL, or XAER_INVAL. + */ + boolean setTransactionTimeout(int seconds) throws XAException; + + /** + * Starts work on behalf of a transaction branch specified in + * xid. + * + * If TMJOIN is specified, the start applies to joining a transaction + * previously seen by the resource manager. If TMRESUME is specified, + * the start applies to resuming a suspended transaction specified in the + * parameter xid. + * + * If neither TMJOIN nor TMRESUME is specified and the transaction + * specified by xid has previously been seen by the resource + * manager, the resource manager throws the XAException exception with + * XAER_DUPID error code. + * + * @param xid A global transaction identifier to be associated + * with the resource. + * + * @param flags One of TMNOFLAGS, TMJOIN, or TMRESUME. + * + * @exception XAException An error has occurred. Possible exceptions + * are XA_RB*, XAER_RMERR, XAER_RMFAIL, XAER_DUPID, XAER_OUTSIDE, + * XAER_NOTA, XAER_INVAL, or XAER_PROTO. + */ + void start(Xid xid, int flags) throws XAException; + + /** + * Ends a recovery scan. + */ + public final static int TMENDRSCAN = 0x00800000; + + /** + * Disassociates the caller and marks the transaction branch + * rollback-only. + */ + public final static int TMFAIL = 0x20000000; + + /** + * Caller is joining existing transaction branch. + */ + public final static int TMJOIN = 0x00200000; + + /** + * Use TMNOFLAGS to indicate no flags value is selected. + */ + public final static int TMNOFLAGS = 0x00000000; + + /** + * Caller is using one-phase optimization. + */ + public final static int TMONEPHASE = 0x40000000; + + /** + * Caller is resuming association with a suspended + * transaction branch. + */ + public final static int TMRESUME = 0x08000000; + + /** + * Starts a recovery scan. + */ + public final static int TMSTARTRSCAN = 0x01000000; + + /** + * Disassociates caller from a transaction branch. + */ + public final static int TMSUCCESS = 0x04000000; + + /** + * Caller is suspending (not ending) its association with + * a transaction branch. + */ + public final static int TMSUSPEND = 0x02000000; + + /** + * The transaction branch has been read-only and has been committed. + */ + public final static int XA_RDONLY = 0x00000003; + + /** + * The transaction work has been prepared normally. + */ + public final static int XA_OK = 0; +} diff --git a/corba/src/java.sql/share/classes/javax/transaction/xa/Xid.java b/jdk/src/java.sql/share/classes/javax/transaction/xa/Xid.java similarity index 100% rename from corba/src/java.sql/share/classes/javax/transaction/xa/Xid.java rename to jdk/src/java.sql/share/classes/javax/transaction/xa/Xid.java diff --git a/corba/src/java.sql/share/classes/javax/transaction/xa/package.html b/jdk/src/java.sql/share/classes/javax/transaction/xa/package.html similarity index 100% rename from corba/src/java.sql/share/classes/javax/transaction/xa/package.html rename to jdk/src/java.sql/share/classes/javax/transaction/xa/package.html diff --git a/corba/src/java.corba/share/classes/javax/transaction/InvalidTransactionException.java b/jdk/src/java.transaction/share/classes/javax/transaction/InvalidTransactionException.java similarity index 89% rename from corba/src/java.corba/share/classes/javax/transaction/InvalidTransactionException.java rename to jdk/src/java.transaction/share/classes/javax/transaction/InvalidTransactionException.java index 268f54cb609..5d0c699b887 100644 --- a/corba/src/java.corba/share/classes/javax/transaction/InvalidTransactionException.java +++ b/jdk/src/java.transaction/share/classes/javax/transaction/InvalidTransactionException.java @@ -36,15 +36,14 @@ package javax.transaction; * context. For example, this exception could be raised if an error * occured when trying to register a resource. */ -public class InvalidTransactionException extends java.rmi.RemoteException -{ - public InvalidTransactionException() - { +@SuppressWarnings("serial") // serialVersionUID intentionally omitted +public class InvalidTransactionException extends java.rmi.RemoteException { + + public InvalidTransactionException() { super(); } - public InvalidTransactionException(String msg) - { + public InvalidTransactionException(String msg) { super(msg); } } diff --git a/corba/src/java.corba/share/classes/javax/transaction/TransactionRequiredException.java b/jdk/src/java.transaction/share/classes/javax/transaction/TransactionRequiredException.java similarity index 89% rename from corba/src/java.corba/share/classes/javax/transaction/TransactionRequiredException.java rename to jdk/src/java.transaction/share/classes/javax/transaction/TransactionRequiredException.java index 3a5040f0d78..ee2ccbb8040 100644 --- a/corba/src/java.corba/share/classes/javax/transaction/TransactionRequiredException.java +++ b/jdk/src/java.transaction/share/classes/javax/transaction/TransactionRequiredException.java @@ -35,15 +35,14 @@ package javax.transaction; * This exception indicates that a request carried a null transaction context, * but the target object requires an activate transaction. */ -public class TransactionRequiredException extends java.rmi.RemoteException -{ - public TransactionRequiredException() - { +@SuppressWarnings("serial") // serialVersionUID intentionally omitted +public class TransactionRequiredException extends java.rmi.RemoteException { + + public TransactionRequiredException() { super(); } - public TransactionRequiredException(String msg) - { + public TransactionRequiredException(String msg) { super(msg); } } diff --git a/corba/src/java.corba/share/classes/javax/transaction/TransactionRolledbackException.java b/jdk/src/java.transaction/share/classes/javax/transaction/TransactionRolledbackException.java similarity index 89% rename from corba/src/java.corba/share/classes/javax/transaction/TransactionRolledbackException.java rename to jdk/src/java.transaction/share/classes/javax/transaction/TransactionRolledbackException.java index f75cdfb70c9..73ee335beee 100644 --- a/corba/src/java.corba/share/classes/javax/transaction/TransactionRolledbackException.java +++ b/jdk/src/java.transaction/share/classes/javax/transaction/TransactionRolledbackException.java @@ -38,15 +38,14 @@ package javax.transaction; * because further computation on behalf of the transaction would be * fruitless */ -public class TransactionRolledbackException extends java.rmi.RemoteException -{ - public TransactionRolledbackException() - { +@SuppressWarnings("serial") // serialVersionUID intentionally omitted +public class TransactionRolledbackException extends java.rmi.RemoteException { + + public TransactionRolledbackException() { super(); } - public TransactionRolledbackException(String msg) - { + public TransactionRolledbackException(String msg) { super(msg); } } diff --git a/corba/src/java.corba/share/classes/javax/transaction/package.html b/jdk/src/java.transaction/share/classes/javax/transaction/package.html similarity index 100% rename from corba/src/java.corba/share/classes/javax/transaction/package.html rename to jdk/src/java.transaction/share/classes/javax/transaction/package.html diff --git a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java index bb7a553beb3..08aee02be10 100644 --- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java +++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java @@ -21,7 +21,7 @@ * under the License. */ /* - * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. */ /* * $Id: DOMKeyValue.java 1333415 2012-05-03 12:03:51Z coheigea $ @@ -33,20 +33,19 @@ import javax.xml.crypto.dom.DOMCryptoContext; import javax.xml.crypto.dsig.*; import javax.xml.crypto.dsig.keyinfo.KeyValue; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.security.AccessController; +import java.io.IOException; +import java.math.BigInteger; import java.security.KeyException; import java.security.KeyFactory; import java.security.NoSuchAlgorithmException; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; import java.security.PublicKey; import java.security.interfaces.DSAParams; import java.security.interfaces.DSAPublicKey; import java.security.interfaces.ECPublicKey; import java.security.interfaces.RSAPublicKey; import java.security.spec.DSAPublicKeySpec; +import java.security.spec.ECField; +import java.security.spec.ECFieldFp; import java.security.spec.ECParameterSpec; import java.security.spec.ECPoint; import java.security.spec.ECPublicKeySpec; @@ -54,6 +53,7 @@ import java.security.spec.EllipticCurve; import java.security.spec.InvalidKeySpecException; import java.security.spec.KeySpec; import java.security.spec.RSAPublicKeySpec; +import java.util.Arrays; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -325,55 +325,112 @@ public abstract class DOMKeyValue extends DOMStructure implements KeyValue { private byte[] ecPublicKey; private KeyFactory eckf; private ECParameterSpec ecParams; - private Method encodePoint, decodePoint, getCurveName, - getECParameterSpec; + + // The supported curve, secp256r1 + private static final Curve SECP256R1; + static { + final String name, oid, sfield, a, b, x, y, n; + name = "secp256r1 [NIST P-256, X9.62 prime256v1]"; + oid = "1.2.840.10045.3.1.7"; + sfield = + "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF"; + a = + "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC"; + b = + "5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B"; + x = + "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296"; + y = + "4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5"; + n = + "FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551"; + final int h = 1; + + BigInteger p = bigInt(sfield); + ECField field = new ECFieldFp(p); + EllipticCurve curve = new EllipticCurve(field, bigInt(a), + bigInt(b)); + ECPoint g = new ECPoint(bigInt(x), bigInt(y)); + SECP256R1 = new Curve(name, oid, curve, g, bigInt(n), h); + } EC(PublicKey key) throws KeyException { super(key); ECPublicKey ecKey = (ECPublicKey)key; ECPoint ecPoint = ecKey.getW(); ecParams = ecKey.getParams(); - try { - AccessController.doPrivileged( - new PrivilegedExceptionAction() { - public Void run() throws - ClassNotFoundException, NoSuchMethodException - { - getMethods(); - return null; - } - } - ); - } catch (PrivilegedActionException pae) { - throw new KeyException("ECKeyValue not supported", - pae.getException()); - } - Object[] args = new Object[] { ecPoint, ecParams.getCurve() }; - try { - ecPublicKey = (byte[])encodePoint.invoke(null, args); - } catch (IllegalAccessException iae) { - throw new KeyException(iae); - } catch (InvocationTargetException ite) { - throw new KeyException(ite); - } + ecPublicKey = encodePoint(ecPoint, ecParams.getCurve()); } EC(Element dmElem) throws MarshalException { super(dmElem); } - void getMethods() throws ClassNotFoundException, NoSuchMethodException { - Class c = Class.forName("sun.security.util.ECParameters"); - Class[] params = new Class[] { ECPoint.class, - EllipticCurve.class }; - encodePoint = c.getMethod("encodePoint", params); - params = new Class[] { ECParameterSpec.class }; - getCurveName = c.getMethod("getCurveName", params); - params = new Class[] { byte[].class, EllipticCurve.class }; - decodePoint = c.getMethod("decodePoint", params); - c = Class.forName("sun.security.util.NamedCurve"); - params = new Class[] { String.class }; - getECParameterSpec = c.getMethod("getECParameterSpec", params); + private static ECPoint decodePoint(byte[] data, EllipticCurve curve) + throws IOException { + if ((data.length == 0) || (data[0] != 4)) { + throw new IOException("Only uncompressed point format " + + "supported"); + } + // Per ANSI X9.62, an encoded point is a 1 byte type followed by + // ceiling(log base 2 field-size / 8) bytes of x and the same of y. + int n = (data.length - 1) / 2; + if (n != ((curve.getField().getFieldSize() + 7) >> 3)) { + throw new IOException("Point does not match field size"); + } + + byte[] xb = Arrays.copyOfRange(data, 1, 1 + n); + byte[] yb = Arrays.copyOfRange(data, n + 1, n + 1 + n); + + return new ECPoint(new BigInteger(1, xb), new BigInteger(1, yb)); + } + + private static byte[] encodePoint(ECPoint point, EllipticCurve curve) { + // get field size in bytes (rounding up) + int n = (curve.getField().getFieldSize() + 7) >> 3; + byte[] xb = trimZeroes(point.getAffineX().toByteArray()); + byte[] yb = trimZeroes(point.getAffineY().toByteArray()); + if ((xb.length > n) || (yb.length > n)) { + throw new RuntimeException("Point coordinates do not " + + "match field size"); + } + byte[] b = new byte[1 + (n << 1)]; + b[0] = 4; // uncompressed + System.arraycopy(xb, 0, b, n - xb.length + 1, xb.length); + System.arraycopy(yb, 0, b, b.length - yb.length, yb.length); + return b; + } + + private static byte[] trimZeroes(byte[] b) { + int i = 0; + while ((i < b.length - 1) && (b[i] == 0)) { + i++; + } + if (i == 0) { + return b; + } + return Arrays.copyOfRange(b, i, b.length); + } + + private static String getCurveOid(ECParameterSpec params) { + // Check that the params represent the secp256r1 curve + // If so, return the object identifier of the curve + int fieldSize = params.getCurve().getField().getFieldSize(); + if (SECP256R1.getCurve().getField().getFieldSize() == fieldSize + && SECP256R1.getCurve().equals(params.getCurve()) + && SECP256R1.getGenerator().equals(params.getGenerator()) + && SECP256R1.getOrder().equals(params.getOrder()) + && SECP256R1.getCofactor() == params.getCofactor()) { + return SECP256R1.getObjectId(); + } + return null; + } + + private static ECParameterSpec getECParameterSpec(String oid) { + if (oid.equals(SECP256R1.getObjectId())) { + return SECP256R1; + } + return null; } void marshalPublicKey(Node parent, Document doc, String dsPrefix, @@ -391,14 +448,11 @@ public abstract class DOMKeyValue extends DOMStructure implements KeyValue { XMLDSIG_11_XMLNS, prefix); Object[] args = new Object[] { ecParams }; - try { - String oid = (String) getCurveName.invoke(null, args); - DOMUtils.setAttribute(namedCurveElem, "URI", "urn:oid:" + oid); - } catch (IllegalAccessException iae) { - throw new MarshalException(iae); - } catch (InvocationTargetException ite) { - throw new MarshalException(ite); + String oid = getCurveOid(ecParams); + if (oid == null) { + throw new MarshalException("Invalid ECParameterSpec"); } + DOMUtils.setAttribute(namedCurveElem, "URI", "urn:oid:" + oid); String qname = (prefix == null || prefix.length() == 0) ? "xmlns" : "xmlns:" + prefix; namedCurveElem.setAttributeNS("http://www.w3.org/2000/xmlns/", @@ -422,21 +476,6 @@ public abstract class DOMKeyValue extends DOMStructure implements KeyValue { ("unable to create EC KeyFactory: " + e.getMessage()); } } - try { - AccessController.doPrivileged( - new PrivilegedExceptionAction() { - public Void run() throws - ClassNotFoundException, NoSuchMethodException - { - getMethods(); - return null; - } - } - ); - } catch (PrivilegedActionException pae) { - throw new MarshalException("ECKeyValue not supported", - pae.getException()); - } ECParameterSpec ecParams = null; Element curElem = DOMUtils.getFirstChildElement(kvtElem); if (curElem.getLocalName().equals("ECParameters")) { @@ -447,14 +486,9 @@ public abstract class DOMKeyValue extends DOMStructure implements KeyValue { // strip off "urn:oid" if (uri.startsWith("urn:oid:")) { String oid = uri.substring(8); - try { - Object[] args = new Object[] { oid }; - ecParams = (ECParameterSpec) - getECParameterSpec.invoke(null, args); - } catch (IllegalAccessException iae) { - throw new MarshalException(iae); - } catch (InvocationTargetException ite) { - throw new MarshalException(ite); + ecParams = getECParameterSpec(oid); + if (ecParams == null) { + throw new MarshalException("Invalid curve OID"); } } else { throw new MarshalException("Invalid NamedCurve URI"); @@ -464,24 +498,43 @@ public abstract class DOMKeyValue extends DOMStructure implements KeyValue { } curElem = DOMUtils.getNextSiblingElement(curElem, "PublicKey"); ECPoint ecPoint = null; + try { - Object[] args = new Object[] { Base64.decode(curElem), - ecParams.getCurve() }; - ecPoint = (ECPoint)decodePoint.invoke(null, args); + ecPoint = decodePoint(Base64.decode(curElem), + ecParams.getCurve()); } catch (Base64DecodingException bde) { throw new MarshalException("Invalid EC PublicKey", bde); - } catch (IllegalAccessException iae) { - throw new MarshalException(iae); - } catch (InvocationTargetException ite) { - throw new MarshalException(ite); + } catch (IOException ioe) { + throw new MarshalException("Invalid EC Point", ioe); } -/* - ecPoint = sun.security.util.ECParameters.decodePoint( - Base64.decode(curElem), ecParams.getCurve()); -*/ + ECPublicKeySpec spec = new ECPublicKeySpec(ecPoint, ecParams); return generatePublicKey(eckf, spec); } + + static final class Curve extends ECParameterSpec { + private final String name; + private final String oid; + + Curve(String name, String oid, EllipticCurve curve, + ECPoint g, BigInteger n, int h) { + super(curve, g, n, h); + this.name = name; + this.oid = oid; + } + + private String getName() { + return name; + } + + private String getObjectId() { + return oid; + } + } + } + + private static BigInteger bigInt(String s) { + return new BigInteger(s, 16); } static final class Unknown extends DOMKeyValue { diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt index 16bdf6d2114..982e1ab15f5 100644 --- a/jdk/test/ProblemList.txt +++ b/jdk/test/ProblemList.txt @@ -154,6 +154,9 @@ com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java aix-all com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java aix-all javax/management/MBeanServer/OldMBeanServerTest.java aix-all +# 8042215 +javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java generic-all + ############################################################################ # jdk_math diff --git a/jdk/test/com/sun/corba/5036554/TestCorbaBug.sh b/jdk/test/com/sun/corba/5036554/TestCorbaBug.sh index 4f0ff231a99..e8b4365b68f 100644 --- a/jdk/test/com/sun/corba/5036554/TestCorbaBug.sh +++ b/jdk/test/com/sun/corba/5036554/TestCorbaBug.sh @@ -75,13 +75,13 @@ ${TESTJAVA}${FS}bin${FS}java -version mkdir bug cp ${TESTSRC}${FS}bug.idl . -${TESTJAVA}${FS}bin${FS}idlj bug.idl +${COMPILEJAVA}${FS}bin${FS}idlj bug.idl cp ${TESTSRC}${FS}JavaBug.java bug chmod -fR 777 bug -${TESTJAVA}${FS}bin${FS}javac -d . bug${FS}*.java +${COMPILEJAVA}${FS}bin${FS}javac -d . bug${FS}*.java ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp . bug/JavaBug > test.out 2>&1 diff --git a/jdk/test/com/sun/corba/cachedSocket/7056731.sh b/jdk/test/com/sun/corba/cachedSocket/7056731.sh index 3db0f73660f..2e5e3fb8547 100644 --- a/jdk/test/com/sun/corba/cachedSocket/7056731.sh +++ b/jdk/test/com/sun/corba/cachedSocket/7056731.sh @@ -55,8 +55,8 @@ PORT=1052 cp -r ${TESTSRC}${FS}*.java ${TESTSRC}${FS}Hello.idl . echo "Testing...please wait" -${TESTJAVA}${FS}bin${FS}idlj -fall Hello.idl -${TESTJAVA}${FS}bin${FS}javac *.java HelloApp/*.java +${COMPILEJAVA}${FS}bin${FS}idlj -fall Hello.idl +${COMPILEJAVA}${FS}bin${FS}javac *.java HelloApp/*.java echo "starting orbd" ${TESTJAVA}${FS}bin${FS}orbd -ORBInitialPort $PORT -ORBInitialHost localhost & diff --git a/jdk/test/com/sun/crypto/provider/Cipher/DES/TestUtility.java b/jdk/test/com/sun/crypto/provider/Cipher/DES/TestUtility.java index 61efd621bdb..ffa0a5bfcb3 100644 --- a/jdk/test/com/sun/crypto/provider/Cipher/DES/TestUtility.java +++ b/jdk/test/com/sun/crypto/provider/Cipher/DES/TestUtility.java @@ -27,39 +27,52 @@ public class TestUtility { - private static final String digits = "0123456789abcdef"; + private static final String DIGITS = "0123456789abcdef"; - public TestUtility() { + private TestUtility() { } public static String hexDump(byte[] bytes) { - StringBuffer buf = new StringBuffer (bytes.length * 2); - int i; + StringBuilder buf = new StringBuilder(bytes.length * 2); + int i; - buf.append (" "); // four spaces + buf.append(" "); // four spaces for (i = 0; i < bytes.length; i++) { - buf.append (digits.charAt ((bytes[i] >> 4) & 0x0f)); - buf.append (digits.charAt (bytes[i] & 0x0f)); - if (((i + 1) % 32) == 0) { - if ((i + 1) != bytes.length) - buf.append ("\n "); // line after four words - } else if (((i + 1) % 4) == 0) - buf.append (' '); // space between words + buf.append(DIGITS.charAt(bytes[i] >> 4 & 0x0f)); + buf.append(DIGITS.charAt(bytes[i] & 0x0f)); + if ((i + 1) % 32 == 0) { + if (i + 1 != bytes.length) { + buf.append("\n "); // line after four words + } + } else if ((i + 1) % 4 == 0) { + buf.append(' '); // space between words + } } - return buf.toString (); + return buf.toString(); } + public static String hexDump(byte[] bytes, int index) { + StringBuilder buf = new StringBuilder(bytes.length * 2); + int i; + + buf.append(" "); // four spaces + buf.append(DIGITS.charAt(bytes[index] >> 4 & 0x0f)); + buf.append(DIGITS.charAt(bytes[index] & 0x0f)); + return buf.toString(); + } public static boolean equalsBlock(byte[] b1, byte[] b2) { - if (b1.length != b2.length) + if (b1.length != b2.length) { return false; + } - for (int i=0; i 0) throw new RuntimeException(failed + " test(s) failed - see log for details"); diff --git a/jdk/test/java/math/BigInteger/BigIntegerTest.java b/jdk/test/java/math/BigInteger/BigIntegerTest.java index c8d63261e70..4de80fad4fd 100644 --- a/jdk/test/java/math/BigInteger/BigIntegerTest.java +++ b/jdk/test/java/math/BigInteger/BigIntegerTest.java @@ -23,7 +23,7 @@ /* * @test - * @bug 4181191 4161971 4227146 4194389 4823171 4624738 4812225 4837946 + * @bug 4181191 4161971 4227146 4194389 4823171 4624738 4812225 4837946 4026465 * @summary tests methods in BigInteger * @run main/timeout=400 BigIntegerTest * @author madbot @@ -89,6 +89,120 @@ public class BigIntegerTest { static Random rnd = new Random(); static boolean failure = false; + public static void constructor() { + int failCount = 0; + + // --- guard condition tests for array indexing --- + + int arrayLength = 23; + int halfLength = arrayLength/2; + byte[] array = new byte[arrayLength]; + rnd.nextBytes(array); + + int[][] offLen = new int[][] { // offset, length, num exceptions + {-1, arrayLength, 1}, // negative offset + {0, arrayLength, 0}, // OK + {1, arrayLength, 1}, // length overflow + {arrayLength - 1, 1, 0}, // OK + {arrayLength, 1, 1}, // offset overflow + {0, -1, 1}, // negative length + {halfLength, arrayLength - halfLength + 1, 1} // length overflow + }; + + // two's complement + for (int[] ol : offLen) { + int numExceptions = 0; + try { + BigInteger bi = new BigInteger(array, ol[0], ol[1]); + } catch (IndexOutOfBoundsException e) { + numExceptions++; + } + if (numExceptions != ol[2]) { + System.err.println("IndexOutOfBoundsException did not occur for " + + " two's complement constructor with parameters offset " + + ol[0] + " and length " + ol[1]); + failCount++; + } + } + + // sign-magnitude + for (int[] ol : offLen) { + int numExceptions = 0; + try { + BigInteger bi = new BigInteger(1, array, ol[0], ol[1]); + } catch (IndexOutOfBoundsException e) { + numExceptions++; + } + if (numExceptions != ol[2]) { + System.err.println("IndexOutOfBoundsException did not occur for " + + " sign-magnitude constructor with parameters offset " + + ol[0] + " and length " + ol[1]); + failCount++; + } + } + + // --- tests for creation of zero-valued BigIntegers --- + + byte[] magZeroLength = new byte[0]; + for (int signum = -1; signum <= 1; signum++) { + BigInteger bi = new BigInteger(signum, magZeroLength); + if (bi.compareTo(BigInteger.ZERO) != 0) { + System.err.println("A: Zero length BigInteger != 0 for signum " + signum); + failCount++; + } + } + + for (int signum = -1; signum <= 1; signum++) { + BigInteger bi = new BigInteger(signum, magZeroLength, 0, 0); + if (bi.compareTo(BigInteger.ZERO) != 0) { + System.err.println("B: Zero length BigInteger != 0 for signum " + signum); + failCount++; + } + } + + byte[] magNonZeroLength = new byte[42]; + rnd.nextBytes(magNonZeroLength); + for (int signum = -1; signum <= 1; signum++) { + BigInteger bi = new BigInteger(signum, magNonZeroLength, 0, 0); + if (bi.compareTo(BigInteger.ZERO) != 0) { + System.err.println("C: Zero length BigInteger != 0 for signum " + signum); + failCount++; + } + } + + // --- tests for accurate creation of non-zero BigIntegers --- + + for (int i = 0; i < SIZE; i++) { + // create reference value via a different code path from those tested + BigInteger reference = new BigInteger(2 + rnd.nextInt(336), 4, rnd); + + byte[] refArray = reference.toByteArray(); + int refLen = refArray.length; + int factor = rnd.nextInt(5); + int objLen = refArray.length + factor*rnd.nextInt(refArray.length) + 1; + int offset = rnd.nextInt(objLen - refLen); + byte[] objArray = new byte[objLen]; + System.arraycopy(refArray, 0, objArray, offset, refLen); + + BigInteger twosComp = new BigInteger(objArray, offset, refLen); + if (twosComp.compareTo(reference) != 0) { + System.err.println("Two's-complement BigInteger not equal for offset " + + offset + " and length " + refLen); + failCount++; + } + + boolean isNegative = rnd.nextBoolean(); + BigInteger signMag = new BigInteger(isNegative ? -1 : 1, objArray, offset, refLen); + if (signMag.compareTo(isNegative ? reference.negate() : reference) != 0) { + System.err.println("Sign-magnitude BigInteger not equal for offset " + + offset + " and length " + refLen); + failCount++; + } + } + + report("Constructor", failCount); + } + public static void pow(int order) { int failCount1 = 0; @@ -961,6 +1075,8 @@ public class BigIntegerTest { if (args.length >3) order4 = (int)((Integer.parseInt(args[3]))* 3.333); + constructor(); + prime(); nextProbablePrime(); diff --git a/jdk/test/java/nio/channels/FileChannel/TransferToChannel.java b/jdk/test/java/nio/channels/FileChannel/TransferToChannel.java index 2aa1b4bd2cc..44e96337b27 100644 --- a/jdk/test/java/nio/channels/FileChannel/TransferToChannel.java +++ b/jdk/test/java/nio/channels/FileChannel/TransferToChannel.java @@ -25,7 +25,7 @@ * @bug 4652496 * @summary Test transferTo with different target channels * @run main TransferToChannel - * @run main/othervm -Djdk.net.enableFastFileTransfer TransferToChannel + * @run main/othervm -Djdk.nio.enableFastFileTransfer TransferToChannel */ import java.nio.channels.FileChannel; diff --git a/jdk/test/java/rmi/activation/Activatable/checkActivateRef/group.security.policy b/jdk/test/java/rmi/activation/Activatable/checkActivateRef/group.security.policy index 2130c464a88..02604b7eeb3 100644 --- a/jdk/test/java/rmi/activation/Activatable/checkActivateRef/group.security.policy +++ b/jdk/test/java/rmi/activation/Activatable/checkActivateRef/group.security.policy @@ -4,8 +4,8 @@ grant { permission java.io.FilePermission "..${/}..${/}test.props", "read"; - - // test needs to communicate with the activation system permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; + permission java.lang.RuntimePermission "getClassLoader"; }; diff --git a/jdk/test/java/rmi/activation/Activatable/checkAnnotations/group.security.policy b/jdk/test/java/rmi/activation/Activatable/checkAnnotations/group.security.policy index a6115faf6df..276768a15d1 100644 --- a/jdk/test/java/rmi/activation/Activatable/checkAnnotations/group.security.policy +++ b/jdk/test/java/rmi/activation/Activatable/checkAnnotations/group.security.policy @@ -1,10 +1,9 @@ /* - * security policy used by activation groups. + * security policy used by activation groups */ grant { permission java.io.FilePermission "..${/}..${/}test.props", "read"; - - // test needs to communicate with the activation system permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/group.security.policy b/jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/group.security.policy index 6c8dc8a0d06..276768a15d1 100644 --- a/jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/group.security.policy +++ b/jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/group.security.policy @@ -4,10 +4,6 @@ grant { permission java.io.FilePermission "..${/}..${/}test.props", "read"; - - // allow remote objects to be exported on arbitrary ports. - permission java.net.SocketPermission "*:1024-", "connect,accept"; - - // allow exporting object with non-public remote interface - permission java.rmi.RMIPermission "exportRemoteInterface.ActivateMe"; + permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/activation/Activatable/createPrivateActivable/group.security.policy b/jdk/test/java/rmi/activation/Activatable/createPrivateActivable/group.security.policy index e7a403e569a..276768a15d1 100644 --- a/jdk/test/java/rmi/activation/Activatable/createPrivateActivable/group.security.policy +++ b/jdk/test/java/rmi/activation/Activatable/createPrivateActivable/group.security.policy @@ -1,13 +1,9 @@ /* - * security policy used activation groups + * security policy used by activation groups */ grant { permission java.io.FilePermission "..${/}..${/}test.props", "read"; - - // test needs to communicate with the activation system permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; - - // allow exporting object with non-public remote interface - permission java.rmi.RMIPermission "exportRemoteInterface.ActivateMe"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/group.security.policy b/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/group.security.policy index 38258b4b45c..41abd5dd468 100644 --- a/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/group.security.policy +++ b/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/group.security.policy @@ -1,14 +1,15 @@ /* - * security policy used exec'ed activation groups + * security policy used by activation groups */ grant { + permission java.io.FilePermission "..${/}..${/}test.props", "read"; + permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; + // need to load custom security manager and activation group from a new codebase permission java.io.FilePermission ".${/}codebase1", "read,write,delete"; permission java.io.FilePermission ".${/}codebase1${/}-", "read,write"; permission java.io.FilePermission ".${/}codebase2", "read,write,delete"; permission java.io.FilePermission ".${/}codebase2${/}-", "read,write,delete"; - - // allow remote objects to be exported on arbitrary ports. - permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; }; diff --git a/jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/group.security.policy b/jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/group.security.policy index 3cc19105e0f..bf7d8c414b9 100644 --- a/jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/group.security.policy +++ b/jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/group.security.policy @@ -1,12 +1,13 @@ /* - * security policy used activation groups + * security policy used by activation groups */ grant { + permission java.io.FilePermission "..${/}..${/}test.props", "read"; + permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; + // Needed because of bug#: 4182104 permission java.lang.RuntimePermission "modifyThreadGroup"; permission java.lang.RuntimePermission "modifyThread"; - - // allow remote objects to be exported on arbitrary ports. - permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; }; diff --git a/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/group.security.policy b/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/group.security.policy index 09e121a74f9..276768a15d1 100644 --- a/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/group.security.policy +++ b/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/group.security.policy @@ -1,8 +1,9 @@ /* - * security policy used exec'ed activation groups + * security policy used by activation groups */ grant { - // allow remote objects to be exported on arbitrary ports. + permission java.io.FilePermission "..${/}..${/}test.props", "read"; permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/group.security.policy b/jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/group.security.policy index f5637355114..276768a15d1 100644 --- a/jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/group.security.policy +++ b/jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/group.security.policy @@ -3,9 +3,7 @@ */ grant { - // allow remote objects to be exported on arbitrary ports. + permission java.io.FilePermission "..${/}..${/}test.props", "read"; permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; - - // allow exporting object with non-public remote interface - permission java.rmi.RMIPermission "exportRemoteInterface.ActivateMe"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/activation/Activatable/inactiveGroup/group.security.policy b/jdk/test/java/rmi/activation/Activatable/inactiveGroup/group.security.policy index f1d7ad2f1a0..276768a15d1 100644 --- a/jdk/test/java/rmi/activation/Activatable/inactiveGroup/group.security.policy +++ b/jdk/test/java/rmi/activation/Activatable/inactiveGroup/group.security.policy @@ -4,10 +4,6 @@ grant { permission java.io.FilePermission "..${/}..${/}test.props", "read"; - - // allow remote objects to be exported on arbitrary ports. permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; - - // allow exporting object with non-public remote interface - permission java.rmi.RMIPermission "exportRemoteInterface.ActivateMe"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/activation/Activatable/nestedActivate/group.security.policy b/jdk/test/java/rmi/activation/Activatable/nestedActivate/group.security.policy index cbb1d41bfe4..276768a15d1 100644 --- a/jdk/test/java/rmi/activation/Activatable/nestedActivate/group.security.policy +++ b/jdk/test/java/rmi/activation/Activatable/nestedActivate/group.security.policy @@ -1,13 +1,9 @@ /* - * security policy used by test activation groups + * security policy used by activation groups */ grant { permission java.io.FilePermission "..${/}..${/}test.props", "read"; - - // allow remote objects to be exported on arbitrary ports. permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; - - // allow exporting of non-public remote interface - permission java.rmi.RMIPermission "exportRemoteInterface.ActivateMe"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/group.security.policy b/jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/group.security.policy index a830e95dfe0..276768a15d1 100644 --- a/jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/group.security.policy +++ b/jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/group.security.policy @@ -4,7 +4,6 @@ grant { permission java.io.FilePermission "..${/}..${/}test.props", "read"; - - // allow remote objects to be exported on arbitrary ports. permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/activation/Activatable/restartCrashedService/group.security.policy b/jdk/test/java/rmi/activation/Activatable/restartCrashedService/group.security.policy index ce2fdaf45df..276768a15d1 100644 --- a/jdk/test/java/rmi/activation/Activatable/restartCrashedService/group.security.policy +++ b/jdk/test/java/rmi/activation/Activatable/restartCrashedService/group.security.policy @@ -1,8 +1,9 @@ /* - * security policy used by test activation groups + * security policy used by activation groups */ grant { - // test needs to communicate with the activation system + permission java.io.FilePermission "..${/}..${/}test.props", "read"; permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/activation/Activatable/restartLatecomer/group.security.policy b/jdk/test/java/rmi/activation/Activatable/restartLatecomer/group.security.policy index 67f3c249496..276768a15d1 100644 --- a/jdk/test/java/rmi/activation/Activatable/restartLatecomer/group.security.policy +++ b/jdk/test/java/rmi/activation/Activatable/restartLatecomer/group.security.policy @@ -3,6 +3,7 @@ */ grant { - // allow remote objects to be exported on arbitrary ports. + permission java.io.FilePermission "..${/}..${/}test.props", "read"; permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/activation/Activatable/restartService/group.security.policy b/jdk/test/java/rmi/activation/Activatable/restartService/group.security.policy index 67f3c249496..276768a15d1 100644 --- a/jdk/test/java/rmi/activation/Activatable/restartService/group.security.policy +++ b/jdk/test/java/rmi/activation/Activatable/restartService/group.security.policy @@ -3,6 +3,7 @@ */ grant { - // allow remote objects to be exported on arbitrary ports. + permission java.io.FilePermission "..${/}..${/}test.props", "read"; permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/activation/Activatable/shutdownGracefully/group.security.policy b/jdk/test/java/rmi/activation/Activatable/shutdownGracefully/group.security.policy index e1a3f30b029..276768a15d1 100644 --- a/jdk/test/java/rmi/activation/Activatable/shutdownGracefully/group.security.policy +++ b/jdk/test/java/rmi/activation/Activatable/shutdownGracefully/group.security.policy @@ -1,10 +1,9 @@ /* - * security policy used activation groups + * security policy used by activation groups */ grant { permission java.io.FilePermission "..${/}..${/}test.props", "read"; - - // test needs to communicate with the activation system permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/activation/Activatable/unregisterInactive/group.security.policy b/jdk/test/java/rmi/activation/Activatable/unregisterInactive/group.security.policy index a830e95dfe0..276768a15d1 100644 --- a/jdk/test/java/rmi/activation/Activatable/unregisterInactive/group.security.policy +++ b/jdk/test/java/rmi/activation/Activatable/unregisterInactive/group.security.policy @@ -4,7 +4,6 @@ grant { permission java.io.FilePermission "..${/}..${/}test.props", "read"; - - // allow remote objects to be exported on arbitrary ports. permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/activation/ActivateFailedException/activateFails/group.security.policy b/jdk/test/java/rmi/activation/ActivateFailedException/activateFails/group.security.policy index 543fc1d345e..276768a15d1 100644 --- a/jdk/test/java/rmi/activation/ActivateFailedException/activateFails/group.security.policy +++ b/jdk/test/java/rmi/activation/ActivateFailedException/activateFails/group.security.policy @@ -1,8 +1,9 @@ /* - * security policy used activation groups + * security policy used by activation groups */ grant { - // test needs to communicate with the activation system + permission java.io.FilePermission "..${/}..${/}test.props", "read"; permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/group.security.policy b/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/group.security.policy index d4b2d5ded47..b290738202a 100644 --- a/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/group.security.policy +++ b/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/group.security.policy @@ -1,10 +1,11 @@ /* - * security policy used by downloaded activation group + * security policy used by activation groups */ grant { permission java.io.FilePermission "..${/}..${/}test.props", "read"; + permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.server"; - permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; }; diff --git a/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/group.security.policy b/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/group.security.policy index 9f404883c86..276768a15d1 100644 --- a/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/group.security.policy +++ b/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/group.security.policy @@ -4,10 +4,6 @@ grant { permission java.io.FilePermission "..${/}..${/}test.props", "read"; - - // accomodate property used by this test. - permission java.util.PropertyPermission "test.message", "read"; - - // test needs to communicate with the activation system permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/group.security.policy b/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/group.security.policy index 7876a38e1fb..c99d2e288a2 100644 --- a/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/group.security.policy +++ b/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/group.security.policy @@ -1,13 +1,11 @@ /* - * security policy used by activation groups. + * security policy used by activation groups */ grant { permission java.io.FilePermission "..${/}..${/}test.props", "read"; - - // give the group permission to create a class that the main test process can not create - permission java.lang.RuntimePermission "accessClassInPackage.sun.security.provider"; - - // test needs to communicate with the activation system permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; + + permission java.lang.RuntimePermission "accessClassInPackage.sun.security.provider"; }; diff --git a/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/group.security.policy b/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/group.security.policy index e596baae478..276768a15d1 100644 --- a/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/group.security.policy +++ b/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/group.security.policy @@ -4,8 +4,6 @@ grant { permission java.io.FilePermission "..${/}..${/}test.props", "read"; - - // test needs to communicate with the activation system permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; - permission java.util.PropertyPermission "unregisterGroup.port", "read"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/activation/CommandEnvironment/group.security.policy b/jdk/test/java/rmi/activation/CommandEnvironment/group.security.policy index 479f351a1e5..276768a15d1 100644 --- a/jdk/test/java/rmi/activation/CommandEnvironment/group.security.policy +++ b/jdk/test/java/rmi/activation/CommandEnvironment/group.security.policy @@ -1,8 +1,9 @@ /* - * security policy used by activation groups. + * security policy used by activation groups */ grant { - // test needs to communicate with the activation system + permission java.io.FilePermission "..${/}..${/}test.props", "read"; permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/group.security.policy b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/group.security.policy index 810baf41d4b..276768a15d1 100644 --- a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/group.security.policy +++ b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/group.security.policy @@ -1,11 +1,9 @@ /* - * security policy used by the rmid process exec'ed by a running - * instance of the test. + * security policy used by activation groups */ grant { permission java.io.FilePermission "..${/}..${/}test.props", "read"; - - // test needs to communicate with the activation system permission java.net.SocketPermission "*:1024-", "connect,accept,listen"; + permission java.util.PropertyPermission "test.*", "read"; }; diff --git a/jdk/test/java/rmi/server/RemoteServer/setLogPermission/SetLogPermission.java b/jdk/test/java/rmi/server/RemoteServer/setLogPermission/SetLogPermission.java index 2353dab0b4b..fd6c6ad5b62 100644 --- a/jdk/test/java/rmi/server/RemoteServer/setLogPermission/SetLogPermission.java +++ b/jdk/test/java/rmi/server/RemoteServer/setLogPermission/SetLogPermission.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * The RemoteServer.setLog method requires * java.util.log.LoggingPermission("control"). * @author Ann Wollrath - * @run main/othervm/policy=java.policy SetLogPermission + * @run main/othervm/policy=security.policy SetLogPermission */ import java.rmi.server.RemoteServer; diff --git a/jdk/test/java/rmi/server/RemoteServer/setLogPermission/java.policy b/jdk/test/java/rmi/server/RemoteServer/setLogPermission/security.policy similarity index 100% rename from jdk/test/java/rmi/server/RemoteServer/setLogPermission/java.policy rename to jdk/test/java/rmi/server/RemoteServer/setLogPermission/security.policy diff --git a/jdk/test/java/rmi/testlibrary/ActivationLibrary.java b/jdk/test/java/rmi/testlibrary/ActivationLibrary.java index 6a7a5b753d8..75531a97017 100644 --- a/jdk/test/java/rmi/testlibrary/ActivationLibrary.java +++ b/jdk/test/java/rmi/testlibrary/ActivationLibrary.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,20 +40,6 @@ import java.rmi.registry.LocateRegistry; * objects. */ public class ActivationLibrary { - /** time safeDestroy should wait before failing on shutdown rmid */ - private static final int SAFE_WAIT_TIME; - static { - int slopFactor = 1; - try { - slopFactor = Integer.valueOf( - TestLibrary.getExtraProperty("jcov.sleep.multiplier","1")); - } catch (NumberFormatException ignore) {} - SAFE_WAIT_TIME = 60000 * slopFactor; - } - - private static final String SYSTEM_NAME = - ActivationSystem.class.getName(); - private static void mesg(Object mesg) { System.err.println("ACTIVATION_LIBRARY: " + mesg.toString()); } @@ -63,20 +49,19 @@ public class ActivationLibrary { */ public static void deactivate(Remote remote, ActivationID id) { - // We do as much as 50 deactivation trials, each separated by - // at least 100 milliseconds sleep time (max sleep time of 5 secs). - final long deactivateSleepTime = 100; - long stopTime = System.currentTimeMillis() + deactivateSleepTime * 50; - while (System.currentTimeMillis() < stopTime) { + final long POLLTIME_MS = 100L; + final long DEACTIVATE_TIME_MS = 30_000L; + + long startTime = System.currentTimeMillis(); + long deadline = TestLibrary.computeDeadline(startTime, DEACTIVATE_TIME_MS); + + while (System.currentTimeMillis() < deadline) { try { if (Activatable.inactive(id) == true) { mesg("inactive successful"); return; } else { - mesg("inactive trial failed. Sleeping " + - deactivateSleepTime + - " milliseconds before next trial"); - Thread.sleep(deactivateSleepTime); + Thread.sleep(POLLTIME_MS); } } catch (InterruptedException e) { Thread.currentThread().interrupt(); @@ -95,7 +80,8 @@ public class ActivationLibrary { } } - mesg("unable to inactivate after several attempts"); + mesg("unable to inactivate after " + + (System.currentTimeMillis() - startTime) + "ms."); mesg("unexporting object forcibly instead"); try { diff --git a/jdk/test/java/rmi/testlibrary/JavaVM.java b/jdk/test/java/rmi/testlibrary/JavaVM.java index b304cd25213..b0c4afd1113 100644 --- a/jdk/test/java/rmi/testlibrary/JavaVM.java +++ b/jdk/test/java/rmi/testlibrary/JavaVM.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -194,7 +194,7 @@ public class JavaVM { throws InterruptedException, TimeoutException { if (vm == null) throw new IllegalStateException("can't wait for JavaVM that isn't running"); - long deadline = computeDeadline(System.currentTimeMillis(), timeout); + long deadline = TestLibrary.computeDeadline(System.currentTimeMillis(), timeout); while (true) { try { @@ -218,21 +218,4 @@ public class JavaVM { start(); return waitFor(); } - - /** - * Computes a deadline from a timestamp and a timeout value. - * Maximum timeout (before multipliers are applied) is one hour. - */ - public static long computeDeadline(long timestamp, long timeout) { - final long MAX_TIMEOUT_MS = 3_600_000L; - - if (timeout < 0L || timeout > MAX_TIMEOUT_MS) { - throw new IllegalArgumentException("timeout " + timeout + "ms out of range"); - } - - // TODO apply test.timeout.factor (and possibly jcov.sleep.multiplier) - // here instead of upstream - - return timestamp + timeout; - } } diff --git a/jdk/test/java/rmi/testlibrary/RMID.java b/jdk/test/java/rmi/testlibrary/RMID.java index 48fb49aa4d2..1ae6cf64bab 100644 --- a/jdk/test/java/rmi/testlibrary/RMID.java +++ b/jdk/test/java/rmi/testlibrary/RMID.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -249,15 +249,15 @@ public class RMID extends JavaVM { mesg("Starting rmid on port " + port + "."); super.start(); - int slopFactor = 1; - try { - slopFactor = Integer.valueOf( - TestLibrary.getExtraProperty("jcov.sleep.multiplier","1")); - } catch (NumberFormatException ignore) {} - waitTime = waitTime * slopFactor; + // int slopFactor = 1; + // try { + // slopFactor = Integer.valueOf( + // TestLibrary.getExtraProperty("jcov.sleep.multiplier","1")); + // } catch (NumberFormatException ignore) {} + // waitTime = waitTime * slopFactor; long startTime = System.currentTimeMillis(); - long deadline = computeDeadline(startTime, waitTime); + long deadline = TestLibrary.computeDeadline(startTime, waitTime); while (true) { try { diff --git a/jdk/test/java/rmi/testlibrary/TestLibrary.java b/jdk/test/java/rmi/testlibrary/TestLibrary.java index 7165c678e6d..a8077ed8207 100644 --- a/jdk/test/java/rmi/testlibrary/TestLibrary.java +++ b/jdk/test/java/rmi/testlibrary/TestLibrary.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -135,7 +135,8 @@ public class TestLibrary { */ public static boolean checkIfRegistryRunning(int port, int msTimeout) { - long stopTime = System.currentTimeMillis() + msTimeout; + final long POLLTIME_MS = 100L; + long stopTime = computeDeadline(System.currentTimeMillis(), msTimeout); do { try { Registry r = LocateRegistry.getRegistry(port); @@ -145,12 +146,12 @@ public class TestLibrary { } catch (RemoteException e) { // problem - not ready ? Try again try { - Thread.sleep(500); + Thread.sleep(POLLTIME_MS); } catch (InterruptedException ie) { // not expected } } - } while (stopTime > System.currentTimeMillis()); + } while (System.currentTimeMillis() < stopTime); return false; } @@ -169,6 +170,31 @@ public class TestLibrary { } } + public static double getTimeoutFactor() { + String prop = getProperty("test.timeout.factor", "1.0"); + double timeoutFactor = 1.0; + + try { + timeoutFactor = Double.parseDouble(prop); + } catch (NumberFormatException ignore) { } + + return timeoutFactor; + } + + /** + * Computes a deadline from a timestamp and a timeout value. + * Maximum timeout (before multipliers are applied) is one hour. + */ + public static long computeDeadline(long timestamp, long timeout) { + final long MAX_TIMEOUT_MS = 3_600_000L; + + if (timeout < 0L || timeout > MAX_TIMEOUT_MS) { + throw new IllegalArgumentException("timeout " + timeout + "ms out of range"); + } + + return timestamp + (long)(timeout * getTimeoutFactor()); + } + /** * Property mutators */ diff --git a/jdk/test/java/util/Formatter/Basic-X.java.template b/jdk/test/java/util/Formatter/Basic-X.java.template index 47c5516be49..57d77ae887d 100644 --- a/jdk/test/java/util/Formatter/Basic-X.java.template +++ b/jdk/test/java/util/Formatter/Basic-X.java.template @@ -1154,6 +1154,10 @@ public class Basic$Type$ extends Basic { test("%.5f", "0.99960", val); test("%.6f", "0.999600", val); + val = new BigDecimal(BigInteger.ZERO, 6); + test("%.4f", "0.0000", val); + val = new BigDecimal(BigInteger.ZERO, -6); + test("%.4f", "0.0000", val); #end[BigDecimal] #if[float] diff --git a/jdk/test/java/util/Formatter/Basic.java b/jdk/test/java/util/Formatter/Basic.java index 9624def5cea..31fce5dd4e2 100644 --- a/jdk/test/java/util/Formatter/Basic.java +++ b/jdk/test/java/util/Formatter/Basic.java @@ -26,6 +26,7 @@ * @bug 4906370 4962433 4973103 4989961 5005818 5031150 4970931 4989491 5002937 * 5005104 5007745 5061412 5055180 5066788 5088703 6317248 6318369 6320122 * 6344623 6369500 6534606 6282094 6286592 6476425 5063507 6469160 6476168 + * 8059175 * * @run shell/timeout=240 Basic.sh */ diff --git a/jdk/test/java/util/Formatter/BasicBigDecimal.java b/jdk/test/java/util/Formatter/BasicBigDecimal.java index 00a04f4535f..0eca6f987dd 100644 --- a/jdk/test/java/util/Formatter/BasicBigDecimal.java +++ b/jdk/test/java/util/Formatter/BasicBigDecimal.java @@ -1154,6 +1154,11 @@ public class BasicBigDecimal extends Basic { test("%.5f", "0.99960", val); test("%.6f", "0.999600", val); + val = new BigDecimal(BigInteger.ZERO, 6); + test("%.4f", "0.0000", val); + + val = new BigDecimal(BigInteger.ZERO, -6); + test("%.4f", "0.0000", val); diff --git a/jdk/test/javax/crypto/KeyGenerator/TestKGParity.java b/jdk/test/javax/crypto/KeyGenerator/TestKGParity.java new file mode 100644 index 00000000000..40752152c56 --- /dev/null +++ b/jdk/test/javax/crypto/KeyGenerator/TestKGParity.java @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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.PrintStream; +import java.lang.String; +import java.lang.System; +import java.security.Provider; +import java.security.SecureRandom; +import java.security.Security; +import javax.crypto.KeyGenerator; +import static java.lang.System.out; + +/* + * @test + * @bug 8048607 + * @compile ../../../com/sun/crypto/provider/Cipher/DES/TestUtility.java + * @summary Test key generation of DES and DESEDE + */ +public class TestKGParity { + + private static final String[] ALGORITHM_ARR = { + "deS", "DesEDE" + }; + + public static void main(String argv[]) throws Exception { + + TestKGParity test = new TestKGParity(); + test.run(); + } + + private void run() throws Exception { + Provider[] providers = Security.getProviders(); + for (Provider p : providers) { + String prvName = p.getName(); + if (prvName.startsWith("SunJCE") + || prvName.startsWith("SunPKCS11-")) { + for (String algorithm : ALGORITHM_ARR) { + if (!runTest(p, algorithm)) { + throw new RuntimeException( + "Test failed with provider/algorithm:" + + p.getName() + "/" + algorithm); + } else { + out.println("Test passed with provider/algorithm:" + + p.getName() + "/" + algorithm); + } + } + } + } + } + + public boolean runTest(Provider p, String algo) throws Exception { + byte[] keyValue = null; + try { + // Initialization + SecureRandom sRdm = new SecureRandom(); + KeyGenerator kg = KeyGenerator.getInstance(algo, p); + kg.init(sRdm); + + // Generate a SecretKey and retrieve its value + keyValue = kg.generateKey().getEncoded(); + + // Verify its parity in the unit of byte + for (int i = 0; i < keyValue.length; i++) { + if (!checkParity(keyValue[i])) { + out.println("Testing: " + + p.getName() + + "/" + + algo + + " failed when verify its parity in the unit of byte:" + + TestUtility.hexDump(keyValue, i)); + return false; + } + } + return true; + } catch (Exception ex) { + out.println("Testing: " + p.getName() + "/" + algo + + " failed with unexpected exception"); + ex.printStackTrace(); + throw ex; + } + } + + private boolean checkParity(byte keyByte) { + boolean even = false; + byte[] PARITY_BIT_MASK = { + (byte) 0x40, (byte) 0x20, (byte) 0x10, (byte) 0x08, + (byte) 0x04, (byte) 0x02, (byte) 0x01 + }; + + for (int i = 0; i < 7; i++) { + if ((keyByte & PARITY_BIT_MASK[i]) > 0) { + even = !even; + } + } + if (keyByte < 0) { + even = !even; + } + + return even; + } +} diff --git a/jdk/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java b/jdk/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java index 79b2e970ab0..e0502079951 100644 --- a/jdk/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java +++ b/jdk/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,7 +24,8 @@ /* * @test * @bug 6239400 - * @summary Tests NotificationBuffer doesn't hold locks when adding listeners. + * @summary Tests NotificationBuffer doesn't hold locks when adding listeners, + * if test times out then deadlock is suspected. * @author Eamonn McManus * @run clean NotificationBufferDeadlockTest * @run build NotificationBufferDeadlockTest @@ -38,6 +39,7 @@ import java.net.MalformedURLException; import java.util.List; import java.util.Set; import java.util.Vector; +import java.util.concurrent.CountDownLatch; import javax.management.*; import javax.management.remote.*; @@ -173,9 +175,7 @@ public class NotificationBufferDeadlockTest { for (ObjectName name : names) mbsc.invoke(name, "send", null, null); - if (!countListener.waiting(MAX_WAITING_TIME)) { - return "did not get " + names.size() + " notifs as expected\n"; - } + countListener.waiting(); if (!sources.containsAll(names)) return "missing names: " + sources; @@ -202,13 +202,13 @@ public class NotificationBufferDeadlockTest { } }; t.start(); + System.out.println("DeadlockTest-addNotificationListener waiting for the sending thread to die..."); try { - t.join(5000L); + t.join(); //if times out here then deadlock is suspected + System.out.println("DeadlockTest-addNotificationListener OK."); } catch (Exception e) { thisFailure = "Join exception: " + e; } - if (t.isAlive()) - thisFailure = "Deadlock detected"; } public void send() { @@ -244,9 +244,9 @@ public class NotificationBufferDeadlockTest { } }; t.start(); - t.join(5000); - if (t.isAlive()) - failure = "Query deadlock detected"; + System.out.println("CreateDuringQueryInvocationHandler-createMBeanIfQuery waiting for the creating thread to die..."); + t.join(); // if times out here then deadlock is suspected + System.out.println("CreateDuringQueryInvocationHandler-createMBeanIfQuery OK"); } } @@ -264,50 +264,30 @@ public class NotificationBufferDeadlockTest { private static class MyListener implements NotificationListener { public MyListener(int waitNB) { - this.waitNB= waitNB; + count = new CountDownLatch(waitNB); } public void handleNotification(Notification n, Object h) { - System.out.println("MyListener got: "+n.getSource()+" "+n.getType()); + System.out.println("MyListener got: " + n.getSource() + " " + n.getType()); - synchronized(this) { - if (TESTING_TYPE.equals(n.getType())) { - sources.add((ObjectName) n.getSource()); - - if (sources.size() == waitNB) { - this.notifyAll(); - } - } + if (TESTING_TYPE.equals(n.getType())) { + sources.add((ObjectName) n.getSource()); + count.countDown(); } } - public boolean waiting(long timeout) { - final long startTime = System.currentTimeMillis(); - long toWait = timeout; - - synchronized(this) { - while(sources.size() < waitNB && toWait > 0) { - try { - this.wait(toWait); - } catch (InterruptedException ire) { - break; - } - - toWait = timeout - - (System.currentTimeMillis() - startTime); - } - } - - return sources.size() == waitNB; + public void waiting() throws InterruptedException { + System.out.println("MyListener-waiting ..."); + count.await(); // if times out here then deadlock is suspected + System.out.println("MyListener-waiting done!"); } - private final int waitNB; + private final CountDownLatch count; } static String thisFailure; static String failure; static int nextNameIndex; - static final long MAX_WAITING_TIME = 10000; private static MyListener countListener; private static final List sources = new Vector(); diff --git a/jdk/test/javax/xml/crypto/dsig/GenerationTests.java b/jdk/test/javax/xml/crypto/dsig/GenerationTests.java index 29261e2f17e..068cd2a86a2 100644 --- a/jdk/test/javax/xml/crypto/dsig/GenerationTests.java +++ b/jdk/test/javax/xml/crypto/dsig/GenerationTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,6 +24,7 @@ /** * @test * @bug 4635230 6283345 6303830 6824440 6867348 7094155 8038184 8038349 8046949 + * 8046724 * @summary Basic unit tests for generating XML Signatures with JSR 105 * @compile -XDignore.symbol.file KeySelectors.java SignatureValidator.java * X509KeySelector.java GenerationTests.java @@ -45,6 +46,13 @@ import java.security.cert.X509CRL; import java.security.spec.KeySpec; import java.security.spec.DSAPrivateKeySpec; import java.security.spec.DSAPublicKeySpec; +import java.security.spec.ECField; +import java.security.spec.ECFieldFp; +import java.security.spec.ECParameterSpec; +import java.security.spec.ECPoint; +import java.security.spec.ECPrivateKeySpec; +import java.security.spec.ECPublicKeySpec; +import java.security.spec.EllipticCurve; import java.security.spec.RSAPrivateKeySpec; import java.security.spec.RSAPublicKeySpec; import java.util.*; @@ -81,9 +89,10 @@ public class GenerationTests { private static DocumentBuilder db; private static CanonicalizationMethod withoutComments; private static SignatureMethod dsaSha1, dsaSha256, rsaSha1, - rsaSha256, rsaSha384, rsaSha512; + rsaSha256, rsaSha384, rsaSha512, + ecdsaSha1; private static DigestMethod sha1, sha256, sha384, sha512; - private static KeyInfo dsa1024, dsa2048, rsa, rsa1024; + private static KeyInfo dsa1024, dsa2048, rsa, rsa1024, p256ki; private static KeySelector kvks = new KeySelectors.KeyValueKeySelector(); private static KeySelector sks; private static Key signingKey; @@ -121,6 +130,7 @@ public class GenerationTests { test_create_signature_enveloping_hmac_sha384(); test_create_signature_enveloping_hmac_sha512(); test_create_signature_enveloping_rsa(); + test_create_signature_enveloping_p256_sha1(); test_create_signature_external_b64_dsa(); test_create_signature_external_dsa(); test_create_signature_keyname(); @@ -175,6 +185,8 @@ public class GenerationTests { (kifac.newKeyValue(getPublicKey("RSA", 512)))); rsa1024 = kifac.newKeyInfo(Collections.singletonList (kifac.newKeyValue(getPublicKey("RSA", 1024)))); + p256ki = kifac.newKeyInfo(Collections.singletonList + (kifac.newKeyValue(getECPublicKey()))); rsaSha1 = fac.newSignatureMethod(SignatureMethod.RSA_SHA1, null); rsaSha256 = fac.newSignatureMethod ("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256", null); @@ -182,6 +194,8 @@ public class GenerationTests { ("http://www.w3.org/2001/04/xmldsig-more#rsa-sha384", null); rsaSha512 = fac.newSignatureMethod ("http://www.w3.org/2001/04/xmldsig-more#rsa-sha512", null); + ecdsaSha1 = fac.newSignatureMethod + ("http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1", null); sks = new KeySelectors.SecretKeySelector("secret".getBytes("ASCII")); httpUd = new HttpURIDereferencer(); @@ -342,6 +356,13 @@ public class GenerationTests { System.out.println(); } + static void test_create_signature_enveloping_p256_sha1() throws Exception { + System.out.println("* Generating signature-enveloping-p256-sha1.xml"); + test_create_signature_enveloping(sha1, ecdsaSha1, p256ki, + getECPrivateKey(), kvks, false); + System.out.println(); + } + static void test_create_signature_external_b64_dsa() throws Exception { System.out.println("* Generating signature-external-b64-dsa.xml"); test_create_signature_external(dsaSha1, dsa1024, signingKey, kvks, true); @@ -1168,7 +1189,42 @@ public class GenerationTests { "237008997971129772408397621801631622129297063463868593083106979716" + "204903524890556839550490384015324575598723478554854070823335021842" + "210112348400928769"; + private static final String EC_X = + "335863644451761614592446380116804721648611739647823420286081723541" + + "6166183710"; + private static final String EC_Y = + "951559601159729477487064127150143688502130342917782252098602422796" + + "95457910701"; + private static final String EC_S = + "425976209773168452211813225517384419928639977904006759709292218082" + + "7440083936"; + private static final ECParameterSpec EC_PARAMS; + static { + final String ec_sfield, ec_a, ec_b, ec_gx, ec_gy, ec_n; + ec_sfield = + "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF"; + ec_a = + "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC"; + ec_b = + "5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B"; + ec_gx = + "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296"; + ec_gy = + "4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5"; + ec_n = + "FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551"; + final int ec_h = 1; + final ECField ec_field = new ECFieldFp(bigInt(ec_sfield)); + final EllipticCurve ec_curve = new EllipticCurve(ec_field, + bigInt(ec_a), bigInt(ec_b)); + final ECPoint ec_g = new ECPoint(bigInt(ec_gx), bigInt(ec_gy)); + EC_PARAMS = new ECParameterSpec(ec_curve, ec_g, bigInt(ec_n), ec_h); + } + + private static BigInteger bigInt(String s) { + return new BigInteger(s, 16); + } private static PublicKey getPublicKey(String algo, int keysize) throws Exception { KeyFactory kf = KeyFactory.getInstance(algo); @@ -1197,6 +1253,14 @@ public class GenerationTests { return kf.generatePublic(kspec); } + private static PublicKey getECPublicKey() throws Exception { + KeyFactory kf = KeyFactory.getInstance("EC"); + KeySpec kspec = new ECPublicKeySpec(new ECPoint(new BigInteger(EC_X), + new BigInteger(EC_Y)), + EC_PARAMS); + return kf.generatePublic(kspec); + } + private static PrivateKey getPrivateKey(String algo, int keysize) throws Exception { KeyFactory kf = KeyFactory.getInstance(algo); @@ -1223,6 +1287,12 @@ public class GenerationTests { return kf.generatePrivate(kspec); } + private static PrivateKey getECPrivateKey() throws Exception { + KeyFactory kf = KeyFactory.getInstance("EC"); + KeySpec kspec = new ECPrivateKeySpec(new BigInteger(EC_S), EC_PARAMS); + return kf.generatePrivate(kspec); + } + private static SecretKey getSecretKey(final byte[] secret) { return new SecretKey() { public String getFormat() { return "RAW"; } diff --git a/jdk/test/javax/xml/crypto/dsig/KeySelectors.java b/jdk/test/javax/xml/crypto/dsig/KeySelectors.java index b8f4d324893..8f041f5f2a6 100644 --- a/jdk/test/javax/xml/crypto/dsig/KeySelectors.java +++ b/jdk/test/javax/xml/crypto/dsig/KeySelectors.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -166,7 +166,6 @@ class KeySelectors { throw new KeySelectorException("No KeyValue element found!"); } - //@@@FIXME: this should also work for key types other than DSA/RSA static boolean algEquals(String algURI, String algName) { if (algName.equalsIgnoreCase("DSA") && algURI.equals(SignatureMethod.DSA_SHA1) || @@ -181,6 +180,10 @@ class KeySelectors { algURI.equals ("http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"))) { return true; + } else if (algName.equalsIgnoreCase("EC") && + (algURI.equals + ("http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"))) { + return true; } else { return false; } diff --git a/jdk/test/javax/xml/crypto/dsig/ValidationTests.java b/jdk/test/javax/xml/crypto/dsig/ValidationTests.java index 5a86692f8c8..3480f23b2be 100644 --- a/jdk/test/javax/xml/crypto/dsig/ValidationTests.java +++ b/jdk/test/javax/xml/crypto/dsig/ValidationTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /** * @test - * @bug 4635230 6365103 6366054 6824440 7131084 + * @bug 4635230 6365103 6366054 6824440 7131084 8046724 * @summary Basic unit tests for validating XML Signatures with JSR 105 * @compile -XDignore.symbol.file KeySelectors.java SignatureValidator.java * X509KeySelector.java ValidationTests.java @@ -90,6 +90,7 @@ public class ValidationTests { new Test("signature-enveloping-b64-dsa.xml", KVKS), new Test("signature-enveloping-dsa.xml", KVKS), new Test("signature-enveloping-rsa.xml", KVKS), + new Test("signature-enveloping-p256-sha1.xml", KVKS), new Test("signature-enveloping-hmac-sha1.xml", SKKS), new Test("signature-external-dsa.xml", KVKS), new Test("signature-external-b64-dsa.xml", KVKS), diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-p256-sha1.xml b/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-p256-sha1.xml new file mode 100644 index 00000000000..0ace1157be5 --- /dev/null +++ b/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-p256-sha1.xml @@ -0,0 +1,3 @@ +7/XTsHaBSOnJ/jXD5v0zL6VKYsk=WiF/Hd0s7BiH36Ds/1iJcbKiXOUVBSGFteuTjXwBbezR43NAwpMmMX5c1su0A9hG9rVVzE/1DOlO +vuDVLBBblg==BAds672US3sCYunM2k2bEQLbuRxdQlNTvq+5fitOpDMe0mBdZV4J3yZaG0taziYIuAT9GJGfds+q +xtXOCNWe/60=some text \ No newline at end of file diff --git a/langtools/.hgtags b/langtools/.hgtags index c7267deceed..78871157c37 100644 --- a/langtools/.hgtags +++ b/langtools/.hgtags @@ -287,3 +287,4 @@ f7ce2cfa4cdbec0ae0f46080484eace66be7987a jdk9-b41 23a3a063a906a91ba696d792f0eeabf157cd2f86 jdk9-b42 6a06008aec10d32898ca665685f531c681b28f5f jdk9-b43 de2ce70d907c9f227b802cea29285bece5194cd5 jdk9-b44 +73bbdcf236b297a0c1b8875f2eeba65eaf7ade60 jdk9-b45 diff --git a/langtools/make/Tools.gmk b/langtools/make/Tools.gmk index 7e23cd122f9..ea2452387cc 100644 --- a/langtools/make/Tools.gmk +++ b/langtools/make/Tools.gmk @@ -39,7 +39,7 @@ $(eval $(call SetupJavaCompilation,BUILD_TOOLS_LANGTOOLS, \ DISABLE_SJAVAC := true, \ ADD_JAVAC_FLAGS := -Xprefer:source, \ SRC := $(LANGTOOLS_TOPDIR)/make/tools, \ - INCLUDES := compileproperties, \ + INCLUDES := compileproperties propertiesparser, \ BIN := $(BUILDTOOLS_OUTPUTDIR)/langtools_tools_classes)) all: $(BUILD_TOOLS_LANGTOOLS) diff --git a/langtools/make/build.properties b/langtools/make/build.properties index b224a9721d2..2a12dbec711 100644 --- a/langtools/make/build.properties +++ b/langtools/make/build.properties @@ -54,6 +54,9 @@ jdk.compiler.dependencies=java.base:java.compiler jdk.javadoc.dependencies=java.base:java.compiler:jdk.compiler jdk.dev.dependencies=java.base:java.compiler:jdk.compiler +javac.resource.includes = \ + com/sun/tools/javac/resources/compiler.properties + #test configuration: jtreg.tests= boot.javac.tests = tools/javac diff --git a/langtools/make/build.xml b/langtools/make/build.xml index 8eff38083aa..bdaae283bde 100644 --- a/langtools/make/build.xml +++ b/langtools/make/build.xml @@ -527,7 +527,8 @@ + compilation.kind="@{compilation.kind}" + resource.includes="${javac.resource.includes}" /> - + + @@ -583,6 +585,12 @@ + + + + + @@ -644,6 +652,28 @@ + + + + + + + + + + + diff --git a/langtools/make/gensrc/Gensrc-jdk.compiler.gmk b/langtools/make/gensrc/Gensrc-jdk.compiler.gmk index 8d44ea7b3e8..04a0479fad7 100644 --- a/langtools/make/gensrc/Gensrc-jdk.compiler.gmk +++ b/langtools/make/gensrc/Gensrc-jdk.compiler.gmk @@ -37,4 +37,7 @@ $(eval $(call SetupVersionProperties,JAVAP_VERSION,\ $(eval $(call SetupCompileProperties,COMPILE_PROPERTIES,\ $(JAVAC_VERSION) $(JAVAH_VERSION) $(JAVAP_VERSION))) -all: $(COMPILE_PROPERTIES) +$(eval $(call SetupParseProperties,PARSE_PROPERTIES,\ + com/sun/tools/javac/resources/compiler.properties)) + +all: $(COMPILE_PROPERTIES) $(PARSE_PROPERTIES) diff --git a/langtools/make/gensrc/GensrcCommon.gmk b/langtools/make/gensrc/GensrcCommon.gmk index efd9d23c58d..0b38117030c 100644 --- a/langtools/make/gensrc/GensrcCommon.gmk +++ b/langtools/make/gensrc/GensrcCommon.gmk @@ -35,6 +35,11 @@ include JavaCompilation.gmk TOOL_COMPILEPROPS_CMD := $(JAVA) -cp $(BUILDTOOLS_OUTPUTDIR)/langtools_tools_classes \ compileproperties.CompileProperties -quiet +################################################################################ +# The compileprops tools compiles a properties file into an enum-like class. +TOOL_PARSEPROPS_CMD := $(JAVA) -cp $(BUILDTOOLS_OUTPUTDIR)/langtools_tools_classes \ + propertiesparser.PropertiesParser + ################################################################################ # Sets up a rule that creates a version.properties file in the gensrc output @@ -93,3 +98,32 @@ define SetupCompileProperties endef ################################################################################ +# Parse property files in given location and generate a Java-like enum in the gensrc folder. +# Param 1 - Variable to add targets to +# Param 2 - Extra properties files to process +define SetupParseProperties + #property file to generate + PARSEPROPSOURCES := $$(foreach var,$2,$$(addsuffix $$(var),$(LANGTOOLS_TOPDIR)/src/$(MODULE)/share/classes/)) + + PARSEPROPALLDIRS := $$(patsubst $(LANGTOOLS_TOPDIR)/src/%, \ + $(SUPPORT_OUTPUTDIR)/gensrc/%, \ + $$(dir $$(PARSEPROPSOURCES))) + + PARSEPROPDIRS := $$(sort $$(PARSEPROPALLDIRS)) + + PARSEPROPCMDLINE := $$(subst _SPACE_, $$(SPACE), \ + $$(join $$(foreach var,$$(PARSEPROPSOURCES),$$(addprefix -compile_SPACE_,$$(var))), \ + $$(addprefix _SPACE_, $$(PARSEPROPALLDIRS)))) + + # Now setup the rule for the generation of the resource bundles. + $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the_parsed_props: $(PARSEPROPSOURCES) + $(CP) -r $(LANGTOOLS_TOPDIR)/make/tools/propertiesparser/resources $(BUILDTOOLS_OUTPUTDIR)/langtools_tools_classes/propertiesparser/resources + $(MKDIR) -p $$(@D) $$(PARSEPROPDIRS) + $(ECHO) Parsing $$(words $$(PARSEPROPSOURCES)) properties into enum-like class for $(MODULE) + $(TOOL_PARSEPROPS_CMD) $$(PARSEPROPCMDLINE) + $(TOUCH) $$@ + + $$(strip $1) += $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the_parsed_props +endef + +################################################################################ diff --git a/langtools/make/intellij/build.xml b/langtools/make/intellij/build.xml index 3494aec4443..46163bbded1 100644 --- a/langtools/make/intellij/build.xml +++ b/langtools/make/intellij/build.xml @@ -28,7 +28,7 @@ - + diff --git a/langtools/make/intellij/compiler.xml b/langtools/make/intellij/compiler.xml index 552c480a158..6edb6d2c5af 100644 --- a/langtools/make/intellij/compiler.xml +++ b/langtools/make/intellij/compiler.xml @@ -5,6 +5,7 @@ + diff --git a/langtools/make/intellij/langtools.iml b/langtools/make/intellij/langtools.iml index 57af163ce76..88c815ff523 100644 --- a/langtools/make/intellij/langtools.iml +++ b/langtools/make/intellij/langtools.iml @@ -1,20 +1,22 @@ - + - - + + + + + - diff --git a/langtools/make/intellij/misc.xml b/langtools/make/intellij/misc.xml index aec616acb92..5039fe35f4a 100644 --- a/langtools/make/intellij/misc.xml +++ b/langtools/make/intellij/misc.xml @@ -3,8 +3,8 @@ - - + + diff --git a/langtools/make/netbeans/langtools/nbproject/project.xml b/langtools/make/netbeans/langtools/nbproject/project.xml index 9f93321fb38..806e3356102 100644 --- a/langtools/make/netbeans/langtools/nbproject/project.xml +++ b/langtools/make/netbeans/langtools/nbproject/project.xml @@ -478,29 +478,34 @@ ${root}/src/java.base/share/classes + ${root}/build/bootstrap/java.base/gensrc ${root}/build/java.base/classes 1.8 ${root}/src/java.compiler/share/classes + ${root}/build/bootstrap/java.compiler/gensrc ${root}/build/java.base/classes ${root}/build/java.compiler/classes 1.8 ${root}/src/jdk.compiler/share/classes + ${root}/build/bootstrap/jdk.compiler/gensrc ${root}/build/java.base/classes:${root}/build/java.compiler/classes ${root}/build/jdk.compiler/classes 1.8 ${root}/src/jdk.dev/share/classes + ${root}/build/bootstrap/jdk.dev/gensrc ${root}/build/java.base/classes:${root}/build/java.compiler/classes:${root}/build/jdk.compiler/classes ${root}/build/jdk.dev/classes 1.8 ${root}/src/jdk.javadoc/share/classes + ${root}/build/bootstrap/jdk.javadoc/gensrc ${root}/build/java.base/classes:${root}/build/java.compiler/classes:${root}/build/jdk.compiler/classes ${root}/build/jdk.javadoc/classes 1.8 diff --git a/langtools/make/tools/anttasks/PropertiesParserTask.java b/langtools/make/tools/anttasks/PropertiesParserTask.java new file mode 100644 index 00000000000..ec288946b10 --- /dev/null +++ b/langtools/make/tools/anttasks/PropertiesParserTask.java @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * 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 anttasks; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import propertiesparser.PropertiesParser; +import propertiesparser.gen.ClassGenerator; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.Resource; + +public class PropertiesParserTask extends MatchingTask { + public void addSrc(Path src) { + if (srcDirs == null) + srcDirs = new Path(getProject()); + srcDirs.add(src); + } + + public void setDestDir(File destDir) { + this.destDir = destDir; + } + + @Override + public void execute() { + List mainOpts = new ArrayList(); + int count = 0; + for (String dir : srcDirs.list()) { + File baseDir = getProject().resolveFile(dir); + DirectoryScanner s = getDirectoryScanner(baseDir); + for (String path : s.getIncludedFiles()) { + if (path.endsWith(".properties")) { + File srcFile = new File(baseDir, path); + String destPath = + path.substring(0, path.lastIndexOf(File.separator) + 1) + + ClassGenerator.toplevelName(srcFile) + ".java"; + File destFile = new File(this.destDir, destPath); + File destDir = destFile.getParentFile(); + // Arguably, the comparison in the next line should be ">", not ">=" + // but that assumes the resolution of the last modified time is fine + // grained enough; in practice, it is better to use ">=". + if (destFile.exists() && destFile.lastModified() >= srcFile.lastModified()) + continue; + destDir.mkdirs(); + mainOpts.add("-compile"); + mainOpts.add(srcFile.getPath()); + mainOpts.add(destDir.getPath()); + count++; + } + } + } + if (mainOpts.size() > 0) { + log("Generating " + count + " resource files to " + destDir, Project.MSG_INFO); + PropertiesParser pp = new PropertiesParser(msg -> log(msg, Project.MSG_INFO)); + boolean ok = pp.run(mainOpts.toArray(new String[mainOpts.size()])); + if (!ok) + throw new BuildException("PropertiesParser failed."); + } + } + + private Path srcDirs; + private File destDir; +} diff --git a/langtools/make/tools/propertiesparser/PropertiesParser.java b/langtools/make/tools/propertiesparser/PropertiesParser.java new file mode 100644 index 00000000000..6ec748ef1a3 --- /dev/null +++ b/langtools/make/tools/propertiesparser/PropertiesParser.java @@ -0,0 +1,127 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * 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 propertiesparser; + +import propertiesparser.parser.MessageFile; +import propertiesparser.gen.ClassGenerator; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.lang.RuntimeException; +import java.lang.Throwable; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +/** Translates a .properties file into a .java file containing an enum-like Java class + * which defines static factory methods for all resource keys in a given resource file.

+ * + * Usage: java PropertiesParser -compile [path to .properties file] [output folder where .java file will be written] + * + * @author mcimadamore + */ + +public class PropertiesParser { + + public Logger logger; + + public PropertiesParser(Logger logger) { + this.logger = logger; + } + + public static void main(String[] args) { + PropertiesParser pp = new PropertiesParser(msg -> System.out.println(msg)); + boolean ok = pp.run(args); + if ( !ok ) { + System.exit(1); + } + } + + public static interface Logger { + void info(String msg); + } + + public void info(String msg) { + logger.info(msg); + } + + public boolean run(String[] args) { + Map optionsMap = parseOptions(args); + if (optionsMap.isEmpty()) { + usage(); + return false; + } + try { + optionsMap.forEach((propfile, outfile) -> compilePropertyFile(propfile, outfile)); + return true; + } catch (RuntimeException ex) { + ex.printStackTrace(); + return false; + } + } + + private void compilePropertyFile(String propertyPath, String outPath) { + try { + File propertyFile = new File(propertyPath); + String prefix = propertyFile.getName().split("\\.")[0]; + MessageFile messageFile = new MessageFile(propertyFile, prefix); + new ClassGenerator().generateFactory(messageFile, new File(outPath)); + } catch (Throwable ex) { + throw new RuntimeException(ex); + } + } + + private Map parseOptions(String args[]) { + Map optionsMap = new HashMap<>(args.length); + for ( int i = 0; i < args.length ; i++ ) { + if ( "-compile".equals(args[i]) && i+2 < args.length ) { + optionsMap.put(args[++i], args[++i]); + } else { + return new HashMap<>(); + } + } + return optionsMap; + } + + private void usage() { + info("usage:"); + info(" java PropertiesParser {-compile path_to_properties_file path_to_java_output_dir}"); + info(""); + info("Example:"); + info(" java PropertiesParser -compile resources/test.properties resources"); + } +} diff --git a/langtools/make/tools/propertiesparser/gen/ClassGenerator.java b/langtools/make/tools/propertiesparser/gen/ClassGenerator.java new file mode 100644 index 00000000000..f46d10a0bee --- /dev/null +++ b/langtools/make/tools/propertiesparser/gen/ClassGenerator.java @@ -0,0 +1,419 @@ +package propertiesparser.gen; + +import propertiesparser.parser.Message; +import propertiesparser.parser.MessageFile; +import propertiesparser.parser.MessageInfo; +import propertiesparser.parser.MessageLine; +import propertiesparser.parser.MessageType; +import propertiesparser.parser.MessageType.CompoundType; +import propertiesparser.parser.MessageType.CustomType; +import propertiesparser.parser.MessageType.SimpleType; +import propertiesparser.parser.MessageType.UnionType; +import propertiesparser.parser.MessageType.Visitor; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.TreeSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Properties; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +public class ClassGenerator { + + /** Empty string - used to generate indentation padding. */ + private final static String INDENT_STRING = " "; + + /** Default indentation step. */ + private final static int INDENT_WIDTH = 4; + + /** File-backed property file containing basic code stubs. */ + static Properties stubs; + + static { + //init properties from file + stubs = new Properties(); + String resourcePath = "/propertiesparser/resources/templates.properties"; + try (InputStream in = ClassGenerator.class.getResourceAsStream(resourcePath)) { + stubs.load(in); + } catch (IOException ex) { + throw new AssertionError(ex); + } + } + + /** + * Supported stubs in the property file. + */ + enum StubKind { + TOPLEVEL("toplevel.decl"), + FACTORY_CLASS("nested.decl"), + IMPORT("import.decl"), + FACTORY_METHOD_DECL("factory.decl.method"), + FACTORY_METHOD_ARG("factory.decl.method.arg"), + FACTORY_METHOD_BODY("factory.decl.method.body"), + FACTORY_FIELD("factory.decl.field"), + WILDCARDS_EXTENDS("wildcards.extends"), + SUPPRESS_WARNINGS("suppress.warnings"); + + /** stub key (as it appears in the property file) */ + String key; + + StubKind(String key) { + this.key = key; + } + + /** + * Subst a list of arguments into a given stub. + */ + String format(Object... args) { + return MessageFormat.format((String)stubs.get(key), args); + } + } + + /** + * Nested factory class kind. There are multiple sub-factories, one for each kind of commonly used + * diagnostics (i.e. error, warnings, note, fragment). An additional category is defined for + * those resource keys whose prefix doesn't match any predefined category. + */ + enum FactoryKind { + ERR("err", "Error", "Errors"), + WARN("warn", "Warning", "Warnings"), + NOTE("note", "Note", "Notes"), + MISC("misc", "Fragment", "Fragments"), + OTHER(null, null, null); + + /** The prefix for this factory kind (i.e. 'err'). */ + String prefix; + + /** The type of the factory method/fields in this class. */ + String keyClazz; + + /** The class name to be used for this factory. */ + String factoryClazz; + + FactoryKind(String prefix, String keyClazz, String factoryClazz) { + this.prefix = prefix; + this.keyClazz = keyClazz; + this.factoryClazz = factoryClazz; + } + + /** + * Utility method for parsing a factory kind from a resource key prefix. + */ + static FactoryKind parseFrom(String prefix) { + for (FactoryKind k : FactoryKind.values()) { + if (k.prefix == null || k.prefix.equals(prefix)) { + return k; + } + } + return null; + } + } + + /** + * Main entry-point: generate a Java enum-like set of nested factory classes into given output + * folder. The factories are populated as mandated by the comments in the input resource file. + */ + public void generateFactory(MessageFile messageFile, File outDir) { + Map>> groupedEntries = + messageFile.messages.entrySet().stream() + .collect(Collectors.groupingBy(e -> FactoryKind.parseFrom(e.getKey().split("\\.")[1]))); + //generate nested classes + List nestedDecls = new ArrayList<>(); + Set importedTypes = new TreeSet<>(); + for (Map.Entry>> entry : groupedEntries.entrySet()) { + if (entry.getKey() == FactoryKind.OTHER) continue; + //emit members + String members = entry.getValue().stream() + .flatMap(e -> generateFactoryMethodsAndFields(e.getKey(), e.getValue()).stream()) + .collect(Collectors.joining("\n\n")); + //emit nested class + String factoryDecl = + StubKind.FACTORY_CLASS.format(entry.getKey().factoryClazz, indent(members, 1)); + nestedDecls.add(indent(factoryDecl, 1)); + //add imports + entry.getValue().stream().forEach(e -> + importedTypes.addAll(importedTypes(e.getValue().getMessageInfo().getTypes()))); + } + String clazz = StubKind.TOPLEVEL.format( + packageName(messageFile.file), + String.join("\n", generateImports(importedTypes)), + toplevelName(messageFile.file), + String.join("\n", nestedDecls)); + try (FileWriter fw = new FileWriter(new File(outDir, toplevelName(messageFile.file) + ".java"))) { + fw.append(clazz); + } catch (Throwable ex) { + throw new AssertionError(ex); + } + } + + /** + * Indent a string to a given level. + */ + String indent(String s, int level) { + return Stream.of(s.split("\n")) + .map(sub -> INDENT_STRING.substring(0, level * INDENT_WIDTH) + sub) + .collect(Collectors.joining("\n")); + } + + /** + * Retrieve package part of given file object. + */ + String packageName(File file) { + String path = file.getAbsolutePath(); + int begin = path.indexOf("com" + File.separatorChar); + String packagePath = path.substring(begin, path.lastIndexOf(File.separatorChar)); + String packageName = packagePath.replace(File.separatorChar, '.'); + return packageName; + } + + /** + * Form the name of the toplevel factory class. + */ + public static String toplevelName(File file) { + return Stream.of(file.getName().split("\\.")) + .map(s -> Character.toUpperCase(s.charAt(0)) + s.substring(1)) + .collect(Collectors.joining("")); + } + + /** + * Generate a list of import declarations given a set of imported types. + */ + List generateImports(Set importedTypes) { + List importDecls = new ArrayList<>(); + for (String it : importedTypes) { + importDecls.add(StubKind.IMPORT.format(it)); + } + return importDecls; + } + + /** + * Generate a list of factory methods/fields to be added to a given factory nested class. + */ + List generateFactoryMethodsAndFields(String key, Message msg) { + MessageInfo msgInfo = msg.getMessageInfo(); + List lines = msg.getLines(false); + String javadoc = lines.stream() + .filter(ml -> !ml.isInfo() && !ml.isEmptyOrComment()) + .map(ml -> ml.text) + .collect(Collectors.joining("\n *")); + String[] keyParts = key.split("\\."); + FactoryKind k = FactoryKind.parseFrom(keyParts[1]); + String factoryName = factoryName(key); + if (msgInfo.getTypes().isEmpty()) { + //generate field + String factoryField = StubKind.FACTORY_FIELD.format(k.keyClazz, factoryName, + "\"" + keyParts[0] + "\"", + "\"" + Stream.of(keyParts).skip(2).collect(Collectors.joining(".")) + "\"", + javadoc); + return Collections.singletonList(factoryField); + } else { + //generate method + List factoryMethods = new ArrayList<>(); + for (List msgTypes : normalizeTypes(0, msgInfo.getTypes())) { + List types = generateTypes(msgTypes); + List argNames = argNames(types.size()); + String suppressionString = needsSuppressWarnings(msgTypes) ? + StubKind.SUPPRESS_WARNINGS.format() : ""; + String factoryMethod = StubKind.FACTORY_METHOD_DECL.format(suppressionString, k.keyClazz, + factoryName, argDecls(types, argNames).stream().collect(Collectors.joining(", ")), + indent(StubKind.FACTORY_METHOD_BODY.format(k.keyClazz, + "\"" + keyParts[0] + "\"", + "\"" + Stream.of(keyParts).skip(2).collect(Collectors.joining(".")) + "\"", + argNames.stream().collect(Collectors.joining(", "))), 1), + javadoc); + factoryMethods.add(factoryMethod); + } + return factoryMethods; + } + } + + /** + * Form the name of a factory method/field given a resource key. + */ + String factoryName(String key) { + return Stream.of(key.split("[\\.-]")) + .skip(2) + .map(s -> Character.toUpperCase(s.charAt(0)) + s.substring(1)) + .collect(Collectors.joining("")); + } + + /** + * Generate a formal parameter list given a list of types and names. + */ + List argDecls(List types, List args) { + List argNames = new ArrayList<>(); + for (int i = 0 ; i < types.size() ; i++) { + argNames.add(types.get(i) + " " + args.get(i)); + } + return argNames; + } + + /** + * Generate a list of formal parameter names given a size. + */ + List argNames(int size) { + List argNames = new ArrayList<>(); + for (int i = 0 ; i < size ; i++) { + argNames.add(StubKind.FACTORY_METHOD_ARG.format(i)); + } + return argNames; + } + + /** + * Convert a (normalized) parsed type into a string-based representation of some Java type. + */ + List generateTypes(List msgTypes) { + return msgTypes.stream().map(t -> t.accept(stringVisitor, null)).collect(Collectors.toList()); + } + //where + Visitor stringVisitor = new Visitor() { + @Override + public String visitCustomType(CustomType t, Void aVoid) { + String customType = t.typeString; + return customType.substring(customType.lastIndexOf('.') + 1); + } + + @Override + public String visitSimpleType(SimpleType t, Void aVoid) { + return t.clazz; + } + + @Override + public String visitCompoundType(CompoundType t, Void aVoid) { + return StubKind.WILDCARDS_EXTENDS.format(t.kind.clazz.clazz, + t.elemtype.accept(this, null)); + } + + @Override + public String visitUnionType(UnionType t, Void aVoid) { + throw new AssertionError("Union types should have been denormalized!"); + } + }; + + /** + * See if any of the parsed types in the given list needs warning suppression. + */ + boolean needsSuppressWarnings(List msgTypes) { + return msgTypes.stream().anyMatch(t -> t.accept(suppressWarningsVisitor, null)); + } + //where + Visitor suppressWarningsVisitor = new Visitor() { + @Override + public Boolean visitCustomType(CustomType t, Void aVoid) { + //play safe + return true; + } + @Override + public Boolean visitSimpleType(SimpleType t, Void aVoid) { + switch (t) { + case LIST: + case SET: + return true; + default: + return false; + } + } + + @Override + public Boolean visitCompoundType(CompoundType t, Void aVoid) { + return t.elemtype.accept(this, null); + } + + @Override + public Boolean visitUnionType(UnionType t, Void aVoid) { + return needsSuppressWarnings(Arrays.asList(t.choices)); + } + }; + + /** + * Retrieve a list of types that need to be imported, so that the factory body can refer + * to the types in the given list using simple names. + */ + Set importedTypes(List msgTypes) { + Set imports = new TreeSet<>(); + msgTypes.forEach(t -> t.accept(importVisitor, imports)); + return imports; + } + //where + Visitor> importVisitor = new Visitor>() { + @Override + public Void visitCustomType(CustomType t, Set imports) { + imports.add(t.typeString); + return null; + } + + @Override + public Void visitSimpleType(SimpleType t, Set imports) { + if (t.qualifier != null) { + imports.add(t.qualifier + "." + t.clazz); + } + return null; + } + + @Override + public Void visitCompoundType(CompoundType t, Set imports) { + visitSimpleType(t.kind.clazz, imports); + t.elemtype.accept(this, imports); + return null; + } + + @Override + public Void visitUnionType(UnionType t, Set imports) { + Stream.of(t.choices).forEach(c -> c.accept(this, imports)); + return null; + } + }; + + /** + * Normalize parsed types in a comment line. If one or more types in the line contains alternatives, + * this routine generate a list of 'overloaded' normalized signatures. + */ + List> normalizeTypes(int idx, List msgTypes) { + if (msgTypes.size() == idx) return Collections.singletonList(Collections.emptyList()); + MessageType head = msgTypes.get(idx); + List> buf = new ArrayList<>(); + for (MessageType alternative : head.accept(normalizeVisitor, null)) { + for (List rest : normalizeTypes(idx + 1, msgTypes)) { + List temp = new ArrayList<>(rest); + temp.add(0, alternative); + buf.add(temp); + } + } + return buf; + } + //where + Visitor, Void> normalizeVisitor = new Visitor, Void>() { + @Override + public List visitCustomType(CustomType t, Void aVoid) { + return Collections.singletonList(t); + } + + @Override + public List visitSimpleType(SimpleType t, Void aVoid) { + return Collections.singletonList(t); + } + + @Override + public List visitCompoundType(CompoundType t, Void aVoid) { + return t.elemtype.accept(this, null).stream() + .map(nt -> new CompoundType(t.kind, nt)) + .collect(Collectors.toList()); + } + + @Override + public List visitUnionType(UnionType t, Void aVoid) { + return Stream.of(t.choices) + .flatMap(t2 -> t2.accept(this, null).stream()) + .collect(Collectors.toList()); + } + }; +} diff --git a/langtools/make/tools/propertiesparser/parser/Message.java b/langtools/make/tools/propertiesparser/parser/Message.java new file mode 100644 index 00000000000..4bfded31285 --- /dev/null +++ b/langtools/make/tools/propertiesparser/parser/Message.java @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package propertiesparser.parser; + +import java.util.ArrayList; +import java.util.List; + +/** + * A message within the message file. + * A message is a series of lines containing a "name=value" property, + * optionally preceded by a comment describing the use of placeholders + * such as {0}, {1}, etc within the property value. + */ +public final class Message { + final MessageLine firstLine; + private MessageInfo messageInfo; + + Message(MessageLine l) { + firstLine = l; + } + + /** + * Get the Info object for this message. It may be empty if there + * if no comment preceding the property specification. + */ + public MessageInfo getMessageInfo() { + if (messageInfo == null) { + MessageLine l = firstLine.prev; + if (l != null && l.isInfo()) + messageInfo = new MessageInfo(l.text); + else + messageInfo = MessageInfo.dummyInfo; + } + return messageInfo; + } + + /** + * Get all the lines pertaining to this message. + */ + public List getLines(boolean includeAllPrecedingComments) { + List lines = new ArrayList<>(); + MessageLine l = firstLine; + if (includeAllPrecedingComments) { + // scan back to find end of prev message + while (l.prev != null && l.prev.isEmptyOrComment()) + l = l.prev; + // skip leading blank lines + while (l.text.isEmpty()) + l = l.next; + } else { + if (l.prev != null && l.prev.isInfo()) + l = l.prev; + } + + // include any preceding lines + for ( ; l != firstLine; l = l.next) + lines.add(l); + + // include message lines + for (l = firstLine; l != null && l.hasContinuation(); l = l.next) + lines.add(l); + lines.add(l); + + // include trailing blank line if present + l = l.next; + if (l != null && l.text.isEmpty()) + lines.add(l); + + return lines; + } +} diff --git a/langtools/make/tools/propertiesparser/parser/MessageFile.java b/langtools/make/tools/propertiesparser/parser/MessageFile.java new file mode 100644 index 00000000000..45e3384ba72 --- /dev/null +++ b/langtools/make/tools/propertiesparser/parser/MessageFile.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package propertiesparser.parser; + +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.*; + +/** + * Class to facilitate manipulating compiler.properties. + */ +public class MessageFile { + + MessageLine firstLine; + public Map messages = new TreeMap<>(); + public File file; + public String keyPrefix; + + public MessageFile(File file, String keyPrefix) throws IOException { + this.file = file; + this.keyPrefix = keyPrefix; + read(file); + } + + final void read(File in) throws IOException { + MessageLine currLine = null; + for (String line : Files.readAllLines(in.toPath())) { + if (currLine == null) + firstLine = currLine = new MessageLine(line); + else + currLine = currLine.append(line); + if (line.startsWith(keyPrefix + ".")) { + int eq = line.indexOf("="); + if (eq > 0) + messages.put(line.substring(0, eq), new Message(currLine)); + } + } + } +} diff --git a/langtools/make/tools/propertiesparser/parser/MessageInfo.java b/langtools/make/tools/propertiesparser/parser/MessageInfo.java new file mode 100644 index 00000000000..e822510a9f1 --- /dev/null +++ b/langtools/make/tools/propertiesparser/parser/MessageInfo.java @@ -0,0 +1,125 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package propertiesparser.parser; + +import propertiesparser.parser.MessageType.CompoundType; +import propertiesparser.parser.MessageType.OrType; +import propertiesparser.parser.MessageType.SimpleType; +import propertiesparser.parser.MessageType.UnionType; + +import java.util.ArrayList; +import java.util.List; + +/** + * An object to represent the comment that may precede the property + * specification in a Message. + * The comment is modelled as a list of fields, where the fields correspond + * to the placeholder values (e.g. {0}, {1}, etc) within the message value. + */ +public final class MessageInfo { + + /** The fields of the Info object. */ + List types = new ArrayList<>(); + + MessageInfo(String text) throws IllegalArgumentException { + if (text != null) { + if (!text.startsWith("# ")) + throw new IllegalArgumentException(); + String[] segs = text.substring(2).split(", "); + types = new ArrayList<>(); + for (String seg : segs) { + types.add(parseType(seg)); + } + } + } + + public List getTypes() { + return types; + } + + boolean isEmpty() { + return types.isEmpty(); + } + + @Override + public String toString() { + return types.toString(); + } + + /** + * Split the type comment into multiple alternatives (separated by 'or') - then parse each of them + * individually and form an 'or' type. + */ + MessageType parseType(String text) { + int commentStart = text.indexOf("("); + if (commentStart != -1) { + //remove optional comment + text = text.substring(0, commentStart); + } + text = text.substring(text.indexOf(": ") + 2); + String[] alternatives = text.split(" " + OrType.OR_NAME + " "); + MessageType[] types = new MessageType[alternatives.length]; + for (int i = 0 ; i < alternatives.length ; i++) { + types[i] = parseAlternative(alternatives[i].trim()); + } + return types.length > 1 ? + new OrType(types) : types[0]; + } + + /** + * Parse a subset of the type comment; valid matches are simple types, compound types, + * union types and custom types. + */ + MessageType parseAlternative(String text) { + //try with custom types + if (text.charAt(0) == '\'') { + int end = text.indexOf('\'', 1); + return new MessageType.CustomType(text.substring(1, end)); + } + //try with simple types + for (SimpleType st : SimpleType.values()) { + if (text.equals(st.kindName())) { + return st; + } + } + //try with compound types + for (CompoundType.Kind ck : CompoundType.Kind.values()) { + if (text.startsWith(ck.kindName)) { + MessageType elemtype = parseAlternative(text.substring(ck.kindName.length() + 1).trim()); + return new CompoundType(ck, elemtype); + } + } + //try with union types + for (UnionType.Kind uk : UnionType.Kind.values()) { + if (text.startsWith(uk.kindName)) { + return new UnionType(uk); + } + } + //no match - report a warning + System.err.println("WARNING - unrecognized type: " + text); + return SimpleType.UNKNOWN; + } + + /** Dummy message info to be used when no resource key comment is available. */ + static final MessageInfo dummyInfo = new MessageInfo(null); +} diff --git a/langtools/make/tools/propertiesparser/parser/MessageLine.java b/langtools/make/tools/propertiesparser/parser/MessageLine.java new file mode 100644 index 00000000000..b7751f9978b --- /dev/null +++ b/langtools/make/tools/propertiesparser/parser/MessageLine.java @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package propertiesparser.parser; + +import java.util.regex.Pattern; + +/** + * A line of text within the message file. + * The lines form a doubly linked list for simple navigation. + */ +public class MessageLine { + + static final Pattern emptyOrCommentPattern = Pattern.compile("( *#.*)?"); + static final Pattern typePattern = Pattern.compile("[-\\\\'A-Z\\.a-z ]+( \\([A-Za-z 0-9]+\\))?"); + static final Pattern infoPattern = Pattern.compile(String.format("# ([0-9]+: %s, )*[0-9]+: %s", + typePattern.pattern(), typePattern.pattern())); + + public String text; + MessageLine prev; + MessageLine next; + + MessageLine(String text) { + this.text = text; + } + + public boolean isEmptyOrComment() { + return emptyOrCommentPattern.matcher(text).matches(); + } + + public boolean isInfo() { + return infoPattern.matcher(text).matches(); + } + + boolean hasContinuation() { + return (next != null) && text.endsWith("\\"); + } + + MessageLine append(String text) { + MessageLine l = new MessageLine(text); + append(l); + return l; + } + + void append(MessageLine l) { + assert l.prev == null && l.next == null; + l.prev = this; + l.next = next; + if (next != null) { + next.prev = l; + } + next = l; + } +} diff --git a/langtools/make/tools/propertiesparser/parser/MessageType.java b/langtools/make/tools/propertiesparser/parser/MessageType.java new file mode 100644 index 00000000000..6c70084349c --- /dev/null +++ b/langtools/make/tools/propertiesparser/parser/MessageType.java @@ -0,0 +1,250 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package propertiesparser.parser; + +/** + * Common interface to all kinds of diagnostic argument types. + */ +public interface MessageType { + + /** + * Visitor method. + */ + R accept(Visitor v, A a); + + /** + * The type as mentioned in the resource file. + */ + String kindName(); + + /** + * A custom type is a type for which a predefined alternative does not exist. As such, it is an + * handy option when prototyping - but usages of custom types should be avoided in product-quality + * resource file comments. + * + * Example: 'com.sun.tools.javac.code.Flags.Flag' + */ + public static class CustomType implements MessageType { + + /** The string-based representation of this type. */ + public String typeString; + + public CustomType(String typeString) { + this.typeString = typeString; + } + + @Override + public String kindName() { + return typeString; + } + + @Override + public R accept(Visitor v, A a) { + return v.visitCustomType(this, a); + } + } + + /** + * A predefined type. All common types mentioned in the resource file comments are meant to + * be included here. + */ + public enum SimpleType implements MessageType { + + BOOLEAN("boolean", "boolean", null), + FRAGMENT("fragment", "Fragment", null), + DIAGNOSTIC("diagnostic", "JCDiagnostic", "com.sun.tools.javac.util"), + MODIFIER("modifier", "Modifier", "javax.lang.model.element"), + FILE("file", "File", "java.io"), + FILE_OBJECT("file object", "JavaFileObject", "javax.tools"), + NAME("name", "Name", "com.sun.tools.javac.util"), + NUMBER("number", "int", null), + OPTION_NAME("option name", "Option", "com.sun.tools.javac.main"), + SOURCE_VERSION("source version", "Source", "com.sun.tools.javac.code"), + STRING("string", "String", null), + SYMBOL("symbol", "Symbol", "com.sun.tools.javac.code"), + SYMBOL_KIND("symbol kind", "Kind", "com.sun.tools.javac.code.Kinds"), + KIND_NAME("kind name", "KindName", "com.sun.tools.javac.code.Kinds"), + TOKEN("token", "TokenKind", "com.sun.tools.javac.parser.Tokens"), + TYPE("type", "Type", "com.sun.tools.javac.code"), + SET("set", "Set", "java.util"), + LIST("list", "List", "java.util"), + OBJECT("object", "Object", null), + UNUSED("unused", "Void", null), + UNKNOWN("", "UnknownType", null); + + /** name of the predefined type as mentioned in the resource file. */ + public final String kindName; + + /** string-based representation of the type */ + public final String clazz; + + /** type qualifier (might be null) */ + public final String qualifier; + + SimpleType(String kindName, String clazz, String qualifier) { + this.kindName = kindName; + this.clazz = clazz; + this.qualifier = qualifier; + } + + @Override + public String kindName() { + return kindName; + } + + @Override + public R accept(Visitor v, A a) { + return v.visitSimpleType(this, a); + } + } + + /** + * A compound type is a collection of some element type. + * + * Example: list of string + */ + public static class CompoundType implements MessageType { + + /** + * Compound type kind. + */ + public enum Kind { + LIST("list of", SimpleType.LIST), + SET("set of", SimpleType.SET); + + public final String kindName; + public final SimpleType clazz; + + Kind(String kindName, SimpleType clazz) { + this.kindName = kindName; + this.clazz = clazz; + } + } + + /** The compound type kind. */ + public final Kind kind; + + /** The element type. */ + public final MessageType elemtype; + + public CompoundType(Kind kind, MessageType elemtype) { + this.kind = kind; + this.elemtype = elemtype; + } + + @Override + public String kindName() { + return kind.kindName; + } + + @Override + public R accept(Visitor v, A a) { + return v.visitCompoundType(this, a); + } + } + + /** + * A union type represents an alternative between two (or more) types. It can be useful to + * define the type of an argument which can assume multiple (unrelated) values; union types + * are only meant to be used in cases where the alternative comes up frequently enough in the + * resource file comments - in order to avoid cluttered comments. + * + * Example: message segment + */ + public static class UnionType implements MessageType { + + /** + * Union type kind. + */ + public enum Kind { + MESSAGE_SEGMENT("message segment", SimpleType.DIAGNOSTIC, SimpleType.FRAGMENT), + FILE_NAME("file name", SimpleType.FILE, SimpleType.FILE_OBJECT); + + final String kindName; + final SimpleType[] choices; + + Kind(String kindName, SimpleType... choices) { + this.kindName = kindName; + this.choices = choices; + } + } + + /** The union type kind. */ + public final Kind kind; + + /** The union type alternatives. */ + public final MessageType[] choices; + + UnionType(Kind kind) { + this(kind, kind.choices); + } + + protected UnionType(Kind kind, MessageType[] choices) { + this.choices = choices; + this.kind = kind; + } + + @Override + public String kindName() { + return kind.kindName; + } + + @Override + public R accept(Visitor v, A a) { + return v.visitUnionType(this, a); + } + } + + /** + * A subclass of union type representing 'explicit' alternatives in the resource file comments. + * Note: as the token 'or' is parsed with lowest priority, it is not possible, for instance, + * to form a compound type out of an 'or' type. In such cases a plain union type should be used + * instead. + * + * Examples: symbol or type + */ + public static class OrType extends UnionType { + + public static final String OR_NAME = "or"; + + @Override + public String kindName() { + return OR_NAME; + } + + public OrType(MessageType... choices) { + super(null, choices); + } + } + + /** + * Visitor class. + */ + public static abstract class Visitor { + public abstract R visitCustomType(CustomType t, A a); + public abstract R visitSimpleType(SimpleType t, A a); + public abstract R visitCompoundType(CompoundType t, A a); + public abstract R visitUnionType(UnionType t, A a); + } +} diff --git a/langtools/make/tools/propertiesparser/resources/templates.properties b/langtools/make/tools/propertiesparser/resources/templates.properties new file mode 100644 index 00000000000..f4715a5a839 --- /dev/null +++ b/langtools/make/tools/propertiesparser/resources/templates.properties @@ -0,0 +1,48 @@ +toplevel.decl=\ + package {0};\n\ + \n\ + {1}\n\ + import com.sun.tools.javac.util.JCDiagnostic.Error;\n\ + import com.sun.tools.javac.util.JCDiagnostic.Warning;\n\ + import com.sun.tools.javac.util.JCDiagnostic.Note;\n\ + import com.sun.tools.javac.util.JCDiagnostic.Fragment;\n\ + \n\ + public class {2} '{'\n\ + {3}\n\ + '}'\n + +import.decl=\ + import {0}; + +nested.decl =\ + public static class {0} '{'\n\ + {1}\n\ + '}' + +factory.decl.method=\ + /**\n\ + ' '* {5}\n\ + ' '*/\n\ + {0}public static {1} {2}({3}) '{'\n\ + {4}\n\ + '}' + +factory.decl.method.arg=\ + arg{0} + +factory.decl.method.body=\ + return new {0}({1}, {2}, {3}); + +factory.decl.field=\ + /**\n\ + ' '* {4}\n\ + ' '*/\n\ + public static final {0} {1} = new {0}({2}, {3}); + +wildcards.extends=\ + {0} + +suppress.warnings=\ + @SuppressWarnings("rawtypes")\n + + diff --git a/langtools/src/java.compiler/share/classes/javax/tools/FileManagerUtils.java b/langtools/src/java.compiler/share/classes/javax/tools/FileManagerUtils.java new file mode 100644 index 00000000000..fe8f6589c5d --- /dev/null +++ b/langtools/src/java.compiler/share/classes/javax/tools/FileManagerUtils.java @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 javax.tools; + +import java.io.File; +import java.nio.file.Path; +import java.util.Iterator; + +/** + * Package-private utility methods to convert between files and paths. + * + * @since 1.9 + */ +class FileManagerUtils { + private FileManagerUtils() { } + + static Iterable asPaths(final Iterable files) { + return () -> new Iterator() { + Iterator iter = files.iterator(); + + @Override + public boolean hasNext() { + return iter.hasNext(); + } + + @Override + public Path next() { + return iter.next().toPath(); + } + }; + } + + static Iterable asFiles(final Iterable paths) { + return () -> new Iterator() { + Iterator iter = paths.iterator(); + + @Override + public boolean hasNext() { + return iter.hasNext(); + } + + @Override + public File next() { + Path p = iter.next(); + try { + return p.toFile(); + } catch (UnsupportedOperationException e) { + throw new IllegalArgumentException(p.toString(), e); + } + } + }; + } +} diff --git a/langtools/src/java.compiler/share/classes/javax/tools/StandardJavaFileManager.java b/langtools/src/java.compiler/share/classes/javax/tools/StandardJavaFileManager.java index 2b1ad4b7303..9701584805c 100644 --- a/langtools/src/java.compiler/share/classes/javax/tools/StandardJavaFileManager.java +++ b/langtools/src/java.compiler/share/classes/javax/tools/StandardJavaFileManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,13 +27,16 @@ package javax.tools; import java.io.File; import java.io.IOException; -import java.util.*; +import java.nio.file.Path; +import java.util.Arrays; + +import static javax.tools.FileManagerUtils.*; /** - * File manager based on {@linkplain File java.io.File}. A common way - * to obtain an instance of this class is using {@linkplain - * JavaCompiler#getStandardFileManager - * getStandardFileManager}, for example: + * File manager based on {@linkplain File java.io.File} and {@linkplain Path java.nio.file.Path}. + * + * A common way to obtain an instance of this class is using + * {@linkplain JavaCompiler#getStandardFileManager getStandardFileManager}, for example: * * 

  *   JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
@@ -110,7 +113,7 @@ import java.util.*;
  *     file:///C:/Documents%20and%20Settings/UncleBob/BobsApp/Test.java
  *   
  *   
  • 
- *     jar:///C:/Documents%20and%20Settings/UncleBob/lib/vendorA.jar!com/vendora/LibraryClass.class
+ *     jar:///C:/Documents%20and%20Settings/UncleBob/lib/vendorA.jar!/com/vendora/LibraryClass.class
  *   
    • 
  * 
  * Whereas these are not (reason in parentheses):
@@ -120,7 +123,7 @@ import java.util.*;
  *     and depend on the current directory)
  *   
  *   
  • 
- *     jar:lib/vendorA.jar!com/vendora/LibraryClass.class
+ *     jar:lib/vendorA.jar!/com/vendora/LibraryClass.class
  *     (the first half of the path depends on the current directory,
  *     whereas the component after ! is legal)
  *   
    • 
@@ -134,6 +137,10 @@ import java.util.*;
  *   
  * 
  *
+ * 
    All implementations of this interface must support Path objects representing
+ * files in the {@linkplain java.nio.file.FileSystems#getDefault() default file system.}
+ * It is recommended that implementations should support Path objects from any filesystem.
    
+ *
  * @author Peter von der Ahé
  * @since 1.6
  */
@@ -147,11 +154,12 @@ public interface StandardJavaFileManager extends JavaFileManager {
      * @param a a file object
      * @param b a file object
      * @return true if the given file objects represent the same
-     * canonical file or zip file entry; false otherwise
+     * canonical file, zip file entry or path; false otherwise
      *
      * @throws IllegalArgumentException if either of the arguments
      * were created with another file manager implementation
      */
+    @Override
     boolean isSameFile(FileObject a, FileObject b);
 
     /**
@@ -165,6 +173,27 @@ public interface StandardJavaFileManager extends JavaFileManager {
     Iterable getJavaFileObjectsFromFiles(
         Iterable files);
 
+    /**
+     * Returns file objects representing the given paths.
+     *
+     * 
    The default implementation converts each path to a file and calls
+     * {@link #getJavaFileObjectsFromFiles getJavaObjectsFromFiles}.
+     * IllegalArgumentException will be thrown if any of the paths
+     * cannot be converted to a file.
+     *
+     * @param paths a list of paths
+     * @return a list of file objects
+     * @throws IllegalArgumentException if the list of paths includes
+     * a directory or if this file manager does not support any of the
+     * given paths.
+     *
+     * @since 1.9
+     */
+    default Iterable getJavaFileObjectsFromPaths(
+            Iterable paths) {
+        return getJavaFileObjectsFromFiles(asFiles(paths));
+    }
+
     /**
      * Returns file objects representing the given files.
      * Convenience method equivalent to:
@@ -182,6 +211,27 @@ public interface StandardJavaFileManager extends JavaFileManager {
      */
     Iterable getJavaFileObjects(File... files);
 
+    /**
+     * Returns file objects representing the given paths.
+     * Convenience method equivalent to:
+     *
+     * 
    +     *     getJavaFileObjectsFromPaths({@linkplain java.util.Arrays#asList Arrays.asList}(paths))
+     * 
    
+     *
+     * @param paths an array of paths
+     * @return a list of file objects
+     * @throws IllegalArgumentException if the array of files includes
+     * a directory
+     * @throws NullPointerException if the given array contains null
+     * elements
+     *
+     * @since 1.9
+     */
+    default Iterable getJavaFileObjects(Path... paths) {
+        return getJavaFileObjectsFromPaths(Arrays.asList(paths));
+    }
+
     /**
      * Returns file objects representing the given file names.
      *
@@ -211,29 +261,94 @@ public interface StandardJavaFileManager extends JavaFileManager {
     Iterable getJavaFileObjects(String... names);
 
     /**
-     * Associates the given path with the given location.  Any
+     * Associates the given search path with the given location.  Any
      * previous value will be discarded.
      *
      * @param location a location
-     * @param path a list of files, if {@code null} use the default
-     * path for this location
+     * @param files a list of files, if {@code null} use the default
+     * search path for this location
      * @see #getLocation
-     * @throws IllegalArgumentException if location is an output
-     * location and path does not contain exactly one element
-     * @throws IOException if location is an output location and path
+     * @throws IllegalArgumentException if {@code location} is an output
+     * location and {@code files} does not contain exactly one element
+     * @throws IOException if {@code location} is an output location and
      * does not represent an existing directory
      */
-    void setLocation(Location location, Iterable path)
+    void setLocation(Location location, Iterable files)
         throws IOException;
 
     /**
-     * Returns the path associated with the given location.
+     * Associates the given search path with the given location.  Any
+     * previous value will be discarded.
+     *
+     * 
    The default implementation converts each path to a file and calls
+     * {@link #getJavaFileObjectsFromFiles getJavaObjectsFromFiles}.
+     * IllegalArgumentException will be thrown if any of the paths
+     * cannot be converted to a file.
    
+     *
+     * @param location a location
+     * @param paths a list of paths, if {@code null} use the default
+     * search path for this location
+     * @see #getLocation
+     * @throws IllegalArgumentException if {@code location} is an output
+     * location and {@code paths} does not contain exactly one element
+     * or if this file manager does not support any of the given paths
+     * @throws IOException if {@code location} is an output location and
+     * {@code paths} does not represent an existing directory
+     *
+     * @since 1.9
+     */
+    default void setLocationFromPaths(Location location, Iterable paths)
+        throws IOException {
+        setLocation(location, asFiles(paths));
+    }
+
+    /**
+     * Returns the search path associated with the given location.
      *
      * @param location a location
      * @return a list of files or {@code null} if this location has no
-     * associated path
+     * associated search path
+     * @throws IllegalStateException if any element of the search path
+     * cannot be converted to a {@linkplain File}.
+     *
      * @see #setLocation
+     * @see Path#toFile
      */
     Iterable getLocation(Location location);
 
+    /**
+     * Returns the search path associated with the given location.
+     *
+     * @param location a location
+     * @return a list of paths or {@code null} if this location has no
+     * associated search path
+     *
+     * @see #setLocationFromPaths
+     * @since 1.9
+     */
+    default Iterable getLocationAsPaths(Location location) {
+        return asPaths(getLocation(location));
+    }
+
+    /**
+     * Returns the path, if any, underlying this file object (optional operation).
+     * File objects derived from a {@link java.nio.file.FileSystem FileSystem},
+     * including the default file system, typically have a corresponding underlying
+     * {@link java.nio.file.Path Path} object. In such cases, this method may be
+     * used to access that object.
+     *
+     * 
    The default implementation throws {@link UnsupportedOperationException}
+     * for all files.
    
+     *
+     * @param file a file object
+     * @return a path representing the same underlying file system artifact
+     * @throws IllegalArgumentException if the file object does not have an underlying path
+     * @throws UnsupportedOperationException if the operation is not supported by this file manager
+     *
+     * @since 1.9
+     */
+    default Path asPath(FileObject file) {
+        throw new UnsupportedOperationException();
+    }
+
 }
diff --git a/langtools/src/java.compiler/share/classes/javax/tools/ToolProvider.java b/langtools/src/java.compiler/share/classes/javax/tools/ToolProvider.java
index 46ab0c4a415..85da537519f 100644
--- a/langtools/src/java.compiler/share/classes/javax/tools/ToolProvider.java
+++ b/langtools/src/java.compiler/share/classes/javax/tools/ToolProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,6 +92,10 @@ public class ToolProvider {
     /**
      * Returns the Java™ programming language compiler provided
      * with this platform.
+     * 
    The file manager returned by calling
+     * {@link JavaCompiler#getStandardFileManager getStandardFileManager}
+     * on this compiler supports paths provided by any
+     * {@linkplain java.nio.file.FileSystem filesystem}.
    
      * @return the compiler provided with this platform or
      * {@code null} if no compiler is provided
      */
@@ -105,6 +109,10 @@ public class ToolProvider {
     /**
      * Returns the Java™ programming language documentation tool provided
      * with this platform.
+     * 
    The file manager returned by calling
+     * {@link DocumentationTool#getStandardFileManager getStandardFileManager}
+     * on this tool supports paths provided by any
+     * {@linkplain java.nio.file.FileSystem filesystem}.
    
      * @return the documentation tool provided with this platform or
      * {@code null} if no documentation tool is provided
      */
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/AnnoConstruct.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/AnnoConstruct.java
index 58762a724f2..899cf827655 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/AnnoConstruct.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/AnnoConstruct.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@ package com.sun.tools.javac.code;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Inherited;
+import java.lang.annotation.Repeatable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
@@ -183,65 +184,12 @@ public abstract class AnnoConstruct implements AnnotatedConstruct {
         return c == null ? null : AnnotationProxyMaker.generateAnnotation(c, annoType);
     }
 
-    // Needed to unpack the runtime view of containing annotations
-    private static final Class REPEATABLE_CLASS = initRepeatable();
-    private static final Method VALUE_ELEMENT_METHOD = initValueElementMethod();
-
-    private static Class initRepeatable() {
-        try {
-            // Repeatable will not be available when bootstrapping on
-            // JDK 7 so use a reflective lookup instead of a class
-            // literal for Repeatable.class.
-            return Class.forName("java.lang.annotation.Repeatable").asSubclass(Annotation.class);
-        } catch (ClassNotFoundException | SecurityException e) {
-            return null;
-        }
-    }
-
-    private static Method initValueElementMethod() {
-        if (REPEATABLE_CLASS == null)
-            return null;
-
-        Method m = null;
-        try {
-            m = REPEATABLE_CLASS.getMethod("value");
-            if (m != null)
-                m.setAccessible(true);
-            return m;
-        } catch (NoSuchMethodException e) {
-            return null;
-        }
-    }
-
-
     // Helper to getAnnotationsByType
     private static Class getContainer(Class annoType) {
-        // Since we can not refer to java.lang.annotation.Repeatable until we are
-        // bootstrapping with java 8 we need to get the Repeatable annotation using
-        // reflective invocations instead of just using its type and element method.
-        if (REPEATABLE_CLASS != null &&
-            VALUE_ELEMENT_METHOD != null) {
-            // Get the Repeatable instance on the annotations declaration
-            Annotation repeatable = (Annotation)annoType.getAnnotation(REPEATABLE_CLASS);
-            if (repeatable != null) {
-                try {
-                    // Get the value element, it should be a class
-                    // indicating the containing annotation type
-                    @SuppressWarnings("unchecked")
-                    Class containerType = (Class)VALUE_ELEMENT_METHOD.invoke(repeatable);
-                    if (containerType == null)
-                        return null;
-
-                    return containerType;
-                } catch (ClassCastException | IllegalAccessException | InvocationTargetException e) {
-                    return null;
-                }
-            }
-        }
-        return null;
+        Repeatable repeatable = annoType.getAnnotation(Repeatable.class);
+        return (repeatable == null) ? null : repeatable.value();
     }
 
-
     // Helper to getAnnotationsByType
     private static Attribute[] unpackAttributes(Attribute.Compound container) {
         // We now have an instance of the container,
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 7ea795423d0..815371baaa9 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -207,6 +207,7 @@ public class Attr extends JCTree.Visitor {
      *  are correct.
      *
      *  @param tree     The tree whose kind and type is checked
+     *  @param found    The computed type of the tree
      *  @param ownkind  The computed kind of the tree
      *  @param resultInfo  The expected result of the tree
      */
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
index 65e166ff4c1..e327e286c67 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
@@ -39,7 +39,6 @@ import com.sun.tools.javac.comp.DeferredAttr.DeferredType;
 import com.sun.tools.javac.comp.Infer.InferenceContext;
 import com.sun.tools.javac.comp.Infer.FreeTypeListener;
 import com.sun.tools.javac.comp.Resolve.MethodResolutionContext.Candidate;
-import com.sun.tools.javac.comp.Resolve.MethodResolutionDiagHelper.DiagnosticRewriter;
 import com.sun.tools.javac.comp.Resolve.MethodResolutionDiagHelper.Template;
 import com.sun.tools.javac.jvm.*;
 import com.sun.tools.javac.main.Option;
@@ -55,11 +54,12 @@ import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType;
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.function.BiPredicate;
+import java.util.stream.Stream;
 
 import javax.lang.model.element.ElementVisitor;
 
@@ -1008,7 +1008,7 @@ public class Resolve {
                 DeferredType dt = (DeferredType)found;
                 return dt.check(this);
             } else {
-                Type uResult = U(found.baseType());
+                Type uResult = U(found);
                 Type capturedType = pos == null || pos.getTree() == null ?
                         types.capture(uResult) :
                         checkContext.inferenceContext()
@@ -2546,17 +2546,7 @@ public class Resolve {
                                 final JCDiagnostic details = sym.kind == WRONG_MTH ?
                                                 ((InapplicableSymbolError)sym.baseSymbol()).errCandidate().snd :
                                                 null;
-                                sym = new InapplicableSymbolError(sym.kind, "diamondError", currentResolutionContext) {
-                                    @Override
-                                    JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos,
-                                            Symbol location, Type site, Name name, List argtypes, List typeargtypes) {
-                                        String key = details == null ?
-                                            "cant.apply.diamond" :
-                                            "cant.apply.diamond.1";
-                                        return diags.create(dkind, log.currentSource(), pos, key,
-                                                diags.fragment("diamond", site.tsym), details);
-                                    }
-                                };
+                                sym = new DiamondError(sym, currentResolutionContext);
                                 sym = accessMethod(sym, pos, site, names.init, true, argtypes, typeargtypes);
                                 env.info.pendingResolutionPhase = currentResolutionContext.step;
                             }
@@ -3724,15 +3714,10 @@ public class Resolve {
             else {
                 Pair c = errCandidate();
                 if (compactMethodDiags) {
-                    for (Map.Entry _entry :
-                            MethodResolutionDiagHelper.rewriters.entrySet()) {
-                        if (_entry.getKey().matches(c.snd)) {
-                            JCDiagnostic simpleDiag =
-                                    _entry.getValue().rewriteDiagnostic(diags, pos,
-                                        log.currentSource(), dkind, c.snd);
-                            simpleDiag.setFlag(DiagnosticFlag.COMPRESSED);
-                            return simpleDiag;
-                        }
+                    JCDiagnostic simpleDiag =
+                        MethodResolutionDiagHelper.rewrite(diags, pos, log.currentSource(), dkind, c.snd);
+                    if (simpleDiag != null) {
+                        return simpleDiag;
                     }
                 }
                 Symbol ws = c.fst.asMemberOf(site, types);
@@ -3765,9 +3750,8 @@ public class Resolve {
     }
 
     /**
-     * ResolveError error class indicating that a set of symbols
-     * (either methods, constructors or operands) is not applicable
-     * given an actual arguments/type argument list.
+     * ResolveError error class indicating that a symbol (either methods, constructors or operand)
+     * is not applicable given an actual arguments/type argument list.
      */
     class InapplicableSymbolsError extends InapplicableSymbolError {
 
@@ -3863,6 +3847,44 @@ public class Resolve {
             }
     }
 
+    /**
+     * DiamondError error class indicating that a constructor symbol is not applicable
+     * given an actual arguments/type argument list using diamond inference.
+     */
+    class DiamondError extends InapplicableSymbolError {
+
+        Symbol sym;
+
+        public DiamondError(Symbol sym, MethodResolutionContext context) {
+            super(sym.kind, "diamondError", context);
+            this.sym = sym;
+        }
+
+        JCDiagnostic getDetails() {
+            return (sym.kind == WRONG_MTH) ?
+                    ((InapplicableSymbolError)sym.baseSymbol()).errCandidate().snd :
+                    null;
+        }
+
+        @Override
+        JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos,
+                Symbol location, Type site, Name name, List argtypes, List typeargtypes) {
+            JCDiagnostic details = getDetails();
+            if (details != null && compactMethodDiags) {
+                JCDiagnostic simpleDiag =
+                        MethodResolutionDiagHelper.rewrite(diags, pos, log.currentSource(), dkind, details);
+                if (simpleDiag != null) {
+                    return simpleDiag;
+                }
+            }
+            String key = details == null ?
+                "cant.apply.diamond" :
+                "cant.apply.diamond.1";
+            return diags.create(dkind, log.currentSource(), pos, key,
+                    diags.fragment("diamond", site.tsym), details);
+        }
+    }
+
     /**
      * An InvalidSymbolError error class indicating that a symbol is not
      * accessible from a given site
@@ -4146,6 +4168,28 @@ public class Resolve {
             }
         }
 
+        /**
+         * Common rewriter for all argument mismatch simplifications.
+         */
+        static class ArgMismatchRewriter implements DiagnosticRewriter {
+
+            /** the index of the subdiagnostic to be used as primary. */
+            int causeIndex;
+
+            public ArgMismatchRewriter(int causeIndex) {
+                this.causeIndex = causeIndex;
+            }
+
+            @Override
+            public JCDiagnostic rewriteDiagnostic(JCDiagnostic.Factory diags,
+                    DiagnosticPosition preferedPos, DiagnosticSource preferredSource,
+                    DiagnosticType preferredKind, JCDiagnostic d) {
+                JCDiagnostic cause = (JCDiagnostic)d.getArgs()[causeIndex];
+                return diags.create(preferredKind, preferredSource, d.getDiagnosticPosition(),
+                        "prob.found.req", cause);
+            }
+        }
+
         /** a dummy template that match any diagnostic argument */
         static final Template skip = new Template("") {
             @Override
@@ -4154,22 +4198,61 @@ public class Resolve {
             }
         };
 
+        /** template for matching inference-free arguments mismatch failures */
+        static final Template argMismatchTemplate = new Template(MethodCheckDiag.ARG_MISMATCH.regex(), skip);
+
+        /** template for matching inference related arguments mismatch failures */
+        static final Template inferArgMismatchTemplate = new Template(MethodCheckDiag.ARG_MISMATCH.regex(), skip, skip) {
+            @Override
+            boolean matches(Object o) {
+                if (!super.matches(o)) {
+                    return false;
+                }
+                JCDiagnostic d = (JCDiagnostic)o;
+                @SuppressWarnings("unchecked")
+                List tvars = (List)d.getArgs()[0];
+                return !containsAny(d, tvars);
+            }
+
+            BiPredicate> containsPredicate = (o, ts) -> {
+                if (o instanceof Type) {
+                    return ((Type)o).containsAny(ts);
+                } else if (o instanceof JCDiagnostic) {
+                    return containsAny((JCDiagnostic)o, ts);
+                } else {
+                    return false;
+                }
+            };
+
+            boolean containsAny(JCDiagnostic d, List ts) {
+                return Stream.of(d.getArgs())
+                        .anyMatch(o -> containsPredicate.test(o, ts));
+            }
+        };
+
         /** rewriter map used for method resolution simplification */
         static final Map rewriters = new LinkedHashMap<>();
 
         static {
-            String argMismatchRegex = MethodCheckDiag.ARG_MISMATCH.regex();
-            rewriters.put(new Template(argMismatchRegex, skip),
-                    new DiagnosticRewriter() {
-                @Override
-                public JCDiagnostic rewriteDiagnostic(JCDiagnostic.Factory diags,
-                        DiagnosticPosition preferedPos, DiagnosticSource preferredSource,
-                        DiagnosticType preferredKind, JCDiagnostic d) {
-                    JCDiagnostic cause = (JCDiagnostic)d.getArgs()[0];
-                    return diags.create(preferredKind, preferredSource, d.getDiagnosticPosition(),
-                            "prob.found.req", cause);
+            rewriters.put(argMismatchTemplate, new ArgMismatchRewriter(0));
+            rewriters.put(inferArgMismatchTemplate, new ArgMismatchRewriter(1));
+        }
+
+        /**
+         * Main entry point for diagnostic rewriting - given a diagnostic, see if any templates matches it,
+         * and rewrite it accordingly.
+         */
+        static JCDiagnostic rewrite(JCDiagnostic.Factory diags, DiagnosticPosition pos, DiagnosticSource source,
+                                    DiagnosticType dkind, JCDiagnostic d) {
+            for (Map.Entry _entry : rewriters.entrySet()) {
+                if (_entry.getKey().matches(d)) {
+                    JCDiagnostic simpleDiag =
+                            _entry.getValue().rewriteDiagnostic(diags, pos, source, dkind, d);
+                    simpleDiag.setFlag(DiagnosticFlag.COMPRESSED);
+                    return simpleDiag;
                 }
-            });
+            }
+            return null;
         }
     }
 
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
index 09aaed7ca24..23b712ef759 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
@@ -739,7 +739,9 @@ public class TransTypes extends TreeTranslator {
     }
 
     public void visitUnary(JCUnary tree) {
-        tree.arg = translate(tree.arg, tree.operator.type.getParameterTypes().head);
+        tree.arg = translate(tree.arg, (tree.getTag() == Tag.NULLCHK)
+            ? tree.type
+            : tree.operator.type.getParameterTypes().head);
         result = tree;
     }
 
@@ -753,7 +755,15 @@ public class TransTypes extends TreeTranslator {
         tree.clazz = translate(tree.clazz, null);
         Type originalTarget = tree.type;
         tree.type = erasure(tree.type);
-        tree.expr = translate(tree.expr, erasure(tree.expr.type));
+        JCExpression newExpression = translate(tree.expr, erasure(tree.expr.type));
+        if (newExpression != tree.expr) {
+            JCTypeCast typeCast = newExpression.hasTag(Tag.TYPECAST)
+                ? (JCTypeCast) newExpression
+                : null;
+            tree.expr = typeCast != null && types.isSameType(typeCast.type, originalTarget, true)
+                ? typeCast.expr
+                : newExpression;
+        }
         if (originalTarget.isCompound()) {
             Type.IntersectionClassType ict = (Type.IntersectionClassType)originalTarget;
             for (Type c : ict.getExplicitComponents()) {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
index 21dce052626..a028dc112f8 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,7 +101,6 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil
     private final Set sourceOrClass =
         EnumSet.of(JavaFileObject.Kind.SOURCE, JavaFileObject.Kind.CLASS);
 
-    protected boolean mmappedIO;
     protected boolean symbolFileEnabled;
 
     protected enum SortFiles implements Comparator {
@@ -157,7 +156,6 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil
         if (contextUseOptimizedZip)
             zipFileIndexCache = ZipFileIndexCache.getSharedInstance();
 
-        mmappedIO = options.isSet("mmappedIO");
         symbolFileEnabled = !options.isSet("ignore.symbol.file");
 
         String sf = options.get("sortFiles");
@@ -177,10 +175,12 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil
         return symbolFileEnabled;
     }
 
+    // used by tests
     public JavaFileObject getFileForInput(String name) {
         return getRegularFile(Paths.get(name));
     }
 
+    // used by tests
     public JavaFileObject getRegularFile(Path file) {
         return new RegularFileObject(this, file);
     }
@@ -195,10 +195,10 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil
 
     @Override @DefinedBy(Api.COMPILER)
     public Iterable getJavaFileObjectsFromStrings(Iterable names) {
-        ListBuffer files = new ListBuffer<>();
+        ListBuffer paths = new ListBuffer<>();
         for (String name : names)
-            files.append(new File(nullCheck(name)));
-        return getJavaFileObjectsFromFiles(files.toList());
+            paths.append(Paths.get(nullCheck(name)));
+        return getJavaFileObjectsFromPaths(paths.toList());
     }
 
     @Override @DefinedBy(Api.COMPILER)
@@ -872,11 +872,30 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil
         return result;
     }
 
+    @Override @DefinedBy(Api.COMPILER)
+    public Iterable getJavaFileObjectsFromPaths(
+        Iterable paths)
+    {
+        ArrayList result;
+        if (paths instanceof Collection)
+            result = new ArrayList<>(((Collection)paths).size());
+        else
+            result = new ArrayList<>();
+        for (Path p: paths)
+            result.add(new RegularFileObject(this, nullCheck(p)));
+        return result;
+    }
+
     @Override @DefinedBy(Api.COMPILER)
     public Iterable getJavaFileObjects(File... files) {
         return getJavaFileObjectsFromFiles(Arrays.asList(nullCheck(files)));
     }
 
+    @Override @DefinedBy(Api.COMPILER)
+    public Iterable getJavaFileObjects(Path... paths) {
+        return getJavaFileObjectsFromPaths(Arrays.asList(nullCheck(paths)));
+    }
+
     @Override @DefinedBy(Api.COMPILER)
     public void setLocation(Location location,
                             Iterable searchpath)
@@ -886,13 +905,23 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil
         locations.setLocation(location, asPaths(searchpath));
     }
 
+    @Override @DefinedBy(Api.COMPILER)
+    public void setLocationFromPaths(Location location,
+                            Iterable searchpath)
+        throws IOException
+    {
+        nullCheck(location);
+        locations.setLocation(location, nullCheck(searchpath));
+    }
+
     @Override @DefinedBy(Api.COMPILER)
     public Iterable getLocation(Location location) {
         nullCheck(location);
         return asFiles(locations.getLocation(location));
     }
 
-    private Iterable getLocationAsPaths(Location location) {
+    @Override @DefinedBy(Api.COMPILER)
+    public Iterable getLocationAsPaths(Location location) {
         nullCheck(location);
         return locations.getLocation(location);
     }
@@ -905,6 +934,14 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil
         return locations.getOutputLocation(SOURCE_OUTPUT);
     }
 
+    @Override @DefinedBy(Api.COMPILER)
+    public Path asPath(FileObject file) {
+        if (file instanceof RegularFileObject) {
+            return ((RegularFileObject) file).file;
+        } else
+            throw new IllegalArgumentException(file.getName());
+    }
+
     /**
      * Enforces the specification of a "relative" name as used in
      * {@linkplain #getFileForInput(Location,String,String)
@@ -1010,12 +1047,12 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil
 
             @Override
             public File next() {
-                return iter.next().toFile();
+                try {
+                    return iter.next().toFile();
+                } catch (UnsupportedOperationException e) {
+                    throw new IllegalStateException(e);
+                }
             }
         };
     }
-
-    private static File asFile(Path path) {
-        return path == null ? null : path.toFile();
-    }
 }
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java
index ba308dfaea2..f8011f3c226 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -428,7 +428,7 @@ public class Locations {
 
     /**
      * General purpose implementation for search path locations, such as -sourcepath/SOURCE_PATH and
-     * -processorPath/ANNOTATION_PROCESS_PATH. All options are treated as equivalent (i.e. aliases.)
+     * -processorPath/ANNOTATION_PROCESSOR_PATH. All options are treated as equivalent (i.e. aliases.)
      * The value is an ordered set of files and/or directories.
      */
     private class SimpleLocationHandler extends LocationHandler {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
index 10cd4bdb4c5..307119aa9bd 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1740,15 +1740,17 @@ public class ClassReader {
             // The method wasn't found: emit a warning and recover
             JavaFileObject prevSource = log.useSource(requestingOwner.classfile);
             try {
-                if (failure == null) {
-                    log.warning("annotation.method.not.found",
-                                container,
-                                name);
-                } else {
-                    log.warning("annotation.method.not.found.reason",
-                                container,
-                                name,
-                                failure.getDetailValue());//diagnostic, if present
+                if (lintClassfile) {
+                    if (failure == null) {
+                        log.warning("annotation.method.not.found",
+                                    container,
+                                    name);
+                    } else {
+                        log.warning("annotation.method.not.found.reason",
+                                    container,
+                                    name,
+                                    failure.getDetailValue());//diagnostic, if present
+                    }
                 }
             } finally {
                 log.useSource(prevSource);
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
index 7fccb889041..3721b329571 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1159,7 +1159,7 @@ public class ClassWriter extends ClassFile {
                     Assert.check(r.start_pc >= 0
                             && r.start_pc <= code.cp);
                     databuf.appendChar(r.start_pc);
-                    Assert.check(r.length >= 0
+                    Assert.check(r.length > 0
                             && (r.start_pc + r.length) <= code.cp);
                     databuf.appendChar(r.length);
                     VarSymbol sym = var.sym;
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
index 2825d2991a6..329deb81353 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -182,8 +182,6 @@ public class Code {
 
     final MethodSymbol meth;
 
-    final LVTRanges lvtRanges;
-
     /** Construct a code object, given the settings of the fatcode,
      *  debugging info switches and the CharacterRangeTable.
      */
@@ -196,8 +194,7 @@ public class Code {
                 CRTable crt,
                 Symtab syms,
                 Types types,
-                Pool pool,
-                LVTRanges lvtRanges) {
+                Pool pool) {
         this.meth = meth;
         this.fatcode = fatcode;
         this.lineMap = lineMap;
@@ -219,7 +216,6 @@ public class Code {
         state = new State();
         lvar = new LocalVar[20];
         this.pool = pool;
-        this.lvtRanges = lvtRanges;
     }
 
 
@@ -1193,7 +1189,9 @@ public class Code {
     public int entryPoint(State state) {
         int pc = curCP();
         alive = true;
-        this.state = state.dup();
+        State newState = state.dup();
+        setDefined(newState.defined);
+        this.state = newState;
         Assert.check(state.stacksize <= max_stack);
         if (debugCode) System.err.println("entry point " + state);
         pendingStackMap = needStackMap;
@@ -1206,7 +1204,9 @@ public class Code {
     public int entryPoint(State state, Type pushed) {
         int pc = curCP();
         alive = true;
-        this.state = state.dup();
+        State newState = state.dup();
+        setDefined(newState.defined);
+        this.state = newState;
         Assert.check(state.stacksize <= max_stack);
         this.state.push(pushed);
         if (debugCode) System.err.println("entry point " + state);
@@ -2008,27 +2008,6 @@ public class Code {
         state.defined.excl(adr);
     }
 
-
-    public void closeAliveRanges(JCTree tree) {
-        closeAliveRanges(tree, cp);
-    }
-
-    public void closeAliveRanges(JCTree tree, int closingCP) {
-        List locals = lvtRanges.getVars(meth, tree);
-        for (LocalVar localVar: lvar) {
-            for (VarSymbol aliveLocal : locals) {
-                if (localVar != null) {
-                    if (localVar.sym == aliveLocal && localVar.lastRange() != null) {
-                        char length = (char)(closingCP - localVar.lastRange().start_pc);
-                        if (length < Character.MAX_VALUE) {
-                            localVar.closeRange(length);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     void adjustAliveRanges(int oldCP, int delta) {
         for (LocalVar localVar: lvar) {
             if (localVar != null) {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
index 5d4cb3f5e20..df229409a1f 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -94,10 +94,6 @@ public class Gen extends JCTree.Visitor {
      */
     private Pool pool;
 
-    /** LVTRanges info.
-     */
-    private LVTRanges lvtRanges;
-
     protected Gen(Context context) {
         context.put(genKey, this);
 
@@ -125,9 +121,6 @@ public class Gen extends JCTree.Visitor {
             options.isUnset(G_CUSTOM)
             ? options.isSet(G)
             : options.isSet(G_CUSTOM, "vars");
-        if (varDebugInfo) {
-            lvtRanges = LVTRanges.instance(context);
-        }
         genCrt = options.isSet(XJCOV);
         debugCode = options.isSet("debugcode");
         allowInvokedynamic = target.hasInvokedynamic() || options.isSet("invokedynamic");
@@ -982,8 +975,7 @@ public class Gen extends JCTree.Visitor {
                                                : null,
                                         syms,
                                         types,
-                                        pool,
-                                        varDebugInfo ? lvtRanges : null);
+                                        pool);
             items = new Items(pool, code, syms, types);
             if (code.debugCode) {
                 System.err.println(meth + " for body " + tree);
@@ -1086,30 +1078,14 @@ public class Gen extends JCTree.Visitor {
                 Chain loopDone = c.jumpFalse();
                 code.resolve(c.trueJumps);
                 genStat(body, loopEnv, CRT_STATEMENT | CRT_FLOW_TARGET);
-                if (varDebugInfo) {
-                    checkLoopLocalVarRangeEnding(loop, body,
-                            LoopLocalVarRangeEndingPoint.BEFORE_STEPS);
-                }
                 code.resolve(loopEnv.info.cont);
                 genStats(step, loopEnv);
-                if (varDebugInfo) {
-                    checkLoopLocalVarRangeEnding(loop, body,
-                            LoopLocalVarRangeEndingPoint.AFTER_STEPS);
-                }
                 code.resolve(code.branch(goto_), startpc);
                 code.resolve(loopDone);
             } else {
                 genStat(body, loopEnv, CRT_STATEMENT | CRT_FLOW_TARGET);
-                if (varDebugInfo) {
-                    checkLoopLocalVarRangeEnding(loop, body,
-                            LoopLocalVarRangeEndingPoint.BEFORE_STEPS);
-                }
                 code.resolve(loopEnv.info.cont);
                 genStats(step, loopEnv);
-                if (varDebugInfo) {
-                    checkLoopLocalVarRangeEnding(loop, body,
-                            LoopLocalVarRangeEndingPoint.AFTER_STEPS);
-                }
                 CondItem c;
                 if (cond != null) {
                     code.statBegin(cond.pos);
@@ -1120,47 +1096,10 @@ public class Gen extends JCTree.Visitor {
                 code.resolve(c.jumpTrue(), startpc);
                 code.resolve(c.falseJumps);
             }
-            code.resolve(loopEnv.info.exit);
-            if (loopEnv.info.exit != null) {
-                loopEnv.info.exit.state.defined.excludeFrom(code.nextreg);
-            }
-        }
-
-        private enum LoopLocalVarRangeEndingPoint {
-            BEFORE_STEPS,
-            AFTER_STEPS,
-        }
-
-        /**
-         *  Checks whether we have reached an alive range ending point for local
-         *  variables after a loop.
-         *
-         *  Local variables alive range ending point for loops varies depending
-         *  on the loop type. The range can be closed before or after the code
-         *  for the steps sentences has been generated.
-         *
-         *  - While loops has no steps so in that case the range is closed just
-         *  after the body of the loop.
-         *
-         *  - For-like loops may have steps so as long as the steps sentences
-         *  can possibly contain non-synthetic local variables, the alive range
-         *  for local variables must be closed after the steps in this case.
-        */
-        private void checkLoopLocalVarRangeEnding(JCTree loop, JCTree body,
-                LoopLocalVarRangeEndingPoint endingPoint) {
-            if (varDebugInfo && lvtRanges.containsKey(code.meth, body)) {
-                switch (endingPoint) {
-                    case BEFORE_STEPS:
-                        if (!loop.hasTag(FORLOOP)) {
-                            code.closeAliveRanges(body);
-                        }
-                        break;
-                    case AFTER_STEPS:
-                        if (loop.hasTag(FORLOOP)) {
-                            code.closeAliveRanges(body);
-                        }
-                        break;
-                }
+            Chain exit = loopEnv.info.exit;
+            if (exit != null) {
+                code.resolve(exit);
+                exit.state.defined.excludeFrom(code.nextreg);
             }
         }
 
@@ -1171,7 +1110,11 @@ public class Gen extends JCTree.Visitor {
     public void visitLabelled(JCLabeledStatement tree) {
         Env localEnv = env.dup(tree, new GenContext());
         genStat(tree.body, localEnv, CRT_STATEMENT);
-        code.resolve(localEnv.info.exit);
+        Chain exit = localEnv.info.exit;
+        if (exit != null) {
+            code.resolve(exit);
+            exit.state.defined.excludeFrom(code.nextreg);
+        }
     }
 
     public void visitSwitch(JCSwitch tree) {
@@ -1277,13 +1220,14 @@ public class Gen extends JCTree.Visitor {
 
                 // Generate code for the statements in this case.
                 genStats(c.stats, switchEnv, CRT_FLOW_TARGET);
-                if (varDebugInfo && lvtRanges.containsKey(code.meth, c.stats.last())) {
-                    code.closeAliveRanges(c.stats.last());
-                }
             }
 
             // Resolve all breaks.
-            code.resolve(switchEnv.info.exit);
+            Chain exit = switchEnv.info.exit;
+            if  (exit != null) {
+                code.resolve(exit);
+                exit.state.defined.excludeFrom(code.nextreg);
+            }
 
             // If we have not set the default offset, we do so now.
             if (code.get4(tableBase) == -1) {
@@ -1436,9 +1380,6 @@ public class Gen extends JCTree.Visitor {
             genFinalizer(env);
             code.statBegin(TreeInfo.endPos(env.tree));
             Chain exitChain = code.branch(goto_);
-            if (varDebugInfo && lvtRanges.containsKey(code.meth, body)) {
-                code.closeAliveRanges(body);
-            }
             endFinalizerGap(env);
             if (startpc != endpc) for (List l = catchers; l.nonEmpty(); l = l.tail) {
                 // start off with exception on stack
@@ -1689,17 +1630,11 @@ public class Gen extends JCTree.Visitor {
             code.resolve(c.trueJumps);
             genStat(tree.thenpart, env, CRT_STATEMENT | CRT_FLOW_TARGET);
             thenExit = code.branch(goto_);
-            if (varDebugInfo && lvtRanges.containsKey(code.meth, tree.thenpart)) {
-                code.closeAliveRanges(tree.thenpart, code.cp);
-            }
         }
         if (elseChain != null) {
             code.resolve(elseChain);
             if (tree.elsepart != null) {
                 genStat(tree.elsepart, env,CRT_STATEMENT | CRT_FLOW_TARGET);
-                if (varDebugInfo && lvtRanges.containsKey(code.meth, tree.elsepart)) {
-                    code.closeAliveRanges(tree.elsepart);
-                }
             }
         }
         code.resolve(thenExit);
@@ -2381,16 +2316,6 @@ public class Gen extends JCTree.Visitor {
             localEnv.toplevel = env.toplevel;
             localEnv.enclClass = cdef;
 
-            /*  We must not analyze synthetic methods
-             */
-            if (varDebugInfo && (cdef.sym.flags() & SYNTHETIC) == 0) {
-                try {
-                    new LVTAssignAnalyzer().analyzeTree(localEnv);
-                } catch (Throwable e) {
-                    throw e;
-                }
-            }
-
             for (List l = cdef.defs; l.nonEmpty(); l = l.tail) {
                 genDef(l.head, localEnv);
             }
@@ -2476,282 +2401,4 @@ public class Gen extends JCTree.Visitor {
         }
     }
 
-    class LVTAssignAnalyzer
-        extends Flow.AbstractAssignAnalyzer {
-
-        final LVTBits lvtInits;
-
-        /*  This class is anchored to a context dependent tree. The tree can
-         *  vary inside the same instruction for example in the switch instruction
-         *  the same FlowBits instance can be anchored to the whole tree, or
-         *  to a given case. The aim is to always anchor the bits to the tree
-         *  capable of closing a DA range.
-         */
-        class LVTBits extends Bits {
-
-            JCTree currentTree;
-            private int[] oldBits = null;
-            BitsState stateBeforeOp;
-
-            @Override
-            public void clear() {
-                generalOp(null, -1, BitsOpKind.CLEAR);
-            }
-
-            @Override
-            protected void internalReset() {
-                super.internalReset();
-                oldBits = null;
-            }
-
-            @Override
-            public Bits assign(Bits someBits) {
-                // bits can be null
-                oldBits = bits;
-                stateBeforeOp = currentState;
-                super.assign(someBits);
-                changed();
-                return this;
-            }
-
-            @Override
-            public void excludeFrom(int start) {
-                generalOp(null, start, BitsOpKind.EXCL_RANGE);
-            }
-
-            @Override
-            public void excl(int x) {
-                Assert.check(x >= 0);
-                generalOp(null, x, BitsOpKind.EXCL_BIT);
-            }
-
-            @Override
-            public Bits andSet(Bits xs) {
-               return generalOp(xs, -1, BitsOpKind.AND_SET);
-            }
-
-            @Override
-            public Bits orSet(Bits xs) {
-                return generalOp(xs, -1, BitsOpKind.OR_SET);
-            }
-
-            @Override
-            public Bits diffSet(Bits xs) {
-                return generalOp(xs, -1, BitsOpKind.DIFF_SET);
-            }
-
-            @Override
-            public Bits xorSet(Bits xs) {
-                return generalOp(xs, -1, BitsOpKind.XOR_SET);
-            }
-
-            private Bits generalOp(Bits xs, int i, BitsOpKind opKind) {
-                Assert.check(currentState != BitsState.UNKNOWN);
-                oldBits = dupBits();
-                stateBeforeOp = currentState;
-                switch (opKind) {
-                    case AND_SET:
-                        super.andSet(xs);
-                        break;
-                    case OR_SET:
-                        super.orSet(xs);
-                        break;
-                    case XOR_SET:
-                        super.xorSet(xs);
-                        break;
-                    case DIFF_SET:
-                        super.diffSet(xs);
-                        break;
-                    case CLEAR:
-                        super.clear();
-                        break;
-                    case EXCL_BIT:
-                        super.excl(i);
-                        break;
-                    case EXCL_RANGE:
-                        super.excludeFrom(i);
-                        break;
-                }
-                changed();
-                return this;
-            }
-
-            /*  The tree we need to anchor the bits instance to.
-             */
-            LVTBits at(JCTree tree) {
-                this.currentTree = tree;
-                return this;
-            }
-
-            /*  If the instance should be changed but the tree is not a closing
-             *  tree then a reset is needed or the former tree can mistakingly be
-             *  used.
-             */
-            LVTBits resetTree() {
-                this.currentTree = null;
-                return this;
-            }
-
-            /** This method will be called after any operation that causes a change to
-             *  the bits. Subclasses can thus override it in order to extract information
-             *  from the changes produced to the bits by the given operation.
-             */
-            public void changed() {
-                if (currentTree != null &&
-                        stateBeforeOp != BitsState.UNKNOWN &&
-                        trackTree(currentTree)) {
-                    List locals = lvtRanges
-                            .getVars(currentMethod, currentTree);
-                    locals = locals != null ?
-                            locals : List.nil();
-                    for (JCVariableDecl vardecl : vardecls) {
-                        //once the first is null, the rest will be so.
-                        if (vardecl == null) {
-                            break;
-                        }
-                        if (trackVar(vardecl.sym) && bitChanged(vardecl.sym.adr)) {
-                            locals = locals.prepend(vardecl.sym);
-                        }
-                    }
-                    if (!locals.isEmpty()) {
-                        lvtRanges.setEntry(currentMethod,
-                                currentTree, locals);
-                    }
-                }
-            }
-
-            boolean bitChanged(int x) {
-                boolean isMemberOfBits = isMember(x);
-                int[] tmp = bits;
-                bits = oldBits;
-                boolean isMemberOfOldBits = isMember(x);
-                bits = tmp;
-                return (!isMemberOfBits && isMemberOfOldBits);
-            }
-
-            boolean trackVar(VarSymbol var) {
-                return (var.owner.kind == MTH &&
-                        (var.flags() & PARAMETER) == 0 &&
-                        trackable(var));
-            }
-
-            boolean trackTree(JCTree tree) {
-                switch (tree.getTag()) {
-                    // of course a method closes the alive range of a local variable.
-                    case METHODDEF:
-                    // for while loops we want only the body
-                    case WHILELOOP:
-                        return false;
-                }
-                return true;
-            }
-
-        }
-
-        public class LVTAssignPendingExit extends
-                                    Flow.AbstractAssignAnalyzer.AbstractAssignPendingExit {
-
-            LVTAssignPendingExit(JCTree tree, final Bits inits, final Bits uninits) {
-                super(tree, inits, uninits);
-            }
-
-            @Override
-            public void resolveJump(JCTree tree) {
-                lvtInits.at(tree);
-                super.resolveJump(tree);
-            }
-        }
-
-        private LVTAssignAnalyzer() {
-            flow.super();
-            lvtInits = new LVTBits();
-            inits = lvtInits;
-        }
-
-        @Override
-        protected void markDead(JCTree tree) {
-            lvtInits.at(tree).inclRange(returnadr, nextadr);
-            super.markDead(tree);
-        }
-
-        @Override
-        protected void merge(JCTree tree) {
-            lvtInits.at(tree);
-            super.merge(tree);
-        }
-
-        boolean isSyntheticOrMandated(Symbol sym) {
-            return (sym.flags() & (SYNTHETIC | MANDATED)) != 0;
-        }
-
-        @Override
-        protected boolean trackable(VarSymbol sym) {
-            if (isSyntheticOrMandated(sym)) {
-                //fast check to avoid tracking synthetic or mandated variables
-                return false;
-            }
-            return super.trackable(sym);
-        }
-
-        @Override
-        protected void initParam(JCVariableDecl def) {
-            if (!isSyntheticOrMandated(def.sym)) {
-                super.initParam(def);
-            }
-        }
-
-        @Override
-        protected void assignToInits(JCTree tree, Bits bits) {
-            lvtInits.at(tree);
-            lvtInits.assign(bits);
-        }
-
-        @Override
-        protected void andSetInits(JCTree tree, Bits bits) {
-            lvtInits.at(tree);
-            lvtInits.andSet(bits);
-        }
-
-        @Override
-        protected void orSetInits(JCTree tree, Bits bits) {
-            lvtInits.at(tree);
-            lvtInits.orSet(bits);
-        }
-
-        @Override
-        protected void exclVarFromInits(JCTree tree, int adr) {
-            lvtInits.at(tree);
-            lvtInits.excl(adr);
-        }
-
-        @Override
-        protected LVTAssignPendingExit createNewPendingExit(JCTree tree, Bits inits, Bits uninits) {
-            return new LVTAssignPendingExit(tree, inits, uninits);
-        }
-
-        MethodSymbol currentMethod;
-
-        @Override
-        public void visitMethodDef(JCMethodDecl tree) {
-            if ((tree.sym.flags() & (SYNTHETIC | GENERATEDCONSTR)) != 0
-                    && (tree.sym.flags() & LAMBDA_METHOD) == 0) {
-                return;
-            }
-            if (tree.name.equals(names.clinit)) {
-                return;
-            }
-            boolean enumClass = (tree.sym.owner.flags() & ENUM) != 0;
-            if (enumClass &&
-                    (tree.name.equals(names.valueOf) ||
-                    tree.name.equals(names.values) ||
-                    tree.name.equals(names.init))) {
-                return;
-            }
-            currentMethod = tree.sym;
-
-            super.visitMethodDef(tree);
-        }
-
-    }
-
 }
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/LVTRanges.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/LVTRanges.java
deleted file mode 100644
index 71139ee78b6..00000000000
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/LVTRanges.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.javac.jvm;
-
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.WeakHashMap;
-
-import com.sun.tools.javac.code.Symbol.MethodSymbol;
-import com.sun.tools.javac.code.Symbol.VarSymbol;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.List;
-
-/** This class contains a one to many relation between a tree and a set of variables.
- *  The relation implies that the given tree closes the DA (definite assignment)
- *  range for the set of variables.
- *
- *  
    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.
- */
-public class LVTRanges {
-    /** The context key for the LVT ranges. */
-    protected static final Context.Key lvtRangesKey = new Context.Key<>();
-
-    /** Get the LVTRanges instance for this context. */
-    public static LVTRanges instance(Context context) {
-        LVTRanges instance = context.get(lvtRangesKey);
-        if (instance == null) {
-            instance = new LVTRanges(context);
-        }
-        return instance;
-    }
-
-    private static final long serialVersionUID = 1812267524140424433L;
-
-    protected Context context;
-
-    protected Map>>
-            aliveRangeClosingTrees = new WeakHashMap<>();
-
-    public LVTRanges(Context context) {
-        this.context = context;
-        context.put(lvtRangesKey, this);
-    }
-
-    public List getVars(MethodSymbol method, JCTree tree) {
-        Map> varMap = aliveRangeClosingTrees.get(method);
-        return (varMap != null) ? varMap.get(tree) : null;
-    }
-
-    public boolean containsKey(MethodSymbol method, JCTree tree) {
-        Map> varMap = aliveRangeClosingTrees.get(method);
-        if (varMap == null) {
-            return false;
-        }
-        return varMap.containsKey(tree);
-    }
-
-    public void setEntry(MethodSymbol method, JCTree tree, List vars) {
-        Map> varMap = aliveRangeClosingTrees.get(method);
-        if (varMap != null) {
-            varMap.put(tree, vars);
-        } else {
-            varMap = new WeakHashMap<>();
-            varMap.put(tree, vars);
-            aliveRangeClosingTrees.put(method, varMap);
-        }
-    }
-
-    public List removeEntry(MethodSymbol method, JCTree tree) {
-        Map> varMap = aliveRangeClosingTrees.get(method);
-        if (varMap != null) {
-            List result = varMap.remove(tree);
-            if (varMap.isEmpty()) {
-                aliveRangeClosingTrees.remove(method);
-            }
-            return result;
-        }
-        return null;
-    }
-
-    /* This method should be used for debugging LVT related issues.
-     */
-    @Override
-    public String toString() {
-        String result = "";
-        for (Entry>> mainEntry: aliveRangeClosingTrees.entrySet()) {
-            result += "Method: \n" + mainEntry.getKey().flatName() + "\n";
-            int i = 1;
-            for (Entry> treeEntry: mainEntry.getValue().entrySet()) {
-                result += "    Tree " + i + ": \n" + treeEntry.getKey().toString() + "\n";
-                result += "        Variables closed:\n";
-                for (VarSymbol var: treeEntry.getValue()) {
-                    result += "            " + var.toString();
-                }
-                result += "\n";
-                i++;
-            }
-        }
-        return result;
-    }
-
-}
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 89eeadaeaad..c736eac1106 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -1,5 +1,6 @@
+
 #
-# Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,30 +27,50 @@
 # Messages in this file which use "placeholders" for values (e.g. {0}, {1})
 # are preceded by a stylized comment describing the type of the corresponding
 # values.
-# The types currently in use are
+# The simple types currently in use are:
 #
 # boolean           true or false
-# file name         the name of an input file; e.g.   MyFile.java
-# message segment   a sub-message; see compiler.misc.*
+# diagnostic        a sub-message; see compiler.misc.*
+# fragment          similar to 'message segment', but with more specific type
 # modifier          a Java modifier; e.g. public, private, protected
+# file              a file URL
+# file object       a file URL - similar to 'file' but typically used for source/class files, hence more specific
 # name              a name, typically a Java identifier
 # number            an integer
 # option name       the name of a command line option
 # source version    a source version number, such as 1.5, 1.6, 1.7
 # string            a general string
 # symbol            the name of a declared type
-# symbol kind       a description of the kind of a declaration; see compiler.misc.kindname.*
+# symbol kind       the kind of a symbol (i.e. method, variable)
+# kind name         an informative description of the kind of a declaration; see compiler.misc.kindname.*
 # token             the name of a non-terminal in source code; see compiler.misc.token.*
 # type              a Java type; e.g. int, X, X
+# object            a Java object (unspecified)
 # unused            the value is not used in this message
 #
+# The following compound types are also used:
+#
 # list of X         a comma-separated list of items; e.g. list of type
-# X or Y            alternation; e.g. message segment or type
 # set of X          a comma-separated collection of items; e.g. set of modifier
 #
-# These may be composed: e.g.   list of type or message segment
+# These may be composed:
 #
-# These comments are verified by the jtreg test test/tools/javac/diags/MessageInfo,
+# list of type or message segment
+#
+# The following type aliases are supported:
+#
+# message segment --> diagnostic or fragment
+# file name --> file or file object
+#
+# Custom comments are supported in parenthesis i.e.
+#
+# number (classfile major version)
+#
+# These comments are used internally in order to generate an enum-like class declaration containing
+# a method/field for each of the diagnostic keys listed here. Those methods/fields can then be used
+# by javac code to build diagnostics in a type-safe fashion.
+#
+# In addition, these comments are verified by the jtreg test test/tools/javac/diags/MessageInfo,
 # using info derived from the collected set of examples in test/tools/javac/diags/examples.
 # MessageInfo can also be run as a standalone utility providing more facilities
 # for manipulating this file. For more details, see MessageInfo.java.
@@ -140,7 +161,7 @@ compiler.err.array.req.but.found=\
 compiler.err.attribute.value.must.be.constant=\
     element value must be a constant expression
 
-# 0: statement type
+# 0: string (statement type)
 compiler.err.bad.initializer=\
     bad initializer for {0}
 
@@ -360,7 +381,7 @@ compiler.err.invalid.repeatable.annotation.multiple.values=\
 compiler.err.invalid.repeatable.annotation.invalid.value=\
     {0} is not a valid @Repeatable: invalid value element
 
-# 0: symbol type, 1: unused, 2: type
+# 0: symbol or type, 1: unused, 2: type
 compiler.err.invalid.repeatable.annotation.value.return=\
     containing annotation type ({0}) must declare an element named ''value'' of type {2}
 
@@ -832,7 +853,7 @@ compiler.err.warnings.and.werror=\
 
 # Errors related to annotation processing
 
-# 0: symbol, 1: string, 2: stack-trace
+# 0: symbol, 1: string, 2: string (stack-trace)
 compiler.err.proc.cant.access=\
     cannot access {0}\n\
     {1}\n\
@@ -984,15 +1005,15 @@ compiler.err.type.var.more.than.once.in.result=\
 compiler.err.types.incompatible.diff.ret=\
     types {0} and {1} are incompatible; both define {2}, but with unrelated return types
 
-# 0: kind, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
+# 0: kind name, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
 compiler.err.types.incompatible.unrelated.defaults=\
     {0} {1} inherits unrelated defaults for {2}({3}) from types {4} and {5}
 
-# 0: kind, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
+# 0: kind name, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
 compiler.err.types.incompatible.abstract.default=\
     {0} {1} inherits abstract and default for {2}({3}) from types {4} and {5}
 
-# 0: name, 1: kind, 2: symbol
+# 0: name, 1: kind name, 2: symbol
 compiler.err.default.overrides.object.member=\
     default method {0} in {1} {2} overrides a member of java.lang.Object
 
@@ -1747,11 +1768,11 @@ compiler.err.cant.access=\
     cannot access {0}\n\
     {1}
 
-# 0: class name
+# 0: name
 compiler.misc.bad.class.file=\
     class file is invalid for class {0}
 
-# 0: file name, 1: expected CP entry type, 2: constant pool index
+# 0: file name, 1: string (expected constant pool entry type), 2: number (constant pool index)
 compiler.misc.bad.const.pool.entry=\
     bad constant pool entry in {0}\n\
     expected {1} at index {2}
@@ -1802,11 +1823,11 @@ compiler.misc.class.file.wrong.class=\
 compiler.misc.class.file.not.found=\
     class file for {0} not found
 
-# 0: classfile major version, 1: classfile minor version
+# 0: string (classfile major version), 1: string (classfile minor version)
 compiler.misc.invalid.default.interface=\
     default method found in version {0}.{1} classfile
 
-# 0: classfile major version, 1: classfile minor version
+# 0: string (classfile major version), 1: string (classfile minor version)
 compiler.misc.invalid.static.interface=\
     static method found in version {0}.{1} classfile
 
@@ -2422,7 +2443,7 @@ compiler.misc.not.applicable.method.found=\
 compiler.misc.partial.inst.sig=\
     partially instantiated to: {0}
 
-# 0: name, 1: symbol, 2: number, 3: MethodResolutionPhase, 4: list of type or message segment, 5: list of type or message segment
+# 0: name, 1: symbol, 2: number, 3: string (method resolution phase), 4: list of type or message segment, 5: list of type or message segment
 compiler.note.verbose.resolve.multi=\
     resolving method {0} in type {1} to candidate {2}\n\
     phase: {3}\n\
@@ -2430,7 +2451,7 @@ compiler.note.verbose.resolve.multi=\
     with type-args: {5}\n\
     candidates:
 
-# 0: name, 1: symbol, 2: unused, 3: MethodResolutionPhase, 4: list of type or message segment, 5: list of type or message segment
+# 0: name, 1: symbol, 2: unused, 3: string (method resolution phase), 4: list of type or message segment, 5: list of type or message segment
 compiler.note.verbose.resolve.multi.1=\
     erroneous resolution for method {0} in type {1}\n\
     phase: {3}\n\
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java
index cab1eaa4980..816959cd81e 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java
@@ -329,7 +329,7 @@ public abstract class DCTree implements DocTree {
 
         DCErroneous(String body, JCDiagnostic.Factory diags, DiagnosticSource diagSource, String code, Object... args) {
             this.body = body;
-            this.diag = diags.error(diagSource, this, code, args);
+            this.diag = diags.error(null, diagSource, this, code, args);
         }
 
         @Override @DefinedBy(Api.COMPILER_TREE)
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractLog.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractLog.java
index 8acbb877778..83ecc9d1737 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractLog.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractLog.java
@@ -31,6 +31,9 @@ import javax.tools.JavaFileObject;
 
 import com.sun.tools.javac.code.Lint.LintCategory;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag;
+import com.sun.tools.javac.util.JCDiagnostic.Error;
+import com.sun.tools.javac.util.JCDiagnostic.Note;
+import com.sun.tools.javac.util.JCDiagnostic.Warning;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
 import com.sun.tools.javac.util.JCDiagnostic.SimpleDiagnosticPosition;
 
@@ -93,7 +96,15 @@ public abstract class AbstractLog {
      *  @param args   Fields of the error message.
      */
     public void error(String key, Object ... args) {
-        report(diags.error(source, null, key, args));
+        error(diags.errorKey(key, args));
+    }
+
+    /** Report an error, unless another error was already reported at same
+     *  source position.
+     *  @param errorKey    The key for the localized error message.
+     */
+    public void error(Error errorKey) {
+        report(diags.error(null, source, null, errorKey));
     }
 
     /** Report an error, unless another error was already reported at same
@@ -102,8 +113,17 @@ public abstract class AbstractLog {
      *  @param key    The key for the localized error message.
      *  @param args   Fields of the error message.
      */
-    public void error(DiagnosticPosition pos, String key, Object ... args) {
-        report(diags.error(source, pos, key, args));
+    public void error(DiagnosticPosition pos, String key, Object... args) {
+        error(pos, diags.errorKey(key, args));
+    }
+
+    /** Report an error, unless another error was already reported at same
+     *  source position.
+     *  @param pos    The source position at which to report the error.
+     *  @param errorKey    The key for the localized error message.
+     */
+    public void error(DiagnosticPosition pos, Error errorKey) {
+        report(diags.error(null, source, pos, errorKey));
     }
 
     /** Report an error, unless another error was already reported at same
@@ -114,9 +134,17 @@ public abstract class AbstractLog {
      *  @param args   Fields of the error message.
      */
     public void error(DiagnosticFlag flag, DiagnosticPosition pos, String key, Object ... args) {
-        JCDiagnostic d = diags.error(source, pos, key, args);
-        d.setFlag(flag);
-        report(d);
+        error(flag, pos, diags.errorKey(key, args));
+    }
+
+    /** Report an error, unless another error was already reported at same
+     *  source position.
+     *  @param flag   A flag to set on the diagnostic
+     *  @param pos    The source position at which to report the error.
+     *  @param errorKey    The key for the localized error message.
+     */
+    public void error(DiagnosticFlag flag, DiagnosticPosition pos, Error errorKey) {
+        report(diags.error(flag, source, pos, errorKey));
     }
 
     /** Report an error, unless another error was already reported at same
@@ -126,7 +154,16 @@ public abstract class AbstractLog {
      *  @param args   Fields of the error message.
      */
     public void error(int pos, String key, Object ... args) {
-        report(diags.error(source, wrap(pos), key, args));
+        error(pos, diags.errorKey(key, args));
+    }
+
+    /** Report an error, unless another error was already reported at same
+     *  source position.
+     *  @param pos    The source position at which to report the error.
+     *  @param errorKey    The key for the localized error message.
+     */
+    public void error(int pos, Error errorKey) {
+        report(diags.error(null, source, wrap(pos), errorKey));
     }
 
     /** Report an error, unless another error was already reported at same
@@ -137,9 +174,17 @@ public abstract class AbstractLog {
      *  @param args   Fields of the error message.
      */
     public void error(DiagnosticFlag flag, int pos, String key, Object ... args) {
-        JCDiagnostic d = diags.error(source, wrap(pos), key, args);
-        d.setFlag(flag);
-        report(d);
+        error(flag, pos, diags.errorKey(key, args));
+    }
+
+    /** Report an error, unless another error was already reported at same
+     *  source position.
+     *  @param flag   A flag to set on the diagnostic
+     *  @param pos    The source position at which to report the error.
+     *  @param errorKey    The key for the localized error message.
+     */
+    public void error(DiagnosticFlag flag, int pos, Error errorKey) {
+        report(diags.error(flag, source, wrap(pos), errorKey));
     }
 
     /** Report a warning, unless suppressed by the  -nowarn option or the
@@ -148,7 +193,15 @@ public abstract class AbstractLog {
      *  @param args   Fields of the warning message.
      */
     public void warning(String key, Object ... args) {
-        report(diags.warning(source, null, key, args));
+        warning(diags.warningKey(key, args));
+    }
+
+    /** Report a warning, unless suppressed by the  -nowarn option or the
+     *  maximum number of warnings has been reached.
+     *  @param warningKey    The key for the localized warning message.
+     */
+    public void warning(Warning warningKey) {
+        report(diags.warning(null, source, null, warningKey));
     }
 
     /** Report a lint warning, unless suppressed by the  -nowarn option or the
@@ -158,7 +211,16 @@ public abstract class AbstractLog {
      *  @param args   Fields of the warning message.
      */
     public void warning(LintCategory lc, String key, Object ... args) {
-        report(diags.warning(lc, key, args));
+        warning(lc, diags.warningKey(key, args));
+    }
+
+    /** Report a lint warning, unless suppressed by the  -nowarn option or the
+     *  maximum number of warnings has been reached.
+     *  @param lc     The lint category for the diagnostic
+     *  @param warningKey    The key for the localized warning message.
+     */
+    public void warning(LintCategory lc, Warning warningKey) {
+        report(diags.warning(lc, null, null, warningKey));
     }
 
     /** Report a warning, unless suppressed by the  -nowarn option or the
@@ -168,7 +230,16 @@ public abstract class AbstractLog {
      *  @param args   Fields of the warning message.
      */
     public void warning(DiagnosticPosition pos, String key, Object ... args) {
-        report(diags.warning(source, pos, key, args));
+        warning(pos, diags.warningKey(key, args));
+    }
+
+    /** Report a warning, unless suppressed by the  -nowarn option or the
+     *  maximum number of warnings has been reached.
+     *  @param pos    The source position at which to report the warning.
+     *  @param warningKey    The key for the localized warning message.
+     */
+    public void warning(DiagnosticPosition pos, Warning warningKey) {
+        report(diags.warning(null, source, pos, warningKey));
     }
 
     /** Report a lint warning, unless suppressed by the  -nowarn option or the
@@ -179,7 +250,17 @@ public abstract class AbstractLog {
      *  @param args   Fields of the warning message.
      */
     public void warning(LintCategory lc, DiagnosticPosition pos, String key, Object ... args) {
-        report(diags.warning(lc, source, pos, key, args));
+        warning(lc, pos, diags.warningKey(key, args));
+    }
+
+    /** Report a lint warning, unless suppressed by the  -nowarn option or the
+     *  maximum number of warnings has been reached.
+     *  @param lc     The lint category for the diagnostic
+     *  @param pos    The source position at which to report the warning.
+     *  @param warningKey    The key for the localized warning message.
+     */
+    public void warning(LintCategory lc, DiagnosticPosition pos, Warning warningKey) {
+        report(diags.warning(lc, source, pos, warningKey));
     }
 
     /** Report a warning, unless suppressed by the  -nowarn option or the
@@ -189,7 +270,16 @@ public abstract class AbstractLog {
      *  @param args   Fields of the warning message.
      */
     public void warning(int pos, String key, Object ... args) {
-        report(diags.warning(source, wrap(pos), key, args));
+        warning(pos, diags.warningKey(key, args));
+    }
+
+    /** Report a warning, unless suppressed by the  -nowarn option or the
+     *  maximum number of warnings has been reached.
+     *  @param pos    The source position at which to report the warning.
+     *  @param warningKey    The key for the localized warning message.
+     */
+    public void warning(int pos, Warning warningKey) {
+        report(diags.warning(null, source, wrap(pos), warningKey));
     }
 
     /** Report a warning.
@@ -198,7 +288,15 @@ public abstract class AbstractLog {
      *  @param args   Fields of the warning message.
      */
     public void mandatoryWarning(DiagnosticPosition pos, String key, Object ... args) {
-        report(diags.mandatoryWarning(source, pos, key, args));
+        mandatoryWarning(pos, diags.warningKey(key, args));
+    }
+
+    /** Report a warning.
+     *  @param pos    The source position at which to report the warning.
+     *  @param warningKey    The key for the localized warning message.
+     */
+    public void mandatoryWarning(DiagnosticPosition pos, Warning warningKey) {
+        report(diags.mandatoryWarning(null, source, pos, warningKey));
     }
 
     /** Report a warning.
@@ -208,7 +306,16 @@ public abstract class AbstractLog {
      *  @param args   Fields of the warning message.
      */
     public void mandatoryWarning(LintCategory lc, DiagnosticPosition pos, String key, Object ... args) {
-        report(diags.mandatoryWarning(lc, source, pos, key, args));
+        mandatoryWarning(lc, pos, diags.warningKey(key, args));
+    }
+
+    /** Report a warning.
+     *  @param lc     The lint category for the diagnostic
+     *  @param pos    The source position at which to report the warning.
+     *  @param warningKey    The key for the localized warning message.
+     */
+    public void mandatoryWarning(LintCategory lc, DiagnosticPosition pos, Warning warningKey) {
+        report(diags.mandatoryWarning(lc, source, pos, warningKey));
     }
 
     /** Provide a non-fatal notification, unless suppressed by the -nowarn option.
@@ -216,7 +323,14 @@ public abstract class AbstractLog {
      *  @param args   Fields of the notint an error or warning message:
      */
     public void note(String key, Object ... args) {
-        report(diags.note(source, null, key, args));
+        note(diags.noteKey(key, args));
+    }
+
+    /** Provide a non-fatal notification, unless suppressed by the -nowarn option.
+     *  @param noteKey    The key for the localized notification message.
+     */
+    public void note(Note noteKey) {
+        report(diags.note(source, null, noteKey));
     }
 
     /** Provide a non-fatal notification, unless suppressed by the -nowarn option.
@@ -224,7 +338,14 @@ public abstract class AbstractLog {
      *  @param args   Fields of the notification message.
      */
     public void note(DiagnosticPosition pos, String key, Object ... args) {
-        report(diags.note(source, pos, key, args));
+        note(pos, diags.noteKey(key, args));
+    }
+
+    /** Provide a non-fatal notification, unless suppressed by the -nowarn option.
+     *  @param noteKey    The key for the localized notification message.
+     */
+    public void note(DiagnosticPosition pos, Note noteKey) {
+        report(diags.note(source, pos, noteKey));
     }
 
     /** Provide a non-fatal notification, unless suppressed by the -nowarn option.
@@ -232,7 +353,14 @@ public abstract class AbstractLog {
      *  @param args   Fields of the notification message.
      */
     public void note(int pos, String key, Object ... args) {
-        report(diags.note(source, wrap(pos), key, args));
+        note(pos, diags.noteKey(key, args));
+    }
+
+    /** Provide a non-fatal notification, unless suppressed by the -nowarn option.
+     *  @param noteKey    The key for the localized notification message.
+     */
+    public void note(int pos, Note noteKey) {
+        report(diags.note(source, wrap(pos), noteKey));
     }
 
     /** Provide a non-fatal notification, unless suppressed by the -nowarn option.
@@ -240,7 +368,14 @@ public abstract class AbstractLog {
      *  @param args   Fields of the notification message.
      */
     public void note(JavaFileObject file, String key, Object ... args) {
-        report(diags.note(getSource(file), null, key, args));
+        note(file, diags.noteKey(key, args));
+    }
+
+    /** Provide a non-fatal notification, unless suppressed by the -nowarn option.
+     *  @param noteKey    The key for the localized notification message.
+     */
+    public void note(JavaFileObject file, Note noteKey) {
+        report(diags.note(getSource(file), null, noteKey));
     }
 
     /** Provide a non-fatal notification, unless suppressed by the -nowarn option.
@@ -248,7 +383,14 @@ public abstract class AbstractLog {
      *  @param args   Fields of the notification message.
      */
     public void mandatoryNote(final JavaFileObject file, String key, Object ... args) {
-        report(diags.mandatoryNote(getSource(file), key, args));
+        mandatoryNote(file, diags.noteKey(key, args));
+    }
+
+    /** Provide a non-fatal notification, unless suppressed by the -nowarn option.
+     *  @param noteKey    The key for the localized notification message.
+     */
+    public void mandatoryNote(final JavaFileObject file, Note noteKey) {
+        report(diags.mandatoryNote(getSource(file), noteKey));
     }
 
     protected abstract void report(JCDiagnostic diagnostic);
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
index 8e3f3e2e6c0..2c8780f9b75 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
@@ -28,6 +28,7 @@ package com.sun.tools.javac.util;
 import java.util.EnumSet;
 import java.util.Locale;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import javax.tools.Diagnostic;
 import javax.tools.JavaFileObject;
@@ -92,28 +93,30 @@ public class JCDiagnostic implements Diagnostic {
         }
 
         /**
-         * Create an error diagnostic.
+         * Create an error diagnostic
          *  @param source The source of the compilation unit, if any, in which to report the error.
          *  @param pos    The source position at which to report the error.
          *  @param key    The key for the localized error message.
          *  @param args   Fields of the error message.
          */
         public JCDiagnostic error(
-                DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-            return create(ERROR, null, defaultErrorFlags, source, pos, key, args);
+                DiagnosticFlag flag, DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
+            return error(flag, source, pos, errorKey(key, args));
         }
 
         /**
-         * Create a warning diagnostic that will not be hidden by the -nowarn or -Xlint:none options.
-         *  @param source The source of the compilation unit, if any, in which to report the warning.
-         *  @param pos    The source position at which to report the warning.
-         *  @param key    The key for the localized warning message.
-         *  @param args   Fields of the warning message.
-         *  @see MandatoryWarningHandler
+         * Create an error diagnostic
+         *  @param source The source of the compilation unit, if any, in which to report the error.
+         *  @param pos    The source position at which to report the error.
+         *  @param errorKey    The key for the localized error message.
          */
-        public JCDiagnostic mandatoryWarning(
-                DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-            return create(WARNING, null, EnumSet.of(DiagnosticFlag.MANDATORY), source, pos, key, args);
+        public JCDiagnostic error(
+                DiagnosticFlag flag, DiagnosticSource source, DiagnosticPosition pos, Error errorKey) {
+            JCDiagnostic diag = create(null, defaultErrorFlags, source, pos, errorKey);
+            if (flag != null) {
+                diag.setFlag(flag);
+            }
+            return diag;
         }
 
         /**
@@ -128,31 +131,35 @@ public class JCDiagnostic implements Diagnostic {
         public JCDiagnostic mandatoryWarning(
                 LintCategory lc,
                 DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-            return create(WARNING, lc, EnumSet.of(DiagnosticFlag.MANDATORY), source, pos, key, args);
+            return mandatoryWarning(lc, source, pos, warningKey(key, args));
+        }
+
+        /**
+         * Create a warning diagnostic that will not be hidden by the -nowarn or -Xlint:none options.
+         *  @param lc     The lint category for the diagnostic
+         *  @param source The source of the compilation unit, if any, in which to report the warning.
+         *  @param pos    The source position at which to report the warning.
+         *  @param warningKey    The key for the localized warning message.
+         *  @see MandatoryWarningHandler
+         */
+        public JCDiagnostic mandatoryWarning(
+                LintCategory lc,
+                DiagnosticSource source, DiagnosticPosition pos, Warning warningKey) {
+            return create(lc, EnumSet.of(DiagnosticFlag.MANDATORY), source, pos, warningKey);
         }
 
         /**
          * Create a warning diagnostic.
          *  @param lc     The lint category for the diagnostic
+         *  @param source The source of the compilation unit, if any, in which to report the warning.
+         *  @param pos    The source position at which to report the warning.
          *  @param key    The key for the localized error message.
          *  @param args   Fields of the warning message.
          *  @see MandatoryWarningHandler
          */
         public JCDiagnostic warning(
-                 LintCategory lc, String key, Object... args) {
-            return create(WARNING, lc, EnumSet.noneOf(DiagnosticFlag.class), null, null, key, args);
-        }
-
-        /**
-         * Create a warning diagnostic.
-         *  @param source The source of the compilation unit, if any, in which to report the warning.
-         *  @param pos    The source position at which to report the warning.
-         *  @param key    The key for the localized warning message.
-         *  @param args   Fields of the warning message.
-         */
-        public JCDiagnostic warning(
-                DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-            return create(WARNING, null, EnumSet.noneOf(DiagnosticFlag.class), source, pos, key, args);
+                LintCategory lc, DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
+            return warning(lc, source, pos, warningKey(key, args));
         }
 
         /**
@@ -160,23 +167,32 @@ public class JCDiagnostic implements Diagnostic {
          *  @param lc     The lint category for the diagnostic
          *  @param source The source of the compilation unit, if any, in which to report the warning.
          *  @param pos    The source position at which to report the warning.
-         *  @param key    The key for the localized warning message.
-         *  @param args   Fields of the warning message.
+         *  @param warningKey    The key for the localized warning message.
          *  @see MandatoryWarningHandler
          */
         public JCDiagnostic warning(
-                 LintCategory lc, DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-            return create(WARNING, lc, EnumSet.noneOf(DiagnosticFlag.class), source, pos, key, args);
+                LintCategory lc, DiagnosticSource source, DiagnosticPosition pos, Warning warningKey) {
+            return create(lc, EnumSet.noneOf(DiagnosticFlag.class), source, pos, warningKey);
         }
 
         /**
          * Create a note diagnostic that will not be hidden by the -nowarn or -Xlint:none options.
-         *  @param key    The key for the localized message.
-         *  @param args   Fields of the message.
+         *  @param source The source of the compilation unit, if any, in which to report the warning.
+         *  @param key    The key for the localized warning message.
+         *  @param args   Fields of the warning message.
          *  @see MandatoryWarningHandler
          */
         public JCDiagnostic mandatoryNote(DiagnosticSource source, String key, Object... args) {
-            return create(NOTE, null, EnumSet.of(DiagnosticFlag.MANDATORY), source, null, key, args);
+            return mandatoryNote(source, noteKey(key, args));
+        }
+
+        /**
+         * Create a note diagnostic that will not be hidden by the -nowarn or -Xlint:none options.
+         *  @param noteKey    The key for the localized note message.
+         *  @see MandatoryWarningHandler
+         */
+        public JCDiagnostic mandatoryNote(DiagnosticSource source, Note noteKey) {
+            return create(null, EnumSet.of(DiagnosticFlag.MANDATORY), source, null, noteKey);
         }
 
         /**
@@ -184,20 +200,20 @@ public class JCDiagnostic implements Diagnostic {
          *  @param key    The key for the localized error message.
          *  @param args   Fields of the message.
          */
-        public JCDiagnostic note(String key, Object... args) {
-            return create(NOTE, null, EnumSet.noneOf(DiagnosticFlag.class), null, null, key, args);
+        public JCDiagnostic note(
+                DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
+            return note(source, pos, noteKey(key, args));
         }
 
         /**
          * Create a note diagnostic.
          *  @param source The source of the compilation unit, if any, in which to report the note.
          *  @param pos    The source position at which to report the note.
-         *  @param key    The key for the localized message.
-         *  @param args   Fields of the message.
+         *  @param noteKey    The key for the localized note message.
          */
         public JCDiagnostic note(
-                DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-            return create(NOTE, null, EnumSet.noneOf(DiagnosticFlag.class), source, pos, key, args);
+                DiagnosticSource source, DiagnosticPosition pos, Note noteKey) {
+            return create(null, EnumSet.noneOf(DiagnosticFlag.class), source, pos, noteKey);
         }
 
         /**
@@ -206,7 +222,15 @@ public class JCDiagnostic implements Diagnostic {
          *  @param args   Fields of the message.
          */
         public JCDiagnostic fragment(String key, Object... args) {
-            return create(FRAGMENT, null, EnumSet.noneOf(DiagnosticFlag.class), null, null, key, args);
+            return fragment(fragmentKey(key, args));
+        }
+
+        /**
+         * Create a fragment diagnostic, for use as an argument in other diagnostics
+         *  @param fragmentKey    The key for the localized subdiagnostic message.
+         */
+        public JCDiagnostic fragment(Fragment fragmentKey) {
+            return create(null, EnumSet.noneOf(DiagnosticFlag.class), null, null, fragmentKey);
         }
 
         /**
@@ -220,7 +244,19 @@ public class JCDiagnostic implements Diagnostic {
          */
         public JCDiagnostic create(
                 DiagnosticType kind, DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-            return create(kind, null, EnumSet.noneOf(DiagnosticFlag.class), source, pos, key, args);
+            return create(null, EnumSet.noneOf(DiagnosticFlag.class), source, pos, DiagnosticInfo.of(kind, prefix, key, args));
+        }
+
+        /**
+         * Create a new diagnostic of the given kind, which is not mandatory and which has
+         * no lint category.
+         *  @param source      The source of the compilation unit, if any, in which to report the message.
+         *  @param pos         The source position at which to report the message.
+         *  @param diagnosticInfo         The key for the localized message.
+         */
+        public JCDiagnostic create(
+                DiagnosticSource source, DiagnosticPosition pos, DiagnosticInfo diagnosticInfo) {
+            return create(null, EnumSet.noneOf(DiagnosticFlag.class), source, pos, diagnosticInfo);
         }
 
         /**
@@ -233,13 +269,59 @@ public class JCDiagnostic implements Diagnostic {
          *  @param key         The key for the localized message.
          *  @param args        Fields of the message.
          */
-        public JCDiagnostic create(
-                DiagnosticType kind, LintCategory lc, Set flags, DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-            return new JCDiagnostic(formatter, kind, lc, flags, source, pos, qualify(kind, key), args);
+        public JCDiagnostic create(DiagnosticType kind,
+                LintCategory lc, Set flags, DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
+            return create(lc, flags, source, pos, DiagnosticInfo.of(kind, prefix, key, args));
         }
 
-        protected String qualify(DiagnosticType t, String key) {
-            return prefix + "." + t.key + "." + key;
+        /**
+         * Create a new diagnostic with given key.
+         *  @param lc          The lint category, if applicable, or null
+         *  @param flags       The set of flags for the diagnostic
+         *  @param source      The source of the compilation unit, if any, in which to report the message.
+         *  @param pos         The source position at which to report the message.
+         *  @param diagnosticInfo    The key for the localized message.
+         */
+        public JCDiagnostic create(
+                LintCategory lc, Set flags, DiagnosticSource source, DiagnosticPosition pos, DiagnosticInfo diagnosticInfo) {
+            return new JCDiagnostic(formatter, normalize(diagnosticInfo), lc, flags, source, pos);
+        }
+        //where
+            DiagnosticInfo normalize(DiagnosticInfo diagnosticInfo) {
+                //replace all nested FragmentKey with full-blown JCDiagnostic objects
+                return DiagnosticInfo.of(diagnosticInfo.type, diagnosticInfo.prefix, diagnosticInfo.code,
+                        Stream.of(diagnosticInfo.args).map(o -> {
+                            return (o instanceof Fragment) ?
+                                    fragment((Fragment)o) : o;
+                        }).toArray());
+            }
+
+        /**
+         * Create a new error key.
+         */
+        Error errorKey(String code, Object... args) {
+            return (Error)DiagnosticInfo.of(ERROR, prefix, code, args);
+        }
+
+        /**
+         * Create a new warning key.
+         */
+        Warning warningKey(String code, Object... args) {
+            return (Warning)DiagnosticInfo.of(WARNING, prefix, code, args);
+        }
+
+        /**
+         * Create a new note key.
+         */
+        Note noteKey(String code, Object... args) {
+            return (Note)DiagnosticInfo.of(NOTE, prefix, code, args);
+        }
+
+        /**
+         * Create a new fragment key.
+         */
+        Fragment fragmentKey(String code, Object... args) {
+            return (Fragment)DiagnosticInfo.of(FRAGMENT, prefix, code, args);
         }
     }
 
@@ -254,13 +336,14 @@ public class JCDiagnostic implements Diagnostic {
     @Deprecated
     public static JCDiagnostic fragment(String key, Object... args) {
         return new JCDiagnostic(getFragmentFormatter(),
-                              FRAGMENT,
+                              DiagnosticInfo.of(FRAGMENT,
+                                      "compiler",
+                                      key,
+                                      args),
                               null,
                               EnumSet.noneOf(DiagnosticFlag.class),
                               null,
-                              null,
-                              "compiler." + FRAGMENT.key + "." + key,
-                              args);
+                              null);
     }
     //where
     @Deprecated
@@ -352,11 +435,9 @@ public class JCDiagnostic implements Diagnostic {
         COMPRESSED
     }
 
-    private final DiagnosticType type;
     private final DiagnosticSource source;
     private final DiagnosticPosition position;
-    private final String key;
-    protected final Object[] args;
+    private final DiagnosticInfo diagnosticInfo;
     private final Set flags;
     private final LintCategory lintCategory;
 
@@ -390,35 +471,121 @@ public class JCDiagnostic implements Diagnostic {
         }
     }
 
+    /**
+     * A diagnostic key object encapsulates basic properties of a diagnostic, such as the resource key,
+     * the arguments and the kind associated with the diagnostic object. Diagnostic keys can be either
+     * created programmatically (by using the supplied factory method) or obtained through build-time
+     * generated factory methods.
+     */
+    public static abstract class DiagnosticInfo {
+
+        /** The diagnostic kind (i.e. error). */
+        DiagnosticType type;
+
+        /** The diagnostic prefix (i.e. 'javac'); used to compute full resource key. */
+        String prefix;
+
+        /** The diagnostic code (i.e. 'cannot.resolve.sym'); together with {@code prefix} it forms
+         * the full resource key. */
+        String code;
+
+        /** The diagnostic arguments. */
+        Object[] args;
+
+        private DiagnosticInfo(DiagnosticType type, String prefix, String code, Object... args) {
+            this.type = type;
+            this.prefix = prefix;
+            this.code = code;
+            this.args = args;
+        }
+
+        /**
+         * Compute the resource key.
+         */
+        public String key() {
+            return prefix + "." + type.key + "." + code;
+        }
+
+        /**
+         * Static factory method; build a custom diagnostic key using given kind, prefix, code and args.
+         */
+        public static DiagnosticInfo of(DiagnosticType type, String prefix, String code, Object... args) {
+            switch (type) {
+                case ERROR:
+                    return new Error(prefix, code, args);
+                case WARNING:
+                    return new Warning(prefix, code, args);
+                case NOTE:
+                    return new Note(prefix, code, args);
+                case FRAGMENT:
+                    return new Fragment(prefix, code, args);
+                default:
+                    Assert.error("Wrong diagnostic type: " + type);
+                    return null;
+            }
+        }
+
+    }
+
+    /**
+     * Class representing error diagnostic keys.
+     */
+    public static final class Error extends DiagnosticInfo {
+        public Error(String prefix, String key, Object... args) {
+            super(DiagnosticType.ERROR, prefix, key, args);
+        }
+    }
+
+    /**
+     * Class representing warning diagnostic keys.
+     */
+    public static final class Warning extends DiagnosticInfo {
+        public Warning(String prefix, String key, Object... args) {
+            super(DiagnosticType.WARNING, prefix, key, args);
+        }
+    }
+
+    /**
+     * Class representing note diagnostic keys.
+     */
+    public static final class Note extends DiagnosticInfo {
+        public Note(String prefix, String key, Object... args) {
+            super(DiagnosticType.NOTE, prefix, key, args);
+        }
+    }
+
+    /**
+     * Class representing fragment diagnostic keys.
+     */
+    public static final class Fragment extends DiagnosticInfo {
+        public Fragment(String prefix, String key, Object... args) {
+            super(DiagnosticType.FRAGMENT, prefix, key, args);
+        }
+    }
+
     /**
      * Create a diagnostic object.
      * @param formatter the formatter to use for the diagnostic
-     * @param dt the type of diagnostic
+     * @param diagnosticInfo the diagnostic key
      * @param lc     the lint category for the diagnostic
      * @param source the name of the source file, or null if none.
      * @param pos the character offset within the source file, if given.
-     * @param key a resource key to identify the text of the diagnostic
-     * @param args arguments to be included in the text of the diagnostic
      */
     protected JCDiagnostic(DiagnosticFormatter formatter,
-                       DiagnosticType dt,
+                       DiagnosticInfo diagnosticInfo,
                        LintCategory lc,
                        Set flags,
                        DiagnosticSource source,
-                       DiagnosticPosition pos,
-                       String key,
-                       Object... args) {
+                       DiagnosticPosition pos) {
         if (source == null && pos != null && pos.getPreferredPosition() != Position.NOPOS)
             throw new IllegalArgumentException();
 
         this.defaultFormatter = formatter;
-        this.type = dt;
+        this.diagnosticInfo = diagnosticInfo;
         this.lintCategory = lc;
         this.flags = flags;
         this.source = source;
         this.position = pos;
-        this.key = key;
-        this.args = args;
     }
 
     /**
@@ -426,7 +593,7 @@ public class JCDiagnostic implements Diagnostic {
      * @return the type of this diagnostic
      */
     public DiagnosticType getType() {
-        return type;
+        return diagnosticInfo.type;
     }
 
     /**
@@ -543,7 +710,7 @@ public class JCDiagnostic implements Diagnostic {
      * @return  the arguments to be included in the text of the diagnostic
      */
     public Object[] getArgs() {
-        return args;
+        return diagnosticInfo.args;
     }
 
     /**
@@ -551,7 +718,7 @@ public class JCDiagnostic implements Diagnostic {
      * @return the prefix string associated with this type of diagnostic
      */
     public String getPrefix() {
-        return getPrefix(type);
+        return getPrefix(diagnosticInfo.type);
     }
 
     /**
@@ -567,7 +734,7 @@ public class JCDiagnostic implements Diagnostic {
      */
     @Override
     public String toString() {
-        return defaultFormatter.format(this,Locale.getDefault());
+        return defaultFormatter.format(this, Locale.getDefault());
     }
 
     private DiagnosticFormatter defaultFormatter;
@@ -578,7 +745,7 @@ public class JCDiagnostic implements Diagnostic {
 
     @DefinedBy(Api.COMPILER)
     public Diagnostic.Kind getKind() {
-        switch (type) {
+        switch (diagnosticInfo.type) {
         case NOTE:
             return Diagnostic.Kind.NOTE;
         case WARNING:
@@ -594,7 +761,7 @@ public class JCDiagnostic implements Diagnostic {
 
     @DefinedBy(Api.COMPILER)
     public String getCode() {
-        return key;
+        return diagnosticInfo.key();
     }
 
     @DefinedBy(Api.COMPILER)
@@ -605,7 +772,7 @@ public class JCDiagnostic implements Diagnostic {
     public void setFlag(DiagnosticFlag flag) {
         flags.add(flag);
 
-        if (type == DiagnosticType.ERROR) {
+        if (diagnosticInfo.type == DiagnosticType.ERROR) {
             switch (flag) {
                 case SYNTAX:
                     flags.remove(DiagnosticFlag.RECOVERABLE);
@@ -627,13 +794,11 @@ public class JCDiagnostic implements Diagnostic {
 
         public MultilineDiagnostic(JCDiagnostic other, List subdiagnostics) {
             super(other.defaultFormatter,
-                  other.getType(),
+                  other.diagnosticInfo,
                   other.getLintCategory(),
                   other.flags,
                   other.getDiagnosticSource(),
-                  other.position,
-                  other.getCode(),
-                  other.getArgs());
+                  other.position);
             this.subdiagnostics = subdiagnostics;
         }
 
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
index 2bd1ee5b9e9..cb4cc93b284 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
@@ -535,7 +535,7 @@ public class Log extends AbstractLog {
      *  @param args   Fields of the warning message.
      */
     public void strictWarning(DiagnosticPosition pos, String key, Object ... args) {
-        writeDiagnostic(diags.warning(source, pos, key, args));
+        writeDiagnostic(diags.warning(null, source, pos, key, args));
         nwarnings++;
     }
 
diff --git a/langtools/test/tools/javac/BranchToFewerDefines.java b/langtools/test/tools/javac/BranchToFewerDefines.java
new file mode 100644
index 00000000000..dabdff64d32
--- /dev/null
+++ b/langtools/test/tools/javac/BranchToFewerDefines.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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 8067429
+ * @summary java.lang.VerifyError: Inconsistent stackmap frames at branch target
+ * @author srikanth
+ *
+ * @compile  BranchToFewerDefines.java
+ * @run main BranchToFewerDefines
+ */
+
+public class BranchToFewerDefines {
+        public static void main(String[] args) {
+        }
+        private void problematicMethod(int p) {
+                switch (p) {
+                        case 3:
+                                long n;
+                                while (true) {
+                                        if (false) {
+                                                break;
+                                        }
+                                }
+                                break;
+                        case 2:
+                                loop: while (true) {
+                                        while (true) {
+                                                int i = 4;
+                                                if (p != 16) {
+                                                        return;
+                                                }
+                                                break loop;
+                                        }
+                                }
+                                break;
+                        default:
+                                while (true) {
+                                        if (false) {
+                                                break;
+                                        }
+                                }
+                                break;
+                }
+                long b;
+                if (p != 7) {
+                        switch (p) {
+                                case 1:
+                                        long a = 17;
+                                        break;
+                                case 2:
+                                        break;
+                                default:
+                                        break;
+                        }
+                }
+        }
+        private void problematicMethod2(int p) {
+                switch (p) {
+                        case 3:
+                                long n;
+                                {
+                                        int i = 4;
+                                        break;
+                                }
+                        case 2:
+                                {
+                                        int i = 4;
+                                        break;
+                                }
+                        default:
+                                {
+                                        int i = 4;
+                                        break;
+                                }
+                }
+                long b;
+                if (p != 7) {
+                        switch (p) {
+                                case 1:
+                                        long a = 17;
+                                        break;
+                                case 2:
+                                        break;
+                                default:
+                                        break;
+                        }
+                }
+        }
+}
diff --git a/langtools/test/tools/javac/ConstFoldTest.java b/langtools/test/tools/javac/ConstFoldTest.java
index e9b6c117472..cbc960529d2 100644
--- a/langtools/test/tools/javac/ConstFoldTest.java
+++ b/langtools/test/tools/javac/ConstFoldTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,8 @@
  */
 
 import java.net.URL;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 
 public class ConstFoldTest {
@@ -75,9 +77,10 @@ public class ConstFoldTest {
         ToolBox tb = new ToolBox();
 
         URL url = ConstFoldTest.class.getResource("ConstFoldTest$CFTest.class");
+        Path file = Paths.get(url.toURI());
         List result = tb.new JavapTask()
                 .options("-c")
-                .classes(url.getFile())
+                .classes(file.toString())
                 .run()
                 .write(ToolBox.OutputKind.DIRECT)
                 .getOutputLines(ToolBox.OutputKind.DIRECT);
diff --git a/langtools/test/tools/javac/Diagnostics/6769027/T6769027.java b/langtools/test/tools/javac/Diagnostics/6769027/T6769027.java
index 2d9bf1810ef..8a7765c84ae 100644
--- a/langtools/test/tools/javac/Diagnostics/6769027/T6769027.java
+++ b/langtools/test/tools/javac/Diagnostics/6769027/T6769027.java
@@ -387,7 +387,7 @@ public class T6769027
         messages.add("tester");
         JCDiagnostic.Factory diags = JCDiagnostic.Factory.instance(ctx);
         log.useSource(new MyFileObject("This is a source line"));
-        JCDiagnostic d = diags.error(log.currentSource(),
+        JCDiagnostic d = diags.error(null, log.currentSource(),
             posKind.pos(),
             errorKind.key(), "Hello!");
         if (multiKind != MultilineKind.NONE) {
diff --git a/langtools/test/tools/javac/Diagnostics/compressed/8067883/T8067883.java b/langtools/test/tools/javac/Diagnostics/compressed/8067883/T8067883.java
new file mode 100644
index 00000000000..506278070ed
--- /dev/null
+++ b/langtools/test/tools/javac/Diagnostics/compressed/8067883/T8067883.java
@@ -0,0 +1,29 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8067883
+ * @summary Javac misses some opportunities for diagnostic simplification
+ *
+ * @compile/fail/ref=T8067883a.out -Xdiags:compact -XDrawDiagnostics T8067883.java
+ * @compile/fail/ref=T8067883b.out -Xdiags:verbose -XDrawDiagnostics T8067883.java
+ *
+ */
+
+import java.util.List;
+
+class T8067883 {
+    void testMethod(List li) {
+        m(null, li);
+        m(1, li);
+    }
+
+    void testDiamond(List li) {
+        new Box<>(null, li);
+        new Box<>(1, li);
+    }
+
+     void m(List z, List ls) { }
+
+    static class Box {
+        Box(List z, List ls) { }
+    }
+}
diff --git a/langtools/test/tools/javac/Diagnostics/compressed/8067883/T8067883a.out b/langtools/test/tools/javac/Diagnostics/compressed/8067883/T8067883a.out
new file mode 100644
index 00000000000..42f316eb91a
--- /dev/null
+++ b/langtools/test/tools/javac/Diagnostics/compressed/8067883/T8067883a.out
@@ -0,0 +1,6 @@
+T8067883.java:15:17: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.util.List, java.util.List)
+T8067883.java:16:9: compiler.err.cant.apply.symbol: kindname.method, m, java.util.List,java.util.List, int,java.util.List, kindname.class, T8067883, (compiler.misc.infer.no.conforming.assignment.exists: Z, (compiler.misc.inconvertible.types: int, java.util.List))
+T8067883.java:20:25: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.util.List, java.util.List)
+T8067883.java:21:9: compiler.err.cant.apply.diamond.1: (compiler.misc.diamond: T8067883.Box), (compiler.misc.infer.no.conforming.assignment.exists: X, (compiler.misc.inconvertible.types: int, java.util.List))
+- compiler.note.compressed.diags
+4 errors
diff --git a/langtools/test/tools/javac/Diagnostics/compressed/8067883/T8067883b.out b/langtools/test/tools/javac/Diagnostics/compressed/8067883/T8067883b.out
new file mode 100644
index 00000000000..4b29a3c7cca
--- /dev/null
+++ b/langtools/test/tools/javac/Diagnostics/compressed/8067883/T8067883b.out
@@ -0,0 +1,5 @@
+T8067883.java:15:9: compiler.err.cant.apply.symbol: kindname.method, m, java.util.List,java.util.List, compiler.misc.type.null,java.util.List, kindname.class, T8067883, (compiler.misc.infer.no.conforming.assignment.exists: Z, (compiler.misc.inconvertible.types: java.util.List, java.util.List))
+T8067883.java:16:9: compiler.err.cant.apply.symbol: kindname.method, m, java.util.List,java.util.List, int,java.util.List, kindname.class, T8067883, (compiler.misc.infer.no.conforming.assignment.exists: Z, (compiler.misc.inconvertible.types: int, java.util.List))
+T8067883.java:20:9: compiler.err.cant.apply.diamond.1: (compiler.misc.diamond: T8067883.Box), (compiler.misc.infer.no.conforming.assignment.exists: X, (compiler.misc.inconvertible.types: java.util.List, java.util.List))
+T8067883.java:21:9: compiler.err.cant.apply.diamond.1: (compiler.misc.diamond: T8067883.Box), (compiler.misc.infer.no.conforming.assignment.exists: X, (compiler.misc.inconvertible.types: int, java.util.List))
+4 errors
diff --git a/langtools/test/tools/javac/SerialWarn.java b/langtools/test/tools/javac/SerialWarn.java
index dce066eeafc..431f6aeb176 100644
--- a/langtools/test/tools/javac/SerialWarn.java
+++ b/langtools/test/tools/javac/SerialWarn.java
@@ -1,34 +1,11 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
- * 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
+ * @test /nodynamiccopyright/
  * @bug 4854628
  * @summary include Throwable subclasses in missing serialVersionUID warning
  * @author gafter
  *
  * @compile                    -Werror SerialWarn.java
- * @compile/fail -Xlint:serial -Werror SerialWarn.java
+ * @compile/fail/ref=SerialWarn.out -XDrawDiagnostics -Xlint:serial -Werror SerialWarn.java
  */
 
 class SerialWarn extends Throwable {}
diff --git a/langtools/test/tools/javac/SerialWarn.out b/langtools/test/tools/javac/SerialWarn.out
new file mode 100644
index 00000000000..23bf7373160
--- /dev/null
+++ b/langtools/test/tools/javac/SerialWarn.out
@@ -0,0 +1,4 @@
+SerialWarn.java:11:1: compiler.warn.missing.SVUID: SerialWarn
+- compiler.err.warnings.and.werror
+1 error
+1 warning
diff --git a/langtools/test/tools/javac/T4994049/DeprecatedYES.java b/langtools/test/tools/javac/T4994049/DeprecatedYES.java
index 4de52129b59..ec59558dcc7 100644
--- a/langtools/test/tools/javac/T4994049/DeprecatedYES.java
+++ b/langtools/test/tools/javac/T4994049/DeprecatedYES.java
@@ -1,33 +1,10 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * 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
+ * @test    /nodynamiccopyright/
  * @bug     6229758
  * @summary deprecatedNOT! is
  * @author  Peter von der Ah\u00e9
  * @compile -Xlint:deprecation DeprecatedYES.java
- * @compile/fail -Werror -Xlint:deprecation DeprecatedYES.java
+ * @compile/fail/ref=DeprecatedYES.out -XDrawDiagnostics -Werror -Xlint:deprecation DeprecatedYES.java
  */
 
 class A {
diff --git a/langtools/test/tools/javac/T4994049/DeprecatedYES.out b/langtools/test/tools/javac/T4994049/DeprecatedYES.out
new file mode 100644
index 00000000000..0750441a39c
--- /dev/null
+++ b/langtools/test/tools/javac/T4994049/DeprecatedYES.out
@@ -0,0 +1,4 @@
+DeprecatedYES.java:18:10: compiler.warn.has.been.deprecated: foo(), A
+- compiler.err.warnings.and.werror
+1 error
+1 warning
diff --git a/langtools/test/tools/javac/T6231847.java b/langtools/test/tools/javac/T6231847.java
index 25b9dede2bb..8d4ef4112e7 100644
--- a/langtools/test/tools/javac/T6231847.java
+++ b/langtools/test/tools/javac/T6231847.java
@@ -1,9 +1,8 @@
 /*
- * @test  /nodynamiccopyright/
+ * @test    /nodynamiccopyright/
  * @bug     6231847
  * @summary Crash in com.sun.tools.javac.comp.Attr.visitNewClass:1352
  * @author  Peter von der Ah\u00e9
- * @compile/fail -XDdev T6231847.java
  * @compile/fail/ref=T6231847.out -XDdev -XDrawDiagnostics T6231847.java
  */
 
diff --git a/langtools/test/tools/javac/T6231847.out b/langtools/test/tools/javac/T6231847.out
index 6dfc875c8ab..d2f36a92e29 100644
--- a/langtools/test/tools/javac/T6231847.out
+++ b/langtools/test/tools/javac/T6231847.out
@@ -1,9 +1,9 @@
-T6231847.java:15:21: compiler.err.anon.class.impl.intf.no.typeargs
-T6231847.java:16:30: compiler.err.anon.class.impl.intf.no.args
+T6231847.java:14:21: compiler.err.anon.class.impl.intf.no.typeargs
+T6231847.java:15:30: compiler.err.anon.class.impl.intf.no.args
+T6231847.java:16:16: compiler.err.anon.class.impl.intf.no.qual.for.new
 T6231847.java:17:16: compiler.err.anon.class.impl.intf.no.qual.for.new
-T6231847.java:18:16: compiler.err.anon.class.impl.intf.no.qual.for.new
-T6231847.java:18:41: compiler.err.anon.class.impl.intf.no.args
-T6231847.java:18:23: compiler.err.anon.class.impl.intf.no.typeargs
-T6231847.java:19:16: compiler.err.qualified.new.of.static.class: T6231847.T6231847C
-T6231847.java:19:34: compiler.err.illegal.qual.not.icls: T6231847.T6231847C
+T6231847.java:17:41: compiler.err.anon.class.impl.intf.no.args
+T6231847.java:17:23: compiler.err.anon.class.impl.intf.no.typeargs
+T6231847.java:18:16: compiler.err.qualified.new.of.static.class: T6231847.T6231847C
+T6231847.java:18:34: compiler.err.illegal.qual.not.icls: T6231847.T6231847C
 8 errors
diff --git a/langtools/test/tools/javac/annotations/6214965/T6214965.java b/langtools/test/tools/javac/annotations/6214965/T6214965.java
index cdac2431271..119c897897a 100644
--- a/langtools/test/tools/javac/annotations/6214965/T6214965.java
+++ b/langtools/test/tools/javac/annotations/6214965/T6214965.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,10 @@
 
 /**
  * @test
- * @bug     6214965 6365854
+ * @bug     6214965 6365854 8068639
  * @summary Compiler crash on redefing nested annotation types
  * @compile CompilerAnnotationTest.java CompilerAnnotationTest2.java
  * @compile CompilerAnnotationTest2bad.java
- * @compile/ref=T6214965.out -XDrawDiagnostics CompilerAnnotationTest2bad.java
+ * @compile/ref=T6214965.out -XDrawDiagnostics -Xlint:classfile CompilerAnnotationTest2bad.java
+ * @compile -Werror CompilerAnnotationTest2bad.java
  */
diff --git a/langtools/test/tools/javac/annotations/6365854/T6365854.java b/langtools/test/tools/javac/annotations/6365854/T6365854.java
index daa24f651f7..d056368f23a 100644
--- a/langtools/test/tools/javac/annotations/6365854/T6365854.java
+++ b/langtools/test/tools/javac/annotations/6365854/T6365854.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug     6365854
+ * @bug     6365854 8068639
  * @summary javac crashes when compiling against an annotated class
  * @compile TestAnnotation.java TestCore.java
  * @clean test.annotation.TestAnnotation
@@ -33,11 +33,11 @@
  *
  * @compile TestAnnotation.java TestCore.java
  * @clean test.annotation.TestAnnotation
- * @compile/ref=test1.out -XDrawDiagnostics T6365854.java
+ * @compile/ref=test1.out -XDrawDiagnostics -Xlint:classfile T6365854.java
  * @run main T6365854
- * @compile/ref=test2.out -XDrawDiagnostics evolve/TestAnnotation.java T6365854.java
+ * @compile/ref=test2.out -XDrawDiagnostics -Xlint:classfile evolve/TestAnnotation.java T6365854.java
  * @run main T6365854
- * @compile/ref=test2.out -XDrawDiagnostics T6365854.java
+ * @compile/ref=test2.out -XDrawDiagnostics -Xlint:classfile T6365854.java
  * @run main T6365854
  */
 
diff --git a/langtools/test/tools/javac/api/file/MyStandardJavaFileManager.java b/langtools/test/tools/javac/api/file/MyStandardJavaFileManager.java
new file mode 100644
index 00000000000..738eb95060b
--- /dev/null
+++ b/langtools/test/tools/javac/api/file/MyStandardJavaFileManager.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.File;
+import java.io.IOException;
+import javax.tools.ForwardingJavaFileManager;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+
+
+class MyStandardJavaFileManager
+        extends ForwardingJavaFileManager
+        implements StandardJavaFileManager {
+    MyStandardJavaFileManager(StandardJavaFileManager delegate) {
+        super(delegate);
+    }
+
+    @Override
+    public Iterable getJavaFileObjectsFromFiles(Iterable files) {
+        return fileManager.getJavaFileObjectsFromFiles(files);
+    }
+
+    @Override
+    public Iterable getJavaFileObjects(File... files) {
+        return fileManager.getJavaFileObjects(files);
+    }
+
+    @Override
+    public Iterable getJavaFileObjectsFromStrings(Iterable names) {
+        return fileManager.getJavaFileObjectsFromStrings(names);
+    }
+
+    @Override
+    public Iterable getJavaFileObjects(String... names) {
+        return fileManager.getJavaFileObjects(names);
+    }
+
+    @Override
+    public void setLocation(JavaFileManager.Location location, Iterable files) throws IOException {
+        fileManager.setLocation(location, files);
+    }
+
+    @Override
+    public Iterable getLocation(JavaFileManager.Location location) {
+        return fileManager.getLocation(location);
+    }
+}
diff --git a/langtools/test/tools/javac/api/file/SJFM_AsPath.java b/langtools/test/tools/javac/api/file/SJFM_AsPath.java
new file mode 100644
index 00000000000..8cc91d95bc7
--- /dev/null
+++ b/langtools/test/tools/javac/api/file/SJFM_AsPath.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8059977
+ * @summary StandardJavaFileManager should support java.nio.file.Path.
+ *          Test asPath method.
+ * @build SJFM_TestBase
+ * @run main SJFM_AsPath
+ */
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+
+/**
+ * For those paths which are supported by a file manager, such that
+ * a file object can encapsulate the path, verify that the underlying
+ * path can be recovered from the file object.
+ */
+public class SJFM_AsPath extends SJFM_TestBase {
+    public static void main(String... args) throws Exception {
+        new SJFM_AsPath().run();
+    }
+
+    @Test
+    void test_asPath(StandardJavaFileManager fm) throws IOException {
+        test_asPath(fm, getTestFilePaths());
+        test_asPath(fm, getTestZipPaths());
+    }
+
+    /**
+     * Tests the asPath method for a specific file manager and a series
+     * of paths.
+     *
+     * Note: instances of MyStandardJavaFileManager only support
+     * encapsulating paths for files in the default file system,
+     * and throw UnsupportedOperationException for asPath.
+     *
+     * @param fm  the file manager to be tested
+     * @param paths  the paths to be tested
+     * @throws IOException
+     */
+    void test_asPath(StandardJavaFileManager fm, List paths) throws IOException {
+        if (!isGetFileObjectsSupported(fm, paths))
+            return;
+        boolean expectException = (fm instanceof MyStandardJavaFileManager);
+
+        Set ref = new HashSet<>(paths);
+        for (JavaFileObject fo : fm.getJavaFileObjectsFromPaths(paths)) {
+            try {
+                Path path = fm.asPath(fo);
+                if (expectException)
+                    error("expected exception not thrown: " + UnsupportedOperationException.class.getName());
+                boolean found = ref.remove(path);
+                if (!found) {
+                    error("Unexpected path found: " + path + "; expected one of " + ref);
+                }
+            } catch (Exception e) {
+                if (expectException && e instanceof UnsupportedOperationException)
+                    continue;
+                error("unexpected exception thrown: " + e);
+            }
+        }
+    }
+}
diff --git a/langtools/test/tools/javac/api/file/SJFM_GetFileObjects.java b/langtools/test/tools/javac/api/file/SJFM_GetFileObjects.java
new file mode 100644
index 00000000000..b8d9c947a79
--- /dev/null
+++ b/langtools/test/tools/javac/api/file/SJFM_GetFileObjects.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8059977
+ * @summary StandardJavaFileManager should support java.nio.file.Path.
+ *          Test getFileObject methods.
+ * @build SJFM_TestBase
+ * @run main SJFM_GetFileObjects
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+
+/**
+ * For those paths supported by a file manager, verify that the paths
+ * can be encapsulated by file objects, such that the file objects can
+ * be used by a tool such as javac.
+ */
+public class SJFM_GetFileObjects extends SJFM_TestBase {
+    public static void main(String... args) throws Exception {
+        new SJFM_GetFileObjects().run();
+    }
+
+    @Test
+    void test_getJavaFileObjects(StandardJavaFileManager fm) throws IOException {
+        test_getJavaFileObjects(fm, getTestFilePaths());
+        test_getJavaFileObjects(fm, getTestZipPaths());
+    }
+
+    /**
+     * Tests the getJavaFileObjects method for a specific file manager
+     * and a series of paths.
+     *
+     * Note: instances of MyStandardJavaFileManager only support
+     * encapsulating paths for files in the default file system.
+     *
+     * @param fm  the file manager to be tested
+     * @param paths  the paths to be tested
+     * @throws IOException
+     */
+    void test_getJavaFileObjects(StandardJavaFileManager fm, List paths) throws IOException {
+        boolean expectException = !isGetFileObjectsSupported(fm, paths);
+        try {
+            compile(fm.getJavaFileObjects(paths.toArray(new Path[paths.size()])));
+            if (expectException)
+                error("expected exception not thrown");
+        } catch (RuntimeException e) {
+            if (expectException && e instanceof IllegalArgumentException)
+                return;
+            error("unexpected exception thrown: " + e);
+        }
+    }
+
+    //----------------------------------------------------------------------------------------------
+
+    @Test
+    void test_getJavaFileObjectsFromPaths(StandardJavaFileManager fm) throws IOException {
+        test_getJavaFileObjectsFromPaths(fm, getTestFilePaths());
+        test_getJavaFileObjectsFromPaths(fm, getTestZipPaths());
+    }
+
+    /**
+     * Tests the getJavaFileObjectsFromPaths method for a specific file manager
+     * and a series of paths.
+     *
+     * Note: instances of MyStandardJavaFileManager only support
+     * encapsulating paths for files in the default file system.
+     *
+     * @param fm  the file manager to be tested
+     * @param paths  the paths to be tested
+     * @throws IOException
+     */
+    void test_getJavaFileObjectsFromPaths(StandardJavaFileManager fm, List paths)
+            throws IOException {
+        boolean expectException = !isGetFileObjectsSupported(fm, paths);
+        try {
+            compile(fm.getJavaFileObjectsFromPaths(paths));
+            if (expectException)
+                error("expected exception not thrown: " + IllegalArgumentException.class.getName());
+        } catch (RuntimeException e) {
+            if (expectException && e instanceof IllegalArgumentException)
+                return;
+            error("unexpected exception thrown: " + e);
+        }
+    }
+
+
+    //----------------------------------------------------------------------------------------------
+
+    /**
+     * Compiles a set of files.
+     *
+     * @param files the files to be compiled.
+     * @throws IOException
+     */
+    void compile(Iterable files) throws IOException {
+        String name = "compile" + (compileCount++);
+        try (StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null)) {
+            File f = new File(name);
+            f.mkdirs();
+            // use setLocation(Iterable) to avoid relying on setLocationFromPaths
+            fm.setLocation(StandardLocation.CLASS_OUTPUT, Collections.singleton(f));
+            boolean ok = comp.getTask(null, fm, null, null, null, files).call();
+            if (!ok)
+                error(name + ": compilation failed");
+        }
+    }
+
+    int compileCount;
+}
diff --git a/langtools/test/tools/javac/api/file/SJFM_IsSameFile.java b/langtools/test/tools/javac/api/file/SJFM_IsSameFile.java
new file mode 100644
index 00000000000..fc6ac845c30
--- /dev/null
+++ b/langtools/test/tools/javac/api/file/SJFM_IsSameFile.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8059977
+ * @summary StandardJavaFileManager should support java.nio.file.Path.
+ *          Test isSameFile method.
+ * @build SJFM_TestBase
+ * @run main SJFM_IsSameFile
+ */
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.concurrent.Callable;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+
+/**
+ * For those paths which are supported by a file manager, such that
+ * a file object can encapsulate the path, verify that the underlying
+ * paths can be compared.
+ */
+public class SJFM_IsSameFile extends SJFM_TestBase {
+    public static void main(String... args) throws Exception {
+        new SJFM_IsSameFile().run();
+    }
+
+    @Test
+    void test_isSameFile(StandardJavaFileManager fm) throws Exception {
+        test_isSameFile(fm, () -> getTestFilePaths());
+        test_isSameFile(fm, () -> getTestZipPaths());
+    }
+
+    /**
+     * Tests the isSameFile method for a specific file manager
+     * and a series of paths.
+     *
+     * Note: instances of MyStandardJavaFileManager only support
+     * encapsulating paths for files in the default file system.
+     *
+     * @param fm  the file manager to be tested
+     * @param paths  a generator for the paths to be tested
+     * @throws IOException
+     */
+    void test_isSameFile(StandardJavaFileManager fm, Callable> paths) throws Exception {
+        if (!isGetFileObjectsSupported(fm, paths.call()))
+            return;
+
+        // use distinct paths and file objects in the following two sets
+        Iterable setA = fm.getJavaFileObjectsFromPaths(paths.call());
+        Iterable setB = fm.getJavaFileObjectsFromPaths(paths.call());
+        for (JavaFileObject a : setA) {
+            for (JavaFileObject b : setB) {
+                System.err.println("compare: a: " + a);
+                System.err.println("         b: " + b);
+                // Use the fileObject getName method to determine the expected result.
+                // For the files being tested, getName is the absolute path.
+                boolean expect = a.getName().equals(b.getName());
+                boolean actual = fm.isSameFile(a, b);
+                if (actual != expect) {
+                    error("mismatch: actual:" + (actual ? "same" : "not same")
+                            + ", expect:" + (expect ? "same" : "not same"));
+                }
+            }
+        }
+    }
+}
diff --git a/langtools/test/tools/javac/api/file/SJFM_Locations.java b/langtools/test/tools/javac/api/file/SJFM_Locations.java
new file mode 100644
index 00000000000..8ae341371a8
--- /dev/null
+++ b/langtools/test/tools/javac/api/file/SJFM_Locations.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8059977
+ * @summary StandardJavaFileManager should support java.nio.file.Path.
+ *          Test get/setLocation methods.
+ * @build SJFM_TestBase
+ * @run main SJFM_Locations
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.tools.JavaFileManager;
+import javax.tools.StandardJavaFileManager;
+
+/**
+ * For those paths which are supported by a file manager, verify
+ * that setLocation can accept such paths, and that getLocation
+ * can subsequently return the same paths.
+ *
+ * In addition, for files in the default file system, verify
+ * the combinations of setting a location using files or paths
+ * and then subsequently getting the location as files or paths.
+ */
+public class SJFM_Locations extends SJFM_TestBase {
+    public static void main(String... args) throws Exception {
+        new SJFM_Locations().run();
+    }
+
+    @Test
+    void test_locations(StandardJavaFileManager fm) throws IOException {
+        test_setFiles_getFiles(fm, getTestFileDirs());
+        test_setFiles_getPaths(fm, getTestFileDirs());
+        test_setPaths_getFiles(fm, getTestFilePathDirs());
+        test_setPaths_getPaths(fm, getTestFilePathDirs());
+//        test_setPaths_getPaths(fm, getTestZipPathDirs());
+    }
+
+    void test_setFiles_getFiles(StandardJavaFileManager fm, List inFiles) throws IOException {
+        System.err.println("test_setFiles_getFiles");
+        JavaFileManager.Location l = newLocation();
+        fm.setLocation(l, inFiles);
+        Iterable outFiles = fm.getLocation(l);
+        compare(inFiles, outFiles);
+    }
+
+    void test_setFiles_getPaths(StandardJavaFileManager fm, List inFiles) throws IOException {
+        System.err.println("test_setFiles_getPaths");
+        JavaFileManager.Location l = newLocation();
+        fm.setLocation(l, inFiles);
+        Iterable outPaths = fm.getLocationAsPaths(l);
+        compare(inFiles, outPaths);
+    }
+
+    void test_setPaths_getFiles(StandardJavaFileManager fm, List inPaths) throws IOException {
+        System.err.println("test_setPaths_getFiles");
+        JavaFileManager.Location l = newLocation();
+        fm.setLocationFromPaths(l, inPaths);
+        Iterable outFiles = fm.getLocation(l);
+        compare(inPaths, outFiles);
+    }
+
+    void test_setPaths_getPaths(StandardJavaFileManager fm, List inPaths) throws IOException {
+        System.err.println("test_setPaths_getPaths");
+        JavaFileManager.Location l = newLocation();
+        fm.setLocationFromPaths(l, inPaths);
+        Iterable outPaths = fm.getLocationAsPaths(l);
+        compare(inPaths, outPaths);
+    }
+
+    //----------------------------------------------------------------------------------------------
+
+    /**
+     * Gets a representative series of directories in the default file system,
+     * derived from the test.src directory and test.classes path.
+     *
+     * @return a list of directories, represented with {@code File}
+     * @throws IOException
+     */
+    List getTestFileDirs() throws IOException {
+        return Stream.of("test.src", "test.classes")
+                .map(s -> System.getProperty(s))
+                .flatMap(s -> Stream.of(s.split(File.pathSeparator, 0)))
+                .filter(s -> !s.isEmpty())
+                .map(s -> new File(s))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * Gets a representative series of directories in the default file system,
+     * derived from the test.src directory and test.classes path.
+     *
+     * @return a list of directories, represented with {@code Path}
+     * @throws IOException
+     */
+    List getTestFilePathDirs() throws IOException {
+        return Stream.of("test.src", "test.classes")
+                .map(s -> System.getProperty(s))
+                .flatMap(s -> Stream.of(s.split(File.pathSeparator, 0)))
+                .filter(s -> !s.isEmpty())
+                .map(s -> Paths.get(s))
+                .collect(Collectors.toList());
+    }
+
+
+    /**
+     * Compares two lists of items by comparing their individual string representations.
+     *
+     * @param in   the first set of items to be compared
+     * @param out  the second set of items to be compared
+     */
+    void compare(Iterable in, Iterable out) {
+        List ins = toString(in);
+        List outs = toString(out);
+        if (!ins.equals(outs)) {
+            error("mismatch in comparison");
+            System.err.println("in:");
+            for (String s: ins) System.err.println(s);
+            System.err.println("out:");
+            for (String s: outs) System.err.println(s);
+        }
+    }
+
+    List toString(Iterable iter) {
+        List strings = new ArrayList<>();
+        for (Object item: iter)
+            strings.add(item.toString());
+        return strings;
+    }
+
+    /**
+     * Create an instance of a location.
+     * @return a location
+     */
+    JavaFileManager.Location newLocation() {
+        final String name = "locn" + (count++);
+        return new JavaFileManager.Location() {
+            @Override
+            public String getName() {
+                return name;
+            }
+
+            @Override
+            public boolean isOutputLocation() {
+                return false;
+            }
+        };
+    }
+
+    int count = 0;
+}
diff --git a/langtools/test/tools/javac/api/file/SJFM_TestBase.java b/langtools/test/tools/javac/api/file/SJFM_TestBase.java
new file mode 100644
index 00000000000..f94579d210d
--- /dev/null
+++ b/langtools/test/tools/javac/api/file/SJFM_TestBase.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.OutputStream;
+import java.io.UncheckedIOException;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import javax.tools.JavaCompiler;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.ToolProvider;
+
+/**
+ * Base class for unit tests for StandardJavaFileManager.
+ */
+class SJFM_TestBase {
+
+    /** Shared compiler instance. */
+    JavaCompiler comp;
+
+    /** A list of items to be closed when the test is complete. */
+    List closeables;
+
+    /**
+     * Runs a test. This is the primary entry point and should generally be
+     * called from each test's main method.
+     * It calls all methods annotated with {@code @Test} with the instances
+     * of StandardJavaFileManager to be tested.
+     *
+     * @throws Exception if the test fails.
+     */
+    void run() throws Exception {
+        comp = ToolProvider.getSystemJavaCompiler();
+        closeables = new ArrayList<>();
+
+        try (StandardJavaFileManager systemFileManager = comp.getStandardFileManager(null, null, null);
+                StandardJavaFileManager customFileManager = new MyStandardJavaFileManager(systemFileManager)) {
+            test(systemFileManager);
+            test(customFileManager);
+        } finally {
+            for (AutoCloseable c: closeables) {
+                try {
+                    c.close();
+                } catch (IOException e) {
+                    error("Exception closing " + c + ": " + e);
+                }
+            }
+        }
+
+        if (errors > 0)
+            throw new Exception(errors + " errors occurred");
+    }
+
+    /**
+     * Get the file managers to be tested.
+     *
+     * Currently, two are provided:
+     * 
      
+     * 
    1. the system-provided file manager
+     * 
    2. a custom file manager, which relies on the default methods provided in the
+     *     StandardJavaFileManager interface
+     * 
      3. 
+     *
+     * @return the file managers to be tested
+     */
+    List getTestFileManagers() {
+        StandardJavaFileManager systemFileManager = comp.getStandardFileManager(null, null, null);
+        StandardJavaFileManager customFileManager = new MyStandardJavaFileManager(systemFileManager);
+        return Arrays.asList(systemFileManager, customFileManager);
+    }
+
+    /**
+     * Tests a specific file manager, by calling all methods annotated
+     * with {@code @Test} passing this file manager as an argument.
+     *
+     * @param fm the file manager to be tested
+     * @throws Exception if the test fails
+     */
+    void test(StandardJavaFileManager fm) throws Exception {
+        System.err.println("Testing " + fm);
+        for (Method m: getClass().getDeclaredMethods()) {
+            Annotation a = m.getAnnotation(Test.class);
+            if (a != null) {
+                try {
+                    System.err.println("Test " + m.getName());
+                    m.invoke(this, new Object[] { fm });
+                } catch (InvocationTargetException e) {
+                    Throwable cause = e.getCause();
+                    throw (cause instanceof Exception) ? ((Exception) cause) : e;
+                }
+                System.err.println();
+            }
+        }
+    }
+
+    /** Marker annotation for test cases. */
+    @Retention(RetentionPolicy.RUNTIME)
+    @interface Test { }
+
+    /**
+     * Returns a series of paths for artifacts in the default file system.
+     * The paths are for the .java files in the test.src directory.
+     *
+     * @return a list of paths
+     * @throws IOException
+     */
+    List getTestFilePaths() throws IOException {
+        String testSrc = System.getProperty("test.src");
+        return Files.list(Paths.get(testSrc))
+                .filter(p -> p.getFileName().toString().endsWith(".java"))
+                .collect(Collectors.toList());
+    }
+
+    private FileSystem zipfs;
+    private List zipPaths;
+
+    /**
+     * Returns a series of paths for artifacts in a non-default file system.
+     * A zip file is created containing copies of the .java files in the
+     * test.src directory. The paths that are returned refer to these files.
+     *
+     * @return a list of paths
+     * @throws IOException
+     */
+    List getTestZipPaths() throws IOException {
+        if (zipfs == null) {
+            Path testZip = createSourceZip();
+            zipfs = FileSystems.newFileSystem(testZip, null);
+            closeables.add(zipfs);
+            zipPaths = Files.list(zipfs.getRootDirectories().iterator().next())
+                .filter(p -> p.getFileName().toString().endsWith(".java"))
+                .collect(Collectors.toList());
+        }
+        return zipPaths;
+    }
+
+    /**
+     * Create a zip file containing the contents of the test.src directory.
+     *
+     * @return a path for the zip file.
+     * @throws IOException if there is a problem creating the file
+     */
+    private Path createSourceZip() throws IOException {
+        Path testSrc = Paths.get(System.getProperty("test.src"));
+        Path testZip = Paths.get("test.zip");
+        try (OutputStream os = Files.newOutputStream(testZip)) {
+            try (ZipOutputStream zos = new ZipOutputStream(os)) {
+                Files.list(testSrc)
+                    .filter(p -> p.getFileName().toString().endsWith(".java"))
+                    .forEach(p -> {
+                        try {
+                            zos.putNextEntry(new ZipEntry(p.getFileName().toString()));
+                            zos.write(Files.readAllBytes(p));
+                            zos.closeEntry();
+                        } catch (IOException ex) {
+                            throw new UncheckedIOException(ex);
+                        }
+                    });
+            }
+        }
+        return testZip;
+    }
+
+    /**
+     * Tests whether it is expected that a file manager will be able
+     * to create a series of file objects from a series of paths.
+     *
+     * MyStandardJavaFileManager does not support paths referring to
+     * non-default file systems.
+     *
+     * @param fm  the file manager to be tested
+     * @param paths  the paths to be tested
+     * @return
+     */
+    boolean isGetFileObjectsSupported(StandardJavaFileManager fm, List paths) {
+        return !(fm instanceof MyStandardJavaFileManager
+                && (paths.get(0).getFileSystem() != FileSystems.getDefault()));
+    }
+
+    /**
+     * Report an error.
+     */
+    void error(String msg) {
+        System.err.println("Error: " + msg);
+        errors++;
+    }
+
+    /** Count of errors reported. */
+    int errors;
+
+}
diff --git a/langtools/test/tools/javac/conditional/ConditionalWithFinalStrings.java b/langtools/test/tools/javac/conditional/ConditionalWithFinalStrings.java
new file mode 100644
index 00000000000..f172802440f
--- /dev/null
+++ b/langtools/test/tools/javac/conditional/ConditionalWithFinalStrings.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8066871
+ * @summary java.lang.VerifyError: Bad local variable type - local final String
+ * @author Srikanth Sankaran
+ *
+ * @compile -g:none ConditionalWithFinalStrings.java
+ * @run main ConditionalWithFinalStrings
+ */
+
+public class ConditionalWithFinalStrings {
+
+        interface I {
+            String foo();
+        }
+
+        static class Tmp {
+                private String value;
+                public void setValue(String tmpStr) {
+                        this.value = tmpStr;
+                        if (!this.value.equals("YES"))
+                            throw new AssertionError();
+                }
+        }
+
+        void goo(I i) {
+            if (!i.foo().equals("YES"))
+                throw new AssertionError();
+        }
+
+        public void test() {
+                final String y = "YES";
+                final String n = "NO";
+                Tmp tmp = new Tmp();
+                tmp.setValue(true ? y : n);
+                goo (() -> y);
+
+        }
+        public static void main(String[] args) {
+                new ConditionalWithFinalStrings().test();
+                if (!id("Hello!").equals("Hello!"))
+                    throw new AssertionError();
+
+        }
+        static  Z id(Z z) { return z; }
+}
diff --git a/langtools/test/tools/javac/diags/MessageFile.java b/langtools/test/tools/javac/diags/MessageFile.java
index 1b22e0838de..cbf731c34ae 100644
--- a/langtools/test/tools/javac/diags/MessageFile.java
+++ b/langtools/test/tools/javac/diags/MessageFile.java
@@ -31,7 +31,9 @@ import java.util.regex.Pattern;
  */
 class MessageFile {
     static final Pattern emptyOrCommentPattern = Pattern.compile("( *#.*)?");
-    static final Pattern infoPattern = Pattern.compile("# ([0-9]+: [-A-Za-z ]+, )*[0-9]+: [-A-Za-z ]+");
+    static final Pattern typePattern = Pattern.compile("[-\\\\'A-Z\\.a-z ]+( \\([A-Za-z 0-9]+\\))?");
+    static final Pattern infoPattern = Pattern.compile(String.format("# ([0-9]+: %s, )*[0-9]+: %s",
+            typePattern.pattern(), typePattern.pattern()));
 
     /**
      * A line of text within the message file.
diff --git a/langtools/test/tools/javac/flow/LVTHarness.java b/langtools/test/tools/javac/flow/LVTHarness.java
index a9e31f6efc0..8d9f97438be 100644
--- a/langtools/test/tools/javac/flow/LVTHarness.java
+++ b/langtools/test/tools/javac/flow/LVTHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7047734 8027660 8037937 8047719 8058708
+ * @bug 7047734 8027660 8037937 8047719 8058708 8064857
  * @summary The LVT is not generated correctly during some try/catch scenarios
  *          javac crash while creating LVT entry for a local variable defined in
  *          an inner block
@@ -147,7 +147,7 @@ public class LVTHarness {
     }
 
     void checkMethod(ConstantPool constantPool, Method method, AliveRanges ranges)
-            throws InvalidIndex, UnexpectedEntry {
+            throws InvalidIndex, UnexpectedEntry, ConstantPoolException {
         Code_attribute code = (Code_attribute) method.attributes.get(Attribute.Code);
         LocalVariableTable_attribute lvt =
             (LocalVariableTable_attribute) (code.attributes.get(Attribute.LocalVariableTable));
@@ -169,7 +169,7 @@ public class LVTHarness {
         }
 
         if (i < infoFromRanges.size()) {
-            error(infoFromLVT, infoFromRanges);
+            error(infoFromLVT, infoFromRanges, method.getName(constantPool).toString());
         }
     }
 
@@ -205,9 +205,10 @@ public class LVTHarness {
         return sb.toString();
     }
 
-    protected void error(List infoFromLVT, List infoFromRanges) {
+    protected void error(List infoFromLVT, List infoFromRanges, String methodName) {
         nerrors++;
         System.err.printf("Error occurred while checking file: %s\n", jfo.getName());
+        System.err.printf("at method: %s\n", methodName);
         System.err.println("The range info from the annotations is");
         printStringListToErrOutput(infoFromRanges);
         System.err.println();
diff --git a/langtools/test/tools/javac/flow/tests/TestCaseFor.java b/langtools/test/tools/javac/flow/tests/TestCaseFor.java
index 10056b88086..e7564994244 100644
--- a/langtools/test/tools/javac/flow/tests/TestCaseFor.java
+++ b/langtools/test/tools/javac/flow/tests/TestCaseFor.java
@@ -2,7 +2,7 @@
 
 public class TestCaseFor {
 
-    @AliveRange(varName="o", bytecodeStart=10, bytecodeLength=8)
+    @AliveRange(varName="o", bytecodeStart=10, bytecodeLength=11)
     @AliveRange(varName="o", bytecodeStart=24, bytecodeLength=1)
     void m1(String[] args) {
         Object o;
@@ -13,7 +13,7 @@ public class TestCaseFor {
         o = "";
     }
 
-    @AliveRange(varName="o", bytecodeStart=10, bytecodeLength=8)
+    @AliveRange(varName="o", bytecodeStart=10, bytecodeLength=11)
     @AliveRange(varName="o", bytecodeStart=24, bytecodeLength=1)
     void m2(String[] args) {
         Object o;
diff --git a/langtools/test/tools/javac/flow/tests/TestCaseForEach.java b/langtools/test/tools/javac/flow/tests/TestCaseForEach.java
index 219f1180772..30b0c131122 100644
--- a/langtools/test/tools/javac/flow/tests/TestCaseForEach.java
+++ b/langtools/test/tools/javac/flow/tests/TestCaseForEach.java
@@ -2,7 +2,7 @@
 
 public class TestCaseForEach {
 
-    @AliveRange(varName="o", bytecodeStart=25, bytecodeLength=8)
+    @AliveRange(varName="o", bytecodeStart=25, bytecodeLength=11)
     @AliveRange(varName="o", bytecodeStart=39, bytecodeLength=1)
     void m(String[] args) {
         Object o;
diff --git a/langtools/test/tools/javac/flow/tests/TestCaseIfElse.java b/langtools/test/tools/javac/flow/tests/TestCaseIfElse.java
index d789853b43a..7318e545486 100644
--- a/langtools/test/tools/javac/flow/tests/TestCaseIfElse.java
+++ b/langtools/test/tools/javac/flow/tests/TestCaseIfElse.java
@@ -60,4 +60,19 @@ public class TestCaseIfElse {
         }
         return null;
     }
+
+    @AliveRange(varName="i", bytecodeStart=6, bytecodeLength=2)
+    int m4(boolean flag) {
+        int i;
+        label:
+        {
+            if (flag) {
+                i = 1;
+            } else {
+                break label;
+            }
+            return i;
+        }
+        return -1;
+    }
 }
diff --git a/langtools/test/tools/javac/flow/tests/TestCaseSwitch.java b/langtools/test/tools/javac/flow/tests/TestCaseSwitch.java
index e67e191122d..43ab1502483 100644
--- a/langtools/test/tools/javac/flow/tests/TestCaseSwitch.java
+++ b/langtools/test/tools/javac/flow/tests/TestCaseSwitch.java
@@ -81,4 +81,26 @@ public class TestCaseSwitch {
         o = "finish";
     }
 
+    @AliveRange(varName="oCache", bytecodeStart=30, bytecodeLength=6)
+    @AliveRange(varName="cache", bytecodeStart=41, bytecodeLength=3)
+    @AliveRange(varName="cache", bytecodeStart=54, bytecodeLength=2)
+    @AliveRange(varName="service", bytecodeStart=39, bytecodeLength=5)
+    Object m4(int i) {
+        Object cache;
+        switch (i) {
+            case 0:
+                Object oCache = null;
+                if (oCache != null) {
+                    return oCache;
+                }
+            case 1:
+                Object service = null;
+                cache = null;
+                break;
+            default:
+                throw new AssertionError("");
+            }
+        return cache;
+    }
+
 }
diff --git a/langtools/test/tools/javac/flow/tests/TestCaseTry.java b/langtools/test/tools/javac/flow/tests/TestCaseTry.java
index e987534ddfc..b3a3762bd20 100644
--- a/langtools/test/tools/javac/flow/tests/TestCaseTry.java
+++ b/langtools/test/tools/javac/flow/tests/TestCaseTry.java
@@ -17,7 +17,8 @@ public class TestCaseTry {
     }
 
     @AliveRange(varName="o", bytecodeStart=3, bytecodeLength=16)
-    @AliveRange(varName="o", bytecodeStart=23, bytecodeLength=23)
+    @AliveRange(varName="o", bytecodeStart=23, bytecodeLength=8)
+    @AliveRange(varName="o", bytecodeStart=35, bytecodeLength=11)
     void m1() {
         Object o;
         try {
@@ -33,7 +34,8 @@ public class TestCaseTry {
     }
 
     @AliveRange(varName="o", bytecodeStart=3, bytecodeLength=16)
-    @AliveRange(varName="o", bytecodeStart=23, bytecodeLength=31)
+    @AliveRange(varName="o", bytecodeStart=23, bytecodeLength=16)
+    @AliveRange(varName="o", bytecodeStart=43, bytecodeLength=11)
     void m2() {
         Object o;
         try {
@@ -51,7 +53,8 @@ public class TestCaseTry {
     }
 
     @AliveRange(varName="o", bytecodeStart=22, bytecodeLength=38)
-    @AliveRange(varName="o", bytecodeStart=103, bytecodeLength=8)
+    @AliveRange(varName="o", bytecodeStart=103, bytecodeLength=3)
+    @AliveRange(varName="o", bytecodeStart=110, bytecodeLength=1)
     void m3() {
         Object o;
         try (BufferedReader br =
diff --git a/langtools/test/tools/javac/flow/tests/TestCaseWhile.java b/langtools/test/tools/javac/flow/tests/TestCaseWhile.java
index bbe1f844422..47d3f3273b5 100644
--- a/langtools/test/tools/javac/flow/tests/TestCaseWhile.java
+++ b/langtools/test/tools/javac/flow/tests/TestCaseWhile.java
@@ -2,7 +2,7 @@
 
 public class TestCaseWhile {
 
-    @AliveRange(varName="o", bytecodeStart=9, bytecodeLength=5)
+    @AliveRange(varName="o", bytecodeStart=9, bytecodeLength=8)
     @AliveRange(varName="o", bytecodeStart=20, bytecodeLength=1)
     void m(String[] args) {
         Object o;
diff --git a/langtools/test/tools/javac/generics/MissingCast2.java b/langtools/test/tools/javac/generics/MissingCast2.java
new file mode 100644
index 00000000000..1c68d2c0854
--- /dev/null
+++ b/langtools/test/tools/javac/generics/MissingCast2.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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 8043741
+ * @summary VerifyError due to missing checkcast
+ * @author srikanth
+ *
+ * @compile  MissingCast2.java
+ * @run main MissingCast2
+ */
+
+import java.util.*;
+
+public class MissingCast2 {
+  public static void main(String[] args) {
+          new E();
+  }
+}
+
+class S {
+    T t;
+}
+
+class C {
+    class I { };
+}
+
+class E extends S {
+    {
+        t = new C();
+        t.new I() { };
+    }
+};
diff --git a/langtools/test/tools/javac/overrridecrash/B.java b/langtools/test/tools/javac/overrridecrash/B.java
index 468a32c0825..321d4e4608c 100644
--- a/langtools/test/tools/javac/overrridecrash/B.java
+++ b/langtools/test/tools/javac/overrridecrash/B.java
@@ -1,33 +1,10 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * 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
+ * @test /nodynamiccopyright/
  * @bug 4909690
  * @summary AssertionError(com.sun.tools.javac.v8.code.Symbol$MethodSymbol.isOverridableIn)
  * @author gafter
  *
- * @compile/fail B.java
+ * @compile/fail/ref=B.out -XDrawDiagnostics B.java
  */
 
 public class B extends A
diff --git a/langtools/test/tools/javac/overrridecrash/B.out b/langtools/test/tools/javac/overrridecrash/B.out
new file mode 100644
index 00000000000..cfe1aa11dcf
--- /dev/null
+++ b/langtools/test/tools/javac/overrridecrash/B.out
@@ -0,0 +1,3 @@
+B.java:12:27: compiler.err.illegal.combination.of.modifiers: private, protected
+A.java:25:27: compiler.err.illegal.combination.of.modifiers: private, protected
+2 errors
diff --git a/langtools/test/tools/javac/processing/6365040/T6365040.java b/langtools/test/tools/javac/processing/6365040/T6365040.java
index 11558412804..56194791fee 100644
--- a/langtools/test/tools/javac/processing/6365040/T6365040.java
+++ b/langtools/test/tools/javac/processing/6365040/T6365040.java
@@ -1,28 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
- * 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
+ * @test /nodynamiccopyright/
  * @bug 6365040 6358129
  * @summary Test -processor foo,bar,baz
  * @author  Joseph D. Darcy
@@ -34,8 +11,8 @@
  * @compile      -processor ProcFoo,ProcBar,T6365040  -proc:only T6365040.java
  * @compile      -processor T6365040                  -proc:only T6365040.java
  * @compile      -processor T6365040,NotThere,        -proc:only T6365040.java
- * @compile/fail -processor NotThere                  -proc:only T6365040.java
- * @compile/fail -processor NotThere,T6365040         -proc:only T6365040.java
+ * @compile/fail/ref=T6365040.out -XDrawDiagnostics -processor NotThere -proc:only T6365040.java
+ * @compile/fail/ref=T6365040.out -XDrawDiagnostics -processor NotThere,T6365040 -proc:only T6365040.java
  */
 
 import java.util.Set;
diff --git a/langtools/test/tools/javac/processing/6365040/T6365040.out b/langtools/test/tools/javac/processing/6365040/T6365040.out
new file mode 100644
index 00000000000..3b01100f5de
--- /dev/null
+++ b/langtools/test/tools/javac/processing/6365040/T6365040.out
@@ -0,0 +1,4 @@
+- compiler.err.proc.processor.not.found: NotThere
+- compiler.warn.proc.proc-only.requested.no.procs
+1 error
+1 warning
diff --git a/langtools/test/tools/javac/processing/6511613/clss41701.java b/langtools/test/tools/javac/processing/6511613/clss41701.java
index 0af3e0614c1..8ba180daf13 100644
--- a/langtools/test/tools/javac/processing/6511613/clss41701.java
+++ b/langtools/test/tools/javac/processing/6511613/clss41701.java
@@ -1,35 +1,11 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- * 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
+ * @test /nodynamiccopyright/
  * @bug 6511613
  * @summary javac unexpectedly doesn't fail in some cases if an annotation processor specified
- *
  * @library /tools/javac/lib
  * @build JavacTestingAbstractProcessor DummyProcessor
- * @compile/fail clss41701.java
- * @compile/fail -processor DummyProcessor clss41701.java
+ * @compile/fail/ref=clss41701.out -XDrawDiagnostics clss41701.java
+ * @compile/fail/ref=clss41701.out -XDrawDiagnostics -processor DummyProcessor clss41701.java
  */
 
 import java.io.PrintStream;
diff --git a/langtools/test/tools/javac/processing/6511613/clss41701.out b/langtools/test/tools/javac/processing/6511613/clss41701.out
new file mode 100644
index 00000000000..c8fe8664dcf
--- /dev/null
+++ b/langtools/test/tools/javac/processing/6511613/clss41701.out
@@ -0,0 +1,2 @@
+clss41701.java:19:30: compiler.err.type.var.may.not.be.followed.by.other.bounds
+1 error
diff --git a/langtools/test/tools/javac/processing/errors/TestFatalityOfParseErrors.java b/langtools/test/tools/javac/processing/errors/TestFatalityOfParseErrors.java
index 734844ed593..605829084d5 100644
--- a/langtools/test/tools/javac/processing/errors/TestFatalityOfParseErrors.java
+++ b/langtools/test/tools/javac/processing/errors/TestFatalityOfParseErrors.java
@@ -1,28 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
- * 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
+ * @test /nodynamiccopyright/
  * @bug 6403459
  * @summary Test that generating programs with syntax errors is a fatal condition
  * @author  Joseph D. Darcy
@@ -30,7 +7,7 @@
  * @build JavacTestingAbstractProcessor
  * @compile TestReturnCode.java
  * @compile TestFatalityOfParseErrors.java
- * @compile/fail -XprintRounds -processor TestFatalityOfParseErrors -proc:only TestFatalityOfParseErrors.java
+ * @compile/fail/ref=TestFatalityOfParseErrors.out -XDrawDiagnostics -XprintRounds -processor TestFatalityOfParseErrors -proc:only TestFatalityOfParseErrors.java
  */
 
 import java.util.Set;
@@ -49,41 +26,12 @@ import java.io.IOException;
  * is marked as an error.
  */
 public class TestFatalityOfParseErrors extends JavacTestingAbstractProcessor {
-    int round = 0;
 
     public boolean process(Set annotations,
                            RoundEnvironment roundEnvironment) {
-        try {
-            PrintWriter pw = null;
-            round++;
-
-            switch (round) {
-            case 1:
-                pw = new PrintWriter(filer.createSourceFile("SyntaxError").openWriter());
-                pw.println("class SyntaxError {");
-                pw.close();
-                break;
-
-            case 2:
-                pw = new PrintWriter(filer.createSourceFile("SimpleClass").openWriter());
-                pw.println("class SimpleClass {}");
-                pw.close();
-
-                if (!roundEnvironment.errorRaised() || !roundEnvironment.processingOver() ) {
-                    System.err.println(roundEnvironment);
-                    throw new RuntimeException("Second round not erroneous as expected.");
-                }
-                if (!roundEnvironment.getRootElements().isEmpty()) {
-                    System.err.println(roundEnvironment);
-                    throw new RuntimeException("Root elements not empty as expected.");
-                }
-                break;
-
-            default:
-                throw new RuntimeException("Unexpected round number " + round);
-            }
+        try (PrintWriter pw = new PrintWriter(filer.createSourceFile("SyntaxError").openWriter())) {
+            pw.println("class SyntaxError {");
         } catch (IOException ioException) {
-            throw new RuntimeException(ioException);
         }
         return true;
     }
diff --git a/langtools/test/tools/javac/processing/errors/TestFatalityOfParseErrors.out b/langtools/test/tools/javac/processing/errors/TestFatalityOfParseErrors.out
new file mode 100644
index 00000000000..23be9813f29
--- /dev/null
+++ b/langtools/test/tools/javac/processing/errors/TestFatalityOfParseErrors.out
@@ -0,0 +1,10 @@
+Round 1:
+	input files: {TestFatalityOfParseErrors}
+	annotations: []
+	last round: false
+Round 2:
+	input files: {}
+	annotations: []
+	last round: true
+SyntaxError.java:1:20: compiler.err.premature.eof
+1 error
diff --git a/langtools/test/tools/javac/processing/messager/MessagerBasics.java b/langtools/test/tools/javac/processing/messager/MessagerBasics.java
index 66a16c3ca38..f6c275dc1ef 100644
--- a/langtools/test/tools/javac/processing/messager/MessagerBasics.java
+++ b/langtools/test/tools/javac/processing/messager/MessagerBasics.java
@@ -1,28 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * 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
+ * @test    /nodynamiccopyright/
  * @bug     6341173 6341072
  * @summary Test presence of Messager methods
  * @author  Joseph D. Darcy
@@ -30,9 +7,9 @@
  * @build   JavacTestingAbstractProcessor
  * @compile MessagerBasics.java
  * @compile -processor MessagerBasics -proc:only MessagerBasics.java
- * @compile/fail -processor MessagerBasics -proc:only -AfinalError MessagerBasics.java
+ * @compile/fail/ref=MessagerBasics.out -XDrawDiagnostics -processor MessagerBasics -proc:only -AfinalError MessagerBasics.java
  * @compile -processor MessagerBasics MessagerBasics.java
- * @compile/fail -processor MessagerBasics -AfinalError MessagerBasics.java
+ * @compile/fail/ref=MessagerBasics.out -XDrawDiagnostics -processor MessagerBasics -AfinalError MessagerBasics.java
  */
 
 import java.util.Set;
diff --git a/langtools/test/tools/javac/processing/messager/MessagerBasics.out b/langtools/test/tools/javac/processing/messager/MessagerBasics.out
new file mode 100644
index 00000000000..271e6c9089f
--- /dev/null
+++ b/langtools/test/tools/javac/processing/messager/MessagerBasics.out
@@ -0,0 +1,2 @@
+- compiler.err.proc.messager: Does not compute
+1 error
diff --git a/langtools/test/tools/javac/staticQualifiedNew/StaticQualifiedNew.java b/langtools/test/tools/javac/staticQualifiedNew/StaticQualifiedNew.java
index fcd9f217450..410a55de312 100644
--- a/langtools/test/tools/javac/staticQualifiedNew/StaticQualifiedNew.java
+++ b/langtools/test/tools/javac/staticQualifiedNew/StaticQualifiedNew.java
@@ -1,33 +1,9 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * 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
+ * @test /nodynamiccopyright/
  * @bug 4295650
  * @summary Verify that qualified 'new' of static class is forbidden.
  * @author maddox (after gbracha)
- *
- * @compile/fail StaticQualifiedNew.java
+ * @compile/fail/ref=StaticQualifiedNew.out -XDrawDiagnostics StaticQualifiedNew.java
  */
 
 import p2.X;
diff --git a/langtools/test/tools/javac/staticQualifiedNew/StaticQualifiedNew.out b/langtools/test/tools/javac/staticQualifiedNew/StaticQualifiedNew.out
new file mode 100644
index 00000000000..a627d54e990
--- /dev/null
+++ b/langtools/test/tools/javac/staticQualifiedNew/StaticQualifiedNew.out
@@ -0,0 +1,2 @@
+StaticQualifiedNew.java:13:11: compiler.err.qualified.new.of.static.class: p2.X.M
+1 error
diff --git a/langtools/test/tools/javac/tree/8067914/E.out b/langtools/test/tools/javac/tree/8067914/E.out
new file mode 100644
index 00000000000..761680d95c1
--- /dev/null
+++ b/langtools/test/tools/javac/tree/8067914/E.out
@@ -0,0 +1,16 @@
+
+class E extends S {
+    
+    E() {
+        super();
+    }
+    {
+        t = new C();
+        new I(<*nullchk*>((C)t)){
+            
+            (.C x0) {
+                x0.super();
+            }
+        };
+    }
+}
diff --git a/langtools/test/tools/javac/tree/8067914/NukeExtraCast.java b/langtools/test/tools/javac/tree/8067914/NukeExtraCast.java
new file mode 100644
index 00000000000..23c55947bd3
--- /dev/null
+++ b/langtools/test/tools/javac/tree/8067914/NukeExtraCast.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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 8067914
+ * @summary Redunant type cast nodes in AST (follow up from JDK-8043741)
+ * @library /tools/lib
+ * @build ToolBox
+ * @run compile -XD-printsource T8067914.java
+ * @run main NukeExtraCast
+ */
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+public class NukeExtraCast {
+
+    public static void main(String[] args) throws Exception {
+        ToolBox tb = new ToolBox();
+        Path path1 = Paths.get(ToolBox.testClasses, "E.java");
+        List file1 = tb.readAllLines(path1);
+
+        Path path2 = Paths.get(ToolBox.testSrc, "E.out");
+        List file2 = tb.readAllLines(path2);
+        tb.checkEqual(file1, file2);
+    }
+
+}
diff --git a/langtools/test/tools/javac/tree/8067914/T8067914.java b/langtools/test/tools/javac/tree/8067914/T8067914.java
new file mode 100644
index 00000000000..2c9a56eea70
--- /dev/null
+++ b/langtools/test/tools/javac/tree/8067914/T8067914.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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 S { T t; }
+class C { class I { }; }
+class E extends S {{
+  t = new C();
+  ((C) t).new I() { };
+}};
+class X {
+  public static void main(String[] args) { new E(); }
+}
+
diff --git a/make/Jprt.gmk b/make/Jprt.gmk
index 48ae1cf4623..516e5ff615d 100644
--- a/make/Jprt.gmk
+++ b/make/Jprt.gmk
@@ -35,6 +35,9 @@ ifneq ($(CYGPATH), )
   ifdef JPRT_ARCHIVE_INSTALL_BUNDLE
     override JPRT_ARCHIVE_INSTALL_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_INSTALL_BUNDLE))
   endif
+  ifdef JPRT_ARCHIVE_TEST_BUNDLE
+    override JPRT_ARCHIVE_TEST_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_TEST_BUNDLE))
+  endif
 endif
 
 # When running in JPRT these will be provided. Need defaults so that this makefile
@@ -45,13 +48,16 @@ endif
 ifndef JPRT_ARCHIVE_INSTALL_BUNDLE
   JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip
 endif
+ifndef JPRT_ARCHIVE_TEST_BUNDLE
+  JPRT_ARCHIVE_TEST_BUNDLE=/tmp/jprt_bundles/test-image.zip
+endif
 
 ifeq ($(SKIP_BOOT_CYCLE), false)
   jprt_bundle: bootcycle-images
 endif
 
 # This target must be called in the context of a SPEC file
-jprt_bundle: $(JPRT_ARCHIVE_BUNDLE)
+jprt_bundle: $(JPRT_ARCHIVE_BUNDLE) $(JPRT_ARCHIVE_TEST_BUNDLE)
 
 # This target must be called in the context of a SPEC file
 $(JPRT_ARCHIVE_BUNDLE): bundles
@@ -59,8 +65,14 @@ $(JPRT_ARCHIVE_BUNDLE): bundles
 	$(RM) $@
 	$(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@
 
+$(JPRT_ARCHIVE_TEST_BUNDLE): bundles
+	$(MKDIR) -p $(@D)
+	$(RM) $@
+	$(CP) $(BUILD_OUTPUT)/bundles/$(TEST_IMAGE_SUBDIR).zip $@
+
 SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
 SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
+SRC_TEST_IMAGE_DIR := $(TEST_IMAGE_DIR)
 SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR)
 SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR)
 
@@ -70,6 +82,7 @@ bundles: all
 	$(MKDIR) -p $(BUILD_OUTPUT)/bundles
 	$(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
 	$(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
+	$(CD) $(SRC_TEST_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(TEST_IMAGE_SUBDIR).zip .
 	if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \
 	  $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
 	fi
diff --git a/make/Main.gmk b/make/Main.gmk
index 0f705491b0a..a46f1de8508 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -238,8 +238,12 @@ profiles:
 mac-bundles:
 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk)
 
+prepare-test-image:
+	$(MKDIR) -p $(TEST_IMAGE_DIR)
+	$(ECHO) > $(TEST_IMAGE_DIR)/Readme.txt 'JDK test image'
+
 ALL_TARGETS += source-tips bootcycle-images zip-security zip-source strip-binaries \
-    jrtfs-jar jimages profiles mac-bundles
+    jrtfs-jar jimages profiles mac-bundles prepare-test-image
 
 ################################################################################
 # Docs targets
@@ -442,7 +446,7 @@ exploded-image: $(ALL_MODULE_TARGETS)
 # alias for ease of use.
 jdk: exploded-image
 
-images: jimages demos samples zip-security
+images: test-image jimages demos samples zip-security
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   images: mac-bundles
@@ -450,9 +454,11 @@ endif
 
 docs: docs-javadoc docs-jvmtidoc
 
+test-image: prepare-test-image
+
 ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers \
     jdk.jdwp.agent-gensrc $(ALL_MODULE_TARGETS) exploded-image jdk images \
-    docs
+    docs test-image
 
 ################################################################################
 
diff --git a/modules.xml b/modules.xml
index 8cfeb74f2b6..3195fd55960 100644
--- a/modules.xml
+++ b/modules.xml
@@ -482,6 +482,7 @@
     java.logging
     java.naming
     java.rmi
+    java.transaction
     
       javax.activity
     
@@ -491,9 +492,6 @@
     
       javax.rmi.CORBA
     
-    
-      javax.transaction
-    
     
       org.omg.CORBA
     
@@ -888,8 +886,8 @@
     java.compact3
     java.corba
     java.desktop
+    java.transaction
     java.xml.bind
-    java.xml.soap
     java.xml.ws
   
   
@@ -981,6 +979,14 @@
       javax.sql.rowset.spi
     
   
+  
+    java.transaction
+    java.base
+    java.rmi
+    
+      javax.transaction
+    
+  
   
     java.xml
     java.base
@@ -1056,17 +1062,17 @@
     
       org.xml.sax.helpers
     
-    
-      com.sun.org.apache.xerces.internal.dom
-      java.xml.soap
-    
-    
-      com.sun.org.apache.xerces.internal.jaxp
-      java.xml.soap
-    
-    
-      com.sun.org.apache.xerces.internal.util
-      java.xml.soap
+     
+       com.sun.org.apache.xerces.internal.dom
+       java.xml.ws
+     
+     
+       com.sun.org.apache.xerces.internal.jaxp
+       java.xml.ws
+     
+     
+       com.sun.org.apache.xerces.internal.util
+       java.xml.ws
     
     
       com.sun.org.apache.xml.internal.dtm
@@ -1262,17 +1268,14 @@
     
     
       com.sun.xml.internal.org.jvnet.mimepull
-      java.xml.soap
       java.xml.ws
     
     
       com.sun.xml.internal.org.jvnet.staxex
-      java.xml.soap
       java.xml.ws
     
     
       com.sun.xml.internal.org.jvnet.staxex.util
-      java.xml.soap
       java.xml.ws
     
     
@@ -1318,30 +1321,17 @@
       javax.xml.crypto.dsig.spec
     
   
-  
-    java.xml.soap
-    java.activation
-    java.base
-    java.desktop
-    java.logging
-    java.xml
-    java.xml.bind
-    
-      javax.xml.soap
-    
-  
   
     java.xml.ws
-    java.activation
     java.annotations.common
     java.base
     java.desktop
     java.logging
     java.management
     java.rmi
+    java.activation
     java.xml
     java.xml.bind
-    java.xml.soap
     jdk.httpserver
     
       javax.jws
@@ -1349,6 +1339,9 @@
     
       javax.jws.soap
     
+    
+      javax.xml.soap
+    
     
       javax.xml.ws
     
diff --git a/nashorn/.hgtags b/nashorn/.hgtags
index e00c3fdde79..924fdc2e2ad 100644
--- a/nashorn/.hgtags
+++ b/nashorn/.hgtags
@@ -278,3 +278,4 @@ dd7bbdf81a537106cfa9227d1a9a57849cb26b4d jdk9-b37
 498d1d6c4219086143b764b3bf61afe65dcece47 jdk9-b42
 8ae8dff2a28f3b8831cce97ae0c7a957c5dc650a jdk9-b43
 50ee576062726e536d1bb9a5eadd8fd4470128fc jdk9-b44
+3c2bbeda038aef7061455fec604db7d8a342fac5 jdk9-b45
diff --git a/nashorn/samples/jd.js b/nashorn/samples/jd.js
new file mode 100644
index 00000000000..7b7bc9657fa
--- /dev/null
+++ b/nashorn/samples/jd.js
@@ -0,0 +1,94 @@
+#// Usage: jjs -cp  jd.js --  [jdis|jdec]
+
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// javap-like disassembler/decoder tool that disassembles/decodes 
+// java classes but with OpenJDK AsmTools disassembler/decoder syntax.
+// You need to build asmtool.jar from OpenJDK codetools project
+// specify it with -cp option.
+
+// See also https://wiki.openjdk.java.net/display/CodeTools/AsmTools
+
+function usage() {
+    print("Usage: jjs -cp  jd.js --  [jdis|jdec]");
+    exit(1);
+}
+
+if (arguments.length == 0) {
+    usage();
+}
+
+// argument handling
+// convert to internal class name
+var className = arguments[0].replaceAll('\\.', '/');
+var tool;
+if (arguments.length > 1) {
+    tool = arguments[1];
+    switch (tool) {
+        case 'jdis':
+        case 'jdec':
+            break;
+        default:
+            usage();
+    }
+} else {
+    tool = "jdis"; // default tool
+}
+
+// Java classes used
+var AsmTools = Java.type("org.openjdk.asmtools.Main");
+var Files = Java.type("java.nio.file.Files");
+var StandardCopyOption = Java.type("java.nio.file.StandardCopyOption");
+
+// retrive input stream for .class bytes
+var cl = AsmTools.class.classLoader;
+var res = cl.getResource(className + ".class");
+
+if (res) {
+    var is = res.openStream();
+    var tmpPath;
+    try {
+        // copy the content of the .class to a temp file
+        tmpPath = Files.createTempFile("asmtools-", ".class");
+        // mark as delete-on-exit
+        tmpPath.toFile().deleteOnExit();
+        Files.copy(is, tmpPath, [ StandardCopyOption.REPLACE_EXISTING ]);
+    } finally {
+        is.close();
+    } 
+
+    // invoke asmtools Main
+    AsmTools.main([ tool, tmpPath.toString() ]);
+} else {
+    print("no such class: " + arguments[0]);
+    exit(1);
+}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java
index a7761645cc9..84fdec81641 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java
@@ -36,7 +36,10 @@ import java.util.Set;
  * treat objects of such classes just like nashorn script objects. Usual nashorn
  * operations like obj[i], obj.foo, obj.func(), delete obj.foo will be glued
  * to appropriate method call of this class.
+ *
+ * @since 1.8u40
  */
+@jdk.Exported
 public abstract class AbstractJSObject implements JSObject {
     /**
      * Call this object as a JavaScript function. This is equivalent to
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java
index ddf1bc33b2a..1a03c1768f7 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java
@@ -28,7 +28,10 @@ package jdk.nashorn.api.scripting;
  * Class filter (optional) to be used by nashorn script engine.
  * jsr-223 program embedding nashorn script can set ClassFilter instance
  * to be used when an engine instance is created.
+ *
+ * @since 1.8u40
  */
+@jdk.Exported
 public interface ClassFilter {
      /**
       * Should the Java class of the specified name be exposed to scripts?
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java
index 8d818642ef5..d6525f5b8de 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java
@@ -33,7 +33,10 @@ import java.util.Set;
  * treat objects of such classes just like nashorn script objects. Usual nashorn
  * operations like obj[i], obj.foo, obj.func(), delete obj.foo will be glued
  * to appropriate method call of this interface.
+ *
+ * @since 1.8u40
  */
+@jdk.Exported
 public interface JSObject {
     /**
      * Call this object as a JavaScript function. This is equivalent to
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java
index 098f850822d..004c1c03c4f 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java
@@ -41,7 +41,10 @@ import jdk.nashorn.internal.runtime.ScriptObject;
  * script object or Java access to script object properties via java.util.Map
  * interface. In these cases, user code will get an instance of this or
  * implementation defined subclass.
+ *
+ * @since 1.8u40
  */
+@jdk.Exported
 @SuppressWarnings("serial")
 public abstract class NashornException extends RuntimeException {
     // script file name
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java
index 2f000954815..46925c4f3f6 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -65,8 +65,10 @@ import jdk.nashorn.internal.runtime.options.Options;
  * {@link NashornScriptEngineFactory#getScriptEngine()}. Note that this engine implements the {@link Compilable} and
  * {@link Invocable} interfaces, allowing for efficient precompilation and repeated execution of scripts.
  * @see NashornScriptEngineFactory
+ *
+ * @since 1.8u40
  */
-
+@jdk.Exported
 public final class NashornScriptEngine extends AbstractScriptEngine implements Compilable, Invocable {
     /**
      * Key used to associate Nashorn global object mirror with arbitrary Bindings instance.
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
index 4ddcf947ea1..7201b9410b2 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
@@ -44,7 +44,10 @@ import jdk.nashorn.internal.runtime.Version;
  * 
  * Programs executing in engines created using {@link #getScriptEngine(String[])} will have the passed arguments
  * accessible as a global variable named {@code "arguments"}.
+ *
+ * @since 1.8u40
  */
+@jdk.Exported
 public final class NashornScriptEngineFactory implements ScriptEngineFactory {
     @Override
     public String getEngineName() {
@@ -120,7 +123,7 @@ public final class NashornScriptEngineFactory implements ScriptEngineFactory {
             // used to execute scripts concurrently on multiple threads.
             return null;
         default:
-            throw new IllegalArgumentException("Invalid key");
+            return null;
         }
     }
 
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java
index e28da041a77..1108a34e775 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java
@@ -54,7 +54,10 @@ import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 
 /**
  * Mirror object that wraps a given Nashorn Script object.
+ *
+ * @since 1.8u40
  */
+@jdk.Exported
 public final class ScriptObjectMirror extends AbstractJSObject implements Bindings {
     private static AccessControlContext getContextAccCtxt() {
         final Permissions perms = new Permissions();
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java
index e6e3915ab29..af99d9a2d1d 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java
@@ -36,7 +36,10 @@ import jdk.nashorn.internal.runtime.linker.Bootstrap;
 
 /**
  * Utilities that are to be called from script code.
+ *
+ * @since 1.8u40
  */
+@jdk.Exported
 public final class ScriptUtils {
     private ScriptUtils() {}
 
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java
index 53efeee7d0a..bd16629d6c8 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java
@@ -35,7 +35,10 @@ import jdk.nashorn.internal.runtime.Source;
 /**
  * A Reader that reads from a URL. Used to make sure that the reader
  * reads content from given URL and can be trusted to do so.
+ *
+ * @since 1.8u40
  */
+@jdk.Exported
 public final class URLReader extends Reader {
     // underlying URL
     private final URL url;
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java
index f017ba9ef4f..1890924f21c 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java
@@ -35,5 +35,8 @@
  * interfaces, allowing for efficient pre-compilation and repeated execution of scripts. In addition,
  * this package provides nashorn specific extension classes, interfaces and methods. See
  * {@link jdk.nashorn.api.scripting.NashornScriptEngineFactory} for further details.
+ *
+ * @since 1.8u40
  */
+@jdk.Exported
 package jdk.nashorn.api.scripting;
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java
index 32173a6c543..b4ccca17b11 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -38,7 +38,6 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
 import static jdk.nashorn.internal.codegen.CompilerConstants.SPLIT_PREFIX;
 import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
 import static jdk.nashorn.internal.codegen.CompilerConstants.VARARGS;
-import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
 import static jdk.nashorn.internal.codegen.CompilerConstants.interfaceCallNoLookup;
 import static jdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
 import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
@@ -186,9 +185,6 @@ final class CodeGenerator extends NodeOperatorVisitor ITERATOR_CLASS = Iterator.class;
     static {
         assert ITERATOR_CLASS == CompilerConstants.ITERATOR_PREFIX.type();
@@ -2242,7 +2243,6 @@ final class CodeGenerator extends NodeOperatorVisitor node, final TypeBounds resultBounds) {
         final Object value = node.getValue();
@@ -4323,15 +4327,13 @@ final class CodeGenerator extends NodeOperatorVisitor>, AdapterInfo> adapterInfoMap = ADAPTER_INFO_MAPS.get(definingClassAndLoader.getRepresentativeClass());
-        final List> typeList = types.length == 1 ? getSingletonClassList(types[0]) : Arrays.asList(types.clone());
+        final List> typeList = types.length == 1 ? Collections.>singletonList(types[0]) : Arrays.asList(types.clone());
         AdapterInfo adapterInfo;
         synchronized(adapterInfoMap) {
             adapterInfo = adapterInfoMap.get(typeList);
@@ -196,11 +196,6 @@ public final class JavaAdapterFactory {
         return adapterInfo;
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    private static List> getSingletonClassList(final Class clazz) {
-        return (List)Collections.singletonList(clazz);
-    }
-
    /**
      * For a given class, create its adapter class and associated info.
      * @param type the class for which the adapter is created
@@ -241,6 +236,8 @@ public final class JavaAdapterFactory {
                     return new AdapterInfo(effectiveSuperClass, interfaces, definingClassAndLoader);
                 } catch (final AdaptationException e) {
                     return new AdapterInfo(e.getAdaptationResult());
+                } catch (final RuntimeException e) {
+                    return new AdapterInfo(new AdaptationResult(AdaptationResult.Outcome.ERROR_OTHER, Arrays.toString(types), e.toString()));
                 }
             }
         }, CREATE_ADAPTER_INFO_ACC_CTXT);
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties
index 119277dfd84..e48ba6c91cf 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties
@@ -141,6 +141,7 @@ type.error.extend.ERROR_NO_ACCESSIBLE_CONSTRUCTOR=Can not extend class {0} as it
 type.error.extend.ERROR_MULTIPLE_SUPERCLASSES=Can not extend multiple classes {0}. At most one of the specified types can be a class, the rest must all be interfaces.
 type.error.extend.ERROR_NO_COMMON_LOADER=Can not find a common class loader for ScriptObject and {0}.
 type.error.extend.ERROR_FINAL_FINALIZER=Can not extend class because {0} has a final finalize method.
+type.error.extend.ERROR_OTHER=Can not extend/implement {0} because of {1}
 type.error.no.constructor.matches.args=Can not construct {0} with the passed arguments; they do not match any of its constructor signatures.
 type.error.no.method.matches.args=Can not invoke method {0} with the passed arguments; they do not match any of its method signatures.
 type.error.method.not.constructor=Java method {0} cannot be used as a constructor.
diff --git a/nashorn/test/script/basic/JDK-8068580.js b/nashorn/test/script/basic/JDK-8068580.js
new file mode 100644
index 00000000000..ca44b28a7e9
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8068580.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * 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-8068580: make JavaAdapterFactory.isAutoConvertibleFromFunction more robust
+ *
+ * @test
+ * @run
+ */
+
+var BigAbstract = Java.type("jdk.nashorn.test.models.BigAbstract")
+try {
+    new BigAbstract({});
+} catch (e) {
+    Assert.assertTrue(e instanceof TypeError);
+    Assert.assertEquals(e.message, "Can not extend/implement [class jdk.nashorn.test.models.BigAbstract] because of java.lang.RuntimeException: Method code too large!");
+}
+try {
+    BigAbstract.accept(function() { });
+} catch (e) {
+    Assert.assertSame(e.class, java.lang.ClassCastException.class);
+}
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
index a066d6b37aa..e2e28852d5f 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
@@ -27,6 +27,7 @@ package jdk.nashorn.api.scripting;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 import java.io.StringReader;
@@ -668,6 +669,17 @@ public class ScriptEngineTest {
         assertEquals("helloworld", inv.invokeMethod(ctx.get(), "join", ""));
     }
 
+    // @bug 8068524: NashornScriptEngineFactory.getParameter() throws IAE
+    // for an unknown key, doesn't conform to the general spec
+    @Test
+    public void getParameterInvalidKeyTest() throws Exception {
+        final ScriptEngineManager manager = new ScriptEngineManager();
+        final ScriptEngine e = manager.getEngineByName("nashorn");
+        // no exception expected here!
+        Object value = e.getFactory().getParameter("no value assigned to this key");
+        assertNull(value);
+    }
+
     private static void checkProperty(final ScriptEngine e, final String name)
         throws ScriptException {
         final String value = System.getProperty(name);
diff --git a/nashorn/test/src/jdk/nashorn/test/models/BigAbstract.java b/nashorn/test/src/jdk/nashorn/test/models/BigAbstract.java
new file mode 100644
index 00000000000..2075eeb6974
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/test/models/BigAbstract.java
@@ -0,0 +1,4709 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.test.models;
+
+public abstract class BigAbstract {
+    public static void accept(BigAbstract ba) {
+    }
+
+    public abstract void f0();
+    public abstract void f1();
+    public abstract void f2();
+    public abstract void f3();
+    public abstract void f4();
+    public abstract void f5();
+    public abstract void f6();
+    public abstract void f7();
+    public abstract void f8();
+    public abstract void f9();
+    public abstract void f10();
+    public abstract void f11();
+    public abstract void f12();
+    public abstract void f13();
+    public abstract void f14();
+    public abstract void f15();
+    public abstract void f16();
+    public abstract void f17();
+    public abstract void f18();
+    public abstract void f19();
+    public abstract void f20();
+    public abstract void f21();
+    public abstract void f22();
+    public abstract void f23();
+    public abstract void f24();
+    public abstract void f25();
+    public abstract void f26();
+    public abstract void f27();
+    public abstract void f28();
+    public abstract void f29();
+    public abstract void f30();
+    public abstract void f31();
+    public abstract void f32();
+    public abstract void f33();
+    public abstract void f34();
+    public abstract void f35();
+    public abstract void f36();
+    public abstract void f37();
+    public abstract void f38();
+    public abstract void f39();
+    public abstract void f40();
+    public abstract void f41();
+    public abstract void f42();
+    public abstract void f43();
+    public abstract void f44();
+    public abstract void f45();
+    public abstract void f46();
+    public abstract void f47();
+    public abstract void f48();
+    public abstract void f49();
+    public abstract void f50();
+    public abstract void f51();
+    public abstract void f52();
+    public abstract void f53();
+    public abstract void f54();
+    public abstract void f55();
+    public abstract void f56();
+    public abstract void f57();
+    public abstract void f58();
+    public abstract void f59();
+    public abstract void f60();
+    public abstract void f61();
+    public abstract void f62();
+    public abstract void f63();
+    public abstract void f64();
+    public abstract void f65();
+    public abstract void f66();
+    public abstract void f67();
+    public abstract void f68();
+    public abstract void f69();
+    public abstract void f70();
+    public abstract void f71();
+    public abstract void f72();
+    public abstract void f73();
+    public abstract void f74();
+    public abstract void f75();
+    public abstract void f76();
+    public abstract void f77();
+    public abstract void f78();
+    public abstract void f79();
+    public abstract void f80();
+    public abstract void f81();
+    public abstract void f82();
+    public abstract void f83();
+    public abstract void f84();
+    public abstract void f85();
+    public abstract void f86();
+    public abstract void f87();
+    public abstract void f88();
+    public abstract void f89();
+    public abstract void f90();
+    public abstract void f91();
+    public abstract void f92();
+    public abstract void f93();
+    public abstract void f94();
+    public abstract void f95();
+    public abstract void f96();
+    public abstract void f97();
+    public abstract void f98();
+    public abstract void f99();
+    public abstract void f100();
+    public abstract void f101();
+    public abstract void f102();
+    public abstract void f103();
+    public abstract void f104();
+    public abstract void f105();
+    public abstract void f106();
+    public abstract void f107();
+    public abstract void f108();
+    public abstract void f109();
+    public abstract void f110();
+    public abstract void f111();
+    public abstract void f112();
+    public abstract void f113();
+    public abstract void f114();
+    public abstract void f115();
+    public abstract void f116();
+    public abstract void f117();
+    public abstract void f118();
+    public abstract void f119();
+    public abstract void f120();
+    public abstract void f121();
+    public abstract void f122();
+    public abstract void f123();
+    public abstract void f124();
+    public abstract void f125();
+    public abstract void f126();
+    public abstract void f127();
+    public abstract void f128();
+    public abstract void f129();
+    public abstract void f130();
+    public abstract void f131();
+    public abstract void f132();
+    public abstract void f133();
+    public abstract void f134();
+    public abstract void f135();
+    public abstract void f136();
+    public abstract void f137();
+    public abstract void f138();
+    public abstract void f139();
+    public abstract void f140();
+    public abstract void f141();
+    public abstract void f142();
+    public abstract void f143();
+    public abstract void f144();
+    public abstract void f145();
+    public abstract void f146();
+    public abstract void f147();
+    public abstract void f148();
+    public abstract void f149();
+    public abstract void f150();
+    public abstract void f151();
+    public abstract void f152();
+    public abstract void f153();
+    public abstract void f154();
+    public abstract void f155();
+    public abstract void f156();
+    public abstract void f157();
+    public abstract void f158();
+    public abstract void f159();
+    public abstract void f160();
+    public abstract void f161();
+    public abstract void f162();
+    public abstract void f163();
+    public abstract void f164();
+    public abstract void f165();
+    public abstract void f166();
+    public abstract void f167();
+    public abstract void f168();
+    public abstract void f169();
+    public abstract void f170();
+    public abstract void f171();
+    public abstract void f172();
+    public abstract void f173();
+    public abstract void f174();
+    public abstract void f175();
+    public abstract void f176();
+    public abstract void f177();
+    public abstract void f178();
+    public abstract void f179();
+    public abstract void f180();
+    public abstract void f181();
+    public abstract void f182();
+    public abstract void f183();
+    public abstract void f184();
+    public abstract void f185();
+    public abstract void f186();
+    public abstract void f187();
+    public abstract void f188();
+    public abstract void f189();
+    public abstract void f190();
+    public abstract void f191();
+    public abstract void f192();
+    public abstract void f193();
+    public abstract void f194();
+    public abstract void f195();
+    public abstract void f196();
+    public abstract void f197();
+    public abstract void f198();
+    public abstract void f199();
+    public abstract void f200();
+    public abstract void f201();
+    public abstract void f202();
+    public abstract void f203();
+    public abstract void f204();
+    public abstract void f205();
+    public abstract void f206();
+    public abstract void f207();
+    public abstract void f208();
+    public abstract void f209();
+    public abstract void f210();
+    public abstract void f211();
+    public abstract void f212();
+    public abstract void f213();
+    public abstract void f214();
+    public abstract void f215();
+    public abstract void f216();
+    public abstract void f217();
+    public abstract void f218();
+    public abstract void f219();
+    public abstract void f220();
+    public abstract void f221();
+    public abstract void f222();
+    public abstract void f223();
+    public abstract void f224();
+    public abstract void f225();
+    public abstract void f226();
+    public abstract void f227();
+    public abstract void f228();
+    public abstract void f229();
+    public abstract void f230();
+    public abstract void f231();
+    public abstract void f232();
+    public abstract void f233();
+    public abstract void f234();
+    public abstract void f235();
+    public abstract void f236();
+    public abstract void f237();
+    public abstract void f238();
+    public abstract void f239();
+    public abstract void f240();
+    public abstract void f241();
+    public abstract void f242();
+    public abstract void f243();
+    public abstract void f244();
+    public abstract void f245();
+    public abstract void f246();
+    public abstract void f247();
+    public abstract void f248();
+    public abstract void f249();
+    public abstract void f250();
+    public abstract void f251();
+    public abstract void f252();
+    public abstract void f253();
+    public abstract void f254();
+    public abstract void f255();
+    public abstract void f256();
+    public abstract void f257();
+    public abstract void f258();
+    public abstract void f259();
+    public abstract void f260();
+    public abstract void f261();
+    public abstract void f262();
+    public abstract void f263();
+    public abstract void f264();
+    public abstract void f265();
+    public abstract void f266();
+    public abstract void f267();
+    public abstract void f268();
+    public abstract void f269();
+    public abstract void f270();
+    public abstract void f271();
+    public abstract void f272();
+    public abstract void f273();
+    public abstract void f274();
+    public abstract void f275();
+    public abstract void f276();
+    public abstract void f277();
+    public abstract void f278();
+    public abstract void f279();
+    public abstract void f280();
+    public abstract void f281();
+    public abstract void f282();
+    public abstract void f283();
+    public abstract void f284();
+    public abstract void f285();
+    public abstract void f286();
+    public abstract void f287();
+    public abstract void f288();
+    public abstract void f289();
+    public abstract void f290();
+    public abstract void f291();
+    public abstract void f292();
+    public abstract void f293();
+    public abstract void f294();
+    public abstract void f295();
+    public abstract void f296();
+    public abstract void f297();
+    public abstract void f298();
+    public abstract void f299();
+    public abstract void f300();
+    public abstract void f301();
+    public abstract void f302();
+    public abstract void f303();
+    public abstract void f304();
+    public abstract void f305();
+    public abstract void f306();
+    public abstract void f307();
+    public abstract void f308();
+    public abstract void f309();
+    public abstract void f310();
+    public abstract void f311();
+    public abstract void f312();
+    public abstract void f313();
+    public abstract void f314();
+    public abstract void f315();
+    public abstract void f316();
+    public abstract void f317();
+    public abstract void f318();
+    public abstract void f319();
+    public abstract void f320();
+    public abstract void f321();
+    public abstract void f322();
+    public abstract void f323();
+    public abstract void f324();
+    public abstract void f325();
+    public abstract void f326();
+    public abstract void f327();
+    public abstract void f328();
+    public abstract void f329();
+    public abstract void f330();
+    public abstract void f331();
+    public abstract void f332();
+    public abstract void f333();
+    public abstract void f334();
+    public abstract void f335();
+    public abstract void f336();
+    public abstract void f337();
+    public abstract void f338();
+    public abstract void f339();
+    public abstract void f340();
+    public abstract void f341();
+    public abstract void f342();
+    public abstract void f343();
+    public abstract void f344();
+    public abstract void f345();
+    public abstract void f346();
+    public abstract void f347();
+    public abstract void f348();
+    public abstract void f349();
+    public abstract void f350();
+    public abstract void f351();
+    public abstract void f352();
+    public abstract void f353();
+    public abstract void f354();
+    public abstract void f355();
+    public abstract void f356();
+    public abstract void f357();
+    public abstract void f358();
+    public abstract void f359();
+    public abstract void f360();
+    public abstract void f361();
+    public abstract void f362();
+    public abstract void f363();
+    public abstract void f364();
+    public abstract void f365();
+    public abstract void f366();
+    public abstract void f367();
+    public abstract void f368();
+    public abstract void f369();
+    public abstract void f370();
+    public abstract void f371();
+    public abstract void f372();
+    public abstract void f373();
+    public abstract void f374();
+    public abstract void f375();
+    public abstract void f376();
+    public abstract void f377();
+    public abstract void f378();
+    public abstract void f379();
+    public abstract void f380();
+    public abstract void f381();
+    public abstract void f382();
+    public abstract void f383();
+    public abstract void f384();
+    public abstract void f385();
+    public abstract void f386();
+    public abstract void f387();
+    public abstract void f388();
+    public abstract void f389();
+    public abstract void f390();
+    public abstract void f391();
+    public abstract void f392();
+    public abstract void f393();
+    public abstract void f394();
+    public abstract void f395();
+    public abstract void f396();
+    public abstract void f397();
+    public abstract void f398();
+    public abstract void f399();
+    public abstract void f400();
+    public abstract void f401();
+    public abstract void f402();
+    public abstract void f403();
+    public abstract void f404();
+    public abstract void f405();
+    public abstract void f406();
+    public abstract void f407();
+    public abstract void f408();
+    public abstract void f409();
+    public abstract void f410();
+    public abstract void f411();
+    public abstract void f412();
+    public abstract void f413();
+    public abstract void f414();
+    public abstract void f415();
+    public abstract void f416();
+    public abstract void f417();
+    public abstract void f418();
+    public abstract void f419();
+    public abstract void f420();
+    public abstract void f421();
+    public abstract void f422();
+    public abstract void f423();
+    public abstract void f424();
+    public abstract void f425();
+    public abstract void f426();
+    public abstract void f427();
+    public abstract void f428();
+    public abstract void f429();
+    public abstract void f430();
+    public abstract void f431();
+    public abstract void f432();
+    public abstract void f433();
+    public abstract void f434();
+    public abstract void f435();
+    public abstract void f436();
+    public abstract void f437();
+    public abstract void f438();
+    public abstract void f439();
+    public abstract void f440();
+    public abstract void f441();
+    public abstract void f442();
+    public abstract void f443();
+    public abstract void f444();
+    public abstract void f445();
+    public abstract void f446();
+    public abstract void f447();
+    public abstract void f448();
+    public abstract void f449();
+    public abstract void f450();
+    public abstract void f451();
+    public abstract void f452();
+    public abstract void f453();
+    public abstract void f454();
+    public abstract void f455();
+    public abstract void f456();
+    public abstract void f457();
+    public abstract void f458();
+    public abstract void f459();
+    public abstract void f460();
+    public abstract void f461();
+    public abstract void f462();
+    public abstract void f463();
+    public abstract void f464();
+    public abstract void f465();
+    public abstract void f466();
+    public abstract void f467();
+    public abstract void f468();
+    public abstract void f469();
+    public abstract void f470();
+    public abstract void f471();
+    public abstract void f472();
+    public abstract void f473();
+    public abstract void f474();
+    public abstract void f475();
+    public abstract void f476();
+    public abstract void f477();
+    public abstract void f478();
+    public abstract void f479();
+    public abstract void f480();
+    public abstract void f481();
+    public abstract void f482();
+    public abstract void f483();
+    public abstract void f484();
+    public abstract void f485();
+    public abstract void f486();
+    public abstract void f487();
+    public abstract void f488();
+    public abstract void f489();
+    public abstract void f490();
+    public abstract void f491();
+    public abstract void f492();
+    public abstract void f493();
+    public abstract void f494();
+    public abstract void f495();
+    public abstract void f496();
+    public abstract void f497();
+    public abstract void f498();
+    public abstract void f499();
+    public abstract void f500();
+    public abstract void f501();
+    public abstract void f502();
+    public abstract void f503();
+    public abstract void f504();
+    public abstract void f505();
+    public abstract void f506();
+    public abstract void f507();
+    public abstract void f508();
+    public abstract void f509();
+    public abstract void f510();
+    public abstract void f511();
+    public abstract void f512();
+    public abstract void f513();
+    public abstract void f514();
+    public abstract void f515();
+    public abstract void f516();
+    public abstract void f517();
+    public abstract void f518();
+    public abstract void f519();
+    public abstract void f520();
+    public abstract void f521();
+    public abstract void f522();
+    public abstract void f523();
+    public abstract void f524();
+    public abstract void f525();
+    public abstract void f526();
+    public abstract void f527();
+    public abstract void f528();
+    public abstract void f529();
+    public abstract void f530();
+    public abstract void f531();
+    public abstract void f532();
+    public abstract void f533();
+    public abstract void f534();
+    public abstract void f535();
+    public abstract void f536();
+    public abstract void f537();
+    public abstract void f538();
+    public abstract void f539();
+    public abstract void f540();
+    public abstract void f541();
+    public abstract void f542();
+    public abstract void f543();
+    public abstract void f544();
+    public abstract void f545();
+    public abstract void f546();
+    public abstract void f547();
+    public abstract void f548();
+    public abstract void f549();
+    public abstract void f550();
+    public abstract void f551();
+    public abstract void f552();
+    public abstract void f553();
+    public abstract void f554();
+    public abstract void f555();
+    public abstract void f556();
+    public abstract void f557();
+    public abstract void f558();
+    public abstract void f559();
+    public abstract void f560();
+    public abstract void f561();
+    public abstract void f562();
+    public abstract void f563();
+    public abstract void f564();
+    public abstract void f565();
+    public abstract void f566();
+    public abstract void f567();
+    public abstract void f568();
+    public abstract void f569();
+    public abstract void f570();
+    public abstract void f571();
+    public abstract void f572();
+    public abstract void f573();
+    public abstract void f574();
+    public abstract void f575();
+    public abstract void f576();
+    public abstract void f577();
+    public abstract void f578();
+    public abstract void f579();
+    public abstract void f580();
+    public abstract void f581();
+    public abstract void f582();
+    public abstract void f583();
+    public abstract void f584();
+    public abstract void f585();
+    public abstract void f586();
+    public abstract void f587();
+    public abstract void f588();
+    public abstract void f589();
+    public abstract void f590();
+    public abstract void f591();
+    public abstract void f592();
+    public abstract void f593();
+    public abstract void f594();
+    public abstract void f595();
+    public abstract void f596();
+    public abstract void f597();
+    public abstract void f598();
+    public abstract void f599();
+    public abstract void f600();
+    public abstract void f601();
+    public abstract void f602();
+    public abstract void f603();
+    public abstract void f604();
+    public abstract void f605();
+    public abstract void f606();
+    public abstract void f607();
+    public abstract void f608();
+    public abstract void f609();
+    public abstract void f610();
+    public abstract void f611();
+    public abstract void f612();
+    public abstract void f613();
+    public abstract void f614();
+    public abstract void f615();
+    public abstract void f616();
+    public abstract void f617();
+    public abstract void f618();
+    public abstract void f619();
+    public abstract void f620();
+    public abstract void f621();
+    public abstract void f622();
+    public abstract void f623();
+    public abstract void f624();
+    public abstract void f625();
+    public abstract void f626();
+    public abstract void f627();
+    public abstract void f628();
+    public abstract void f629();
+    public abstract void f630();
+    public abstract void f631();
+    public abstract void f632();
+    public abstract void f633();
+    public abstract void f634();
+    public abstract void f635();
+    public abstract void f636();
+    public abstract void f637();
+    public abstract void f638();
+    public abstract void f639();
+    public abstract void f640();
+    public abstract void f641();
+    public abstract void f642();
+    public abstract void f643();
+    public abstract void f644();
+    public abstract void f645();
+    public abstract void f646();
+    public abstract void f647();
+    public abstract void f648();
+    public abstract void f649();
+    public abstract void f650();
+    public abstract void f651();
+    public abstract void f652();
+    public abstract void f653();
+    public abstract void f654();
+    public abstract void f655();
+    public abstract void f656();
+    public abstract void f657();
+    public abstract void f658();
+    public abstract void f659();
+    public abstract void f660();
+    public abstract void f661();
+    public abstract void f662();
+    public abstract void f663();
+    public abstract void f664();
+    public abstract void f665();
+    public abstract void f666();
+    public abstract void f667();
+    public abstract void f668();
+    public abstract void f669();
+    public abstract void f670();
+    public abstract void f671();
+    public abstract void f672();
+    public abstract void f673();
+    public abstract void f674();
+    public abstract void f675();
+    public abstract void f676();
+    public abstract void f677();
+    public abstract void f678();
+    public abstract void f679();
+    public abstract void f680();
+    public abstract void f681();
+    public abstract void f682();
+    public abstract void f683();
+    public abstract void f684();
+    public abstract void f685();
+    public abstract void f686();
+    public abstract void f687();
+    public abstract void f688();
+    public abstract void f689();
+    public abstract void f690();
+    public abstract void f691();
+    public abstract void f692();
+    public abstract void f693();
+    public abstract void f694();
+    public abstract void f695();
+    public abstract void f696();
+    public abstract void f697();
+    public abstract void f698();
+    public abstract void f699();
+    public abstract void f700();
+    public abstract void f701();
+    public abstract void f702();
+    public abstract void f703();
+    public abstract void f704();
+    public abstract void f705();
+    public abstract void f706();
+    public abstract void f707();
+    public abstract void f708();
+    public abstract void f709();
+    public abstract void f710();
+    public abstract void f711();
+    public abstract void f712();
+    public abstract void f713();
+    public abstract void f714();
+    public abstract void f715();
+    public abstract void f716();
+    public abstract void f717();
+    public abstract void f718();
+    public abstract void f719();
+    public abstract void f720();
+    public abstract void f721();
+    public abstract void f722();
+    public abstract void f723();
+    public abstract void f724();
+    public abstract void f725();
+    public abstract void f726();
+    public abstract void f727();
+    public abstract void f728();
+    public abstract void f729();
+    public abstract void f730();
+    public abstract void f731();
+    public abstract void f732();
+    public abstract void f733();
+    public abstract void f734();
+    public abstract void f735();
+    public abstract void f736();
+    public abstract void f737();
+    public abstract void f738();
+    public abstract void f739();
+    public abstract void f740();
+    public abstract void f741();
+    public abstract void f742();
+    public abstract void f743();
+    public abstract void f744();
+    public abstract void f745();
+    public abstract void f746();
+    public abstract void f747();
+    public abstract void f748();
+    public abstract void f749();
+    public abstract void f750();
+    public abstract void f751();
+    public abstract void f752();
+    public abstract void f753();
+    public abstract void f754();
+    public abstract void f755();
+    public abstract void f756();
+    public abstract void f757();
+    public abstract void f758();
+    public abstract void f759();
+    public abstract void f760();
+    public abstract void f761();
+    public abstract void f762();
+    public abstract void f763();
+    public abstract void f764();
+    public abstract void f765();
+    public abstract void f766();
+    public abstract void f767();
+    public abstract void f768();
+    public abstract void f769();
+    public abstract void f770();
+    public abstract void f771();
+    public abstract void f772();
+    public abstract void f773();
+    public abstract void f774();
+    public abstract void f775();
+    public abstract void f776();
+    public abstract void f777();
+    public abstract void f778();
+    public abstract void f779();
+    public abstract void f780();
+    public abstract void f781();
+    public abstract void f782();
+    public abstract void f783();
+    public abstract void f784();
+    public abstract void f785();
+    public abstract void f786();
+    public abstract void f787();
+    public abstract void f788();
+    public abstract void f789();
+    public abstract void f790();
+    public abstract void f791();
+    public abstract void f792();
+    public abstract void f793();
+    public abstract void f794();
+    public abstract void f795();
+    public abstract void f796();
+    public abstract void f797();
+    public abstract void f798();
+    public abstract void f799();
+    public abstract void f800();
+    public abstract void f801();
+    public abstract void f802();
+    public abstract void f803();
+    public abstract void f804();
+    public abstract void f805();
+    public abstract void f806();
+    public abstract void f807();
+    public abstract void f808();
+    public abstract void f809();
+    public abstract void f810();
+    public abstract void f811();
+    public abstract void f812();
+    public abstract void f813();
+    public abstract void f814();
+    public abstract void f815();
+    public abstract void f816();
+    public abstract void f817();
+    public abstract void f818();
+    public abstract void f819();
+    public abstract void f820();
+    public abstract void f821();
+    public abstract void f822();
+    public abstract void f823();
+    public abstract void f824();
+    public abstract void f825();
+    public abstract void f826();
+    public abstract void f827();
+    public abstract void f828();
+    public abstract void f829();
+    public abstract void f830();
+    public abstract void f831();
+    public abstract void f832();
+    public abstract void f833();
+    public abstract void f834();
+    public abstract void f835();
+    public abstract void f836();
+    public abstract void f837();
+    public abstract void f838();
+    public abstract void f839();
+    public abstract void f840();
+    public abstract void f841();
+    public abstract void f842();
+    public abstract void f843();
+    public abstract void f844();
+    public abstract void f845();
+    public abstract void f846();
+    public abstract void f847();
+    public abstract void f848();
+    public abstract void f849();
+    public abstract void f850();
+    public abstract void f851();
+    public abstract void f852();
+    public abstract void f853();
+    public abstract void f854();
+    public abstract void f855();
+    public abstract void f856();
+    public abstract void f857();
+    public abstract void f858();
+    public abstract void f859();
+    public abstract void f860();
+    public abstract void f861();
+    public abstract void f862();
+    public abstract void f863();
+    public abstract void f864();
+    public abstract void f865();
+    public abstract void f866();
+    public abstract void f867();
+    public abstract void f868();
+    public abstract void f869();
+    public abstract void f870();
+    public abstract void f871();
+    public abstract void f872();
+    public abstract void f873();
+    public abstract void f874();
+    public abstract void f875();
+    public abstract void f876();
+    public abstract void f877();
+    public abstract void f878();
+    public abstract void f879();
+    public abstract void f880();
+    public abstract void f881();
+    public abstract void f882();
+    public abstract void f883();
+    public abstract void f884();
+    public abstract void f885();
+    public abstract void f886();
+    public abstract void f887();
+    public abstract void f888();
+    public abstract void f889();
+    public abstract void f890();
+    public abstract void f891();
+    public abstract void f892();
+    public abstract void f893();
+    public abstract void f894();
+    public abstract void f895();
+    public abstract void f896();
+    public abstract void f897();
+    public abstract void f898();
+    public abstract void f899();
+    public abstract void f900();
+    public abstract void f901();
+    public abstract void f902();
+    public abstract void f903();
+    public abstract void f904();
+    public abstract void f905();
+    public abstract void f906();
+    public abstract void f907();
+    public abstract void f908();
+    public abstract void f909();
+    public abstract void f910();
+    public abstract void f911();
+    public abstract void f912();
+    public abstract void f913();
+    public abstract void f914();
+    public abstract void f915();
+    public abstract void f916();
+    public abstract void f917();
+    public abstract void f918();
+    public abstract void f919();
+    public abstract void f920();
+    public abstract void f921();
+    public abstract void f922();
+    public abstract void f923();
+    public abstract void f924();
+    public abstract void f925();
+    public abstract void f926();
+    public abstract void f927();
+    public abstract void f928();
+    public abstract void f929();
+    public abstract void f930();
+    public abstract void f931();
+    public abstract void f932();
+    public abstract void f933();
+    public abstract void f934();
+    public abstract void f935();
+    public abstract void f936();
+    public abstract void f937();
+    public abstract void f938();
+    public abstract void f939();
+    public abstract void f940();
+    public abstract void f941();
+    public abstract void f942();
+    public abstract void f943();
+    public abstract void f944();
+    public abstract void f945();
+    public abstract void f946();
+    public abstract void f947();
+    public abstract void f948();
+    public abstract void f949();
+    public abstract void f950();
+    public abstract void f951();
+    public abstract void f952();
+    public abstract void f953();
+    public abstract void f954();
+    public abstract void f955();
+    public abstract void f956();
+    public abstract void f957();
+    public abstract void f958();
+    public abstract void f959();
+    public abstract void f960();
+    public abstract void f961();
+    public abstract void f962();
+    public abstract void f963();
+    public abstract void f964();
+    public abstract void f965();
+    public abstract void f966();
+    public abstract void f967();
+    public abstract void f968();
+    public abstract void f969();
+    public abstract void f970();
+    public abstract void f971();
+    public abstract void f972();
+    public abstract void f973();
+    public abstract void f974();
+    public abstract void f975();
+    public abstract void f976();
+    public abstract void f977();
+    public abstract void f978();
+    public abstract void f979();
+    public abstract void f980();
+    public abstract void f981();
+    public abstract void f982();
+    public abstract void f983();
+    public abstract void f984();
+    public abstract void f985();
+    public abstract void f986();
+    public abstract void f987();
+    public abstract void f988();
+    public abstract void f989();
+    public abstract void f990();
+    public abstract void f991();
+    public abstract void f992();
+    public abstract void f993();
+    public abstract void f994();
+    public abstract void f995();
+    public abstract void f996();
+    public abstract void f997();
+    public abstract void f998();
+    public abstract void f999();
+    public abstract void f1000();
+    public abstract void f1001();
+    public abstract void f1002();
+    public abstract void f1003();
+    public abstract void f1004();
+    public abstract void f1005();
+    public abstract void f1006();
+    public abstract void f1007();
+    public abstract void f1008();
+    public abstract void f1009();
+    public abstract void f1010();
+    public abstract void f1011();
+    public abstract void f1012();
+    public abstract void f1013();
+    public abstract void f1014();
+    public abstract void f1015();
+    public abstract void f1016();
+    public abstract void f1017();
+    public abstract void f1018();
+    public abstract void f1019();
+    public abstract void f1020();
+    public abstract void f1021();
+    public abstract void f1022();
+    public abstract void f1023();
+    public abstract void f1024();
+    public abstract void f1025();
+    public abstract void f1026();
+    public abstract void f1027();
+    public abstract void f1028();
+    public abstract void f1029();
+    public abstract void f1030();
+    public abstract void f1031();
+    public abstract void f1032();
+    public abstract void f1033();
+    public abstract void f1034();
+    public abstract void f1035();
+    public abstract void f1036();
+    public abstract void f1037();
+    public abstract void f1038();
+    public abstract void f1039();
+    public abstract void f1040();
+    public abstract void f1041();
+    public abstract void f1042();
+    public abstract void f1043();
+    public abstract void f1044();
+    public abstract void f1045();
+    public abstract void f1046();
+    public abstract void f1047();
+    public abstract void f1048();
+    public abstract void f1049();
+    public abstract void f1050();
+    public abstract void f1051();
+    public abstract void f1052();
+    public abstract void f1053();
+    public abstract void f1054();
+    public abstract void f1055();
+    public abstract void f1056();
+    public abstract void f1057();
+    public abstract void f1058();
+    public abstract void f1059();
+    public abstract void f1060();
+    public abstract void f1061();
+    public abstract void f1062();
+    public abstract void f1063();
+    public abstract void f1064();
+    public abstract void f1065();
+    public abstract void f1066();
+    public abstract void f1067();
+    public abstract void f1068();
+    public abstract void f1069();
+    public abstract void f1070();
+    public abstract void f1071();
+    public abstract void f1072();
+    public abstract void f1073();
+    public abstract void f1074();
+    public abstract void f1075();
+    public abstract void f1076();
+    public abstract void f1077();
+    public abstract void f1078();
+    public abstract void f1079();
+    public abstract void f1080();
+    public abstract void f1081();
+    public abstract void f1082();
+    public abstract void f1083();
+    public abstract void f1084();
+    public abstract void f1085();
+    public abstract void f1086();
+    public abstract void f1087();
+    public abstract void f1088();
+    public abstract void f1089();
+    public abstract void f1090();
+    public abstract void f1091();
+    public abstract void f1092();
+    public abstract void f1093();
+    public abstract void f1094();
+    public abstract void f1095();
+    public abstract void f1096();
+    public abstract void f1097();
+    public abstract void f1098();
+    public abstract void f1099();
+    public abstract void f1100();
+    public abstract void f1101();
+    public abstract void f1102();
+    public abstract void f1103();
+    public abstract void f1104();
+    public abstract void f1105();
+    public abstract void f1106();
+    public abstract void f1107();
+    public abstract void f1108();
+    public abstract void f1109();
+    public abstract void f1110();
+    public abstract void f1111();
+    public abstract void f1112();
+    public abstract void f1113();
+    public abstract void f1114();
+    public abstract void f1115();
+    public abstract void f1116();
+    public abstract void f1117();
+    public abstract void f1118();
+    public abstract void f1119();
+    public abstract void f1120();
+    public abstract void f1121();
+    public abstract void f1122();
+    public abstract void f1123();
+    public abstract void f1124();
+    public abstract void f1125();
+    public abstract void f1126();
+    public abstract void f1127();
+    public abstract void f1128();
+    public abstract void f1129();
+    public abstract void f1130();
+    public abstract void f1131();
+    public abstract void f1132();
+    public abstract void f1133();
+    public abstract void f1134();
+    public abstract void f1135();
+    public abstract void f1136();
+    public abstract void f1137();
+    public abstract void f1138();
+    public abstract void f1139();
+    public abstract void f1140();
+    public abstract void f1141();
+    public abstract void f1142();
+    public abstract void f1143();
+    public abstract void f1144();
+    public abstract void f1145();
+    public abstract void f1146();
+    public abstract void f1147();
+    public abstract void f1148();
+    public abstract void f1149();
+    public abstract void f1150();
+    public abstract void f1151();
+    public abstract void f1152();
+    public abstract void f1153();
+    public abstract void f1154();
+    public abstract void f1155();
+    public abstract void f1156();
+    public abstract void f1157();
+    public abstract void f1158();
+    public abstract void f1159();
+    public abstract void f1160();
+    public abstract void f1161();
+    public abstract void f1162();
+    public abstract void f1163();
+    public abstract void f1164();
+    public abstract void f1165();
+    public abstract void f1166();
+    public abstract void f1167();
+    public abstract void f1168();
+    public abstract void f1169();
+    public abstract void f1170();
+    public abstract void f1171();
+    public abstract void f1172();
+    public abstract void f1173();
+    public abstract void f1174();
+    public abstract void f1175();
+    public abstract void f1176();
+    public abstract void f1177();
+    public abstract void f1178();
+    public abstract void f1179();
+    public abstract void f1180();
+    public abstract void f1181();
+    public abstract void f1182();
+    public abstract void f1183();
+    public abstract void f1184();
+    public abstract void f1185();
+    public abstract void f1186();
+    public abstract void f1187();
+    public abstract void f1188();
+    public abstract void f1189();
+    public abstract void f1190();
+    public abstract void f1191();
+    public abstract void f1192();
+    public abstract void f1193();
+    public abstract void f1194();
+    public abstract void f1195();
+    public abstract void f1196();
+    public abstract void f1197();
+    public abstract void f1198();
+    public abstract void f1199();
+    public abstract void f1200();
+    public abstract void f1201();
+    public abstract void f1202();
+    public abstract void f1203();
+    public abstract void f1204();
+    public abstract void f1205();
+    public abstract void f1206();
+    public abstract void f1207();
+    public abstract void f1208();
+    public abstract void f1209();
+    public abstract void f1210();
+    public abstract void f1211();
+    public abstract void f1212();
+    public abstract void f1213();
+    public abstract void f1214();
+    public abstract void f1215();
+    public abstract void f1216();
+    public abstract void f1217();
+    public abstract void f1218();
+    public abstract void f1219();
+    public abstract void f1220();
+    public abstract void f1221();
+    public abstract void f1222();
+    public abstract void f1223();
+    public abstract void f1224();
+    public abstract void f1225();
+    public abstract void f1226();
+    public abstract void f1227();
+    public abstract void f1228();
+    public abstract void f1229();
+    public abstract void f1230();
+    public abstract void f1231();
+    public abstract void f1232();
+    public abstract void f1233();
+    public abstract void f1234();
+    public abstract void f1235();
+    public abstract void f1236();
+    public abstract void f1237();
+    public abstract void f1238();
+    public abstract void f1239();
+    public abstract void f1240();
+    public abstract void f1241();
+    public abstract void f1242();
+    public abstract void f1243();
+    public abstract void f1244();
+    public abstract void f1245();
+    public abstract void f1246();
+    public abstract void f1247();
+    public abstract void f1248();
+    public abstract void f1249();
+    public abstract void f1250();
+    public abstract void f1251();
+    public abstract void f1252();
+    public abstract void f1253();
+    public abstract void f1254();
+    public abstract void f1255();
+    public abstract void f1256();
+    public abstract void f1257();
+    public abstract void f1258();
+    public abstract void f1259();
+    public abstract void f1260();
+    public abstract void f1261();
+    public abstract void f1262();
+    public abstract void f1263();
+    public abstract void f1264();
+    public abstract void f1265();
+    public abstract void f1266();
+    public abstract void f1267();
+    public abstract void f1268();
+    public abstract void f1269();
+    public abstract void f1270();
+    public abstract void f1271();
+    public abstract void f1272();
+    public abstract void f1273();
+    public abstract void f1274();
+    public abstract void f1275();
+    public abstract void f1276();
+    public abstract void f1277();
+    public abstract void f1278();
+    public abstract void f1279();
+    public abstract void f1280();
+    public abstract void f1281();
+    public abstract void f1282();
+    public abstract void f1283();
+    public abstract void f1284();
+    public abstract void f1285();
+    public abstract void f1286();
+    public abstract void f1287();
+    public abstract void f1288();
+    public abstract void f1289();
+    public abstract void f1290();
+    public abstract void f1291();
+    public abstract void f1292();
+    public abstract void f1293();
+    public abstract void f1294();
+    public abstract void f1295();
+    public abstract void f1296();
+    public abstract void f1297();
+    public abstract void f1298();
+    public abstract void f1299();
+    public abstract void f1300();
+    public abstract void f1301();
+    public abstract void f1302();
+    public abstract void f1303();
+    public abstract void f1304();
+    public abstract void f1305();
+    public abstract void f1306();
+    public abstract void f1307();
+    public abstract void f1308();
+    public abstract void f1309();
+    public abstract void f1310();
+    public abstract void f1311();
+    public abstract void f1312();
+    public abstract void f1313();
+    public abstract void f1314();
+    public abstract void f1315();
+    public abstract void f1316();
+    public abstract void f1317();
+    public abstract void f1318();
+    public abstract void f1319();
+    public abstract void f1320();
+    public abstract void f1321();
+    public abstract void f1322();
+    public abstract void f1323();
+    public abstract void f1324();
+    public abstract void f1325();
+    public abstract void f1326();
+    public abstract void f1327();
+    public abstract void f1328();
+    public abstract void f1329();
+    public abstract void f1330();
+    public abstract void f1331();
+    public abstract void f1332();
+    public abstract void f1333();
+    public abstract void f1334();
+    public abstract void f1335();
+    public abstract void f1336();
+    public abstract void f1337();
+    public abstract void f1338();
+    public abstract void f1339();
+    public abstract void f1340();
+    public abstract void f1341();
+    public abstract void f1342();
+    public abstract void f1343();
+    public abstract void f1344();
+    public abstract void f1345();
+    public abstract void f1346();
+    public abstract void f1347();
+    public abstract void f1348();
+    public abstract void f1349();
+    public abstract void f1350();
+    public abstract void f1351();
+    public abstract void f1352();
+    public abstract void f1353();
+    public abstract void f1354();
+    public abstract void f1355();
+    public abstract void f1356();
+    public abstract void f1357();
+    public abstract void f1358();
+    public abstract void f1359();
+    public abstract void f1360();
+    public abstract void f1361();
+    public abstract void f1362();
+    public abstract void f1363();
+    public abstract void f1364();
+    public abstract void f1365();
+    public abstract void f1366();
+    public abstract void f1367();
+    public abstract void f1368();
+    public abstract void f1369();
+    public abstract void f1370();
+    public abstract void f1371();
+    public abstract void f1372();
+    public abstract void f1373();
+    public abstract void f1374();
+    public abstract void f1375();
+    public abstract void f1376();
+    public abstract void f1377();
+    public abstract void f1378();
+    public abstract void f1379();
+    public abstract void f1380();
+    public abstract void f1381();
+    public abstract void f1382();
+    public abstract void f1383();
+    public abstract void f1384();
+    public abstract void f1385();
+    public abstract void f1386();
+    public abstract void f1387();
+    public abstract void f1388();
+    public abstract void f1389();
+    public abstract void f1390();
+    public abstract void f1391();
+    public abstract void f1392();
+    public abstract void f1393();
+    public abstract void f1394();
+    public abstract void f1395();
+    public abstract void f1396();
+    public abstract void f1397();
+    public abstract void f1398();
+    public abstract void f1399();
+    public abstract void f1400();
+    public abstract void f1401();
+    public abstract void f1402();
+    public abstract void f1403();
+    public abstract void f1404();
+    public abstract void f1405();
+    public abstract void f1406();
+    public abstract void f1407();
+    public abstract void f1408();
+    public abstract void f1409();
+    public abstract void f1410();
+    public abstract void f1411();
+    public abstract void f1412();
+    public abstract void f1413();
+    public abstract void f1414();
+    public abstract void f1415();
+    public abstract void f1416();
+    public abstract void f1417();
+    public abstract void f1418();
+    public abstract void f1419();
+    public abstract void f1420();
+    public abstract void f1421();
+    public abstract void f1422();
+    public abstract void f1423();
+    public abstract void f1424();
+    public abstract void f1425();
+    public abstract void f1426();
+    public abstract void f1427();
+    public abstract void f1428();
+    public abstract void f1429();
+    public abstract void f1430();
+    public abstract void f1431();
+    public abstract void f1432();
+    public abstract void f1433();
+    public abstract void f1434();
+    public abstract void f1435();
+    public abstract void f1436();
+    public abstract void f1437();
+    public abstract void f1438();
+    public abstract void f1439();
+    public abstract void f1440();
+    public abstract void f1441();
+    public abstract void f1442();
+    public abstract void f1443();
+    public abstract void f1444();
+    public abstract void f1445();
+    public abstract void f1446();
+    public abstract void f1447();
+    public abstract void f1448();
+    public abstract void f1449();
+    public abstract void f1450();
+    public abstract void f1451();
+    public abstract void f1452();
+    public abstract void f1453();
+    public abstract void f1454();
+    public abstract void f1455();
+    public abstract void f1456();
+    public abstract void f1457();
+    public abstract void f1458();
+    public abstract void f1459();
+    public abstract void f1460();
+    public abstract void f1461();
+    public abstract void f1462();
+    public abstract void f1463();
+    public abstract void f1464();
+    public abstract void f1465();
+    public abstract void f1466();
+    public abstract void f1467();
+    public abstract void f1468();
+    public abstract void f1469();
+    public abstract void f1470();
+    public abstract void f1471();
+    public abstract void f1472();
+    public abstract void f1473();
+    public abstract void f1474();
+    public abstract void f1475();
+    public abstract void f1476();
+    public abstract void f1477();
+    public abstract void f1478();
+    public abstract void f1479();
+    public abstract void f1480();
+    public abstract void f1481();
+    public abstract void f1482();
+    public abstract void f1483();
+    public abstract void f1484();
+    public abstract void f1485();
+    public abstract void f1486();
+    public abstract void f1487();
+    public abstract void f1488();
+    public abstract void f1489();
+    public abstract void f1490();
+    public abstract void f1491();
+    public abstract void f1492();
+    public abstract void f1493();
+    public abstract void f1494();
+    public abstract void f1495();
+    public abstract void f1496();
+    public abstract void f1497();
+    public abstract void f1498();
+    public abstract void f1499();
+    public abstract void f1500();
+    public abstract void f1501();
+    public abstract void f1502();
+    public abstract void f1503();
+    public abstract void f1504();
+    public abstract void f1505();
+    public abstract void f1506();
+    public abstract void f1507();
+    public abstract void f1508();
+    public abstract void f1509();
+    public abstract void f1510();
+    public abstract void f1511();
+    public abstract void f1512();
+    public abstract void f1513();
+    public abstract void f1514();
+    public abstract void f1515();
+    public abstract void f1516();
+    public abstract void f1517();
+    public abstract void f1518();
+    public abstract void f1519();
+    public abstract void f1520();
+    public abstract void f1521();
+    public abstract void f1522();
+    public abstract void f1523();
+    public abstract void f1524();
+    public abstract void f1525();
+    public abstract void f1526();
+    public abstract void f1527();
+    public abstract void f1528();
+    public abstract void f1529();
+    public abstract void f1530();
+    public abstract void f1531();
+    public abstract void f1532();
+    public abstract void f1533();
+    public abstract void f1534();
+    public abstract void f1535();
+    public abstract void f1536();
+    public abstract void f1537();
+    public abstract void f1538();
+    public abstract void f1539();
+    public abstract void f1540();
+    public abstract void f1541();
+    public abstract void f1542();
+    public abstract void f1543();
+    public abstract void f1544();
+    public abstract void f1545();
+    public abstract void f1546();
+    public abstract void f1547();
+    public abstract void f1548();
+    public abstract void f1549();
+    public abstract void f1550();
+    public abstract void f1551();
+    public abstract void f1552();
+    public abstract void f1553();
+    public abstract void f1554();
+    public abstract void f1555();
+    public abstract void f1556();
+    public abstract void f1557();
+    public abstract void f1558();
+    public abstract void f1559();
+    public abstract void f1560();
+    public abstract void f1561();
+    public abstract void f1562();
+    public abstract void f1563();
+    public abstract void f1564();
+    public abstract void f1565();
+    public abstract void f1566();
+    public abstract void f1567();
+    public abstract void f1568();
+    public abstract void f1569();
+    public abstract void f1570();
+    public abstract void f1571();
+    public abstract void f1572();
+    public abstract void f1573();
+    public abstract void f1574();
+    public abstract void f1575();
+    public abstract void f1576();
+    public abstract void f1577();
+    public abstract void f1578();
+    public abstract void f1579();
+    public abstract void f1580();
+    public abstract void f1581();
+    public abstract void f1582();
+    public abstract void f1583();
+    public abstract void f1584();
+    public abstract void f1585();
+    public abstract void f1586();
+    public abstract void f1587();
+    public abstract void f1588();
+    public abstract void f1589();
+    public abstract void f1590();
+    public abstract void f1591();
+    public abstract void f1592();
+    public abstract void f1593();
+    public abstract void f1594();
+    public abstract void f1595();
+    public abstract void f1596();
+    public abstract void f1597();
+    public abstract void f1598();
+    public abstract void f1599();
+    public abstract void f1600();
+    public abstract void f1601();
+    public abstract void f1602();
+    public abstract void f1603();
+    public abstract void f1604();
+    public abstract void f1605();
+    public abstract void f1606();
+    public abstract void f1607();
+    public abstract void f1608();
+    public abstract void f1609();
+    public abstract void f1610();
+    public abstract void f1611();
+    public abstract void f1612();
+    public abstract void f1613();
+    public abstract void f1614();
+    public abstract void f1615();
+    public abstract void f1616();
+    public abstract void f1617();
+    public abstract void f1618();
+    public abstract void f1619();
+    public abstract void f1620();
+    public abstract void f1621();
+    public abstract void f1622();
+    public abstract void f1623();
+    public abstract void f1624();
+    public abstract void f1625();
+    public abstract void f1626();
+    public abstract void f1627();
+    public abstract void f1628();
+    public abstract void f1629();
+    public abstract void f1630();
+    public abstract void f1631();
+    public abstract void f1632();
+    public abstract void f1633();
+    public abstract void f1634();
+    public abstract void f1635();
+    public abstract void f1636();
+    public abstract void f1637();
+    public abstract void f1638();
+    public abstract void f1639();
+    public abstract void f1640();
+    public abstract void f1641();
+    public abstract void f1642();
+    public abstract void f1643();
+    public abstract void f1644();
+    public abstract void f1645();
+    public abstract void f1646();
+    public abstract void f1647();
+    public abstract void f1648();
+    public abstract void f1649();
+    public abstract void f1650();
+    public abstract void f1651();
+    public abstract void f1652();
+    public abstract void f1653();
+    public abstract void f1654();
+    public abstract void f1655();
+    public abstract void f1656();
+    public abstract void f1657();
+    public abstract void f1658();
+    public abstract void f1659();
+    public abstract void f1660();
+    public abstract void f1661();
+    public abstract void f1662();
+    public abstract void f1663();
+    public abstract void f1664();
+    public abstract void f1665();
+    public abstract void f1666();
+    public abstract void f1667();
+    public abstract void f1668();
+    public abstract void f1669();
+    public abstract void f1670();
+    public abstract void f1671();
+    public abstract void f1672();
+    public abstract void f1673();
+    public abstract void f1674();
+    public abstract void f1675();
+    public abstract void f1676();
+    public abstract void f1677();
+    public abstract void f1678();
+    public abstract void f1679();
+    public abstract void f1680();
+    public abstract void f1681();
+    public abstract void f1682();
+    public abstract void f1683();
+    public abstract void f1684();
+    public abstract void f1685();
+    public abstract void f1686();
+    public abstract void f1687();
+    public abstract void f1688();
+    public abstract void f1689();
+    public abstract void f1690();
+    public abstract void f1691();
+    public abstract void f1692();
+    public abstract void f1693();
+    public abstract void f1694();
+    public abstract void f1695();
+    public abstract void f1696();
+    public abstract void f1697();
+    public abstract void f1698();
+    public abstract void f1699();
+    public abstract void f1700();
+    public abstract void f1701();
+    public abstract void f1702();
+    public abstract void f1703();
+    public abstract void f1704();
+    public abstract void f1705();
+    public abstract void f1706();
+    public abstract void f1707();
+    public abstract void f1708();
+    public abstract void f1709();
+    public abstract void f1710();
+    public abstract void f1711();
+    public abstract void f1712();
+    public abstract void f1713();
+    public abstract void f1714();
+    public abstract void f1715();
+    public abstract void f1716();
+    public abstract void f1717();
+    public abstract void f1718();
+    public abstract void f1719();
+    public abstract void f1720();
+    public abstract void f1721();
+    public abstract void f1722();
+    public abstract void f1723();
+    public abstract void f1724();
+    public abstract void f1725();
+    public abstract void f1726();
+    public abstract void f1727();
+    public abstract void f1728();
+    public abstract void f1729();
+    public abstract void f1730();
+    public abstract void f1731();
+    public abstract void f1732();
+    public abstract void f1733();
+    public abstract void f1734();
+    public abstract void f1735();
+    public abstract void f1736();
+    public abstract void f1737();
+    public abstract void f1738();
+    public abstract void f1739();
+    public abstract void f1740();
+    public abstract void f1741();
+    public abstract void f1742();
+    public abstract void f1743();
+    public abstract void f1744();
+    public abstract void f1745();
+    public abstract void f1746();
+    public abstract void f1747();
+    public abstract void f1748();
+    public abstract void f1749();
+    public abstract void f1750();
+    public abstract void f1751();
+    public abstract void f1752();
+    public abstract void f1753();
+    public abstract void f1754();
+    public abstract void f1755();
+    public abstract void f1756();
+    public abstract void f1757();
+    public abstract void f1758();
+    public abstract void f1759();
+    public abstract void f1760();
+    public abstract void f1761();
+    public abstract void f1762();
+    public abstract void f1763();
+    public abstract void f1764();
+    public abstract void f1765();
+    public abstract void f1766();
+    public abstract void f1767();
+    public abstract void f1768();
+    public abstract void f1769();
+    public abstract void f1770();
+    public abstract void f1771();
+    public abstract void f1772();
+    public abstract void f1773();
+    public abstract void f1774();
+    public abstract void f1775();
+    public abstract void f1776();
+    public abstract void f1777();
+    public abstract void f1778();
+    public abstract void f1779();
+    public abstract void f1780();
+    public abstract void f1781();
+    public abstract void f1782();
+    public abstract void f1783();
+    public abstract void f1784();
+    public abstract void f1785();
+    public abstract void f1786();
+    public abstract void f1787();
+    public abstract void f1788();
+    public abstract void f1789();
+    public abstract void f1790();
+    public abstract void f1791();
+    public abstract void f1792();
+    public abstract void f1793();
+    public abstract void f1794();
+    public abstract void f1795();
+    public abstract void f1796();
+    public abstract void f1797();
+    public abstract void f1798();
+    public abstract void f1799();
+    public abstract void f1800();
+    public abstract void f1801();
+    public abstract void f1802();
+    public abstract void f1803();
+    public abstract void f1804();
+    public abstract void f1805();
+    public abstract void f1806();
+    public abstract void f1807();
+    public abstract void f1808();
+    public abstract void f1809();
+    public abstract void f1810();
+    public abstract void f1811();
+    public abstract void f1812();
+    public abstract void f1813();
+    public abstract void f1814();
+    public abstract void f1815();
+    public abstract void f1816();
+    public abstract void f1817();
+    public abstract void f1818();
+    public abstract void f1819();
+    public abstract void f1820();
+    public abstract void f1821();
+    public abstract void f1822();
+    public abstract void f1823();
+    public abstract void f1824();
+    public abstract void f1825();
+    public abstract void f1826();
+    public abstract void f1827();
+    public abstract void f1828();
+    public abstract void f1829();
+    public abstract void f1830();
+    public abstract void f1831();
+    public abstract void f1832();
+    public abstract void f1833();
+    public abstract void f1834();
+    public abstract void f1835();
+    public abstract void f1836();
+    public abstract void f1837();
+    public abstract void f1838();
+    public abstract void f1839();
+    public abstract void f1840();
+    public abstract void f1841();
+    public abstract void f1842();
+    public abstract void f1843();
+    public abstract void f1844();
+    public abstract void f1845();
+    public abstract void f1846();
+    public abstract void f1847();
+    public abstract void f1848();
+    public abstract void f1849();
+    public abstract void f1850();
+    public abstract void f1851();
+    public abstract void f1852();
+    public abstract void f1853();
+    public abstract void f1854();
+    public abstract void f1855();
+    public abstract void f1856();
+    public abstract void f1857();
+    public abstract void f1858();
+    public abstract void f1859();
+    public abstract void f1860();
+    public abstract void f1861();
+    public abstract void f1862();
+    public abstract void f1863();
+    public abstract void f1864();
+    public abstract void f1865();
+    public abstract void f1866();
+    public abstract void f1867();
+    public abstract void f1868();
+    public abstract void f1869();
+    public abstract void f1870();
+    public abstract void f1871();
+    public abstract void f1872();
+    public abstract void f1873();
+    public abstract void f1874();
+    public abstract void f1875();
+    public abstract void f1876();
+    public abstract void f1877();
+    public abstract void f1878();
+    public abstract void f1879();
+    public abstract void f1880();
+    public abstract void f1881();
+    public abstract void f1882();
+    public abstract void f1883();
+    public abstract void f1884();
+    public abstract void f1885();
+    public abstract void f1886();
+    public abstract void f1887();
+    public abstract void f1888();
+    public abstract void f1889();
+    public abstract void f1890();
+    public abstract void f1891();
+    public abstract void f1892();
+    public abstract void f1893();
+    public abstract void f1894();
+    public abstract void f1895();
+    public abstract void f1896();
+    public abstract void f1897();
+    public abstract void f1898();
+    public abstract void f1899();
+    public abstract void f1900();
+    public abstract void f1901();
+    public abstract void f1902();
+    public abstract void f1903();
+    public abstract void f1904();
+    public abstract void f1905();
+    public abstract void f1906();
+    public abstract void f1907();
+    public abstract void f1908();
+    public abstract void f1909();
+    public abstract void f1910();
+    public abstract void f1911();
+    public abstract void f1912();
+    public abstract void f1913();
+    public abstract void f1914();
+    public abstract void f1915();
+    public abstract void f1916();
+    public abstract void f1917();
+    public abstract void f1918();
+    public abstract void f1919();
+    public abstract void f1920();
+    public abstract void f1921();
+    public abstract void f1922();
+    public abstract void f1923();
+    public abstract void f1924();
+    public abstract void f1925();
+    public abstract void f1926();
+    public abstract void f1927();
+    public abstract void f1928();
+    public abstract void f1929();
+    public abstract void f1930();
+    public abstract void f1931();
+    public abstract void f1932();
+    public abstract void f1933();
+    public abstract void f1934();
+    public abstract void f1935();
+    public abstract void f1936();
+    public abstract void f1937();
+    public abstract void f1938();
+    public abstract void f1939();
+    public abstract void f1940();
+    public abstract void f1941();
+    public abstract void f1942();
+    public abstract void f1943();
+    public abstract void f1944();
+    public abstract void f1945();
+    public abstract void f1946();
+    public abstract void f1947();
+    public abstract void f1948();
+    public abstract void f1949();
+    public abstract void f1950();
+    public abstract void f1951();
+    public abstract void f1952();
+    public abstract void f1953();
+    public abstract void f1954();
+    public abstract void f1955();
+    public abstract void f1956();
+    public abstract void f1957();
+    public abstract void f1958();
+    public abstract void f1959();
+    public abstract void f1960();
+    public abstract void f1961();
+    public abstract void f1962();
+    public abstract void f1963();
+    public abstract void f1964();
+    public abstract void f1965();
+    public abstract void f1966();
+    public abstract void f1967();
+    public abstract void f1968();
+    public abstract void f1969();
+    public abstract void f1970();
+    public abstract void f1971();
+    public abstract void f1972();
+    public abstract void f1973();
+    public abstract void f1974();
+    public abstract void f1975();
+    public abstract void f1976();
+    public abstract void f1977();
+    public abstract void f1978();
+    public abstract void f1979();
+    public abstract void f1980();
+    public abstract void f1981();
+    public abstract void f1982();
+    public abstract void f1983();
+    public abstract void f1984();
+    public abstract void f1985();
+    public abstract void f1986();
+    public abstract void f1987();
+    public abstract void f1988();
+    public abstract void f1989();
+    public abstract void f1990();
+    public abstract void f1991();
+    public abstract void f1992();
+    public abstract void f1993();
+    public abstract void f1994();
+    public abstract void f1995();
+    public abstract void f1996();
+    public abstract void f1997();
+    public abstract void f1998();
+    public abstract void f1999();
+    public abstract void f2000();
+    public abstract void f2001();
+    public abstract void f2002();
+    public abstract void f2003();
+    public abstract void f2004();
+    public abstract void f2005();
+    public abstract void f2006();
+    public abstract void f2007();
+    public abstract void f2008();
+    public abstract void f2009();
+    public abstract void f2010();
+    public abstract void f2011();
+    public abstract void f2012();
+    public abstract void f2013();
+    public abstract void f2014();
+    public abstract void f2015();
+    public abstract void f2016();
+    public abstract void f2017();
+    public abstract void f2018();
+    public abstract void f2019();
+    public abstract void f2020();
+    public abstract void f2021();
+    public abstract void f2022();
+    public abstract void f2023();
+    public abstract void f2024();
+    public abstract void f2025();
+    public abstract void f2026();
+    public abstract void f2027();
+    public abstract void f2028();
+    public abstract void f2029();
+    public abstract void f2030();
+    public abstract void f2031();
+    public abstract void f2032();
+    public abstract void f2033();
+    public abstract void f2034();
+    public abstract void f2035();
+    public abstract void f2036();
+    public abstract void f2037();
+    public abstract void f2038();
+    public abstract void f2039();
+    public abstract void f2040();
+    public abstract void f2041();
+    public abstract void f2042();
+    public abstract void f2043();
+    public abstract void f2044();
+    public abstract void f2045();
+    public abstract void f2046();
+    public abstract void f2047();
+    public abstract void f2048();
+    public abstract void f2049();
+    public abstract void f2050();
+    public abstract void f2051();
+    public abstract void f2052();
+    public abstract void f2053();
+    public abstract void f2054();
+    public abstract void f2055();
+    public abstract void f2056();
+    public abstract void f2057();
+    public abstract void f2058();
+    public abstract void f2059();
+    public abstract void f2060();
+    public abstract void f2061();
+    public abstract void f2062();
+    public abstract void f2063();
+    public abstract void f2064();
+    public abstract void f2065();
+    public abstract void f2066();
+    public abstract void f2067();
+    public abstract void f2068();
+    public abstract void f2069();
+    public abstract void f2070();
+    public abstract void f2071();
+    public abstract void f2072();
+    public abstract void f2073();
+    public abstract void f2074();
+    public abstract void f2075();
+    public abstract void f2076();
+    public abstract void f2077();
+    public abstract void f2078();
+    public abstract void f2079();
+    public abstract void f2080();
+    public abstract void f2081();
+    public abstract void f2082();
+    public abstract void f2083();
+    public abstract void f2084();
+    public abstract void f2085();
+    public abstract void f2086();
+    public abstract void f2087();
+    public abstract void f2088();
+    public abstract void f2089();
+    public abstract void f2090();
+    public abstract void f2091();
+    public abstract void f2092();
+    public abstract void f2093();
+    public abstract void f2094();
+    public abstract void f2095();
+    public abstract void f2096();
+    public abstract void f2097();
+    public abstract void f2098();
+    public abstract void f2099();
+    public abstract void f2100();
+    public abstract void f2101();
+    public abstract void f2102();
+    public abstract void f2103();
+    public abstract void f2104();
+    public abstract void f2105();
+    public abstract void f2106();
+    public abstract void f2107();
+    public abstract void f2108();
+    public abstract void f2109();
+    public abstract void f2110();
+    public abstract void f2111();
+    public abstract void f2112();
+    public abstract void f2113();
+    public abstract void f2114();
+    public abstract void f2115();
+    public abstract void f2116();
+    public abstract void f2117();
+    public abstract void f2118();
+    public abstract void f2119();
+    public abstract void f2120();
+    public abstract void f2121();
+    public abstract void f2122();
+    public abstract void f2123();
+    public abstract void f2124();
+    public abstract void f2125();
+    public abstract void f2126();
+    public abstract void f2127();
+    public abstract void f2128();
+    public abstract void f2129();
+    public abstract void f2130();
+    public abstract void f2131();
+    public abstract void f2132();
+    public abstract void f2133();
+    public abstract void f2134();
+    public abstract void f2135();
+    public abstract void f2136();
+    public abstract void f2137();
+    public abstract void f2138();
+    public abstract void f2139();
+    public abstract void f2140();
+    public abstract void f2141();
+    public abstract void f2142();
+    public abstract void f2143();
+    public abstract void f2144();
+    public abstract void f2145();
+    public abstract void f2146();
+    public abstract void f2147();
+    public abstract void f2148();
+    public abstract void f2149();
+    public abstract void f2150();
+    public abstract void f2151();
+    public abstract void f2152();
+    public abstract void f2153();
+    public abstract void f2154();
+    public abstract void f2155();
+    public abstract void f2156();
+    public abstract void f2157();
+    public abstract void f2158();
+    public abstract void f2159();
+    public abstract void f2160();
+    public abstract void f2161();
+    public abstract void f2162();
+    public abstract void f2163();
+    public abstract void f2164();
+    public abstract void f2165();
+    public abstract void f2166();
+    public abstract void f2167();
+    public abstract void f2168();
+    public abstract void f2169();
+    public abstract void f2170();
+    public abstract void f2171();
+    public abstract void f2172();
+    public abstract void f2173();
+    public abstract void f2174();
+    public abstract void f2175();
+    public abstract void f2176();
+    public abstract void f2177();
+    public abstract void f2178();
+    public abstract void f2179();
+    public abstract void f2180();
+    public abstract void f2181();
+    public abstract void f2182();
+    public abstract void f2183();
+    public abstract void f2184();
+    public abstract void f2185();
+    public abstract void f2186();
+    public abstract void f2187();
+    public abstract void f2188();
+    public abstract void f2189();
+    public abstract void f2190();
+    public abstract void f2191();
+    public abstract void f2192();
+    public abstract void f2193();
+    public abstract void f2194();
+    public abstract void f2195();
+    public abstract void f2196();
+    public abstract void f2197();
+    public abstract void f2198();
+    public abstract void f2199();
+    public abstract void f2200();
+    public abstract void f2201();
+    public abstract void f2202();
+    public abstract void f2203();
+    public abstract void f2204();
+    public abstract void f2205();
+    public abstract void f2206();
+    public abstract void f2207();
+    public abstract void f2208();
+    public abstract void f2209();
+    public abstract void f2210();
+    public abstract void f2211();
+    public abstract void f2212();
+    public abstract void f2213();
+    public abstract void f2214();
+    public abstract void f2215();
+    public abstract void f2216();
+    public abstract void f2217();
+    public abstract void f2218();
+    public abstract void f2219();
+    public abstract void f2220();
+    public abstract void f2221();
+    public abstract void f2222();
+    public abstract void f2223();
+    public abstract void f2224();
+    public abstract void f2225();
+    public abstract void f2226();
+    public abstract void f2227();
+    public abstract void f2228();
+    public abstract void f2229();
+    public abstract void f2230();
+    public abstract void f2231();
+    public abstract void f2232();
+    public abstract void f2233();
+    public abstract void f2234();
+    public abstract void f2235();
+    public abstract void f2236();
+    public abstract void f2237();
+    public abstract void f2238();
+    public abstract void f2239();
+    public abstract void f2240();
+    public abstract void f2241();
+    public abstract void f2242();
+    public abstract void f2243();
+    public abstract void f2244();
+    public abstract void f2245();
+    public abstract void f2246();
+    public abstract void f2247();
+    public abstract void f2248();
+    public abstract void f2249();
+    public abstract void f2250();
+    public abstract void f2251();
+    public abstract void f2252();
+    public abstract void f2253();
+    public abstract void f2254();
+    public abstract void f2255();
+    public abstract void f2256();
+    public abstract void f2257();
+    public abstract void f2258();
+    public abstract void f2259();
+    public abstract void f2260();
+    public abstract void f2261();
+    public abstract void f2262();
+    public abstract void f2263();
+    public abstract void f2264();
+    public abstract void f2265();
+    public abstract void f2266();
+    public abstract void f2267();
+    public abstract void f2268();
+    public abstract void f2269();
+    public abstract void f2270();
+    public abstract void f2271();
+    public abstract void f2272();
+    public abstract void f2273();
+    public abstract void f2274();
+    public abstract void f2275();
+    public abstract void f2276();
+    public abstract void f2277();
+    public abstract void f2278();
+    public abstract void f2279();
+    public abstract void f2280();
+    public abstract void f2281();
+    public abstract void f2282();
+    public abstract void f2283();
+    public abstract void f2284();
+    public abstract void f2285();
+    public abstract void f2286();
+    public abstract void f2287();
+    public abstract void f2288();
+    public abstract void f2289();
+    public abstract void f2290();
+    public abstract void f2291();
+    public abstract void f2292();
+    public abstract void f2293();
+    public abstract void f2294();
+    public abstract void f2295();
+    public abstract void f2296();
+    public abstract void f2297();
+    public abstract void f2298();
+    public abstract void f2299();
+    public abstract void f2300();
+    public abstract void f2301();
+    public abstract void f2302();
+    public abstract void f2303();
+    public abstract void f2304();
+    public abstract void f2305();
+    public abstract void f2306();
+    public abstract void f2307();
+    public abstract void f2308();
+    public abstract void f2309();
+    public abstract void f2310();
+    public abstract void f2311();
+    public abstract void f2312();
+    public abstract void f2313();
+    public abstract void f2314();
+    public abstract void f2315();
+    public abstract void f2316();
+    public abstract void f2317();
+    public abstract void f2318();
+    public abstract void f2319();
+    public abstract void f2320();
+    public abstract void f2321();
+    public abstract void f2322();
+    public abstract void f2323();
+    public abstract void f2324();
+    public abstract void f2325();
+    public abstract void f2326();
+    public abstract void f2327();
+    public abstract void f2328();
+    public abstract void f2329();
+    public abstract void f2330();
+    public abstract void f2331();
+    public abstract void f2332();
+    public abstract void f2333();
+    public abstract void f2334();
+    public abstract void f2335();
+    public abstract void f2336();
+    public abstract void f2337();
+    public abstract void f2338();
+    public abstract void f2339();
+    public abstract void f2340();
+    public abstract void f2341();
+    public abstract void f2342();
+    public abstract void f2343();
+    public abstract void f2344();
+    public abstract void f2345();
+    public abstract void f2346();
+    public abstract void f2347();
+    public abstract void f2348();
+    public abstract void f2349();
+    public abstract void f2350();
+    public abstract void f2351();
+    public abstract void f2352();
+    public abstract void f2353();
+    public abstract void f2354();
+    public abstract void f2355();
+    public abstract void f2356();
+    public abstract void f2357();
+    public abstract void f2358();
+    public abstract void f2359();
+    public abstract void f2360();
+    public abstract void f2361();
+    public abstract void f2362();
+    public abstract void f2363();
+    public abstract void f2364();
+    public abstract void f2365();
+    public abstract void f2366();
+    public abstract void f2367();
+    public abstract void f2368();
+    public abstract void f2369();
+    public abstract void f2370();
+    public abstract void f2371();
+    public abstract void f2372();
+    public abstract void f2373();
+    public abstract void f2374();
+    public abstract void f2375();
+    public abstract void f2376();
+    public abstract void f2377();
+    public abstract void f2378();
+    public abstract void f2379();
+    public abstract void f2380();
+    public abstract void f2381();
+    public abstract void f2382();
+    public abstract void f2383();
+    public abstract void f2384();
+    public abstract void f2385();
+    public abstract void f2386();
+    public abstract void f2387();
+    public abstract void f2388();
+    public abstract void f2389();
+    public abstract void f2390();
+    public abstract void f2391();
+    public abstract void f2392();
+    public abstract void f2393();
+    public abstract void f2394();
+    public abstract void f2395();
+    public abstract void f2396();
+    public abstract void f2397();
+    public abstract void f2398();
+    public abstract void f2399();
+    public abstract void f2400();
+    public abstract void f2401();
+    public abstract void f2402();
+    public abstract void f2403();
+    public abstract void f2404();
+    public abstract void f2405();
+    public abstract void f2406();
+    public abstract void f2407();
+    public abstract void f2408();
+    public abstract void f2409();
+    public abstract void f2410();
+    public abstract void f2411();
+    public abstract void f2412();
+    public abstract void f2413();
+    public abstract void f2414();
+    public abstract void f2415();
+    public abstract void f2416();
+    public abstract void f2417();
+    public abstract void f2418();
+    public abstract void f2419();
+    public abstract void f2420();
+    public abstract void f2421();
+    public abstract void f2422();
+    public abstract void f2423();
+    public abstract void f2424();
+    public abstract void f2425();
+    public abstract void f2426();
+    public abstract void f2427();
+    public abstract void f2428();
+    public abstract void f2429();
+    public abstract void f2430();
+    public abstract void f2431();
+    public abstract void f2432();
+    public abstract void f2433();
+    public abstract void f2434();
+    public abstract void f2435();
+    public abstract void f2436();
+    public abstract void f2437();
+    public abstract void f2438();
+    public abstract void f2439();
+    public abstract void f2440();
+    public abstract void f2441();
+    public abstract void f2442();
+    public abstract void f2443();
+    public abstract void f2444();
+    public abstract void f2445();
+    public abstract void f2446();
+    public abstract void f2447();
+    public abstract void f2448();
+    public abstract void f2449();
+    public abstract void f2450();
+    public abstract void f2451();
+    public abstract void f2452();
+    public abstract void f2453();
+    public abstract void f2454();
+    public abstract void f2455();
+    public abstract void f2456();
+    public abstract void f2457();
+    public abstract void f2458();
+    public abstract void f2459();
+    public abstract void f2460();
+    public abstract void f2461();
+    public abstract void f2462();
+    public abstract void f2463();
+    public abstract void f2464();
+    public abstract void f2465();
+    public abstract void f2466();
+    public abstract void f2467();
+    public abstract void f2468();
+    public abstract void f2469();
+    public abstract void f2470();
+    public abstract void f2471();
+    public abstract void f2472();
+    public abstract void f2473();
+    public abstract void f2474();
+    public abstract void f2475();
+    public abstract void f2476();
+    public abstract void f2477();
+    public abstract void f2478();
+    public abstract void f2479();
+    public abstract void f2480();
+    public abstract void f2481();
+    public abstract void f2482();
+    public abstract void f2483();
+    public abstract void f2484();
+    public abstract void f2485();
+    public abstract void f2486();
+    public abstract void f2487();
+    public abstract void f2488();
+    public abstract void f2489();
+    public abstract void f2490();
+    public abstract void f2491();
+    public abstract void f2492();
+    public abstract void f2493();
+    public abstract void f2494();
+    public abstract void f2495();
+    public abstract void f2496();
+    public abstract void f2497();
+    public abstract void f2498();
+    public abstract void f2499();
+    public abstract void f2500();
+    public abstract void f2501();
+    public abstract void f2502();
+    public abstract void f2503();
+    public abstract void f2504();
+    public abstract void f2505();
+    public abstract void f2506();
+    public abstract void f2507();
+    public abstract void f2508();
+    public abstract void f2509();
+    public abstract void f2510();
+    public abstract void f2511();
+    public abstract void f2512();
+    public abstract void f2513();
+    public abstract void f2514();
+    public abstract void f2515();
+    public abstract void f2516();
+    public abstract void f2517();
+    public abstract void f2518();
+    public abstract void f2519();
+    public abstract void f2520();
+    public abstract void f2521();
+    public abstract void f2522();
+    public abstract void f2523();
+    public abstract void f2524();
+    public abstract void f2525();
+    public abstract void f2526();
+    public abstract void f2527();
+    public abstract void f2528();
+    public abstract void f2529();
+    public abstract void f2530();
+    public abstract void f2531();
+    public abstract void f2532();
+    public abstract void f2533();
+    public abstract void f2534();
+    public abstract void f2535();
+    public abstract void f2536();
+    public abstract void f2537();
+    public abstract void f2538();
+    public abstract void f2539();
+    public abstract void f2540();
+    public abstract void f2541();
+    public abstract void f2542();
+    public abstract void f2543();
+    public abstract void f2544();
+    public abstract void f2545();
+    public abstract void f2546();
+    public abstract void f2547();
+    public abstract void f2548();
+    public abstract void f2549();
+    public abstract void f2550();
+    public abstract void f2551();
+    public abstract void f2552();
+    public abstract void f2553();
+    public abstract void f2554();
+    public abstract void f2555();
+    public abstract void f2556();
+    public abstract void f2557();
+    public abstract void f2558();
+    public abstract void f2559();
+    public abstract void f2560();
+    public abstract void f2561();
+    public abstract void f2562();
+    public abstract void f2563();
+    public abstract void f2564();
+    public abstract void f2565();
+    public abstract void f2566();
+    public abstract void f2567();
+    public abstract void f2568();
+    public abstract void f2569();
+    public abstract void f2570();
+    public abstract void f2571();
+    public abstract void f2572();
+    public abstract void f2573();
+    public abstract void f2574();
+    public abstract void f2575();
+    public abstract void f2576();
+    public abstract void f2577();
+    public abstract void f2578();
+    public abstract void f2579();
+    public abstract void f2580();
+    public abstract void f2581();
+    public abstract void f2582();
+    public abstract void f2583();
+    public abstract void f2584();
+    public abstract void f2585();
+    public abstract void f2586();
+    public abstract void f2587();
+    public abstract void f2588();
+    public abstract void f2589();
+    public abstract void f2590();
+    public abstract void f2591();
+    public abstract void f2592();
+    public abstract void f2593();
+    public abstract void f2594();
+    public abstract void f2595();
+    public abstract void f2596();
+    public abstract void f2597();
+    public abstract void f2598();
+    public abstract void f2599();
+    public abstract void f2600();
+    public abstract void f2601();
+    public abstract void f2602();
+    public abstract void f2603();
+    public abstract void f2604();
+    public abstract void f2605();
+    public abstract void f2606();
+    public abstract void f2607();
+    public abstract void f2608();
+    public abstract void f2609();
+    public abstract void f2610();
+    public abstract void f2611();
+    public abstract void f2612();
+    public abstract void f2613();
+    public abstract void f2614();
+    public abstract void f2615();
+    public abstract void f2616();
+    public abstract void f2617();
+    public abstract void f2618();
+    public abstract void f2619();
+    public abstract void f2620();
+    public abstract void f2621();
+    public abstract void f2622();
+    public abstract void f2623();
+    public abstract void f2624();
+    public abstract void f2625();
+    public abstract void f2626();
+    public abstract void f2627();
+    public abstract void f2628();
+    public abstract void f2629();
+    public abstract void f2630();
+    public abstract void f2631();
+    public abstract void f2632();
+    public abstract void f2633();
+    public abstract void f2634();
+    public abstract void f2635();
+    public abstract void f2636();
+    public abstract void f2637();
+    public abstract void f2638();
+    public abstract void f2639();
+    public abstract void f2640();
+    public abstract void f2641();
+    public abstract void f2642();
+    public abstract void f2643();
+    public abstract void f2644();
+    public abstract void f2645();
+    public abstract void f2646();
+    public abstract void f2647();
+    public abstract void f2648();
+    public abstract void f2649();
+    public abstract void f2650();
+    public abstract void f2651();
+    public abstract void f2652();
+    public abstract void f2653();
+    public abstract void f2654();
+    public abstract void f2655();
+    public abstract void f2656();
+    public abstract void f2657();
+    public abstract void f2658();
+    public abstract void f2659();
+    public abstract void f2660();
+    public abstract void f2661();
+    public abstract void f2662();
+    public abstract void f2663();
+    public abstract void f2664();
+    public abstract void f2665();
+    public abstract void f2666();
+    public abstract void f2667();
+    public abstract void f2668();
+    public abstract void f2669();
+    public abstract void f2670();
+    public abstract void f2671();
+    public abstract void f2672();
+    public abstract void f2673();
+    public abstract void f2674();
+    public abstract void f2675();
+    public abstract void f2676();
+    public abstract void f2677();
+    public abstract void f2678();
+    public abstract void f2679();
+    public abstract void f2680();
+    public abstract void f2681();
+    public abstract void f2682();
+    public abstract void f2683();
+    public abstract void f2684();
+    public abstract void f2685();
+    public abstract void f2686();
+    public abstract void f2687();
+    public abstract void f2688();
+    public abstract void f2689();
+    public abstract void f2690();
+    public abstract void f2691();
+    public abstract void f2692();
+    public abstract void f2693();
+    public abstract void f2694();
+    public abstract void f2695();
+    public abstract void f2696();
+    public abstract void f2697();
+    public abstract void f2698();
+    public abstract void f2699();
+    public abstract void f2700();
+    public abstract void f2701();
+    public abstract void f2702();
+    public abstract void f2703();
+    public abstract void f2704();
+    public abstract void f2705();
+    public abstract void f2706();
+    public abstract void f2707();
+    public abstract void f2708();
+    public abstract void f2709();
+    public abstract void f2710();
+    public abstract void f2711();
+    public abstract void f2712();
+    public abstract void f2713();
+    public abstract void f2714();
+    public abstract void f2715();
+    public abstract void f2716();
+    public abstract void f2717();
+    public abstract void f2718();
+    public abstract void f2719();
+    public abstract void f2720();
+    public abstract void f2721();
+    public abstract void f2722();
+    public abstract void f2723();
+    public abstract void f2724();
+    public abstract void f2725();
+    public abstract void f2726();
+    public abstract void f2727();
+    public abstract void f2728();
+    public abstract void f2729();
+    public abstract void f2730();
+    public abstract void f2731();
+    public abstract void f2732();
+    public abstract void f2733();
+    public abstract void f2734();
+    public abstract void f2735();
+    public abstract void f2736();
+    public abstract void f2737();
+    public abstract void f2738();
+    public abstract void f2739();
+    public abstract void f2740();
+    public abstract void f2741();
+    public abstract void f2742();
+    public abstract void f2743();
+    public abstract void f2744();
+    public abstract void f2745();
+    public abstract void f2746();
+    public abstract void f2747();
+    public abstract void f2748();
+    public abstract void f2749();
+    public abstract void f2750();
+    public abstract void f2751();
+    public abstract void f2752();
+    public abstract void f2753();
+    public abstract void f2754();
+    public abstract void f2755();
+    public abstract void f2756();
+    public abstract void f2757();
+    public abstract void f2758();
+    public abstract void f2759();
+    public abstract void f2760();
+    public abstract void f2761();
+    public abstract void f2762();
+    public abstract void f2763();
+    public abstract void f2764();
+    public abstract void f2765();
+    public abstract void f2766();
+    public abstract void f2767();
+    public abstract void f2768();
+    public abstract void f2769();
+    public abstract void f2770();
+    public abstract void f2771();
+    public abstract void f2772();
+    public abstract void f2773();
+    public abstract void f2774();
+    public abstract void f2775();
+    public abstract void f2776();
+    public abstract void f2777();
+    public abstract void f2778();
+    public abstract void f2779();
+    public abstract void f2780();
+    public abstract void f2781();
+    public abstract void f2782();
+    public abstract void f2783();
+    public abstract void f2784();
+    public abstract void f2785();
+    public abstract void f2786();
+    public abstract void f2787();
+    public abstract void f2788();
+    public abstract void f2789();
+    public abstract void f2790();
+    public abstract void f2791();
+    public abstract void f2792();
+    public abstract void f2793();
+    public abstract void f2794();
+    public abstract void f2795();
+    public abstract void f2796();
+    public abstract void f2797();
+    public abstract void f2798();
+    public abstract void f2799();
+    public abstract void f2800();
+    public abstract void f2801();
+    public abstract void f2802();
+    public abstract void f2803();
+    public abstract void f2804();
+    public abstract void f2805();
+    public abstract void f2806();
+    public abstract void f2807();
+    public abstract void f2808();
+    public abstract void f2809();
+    public abstract void f2810();
+    public abstract void f2811();
+    public abstract void f2812();
+    public abstract void f2813();
+    public abstract void f2814();
+    public abstract void f2815();
+    public abstract void f2816();
+    public abstract void f2817();
+    public abstract void f2818();
+    public abstract void f2819();
+    public abstract void f2820();
+    public abstract void f2821();
+    public abstract void f2822();
+    public abstract void f2823();
+    public abstract void f2824();
+    public abstract void f2825();
+    public abstract void f2826();
+    public abstract void f2827();
+    public abstract void f2828();
+    public abstract void f2829();
+    public abstract void f2830();
+    public abstract void f2831();
+    public abstract void f2832();
+    public abstract void f2833();
+    public abstract void f2834();
+    public abstract void f2835();
+    public abstract void f2836();
+    public abstract void f2837();
+    public abstract void f2838();
+    public abstract void f2839();
+    public abstract void f2840();
+    public abstract void f2841();
+    public abstract void f2842();
+    public abstract void f2843();
+    public abstract void f2844();
+    public abstract void f2845();
+    public abstract void f2846();
+    public abstract void f2847();
+    public abstract void f2848();
+    public abstract void f2849();
+    public abstract void f2850();
+    public abstract void f2851();
+    public abstract void f2852();
+    public abstract void f2853();
+    public abstract void f2854();
+    public abstract void f2855();
+    public abstract void f2856();
+    public abstract void f2857();
+    public abstract void f2858();
+    public abstract void f2859();
+    public abstract void f2860();
+    public abstract void f2861();
+    public abstract void f2862();
+    public abstract void f2863();
+    public abstract void f2864();
+    public abstract void f2865();
+    public abstract void f2866();
+    public abstract void f2867();
+    public abstract void f2868();
+    public abstract void f2869();
+    public abstract void f2870();
+    public abstract void f2871();
+    public abstract void f2872();
+    public abstract void f2873();
+    public abstract void f2874();
+    public abstract void f2875();
+    public abstract void f2876();
+    public abstract void f2877();
+    public abstract void f2878();
+    public abstract void f2879();
+    public abstract void f2880();
+    public abstract void f2881();
+    public abstract void f2882();
+    public abstract void f2883();
+    public abstract void f2884();
+    public abstract void f2885();
+    public abstract void f2886();
+    public abstract void f2887();
+    public abstract void f2888();
+    public abstract void f2889();
+    public abstract void f2890();
+    public abstract void f2891();
+    public abstract void f2892();
+    public abstract void f2893();
+    public abstract void f2894();
+    public abstract void f2895();
+    public abstract void f2896();
+    public abstract void f2897();
+    public abstract void f2898();
+    public abstract void f2899();
+    public abstract void f2900();
+    public abstract void f2901();
+    public abstract void f2902();
+    public abstract void f2903();
+    public abstract void f2904();
+    public abstract void f2905();
+    public abstract void f2906();
+    public abstract void f2907();
+    public abstract void f2908();
+    public abstract void f2909();
+    public abstract void f2910();
+    public abstract void f2911();
+    public abstract void f2912();
+    public abstract void f2913();
+    public abstract void f2914();
+    public abstract void f2915();
+    public abstract void f2916();
+    public abstract void f2917();
+    public abstract void f2918();
+    public abstract void f2919();
+    public abstract void f2920();
+    public abstract void f2921();
+    public abstract void f2922();
+    public abstract void f2923();
+    public abstract void f2924();
+    public abstract void f2925();
+    public abstract void f2926();
+    public abstract void f2927();
+    public abstract void f2928();
+    public abstract void f2929();
+    public abstract void f2930();
+    public abstract void f2931();
+    public abstract void f2932();
+    public abstract void f2933();
+    public abstract void f2934();
+    public abstract void f2935();
+    public abstract void f2936();
+    public abstract void f2937();
+    public abstract void f2938();
+    public abstract void f2939();
+    public abstract void f2940();
+    public abstract void f2941();
+    public abstract void f2942();
+    public abstract void f2943();
+    public abstract void f2944();
+    public abstract void f2945();
+    public abstract void f2946();
+    public abstract void f2947();
+    public abstract void f2948();
+    public abstract void f2949();
+    public abstract void f2950();
+    public abstract void f2951();
+    public abstract void f2952();
+    public abstract void f2953();
+    public abstract void f2954();
+    public abstract void f2955();
+    public abstract void f2956();
+    public abstract void f2957();
+    public abstract void f2958();
+    public abstract void f2959();
+    public abstract void f2960();
+    public abstract void f2961();
+    public abstract void f2962();
+    public abstract void f2963();
+    public abstract void f2964();
+    public abstract void f2965();
+    public abstract void f2966();
+    public abstract void f2967();
+    public abstract void f2968();
+    public abstract void f2969();
+    public abstract void f2970();
+    public abstract void f2971();
+    public abstract void f2972();
+    public abstract void f2973();
+    public abstract void f2974();
+    public abstract void f2975();
+    public abstract void f2976();
+    public abstract void f2977();
+    public abstract void f2978();
+    public abstract void f2979();
+    public abstract void f2980();
+    public abstract void f2981();
+    public abstract void f2982();
+    public abstract void f2983();
+    public abstract void f2984();
+    public abstract void f2985();
+    public abstract void f2986();
+    public abstract void f2987();
+    public abstract void f2988();
+    public abstract void f2989();
+    public abstract void f2990();
+    public abstract void f2991();
+    public abstract void f2992();
+    public abstract void f2993();
+    public abstract void f2994();
+    public abstract void f2995();
+    public abstract void f2996();
+    public abstract void f2997();
+    public abstract void f2998();
+    public abstract void f2999();
+    public abstract void f3000();
+    public abstract void f3001();
+    public abstract void f3002();
+    public abstract void f3003();
+    public abstract void f3004();
+    public abstract void f3005();
+    public abstract void f3006();
+    public abstract void f3007();
+    public abstract void f3008();
+    public abstract void f3009();
+    public abstract void f3010();
+    public abstract void f3011();
+    public abstract void f3012();
+    public abstract void f3013();
+    public abstract void f3014();
+    public abstract void f3015();
+    public abstract void f3016();
+    public abstract void f3017();
+    public abstract void f3018();
+    public abstract void f3019();
+    public abstract void f3020();
+    public abstract void f3021();
+    public abstract void f3022();
+    public abstract void f3023();
+    public abstract void f3024();
+    public abstract void f3025();
+    public abstract void f3026();
+    public abstract void f3027();
+    public abstract void f3028();
+    public abstract void f3029();
+    public abstract void f3030();
+    public abstract void f3031();
+    public abstract void f3032();
+    public abstract void f3033();
+    public abstract void f3034();
+    public abstract void f3035();
+    public abstract void f3036();
+    public abstract void f3037();
+    public abstract void f3038();
+    public abstract void f3039();
+    public abstract void f3040();
+    public abstract void f3041();
+    public abstract void f3042();
+    public abstract void f3043();
+    public abstract void f3044();
+    public abstract void f3045();
+    public abstract void f3046();
+    public abstract void f3047();
+    public abstract void f3048();
+    public abstract void f3049();
+    public abstract void f3050();
+    public abstract void f3051();
+    public abstract void f3052();
+    public abstract void f3053();
+    public abstract void f3054();
+    public abstract void f3055();
+    public abstract void f3056();
+    public abstract void f3057();
+    public abstract void f3058();
+    public abstract void f3059();
+    public abstract void f3060();
+    public abstract void f3061();
+    public abstract void f3062();
+    public abstract void f3063();
+    public abstract void f3064();
+    public abstract void f3065();
+    public abstract void f3066();
+    public abstract void f3067();
+    public abstract void f3068();
+    public abstract void f3069();
+    public abstract void f3070();
+    public abstract void f3071();
+    public abstract void f3072();
+    public abstract void f3073();
+    public abstract void f3074();
+    public abstract void f3075();
+    public abstract void f3076();
+    public abstract void f3077();
+    public abstract void f3078();
+    public abstract void f3079();
+    public abstract void f3080();
+    public abstract void f3081();
+    public abstract void f3082();
+    public abstract void f3083();
+    public abstract void f3084();
+    public abstract void f3085();
+    public abstract void f3086();
+    public abstract void f3087();
+    public abstract void f3088();
+    public abstract void f3089();
+    public abstract void f3090();
+    public abstract void f3091();
+    public abstract void f3092();
+    public abstract void f3093();
+    public abstract void f3094();
+    public abstract void f3095();
+    public abstract void f3096();
+    public abstract void f3097();
+    public abstract void f3098();
+    public abstract void f3099();
+    public abstract void f3100();
+    public abstract void f3101();
+    public abstract void f3102();
+    public abstract void f3103();
+    public abstract void f3104();
+    public abstract void f3105();
+    public abstract void f3106();
+    public abstract void f3107();
+    public abstract void f3108();
+    public abstract void f3109();
+    public abstract void f3110();
+    public abstract void f3111();
+    public abstract void f3112();
+    public abstract void f3113();
+    public abstract void f3114();
+    public abstract void f3115();
+    public abstract void f3116();
+    public abstract void f3117();
+    public abstract void f3118();
+    public abstract void f3119();
+    public abstract void f3120();
+    public abstract void f3121();
+    public abstract void f3122();
+    public abstract void f3123();
+    public abstract void f3124();
+    public abstract void f3125();
+    public abstract void f3126();
+    public abstract void f3127();
+    public abstract void f3128();
+    public abstract void f3129();
+    public abstract void f3130();
+    public abstract void f3131();
+    public abstract void f3132();
+    public abstract void f3133();
+    public abstract void f3134();
+    public abstract void f3135();
+    public abstract void f3136();
+    public abstract void f3137();
+    public abstract void f3138();
+    public abstract void f3139();
+    public abstract void f3140();
+    public abstract void f3141();
+    public abstract void f3142();
+    public abstract void f3143();
+    public abstract void f3144();
+    public abstract void f3145();
+    public abstract void f3146();
+    public abstract void f3147();
+    public abstract void f3148();
+    public abstract void f3149();
+    public abstract void f3150();
+    public abstract void f3151();
+    public abstract void f3152();
+    public abstract void f3153();
+    public abstract void f3154();
+    public abstract void f3155();
+    public abstract void f3156();
+    public abstract void f3157();
+    public abstract void f3158();
+    public abstract void f3159();
+    public abstract void f3160();
+    public abstract void f3161();
+    public abstract void f3162();
+    public abstract void f3163();
+    public abstract void f3164();
+    public abstract void f3165();
+    public abstract void f3166();
+    public abstract void f3167();
+    public abstract void f3168();
+    public abstract void f3169();
+    public abstract void f3170();
+    public abstract void f3171();
+    public abstract void f3172();
+    public abstract void f3173();
+    public abstract void f3174();
+    public abstract void f3175();
+    public abstract void f3176();
+    public abstract void f3177();
+    public abstract void f3178();
+    public abstract void f3179();
+    public abstract void f3180();
+    public abstract void f3181();
+    public abstract void f3182();
+    public abstract void f3183();
+    public abstract void f3184();
+    public abstract void f3185();
+    public abstract void f3186();
+    public abstract void f3187();
+    public abstract void f3188();
+    public abstract void f3189();
+    public abstract void f3190();
+    public abstract void f3191();
+    public abstract void f3192();
+    public abstract void f3193();
+    public abstract void f3194();
+    public abstract void f3195();
+    public abstract void f3196();
+    public abstract void f3197();
+    public abstract void f3198();
+    public abstract void f3199();
+    public abstract void f3200();
+    public abstract void f3201();
+    public abstract void f3202();
+    public abstract void f3203();
+    public abstract void f3204();
+    public abstract void f3205();
+    public abstract void f3206();
+    public abstract void f3207();
+    public abstract void f3208();
+    public abstract void f3209();
+    public abstract void f3210();
+    public abstract void f3211();
+    public abstract void f3212();
+    public abstract void f3213();
+    public abstract void f3214();
+    public abstract void f3215();
+    public abstract void f3216();
+    public abstract void f3217();
+    public abstract void f3218();
+    public abstract void f3219();
+    public abstract void f3220();
+    public abstract void f3221();
+    public abstract void f3222();
+    public abstract void f3223();
+    public abstract void f3224();
+    public abstract void f3225();
+    public abstract void f3226();
+    public abstract void f3227();
+    public abstract void f3228();
+    public abstract void f3229();
+    public abstract void f3230();
+    public abstract void f3231();
+    public abstract void f3232();
+    public abstract void f3233();
+    public abstract void f3234();
+    public abstract void f3235();
+    public abstract void f3236();
+    public abstract void f3237();
+    public abstract void f3238();
+    public abstract void f3239();
+    public abstract void f3240();
+    public abstract void f3241();
+    public abstract void f3242();
+    public abstract void f3243();
+    public abstract void f3244();
+    public abstract void f3245();
+    public abstract void f3246();
+    public abstract void f3247();
+    public abstract void f3248();
+    public abstract void f3249();
+    public abstract void f3250();
+    public abstract void f3251();
+    public abstract void f3252();
+    public abstract void f3253();
+    public abstract void f3254();
+    public abstract void f3255();
+    public abstract void f3256();
+    public abstract void f3257();
+    public abstract void f3258();
+    public abstract void f3259();
+    public abstract void f3260();
+    public abstract void f3261();
+    public abstract void f3262();
+    public abstract void f3263();
+    public abstract void f3264();
+    public abstract void f3265();
+    public abstract void f3266();
+    public abstract void f3267();
+    public abstract void f3268();
+    public abstract void f3269();
+    public abstract void f3270();
+    public abstract void f3271();
+    public abstract void f3272();
+    public abstract void f3273();
+    public abstract void f3274();
+    public abstract void f3275();
+    public abstract void f3276();
+    public abstract void f3277();
+    public abstract void f3278();
+    public abstract void f3279();
+    public abstract void f3280();
+    public abstract void f3281();
+    public abstract void f3282();
+    public abstract void f3283();
+    public abstract void f3284();
+    public abstract void f3285();
+    public abstract void f3286();
+    public abstract void f3287();
+    public abstract void f3288();
+    public abstract void f3289();
+    public abstract void f3290();
+    public abstract void f3291();
+    public abstract void f3292();
+    public abstract void f3293();
+    public abstract void f3294();
+    public abstract void f3295();
+    public abstract void f3296();
+    public abstract void f3297();
+    public abstract void f3298();
+    public abstract void f3299();
+    public abstract void f3300();
+    public abstract void f3301();
+    public abstract void f3302();
+    public abstract void f3303();
+    public abstract void f3304();
+    public abstract void f3305();
+    public abstract void f3306();
+    public abstract void f3307();
+    public abstract void f3308();
+    public abstract void f3309();
+    public abstract void f3310();
+    public abstract void f3311();
+    public abstract void f3312();
+    public abstract void f3313();
+    public abstract void f3314();
+    public abstract void f3315();
+    public abstract void f3316();
+    public abstract void f3317();
+    public abstract void f3318();
+    public abstract void f3319();
+    public abstract void f3320();
+    public abstract void f3321();
+    public abstract void f3322();
+    public abstract void f3323();
+    public abstract void f3324();
+    public abstract void f3325();
+    public abstract void f3326();
+    public abstract void f3327();
+    public abstract void f3328();
+    public abstract void f3329();
+    public abstract void f3330();
+    public abstract void f3331();
+    public abstract void f3332();
+    public abstract void f3333();
+    public abstract void f3334();
+    public abstract void f3335();
+    public abstract void f3336();
+    public abstract void f3337();
+    public abstract void f3338();
+    public abstract void f3339();
+    public abstract void f3340();
+    public abstract void f3341();
+    public abstract void f3342();
+    public abstract void f3343();
+    public abstract void f3344();
+    public abstract void f3345();
+    public abstract void f3346();
+    public abstract void f3347();
+    public abstract void f3348();
+    public abstract void f3349();
+    public abstract void f3350();
+    public abstract void f3351();
+    public abstract void f3352();
+    public abstract void f3353();
+    public abstract void f3354();
+    public abstract void f3355();
+    public abstract void f3356();
+    public abstract void f3357();
+    public abstract void f3358();
+    public abstract void f3359();
+    public abstract void f3360();
+    public abstract void f3361();
+    public abstract void f3362();
+    public abstract void f3363();
+    public abstract void f3364();
+    public abstract void f3365();
+    public abstract void f3366();
+    public abstract void f3367();
+    public abstract void f3368();
+    public abstract void f3369();
+    public abstract void f3370();
+    public abstract void f3371();
+    public abstract void f3372();
+    public abstract void f3373();
+    public abstract void f3374();
+    public abstract void f3375();
+    public abstract void f3376();
+    public abstract void f3377();
+    public abstract void f3378();
+    public abstract void f3379();
+    public abstract void f3380();
+    public abstract void f3381();
+    public abstract void f3382();
+    public abstract void f3383();
+    public abstract void f3384();
+    public abstract void f3385();
+    public abstract void f3386();
+    public abstract void f3387();
+    public abstract void f3388();
+    public abstract void f3389();
+    public abstract void f3390();
+    public abstract void f3391();
+    public abstract void f3392();
+    public abstract void f3393();
+    public abstract void f3394();
+    public abstract void f3395();
+    public abstract void f3396();
+    public abstract void f3397();
+    public abstract void f3398();
+    public abstract void f3399();
+    public abstract void f3400();
+    public abstract void f3401();
+    public abstract void f3402();
+    public abstract void f3403();
+    public abstract void f3404();
+    public abstract void f3405();
+    public abstract void f3406();
+    public abstract void f3407();
+    public abstract void f3408();
+    public abstract void f3409();
+    public abstract void f3410();
+    public abstract void f3411();
+    public abstract void f3412();
+    public abstract void f3413();
+    public abstract void f3414();
+    public abstract void f3415();
+    public abstract void f3416();
+    public abstract void f3417();
+    public abstract void f3418();
+    public abstract void f3419();
+    public abstract void f3420();
+    public abstract void f3421();
+    public abstract void f3422();
+    public abstract void f3423();
+    public abstract void f3424();
+    public abstract void f3425();
+    public abstract void f3426();
+    public abstract void f3427();
+    public abstract void f3428();
+    public abstract void f3429();
+    public abstract void f3430();
+    public abstract void f3431();
+    public abstract void f3432();
+    public abstract void f3433();
+    public abstract void f3434();
+    public abstract void f3435();
+    public abstract void f3436();
+    public abstract void f3437();
+    public abstract void f3438();
+    public abstract void f3439();
+    public abstract void f3440();
+    public abstract void f3441();
+    public abstract void f3442();
+    public abstract void f3443();
+    public abstract void f3444();
+    public abstract void f3445();
+    public abstract void f3446();
+    public abstract void f3447();
+    public abstract void f3448();
+    public abstract void f3449();
+    public abstract void f3450();
+    public abstract void f3451();
+    public abstract void f3452();
+    public abstract void f3453();
+    public abstract void f3454();
+    public abstract void f3455();
+    public abstract void f3456();
+    public abstract void f3457();
+    public abstract void f3458();
+    public abstract void f3459();
+    public abstract void f3460();
+    public abstract void f3461();
+    public abstract void f3462();
+    public abstract void f3463();
+    public abstract void f3464();
+    public abstract void f3465();
+    public abstract void f3466();
+    public abstract void f3467();
+    public abstract void f3468();
+    public abstract void f3469();
+    public abstract void f3470();
+    public abstract void f3471();
+    public abstract void f3472();
+    public abstract void f3473();
+    public abstract void f3474();
+    public abstract void f3475();
+    public abstract void f3476();
+    public abstract void f3477();
+    public abstract void f3478();
+    public abstract void f3479();
+    public abstract void f3480();
+    public abstract void f3481();
+    public abstract void f3482();
+    public abstract void f3483();
+    public abstract void f3484();
+    public abstract void f3485();
+    public abstract void f3486();
+    public abstract void f3487();
+    public abstract void f3488();
+    public abstract void f3489();
+    public abstract void f3490();
+    public abstract void f3491();
+    public abstract void f3492();
+    public abstract void f3493();
+    public abstract void f3494();
+    public abstract void f3495();
+    public abstract void f3496();
+    public abstract void f3497();
+    public abstract void f3498();
+    public abstract void f3499();
+    public abstract void f3500();
+    public abstract void f3501();
+    public abstract void f3502();
+    public abstract void f3503();
+    public abstract void f3504();
+    public abstract void f3505();
+    public abstract void f3506();
+    public abstract void f3507();
+    public abstract void f3508();
+    public abstract void f3509();
+    public abstract void f3510();
+    public abstract void f3511();
+    public abstract void f3512();
+    public abstract void f3513();
+    public abstract void f3514();
+    public abstract void f3515();
+    public abstract void f3516();
+    public abstract void f3517();
+    public abstract void f3518();
+    public abstract void f3519();
+    public abstract void f3520();
+    public abstract void f3521();
+    public abstract void f3522();
+    public abstract void f3523();
+    public abstract void f3524();
+    public abstract void f3525();
+    public abstract void f3526();
+    public abstract void f3527();
+    public abstract void f3528();
+    public abstract void f3529();
+    public abstract void f3530();
+    public abstract void f3531();
+    public abstract void f3532();
+    public abstract void f3533();
+    public abstract void f3534();
+    public abstract void f3535();
+    public abstract void f3536();
+    public abstract void f3537();
+    public abstract void f3538();
+    public abstract void f3539();
+    public abstract void f3540();
+    public abstract void f3541();
+    public abstract void f3542();
+    public abstract void f3543();
+    public abstract void f3544();
+    public abstract void f3545();
+    public abstract void f3546();
+    public abstract void f3547();
+    public abstract void f3548();
+    public abstract void f3549();
+    public abstract void f3550();
+    public abstract void f3551();
+    public abstract void f3552();
+    public abstract void f3553();
+    public abstract void f3554();
+    public abstract void f3555();
+    public abstract void f3556();
+    public abstract void f3557();
+    public abstract void f3558();
+    public abstract void f3559();
+    public abstract void f3560();
+    public abstract void f3561();
+    public abstract void f3562();
+    public abstract void f3563();
+    public abstract void f3564();
+    public abstract void f3565();
+    public abstract void f3566();
+    public abstract void f3567();
+    public abstract void f3568();
+    public abstract void f3569();
+    public abstract void f3570();
+    public abstract void f3571();
+    public abstract void f3572();
+    public abstract void f3573();
+    public abstract void f3574();
+    public abstract void f3575();
+    public abstract void f3576();
+    public abstract void f3577();
+    public abstract void f3578();
+    public abstract void f3579();
+    public abstract void f3580();
+    public abstract void f3581();
+    public abstract void f3582();
+    public abstract void f3583();
+    public abstract void f3584();
+    public abstract void f3585();
+    public abstract void f3586();
+    public abstract void f3587();
+    public abstract void f3588();
+    public abstract void f3589();
+    public abstract void f3590();
+    public abstract void f3591();
+    public abstract void f3592();
+    public abstract void f3593();
+    public abstract void f3594();
+    public abstract void f3595();
+    public abstract void f3596();
+    public abstract void f3597();
+    public abstract void f3598();
+    public abstract void f3599();
+    public abstract void f3600();
+    public abstract void f3601();
+    public abstract void f3602();
+    public abstract void f3603();
+    public abstract void f3604();
+    public abstract void f3605();
+    public abstract void f3606();
+    public abstract void f3607();
+    public abstract void f3608();
+    public abstract void f3609();
+    public abstract void f3610();
+    public abstract void f3611();
+    public abstract void f3612();
+    public abstract void f3613();
+    public abstract void f3614();
+    public abstract void f3615();
+    public abstract void f3616();
+    public abstract void f3617();
+    public abstract void f3618();
+    public abstract void f3619();
+    public abstract void f3620();
+    public abstract void f3621();
+    public abstract void f3622();
+    public abstract void f3623();
+    public abstract void f3624();
+    public abstract void f3625();
+    public abstract void f3626();
+    public abstract void f3627();
+    public abstract void f3628();
+    public abstract void f3629();
+    public abstract void f3630();
+    public abstract void f3631();
+    public abstract void f3632();
+    public abstract void f3633();
+    public abstract void f3634();
+    public abstract void f3635();
+    public abstract void f3636();
+    public abstract void f3637();
+    public abstract void f3638();
+    public abstract void f3639();
+    public abstract void f3640();
+    public abstract void f3641();
+    public abstract void f3642();
+    public abstract void f3643();
+    public abstract void f3644();
+    public abstract void f3645();
+    public abstract void f3646();
+    public abstract void f3647();
+    public abstract void f3648();
+    public abstract void f3649();
+    public abstract void f3650();
+    public abstract void f3651();
+    public abstract void f3652();
+    public abstract void f3653();
+    public abstract void f3654();
+    public abstract void f3655();
+    public abstract void f3656();
+    public abstract void f3657();
+    public abstract void f3658();
+    public abstract void f3659();
+    public abstract void f3660();
+    public abstract void f3661();
+    public abstract void f3662();
+    public abstract void f3663();
+    public abstract void f3664();
+    public abstract void f3665();
+    public abstract void f3666();
+    public abstract void f3667();
+    public abstract void f3668();
+    public abstract void f3669();
+    public abstract void f3670();
+    public abstract void f3671();
+    public abstract void f3672();
+    public abstract void f3673();
+    public abstract void f3674();
+    public abstract void f3675();
+    public abstract void f3676();
+    public abstract void f3677();
+    public abstract void f3678();
+    public abstract void f3679();
+    public abstract void f3680();
+    public abstract void f3681();
+    public abstract void f3682();
+    public abstract void f3683();
+    public abstract void f3684();
+    public abstract void f3685();
+    public abstract void f3686();
+    public abstract void f3687();
+    public abstract void f3688();
+    public abstract void f3689();
+    public abstract void f3690();
+    public abstract void f3691();
+    public abstract void f3692();
+    public abstract void f3693();
+    public abstract void f3694();
+    public abstract void f3695();
+    public abstract void f3696();
+    public abstract void f3697();
+    public abstract void f3698();
+    public abstract void f3699();
+    public abstract void f3700();
+    public abstract void f3701();
+    public abstract void f3702();
+    public abstract void f3703();
+    public abstract void f3704();
+    public abstract void f3705();
+    public abstract void f3706();
+    public abstract void f3707();
+    public abstract void f3708();
+    public abstract void f3709();
+    public abstract void f3710();
+    public abstract void f3711();
+    public abstract void f3712();
+    public abstract void f3713();
+    public abstract void f3714();
+    public abstract void f3715();
+    public abstract void f3716();
+    public abstract void f3717();
+    public abstract void f3718();
+    public abstract void f3719();
+    public abstract void f3720();
+    public abstract void f3721();
+    public abstract void f3722();
+    public abstract void f3723();
+    public abstract void f3724();
+    public abstract void f3725();
+    public abstract void f3726();
+    public abstract void f3727();
+    public abstract void f3728();
+    public abstract void f3729();
+    public abstract void f3730();
+    public abstract void f3731();
+    public abstract void f3732();
+    public abstract void f3733();
+    public abstract void f3734();
+    public abstract void f3735();
+    public abstract void f3736();
+    public abstract void f3737();
+    public abstract void f3738();
+    public abstract void f3739();
+    public abstract void f3740();
+    public abstract void f3741();
+    public abstract void f3742();
+    public abstract void f3743();
+    public abstract void f3744();
+    public abstract void f3745();
+    public abstract void f3746();
+    public abstract void f3747();
+    public abstract void f3748();
+    public abstract void f3749();
+    public abstract void f3750();
+    public abstract void f3751();
+    public abstract void f3752();
+    public abstract void f3753();
+    public abstract void f3754();
+    public abstract void f3755();
+    public abstract void f3756();
+    public abstract void f3757();
+    public abstract void f3758();
+    public abstract void f3759();
+    public abstract void f3760();
+    public abstract void f3761();
+    public abstract void f3762();
+    public abstract void f3763();
+    public abstract void f3764();
+    public abstract void f3765();
+    public abstract void f3766();
+    public abstract void f3767();
+    public abstract void f3768();
+    public abstract void f3769();
+    public abstract void f3770();
+    public abstract void f3771();
+    public abstract void f3772();
+    public abstract void f3773();
+    public abstract void f3774();
+    public abstract void f3775();
+    public abstract void f3776();
+    public abstract void f3777();
+    public abstract void f3778();
+    public abstract void f3779();
+    public abstract void f3780();
+    public abstract void f3781();
+    public abstract void f3782();
+    public abstract void f3783();
+    public abstract void f3784();
+    public abstract void f3785();
+    public abstract void f3786();
+    public abstract void f3787();
+    public abstract void f3788();
+    public abstract void f3789();
+    public abstract void f3790();
+    public abstract void f3791();
+    public abstract void f3792();
+    public abstract void f3793();
+    public abstract void f3794();
+    public abstract void f3795();
+    public abstract void f3796();
+    public abstract void f3797();
+    public abstract void f3798();
+    public abstract void f3799();
+    public abstract void f3800();
+    public abstract void f3801();
+    public abstract void f3802();
+    public abstract void f3803();
+    public abstract void f3804();
+    public abstract void f3805();
+    public abstract void f3806();
+    public abstract void f3807();
+    public abstract void f3808();
+    public abstract void f3809();
+    public abstract void f3810();
+    public abstract void f3811();
+    public abstract void f3812();
+    public abstract void f3813();
+    public abstract void f3814();
+    public abstract void f3815();
+    public abstract void f3816();
+    public abstract void f3817();
+    public abstract void f3818();
+    public abstract void f3819();
+    public abstract void f3820();
+    public abstract void f3821();
+    public abstract void f3822();
+    public abstract void f3823();
+    public abstract void f3824();
+    public abstract void f3825();
+    public abstract void f3826();
+    public abstract void f3827();
+    public abstract void f3828();
+    public abstract void f3829();
+    public abstract void f3830();
+    public abstract void f3831();
+    public abstract void f3832();
+    public abstract void f3833();
+    public abstract void f3834();
+    public abstract void f3835();
+    public abstract void f3836();
+    public abstract void f3837();
+    public abstract void f3838();
+    public abstract void f3839();
+    public abstract void f3840();
+    public abstract void f3841();
+    public abstract void f3842();
+    public abstract void f3843();
+    public abstract void f3844();
+    public abstract void f3845();
+    public abstract void f3846();
+    public abstract void f3847();
+    public abstract void f3848();
+    public abstract void f3849();
+    public abstract void f3850();
+    public abstract void f3851();
+    public abstract void f3852();
+    public abstract void f3853();
+    public abstract void f3854();
+    public abstract void f3855();
+    public abstract void f3856();
+    public abstract void f3857();
+    public abstract void f3858();
+    public abstract void f3859();
+    public abstract void f3860();
+    public abstract void f3861();
+    public abstract void f3862();
+    public abstract void f3863();
+    public abstract void f3864();
+    public abstract void f3865();
+    public abstract void f3866();
+    public abstract void f3867();
+    public abstract void f3868();
+    public abstract void f3869();
+    public abstract void f3870();
+    public abstract void f3871();
+    public abstract void f3872();
+    public abstract void f3873();
+    public abstract void f3874();
+    public abstract void f3875();
+    public abstract void f3876();
+    public abstract void f3877();
+    public abstract void f3878();
+    public abstract void f3879();
+    public abstract void f3880();
+    public abstract void f3881();
+    public abstract void f3882();
+    public abstract void f3883();
+    public abstract void f3884();
+    public abstract void f3885();
+    public abstract void f3886();
+    public abstract void f3887();
+    public abstract void f3888();
+    public abstract void f3889();
+    public abstract void f3890();
+    public abstract void f3891();
+    public abstract void f3892();
+    public abstract void f3893();
+    public abstract void f3894();
+    public abstract void f3895();
+    public abstract void f3896();
+    public abstract void f3897();
+    public abstract void f3898();
+    public abstract void f3899();
+    public abstract void f3900();
+    public abstract void f3901();
+    public abstract void f3902();
+    public abstract void f3903();
+    public abstract void f3904();
+    public abstract void f3905();
+    public abstract void f3906();
+    public abstract void f3907();
+    public abstract void f3908();
+    public abstract void f3909();
+    public abstract void f3910();
+    public abstract void f3911();
+    public abstract void f3912();
+    public abstract void f3913();
+    public abstract void f3914();
+    public abstract void f3915();
+    public abstract void f3916();
+    public abstract void f3917();
+    public abstract void f3918();
+    public abstract void f3919();
+    public abstract void f3920();
+    public abstract void f3921();
+    public abstract void f3922();
+    public abstract void f3923();
+    public abstract void f3924();
+    public abstract void f3925();
+    public abstract void f3926();
+    public abstract void f3927();
+    public abstract void f3928();
+    public abstract void f3929();
+    public abstract void f3930();
+    public abstract void f3931();
+    public abstract void f3932();
+    public abstract void f3933();
+    public abstract void f3934();
+    public abstract void f3935();
+    public abstract void f3936();
+    public abstract void f3937();
+    public abstract void f3938();
+    public abstract void f3939();
+    public abstract void f3940();
+    public abstract void f3941();
+    public abstract void f3942();
+    public abstract void f3943();
+    public abstract void f3944();
+    public abstract void f3945();
+    public abstract void f3946();
+    public abstract void f3947();
+    public abstract void f3948();
+    public abstract void f3949();
+    public abstract void f3950();
+    public abstract void f3951();
+    public abstract void f3952();
+    public abstract void f3953();
+    public abstract void f3954();
+    public abstract void f3955();
+    public abstract void f3956();
+    public abstract void f3957();
+    public abstract void f3958();
+    public abstract void f3959();
+    public abstract void f3960();
+    public abstract void f3961();
+    public abstract void f3962();
+    public abstract void f3963();
+    public abstract void f3964();
+    public abstract void f3965();
+    public abstract void f3966();
+    public abstract void f3967();
+    public abstract void f3968();
+    public abstract void f3969();
+    public abstract void f3970();
+    public abstract void f3971();
+    public abstract void f3972();
+    public abstract void f3973();
+    public abstract void f3974();
+    public abstract void f3975();
+    public abstract void f3976();
+    public abstract void f3977();
+    public abstract void f3978();
+    public abstract void f3979();
+    public abstract void f3980();
+    public abstract void f3981();
+    public abstract void f3982();
+    public abstract void f3983();
+    public abstract void f3984();
+    public abstract void f3985();
+    public abstract void f3986();
+    public abstract void f3987();
+    public abstract void f3988();
+    public abstract void f3989();
+    public abstract void f3990();
+    public abstract void f3991();
+    public abstract void f3992();
+    public abstract void f3993();
+    public abstract void f3994();
+    public abstract void f3995();
+    public abstract void f3996();
+    public abstract void f3997();
+    public abstract void f3998();
+    public abstract void f3999();
+    public abstract void f4000();
+    public abstract void f4001();
+    public abstract void f4002();
+    public abstract void f4003();
+    public abstract void f4004();
+    public abstract void f4005();
+    public abstract void f4006();
+    public abstract void f4007();
+    public abstract void f4008();
+    public abstract void f4009();
+    public abstract void f4010();
+    public abstract void f4011();
+    public abstract void f4012();
+    public abstract void f4013();
+    public abstract void f4014();
+    public abstract void f4015();
+    public abstract void f4016();
+    public abstract void f4017();
+    public abstract void f4018();
+    public abstract void f4019();
+    public abstract void f4020();
+    public abstract void f4021();
+    public abstract void f4022();
+    public abstract void f4023();
+    public abstract void f4024();
+    public abstract void f4025();
+    public abstract void f4026();
+    public abstract void f4027();
+    public abstract void f4028();
+    public abstract void f4029();
+    public abstract void f4030();
+    public abstract void f4031();
+    public abstract void f4032();
+    public abstract void f4033();
+    public abstract void f4034();
+    public abstract void f4035();
+    public abstract void f4036();
+    public abstract void f4037();
+    public abstract void f4038();
+    public abstract void f4039();
+    public abstract void f4040();
+    public abstract void f4041();
+    public abstract void f4042();
+    public abstract void f4043();
+    public abstract void f4044();
+    public abstract void f4045();
+    public abstract void f4046();
+    public abstract void f4047();
+    public abstract void f4048();
+    public abstract void f4049();
+    public abstract void f4050();
+    public abstract void f4051();
+    public abstract void f4052();
+    public abstract void f4053();
+    public abstract void f4054();
+    public abstract void f4055();
+    public abstract void f4056();
+    public abstract void f4057();
+    public abstract void f4058();
+    public abstract void f4059();
+    public abstract void f4060();
+    public abstract void f4061();
+    public abstract void f4062();
+    public abstract void f4063();
+    public abstract void f4064();
+    public abstract void f4065();
+    public abstract void f4066();
+    public abstract void f4067();
+    public abstract void f4068();
+    public abstract void f4069();
+    public abstract void f4070();
+    public abstract void f4071();
+    public abstract void f4072();
+    public abstract void f4073();
+    public abstract void f4074();
+    public abstract void f4075();
+    public abstract void f4076();
+    public abstract void f4077();
+    public abstract void f4078();
+    public abstract void f4079();
+    public abstract void f4080();
+    public abstract void f4081();
+    public abstract void f4082();
+    public abstract void f4083();
+    public abstract void f4084();
+    public abstract void f4085();
+    public abstract void f4086();
+    public abstract void f4087();
+    public abstract void f4088();
+    public abstract void f4089();
+    public abstract void f4090();
+    public abstract void f4091();
+    public abstract void f4092();
+    public abstract void f4093();
+    public abstract void f4094();
+    public abstract void f4095();
+    public abstract void f4096();
+    public abstract void f4097();
+    public abstract void f4098();
+    public abstract void f4099();
+    public abstract void f4100();
+    public abstract void f4101();
+    public abstract void f4102();
+    public abstract void f4103();
+    public abstract void f4104();
+    public abstract void f4105();
+    public abstract void f4106();
+    public abstract void f4107();
+    public abstract void f4108();
+    public abstract void f4109();
+    public abstract void f4110();
+    public abstract void f4111();
+    public abstract void f4112();
+    public abstract void f4113();
+    public abstract void f4114();
+    public abstract void f4115();
+    public abstract void f4116();
+    public abstract void f4117();
+    public abstract void f4118();
+    public abstract void f4119();
+    public abstract void f4120();
+    public abstract void f4121();
+    public abstract void f4122();
+    public abstract void f4123();
+    public abstract void f4124();
+    public abstract void f4125();
+    public abstract void f4126();
+    public abstract void f4127();
+    public abstract void f4128();
+    public abstract void f4129();
+    public abstract void f4130();
+    public abstract void f4131();
+    public abstract void f4132();
+    public abstract void f4133();
+    public abstract void f4134();
+    public abstract void f4135();
+    public abstract void f4136();
+    public abstract void f4137();
+    public abstract void f4138();
+    public abstract void f4139();
+    public abstract void f4140();
+    public abstract void f4141();
+    public abstract void f4142();
+    public abstract void f4143();
+    public abstract void f4144();
+    public abstract void f4145();
+    public abstract void f4146();
+    public abstract void f4147();
+    public abstract void f4148();
+    public abstract void f4149();
+    public abstract void f4150();
+    public abstract void f4151();
+    public abstract void f4152();
+    public abstract void f4153();
+    public abstract void f4154();
+    public abstract void f4155();
+    public abstract void f4156();
+    public abstract void f4157();
+    public abstract void f4158();
+    public abstract void f4159();
+    public abstract void f4160();
+    public abstract void f4161();
+    public abstract void f4162();
+    public abstract void f4163();
+    public abstract void f4164();
+    public abstract void f4165();
+    public abstract void f4166();
+    public abstract void f4167();
+    public abstract void f4168();
+    public abstract void f4169();
+    public abstract void f4170();
+    public abstract void f4171();
+    public abstract void f4172();
+    public abstract void f4173();
+    public abstract void f4174();
+    public abstract void f4175();
+    public abstract void f4176();
+    public abstract void f4177();
+    public abstract void f4178();
+    public abstract void f4179();
+    public abstract void f4180();
+    public abstract void f4181();
+    public abstract void f4182();
+    public abstract void f4183();
+    public abstract void f4184();
+    public abstract void f4185();
+    public abstract void f4186();
+    public abstract void f4187();
+    public abstract void f4188();
+    public abstract void f4189();
+    public abstract void f4190();
+    public abstract void f4191();
+    public abstract void f4192();
+    public abstract void f4193();
+    public abstract void f4194();
+    public abstract void f4195();
+    public abstract void f4196();
+    public abstract void f4197();
+    public abstract void f4198();
+    public abstract void f4199();
+    public abstract void f4200();
+    public abstract void f4201();
+    public abstract void f4202();
+    public abstract void f4203();
+    public abstract void f4204();
+    public abstract void f4205();
+    public abstract void f4206();
+    public abstract void f4207();
+    public abstract void f4208();
+    public abstract void f4209();
+    public abstract void f4210();
+    public abstract void f4211();
+    public abstract void f4212();
+    public abstract void f4213();
+    public abstract void f4214();
+    public abstract void f4215();
+    public abstract void f4216();
+    public abstract void f4217();
+    public abstract void f4218();
+    public abstract void f4219();
+    public abstract void f4220();
+    public abstract void f4221();
+    public abstract void f4222();
+    public abstract void f4223();
+    public abstract void f4224();
+    public abstract void f4225();
+    public abstract void f4226();
+    public abstract void f4227();
+    public abstract void f4228();
+    public abstract void f4229();
+    public abstract void f4230();
+    public abstract void f4231();
+    public abstract void f4232();
+    public abstract void f4233();
+    public abstract void f4234();
+    public abstract void f4235();
+    public abstract void f4236();
+    public abstract void f4237();
+    public abstract void f4238();
+    public abstract void f4239();
+    public abstract void f4240();
+    public abstract void f4241();
+    public abstract void f4242();
+    public abstract void f4243();
+    public abstract void f4244();
+    public abstract void f4245();
+    public abstract void f4246();
+    public abstract void f4247();
+    public abstract void f4248();
+    public abstract void f4249();
+    public abstract void f4250();
+    public abstract void f4251();
+    public abstract void f4252();
+    public abstract void f4253();
+    public abstract void f4254();
+    public abstract void f4255();
+    public abstract void f4256();
+    public abstract void f4257();
+    public abstract void f4258();
+    public abstract void f4259();
+    public abstract void f4260();
+    public abstract void f4261();
+    public abstract void f4262();
+    public abstract void f4263();
+    public abstract void f4264();
+    public abstract void f4265();
+    public abstract void f4266();
+    public abstract void f4267();
+    public abstract void f4268();
+    public abstract void f4269();
+    public abstract void f4270();
+    public abstract void f4271();
+    public abstract void f4272();
+    public abstract void f4273();
+    public abstract void f4274();
+    public abstract void f4275();
+    public abstract void f4276();
+    public abstract void f4277();
+    public abstract void f4278();
+    public abstract void f4279();
+    public abstract void f4280();
+    public abstract void f4281();
+    public abstract void f4282();
+    public abstract void f4283();
+    public abstract void f4284();
+    public abstract void f4285();
+    public abstract void f4286();
+    public abstract void f4287();
+    public abstract void f4288();
+    public abstract void f4289();
+    public abstract void f4290();
+    public abstract void f4291();
+    public abstract void f4292();
+    public abstract void f4293();
+    public abstract void f4294();
+    public abstract void f4295();
+    public abstract void f4296();
+    public abstract void f4297();
+    public abstract void f4298();
+    public abstract void f4299();
+    public abstract void f4300();
+    public abstract void f4301();
+    public abstract void f4302();
+    public abstract void f4303();
+    public abstract void f4304();
+    public abstract void f4305();
+    public abstract void f4306();
+    public abstract void f4307();
+    public abstract void f4308();
+    public abstract void f4309();
+    public abstract void f4310();
+    public abstract void f4311();
+    public abstract void f4312();
+    public abstract void f4313();
+    public abstract void f4314();
+    public abstract void f4315();
+    public abstract void f4316();
+    public abstract void f4317();
+    public abstract void f4318();
+    public abstract void f4319();
+    public abstract void f4320();
+    public abstract void f4321();
+    public abstract void f4322();
+    public abstract void f4323();
+    public abstract void f4324();
+    public abstract void f4325();
+    public abstract void f4326();
+    public abstract void f4327();
+    public abstract void f4328();
+    public abstract void f4329();
+    public abstract void f4330();
+    public abstract void f4331();
+    public abstract void f4332();
+    public abstract void f4333();
+    public abstract void f4334();
+    public abstract void f4335();
+    public abstract void f4336();
+    public abstract void f4337();
+    public abstract void f4338();
+    public abstract void f4339();
+    public abstract void f4340();
+    public abstract void f4341();
+    public abstract void f4342();
+    public abstract void f4343();
+    public abstract void f4344();
+    public abstract void f4345();
+    public abstract void f4346();
+    public abstract void f4347();
+    public abstract void f4348();
+    public abstract void f4349();
+    public abstract void f4350();
+    public abstract void f4351();
+    public abstract void f4352();
+    public abstract void f4353();
+    public abstract void f4354();
+    public abstract void f4355();
+    public abstract void f4356();
+    public abstract void f4357();
+    public abstract void f4358();
+    public abstract void f4359();
+    public abstract void f4360();
+    public abstract void f4361();
+    public abstract void f4362();
+    public abstract void f4363();
+    public abstract void f4364();
+    public abstract void f4365();
+    public abstract void f4366();
+    public abstract void f4367();
+    public abstract void f4368();
+    public abstract void f4369();
+    public abstract void f4370();
+    public abstract void f4371();
+    public abstract void f4372();
+    public abstract void f4373();
+    public abstract void f4374();
+    public abstract void f4375();
+    public abstract void f4376();
+    public abstract void f4377();
+    public abstract void f4378();
+    public abstract void f4379();
+    public abstract void f4380();
+    public abstract void f4381();
+    public abstract void f4382();
+    public abstract void f4383();
+    public abstract void f4384();
+    public abstract void f4385();
+    public abstract void f4386();
+    public abstract void f4387();
+    public abstract void f4388();
+    public abstract void f4389();
+    public abstract void f4390();
+    public abstract void f4391();
+    public abstract void f4392();
+    public abstract void f4393();
+    public abstract void f4394();
+    public abstract void f4395();
+    public abstract void f4396();
+    public abstract void f4397();
+    public abstract void f4398();
+    public abstract void f4399();
+    public abstract void f4400();
+    public abstract void f4401();
+    public abstract void f4402();
+    public abstract void f4403();
+    public abstract void f4404();
+    public abstract void f4405();
+    public abstract void f4406();
+    public abstract void f4407();
+    public abstract void f4408();
+    public abstract void f4409();
+    public abstract void f4410();
+    public abstract void f4411();
+    public abstract void f4412();
+    public abstract void f4413();
+    public abstract void f4414();
+    public abstract void f4415();
+    public abstract void f4416();
+    public abstract void f4417();
+    public abstract void f4418();
+    public abstract void f4419();
+    public abstract void f4420();
+    public abstract void f4421();
+    public abstract void f4422();
+    public abstract void f4423();
+    public abstract void f4424();
+    public abstract void f4425();
+    public abstract void f4426();
+    public abstract void f4427();
+    public abstract void f4428();
+    public abstract void f4429();
+    public abstract void f4430();
+    public abstract void f4431();
+    public abstract void f4432();
+    public abstract void f4433();
+    public abstract void f4434();
+    public abstract void f4435();
+    public abstract void f4436();
+    public abstract void f4437();
+    public abstract void f4438();
+    public abstract void f4439();
+    public abstract void f4440();
+    public abstract void f4441();
+    public abstract void f4442();
+    public abstract void f4443();
+    public abstract void f4444();
+    public abstract void f4445();
+    public abstract void f4446();
+    public abstract void f4447();
+    public abstract void f4448();
+    public abstract void f4449();
+    public abstract void f4450();
+    public abstract void f4451();
+    public abstract void f4452();
+    public abstract void f4453();
+    public abstract void f4454();
+    public abstract void f4455();
+    public abstract void f4456();
+    public abstract void f4457();
+    public abstract void f4458();
+    public abstract void f4459();
+    public abstract void f4460();
+    public abstract void f4461();
+    public abstract void f4462();
+    public abstract void f4463();
+    public abstract void f4464();
+    public abstract void f4465();
+    public abstract void f4466();
+    public abstract void f4467();
+    public abstract void f4468();
+    public abstract void f4469();
+    public abstract void f4470();
+    public abstract void f4471();
+    public abstract void f4472();
+    public abstract void f4473();
+    public abstract void f4474();
+    public abstract void f4475();
+    public abstract void f4476();
+    public abstract void f4477();
+    public abstract void f4478();
+    public abstract void f4479();
+    public abstract void f4480();
+    public abstract void f4481();
+    public abstract void f4482();
+    public abstract void f4483();
+    public abstract void f4484();
+    public abstract void f4485();
+    public abstract void f4486();
+    public abstract void f4487();
+    public abstract void f4488();
+    public abstract void f4489();
+    public abstract void f4490();
+    public abstract void f4491();
+    public abstract void f4492();
+    public abstract void f4493();
+    public abstract void f4494();
+    public abstract void f4495();
+    public abstract void f4496();
+    public abstract void f4497();
+    public abstract void f4498();
+    public abstract void f4499();
+    public abstract void f4500();
+    public abstract void f4501();
+    public abstract void f4502();
+    public abstract void f4503();
+    public abstract void f4504();
+    public abstract void f4505();
+    public abstract void f4506();
+    public abstract void f4507();
+    public abstract void f4508();
+    public abstract void f4509();
+    public abstract void f4510();
+    public abstract void f4511();
+    public abstract void f4512();
+    public abstract void f4513();
+    public abstract void f4514();
+    public abstract void f4515();
+    public abstract void f4516();
+    public abstract void f4517();
+    public abstract void f4518();
+    public abstract void f4519();
+    public abstract void f4520();
+    public abstract void f4521();
+    public abstract void f4522();
+    public abstract void f4523();
+    public abstract void f4524();
+    public abstract void f4525();
+    public abstract void f4526();
+    public abstract void f4527();
+    public abstract void f4528();
+    public abstract void f4529();
+    public abstract void f4530();
+    public abstract void f4531();
+    public abstract void f4532();
+    public abstract void f4533();
+    public abstract void f4534();
+    public abstract void f4535();
+    public abstract void f4536();
+    public abstract void f4537();
+    public abstract void f4538();
+    public abstract void f4539();
+    public abstract void f4540();
+    public abstract void f4541();
+    public abstract void f4542();
+    public abstract void f4543();
+    public abstract void f4544();
+    public abstract void f4545();
+    public abstract void f4546();
+    public abstract void f4547();
+    public abstract void f4548();
+    public abstract void f4549();
+    public abstract void f4550();
+    public abstract void f4551();
+    public abstract void f4552();
+    public abstract void f4553();
+    public abstract void f4554();
+    public abstract void f4555();
+    public abstract void f4556();
+    public abstract void f4557();
+    public abstract void f4558();
+    public abstract void f4559();
+    public abstract void f4560();
+    public abstract void f4561();
+    public abstract void f4562();
+    public abstract void f4563();
+    public abstract void f4564();
+    public abstract void f4565();
+    public abstract void f4566();
+    public abstract void f4567();
+    public abstract void f4568();
+    public abstract void f4569();
+    public abstract void f4570();
+    public abstract void f4571();
+    public abstract void f4572();
+    public abstract void f4573();
+    public abstract void f4574();
+    public abstract void f4575();
+    public abstract void f4576();
+    public abstract void f4577();
+    public abstract void f4578();
+    public abstract void f4579();
+    public abstract void f4580();
+    public abstract void f4581();
+    public abstract void f4582();
+    public abstract void f4583();
+    public abstract void f4584();
+    public abstract void f4585();
+    public abstract void f4586();
+    public abstract void f4587();
+    public abstract void f4588();
+    public abstract void f4589();
+    public abstract void f4590();
+    public abstract void f4591();
+    public abstract void f4592();
+    public abstract void f4593();
+    public abstract void f4594();
+    public abstract void f4595();
+    public abstract void f4596();
+    public abstract void f4597();
+    public abstract void f4598();
+    public abstract void f4599();
+    public abstract void f4600();
+    public abstract void f4601();
+    public abstract void f4602();
+    public abstract void f4603();
+    public abstract void f4604();
+    public abstract void f4605();
+    public abstract void f4606();
+    public abstract void f4607();
+    public abstract void f4608();
+    public abstract void f4609();
+    public abstract void f4610();
+    public abstract void f4611();
+    public abstract void f4612();
+    public abstract void f4613();
+    public abstract void f4614();
+    public abstract void f4615();
+    public abstract void f4616();
+    public abstract void f4617();
+    public abstract void f4618();
+    public abstract void f4619();
+    public abstract void f4620();
+    public abstract void f4621();
+    public abstract void f4622();
+    public abstract void f4623();
+    public abstract void f4624();
+    public abstract void f4625();
+    public abstract void f4626();
+    public abstract void f4627();
+    public abstract void f4628();
+    public abstract void f4629();
+    public abstract void f4630();
+    public abstract void f4631();
+    public abstract void f4632();
+    public abstract void f4633();
+    public abstract void f4634();
+    public abstract void f4635();
+    public abstract void f4636();
+    public abstract void f4637();
+    public abstract void f4638();
+    public abstract void f4639();
+    public abstract void f4640();
+    public abstract void f4641();
+    public abstract void f4642();
+    public abstract void f4643();
+    public abstract void f4644();
+    public abstract void f4645();
+    public abstract void f4646();
+    public abstract void f4647();
+    public abstract void f4648();
+    public abstract void f4649();
+    public abstract void f4650();
+    public abstract void f4651();
+    public abstract void f4652();
+    public abstract void f4653();
+    public abstract void f4654();
+    public abstract void f4655();
+    public abstract void f4656();
+    public abstract void f4657();
+    public abstract void f4658();
+    public abstract void f4659();
+    public abstract void f4660();
+    public abstract void f4661();
+    public abstract void f4662();
+    public abstract void f4663();
+    public abstract void f4664();
+    public abstract void f4665();
+    public abstract void f4666();
+    public abstract void f4667();
+    public abstract void f4668();
+    public abstract void f4669();
+    public abstract void f4670();
+    public abstract void f4671();
+    public abstract void f4672();
+    public abstract void f4673();
+    public abstract void f4674();
+    public abstract void f4675();
+    public abstract void f4676();
+}