Merged changes from defaultjetbrains-master-mirror-osx

--HG--
branch : 8u40-verified-fixes

5 files changed, 175 insertions, 48 deletions

diff --git a/.hgtags b/.hgtags
index 158aeb47..7f2f567b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -334,6 +334,8 @@ d3a96bbb88521188a3af1a34dd9523f13afa521d jdk8u25-b15
 d47a47f961ee423ce03623098f62d79254c6f328 jdk8u25-b17
 cb0ad90bfe3c497c7236c5480447c4bde110934f jdk8u25-b18
 a345282d661be80f2cdee3c43e12fbe01e7ff6d5 jdk8u25-b31
+90b0097a98f161c3e605dc26abf97bb9fc278f33 jdk8u25-b32
+da8457217afd472276c62f558fb1431f7e0e3bc0 jdk8u25-b33
 3a676fe898c93ad3afcaa55a71da96455e5f230e jdk8u31-b00
 1c73ca9179f22d4a73d1a248a3254f891c71ee30 jdk8u31-b01
 c1f1ed28e0bb68d7536fb30bb6f1a3623816b12a jdk8u31-b02
@@ -348,6 +350,10 @@ dd0467f3fe130884849ad8fb226d76f02b4cbde4 jdk8u31-b10
 497c783d228ed188d61964edd409794af3ad3e5c jdk8u31-b11
 959e8fca46155528c8147da69a7c49edfb002cb1 jdk8u31-b12
 9d0c737694ece23547c0a27dcd0ba6cbcdf577f2 jdk8u31-b13
+49e91817cbe1b14f856c26f6e55b7151e3f8c3a8 jdk8u31-b31
+9e20c5acb448c5f9b05a4e9b4efc222b3b616c23 jdk8u31-b32
+ea23d583e36301301612946d34ff6aa90d795dd9 jdk8u31-b33
+e7a9c2fb6b0529e4c64a33240fd18c3e4864dc52 jdk8u31-b34
 31d43d250c836c13fcc87025837783788c5cd0de jdk8u40-b00
 262fb5353ffa661f88b4a9cf2581fcad8c2a43f7 jdk8u40-b01
 8043f77ef8a4ded9505269a356c4e2f4f9604cd9 jdk8u40-b02
@@ -376,3 +382,150 @@ b6755a463ccf6a79b1e1a43ed7bdb1c5cb1ac17d jdk8u40-b23
 b6120aaf2aeef7c5608d578e15e82db7eb24fb2e jdk8u40-b25
 1bcb30bdd9883cc7fc1bf70800ea03a4429eaa80 jdk8u40-b26
 a5f2cdedb940511674e153dce8d3cbc3a0598c9e jdk8u40-b27
+a342e6841e8d3bbef44d4158c980be2ab903e10a jdk8u40-b31
+8960bce00f1abecad665291b0077d6e673c0ff64 jdk8u40-b32
+667a4aee3720373f5c286a50f537afd0ff4b65ae jdk8u45-b00
+cb6added4913f4899bd1689e77be1fe4efcff4f1 jdk8u45-b01
+855a7b9302053546e4da94b67cc3b8956f5b4985 jdk8u45-b02
+698a88182586b0914b204de27cc45d6f0dfe7683 jdk8u45-b03
+c7307f75843b64e6096205425ba2f7387017ee9e jdk8u45-b04
+6bd873f17e03cf285f576f69340123e3b2d8922f jdk8u45-b05
+a5e99f4d067ebea01e438e5b3e9b09bda47ddb25 jdk8u45-b06
+145ea6d2899f5cc6bd4e1108903e4d22ad063eca jdk8u45-b07
+f3d678fe58e7c026fb62be8b72c46ce1015aadf6 jdk8u45-b08
+8f2e5110151810dc5b56a3ce05d955e400bee937 jdk8u45-b09
+5cf887e3e1368d1910181eaab2794b25058fe8b6 jdk8u45-b10
+855fd9dfcbee177b508413dbab6e46b57dd367c4 jdk8u45-b11
+3f6c3f48179ac8bab98509be8708edcea32727b6 jdk8u45-b12
+15fb2359f5f86dbacc1bc120f663853b5292cd14 jdk8u45-b13
+bad02ac45d59b5096032cf42bb880dcddffa84b4 jdk8u45-b14
+cc7d796b8f12cc11d415f8ae0ef2d952274fc069 jdk8u45-b15
+8a7494ab96913de396a8f38dd324ac52c44b1a80 jdk8u45-b31
+1c022144b99b859336914740e571c672e51ee1b9 jdk8u45-b32
+67e3db8ade754c88f735ce23d7e6aaaeff075e71 jdk8u45-b33
+7fbeef307a54dd209687e22e7244012f512805bc jdk8u45-b34
+f2afa963f0ce5804dafc8d9c4bc951b08acdf04c jdk8u45-b35
+f5af8bb98711743ae10c61abc3f163ac44e70971 jdk8u45-b36
+32680a5ae597b05911770a9863643d4639498fea jdk8u45-b37
+74aae7549ef8c6e9f394b75c840bf293e2664858 jdk8u51-b00
+78d8cafb17e46dd2453704f679ca1e431e4df0ba jdk8u51-b01
+9bd6f57d97e5423d5f25774b095124cbe1eeb9c1 jdk8u51-b02
+a9ed1bcefec1ee0d30ea8cf700cf0813d8588eb0 jdk8u51-b03
+3d07c26d5012f47ef274043a6204db686769d65d jdk8u51-b04
+834da1120e80f17356475a5d3f06a678355dbbf6 jdk8u51-b05
+243ba3774d18cfe2e56fa0e0474255787c360d07 jdk8u51-b06
+13d1721eae3bdea08dcd7b84e0856e6769caafc9 jdk8u51-b07
+cbba234a2b481b236e2bf78c892111b86f6bba81 jdk8u51-b08
+9116c6bb2ffa6bb624ad39f7a98b7b9bed4512dc jdk8u51-b09
+783b917616ab6977f9b3157667d1493636ba66d1 jdk8u51-b10
+5a69995912aae8bd61758e95a3b5edac167b6acc jdk8u51-b11
+1a855f69de645c4bd485d5fb6d9a524994278a16 jdk8u51-b12
+880b67345f557d5613071d09c1cf234a7e1b8759 jdk8u51-b13
+4a6824c3fd8d74f83daac1a79952786837a9848c jdk8u51-b14
+dde8e5b2366b9a08d7448c3cef2cabc710cc9da5 jdk8u51-b15
+e465c106bfe3feb6e2887fa512511c894c092dde jdk8u51-b16
+b189fe14d0f4375961a60d3e8532ca652e1aa592 jdk8u51-b31
+ef7893ef8718d205494fd5f79921be7c63b598b0 jdk8u51-b32
+e8631058a15d828af4d362cc247b18fc71aefeee jdk8u51-b33
+c8b402c28fe51e25f3298e1266f2ae48bda8d3e0 jdk8u60-b00
+7a0dacd12a9e42f581c11edeb51a69af9a8ab16d jdk8u60-b01
+5eb3236cc4a7075baf80fc8a258a1f9612e52cf0 jdk8u60-b02
+3e52068e8b9df8a9bb7a0594fab7f4132817ac3d jdk8u60-b03
+02b1d3c68132b14a36e5d1df9b4a53c7981469b4 jdk8u60-b04
+4dfd5dbd3014db59f92d54cf215f7e7ed4508044 jdk8u60-b05
+a22a9460d53fb519b00e118c98ee0cb5e981b659 jdk8u60-b06
+6f0885023e43fe44cade86e3dd77350d9ecbc4b4 jdk8u60-b07
+078fde829e878595fcd9122a52ea5cfafe6685a8 jdk8u60-b08
+fbb7b2d1321fdb7345e163bbc8c01a307f9d9d38 jdk8u60-b09
+3e7a28ca602befafcd6329a60c00e5b36c4e69c6 jdk8u60-b10
+334320b978e06d309d9a9ec67097f982128fad91 jdk8u60-b11
+fab06c192b0b246656e47aacab2fb555e3ca2cb7 jdk8u60-b12
+4390fe716719a6966e10bf9cce4b8752f9cf5d96 jdk8u60-b13
+feb70717506da80f712f0b942d77527d2cc4cde5 jdk8u60-b14
+8c0018c9c533126cf3f7e912936f6e227bd1e96c jdk8u60-b15
+1c9eb173022b4b95ef6c93685b62b3039ccf8d92 jdk8u60-b16
+d6a80a0a3e9aca2b40f80709c9ce6c471b8902cf jdk8u60-b17
+53361b1cead8fc5ab1619a0b3baec8d4b411319d jdk8u60-b18
+5b422975b71def8c5a16a4f303c8fb8b108dc0cf jdk8u60-b19
+1a4b2888aa98ea70aad849e35e05b48e1c107503 jdk8u60-b20
+a414aec2d19cf692310587518546842070b80cb8 jdk8u60-b21
+6079c26a3b8fa1ead3d26a9de6ade2af71f1fb94 jdk8u60-b22
+c21563403b7a043be3d8f1afdd314e91438e357c jdk8u60-b23
+1c394b3be96628b705bb78d62bb4b7c9a7f75175 jdk8u60-b24
+0497fdafbc8d19d72bce668e65dc5e5457f6f21a jdk8u60-b25
+a20f5fa8d56298239e762408d3a427a0632a8b69 jdk8u60-b26
+975eb04d17953228e0f401cfee657fa9f5e26915 jdk8u60-b27
+2ba41569e6a0d314333fc3d4375381fdde4de7ea jdk8u60-b31
+61c97f549df419ef128d56d830014c8c782f220e jdk8u60-b32
+b61213045ec6e71505dfb94d2cd4ae3ce866166b jdk8u52-b06
+45891cd5c7a2268c65e9b8ab9299d46c45c77c47 jdk8u52-b07
+b61213045ec6e71505dfb94d2cd4ae3ce866166b jdk8u65-b00
+2af4e64ba020ba1419f48ed901ba0c91ea6b0aa1 jdk8u65-b01
+0851a86980a752b2b0250f7aa8da0e95cd07520c jdk8u65-b02
+330a44775442aba19645e9de00f6e09e398493ac jdk8u65-b03
+8c449f659e1338f7360295659201e0f1f204b711 jdk8u65-b04
+34221564cc133b306fa2cbadea0524ccb6c11e78 jdk8u65-b05
+14a55d61e06e2c20cd108ff636d1b853f5c8749a jdk8u65-b06
+20c5aa28a5fdc1c2c57e9561b08efb1a054fea22 jdk8u65-b07
+7f5df082d224e558e546cfddaf0805d68f34b2e5 jdk8u65-b08
+fd04b18dbdd1cb6fd7a63f2719f74f9bd7f8131d jdk8u65-b09
+6adf33f124fdd40b0079013c1074b4c7fc24aae7 jdk8u65-b10
+0a351d11449f81065425154c679a255c7916cc6d jdk8u65-b11
+414bc42938220882d399efd347f249cdfa024a6a jdk8u65-b12
+0984b16cc4d5b787fe03a2c1385a02030e9178fc jdk8u65-b13
+55033df0bbba6593bca22a4552bffc014fc6fbf2 jdk8u65-b14
+4ccc9e1468ae438821c5774cfd92129c1cc7bc6e jdk8u65-b15
+8ad14ed35d90f80d747a807307aaf92b146f53a9 jdk8u65-b16
+dbdfb913c5284242da2f97c74d031f24719edf56 jdk8u65-b17
+6079c26a3b8fa1ead3d26a9de6ade2af71f1fb94 jdk8u66-b00
+9655502cb94fada4580aa1d8ac08ed027b2272ed jdk8u66-b01
+0357274e67e94963c226f98e3af535ada2c7e0c5 jdk8u66-b02
+c3801338e94e391e639602106f5a76c725f2bc6c jdk8u66-b07
+1f936b23f61914dc75c8b496ad6b13c453af81be jdk8u66-b08
+e294a428c36f3d405fb691bfa07905e76637412c jdk8u66-b09
+b30c137b45929ec5f300fa831eab49807f0fea0a jdk8u66-b10
+b4bf5b2e93a0ec26dfc70caebaeace3927243b19 jdk8u66-b11
+8ab75dba8353e1dd658e086de9c7ad1157d81cd7 jdk8u66-b12
+d0c6921ee6c88e050673cb9cf9f88b7159442c1c jdk8u66-b13
+972d89655bab60525ddbc9365354fc809d0b74ea jdk8u66-b14
+19e64af41036d4ba0109ac2838133de5e7d159cc jdk8u66-b15
+529e4f09082daa07610ddde7dd2bca35b979eb14 jdk8u66-b16
+78c988a427d751f5a986af258248b3665950e509 jdk8u66-b17
+f3e9f0fcf5560c535bb93735b4c54e2f0257eb1a jdk8u66-b18
+f3c71687f52b6c4c331af8f6d200f677b367995c jdk8u66-b31
+47fc8ab84f47979b378158626f84b99b6f2b110f jdk8u71-b00
+f86ce5ee62ba5d0c91040fa53f0de5b19b20f155 jdk8u71-b01
+7d639191d91cd31b87363ed5383b636bed17f757 jdk8u71-b02
+12b4dcdd76c9b84fed7f6236964075846cb8964e jdk8u71-b03
+79f7e6560ce99eff5745da2a90e75200ca5b4c1e jdk8u71-b04
+15e05a6c32585edd6d2551445735994cb44f948e jdk8u71-b05
+b567f800daaadd47bbf49f69f683b515baeb4d9b jdk8u71-b06
+58f12bf42e5d726b01429a5bbfe26955c6620051 jdk8u71-b07
+7099cbc92fa4f4555e9ad8e19773851d701968b2 jdk8u71-b08
+a46eae10609ff4c9199fec9bff277f892da00495 jdk8u71-b09
+8ba92a4a3607da20a57f35d671e5ead5c5a5de3b jdk8u71-b10
+bd83bb17b08125088de07773d0305671d966ed6e jdk8u71-b11
+cf00d4a52f6444c8128313be33c29a98f67734bd jdk8u71-b12
+b570e47d708e4d7e9d65371ca16c3c93b0362091 jdk8u71-b13
+13b47358cf8965869865382d74c079c9290787f7 jdk8u71-b14
+6fabdb0ad3a0b28c7c1f9da4e7756c90f2c92b47 jdk8u71-b15
+3cbfc8bd4b1c83e151ba786778e04e8502ea13e4 jdk8u72-b00
+121e784f01d1b658866e499a42288b2f98eeb482 jdk8u72-b01
+c51556c23de38d5f4412622853e643bb8c67d647 jdk8u72-b02
+dddcabf97b4ab156545b3e98d67d6d3e37c8529e jdk8u72-b03
+baa0e7874269223b1726c9b2eccf628d0f72bcfe jdk8u72-b04
+b2b41f383c882ee7a8c2a54dfb0957aa2764d1f8 jdk8u72-b05
+fb0c51afcc55180608f07eb6697d517416ae15da jdk8u72-b06
+abf379db9ce09f747535558fa81d8468b220b810 jdk8u72-b07
+9c9e8cacf2b9161b2cbe232c6aa083fa09a5e63a jdk8u72-b08
+281229749d8ec6fbcd5e7a1eb05b433cd03d7b22 jdk8u72-b09
+b7a0a2c501f43027b870940b3fce2fe1306fc597 jdk8u72-b10
+96671bae6d531d23d1d6c9e1eff09e609dd3a273 jdk8u72-b11
+a2473dd1dc0df47425e42d7fed1e4cabdb696154 jdk8u72-b12
+4c28352ce19bc25be5de681868a8cddb3f3644a8 jdk8u72-b13
+1a523f4b8cc77ef9dfb6d8191742dcd616cd9093 jdk8u72-b14
+2f840ac0adf079f0d2f0bac7a9c3fae6ea651271 jdk8u72-b15
+6aba0f814a15966e47aeab61b466894b82c03c70 jdk8u76-b00
+60789eebd1fe440255fd3f504221dc8b5553b8c2 jdk8u76-b01
+8c7d476c446940edd913ba5a3ca36975febdac28 jdk8u76-b02
+4b728dce9390e63f60d9ea445c229430ed059174 jdk8u76-b03
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index c34ce6b3..2b20da2c 100644
--- a/THIRD_PARTY_README
+++ b/THIRD_PARTY_README
@@ -1140,37 +1140,6 @@ included with JRE 8, JDK 8, and OpenJDK 8.
 
 --------------------------------------------------------------------------------
 
-%% This notice is provided with respect to JSON, which may be included 
-with JRE 8 & JDK 8.
-
---- begin of LICENSE ---
-
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
 %% This notice is provided with respect to Kerberos functionality, which 
 which may be included with JRE 8, JDK 8, and OpenJDK 8.
 
@@ -1250,7 +1219,7 @@ included with JDK 8 and OpenJDK 8 source distributions.
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to libpng 1.5.4, which may be 
+%% This notice is provided with respect to libpng 1.6.16, which may be 
 included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
@@ -1266,8 +1235,8 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
-Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
+libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
+Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
 
@@ -1364,13 +1333,13 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-July 7, 2011
+December 22, 2014
 
 --- end of LICENSE ---
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to libungif 4.1.3, which may be 
+%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3, which may be 
 included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
@@ -1399,13 +1368,13 @@ THE SOFTWARE.
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to Little CMS 2.5, which may be 
+%% This notice is provided with respect to Little CMS 2.7, which may be 
 included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
 Little CMS
-Copyright (c) 1998-2011 Marti Maria Saguer
+Copyright (c) 1998-2015 Marti Maria Saguer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java b/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java
index cd4619ad..f1f675e2 100644
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java
@@ -30,6 +30,7 @@ import com.sun.tools.internal.xjc.BadCommandLineException;
 import com.sun.xml.internal.bind.util.Which;
 
 import javax.lang.model.SourceVersion;
+import javax.tools.Diagnostic;
 import javax.tools.DiagnosticCollector;
 import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
@@ -239,7 +240,12 @@ public class SchemaGenerator {
             if (episode != null)
                 r.setEpisodeFile(episode);
             task.setProcessors(Collections.singleton(r));
-            return task.call();
+            boolean res = task.call();
+            //Print messages generated by compiler
+            for (Diagnostic<? extends JavaFileObject> d : diagnostics.getDiagnostics()) {
+                 System.err.println(d.toString());
+            }
+            return res;
         }
     }
 
diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java
index 4f84ade7..0f7843e0 100644
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java
@@ -135,7 +135,7 @@ public class SchemaGenerator extends AbstractProcessor {
 
     private void filterClass(List<Reference> classes, Collection<? extends Element> elements) {
         for (Element element : elements) {
-            if (element.getKind().equals(ElementKind.CLASS)) {
+            if (element.getKind().equals(ElementKind.CLASS) || element.getKind().equals(ElementKind.ENUM)) {
                 classes.add(new Reference((TypeElement) element, processingEnv));
                 filterClass(classes, ElementFilter.typesIn(element.getEnclosedElements()));
             }
diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java b/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java
index 803d3297..dcdaae3a 100644
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java
@@ -30,7 +30,12 @@ import com.sun.source.util.TreePath;
 import com.sun.source.util.Trees;
 import com.sun.xml.internal.bind.v2.model.nav.Navigator;
 import com.sun.xml.internal.bind.v2.runtime.Location;
-
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
@@ -52,12 +57,6 @@ import javax.lang.model.util.ElementFilter;
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.SimpleTypeVisitor6;
 import javax.lang.model.util.Types;
-import java.lang.annotation.Annotation;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
 
 /**
  * {@link Navigator} implementation for annotation processing.
@@ -241,7 +240,7 @@ public final class ApNavigator implements Navigator<TypeMirror, TypeElement, Var
 
     public VariableElement[] getEnumConstants(TypeElement clazz) {
         List<? extends Element> elements = env.getElementUtils().getAllMembers(clazz);
-        Collection<VariableElement> constants = new HashSet<VariableElement>();
+        Collection<VariableElement> constants = new ArrayList<VariableElement>();
         for (Element element : elements) {
             if (element.getKind().equals(ElementKind.ENUM_CONSTANT)) {
                 constants.add((VariableElement) element);