/hg/icedtea: Move jaxws getDTDType() patch to bootstrap subdirec...

[andrew at icedtea.classpath.org]

changeset efb52113d74b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=efb52113d74b
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 01 15:35:38 2010 +0100

	Move jaxws getDTDType() patch to bootstrap subdirectory.

	2010-06-01 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-jaxws-getdtdtype.patch: Moved
	to...
		* Makefile.am: Move jaxws patch to bootstrap subdirectory.
		* patches/boot/jaxws-getdtdtype.patch: ...here.


diffstat:

4 files changed, 37 insertions(+), 28 deletions(-)
ChangeLog                              |    9 +++++++++
Makefile.am                            |    2 +-
patches/boot/jaxws-getdtdtype.patch    |   27 +++++++++++++++++++++++++++
patches/icedtea-jaxws-getdtdtype.patch |   27 ---------------------------

diffs (90 lines):

diff -r 007d1cc7ea12 -r efb52113d74b ChangeLog
--- a/ChangeLog	Tue Jun 01 15:24:24 2010 +0100
+++ b/ChangeLog	Tue Jun 01 15:35:38 2010 +0100
@@ -1,3 +1,12 @@ 2010-06-01 Andrew John Hughes  <ahughes@
+2010-06-01 Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-jaxws-getdtdtype.patch:
+	Moved to...
+	* Makefile.am:
+	Move jaxws patch to bootstrap subdirectory.
+	* patches/boot/jaxws-getdtdtype.patch:
+	...here.
+
 2010-06-01 Andrew John Hughes  <ahughes at redhat.com>
 
 	Drop fake tools.jar in bootstrap JDK.
diff -r 007d1cc7ea12 -r efb52113d74b Makefile.am
--- a/Makefile.am	Tue Jun 01 15:24:24 2010 +0100
+++ b/Makefile.am	Tue Jun 01 15:35:38 2010 +0100
@@ -444,7 +444,7 @@ endif
 
 # Patches for JAXWS
 
-JAXWS_PATCHES = patches/icedtea-jaxws-getdtdtype.patch
+JAXWS_PATCHES = patches/boot/jaxws-getdtdtype.patch
 
 # OpenJDK build environment.
 if ZERO_BUILD
diff -r 007d1cc7ea12 -r efb52113d74b patches/boot/jaxws-getdtdtype.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boot/jaxws-getdtdtype.patch	Tue Jun 01 15:35:38 2010 +0100
@@ -0,0 +1,27 @@
+--- drop/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java	2009-11-17 16:37:06.000000000 +0000
++++ drop/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);
+--- drop/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.old	2009-11-17 19:46:11.000000000 +0000
++++ drop/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.
diff -r 007d1cc7ea12 -r efb52113d74b patches/icedtea-jaxws-getdtdtype.patch
--- a/patches/icedtea-jaxws-getdtdtype.patch	Tue Jun 01 15:24:24 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
---- drop/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java	2009-11-17 16:37:06.000000000 +0000
-+++ drop/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);
---- drop/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.old	2009-11-17 19:46:11.000000000 +0000
-+++ drop/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.