Mercurial > hg > release > icedtea6-1.11

changeset 2639:bef042dcbb2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Drop serialization patches for JAXP and JTable which are now upstream. 2011-03-31 Andrew John Hughes <ahughes@redhat.com> * patches/jaxp-serial-version-uid.patch, * patches/openjdk/6768387-jtable_not_serializable.patch: Dropped, upstream. * Makefile.am: (JAXP_DROP_ZIP): Update. (JAXP_DROP_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Drop above.
author Andrew John Hughes <ahughes@redhat.com>
date Thu, 31 Mar 2011 01:04:37 +0100
parents 15ee0af0207b
children 83034f3f172f
files ChangeLog Makefile.am patches/jaxp-serial-version-uid.patch patches/openjdk/6768387-jtable_not_serializable.patch
diffstat 4 files changed, 12 insertions(+), 164 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Mar 30 23:14:30 2011 +0100
+++ b/ChangeLog	Thu Mar 31 01:04:37 2011 +0100
@@ -1,3 +1,13 @@
+2011-03-31  Andrew John Hughes  <ahughes@redhat.com>
+
+	* patches/jaxp-serial-version-uid.patch,
+	* patches/openjdk/6768387-jtable_not_serializable.patch:
+	Dropped, upstream.
+	* Makefile.am:
+	(JAXP_DROP_ZIP): Update.
+	(JAXP_DROP_SHA256SUM): Likewise.
+	(ICEDTEA_PATCHES): Drop above.
+
 2011-03-29  Pavel Tisnovsky  <ptisnovs@redhat.com>
 
 	* Makefile.am: Add new patch.
--- a/Makefile.am	Wed Mar 30 23:14:30 2011 +0100
+++ b/Makefile.am	Thu Mar 31 01:04:37 2011 +0100
@@ -24,9 +24,8 @@
 JAF_DROP_ZIP = jdk6-jaf-b20.zip
 JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
 JAXP_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXP_DROP_ZIP = jaxp144_01.zip
-JAXP_DROP_SHA256SUM = d72c2e27a479e7e78e0141cfcf3a9c5dbc5677495bd21b2d52dce85d21322186
-
+JAXP_DROP_ZIP = jaxp144_02.zip
+JAXP_DROP_SHA256SUM = 29edfda4b7e5e2f87da5a172b4d3e3cf05b1c1ec60e5ebb0144470edcb2a9c1d
 OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
 
 HOTSPOT_SRC_ZIP = hotspot.tar.gz
@@ -324,13 +323,11 @@
 	patches/openjdk/6766342-AA-simple-shape-performance.patch \
 	patches/openjdk/7016856-pisces-performance.patch \
 	patches/openjdk/6934977-MappedByteBuffer.load.patch \
-	patches/jaxp-serial-version-uid.patch \
 	patches/jtreg-hotspot-bug-6196102.patch \
 	patches/jtreg-double-to-string.patch \
 	patches/openjdk/7023591-AAShapePipe.patch \
 	patches/openjdk/7027667-AAShapePipeRegTest.patch \
 	patches/openjdk/7019861-AA-regression-fix.patch \
-	patches/openjdk/6768387-jtable_not_serializable.patch \
 	patches/mark_sun_toolkit_privileged_code.patch \
 	patches/g356743-libpng-1.5.patch \
 	patches/revert-6885123.patch
--- a/patches/jaxp-serial-version-uid.patch	Wed Mar 30 23:14:30 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-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 previous versions.
-++  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 previous versions.
-++    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 previous versions.
-++    private static final long serialVersionUID = -827108682472263355L;
-++
-+     /**
-+      *<code>Exception</code> that represents the error.
-+      */
--- a/patches/openjdk/6768387-jtable_not_serializable.patch	Wed Mar 30 23:14:30 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-# HG changeset patch
-# User alexp
-# Date 1274805592 -14400
-# Node ID 8d59b361635f12e378b41b44c4b953849de0d9fa
-# Parent  1297a41dbb47e58e89f7f639cee933a677998318
-6768387: REGRESSION: JTable no longer serializable
-Reviewed-by: rupashka
-
-diff -r 1297a41dbb47 -r 8d59b361635f src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java
---- openjdk/jdk/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java	Tue May 25 20:30:54 2010 +0400
-+++ openjdk/jdk/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java	Tue May 25 20:39:52 2010 +0400
-@@ -24,6 +24,8 @@
-  */
- package sun.swing.table;
- 
-+import sun.swing.DefaultLookup;
-+
- import java.awt.Component;
- import java.awt.Color;
- import java.awt.FontMetrics;
-@@ -31,12 +33,11 @@
- import java.awt.Insets;
- import java.awt.Point;
- import java.awt.Rectangle;
-+import java.io.Serializable;
- import javax.swing.*;
- import javax.swing.plaf.UIResource;
- import javax.swing.border.Border;
- import javax.swing.table.*;
--import sun.swing.DefaultLookup;
--
- 
- public class DefaultTableCellHeaderRenderer extends DefaultTableCellRenderer
-         implements UIResource {
-@@ -186,7 +187,7 @@
-         return new Point(x, y);
-     }
- 
--    private class EmptyIcon implements Icon {
-+    private class EmptyIcon implements Icon, Serializable {
-         int width = 0;
-         int height = 0;
-         public void paintIcon(Component c, Graphics g, int x, int y) {}
-diff -r 1297a41dbb47 -r 8d59b361635f test/javax/swing/JTable/6768387/bug6768387.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ openjdk/jdk/test/javax/swing/JTable/6768387/bug6768387.java	Tue May 25 20:39:52 2010 +0400
-@@ -0,0 +1,59 @@
-+/*
-+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* @test
-+   @bug 6768387
-+   @summary REGRESSION: JTable no longer serializable
-+   @author Alexander Potochkin
-+   @run main bug6768387
-+*/
-+
-+import javax.swing.*;
-+import javax.swing.table.AbstractTableModel;
-+import java.io.*;
-+
-+public class bug6768387 {
-+
-+    private static void createGui() {
-+        JTable table = new JTable();
-+        OutputStream os;
-+        ObjectOutputStream out;
-+        try {
-+            os = new ByteArrayOutputStream();
-+            out = new ObjectOutputStream(os);
-+            out.writeObject(table);
-+            out.close();
-+        }
-+        catch (Exception ex) {
-+            throw new RuntimeException(ex);
-+        }
-+    }
-+
-+    public static void main(String[] args) throws Exception {
-+        SwingUtilities.invokeAndWait(new Runnable() {
-+            public void run() {
-+                bug6768387.createGui();
-+            }
-+        });
-+    }
-+}