Reviewer needed - patch which added explicit class serial version UID to some JAXP classes

[Dr Andrew John Hughes]

On 18:20 Wed 02 Mar     , Pavel Tisnovsky wrote:
> Hi all,
> 
> I'd like to add new patch to IcedTea6 HEAD and IcedTea6-1.10 which fixes
> TCK failures which occured due to changes made in some JAXP classes
> (more precisely: there were new method getCause() added to some
> classes). These failures can be simply fixed by explicitly setting
> serial version UID to these classes which can be done by patch applied
> during JAXP build. Explicit serial version UIDs now matches UIDs used
> by JDK 6 as can be checked by running serial_version_check.sh [attachment].
> 
> Here are results obtained by running serial_version_check.sh against JDK
> 1.6.0_24:
> 
> javax.xml.stream.FactoryConfigurationError:    static final long
> serialVersionUID = -2994412584589975744L;
> javax.xml.transform.TransformerFactoryConfigurationError:    static
> final long serialVersionUID = -6527718720676281516L;
> javax.xml.parsers.FactoryConfigurationError:    static final long
> serialVersionUID = -827108682472263355L;
> 

Please don't post results against proprietary JDKs.

> Changes in API can be also seen here:
> http://fuseyism.com/japi/icedtea6-1.9-head.html
> 

These JAPI results show the true issue; the serial version UID has changed
between 1.9 and HEAD for three public classes and this should not happen.

> Changelog:
> 
> 2011-03-01  Pavel Tisnovsky  <ptisnovs at redhat.com>
> 
>         * Makefile.am:
>         Added patch jaxp-serial-version-uid.patch
>         * patches/jaxp-serial-version-uid.patch:
>         Patch which fixes class UID for various JAXP classes
> 
> hg diff generated against recent IcedTea6 HEAD is stored in attachment.
> 
> Can anybody review this patch please?
> 

Please commit to HEAD.  I'll handle 1.10.

> Thank you in advance
> Pavel
> 
> 

> diff -r 2d4768330e78 ChangeLog
> --- a/ChangeLog	Wed Mar 02 08:52:04 2011 -0500
> +++ b/ChangeLog	Wed Mar 02 16:42:51 2011 +0100
> @@ -1,3 +1,11 @@
> +2011-03-01  Pavel Tisnovsky  <ptisnovs at redhat.com>
> +
> +	* Makefile.am:
> +	Added patch jaxp-serial-version-uid.patch
> +	* patches/jaxp-serial-version-uid.patch:
> +	Patch which fixes class UID for various JAXP classes
> +	to allow IcedTea6 to pass TCK.
> +
>  2011-03-01  Denis Lila  <dlila at redhat.com>
>  
>  	* Makefile.am:
> diff -r 2d4768330e78 Makefile.am
> --- a/Makefile.am	Wed Mar 02 08:52:04 2011 -0500
> +++ b/Makefile.am	Wed Mar 02 16:42:51 2011 +0100
> @@ -326,7 +326,8 @@
>  	patches/openjdk/6967434-bad-round-joins.patch \
>  	patches/openjdk/6766342-AA-simple-shape-performance.patch \
>  	patches/openjdk/7016856-pisces-performance.patch \
> -	patches/openjdk/6934977-MappedByteBuffer.load.patch
> +	patches/openjdk/6934977-MappedByteBuffer.load.patch \
> +	patches/jaxp-serial-version-uid.patch
>  
>  if !WITH_ALT_HSBUILD
>  ICEDTEA_PATCHES += \
> diff -r 2d4768330e78 patches/jaxp-serial-version-uid.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/jaxp-serial-version-uid.patch	Wed Mar 02 16:42:51 2011 +0100
> @@ -0,0 +1,50 @@
> +--- openjdk.orig/jaxp/build.properties	2011-03-01 12:32:15.000000000 +0100
> ++++ openjdk/jaxp/build.properties	2011-03-01 12:32:15.000000000 +0100
> +@@ -78,7 +78,7 @@
> + patches.dir=patches
> + 
> + # Patches to apply
> +-jaxp_src.patch.list=6927050.patch
> ++jaxp_src.patch.list=6927050.patch SerialVersionUid.patch
> + 
> + # Sanity information
> + sanity.info= Sanity Settings:${line.separator}\
> +--- openjdk.orig/jaxp/patches/jaxp_src/SerialVersionUid.patch	2010-06-29 10:52:54.337250608 +0200
> ++++ openjdk/jaxp/patches/jaxp_src/SerialVersionUid.patch	2010-06-29 10:52:54.337250608 +0200
> +@@ -0,0 +1,36 @@
> ++--- src/javax/xml/stream/FactoryConfigurationError.java	2010-06-04 01:51:47.000000000 +0200
> +++++ src/javax/xml/stream/FactoryConfigurationError.java	2010-06-04 01:51:47.000000000 +0200
> ++@@ -37,6 +37,9 @@
> ++  */
> ++ public class FactoryConfigurationError extends Error {
> ++ 
> +++  // explicitly defined serial version ID to match JDK 6.
> +++  private static final long serialVersionUID = -2994412584589975744L;
> +++
> ++   Exception nested;
> ++ 
> ++   /**
> ++--- src/javax/xml/transform/TransformerFactoryConfigurationError.java	2011-03-01 14:18:52.000000000 +0100
> +++++ src/javax/xml/transform/TransformerFactoryConfigurationError.java	2011-03-02 14:06:02.000000000 +0100
> ++@@ -33,6 +33,9 @@
> ++  */
> ++ public class TransformerFactoryConfigurationError extends Error {
> ++ 
> +++    // explicitly defined serial version ID to match JDK 6.
> +++    private static final long serialVersionUID = -6527718720676281516L;
> +++
> ++     /**
> ++      * <code>Exception</code> for the
> ++      *  <code>TransformerFactoryConfigurationError</code>.
> ++--- src/javax/xml/parsers/FactoryConfigurationError.java	2011-03-01 14:18:52.000000000 +0100
> +++++ src/javax/xml/parsers/FactoryConfigurationError.java	2011-03-02 15:12:22.000000000 +0100
> ++@@ -37,6 +37,9 @@
> ++ 
> ++ public class FactoryConfigurationError extends Error {
> ++ 
> +++    // explicitly defined serial version ID to match JDK 6.
> +++    private static final long serialVersionUID = -827108682472263355L;
> +++
> ++     /**
> ++      *<code>Exception</code> that represents the error.
> ++      */



-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37