/hg/release/icedtea6-1.13: PR2033: patches/ecj/jaxws-getdtdtype....
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Oct 15 22:23:18 UTC 2014
changeset 2590e85d1b00 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=2590e85d1b00
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Oct 15 23:22:58 2014 +0100
PR2033: patches/ecj/jaxws-getdtdtype.patch no longer applies since removal of JAXWS drop
2014-10-15 Andrew John Hughes <gnu.andrew at 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.
diffstat:
ChangeLog | 9 +++++
NEWS | 3 +
patches/ecj/jaxws-getdtdtype.patch | 68 +++++++++++++++----------------------
3 files changed, 39 insertions(+), 41 deletions(-)
diffs (103 lines):
diff -r d250454d7fbc -r 2590e85d1b00 ChangeLog
--- 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 at 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 at redhat.com>
* NEWS: Add 1.13.6 section.
diff -r d250454d7fbc -r 2590e85d1b00 NEWS
--- 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
diff -r d250454d7fbc -r 2590e85d1b00 patches/ecj/jaxws-getdtdtype.patch
--- 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
+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();
- # Patches to apply
--jaxws_src.patch.list=xjc.patch
-+jaxws_src.patch.list=xjc.patch getdtdtype.patch
+ 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);
+ }
- # 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.
+-
+ /**
+ * A flag indicating whether this attribute was actually
+ * specified in the start-tag of its element, or was defaulted from the schema.
More information about the distro-pkg-dev
mailing list