Mercurial > hg > release > icedtea6-1.10

changeset 2483:787b1537342a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert serialversionUID changes in public JAXP API classes that occurred between 1.9 and 1.10. 2011-03-02 Andrew John Hughes <ahughes@redhat.com> * patches/jaxp-serial-version-uid.patch: Rejigged to work post-b22 update. 2011-03-02 Pavel Tisnovsky <ptisnovs@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.
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 02 Mar 2011 18:34:51 +0000
parents 853d361c406a
children 1ad2d765dd39
files ChangeLog Makefile.am patches/jaxp-serial-version-uid.patch
diffstat 3 files changed, 68 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Mar 02 15:54:21 2011 +0000
+++ b/ChangeLog	Wed Mar 02 18:34:51 2011 +0000
@@ -1,3 +1,16 @@
+2011-03-02  Andrew John Hughes  <ahughes@redhat.com>
+
+	* patches/jaxp-serial-version-uid.patch:
+	Rejigged to work post-b22 update.
+
+2011-03-02  Pavel Tisnovsky  <ptisnovs@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-02  Andrew John Hughes  <ahughes@redhat.com>
 
 	* NEWS:
--- a/Makefile.am	Wed Mar 02 15:54:21 2011 +0000
+++ b/Makefile.am	Wed Mar 02 18:34:51 2011 +0000
@@ -317,7 +317,8 @@
 	patches/openjdk/6663040-com.sun.awt.patch \
 	patches/openjdk/6775317-non-AA-simple-shape-performance.patch \
 	patches/openjdk/6766342-AA-simple-shape-performance.patch \
-	patches/pr600-arm-jvm.cfg.patch
+	patches/pr600-arm-jvm.cfg.patch \
+	patches/jaxp-serial-version-uid.patch
 
 if !WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jaxp-serial-version-uid.patch	Wed Mar 02 18:34:51 2011 +0000
@@ -0,0 +1,53 @@
+diff -Nru openjdk.orig/jaxp/build.properties openjdk/jaxp/build.properties
+--- openjdk.orig/jaxp/build.properties	2011-02-28 16:03:34.000000000 +0000
++++ openjdk/jaxp/build.properties	2011-03-02 17:46:39.609899609 +0000
+@@ -77,6 +77,9 @@
+ # Where patches to drop bundle sources live
+ patches.dir=patches
+ 
++# Patches to apply
++jaxp_src.patch.list=6927050.patch serialversionuid.patch
++
+ # Sanity information
+ sanity.info= Sanity Settings:${line.separator}\
+   ant.home=${ant.home}${line.separator}\
+diff -Nru openjdk.orig/jaxp/patches/jaxp_src/serialversionuid.patch openjdk/jaxp/patches/jaxp_src/serialversionuid.patch
+--- openjdk.orig/jaxp/patches/jaxp_src/serialversionuid.patch	1970-01-01 01:00:00.000000000 +0100
++++ openjdk/jaxp/patches/jaxp_src/serialversionuid.patch	2011-03-02 17:46:17.322764393 +0000
+@@ -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.
++      */