/hg/icedtea6: Revert duplicate icedtea-jaxws-getdtdtype.patch fr...

[mjw at icedtea.classpath.org]

changeset 775503860dc5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=775503860dc5
author: Mark Wielaard <mark at klomp.org>
date: Fri Jul 30 12:18:43 2010 +0200

	Revert duplicate icedtea-jaxws-getdtdtype.patch from bad merge
	41911a183c51.

	patches/ecj/icedtea-jaxws-getdtdtype.patch replaced patches/icedtea-
	jaxws-getdtdtype.patch. The merge accidentically reintroduced the
	old patch and duplicated the check.


diffstat:

3 files changed, 39 deletions(-)
Makefile.am                            |   10 ----------
configure.ac                           |    2 --
patches/icedtea-jaxws-getdtdtype.patch |   27 ---------------------------

diffs (63 lines):

diff -r 58d1f80fc642 -r 775503860dc5 Makefile.am
--- a/Makefile.am	Thu Jul 29 16:59:15 2010 -0400
+++ b/Makefile.am	Fri Jul 30 12:18:43 2010 +0200
@@ -360,16 +360,6 @@ endif
 endif
 
 ICEDTEA_ECJ_PATCHES += $(DISTRIBUTION_ECJ_PATCHES)
-
-# Patches for JAXWS
-
-if DTDTYPE_QNAME
-JAXWS_PATCHES = patches/icedtea-jaxws-getdtdtype.patch
-else
-JAXWS_PATCHES = 
-endif
-
-ICEDTEA_ECJ_PATCHES += $(JAXWS_PATCHES)
 
 # OpenJDK build environment.
 if ZERO_BUILD
diff -r 58d1f80fc642 -r 775503860dc5 configure.ac
--- a/configure.ac	Thu Jul 29 16:59:15 2010 -0400
+++ b/configure.ac	Fri Jul 30 12:18:43 2010 +0200
@@ -169,8 +169,6 @@ else
   AC_CONFIG_FILES([javac], [chmod +x javac])
   AC_CONFIG_FILES([javap], [chmod +x javap])
 fi
-
-IT_GETDTDTYPE_CHECK
 
 FIND_RHINO_JAR
 WITH_OPENJDK_SRC_ZIP
diff -r 58d1f80fc642 -r 775503860dc5 patches/icedtea-jaxws-getdtdtype.patch
--- a/patches/icedtea-jaxws-getdtdtype.patch	Thu Jul 29 16:59:15 2010 -0400
+++ /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.