Mercurial > hg > openjdk > aarch64-port > jaxws

changeset 882:78d8cafb17e4 jdk8u51-b01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Wed, 25 Feb 2015 12:16:27 -0800
parents 63985bfdcdce (diff) e7a9c2fb6b05 (current diff)
children a561467595cb
files .hgtags
diffstat 3 files changed, 39 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Feb 10 15:00:19 2015 -0800
+++ b/.hgtags	Wed Feb 25 12:16:27 2015 -0800
@@ -353,3 +353,40 @@
 49e91817cbe1b14f856c26f6e55b7151e3f8c3a8 jdk8u31-b31
 9e20c5acb448c5f9b05a4e9b4efc222b3b616c23 jdk8u31-b32
 ea23d583e36301301612946d34ff6aa90d795dd9 jdk8u31-b33
+31d43d250c836c13fcc87025837783788c5cd0de jdk8u40-b00
+262fb5353ffa661f88b4a9cf2581fcad8c2a43f7 jdk8u40-b01
+8043f77ef8a4ded9505269a356c4e2f4f9604cd9 jdk8u40-b02
+27bcab54f36afc2340adf525fa2a8de1b1c356ca jdk8u40-b03
+127fb2a65ca6d09bb59ff8030aac11c67f3da4d8 jdk8u40-b04
+b904fcd66860c2b069493f989b3347241266407d jdk8u40-b05
+52ae3094de1ec6974ff0250b8cabc13f110290d1 jdk8u40-b06
+3857b4b27e22cfd3f970cd77ed1a41d44444202f jdk8u40-b07
+304ea93428f83d55a558a76ebbcc318d07c03fbe jdk8u40-b08
+26529be4ae77192acf99c867f0c2a75a7ad71f28 jdk8u40-b09
+337fb10bc4da77f31b3ba3049d45180a8c215f97 jdk8u40-b10
+475f12001625b16230f29a96b6371b3cd2e955dd jdk8u40-b11
+d78fb9203a2782842810ff0197f2ce92d364a8ea jdk8u40-b12
+42a61f4bdca3f7f919b7f8aeb5cad961dc2d1660 jdk8u40-b13
+d22a374ce8569a89301b6c07301e0a803af024e7 jdk8u40-b14
+a278e39ba58d104d0731db5ab5ea6cedf3084a1d jdk8u40-b15
+8893690584dac2df7cc2e9b0a5ffe107266a160b jdk8u40-b16
+83c4d5aca2ff8fd0c6b2a7091018b71313371176 jdk8u40-b17
+fa07311627d085f1307f55298f59463bcf55db02 jdk8u40-b18
+c8b402c28fe51e25f3298e1266f2ae48bda8d3e0 jdk8u40-b19
+a21c4edfdf4402f027183ac8c8aac2db49df3b7d jdk8u40-b20
+16485a38b6bc762b363f4e439047486742fbcfcb jdk8u40-b21
+6e928fd9152541eddf25694be89eb881434a5c5f jdk8u40-b22
+b6755a463ccf6a79b1e1a43ed7bdb1c5cb1ac17d jdk8u40-b23
+5fbbfd66643edb81cfa0688825d698dcc5f2eb11 jdk8u40-b24
+b6120aaf2aeef7c5608d578e15e82db7eb24fb2e jdk8u40-b25
+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
+74aae7549ef8c6e9f394b75c840bf293e2664858 jdk8u51-b00
--- a/THIRD_PARTY_README	Tue Feb 10 15:00:19 2015 -0800
+++ b/THIRD_PARTY_README	Wed Feb 25 12:16:27 2015 -0800
@@ -3385,7 +3385,7 @@
 included with JRE 8, JDK 8, and OpenJDK 8.
 
   Apache Commons Math 3.2
-  Apache Derby 10.10.1.3        
+  Apache Derby 10.11.1.2
   Apache Jakarta BCEL 5.1 
   Apache Jakarta Regexp 1.4 
   Apache Santuario XML Security for Java 1.5.4
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java	Tue Feb 10 15:00:19 2015 -0800
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java	Wed Feb 25 12:16:27 2015 -0800
@@ -135,7 +135,7 @@
 
     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()));
             }