Mercurial > hg > release > icedtea6-1.13
changeset 3176:2590e85d1b00
PR2033: patches/ecj/jaxws-getdtdtype.patch no longer applies since removal of JAXWS drop
2014-10-15 Andrew John Hughes <gnu.andrew@redhat.com>
PR2033: patches/ecj/jaxws-getdtdtype.patch no
longer applies since removal of JAXWS drop
* NEWS: Updated.
* patches/ecj/jaxws-getdtdtype.patch:
Regenerated as a normal patch against the
OpenJDK source tree.
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Wed, 15 Oct 2014 23:22:58 +0100 |
parents | d250454d7fbc |
children | b151eb4fe5bc |
files | ChangeLog NEWS patches/ecj/jaxws-getdtdtype.patch |
diffstat | 3 files changed, 40 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Oct 15 03:45:14 2014 +0100 +++ b/ChangeLog Wed Oct 15 23:22:58 2014 +0100 @@ -1,3 +1,12 @@ +2014-10-15 Andrew John Hughes <gnu.andrew@redhat.com> + + PR2033: patches/ecj/jaxws-getdtdtype.patch no + longer applies since removal of JAXWS drop + * NEWS: Updated. + * patches/ecj/jaxws-getdtdtype.patch: + Regenerated as a normal patch against the + OpenJDK source tree. + 2014-10-14 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add 1.13.6 section.
--- a/NEWS Wed Oct 15 03:45:14 2014 +0100 +++ b/NEWS Wed Oct 15 23:22:58 2014 +0100 @@ -14,6 +14,9 @@ New in release 1.13.6 (2015-01-XX): +* Bug fixes + - PR2033: patches/ecj/jaxws-getdtdtype.patch no longer applies since removal of JAXWS drop + New in release 1.13.5 (2014-10-14): * Security fixes
--- a/patches/ecj/jaxws-getdtdtype.patch Wed Oct 15 03:45:14 2014 +0100 +++ b/patches/ecj/jaxws-getdtdtype.patch Wed Oct 15 23:22:58 2014 +0100 @@ -1,43 +1,29 @@ -diff -Nru openjdk-ecj.orig/jaxws/build.properties openjdk-ecj/jaxws/build.properties ---- openjdk-ecj.orig/jaxws/build.properties 2011-06-29 23:08:21.756066418 +0100 -+++ openjdk-ecj/jaxws/build.properties 2011-06-29 23:09:51.701491292 +0100 -@@ -81,7 +81,7 @@ - patches.dir=patches - - # Patches to apply --jaxws_src.patch.list=xjc.patch -+jaxws_src.patch.list=xjc.patch getdtdtype.patch +diff -Nru openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java +--- openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2014-10-15 22:55:39.955155652 +0100 ++++ openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2014-10-15 22:56:29.899840571 +0100 +@@ -276,7 +276,7 @@ + qName = localName; + else + qName = prefix + ':' + localName; +- String type = staxAttr.getDTDType(); ++ String type = staxAttr.getDTDType().toString(); + String value = staxAttr.getValue(); - # Sanity information - sanity.info= Sanity Settings:${line.separator}\ -diff -Nru openjdk-ecj.orig/jaxws/patches/jaxws_src/getdtdtype.patch openjdk-ecj/jaxws/patches/jaxws_src/getdtdtype.patch ---- openjdk-ecj.orig/jaxws/patches/jaxws_src/getdtdtype.patch 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk-ecj/jaxws/patches/jaxws_src/getdtdtype.patch 2011-06-29 23:09:34.609220483 +0100 -@@ -0,0 +1,27 @@ -+--- src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:37:06.000000000 +0000 -++++ src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:38:00.000000000 +0000 -+@@ -276,7 +276,7 @@ -+ qName = localName; -+ else -+ qName = prefix + ':' + localName; -+- String type = staxAttr.getDTDType(); -++ String type = staxAttr.getDTDType().toString(); -+ String value = staxAttr.getValue(); -+ -+ attrs.addAttribute(uri, localName, qName, type, value); -+--- src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.old 2009-11-17 19:46:11.000000000 +0000 -++++ src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java 2009-11-17 19:46:35.000000000 +0000 -+@@ -108,11 +108,10 @@ -+ * the String "CDATA" -+ * @return the type as a String, default is "CDATA" -+ */ -+- public String getDTDType() { -+- return _attributeType; -++ public QName getDTDType() { -++ return new QName(_attributeType); -+ } -+ -+- -+ /** -+ * A flag indicating whether this attribute was actually -+ * specified in the start-tag of its element, or was defaulted from the schema. + attrs.addAttribute(uri, localName, qName, type, value); +diff -Nru openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java +--- openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java 2014-10-15 22:55:18.002854659 +0100 ++++ openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java 2014-10-15 22:56:29.899840571 +0100 +@@ -108,11 +108,10 @@ + * the String "CDATA" + * @return the type as a String, default is "CDATA" + */ +- public String getDTDType() { +- return _attributeType; ++ public QName getDTDType() { ++ return new QName(_attributeType); + } + +- + /** + * A flag indicating whether this attribute was actually + * specified in the start-tag of its element, or was defaulted from the schema.