Merge

d0c33146 · asaha · b6c2a496 · efa47850 · d0c33146 · d0c33146
126 changed file
--- a/.hgtags
+++ b/.hgtags
@@ -454,6 +454,7 @@ cc6c74b164dfd0636d9dba8f9865baa18a6f2338 jdk8u60-b20
 e9f82302d5fdef8a0976640e09363895e9dcde3c jdk8u60-b22
 c4b37246b92736adf5f40c785aabb67a7d227245 jdk8u60-b23
 d433f5fd8910bee1f2c295b65cf03977034fe0ea jdk8u60-b24
+c8cfbe57bcd5042d2fef42dcef14d73dd4bdc416 jdk8u60-b25
 286b9a885fcc6245fdf2b20697473ec3b35f2538 jdk8u65-b00
 80a796d0db958f49a4b0713818227eda8e5efbb9 jdk8u65-b01
 77d48e6d111faec236c8678997ae4311151cfee4 jdk8u65-b02

--- a/make/data/classlist/classlist.linux
+++ b/make/data/classlist/classlist.linux
--- a/make/data/classlist/classlist.windows
+++ b/make/data/classlist/classlist.windows
--- a/src/bsd/doc/man/appletviewer.1
+++ b/src/bsd/doc/man/appletviewer.1
--- a/src/bsd/doc/man/extcheck.1
+++ b/src/bsd/doc/man/extcheck.1
--- a/src/bsd/doc/man/idlj.1
+++ b/src/bsd/doc/man/idlj.1
--- a/src/bsd/doc/man/jar.1
+++ b/src/bsd/doc/man/jar.1
--- a/src/bsd/doc/man/jarsigner.1
+++ b/src/bsd/doc/man/jarsigner.1
--- a/src/bsd/doc/man/java.1
+++ b/src/bsd/doc/man/java.1
--- a/src/bsd/doc/man/javac.1
+++ b/src/bsd/doc/man/javac.1
--- a/src/bsd/doc/man/javadoc.1
+++ b/src/bsd/doc/man/javadoc.1
--- a/src/bsd/doc/man/javah.1
+++ b/src/bsd/doc/man/javah.1
--- a/src/bsd/doc/man/javap.1
+++ b/src/bsd/doc/man/javap.1
--- a/src/bsd/doc/man/jcmd.1
+++ b/src/bsd/doc/man/jcmd.1
--- a/src/bsd/doc/man/jconsole.1
+++ b/src/bsd/doc/man/jconsole.1
--- a/src/bsd/doc/man/jdb.1
+++ b/src/bsd/doc/man/jdb.1
--- a/src/bsd/doc/man/jdeps.1
+++ b/src/bsd/doc/man/jdeps.1
--- a/src/bsd/doc/man/jhat.1
+++ b/src/bsd/doc/man/jhat.1
--- a/src/bsd/doc/man/jinfo.1
+++ b/src/bsd/doc/man/jinfo.1
--- a/src/bsd/doc/man/jjs.1
+++ b/src/bsd/doc/man/jjs.1
--- a/src/bsd/doc/man/jmap.1
+++ b/src/bsd/doc/man/jmap.1
--- a/src/bsd/doc/man/jps.1
+++ b/src/bsd/doc/man/jps.1
--- a/src/bsd/doc/man/jrunscript.1
+++ b/src/bsd/doc/man/jrunscript.1
--- a/src/bsd/doc/man/jsadebugd.1
+++ b/src/bsd/doc/man/jsadebugd.1
--- a/src/bsd/doc/man/jstack.1
+++ b/src/bsd/doc/man/jstack.1
--- a/src/bsd/doc/man/jstat.1
+++ b/src/bsd/doc/man/jstat.1
--- a/src/bsd/doc/man/jstatd.1
+++ b/src/bsd/doc/man/jstatd.1
--- a/src/bsd/doc/man/keytool.1
+++ b/src/bsd/doc/man/keytool.1
--- a/src/bsd/doc/man/native2ascii.1
+++ b/src/bsd/doc/man/native2ascii.1
--- a/src/bsd/doc/man/orbd.1
+++ b/src/bsd/doc/man/orbd.1
--- a/src/bsd/doc/man/pack200.1
+++ b/src/bsd/doc/man/pack200.1
--- a/src/bsd/doc/man/policytool.1
+++ b/src/bsd/doc/man/policytool.1
--- a/src/bsd/doc/man/rmic.1
+++ b/src/bsd/doc/man/rmic.1
--- a/src/bsd/doc/man/rmid.1
+++ b/src/bsd/doc/man/rmid.1
--- a/src/bsd/doc/man/rmiregistry.1
+++ b/src/bsd/doc/man/rmiregistry.1
--- a/src/bsd/doc/man/schemagen.1
+++ b/src/bsd/doc/man/schemagen.1
--- a/src/bsd/doc/man/serialver.1
+++ b/src/bsd/doc/man/serialver.1
--- a/src/bsd/doc/man/servertool.1
+++ b/src/bsd/doc/man/servertool.1
--- a/src/bsd/doc/man/tnameserv.1
+++ b/src/bsd/doc/man/tnameserv.1
--- a/src/bsd/doc/man/unpack200.1
+++ b/src/bsd/doc/man/unpack200.1
--- a/src/bsd/doc/man/wsgen.1
+++ b/src/bsd/doc/man/wsgen.1
--- a/src/bsd/doc/man/wsimport.1
+++ b/src/bsd/doc/man/wsimport.1
--- a/src/bsd/doc/man/xjc.1
+++ b/src/bsd/doc/man/xjc.1
--- a/src/linux/doc/man/appletviewer.1
+++ b/src/linux/doc/man/appletviewer.1
--- a/src/linux/doc/man/extcheck.1
+++ b/src/linux/doc/man/extcheck.1
--- a/src/linux/doc/man/idlj.1
+++ b/src/linux/doc/man/idlj.1
--- a/src/linux/doc/man/ja/appletviewer.1
+++ b/src/linux/doc/man/ja/appletviewer.1
--- a/src/linux/doc/man/ja/extcheck.1
+++ b/src/linux/doc/man/ja/extcheck.1
--- a/src/linux/doc/man/ja/idlj.1
+++ b/src/linux/doc/man/ja/idlj.1
--- a/src/linux/doc/man/ja/jar.1
+++ b/src/linux/doc/man/ja/jar.1
--- a/src/linux/doc/man/ja/jarsigner.1
+++ b/src/linux/doc/man/ja/jarsigner.1
--- a/src/linux/doc/man/ja/java.1
+++ b/src/linux/doc/man/ja/java.1
--- a/src/linux/doc/man/ja/javac.1
+++ b/src/linux/doc/man/ja/javac.1
--- a/src/linux/doc/man/ja/javadoc.1
+++ b/src/linux/doc/man/ja/javadoc.1
--- a/src/linux/doc/man/ja/javah.1
+++ b/src/linux/doc/man/ja/javah.1
--- a/src/linux/doc/man/ja/javap.1
+++ b/src/linux/doc/man/ja/javap.1
--- a/src/linux/doc/man/ja/javaws.1
+++ b/src/linux/doc/man/ja/javaws.1
--- a/src/linux/doc/man/ja/jcmd.1
+++ b/src/linux/doc/man/ja/jcmd.1
--- a/src/linux/doc/man/ja/jconsole.1
+++ b/src/linux/doc/man/ja/jconsole.1
--- a/src/linux/doc/man/ja/jdb.1
+++ b/src/linux/doc/man/ja/jdb.1
--- a/src/linux/doc/man/ja/jdeps.1
+++ b/src/linux/doc/man/ja/jdeps.1
--- a/src/linux/doc/man/ja/jhat.1
+++ b/src/linux/doc/man/ja/jhat.1
--- a/src/linux/doc/man/ja/jinfo.1
+++ b/src/linux/doc/man/ja/jinfo.1
--- a/src/linux/doc/man/ja/jjs.1
+++ b/src/linux/doc/man/ja/jjs.1
--- a/src/linux/doc/man/ja/jmap.1
+++ b/src/linux/doc/man/ja/jmap.1
--- a/src/linux/doc/man/ja/jps.1
+++ b/src/linux/doc/man/ja/jps.1
--- a/src/linux/doc/man/ja/jrunscript.1
+++ b/src/linux/doc/man/ja/jrunscript.1
--- a/src/linux/doc/man/ja/jsadebugd.1
+++ b/src/linux/doc/man/ja/jsadebugd.1
--- a/src/linux/doc/man/ja/jstack.1
+++ b/src/linux/doc/man/ja/jstack.1
--- a/src/linux/doc/man/ja/jstat.1
+++ b/src/linux/doc/man/ja/jstat.1
--- a/src/linux/doc/man/ja/jstatd.1
+++ b/src/linux/doc/man/ja/jstatd.1
--- a/src/linux/doc/man/ja/jvisualvm.1
+++ b/src/linux/doc/man/ja/jvisualvm.1
--- a/src/linux/doc/man/ja/keytool.1
+++ b/src/linux/doc/man/ja/keytool.1
--- a/src/linux/doc/man/ja/native2ascii.1
+++ b/src/linux/doc/man/ja/native2ascii.1
--- a/src/linux/doc/man/ja/orbd.1
+++ b/src/linux/doc/man/ja/orbd.1
--- a/src/linux/doc/man/ja/pack200.1
+++ b/src/linux/doc/man/ja/pack200.1
--- a/src/linux/doc/man/ja/policytool.1
+++ b/src/linux/doc/man/ja/policytool.1
--- a/src/linux/doc/man/ja/rmic.1
+++ b/src/linux/doc/man/ja/rmic.1
--- a/src/linux/doc/man/ja/rmid.1
+++ b/src/linux/doc/man/ja/rmid.1
--- a/src/linux/doc/man/ja/rmiregistry.1
+++ b/src/linux/doc/man/ja/rmiregistry.1
--- a/src/linux/doc/man/ja/schemagen.1
+++ b/src/linux/doc/man/ja/schemagen.1
--- a/src/linux/doc/man/ja/serialver.1
+++ b/src/linux/doc/man/ja/serialver.1
--- a/src/linux/doc/man/ja/servertool.1
+++ b/src/linux/doc/man/ja/servertool.1
--- a/src/linux/doc/man/ja/tnameserv.1
+++ b/src/linux/doc/man/ja/tnameserv.1
--- a/src/linux/doc/man/ja/unpack200.1
+++ b/src/linux/doc/man/ja/unpack200.1
--- a/src/linux/doc/man/ja/wsgen.1
+++ b/src/linux/doc/man/ja/wsgen.1
--- a/src/linux/doc/man/ja/wsimport.1
+++ b/src/linux/doc/man/ja/wsimport.1
--- a/src/linux/doc/man/ja/xjc.1
+++ b/src/linux/doc/man/ja/xjc.1
--- a/src/linux/doc/man/jar.1
+++ b/src/linux/doc/man/jar.1
--- a/src/linux/doc/man/jarsigner.1
+++ b/src/linux/doc/man/jarsigner.1
--- a/src/linux/doc/man/java.1
+++ b/src/linux/doc/man/java.1
 '\" t
-.\" Copyright (c) 1994, 2015, Oracle and/or its affiliates. All rights reserved. DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+.\" Copyright (c) 1994, 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

--- a/src/linux/doc/man/javac.1
+++ b/src/linux/doc/man/javac.1
--- a/src/linux/doc/man/javadoc.1
+++ b/src/linux/doc/man/javadoc.1
--- a/src/linux/doc/man/javah.1
+++ b/src/linux/doc/man/javah.1
--- a/src/linux/doc/man/javap.1
+++ b/src/linux/doc/man/javap.1
--- a/src/linux/doc/man/jcmd.1
+++ b/src/linux/doc/man/jcmd.1
--- a/src/linux/doc/man/jconsole.1
+++ b/src/linux/doc/man/jconsole.1
--- a/src/linux/doc/man/jdb.1
+++ b/src/linux/doc/man/jdb.1
--- a/src/linux/doc/man/jdeps.1
+++ b/src/linux/doc/man/jdeps.1
--- a/src/linux/doc/man/jhat.1
+++ b/src/linux/doc/man/jhat.1
--- a/src/linux/doc/man/jinfo.1
+++ b/src/linux/doc/man/jinfo.1
--- a/src/linux/doc/man/jjs.1
+++ b/src/linux/doc/man/jjs.1
--- a/src/linux/doc/man/jmap.1
+++ b/src/linux/doc/man/jmap.1
--- a/src/linux/doc/man/jps.1
+++ b/src/linux/doc/man/jps.1
--- a/src/linux/doc/man/jrunscript.1
+++ b/src/linux/doc/man/jrunscript.1
--- a/src/linux/doc/man/jsadebugd.1
+++ b/src/linux/doc/man/jsadebugd.1
--- a/src/linux/doc/man/jstack.1
+++ b/src/linux/doc/man/jstack.1
--- a/src/linux/doc/man/jstat.1
+++ b/src/linux/doc/man/jstat.1
--- a/src/linux/doc/man/jstatd.1
+++ b/src/linux/doc/man/jstatd.1
--- a/src/linux/doc/man/keytool.1
+++ b/src/linux/doc/man/keytool.1
--- a/src/linux/doc/man/native2ascii.1
+++ b/src/linux/doc/man/native2ascii.1
--- a/src/linux/doc/man/orbd.1
+++ b/src/linux/doc/man/orbd.1
--- a/src/linux/doc/man/pack200.1
+++ b/src/linux/doc/man/pack200.1
--- a/src/linux/doc/man/policytool.1
+++ b/src/linux/doc/man/policytool.1
--- a/src/linux/doc/man/rmic.1
+++ b/src/linux/doc/man/rmic.1
--- a/src/linux/doc/man/rmid.1
+++ b/src/linux/doc/man/rmid.1
--- a/src/linux/doc/man/rmiregistry.1
+++ b/src/linux/doc/man/rmiregistry.1
--- a/src/linux/doc/man/schemagen.1
+++ b/src/linux/doc/man/schemagen.1
--- a/src/linux/doc/man/serialver.1
+++ b/src/linux/doc/man/serialver.1
--- a/src/linux/doc/man/servertool.1
+++ b/src/linux/doc/man/servertool.1
--- a/src/linux/doc/man/tnameserv.1
+++ b/src/linux/doc/man/tnameserv.1
--- a/src/linux/doc/man/unpack200.1
+++ b/src/linux/doc/man/unpack200.1
--- a/src/linux/doc/man/wsgen.1
+++ b/src/linux/doc/man/wsgen.1
--- a/src/linux/doc/man/wsimport.1
+++ b/src/linux/doc/man/wsimport.1
--- a/src/linux/doc/man/xjc.1
+++ b/src/linux/doc/man/xjc.1
--- a/src/share/classes/sun/awt/datatransfer/DataTransferer.java
+++ b/src/share/classes/sun/awt/datatransfer/DataTransferer.java