Merge up to jdk8u45-b14HEADmaster

3 files changed, 25 insertions, 5 deletions

diff --git a/.hgtags b/.hgtags
index 74f1b332..4d9dfc05 100644
--- a/.hgtags
+++ b/.hgtags
@@ -343,6 +343,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
@@ -357,6 +359,8 @@ dd0467f3fe130884849ad8fb226d76f02b4cbde4 jdk8u31-b10
 497c783d228ed188d61964edd409794af3ad3e5c jdk8u31-b11
 959e8fca46155528c8147da69a7c49edfb002cb1 jdk8u31-b12
 9d0c737694ece23547c0a27dcd0ba6cbcdf577f2 jdk8u31-b13
+49e91817cbe1b14f856c26f6e55b7151e3f8c3a8 jdk8u31-b31
+9e20c5acb448c5f9b05a4e9b4efc222b3b616c23 jdk8u31-b32
 31d43d250c836c13fcc87025837783788c5cd0de jdk8u40-b00
 262fb5353ffa661f88b4a9cf2581fcad8c2a43f7 jdk8u40-b01
 1e91cd08b25ae7d1e0556c9d6dd97dcf2f727ce4 jdk8u40-b02
@@ -383,3 +387,19 @@ a21c4edfdf4402f027183ac8c8aac2db49df3b7d jdk8u40-b20
 b6755a463ccf6a79b1e1a43ed7bdb1c5cb1ac17d jdk8u40-b23
 5fbbfd66643edb81cfa0688825d698dcc5f2eb11 jdk8u40-b24
 b6120aaf2aeef7c5608d578e15e82db7eb24fb2e jdk8u40-b25
+1bcb30bdd9883cc7fc1bf70800ea03a4429eaa80 jdk8u40-b26
+a5f2cdedb940511674e153dce8d3cbc3a0598c9e jdk8u40-b27
+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
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index c34ce6b3..cd88baf5 100644
--- a/THIRD_PARTY_README
+++ b/THIRD_PARTY_README
@@ -1250,7 +1250,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 +1266,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,7 +1364,7 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-July 7, 2011
+December 22, 2014
 
 --- end of LICENSE ---
 
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()));
             }