Mercurial > hg > release > icedtea6-1.11
changeset 1955:278ade392786
Simplify JAXWS patching for OpenJDK6.
2010-03-01 Andrew John Hughes <ahughes@redhat.com>
Simply JAXWS patching for OpenJDK6.
* Makefile.am,
(NEED_JAXWS_SRC): Removed.
(JAXWS_PATCHES): Removed.
(ICEDTEA_ENV_ECJ): Add getdtdtype patch.
(extract.stamp): Remove extract-jaxws dependency.
(clean-extract): Remove clean-extract-jaxws dependency.
(extract-jaxws.stamp): Removed.
(clean-extract-jaxws): Removed.
* patches/ecj/icedtea-jaxws-getdtdtype.patch:
Updated to apply to JAXWS tree as a patch.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Mon, 01 Mar 2010 15:20:29 +0000 |
| parents | 7110db4670d3 |
| children | 15ae6e3a64d2 |
| files | ChangeLog Makefile.am patches/ecj/icedtea-jaxws-getdtdtype.patch |
| diffstat | 3 files changed, 64 insertions(+), 89 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Nov 17 21:35:00 2009 +0000 +++ b/ChangeLog Mon Mar 01 15:20:29 2010 +0000 @@ -1,13 +1,27 @@ +2010-03-01 Andrew John Hughes <ahughes@redhat.com> + + Simply JAXWS patching for OpenJDK6. + * Makefile.am, + (NEED_JAXWS_SRC): Removed. + (JAXWS_PATCHES): Removed. + (ICEDTEA_ENV_ECJ): Add getdtdtype patch. + (extract.stamp): Remove extract-jaxws dependency. + (clean-extract): Remove clean-extract-jaxws dependency. + (extract-jaxws.stamp): Removed. + (clean-extract-jaxws): Removed. + * patches/ecj/icedtea-jaxws-getdtdtype.patch: + Updated to apply to JAXWS tree as a patch. + 2009-11-17 Andrew John Hughes <ahughes@redhat.com> * patches/ecj/icedtea-jaxws-getdtdtype.patch: Replace getDTDType method, don't add another. - + 2009-11-17 Andrew John Hughes <ahughes@redhat.com> * patches/ecj/icedtea-jaxws-getdtdtype.patch: Add additional fix for AttributeBase.java - + 2010-03-01 Andrew John Hughes <ahughes@redhat.com> * Makefile.am:
--- a/Makefile.am Tue Nov 17 21:35:00 2009 +0000 +++ b/Makefile.am Mon Mar 01 15:20:29 2010 +0000 @@ -64,10 +64,6 @@ # FIXME (netx): NetX source directories go here -if DTDTYPE_QNAME -NEED_JAXWS_SRC = true -endif - OPENJDK_SOURCEPATH_DIRS = \ $(SHARE):$(SOLARIS):$(LANGTOOLS):$(CORBA) @@ -386,10 +382,6 @@ patches/ecj/icedtea-jaxp-dependency.patch \ patches/ecj/bootver.patch -# Patches for JAXWS - -JAXWS_PATCHES = patches/ecj/icedtea-jaxws-getdtdtype.patch - # OpenJDK build environment. if ZERO_BUILD ICEDTEA_ZERO_BUILD = true @@ -587,6 +579,11 @@ RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar" endif +if DTDTYPE_QNAME +ICEDTEA_ENV_ECJ += \ + patches/ecj/icedtea-jaxws-getdtdtype.patch +endif + # Source files # FIXME (distclean): Add generated file list # FIXME (distclean): Add jtreg sources @@ -902,11 +899,10 @@ #FIXME (meta): Split into multiple targets stamps/extract.stamp: stamps/extract-openjdk.stamp \ - stamps/extract-jaxws.stamp mkdir -p stamps touch $@ -clean-extract: clean-extract-jaxws +clean-extract: rm -f stamps/extract.stamp stamps/extract-openjdk.stamp: stamps/download.stamp @@ -966,57 +962,6 @@ mkdir -p stamps touch stamps/extract-openjdk.stamp - -stamps/extract-jaxws.stamp: stamps/extract-openjdk.stamp \ - stamps/download-jaxws-drop.stamp stamps/download-jaf-drop.stamp - if test "x$(NEED_JAXWS_SRC)" = "xtrue"; then \ - (cd openjdk/jaxws ; \ - $(ANT) -Ddrops.dir=$(abs_top_builddir)/drops \ - -Doutput.dir=$(BUILD_OUTPUT_DIR)/jaxws \ - source ; \ - cd $(abs_top_builddir)) ; \ - fi -if DTDTYPE_QNAME - (cd $(BUILD_OUTPUT_DIR)/jaxws; \ - all_patches_ok=yes; \ - for p in $(JAXWS_PATCHES) ; \ - do \ - if test x$${all_patches_ok} = "xyes" \ - && echo Checking $$p \ - && $(PATCH) -l -p0 --dry-run -s -t -f \ - -F 0 < $(abs_top_srcdir)/$$p ; \ - then \ - echo Applying $$p ; \ - $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \ - if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \ - >> stamps/extract-jaxws.stamp.tmp ; \ - then \ - echo "* $$(basename $$p): UNDOCUMENTED" \ - >> stamps/extract-jaxws.stamp.tmp ; \ - fi ; \ - else \ - test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \ - fi ; \ - done ; \ - if ! test x$${all_patches_ok} = "xyes"; then \ - echo ERROR patch $${all_patches_ok} FAILED! ; \ - echo WARNING make clean-extract-jaxws before retrying a fix ; \ - exit 2; \ - fi ; \ - cd $(abs_top_builddir)) ; -endif - mkdir -p stamps - touch $@ - -clean-extract-jaxws: - if [ -d $(BUILD_OUTPUT_DIR)/jaxws ] ; then \ - (cd openjdk/jaxws ; \ - $(ANT) -Doutput.dir=$(BUILD_OUTPUT_DIR)/jaxws clobber ; \ - cd ../../); \ - fi - mkdir -p stamps - rm -f stamps/extract-jaxws.stamp - stamps/replace-hotspot.stamp: stamps/extract.stamp if WITH_ALT_HSBUILD if test "x${HSBUILD}" != "xoriginal"; then \
--- a/patches/ecj/icedtea-jaxws-getdtdtype.patch Tue Nov 17 21:35:00 2009 +0000 +++ b/patches/ecj/icedtea-jaxws-getdtdtype.patch Mon Mar 01 15:20:29 2010 +0000 @@ -1,27 +1,43 @@ ---- openjdk-ecj.orig/build/linux-amd64/jaxws/drop/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:37:06.000000000 +0000 -+++ openjdk-ecj/build/linux-amd64/jaxws/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(); +diff -Nru openjdk-ecj.orig/jaxws/build.properties openjdk-ecj/jaxws/build.properties +--- openjdk-ecj.orig/jaxws/build.properties 2010-03-01 15:13:38.000000000 +0000 ++++ openjdk-ecj/jaxws/build.properties 2010-03-01 15:14:30.000000000 +0000 +@@ -81,7 +81,7 @@ + patches.dir=patches + + # Patches to apply +-jaxws_src.patch.list=xjc.patch ++jaxws_src.patch.list=xjc.patch getdtdtype.patch - 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. + # 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 2010-03-01 15:15:10.000000000 +0000 +@@ -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.