--- a/ChangeLog	Thu Jan 28 17:34:31 2010 +0000
+++ b/ChangeLog	Fri Jan 29 14:56:25 2010 +0000
@@ -1,3 +1,12 @@
+2010-01-29 Andrew John Hughes  <ahughes@redhat.com>
+
+	* patches/icedtea-6920143-using-with-mouse.patch,
+	* patches/icedtea-6920172-location-relative-to-test.patch,
+	* patches/icedtea-6920172-turkish.patch,
+	* patches/icedtea-xml-encodinginfo.patch:
+	Dropped, already in OpenJDK6 hg.
+	* Makefile.am: Remove above patches.
+
 2010-01-28 Pavel Tisnovsky <ptisnovs@redhat.com>
 
 	* Makefile.am: Add new patches.

--- a/Makefile.am	Thu Jan 28 17:34:31 2010 +0000
+++ b/Makefile.am	Fri Jan 29 14:56:25 2010 +0000
@@ -23,9 +23,9 @@
 JAXWS_DROP_SHA256SUM = 155ff3be83c980e197621a2fbf7ee34e8e0f536489351a5865cf0e52206245e2
 JAF_DROP_ZIP = jdk6-jaf-2009_10_27.zip
 JAF_DROP_SHA256SUM = fdc51476fc6bcc69ea1f099f33e84601a126bfa8b11c8fa11c25dc574345aa9f
-JAXP_DROP_URL = http://kenai.com/projects/jdk6-drops/downloads/download
-JAXP_DROP_ZIP = jdk6-jaxp-2009_10_27.zip
-JAXP_DROP_SHA256SUM = c027858c5a6195c8b06cdb5f5fb289054e65845594b0f0414f2514abcfca7422
+JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/147329
+JAXP_DROP_ZIP = jdk6-jaxp-2009_10_13.zip
+JAXP_DROP_SHA256SUM = 8714d55de18db48ca9da0ee986202005082f44cf4c215da8683342b70e61792b
 
 OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
 
@@ -281,7 +281,6 @@
 	patches/icedtea-demo-swingapplet.patch \
 	patches/icedtea-awt-window-size.patch \
 	patches/icedtea-java2d-dasher.patch \
-	patches/icedtea-xml-encodinginfo.patch \
 	patches/icedtea-jtreg-6592792.patch \
 	patches/icedtea-s390-noinline.patch \
 	patches/icedtea-jtreg-dnd.patch \
@@ -299,10 +298,7 @@
 	patches/icedtea-linux-separate-debuginfo.patch \
 	patches/icedtea-parisc.patch \
 	patches/icedtea-sh4-support.patch \
-	patches/libpng.patch \
-	patches/icedtea-6920143-using-with-mouse.patch \
-        patches/icedtea-6920172-location-relative-to-test.patch \
-        patches/icedtea-6920172-turkish.patch
+	patches/libpng.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \

--- a/patches/icedtea-6920143-using-with-mouse.patch	Thu Jan 28 17:34:31 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-6920143: test/java/awt/TestArea/UsingWithMouse.java needs realSync()
-Summary: Added small delay to make sure that TextArea animation have finished
-Reviewed-by: anthony
-
---- openjdk.orig/jdk/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java	2010-01-27 14:45:28.000000000 +0100
-+++ openjdk/jdk/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java	2010-01-27 14:45:27.000000000 +0100
-@@ -56,6 +56,7 @@
-     TextArea textArea;
-     Robot robot;
-     final int desiredSelectionEnd = ('z'-'a'+1)*2;  // 52
-+    final static int SCROLL_DELAY = 100; // ms
- 
-     public void start () {
-         createObjects();
-@@ -126,6 +127,8 @@
- 
-             moveMouseBelowTextArea( tremble%2!=0 );
-             Util.waitForIdle( robot );
-+            // it is needed to add some small delay on Gnome
-+            waitUntilScrollIsPerformed(robot);
-         }
- 
-         robot.mouseRelease( MouseEvent.BUTTON1_MASK );
-@@ -141,9 +144,19 @@
-     void moveMouseBelowTextArea( boolean shift ) {
-         Dimension d = textArea.getSize();
-         Point l = textArea.getLocationOnScreen();
-+        int x = (int)(l.x+d.width*.5);
-         int y = (int)(l.y+d.height*1.5);
-         if( shift ) y+=15;
--        robot.mouseMove( (int)(l.x+d.width*.5), y );
-+        robot.mouseMove( x, y );
-+    }
-+
-+    void waitUntilScrollIsPerformed(Robot robot) {
-+        try {
-+            Thread.sleep( SCROLL_DELAY );
-+        }
-+        catch( Exception e ) {
-+            throw new RuntimeException( e );
-+        }
-     }
- 
-     void checkResults() {
-

--- a/patches/icedtea-6920172-location-relative-to-test.patch	Thu Jan 28 17:34:31 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-6920172: Regression test LocationRelativeToTest does not check frame position correctly.
-Summary: Testcase correction - check frame position against graphics environment's center point
-Reviewed-by: art
-
---- openjdk.orig/jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java	2010-01-25 17:42:52.000000000 +0100
-+++ openjdk/jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java	2010-01-25 17:42:52.000000000 +0100
-@@ -50,7 +50,8 @@
- 
-         GraphicsEnvironment ge =
-             GraphicsEnvironment.getLocalGraphicsEnvironment();
--        System.out.println("Center point: " + ge.getCenterPoint());
-+        Point centerPoint = ge.getCenterPoint();
-+        System.out.println("Center point: " + centerPoint);
-         GraphicsDevice[] gds = ge.getScreenDevices();
-         GraphicsDevice gdDef = ge.getDefaultScreenDevice();
-         GraphicsConfiguration gcDef =
-@@ -77,8 +78,7 @@
-             // second, check setLocationRelativeTo(invisible)
-             f.setLocationRelativeTo(f2);
-             Util.waitForIdle(r);
--            checkLocation(f, new Point(gcBounds.x + gcBounds.width / 2,
--                                       gcBounds.y + gcBounds.height / 2));
-+            checkLocation(f, centerPoint);
- 
-             // third, check setLocationRelativeTo(visible)
-             f2.setVisible(true);
-

--- a/patches/icedtea-6920172-turkish.patch	Thu Jan 28 17:34:31 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-6917663: test/java/security/Provider/Turkish.java not samevm friendly
-Summary: Added othervm flag to ensure that this test will run in isolation.
-Reviewed-by: alanb
-
---- openjdk.orig/jdk/test/java/security/Provider/Turkish.java        2010-01-18 11:02:18.000000000 +0100
-+++ openjdk/jdk/test/java/security/Provider/Turkish.java        2010-01-18 11:02:17.000000000 +0100
-@@ -25,6 +25,7 @@
-  * @test
-  * @bug 6220064
-  * @summary make sure everything works ok in the Turkish local (dotted/dotless i problem)
-+ * @run main/othervm Turkish
-  * @author Andreas Sterbenz
-  */
-

--- a/patches/icedtea-xml-encodinginfo.patch	Thu Jan 28 17:34:31 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
---- /dev/null	2009-03-12 10:05:36.797002285 -0400
-+++ openjdk/jdk/test/com/sun/org/apache/xml/internal/serializer/XMLStackOverflowBug.java	2009-03-13 16:10:05.000000000 -0400
-@@ -0,0 +1,58 @@
-+/*
-+ * Copyright 2009 Red Hat, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+ * CA 95054 USA or visit www.sun.com if you need additional information or
-+ * have any questions.
-+ */
-+
-+/*
-+ * @test
-+ * @summary Check that the xml encoder doesnt cause a StackOverflowError
-+ *
-+ */
-+
-+import java.io.IOException;
-+
-+import javax.xml.transform.TransformerConfigurationException;
-+import javax.xml.transform.TransformerFactory;
-+import javax.xml.transform.sax.SAXTransformerFactory;
-+import javax.xml.transform.sax.TransformerHandler;
-+import javax.xml.transform.stream.StreamResult;
-+
-+import org.xml.sax.SAXException;
-+
-+public class XMLStackOverflowBug {
-+
-+    public static void main(String[] args)
-+            throws TransformerConfigurationException, IOException, SAXException {
-+
-+        SAXTransformerFactory stf = (SAXTransformerFactory) TransformerFactory
-+                .newInstance();
-+        TransformerHandler ser = stf.newTransformerHandler();
-+        ser.setResult(new StreamResult(System.out));
-+
-+        StringBuilder sb = new StringBuilder(4096); 
-+        for (int x = 4096; x > 0; x--) {
-+            sb.append((char)x);
-+        }
-+        ser.characters(sb.toString().toCharArray(), 0, sb.toString().toCharArray().length);
-+        ser.endDocument();
-+    }
-+}
-+
-diff -Nru openjdk.orig/jaxp/build.properties openjdk/jaxp/build.properties
---- openjdk.orig/jaxp/build.properties	2009-12-08 17:42:33.000000000 +0000
-+++ openjdk/jaxp/build.properties	2009-12-08 17:43:03.000000000 +0000
-@@ -73,6 +73,9 @@
- # Where patches to drop bundle sources live
- patches.dir=patches
- 
-+# Patches to apply
-+jaxp_src.patch.list=xml-encodinginfo.patch
-+
- # Sanity information
- sanity.info= Sanity Settings:${line.separator}\
-   ant.home=${ant.home}${line.separator}\
-diff -Nru openjdk.orig/jaxp/patches/jaxp_src/xml-encodinginfo.patch openjdk/jaxp/patches/jaxp_src/xml-encodinginfo.patch
---- openjdk.orig/jaxp/patches/jaxp_src/xml-encodinginfo.patch	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jaxp/patches/jaxp_src/xml-encodinginfo.patch	2009-12-08 17:41:58.000000000 +0000
-@@ -0,0 +1,18 @@
-+diff -Nru src/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java src.new/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java
-+--- src/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java	2009-10-27 21:54:16.000000000 +0000
-++++ src.new/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java	2009-12-08 17:40:14.000000000 +0000
-+@@ -326,9 +326,11 @@
-+             m_last = last;
-+ 
-+             // Set the range of unicode values that this object
-+-            // explicitly manages
-+-            m_explFirst = codePoint;
-+-            m_explLast = codePoint + (RANGE-1);
-++            // explicitly manages. Align the explicitly managed values
-++            // to RANGE so multiple EncodingImpl objects dont manage the same 
-++            // values.
-++            m_explFirst = codePoint / RANGE * RANGE;
-++            m_explLast = m_explFirst + (RANGE-1);
-+ 
-+             m_encoding = encoding;
-+