Mercurial > hg > release > icedtea7-2.0
view patches/boot/jaxws-getdtdtype.patch @ 2483:8d011581534d
PR790: Include JAXP, JAF and JAXWS in the source tree.
2011-09-27 Andrew John Hughes <ahughes@redhat.com>
PR790: Include JAXP, JAF and JAXWS sources directly
in OpenJDK tree, removing the need for drop tarballs.
* INSTALL: Remove drop zip options.
* Makefile.am:
(JAXP_CHANGESET): Updated to bring in JAXP sources.
(JAXP_SHA256SUM): Likewise.
(JAXWS_CHANGESET): Likewise for JAXWS.
(JAXWS_SHA256SUM): Likewise.
(JAXWS_DROP_URL): Removed.
(JAXWS_DROP_ZIP): Likewise.
(JAXWS_DROP_SHA256SUM): Likewise.
(JAF_DROP_URL): Likewise.
(JAF_DROP_ZIP): Likewise.
(JAF_DROP_SHA256SUM): Likewise.
(JAXP_DROP_URL): Likewise.
(JAXP_DROP_ZIP): Likewise.
(JAXP_DROP_SHA256SUM): Likewise.
(JAXWS): Fix path to point into source tree.
(NEED_JAXWS_SRC): Removed; always available now.
(OPENJDK_BOOT_TREE): Remove reference to patch-jaxws.
(ICEDTEA_BOOT_PATCHES): Move dtdtype patch to here.
(ICEDTEA_ENV): Drop ALT_DROPS_DIR.
(.PHONY): Drop clean-drops.
(download): Drop download-drops.
(clean-download): Drop clean-drops.
(download-jaxp-drop): Removed.
(clean-download-jaxp-drop): Likewise.
(download-jaf-drop): Likewise.
(clean-download-jaf-drop): Likewise.
(download-jaxws-drop): Likewise.
(clean-download-jaxws-drop): Likewise.
(download-drops): Likewise.
(clean-drops): Likewise.
(extract): Drop clean-extract-jaxws.
(extract-jaxws): Removed.
(clean-extract-jaxws): Removed.
(clean-clone-boot): No more patch-jaxws stamp.
(patch-jaxws): Removed.
(clean-patch-jaxws): Removed.
* NEWS: Updated.
* acinclude.m4:
(IT_WITH_JAXP_DROP_ZIP): Likewise.
(IT_WITH_JAF_DROP_ZIP): Likewise.
(IT_WITH_JAXWS_DROP_ZIP): Likewise.
* configure.ac: Don't call drop macros.
* patches/boot/jaxws-getdtdtype.patch:
Updated to apply to openjdk-boot tree.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Wed, 28 Sep 2011 21:44:40 +0100 |
parents | efb52113d74b |
children |
line wrap: on
line source
--- openjdk-boot.orig/jaxws/sources/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:37:06.000000000 +0000 +++ openjdk-boot/jaxws/sources/jaxws_src/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); --- openjdk-boot.orig/jaxws/sources/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.old 2009-11-17 19:46:11.000000000 +0000 +++ openjdk-boot/jaxws/sources/jaxws_src/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.