From ptisnovs at icedtea.classpath.org  Tue Oct  1 00:13:28 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Tue, 01 Oct 2013 07:13:28 +0000
Subject: /hg/gfx-test: Ten new tests added into BitBltAffineIdentityTrans...
Message-ID: <hg.5ad19e7d210f.1380611608.-6248649288953172555@icedtea.classpath.org>

changeset 5ad19e7d210f in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=5ad19e7d210f
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue Oct 01 09:17:15 2013 +0200

	Ten new tests added into BitBltAffineIdentityTransformOp test suite.
	Fixed whitespaces/indentation in BitBltAffineRotateTransformOp.


diffstat:

 ChangeLog                                                       |    7 +
 src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java |  140 ++++++++++
 src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java   |    2 +-
 3 files changed, 148 insertions(+), 1 deletions(-)

diffs (176 lines):

diff -r 4702a3a2f69e -r 5ad19e7d210f ChangeLog
--- a/ChangeLog	Mon Sep 30 08:52:23 2013 +0200
+++ b/ChangeLog	Tue Oct 01 09:17:15 2013 +0200
@@ -1,3 +1,10 @@
+2013-10-01  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java:
+	Ten new tests added into BitBltAffineIdentityTransformOp test suite.
+	* src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java:
+	Fixed whitespaces/indentation in BitBltAffineRotateTransformOp.
+
 2013-09-30  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltUsingBgColor.java:
diff -r 4702a3a2f69e -r 5ad19e7d210f src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java
--- a/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java	Mon Sep 30 08:52:23 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java	Tue Oct 01 09:17:15 2013 +0200
@@ -1065,6 +1065,146 @@
         return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, IdentifyTranspormationOp3);
     }
 
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, IdentifyTranspormationOp4);
+    }
+
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, IdentifyTranspormationOp5);
+    }
+
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltEmptyBufferedImageTypeUshort555RGBIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltEmptyBufferedImageTypeUshort555RGB(image, graphics2d, IdentifyTranspormationOp6);
+    }
+
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, IdentifyTranspormationOp1);
+    }
+
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, IdentifyTranspormationOp2);
+    }
+
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, IdentifyTranspormationOp3);
+    }
+
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, IdentifyTranspormationOp4);
+    }
+
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, IdentifyTranspormationOp5);
+    }
+
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, IdentifyTranspormationOp6);
+    }
+
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltEmptyBufferedImageTypeUshortGrayIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, IdentifyTranspormationOp1);
+    }
+
     }
 
     /**
diff -r 4702a3a2f69e -r 5ad19e7d210f src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java
--- a/src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java	Mon Sep 30 08:52:23 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java	Tue Oct 01 09:17:15 2013 +0200
@@ -97,7 +97,7 @@
         for (int i = 0; i < NUM_ROTATIONS; i++)
         {
             RotateTransformation[i] = AffineTransform.getRotateInstance(ROTATIONS[i]);
-            
+
             RotateTransformationNearest1Op[i] = new AffineTransformOp(RotateTransformation[i], AffineTransformOp.TYPE_NEAREST_NEIGHBOR);
             RotateTransformationBilinear1Op[i] = new AffineTransformOp(RotateTransformation[i], AffineTransformOp.TYPE_BILINEAR);
             RotateTransformationBicubic1Op[i] = new AffineTransformOp(RotateTransformation[i], AffineTransformOp.TYPE_BICUBIC);

From ptisnovs at icedtea.classpath.org  Tue Oct  1 00:20:16 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Tue, 01 Oct 2013 07:20:16 +0000
Subject: /hg/rhino-tests: Added new test testCast (that checks Class.cast...
Message-ID: <hg.fbd651803006.1380612016.-6019694633368342460@icedtea.classpath.org>

changeset fbd651803006 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=fbd651803006
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue Oct 01 09:24:04 2013 +0200

	Added new test testCast (that checks Class.cast() method) into test
	test suite ScriptEngineClassTest.


diffstat:

 ChangeLog                                     |    6 +
 src/org/RhinoTests/ScriptEngineClassTest.java |  190 ++++++++++++++++++++++++++
 2 files changed, 196 insertions(+), 0 deletions(-)

diffs (213 lines):

diff -r 8055f8294f0e -r fbd651803006 ChangeLog
--- a/ChangeLog	Mon Sep 30 08:55:31 2013 +0200
+++ b/ChangeLog	Tue Oct 01 09:24:04 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-01  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/ScriptEngineClassTest.java:
+	Added new test testCast (that checks Class.cast() method) into test
+	test suite ScriptEngineClassTest.
+
 2013-09-30  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptEngineClassTest.java:
diff -r 8055f8294f0e -r fbd651803006 src/org/RhinoTests/ScriptEngineClassTest.java
--- a/src/org/RhinoTests/ScriptEngineClassTest.java	Mon Sep 30 08:55:31 2013 +0200
+++ b/src/org/RhinoTests/ScriptEngineClassTest.java	Tue Oct 01 09:24:04 2013 +0200
@@ -1431,6 +1431,196 @@
     }
 
     /**
+     * Test for method javax.script.ScriptEngine.getClass().cast()
+     */
+    protected void testCast() {
+        try {
+            this.scriptEngineClass.cast(new Object());
+            throw new AssertionError("Class.cast(new Object()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(new Object().getClass());
+            throw new AssertionError("Class.cast(new Object().getClass()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(new String());
+            throw new AssertionError("Class.cast(new String()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(Boolean.valueOf(true));
+            throw new AssertionError("Class.cast(Boolean.valueOf(true)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(Boolean.valueOf(false));
+            throw new AssertionError("Class.cast(Boolean.valueOf(false)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(Byte.valueOf((byte)42));
+            throw new AssertionError("Class.cast(Byte.valueOf((byte)42)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(Short.valueOf((short)42));
+            throw new AssertionError("Class.cast(Short.valueOf((short)42)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(Integer.valueOf(42));
+            throw new AssertionError("Class.cast(Integer.valueOf(42)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(Long.valueOf(42L));
+            throw new AssertionError("Class.cast(Long.valueOf(42L)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(Float.valueOf(42f));
+            throw new AssertionError("Class.cast(Float.valueOf(42f)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(Double.valueOf(42.));
+            throw new AssertionError("Class.cast(Double.valueOf(42.)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(new Throwable());
+            throw new AssertionError("Class.cast(new Throwable()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(new RuntimeException());
+            throw new AssertionError("Class.cast(new RuntimeException()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(new Error());
+            throw new AssertionError("Class.cast(new Error()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(new java.lang.String());
+            throw new AssertionError("Class.cast(new java.lang.String()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(new java.lang.StringBuffer());
+            throw new AssertionError("Class.cast(new java.lang.StringBuffer()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(new java.lang.StringBuilder());
+            throw new AssertionError("Class.cast(new java.lang.StringBuilder()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(java.awt.Color.black);
+            throw new AssertionError("Class.cast(java.awt.Color.black) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(new java.awt.Frame());
+            throw new AssertionError("Class.cast(new java.awt.Frame()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(new java.awt.Frame(new String()));
+            throw new AssertionError("Class.cast(new java.awt.Frame(new String())) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(new javax.swing.JLabel());
+            throw new AssertionError("Class.cast(new javax.swing.JLabel()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(new javax.swing.JLabel(new String()));
+            throw new AssertionError("Class.cast(new javax.swing.JLabel(new String())) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineClass.cast(new javax.swing.JPanel());
+            throw new AssertionError("Class.cast(new javax.swing.JPanel()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+    }
+
+    /**
      * Test for method javax.script.ScriptEngine.getClass().newInstance()
      */
     protected void testNewInstance() {

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  1 03:12:21 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 01 Oct 2013 10:12:21 +0000
Subject: [Bug 1571] New: JDK-7199196 : Incremental transfer is broken because
	of a typo
Message-ID: <bug-1571-30@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1571

            Bug ID: 1571
           Summary: JDK-7199196 : Incremental transfer is broken because
                    of a typo
    Classification: Unclassified
           Product: IcedTea
           Version: 7-hg
          Hardware: x86
               URL: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=719
                    9196
                OS: Linux
            Status: NEW
          Severity: normal
          Priority: P3
         Component: IcedTea
          Assignee: gnu.andrew at redhat.com
          Reporter: xerxes at zafena.se
                CC: unassigned at icedtea.classpath.org

This bug only trigger when pasting large amounts of data (256kb+) using the
clipboard

Steps to reproduce:
1. open clipboardtest.html in firefox
2. ctrl-a + crtl-c to copy content into clipboard
3. compile and run PasteTest.java reproducer from sun bug 7107490
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7107490

expected behaviour:
content is pasted to standard output

actual behaviour:
javac PasteTest.java
java PasteTest 
java.io.IOException: Owner failed to convert data
    at sun.awt.X11.XSelection.validateDataGetter(XSelection.java:444)
    at sun.awt.X11.XSelection.getData(XSelection.java:378)
    at sun.awt.X11.XClipboard.getClipboardData(XClipboard.java:120)
    at
sun.awt.datatransfer.ClipboardTransferable.fetchOneFlavor(ClipboardTransferable.java:118)
    at
sun.awt.datatransfer.ClipboardTransferable.<init>(ClipboardTransferable.java:97)
    at sun.awt.X11.XClipboard.getContents(XClipboard.java:106)
    at PasteTest.paste(PasteTest.java:10)
    at PasteTest.main(PasteTest.java:29)

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131001/8f68dbc2/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  1 03:13:41 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 01 Oct 2013 10:13:41 +0000
Subject: [Bug 1571] JDK-7199196 : Incremental transfer is broken because of a
	typo
In-Reply-To: <bug-1571-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1571-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1571-30-sXEeIccGLu@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1571

--- Comment #1 from Xerxes R?nby <xerxes at zafena.se> ---
Created attachment 945
  --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=945&action=edit
PasteTest.java reproducer from sun bug 7107490

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131001/64d2cba2/attachment-0001.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  1 03:14:58 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 01 Oct 2013 10:14:58 +0000
Subject: [Bug 1571] JDK-7199196 : Incremental transfer is broken because of a
	typo
In-Reply-To: <bug-1571-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1571-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1571-30-ALIu5SxLxg@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1571

--- Comment #2 from Xerxes R?nby <xerxes at zafena.se> ---
Created attachment 946
  --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=946&action=edit
jdk patch based on sun bug 7107490

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131001/8235af5b/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  1 03:16:51 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 01 Oct 2013 10:16:51 +0000
Subject: [Bug 1571] JDK-7199196 : Incremental transfer is broken because of a
	typo
In-Reply-To: <bug-1571-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1571-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1571-30-Qi92OEizKV@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1571

--- Comment #3 from Xerxes R?nby <xerxes at zafena.se> ---
(In reply to comment #2)
> Created attachment 946 [details]
> jdk patch based on sun bug 7107490

clarification: the patch is directly based on the comment from:
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7199196


These two sun bugs are duplicates of the same issue:
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7199196
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7107490

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131001/bbc8a91b/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  1 03:22:10 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 01 Oct 2013 10:22:10 +0000
Subject: [Bug 1571] JDK-7199196 : Incremental transfer is broken because of a
	typo
In-Reply-To: <bug-1571-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1571-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1571-30-V3jqp4fvjt@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1571

--- Comment #4 from Xerxes R?nby <xerxes at zafena.se> ---
Created attachment 947
  --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=947&action=edit
clipboardtest.html.tar.gz

tar.gz containing clipboardtest.html for use with the PasteTest reproducer

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131001/130ed12e/attachment.html 

From yasu at ysfactory.dip.jp  Tue Oct  1 07:51:43 2013
From: yasu at ysfactory.dip.jp (Yasumasa Suenaga)
Date: Tue, 01 Oct 2013 23:51:43 +0900
Subject: jstack.stp should be adapted CR#7172967
Message-ID: <524AE17F.1000805@ysfactory.dip.jp>

Hi all,

When I use jstack.stp in java-1.7.0-openjdk-devel-1.7.0.60-2.4.2.5.fc19.x86_64.rpm
on Fedora19, stap command does not work.
At "CR#7172967: Eliminate constMethod's _method backpointer to methodOop.", handling
of constantPoolOop is changed. Thus jstack.stp should be adapted this CR.

I've made a patch for this issue and attached to this email.
Can I contribute this patch for IcedTea7?


BTW, I am committer of HeapStats which is hosted in IcedTea.
If someone reviewes this patch, can I push this to repository?


P.S.
TapSet in JDK7 which is provided from Fedora is too old.
I have to apply this patch and another one as following:
http://icedtea.classpath.org/hg/icedtea7/rev/069e50dcd06a

I hope that Fedora fetches new tapset...



Thanks,

Yasumasa
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: jstack.patch
Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131001/f97736dc/jstack.patch 

From omajid at redhat.com  Tue Oct  1 08:37:02 2013
From: omajid at redhat.com (Omair Majid)
Date: Tue, 01 Oct 2013 11:37:02 -0400
Subject: /hg/icedtea-web: Introduced logging bottleneck
In-Reply-To: <524A66B6.4080503@redhat.com>
References: <hg.a817bb6d12a6.1380127844.8643924302249223276@icedtea.classpath.org>
	<5249CA9E.9060004@redhat.com> <524A66B6.4080503@redhat.com>
Message-ID: <524AEC1E.6030107@redhat.com>

On 10/01/2013 02:07 AM, Jiri Vanek wrote:
> On 09/30/2013 09:01 PM, Andrew Azores wrote:
>> On 09/25/2013 12:50 PM, jvanek at icedtea.classpath.org wrote:
>>> changeset a817bb6d12a6 in /hg/icedtea-web
>>> details:
>>> http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=a817bb6d12a6
>>>
>>> author: Jiri Vanek <jvanek at redhat.com>
>>> date: Wed Sep 25 18:50:18 2013 +0200
>>>
>>> Introduced logging bottleneck
>>>
>> As noted by Omair and I in the IRC channel today, this patch makes
>> "make check" rather noisy. I also mentioned that a fair number of
>> reproducers are broken by this. The common trait to most/all of them
>> is that they expect stdout to be a particular (very short, common case
>> being <= 2 chars) length, which it is because messages are now coming
>> through stdout which were previously on stderr. For example,
>> CreateClassLoaderTest.CreateClassLoaderLunch1 fails because "netx:
>> Launch Error: Could not launch JNLP file. ( (access denied
>> ("java.lang.RuntimePermission" "createClassLoader"))) " is printed to
>> stdout instead, and the test includes a check that pr.stdout has
>> length <= 2.
> 
> Both those failures are cuased by "enable logging" == true (by other
> words works for me).  However Omiar reported hat he have cleaned the
> configuration.
> 
> Loging enabled == environment variable || -verbose || deployment property
> 

Okay, but I did not change the configuration (whatever it was) before
the patch vs after. Yet, the output was not so noisy before; it is now.
Given the only change is this patch, something is not quite right with it.

Is there anything I can do to narrow down the cause?

Thanks,
Omair

-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681

From aazores at redhat.com  Tue Oct  1 08:45:26 2013
From: aazores at redhat.com (Andrew Azores)
Date: Tue, 01 Oct 2013 11:45:26 -0400
Subject: [rfc][icedtea-web] Fix regression in recent PR1204 patch
Message-ID: <524AEE16.1040402@redhat.com>

Hi,

I just caught a regression in my own patch. The "path" portion of the 
URI was already percent-encoded seeing as it was obtained with 
URL#getPath(). This was then fed back into the constructor of a new URI, 
and the .toURL() result of this URI was returned. This process repeated 
the percent-encoding, so eg spaces would become "%2520" rather than 
simply "%20".

Changelog:
* netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java: 
(getVersionedUrl) fix regression in applying percent-encoding twice


Thanks,

-- 
Andrew A

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PR1204_regression.patch
Type: text/x-patch
Size: 1532 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131001/b8938b1b/PR1204_regression.patch 

From omajid at icedtea.classpath.org  Tue Oct  1 08:51:52 2013
From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org)
Date: Tue, 01 Oct 2013 15:51:52 +0000
Subject: /hg/icedtea-web: Add unit tests for PluginProxySelector
Message-ID: <hg.14d2babbf9fd.1380642712.8643924302249223276@icedtea.classpath.org>

changeset 14d2babbf9fd in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=14d2babbf9fd
author: Omair Majid <omajid at redhat.com>
date: Tue Oct 01 11:51:00 2013 -0400

	Add unit tests for PluginProxySelector

	There are no functional changes to PluginProxySelector itself. Refactor
	minimial code to make it possible to unit test. Mark suspicious
	behaviour with a FIXME or TODO.


diffstat:

 ChangeLog                                                 |    8 +
 plugin/icedteanp/java/sun/applet/PluginProxySelector.java |    7 +-
 tests/netx/unit/sun/applet/PluginProxySelectorTest.java   |  195 ++++++++++++++
 3 files changed, 209 insertions(+), 1 deletions(-)

diffs (238 lines):

diff -r 654630a490cb -r 14d2babbf9fd ChangeLog
--- a/ChangeLog	Thu Sep 26 10:25:33 2013 -0400
+++ b/ChangeLog	Tue Oct 01 11:51:00 2013 -0400
@@ -1,3 +1,11 @@
+2013-10-01  Omair Majid  <omajid at redhat.com>
+
+	* plugin/icedteanp/java/sun/applet/PluginProxySelector.java
+	(getFromBrowser): Move call to
+	PluginAppletViewer.requestPluginProxyInfo into new method.
+	(getProxyFromRemoteCallToBrowser): New method.
+	* tests/netx/unit/sun/applet/PluginProxySelectorTest.java: New file.
+
 2013-09-26  Andrew Azores  <aazores at redhat.com>
 
 	Fix for PR1204. Absolute paths in resource URLs are correctly handled when
diff -r 654630a490cb -r 14d2babbf9fd plugin/icedteanp/java/sun/applet/PluginProxySelector.java
--- a/plugin/icedteanp/java/sun/applet/PluginProxySelector.java	Thu Sep 26 10:25:33 2013 -0400
+++ b/plugin/icedteanp/java/sun/applet/PluginProxySelector.java	Tue Oct 01 11:51:00 2013 -0400
@@ -85,7 +85,7 @@
 
         // Nothing usable in cache. Fetch info from browser
         Proxy proxy = Proxy.NO_PROXY;
-        Object o = PluginAppletViewer.requestPluginProxyInfo(uri);
+        Object o = getProxyFromRemoteCallToBrowser(uri);
 
         // If the browser returned anything, try to parse it. If anything in the try block fails, the fallback is direct connection
         try {
@@ -118,6 +118,11 @@
         return proxyList;
     }
 
+    /** For tests to override */
+    protected Object getProxyFromRemoteCallToBrowser(URI uri) {
+        return PluginAppletViewer.requestPluginProxyInfo(uri);
+    }
+
     /**
      * Checks to see if proxy information is already cached.
      *
diff -r 654630a490cb -r 14d2babbf9fd tests/netx/unit/sun/applet/PluginProxySelectorTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/netx/unit/sun/applet/PluginProxySelectorTest.java	Tue Oct 01 11:51:00 2013 -0400
@@ -0,0 +1,195 @@
+/* PluginProxySelectorTest
+   Copyright (C) 2013  Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package sun.applet;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.Proxy.Type;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
+import net.sourceforge.jnlp.runtime.JNLPProxySelector;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class PluginProxySelectorTest {
+
+    private static class TestSelector extends PluginProxySelector {
+
+        private URI browserResponse = null;
+        private int remoteCallCount = 0;
+
+        public TestSelector(DeploymentConfiguration config) {
+            super(config);
+        }
+
+        @Override
+        protected Object getProxyFromRemoteCallToBrowser(URI uri) {
+            remoteCallCount++;
+            return browserResponse;
+        }
+
+        public void setBrowserResponse(URI response) {
+            browserResponse = response;
+        }
+
+        public int getRemoteCallCount() {
+            return remoteCallCount;
+        }
+    }
+
+    private String PROXY_HOST = "localhost";
+    private int PROXY_PORT = 42;
+
+    private DeploymentConfiguration config;
+    private TestSelector proxySelector;
+
+    @Before
+    public void setUp() {
+        config = new DeploymentConfiguration();
+        config.setProperty(DeploymentConfiguration.KEY_PROXY_TYPE, String.valueOf(JNLPProxySelector.PROXY_TYPE_BROWSER));
+
+        proxySelector = new TestSelector(config);
+    }
+
+    @Test
+    public void testNullResponseFromBrowserMeansNoProxy() throws URISyntaxException {
+        List<Proxy> result = proxySelector.select(new URI("http://example.org"));
+
+        assertNotNull(result);
+        assertEquals(1, result.size());
+        assertEquals(Proxy.NO_PROXY, result.get(0));
+    }
+
+    @Test
+    public void testUnrecognizedURIMeansNoProxy() throws URISyntaxException {
+        TestSelector proxySelector = new TestSelector(config);
+
+        proxySelector.setBrowserResponse(new URI("http://" + PROXY_HOST + ":" + PROXY_PORT));
+
+        List<Proxy> result = proxySelector.select(new URI("foo://example.org"));
+
+        assertNotNull(result);
+        assertEquals(1, result.size());
+        assertEquals(Proxy.NO_PROXY, result.get(0));
+    }
+
+    @Test
+    public void testHttpResponseFromBrowser() throws URISyntaxException {
+        proxySelector.setBrowserResponse(new URI("http://" + PROXY_HOST + ":" + PROXY_PORT));
+
+        List<Proxy> result = proxySelector.select(new URI("http://example.org"));
+
+        Proxy expectedProxy = new Proxy(Type.HTTP, new InetSocketAddress(PROXY_HOST, PROXY_PORT));
+
+        assertNotNull(result);
+        assertEquals(1, result.size());
+        assertEquals(expectedProxy, result.get(0));
+    }
+
+    @Test
+    public void testHttpsResponseFromBrowser() throws URISyntaxException {
+        proxySelector.setBrowserResponse(new URI("https://" + PROXY_HOST + ":" + PROXY_PORT));
+
+        List<Proxy> result = proxySelector.select(new URI("https://example.org"));
+
+        // FIXME if a browser returns a https URI, that does not mean socks
+        Proxy expectedProxy = new Proxy(Type.SOCKS, new InetSocketAddress(PROXY_HOST, PROXY_PORT));
+
+        assertNotNull(result);
+        assertEquals(1, result.size());
+        assertEquals(expectedProxy, result.get(0));
+    }
+
+    @Test
+    public void testFtpResponseFromBrowser() throws URISyntaxException {
+        proxySelector.setBrowserResponse(new URI("ftp://" + PROXY_HOST + ":" + PROXY_PORT));
+
+        List<Proxy> result = proxySelector.select(new URI("ftp://example.org"));
+
+        // FIXME if a browser returns a ftp URI, that doesn't mean socks
+        Proxy expectedProxy = new Proxy(Type.SOCKS, new InetSocketAddress(PROXY_HOST, PROXY_PORT));
+
+        assertNotNull(result);
+        assertEquals(1, result.size());
+        assertEquals(expectedProxy, result.get(0));
+    }
+
+    @Test
+    public void testSocketResponseFromBrowser() throws URISyntaxException {
+        TestSelector proxySelector = new TestSelector(config);
+
+        // TODO does firefox actually return a "socks" URI? or a "socket" uri?
+        proxySelector.setBrowserResponse(new URI("socks://" + PROXY_HOST + ":" + PROXY_PORT));
+
+        List<Proxy> result = proxySelector.select(new URI("socket://example.org"));
+
+        Proxy expectedProxy = new Proxy(Type.SOCKS, new InetSocketAddress(PROXY_HOST, PROXY_PORT));
+
+        assertNotNull(result);
+        assertEquals(1, result.size());
+        assertEquals(expectedProxy, result.get(0));
+    }
+
+    @Test
+    public void testCacheIsUsedOnRepeatedCalls() throws URISyntaxException {
+        proxySelector.setBrowserResponse(new URI("http://" + PROXY_HOST + ":" + PROXY_PORT));
+
+        proxySelector.select(new URI("http://example.org"));
+        proxySelector.select(new URI("http://example.org"));
+
+        assertEquals(1, proxySelector.getRemoteCallCount());
+    }
+
+    @Test
+    public void testCacheIsNotUsedOnDifferentCalls() throws URISyntaxException {
+        proxySelector.setBrowserResponse(new URI("http://" + PROXY_HOST + ":" + PROXY_PORT));
+
+        proxySelector.select(new URI("http://foo.example.org"));
+        proxySelector.select(new URI("http://bar.example.org"));
+
+        assertEquals(2, proxySelector.getRemoteCallCount());
+    }
+
+}

From jvanek at redhat.com  Tue Oct  1 08:54:41 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Tue, 01 Oct 2013 17:54:41 +0200
Subject: jstack.stp should be adapted CR#7172967
In-Reply-To: <524AE17F.1000805@ysfactory.dip.jp>
References: <524AE17F.1000805@ysfactory.dip.jp>
Message-ID: <524AF041.9090200@redhat.com>

It would be nice if upstream of jstack do sometimes some release :)
I would be happy to update to it.

j.

On 10/01/2013 04:51 PM, Yasumasa Suenaga wrote:
> Hi all,
>
> When I use jstack.stp in java-1.7.0-openjdk-devel-1.7.0.60-2.4.2.5.fc19.x86_64.rpm
> on Fedora19, stap command does not work.
> At "CR#7172967: Eliminate constMethod's _method backpointer to methodOop.", handling
> of constantPoolOop is changed. Thus jstack.stp should be adapted this CR.
>
> I've made a patch for this issue and attached to this email.
> Can I contribute this patch for IcedTea7?
>
>
> BTW, I am committer of HeapStats which is hosted in IcedTea.
> If someone reviewes this patch, can I push this to repository?
>
>
> P.S.
> TapSet in JDK7 which is provided from Fedora is too old.
> I have to apply this patch and another one as following:
> http://icedtea.classpath.org/hg/icedtea7/rev/069e50dcd06a
>
> I hope that Fedora fetches new tapset...
>
>
>
> Thanks,
>
> Yasumasa


From omajid at redhat.com  Tue Oct  1 08:55:40 2013
From: omajid at redhat.com (Omair Majid)
Date: Tue, 01 Oct 2013 11:55:40 -0400
Subject: [icedtea-web] RFC: Unit tests for BrowserAwareProxySelector
In-Reply-To: <5249AA38.7060001@redhat.com>
References: <5241DDEF.2080409@redhat.com> <52461597.8050703@redhat.com>
	<5249AA38.7060001@redhat.com>
Message-ID: <524AF07C.9010008@redhat.com>

On 09/30/2013 12:43 PM, Andrew Azores wrote:
> On 09/27/2013 07:32 PM, Omair Majid wrote:
>> On 09/24/2013 02:46 PM, Omair Majid wrote:
>>> Hi,
>>>
>>> The attached patch adds unit tests for BrowserAwareProxySelector and
>>> makes minor changes to make testing it easier.
>>>
>>> It also removes duplicate logic of selecting a host and port depending
>>> on the protocol into JNLPProxySelector.getFromArguments. The semantics
>>> of 'sameProxy' are different between BrowserAwareProxySelector and
>>> JNLPProxy selector; the socks proxy is included in firefox [1].
>>>
>> Ping. Can anyone review this?
> 
> Different filename in the license header of
> BrowserAwareProxySelectorTest.java.
> 

> Anyway, like I said I don't insist on this refactoring, because the
> tests are still readable and make clear sense. The class is just a lot
> longer in LoC than it probably has to be :) your call on bothering with
> refactor or not. Just fix the filename in that license header before
> push at least though.

Thanks for the suggestions. Does the attached patch look okay?

Thanks,
Omair

-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681
-------------- next part --------------
A non-text attachment was scrubbed...
Name: browser-aware-proxy-tests-02.patch
Type: text/x-patch
Size: 17760 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131001/cb200409/browser-aware-proxy-tests-02.patch 

From omajid at redhat.com  Tue Oct  1 09:01:31 2013
From: omajid at redhat.com (Omair Majid)
Date: Tue, 01 Oct 2013 12:01:31 -0400
Subject: [rfc][icedtea-web] Fix regression in recent PR1204 patch
In-Reply-To: <524AEE16.1040402@redhat.com>
References: <524AEE16.1040402@redhat.com>
Message-ID: <524AF1DB.8070403@redhat.com>

On 10/01/2013 11:45 AM, Andrew Azores wrote:
> I just caught a regression in my own patch. The "path" portion of the
> URI was already percent-encoded seeing as it was obtained with
> URL#getPath(). This was then fed back into the constructor of a new URI,
> and the .toURL() result of this URI was returned. This process repeated
> the percent-encoding, so eg spaces would become "%2520" rather than
> simply "%20".

Could you include a unit test? Otherwise looks good to me.

Cheers,
Omair

-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681

From aazores at redhat.com  Tue Oct  1 10:02:24 2013
From: aazores at redhat.com (Andrew Azores)
Date: Tue, 01 Oct 2013 13:02:24 -0400
Subject: [icedtea-web] RFC: Unit tests for BrowserAwareProxySelector
In-Reply-To: <524AF07C.9010008@redhat.com>
References: <5241DDEF.2080409@redhat.com> <52461597.8050703@redhat.com>
	<5249AA38.7060001@redhat.com> <524AF07C.9010008@redhat.com>
Message-ID: <524B0020.1020404@redhat.com>

On 10/01/2013 11:55 AM, Omair Majid wrote:
> On 09/30/2013 12:43 PM, Andrew Azores wrote:
>> On 09/27/2013 07:32 PM, Omair Majid wrote:
>>> On 09/24/2013 02:46 PM, Omair Majid wrote:
>>>> Hi,
>>>>
>>>> The attached patch adds unit tests for BrowserAwareProxySelector and
>>>> makes minor changes to make testing it easier.
>>>>
>>>> It also removes duplicate logic of selecting a host and port depending
>>>> on the protocol into JNLPProxySelector.getFromArguments. The semantics
>>>> of 'sameProxy' are different between BrowserAwareProxySelector and
>>>> JNLPProxy selector; the socks proxy is included in firefox [1].
>>>>
>>> Ping. Can anyone review this?
>> Different filename in the license header of
>> BrowserAwareProxySelectorTest.java.
>>
>> Anyway, like I said I don't insist on this refactoring, because the
>> tests are still readable and make clear sense. The class is just a lot
>> longer in LoC than it probably has to be :) your call on bothering with
>> refactor or not. Just fix the filename in that license header before
>> push at least though.
> Thanks for the suggestions. Does the attached patch look okay?
>
> Thanks,
> Omair
>

Looks good to me.

Thanks,

-- 
Andrew A


From bugzilla-daemon at icedtea.classpath.org  Tue Oct  1 13:23:39 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 01 Oct 2013 20:23:39 +0000
Subject: [Bug 1573] New: jnlp_embedded does not work without jnlp_href
Message-ID: <bug-1573-30@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1573

            Bug ID: 1573
           Summary: jnlp_embedded does not work without jnlp_href
    Classification: Unclassified
           Product: IcedTea-Web
           Version: unspecified
          Hardware: x86_64
                OS: Linux
            Status: NEW
          Severity: normal
          Priority: P3
         Component: Plugin
          Assignee: dbhole at redhat.com
          Reporter: inxonic+icedtea at googlemail.com
                CC: unassigned at icedtea.classpath.org

Created attachment 948
  --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=948&action=edit
Error Message

A web page containing jnlp_embedded does not work if jnlp_href isn't also
specified.

According to http://bugs.sun.com/view_bug.do?bug_id=6990877 jnlp_href is
optional if jnlp_embedded has been specified.

Reproducer: http://www.stellwerksim.de/verify.php (I'm not the author of this
site)

Versions: At least 1.4 (Fedora) and latest developement.

I've tried to fix it with a patch. Hope I didn't break other things :)

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131001/71029acb/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  1 13:25:14 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 01 Oct 2013 20:25:14 +0000
Subject: [Bug 1573] jnlp_embedded does not work without jnlp_href
In-Reply-To: <bug-1573-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1573-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1573-30-Ny2PvmxjGe@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1573

--- Comment #1 from Daniel <inxonic+icedtea at googlemail.com> ---
Created attachment 949
  --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=949&action=edit
Patch

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131001/014b2309/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  1 13:31:38 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 01 Oct 2013 20:31:38 +0000
Subject: [Bug 1573] jnlp_embedded does not work without jnlp_href
In-Reply-To: <bug-1573-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1573-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1573-30-nChiYsoyXr@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1573

Deepak Bhole <dbhole at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Assignee|dbhole at redhat.com           |jvanek at redhat.com

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131001/9b84ba87/attachment.html 

From gitne at gmx.de  Tue Oct  1 13:51:56 2013
From: gitne at gmx.de (Jacob Wisor)
Date: Tue, 01 Oct 2013 22:51:56 +0200
Subject: [rfc][icedtea-web] Cache viewer cleanup
In-Reply-To: <523B4687.8070505@gmx.de>
References: <201307302347.r6UNl2x1011963@mail-web03.excite.co.jp>	<5229ACDB.7030102@redhat.com>
	<52364E27.3010300@gmx.de>	<523713B7.6080607@redhat.com>
	<523B4687.8070505@gmx.de>
Message-ID: <524B35EC.3030902@gmx.de>

Hello,

> Jiri Vanek wrote:
>> On 09/16/2013 02:17 AM, Jakob Wisor wrote:
>>> Hello there!
>>>
>>> I have checked and corrected the code's formatting, and followed
>>> Jiri's reasonable advice.
>>>
>>> Jiri Vanek wrote:
>>>> On 07/31/2013 01:47 AM, Jacob Wisor wrote:
>>>>> Hello,
>>>>>
>>>>> * Added closing of cache viewer by ESC key
>>>>> * Added proper dis-/enabling of cache viewer's buttons
>>>>> * Added busy mouse cursor indicator when populating the cache viewer
>>>>>
>>>>> Everything is done on purpose on the AWT thread as before. Although
>>>>> I am personally not in favor
>>>>> of anonymous classes, I have tried to stick to the prevalent coding
>>>>> style.
>>>>>
>>>>> Unfortunately, I was unable to test the cache viewer's behavior
>>>>> because I do not know how to put
>>>>> synthetic cache entries into the cache. Can anyone help me with
>>>>> that? What does a the cache look
>>>>> like when filled with resources? Is there any index file that keeps
>>>>> track of the cache?
>>
>> As this is gui change only, it shouldbe ok without test.
>> However cache is set of jars and jnlp files saved in
>> url-like-filestrucutre
>>
>> eg http:\\my.domain\myApp.jnlp with myJAr in "." codebase will be
>> saved like
>> cache/http/my/domain/myApp.jnlp
>> cache/http/my/domain/myJar.jnlp
>>
>> and yes, there is index file in tom cache directory
>>
>> I have some memorry that there are already tests for it - most simple
>> case how to import jar into cache is to lunch javaws ;)
>>
>>>>>
>> ...,snip...
>>>> Those should be in finally block
>>>>> +        parent.getContentPane().setCursor(Cursor.getDefaultCursor());
>>>
>>> Done. Please check whether I have done it correctly or the way you
>>> have meant.
>>>
>>>>>       }
>>
>> Thank you.
 >>>> [...]
>>>> Please mention both Cache viewer cleanup and  CerViewr viewer
>>>> cleanup in news.
>>>
>>> Will do but they are separate patches.
>>>
>>> Happy reviewing!
>>
>> For _this_ patch, the NEWS line should be attached explicitly.
>> For CerViewr the separate patch is ok.
>>
>>
>> No more review needed. With above fixed, ok to head (and 1.4 if wonted)
>
> Okay! :-) Thank you for reviewing. But, I want to test it at least a
> little bit. Now, that I have written a few JNLP application and applet
> tests I have kinda also found the time and leisure to really do it. ;-)
> It's better do it once before feeling sorry afterwards.

After throughly testing this patch I think it is ready to be pushed.
Please review the NEWS and ChangeLog sections. I have also decided to 
include the new NonEditableTableModel class with this patch, since this 
patch can also make use of it. It is also going to be ready for the 
upcoming certificate viewer patch.

Regards,
Jacob
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CacheViewer.patch
Type: text/x-patch
Size: 35372 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131001/6e227238/CacheViewer-0001.patch 

From aazores at redhat.com  Tue Oct  1 14:16:29 2013
From: aazores at redhat.com (Andrew Azores)
Date: Tue, 01 Oct 2013 17:16:29 -0400
Subject: [rfc][icedtea-web] Fix regression in recent PR1204 patch
In-Reply-To: <524AF1DB.8070403@redhat.com>
References: <524AEE16.1040402@redhat.com> <524AF1DB.8070403@redhat.com>
Message-ID: <524B3BAD.9040303@redhat.com>

On 10/01/2013 12:01 PM, Omair Majid wrote:
> On 10/01/2013 11:45 AM, Andrew Azores wrote:
>> I just caught a regression in my own patch. The "path" portion of the
>> URI was already percent-encoded seeing as it was obtained with
>> URL#getPath(). This was then fed back into the constructor of a new URI,
>> and the .toURL() result of this URI was returned. This process repeated
>> the percent-encoding, so eg spaces would become "%2520" rather than
>> simply "%20".
> Could you include a unit test? Otherwise looks good to me.
>
> Cheers,
> Omair
>

Sure, added three new tests to ensure correct percent-encoding 
behaviour. The SpacesAreEverywhere(Signed) reproducer(s) also catch this 
regression, which is how I noticed it to begin with. I also went ahead 
and refactored the existing unit tests a bit.

I had to add some simple input validation to the getVersionedUrl call. I 
realized that the older version of this method was not actually dealing 
with percent encoding on its own - if you passed it an invalid URL 
containing a space, it would happily accept this, work with it, and 
return to you another invalid URL containing the same spaces. This seems 
incorrect at first but I didn't want to go about changing the behaviour 
of this method. If the method started handling percent-encoding, then it 
could be passing back up URLs that actually do point to valid resources, 
when in fact that isn't *really* the same URL it was asked to work with. 
Rather than causing an explicit failure on invalid input, I kept the 
behaviour the same, so that the invalid URL is simply returned, and the 
same later point of failure should still occur as it does now. Of the 
two new test cases, two of them contain spaces. The return value of the 
method on these inputs is simply the same URL that was given in the 
first place, as this is what the method used to do. The other new test 
case ensures that a properly-encoded URL is not mistakenly re-encoded.

On another note, I have a question about this method now that I'm 
looking back into it again. It's only called from two places in the 
entire codebase - one place is these unit tests. The other place is 
ResourceUrlCreator#getUrls(). getUrls() and getVersionedUrl() are both 
instance methods of the class. When getUrls calls getVersionedUrl, it 
passes it a Resource reference - but this Resource is also a field of 
the instance. So, why does getVersionedUrl take a parameter at all if 
the same reference is already available to it? Or, on the other hand, 
getVersionedUrl doesn't care at all about its containing instance - the 
only information it needs to perform its duty is a Resource reference. 
So then getVersionedUrl can be made static and passed the Resource 
reference. I don't understand that there's any reason for it to be in 
this in-between state. Anyone seeing something I'm not?

Thanks,

-- 
Andrew A

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PR1204_regression.patch
Type: text/x-patch
Size: 10673 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131001/4df84ff6/PR1204_regression.patch 

From yasu at ysfactory.dip.jp  Tue Oct  1 15:14:28 2013
From: yasu at ysfactory.dip.jp (Yasumasa Suenaga)
Date: Wed, 02 Oct 2013 07:14:28 +0900
Subject: jstack.stp should be adapted CR#7172967
In-Reply-To: <524AF041.9090200@redhat.com>
References: <524AE17F.1000805@ysfactory.dip.jp> <524AF041.9090200@redhat.com>
Message-ID: <524B4944.60404@ysfactory.dip.jp>

Thanks! I will push it later.


On 2013/10/02 0:54, Jiri Vanek wrote:
> It would be nice if upstream of jstack do sometimes some release :)
> I would be happy to update to it.
>
> j.
>
> On 10/01/2013 04:51 PM, Yasumasa Suenaga wrote:
>> Hi all,
>>
>> When I use jstack.stp in java-1.7.0-openjdk-devel-1.7.0.60-2.4.2.5.fc19.x86_64.rpm
>> on Fedora19, stap command does not work.
>> At "CR#7172967: Eliminate constMethod's _method backpointer to methodOop.", handling
>> of constantPoolOop is changed. Thus jstack.stp should be adapted this CR.
>>
>> I've made a patch for this issue and attached to this email.
>> Can I contribute this patch for IcedTea7?
>>
>>
>> BTW, I am committer of HeapStats which is hosted in IcedTea.
>> If someone reviewes this patch, can I push this to repository?
>>
>>
>> P.S.
>> TapSet in JDK7 which is provided from Fedora is too old.
>> I have to apply this patch and another one as following:
>> http://icedtea.classpath.org/hg/icedtea7/rev/069e50dcd06a
>>
>> I hope that Fedora fetches new tapset...
>>
>>
>>
>> Thanks,
>>
>> Yasumasa
>


From bugzilla-daemon at icedtea.classpath.org  Tue Oct  1 18:10:27 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 02 Oct 2013 01:10:27 +0000
Subject: [Bug 1531] Idk
In-Reply-To: <bug-1531-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1531-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1531-30-xTNCBrYt67@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1531

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|---                         |WONTFIX

--- Comment #1 from Andrew John Hughes <gnu.andrew at redhat.com> ---
2.1.1 is no longer supported.  Please reopen with information on how to
reproduce this issue if you can do so on either 2.3.x or 2.4.x.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131002/6d424a28/attachment.html 

From gnu.andrew at redhat.com  Tue Oct  1 18:00:57 2013
From: gnu.andrew at redhat.com (Andrew Hughes)
Date: Tue, 1 Oct 2013 21:00:57 -0400 (EDT)
Subject: jstack.stp should be adapted CR#7172967
In-Reply-To: <524AE17F.1000805@ysfactory.dip.jp>
References: <524AE17F.1000805@ysfactory.dip.jp>
Message-ID: <1264610312.31455.1380675657205.JavaMail.root@redhat.com>

----- Original Message -----
> Hi all,
> 
> When I use jstack.stp in
> java-1.7.0-openjdk-devel-1.7.0.60-2.4.2.5.fc19.x86_64.rpm
> on Fedora19, stap command does not work.
> At "CR#7172967: Eliminate constMethod's _method backpointer to methodOop.",
> handling
> of constantPoolOop is changed. Thus jstack.stp should be adapted this CR.
> 
> I've made a patch for this issue and attached to this email.
> Can I contribute this patch for IcedTea7?
> 
> 
> BTW, I am committer of HeapStats which is hosted in IcedTea.
> If someone reviewes this patch, can I push this to repository?

Fine by me.  Feel free to push as you did before.
> Thanks,
> 
> Yasumasa
> 

Thanks,
-- 
Andrew :)

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

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07


From omajid at icedtea.classpath.org  Tue Oct  1 20:44:49 2013
From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org)
Date: Wed, 02 Oct 2013 03:44:49 +0000
Subject: /hg/icedtea-web: Unit tests for BrowserAwareProxySelector
Message-ID: <hg.c4476a810053.1380685489.8643924302249223276@icedtea.classpath.org>

changeset c4476a810053 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c4476a810053
author: Omair Majid <omajid at redhat.com>
date: Tue Oct 01 23:43:31 2013 -0400

	Unit tests for BrowserAwareProxySelector

	Also move duplicate code for selecting a host and port depending on the
	protocol into JNLPProxySelector.getFromArguments. The semantics of
	'sameProxy' are different between BrowserAwareProxySelector and
	JNLPProxySelector; the socks proxy is included in firefox.


diffstat:

 ChangeLog                                                                       |   18 +
 netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java                |   55 +-
 netx/net/sourceforge/jnlp/runtime/JNLPProxySelector.java                        |   36 +-
 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java                              |    4 +-
 tests/netx/unit/net/sourceforge/jnlp/browser/BrowserAwareProxySelectorTest.java |  227 ++++++++++
 5 files changed, 297 insertions(+), 43 deletions(-)

diffs (435 lines):

diff -r 14d2babbf9fd -r c4476a810053 ChangeLog
--- a/ChangeLog	Tue Oct 01 11:51:00 2013 -0400
+++ b/ChangeLog	Tue Oct 01 23:43:31 2013 -0400
@@ -1,3 +1,21 @@
+2013-10-01  Omair Majid  <omajid at redhat.com>
+
+	* netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java
+	(BrowserAwareProxySelector): Split off browser-specific work into ..
+	(initialize): New method.
+	(initFromBrowserConfig): Delegate reading browser preferences to ..
+	(parseBrowserPreferences): New method.
+	(getFromBrowserConfiguration): Delegate to
+	JNLPProxySelector.getFromArguments.
+	* netx/net/sourceforge/jnlp/runtime/JNLPProxySelector.java
+	(getFromConfiguration): Move logic into getFromArguments; delegate to it.
+	(getFromArguments): Renamed from getFromConfiguration. Handle optionally
+	using the http host/port for socket addresses.
+	* netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
+	(initialize): Call BrowserAwareProxySelector.initialize.
+	* tests/netx/unit/net/sourceforge/jnlp/browser/BrowserAwareProxySelectorTest.java:
+	New file.
+
 2013-10-01  Omair Majid  <omajid at redhat.com>
 
 	* plugin/icedteanp/java/sun/applet/PluginProxySelector.java
diff -r 14d2babbf9fd -r c4476a810053 netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java
--- a/netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java	Tue Oct 01 11:51:00 2013 -0400
+++ b/netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java	Tue Oct 01 23:43:31 2013 -0400
@@ -40,13 +40,10 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.InetSocketAddress;
 import java.net.MalformedURLException;
 import java.net.Proxy;
-import java.net.SocketAddress;
 import java.net.URI;
 import java.net.URL;
-import java.net.Proxy.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -79,6 +76,7 @@
 
     private int browserProxyType = BROWSER_PROXY_TYPE_NONE;
     private URL browserAutoConfigUrl;
+    /** Whether the http proxy should be used for http, https, ftp and socket protocols */
     private Boolean browserUseSameProxy;
     private String browserHttpProxyHost;
     private int browserHttpProxyPort;
@@ -96,6 +94,9 @@
      */
     public BrowserAwareProxySelector(DeploymentConfiguration config) {
         super(config);
+    }
+
+    public void initialize() {
         try {
             initFromBrowserConfig();
         } catch (IOException e) {
@@ -110,11 +111,7 @@
      */
     private void initFromBrowserConfig() throws IOException {
 
-        File preferencesFile = FirefoxPreferencesFinder.find();
-
-        FirefoxPreferencesParser parser = new FirefoxPreferencesParser(preferencesFile);
-        parser.parse();
-        Map<String, String> prefs = parser.getPreferences();
+        Map<String, String> prefs = parseBrowserPreferences();
 
         String type = prefs.get("network.proxy.type");
         if (type != null) {
@@ -150,6 +147,13 @@
         browserSocks4ProxyPort = stringToPort(prefs.get("network.proxy.socks_port"));
     }
 
+    Map<String, String> parseBrowserPreferences() throws IOException {
+        File preferencesFile = FirefoxPreferencesFinder.find();
+        FirefoxPreferencesParser parser = new FirefoxPreferencesParser(preferencesFile);
+        parser.parse();
+        return parser.getPreferences();
+    }
+
     /**
      * Returns port inside a string. Unlike {@link Integer#valueOf(String)},
      * it will not throw exceptions.
@@ -244,36 +248,11 @@
      * the browser's preferences file.
      */
     private List<Proxy> getFromBrowserConfiguration(URI uri) {
-        List<Proxy> proxies = new ArrayList<Proxy>();
-
-        String scheme = uri.getScheme();
-
-        if (browserUseSameProxy) {
-            SocketAddress sa = new InetSocketAddress(browserHttpProxyHost, browserHttpProxyPort);
-            Proxy proxy;
-            if (scheme.equals("socket")) {
-                proxy = new Proxy(Type.SOCKS, sa);
-            } else {
-                proxy = new Proxy(Type.HTTP, sa);
-            }
-            proxies.add(proxy);
-        } else if (scheme.equals("http")) {
-            SocketAddress sa = new InetSocketAddress(browserHttpProxyHost, browserHttpProxyPort);
-            proxies.add(new Proxy(Type.HTTP, sa));
-        } else if (scheme.equals("https")) {
-            SocketAddress sa = new InetSocketAddress(browserHttpsProxyHost, browserHttpsProxyPort);
-            proxies.add(new Proxy(Type.HTTP, sa));
-        } else if (scheme.equals("ftp")) {
-            SocketAddress sa = new InetSocketAddress(browserFtpProxyHost, browserFtpProxyPort);
-            proxies.add(new Proxy(Type.HTTP, sa));
-        } else if (scheme.equals("socket")) {
-            SocketAddress sa = new InetSocketAddress(browserSocks4ProxyHost, browserSocks4ProxyPort);
-            proxies.add(new Proxy(Type.SOCKS, sa));
-        } else {
-            proxies.add(Proxy.NO_PROXY);
-        }
-
-        return proxies;
+        return getFromArguments(uri, browserUseSameProxy, true,
+                browserHttpsProxyHost, browserHttpsProxyPort,
+                browserHttpProxyHost, browserHttpProxyPort,
+                browserFtpProxyHost, browserFtpProxyPort,
+                browserSocks4ProxyHost, browserSocks4ProxyPort);
     }
 
 }
diff -r 14d2babbf9fd -r c4476a810053 netx/net/sourceforge/jnlp/runtime/JNLPProxySelector.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPProxySelector.java	Tue Oct 01 11:51:00 2013 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPProxySelector.java	Tue Oct 01 23:43:31 2013 -0400
@@ -288,15 +288,42 @@
      * @return a List of Proxy objects
      */
     private List<Proxy> getFromConfiguration(URI uri) {
+        return getFromArguments(uri, sameProxy, false,
+                proxyHttpsHost, proxyHttpsPort,
+                proxyHttpHost, proxyHttpPort,
+                proxyFtpHost, proxyFtpPort,
+                proxySocks4Host, proxySocks4Port);
+    }
+
+    /**
+     * Returns a list of proxies by using the arguments
+     *
+     * @return a List of Proxy objects
+     */
+    protected static List<Proxy> getFromArguments(URI uri,
+            boolean sameProxy, boolean sameProxyIncludesSocket,
+            String proxyHttpsHost, int proxyHttpsPort,
+            String proxyHttpHost, int proxyHttpPort,
+            String proxyFtpHost, int proxyFtpPort,
+            String proxySocks4Host, int proxySocks4Port) {
+
         List<Proxy> proxies = new ArrayList<Proxy>();
 
         String scheme = uri.getScheme();
 
+        boolean socksProxyAdded = false;
+
         if (sameProxy) {
-            if (proxyHttpHost != null && (scheme.equals("https") || scheme.equals("http") || scheme.equals("ftp"))) {
+            if (proxyHttpHost != null) {
                 SocketAddress sa = new InetSocketAddress(proxyHttpHost, proxyHttpPort);
-                Proxy proxy = new Proxy(Type.HTTP, sa);
-                proxies.add(proxy);
+                if ((scheme.equals("https") || scheme.equals("http") || scheme.equals("ftp"))) {
+                    Proxy proxy = new Proxy(Type.HTTP, sa);
+                    proxies.add(proxy);
+                } else if (scheme.equals("socket") && sameProxyIncludesSocket) {
+                    Proxy proxy = new Proxy(Type.SOCKS, sa);
+                    proxies.add(proxy);
+                    socksProxyAdded = true;
+                }
             }
         } else if (scheme.equals("http") && proxyHttpHost != null) {
             SocketAddress sa = new InetSocketAddress(proxyHttpHost, proxyHttpPort);
@@ -309,9 +336,10 @@
             proxies.add(new Proxy(Type.HTTP, sa));
         }
 
-        if (proxySocks4Host != null) {
+        if (!socksProxyAdded && (proxySocks4Host != null)) {
             SocketAddress sa = new InetSocketAddress(proxySocks4Host, proxySocks4Port);
             proxies.add(new Proxy(Type.SOCKS, sa));
+            socksProxyAdded = true;
         }
 
         if (proxies.size() == 0) {
diff -r 14d2babbf9fd -r c4476a810053 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java	Tue Oct 01 11:51:00 2013 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java	Tue Oct 01 23:43:31 2013 -0400
@@ -266,7 +266,9 @@
 
         // plug in a custom authenticator and proxy selector
         Authenticator.setDefault(new JNLPAuthenticator());
-        ProxySelector.setDefault(new BrowserAwareProxySelector(config));
+        BrowserAwareProxySelector proxySelector = new BrowserAwareProxySelector(config);
+        proxySelector.initialize();
+        ProxySelector.setDefault(proxySelector);
 
         // Restrict access to netx classes
         Security.setProperty("package.access", 
diff -r 14d2babbf9fd -r c4476a810053 tests/netx/unit/net/sourceforge/jnlp/browser/BrowserAwareProxySelectorTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/netx/unit/net/sourceforge/jnlp/browser/BrowserAwareProxySelectorTest.java	Tue Oct 01 23:43:31 2013 -0400
@@ -0,0 +1,227 @@
+/* BrowserAwareProxySelectorTest.java
+   Copyright (C) 2013 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package net.sourceforge.jnlp.browser;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.Proxy.Type;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
+import net.sourceforge.jnlp.runtime.JNLPProxySelector;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class BrowserAwareProxySelectorTest {
+
+    static class TestBrowserAwareProxySelector extends BrowserAwareProxySelector {
+
+        private final Map<String, String> browserPrefs;
+
+        public TestBrowserAwareProxySelector(DeploymentConfiguration config, Map<String, String> browserPrefs) {
+            super(config);
+            this.browserPrefs = browserPrefs;
+        }
+
+        @Override
+        protected Map<String, String> parseBrowserPreferences() throws IOException {
+            return browserPrefs;
+        }
+    }
+
+    private static final String PROXY_HOST = "foo";
+    private static final int PROXY_PORT = 42;
+    private static final InetSocketAddress PROXY_ADDRESS = new InetSocketAddress(PROXY_HOST, PROXY_PORT);
+
+    private DeploymentConfiguration config;
+    private Map<String, String> browserPrefs;
+
+    @Before
+    public void setUp() {
+        config = new DeploymentConfiguration();
+        config.setProperty(DeploymentConfiguration.KEY_PROXY_TYPE, String.valueOf(JNLPProxySelector.PROXY_TYPE_BROWSER));
+
+        browserPrefs = new HashMap<String, String>();
+    }
+
+    @Test
+    public void testNoBrowserProxy() throws URISyntaxException {
+        browserPrefs.put("network.proxy.type", "0" /* none */);
+
+        List<Proxy> result = getProxy(config, browserPrefs, new URI("https://example.org"));
+
+        assertEquals(1, result.size());
+        assertEquals(Proxy.NO_PROXY, result.get(0));
+    }
+
+    @Test
+    public void testBrowserManualSameProxy() throws URISyntaxException {
+        browserPrefs.put("network.proxy.type", "1" /* = manual */);
+        browserPrefs.put("network.proxy.share_proxy_settings", "true");
+        browserPrefs.put("network.proxy.http", PROXY_HOST);
+        browserPrefs.put("network.proxy.http_port", String.valueOf(PROXY_PORT));
+
+        List<Proxy> result;
+
+        result = getProxy(config, browserPrefs, new URI("https://example.org"));
+
+        assertEquals(1, result.size());
+        assertEquals(new Proxy(Type.HTTP, PROXY_ADDRESS), result.get(0));
+
+        result = getProxy(config, browserPrefs, new URI("socket://example.org"));
+
+        assertEquals(1, result.size());
+        assertEquals(new Proxy(Type.SOCKS, PROXY_ADDRESS), result.get(0));
+
+    }
+
+    @Test
+    public void testBrowserManualHttpsProxy() throws URISyntaxException {
+        browserPrefs.put("network.proxy.type", "1" /* = manual */);
+        browserPrefs.put("network.proxy.ssl", PROXY_HOST);
+        browserPrefs.put("network.proxy.ssl_port", String.valueOf(PROXY_PORT));
+
+        List<Proxy> result = getProxy(config, browserPrefs, new URI("https://example.org"));
+
+        assertEquals(1, result.size());
+        assertEquals(new Proxy(Type.HTTP, PROXY_ADDRESS), result.get(0));
+    }
+
+    @Test
+    public void testBrowserManualHttpProxy() throws URISyntaxException {
+        browserPrefs.put("network.proxy.type", "1" /* = manual */);
+        browserPrefs.put("network.proxy.http", PROXY_HOST);
+        browserPrefs.put("network.proxy.http_port", String.valueOf(PROXY_PORT));
+
+        List<Proxy> result = getProxy(config, browserPrefs, new URI("http://example.org"));
+
+        assertEquals(1, result.size());
+        assertEquals(new Proxy(Type.HTTP, PROXY_ADDRESS), result.get(0));
+    }
+
+    @Test
+    public void testBrowserManualFtpProxy() throws URISyntaxException {
+        browserPrefs.put("network.proxy.type", "1" /* = manual */);
+        browserPrefs.put("network.proxy.ftp", PROXY_HOST);
+        browserPrefs.put("network.proxy.ftp_port", String.valueOf(PROXY_PORT));
+
+        List<Proxy> result = getProxy(config, browserPrefs, new URI("ftp://example.org"));
+
+        assertEquals(1, result.size());
+        assertEquals(new Proxy(Type.HTTP, PROXY_ADDRESS), result.get(0));
+    }
+
+    @Test
+    public void testBrowserManualSocksProxy() throws URISyntaxException {
+        browserPrefs.put("network.proxy.type", "1" /* = manual */);
+        browserPrefs.put("network.proxy.socks", PROXY_HOST);
+        browserPrefs.put("network.proxy.socks_port", String.valueOf(PROXY_PORT));
+
+        List<Proxy> result = getProxy(config, browserPrefs, new URI("socket://example.org"));
+
+        assertEquals(1, result.size());
+        assertEquals(new Proxy(Type.SOCKS, PROXY_ADDRESS), result.get(0));
+    }
+
+    @Test
+    public void testBrowserManualHttpProxyFallsBackToSocksProxy() throws URISyntaxException {
+        browserPrefs.put("network.proxy.type", "1" /* = manual */);
+        browserPrefs.put("network.proxy.socks", PROXY_HOST);
+        browserPrefs.put("network.proxy.socks_port", String.valueOf(PROXY_PORT));
+
+        List<Proxy> result = getProxy(config, browserPrefs, new URI("http://example.org"));
+
+        assertEquals(1, result.size());
+        assertEquals(new Proxy(Type.SOCKS, PROXY_ADDRESS), result.get(0));
+    }
+
+    @Test
+    public void testBrowserManualProxyUnknownProtocol() throws URISyntaxException {
+        browserPrefs.put("network.proxy.type", "1" /* = manual */);
+
+        List<Proxy> result = getProxy(config, browserPrefs, new URI("gopher://example.org"));
+
+        assertEquals(1, result.size());
+        assertEquals(Proxy.NO_PROXY, result.get(0));
+    }
+
+    @Test
+    public void testBrowserAutoProxyUnimplemented() throws URISyntaxException {
+        browserPrefs.put("network.proxy.type", "4" /* = auto */);
+
+        List<Proxy> result = getProxy(config, browserPrefs, new URI("http://example.org"));
+
+        assertEquals(1, result.size());
+        assertEquals(Proxy.NO_PROXY, result.get(0));
+    }
+
+    @Test
+    public void testBrowserSystemProxyUnimplemented() throws URISyntaxException {
+        browserPrefs.put("network.proxy.type", "5" /* = system */);
+
+        List<Proxy> result = getProxy(config, browserPrefs, new URI("http://example.org"));
+
+        assertEquals(1, result.size());
+        assertEquals(Proxy.NO_PROXY, result.get(0));
+    }
+
+    @Test
+    public void testBrowserPacProxyUnimplemented() throws URISyntaxException {
+        browserPrefs.put("network.proxy.type", "2" /* = pac */);
+
+        List<Proxy> result = getProxy(config, browserPrefs, new URI("http://example.org"));
+
+        assertEquals(1, result.size());
+        assertEquals(Proxy.NO_PROXY, result.get(0));
+    }
+
+    private static List<Proxy> getProxy(DeploymentConfiguration config, Map<String, String> browserPrefs, URI uri) {
+        BrowserAwareProxySelector selector = new TestBrowserAwareProxySelector(config, browserPrefs);
+        selector.initialize();
+
+        return selector.getFromBrowser(uri);
+    }
+}

From jvanek at redhat.com  Wed Oct  2 00:01:01 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Wed, 02 Oct 2013 09:01:01 +0200
Subject: [rfc][icedtea-web] Cache viewer cleanup
In-Reply-To: <524B35EC.3030902@gmx.de>
References: <201307302347.r6UNl2x1011963@mail-web03.excite.co.jp>	<5229ACDB.7030102@redhat.com>	<52364E27.3010300@gmx.de>	<523713B7.6080607@redhat.com>	<523B4687.8070505@gmx.de>
	<524B35EC.3030902@gmx.de>
Message-ID: <524BC4AD.1080306@redhat.com>

On 10/01/2013 10:51 PM, Jacob Wisor wrote:
> Hello,
>
>> Jiri Vanek wrote:
>>> On 09/16/2013 02:17 AM, Jakob Wisor wrote:
>>>> Hello there!
>>>>
>>>> I have checked and corrected the code's formatting, and followed
>>>> Jiri's reasonable advice.
>>>>
>>>> Jiri Vanek wrote:
>>>>> On 07/31/2013 01:47 AM, Jacob Wisor wrote:
>>>>>> Hello,
>>>>>>
>>>>>> * Added closing of cache viewer by ESC key
>>>>>> * Added proper dis-/enabling of cache viewer's buttons
>>>>>> * Added busy mouse cursor indicator when populating the cache viewer
>>>>>>
>>>>>> Everything is done on purpose on the AWT thread as before. Although
>>>>>> I am personally not in favor
>>>>>> of anonymous classes, I have tried to stick to the prevalent coding
>>>>>> style.
>>>>>>
>>>>>> Unfortunately, I was unable to test the cache viewer's behavior
>>>>>> because I do not know how to put
>>>>>> synthetic cache entries into the cache. Can anyone help me with
>>>>>> that? What does a the cache look
>>>>>> like when filled with resources? Is there any index file that keeps
>>>>>> track of the cache?
>>>
>>> As this is gui change only, it shouldbe ok without test.
>>> However cache is set of jars and jnlp files saved in
>>> url-like-filestrucutre
>>>
>>> eg http:\\my.domain\myApp.jnlp with myJAr in "." codebase will be
>>> saved like
>>> cache/http/my/domain/myApp.jnlp
>>> cache/http/my/domain/myJar.jnlp
>>>
>>> and yes, there is index file in tom cache directory
>>>
>>> I have some memorry that there are already tests for it - most simple
>>> case how to import jar into cache is to lunch javaws ;)
>>>
>>>>>>
>>> ...,snip...
>>>>> Those should be in finally block
>>>>>> + parent.getContentPane().setCursor(Cursor.getDefaultCursor());
>>>>
>>>> Done. Please check whether I have done it correctly or the way you
>>>> have meant.
>>>>
>>>>>> }
>>>
>>> Thank you.
>  >>>> [...]
>>>>> Please mention both Cache viewer cleanup and CerViewr viewer
>>>>> cleanup in news.
>>>>
>>>> Will do but they are separate patches.
>>>>
>>>> Happy reviewing!
>>>
>>> For _this_ patch, the NEWS line should be attached explicitly.
>>> For CerViewr the separate patch is ok.
>>>
>>>
>>> No more review needed. With above fixed, ok to head (and 1.4 if wonted)
>>
>> Okay! :-) Thank you for reviewing. But, I want to test it at least a
>> little bit. Now, that I have written a few JNLP application and applet
>> tests I have kinda also found the time and leisure to really do it. ;-)
>> It's better do it once before feeling sorry afterwards.
>
> After throughly testing this patch I think it is ready to be pushed.
> Please review the NEWS and ChangeLog sections. I have also decided to include the new NonEditableTableModel class with this patch, since this patch can also make use of it. It is also going to be ready for the upcoming certificate viewer patch.

I'm happy with the patch code, however the delete button have not worked for me :(
Also I have noted  two empty catch blocs. Please log the exceptions in Debug mode on.

Also  - that is nit probably for another change set (if changeset at all) - is multiple selection or "delete all" button in your queue?

Once delete button working/not working cleared and catch block logged, ok to go.

Thank you very much!

J.

From ptisnovs at icedtea.classpath.org  Wed Oct  2 00:42:03 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Wed, 02 Oct 2013 07:42:03 +0000
Subject: /hg/rhino-tests: Added new test testNewInstance into the test suite
Message-ID: <hg.9a5179c62ad8.1380699723.-6019694633368342460@icedtea.classpath.org>

changeset 9a5179c62ad8 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=9a5179c62ad8
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Wed Oct 02 09:45:49 2013 +0200

	Added new test testNewInstance into the test suite
	ScriptEngineFactoryClassTest.


diffstat:

 ChangeLog                                            |   6 ++++++
 src/org/RhinoTests/ScriptEngineFactoryClassTest.java |  17 +++++++++++++++++
 2 files changed, 23 insertions(+), 0 deletions(-)

diffs (40 lines):

diff -r fbd651803006 -r 9a5179c62ad8 ChangeLog
--- a/ChangeLog	Tue Oct 01 09:24:04 2013 +0200
+++ b/ChangeLog	Wed Oct 02 09:45:49 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-02  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/ScriptEngineFactoryClassTest.java:
+	Added new test testNewInstance into the test suite
+	ScriptEngineFactoryClassTest.
+
 2013-10-01  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptEngineClassTest.java:
diff -r fbd651803006 -r 9a5179c62ad8 src/org/RhinoTests/ScriptEngineFactoryClassTest.java
--- a/src/org/RhinoTests/ScriptEngineFactoryClassTest.java	Tue Oct 01 09:24:04 2013 +0200
+++ b/src/org/RhinoTests/ScriptEngineFactoryClassTest.java	Wed Oct 02 09:45:49 2013 +0200
@@ -1166,6 +1166,23 @@
     }
 
     /**
+     * Test for method javax.script.ScriptEngineFactory.getClass().newInstance()
+     */
+    protected void testNewInstance() {
+        try {
+            Object o = this.scriptEngineFactoryClass.newInstance();
+            throw new AssertionError("Class.newInstance() does not throw any exception");
+        }
+        catch (InstantiationException e) {
+            // expected exception
+        }
+        catch (IllegalAccessException e) {
+            // expected exception
+        }
+
+    }
+
+    /**
      * Test for instanceof operator applied to a class javax.script.ScriptEngineFactory
      */
     @SuppressWarnings("cast")

From ptisnovs at icedtea.classpath.org  Wed Oct  2 00:48:00 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Wed, 02 Oct 2013 07:48:00 +0000
Subject: /hg/gfx-test: Added one test into BitBltAffineScaleTransformOp.
Message-ID: <hg.7fa68bf4256a.1380700080.-6248649288953172555@icedtea.classpath.org>

changeset 7fa68bf4256a in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=7fa68bf4256a
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Wed Oct 02 09:51:47 2013 +0200

	Added one test into BitBltAffineScaleTransformOp.
	Four new common test methods added into BitBltBufferedImageOp.


diffstat:

 ChangeLog                                                    |   7 +
 src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java |  15 ++
 src/org/gfxtest/testsuites/BitBltBufferedImageOp.java        |  73 +++++++++++-
 3 files changed, 92 insertions(+), 3 deletions(-)

diffs (122 lines):

diff -r 5ad19e7d210f -r 7fa68bf4256a ChangeLog
--- a/ChangeLog	Tue Oct 01 09:17:15 2013 +0200
+++ b/ChangeLog	Wed Oct 02 09:51:47 2013 +0200
@@ -1,3 +1,10 @@
+2013-10-02  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java:
+	Added one test into BitBltAffineScaleTransformOp.
+	* src/org/gfxtest/testsuites/BitBltBufferedImageOp.java:
+	Four new common test methods added into BitBltBufferedImageOp.
+
 2013-10-01  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java:
diff -r 5ad19e7d210f -r 7fa68bf4256a src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java
--- a/src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java	Tue Oct 01 09:17:15 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java	Wed Oct 02 09:51:47 2013 +0200
@@ -111,6 +111,21 @@
             }
         }
     }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageType3ByteBGRScaleTransformation0Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, ScaleTransformationNearest1Op[0]);
+    }
+
     /**
      * Entry point to the test suite.
      *
diff -r 5ad19e7d210f -r 7fa68bf4256a src/org/gfxtest/testsuites/BitBltBufferedImageOp.java
--- a/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java	Tue Oct 01 09:17:15 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java	Wed Oct 02 09:51:47 2013 +0200
@@ -549,9 +549,76 @@
     }
 
     /**
-     * Test basic BitBlt operation for buffered image containing diagonal checker pattern
-     * with type TYPE_3BYTE_BGR
-     * 
+     * Test basic BitBlt operation for diagonal checker buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltDiagonalCheckerBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal checker buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltDiagonalCheckerBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal checker buffered image with type {@link BufferedImage#TYPE_BYTE_INDEXED}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltDiagonalCheckerBufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal checker buffered image with type {@link BufferedImage#TYPE_CUSTOM}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltDiagonalCheckerBufferedImageTypeCustom(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_CUSTOM, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal checker buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}.
+     *
      * @param image
      *            image used as a destination for BitBlt-type operations
      * @param graphics2d

From jvanek at redhat.com  Wed Oct  2 04:26:27 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Wed, 02 Oct 2013 13:26:27 +0200
Subject: jstack.stp should be adapted CR#7172967
In-Reply-To: <524B4944.60404@ysfactory.dip.jp>
References: <524AE17F.1000805@ysfactory.dip.jp> <524AF041.9090200@redhat.com>
	<524B4944.60404@ysfactory.dip.jp>
Message-ID: <524C02E3.1000804@redhat.com>

On 10/02/2013 12:14 AM, Yasumasa Suenaga wrote:
> Thanks! I will push it later.
>

Once its pushed, I will grap the sources and update fedora RPMs
>
> On 2013/10/02 0:54, Jiri Vanek wrote:
>> It would be nice if upstream of jstack do sometimes some release :)
>> I would be happy to update to it.
>>
>> j.
>>
>> On 10/01/2013 04:51 PM, Yasumasa Suenaga wrote:
>>> Hi all,
>>>
>>> When I use jstack.stp in java-1.7.0-openjdk-devel-1.7.0.60-2.4.2.5.fc19.x86_64.rpm
>>> on Fedora19, stap command does not work.
>>> At "CR#7172967: Eliminate constMethod's _method backpointer to methodOop.", handling
>>> of constantPoolOop is changed. Thus jstack.stp should be adapted this CR.
>>>
>>> I've made a patch for this issue and attached to this email.
>>> Can I contribute this patch for IcedTea7?
>>>
>>>
>>> BTW, I am committer of HeapStats which is hosted in IcedTea.
>>> If someone reviewes this patch, can I push this to repository?
>>>
>>>
>>> P.S.
>>> TapSet in JDK7 which is provided from Fedora is too old.
>>> I have to apply this patch and another one as following:
>>> http://icedtea.classpath.org/hg/icedtea7/rev/069e50dcd06a
>>>
>>> I hope that Fedora fetches new tapset...
>>>
>>>
>>>
>>> Thanks,
>>>
>>> Yasumasa
>>
>


From jvanek at redhat.com  Wed Oct  2 04:28:51 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Wed, 02 Oct 2013 13:28:51 +0200
Subject: jstack.stp should be adapted CR#7172967
In-Reply-To: <524B4944.60404@ysfactory.dip.jp>
References: <524AE17F.1000805@ysfactory.dip.jp> <524AF041.9090200@redhat.com>
	<524B4944.60404@ysfactory.dip.jp>
Message-ID: <524C0373.4060907@redhat.com>

On 10/02/2013 12:14 AM, Yasumasa Suenaga wrote:
>

My wrong - to much coffee! - I meant - It IS pushed, so I 'm going to grab the sources and update RPMs

:)
> On 2013/10/02 0:54, Jiri Vanek wrote:
>> It would be nice if upstream of jstack do sometimes some release :)
>> I would be happy to update to it.
>>
>> j.
>>
>> On 10/01/2013 04:51 PM, Yasumasa Suenaga wrote:
>>> Hi all,
>>>
>>> When I use jstack.stp in java-1.7.0-openjdk-devel-1.7.0.60-2.4.2.5.fc19.x86_64.rpm
>>> on Fedora19, stap command does not work.
>>> At "CR#7172967: Eliminate constMethod's _method backpointer to methodOop.", handling
>>> of constantPoolOop is changed. Thus jstack.stp should be adapted this CR.
>>>
>>> I've made a patch for this issue and attached to this email.
>>> Can I contribute this patch for IcedTea7?
>>>
>>>
>>> BTW, I am committer of HeapStats which is hosted in IcedTea.
>>> If someone reviewes this patch, can I push this to repository?
>>>
>>>
>>> P.S.
>>> TapSet in JDK7 which is provided from Fedora is too old.
>>> I have to apply this patch and another one as following:
>>> http://icedtea.classpath.org/hg/icedtea7/rev/069e50dcd06a
>>>
>>> I hope that Fedora fetches new tapset...
>>>
>>>
>>>
>>> Thanks,
>>>
>>> Yasumasa
>>
>


From yasu at ysfactory.dip.jp  Wed Oct  2 05:54:36 2013
From: yasu at ysfactory.dip.jp (Yasumasa Suenaga)
Date: Wed, 02 Oct 2013 21:54:36 +0900
Subject: jstack.stp should be adapted CR#7172967
In-Reply-To: <524C0373.4060907@redhat.com>
References: <524AE17F.1000805@ysfactory.dip.jp> <524AF041.9090200@redhat.com>
	<524B4944.60404@ysfactory.dip.jp> <524C0373.4060907@redhat.com>
Message-ID: <524C178C.5020209@ysfactory.dip.jp>

I've already pushed it.
http://icedtea.classpath.org/hg/icedtea7/rev/8599fdfc398d

Commit message was not delivered because I have not registered my IcedTea account :-P


> I 'm going to grab the sources and update RPMs

Thank you so much!


Yasumasa


P.S.

  jstack.stp in OpenJDK8 which is provided from Fedora19 does not work too.
  There are two causes:

   1. debuginfo is separated in Makefile.
      Thus we have to merge libjvm.so.debug (in debuginfo package) and libjvm.debuginfo (in openjdk package) .

   2. Current jstack.stp is not adapted NoPermGen.

  OpenJDK8 is not GA yet. So we are too early to fix them.


On 2013/10/02 20:28, Jiri Vanek wrote:
> On 10/02/2013 12:14 AM, Yasumasa Suenaga wrote:
>>
>
> My wrong - to much coffee! - I meant - It IS pushed, so I 'm going to grab the sources and update RPMs
>
> :)
>> On 2013/10/02 0:54, Jiri Vanek wrote:
>>> It would be nice if upstream of jstack do sometimes some release :)
>>> I would be happy to update to it.
>>>
>>> j.
>>>
>>> On 10/01/2013 04:51 PM, Yasumasa Suenaga wrote:
>>>> Hi all,
>>>>
>>>> When I use jstack.stp in java-1.7.0-openjdk-devel-1.7.0.60-2.4.2.5.fc19.x86_64.rpm
>>>> on Fedora19, stap command does not work.
>>>> At "CR#7172967: Eliminate constMethod's _method backpointer to methodOop.", handling
>>>> of constantPoolOop is changed. Thus jstack.stp should be adapted this CR.
>>>>
>>>> I've made a patch for this issue and attached to this email.
>>>> Can I contribute this patch for IcedTea7?
>>>>
>>>>
>>>> BTW, I am committer of HeapStats which is hosted in IcedTea.
>>>> If someone reviewes this patch, can I push this to repository?
>>>>
>>>>
>>>> P.S.
>>>> TapSet in JDK7 which is provided from Fedora is too old.
>>>> I have to apply this patch and another one as following:
>>>> http://icedtea.classpath.org/hg/icedtea7/rev/069e50dcd06a
>>>>
>>>> I hope that Fedora fetches new tapset...
>>>>
>>>>
>>>>
>>>> Thanks,
>>>>
>>>> Yasumasa
>>>
>>
>


From yasuenag at icedtea.classpath.org  Tue Oct  1 20:28:19 2013
From: yasuenag at icedtea.classpath.org (yasuenag at icedtea.classpath.org)
Date: Wed, 02 Oct 2013 03:28:19 +0000
Subject: /hg/icedtea7: jstack.stp should be adapted CR#7172967
Message-ID: <hg.8599fdfc398d.1380684499.2873452341184383833@icedtea.classpath.org>

changeset 8599fdfc398d in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=8599fdfc398d
author: Yasumasa Suenaga  <yasu at ysfactory.dip.jp>
date: Wed Oct 02 12:26:39 2013 +0900

	jstack.stp should be adapted CR#7172967
	Reviewed-by: Jiri Vanek  <jvanek at redhat.com> , Andrew Hughes  <gnu.andrew at redhat.com>
	Review-thread: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-October/024880.html


diffstat:

 ChangeLog            |  4 ++++
 tapset/jstack.stp.in |  8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r c3c661000904 -r 8599fdfc398d ChangeLog
--- a/ChangeLog	Tue Sep 24 03:48:26 2013 +0100
+++ b/ChangeLog	Wed Oct 02 12:26:39 2013 +0900
@@ -1,3 +1,7 @@
+2013-10-02  Yasumasa Suenaga  <yasu at ysfactory.dip.jp>
+
+	* jstack.stp should be adapted CR#7172967
+
 2013-09-23  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* NEWS: Add 2.4.2 release notes.
diff -r c3c661000904 -r 8599fdfc398d tapset/jstack.stp.in
--- a/tapset/jstack.stp.in	Tue Sep 24 03:48:26 2013 +0100
+++ b/tapset/jstack.stp.in	Wed Oct 02 12:26:39 2013 +0900
@@ -85,7 +85,9 @@
   Universe_collectedHeap[pid()] = %( systemtap_v >= "1.8"
                                     %? @var("_collectedHeap at universe.cpp")
                                     %: $_collectedHeap %);
-  HeapWordSize[pid()] = $HeapWordSize;
+  HeapWordSize[pid()] = %( systemtap_v >= "1.8"
+                          %? @var("HeapWordSize")
+                          %: $HeapWordSize %);
 
   /**
    * The CodeCache class contains the static CodeHeap _heap that
@@ -395,7 +397,9 @@
                   // package name separator and that the method signature is
                   // encoded as a method descriptor string. Both of which we
                   // don't demangle here.
-                  constantPoolOopDesc = @cast(methodOopPtr, "methodOopDesc",
+                  constMethodOopPtr = @cast(methodOopPtr, "methodOopDesc",
+                                            "@ABS_SERVER_LIBJVM_SO@")->_constMethod;
+                  constantPoolOopDesc = @cast(constMethodOopPtr, "constMethodOopDesc",
                                               "@ABS_SERVER_LIBJVM_SO@")->_constants;
                   constantPoolOop_base = constantPoolOopDesc + constantPoolOopDesc_size;
 

From omajid at redhat.com  Wed Oct  2 10:17:45 2013
From: omajid at redhat.com (Omair Majid)
Date: Wed, 02 Oct 2013 13:17:45 -0400
Subject: [rfc][icedtea-web] Fix regression in recent PR1204 patch
In-Reply-To: <524B3BAD.9040303@redhat.com>
References: <524AEE16.1040402@redhat.com> <524AF1DB.8070403@redhat.com>
	<524B3BAD.9040303@redhat.com>
Message-ID: <524C5539.5050107@redhat.com>

Hi Andrew,

On 10/01/2013 05:16 PM, Andrew Azores wrote:
> On 10/01/2013 12:01 PM, Omair Majid wrote:
>> On 10/01/2013 11:45 AM, Andrew Azores wrote:
>>> I just caught a regression in my own patch. The "path" portion of the
>>> URI was already percent-encoded seeing as it was obtained with
>>> URL#getPath(). This was then fed back into the constructor of a new URI,
>>> and the .toURL() result of this URI was returned. This process repeated
>>> the percent-encoding, so eg spaces would become "%2520" rather than
>>> simply "%20".
>> Could you include a unit test? Otherwise looks good to me.
>>
> 
> Sure, added three new tests to ensure correct percent-encoding
> behaviour. The SpacesAreEverywhere(Signed) reproducer(s) also catch this
> regression, which is how I noticed it to begin with. I also went ahead
> and refactored the existing unit tests a bit.
> 
> I had to add some simple input validation to the getVersionedUrl call. I
> realized that the older version of this method was not actually dealing
> with percent encoding on its own - if you passed it an invalid URL
> containing a space, it would happily accept this, work with it, and
> return to you another invalid URL containing the same spaces. This seems
> incorrect at first but I didn't want to go about changing the behaviour
> of this method. If the method started handling percent-encoding, then it
> could be passing back up URLs that actually do point to valid resources,
> when in fact that isn't *really* the same URL it was asked to work with.
> Rather than causing an explicit failure on invalid input, I kept the
> behaviour the same, so that the invalid URL is simply returned, and the
> same later point of failure should still occur as it does now. Of the
> two new test cases, two of them contain spaces. The return value of the
> method on these inputs is simply the same URL that was given in the
> first place, as this is what the method used to do. The other new test
> case ensures that a properly-encoded URL is not mistakenly re-encoded.

I think this is the better approach. Thanks for fixing this.

Not related to this patch, but have you considered that this is the
wrong place for handling this percent encoding problem? These URLs (with
mistakes) only appear in JNLP files, right? Maybe the file parser should
be deciding what to do with incorrectly encoded urls and the rest of
icedtea-web (including ResourceUrlCreator) should assume the urls are
not malformed.

> On another note, I have a question about this method now that I'm
> looking back into it again. It's only called from two places in the
> entire codebase - one place is these unit tests. The other place is
> ResourceUrlCreator#getUrls(). getUrls() and getVersionedUrl() are both
> instance methods of the class. When getUrls calls getVersionedUrl, it
> passes it a Resource reference - but this Resource is also a field of
> the instance. So, why does getVersionedUrl take a parameter at all if
> the same reference is already available to it? Or, on the other hand,
> getVersionedUrl doesn't care at all about its containing instance - the
> only information it needs to perform its duty is a Resource reference.
> So then getVersionedUrl can be made static and passed the Resource
> reference. I don't understand that there's any reason for it to be in
> this in-between state. Anyone seeing something I'm not?

I don't recall the details in this particular case, but I do think all
three options are generally valid. Depending on what the code is doing
(especially if it a mutation), passing the instance variable as an
argument may make sense.

In this case, I am leaning towards keeping it an instance method and not
passing the Resource as argument.

> +++ b/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java

> +        } catch (UnsupportedEncodingException e) { // "UTF-8" is hardcoded, this won't happen
> +            return resourceUrl;

If this case can only happen if a developer makes a mistake, perhaps
throwing a 'new IllegalStateException("UTF-8 is a hardcoded and
always-supported encoding")' may make more sense?

> +    private static boolean checkEncoding(String path) {

It's a good idea to name methods so the name describes the return value.
In this case, it would be nice to describe what is it checking, and what
the return value indicates.

Maybe call it 'isPathMalformed'? (or maybe invert the conditional and
call it 'isPathValid'?)

> +        } catch (UnsupportedEncodingException e) {

Please don't ignore exceptions. If it should never happen, throw an
AssertionError or IllegalStateException.

> +        return !(path.equals(decodedUrl) && path.equals(encodedUrl));

In general, it's better to comment the 'why' instead of the 'what'. I
see some comments in this file which say that method foo may return null
and (personally) I don't find those style of comments too useful (the
method has javadocs already, no?). But I do think describing why this
compare provides the right result is a good idea.

> +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceUrlCreatorTest.java

> +    private static final Version version_11 = new Version("1.1");
> +    private static final Version version_20 = new Version("2.0");
> +    private static final Version version_two = new Version("version two");
> +    private static final DownloadOptions dlopts_noPack_useVersion = new DownloadOptions(false, true);
> +    private static final DownloadOptions dlopts_noPack_noVersion = new DownloadOptions(false, false);

It's generally common to have constants (which is what these static,
final and immutable objects are) declared as UPPER_CASE.

>      @Test
>      public void testVersionEncode() throws MalformedURLException {
> -        Resource resource = Resource.getResource(new URL("http://test.jar"), new Version("1.1"), null);
> -        URL result = ResourceUrlCreator.getUrl(resource, false /*don't use pack suffix*/, true /*use version suffix*/);
> +        URL result = getResultUrl("http://test.jar", version_11, false, true);
>          assertEquals("http://test__V1.1.jar", result.toString());
>      }

It's completely a matter of personal style, but I am okay with a 2-line
duplication in tests too, when the two lines are declaring the object to
be tested. Your new version is fine too.

> +    @Test
> +    public void testPartiallyEncodedUrl() throws MalformedURLException {
> +        URL result = getResultUrl("http://test.com/a malformed%20url.jar", null, dlopts_noPack_useVersion);
> +        assertEquals("http://test.com/a malformed%20url.jar", result.toString());
> +    }

Instead of "test.com", have you considered using "example.com"? It's a
real URL meant for examples.

Cheers,
Omair
-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681

From aazores at redhat.com  Wed Oct  2 14:18:11 2013
From: aazores at redhat.com (Andrew Azores)
Date: Wed, 02 Oct 2013 17:18:11 -0400
Subject: [rfc][icedtea-web] Fix regression in recent PR1204 patch
In-Reply-To: <524C5539.5050107@redhat.com>
References: <524AEE16.1040402@redhat.com> <524AF1DB.8070403@redhat.com>
	<524B3BAD.9040303@redhat.com> <524C5539.5050107@redhat.com>
Message-ID: <524C8D93.2040102@redhat.com>

On 10/02/2013 01:17 PM, Omair Majid wrote:
> Hi Andrew,
>
> On 10/01/2013 05:16 PM, Andrew Azores wrote:
>> On 10/01/2013 12:01 PM, Omair Majid wrote:
>>> On 10/01/2013 11:45 AM, Andrew Azores wrote:
>>>> I just caught a regression in my own patch. The "path" portion of the
>>>> URI was already percent-encoded seeing as it was obtained with
>>>> URL#getPath(). This was then fed back into the constructor of a new URI,
>>>> and the .toURL() result of this URI was returned. This process repeated
>>>> the percent-encoding, so eg spaces would become "%2520" rather than
>>>> simply "%20".
>>> Could you include a unit test? Otherwise looks good to me.
>>>
>> Sure, added three new tests to ensure correct percent-encoding
>> behaviour. The SpacesAreEverywhere(Signed) reproducer(s) also catch this
>> regression, which is how I noticed it to begin with. I also went ahead
>> and refactored the existing unit tests a bit.
>>
>> I had to add some simple input validation to the getVersionedUrl call. I
>> realized that the older version of this method was not actually dealing
>> with percent encoding on its own - if you passed it an invalid URL
>> containing a space, it would happily accept this, work with it, and
>> return to you another invalid URL containing the same spaces. This seems
>> incorrect at first but I didn't want to go about changing the behaviour
>> of this method. If the method started handling percent-encoding, then it
>> could be passing back up URLs that actually do point to valid resources,
>> when in fact that isn't *really* the same URL it was asked to work with.
>> Rather than causing an explicit failure on invalid input, I kept the
>> behaviour the same, so that the invalid URL is simply returned, and the
>> same later point of failure should still occur as it does now. Of the
>> two new test cases, two of them contain spaces. The return value of the
>> method on these inputs is simply the same URL that was given in the
>> first place, as this is what the method used to do. The other new test
>> case ensures that a properly-encoded URL is not mistakenly re-encoded.
> I think this is the better approach. Thanks for fixing this.
>
> Not related to this patch, but have you considered that this is the
> wrong place for handling this percent encoding problem? These URLs (with
> mistakes) only appear in JNLP files, right? Maybe the file parser should
> be deciding what to do with incorrectly encoded urls and the rest of
> icedtea-web (including ResourceUrlCreator) should assume the urls are
> not malformed.

Well, I ended up running into another corner case (as I mentioned on 
IRC) and decided it was easier to ditch the URI class and go back to 
manually constructing URLs :( . This is sort of ugly IMO but it 
completely sidesteps the percent-encoding issues involved with using 
URI, which was quickly making that solution uglier and uglier anyway. 
It's still enhanced over the pre-PR1204 fix version though, as that one 
was missing some of the optional parts in a URL. It had no user info and 
no query string, notably. Now it does, and tests for them too!

>
>> On another note, I have a question about this method now that I'm
>> looking back into it again. It's only called from two places in the
>> entire codebase - one place is these unit tests. The other place is
>> ResourceUrlCreator#getUrls(). getUrls() and getVersionedUrl() are both
>> instance methods of the class. When getUrls calls getVersionedUrl, it
>> passes it a Resource reference - but this Resource is also a field of
>> the instance. So, why does getVersionedUrl take a parameter at all if
>> the same reference is already available to it? Or, on the other hand,
>> getVersionedUrl doesn't care at all about its containing instance - the
>> only information it needs to perform its duty is a Resource reference.
>> So then getVersionedUrl can be made static and passed the Resource
>> reference. I don't understand that there's any reason for it to be in
>> this in-between state. Anyone seeing something I'm not?
> I don't recall the details in this particular case, but I do think all
> three options are generally valid. Depending on what the code is doing
> (especially if it a mutation), passing the instance variable as an
> argument may make sense.
>
> In this case, I am leaning towards keeping it an instance method and not
> passing the Resource as argument.

That's what I was leaning toward as well. I've also put that refactor 
into this patch since it really only affects about three lines of code.

>
>> +++ b/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java
>> +        } catch (UnsupportedEncodingException e) { // "UTF-8" is hardcoded, this won't happen
>> +            return resourceUrl;
> If this case can only happen if a developer makes a mistake, perhaps
> throwing a 'new IllegalStateException("UTF-8 is a hardcoded and
> always-supported encoding")' may make more sense?
>
>> +    private static boolean checkEncoding(String path) {
> It's a good idea to name methods so the name describes the return value.
> In this case, it would be nice to describe what is it checking, and what
> the return value indicates.
>
> Maybe call it 'isPathMalformed'? (or maybe invert the conditional and
> call it 'isPathValid'?)
>
>> +        } catch (UnsupportedEncodingException e) {
> Please don't ignore exceptions. If it should never happen, throw an
> AssertionError or IllegalStateException.

Okay, this is sounds good to me. Thanks for the advice.

>
>> +        return !(path.equals(decodedUrl) && path.equals(encodedUrl));
> In general, it's better to comment the 'why' instead of the 'what'. I
> see some comments in this file which say that method foo may return null
> and (personally) I don't find those style of comments too useful (the
> method has javadocs already, no?). But I do think describing why this
> compare provides the right result is a good idea.
>
>> +++ b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceUrlCreatorTest.java
>> +    private static final Version version_11 = new Version("1.1");
>> +    private static final Version version_20 = new Version("2.0");
>> +    private static final Version version_two = new Version("version two");
>> +    private static final DownloadOptions dlopts_noPack_useVersion = new DownloadOptions(false, true);
>> +    private static final DownloadOptions dlopts_noPack_noVersion = new DownloadOptions(false, false);
> It's generally common to have constants (which is what these static,
> final and immutable objects are) declared as UPPER_CASE.

Yea, I had quickly extracted those values out into constants and didn't 
really think about what I named them. Should've followed convention the 
first time :)

>
>> +    @Test
>> +    public void testPartiallyEncodedUrl() throws MalformedURLException {
>> +        URL result = getResultUrl("http://test.com/a malformed%20url.jar", null, dlopts_noPack_useVersion);
>> +        assertEquals("http://test.com/a malformed%20url.jar", result.toString());
>> +    }
> Instead of "test.com", have you considered using "example.com"? It's a
> real URL meant for examples.
>
> Cheers,
> Omair

This is done in the new patch. Doesn't matter at this point because no 
network requests are ever made by the tests, but anyway no harm done 
changing it.

I also ended up adding several new tests. There's one extremely tiny new 
helper method in ResourceUrlCreator - all it does is take a string, 
return empty string if the argument is null and otherwise return the 
same string. Just because URL.get* tends to return null for optional 
non-specified parameters. I didn't write tests for that one.

New ChangeLog:
PR1204 patch regression fix
* netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java: 
(getVersionedUrl) fix regression in previous PR1204 patch. Refactor to 
not take Resource parameter, use instance's field instead. 
(uriPartToString) new method
* 
tests/netx/unit/net/sourceforge/jnlp/cache/ResourceUrlCreatorTest.java: 
new tests for ResourceUrlCreator.getVersionedUrl

Thanks,

-- 
Andrew A

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PR1204_regression_refactor.patch
Type: text/x-patch
Size: 14495 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131002/4dadbe04/PR1204_regression_refactor.patch 

From omajid at redhat.com  Wed Oct  2 15:36:52 2013
From: omajid at redhat.com (Omair Majid)
Date: Wed, 02 Oct 2013 18:36:52 -0400
Subject: [rfc][icedtea-web] Fix regression in recent PR1204 patch
In-Reply-To: <524C8D93.2040102@redhat.com>
References: <524AEE16.1040402@redhat.com> <524AF1DB.8070403@redhat.com>
	<524B3BAD.9040303@redhat.com> <524C5539.5050107@redhat.com>
	<524C8D93.2040102@redhat.com>
Message-ID: <524CA004.4010400@redhat.com>

On 10/02/2013 05:18 PM, Andrew Azores wrote:
> Well, I ended up running into another corner case (as I mentioned on
> IRC) and decided it was easier to ditch the URI class and go back to
> manually constructing URLs :( . This is sort of ugly IMO but it
> completely sidesteps the percent-encoding issues involved with using
> URI, which was quickly making that solution uglier and uglier anyway.
> It's still enhanced over the pre-PR1204 fix version though, as that one
> was missing some of the optional parts in a URL. It had no user info and
> no query string, notably. Now it does, and tests for them too!

> I didn't write tests for that one.

That should be fine; it's a helper method that is exercised by other
tests already, right?

Patch looks good to me.

Cheers,
Omair

-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681

From ptisnovs at icedtea.classpath.org  Thu Oct  3 01:17:41 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Thu, 03 Oct 2013 08:17:41 +0000
Subject: /hg/rhino-tests: Added new test testNewInstance into the test suite
Message-ID: <hg.3c6b83c0c0b6.1380788261.-6019694633368342460@icedtea.classpath.org>

changeset 3c6b83c0c0b6 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=3c6b83c0c0b6
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Oct 03 10:21:27 2013 +0200

	Added new test testNewInstance into the test suite
	SimpleBindingsClassTest.


diffstat:

 ChangeLog                                       |   6 ++++++
 src/org/RhinoTests/SimpleBindingsClassTest.java |  18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 0 deletions(-)

diffs (41 lines):

diff -r 9a5179c62ad8 -r 3c6b83c0c0b6 ChangeLog
--- a/ChangeLog	Wed Oct 02 09:45:49 2013 +0200
+++ b/ChangeLog	Thu Oct 03 10:21:27 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-03  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/SimpleBindingsClassTest.java:
+	Added new test testNewInstance into the test suite
+	SimpleBindingsClassTest.
+
 2013-10-02  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptEngineFactoryClassTest.java:
diff -r 9a5179c62ad8 -r 3c6b83c0c0b6 src/org/RhinoTests/SimpleBindingsClassTest.java
--- a/src/org/RhinoTests/SimpleBindingsClassTest.java	Wed Oct 02 09:45:49 2013 +0200
+++ b/src/org/RhinoTests/SimpleBindingsClassTest.java	Thu Oct 03 10:21:27 2013 +0200
@@ -1652,6 +1652,24 @@
     }
 
     /**
+     * Test for method javax.script.SimpleBindings.getClass().newInstance()
+     */
+    protected void testNewInstance() {
+        try {
+            Object o = this.simpleBindingsClass.newInstance();
+        }
+        catch (InstantiationException e) {
+            e.printStackTrace();
+            throw new AssertionError(e.getMessage());
+        }
+        catch (IllegalAccessException e) {
+            e.printStackTrace();
+            throw new AssertionError(e.getMessage());
+        }
+
+    }
+
+    /**
      * Test for instanceof operator applied to a class javax.script.SimpleBindings
      */
     @SuppressWarnings("cast")

From ptisnovs at icedtea.classpath.org  Thu Oct  3 01:20:00 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Thu, 03 Oct 2013 08:20:00 +0000
Subject: /hg/gfx-test: Ten new tests added into BitBltBasicTests test suite.
Message-ID: <hg.41ce64887abb.1380788400.-6248649288953172555@icedtea.classpath.org>

changeset 41ce64887abb in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=41ce64887abb
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Oct 03 10:23:48 2013 +0200

	Ten new tests added into BitBltBasicTests test suite.


diffstat:

 ChangeLog                                        |    5 +
 src/org/gfxtest/testsuites/BitBltBasicTests.java |  151 +++++++++++++++++++++++
 2 files changed, 156 insertions(+), 0 deletions(-)

diffs (173 lines):

diff -r 7fa68bf4256a -r 41ce64887abb ChangeLog
--- a/ChangeLog	Wed Oct 02 09:51:47 2013 +0200
+++ b/ChangeLog	Thu Oct 03 10:23:48 2013 +0200
@@ -1,3 +1,8 @@
+2013-10-03  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltBasicTests.java:
+	Ten new tests added into BitBltBasicTests test suite.
+
 2013-10-02  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java:
diff -r 7fa68bf4256a -r 41ce64887abb src/org/gfxtest/testsuites/BitBltBasicTests.java
--- a/src/org/gfxtest/testsuites/BitBltBasicTests.java	Wed Oct 02 09:51:47 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java	Thu Oct 03 10:23:48 2013 +0200
@@ -6278,6 +6278,157 @@
     }
 
     /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image with type TYPE_INT_RGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture5BufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_INT_RGB);
+    }
+
+    /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image with type TYPE_INT_ARGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture5BufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_INT_ARGB);
+    }
+
+    /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image with type TYPE_INT_ARGB_PRE.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture5BufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE);
+    }
+
+    /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image with type TYPE_USHORT_555_RGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture5BufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB);
+    }
+
+    /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image with type TYPE_USHORT_565_RGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture5BufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB);
+    }
+
+    /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image with type TYPE_USHORT_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture5BufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture5Image(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY);
+    }
+
+    /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image with type TYPE_3BYTE_BGR.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture6BufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR);
+    }
+
+    /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image with type TYPE_4BYTE_ABGR.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture6BufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR);
+    }
+
+    /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image with type TYPE_4BYTE_ABGR_PRE.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture6BufferedImageType4ByteABGR_PRE(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE);
+    }
+
+    /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image
+     * with type TYPE_BYTE_BINARY.
+     * 
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture6BufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY);
+    }
+
+    /**
      * Entry point to the test suite.
      *
      * @param args not used in this case

From gitne at icedtea.classpath.org  Thu Oct  3 05:57:00 2013
From: gitne at icedtea.classpath.org (gitne at icedtea.classpath.org)
Date: Thu, 03 Oct 2013 12:57:00 +0000
Subject: /hg/icedtea-web: * Cache viewer update:
Message-ID: <hg.c797a2c1329b.1380805020.8643924302249223276@icedtea.classpath.org>

changeset c797a2c1329b in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c797a2c1329b
author: Jacob Wisor <gitne at gmx.de>
date: Thu Oct 03 14:54:25 2013 +0200

	* Cache viewer update:
	  - Can be closed by ESC key
	  - Enabling and disabling of operational buttons is handled properly
	  - Time consuming operations are indicated by a mouse busy cursor
	  - "Size" and "Last Modified" columns display localized data

		* netx/net/sourceforge/jnlp/controlpanel/CachePane.java:
		Moved JButtons to members.
		(addComponents): Modified to make use of new NonEditableTableModel.
		Added ListSelectionListener to propertly handle enabling and disabling of
		operational	JButtons when selecting a resource from the cache table.
		Moved inital populating of the cache table to CacheViewer's constructor
		until after the	CachePane has been instatiated.
		Added a general purpose Comparator for all non-String columns in the table
		model.
		Added a TableCellRenderer with proper localized rendering of "Size" and
		"Last Modified" columns as well as the content of "Name" and "Path"
		columns.
		(createButtonPanel): Moved delete operation into new method
		invokeDeleteLater(), added mouse cursor busy indicator, and proper handling
		of enabling and disabling of operational JButtons when pushing the delete
		button.
		Moved refresh operation when pushing the refresh button into new method
		invokePopulateLater() and added proper handling of enabling and disabling
		of operational JButtons while refreshing.
		Replaced closing the cache viewer dialog via JDialog.dispose() when pushing
		the delete button by a post of the WindowEvent.WINDOW_CLOSING event to
		the CacheViewer dialog in order	to effectively remove the newly introduced
		KeyEventDispatcher.
		(invokeDeleteLater): New method: Posts an event to the event queue deleting
		the currently selected resource.
		(invokePopulateLater): New method: Posts an event to the event queue
		repopulating the cache table.
		(populateTable):
		Added mouse cursor busy indicator.
		(generateData): Modified cache table's per row data model for proper
		rendering and sorting to: DirectoryNode, File, String, String, Long, Date.
		* netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java:
		(CacheViewer): Added null parameter check.
		Added a KeyEventDispatcher to enable closing the CacheViewer dialog on a
		KeyEvent.VK_ESCAPE key event.
		Replaced closing the cache viewer dialog via JDialog.dispose() by a post
		of the WindowEvent.WINDOW_CLOSING event to the CacheViewer dialog in order
		to effectively remove the newly introduced KeyEventDispatcher.
		* netx/net/sourceforge/jnlp/util/ui/NonEditableTableModel.java:
		Added a new table model that in effect is a
		javax.swing.table.DefaultTableModel	except for no cell being editable.
		* netx/net/sourceforge/jnlp/util/ui/package-info.java:
		Added new package for UI common and recurrung UI tasks with documentation


diffstat:

 ChangeLog                                                    |   46 +
 NEWS                                                         |    5 +
 netx/net/sourceforge/jnlp/controlpanel/CachePane.java        |  332 +++++++---
 netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java      |   39 +-
 netx/net/sourceforge/jnlp/util/ui/NonEditableTableModel.java |  124 ++++
 netx/net/sourceforge/jnlp/util/ui/package-info.java          |   41 +
 6 files changed, 480 insertions(+), 107 deletions(-)

diffs (truncated from 785 to 500 lines):

diff -r c4476a810053 -r c797a2c1329b ChangeLog
--- a/ChangeLog	Tue Oct 01 23:43:31 2013 -0400
+++ b/ChangeLog	Thu Oct 03 14:54:25 2013 +0200
@@ -1,3 +1,49 @@
+2013-10-03  Jacob Wisor  <gitne at gmx.de>
+
+	* netx/net/sourceforge/jnlp/controlpanel/CachePane.java:
+	Moved JButtons to members.
+	(addComponents): Modified to make use of new NonEditableTableModel.
+	Added ListSelectionListener to propertly handle enabling and disabling of
+	operational	JButtons when selecting a resource from the cache table.
+	Moved inital populating of the cache table to CacheViewer's constructor
+	until after the	CachePane has been instatiated.
+	Added a general purpose Comparator for all non-String columns in the table
+	model.
+	Added a TableCellRenderer with proper localized rendering of "Size" and
+	"Last Modified" columns as well as the content of "Name" and "Path"
+	columns.
+	(createButtonPanel): Moved delete operation into new method
+	invokeDeleteLater(), added mouse cursor busy indicator, and proper handling
+	of enabling and disabling of operational JButtons when pushing the delete
+	button.
+	Moved refresh operation when pushing the refresh button into new method 
+	invokePopulateLater() and added proper handling of enabling and disabling
+	of operational JButtons while refreshing.
+	Replaced closing the cache viewer dialog via JDialog.dispose() when pushing
+	the delete button by a post of the WindowEvent.WINDOW_CLOSING event to
+	the CacheViewer dialog in order	to effectively remove the newly introduced 
+	KeyEventDispatcher.
+	(invokeDeleteLater): New method: Posts an event to the event queue deleting
+	the currently selected resource.
+	(invokePopulateLater): New method: Posts an event to the event queue
+	repopulating the cache table.
+	(populateTable):
+	Added mouse cursor busy indicator.
+	(generateData): Modified cache table's per row data model for proper
+	rendering and sorting to: DirectoryNode, File, String, String, Long, Date.
+	* netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java:
+	(CacheViewer): Added null parameter check.
+	Added a KeyEventDispatcher to enable closing the CacheViewer dialog on a
+	KeyEvent.VK_ESCAPE key event.
+	Replaced closing the cache viewer dialog via JDialog.dispose() by a post
+	of the WindowEvent.WINDOW_CLOSING event to the CacheViewer dialog in order
+	to effectively remove the newly introduced KeyEventDispatcher.
+	* netx/net/sourceforge/jnlp/util/ui/NonEditableTableModel.java:
+	Added a new table model that in effect is a
+	javax.swing.table.DefaultTableModel	except for no cell being editable.
+	* netx/net/sourceforge/jnlp/util/ui/package-info.java:
+	Added new package for UI common and recurrung UI tasks with documentation
+
 2013-10-01  Omair Majid  <omajid at redhat.com>
 
 	* netx/net/sourceforge/jnlp/browser/BrowserAwareProxySelector.java
diff -r c4476a810053 -r c797a2c1329b NEWS
--- a/NEWS	Tue Oct 01 23:43:31 2013 -0400
+++ b/NEWS	Thu Oct 03 14:54:25 2013 +0200
@@ -12,6 +12,11 @@
 * IcedTea-Web now using tagsoup as default (tagsoup dependence) sanitizer for input
 * JDK older then 1.5 no longer supported
 * IcedTea-Web is now following XDG .config and .cache specification(RH947647)
+* Cache Viewer
+  - Can be closed by ESC key
+  - Enabling and disabling of operational buttons is handled properly
+  - Time consuming operations are indicated by a mouse busy cursor
+  - "Size" and "Last Modified" columns display localized data
 * NetX
   - PR1465 - java.io.FileNotFoundException while trying to download a JAR file
   - Netx can now parse malformed jnlp files using tagsoup
diff -r c4476a810053 -r c797a2c1329b netx/net/sourceforge/jnlp/controlpanel/CachePane.java
--- a/netx/net/sourceforge/jnlp/controlpanel/CachePane.java	Tue Oct 01 23:43:31 2013 -0400
+++ b/netx/net/sourceforge/jnlp/controlpanel/CachePane.java	Thu Oct 03 14:54:25 2013 +0200
@@ -1,5 +1,5 @@
 /* CachePane.java -- Displays the specified folder and allows modification to its content.
-Copyright (C) 2010 Red Hat
+Copyright (C) 2013 Red Hat
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -19,22 +19,27 @@
 
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.Cursor;
 import java.awt.Dimension;
+import java.awt.EventQueue;
 import java.awt.FlowLayout;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.GridLayout;
+import java.awt.SystemColor;
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.channels.FileLock;
 import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.Enumeration;
 import java.util.List;
 
@@ -45,7 +50,10 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
-import javax.swing.table.DefaultTableModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
 
 import net.sourceforge.jnlp.cache.CacheDirectory;
@@ -54,23 +62,25 @@
 import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import net.sourceforge.jnlp.runtime.Translator;
 import net.sourceforge.jnlp.util.FileUtils;
+import net.sourceforge.jnlp.util.PropertiesFile;
 import net.sourceforge.jnlp.util.logging.OutputController;
-import net.sourceforge.jnlp.util.PropertiesFile;
+import net.sourceforge.jnlp.util.ui.NonEditableTableModel;
 
 public class CachePane extends JPanel {
-
     JDialog parent;
     DeploymentConfiguration config;
     private String location;
     private JComponent defaultFocusComponent;
     DirectoryNode root;
-    String[] columns = { Translator.R("CVCPColName"),
+    String[] columns = {
+            Translator.R("CVCPColName"),
             Translator.R("CVCPColPath"),
             Translator.R("CVCPColType"),
             Translator.R("CVCPColDomain"),
             Translator.R("CVCPColSize"),
             Translator.R("CVCPColLastModified") };
     JTable cacheTable;
+    private JButton deleteButton, refreshButton, doneButton;
 
     /**
      * Creates a new instance of the CachePane.
@@ -95,42 +105,64 @@
         GridBagConstraints c = new GridBagConstraints();
         c.fill = GridBagConstraints.BOTH;
 
-        DefaultTableModel model = new DefaultTableModel(columns, 0) {
-            public boolean isCellEditable(int row, int column) {
-                return false;
-            }
-        };
+        TableModel model = new NonEditableTableModel(columns, 0);
 
         cacheTable = new JTable(model);
         cacheTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        cacheTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+            final public void valueChanged(ListSelectionEvent listSelectionEvent) {
+                // If no row has been selected, disable the delete button, else enable it
+                if (cacheTable.getSelectionModel().isSelectionEmpty())
+                    // Disable delete button, since nothing selected
+                    deleteButton.setEnabled(false);
+                else
+                    // Enable delete button, since something selected
+                    deleteButton.setEnabled(true);
+            }
+        });
         cacheTable.setAutoResizeMode(JTable.AUTO_RESIZE_NEXT_COLUMN);
         cacheTable.setPreferredScrollableViewportSize(new Dimension(600, 200));
         cacheTable.setFillsViewportHeight(true);
         JScrollPane scrollPane = new JScrollPane(cacheTable);
 
-        populateTable();
+        TableRowSorter<TableModel> tableSorter = new TableRowSorter<TableModel>(model);
+        final Comparator comparator = new Comparator<Comparable>() { // General purpose Comparator
+            public final int compare(final Comparable a, final Comparable b) {
+                return a.compareTo(b);
+            }
+        };
+        tableSorter.setComparator(1, comparator); // Comparator for path column.
+        tableSorter.setComparator(4, comparator); // Comparator for size column.
+        tableSorter.setComparator(5, comparator); // Comparator for modified column.
+        cacheTable.setRowSorter(tableSorter);
+        final DefaultTableCellRenderer tableCellRenderer = new DefaultTableCellRenderer() {
+            @Override
+            public final Component getTableCellRendererComponent(final JTable table, final Object value, final boolean isSelected, final boolean hasFocus, final int row, final int column) {
+                super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
 
-        TableRowSorter<DefaultTableModel> tableSorter = new TableRowSorter<DefaultTableModel>(model);
-        tableSorter.setComparator(4, new Comparator<Long>() { // Comparator for size column.
-            @Override
-            public int compare(Long o1, Long o2) {
-                return o1.compareTo(o2);
+                switch (column) {
+                    case 1: // Path column
+                    // Render absolute path
+                    super.setText(((File)value).getAbsolutePath());
+                    break;
+                    case 4: // Size column
+                    // Render size formatted to default locale's number format
+                    super.setText(NumberFormat.getInstance().format(value));
+                    break;
+                    case 5: // last modified column
+                    // Render modify date formatted to default locale's date format
+                    super.setText(DateFormat.getDateInstance().format(value));
+                }
+
+                return this;
             }
-        });
-        tableSorter.setComparator(5, new Comparator<String>() { // Comparator for date column.
-            @Override
-            public int compare(String o1, String o2) {
-                DateFormat format = new SimpleDateFormat("MM/dd/yyyy");
-                try {
-                    Long time1 = format.parse(o1).getTime();
-                    Long time2 = format.parse(o2).getTime();
-                    return time1.compareTo(time2);
-                } catch (ParseException e) {
-                    return 0;
-                }
-            }
-        });
-        cacheTable.setRowSorter(tableSorter);
+        };
+        // TableCellRenderer for path column
+        cacheTable.getColumn(this.columns[1]).setCellRenderer(tableCellRenderer);
+        // TableCellRenderer for size column
+        cacheTable.getColumn(this.columns[4]).setCellRenderer(tableCellRenderer);
+        // TableCellRenderer for last modified column
+        cacheTable.getColumn(this.columns[5]).setCellRenderer(tableCellRenderer);
 
         c.weightx = 1;
         c.weighty = 1;
@@ -139,7 +171,6 @@
         topPanel.add(scrollPane, c);
         this.add(topPanel, BorderLayout.CENTER);
         this.add(createButtonPanel(), BorderLayout.SOUTH);
-
     }
 
     /**
@@ -154,85 +185,45 @@
 
         List<JButton> buttons = new ArrayList<JButton>();
 
-        JButton deleteButton = new JButton(Translator.R("CVCPButDelete"));
+        this.deleteButton = new JButton(Translator.R("CVCPButDelete"));
         deleteButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                FileLock fl = null;
-                File netxRunningFile = new File(config.getProperty(DeploymentConfiguration.KEY_USER_NETX_RUNNING_FILE));
-                if (!netxRunningFile.exists()) {
-                    try {
-                        FileUtils.createParentDir(netxRunningFile);
-                        FileUtils.createRestrictedFile(netxRunningFile, true);
-                    } catch (IOException e1) {
-                        OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e1);
-                    }
-                }
-
-                try {
-                    fl = FileUtils.getFileLock(netxRunningFile.getPath(), false, false);
-                } catch (FileNotFoundException e1) {
-                }
-
-                int row = cacheTable.getSelectedRow();
-                try {
-                    if (fl == null) return;
-                    if (row == -1 || row > cacheTable.getRowCount() - 1)
-                        return;
-                    int modelRow = cacheTable.convertRowIndexToModel(row);
-                    DirectoryNode fileNode = ((DirectoryNode) cacheTable.getModel().getValueAt(modelRow, 0));
-                    if (fileNode.getFile().delete()) {
-                        updateRecentlyUsed(fileNode.getFile());
-                        fileNode.getParent().removeChild(fileNode);
-                        FileUtils.deleteWithErrMesg(fileNode.getInfoFile());
-                        ((DefaultTableModel) cacheTable.getModel()).removeRow(modelRow);
-                        cacheTable.getSelectionModel().setSelectionInterval(row, row);
-                        CacheDirectory.cleanParent(fileNode);
-                    }
-                } catch (Exception exception) {
-                    //ignore
-                }
-
-                if (fl != null) {
-                    try {
-                        fl.release();
-                        fl.channel().close();
-                    } catch (IOException e1) {
-                        OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e1);
-                    }
-                }
-            }
-
-            private void updateRecentlyUsed(File f) {
-                File recentlyUsedFile = new File(location + File.separator + CacheLRUWrapper.CACHE_INDEX_FILE_NAME);
-                PropertiesFile pf = new PropertiesFile(recentlyUsedFile);
-                pf.load();
-                Enumeration<Object> en = pf.keys();
-                while (en.hasMoreElements()) {
-                    String key = (String) en.nextElement();
-                    if (pf.get(key).equals(f.getAbsolutePath())) {
-                        pf.remove(key);
-                    }
-                }
-                pf.store();
+                // Deleting may take a while, so indicate busy by cursor
+                parent.getContentPane().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+                // Disable dialog and buttons while deleting
+                deleteButton.setEnabled(false);
+                refreshButton.setEnabled(false);
+                doneButton.setEnabled(false);
+                // Delete on AWT thread after this action has been performed
+                // in order to allow the cache viewer to update itself
+                invokeLaterDelete();
             }
         });
+        deleteButton.setEnabled(false);
         buttons.add(deleteButton);
 
-        JButton refreshButton = new JButton(Translator.R("CVCPButRefresh"));
+        this.refreshButton = new JButton(Translator.R("CVCPButRefresh"));
         refreshButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                populateTable();
+                // Disable all its controls when performing cacheTable refresh (populating)
+                deleteButton.setEnabled(false);
+                refreshButton.setEnabled(false);
+                doneButton.setEnabled(false);
+                // Populate cacheTable on AWT thread after this action event has been performed
+                invokeLaterPopulateTable();
             }
         });
+        refreshButton.setEnabled(false);
         buttons.add(refreshButton);
 
-        JButton doneButton = new JButton(Translator.R("ButDone"));
+        this.doneButton = new JButton(Translator.R("ButDone"));
         doneButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                parent.dispose();
+                Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(
+                        new WindowEvent(parent, WindowEvent.WINDOW_CLOSING));
             }
         });
 
@@ -251,6 +242,7 @@
         }
 
         doneButton.setPreferredSize(new Dimension(wantedWidth, wantedHeight));
+        doneButton.setEnabled(false);
         rightPanel.add(doneButton);
         buttonPanel.add(leftPanel);
         buttonPanel.add(rightPanel);
@@ -259,13 +251,140 @@
     }
 
     /**
+     * Posts an event to the event queue to delete the currently selected
+     * resource in {@link CachePane#cacheTable} after the {@code CachePane} and
+     * {@link CacheViewer} have been instantiated and painted.
+     * @see CachePane#cacheTable
+     */
+    private final void invokeLaterDelete() {
+        EventQueue.invokeLater(new Runnable() {
+            public void run() {
+                try {
+                    FileLock fl = null;
+                    File netxRunningFile = new File(config.getProperty(DeploymentConfiguration.KEY_USER_NETX_RUNNING_FILE));
+                    if (!netxRunningFile.exists()) {
+                        try {
+                            FileUtils.createParentDir(netxRunningFile);
+                            FileUtils.createRestrictedFile(netxRunningFile, true);
+                        } catch (IOException e1) {
+                            OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e1);
+                        }
+                    }
+
+                    try {
+                        fl = FileUtils.getFileLock(netxRunningFile.getPath(), false, false);
+                    } catch (FileNotFoundException e1) {
+                    }
+
+                    int row = cacheTable.getSelectedRow();
+                    try {
+                        if (fl == null) return;
+                        int modelRow = cacheTable.convertRowIndexToModel(row);
+                        DirectoryNode fileNode = ((DirectoryNode) cacheTable.getModel().getValueAt(modelRow, 0));
+                        if (fileNode.getFile().delete()) {
+                            updateRecentlyUsed(fileNode.getFile());
+                            fileNode.getParent().removeChild(fileNode);
+                            FileUtils.deleteWithErrMesg(fileNode.getInfoFile());
+                            ((NonEditableTableModel) cacheTable.getModel()).removeRow(modelRow);
+                            cacheTable.getSelectionModel().clearSelection();
+                            CacheDirectory.cleanParent(fileNode);
+                        }
+                    } catch (Exception exception) {
+                        // ignore
+                    }
+
+                    if (fl != null) {
+                        try {
+                            fl.release();
+                            fl.channel().close();
+                        } catch (IOException e1) {
+                            OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e1);
+                        }
+                    }
+                } catch (Exception exception) {
+                        OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, exception);
+                } finally {
+                    // If nothing selected then keep deleteButton disabled
+                    if (!cacheTable.getSelectionModel().isSelectionEmpty()) deleteButton.setEnabled(true);
+                    // Enable buttons
+                    refreshButton.setEnabled(true);
+                    doneButton.setEnabled(true);
+                    // If cacheTable is empty disable it and set background
+                    // color to indicate being disabled
+                    if (cacheTable.getModel().getRowCount() == 0) {
+                        cacheTable.setEnabled(false);
+                        cacheTable.setBackground(SystemColor.control);
+                    }
+                    // Reset cursor
+                    parent.getContentPane().setCursor(Cursor.getDefaultCursor());
+                }
+            }
+
+            private void updateRecentlyUsed(File f) {
+                File recentlyUsedFile = new File(location + File.separator + CacheLRUWrapper.CACHE_INDEX_FILE_NAME);
+                PropertiesFile pf = new PropertiesFile(recentlyUsedFile);
+                pf.load();
+                Enumeration<Object> en = pf.keys();
+                while (en.hasMoreElements()) {
+                    String key = (String) en.nextElement();
+                    if (pf.get(key).equals(f.getAbsolutePath())) {
+                        pf.remove(key);
+                    }
+                }
+                pf.store();
+            }
+        });
+    }
+
+    /**
+     * Posts an event to the event queue to populate the
+     * {@link CachePane#cacheTable} after the {@code CachePane} and
+     * {@link CacheViewer} have been instantiated and painted.
+     * @see CachePane#populateTable
+     */
+    final void invokeLaterPopulateTable() {
+        EventQueue.invokeLater(new Runnable() {
+            public void run() {
+                try {
+                    populateTable();
+                    // Disable cacheTable when no data to display, so no events are generated
+                    if (cacheTable.getModel().getRowCount() == 0) {
+                        cacheTable.setEnabled(false);
+                        cacheTable.setBackground(SystemColor.control);
+                        // No data in cacheTable, so nothing to delete
+                        deleteButton.setEnabled(false);
+                    } else {
+                        cacheTable.setEnabled(true);
+                        cacheTable.setBackground(SystemColor.text);
+                    }
+                } catch (Exception exception) {
+                        OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, exception);
+                } finally {
+                    refreshButton.setEnabled(true);
+                    doneButton.setEnabled(true);
+                }
+            }
+        });
+    }
+
+    /**
      * Populate the table with fresh data. Any manual updates to the cache
      * directory will be updated in the table.
      */
     private void populateTable() {
-        ((DefaultTableModel) cacheTable.getModel()).setRowCount(0); //Clears the table
-        for (Object[] v : generateData(root))
-            ((DefaultTableModel) cacheTable.getModel()).addRow(v);
+        try {
+            // Populating the cacheTable may take a while, so indicate busy by cursor
+            parent.getContentPane().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+
+            NonEditableTableModel tableModel;
+            (tableModel = (NonEditableTableModel)cacheTable.getModel()).setRowCount(0); //Clears the table
+            for (Object[] v : generateData(root)) tableModel.addRow(v);
+        } catch (Exception exception) {

From gitne at gmx.de  Thu Oct  3 06:00:36 2013
From: gitne at gmx.de (Jakob Wisor)
Date: Thu, 03 Oct 2013 15:00:36 +0200
Subject: [rfc][icedtea-web] Cache viewer cleanup
In-Reply-To: <524BC4AD.1080306@redhat.com>
References: <201307302347.r6UNl2x1011963@mail-web03.excite.co.jp>	<5229ACDB.7030102@redhat.com>	<52364E27.3010300@gmx.de>	<523713B7.6080607@redhat.com>	<523B4687.8070505@gmx.de>
	<524B35EC.3030902@gmx.de> <524BC4AD.1080306@redhat.com>
Message-ID: <524D6A74.60308@gmx.de>

Jiri Vanek schrieb:
> On 10/01/2013 10:51 PM, Jacob Wisor wrote:
>> Hello,
>>
>>> Jiri Vanek wrote:
>>>> On 09/16/2013 02:17 AM, Jakob Wisor wrote:
>>>>> Hello there!
>>>>>
>>>>> I have checked and corrected the code's formatting, and followed
>>>>> Jiri's reasonable advice.
>>>>>
>>>>> Jiri Vanek wrote:
>>>>>> On 07/31/2013 01:47 AM, Jacob Wisor wrote:
>>>>>>> Hello,
>>>>>>>
>>>>>>> * Added closing of cache viewer by ESC key
>>>>>>> * Added proper dis-/enabling of cache viewer's buttons
>>>>>>> * Added busy mouse cursor indicator when populating the cache viewer
>>>>>>>
>>>>>>> Everything is done on purpose on the AWT thread as before. Although
>>>>>>> I am personally not in favor
>>>>>>> of anonymous classes, I have tried to stick to the prevalent coding
>>>>>>> style.
>>>>>>>
>>>>>>> Unfortunately, I was unable to test the cache viewer's behavior
>>>>>>> because I do not know how to put
>>>>>>> synthetic cache entries into the cache. Can anyone help me with
>>>>>>> that? What does a the cache look
>>>>>>> like when filled with resources? Is there any index file that keeps
>>>>>>> track of the cache?
>>>>
>>>> As this is gui change only, it shouldbe ok without test.
>>>> However cache is set of jars and jnlp files saved in
>>>> url-like-filestrucutre
>>>>
>>>> eg http:\\my.domain\myApp.jnlp with myJAr in "." codebase will be
>>>> saved like
>>>> cache/http/my/domain/myApp.jnlp
>>>> cache/http/my/domain/myJar.jnlp
>>>>
>>>> and yes, there is index file in tom cache directory
>>>>
>>>> I have some memorry that there are already tests for it - most simple
>>>> case how to import jar into cache is to lunch javaws ;)
>>>>
>>>>>>>
>>>> ...,snip...
>>>>>> Those should be in finally block
>>>>>>> + parent.getContentPane().setCursor(Cursor.getDefaultCursor());
>>>>>
>>>>> Done. Please check whether I have done it correctly or the way you
>>>>> have meant.
>>>>>
>>>>>>> }
>>>>
>>>> Thank you.
>>  >>>> [...]
>>>>>> Please mention both Cache viewer cleanup and CerViewr viewer
>>>>>> cleanup in news.
>>>>>
>>>>> Will do but they are separate patches.
>>>>>
>>>>> Happy reviewing!
>>>>
>>>> For _this_ patch, the NEWS line should be attached explicitly.
>>>> For CerViewr the separate patch is ok.
>>>>
>>>>
>>>> No more review needed. With above fixed, ok to head (and 1.4 if wonted)
>>>
>>> Okay! :-) Thank you for reviewing. But, I want to test it at least a
>>> little bit. Now, that I have written a few JNLP application and applet
>>> tests I have kinda also found the time and leisure to really do it. ;-)
>>> It's better do it once before feeling sorry afterwards.
>>
>> After throughly testing this patch I think it is ready to be pushed.
>> Please review the NEWS and ChangeLog sections. I have also decided to 
>> include the new NonEditableTableModel class with this patch, since 
>> this patch can also make use of it. It is also going to be ready for 
>> the upcoming certificate viewer patch.
> 
> I'm happy with the patch code, however the delete button have not worked 
> for me :(

Right :( Sorry for any inconvenience. Thank you for catching this. I forgot to 
test the delete button again after changing the cache table's data model.

> Also I have noted  two empty catch blocks. Please log the exceptions in 
> Debug mode on.

Ah yes, I was not aware that this would be of any interest. Done.

> Also  - that is nit probably for another change set (if changeset at 
> all) - is multiple selection or "delete all" button in your queue?

Indeed, I have thought about this too (multi-select is probably a better 
approach). Generally speaking there is still a lot of room for improvement, 
especially when compared to e.g. Oracle's JNLP client (I don't endorse Oracle's 
JNLP client). This and other stuff is on my list of improvements, though I am 
unsure about as to when or ever since my time is limited.

> Once delete button working/not working cleared and catch block logged, 
> ok to go.

A change to the cache viewer's table model has caused this. I have reverted to 
DirectoryNode for column 0. I am not really fond of it because DirectoryNode 
should implement Comparable, but this would cause even more work and probably 
testing. File, as initially intended for column 0, does implement Comparable, so 
IMHO is more suitable as a complex type in the model. But, column 0 contains 
effectively file names only, hence the default String comparator is functionally 
equivalent for the user. The delete button is working as intended again.

Regards,
Jacob

From aazores at icedtea.classpath.org  Thu Oct  3 06:25:44 2013
From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org)
Date: Thu, 03 Oct 2013 13:25:44 +0000
Subject: /hg/icedtea-web: Fix regression in ResourceUrlCreator due to PR1...
Message-ID: <hg.cdd42af7c0b5.1380806744.8643924302249223276@icedtea.classpath.org>

changeset cdd42af7c0b5 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=cdd42af7c0b5
author: Andrew Azores <aazores at redhat.com>
date: Thu Oct 03 09:25:35 2013 -0400

	Fix regression in ResourceUrlCreator due to PR1204 patch

	* netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java:
	(getVersionedUrl) fix regression in previous PR1204 patch. Refactor
	to not take Resource parameter, use instance's field instead.
	(uriPartToString) new method
	* tests/netx/unit/net/sourceforge/jnlp/cache/ResourceUrlCreatorTest.java:
	new tests for ResourceUrlCreator.getVersionedUrl


diffstat:

 ChangeLog                                                              |   10 +
 netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java                |   57 ++-
 tests/netx/unit/net/sourceforge/jnlp/cache/ResourceUrlCreatorTest.java |  136 +++++++--
 3 files changed, 148 insertions(+), 55 deletions(-)

diffs (297 lines):

diff -r c797a2c1329b -r cdd42af7c0b5 ChangeLog
--- a/ChangeLog	Thu Oct 03 14:54:25 2013 +0200
+++ b/ChangeLog	Thu Oct 03 09:25:35 2013 -0400
@@ -1,3 +1,13 @@
+2013-10-03  Andrew Azores  <aazores at redhat.com>
+
+	PR1204 patch regression fix
+	* netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java:
+	(getVersionedUrl) fix regression in previous PR1204 patch. Refactor
+	to not take Resource parameter, use instance's field instead.
+	(uriPartToString) new method
+	* tests/netx/unit/net/sourceforge/jnlp/cache/ResourceUrlCreatorTest.java:
+	new tests for ResourceUrlCreator.getVersionedUrl 
+
 2013-10-03  Jacob Wisor  <gitne at gmx.de>
 
 	* netx/net/sourceforge/jnlp/controlpanel/CachePane.java:
diff -r c797a2c1329b -r cdd42af7c0b5 netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java
--- a/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java	Thu Oct 03 14:54:25 2013 +0200
+++ b/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java	Thu Oct 03 09:25:35 2013 -0400
@@ -41,8 +41,11 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.LinkedList;
 import java.util.List;
+import java.io.UnsupportedEncodingException;
 
 import net.sourceforge.jnlp.DownloadOptions;
 
@@ -91,7 +94,7 @@
             }
         }
 
-        url = getVersionedUrl(resource);
+        url = getVersionedUrl();
         urls.add(url);
 
         urls.add(resource.getLocation());
@@ -148,29 +151,47 @@
     }
 
     /**
-     * Returns the URL for a resource, including the resource's version number in the query string
-     *
-     * @param resource the resource to get the url for
+     * Returns the URL for this resource, including the resource's version number in the query string
      */
-    protected URL getVersionedUrl(Resource resource) {
+    protected URL getVersionedUrl() {
         URL resourceUrl = resource.getLocation();
+        String protocol = uriPartToString(resourceUrl.getProtocol()) + "://";
+        String userInfo = uriPartToString(resourceUrl.getUserInfo());
+        if (!userInfo.isEmpty()) {
+            userInfo += "@";
+        }
+        String host = uriPartToString(resourceUrl.getHost());
+        String port;
+        if (resourceUrl.getPort() == -1) {
+            port = "";
+        } else {
+            port = ":" + String.valueOf(resourceUrl.getPort());
+        }
+        String path = uriPartToString(resourceUrl.getPath());
+        String query = uriPartToString(resourceUrl.getQuery());
+        if (!query.isEmpty()) {
+            query = "?" + query;
+        }
+        if (resource.requestVersion != null && resource.requestVersion.isVersionId()) {
+            if (!query.isEmpty()) {
+                query += "&";
+            } else {
+                query = "?" + query;
+            }
+            query += "version-id=" + resource.requestVersion;
+        }
         try {
-            String query = resourceUrl.getQuery(); // returns null if there was no query string
-            if (resource.requestVersion != null && resource.requestVersion.isVersionId()) {
-                if (query == null) {
-                    query = "";
-                } else {
-                    query += "&";
-                }
-                query += "version-id=" + resource.requestVersion;
-            }
-            URI uri = new URI(resourceUrl.getProtocol(), resourceUrl.getUserInfo(), resourceUrl.getHost(), resourceUrl.getPort(), resourceUrl.getPath(), query, null);
-            return uri.toURL();
+            URL url = new URL(protocol + userInfo + host + port + path + query);
+            return url;
         } catch (MalformedURLException e) {
             return resourceUrl;
-        } catch (URISyntaxException e) {
-            return resourceUrl;
         }
     }
 
+    private static String uriPartToString(String part) {
+        if (part == null)
+            return "";
+        return part;
+    }
+
 }
diff -r c797a2c1329b -r cdd42af7c0b5 tests/netx/unit/net/sourceforge/jnlp/cache/ResourceUrlCreatorTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceUrlCreatorTest.java	Thu Oct 03 14:54:25 2013 +0200
+++ b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceUrlCreatorTest.java	Thu Oct 03 09:25:35 2013 -0400
@@ -1,6 +1,8 @@
 package net.sourceforge.jnlp.cache;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -12,81 +14,141 @@
 
 public class ResourceUrlCreatorTest {
 
+    private static final Version VERSION_11 = new Version("1.1");
+    private static final Version VERSION_20 = new Version("2.0");
+    private static final Version VERSION_TWO = new Version("version two");
+    private static final DownloadOptions DLOPTS_NOPACK_USEVERSION = new DownloadOptions(false, true);
+    private static final DownloadOptions DLOPTS_NOPACK_NOVERSION = new DownloadOptions(false, false);
+
+    private URL getResultUrl(String url, Version version,
+            boolean usePack /*use pack.gz suffix*/, boolean useVersion /*use version suffix*/) throws MalformedURLException {
+        Resource resource = Resource.getResource(new URL(url), version, null);
+        return ResourceUrlCreator.getUrl(resource, usePack, useVersion);
+    }
+
+    private URL getResultUrl(String url, Version version, DownloadOptions downloadOptions) throws MalformedURLException {
+        Resource resource = Resource.getResource(new URL(url), version, null);
+        ResourceUrlCreator ruc = new ResourceUrlCreator(resource, downloadOptions);
+        return ruc.getVersionedUrl();
+    }
+
     @Test
     public void testVersionEncode() throws MalformedURLException {
-        Resource resource = Resource.getResource(new URL("http://test.jar"), new Version("1.1"), null);
-        URL result = ResourceUrlCreator.getUrl(resource, false /*don't use pack suffix*/, true /*use version suffix*/);
-        assertEquals("http://test__V1.1.jar", result.toString());
+        URL result = getResultUrl("http://example.com/versionEncode.jar", VERSION_11, false, true);
+        assertEquals("http://example.com/versionEncode__V1.1.jar", result.toString());
     }
 
     @Test
     public void testVersionWithPeriods() throws MalformedURLException {
-        Resource resource = Resource.getResource(new URL("http://test.with.periods.jar"), new Version("1.1"), null);
-        URL result = ResourceUrlCreator.getUrl(resource, false /*don't use pack suffix*/, true /*use version suffix*/);
-
+        URL result = getResultUrl("http://example.com/test.version.with.periods.jar", VERSION_11, false, true);
         // A previous bug had this as "test__V1.1.with.periods.jar"
-        assertEquals("http://test.with.periods__V1.1.jar", result.toString());
+        assertEquals("http://example.com/test.version.with.periods__V1.1.jar", result.toString());
     }
 
     @Test
     public void testPackEncode() throws MalformedURLException {
-        Resource resource = Resource.getResource(new URL("http://test.jar"), new Version("1.1"), null);
-        URL result = ResourceUrlCreator.getUrl(resource, true /*use pack suffix*/, false /*don't use version suffix*/);
-        assertEquals("http://test.jar.pack.gz", result.toString());
+        URL result = getResultUrl("http://example.com/packEncode.jar", VERSION_11, true, false);
+        assertEquals("http://example.com/packEncode.jar.pack.gz", result.toString());
     }
 
     @Test
     public void testVersionAndPackEncode() throws MalformedURLException {
-        Resource resource = Resource.getResource(new URL("http://test.jar"), new Version("1.1"), null);
-        URL result = ResourceUrlCreator.getUrl(resource, true /*use pack suffix*/, true /*use version suffix*/);
-        assertEquals("http://test__V1.1.jar.pack.gz", result.toString());
+        URL result = getResultUrl("http://example.com/versionAndPackEncode.jar", VERSION_11, true, true);
+        assertEquals("http://example.com/versionAndPackEncode__V1.1.jar.pack.gz", result.toString());
     }
 
     @Test
     public void testGetVersionedUrl() throws MalformedURLException {
-        Resource resource = Resource.getResource(new URL("http://foo.com/bar.jar"), new Version("1.1"), null);
-        ResourceUrlCreator ruc = new ResourceUrlCreator(resource, new DownloadOptions(false, true));
-        URL result = ruc.getVersionedUrl(resource);
-        assertEquals("http://foo.com/bar.jar?version-id=1.1", result.toString());
+        URL result = getResultUrl("http://example.com/versionedUrl.jar", VERSION_11, DLOPTS_NOPACK_USEVERSION);
+        assertEquals("http://example.com/versionedUrl.jar?version-id=1.1", result.toString());
     }
 
     @Test
     public void testGetNonVersionIdUrl() throws MalformedURLException {
-        Resource resource = Resource.getResource(new URL("http://foo.com/some.jar"), new Version("version two"), null);
-        ResourceUrlCreator ruc = new ResourceUrlCreator(resource, new DownloadOptions(false, true));
-        URL result = ruc.getVersionedUrl(resource);
-        assertEquals("http://foo.com/some.jar", result.toString());
+        URL result = getResultUrl("http://example.com/nonVersionIdUrl.jar", VERSION_TWO, DLOPTS_NOPACK_USEVERSION);
+        assertEquals("http://example.com/nonVersionIdUrl.jar", result.toString());
     }
 
     @Test
     public void testGetVersionedUrlWithQuery() throws MalformedURLException {
-        Resource resource = Resource.getResource(new URL("http://bar.com/bar.jar?i=1234abcd"), new Version("1.1"), null);
-        ResourceUrlCreator ruc = new ResourceUrlCreator(resource, new DownloadOptions(false, true));
-        URL result = ruc.getVersionedUrl(resource);
-        assertEquals("http://bar.com/bar.jar?i=1234abcd&version-id=1.1", result.toString());
+        URL result = getResultUrl("http://example.com/versionedUrlWithQuery.jar?i=1234abcd", VERSION_11, DLOPTS_NOPACK_USEVERSION);
+        assertEquals("http://example.com/versionedUrlWithQuery.jar?i=1234abcd&version-id=1.1", result.toString());
     }
 
     @Test
     public void testGetVersionedUrlWithoutVersion() throws MalformedURLException {
-        Resource resource = Resource.getResource(new URL("http://baz.com/bar.jar"), null, null);
-        ResourceUrlCreator ruc = new ResourceUrlCreator(resource, new DownloadOptions(false, false));
-        URL result = ruc.getVersionedUrl(resource);
-        assertEquals("http://baz.com/bar.jar", result.toString());
+        URL result = getResultUrl("http://example.com/versionedUrlWithoutVersion.jar", null, DLOPTS_NOPACK_NOVERSION);
+        assertEquals("http://example.com/versionedUrlWithoutVersion.jar", result.toString());
     }
 
     @Test
     public void testGetVersionedUrlWithoutVersionWithQuery() throws MalformedURLException {
-        Resource resource = Resource.getResource(new URL("http://rhat.com/bar.jar?i=1234abcd"), null, null);
-        ResourceUrlCreator ruc = new ResourceUrlCreator(resource, new DownloadOptions(false, false));
-        URL result = ruc.getVersionedUrl(resource);
-        assertEquals("http://rhat.com/bar.jar?i=1234abcd", result.toString());
+        URL result = getResultUrl("http://example.com/versionedUrlWithoutVersionWithQuery.jar?i=1234abcd", null, DLOPTS_NOPACK_NOVERSION);
+        assertEquals("http://example.com/versionedUrlWithoutVersionWithQuery.jar?i=1234abcd", result.toString());
     }
 
     @Test
     public void testGetVersionedUrlWithLongQuery() throws MalformedURLException {
-        Resource resource = Resource.getResource(new URL("http://yyz.com/bar.jar?i=1234&j=abcd"), new Version("2.0"), null);
-        ResourceUrlCreator ruc = new ResourceUrlCreator(resource, new DownloadOptions(false, true));
-        URL result = ruc.getVersionedUrl(resource);
-        assertEquals("http://yyz.com/bar.jar?i=1234&j=abcd&version-id=2.0", result.toString());
+        URL result = getResultUrl("http://example.com/versionedUrlWithLongQuery.jar?i=1234&j=abcd", VERSION_20, DLOPTS_NOPACK_USEVERSION);
+        assertEquals("http://example.com/versionedUrlWithLongQuery.jar?i=1234&j=abcd&version-id=2.0", result.toString());
     }
+
+    @Test
+    public void testPercentEncoded() throws MalformedURLException {
+        URL result = getResultUrl("http://example.com/percent encoded.jar", null, DLOPTS_NOPACK_USEVERSION);
+        assertEquals("http://example.com/percent encoded.jar", result.toString());
+    }
+
+    @Test
+    public void testPercentEncodedOnlyOnce() throws MalformedURLException {
+        URL result = getResultUrl("http://example.com/percent%20encoded%20once.jar", null, DLOPTS_NOPACK_USEVERSION);
+        assertEquals("http://example.com/percent%20encoded%20once.jar", result.toString());
+    }
+
+    @Test
+    public void testPartiallyEncodedUrl() throws MalformedURLException {
+        URL result = getResultUrl("http://example.com/partially encoded%20url.jar", null, DLOPTS_NOPACK_USEVERSION);
+        assertEquals("http://example.com/partially encoded%20url.jar", result.toString());
+    }
+
+    @Test
+    public void testVersionedEncodedUrl() throws MalformedURLException {
+        URL result = getResultUrl("http://example.com/versioned%20encoded.jar", VERSION_11, DLOPTS_NOPACK_USEVERSION);
+        assertEquals("http://example.com/versioned%20encoded.jar?version-id=1.1", result.toString());
+    }
+
+    @Test
+    public void testInvalidVersionedUrl() throws MalformedURLException {
+        URL result = getResultUrl("http://example.com/invalid versioned url.jar", VERSION_11, DLOPTS_NOPACK_USEVERSION);
+        assertEquals("http://example.com/invalid versioned url.jar?version-id=1.1", result.toString());
+    }
+
+    @Test
+    public void testLongComplexUrl() throws MalformedURLException {
+        String URL =
+            "https://example.com/,DSID=64c19c5b657df383835706571a7c7216,DanaInfo=example.com,CT=java+JICAComponents/complexOne.jar";
+        URL result = getResultUrl(URL, null, DLOPTS_NOPACK_USEVERSION);
+        assertEquals(URL, result.toString());
+    }
+
+    @Test
+    public void testLongComplexVersionedUrl() throws MalformedURLException {
+        String URL =
+            "https://example.com/,DSID=64c19c5b657df383835706571a7c7216,DanaInfo=example.com,CT=java+JICAComponents/complexTwo.jar";
+        URL result = getResultUrl(URL, VERSION_11, DLOPTS_NOPACK_USEVERSION);
+        assertEquals(URL + "?version-id=" + VERSION_11, result.toString());
+    }
+
+    @Test
+    public void testUserInfoAndVersioning() throws MalformedURLException {
+        URL result = getResultUrl("http://foo:bar at example.com/userInfoAndVersion.jar", VERSION_11, DLOPTS_NOPACK_USEVERSION);
+        assertEquals("http://foo:bar at example.com/userInfoAndVersion.jar?version-id=1.1", result.toString());
+    }
+
+    @Test
+    public void testPortAndVersioning() throws MalformedURLException {
+        URL result = getResultUrl("http://example.com:1234/portAndVersioning.jar", VERSION_11, DLOPTS_NOPACK_USEVERSION);
+        assertEquals("http://example.com:1234/portAndVersioning.jar?version-id=1.1", result.toString());
+    }
+
 }

From bugzilla-daemon at icedtea.classpath.org  Thu Oct  3 06:25:52 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 03 Oct 2013 13:25:52 +0000
Subject: [Bug 1204] Archive URL wrongly resolved
In-Reply-To: <bug-1204-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1204-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1204-30-NtyF0W8X0i@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1204

--- Comment #10 from hg commits <mercurial at icedtea.classpath.org> ---
details:
http://icedtea.classpath.org//hg/icedtea-web?cmd=changeset;node=cdd42af7c0b5
author: Andrew Azores <aazores at redhat.com>
date: Thu Oct 03 09:25:35 2013 -0400

    Fix regression in ResourceUrlCreator due to PR1204 patch

    * netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java:
    (getVersionedUrl) fix regression in previous PR1204 patch. Refactor
    to not take Resource parameter, use instance's field instead.
    (uriPartToString) new method
    * tests/netx/unit/net/sourceforge/jnlp/cache/ResourceUrlCreatorTest.java:
    new tests for ResourceUrlCreator.getVersionedUrl

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131003/b957cc16/attachment.html 

From gitne at gmx.de  Thu Oct  3 06:37:40 2013
From: gitne at gmx.de (Jacob Wisor)
Date: Thu, 03 Oct 2013 15:37:40 +0200
Subject: http://icedtea.classpath.org/hg/fedora
Message-ID: <524D7324.8020309@gmx.de>

Hello,

just asking out of curiosity: Does anybody still use this repo? It has 
not been touched since August 30, 2007. I suppose that the Fedora 
Project has found some other location for keeping their OpenJDK rpm 
build system. I believe jpackage.org to be it. If so I would like to 
propose marking this repo to be removed.

Regards,
Jacob

From gnu.andrew at redhat.com  Thu Oct  3 07:07:47 2013
From: gnu.andrew at redhat.com (Andrew Hughes)
Date: Thu, 3 Oct 2013 10:07:47 -0400 (EDT)
Subject: http://icedtea.classpath.org/hg/fedora
In-Reply-To: <524D7324.8020309@gmx.de>
References: <524D7324.8020309@gmx.de>
Message-ID: <865308553.1121348.1380809267113.JavaMail.root@redhat.com>



----- Original Message -----
> Hello,
> 
> just asking out of curiosity: Does anybody still use this repo? It has
> not been touched since August 30, 2007. I suppose that the Fedora
> Project has found some other location for keeping their OpenJDK rpm
> build system.

As part of Fedora itself, presumably.

> I believe jpackage.org to be it. If so I would like to
> propose marking this repo to be removed.

What would be the point in that?  It would just destroy history.
> 
> Regards,
> Jacob
> 

-- 
Andrew :)

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

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07


From gitne at gmx.de  Thu Oct  3 07:36:47 2013
From: gitne at gmx.de (Jacob Wisor)
Date: Thu, 03 Oct 2013 16:36:47 +0200
Subject: http://icedtea.classpath.org/hg/fedora
In-Reply-To: <865308553.1121348.1380809267113.JavaMail.root@redhat.com>
References: <524D7324.8020309@gmx.de>
	<865308553.1121348.1380809267113.JavaMail.root@redhat.com>
Message-ID: <524D80FF.5020001@gmx.de>

Andrew Hughes wrote:
>> Hello,
>>
>> just asking out of curiosity: Does anybody still use this repo? It has
>> not been touched since August 30, 2007. I suppose that the Fedora
>> Project has found some other location for keeping their OpenJDK rpm
>> build system.
>
> As part of Fedora itself, presumably.
>
>> I believe jpackage.org to be it. If so I would like to
>> propose marking this repo to be removed.
>
> What would be the point in that?

Cleanup. ;) Besides, this repo does not seem to be maintained ergo it is 
probably useless unless some historian has interest in it. Anyway, even 
if somebody were really interested in it, it would probably require some 
unreasonable amount of work to get it up to date and would also mean 
double work because of Fedora's already existing up-to-date rpm build 
system.

> It would just destroy history.

As long as other repos do not reference change sets in this repo - which 
they probably do not - dropping it should do no harm.

The reason I am asking is simply because I appreciate clean systems, 
repos, sources, etc. free of ballast. It makes life easier. ;)
I do know that people usually do not have time for this but in effect it 
really aids progress.

Regards,
Jacob

From jvanek at redhat.com  Thu Oct  3 10:21:25 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Thu, 03 Oct 2013 19:21:25 +0200
Subject: http://icedtea.classpath.org/hg/fedora
In-Reply-To: <524D80FF.5020001@gmx.de>
References: <524D7324.8020309@gmx.de>	<865308553.1121348.1380809267113.JavaMail.root@redhat.com>
	<524D80FF.5020001@gmx.de>
Message-ID: <524DA795.70209@redhat.com>

On 10/03/2013 04:36 PM, Jacob Wisor wrote:
> Andrew Hughes wrote:
>>> Hello,
>>>
>>> just asking out of curiosity: Does anybody still use this repo? It has
>>> not been touched since August 30, 2007. I suppose that the Fedora
>>> Project has found some other location for keeping their OpenJDK rpm
>>> build system.
>>
>> As part of Fedora itself, presumably.
>>
>>> I believe jpackage.org to be it. If so I would like to
>>> propose marking this repo to be removed.
>>
>> What would be the point in that?
>
> Cleanup. ;) Besides, this repo does not seem to be maintained ergo it is probably useless unless some historian has interest in it. Anyway, even if somebody were really interested in it, it would probably require some unreasonable amount of work to get it up to date and would also mean double work because of Fedora's already existing up-to-date rpm build system.
>
>> It would just destroy history.
>
> As long as other repos do not reference change sets in this repo - which they probably do not - dropping it should do no harm.
>
> The reason I am asking is simply because I appreciate clean systems, repos, sources, etc. free of ballast. It makes life easier. ;)
> I do know that people usually do not have time for this but in effect it really aids progress.
>

+1 for removing


From ptisnovs at icedtea.classpath.org  Fri Oct  4 01:22:53 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Fri, 04 Oct 2013 08:22:53 +0000
Subject: /hg/rhino-tests: Added new test testAsSubclass into the test suite
Message-ID: <hg.63ab35ca019e.1380874973.-6019694633368342460@icedtea.classpath.org>

changeset 63ab35ca019e in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=63ab35ca019e
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Oct 04 10:26:39 2013 +0200

	Added new test testAsSubclass into the test suite
	ScriptEngineFactoryClassTest.


diffstat:

 ChangeLog                                            |    6 +
 src/org/RhinoTests/ScriptEngineFactoryClassTest.java |  158 +++++++++++++++++++
 2 files changed, 164 insertions(+), 0 deletions(-)

diffs (181 lines):

diff -r 3c6b83c0c0b6 -r 63ab35ca019e ChangeLog
--- a/ChangeLog	Thu Oct 03 10:21:27 2013 +0200
+++ b/ChangeLog	Fri Oct 04 10:26:39 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-04  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/ScriptEngineFactoryClassTest.java:
+	Added new test testAsSubclass into the test suite
+	ScriptEngineFactoryClassTest.
+
 2013-10-03  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/SimpleBindingsClassTest.java:
diff -r 3c6b83c0c0b6 -r 63ab35ca019e src/org/RhinoTests/ScriptEngineFactoryClassTest.java
--- a/src/org/RhinoTests/ScriptEngineFactoryClassTest.java	Thu Oct 03 10:21:27 2013 +0200
+++ b/src/org/RhinoTests/ScriptEngineFactoryClassTest.java	Fri Oct 04 10:26:39 2013 +0200
@@ -1166,6 +1166,164 @@
     }
 
     /**
+     * Test for method javax.script.ScriptEngineFactory.getClass().asSubclass()
+     */
+    protected void testAsSubclass() {
+        try {
+            this.scriptEngineFactoryClass.asSubclass(scriptEngineFactoryClass);
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            throw new AssertionError(e.getMessage());
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(java.lang.Void.class);
+            throw new AssertionError("Class.asSubclass(java.lang.Void.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(java.lang.Number.class);
+            throw new AssertionError("Class.asSubclass(java.lang.Number.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(java.lang.Byte.class);
+            throw new AssertionError("Class.asSubclass(java.lang.Byte.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(java.lang.Double.class);
+            throw new AssertionError("Class.asSubclass(java.lang.Double.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(java.lang.Float.class);
+            throw new AssertionError("Class.asSubclass(java.lang.Float.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(java.lang.Integer.class);
+            throw new AssertionError("Class.asSubclass(java.lang.Integer.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(java.lang.Long.class);
+            throw new AssertionError("Class.asSubclass(java.lang.Long.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(java.lang.Short.class);
+            throw new AssertionError("Class.asSubclass(java.lang.Short.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(java.lang.String.class);
+            throw new AssertionError("Class.asSubclass(java.lang.String.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(java.lang.StringBuffer.class);
+            throw new AssertionError("Class.asSubclass(java.lang.StringBuffer.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(java.lang.StringBuilder.class);
+            throw new AssertionError("Class.asSubclass(java.lang.StringBuilder.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(java.awt.Color.class);
+            throw new AssertionError("Class.asSubclass(java.awt.Color.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(java.awt.Font.class);
+            throw new AssertionError("Class.asSubclass(java.awt.Font.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(java.awt.Image.class);
+            throw new AssertionError("Class.asSubclass(java.awt.Image.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(javax.swing.JPanel.class);
+            throw new AssertionError("Class.asSubclass(javax.swing.JPanel.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(javax.swing.JColorChooser.class);
+            throw new AssertionError("Class.asSubclass(javax.swing.JColorChooser.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(javax.swing.JScrollBar.class);
+            throw new AssertionError("Class.asSubclass(javax.swing.JScrollBar.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.asSubclass(javax.swing.JSlider.class);
+            throw new AssertionError("Class.asSubclass(javax.swing.JSlider.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+    }
+
+    /**
      * Test for method javax.script.ScriptEngineFactory.getClass().newInstance()
      */
     protected void testNewInstance() {

From ptisnovs at icedtea.classpath.org  Fri Oct  4 01:25:58 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Fri, 04 Oct 2013 08:25:58 +0000
Subject: /hg/gfx-test: Ten new tests added into BitBltUsingBgColor test s...
Message-ID: <hg.264a5e3758ce.1380875158.-6248649288953172555@icedtea.classpath.org>

changeset 264a5e3758ce in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=264a5e3758ce
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Oct 04 10:29:43 2013 +0200

	Ten new tests added into BitBltUsingBgColor test suite.


diffstat:

 ChangeLog                                          |    5 +
 src/org/gfxtest/testsuites/BitBltUsingBgColor.java |  150 +++++++++++++++++++++
 2 files changed, 155 insertions(+), 0 deletions(-)

diffs (172 lines):

diff -r 41ce64887abb -r 264a5e3758ce ChangeLog
--- a/ChangeLog	Thu Oct 03 10:23:48 2013 +0200
+++ b/ChangeLog	Fri Oct 04 10:29:43 2013 +0200
@@ -1,3 +1,8 @@
+2013-10-04  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltUsingBgColor.java:
+	Ten new tests added into BitBltUsingBgColor test suite.
+
 2013-10-03  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltBasicTests.java:
diff -r 41ce64887abb -r 264a5e3758ce src/org/gfxtest/testsuites/BitBltUsingBgColor.java
--- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java	Thu Oct 03 10:23:48 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java	Fri Oct 04 10:29:43 2013 +0200
@@ -4052,6 +4052,156 @@
     }
 
     /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_USHORT_555_RGB.
+     * Background color is set to Color.white.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshort555RGBBackgroundWhite(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeUshort555RGB(image, graphics2d, Color.white);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_USHORT_565_RGB.
+     * Background color is set to Color.black.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshort565RGBBackgroundBlack(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeUshort565RGB(image, graphics2d, Color.black);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_USHORT_565_RGB.
+     * Background color is set to Color.blue.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshort565RGBBackgroundBlue(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeUshort565RGB(image, graphics2d, Color.blue);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_USHORT_565_RGB.
+     * Background color is set to Color.green.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshort565RGBBackgroundGreen(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeUshort565RGB(image, graphics2d, Color.green);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_USHORT_565_RGB.
+     * Background color is set to Color.cyan.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshort565RGBBackgroundCyan(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeUshort565RGB(image, graphics2d, Color.cyan);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_USHORT_565_RGB.
+     * Background color is set to Color.red.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshort565RGBBackgroundRed(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeUshort565RGB(image, graphics2d, Color.red);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_USHORT_565_RGB.
+     * Background color is set to Color.magenta.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshort565RGBBackgroundMagenta(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeUshort565RGB(image, graphics2d, Color.magenta);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_USHORT_565_RGB.
+     * Background color is set to Color.yellow.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshort565RGBBackgroundYellow(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeUshort565RGB(image, graphics2d, Color.yellow);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_USHORT_565_RGB.
+     * Background color is set to Color.white.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshort565RGBBackgroundWhite(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeUshort565RGB(image, graphics2d, Color.white);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_USHORT_GRAY.
+     * Background color is set to Color.black.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshortGrayBackgroundBlack(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeUshortGray(image, graphics2d, Color.black);
+    }
+
+    /**
      * Entry point to the test suite.
      *
      * @param args not used in this case

From aazores at redhat.com  Fri Oct  4 08:27:07 2013
From: aazores at redhat.com (Andrew Azores)
Date: Fri, 04 Oct 2013 11:27:07 -0400
Subject: /hg/icedtea-web: Do not wait for applet initialization when
	bind...
In-Reply-To: <hg.420d72e5cee7.1377715818.8643924302249223276@icedtea.classpath.org>
References: <hg.420d72e5cee7.1377715818.8643924302249223276@icedtea.classpath.org>
Message-ID: <524EDE4B.90804@redhat.com>

On 08/28/13 14:50, adomurad at icedtea.classpath.org wrote:
> changeset 420d72e5cee7 in /hg/icedtea-web
> details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=420d72e5cee7
> author: Adam Domurad <adomurad at redhat.com>
> date: Tue Aug 27 16:53:30 2013 -0400
>
> 	Do not wait for applet initialization when binding Java applets for NPAPI.
>
>
> diffstat:
>
>   ChangeLog                                                 |   15 +
>   plugin/icedteanp/IcedTeaNPPlugin.cc                       |   36 +--
>   plugin/icedteanp/IcedTeaPluginUtils.cc                    |  134 +++++--
>   plugin/icedteanp/IcedTeaPluginUtils.h                     |   67 +++-
>   plugin/icedteanp/IcedTeaScriptablePluginObject.cc         |  220 +++++++++----
>   plugin/icedteanp/IcedTeaScriptablePluginObject.h          |   28 +-
>   tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc |   15 +-
>   7 files changed, 356 insertions(+), 159 deletions(-)
>
> diffs (truncated from 851 to 500 lines):
>
> diff -r 94ebabfba6ab -r 420d72e5cee7 ChangeLog
> --- a/ChangeLog	Fri Aug 23 16:35:37 2013 -0400
> +++ b/ChangeLog	Tue Aug 27 16:53:30 2013 -0400
> @@ -1,3 +1,18 @@
> +2013-08-27  Adam Domurad  <adomurad at redhat.com>
> +
> +	Do not wait for applet initialization when binding Java applets for NPAPI.
> +	* plugin/icedteanp/IcedTeaNPPlugin.cc: Refactor to use
> +	lazy-initialized javascript applet binding.
> +	* plugin/icedteanp/IcedTeaPluginUtils.cc: Make use of new helper
> +	class, introduce (stringPrintf), introduce NPObjectRef.
> +	* plugin/icedteanp/IcedTeaPluginUtils.h: Same.
> +	* plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Allow
> +	IcedTeaScriptableJavaObject to be lazy-initialized, introduce
> +	lazy-initializing (get_scriptable_applet_object).
> +	* plugin/icedteanp/IcedTeaScriptablePluginObject.h: Same.
> +	* tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc: Adapt
> +	test to new helper class.
> +
>   2013-08-23  Adam Domurad  <adomurad at redhat.com>
>   
>   	Spawn Java side during C++ unit tests. Many new tests.
> diff -r 94ebabfba6ab -r 420d72e5cee7 plugin/icedteanp/IcedTeaNPPlugin.cc
> --- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Fri Aug 23 16:35:37 2013 -0400
> +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Tue Aug 27 16:53:30 2013 -0400
> @@ -2101,14 +2101,6 @@
>   
>       if (data->is_applet_instance) // dummy instance/package?
>       {
> -        JavaRequestProcessor java_request = JavaRequestProcessor();
> -        JavaResultData* java_result;
> -        std::string instance_id = std::string();
> -        std::string applet_class_id = std::string();
> -
> -        int id = get_id_from_instance(instance);
> -        gchar* id_str = g_strdup_printf ("%d", id);
> -
>           // Some browsers.. (e.g. chromium) don't call NPP_SetWindow
>           // for 0x0 plugins and therefore require initialization with
>           // a 0 handle
> @@ -2117,30 +2109,10 @@
>               plugin_send_initialization_message(data->instance_id, 0, 0, 0, data->parameters_string);
>           }
>   
> -        java_result = java_request.getAppletObjectInstance(id_str);
> -
> -        g_free(id_str);
> -
> -        if (java_result->error_occurred)
> -        {
> -            printf("Error: Unable to fetch applet instance id from Java side.\n");
> -            return NULL;
> -        }
> -
> -        instance_id.append(*(java_result->return_string));
> -
> -        java_result = java_request.getClassID(instance_id);
> -
> -        if (java_result->error_occurred)
> -        {
> -            printf("Error: Unable to fetch applet instance id from Java side.\n");
> -            return NULL;
> -        }
> -
> -        applet_class_id.append(*(java_result->return_string));
> -
> -        obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, applet_class_id, instance_id, false);
> -
> +        NPObjectRef applet_object = IcedTeaScriptableJavaObject::get_scriptable_applet_object(instance);
> +        /* Retain because we are returning an NPObject* */
> +        applet_object.raw_retain();
> +        obj = applet_object.get();
>       } else
>       {
>           obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(instance, "");
> diff -r 94ebabfba6ab -r 420d72e5cee7 plugin/icedteanp/IcedTeaPluginUtils.cc
> --- a/plugin/icedteanp/IcedTeaPluginUtils.cc	Fri Aug 23 16:35:37 2013 -0400
> +++ b/plugin/icedteanp/IcedTeaPluginUtils.cc	Tue Aug 27 16:53:30 2013 -0400
> @@ -53,7 +53,7 @@
>   int IcedTeaPluginUtilities::reference = -1;
>   pthread_mutex_t IcedTeaPluginUtilities::reference_mutex = PTHREAD_MUTEX_INITIALIZER;
>   std::map<void*, NPP>* IcedTeaPluginUtilities::instance_map = new std::map<void*, NPP>();
> -std::map<std::string, NPObject*>* IcedTeaPluginUtilities::object_map = new std::map<std::string, NPObject*>();
> +std::map<std::string, NPObjectRef> IcedTeaPluginUtilities::object_map;
>   
>   /* Plugin async call queue */
>   static std::vector< PluginThreadCall* >* pendingPluginThreadRequests = new std::vector< PluginThreadCall* >();
> @@ -433,9 +433,9 @@
>   IcedTeaPluginUtilities::printStringVector(const char* prefix, std::vector<std::string>* str_vector)
>   {
>   
> -        // This is a CPU intensive function. Run only if debugging
> -        if (!plugin_debug)
> -            return;
> +    // This is a CPU intensive function. Run only if debugging
> +    if (!plugin_debug)
> +        return;
>   
>   	std::string* str = new std::string();
>   	*str += "{ ";
> @@ -561,27 +561,25 @@
>    * @return The associated active NPObject, NULL otherwise
>    */
>   
> -NPObject*
> +NPObjectRef
>   IcedTeaPluginUtilities::getNPObjectFromJavaKey(std::string key)
>   {
> -
> -    NPObject* object = NULL;
>       PLUGIN_DEBUG("getNPObjectFromJavaKey looking for %s\n", key.c_str());
>   
> -    std::map<std::string, NPObject*>::iterator iterator = object_map->find(key);
> +    std::map<std::string, NPObjectRef>::iterator iterator = object_map.find(key);
>   
> -    if (iterator != object_map->end())
> +    if (iterator != object_map.end())
>       {
> -        NPObject* mapped_object = object_map->find(key)->second;
> +        NPObjectRef object = object_map.find(key)->second;
>   
> -        if (getInstanceFromMemberPtr(mapped_object) != NULL)
> +        if (getInstanceFromMemberPtr(object.get()) != NULL)
>           {
> -            object = mapped_object;
> -            PLUGIN_DEBUG("getNPObjectFromJavaKey found %s. NPObject = %p\n", key.c_str(), object);
> +            PLUGIN_DEBUG("getNPObjectFromJavaKey found %s. NPObject = %p\n", key.c_str(), object.get());
> +            return object;
>           }
>       }
>   
> -    return object;
> +    return NPObjectRef(NULL);
>   }
>   
>   /**
> @@ -592,10 +590,10 @@
>    */
>   
>   void
> -IcedTeaPluginUtilities::storeObjectMapping(std::string key, NPObject* object)
> +IcedTeaPluginUtilities::storeObjectMapping(std::string key, NPObjectRef object)
>   {
> -    PLUGIN_DEBUG("Storing object %p with key %s\n", object, key.c_str());
> -    object_map->insert(std::make_pair(key, object));
> +    PLUGIN_DEBUG("Storing object %p with key %s\n", object.get(), key.c_str());
> +    object_map.insert(std::make_pair(key, object));
>   }
>   
>   /**
> @@ -608,19 +606,14 @@
>   IcedTeaPluginUtilities::removeObjectMapping(std::string key)
>   {
>       PLUGIN_DEBUG("Removing key %s from object map\n", key.c_str());
> -    object_map->erase(key);
> +    object_map.erase(key);
>   }
>   
>   /* Clear object_map. Useful for tests. */
>   void
>   IcedTeaPluginUtilities::clearObjectMapping()
>   {
> -    std::map<std::string, NPObject*>::iterator iter = object_map->begin();
> -    for (; iter != object_map->end(); ++iter) {
> -        browser_functions.releaseobject(iter->second);
> -    }
> -    delete object_map;
> -    object_map = new std::map<std::string, NPObject*>();
> +    object_map = std::map<std::string, NPObjectRef>();
>   }
>   
>   /*
> @@ -633,9 +626,9 @@
>   void
>   IcedTeaPluginUtilities::printStringPtrVector(const char* prefix, std::vector<std::string*>* str_ptr_vector)
>   {
> -        // This is a CPU intensive function. Run only if debugging
> -        if (!plugin_debug)
> -            return;
> +    // This is a CPU intensive function. Run only if debugging
> +    if (!plugin_debug)
> +        return;
>   
>   	std::string* str = new std::string();
>   	*str += "{ ";
> @@ -819,18 +812,13 @@
>   
>       std::string jclass_id = *jclass_result->return_string;
>   
> -    NPObject* obj;
> -    if (jclass_id.at(0) == '[') // array
> -    {
> -        obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, jclass_id,
> -                jobject_id, true);
> -    } else
> -    {
> -        obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, jclass_id,
> -                jobject_id, false);
> -    }
> +    bool is_array = (jclass_id.at(0) == '[');
> +    NPObjectRef object = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, jclass_id,
> +                jobject_id, is_array);
>   
> -    OBJECT_TO_NPVARIANT(obj, *variant);
> +    OBJECT_TO_NPVARIANT(object.get(), *variant);
> +    /* Retain because we are returning an NPObject* */
> +    object.raw_retain();
>   
>       return true;
>   }
> @@ -874,12 +862,12 @@
>   }
>   
>   bool
> -IcedTeaPluginUtilities::isObjectJSArray(NPP instance, NPObject* object)
> +IcedTeaPluginUtilities::isObjectJSArray(NPP instance, NPObjectRef object)
>   {
>   
>       NPVariant constructor_v = NPVariant();
>       NPIdentifier constructor_id = browser_functions.getstringidentifier("constructor");
> -    browser_functions.getproperty(instance, object, constructor_id, &constructor_v);
> +    browser_functions.getproperty(instance, object.get(), constructor_id, &constructor_v);
>       IcedTeaPluginUtilities::printNPVariant(constructor_v);
>   
>       // void constructor => not an array
> @@ -1087,6 +1075,34 @@
>   	str = str.substr(start, end - start + 1);
>   }
>   
> +std::string
> +IcedTeaPluginUtilities::stringPrintf(const char* fmt, /*variable arguments*/ ...)
> +{
> +  /* Extract the variable arguments */
> +  va_list args;
> +  va_start(args, fmt);
> +
> +  gchar* result = NULL;
> +  size_t size;
> +
> +  /* Format the arguments into a new buffer, held in 'result' */
> +  size = g_vasprintf (&result, fmt, args);
> +
> +  if (result == NULL)
> +  {
> +    // We are out of memory
> +    throw std::bad_alloc();
> +  }
> +
> +  /* Wrap as string and free buffer */
> +  std::string str(result, size);
> +  g_free(result);
> +
> +  va_end(args); /* Finish using variable arguments */
> +
> +  return str;
> +}
> +
>   std::string IcedTeaPluginUtilities::NPIdentifierAsString(NPIdentifier id) {
>       NPUTF8* cstr = browser_functions.utf8fromidentifier(id);
>       if (cstr == NULL) {
> @@ -1242,3 +1258,41 @@
>       PLUGIN_DEBUG("%p unlocked...\n", &msg_queue_mutex);
>   }
>   
> +void
> +NPObjectRef::set(NPObject* new_object)
> +{
> +    if (new_object != NULL) {
> +        /* Increase the new object's reference count */
> +        browser_functions.retainobject(new_object);
> +    }
> +    if (current_object != NULL) {
> +        /* Decrease the old object's reference count */
> +        browser_functions.releaseobject(current_object);
> +    }
> +
> +    this->current_object = new_object;
> +}
> +
> +NPObjectRef
> +NPObjectRef::create(NPP instance, NPClass* np_class)
> +{
> +    NPObjectRef ref;
> +    /* Don't use set(), otherwise we'd double-retain */
> +    ref.current_object = browser_functions.createobject(instance, np_class);
> +    return ref;
> +}
> +
> +/* Explicit reference counting operations, use only if needed for interoperating with NPObject* */
> +void
> +NPObjectRef::raw_retain() {
> +    if (current_object != NULL) {
> +        browser_functions.retainobject(current_object);
> +    }
> +}
> +
> +void
> +NPObjectRef::raw_release() {
> +    if (current_object != NULL) {
> +        browser_functions.releaseobject(current_object);
> +    }
> +}
> diff -r 94ebabfba6ab -r 420d72e5cee7 plugin/icedteanp/IcedTeaPluginUtils.h
> --- a/plugin/icedteanp/IcedTeaPluginUtils.h	Fri Aug 23 16:35:37 2013 -0400
> +++ b/plugin/icedteanp/IcedTeaPluginUtils.h	Tue Aug 27 16:53:30 2013 -0400
> @@ -153,6 +153,61 @@
>   /* Function to process all pending async calls */
>   void processAsyncCallQueue(void*);
>   
> +/* Reference-counted 'smart pointer' to NPObject */
> +class NPObjectRef {
> +public:
> +    /* Create with browser_functions.createobject.
> +     * This ensures the object is not double-retained. */
> +    static NPObjectRef create(NPP instance, NPClass* np_class);
> +
> +    NPObjectRef(NPObject* obj = NULL) {
> +        current_object = NULL;
> +        set(obj);
> +    }
> +
> +    NPObjectRef(const NPObjectRef& ref) {
> +        current_object = NULL;
> +        set(ref.current_object);
> +    }
> +
> +    NPObjectRef& operator=(const NPObjectRef& ref) {
> +        set(ref.current_object);
> +        return *this;
> +    }
> +
> +    ~NPObjectRef() {
> +        clear();
> +    }
> +
> +    void set(NPObject* new_object);
> +
> +    /* Get's the object pointer */
> +    NPObject* get() {
> +        return current_object;
> +    }
> +
> +    /* Helper for getting object as different type.
> +     * NOTE: This cast is unchecked. */
> +    template <typename T>
> +    T as() {
> +        return (T)current_object;
> +    }
> +
> +    /* Explicit reference counting operations, use only if needed for interoperating with NPObject* */
> +    void raw_retain();
> +    void raw_release();
> +
> +    bool empty() {
> +        return (current_object == NULL);
> +    }
> +
> +    void clear() {
> +        set(NULL);
> +    }
> +private:
> +    NPObject* current_object;
> +};
> +
>   class IcedTeaPluginUtilities
>   {
>   
> @@ -165,8 +220,8 @@
>           /* Map holding window pointer<->instance relationships */
>           static std::map<void*, NPP>* instance_map;
>   
> -        /* Map holding java-side-obj-key->NPObject relationship  */
> -        static std::map<std::string, NPObject*>* object_map;
> +        /* Map holding java-side-obj-key->NPObject relationship. */
> +        static std::map<std::string, NPObjectRef> object_map;
>   
>           /* Posts a call in the async call queue */
>           static bool postPluginThreadAsyncCall(NPP instance, void (*func) (void *), void* data);
> @@ -202,6 +257,8 @@
>       	/* Converts the given integer to a string */
>       	static void itoa(int i, std::string* result);
>   
> +    	static std::string stringPrintf(const char* fmt, ...);
> +
>       	/* Copies a variant data type into a C++ string */
>       	static std::string NPVariantAsString(NPVariant variant);
>   
> @@ -262,9 +319,9 @@
>   
>       	static NPP getInstanceFromMemberPtr(void* member_ptr);
>   
> -    	static NPObject* getNPObjectFromJavaKey(std::string key);
> +    	static NPObjectRef getNPObjectFromJavaKey(std::string key);
>   
> -    	static void storeObjectMapping(std::string key, NPObject* object);
> +    	static void storeObjectMapping(std::string key, NPObjectRef object);
>   
>       	static void removeObjectMapping(std::string key);
>   
> @@ -273,7 +330,7 @@
>   
>       	static void invalidateInstance(NPP instance);
>   
> -    	static bool isObjectJSArray(NPP instance, NPObject* object);
> +    	static bool isObjectJSArray(NPP instance, NPObjectRef object);
>   
>       	static void decodeURL(const char* url, char** decoded_url);
>   
> diff -r 94ebabfba6ab -r 420d72e5cee7 plugin/icedteanp/IcedTeaScriptablePluginObject.cc
> --- a/plugin/icedteanp/IcedTeaScriptablePluginObject.cc	Fri Aug 23 16:35:37 2013 -0400
> +++ b/plugin/icedteanp/IcedTeaScriptablePluginObject.cc	Tue Aug 27 16:53:30 2013 -0400
> @@ -306,24 +306,26 @@
>   
>   	//NPIdentifier property = browser_functions.getstringidentifier(property_name.c_str());
>   
> -	NPObject* obj;
> +	NPObjectRef object;
>   
>   	if (isPropertyClass)
>   	{
>   		PLUGIN_DEBUG("Returning package object\n");
> -		obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(
> +		object = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(
>                                     IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj),
>                                     property_name.c_str());
>   	}
>   	else
>   	{
>   		PLUGIN_DEBUG("Returning Java object\n");
> -		obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(
> +		object = IcedTeaScriptableJavaObject::get_scriptable_java_object(
>   		                IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj),
>   		                *(java_result->return_string), "0", false);
>   	}
>   
> -	OBJECT_TO_NPVARIANT(obj, *result);
> +	OBJECT_TO_NPVARIANT(object.get(), *result);
> +	/* Retain because we are returning an NPObject* */
> +	object.raw_retain();
>   
>   	return true;
>   }
> @@ -384,32 +386,33 @@
>       return np_class;
>   }
>   
> -NPObject*
> -IcedTeaScriptableJavaObject::get_scriptable_java_object(NPP instance,
> -                                    std::string class_id,
> -                                    std::string instance_id,
> -                                    bool isArray)
> +/* Creates a scriptable java object (intended to be called asynch.) */
> +static void
> +create_scriptable_java_object_async(void* data)
> +{
> +    PLUGIN_DEBUG("Asynchronously creating object ...\n");
> +
> +    std::vector<void*> parameters = ((AsyncCallThreadData*) data)->parameters;
> +    NPP instance = (NPP) parameters.at(0);
> +    NPClass* np_class = (NPClass*) parameters.at(1);
> +    NPObjectRef* object_ref = (NPObjectRef*) parameters.at(2);
> +
> +    *object_ref = browser_functions.createobject(instance, np_class);
> +
> +    ((AsyncCallThreadData*) data)->result_ready = true;
> +}
> +
> +static NPObjectRef
> +create_scriptable_java_object(NPP instance)
>   {
>       /* Shared NPClass instance for IcedTeaScriptablePluginObject */
>       static NPClass np_class = scriptable_java_package_object_class();
>   
> -    std::string obj_key = class_id + ":" + instance_id;
> -
> -    PLUGIN_DEBUG("get_scriptable_java_object searching for %s...\n", obj_key.c_str());
> -    IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*) IcedTeaPluginUtilities::getNPObjectFromJavaKey(obj_key);
> -
> -    if (scriptable_object != NULL)
> -    {
> -        PLUGIN_DEBUG("Returning existing object %p\n", scriptable_object);
> -        browser_functions.retainobject(scriptable_object);
> -        return scriptable_object;
> -    }
> -
>       // try to create normally
> -    scriptable_object = (IcedTeaScriptableJavaObject*)browser_functions.createobject(instance, &np_class);
> +    NPObjectRef np_object = NPObjectRef::create(instance, &np_class);
>   
>       // didn't work? try creating asynch
> -    if (!scriptable_object)
> +    if (np_object.empty())
>       {
>           AsyncCallThreadData thread_data = AsyncCallThreadData();
>           thread_data.result_ready = false;
> @@ -418,45 +421,104 @@
>   
>           thread_data.parameters.push_back(instance);
>           thread_data.parameters.push_back(&np_class);
> -        thread_data.parameters.push_back(&scriptable_object);

This changeset causes nearly all of our JavaScript-related reproducer 
tests to fail. The failure is very clearly illustrated using external 
test [1] as well. You can verify the failure easily by running this test 
with hg head vs 1.4.1 from official repos. I have attempted to find the 
specific cause of failure within the changeset but I haven't been 
successful. Some small parts of it are acceptable to apply (for example, 
the object_map in IcedTeaPluginUtils being changed from 
std::map<std::string, NPObject*>* to std::map<std::string, NPObject*> 
seems to be harmless). However the patch contains two large changes - 
one to incorporate a new 'smart pointer' for NPObject*, and one to 
enable lazy-initialization. I tried to manually backout each of those 
large changes separately, but with either one still applied, the 
failures persisted.

As such I'd like to propose that we backout this changeset.

[1]
https://jdk6.java.net/nonav/plugin2/liveconnect/LiveConnectTests/

Thanks,

-- 
Andrew A


From aazores at redhat.com  Fri Oct  4 12:07:28 2013
From: aazores at redhat.com (Andrew Azores)
Date: Fri, 04 Oct 2013 15:07:28 -0400
Subject: [rfc][icedtea-web] DeploymentPropertiesAreExposed reproducer fix
In-Reply-To: <524483E5.2080709@redhat.com>
References: <52337051.6020306@redhat.com>
	<52337204.3000505@redhat.com>	<52370F60.4060908@redhat.com>
	<523741DB.30309@redhat.com> <5237A1B8.7050908@gmx.de>
	<52387089.7000703@redhat.com> <523AD1F7.10609@gmx.de>
	<523B1288.2030408@redhat.com> <523BF6F0.1090906@redhat.com>
	<52433C3E.5060701@redhat.com> <5243E056.3060309@redhat.com>
	<524483E5.2080709@redhat.com>
Message-ID: <524F11F0.2090603@redhat.com>

On 09/26/2013 02:58 PM, Andrew Azores wrote:
> On 09/26/2013 03:20 AM, Jiri Vanek wrote:
>> On 09/25/2013 09:40 PM, Andrew Azores wrote:
>>> On 09/20/2013 03:19 AM, Jiri Vanek wrote:
>>>> ok, discussion have been taken :))
>>>>
>>>> now whats about original patch?
>>>>
>>>>
>>>>
>>>> Changelog:
>>>> * netx/net/sourceforge/jnlp/config/Defaults.java: 
>>>> (USER_CONFIG_HOME) made public
>>>> *
>>>> tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java: 
>>>>
>>>> fixed log dir location
>>>>
>>>>
>>>> Another casualty of the XDG spec change ;)
>>>>
>>>> Thanks,
>>>>
>>>
>>> I don't know enough to comment further on what the three of you have 
>>> already discussed in this
>>> thread. I am convinced that there should be a better method for 
>>> getting access to those Defaults
>>> values than simply making them public, but I can't say I know what 
>>> to actually do instead in order
>>> to keep everything secure and not leak information. In any case this 
>>> reproducer being broken in the
>>> meantime, until that better system is determined, is not an urgent 
>>> issue IMO. Perhaps it should just
>>> be put off for now.
>>>
>>> Thanks,
>>>
>> I'm for making it public. The field should be well protected in netx.
>>
>>
>> J.
>
> Actually, since the test is about checking that the 
> DeploymentConfiguration data is available through 
> System.getProperty()... is there any reason I can't just "abuse" the 
> DeploymentConfiguration singleton from JNLPRuntime again? Should work 
> just fine, I think still captures the "spirit" of this test, and also 
> means we can leave that constant in Defaults as default visibility.
>
> Thanks,
>
Ping?

Thanks,

-- 
Andrew A


From omajid at redhat.com  Fri Oct  4 12:38:30 2013
From: omajid at redhat.com (Omair Majid)
Date: Fri, 04 Oct 2013 15:38:30 -0400
Subject: [rfc][icedtea-web] DeploymentPropertiesAreExposed reproducer fix
In-Reply-To: <524483E5.2080709@redhat.com>
References: <52337051.6020306@redhat.com>
	<52337204.3000505@redhat.com>	<52370F60.4060908@redhat.com>
	<523741DB.30309@redhat.com> <5237A1B8.7050908@gmx.de>
	<52387089.7000703@redhat.com> <523AD1F7.10609@gmx.de>
	<523B1288.2030408@redhat.com> <523BF6F0.1090906@redhat.com>
	<52433C3E.5060701@redhat.com> <5243E056.3060309@redhat.com>
	<524483E5.2080709@redhat.com>
Message-ID: <524F1936.9060204@redhat.com>

On 09/26/2013 02:58 PM, Andrew Azores wrote:
> Actually, since the test is about checking that the
> DeploymentConfiguration data is available through
> System.getProperty()... is there any reason I can't just "abuse" the
> DeploymentConfiguration singleton from JNLPRuntime again? Should work
> just fine, I think still captures the "spirit" of this test, and also
> means we can leave that constant in Defaults as default visibility.

Sounds fine to me.

Cheers,
Omair

-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681

From omajid at redhat.com  Fri Oct  4 12:42:56 2013
From: omajid at redhat.com (Omair Majid)
Date: Fri, 04 Oct 2013 15:42:56 -0400
Subject: [rfc][icedtea-web] RH976833 ClassLoader deadlock
In-Reply-To: <524F0FFE.60208@redhat.com>
References: <520D35CA.9070208@redhat.com> <52286E1C.8030604@redhat.com>
	<52288F54.1000907@redhat.com> <5229A989.2060203@redhat.com>
	<5229F796.4070708@redhat.com> <5229FB6D.2070301@redhat.com>
	<5237102D.4070207@redhat.com> <52371F34.9050207@redhat.com>
	<52372111.8030200@redhat.com> <52374085.5080901@redhat.com>
	<5245B571.6030106@redhat.com> <524F0FFE.60208@redhat.com>
Message-ID: <524F1A40.10300@redhat.com>

On 10/04/2013 02:59 PM, Andrew Azores wrote:
> On 09/27/2013 12:42 PM, Omair Majid wrote:
>> Actually, I don't follow this. Two different threads will enter the
>> JNLPClassLoader.loadClass() method, one through CodeBaseClassLoader
>> and one through JNLPClassLoader. Shouldn't one thread block and
>> another continue? What causes the deadlock? 
> 
> See the attached PDF flow diagram, it should help clarify what's going
> on. The idea behind the patch is that t1's acquisition of cl1 is not
> strictly necessary, so removing that resolves the deadlock condition.

Thanks, that makes thing much more clearer.

> As for the rest of your response... well, I'm going to rethink this
> whole thing and try to come up with a better, higher-level solution to
> this. It is scary dealing with low-level synchronization like this,
> especially in somewhere like the JNLPClassLoader. Like I said, it's
> possible to simply use a ReentrantLock or other similar construct and
> retain the coarse-grained synch control over the
> JNLPClassLoader.loadClass method, without resorting to low-level
> synchronization on instance variables. In terms of the diagram this
> would mean introducing a new lock "r1", and causing the second box on
> the chart to cause the acquisition of r1 rather than cl1. As far as I
> can tell there's nothing really wrong with enforcing that only one
> thread enters that method at a time, the issue is just that the lock
> used for this purpose happens to be an inappropriate lock to use in this
> particular scenario.

I await the patch :)

Cheers,
Omair

-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681

From aazores at redhat.com  Fri Oct  4 13:10:16 2013
From: aazores at redhat.com (Andrew Azores)
Date: Fri, 04 Oct 2013 16:10:16 -0400
Subject: [rfc][icedtea-web] DeploymentPropertiesAreExposed reproducer fix
In-Reply-To: <524F1936.9060204@redhat.com>
References: <52337051.6020306@redhat.com>
	<52337204.3000505@redhat.com>	<52370F60.4060908@redhat.com>
	<523741DB.30309@redhat.com> <5237A1B8.7050908@gmx.de>
	<52387089.7000703@redhat.com> <523AD1F7.10609@gmx.de>
	<523B1288.2030408@redhat.com> <523BF6F0.1090906@redhat.com>
	<52433C3E.5060701@redhat.com> <5243E056.3060309@redhat.com>
	<524483E5.2080709@redhat.com> <524F1936.9060204@redhat.com>
Message-ID: <524F20A8.7080700@redhat.com>

On 10/04/2013 03:38 PM, Omair Majid wrote:
> On 09/26/2013 02:58 PM, Andrew Azores wrote:
>> Actually, since the test is about checking that the
>> DeploymentConfiguration data is available through
>> System.getProperty()... is there any reason I can't just "abuse" the
>> DeploymentConfiguration singleton from JNLPRuntime again? Should work
>> just fine, I think still captures the "spirit" of this test, and also
>> means we can leave that constant in Defaults as default visibility.
> Sounds fine to me.
>
> Cheers,
> Omair
>

Here it is then.

Changelog:
* 
tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java: 
corrected expected log directory location

Thanks,

-- 
Andrew A

-------------- next part --------------
A non-text attachment was scrubbed...
Name: DeploymentPropertiesAreExposed.patch
Type: text/x-patch
Size: 1714 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131004/61224a92/DeploymentPropertiesAreExposed.patch 

From omajid at redhat.com  Fri Oct  4 13:19:08 2013
From: omajid at redhat.com (Omair Majid)
Date: Fri, 04 Oct 2013 16:19:08 -0400
Subject: [rfc][icedtea-web] DeploymentPropertiesAreExposed reproducer fix
In-Reply-To: <524F20A8.7080700@redhat.com>
References: <52337051.6020306@redhat.com>
	<52337204.3000505@redhat.com>	<52370F60.4060908@redhat.com>
	<523741DB.30309@redhat.com> <5237A1B8.7050908@gmx.de>
	<52387089.7000703@redhat.com> <523AD1F7.10609@gmx.de>
	<523B1288.2030408@redhat.com> <523BF6F0.1090906@redhat.com>
	<52433C3E.5060701@redhat.com> <5243E056.3060309@redhat.com>
	<524483E5.2080709@redhat.com> <524F1936.9060204@redhat.com>
	<524F20A8.7080700@redhat.com>
Message-ID: <524F22BC.6090703@redhat.com>

On 10/04/2013 04:10 PM, Andrew Azores wrote:
> On 10/04/2013 03:38 PM, Omair Majid wrote:
>> On 09/26/2013 02:58 PM, Andrew Azores wrote:
>>> Actually, since the test is about checking that the
>>> DeploymentConfiguration data is available through
>>> System.getProperty()... is there any reason I can't just "abuse" the
>>> DeploymentConfiguration singleton from JNLPRuntime again? Should work
>>> just fine, I think still captures the "spirit" of this test, and also
>>> means we can leave that constant in Defaults as default visibility.
>> Sounds fine to me.
>>
> 
> Here it is then.

> +        DeploymentConfiguration config = JNLPRuntime.getConfiguration();
> +        config.load();

If you have to invoke load() manually, why not skip JNLPRuntime
altogether and just use:

DeploymentConfiguration config = new DeploymentConfiguration();
config.load();

Disclaimer: I did not try and compile this. It just seems a little
awkward that you are using config through JNLPRuntime, but JNLPRuntime
has not done its one job: calling config.load(). Of course, calling
JNLPRuntime.initialize() is a big no-no.

> +        String userLogDir = config.getProperty(DeploymentConfiguration.KEY_USER_LOG_DIR);
> +        String expectedRegex = userLogDir + "/?";

I am a little surprised here. Is this file named with a single character?

Anyway, these are just nits. If this works correctly, feel free to push
this.

Thanks,
Omair

-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681

From aazores at redhat.com  Fri Oct  4 13:27:07 2013
From: aazores at redhat.com (Andrew Azores)
Date: Fri, 04 Oct 2013 16:27:07 -0400
Subject: [rfc][icedtea-web] RH976833 ClassLoader deadlock
In-Reply-To: <524F1A40.10300@redhat.com>
References: <520D35CA.9070208@redhat.com> <52286E1C.8030604@redhat.com>
	<52288F54.1000907@redhat.com> <5229A989.2060203@redhat.com>
	<5229F796.4070708@redhat.com> <5229FB6D.2070301@redhat.com>
	<5237102D.4070207@redhat.com> <52371F34.9050207@redhat.com>
	<52372111.8030200@redhat.com> <52374085.5080901@redhat.com>
	<5245B571.6030106@redhat.com> <524F0FFE.60208@redhat.com>
	<524F1A40.10300@redhat.com>
Message-ID: <524F249B.3020804@redhat.com>

On 10/04/2013 03:42 PM, Omair Majid wrote:
>
>> As for the rest of your response... well, I'm going to rethink this
>> whole thing and try to come up with a better, higher-level solution to
>> this. It is scary dealing with low-level synchronization like this,
>> especially in somewhere like the JNLPClassLoader. Like I said, it's
>> possible to simply use a ReentrantLock or other similar construct and
>> retain the coarse-grained synch control over the
>> JNLPClassLoader.loadClass method, without resorting to low-level
>> synchronization on instance variables. In terms of the diagram this
>> would mean introducing a new lock "r1", and causing the second box on
>> the chart to cause the acquisition of r1 rather than cl1. As far as I
>> can tell there's nothing really wrong with enforcing that only one
>> thread enters that method at a time, the issue is just that the lock
>> used for this purpose happens to be an inappropriate lock to use in this
>> particular scenario.
> I await the patch :)
>
> Cheers,
> Omair
>

This should fix it. It's still a bit heavy-handed IMO, but on the other 
hand it avoids messy synchronization of individual fields. Reasoning 
about it should be much easier too, especially given that flow diagram. 
Like I said before, the JNLPClassLoader instance lock is not actually 
used anywhere else, except by inherited methods. So I think it's safe to 
do the "cl1/r1" replacement from my last message. AFAIK nothing else is 
depending on that lock being in use, really.

Just as correct (or incorrect) would have been to create a new Object 
and synchronize() on it instead, but it's a very long method and I 
didn't think it would look very good being indented another level.

Testing with the browserspy.dk website mentioned in the report as well 
as with the 9x applets page I linked somewhere earlier in this message 
thread, the deadlock is resolved. I haven't come up with a reproducer 
yet but I just need to figure out how to ensure that the reproducer 
causes the two applet threads to go through the same two classloaders as 
they are in that diagram. I'm not actually sure what the conditions are 
for that so I'll have to look into it unless anyone can explain it off 
the top of their head.

Thanks,

-- 
Andrew A

-------------- next part --------------
A non-text attachment was scrubbed...
Name: reentrant_lock.patch
Type: text/x-patch
Size: 1184 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131004/6e609adf/reentrant_lock.patch 

From omajid at redhat.com  Fri Oct  4 13:51:00 2013
From: omajid at redhat.com (Omair Majid)
Date: Fri, 04 Oct 2013 16:51:00 -0400
Subject: [rfc][icedtea-web] RH976833 ClassLoader deadlock
In-Reply-To: <524F249B.3020804@redhat.com>
References: <520D35CA.9070208@redhat.com> <52286E1C.8030604@redhat.com>
	<52288F54.1000907@redhat.com> <5229A989.2060203@redhat.com>
	<5229F796.4070708@redhat.com> <5229FB6D.2070301@redhat.com>
	<5237102D.4070207@redhat.com> <52371F34.9050207@redhat.com>
	<52372111.8030200@redhat.com> <52374085.5080901@redhat.com>
	<5245B571.6030106@redhat.com> <524F0FFE.60208@redhat.com>
	<524F1A40.10300@redhat.com> <524F249B.3020804@redhat.com>
Message-ID: <524F2A34.1000305@redhat.com>

On 10/04/2013 04:27 PM, Andrew Azores wrote:
> On 10/04/2013 03:42 PM, Omair Majid wrote:
>>
>>> As for the rest of your response... well, I'm going to rethink this
>>> whole thing and try to come up with a better, higher-level solution to
>>> this. It is scary dealing with low-level synchronization like this,
>>> especially in somewhere like the JNLPClassLoader. Like I said, it's
>>> possible to simply use a ReentrantLock or other similar construct and
>>> retain the coarse-grained synch control over the
>>> JNLPClassLoader.loadClass method, without resorting to low-level
>>> synchronization on instance variables. In terms of the diagram this
>>> would mean introducing a new lock "r1", and causing the second box on
>>> the chart to cause the acquisition of r1 rather than cl1. As far as I
>>> can tell there's nothing really wrong with enforcing that only one
>>> thread enters that method at a time, the issue is just that the lock
>>> used for this purpose happens to be an inappropriate lock to use in this
>>> particular scenario.
>> I await the patch :)
>>
> 
> This should fix it. It's still a bit heavy-handed IMO, but on the other
> hand it avoids messy synchronization of individual fields.

I think the idea is sensible, but the implementation has a few issues.

> +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java

>      /**
>       * Find a JAR in the shared 'extension' classloaders, this
>       * classloader, or one of the classloaders for the JNLP file's
> -     * extensions.
> +     * extensions. This method should be synchronized so that only
> +     * one thread is executing within it at a time, however this
> +     * classloader's instance lock is NOT appropriate and its use
> +     * can result in deadlock. This ReentrantLock is provided instead.
>       */
> -    public synchronized Class<?> loadClass(String name) throws ClassNotFoundException {
> +    private ReentrantLock loadClassLock = new ReentrantLock();

Please make this field final to ensure all threads see the same value
(and it's never reassigned).

I don't think it's good style to hide members in the middle of a 1000+
line file. Could you move it to the top of the file?

Also, the javadocs need to be associated with the method, not with the
variable (moving the declaration will fix that).

> +        loadClassLock.unlock();
>          return result;

This is problematic: it may never get invoked. ClassLoader.loadClass()
communicates failure to find a class by throwing an exception. So if a
class is found earlier (and the method returns) or not found at all the
execution will not reach this line and unlock() will not be called.

I think it's safer to call unlock in a finally clause:

  lock.lock()
  try {
    // do stuff
    // maybe throw an exception
    // or maybe return early
  } finally {
    lock.unlock();
  }


But then, your concerns with a synchronized block (indention) are back.

Thanks,
Omair
-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681

From aazores at redhat.com  Fri Oct  4 14:16:34 2013
From: aazores at redhat.com (Andrew Azores)
Date: Fri, 04 Oct 2013 17:16:34 -0400
Subject: [rfc][icedtea-web] RH976833 ClassLoader deadlock
In-Reply-To: <524F2A34.1000305@redhat.com>
References: <520D35CA.9070208@redhat.com> <52286E1C.8030604@redhat.com>
	<52288F54.1000907@redhat.com> <5229A989.2060203@redhat.com>
	<5229F796.4070708@redhat.com> <5229FB6D.2070301@redhat.com>
	<5237102D.4070207@redhat.com> <52371F34.9050207@redhat.com>
	<52372111.8030200@redhat.com> <52374085.5080901@redhat.com>
	<5245B571.6030106@redhat.com> <524F0FFE.60208@redhat.com>
	<524F1A40.10300@redhat.com> <524F249B.3020804@redhat.com>
	<524F2A34.1000305@redhat.com>
Message-ID: <524F3032.6070509@redhat.com>

On 10/04/2013 04:51 PM, Omair Majid wrote:
> On 10/04/2013 04:27 PM, Andrew Azores wrote:
>> On 10/04/2013 03:42 PM, Omair Majid wrote:
>>>> As for the rest of your response... well, I'm going to rethink this
>>>> whole thing and try to come up with a better, higher-level solution to
>>>> this. It is scary dealing with low-level synchronization like this,
>>>> especially in somewhere like the JNLPClassLoader. Like I said, it's
>>>> possible to simply use a ReentrantLock or other similar construct and
>>>> retain the coarse-grained synch control over the
>>>> JNLPClassLoader.loadClass method, without resorting to low-level
>>>> synchronization on instance variables. In terms of the diagram this
>>>> would mean introducing a new lock "r1", and causing the second box on
>>>> the chart to cause the acquisition of r1 rather than cl1. As far as I
>>>> can tell there's nothing really wrong with enforcing that only one
>>>> thread enters that method at a time, the issue is just that the lock
>>>> used for this purpose happens to be an inappropriate lock to use in this
>>>> particular scenario.
>>> I await the patch :)
>>>
>> This should fix it. It's still a bit heavy-handed IMO, but on the other
>> hand it avoids messy synchronization of individual fields.
> I think the idea is sensible, but the implementation has a few issues.
>
>> +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
>>       /**
>>        * Find a JAR in the shared 'extension' classloaders, this
>>        * classloader, or one of the classloaders for the JNLP file's
>> -     * extensions.
>> +     * extensions. This method should be synchronized so that only
>> +     * one thread is executing within it at a time, however this
>> +     * classloader's instance lock is NOT appropriate and its use
>> +     * can result in deadlock. This ReentrantLock is provided instead.
>>        */
>> -    public synchronized Class<?> loadClass(String name) throws ClassNotFoundException {
>> +    private ReentrantLock loadClassLock = new ReentrantLock();
> Please make this field final to ensure all threads see the same value
> (and it's never reassigned).
>
> I don't think it's good style to hide members in the middle of a 1000+
> line file. Could you move it to the top of the file?
>
> Also, the javadocs need to be associated with the method, not with the
> variable (moving the declaration will fix that).
>
>> +        loadClassLock.unlock();
>>           return result;
> This is problematic: it may never get invoked. ClassLoader.loadClass()
> communicates failure to find a class by throwing an exception. So if a
> class is found earlier (and the method returns) or not found at all the
> execution will not reach this line and unlock() will not be called.
>
> I think it's safer to call unlock in a finally clause:
>
>    lock.lock()
>    try {
>      // do stuff
>      // maybe throw an exception
>      // or maybe return early
>    } finally {
>      lock.unlock();
>    }
>
>
> But then, your concerns with a synchronized block (indention) are back.
>
> Thanks,
> Omair

Sorry, that was more meant as a code demonstration of the "cl1/r1" 
replacement idea, not as push-ready code. My wording about it, and the 
rest of the email, definitely made it sound otherwise. I still think 
there's some discussion to be had about the safety of this before a 
candidate implementation is put forward.

Even though I think it seems safe to do this replacement (other than the 
implementation issues you've correctly pointed out), I'm not 100% sure. 
I don't see anything else that depends on the cl1 lock other than 
methods JNLPClassLoader is inheriting from URLClassLoader, and this 
replacement really shouldn't have any effect on URLClassLoader. But 
maybe I'm missing something and there is a good reason for our 
overriding loadClass method to be requiring the cl1 lock in particular. 
I don't have any idea what that might actually be, but it's still 
something I'm concerned about. If that is the case then the solution to 
this deadlock probably won't be quite as trivial as the cl1/r1 switch, 
so I don't feel it's quite worth making a push-ready patch implementing 
that change until it's deemed both safe and effective at the conceptual 
level.

If none of us are able to identify any issues with doing this simple 
lock replacement trick then I'll make another push-candidate patch later.

You're right though, the proper alternative to a synchronized() block is 
a try/finally. Might as well just use an Object and synchronized block 
for that for if/when that patch gets made.

Thanks,

-- 
Andrew A


From omajid at redhat.com  Fri Oct  4 16:45:45 2013
From: omajid at redhat.com (Omair Majid)
Date: Fri, 04 Oct 2013 19:45:45 -0400
Subject: [icedtea-web] RFC: Move some proxy logic to BrowserAwareProxySelector
Message-ID: <524F5329.2060103@redhat.com>

Hi,

The attached patch tries to clean up some code by moving some logic
around asking the browser for proxy into BrowserAwareProxySelector,
which seems more appropriate to keep this logic compared to the
catch-all class PluginAppletViewr.

Thoughts?

Thanks,
Omair
-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681
-------------- next part --------------
A non-text attachment was scrubbed...
Name: move-proxy-logic-01.patch
Type: text/x-patch
Size: 10391 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131004/26eadaad/move-proxy-logic-01.patch 

From omajid at redhat.com  Fri Oct  4 16:57:09 2013
From: omajid at redhat.com (Omair Majid)
Date: Fri, 04 Oct 2013 19:57:09 -0400
Subject: [icedtea-web] RFC: remove duplication in proxy code
Message-ID: <524F55D5.9080806@redhat.com>

Hi,

The attached patch removes some duplication in proxy code. Okay to push?

Thanks,
Omair
-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681
-------------- next part --------------
A non-text attachment was scrubbed...
Name: duplicate-code-plugin-proxy-01.patch
Type: text/x-patch
Size: 1560 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131004/9651483a/duplicate-code-plugin-proxy-01.patch 

From bugzilla-daemon at icedtea.classpath.org  Fri Oct  4 16:59:01 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 04 Oct 2013 23:59:01 +0000
Subject: [Bug 1474] Can't get javaws to use SOCKS proxy
In-Reply-To: <bug-1474-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1474-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1474-30-NH26iVcmhV@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1474

--- Comment #2 from Omair Majid <omajid at redhat.com> ---
Could you test with a build from source? It would be nice to confirm that this
works for you too now.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131004/db1bb2e0/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Fri Oct  4 17:21:22 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 05 Oct 2013 00:21:22 +0000
Subject: [Bug 846] Plugin tries to use a SOCKS proxy even if there is none
	configured
In-Reply-To: <bug-846-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-846-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-846-30-LwhAYgv4Zu@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=846

Omair Majid <omajid at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |omajid at redhat.com

--- Comment #2 from Omair Majid <omajid at redhat.com> ---
I am not entirely clear on where this problem is. You mention both 'plugin' and
'javaws'. These are completely different program and use different ways of
obtaining the proxy.

I suspect the problem with javaws was fixed by:
http://icedtea.classpath.org/hg/icedtea-web/rev/c4476a810053

But I don't see what could be wrong with the plugin. Could follow the steps on
http://icedtea.classpath.org/wiki/IcedTea-Web#Filing_bugs and attach the logs
for the plugin?

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131005/58d3c44a/attachment-0001.html 

From bugzilla-daemon at icedtea.classpath.org  Fri Oct  4 17:23:26 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 05 Oct 2013 00:23:26 +0000
Subject: [Bug 1055] IllegalArgumentException if proxy for required type is
	not specified
In-Reply-To: <bug-1055-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1055-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1055-30-IwkxSYunkQ@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1055

--- Comment #2 from Omair Majid <omajid at redhat.com> ---
I think this is fixed in head now:
http://icedtea.classpath.org/hg/icedtea-web/rev/a69671b1e1f1

Can you build from source and confirm? Or is there another test case I can use
to check this myself?

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131005/b7ef83db/attachment.html 

From thomas at m3y3r.de  Sat Oct  5 01:25:28 2013
From: thomas at m3y3r.de (Thomas Meyer)
Date: Sat, 05 Oct 2013 10:25:28 +0200
Subject: New Exceptions in icedtea-web 1.4.1-0.fc19
Message-ID: <1380961528.2975.4.camel@localhost.localdomain>

Hi,

the Juniper Secure applet seems to throw new exceptions on the latest
fedora packaged icedtea-web plugin.

Either something broke in this version or my company did an upgrade of
the Juniper server software. Anyway the plugin doesn't work correctly.

I see these exceptions in the juniper log file:

1.) Deletion of file failed.

java.io.IOException: Deletion of file [/home/thomas/.juniper_networks/tncc.jar] failed
        at SecureLauncherApplet.DeleteFileWithAuthorization(SecureLauncherApplet.java:1093)
        at SecureLauncherApplet.InstallTargetApp(SecureLauncherApplet.java:855)
        at SecureLauncherApplet.startTargetApp(SecureLauncherApplet.java:475)
        at SecureHCLauncher.doInstall(SecureHCLauncher.java:259)
        at SecureLauncherApplet.start(SecureLauncherApplet.java:226)
        at SecureHCLauncher.start(SecureHCLauncher.java:205)
        at sun.applet.AppletPanel.run(AppletPanel.java:476)
        at java.lang.Thread.run(Thread.java:724)

2.) Download and copy of stream/file fails:

java.io.FileNotFoundException: /home/thomas/.juniper_networks/tncc.jar (Keine Berechtigung)
        at java.io.FileOutputStream.open(Native Method)
        at java.io.FileOutputStream.<init>(FileOutputStream.java:221)
        at java.io.FileOutputStream.<init>(FileOutputStream.java:171)
        at FileUtil.copyFile(FileUtil.java:221)
        at FileUtil.copyFile(FileUtil.java:206)
        at SecureLauncherApplet.InstallTargetApp(SecureLauncherApplet.java:861)
        at SecureLauncherApplet.startTargetApp(SecureLauncherApplet.java:475)
        at SecureHCLauncher.doInstall(SecureHCLauncher.java:259)
        at SecureLauncherApplet.start(SecureLauncherApplet.java:226)
        at SecureHCLauncher.start(SecureHCLauncher.java:205)
        at sun.applet.AppletPanel.run(AppletPanel.java:476)
        at java.lang.Thread.run(Thread.java:724)

(Looks like some permissions got removed in the 1.4.1 version)

any ideas what could have caused this?

with kind regards
thomas


From thomas at m3y3r.de  Sat Oct  5 03:18:32 2013
From: thomas at m3y3r.de (Thomas Meyer)
Date: Sat, 05 Oct 2013 12:18:32 +0200
Subject: New Exceptions in icedtea-web 1.4.1-0.fc19
In-Reply-To: <1380961528.2975.4.camel@localhost.localdomain>
References: <1380961528.2975.4.camel@localhost.localdomain>
Message-ID: <1380968312.24520.0.camel@localhost.localdomain>

Am Samstag, den 05.10.2013, 10:25 +0200 schrieb Thomas Meyer:
> Hi,
> 
> the Juniper Secure applet seems to throw new exceptions on the latest
> fedora packaged icedtea-web plugin.
> 
> Either something broke in this version or my company did an upgrade of
> the Juniper server software. Anyway the plugin doesn't work correctly.
> 
> I see these exceptions in the juniper log file:
> 
> 1.) Deletion of file failed.
> 
> java.io.IOException: Deletion of file [/home/thomas/.juniper_networks/tncc.jar] failed
>         at SecureLauncherApplet.DeleteFileWithAuthorization(SecureLauncherApplet.java:1093)
>         at SecureLauncherApplet.InstallTargetApp(SecureLauncherApplet.java:855)
>         at SecureLauncherApplet.startTargetApp(SecureLauncherApplet.java:475)
>         at SecureHCLauncher.doInstall(SecureHCLauncher.java:259)
>         at SecureLauncherApplet.start(SecureLauncherApplet.java:226)
>         at SecureHCLauncher.start(SecureHCLauncher.java:205)
>         at sun.applet.AppletPanel.run(AppletPanel.java:476)
>         at java.lang.Thread.run(Thread.java:724)
> 
> 2.) Download and copy of stream/file fails:
> 
> java.io.FileNotFoundException: /home/thomas/.juniper_networks/tncc.jar (Keine Berechtigung)
>         at java.io.FileOutputStream.open(Native Method)
>         at java.io.FileOutputStream.<init>(FileOutputStream.java:221)
>         at java.io.FileOutputStream.<init>(FileOutputStream.java:171)
>         at FileUtil.copyFile(FileUtil.java:221)
>         at FileUtil.copyFile(FileUtil.java:206)
>         at SecureLauncherApplet.InstallTargetApp(SecureLauncherApplet.java:861)
>         at SecureLauncherApplet.startTargetApp(SecureLauncherApplet.java:475)
>         at SecureHCLauncher.doInstall(SecureHCLauncher.java:259)
>         at SecureLauncherApplet.start(SecureLauncherApplet.java:226)
>         at SecureHCLauncher.start(SecureHCLauncher.java:205)
>         at sun.applet.AppletPanel.run(AppletPanel.java:476)
>         at java.lang.Thread.run(Thread.java:724)
> 
> (Looks like some permissions got removed in the 1.4.1 version)
> 
> any ideas what could have caused this?

okay, switching SELinux to Permissive mode makes the problem go away.

I think I'll file a bug in the Fedora bugzilla.

> 
> with kind regards
> thomas




From bugzilla-daemon at icedtea.classpath.org  Sat Oct  5 15:29:11 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 05 Oct 2013 22:29:11 +0000
Subject: [Bug 1474] Can't get javaws to use SOCKS proxy
In-Reply-To: <bug-1474-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1474-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1474-30-lwkx9bR8yb@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1474

--- Comment #3 from silvrax <silvrax at gmail.com> ---
I've just tested this with the latest sources. If I put the following in my
deployment.properties then I can get my application to work properly:

deployment.proxy.socks.port=8989
deployment.proxy.socks.host=localhost
deployment.proxy.type=1
deployment.security.level=ASK_UNSIGNED

I can see that when it tries to download the first file, it selects the SOCKS
proxy, and then attempts to download the logo file:

All possible urls for location=http://10.148.0.16:80/images/logo.gif
state=CONNECTING DOWNLOAD STARTED : [http://10.148.0.16:80/images/logo.gif,
http://10.148.0.16:80/images/logo.gif]
Selecting proxy for: http://10.148.0.16:80/images/logo.gif
Selected proxies: [SOCKS @ localhost/127.0.0.1:8989]
For location=http://10.148.0.16:80/images/logo.gif state=CONNECTING DOWNLOAD
STARTED the server returned 302 code for HEAD request for
http://10.148.0.16:80/images/logo.gif

The fact that I get a 302 is probably correct for this particular application.
After this I can see it successfully pulling in some jar files and then it
launches correctly.

So far so good, basically my problem is solved, so thank you for that!

I've also tried with the following deployment.properties:

deployment.proxy.http.host=localhost
deployment.proxy.socks.port=8989
deployment.proxy.socks.host=localhost
deployment.proxy.type=1
deployment.proxy.http.port=8989
deployment.security.level=ASK_UNSIGNED

I then get the following in my logs. It does suggest it will try both the HTTP
and SOCKS proxy. But I only see it trying (and failing) to use the HTTP proxy.

All possible urls for location=http://10.148.0.16:80/images/logo.gif
state=CONNECTING DOWNLOAD STARTED : [http://10.148.0.16:80/images/logo.gif,
http://10.148.0.16:80/images/logo.gif]
Selecting proxy for: http://10.148.0.16:80/images/logo.gif
Selected proxies: [HTTP @ localhost/127.0.0.1:8989, SOCKS @
localhost/127.0.0.1:8989]
While processing http://10.148.0.16:80/images/logo.gif by HEAD for resource
location=http://10.148.0.16:80/images/logo.gif state=CONNECTING DOWNLOAD
STARTED got java.net.SocketException: Unexpected end of file from server: 
java.net.SocketException: Unexpected end of file from server
        at sun.net.www.http.HttpClient.parseHTTPHeader(HttpClient.java:772)
        at sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:633)
        at sun.net.www.http.HttpClient.parseHTTPHeader(HttpClient.java:769)
        at sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:633)
        at
sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1323)
        at
java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:468)
        at
net.sourceforge.jnlp.cache.ResourceTracker.getUrlResponseCode(ResourceTracker.java:862)
        at
net.sourceforge.jnlp.cache.ResourceTracker.findBestUrl(ResourceTracker.java:899)
        at
net.sourceforge.jnlp.cache.ResourceTracker.initializeResource(ResourceTracker.java:781)
        at
net.sourceforge.jnlp.cache.ResourceTracker.processResource(ResourceTracker.java:621)
        at
net.sourceforge.jnlp.cache.ResourceTracker.access$500(ResourceTracker.java:77)
        at
net.sourceforge.jnlp.cache.ResourceTracker$Downloader$1.run(ResourceTracker.java:1154)
        at
net.sourceforge.jnlp.cache.ResourceTracker$Downloader$1.run(ResourceTracker.java:1152)
        at java.security.AccessController.doPrivileged(Native Method)
        at
net.sourceforge.jnlp.cache.ResourceTracker$Downloader.run(ResourceTracker.java:1152)
        at java.lang.Thread.run(Thread.java:724)

After this, I see several similar exceptions when it's trying to pull in the
jar files and then it bails out.
So this has me left wondering, is this supposed to happen? Note that in this
case, the HTTP proxy is set to the address/port where the SOCKS proxy is
actually listening. So if it's first trying to use the HTTP proxy, that is
expected to fail. But shouldn't it then try to use the SOCKS one?

I did another test where I've changed the HTTP proxy port to 8990, where
nothing is actually listening. In that case I do see it first attempting the
HTTP proxy and throwing a connection refused exception, to then try again using
the SOCKS proxy, which works.

So, to summarize, my application works using these two settings:

deployment.proxy.socks.port=8989
deployment.proxy.socks.host=localhost
deployment.proxy.type=1
deployment.security.level=ASK_UNSIGNED

or:

deployment.proxy.http.host=localhost
deployment.proxy.socks.port=8989
deployment.proxy.socks.host=localhost
deployment.proxy.type=1
deployment.proxy.http.port=8990
deployment.security.level=ASK_UNSIGNED

But it doesn't when these are used:

deployment.proxy.http.host=localhost
deployment.proxy.socks.port=8989
deployment.proxy.socks.host=localhost
deployment.proxy.type=1
deployment.proxy.http.port=8989
deployment.security.level=ASK_UNSIGNED

I realize one could argue that this new "problem" is just a case of
misconfiguration, but I'm just wondering if the observed behavior is what was
intended to happen?

Thanks again for looking in to this case.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131005/bc61879a/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Sun Oct  6 09:50:21 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 06 Oct 2013 16:50:21 +0000
Subject: [Bug 1474] Can't get javaws to use SOCKS proxy
In-Reply-To: <bug-1474-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1474-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1474-30-GqPWVMTjHv@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1474

--- Comment #4 from Omair Majid <omajid at redhat.com> ---
(In reply to comment #3)
> So far so good, basically my problem is solved, so thank you for that!

Thank _you_ for confirming the fix!

> Selecting proxy for: http://10.148.0.16:80/images/logo.gif
> Selected proxies: [HTTP @ localhost/127.0.0.1:8989, SOCKS @
> localhost/127.0.0.1:8989]

> So this has me left wondering, is this supposed to happen? Note that in this
> case, the HTTP proxy is set to the address/port where the SOCKS proxy is
> actually listening. So if it's first trying to use the HTTP proxy, that is
> expected to fail. But shouldn't it then try to use the SOCKS one?

It probably should. The documentation for the Proxy class strongly suggests
this.

Here's what's happening: The code in icedtea-web selects a list of proxies. It
selects both http and socks (correctly). The code then calls the standard
library to open a connection. The standard library gets the list of proxies
from icedtea-web and establishes a connection. The connection fails.

Ideally, the standard library would retry the connection with a different
proxy. I am not sure how to change what the standard library is doing here,
though. One option would be to obtain the proxy list and use that as explicitly
as the proxy, though I am a little hesitant to duplicate something the standard
library claims to be doing already. 

> I realize one could argue that this new "problem" is just a case of
> misconfiguration, but I'm just wondering if the observed behavior is what
> was intended to happen?

I am far from an expert on networking in java, but this feels like a bug to me.

> Thanks again for looking in to this case.

No problem.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131006/a28cccb1/attachment.html 

From ptisnovs at icedtea.classpath.org  Mon Oct  7 02:13:47 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Mon, 07 Oct 2013 09:13:47 +0000
Subject: /hg/rhino-tests: Fixed two tests and added one new test into
Message-ID: <hg.969c6cb3cfb9.1381137227.-6019694633368342460@icedtea.classpath.org>

changeset 969c6cb3cfb9 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=969c6cb3cfb9
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Mon Oct 07 11:17:33 2013 +0200

	Fixed two tests and added one new test into
	ScriptEngineManagerClassTest.


diffstat:

 ChangeLog                                            |   6 +++++
 src/org/RhinoTests/ScriptEngineManagerClassTest.java |  24 +++++++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

diffs (68 lines):

diff -r 63ab35ca019e -r 969c6cb3cfb9 ChangeLog
--- a/ChangeLog	Fri Oct 04 10:26:39 2013 +0200
+++ b/ChangeLog	Mon Oct 07 11:17:33 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-07  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/ScriptEngineManagerClassTest.java:
+	Fixed two tests and added one new test into
+	ScriptEngineManagerClassTest.
+
 2013-10-04  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptEngineFactoryClassTest.java:
diff -r 63ab35ca019e -r 969c6cb3cfb9 src/org/RhinoTests/ScriptEngineManagerClassTest.java
--- a/src/org/RhinoTests/ScriptEngineManagerClassTest.java	Fri Oct 04 10:26:39 2013 +0200
+++ b/src/org/RhinoTests/ScriptEngineManagerClassTest.java	Mon Oct 07 11:17:33 2013 +0200
@@ -782,9 +782,6 @@
     protected void testGetDeclaredMethods() {
         // following methods should be declared
         final String[] declaredMethodsThatShouldExist_jdk6 = {
-            "private boolean javax.script.ScriptEngineManager.canCallerAccessLoader(java.lang.ClassLoader)",
-            "private boolean javax.script.ScriptEngineManager.isAncestor(java.lang.ClassLoader,java.lang.ClassLoader)",
-            "private java.lang.ClassLoader javax.script.ScriptEngineManager.getCallerClassLoader()",
             "private void javax.script.ScriptEngineManager.init(java.lang.ClassLoader)",
             "private void javax.script.ScriptEngineManager.initEngines(java.lang.ClassLoader)",
             "public java.lang.Object javax.script.ScriptEngineManager.get(java.lang.String)",
@@ -980,8 +977,6 @@
         Map<String, Class[]> methodsThatShouldExist_jdk6 = new TreeMap<String, Class[]>();
         methodsThatShouldExist_jdk6.put("get", new Class[] {java.lang.String.class});
         methodsThatShouldExist_jdk6.put("put", new Class[] {java.lang.String.class, java.lang.Object.class});
-        methodsThatShouldExist_jdk6.put("getCallerClassLoader", new Class[] {});
-        methodsThatShouldExist_jdk6.put("isAncestor", new Class[] {java.lang.ClassLoader.class, java.lang.ClassLoader.class});
         methodsThatShouldExist_jdk6.put("access$000", new Class[] {javax.script.ScriptEngineManager.class, java.lang.ClassLoader.class});
         methodsThatShouldExist_jdk6.put("init", new Class[] {java.lang.ClassLoader.class});
         methodsThatShouldExist_jdk6.put("setBindings", new Class[] {javax.script.Bindings.class});
@@ -994,7 +989,6 @@
         methodsThatShouldExist_jdk6.put("registerEngineName", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class});
         methodsThatShouldExist_jdk6.put("registerEngineMimeType", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class});
         methodsThatShouldExist_jdk6.put("registerEngineExtension", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class});
-        methodsThatShouldExist_jdk6.put("canCallerAccessLoader", new Class[] {java.lang.ClassLoader.class});
 
         Map<String, Class[]> methodsThatShouldExist_jdk7 = new TreeMap<String, Class[]>();
         methodsThatShouldExist_jdk7.put("get", new Class[] {java.lang.String.class});
@@ -1322,6 +1316,24 @@
     }
 
     /**
+     * Test for method javax.script.ScriptEngineManager.getClass().newInstance()
+     */
+    protected void testNewInstance() {
+        try {
+            Object o = this.scriptEngineManagerClass.newInstance();
+        }
+        catch (InstantiationException e) {
+            e.printStackTrace();
+            throw new AssertionError(e.getMessage());
+        }
+        catch (IllegalAccessException e) {
+            e.printStackTrace();
+            throw new AssertionError(e.getMessage());
+        }
+
+    }
+
+    /**
      * Test for instanceof operator applied to a class javax.script.ScriptEngineManager
      */
     @SuppressWarnings("cast")

From ptisnovs at icedtea.classpath.org  Mon Oct  7 02:24:50 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Mon, 07 Oct 2013 09:24:50 +0000
Subject: /hg/gfx-test: Eight new tests added into BitBltAffineIdentityTra...
Message-ID: <hg.5a50e6dce23d.1381137890.-6248649288953172555@icedtea.classpath.org>

changeset 5a50e6dce23d in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=5a50e6dce23d
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Mon Oct 07 11:28:37 2013 +0200

	Eight new tests added into BitBltAffineIdentityTransformOp test suite.


diffstat:

 ChangeLog                                                       |    5 +
 src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java |  171 ++++++++-
 2 files changed, 153 insertions(+), 23 deletions(-)

diffs (233 lines):

diff -r 264a5e3758ce -r 5a50e6dce23d ChangeLog
--- a/ChangeLog	Fri Oct 04 10:29:43 2013 +0200
+++ b/ChangeLog	Mon Oct 07 11:28:37 2013 +0200
@@ -1,3 +1,8 @@
+2013-10-07  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java:
+	Eight new tests added into BitBltAffineIdentityTransformOp test suite.
+
 2013-10-04  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltUsingBgColor.java:
diff -r 264a5e3758ce -r 5a50e6dce23d src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java
--- a/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java	Fri Oct 04 10:29:43 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java	Mon Oct 07 11:28:37 2013 +0200
@@ -1205,6 +1205,74 @@
         return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, IdentifyTranspormationOp1);
     }
 
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltEmptyBufferedImageTypeUshortGrayIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, IdentifyTranspormationOp2);
+    }
+
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltEmptyBufferedImageTypeUshortGrayIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, IdentifyTranspormationOp3);
+    }
+
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltEmptyBufferedImageTypeUshortGrayIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, IdentifyTranspormationOp4);
+    }
+
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltEmptyBufferedImageTypeUshortGrayIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, IdentifyTranspormationOp5);
+    }
+
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltEmptyBufferedImageTypeUshortGrayIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, IdentifyTranspormationOp6);
     }
 
     /**
@@ -1216,9 +1284,9 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d)
+    public TestResult testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d)
     {
-        return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp1);
+        return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp1);
     }
 
     /**
@@ -1230,9 +1298,9 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d)
+    public TestResult testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d)
     {
-        return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp2);
+        return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp2);
     }
 
     /**
@@ -1244,22 +1312,9 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d)
+    public TestResult testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d)
     {
-        return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp3);
-    }
-
-    /** * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR.
-     *
-     * @param image
-     *            image used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d)
-    {
-        return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp4);
+        return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp3);
     }
 
     /**
@@ -1271,9 +1326,9 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d)
+    public TestResult testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d)
     {
-        return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp5);
+        return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp4);
     }
 
     /**
@@ -1285,9 +1340,79 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d)
+    public TestResult testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d)
     {
-        return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp6);
+        return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp5);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp6);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageType4ByteABGRIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, IdentifyTranspormationOp1);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageType4ByteABGRIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, IdentifyTranspormationOp2);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageType4ByteABGRIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, IdentifyTranspormationOp3);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageType4ByteABGRIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, IdentifyTranspormationOp4);
     }
 
     /**

From jvanek at redhat.com  Mon Oct  7 07:51:09 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Mon, 07 Oct 2013 16:51:09 +0200
Subject: [icedtea-web] RFC: remove duplication in proxy code
In-Reply-To: <524F55D5.9080806@redhat.com>
References: <524F55D5.9080806@redhat.com>
Message-ID: <5252CA5D.50205@redhat.com>

On 10/05/2013 01:57 AM, Omair Majid wrote:
> Hi,
>
> The attached patch removes some duplication in proxy code. Okay to push?
>
Sure

J.


From jvanek at redhat.com  Mon Oct  7 08:06:18 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Mon, 07 Oct 2013 17:06:18 +0200
Subject: [icedtea-web] RFC: Move some proxy logic to
	BrowserAwareProxySelector
In-Reply-To: <524F5329.2060103@redhat.com>
References: <524F5329.2060103@redhat.com>
Message-ID: <5252CDEA.5040004@redhat.com>

On 10/05/2013 01:45 AM, Omair Majid wrote:
> Hi,
>
> The attached patch tries to clean up some code by moving some logic
> around asking the browser for proxy into BrowserAwareProxySelector,
> which seems more appropriate to keep this logic compared to the
> catch-all class PluginAppletViewr.
>
> Thoughts?
>
> Thanks,
> Omair
>
The change give sense. Thanx.

What is torubeling me a bit is change or parameter from uri to string. Why so?
I think more uri-validity checks ...even better.

J.

From omajid at redhat.com  Mon Oct  7 08:25:35 2013
From: omajid at redhat.com (Omair Majid)
Date: Mon, 07 Oct 2013 11:25:35 -0400
Subject: [icedtea-web] RFC: Move some proxy logic to
	BrowserAwareProxySelector
In-Reply-To: <5252CDEA.5040004@redhat.com>
References: <524F5329.2060103@redhat.com> <5252CDEA.5040004@redhat.com>
Message-ID: <5252D26F.8070907@redhat.com>

On 10/07/2013 11:06 AM, Jiri Vanek wrote:
> On 10/05/2013 01:45 AM, Omair Majid wrote:
>> Hi,
>>
>> The attached patch tries to clean up some code by moving some logic
>> around asking the browser for proxy into BrowserAwareProxySelector,
>> which seems more appropriate to keep this logic compared to the
>> catch-all class PluginAppletViewr.
>>
> What is torubeling me a bit is change or parameter from uri to string.
> Why so?

Because the request to the browser currently takes a string:

String requestURI = null;
requestURI = convertUriSchemeForProxyQuery(uri);
PluginCallRequest request =
  requestFactory.getPluginCallRequest("proxyinfo",
                 "plugin PluginProxyInfo reference " + reference + " " +
                  requestURI, reference)


The convertUriSchemeForProxy is now part of the ProxySelector, so this
method accepts a string directly.

> I think more uri-validity checks ...even better.

Any suggestions? I just refactored code (no functional changes unless I
screwed up).

Cheers,
Omair

-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681

From bugzilla-daemon at icedtea.classpath.org  Mon Oct  7 09:44:37 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 07 Oct 2013 16:44:37 +0000
Subject: [Bug 1570] Applet fails to load , permission denied
In-Reply-To: <bug-1570-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1570-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1570-30-ErjCmRngt2@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1570

--- Comment #1 from A Pengelly <adpengelly at gmail.com> ---
Fixed in 1.4.1.
Thanks

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131007/e0bb62c3/attachment-0001.html 

From aazores at redhat.com  Mon Oct  7 10:54:00 2013
From: aazores at redhat.com (Andrew Azores)
Date: Mon, 07 Oct 2013 13:54:00 -0400
Subject: [rfc][icedtea-web] DeploymentPropertiesAreExposed reproducer fix
In-Reply-To: <524F22BC.6090703@redhat.com>
References: <52337051.6020306@redhat.com>
	<52337204.3000505@redhat.com>	<52370F60.4060908@redhat.com>
	<523741DB.30309@redhat.com> <5237A1B8.7050908@gmx.de>
	<52387089.7000703@redhat.com> <523AD1F7.10609@gmx.de>
	<523B1288.2030408@redhat.com> <523BF6F0.1090906@redhat.com>
	<52433C3E.5060701@redhat.com> <5243E056.3060309@redhat.com>
	<524483E5.2080709@redhat.com> <524F1936.9060204@redhat.com>
	<524F20A8.7080700@redhat.com> <524F22BC.6090703@redhat.com>
Message-ID: <5252F538.7090208@redhat.com>

On 10/04/13 16:19, Omair Majid wrote:
> On 10/04/2013 04:10 PM, Andrew Azores wrote:
>> On 10/04/2013 03:38 PM, Omair Majid wrote:
>>> On 09/26/2013 02:58 PM, Andrew Azores wrote:
>>>> Actually, since the test is about checking that the
>>>> DeploymentConfiguration data is available through
>>>> System.getProperty()... is there any reason I can't just "abuse" the
>>>> DeploymentConfiguration singleton from JNLPRuntime again? Should work
>>>> just fine, I think still captures the "spirit" of this test, and also
>>>> means we can leave that constant in Defaults as default visibility.
>>> Sounds fine to me.
>>>
>> Here it is then.
>> +        DeploymentConfiguration config = JNLPRuntime.getConfiguration();
>> +        config.load();
> If you have to invoke load() manually, why not skip JNLPRuntime
> altogether and just use:
>
> DeploymentConfiguration config = new DeploymentConfiguration();
> config.load();
>
> Disclaimer: I did not try and compile this. It just seems a little
> awkward that you are using config through JNLPRuntime, but JNLPRuntime
> has not done its one job: calling config.load(). Of course, calling
> JNLPRuntime.initialize() is a big no-no.

Using DeploymentConfiguration directly is what I did last time I needed 
to read something for a reproducer like this, but Jiri was more 
comfortable with using the existing singleton instance, so that 
reproducer was changed and I stuck to the same pattern this time. What 
you said does work as well and does the exact same job as far as the 
reproducer is concerned.

>
>> +        String userLogDir = config.getProperty(DeploymentConfiguration.KEY_USER_LOG_DIR);
>> +        String expectedRegex = userLogDir + "/?";
> I am a little surprised here. Is this file named with a single character?
>
> Anyway, these are just nits. If this works correctly, feel free to push
> this.
>
> Thanks,
> Omair
>

Thanks,

-- 
Andrew A


From aazores at icedtea.classpath.org  Mon Oct  7 11:02:48 2013
From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org)
Date: Mon, 07 Oct 2013 18:02:48 +0000
Subject: /hg/icedtea-web: DeploymentConfiguration properties reproducer fix
Message-ID: <hg.9424264bb603.1381168968.8643924302249223276@icedtea.classpath.org>

changeset 9424264bb603 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=9424264bb603
author: Andrew Azores <aazores at redhat.com>
date: Mon Oct 07 14:02:15 2013 -0400

	DeploymentConfiguration properties reproducer fix

	Update test to reflect changed log directory


diffstat:

 ChangeLog                                                                                                 |   6 +++++
 tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java |  11 +++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r cdd42af7c0b5 -r 9424264bb603 ChangeLog
--- a/ChangeLog	Thu Oct 03 09:25:35 2013 -0400
+++ b/ChangeLog	Mon Oct 07 14:02:15 2013 -0400
@@ -1,3 +1,9 @@
+2013-10-07  Andrew Azores  <aazores at redhat.com>
+
+	DeploymentConfiguration properties reproducer fix
+	* tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java: 
+	update test to reflect changed log directory
+
 2013-10-03  Andrew Azores  <aazores at redhat.com>
 
 	PR1204 patch regression fix
diff -r cdd42af7c0b5 -r 9424264bb603 tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java
--- a/tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java	Thu Oct 03 09:25:35 2013 -0400
+++ b/tests/reproducers/signed/DeploymentPropertiesAreExposed/testcases/DeploymentPropertiesAreExposedTest.java	Mon Oct 07 14:02:15 2013 -0400
@@ -42,20 +42,25 @@
 import java.util.Collections;
 import java.util.List;
 import net.sourceforge.jnlp.ServerAccess;
+import net.sourceforge.jnlp.ProcessResult;
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import org.junit.Test;
 
 public class DeploymentPropertiesAreExposedTest {
 
-
     @Test
     public void verifyDeploymentConfigrationIsExposedAsSystemProperties() throws Exception {
         ServerAccess server = new ServerAccess();
         List<String> trustCertificates = Arrays.asList(new String[] {"-Xtrustall"});
 
-        ServerAccess.ProcessResult result = server.executeJavawsHeadless(
+        ProcessResult result = server.executeJavawsHeadless(
             trustCertificates, "/DeploymentPropertiesAreExposed.jnlp");
 
-        String expectedRegex = ".*" + File.separator + ".icedtea" + File.separator + "log" + ".*";
+        DeploymentConfiguration config = JNLPRuntime.getConfiguration();
+        config.load();
+        String userLogDir = config.getProperty(DeploymentConfiguration.KEY_USER_LOG_DIR);
+        String expectedRegex = userLogDir + "/?";
         String actual = result.stdout.trim();
 
         boolean stdOutMatches = actual.matches(expectedRegex);

From andrew at icedtea.classpath.org  Mon Oct  7 12:19:58 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Mon, 07 Oct 2013 19:19:58 +0000
Subject: /hg/icedtea6: 34 new changesets
Message-ID: <hg.043e26adc2ce.1381173598.2873452341184383832@icedtea.classpath.org>

changeset 043e26adc2ce in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=043e26adc2ce
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 31 10:35:14 2012 +0000

	Prepare for next release, b28.

	2012-10-31  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(OPENJDK_VERSION): Bump to next release, b28.


changeset 3e928e5030ad in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3e928e5030ad
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 31 11:42:49 2012 +0000

	Merge


changeset 5b29b2f26eea in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5b29b2f26eea
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Dec 05 14:55:23 2012 +0000

	Merge


changeset 6b20a50ba2fa in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6b20a50ba2fa
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jan 30 01:18:32 2013 +0000

	Merge


changeset 55720644035f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=55720644035f
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 13 23:54:10 2013 +0000

	Merge


changeset 6415ddeeeb09 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6415ddeeeb09
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Mar 19 00:21:31 2013 +0000

	Merge


changeset c01c31ed2f60 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c01c31ed2f60
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Mar 20 00:03:03 2013 +0000

	Sync with upstream availability of latest security patches.

	2013-03-19  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/openjdk/8004341-jck_dialog_failure.patch,
		* patches/openjdk/8005615-failure_to_load_logger_implementation.patch,
		* patches/openjdk/8007393.patch,
		* patches/openjdk/8007611.patch,
		* patches/openjdk/8009641-8007675_build_fix.patch,
		* patches/security/20130201/6563318.patch,
		* patches/security/20130201/6664509.patch,
		* patches/security/20130201/6776941.patch,
		* patches/security/20130201/7141694.patch,
		* patches/security/20130201/7173145.patch,
		* patches/security/20130201/7186945.patch,
		* patches/security/20130201/7186948.patch,
		* patches/security/20130201/7186952.patch,
		* patches/security/20130201/7186954.patch,
		* patches/security/20130201/7192392.patch,
		* patches/security/20130201/7192393.patch,
		* patches/security/20130201/7192977.patch,
		* patches/security/20130201/7197546.patch,
		* patches/security/20130201/7200491.patch,
		* patches/security/20130201/7200500.patch,
		* patches/security/20130201/7201064.patch,
		* patches/security/20130201/7201066.patch,
		* patches/security/20130201/7201068.patch,
		* patches/security/20130201/7201070.patch,
		* patches/security/20130201/7201071.patch,
		* patches/security/20130201/8000210.patch,
		* patches/security/20130201/8000537.patch,
		* patches/security/20130201/8000540.patch,
		* patches/security/20130201/8000631.patch,
		* patches/security/20130201/8001235.patch,
		* patches/security/20130201/8001242.patch,
		* patches/security/20130201/8001307.patch,
		* patches/security/20130201/8001972.patch,
		* patches/security/20130201/8002325.patch,
		* patches/security/20130219/8006446.patch,
		* patches/security/20130219/8006777.patch,
		* patches/security/20130219/8007688.patch,
		* patches/security/20130304/8007014.patch,
		* patches/security/20130304/8007675.patch:
		Remove patches available upstream.
		* Makefile.am:
		(JAXP_DROP_ZIP): Update to jaxp144_05.zip
		with latest security fix included.
		(JAXP_DROP_SHA256SUM): Likewise.
		(SECURITY_PATCHES): Remove ones available
		upstream (all from 2013/02/01, 2013/02/19
		and 2013/03/04).
		(ICEDTEA_PATCHES): Remove patches for
		8005615, 8004341, 8007393 & 8007611
		available upstream.
		* patches/ecj/override.patch:
		Add new case introduced by upstream version
		of security patches (sigh...)


changeset 635d03c5e2dc in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=635d03c5e2dc
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri May 03 15:38:08 2013 +0100

	Merge


changeset 2afb2999ac61 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2afb2999ac61
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 15 20:23:28 2013 +0100

	Merge


changeset 095625ea8650 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=095625ea8650
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 15 20:25:05 2013 +0100

	Remove reference to removed patch.

	2013-05-15  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(ICEDTEA_PATCHES): Remove reference to removed
		patch patches/openjdk/8009641-8007675_build_fix.patch.


changeset 2e5fa8029f94 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2e5fa8029f94
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri May 17 22:41:38 2013 +0100

	Synchronise with upstream, removing patches available there.

	2013-05-17  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/hotspot/original/7197906-handle_32_bit_shifts.patch,
		* patches/hotspot/original/fix_get_stack_bounds_leak.patch,
		* patches/openjdk/8004302-soap_test_failure.patch,
		* patches/openjdk/jaxp144_05.patch:
		Removed as available upstream.
		* Makefile.am: Remove patches.
		* patches/security/20130416/6657673.patch,
		* patches/security/20130416/8005432.patch:
		Regenerated against upstream.


changeset 8721058bbbbf in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8721058bbbbf
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri May 17 22:43:02 2013 +0100

	Merge


changeset 776606a4878e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=776606a4878e
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon May 27 12:48:12 2013 +0100

	Merge


changeset aa0c5db9e503 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=aa0c5db9e503
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri May 31 15:05:33 2013 +0100

	Sync with upstream.

	2013-05-31  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* patches/copy_memory.patch,
		* patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch:
		Drop upstreamed patches.
		* Makefile.am:
		(DROP_PATCHES): Remove JAXP patch.
		(ICEDTEA_PATCHES): Remove OpenJDK6-4 patch.


changeset a2839754d553 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a2839754d553
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jul 15 14:56:16 2013 +0100

	Merge


changeset 2bcbba03ee49 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2bcbba03ee49
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jul 15 17:02:08 2013 +0100

	Drop upstreamed patches.

	2013-07-11  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/openjdk/7036559-concurrenthashmap_improvements.patch:
		Remove upstreamed patch.
		* Makefile.am:
		(ICEDTEA_PATCHES): Drop upstreamed patches.


changeset 455071a8e0ec in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=455071a8e0ec
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jul 22 17:04:11 2013 +0100

	Merge


changeset b83b6ac3b4a1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b83b6ac3b4a1
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jul 31 16:35:55 2013 +0100

	Remove 2013/04/16 errata patches, now upstream.

	2013-07-31  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/ecj/jcp-importsources.patch,
		* patches/openjdk/5102804-memory_leak.patch,
		* patches/openjdk/6501644-icu_sync.patch,
		* patches/openjdk/6669869-queries_per_appcontext.patch,
		* patches/openjdk/6886358-layout_update.patch,
		* patches/openjdk/6963811-deadlock_fix.patch,
		* patches/openjdk/7017324-kerning_crash.patch,
		* patches/openjdk/7064279-fixup.patch,
		* patches/openjdk/7064279-resource_release.patch,
		* patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch,
		* patches/security/20130416/6657673-factory_finder.patch,
		* patches/security/20130416/6657673-fixup.patch,
		* patches/security/20130416/6657673.patch,
		* patches/security/20130416/7200507.patch,
		* patches/security/20130416/8000724.patch,
		* patches/security/20130416/8001031.patch,
		* patches/security/20130416/8001040.patch,
		* patches/security/20130416/8001322.patch,
		* patches/security/20130416/8001329.patch,
		* patches/security/20130416/8003335.patch,
		* patches/security/20130416/8003445.patch,
		* patches/security/20130416/8003543.patch,
		* patches/security/20130416/8004261.patch,
		* patches/security/20130416/8004336.patch,
		* patches/security/20130416/8004986.patch,
		* patches/security/20130416/8005432.patch,
		* patches/security/20130416/8005943.patch,
		* patches/security/20130416/8006309.patch,
		* patches/security/20130416/8006435.patch,
		* patches/security/20130416/8006790.patch,
		* patches/security/20130416/8006795.patch,
		* patches/security/20130416/8007406.patch,
		* patches/security/20130416/8007617.patch,
		* patches/security/20130416/8007667.patch,
		* patches/security/20130416/8007918.patch,
		* patches/security/20130416/8009063.patch,
		* patches/security/20130416/8009305.patch,
		* patches/security/20130416/8009699.patch,
		* patches/security/20130416/8009814.patch,
		* patches/security/20130416/8009857.patch:
		Remove unused patches.
		* Makefile.am:
		(SECURITY_PATCHES): Remove upstreamed security
		patches.


changeset 73409100db47 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=73409100db47
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jul 31 18:04:46 2013 +0100

	Merge


changeset 2074ba4e8816 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2074ba4e8816
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Aug 02 13:52:22 2013 +0100

	Remove upstreamed JDK security patches from 2013/06/18 erratum.

	2013-08-02  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/openjdk/6469266-xmlsec_1.4.2.patch,
		* patches/openjdk/6888167-medialib_memory_leaks.patch,
		* patches/openjdk/7195301-no_instanceof_node.patch,
		* patches/security/20130618/6741606-apache_santuario.patch,
		* patches/security/20130618/7170730-windows_network_stack.patch,
		* patches/security/20130618/8000638-improve_deserialization.patch,
		* patches/security/20130618/8001032-restrict_object_access-jdk.patch,
		* patches/security/20130618/8001033-refactor_address_handling.patch,
		* patches/security/20130618/8001034-memory_management.patch,
		* patches/security/20130618/8001038-resourcefully_handle_resources.patch,
		* patches/security/20130618/8001043-clarify_definition_restrictions.patch,
		* patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch,
		* patches/security/20130618/8001318-6_fixup.patch,
		* patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch,
		* patches/security/20130618/8001330-improve_checking_order.patch,
		* patches/security/20130618/8003703-update_rmi_connection_dialog.patch,
		* patches/security/20130618/8004584-augment_applet_contextualization.patch,
		* patches/security/20130618/8005007-better_glyph_processing.patch,
		* patches/security/20130618/8006328-6_fixup.patch,
		* patches/security/20130618/8006328-sound_class_robustness.patch,
		* patches/security/20130618/8006611-improve_scripting.patch,
		* patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch,
		* patches/security/20130618/8007471-6_fixup.patch,
		* patches/security/20130618/8007471-improve_mbean_notifications.patch,
		* patches/security/20130618/8007812-getenclosingmethod.patch,
		* patches/security/20130618/8008120-improve_jmx_class_checking.patch,
		* patches/security/20130618/8008124-better_compliance_testing.patch,
		* patches/security/20130618/8008128-better_jmx_api_coherence.patch,
		* patches/security/20130618/8008132-better_serialization.patch,
		* patches/security/20130618/8008585-jmx_data_handling.patch,
		* patches/security/20130618/8008593-better_urlclassloader.patch,
		* patches/security/20130618/8008603-jmx_provider_provision.patch,
		* patches/security/20130618/8008611-6_fixup.patch,
		* patches/security/20130618/8008611-jmx_annotations.patch,
		* patches/security/20130618/8008615-jmx_internal_api_robustness.patch,
		* patches/security/20130618/8008623-mbeanserver_handling.patch,
		* patches/security/20130618/8008744-6741606_rework.patch,
		* patches/security/20130618/8008982-jmx_interface_changes.patch,
		* patches/security/20130618/8009004-rmi_connection_improvement.patch,
		* patches/security/20130618/8009013-t2k_glyphs.patch,
		* patches/security/20130618/8009034-jmx_notification_improvement.patch,
		* patches/security/20130618/8009038-jmx_notification_support_improvement.patch,
		* patches/security/20130618/8009067-improve_key_storing.patch,
		* patches/security/20130618/8009235-improve_tsa_data_handling.patch,
		* patches/security/20130618/8011243-improve_imaginglib.patch,
		* patches/security/20130618/8011248-better_component_rasters.patch,
		* patches/security/20130618/8011253-better_short_component_rasters.patch,
		* patches/security/20130618/8011257-better_byte_component_rasters.patch,
		* patches/security/20130618/8011557-improve_reflection.patch,
		* patches/security/20130618/8012421-better_positioning.patch,
		* patches/security/20130618/8012438-better_image_validation.patch,
		* patches/security/20130618/8012597-better_image_channel_validation.patch,
		* patches/security/20130618/8012601-better_layout_validation.patch,
		* patches/security/20130618/8014281-better_xml_signature_checking.patch,
		* patches/security/20130618/diamond_fix.patch,
		* patches/security/20130618/javac_issue.patch,
		* Makefile.am:
		Remove unused patches.
		* Makefile.am:
		(SECURITY_PATCHES): Remove upstreamed security
		patches.


changeset c56469bd12cb in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c56469bd12cb
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Aug 05 12:14:35 2013 +0100

	Merge


changeset 7307b283e366 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7307b283e366
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Aug 06 16:34:58 2013 +0100

	Remove upstreamed CORBA patches from the 2013/06/18 erratum.

	2013-08-06  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/security/20130618/8000642-better_transportation_handling.patch,
		* patches/security/20130618/8001032-restrict_object_access-corba.patch:
		Removed.
		* Makefile.am:
		(ICEDTEA_PATCHES): Remove upstreamed patches.


changeset 55b0d105e57a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=55b0d105e57a
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Aug 07 13:07:02 2013 +0100

	Merge


changeset 2a39fbf2cf14 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2a39fbf2cf14
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Aug 08 15:24:00 2013 +0100

	Remove upstreamed langtools patches from the 2013/06/18 erratum.

	2013-08-07  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/openjdk/6786028-wcag_bold_tags.patch,
		* patches/openjdk/6786682-wcag_lang.patch,
		* patches/openjdk/6786688-wcag_table.patch,
		* patches/openjdk/6786690-wcag_dl.patch,
		* patches/openjdk/6802694-no_deprecated.patch,
		* patches/openjdk/6851834-handle_renames.patch,
		* patches/openjdk/6851834-restructure.patch,
		* patches/openjdk/6961178-doclet_xml.patch,
		* patches/openjdk/7006270-regressions.patch,
		* patches/security/20130618/8012375-javadoc_framing.patch,
		* patches/security/20130618/8015997-more_javadoc_framing.patch,
		* patches/security/20130618/langtools_generics.patch,
		* patches/security/20130618/langtools_merge-01.patch,
		* patches/security/20130618/langtools_merge-02.patch,
		* patches/security/20130618/langtools_merge-03.patch:
		Removed.
		* Makefile.am:
		(ICEDTEA_PATCHES): Remove upstreamed patches.


changeset 09a1c728d5d1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=09a1c728d5d1
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Aug 22 16:30:29 2013 +0100

	Merge


changeset ad9fd882beed in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ad9fd882beed
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Aug 22 20:18:35 2013 +0100

	Remove upstreamed patches.

	2013-08-22  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/fonts-rhel-version.patch,
		* patches/fonts-rhel.patch,
		* patches/object-factory-cl-internal.patch,
		* patches/openjdk/8009996-emitter_bean.patch,
		* patches/security/20130618/handle_npe.patch:
		Remove upstreamed patches.
		* Makefile.am:
		(SECURITY_PATCHES): Remove upstreamed patch.
		(ICEDTEA_PATCHES): Remove upstreamed patches.
		* patches/hotspot/original/7197906-handle_32_bit_shifts.patch:
		Restored as now used by the HotSpot 23 build.


changeset b3fb887daac8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b3fb887daac8
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Aug 23 16:13:12 2013 +0100

	Fix build with original upstream HotSpot.

	2013-08-23  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(ICEDTEA_PATCHES): Apply 7197906 on hs23 only.
		* patches/security/20130416/8004336.patch,
		* patches/security/20130416/8006309.patch,
		* patches/security/20130416/8009699.patch:
		Restore HotSpot security patches as not available
		in upstream HotSpot yet.
		* patches/hotspot/original/7197906-handle_32_bit_shifts.patch:
		Moved to...
		* patches/hotspot/hs23/7197906-handle_32_bit_shifts.patch:
		...here.


changeset 5e0a99d009ab in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5e0a99d009ab
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 13 15:33:34 2013 +0100

	Merge


changeset 017840fe5750 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=017840fe5750
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 13 23:16:16 2013 +0100

	Update to work following upstream merge of hs23.

	2013-09-13  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/cacao/hotspot/original/memory.patch,
		* patches/ecj/bootver.patch,
		* patches/ecj/hotspot/original/hotspot-jdk-dependency.patch,
		* patches/hotspot/hs23/7197906-handle_32_bit_shifts.patch,
		* patches/hotspot/hs23/revert-7017193.patch,
		* patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch,
		* patches/hotspot/original/7022999-fastlocking_compiler1_only.patch,
		* patches/hotspot/original/7032696-7029152_broke_vm.patch,
		* patches/hotspot/original/7140985-hsdis_caller_options.patch,
		* patches/hotspot/original/aarch64.patch,
		* patches/hotspot/original/alpha-fixes.patch,
		* patches/hotspot/original/arm-hsdis.patch,
		* patches/hotspot/original/arm.patch,
		* patches/hotspot/original/gcc-suffix.patch,
		* patches/hotspot/original/jtreg-test7020373-fix.patch,
		* patches/hotspot/original/pr639-broken_shark_build.patch,
		* patches/hotspot/original/sdt-arguments.patch,
		* patches/hotspot/original/sdt-dtrace-hpp.patch,
		* patches/hotspot/original/sdt-jni.patch,
		* patches/hotspot/original/sdt-make.patch,
		* patches/hotspot/original/systemtap-alloc-size-workaround.patch,
		* patches/hotspot/original/systemtap_gc.patch,
		* patches/hotspot/original/text-relocations.patch,
		* patches/hotspot/original/update-bootclasspath.patch,
		* patches/hotspot/original/version.patch,
		* patches/ia64-fix.patch,
		* patches/jtreg-remove-test-6987555.patch,
		* patches/jtreg-remove-test-6991596.patch,
		* patches/numa_on_early_glibc.patch,
		* patches/openjdk/6796786-invalid_FP_identity_transform.patch,
		* patches/openjdk/6956668-misbehavior_of_XOR_operator_with_int.patch,
		* patches/openjdk/7010849-modernise_sa.patch,
		* patches/openjdk/7019808-stack_noexec.patch,
		* patches/openjdk/7029152-String_intrinsics_miss_optimization.patch,
		* patches/openjdk/7031385-gcc-register-allocation-fix.patch,
		* patches/openjdk/7032388-work_without_cmov_instruction.patch,
		* patches/openjdk/7034464-transparent_huge_pages.patch,
		* patches/openjdk/7036220-shark_llvm_29_headers.patch,
		* patches/openjdk/7037939-disable_adaptive_resizing_with_large_pages.patch,
		* patches/openjdk/7041156-gcc_export_dynamic.patch,
		* patches/openjdk/7042070-Typo_in_Test6796786.patch,
		* patches/openjdk/7043564-hugepage.patch,
		* patches/openjdk/7047069-Array_can_dynamically_change_size.patch,
		* patches/params-cast-size_t.patch,
		* patches/pr690-shark-jit-hs20.patch,
		* patches/pr696-zero-fast_aldc-hs20.patch,
		* patches/security/20130416/8004336.patch,
		* patches/security/20130416/8006309.patch,
		* patches/security/20130416/8009699.patch,
		* patches/security/20130618/7158805-nested_subroutine_rewriting.patch,
		* patches/security/20130618/8001330-checking_order_improvement.patch,
		* patches/stdc-limit-macros.patch,
		* patches/systemtap-gcc-4.5.patch,
		* patches/use-idx_t.patch:
		Remove patches obsoleted by dropping of hs20 support.
		* INSTALL: Update docs to support only the 'original' hs23.
		* Makefile.am:
		(SECURITY_PATCHES): Removed (in hs23).
		(ICEDTEA_PATCHES): Add 6_for_override.  Replace
		$(HSBUILD) with hs23.  Join ALT_HSBUILD patches
		into main version.  Remove !ALT_HSBUILD patches.
		(ICEDTEA_ENV): Join ALT_HSBUILD settings to main version.
		* acinclude.m4:
		(IT_WITH_HOTSPOT_BUILD): Support only original.
		* hotspot.map: Remove hs23 line.
		* patches/hotspot/hs23/6_for_override.patch:
		New patch to use source/target 6 for building
		the agent as the hs23 version includes @Override.


changeset a0468e1d41b2 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a0468e1d41b2
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Sep 18 15:57:18 2013 +0100

	Merge


changeset 75ec17efe140 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=75ec17efe140
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Sep 19 02:34:29 2013 +0100

	Work around @Override on interfaces issue by removing annotation rather than increasing source/target.

	2013-09-19  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/cacao/hotspot/hs23/memory.patch,
		* patches/hotspot/hs23/6_for_override.patch:
		Removed.
		* Makefile.am:
		(ICEDTEA_PATCHES): Replace 6_for_override with
		remove_bad_overrides and hs23 memory patch with
		original.
		* patches/cacao/hotspot/original/memory.patch:
		Restored.
		* patches/hotspot/hs23/remove_bad_overrides.patch:
		Added.


changeset d8038ebde003 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d8038ebde003
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Sep 24 15:55:32 2013 +0100

	Merge


changeset 64de09c6e614 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=64de09c6e614
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Sep 24 17:44:25 2013 +0100

	Remove upstreamed patch OPENJDK6-18.

	2013-09-24  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/hotspot/hs23/remove_bad_overrides.patch:
		Removed.
		* Makefile.am:
		Remove patch now upstreamed.


changeset c6d9c3b67430 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c6d9c3b67430
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Oct 07 20:19:28 2013 +0100

	Switch to b28 release tarball.

	2013-10-07  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(OPENJDK_DATE): Set to date of b28.
		(OPENJDK_SHA256SUM): Likewise for SHA256 checksum.
		(OPENJDK_URL): Use new OPENJDK-6 project URL.


diffstat:

 .hgignore                                                                      |      7 +-
 .hgtags                                                                        |      1 +
 AUTHORS                                                                        |      4 +
 ChangeLog                                                                      |   2039 +
 HACKING                                                                        |      6 +-
 INSTALL                                                                        |     35 +-
 Makefile.am                                                                    |    715 +-
 NEWS                                                                           |    580 +-
 THANKYOU                                                                       |     10 -
 acinclude.m4                                                                   |    410 +-
 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S                          |      2 +-
 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp                                    |     30 +-
 configure.ac                                                                   |    134 +-
 javac.in                                                                       |     42 +-
 patches/alpha-fixes.patch                                                      |     21 -
 patches/alternative_krb5_cache.patch                                           |    332 +
 patches/alternative_krb5_cache_fixup.patch                                     |    128 +
 patches/apache-xml-internal-fix-bug-38655.patch                                |     11 -
 patches/arm-hsdis.patch                                                        |     90 -
 patches/arm.patch                                                              |    286 -
 patches/arm/cc_compile-01.patch                                                |     23 +
 patches/arm/cc_compile-02.patch                                                |     46 +
 patches/arm/cc_compile-03.patch                                                |     21 +
 patches/arm/cc_compile-04.patch                                                |     20 +
 patches/arm/cc_compile-05.patch                                                |     29 +
 patches/arm/cc_compile-06.patch                                                |     20 +
 patches/cacao/armhf.patch                                                      |     12 +
 patches/cacao/hotspot/original/memory.patch                                    |     36 +
 patches/cacao/jsig.patch                                                       |     18 -
 patches/cacao/memory.patch                                                     |     12 +
 patches/disable-cc-incompatible-sanity-checks.patch                            |     54 +-
 patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch                           |    394 -
 patches/ecj/ant.patch                                                          |     20 -
 patches/ecj/bootstrap-tools.patch                                              |     87 +
 patches/ecj/bootver.patch                                                      |     14 -
 patches/ecj/corba-dependencies.patch                                           |     31 +-
 patches/ecj/fphexconstants.patch                                               |     60 +
 patches/ecj/hotspot-jdk-dependency.patch                                       |     25 -
 patches/ecj/hotspot/hs23/hotspot-jdk-dependency.patch                          |     23 +
 patches/ecj/icedtea.patch                                                      |    249 -
 patches/ecj/needs-6.patch                                                      |     48 +
 patches/ecj/no-sun-classes.patch                                               |     35 +
 patches/ecj/override.patch                                                     |    110 +
 patches/ecj/xbootclasspath.patch                                               |     45 +
 patches/fonts-rhel-version.patch                                               |     33 -
 patches/fonts-rhel.patch                                                       |    458 -
 patches/freetypeversion.patch                                                  |     23 +-
 patches/gcc-suffix.patch                                                       |     31 -
 patches/hotspot/hs23/7188168-fix_debug_binaries.patch                          |    120 +
 patches/hotspot/hs23/aarch64.patch                                             |     42 +
 patches/hotspot/hs23/alpha-fixes.patch                                         |     21 +
 patches/hotspot/hs23/arm-01-hsx22.patch                                        |    189 +
 patches/hotspot/hs23/arm-03-invokedynamic.patch                                |    171 +
 patches/hotspot/hs23/arm-04-invokedynamic_jit.patch                            |    322 +
 patches/hotspot/hs23/arm-05-invokedynamic_methodhandle.patch                   |     40 +
 patches/hotspot/hs23/arm-06-no_o0.patch                                        |     32 +
 patches/hotspot/hs23/arm-07-cleanup.patch                                      |    153 +
 patches/hotspot/hs23/arm-08-cleanup.patch                                      |     29 +
 patches/hotspot/hs23/arm-09-jvmti.patch                                        |    256 +
 patches/hotspot/hs23/arm-10-memory_protect.patch                               |    247 +
 patches/hotspot/hs23/arm-11-thumb2_jit.patch                                   |  10888 ++
 patches/hotspot/hs23/arm-12-ldrexd.patch                                       |     28 +
 patches/hotspot/hs23/arm-13-sp_adjustment.patch                                |     31 +
 patches/hotspot/hs23/arm-14-stage1.patch                                       |    135 +
 patches/hotspot/hs23/arm-15-stage2.patch                                       |     56 +
 patches/hotspot/hs23/arm-16-dont_save_locals.patch                             |    263 +
 patches/hotspot/hs23/arm-17-no_debug_code.patch                                |    206 +
 patches/hotspot/hs23/arm-18-correct_call.patch                                 |     19 +
 patches/hotspot/hs23/arm-19-fix_jit_bug.patch                                  |     59 +
 patches/hotspot/hs23/arm-20-function_renaming.patch                            |    377 +
 patches/hotspot/hs23/arm-21-fix_compareandswaplong.patch                       |     52 +
 patches/hotspot/hs23/arm-22-fix_trashed_thread_ptr.patch                       |     24 +
 patches/hotspot/hs23/arm-25-hsx23.patch                                        |     53 +
 patches/hotspot/hs23/arm-hsdis.patch                                           |     63 +
 patches/hotspot/hs23/arm.patch                                                 |    295 +
 patches/hotspot/hs23/drop_unlicensed_test.patch                                |     43 +
 patches/hotspot/hs23/gcc-suffix.patch                                          |     35 +
 patches/hotspot/hs23/jtreg-test7020373-fix.patch                               |    187 +
 patches/hotspot/hs23/no_useless_debuginfo_files.patch                          |    211 +
 patches/hotspot/hs23/pr1101-sparc_symbols.patch                                |     57 +
 patches/hotspot/hs23/pr639-broken_shark_build.patch                            |     27 +
 patches/hotspot/hs23/remove_jsr292_tests.patch                                 |    199 +
 patches/hotspot/hs23/systemtap-alloc-size-workaround.patch                     |     12 +
 patches/hotspot/hs23/systemtap.patch                                           |    140 +
 patches/hotspot/hs23/systemtap_gc.patch                                        |    378 +
 patches/hotspot/hs23/text-relocations.patch                                    |     40 +
 patches/hotspot/hs23/type_fixes.patch                                          |    192 +
 patches/hotspot/hs23/update-bootclasspath.patch                                |     13 +
 patches/hotspot/hs23/version.patch                                             |     56 +
 patches/hotspot/hs23/zero_fixes.patch                                          |    644 +
 patches/hotspot/hs23/zero_hs22.patch                                           |    216 +
 patches/hotspot/original/jvmtiEnv.patch                                        |     12 +
 patches/ia64-fix.patch                                                         |     15 -
 patches/idresolver_fix.patch                                                   |    194 -
 patches/imageiojpeg_sync.patch                                                 |    217 +
 patches/jaxws-tempfiles-ioutils-6.patch                                        |    176 +
 patches/jtreg-ComponentOrientationTests.patch                                  |    246 +
 patches/jtreg-LayoutGetCharacterCount.patch                                    |     54 +
 patches/jtreg-LayoutLimits.patch                                               |     49 +
 patches/jtreg-ReadWriteProfileTest.patch                                       |    124 -
 patches/jtreg-TextLayoutBoundsChecks.patch                                     |    150 +
 patches/jtreg-hotspot-Test7020373-fix.patch                                    |    187 -
 patches/jtreg-remove-test-6987555.patch                                        |    184 -
 patches/jtreg-remove-test-6991596.patch                                        |    472 -
 patches/jvmtiEnv.patch                                                         |     12 -
 patches/lcms2-emulate_old_settagdata.patch                                     |     31 +
 patches/libraries.patch                                                        |    335 +-
 patches/no-static-linking.patch                                                |     44 -
 patches/nomotif-6706121.patch                                                  |    218 +-
 patches/numa_on_early_glibc.patch                                              |     46 -
 patches/openjdk/4893408-jpegreader_byte_gray.patch                             |    747 +
 patches/openjdk/6307603-xrender-01.patch                                       |    239 +-
 patches/openjdk/6500343-bad_code_from_conditionals.patch                       |    129 +
 patches/openjdk/6541350-tz_display_names_l10n.patch                            |    300 +
 patches/openjdk/6563752-ss12_support.patch                                     |    173 +
 patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch    |    562 +
 patches/openjdk/6633275-shaped_translucent_windows.patch                       |    279 +-
 patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch       |     24 +
 patches/openjdk/6636370-appcontext_simplification.patch                        |    178 +
 patches/openjdk/6656651-windows_lcd_glyphs.patch                               |    938 +
 patches/openjdk/6669869-Beans_isDesignTime_should_be_per-AppContext.patch      |    346 -
 patches/openjdk/6682380-foreach_crash.patch                                    |     97 +
 patches/openjdk/6718364-inference_failure.patch                                |     76 +
 patches/openjdk/6729772-opt_cleanup.patch                                      |    847 +
 patches/openjdk/6733501-icedtea_lcms_test.patch                                |    133 +
 patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch                    |      4 +-
 patches/openjdk/6791502-invalid_icc_profile.patch                              |    269 +
 patches/openjdk/6793818-jpegimagereader_too_greedy.patch                       |    228 +
 patches/openjdk/6796786-invalid_FP_identity_transform.patch                    |    105 -
 patches/openjdk/6799141-split_out_versions.patch                               |    915 +
 patches/openjdk/6816311-compiler_name.patch                                    |    417 +
 patches/openjdk/6821191-tz_display_names_l10n.patch                            |    125 +
 patches/openjdk/6888215-jpeg_memory_leak.patch                                 |     56 +
 patches/openjdk/6893617-cnctx_always_uses_default_orb.patch                    |    234 +
 patches/openjdk/6956668-misbehavior_of_XOR_operator_with_int.patch             |     93 -
 patches/openjdk/6974017-minorver_for_solaris.patch                             |     24 +
 patches/openjdk/6977550-tzdata2010l.patch                                      |   1208 +
 patches/openjdk/6980281-majorver_for_solaris.patch                             |     66 +
 patches/openjdk/6980681-corba_deadlock.patch                                   |      7 -
 patches/openjdk/6989760-native_warnings.patch                                  |     42 +
 patches/openjdk/6989774-imageio_compiler_warnings.patch                        |    649 +
 patches/openjdk/6996686-tzdata2010o.patch                                      |     93 +
 patches/openjdk/7000225-bad_tabs.patch                                         |     48 +
 patches/openjdk/7002766-parfait-jpeg.patch                                     |     42 +
 patches/openjdk/7003595-incompatibleclasschangeerror.patch                     |    351 +
 patches/openjdk/7013519-integer_overflows.patch                                |     17 +
 patches/openjdk/7017800-tzdata2011b.patch                                      |    254 +
 patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch                |     21 +
 patches/openjdk/7019808-stack_noexec.patch                                     |     23 -
 patches/openjdk/7024568-long_method_resolution_oom_error.patch                 |    102 +
 patches/openjdk/7027387-tzdata2011d.patch                                      |    502 +
 patches/openjdk/7029152-String_intrinsics_miss_optimization.patch              |    383 -
 patches/openjdk/7031385-gcc-register-allocation-fix.patch                      |     21 -
 patches/openjdk/7032388-work_without_cmov_instruction.patch                    |    178 -
 patches/openjdk/7033174-tzdata2011e.patch                                      |    117 +
 patches/openjdk/7034464-transparent_huge_pages.patch                           |    458 -
 patches/openjdk/7036220-shark_llvm_29_headers.patch                            |     44 -
 patches/openjdk/7037939-disable_adaptive_resizing_with_large_pages.patch       |     71 -
 patches/openjdk/7038711-fix_no-clobber_usage.patch                             |    125 +
 patches/openjdk/7039469-tzdata2011g.patch                                      |    116 +
 patches/openjdk/7041156-gcc_export_dynamic.patch                               |     22 -
 patches/openjdk/7042070-Typo_in_Test6796786.patch                              |     33 -
 patches/openjdk/7043564-hugepage.patch                                         |     21 -
 patches/openjdk/7046929-fix_t6397104_test_failure.patch                        |     42 +
 patches/openjdk/7047069-Array_can_dynamically_change_size.patch                |    239 -
 patches/openjdk/7090843-tzdata2011j.patch                                      |   1228 +
 patches/openjdk/7103108-tzdata2011l.patch                                      |   1593 +
 patches/openjdk/7103405-correct_display_names.patch                            |    118 +
 patches/openjdk/7104126-headers_tzdata.patch                                   |    530 +
 patches/openjdk/7158483-tzdata2012c.patch                                      |   1436 +
 patches/openjdk/7162902-corba_fixes.patch                                      |    128 +-
 patches/openjdk/7171223-strict_aliasing.patch                                  |     25 +
 patches/openjdk/7188114-alternate_command_line_parser.patch                    |    611 +
 patches/openjdk/7196533-timezone_bottleneck.patch                              |     66 +
 patches/openjdk/7198570-tzdata2012f.patch                                      |    841 +
 patches/openjdk/7199143-OCSP_timeout.patch                                     |     53 +
 patches/openjdk/8002070-remove_logger_stack_search.patch                       |    152 +
 patches/openjdk/8002070-remove_logger_stack_search_2.patch                     |    546 +
 patches/openjdk/8002225-tzdata2012i.patch                                      |    261 +
 patches/openjdk/8005194-scale_memory_leak.patch                                |     25 +
 patches/openjdk/8006120-server_jre.patch                                       |     60 +
 patches/openjdk/8006536-remove_trailing_slashes.patch                          |     43 +
 patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch              |     68 +
 patches/openjdk/8009217-fix_test_compile.patch                                 |     91 +
 patches/openjdk/8009463-space_and_final_backslash.patch                        |     33 +
 patches/openjdk/8009530-icu_kern_table_support_broken.patch                    |    332 +
 patches/openjdk/8009610-blacklist_malware_certificate.patch                    |     64 +
 patches/openjdk/8009987-tzdata2013b.patch                                      |   2165 +
 patches/openjdk/8010118-caller_sensitive.patch                                 |   2964 +
 patches/openjdk/8010213-set_socketoptions_windows.patch                        |     29 +
 patches/openjdk/8010714-xml_dsig_retrievalmethod.patch                         |    345 +
 patches/openjdk/8010727-empty_logger_name.patch                                |     99 +
 patches/openjdk/8010939-logmanager_deadlock.patch                              |    264 +
 patches/openjdk/8011139-revise_checking_getenclosingclass.patch                |     58 +
 patches/openjdk/8011154-awt_regression.patch                                   |     20 +
 patches/openjdk/8011313-OCSP_timeout_wrong_value.patch                         |     31 +
 patches/openjdk/8011990-logger_test_urls.patch                                 |     55 +
 patches/openjdk/8011992-MlibOpsTest_failed.patch                               |     89 +
 patches/openjdk/8012112-MlibOpsTest_fails.patch                                |     51 +
 patches/openjdk/8012243-serial_regression.patch                                |     42 +
 patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch          |    480 +
 patches/openjdk/8012933-appcontext_disposed_too_early.patch                    |    153 +
 patches/openjdk/8013196-timezone_getdefault_throws_exception.patch             |     39 +
 patches/openjdk/8013380-handle_renames.patch                                   |    107 +
 patches/openjdk/8013380-logger_stack_walk_glassfish.patch                      |    936 +
 patches/openjdk/8014205-blank_swing_dialogs_windows.patch                      |    146 +
 patches/openjdk/8014427-raster_regression.patch                                |     20 +
 patches/openjdk/8014469-tzdata2013c.patch                                      |    276 +
 patches/openjdk/8014676-javadebugger_space_in_paths.patch                      |     32 +
 patches/openjdk/8014718-remove_logging_suntoolkit.patch                        |    112 +
 patches/openjdk/8014745-logger_stack_walk_switch.patch                         |    199 +
 patches/openjdk/8014968-OCSP_timeout_default.patch                             |     19 +
 patches/openjdk/8020054-tzdata2013d.patch                                      |    314 +
 patches/openjdk/8020983-outofmemoryerror_jpegimagewriter.patch                 |    320 +
 patches/openjdk/lcms2/6523398-writing_tags.patch                               |  51207 ++++++++++
 patches/openjdk/lcms2/6988213-windows_build_failure.patch                      |     25 +
 patches/openjdk/lcms2/7002766-parfait.patch                                    |     20 +
 patches/openjdk/lcms2/7042594-tck_failure.patch                                |    375 +
 patches/openjdk/lcms2/7053526-lcms_2.4.patch                                   |  10111 +
 patches/openjdk/lcms2/8007925-improve_cmsstagealloclabv2tov4curves.patch       |     30 +
 patches/openjdk/lcms2/8007927-improve_cmsallocprofilesequencedescription.patch |     23 +
 patches/openjdk/lcms2/8007929-improve_curvesalloc.patch                        |     28 +
 patches/openjdk/lcms2/8009654-cmsnamed_stability.patch                         |     38 +
 patches/openjdk/lcms2/system_lcms2.patch                                       |     93 +
 patches/params-cast-size_t.patch                                               |    270 -
 patches/pax-mark-rmic-java.patch                                               |     10 +
 patches/pr1095-werror.patch                                                    |     64 +
 patches/pr1319-support_giflib_5.patch                                          |     29 +
 patches/pr639-broken_shark_build.patch                                         |     44 -
 patches/pr690-shark-jit-hs20.patch                                             |     61 -
 patches/pr696-zero-fast_aldc-hs20.patch                                        |     44 -
 patches/rh995488-rhel_tz_fix.patch                                             |     77 +
 patches/sdt-arguments.patch                                                    |     24 -
 patches/sdt-dtrace-hpp.patch                                                   |    103 -
 patches/sdt-jni.patch                                                          |     37 -
 patches/sdt-make.patch                                                         |     51 -
 patches/security/20130618/8009071-improve_shape_handling.patch                 |   1014 +
 patches/sparc.patch                                                            |   1808 -
 patches/stdc-limit-macros.patch                                                |     12 -
 patches/systemtap-alloc-size-workaround.patch                                  |     17 -
 patches/systemtap-gcc-4.5.patch                                                |     11 -
 patches/text-relocations.patch                                                 |     63 -
 patches/update-bootclasspath.patch                                             |     13 -
 patches/use-idx_t.patch                                                        |    101 -
 patches/version-hotspot.patch                                                  |     56 -
 patches/xjc.patch                                                              |     56 +-
 pax-mark-vm.in                                                                 |     13 +
 rewriter/com/redhat/rewriter/ClassRewriter.java                                |      6 +-
 tapset/hotspot_gc.stp.in                                                       |    534 +
 249 files changed, 114420 insertions(+), 8797 deletions(-)

diffs (truncated from 127911 to 500 lines):

diff -r 55241b2310b8 -r c6d9c3b67430 .hgignore
--- a/.hgignore	Wed Oct 31 10:33:28 2012 +0000
+++ b/.hgignore	Mon Oct 07 20:19:28 2013 +0100
@@ -4,10 +4,6 @@
 missing
 aclocal.m4
 autom4te.cache
-cacao
-netbeans
-visualvm
-bootstrap
 build
 debian
 lib
@@ -52,3 +48,6 @@
 
 syntax: regexp
 ^openjdk
+^cacao
+^bootstrap
+^jamvm
diff -r 55241b2310b8 -r c6d9c3b67430 .hgtags
--- a/.hgtags	Wed Oct 31 10:33:28 2012 +0000
+++ b/.hgtags	Mon Oct 07 20:19:28 2013 +0100
@@ -21,3 +21,4 @@
 cb463b94b82da269ea089c481ed5e39700525a8a icedtea6-1.9-branchpoint
 21f2a8d158545a161ba0d997c13bdba1e6166394 icedtea6-1.10-branchpoint
 24c5bd2e7d574441813bfb8f9e4636e50c5d7c28 icedtea6-1.11-branchpoint
+5a1e1b39664409e9a0945ba49b558f25ef976c58 icedtea6-1.12-branchpoint
diff -r 55241b2310b8 -r c6d9c3b67430 AUTHORS
--- a/AUTHORS	Wed Oct 31 10:33:28 2012 +0000
+++ b/AUTHORS	Mon Oct 07 20:19:28 2013 +0100
@@ -2,6 +2,7 @@
 Please keep this list in alphabetical order.
 
 Lillian Angel <langel at redhat.com>
+Alexis Ballier <aballier at gentoo.org>
 Alon Bar-Lev <alon.barlev at gmail.com>
 Gary Benson <gbenson at redhat.com>
 Tania Bento <tbento at redhat.com>
@@ -18,6 +19,7 @@
 Andrew John Hughes <gnu_andrew at member.fsf.org, gnu.andrew at redhat.com>
 Tomas Hurka <tomas.hurka at sun.com>
 Ioana Ivan <iivan at redhat.com>
+C. K. Jester-Young (cky944 at gmail.com)
 Matthias Klose <doko at ubuntu.com>
 Francis Kung <fkung at redhat.com>
 Denis Lila <dlila at redhat.com>
@@ -32,6 +34,7 @@
 Mark Reinhold <mr at sun.com>
 Bernhard Rosenkr??nzer <bero at arklinux.org>
 Marc Schoenefeld <mschoene at redhat.com>
+Andreas Schwab <schwab at suse.cz>
 Keith Seitz <keiths at redhat.com>
 Andrew Su <asu at redhat.com, andrew.su at utoronto.ca>
 Joshua Sumali <jsumali at redhat.com>
@@ -39,6 +42,7 @@
 Christian Thalinger <twisti at complang.tuwien.ac.at>
 Dalibor Topic <robilad at kaffe.org>
 Arnaud Vandyck <avdyk at debian.org>
+Torsten Werner (mail.twerner at googlemail.com)
 Mark Wielaard <mark at klomp.org>
 Yi Zhan <yi.zhan at intel.com>
 
diff -r 55241b2310b8 -r c6d9c3b67430 ChangeLog
--- a/ChangeLog	Wed Oct 31 10:33:28 2012 +0000
+++ b/ChangeLog	Mon Oct 07 20:19:28 2013 +0100
@@ -1,3 +1,2042 @@
+2013-10-07  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(OPENJDK_DATE): Set to date of b28.
+	(OPENJDK_SHA256SUM): Likewise for SHA256 checksum.
+	(OPENJDK_URL): Use new OPENJDK-6 project URL.
+
+2013-09-24  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/hotspot/hs23/remove_bad_overrides.patch:
+	Removed.
+	* Makefile.am:
+	Remove patch now upstreamed.
+
+2013-09-19  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* configure.ac:
+	Check if CC gets set and fail if not.
+
+2013-09-19  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* configure.ac:
+	Check if CXX gets set and fail if not.
+
+2013-09-19  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/cacao/hotspot/hs23/memory.patch,
+	* patches/hotspot/hs23/6_for_override.patch:
+	Removed.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Replace 6_for_override with
+	remove_bad_overrides and hs23 memory patch with
+	original.
+	* patches/cacao/hotspot/original/memory.patch:
+	Restored.
+	* patches/hotspot/hs23/remove_bad_overrides.patch:
+	Added.
+
+2013-09-17  Xerxes R??nby  <xerxes at zafena.se>
+	    Robert Lougher  <rob at jamvm.org.uk>
+
+	JamVM
+	- JSR 335: fix frame.c
+	- Add support for CallerSensitive
+	- JSR 335: handle interfaces when resolving a method
+	- sun.misc.Unsafe: additional methods get/putAddress
+	- JSR 292: make internal functions static
+	* NEWS: Updated.
+	* Makefile.am
+	(JAMVM_VERSION): Updated JamVM to 2013-08-28 revision.
+	(JAMVM_SHA256SUM): Updated.
+
+2013-09-13  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/cacao/hotspot/original/memory.patch,
+	* patches/ecj/bootver.patch,
+	* patches/ecj/hotspot/original/hotspot-jdk-dependency.patch,
+	* patches/hotspot/hs23/7197906-handle_32_bit_shifts.patch,
+	* patches/hotspot/hs23/revert-7017193.patch,
+	* patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch,
+	* patches/hotspot/original/7022999-fastlocking_compiler1_only.patch,
+	* patches/hotspot/original/7032696-7029152_broke_vm.patch,
+	* patches/hotspot/original/7140985-hsdis_caller_options.patch,
+	* patches/hotspot/original/aarch64.patch,
+	* patches/hotspot/original/alpha-fixes.patch,
+	* patches/hotspot/original/arm-hsdis.patch,
+	* patches/hotspot/original/arm.patch,
+	* patches/hotspot/original/gcc-suffix.patch,
+	* patches/hotspot/original/jtreg-test7020373-fix.patch,
+	* patches/hotspot/original/pr639-broken_shark_build.patch,
+	* patches/hotspot/original/sdt-arguments.patch,
+	* patches/hotspot/original/sdt-dtrace-hpp.patch,
+	* patches/hotspot/original/sdt-jni.patch,
+	* patches/hotspot/original/sdt-make.patch,
+	* patches/hotspot/original/systemtap-alloc-size-workaround.patch,
+	* patches/hotspot/original/systemtap_gc.patch,
+	* patches/hotspot/original/text-relocations.patch,
+	* patches/hotspot/original/update-bootclasspath.patch,
+	* patches/hotspot/original/version.patch,
+	* patches/ia64-fix.patch,
+	* patches/jtreg-remove-test-6987555.patch,
+	* patches/jtreg-remove-test-6991596.patch,
+	* patches/numa_on_early_glibc.patch,
+	* patches/openjdk/6796786-invalid_FP_identity_transform.patch,
+	* patches/openjdk/6956668-misbehavior_of_XOR_operator_with_int.patch,
+	* patches/openjdk/7010849-modernise_sa.patch,
+	* patches/openjdk/7019808-stack_noexec.patch,
+	* patches/openjdk/7029152-String_intrinsics_miss_optimization.patch,
+	* patches/openjdk/7031385-gcc-register-allocation-fix.patch,
+	* patches/openjdk/7032388-work_without_cmov_instruction.patch,
+	* patches/openjdk/7034464-transparent_huge_pages.patch,
+	* patches/openjdk/7036220-shark_llvm_29_headers.patch,
+	* patches/openjdk/7037939-disable_adaptive_resizing_with_large_pages.patch,
+	* patches/openjdk/7041156-gcc_export_dynamic.patch,
+	* patches/openjdk/7042070-Typo_in_Test6796786.patch,
+	* patches/openjdk/7043564-hugepage.patch,
+	* patches/openjdk/7047069-Array_can_dynamically_change_size.patch,
+	* patches/params-cast-size_t.patch,
+	* patches/pr690-shark-jit-hs20.patch,
+	* patches/pr696-zero-fast_aldc-hs20.patch,
+	* patches/security/20130416/8004336.patch,
+	* patches/security/20130416/8006309.patch,
+	* patches/security/20130416/8009699.patch,
+	* patches/security/20130618/7158805-nested_subroutine_rewriting.patch,
+	* patches/security/20130618/8001330-checking_order_improvement.patch,
+	* patches/stdc-limit-macros.patch,
+	* patches/systemtap-gcc-4.5.patch,
+	* patches/use-idx_t.patch:
+	Remove patches obsoleted by dropping of hs20 support.
+	* INSTALL: Update docs to support only the 'original' hs23.
+	* Makefile.am:
+	(SECURITY_PATCHES): Removed (in hs23).
+	(ICEDTEA_PATCHES): Add 6_for_override.  Replace
+	$(HSBUILD) with hs23.  Join ALT_HSBUILD patches
+	into main version.  Remove !ALT_HSBUILD patches.
+	(ICEDTEA_ENV): Join ALT_HSBUILD settings to main version.
+	* acinclude.m4:
+	(IT_WITH_HOTSPOT_BUILD): Support only original.
+	* hotspot.map: Remove hs23 line.
+	* patches/hotspot/hs23/6_for_override.patch:
+	New patch to use source/target 6 for building
+	the agent as the hs23 version includes @Override.
+
+2013-09-09  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* NEWS:
+	Add release notes for 1.11.13.
+
+2013-09-05  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patch.
+	* patches/rh995488-rhel_tz_fix.patch:
+	Use /etc/sysconfig/clock on RHEL & clones
+	so that they don't search /usr/share/zoneinfo.
+	* NEWS: Mention patch.
+
+2013-09-02  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new backports.  Move
+	disable-cc-incompatible-sanity-checks and freetypeversion
+	to the end.
+	* patches/disable-cc-incompatible-sanity-checks.patch,
+	* patches/freetypeversion.patch:
+	Regenerated to work after new backports.
+	* patches/openjdk/6563752-ss12_support.patch,
+	* patches/openjdk/6729772-opt_cleanup.patch,
+	* patches/openjdk/6799141-split_out_versions.patch,
+	* patches/openjdk/6816311-compiler_name.patch,
+	* patches/openjdk/6974017-minorver_for_solaris.patch,
+	* patches/openjdk/6980281-majorver_for_solaris.patch,
+	* patches/openjdk/7000225-bad_tabs.patch,
+	* patches/openjdk/7038711-fix_no-clobber_usage.patch:
+	Backports from OpenJDK 7 to bring in latest Makefile
+	updates.
+	* NEWS: Update and order backports numerically.
+
+2013-08-30  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patches.
+	* NEWS: Updated with new patches.
+	* patches/imageiojpeg_sync.patch:
+	Bring in changes to imageioJPEG.c made between
+	the start of OpenJDK 6 and the start of OpenJDK 7's
+	hg repositories.
+	* patches/libraries.patch: Updated against patches below.
+	* patches/openjdk/4893408-jpegreader_byte_gray.patch,
+	* patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch,
+	* patches/openjdk/6791502-invalid_icc_profile.patch,
+	* patches/openjdk/6793818-jpegimagereader_too_greedy.patch,
+	* patches/openjdk/6888215-jpeg_memory_leak.patch,
+	* patches/openjdk/6989760-native_warnings.patch,
+	* patches/openjdk/6989774-imageio_compiler_warnings.patch,
+	* patches/openjdk/7013519-integer_overflows.patch,
+	* patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch,
+	* patches/openjdk/8005194-scale_memory_leak.patch,
+	* patches/openjdk/8020983-outofmemoryerror_jpegimagewriter.patch:
+	New backports from OpenJDK 7u.
+
+2013-08-29  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new timezone data patches.
+	* patches/openjdk/8014469-tzdata2013c.patch,
+	* patches/openjdk/8020054-tzdata2013d.patch:
+	Latest tzdata updates.
+
+2013-08-30  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patch.
+	(ICEDTEA_ENV): Set SYSTEM_KRB5, KRB5_LIBS
+	and KRB5_CFLAGS.
+	* acinclude.m4:
+	(IT_CHECK_FOR_KERBEROS): Add --enable-system-kerberos
+	option (on by default) which checks for libkrb5 and
+	the krb5.h header.
+	* configure.ac: Invoke IT_CHECK_FOR_KERBEROS.
+	* patches/alternative_krb5_cache_fixup.patch:
+	Fix previous Kerberos patch to fall back on old
+	method of using /tmp/krb5cc_<uid> and to allow
+	the LDFLAGS for Kerberos to be specified.
+	* INSTALL: Updated.
+	* NEWS: Likewise.
+
+2013-08-29  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patch.
+	* NEWS: Mention RH991170.
+	* patches/alternative_krb5_cache.patch:
+	Backport from IcedTea 2.x which retrieves the
+	Kerberos cache name using a Kerberos library call.
+
+2013-08-28  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am: Add new patch.
+	* patches/lcms2-emulate_old_settagdata.patch:
+	Emulate behaviour of old 6 setTagData function
+	in not throwing exceptions.
+
+2013-08-28  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new backport.
+	* patches/openjdk/6893617-cnctx_always_uses_default_orb.patch:
+	Fixes TCK regression caused by 7162902.
+
+2013-08-23  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Apply 7197906 on hs23 only.
+	* patches/security/20130416/8004336.patch,
+	* patches/security/20130416/8006309.patch,
+	* patches/security/20130416/8009699.patch:
+	Restore HotSpot security patches as not available
+	in upstream HotSpot yet.
+	* patches/hotspot/original/7197906-handle_32_bit_shifts.patch:
+	Moved to...
+	* patches/hotspot/hs23/7197906-handle_32_bit_shifts.patch:
+	...here.
+
+2013-08-22  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/fonts-rhel-version.patch,
+	* patches/fonts-rhel.patch,
+	* patches/object-factory-cl-internal.patch,
+	* patches/openjdk/8009996-emitter_bean.patch,
+	* patches/security/20130618/handle_npe.patch:
+	Remove upstreamed patches.
+	* Makefile.am:
+	(SECURITY_PATCHES): Remove upstreamed patch.
+	(ICEDTEA_PATCHES): Remove upstreamed patches.
+	* patches/hotspot/original/7197906-handle_32_bit_shifts.patch:
+	Restored as now used by the HotSpot 23 build.
+
+2013-08-20  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add patches from IcedTea's
+	HotSpot 23 (mainly the ARM port work).  Move
+	some patches back to being applied on both
+	versions of HotSpot.
+	(ports): Install ARM port in all builds.
+	(clean-ports): Likewise for uninstall.
+	* hotspot.map: Use HotSpot 23 from the 7u
+	tree.
+	* patches/arm/cc_compile-01.patch,
+	* patches/arm/cc_compile-02.patch,
+	* patches/arm/cc_compile-03.patch,
+	* patches/arm/cc_compile-04.patch,
+	* patches/arm/cc_compile-05.patch,
+	* patches/arm/cc_compile-06.patch,
+	* patches/hotspot/hs23/7188168-fix_debug_binaries.patch,
+	* patches/hotspot/hs23/aarch64.patch:
+	Patches from IcedTea's 2.3.x HotSpot.
+	* patches/hotspot/original/alpha-fixes.patch,
+	* patches/hotspot/hs23/alpha-fixes.patch:
+	Split from patches/alpha-fixes.patch.
+	* patches/hotspot/hs23/arm-01-hsx22.patch,
+	* patches/hotspot/hs23/arm-03-invokedynamic.patch,
+	* patches/hotspot/hs23/arm-04-invokedynamic_jit.patch,
+	* patches/hotspot/hs23/arm-05-invokedynamic_methodhandle.patch,
+	* patches/hotspot/hs23/arm-06-no_o0.patch,
+	* patches/hotspot/hs23/arm-07-cleanup.patch,
+	* patches/hotspot/hs23/arm-08-cleanup.patch,
+	* patches/hotspot/hs23/arm-09-jvmti.patch,
+	* patches/hotspot/hs23/arm-10-memory_protect.patch,
+	* patches/hotspot/hs23/arm-11-thumb2_jit.patch,
+	* patches/hotspot/hs23/arm-12-ldrexd.patch,
+	* patches/hotspot/hs23/arm-13-sp_adjustment.patch,
+	* patches/hotspot/hs23/arm-14-stage1.patch,
+	* patches/hotspot/hs23/arm-15-stage2.patch,
+	* patches/hotspot/hs23/arm-16-dont_save_locals.patch,
+	* patches/hotspot/hs23/arm-17-no_debug_code.patch,
+	* patches/hotspot/hs23/arm-18-correct_call.patch,
+	* patches/hotspot/hs23/arm-19-fix_jit_bug.patch,
+	* patches/hotspot/hs23/arm-20-function_renaming.patch,
+	* patches/hotspot/hs23/arm-21-fix_compareandswaplong.patch,
+	* patches/hotspot/hs23/arm-22-fix_trashed_thread_ptr.patch,
+	* patches/hotspot/hs23/arm-25-hsx23.patch:
+	HotSpot 23 only ARM port work.
+	* patches/hotspot/hs23/arm-hsdis.patch:
+	HotSpot 23 version of hsdis patch.
+	* patches/hotspot/original/arm.patch,
+	* patches/hotspot/hs23/arm.patch,
+	Split from patches/arm.patch.
+	* patches/hotspot/hs23/drop_unlicensed_test.patch:
+	Patches from IcedTea's 2.3.x HotSpot.
+	* patches/hotspot/original/gcc-suffix.patch,
+	* patches/hotspot/hs23/gcc-suffix.patch:
+	Split from patches/gcc-suffix-hotspot.patch.
+	* patches/hotspot/original/jtreg-test7020373-fix.patch,
+	* patches/hotspot/hs23/jtreg-test7020373-fix.patch:
+	Split from patches/jtreg-hotspot-Test7020373-fix.patch.
+	* patches/hotspot/hs23/no_useless_debuginfo_files.patch,
+	* patches/hotspot/hs23/pr1101-sparc_symbols.patch:
+	From IcedTea 2.3.x HotSpot.
+	* patches/hotspot/original/text-relocations.patch:
+	* patches/hotspot/hs23/text-relocations.patch:
+	Split from patches/text-relocations.patch.
+	* patches/hotspot/hs23/type_fixes.patch:
+	From IcedTea 2.3.x HotSpot.
+	* patches/hotspot/original/update-bootclasspath.patch,
+	* patches/hotspot/hs23/update-bootclasspath.patch:
+	Split from patches/update-bootclasspath.patch.
+	* patches/hotspot/original/version.patch,
+	* patches/hotspot/hs23/version.patch:
+	Split from patches/version-hotspot.patch.
+	* patches/hotspot/hs23/zero_fixes.patch,
+	* patches/hotspot/hs23/zero_hs22.patch:
+	HotSpot 23 only Zero work.
+	* patches/hotspot/original/7032696-7029152_broke_vm.patch:
+	Backported from 7u.
+	* patches/hotspot/original/7140985-hsdis_caller_options.patch:
+	Upstream version of part of the arm-hsdis patch.
+	* patches/hotspot/original/arm-hsdis.patch:
+	Remove 7140985 fragment.
+	* patches/pr1095-werror.patch: Apply to both HotSpots.
+
+2013-08-14  Xerxes R??nby  <xerxes at zafena.se>
+	    Robert Lougher  <rob at jamvm.org.uk>
+
+	JamVM
+	- JSR 292: enable for OpenJDK 7/IcedTea 2
+	- JSR 335: invokeinterface check in method resolution
+	- JSR 335: java.lang.invoke.MagicLambdaImpl
+	- JSR 292: invokedynamic is 5 bytes - non-direct interp
+	- JSR 292: invokedynamic is 5 bytes in length
+	- Minor formatting change
+	- Minor fixes: use perror for mmap failure
+	- FreeClassData: fix comment
+	- FreeClassData: adjust method count for Miranda methods
+	- JSR 335: remove GC hack
+	- JSR 335: implement "bridge" methods for Mirandas
+	- JSR 335: handle multiple defaults and conflicts
+	* NEWS: Updated.
+	* Makefile.am
+	(JAMVM_VERSION): Updated JamVM to 2013-07-14 revision.
+	(JAMVM_SHA256SUM): Updated.
+
+2013-08-07  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/openjdk/6786028-wcag_bold_tags.patch,
+	* patches/openjdk/6786682-wcag_lang.patch,
+	* patches/openjdk/6786688-wcag_table.patch,
+	* patches/openjdk/6786690-wcag_dl.patch,
+	* patches/openjdk/6802694-no_deprecated.patch,
+	* patches/openjdk/6851834-handle_renames.patch,
+	* patches/openjdk/6851834-restructure.patch,
+	* patches/openjdk/6961178-doclet_xml.patch,
+	* patches/openjdk/7006270-regressions.patch,
+	* patches/security/20130618/8012375-javadoc_framing.patch,
+	* patches/security/20130618/8015997-more_javadoc_framing.patch,
+	* patches/security/20130618/langtools_generics.patch,
+	* patches/security/20130618/langtools_merge-01.patch,
+	* patches/security/20130618/langtools_merge-02.patch,
+	* patches/security/20130618/langtools_merge-03.patch:
+	Removed.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Remove upstreamed patches.
+
+2013-08-07  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* hotspot.map: Bring in 2.3.12 tag.
+
+2013-08-06  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/security/20130618/8000642-better_transportation_handling.patch,
+	* patches/security/20130618/8001032-restrict_object_access-corba.patch:
+	Removed.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Remove upstreamed patches.
+
+2013-08-06  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* 8013196-TimeZone_getDefault_throws_exception.patch:
+	Renamed to...
+	* 8013196-timezone_getdefault_throws_exception.patch:
+	...this.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Fix name of patch.
+
+2013-08-05  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patches.
+	* patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch,
+	* patches/openjdk/6636370-appcontext_simplification.patch,
+	* patches/openjdk/7196533-timezone_bottleneck.patch:
+	Backport additional patches which relate to changes in 8013196.
+	* patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch:
+	Drop SharedSecrets changes which cause a TCK regression.
+
+2013-08-02  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* hotspot.map: Bring in hs23 changes to ARM32
+	port, syncing with 2.3.12 tag.
+
+2013-08-02  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/openjdk/6469266-xmlsec_1.4.2.patch,
+	* patches/openjdk/6888167-medialib_memory_leaks.patch,
+	* patches/openjdk/7195301-no_instanceof_node.patch,
+	* patches/security/20130618/6741606-apache_santuario.patch,
+	* patches/security/20130618/7170730-windows_network_stack.patch,
+	* patches/security/20130618/8000638-improve_deserialization.patch,
+	* patches/security/20130618/8001032-restrict_object_access-jdk.patch,
+	* patches/security/20130618/8001033-refactor_address_handling.patch,
+	* patches/security/20130618/8001034-memory_management.patch,

From andrew at icedtea.classpath.org  Mon Oct  7 15:11:26 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Mon, 07 Oct 2013 22:11:26 +0000
Subject: /hg/icedtea6: Update NEWS with features in b28 not already relea...
Message-ID: <hg.7ce84f82f817.1381183886.2873452341184383832@icedtea.classpath.org>

changeset 7ce84f82f817 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7ce84f82f817
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Oct 07 23:11:18 2013 +0100

	Update NEWS with features in b28 not already released.

	2013-10-07  Andrew John Hughes  <gnu.andrew at redhat.com>

		* NEWS:
		Add features from b28 not already released (mainly
		those changes in HotSpot 20->23).


diffstat:

 ChangeLog |    6 +
 NEWS      |  854 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 856 insertions(+), 4 deletions(-)

diffs (truncated from 889 to 500 lines):

diff -r c6d9c3b67430 -r 7ce84f82f817 ChangeLog
--- a/ChangeLog	Mon Oct 07 20:19:28 2013 +0100
+++ b/ChangeLog	Mon Oct 07 23:11:18 2013 +0100
@@ -1,3 +1,9 @@
+2013-10-07  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* NEWS:
+	Add features from b28 not already released (mainly
+	those changes in HotSpot 20->23).
+
 2013-10-07  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	* Makefile.am:
diff -r c6d9c3b67430 -r 7ce84f82f817 NEWS
--- a/NEWS	Mon Oct 07 20:19:28 2013 +0100
+++ b/NEWS	Mon Oct 07 23:11:18 2013 +0100
@@ -14,11 +14,859 @@
 New in release 1.13.0 (201X-XX-XX):
 
 * New features
-  - PR1317: Provide an option to build with a more up-to-date HotSpot
   - PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional
   - PR718: Backport LCMS2 support from IcedTea7
+* Import of OpenJDK6 b28
+  - OJ1: Confirm that community members can commit to hotspot in OpenJDK6
+  - OJ2: Revert unnecessary file added to hotspot repo
+  - OJ4: Backport the new version of copyMemory from OpenJDK 7 to allow Snappy to build
+  - OJ10: Add additional use of generics to satisfy OpenJDK 6 javac
+  - OJ11: Add generics to javadoc to allow it to compile with recent backports
+  - OJ12: Xalan/xerxes classes don't have access to its own internal packages
+  - OJ13: Font configuration problem on RHEL6 systems
+  - OJ15: Windows lacks SIZE_MAX
+  - OJ16: Windows lacks variadic macros
+  - OJ17: Error in Backport of Windows version of 7170730
+  - OJ18: HotSpot 23's Java code won't build with a 1.5 compiler due to @Override on interfaces
+  - S4965777: GC changes to support use of discovered field for pending references
+  - S5091921: Sign flip issues in loop optimizer
+  - S6310967: SA: jstack -m produce failures in output
+  - S6330863: vm/gc/InfiniteList.java fails intermittently due to timeout
+  - S6354181: nsk.logging.stress.threads.scmhml001 fails assertion in "src/share/vm/oops/instanceKlass.cpp, 111"
+  - S6385687: UseFastEmptyMethods/UseFastAccessorMethods considered harmful
+  - S6472925: OutOfMemoryError fails to generate stack trace as it now ought
+  - S6478991: C1 NullCheckEliminator yields incorrect exceptions
+  - S6484965: G1: piggy-back liveness accounting phase on marking
+  - S6484982: G1: process references during evacuation pauses
+  - S6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool")
+  - S6528013: C1 CTW failure with -XX:+VerifyOops assert(allocates2(pc),"")
+  - S6535709: interrupt of wait()ing thread isn't triggerring InterruptedException - test intwait3
+  - S6552561: MaxRecursiveInlineLevel flag doesn't operate correctly
+  - S6564610: assert(UseCompiler || CompileTheWorld, "UseCompiler should be set by now.")
+  - S6566340: Restore use of stillborn flag to signify a thread that was stopped before it started
+  - S6588413: Use -fvisibility=hidden for gcc compiles
+  - S6589823: Error: meet not symmetric
+  - S6591247: C2 cleans up the merge point too early during SplitIf
+  - S6593758: RFE: Enhance GC ergonomics to dynamically choose ParallelGCThreads
+  - S6608385: G1: need to support parallel reference processing
+  - S6627787: CMS: JVM refuses to start up with -Xms16m -Xmx16m
+  - S6627983: G1: Bad oop deference during marking
+  - S6631003: Add hg tip changeset to build image
+  - S6636110: unaligned stackpointer leads to crash during deoptimization
+  - S6668573: CMS: reference processing crash if ParallelCMSThreads > ParallelGCThreads
+  - S6679764: enable parallel compaction by default
+  - S6725983: Assertion "method->method_holder())->is_not_initialized(),"method holder must be initialized"
+  - S6728025: LinkResolver is missing some ResourceMarks
+  - S6741940: Nonvolatile XMM registers not preserved across JNI calls
+  - S6766644: Redefinition of compiled method fails with assertion "Can not load classes with the Compiler thread"
+  - S6777083: assert(target != __null,"must not be null")
+  - S6789220: CMS: intermittent timeout running nsk/regression/b4796926
+  - S6791672: enable 1G and larger pages on solaris
+  - S6804436: G1: heap region indices should be size_t
+  - S6809483: hotspot:::method_entry are not correctly generated for "method()V"
+  - S6810861: G1: support -XX:+{PrintClassHistogram,HeapDump}{Before,After}FullGC
+  - S6812217: Base memory of MergeMem node violates assert during killing expanded AllocateArray node
+  - S6814390: G1: remove the concept of non-generational G1
+  - S6817525: turn on method handle functionality by default for JSR 292
+  - S6820066: Check that -XX:ParGCArrayScanChunk has a value larger than zero.
+  - S6839872: remove implementation inheritance from JSR 292 APIs
+  - S6841742: par compact - remove unused/unsupported options
+  - S6845426: non-static <clinit> method with no args is called during the class initialization process
+  - S6865265: JVM crashes with "missing exception handler" error
+  - S6883834: ParNew: assert(!_g->to()->is_in_reserved(obj),"Scanning field twice?") with LargeObjects tests
+  - S6888336: G1: avoid explicitly marking and pushing objects in survivor spaces
+  - S6890673: Eliminate allocations immediately after EA
+  - S6896099: Integrate CMS heap ergo with default heap sizing ergo
+  - S6909440: C2 fails with assertion (_always_cold->is_cold(),"must always be cold")
+  - S6912621: iCMS: Error: assert(_markBitMap.isMarked(addr + 1),"Missing Printezis bit?")
+  - S6916968: CMS: freeList.cpp:304 assert(_allocation_stats.prevSweep() + ..., "Conservation Principle")
+  - S6918185: Remove unused code for lost card-marking optimization in BacktraceBuilder
+  - S6923430: G1: assert(res != 0,"This should have worked.")
+  - S6924259: Remove String.count/String.offset
+  - S6929868: G1: introduce min / max young gen size bounds
+  - S6939861: JVM should handle more conversion operations
+  - S6941923: RFE: Handling large log files produced by long running Java Applications
+  - S6942326: x86 code in string_indexof() could read beyond reserved heap space
+  - S6946385: G1: jstat does not support G1 GC
+  - S6946417: G1: Java VisualVM does not support G1 properly.
+  - S6948149: G1: Imbalance in termination times
+  - S6951623: 3/3 possible performance problems in FollowReferences() and GetObjectsWithTags()
+  - S6954420: 2/4 jps shows "process information unavailable" sometimes
+  - S6962930: make the string table size configurable
+  - S6962931: move interned strings out of the perm gen
+  - S6964776: c2 should ensure the polling page is reachable on 64 bit
+  - S6965570: assert(!needs_patching && x->is_loaded(),"how do we know it's volatile if it's not loaded")
+  - S6972759: Step over not working after thrown exception and Pop
+  - S6976060: G1: humongous object allocations should initiate marking cycles when necessary
+  - S6981791: remove experimental code for JSR 292
+  - S6986065: Rebrand exe/dll company names
+  - S6987703: iCMS: Intermittent hang with gc/gctests/CallGC/CallGC01 and +ExplicitGCInvokesConcurrent
+  - S6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
+  - S6988308: assert((cnt > 0.0f) && (prob > 0.0f)) failed: Bad frequency assignment in if
+  - S6990015: Incorrect Icache line size is used for 64 bit x86
+  - S6990212: JSR 292 JVMTI MethodEnter hook is not called for JSR 292 bootstrap and target methods
+  - S6990754: Use native memory and reference counting to implement SymbolTable
+  - S6992789: assert(phi->_idx >= nodes_size()) failed: only new Phi per instance memory slice
+  - S6993078: JSR 292 too many pushes:  Lesp points into register window
+  - S6994322: Remove the is_tlab and is_noref / is_large_noref parameters from the CollectedHeap
+  - S6996747: SIGSEGV in nmethod::cleanup_inline_caches / CompiledIC::verify
+  - S6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
+  - S7000125: CMS: Anti-monotone young gen sizing with respect to maximum whole heap size specification
+  - S7003401: Implement VM error-reporting functionality on erroneous termination
+  - S7003454: order constants in constant table by number of references in code
+  - S7004535: Clone loop predicate during loop unswitch
+  - S7004547: regular loop unroll should not unroll more than max unrolling
+  - S7004555: Add new policy for one iteration loops
+  - S7004681: G1: Extend marking verification to Full GCs
+  - S7005503: Make GuaranteedSafepointInterval a diagnostic flag
+  - S7005808: G1: re-enable ReduceInitialCardMarks for G1
+  - S7005865: Crash when running with PrintIRWithLIR
+  - S7007254: NullPointerException occurs with jvisualvm placed under a dir. including Japanese chars
+  - S7007446: G1: expand the heap with a single step, not one region at a time
+  - S7008809: should report the class in ArrayStoreExceptions from compiled code
+  - S7008866: Missing loop predicate for loop with multiple entries
+  - S7009098: SA cannot open core files larger than 2GB on Linux 32-bit
+  - S7009266: G1: assert(obj->is_oop_or_null(true )) failed: Error
+  - S7009276: Add -XX:+IgnoreUnrecognizedVMOptions to several tests
+  - S7009309: JSR 292: compiler/6991596/Test6991596.java crashes on fastdebug JDK7/b122
+  - S7009346: java/dyn/InvokeDynamicPrintArgs.java fails with NPE on solaris-sparc with -Xcomp
+  - S7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp
+  - S7009600: JSR 292 Server compiler crashes in Compile::find_intrinsic(ciMethod*, bool)
+  - S7009923: JSR 292: VM crash in JavaThread::last_frame
+  - S7010070: Update all 2010 Oracle-changed OpenJDK files to have the proper copyright dates - second pass
+  - S7011490: Wrong computation results in Test6880034
+  - S7011839: JSR 292 turn on escape analysis when using invokedynamic
+  - S7011855: G1: non-product flag to artificially grow the heap
+  - S7011865: JSR 292 CTW fails: !THREAD->is_Compiler_thread() failed: Can not load classes with the Compiler thre
+  - S7012072: CompileTheWorld causes incorrect class initialization
+  - S7012081: JSR 292: SA-JDI can't read MH/MT/Indy ConstantPool entries
+  - S7012087: JSR 292 Misleading exception message for a non-bound MH for a virtual method
+  - S7012088: jump to 0 address because of lack of memory ordering in SignatureHandlerLibrary::add
+  - S7012339: JSR 292 crash in G1SATBCardTableModRefBS::write_ref_field_pre_work()
+  - S7012648: move JSR 292 to package java.lang.invoke and adjust names
+  - S7012914: JSR 292 MethodHandlesTest C1: frame::verify_return_pc(return_address) failed: must be a return pc
+  - S7013347: allow crypto functions to be called inline to enhance performance
+  - S7013538: Java memory leak with escape analysis
+  - S7013964: openjdk LICENSE file needs rebranding
+  - S7014711: Fork HS20 to HS21 - renumber Major and build numbers of JVM
+  - S7014851: Remove unused parallel compaction code
+  - S7014874: Incorrect COOPs modes on solaris-{sparcv9,amd64} with ParallelGC
+  - S7014918: Improve core/minidump handling in Hotspot
+  - S7014923: G1: code cleanup
+  - S7015169: GC Cause not always set
+  - S7016023: Enable building ARM and PPC from src/closed repository
+  - S7016112: CMS: crash during promotion testing
+  - S7016797: Hotspot: securely/restrictive load dlls and new API for loading system dlls
+  - S7016881: JSR 292: JDI: sun.jvm.hotspot.utilities.AssertionFailure: index out of bounds
+  - S7016998: gcutil class LinearLeastSquareFit doesn't initialize some of its fields
+  - S7017008: G1: Turn on compressed oops by default.
+  - S7017009: Secondary out of c-heap memory error reporting out of memory
+  - S7017110: Add /SAFESEH to links on windows 32bit to verify safe exceptions
+  - S7017124: Fix some VM stats to avoid 32-bit overflow
+  - S7017240: C2: native memory leak in nsk/regression/b4675027 on windows-x86 in comp mode with G1
+  - S7017434: Tiered needs to support reprofiling
+  - S7017640: Fix for 6766644 deadlocks on some NSK tests when running with -Xcomp
+  - S7017673: Remove setting of the sun.jkernel.DownloadManager as a boot classloader hook
+  - S7017732: move static fields into Class to prepare for perm gen removal
+  - S7017824: Add support for creating 64-bit Visual Studio projects
+  - S7018257: jmm_DumpThreads allocates into permgen
+  - S7018277: JSR 292 change test/compiler/6987555/Test6987555.java to new MH syntax
+  - S7018286: G1: humongous allocation attempts should take the GC locker into account
+  - S7018302: newly added assert related to size of constantPoolOop causes secondary assertions or crashes
+  - S7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
+  - S7018366: hotspot/runtime_erro Fix for 7014918 does not build using MVC 2003
+  - S7018378: JSR 292: _bound_int_mh produces wrong result on 64-bit SPARC
+  - S7018429: JPRT: Update Makefile to use ALT_JDK_TARGET_IMPORT_PATH for copying JDK
+  - S7018506: CTW swallowing OOMs after symbol changes
+  - S7018673: Zero: 6953144, 6990754 and 7009756 made some changes which broke Zero
+  - S7018849: 7017124 fix broke VM build on some platforms
+  - S7019104: Bump the HS21 build number to 02
+  - S7019157: errorHandler doesn't compile with super old gcc without precompiled headers
+  - S7019165: Incorrect symbols in pstack output after SymbolTable changes
+  - S7019210: Fix misc references to /bugreport websites
+  - S7019557: SharedMiscDataSize too small for 64-bit fastdebug JVM
+  - S7019689: Non-dependent name is found in dependent base class although it should be rejected
+  - S7019718: make error reporting flags product instead of diagnostic
+  - S7019808: build fails on Fedora 14: SELinux run-time check: execution of stack in libjvm.so
+  - S7019819: bare oop in ciField
+  - S7020118: Alter frame assignability to allow for exception handler coverage of invokespecial <init>
+  - S7020403: Add AdvancedCompilationPolicy for tiered
+  - S7020521: arraycopy stubs place prebarriers incorrectly
+  - S7020992: jmm_DumpThreads should not allocate system object arrays outside the perm gen
+  - S7021322: assert(object_end <= top()) failed: Object crosses promotion LAB boundary
+  - S7021531: lock ordering problems after fix for 6354181
+  - S7021603: crash in fill_sync_handler with ExtendedDTrace probes
+  - S7021653: Parfait issue in hotspot/src/share/vm/oops/methodDataOops.hpp
+  - S7021953: Remove flags from globals.hpp inadvertently dragged in by 7016023
+  - S7022037: Pause when exiting if debugger is attached on windows
+  - S7022100: Method annotations are incorrectly set when redefining classes
+  - S7022200: G1: optimized build broken
+  - S7022204: LogFile wildcarding should use %p instead of star
+  - S7022570: Bump the HS21 build number to 03
+  - S7022659: errorHandler doesn't compile without precompiled headers
+  - S7022943: G1: improve logging to avoid interleaved numbers
+  - S7022998: JSR 292 recursive method handle calls inline themselves infinitely
+  - S7023069: G1: Introduce symmetric locking in the slow allocation path
+  - S7023151: G1: refactor the code that operates on _cur_alloc_region to be re-used for allocs by the GC threads
+  - S7023229: extraneous include of precompiled.hpp in hsdis.c
+  - S7023323: Build failure on VS2003: IsDebuggerPresent not found
+  - S7023747: G1: too strict assert in RefineRecordRefsIntoCSCardTableEntryClosure::do_card_ptr in g1RemSet.cpp
+  - S7023931: PcDescCache::find_pc_desc should not write _last_pc_desc
+  - S7024234: 2/3 jvmti tests fail assert(!_oops_are_stale) failed: oops are stale on Win-AMD64
+  - S7024475: loop doesn't terminate when compiled
+  - S7024584: Symbol printouts shouldnt be under PrintGCDetails
+  - S7024814: Bump the HS21 build number to 04
+  - S7024866: #  assert(limit == NULL || limit <= nm->code_end()) failed: in bounds
+  - S7024970: 2/3 assert(ServiceThread::is_service_thread(Thread::current())) failed: Service thread must post enqueue
+  - S7025485: leverage shared x86-only deoptimization code
+  - S7025628: Remove the temporary hack added for jdk modularization in hotspot
+  - S7025708: Assertion if using "-XX:+CITraceTypeFlow -XX:+Verbose" together
+  - S7025742: Can not use CodeCache::unallocated_capacity() with fragmented CodeCache
+  - S7026307: DEBUG MESSAGE: broken null klass on amd64
+  - S7026631: field _klass is incorrectly set for dual type of TypeAryPtr::OOPS
+  - S7026700: regression in 6u24-rev-b23: Crash in C2 compiler in PhaseIdealLoop::build_loop_late_post
+  - S7026932: G1: No need to abort VM when card count cache expansion fails
+  - S7026957: assert(type2aelembytes(store->as_Mem()->memory_type(), true) == 1 << shift->in(2)->get_int()) failed
+  - S7027232: JSR 292: wrong numeric value returned by MH on solaris-sparc
+  - S7027529: CMS: retire CMSUseOldDefaults flag
+  - S7027766: G1: introduce flag to dump the liveness information per region at the end of marking
+  - S7028172: 3/4 SA needs to adapt to Solaris libproc change made in 6748307
+  - S7028374: race in fix_oop_relocations for scavengeable nmethods
+  - S7028394: Newer AMD Processor Prefetch Defaults
+  - S7028846: Bump the HS21 build number to 05
+  - S7029017: Additional architecture support for c2 compiler
+  - S7029036: Card-table verification hangs with all framework collectors, except G1, even before the first GC
+  - S7029167: add support for conditional card marks
+  - S7029458: G1: Add newly-reclaimed regions to the beginning of the region free list, not the end
+  - S7029509: nightly failures after static fields in Class
+  - S7029805: JSR 292 compiler/6991596/Test6991596.java fails in nightly
+  - S7030207: Zero tweak to remove accidentally incorporated code
+  - S7030300: more nightly failures after statics in Class changes
+  - S7030388: JCK test failed to reject invalid class check01304m10n.
+  - S7030435: Some oop_oop_iterate_m() methods iterate outside of specified memory bounds
+  - S7030715: JSR 292 JRuby test/test_super_call_site_caching.rb asserts with +DoEscapeAnalysis
+  - S7031227: Bump the HS21 build number to 06
+  - S7031571: Generate native VS2010 project files
+  - S7031614: jmap -permstat fails with java.lang.InternalError in sun.jvm.hotspot.oops.OopField.getValue
+  - S7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
+  - S7032133: Enable sse4.2 for new AMD processors
+  - S7032162: assert(flat != TypePtr::BOTTOM) failed: cannot alias-analyze an untyped ptr
+  - S7032306: Fastdebug build failure on Solaris with SS11 compilers
+  - S7032314: Allow to generate CallLeafNoFPNode in IdealKit
+  - S7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
+  - S7032458: Zero and Shark fixes
+  - S7032531: G1: enhance GC logging to include more accurate eden / survivor size transitions
+  - S7032696: Fix for 7029152 broke VM
+  - S7032775: Include Shark code in the build again
+  - S7032849: 7022998 changes broke hs_err compile task print
+  - S7032963: StoreCM shouldn't participate in store elimination
+  - S7033100: CreateMinidumpOnCrash does not work for failed asserts
+  - S7033141: assert(has_cp_cache(i)) failed: oob
+  - S7033154: Improve C1 arraycopy performance
+  - S7033237: Bump the HS21 build number to 07
+  - S7033292: G1: nightly failure: Non-dirty cards in region that should be dirty
+  - S7033669: JVM TI spec has to be changed to not contain URLS to the VM Spec
+  - S7033732: C1: When calling c2 arraycopy stubs offsets and length must have clear upper 32bits
+  - S7033779: CodeCache::largest_free_block may need to hold the CodeCache lock
+  - S7034133: cleanup obsolete option handling
+  - S7034139: G1: assert(Thread::current()->is_ConcurrentGC_thread()) failed: only a conc GC thread can call this.
+  - S7034513: enable fast accessors and empty methods for ZERO and -Xint
+  - S7034585: Adjust fillInStackTrace filtering to assist 6998871
+  - S7034625: Product builds in Visual Studio projects should produce full symbol information
+  - S7034957: acquiring lock CodeCache_lock/1 out of order with lock tty_lock/0 -- possible deadlock
+  - S7034967: C1: assert(false) failed: error (assembler_sparc.cpp:2043)
+  - S7035117: G1: nsk/stress/jni/jnistress002 fails with assertion failure
+  - S7035144: G1: nightly failure: Non-dirty cards in region that should be dirty (failures still exist...)
+  - S7035161: assert(!o->is_null_object()) failed: null object not yet handled here.
+  - S7035259: Bump the HS21 build number to 08
+  - S7035713: 3DNow Prefetch Instruction Support
+  - S7035744: jprt no longer does open-only builds
+  - S7035861: linux-armsflt: assert(ni->data() == (int)(x + o)) failed: instructions must match
+  - S7035870: JSR 292: Zero support
+  - S7035946: Up to 15% regression on JDK 7 b136 vs b135 on specjvm2008.crypto.rsa on x64
+  - S7036021: G1: build failure on win64 and linux with hs21 in jdk6 build environment
+  - S7036199: Adding a notification to the implementation of GarbageCollectorMXBeans
+  - S7036220: Shark fails to find LLVM 2.9 System headers during build
+  - S7036236: VM crashes assert((!inside_attrs()) || is_error_reported()) failed ...
+  - S7036267: c2/arm: mark version number as experimental and disable on unsupported platforms
+  - S7036482: clear argument is redundant and unused in cardtable methods
+  - S7036525: Disable alternative source mechanism for OPENJDK builds
+  - S7036706: G1: Use LIR_OprDesc::as_pointer_register in code changes for 7035117
+  - S7036747: 7017009 reappeared, problem with ElfStringTable
+  - S7036960: TemplateTable::fast_aldc in templateTable_x86_64.cpp uses movptr instead of load_klass
+  - S7037174: Bump the HS21 build number to 09
+  - S7037250: cscope.make database generation is silently broken
+  - S7037276: Unnecessary double traversal of dirty card windows
+  - S7037756: Deadlock in compiler thread similiar to 6789220
+  - S7037812: few more defaults changes for new AMD processors
+  - S7039044: Bump the HS21 build number to 10
+  - S7039089: G1: changeset for 7037276 broke heap verification, and related cleanups
+  - S7039447: 2/1 java profiling is broken in build 139 (garbage in function name)
+  - S7039586: test/java/util/Collections/Rotate.java failing with hs21-b09
+  - S7039627: G1: avoid BOT updates for survivor allocations and dirty survivor regions incrementally
+  - S7039652: Performance regression after 7004547 changes
+  - S7039731: arraycopy could use prefetch on SPARC
+  - S7040068: CMS: Possibly unsafe initialization of BlockOffsetArrayUseUnallocatedBlock
+  - S7040410: -Xloggc:<file> incorrectly enables TraceClassUnloading causing tracing on tty
+  - S7040450: G1: assert((_g1->evacuation_failed()) || (!_g1->obj_in_cs(obj))) failed: shouldn't still be in ...
+  - S7040485: Use transparent huge page on linux by default
+  - S7040777: Bump the HS21 build number to 11
+  - S7040779: Bump the HS21 build number to 12
+  - S7040780: Bump the HS21 build number to 13
+  - S7040781: Bump the HS21 build number to 14
+  - S7041100: The load in String.equals intrinsic executed before null check
+  - S7041156: gcc 4.6 doesn't recognise -export-dynamic option
+  - S7041244: JSR 292: Server VM gets a SEGV running a JCK test
+  - S7041410: 5/4 finish removing SOLARIS_7_OR_LATER from HotSpot
+  - S7041440: G1: assert(obj->is_oop_or_null(true )) failed: Error #
+  - S7041501: NUMA: Expand the old gen more aggressively
+  - S7041582: set_mode_flags isn't called without -Xmixed specified
+  - S7041603: standalone SA doesn't build after 7010849
+  - S7041789: 30% perf regression with c2/arm following 7017732
+  - S7042052: Xcomp crash with PopSynchronousTest
+  - S7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
+  - S7042153: guarantee(x_compare_res != Constant::not_comparable) failed: incomparable constants in IfOp
+  - S7042285: G1: native memory leak during humongous object allocation
+  - S7042327: assert(opaq->outcnt() == 1 && opaq->in(1) == limit)
+  - S7042740: CMS: assert(n> q) failed: Looping at: ... blockOffsetTable.cpp:557
+  - S7043040: JSR292: JRuby bench/shootout/binarytrees.ruby-2.ruby SEGV: constantPoolKlass::oop_follow_contents
+  - S7043298: 4/4 fix for 7028172 causes "Label too long: ..." error message
+  - S7043301: assert(locals < caller->fp() || locals > (caller->fp() + 16)) failed: locals in save area
+  - S7043461: VM crashes in void LinkResolver::runtime_resolve_virtual_method
+  - S7043552: regression after 7042327
+  - S7043564: compile warning and copyright fixes
+  - S7043891: CMS: assert(_whole_heap.contains(p)) failed: out of bounds access to card marking array
+  - S7043987: 3/3 JVMTI FollowReferences is slow
+  - S7044486: open jdk repos have files with incorrect copyright headers, which can end up in src bundles
+  - S7044725: -XX:-UnrollLimitCheck -Xcomp : Exception: String index out of range: 29488
+  - S7044738: Loop unroll optimization causes incorrect result
+  - S7044892: JSR 292: API entry points sometimes throw the wrong exceptions or doesn't throw the expected one
+  - S7045232: G1: pool names are inconsistent with other collectors (don't have 'Space')
+  - S7045330: G1: Simplify/fix the HeapRegionSeq class
+  - S7045506: assert(!can_reshape || !new_phi) failed: for igvn new phi should be hooked
+  - S7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
+  - S7045514: SPARC assembly code for JSR 292 ricochet frames
+  - S7045515: ARM assembly code for JSR 292 ricochet frames
+  - S7045570: compiler/5091921/Test7005594.java failed because not enough space for object heap
+  - S7045662: G1: OopsInHeapRegionClosure::set_region() should not be virtual
+  - S7045693: java/util/EnumSet/EnumSetBash.java still failing intermittently
+  - S7045697: JDK7 THIRD PARTY README update
+  - S7045751: G1: +ExplicitGCInvokesConcurrent causes excessive single region evacuation pauses
+  - S7046096: SEGV IN C2 WITH 6U25
+  - S7046182: G1: remove unnecessary iterations over the collection set
+  - S7046490: Preallocated OOME objects should obey Throwable stack trace protocol
+  - S7046558: G1: concurrent marking optimizations
+  - S7046732: JSR 292 assert(result == cpce->f1()) failed: expected result for assembly code
+  - S7046893: LP64 problem with double_quadword in c1_LIRAssembler_x86.cpp
+  - S7047300: VM crashes with assert(_base == InstPtr) failed: Not an object pointer
+  - S7047491: C1: registers saved incorrectly when calling checkcast_arraycopy stub
+  - S7047697: MethodHandle.invokeExact call for wrong method causes VM failure if run with -Xcomp
+  - S7047954: VM crashes with assert(is_Mem()) failed
+  - S7047961: JSR 292 MethodHandleWalk swap args doesn't handle T_LONG and T_DOUBLE properly
+  - S7048009: Update .jcheck/conf files for JDK 8
+  - S7048030: is_scavengable changes causing compiler to embed more constants
+  - S7048332: Cadd_cmpLTMask doesn't handle 64-bit tmp register properly
+  - S7048342: CMS: eob == _limit || fc->isFree() failed: Only a free chunk should allow us to cross over the limit
+  - S7048782: CMS: assert(last_chunk_index_to_check<= last_chunk_index) failed: parCardTableModRefBS.cpp:359
+  - S7049385: Bump the HS21 build number to 15
+  - S7049410: JSR 292 old method name MethodHandle.invokeGeneric should not be accepted by the JVM
+  - S7049415: Failure of resolution of sym.reference to the c.s.s. should be wrapped in BootstrapMethodError
+  - S7049928: VM crashes with "assert(_adapter != NULL) failed: must have" at methodOop.cpp:63
+  - S7049999: G1: Make the G1PrintHeapRegions output consistent and complete
+  - S7050280: assert(u->as_Unlock()->is_eliminated()) failed: sanity
+  - S7050298: ARM: SIGSEGV in JNIHandleBlock::allocate_handle
+  - S7050392: G1: Introduce flag to generate a log of the G1 ergonomic decisions
+  - S7050554: JSR 292 - need optimization for selectAlternative
+  - S7051189: Need to suppress info message if -xcheck:jni used with libjsig.so
+  - S7051430: CMS: ongoing CMS cycle should terminate abruptly to allow prompt JVM termination at exit
+  - S7051798: SA-JDI: NPE in Frame.addressOfStackSlot(Frame.java:244)
+  - S7052219: JSR 292: Crash in ~BufferBlob::MethodHandles adapters
+  - S7052494: Eclipse test fails on JDK 7 b142
+  - S7052988: JPRT embedded builds don't set MINIMIZE_RAM_USAGE
+  - S7053189: remove some unnecessary platform-dependent includes
+  - S7053520: JSR292: crash in invokedynamic with C1 using tiered and compressed oops
+  - S7054211: No loop unrolling done in jdk7b144 for a test update() while loop
+  - S7055073: G1: code cleanup in the concurrentMark.* files
+  - S7055247: Ignore test of # 7020373
+  - S7055355: JSR 292: crash while throwing WrongMethodTypeException
+  - S7055788: Bump the HS21 build number to 16
+  - S7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
+  - S7056380: VM crashes with SIGSEGV in compiled code
+  - S7057046: Add embedded license to THIRD PARTY README
+  - S7057120: Tiered: Allow C1 to inline methods with loops
+  - S7057556: Bump the HS21 build number to 17
+  - S7057587: JSR 292 - crash with jruby in test/test_respond_to.rb
+  - S7057978: improve robustness of c1 ARM back-end wrt non encodable constants
+  - S7058036: FieldsAllocationStyle=2 does not work in 32-bit VM
+  - S7058510: multinewarray with 6 dimensions uncommon traps in server compiler
+  - S7058689: Tiered: Reprofiling doesn't happen in presence of level 4 OSR methods
+  - S7059019: G1: add G1 support to the SA
+  - S7059034: Use movxtod/movdtox on T4
+  - S7059037: Use BIS for zeroing on T4
+  - S7059039: EA: don't change non-escaping state of NULL pointer
+  - S7059047: EA: can't find initializing store with several CheckCastPP
+  - S7059899: Stack overflows in Java code cause 64-bit JVMs to exit due to SIGSEGV
+  - S7060619: C1 should respect inline and dontinline directives from CompilerOracle
+  - S7060836: RHEL 5.5 and 5.6 should support UseNUMA
+  - S7060842: UseNUMA crash with UseHugreTLBFS running SPECjvm2008
+  - S7061101: adlc should complain about mixing block and expression forms of ins_encode
+  - S7061187: need some includes for arm/ppc
+  - S7061192: option handling adjustments for oracle and embedded builds
+  - S7061197: ThreadLocalStorage sp map table should be optional
+  - S7061204: clean the chunk table synchronously in embedded builds
+  - S7061212: use o/s low memory notification in embedded builds
+  - S7061225: os::print_cpu_info() should support os-specific data
+  - S7061691: Fork HS21 to HS22 - renumber Minor and build numbers of JVM
+  - S7062856: Disassembler needs to be smarter about finding hsdis after 1.7 launcher changes
+  - S7063628: Use cbcond on T4
+  - S7063629: use cbcond in C2 generated code on T4
+  - S7063674: Wrong results from basic comparisons after calls to Long.bitCount(long)
+  - S7064302: JDK7 build 147 crashed after testing my java 6-compiled web app
+  - S7064927: retransformClasses() does not pass in LocalVariableTable of a method
+  - S7065535: Mistyped function name that disabled UseLargePages on Windows
+  - S7066129: GarbageCollectorMXBean#getLastGcInfo leaks native memory
+  - S7066143: JSR 292: Zero support after regressions from 7009923 and 7009309
+  - S7066339: Tiered: policy should make consistent decisions about osr levels
+  - S7066841: remove MacroAssembler::br_on_reg_cond() on sparc
+  - S7067288: compiler regression test Test7052494 timeouts with client VM
+  - S7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
+  - S7068215: G1: Print reference processing time during remark
+  - S7068240: G1: Long "parallel other time" and "ext root scanning" when running specific benchmark
+  - S7069176: Update the JDK version numbers in Hotspot for JDK 8
+  - S7069452: Cleanup NodeFlags
+  - S7069863: G1: SIGSEGV running SPECjbb2011 and -UseBiasedLocking
+  - S7069991: Setup make/jprt.properties files for jdk8
+  - S7070061: Adjust Hotspot make/jprt.properties for new JDK8 settings
+  - S7071307: MethodHandle bimorphic inlining should consider the frequency
+  - S7071311: Decoder enhancement
+  - S7071427: AdapterFingerPrint can hold 8 entries per int
+  - S7071653: JSR 292: call site change notification should be pushed not pulled
+  - S7071709: JSR 292: switchpoint invalidation should be pushed not pulled
+  - S7071823: Zero: zero/shark doesn't build after b147-fcs
+  - S7071904: 4/4 HotSpot: Full Debug Symbols
+  - S7072527: CMS: JMM GC counters overcount in some cases
+  - S7074017: Introduce MemBarAcquireLock/MemBarReleaseLock nodes for monitor enter/exit code paths
+  - S7074579: G1: JVM crash with JDK7 running ATG CRMDemo Fusion App
+  - S7075559: JPRT windows_x64 build failure
+  - S7075623: 6990212 broke raiseException in 64 bit
+  - S7075646: G1: fix inconsistencies in the monitoring data
+  - S7076831: TEST_BUG: compiler/5091921/Test7005594.java fails on LOW MEM SYSTEMS
+  - S7077312: Provide a CALL effect for instruct declaration in the ad file
+  - S7077439: Possible reference through NULL in loopPredicate.cpp:726
+  - S7077806: ARM: java.lang.InternalError: bound subword value does not fit into the subword type
+  - S7078382: JSR 292: don't count method handle adapters against inlining budgets
+  - S7078465: G1: Don't use the undefined value (-1) for the G1 old memory pool max size
+  - S7079317: Incorrect branch's destination block in PrintoOptoAssembly output
+  - S7079329: Adjust allocation prefetching for T4
+  - S7079626: x64 emits unnecessary REX prefix
+  - S7079673: JSR 292: C1 should inline bytecoded method handle adapters
+  - S7079769: JSR 292: incorrect size() for CallStaticJavaHandle on sparc
+  - S7080389: G1: refactor marking code in evacuation pause copy closures
+  - S7080431: VM asserts if specified size(x) in .ad is larger than emitted size
+  - S7081064: G1: remove develop params G1FixedSurvivorSpaceSize, G1FixedTenuringThreshold, and G1FixedEdenSize
+  - S7081251: bump the hs22 build number to 02
+  - S7081842: assert(Compile::current()->unique() < (uint)MaxNodeLimit) failed: Node limit exceeded
+  - S7081926: assert(VM_Version::supports_sse2()) failed: must support
+  - S7081933: Use zeroing elimination optimization for large array
+  - S7081938: JSR292: assert(magic_number_2() == MAGIC_NUMBER_2) failed
+  - S7082220: Visual Studio projects broken after change 7016797: Hotspot: securely/restrictive load dlls and new
+  - S7082263: Reflection::resolve_field/field_get/field_set are broken
+  - S7082553: Interpret Thread.setPriority(Thread.MAX_PRIORITY) to mean FX60 on Solaris 10 and 11
+  - S7082645: Hotspot doesn't compile on old linuxes after 7060836
+  - S7082689: allow duplicate bug ids in jdk7u repos
+  - S7082949: JSR 292: missing ResourceMark in methodOopDesc::make_invoke_method
+  - S7082969: NUMA interleaving
+  - S7083184: JSR 292: don't store context class argument with call site dependencies
+  - S7083786: dead various dead chunks of code
+  - S7083916: Bump the hs22 build number to 03
+  - S7084509: G1: fix inconsistencies and mistakes in the young list target length calculations
+  - S7085012: ARM: com/sun/jdi/PopSynchronousTest.java still fails
+  - S7085137: -XX:+VerifyOops is broken
+  - S7085279: C1 overflows code buffer with VerifyOops and CompressedOops
+  - S7085404: JSR 292: VolatileCallSites should have push notification too
+  - S7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
+  - S7085906: Replace the permgen allocated sentinelRef with a self-looped end
+  - S7086226: UseNUMA fails on old versions of windows
+  - S7086394: c2/arm: enable UseFPUForSpilling
+  - S7086533: G1: assert(!_g1->is_obj_dead(obj)): We should not be preserving dead objs: g1CollectedHeap.cpp:3835
+  - S7086560: 7085404 changes broke VM with -XX:-EnableInvokeDynamic
+  - S7086585: make Java field injection more flexible
+  - S7086589: bump the hs22 build number to 04
+  - S7087445: Improve platform independence of JSR292 shared code

From andrew at icedtea.classpath.org  Mon Oct  7 15:18:00 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Mon, 07 Oct 2013 22:18:00 +0000
Subject: /hg/release/icedtea7-forest-2.3/corba: 2 new changesets
Message-ID: <hg.92ba644f82df.1381184280.-5398653327640076568@icedtea.classpath.org>

changeset 92ba644f82df in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=92ba644f82df
author: andrew
date: Wed Sep 04 17:48:23 2013 +0100

	PR1551: Add build support for Zero AArch64


changeset db25aa0380d9 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=db25aa0380d9
author: andrew
date: Wed Sep 04 17:52:30 2013 +0100

	PR1553: Add Debian AArch64 support


diffstat:

 make/common/shared/Defs-java.gmk |  2 +-
 make/common/shared/Platform.gmk  |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r ffc59f951801 -r db25aa0380d9 make/common/shared/Defs-java.gmk
--- a/make/common/shared/Defs-java.gmk	Thu Aug 08 23:15:42 2013 +0100
+++ b/make/common/shared/Defs-java.gmk	Wed Sep 04 17:52:30 2013 +0100
@@ -81,7 +81,7 @@
 ifeq ($(ARCH_DATA_MODEL), 32)
   JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=768
 else
-  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1536
+  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1664
 endif
 JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
 
diff -r ffc59f951801 -r db25aa0380d9 make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk	Thu Aug 08 23:15:42 2013 +0100
+++ b/make/common/shared/Platform.gmk	Wed Sep 04 17:52:30 2013 +0100
@@ -154,7 +154,7 @@
   # Arch and OS name/version
   mach := $(shell uname -m)
   ifneq (,$(wildcard /usr/bin/dpkg-architecture))
-    mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
+    mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/')
   endif
   archExpr = case "$(mach)" in \
                 i[3-9]86) \

From bugzilla-daemon at icedtea.classpath.org  Mon Oct  7 15:18:06 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 07 Oct 2013 22:18:06 +0000
Subject: [Bug 1551] [IcedTea7] Add build support for Zero AArch64
In-Reply-To: <bug-1551-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1551-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1551-30-FCA4UBaSSY@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1551

--- Comment #9 from hg commits <mercurial at icedtea.classpath.org> ---
details:
http://icedtea.classpath.org//hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=92ba644f82df
author: andrew
date: Wed Sep 04 17:48:23 2013 +0100

    PR1551: Add build support for Zero AArch64

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131007/127617e5/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Mon Oct  7 15:18:14 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 07 Oct 2013 22:18:14 +0000
Subject: [Bug 1553] [IcedTea7] Add Debian AArch64 support
In-Reply-To: <bug-1553-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1553-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1553-30-IphGK4cuXP@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1553

--- Comment #6 from hg commits <mercurial at icedtea.classpath.org> ---
details:
http://icedtea.classpath.org//hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=db25aa0380d9
author: andrew
date: Wed Sep 04 17:52:30 2013 +0100

    PR1553: Add Debian AArch64 support

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131007/ec98f234/attachment.html 

From andrew at icedtea.classpath.org  Mon Oct  7 15:18:33 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Mon, 07 Oct 2013 22:18:33 +0000
Subject: /hg/release/icedtea7-forest-2.3/hotspot: 5 new changesets
Message-ID: <hg.05cfb8042c3c.1381184313.4308599361692689988@icedtea.classpath.org>

changeset 05cfb8042c3c in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=05cfb8042c3c
author: andrew
date: Wed Sep 04 18:21:33 2013 +0100

	PR1551: Add build support for Zero AArch64


changeset 654ac2276f33 in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=654ac2276f33
author: andrew
date: Fri Oct 04 16:32:45 2013 +0100

	Set ZERO_BUILD in flags.make so it is set on rebuilds


changeset 8ddb16e17aa5 in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=8ddb16e17aa5
author: andrew
date: Wed Sep 18 21:34:50 2013 +0100

	Cast should use same type as GCDrainStackTargetSize (uintx).


changeset 92cff4cc37d7 in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=92cff4cc37d7
author: tschatzl
date: Tue Sep 17 12:04:11 2013 +0200

	8024914: Swapped usage of idx_t and bm_word_t types in bitMap.inline.hpp
	Summary: Incorrect usage of idx_t where bm_word_t is appropriate.
	Reviewed-by: tschatzl, brutisso
	Contributed-by: Dan Horak <dhorak at redhat.com>


changeset fa3171a9cec3 in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=fa3171a9cec3
author: andrew
date: Thu Sep 19 00:00:25 2013 +0100

	Add casts to fix build on S390


diffstat:

 make/bsd/makefiles/buildtree.make                                               |   1 +
 make/linux/makefiles/buildtree.make                                             |   1 +
 src/os/linux/vm/os_linux.cpp                                                    |  15 ++-----
 src/os_cpu/linux_zero/vm/globals_linux_zero.hpp                                 |   2 +-
 src/share/vm/compiler/methodLiveness.cpp                                        |  12 +++---
 src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp |   2 +-
 src/share/vm/gc_implementation/g1/concurrentMark.cpp                            |   2 +-
 src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp                           |   2 +-
 src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp                          |   2 +-
 src/share/vm/gc_implementation/parNew/parNewGeneration.cpp                      |   2 +-
 src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp               |   2 +-
 src/share/vm/memory/collectorPolicy.cpp                                         |  16 ++++----
 src/share/vm/oops/objArrayKlass.inline.hpp                                      |   4 +-
 src/share/vm/runtime/arguments.cpp                                              |   2 +-
 src/share/vm/utilities/bitMap.inline.hpp                                        |  20 +++++-----
 src/share/vm/utilities/macros.hpp                                               |   8 ++++
 16 files changed, 48 insertions(+), 45 deletions(-)

diffs (349 lines):

diff -r 4b04ad70d347 -r fa3171a9cec3 make/bsd/makefiles/buildtree.make
--- a/make/bsd/makefiles/buildtree.make	Fri Sep 27 20:43:52 2013 +0100
+++ b/make/bsd/makefiles/buildtree.make	Thu Sep 19 00:00:25 2013 +0100
@@ -204,6 +204,7 @@
 	echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \
 	echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
 	echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
+	echo "ZERO_BUILD = $(ZERO_BUILD)"; \
 	echo; \
 	echo "# Used for platform dispatching"; \
 	echo "TARGET_DEFINES  = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
diff -r 4b04ad70d347 -r fa3171a9cec3 make/linux/makefiles/buildtree.make
--- a/make/linux/makefiles/buildtree.make	Fri Sep 27 20:43:52 2013 +0100
+++ b/make/linux/makefiles/buildtree.make	Thu Sep 19 00:00:25 2013 +0100
@@ -197,6 +197,7 @@
 	echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \
 	echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
 	echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
+	echo "ZERO_BUILD = $(ZERO_BUILD)"; \
 	echo; \
 	echo "# Used for platform dispatching"; \
 	echo "TARGET_DEFINES  = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
diff -r 4b04ad70d347 -r fa3171a9cec3 src/os/linux/vm/os_linux.cpp
--- a/src/os/linux/vm/os_linux.cpp	Fri Sep 27 20:43:52 2013 +0100
+++ b/src/os/linux/vm/os_linux.cpp	Thu Sep 19 00:00:25 2013 +0100
@@ -387,7 +387,7 @@
  *        ...
  *        7: The default directories, normally /lib and /usr/lib.
  */
-#if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390))
+#if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390) || defined(AARCH64))
 #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
 #else
 #define DEFAULT_LIBPATH "/lib:/usr/lib"
@@ -5365,14 +5365,6 @@
 
 extern char** environ;
 
-#ifndef __NR_fork
-#define __NR_fork IA32_ONLY(2) IA64_ONLY(not defined) AMD64_ONLY(57)
-#endif
-
-#ifndef __NR_execve
-#define __NR_execve IA32_ONLY(11) IA64_ONLY(1033) AMD64_ONLY(59)
-#endif
-
 // Run the specified command in a separate process. Return its exit value,
 // or -1 on failure (e.g. can't fork a new process).
 // Unlike system(), this function can be called from signal handler. It
@@ -5385,8 +5377,9 @@
   // separate process to execve. Make a direct syscall to fork process.
   // On IA64 there's no fork syscall, we have to use fork() and hope for
   // the best...
-  pid_t pid = NOT_IA64(syscall(__NR_fork);)
+  pid_t pid = NOT_IA64(NOT_AARCH64(syscall(SYS_fork);))
               IA64_ONLY(fork();)
+              AARCH64_ONLY(vfork();)
 
   if (pid < 0) {
     // fork failed
@@ -5402,7 +5395,7 @@
     // in the new process, so make a system call directly.
     // IA64 should use normal execve() from glibc to match the glibc fork()
     // above.
-    NOT_IA64(syscall(__NR_execve, "/bin/sh", argv, environ);)
+    NOT_IA64(syscall(SYS_execve, "/bin/sh", argv, environ);)
     IA64_ONLY(execve("/bin/sh", (char* const*)argv, environ);)
 
     // execve failed
diff -r 4b04ad70d347 -r fa3171a9cec3 src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
--- a/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp	Fri Sep 27 20:43:52 2013 +0100
+++ b/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp	Thu Sep 19 00:00:25 2013 +0100
@@ -32,7 +32,7 @@
 //
 
 define_pd_global(bool,  DontYieldALot,           false);
-define_pd_global(intx,  ThreadStackSize,         1536);
+define_pd_global(intx,  ThreadStackSize,         1664);
 #ifdef _LP64
 define_pd_global(intx,  VMThreadStackSize,       1024);
 #else
diff -r 4b04ad70d347 -r fa3171a9cec3 src/share/vm/compiler/methodLiveness.cpp
--- a/src/share/vm/compiler/methodLiveness.cpp	Fri Sep 27 20:43:52 2013 +0100
+++ b/src/share/vm/compiler/methodLiveness.cpp	Thu Sep 19 00:00:25 2013 +0100
@@ -572,15 +572,15 @@
 
 
 MethodLiveness::BasicBlock::BasicBlock(MethodLiveness *analyzer, int start, int limit) :
-         _gen((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
+         _gen((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
                          analyzer->bit_map_size_bits()),
-         _kill((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
+         _kill((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
                          analyzer->bit_map_size_bits()),
-         _entry((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
+         _entry((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
                          analyzer->bit_map_size_bits()),
-         _normal_exit((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
+         _normal_exit((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
                          analyzer->bit_map_size_bits()),
-         _exception_exit((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
+         _exception_exit((BitMap::bm_word_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
                          analyzer->bit_map_size_bits()),
          _last_bci(-1) {
   _analyzer = analyzer;
@@ -998,7 +998,7 @@
 }
 
 MethodLivenessResult MethodLiveness::BasicBlock::get_liveness_at(ciMethod* method, int bci) {
-  MethodLivenessResult answer(NEW_RESOURCE_ARRAY(size_t, _analyzer->bit_map_size_words()),
+  MethodLivenessResult answer(NEW_RESOURCE_ARRAY(BitMap::bm_word_t, _analyzer->bit_map_size_words()),
                 _analyzer->bit_map_size_bits());
   answer.set_is_valid();
 
diff -r 4b04ad70d347 -r fa3171a9cec3 src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	Fri Sep 27 20:43:52 2013 +0100
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	Thu Sep 19 00:00:25 2013 +0100
@@ -2676,7 +2676,7 @@
   if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {
     size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks);
     n_blks +=  CMSOldPLABReactivityFactor*multiple*n_blks;
-    n_blks = MIN2(n_blks, CMSOldPLABMax);
+    n_blks = MIN2(n_blks, (size_t)CMSOldPLABMax);
   }
   assert(n_blks > 0, "Error");
   _cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl);
diff -r 4b04ad70d347 -r fa3171a9cec3 src/share/vm/gc_implementation/g1/concurrentMark.cpp
--- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Fri Sep 27 20:43:52 2013 +0100
+++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Thu Sep 19 00:00:25 2013 +0100
@@ -4515,7 +4515,7 @@
   // of things to do) or totally (at the very end).
   size_t target_size;
   if (partially) {
-    target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize);
+    target_size = MIN2((uintx)_task_queue->max_elems()/3, GCDrainStackTargetSize);
   } else {
     target_size = 0;
   }
diff -r 4b04ad70d347 -r fa3171a9cec3 src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Fri Sep 27 20:43:52 2013 +0100
+++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Thu Sep 19 00:00:25 2013 +0100
@@ -1680,7 +1680,7 @@
 
   verify_region_sets_optional();
 
-  size_t expand_bytes = MAX2(word_size * HeapWordSize, MinHeapDeltaBytes);
+  size_t expand_bytes = MAX2(word_size * HeapWordSize, (size_t)MinHeapDeltaBytes);
   ergo_verbose1(ErgoHeapSizing,
                 "attempt heap expansion",
                 ergo_format_reason("allocation request failed")
diff -r 4b04ad70d347 -r fa3171a9cec3 src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
--- a/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	Fri Sep 27 20:43:52 2013 +0100
+++ b/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	Thu Sep 19 00:00:25 2013 +0100
@@ -1087,7 +1087,7 @@
 // This can be done by either mutator threads together with the
 // concurrent refinement threads or GC threads.
 int HeapRegionRemSet::num_par_rem_sets() {
-  return (int)MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), ParallelGCThreads);
+  return (int)MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), (size_t)ParallelGCThreads);
 }
 
 HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,
diff -r 4b04ad70d347 -r fa3171a9cec3 src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
--- a/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	Fri Sep 27 20:43:52 2013 +0100
+++ b/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	Thu Sep 19 00:00:25 2013 +0100
@@ -188,7 +188,7 @@
   const size_t num_overflow_elems = of_stack->size();
   const size_t space_available = queue->max_elems() - queue->size();
   const size_t num_take_elems = MIN3(space_available / 4,
-                                     ParGCDesiredObjsFromOverflowList,
+                                     (size_t)ParGCDesiredObjsFromOverflowList,
                                      num_overflow_elems);
   // Transfer the most recent num_take_elems from the overflow
   // stack to our work queue.
diff -r 4b04ad70d347 -r fa3171a9cec3 src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp	Fri Sep 27 20:43:52 2013 +0100
+++ b/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp	Thu Sep 19 00:00:25 2013 +0100
@@ -65,7 +65,7 @@
   if (_virtual_space != NULL && _virtual_space->expand_by(bytes)) {
     _region_start = covered_region.start();
     _region_size = covered_region.word_size();
-    idx_t* map = (idx_t*)_virtual_space->reserved_low_addr();
+    BitMap::bm_word_t* map = (BitMap::bm_word_t*)_virtual_space->reserved_low_addr();
     _beg_bits.set_map(map);
     _beg_bits.set_size(bits / 2);
     _end_bits.set_map(map + words / 2);
diff -r 4b04ad70d347 -r fa3171a9cec3 src/share/vm/memory/collectorPolicy.cpp
--- a/src/share/vm/memory/collectorPolicy.cpp	Fri Sep 27 20:43:52 2013 +0100
+++ b/src/share/vm/memory/collectorPolicy.cpp	Thu Sep 19 00:00:25 2013 +0100
@@ -357,7 +357,7 @@
       // generally small compared to the NewRatio calculation.
       _min_gen0_size = NewSize;
       desired_new_size = NewSize;
-      max_new_size = MAX2(max_new_size, NewSize);
+      max_new_size = MAX2(max_new_size, (size_t)NewSize);
     } else {
       // For the case where NewSize is the default, use NewRatio
       // to size the minimum and initial generation sizes.
@@ -365,10 +365,10 @@
       // NewRatio is overly large, the resulting sizes can be too
       // small.
       _min_gen0_size = MAX2(scale_by_NewRatio_aligned(min_heap_byte_size()),
-                          NewSize);
+                          (size_t)NewSize);
       desired_new_size =
         MAX2(scale_by_NewRatio_aligned(initial_heap_byte_size()),
-             NewSize);
+             (size_t)NewSize);
     }
 
     assert(_min_gen0_size > 0, "Sanity check");
@@ -423,14 +423,14 @@
       // Adjust gen0 down to accomodate OldSize
       *gen0_size_ptr = heap_size - min_gen0_size;
       *gen0_size_ptr =
-        MAX2((uintx)align_size_down(*gen0_size_ptr, min_alignment()),
+        MAX2((size_t)align_size_down(*gen0_size_ptr, min_alignment()),
              min_alignment());
       assert(*gen0_size_ptr > 0, "Min gen0 is too large");
       result = true;
     } else {
       *gen1_size_ptr = heap_size - *gen0_size_ptr;
       *gen1_size_ptr =
-        MAX2((uintx)align_size_down(*gen1_size_ptr, min_alignment()),
+        MAX2((size_t)align_size_down(*gen1_size_ptr, min_alignment()),
                        min_alignment());
     }
   }
@@ -454,7 +454,7 @@
   // for setting the gen1 maximum.
   _max_gen1_size = max_heap_byte_size() - _max_gen0_size;
   _max_gen1_size =
-    MAX2((uintx)align_size_down(_max_gen1_size, min_alignment()),
+    MAX2((size_t)align_size_down(_max_gen1_size, min_alignment()),
          min_alignment());
   // If no explicit command line flag has been set for the
   // gen1 size, use what is left for gen1.
@@ -468,11 +468,11 @@
       "gen0 has an unexpected minimum size");
     set_min_gen1_size(min_heap_byte_size() - min_gen0_size());
     set_min_gen1_size(
-      MAX2((uintx)align_size_down(_min_gen1_size, min_alignment()),
+      MAX2((size_t)align_size_down(_min_gen1_size, min_alignment()),
            min_alignment()));
     set_initial_gen1_size(initial_heap_byte_size() - initial_gen0_size());
     set_initial_gen1_size(
-      MAX2((uintx)align_size_down(_initial_gen1_size, min_alignment()),
+      MAX2((size_t)align_size_down(_initial_gen1_size, min_alignment()),
            min_alignment()));
 
   } else {
diff -r 4b04ad70d347 -r fa3171a9cec3 src/share/vm/oops/objArrayKlass.inline.hpp
--- a/src/share/vm/oops/objArrayKlass.inline.hpp	Fri Sep 27 20:43:52 2013 +0100
+++ b/src/share/vm/oops/objArrayKlass.inline.hpp	Thu Sep 19 00:00:25 2013 +0100
@@ -46,7 +46,7 @@
   const size_t beg_index = size_t(index);
   assert(beg_index < len || len == 0, "index too large");
 
-  const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
+  const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
   const size_t end_index = beg_index + stride;
   T* const base = (T*)a->base();
   T* const beg = base + beg_index;
@@ -80,7 +80,7 @@
   const size_t beg_index = size_t(index);
   assert(beg_index < len || len == 0, "index too large");
 
-  const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
+  const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
   const size_t end_index = beg_index + stride;
   T* const base = (T*)a->base();
   T* const beg = base + beg_index;
diff -r 4b04ad70d347 -r fa3171a9cec3 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Fri Sep 27 20:43:52 2013 +0100
+++ b/src/share/vm/runtime/arguments.cpp	Thu Sep 19 00:00:25 2013 +0100
@@ -1207,7 +1207,7 @@
       // so it's NewRatio x of NewSize.
       if (FLAG_IS_DEFAULT(OldSize)) {
         if (max_heap > NewSize) {
-          FLAG_SET_ERGO(uintx, OldSize, MIN2(NewRatio*NewSize, max_heap - NewSize));
+          FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t)(NewRatio*NewSize), max_heap - NewSize));
           if (PrintGCDetails && Verbose) {
             // Too early to use gclog_or_tty
             tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);
diff -r 4b04ad70d347 -r fa3171a9cec3 src/share/vm/utilities/bitMap.inline.hpp
--- a/src/share/vm/utilities/bitMap.inline.hpp	Fri Sep 27 20:43:52 2013 +0100
+++ b/src/share/vm/utilities/bitMap.inline.hpp	Thu Sep 19 00:00:25 2013 +0100
@@ -52,16 +52,16 @@
 
 inline bool BitMap::par_set_bit(idx_t bit) {
   verify_index(bit);
-  volatile idx_t* const addr = word_addr(bit);
-  const idx_t mask = bit_mask(bit);
-  idx_t old_val = *addr;
+  volatile bm_word_t* const addr = word_addr(bit);
+  const bm_word_t mask = bit_mask(bit);
+  bm_word_t old_val = *addr;
 
   do {
-    const idx_t new_val = old_val | mask;
+    const bm_word_t new_val = old_val | mask;
     if (new_val == old_val) {
       return false;     // Someone else beat us to it.
     }
-    const idx_t cur_val = (idx_t) Atomic::cmpxchg_ptr((void*) new_val,
+    const bm_word_t cur_val = (bm_word_t) Atomic::cmpxchg_ptr((void*) new_val,
                                                       (volatile void*) addr,
                                                       (void*) old_val);
     if (cur_val == old_val) {
@@ -73,16 +73,16 @@
 
 inline bool BitMap::par_clear_bit(idx_t bit) {
   verify_index(bit);
-  volatile idx_t* const addr = word_addr(bit);
-  const idx_t mask = ~bit_mask(bit);
-  idx_t old_val = *addr;
+  volatile bm_word_t* const addr = word_addr(bit);
+  const bm_word_t mask = ~bit_mask(bit);
+  bm_word_t old_val = *addr;
 
   do {
-    const idx_t new_val = old_val & mask;
+    const bm_word_t new_val = old_val & mask;
     if (new_val == old_val) {
       return false;     // Someone else beat us to it.
     }
-    const idx_t cur_val = (idx_t) Atomic::cmpxchg_ptr((void*) new_val,
+    const bm_word_t cur_val = (bm_word_t) Atomic::cmpxchg_ptr((void*) new_val,
                                                       (volatile void*) addr,
                                                       (void*) old_val);
     if (cur_val == old_val) {
diff -r 4b04ad70d347 -r fa3171a9cec3 src/share/vm/utilities/macros.hpp
--- a/src/share/vm/utilities/macros.hpp	Fri Sep 27 20:43:52 2013 +0100
+++ b/src/share/vm/utilities/macros.hpp	Thu Sep 19 00:00:25 2013 +0100
@@ -260,6 +260,14 @@
 #define NOT_ARM(code) code
 #endif
 
+#ifdef AARCH64
+#define AARCH64_ONLY(code) code
+#define NOT_AARCH64(code)
+#else
+#define AARCH64_ONLY(code)
+#define NOT_AARCH64(code) code
+#endif
+
 #ifdef JAVASE_EMBEDDED
 #define EMBEDDED_ONLY(code) code
 #define NOT_EMBEDDED(code)

From bugzilla-daemon at icedtea.classpath.org  Mon Oct  7 15:18:41 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 07 Oct 2013 22:18:41 +0000
Subject: [Bug 1551] [IcedTea7] Add build support for Zero AArch64
In-Reply-To: <bug-1551-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1551-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1551-30-jvbcJoubuF@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1551

--- Comment #10 from hg commits <mercurial at icedtea.classpath.org> ---
details:
http://icedtea.classpath.org//hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=05cfb8042c3c
author: andrew
date: Wed Sep 04 18:21:33 2013 +0100

    PR1551: Add build support for Zero AArch64

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131007/2e4cbcdd/attachment.html 

From andrew at icedtea.classpath.org  Mon Oct  7 15:18:48 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Mon, 07 Oct 2013 22:18:48 +0000
Subject: /hg/release/icedtea7-forest-2.3/jdk: 13 new changesets
Message-ID: <hg.ba476cfdd27c.1381184328.4833355912275447704@icedtea.classpath.org>

changeset ba476cfdd27c in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ba476cfdd27c
author: andrew
date: Fri Oct 04 16:36:56 2013 +0100

	Add tests missing form 8014618 backport


changeset 5438973623f2 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=5438973623f2
author: jgodinez
date: Wed Feb 06 14:45:02 2013 -0800

	8005194: [parfait] #353 sun/awt/image/jpeg/imageioJPEG.c Memory leak of pointer 'scale' allocated with calloc()
	Reviewed-by: prr, vadim
	Contributed-by: jia-hong.chen at oracle.com


changeset 375646138f2e in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=375646138f2e
author: andrew
date: Fri Oct 04 16:38:52 2013 +0100

	Fix Kerberos cache support to check for null, fallback on old path support and not hardcode the krb5 library.


changeset 6200515176fa in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6200515176fa
author: andrew
date: Tue Sep 03 15:19:59 2013 +0100

	Only define _GNU_SOURCE if not already defined.


changeset 8e4c462b3a10 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8e4c462b3a10
author: andrew
date: Fri Oct 04 16:40:15 2013 +0100

	PR1551: Add build support for Zero AArch64


changeset b37ac011ed13 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b37ac011ed13
author: andrew
date: Fri Oct 04 16:41:37 2013 +0100

	Add -D_LITTLE_ENDIAN for AArch64.


changeset b3846cc85e15 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b3846cc85e15
author: andrew
date: Wed Sep 04 17:53:23 2013 +0100

	PR1553: Add Debian AArch64 support


changeset 3297163636bf in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3297163636bf
author: andrew
date: Wed Sep 04 18:20:38 2013 +0100

	PR1554: Fix build on Mac OS X
	Contributed-by: Alex Kasko <alex.kasko.lists at gmail.com>


changeset 5bbb4c34cc3a in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=5bbb4c34cc3a
author: andrew
date: Fri Sep 06 12:44:40 2013 +0100

	RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors


changeset 5dc47fef62d0 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=5dc47fef62d0
author: andrew
date: Fri Sep 06 12:45:39 2013 +0100

	RH995488: Java thinks that the default timezone is Busingen instead of Zurich


changeset 424d6404dab6 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=424d6404dab6
author: andrew
date: Fri Sep 06 21:36:31 2013 +0100

	Correct error resulting from IcedTea 1.x hack.


changeset 1076012c37f5 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1076012c37f5
author: andrew
date: Mon Sep 09 20:18:12 2013 +0100

	Cleanup file resources properly in TimeZone_md.


changeset 6e44e8962a31 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6e44e8962a31
author: omajid
date: Mon Sep 16 15:43:06 2013 -0400

	8024863: X11: Support GNOME Shell as mutter
	Reviewed-by: anthony


diffstat:

 make/common/shared/Defs-java.gmk                                              |    2 +-
 make/common/shared/Platform.gmk                                               |    2 +-
 make/java/nio/Makefile                                                        |   10 +-
 make/javax/sound/SoundDefs.gmk                                                |    4 +
 make/jdk_generic_profile.sh                                                   |   17 +-
 make/sun/lwawt/FILES_c_macosx.gmk                                             |    6 +
 make/sun/lwawt/Makefile                                                       |    7 +-
 make/sun/security/Makefile                                                    |    4 +-
 make/sun/security/krb5/internal/ccache/Makefile                               |    3 +-
 src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java |   34 +-
 src/share/native/com/sun/media/sound/SoundDefs.h                              |    1 +
 src/share/native/sun/awt/image/jpeg/imageioJPEG.c                             |   10 +-
 src/solaris/classes/sun/awt/X11/XWM.java                                      |    2 +-
 src/solaris/native/java/util/TimeZone_md.c                                    |   64 +
 src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c             |    2 +
 test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java                       |  420 ++++++++++
 test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java                        |  410 +++++++++
 17 files changed, 974 insertions(+), 24 deletions(-)

diffs (truncated from 1268 to 500 lines):

diff -r ba0446e8ac19 -r 6e44e8962a31 make/common/shared/Defs-java.gmk
--- a/make/common/shared/Defs-java.gmk	Fri Sep 27 20:53:43 2013 +0100
+++ b/make/common/shared/Defs-java.gmk	Mon Sep 16 15:43:06 2013 -0400
@@ -90,7 +90,7 @@
 ifeq ($(ARCH_DATA_MODEL), 32)
   JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=768
 else
-  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1536
+  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1664
 endif
 JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
 
diff -r ba0446e8ac19 -r 6e44e8962a31 make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk	Fri Sep 27 20:53:43 2013 +0100
+++ b/make/common/shared/Platform.gmk	Mon Sep 16 15:43:06 2013 -0400
@@ -161,7 +161,7 @@
     mach := $(shell uname -m)
   endif
   ifneq (,$(wildcard /usr/bin/dpkg-architecture))
-    mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
+    mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/')
   endif
   archExpr = case "$(mach)" in \
                 i[3-9]86) \
diff -r ba0446e8ac19 -r 6e44e8962a31 make/java/nio/Makefile
--- a/make/java/nio/Makefile	Fri Sep 27 20:53:43 2013 +0100
+++ b/make/java/nio/Makefile	Mon Sep 16 15:43:06 2013 -0400
@@ -167,6 +167,11 @@
 FILES_gen += \
 	sun/nio/fs/UnixConstants.java
 
+ifndef COMPILE_AGAINST_SYSCALLS
+FILES_c += \
+	syscalls_fp.c
+endif
+
 endif
 
 ifeq ($(PLATFORM), solaris)
@@ -234,11 +239,6 @@
 	gio_fp.c
 endif
 
-ifndef COMPILE_AGAINST_SYSCALLS
-FILES_c += \
-	syscalls_fp.c
-endif
-
 endif # PLATFORM = linux
 
 ifeq ($(PLATFORM), macosx)
diff -r ba0446e8ac19 -r 6e44e8962a31 make/javax/sound/SoundDefs.gmk
--- a/make/javax/sound/SoundDefs.gmk	Fri Sep 27 20:53:43 2013 +0100
+++ b/make/javax/sound/SoundDefs.gmk	Mon Sep 16 15:43:06 2013 -0400
@@ -118,6 +118,10 @@
     CPPFLAGS += -DX_ARCH=X_SPARCV9
   endif # ARCH sparcv9
 
+  ifeq ($(ARCH), aarch64)
+    CPPFLAGS += -DX_ARCH=X_AARCH64
+  endif # ARCH aarch64
+
   ifeq ($(ARCH), amd64)
     CPPFLAGS += -DX_ARCH=X_AMD64
   endif # ARCH amd64
diff -r ba0446e8ac19 -r 6e44e8962a31 make/jdk_generic_profile.sh
--- a/make/jdk_generic_profile.sh	Fri Sep 27 20:53:43 2013 +0100
+++ b/make/jdk_generic_profile.sh	Mon Sep 16 15:43:06 2013 -0400
@@ -266,10 +266,10 @@
 
   # ARCH_DATA_MODEL is the number of bits in a pointer
   case "${ZERO_LIBARCH}" in
-    i386|ppc|s390|sparc|arm|sh)
+    arm|i386|ppc|s390|sh|sparc)
       ARCH_DATA_MODEL=32
       ;;
-    amd64|ppc64|s390x|sparcv9|ia64|alpha)
+    aarch64|alpha|amd64|ia64|ppc64|s390x|sparcv9)
       ARCH_DATA_MODEL=64
       ;;
     *)
@@ -280,7 +280,7 @@
 
   # ZERO_ENDIANNESS is the endianness of the processor
   case "${ZERO_LIBARCH}" in
-    i386|amd64|ia64|arm)
+    arm|aarch64|amd64|i386|ia64|mipsel)
       ZERO_ENDIANNESS=little
       ;;
     ppc*|s390*|sparc*|alpha)
@@ -307,7 +307,7 @@
     s390)
       ZERO_ARCHFLAG="-m31"
       ;;
-    arm)
+    arm|aarch64)
       ZERO_ARCHFLAG="-D_LITTLE_ENDIAN"
       ;;
     *)
@@ -454,9 +454,18 @@
 fi
 export GIF_LIBS
 
+# Export variables for system krb5
+# KRB5_CFLAGS and KRB5_LIBS tell the compiler how to compile and
+# link against Kerberos
+if [ "${KRB5_LIBS}" = "" ] ; then
+    KRB5_LIBS="-lkrb5"
+fi
+export KRB5_LIBS
+
 # IcedTea defaults; use system libraries
 export USE_SYSTEM_LCMS=true
 export USE_SYSTEM_ZLIB=true
 export USE_SYSTEM_JPEG=true
 export USE_SYSTEM_PNG=true
 export USE_SYSTEM_GIF=true
+export SYSTEM_KRB5=true
diff -r ba0446e8ac19 -r 6e44e8962a31 make/sun/lwawt/FILES_c_macosx.gmk
--- a/make/sun/lwawt/FILES_c_macosx.gmk	Fri Sep 27 20:53:43 2013 +0100
+++ b/make/sun/lwawt/FILES_c_macosx.gmk	Mon Sep 16 15:43:06 2013 -0400
@@ -98,3 +98,9 @@
         AccelGlyphCache.c \
         CUPSfuncs.c
 
+
+ifndef USE_SYSTEM_CUPS
+FILES_c += \
+        cups_fp.c
+endif
+
diff -r ba0446e8ac19 -r 6e44e8962a31 make/sun/lwawt/Makefile
--- a/make/sun/lwawt/Makefile	Fri Sep 27 20:53:43 2013 +0100
+++ b/make/sun/lwawt/Makefile	Mon Sep 16 15:43:06 2013 -0400
@@ -63,6 +63,10 @@
 vpath %.c   $(SHARE_SRC)/native/sun/font
 vpath %.c   $(call NativeSrcDirList,,native/sun/awt)
 
+ifndef USE_SYSTEM_CUPS
+vpath %.c   $(PLATFORM_SRC)/native/common/deps
+endif
+
 vpath %.cpp $(SHARE_SRC)/native/sun/image
 
 vpath %.m   $(call NativeSrcDirList,,native/sun/awt)
@@ -103,7 +107,8 @@
         $(call NativeSrcDirList,-I,/native/sun/osxapp) \
         $(call NativeSrcDirList,-I,/native/sun/font) \
 	$(call NativeSrcDirList,-I,/native/sun/java2d) \
-	$(call NativeSrcDirList,-I,/native/sun/java2d/opengl)
+	$(call NativeSrcDirList,-I,/native/sun/java2d/opengl) \
+	$(call NativeSrcDirList,-I,/native/common/deps)
 
 ifeq ($(MILESTONE), internal)
   CPPFLAGS += -DINTERNAL_BUILD
diff -r ba0446e8ac19 -r 6e44e8962a31 make/sun/security/Makefile
--- a/make/sun/security/Makefile	Fri Sep 27 20:53:43 2013 +0100
+++ b/make/sun/security/Makefile	Mon Sep 16 15:43:06 2013 -0400
@@ -56,7 +56,9 @@
 # Build krb5/internal/ccache only on Linux and Solaris platforms.
 KRB5_CCACHE =
 ifeq ($(PLATFORM), $(filter $(PLATFORM),linux solaris))
-  KRB5_CCACHE = krb5/internal/ccache
+  ifeq ($(SYSTEM_KRB5),true)
+    KRB5_CCACHE = krb5/internal/ccache
+  endif
 endif
 
 # Build Microsoft CryptoAPI provider only on Windows platform.
diff -r ba0446e8ac19 -r 6e44e8962a31 make/sun/security/krb5/internal/ccache/Makefile
--- a/make/sun/security/krb5/internal/ccache/Makefile	Fri Sep 27 20:53:43 2013 +0100
+++ b/make/sun/security/krb5/internal/ccache/Makefile	Mon Sep 16 15:43:06 2013 -0400
@@ -44,5 +44,6 @@
 
 include $(BUILDDIR)/common/Library.gmk
 
-OTHER_LDLIBS = $(LIBDL) $(JVMLIB) -lkrb5
+OTHER_CFLAGS += $(KRB5_CFLAGS)
+OTHER_LDLIBS = $(LIBDL) $(JVMLIB) $(KRB5_LIBS)
 endif # PLATFORM
diff -r ba0446e8ac19 -r 6e44e8962a31 src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
--- a/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java	Fri Sep 27 20:53:43 2013 +0100
+++ b/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java	Mon Sep 16 15:43:06 2013 -0400
@@ -45,6 +45,9 @@
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
 /**
  * CredentialsCache stores credentials(tickets, session keys, etc) in a
  * semi-permanent store
@@ -360,8 +363,9 @@
      *
      * 1. KRB5CCNAME
      * 2. location specified by Kerberos API on unix systems
-     * 3. <user.home>/krb5cc_<user.name>
-     * 4. <user.home>/krb5cc (if can't get <user.name>)
+     * 3. /tmp/krb5cc_<uid> on unix systems
+     * 4. <user.home>/krb5cc_<user.name>
+     * 5. <user.home>/krb5cc (if can't get <user.name>)
      */
 
     public static String getDefaultCacheName() {
@@ -429,16 +433,32 @@
                      * We require the default cache location to be a file name.
                      * DIR: can point to a cache collection, while DIR:: points
                      * to a specific cache file.
-                     *  
+                     *
                      * http://k5wiki.kerberos.org/wiki?title=Projects/Client_principal_selection&oldid=4118
                      */
-                    if (name.startsWith("FILE:") || name.startsWith("DIR::")) {
+                    if (name != null && (name.startsWith("FILE:") || name.startsWith("DIR::"))) {
                         name = name.substring(5);
                         if (DEBUG) {
                             System.out.println(">>>KinitOptions cache name is " +
                                     name);
                         }
                         return name;
+                    } else {
+                        long uid = 0;
+
+                        Class<?> c = Class.forName
+                            ("com.sun.security.auth.module.UnixSystem");
+                        Constructor<?> constructor = c.getConstructor();
+                        Object obj = constructor.newInstance();
+                        Method method = c.getMethod("getUid");
+                        uid =  ((Long)method.invoke(obj)).longValue();
+                        name = File.separator + "tmp" +
+                            File.separator + stdCacheNameComponent + "_" + uid;
+                        if (DEBUG) {
+                            System.out.println(">>>KinitOptions cache name is " +
+                                               name);
+                        }
+                        return name;
                     }
                 } catch (Exception e) {
                     if (DEBUG) {
@@ -483,7 +503,7 @@
 
         return name;
     }
-    
+
     private native static String nativeGetDefaultCacheName() throws Exception;
 
     public static String checkValidation(String name) {
@@ -566,7 +586,7 @@
         }
         return null;
     }
-    
+
     private static void ensureLoaded() {
         java.security.AccessController.doPrivileged(
                 new java.security.PrivilegedAction<Void> () {
@@ -577,5 +597,5 @@
                 });
         alreadyLoaded = true;
     }
-    
+
 }
diff -r ba0446e8ac19 -r 6e44e8962a31 src/share/native/com/sun/media/sound/SoundDefs.h
--- a/src/share/native/com/sun/media/sound/SoundDefs.h	Fri Sep 27 20:53:43 2013 +0100
+++ b/src/share/native/com/sun/media/sound/SoundDefs.h	Mon Sep 16 15:43:06 2013 -0400
@@ -51,6 +51,7 @@
 #define X_S390          14
 #define X_S390X         15
 #define X_SH            16
+#define X_AARCH64       17
 
 // **********************************
 // Make sure you set X_PLATFORM and X_ARCH defines correctly.
diff -r ba0446e8ac19 -r 6e44e8962a31 src/share/native/sun/awt/image/jpeg/imageioJPEG.c
--- a/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	Fri Sep 27 20:53:43 2013 +0100
+++ b/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	Mon Sep 16 15:43:06 2013 -0400
@@ -1435,6 +1435,8 @@
                                                     "[S");
 }
 
+#define JPEG_APP1  (JPEG_APP0 + 1)  /* EXIF APP1 marker code  */
+
 JNIEXPORT jlong JNICALL
 Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_initJPEGImageReader
     (JNIEnv *env,
@@ -1488,6 +1490,7 @@
 
     // Set up to keep any APP2 markers, as these might contain ICC profile
     // data
+    jpeg_save_markers(cinfo, JPEG_APP1, 0xFFFF);
     jpeg_save_markers(cinfo, ICC_MARKER, 0xFFFF);
 
     /*
@@ -1550,8 +1553,6 @@
     imageio_init_source((j_decompress_ptr) cinfo);
 }
 
-#define JPEG_APP1  (JPEG_APP0 + 1)  /* EXIF APP1 marker code  */
-
 /*
  * For EXIF images, the APP1 will appear immediately after the SOI,
  * so it's safe to only look at the first marker in the list.
@@ -2691,6 +2692,11 @@
             scale[i] = (UINT8*) malloc((maxBandValue + 1) * sizeof(UINT8));
 
             if (scale[i] == NULL) {
+                // Cleanup before throwing an out of memory exception
+                for (j = 0; j < i; j++) {
+                    free(scale[j]);
+                }
+                free(scale);
                 JNU_ThrowByName( env, "java/lang/OutOfMemoryError",
                                  "Writing JPEG Stream");
                 return JNI_FALSE;
diff -r ba0446e8ac19 -r 6e44e8962a31 src/solaris/classes/sun/awt/X11/XWM.java
--- a/src/solaris/classes/sun/awt/X11/XWM.java	Fri Sep 27 20:53:43 2013 +0100
+++ b/src/solaris/classes/sun/awt/X11/XWM.java	Mon Sep 16 15:43:06 2013 -0400
@@ -578,7 +578,7 @@
     }
 
     static boolean isMutter() {
-        return isNetWMName("Mutter");
+        return isNetWMName("Mutter") || isNetWMName("GNOME Shell");
     }
 
     // TODO: according to wikipedia, compiz is now reparenting. This should
diff -r ba0446e8ac19 -r 6e44e8962a31 src/solaris/native/java/util/TimeZone_md.c
--- a/src/solaris/native/java/util/TimeZone_md.c	Fri Sep 27 20:53:43 2013 +0100
+++ b/src/solaris/native/java/util/TimeZone_md.c	Mon Sep 16 15:43:06 2013 -0400
@@ -53,6 +53,8 @@
 
 
 static const char *ETC_TIMEZONE_FILE = "/etc/timezone";
+static const char *REDHAT_RELEASE_FILE = "/etc/redhat-release";
+static const char *SYSCONFIG_CLOCK_FILE = "/etc/sysconfig/clock";
 static const char *ZONEINFO_DIR = "/usr/share/zoneinfo";
 static const char *DEFAULT_ZONEINFO_FILE = "/etc/localtime";
 #else
@@ -248,6 +250,7 @@
             }
         }
         (void) fclose(fp);
+	fp = NULL;
         if (tz != NULL) {
             return tz;
         }
@@ -255,6 +258,67 @@
 #endif /* __linux__ */
 
     /*
+     * Next, try the ZONE entry in /etc/sysconfig/clock.
+     */
+    if ((fp = fopen(REDHAT_RELEASE_FILE, "r")) != NULL) {
+	char id[7];
+
+	/* Avoid this file on Fedora as may be buggy; RH489586 */
+	if (fgets(id, sizeof (id), fp) != NULL && 
+	  strncmp(id, "Fedora", 6) != 0) {
+	    (void) fclose(fp);
+	    if ((fp = fopen(SYSCONFIG_CLOCK_FILE, "r")) != NULL) {
+		char line[256];
+		
+		while (fgets(line, sizeof(line), fp) != NULL) {
+		    char *p = line;
+		    char *s;
+		    
+		    SKIP_SPACE(p);
+		    if (*p != 'Z') {
+			continue;
+		    }
+		    if (strncmp(p, "ZONE=\"", 6) == 0) {
+			p += 6;
+		    } else {
+			/*
+			 * In case we need to parse it token by token.
+			 */
+			if (strncmp(p, "ZONE", 4) != 0) {
+			    continue;
+			}
+			p += 4;
+			SKIP_SPACE(p);
+			if (*p++ != '=') {
+			    break;
+			}
+			SKIP_SPACE(p);
+			if (*p++ != '"') {
+			    break;
+			}
+		    }
+		    for (s = p; *s && *s != '"'; s++)
+			;
+		    if (*s != '"') {
+			/* this ZONE entry is broken. */
+			break;
+		    }
+		    *s = '\0';
+		    tz = strdup(p);
+		    break; 
+		}
+	    }
+	}
+	if (fp != NULL) {
+	    (void) fclose(fp);
+	    fp = NULL;
+	}
+	if (tz != NULL) {
+	    return tz;
+	}
+    }
+
+    /*
      * Next, try /etc/localtime to find the zone ID.
      */
     if (lstat(DEFAULT_ZONEINFO_FILE, &statbuf) == -1) {
diff -r ba0446e8ac19 -r 6e44e8962a31 src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c
--- a/src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c	Fri Sep 27 20:53:43 2013 +0100
+++ b/src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c	Mon Sep 16 15:43:06 2013 -0400
@@ -23,7 +23,9 @@
  * questions.
  */
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 
 #include <krb5.h>
 #include <stdlib.h>
diff -r ba0446e8ac19 -r 6e44e8962a31 test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java	Mon Sep 16 15:43:06 2013 -0400
@@ -0,0 +1,420 @@
+/*
+ * Copyright (c) 2013, 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 8014618
+ * @summary Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement
+ * @author Pasi Eronen
+ */
+
+import java.io.*;
+import java.security.*;
+import java.security.spec.*;
+import java.security.interfaces.*;
+import javax.crypto.*;
+import javax.crypto.spec.*;
+import javax.crypto.interfaces.*;
+import com.sun.crypto.provider.SunJCE;
+
+/**
+ * Test that leading zeroes are stripped in TlsPremasterSecret case,
+ * but are left as-is in other cases.
+ *
+ * We use pre-generated keypairs, since with randomly generated keypairs,
+ * a leading zero happens only (roughly) 1 out of 256 cases.
+ */
+
+public class TestLeadingZeroes {
+
+    private static final String SUNJCE = "SunJCE";
+
+    private TestLeadingZeroes() {}
+
+    public static void main(String argv[]) throws Exception {
+        // Add JCE to the list of providers
+        SunJCE jce = new SunJCE();
+        Security.addProvider(jce);
+
+        TestLeadingZeroes keyAgree = new TestLeadingZeroes();
+        keyAgree.run();
+        System.out.println("Test Passed");
+    }
+
+    private void run() throws Exception {
+
+        // decode pre-generated keypairs

From bugzilla-daemon at icedtea.classpath.org  Mon Oct  7 15:18:56 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 07 Oct 2013 22:18:56 +0000
Subject: [Bug 1551] [IcedTea7] Add build support for Zero AArch64
In-Reply-To: <bug-1551-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1551-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1551-30-5k4vTVsXsB@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1551

--- Comment #11 from hg commits <mercurial at icedtea.classpath.org> ---
details:
http://icedtea.classpath.org//hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8e4c462b3a10
author: andrew
date: Fri Oct 04 16:40:15 2013 +0100

    PR1551: Add build support for Zero AArch64

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131007/7c102d1d/attachment-0001.html 

From bugzilla-daemon at icedtea.classpath.org  Mon Oct  7 15:19:02 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 07 Oct 2013 22:19:02 +0000
Subject: [Bug 1553] [IcedTea7] Add Debian AArch64 support
In-Reply-To: <bug-1553-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1553-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1553-30-eb2cTgAlhE@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1553

--- Comment #7 from hg commits <mercurial at icedtea.classpath.org> ---
details:
http://icedtea.classpath.org//hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=b3846cc85e15
author: andrew
date: Wed Sep 04 17:53:23 2013 +0100

    PR1553: Add Debian AArch64 support

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131007/88a813f5/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Mon Oct  7 15:19:07 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 07 Oct 2013 22:19:07 +0000
Subject: [Bug 1554] [IcedTea7] Fix build on Mac OS X
In-Reply-To: <bug-1554-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1554-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1554-30-cCDrgc2K6O@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1554

--- Comment #5 from hg commits <mercurial at icedtea.classpath.org> ---
details:
http://icedtea.classpath.org//hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3297163636bf
author: andrew
date: Wed Sep 04 18:20:38 2013 +0100

    PR1554: Fix build on Mac OS X
    Contributed-by: Alex Kasko <alex.kasko.lists at gmail.com>

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131007/35f3c627/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Mon Oct  7 17:04:34 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 00:04:34 +0000
Subject: [Bug 1397] [IcedTea6] Remove needed for override patch by building
	source/target 6 throughout
In-Reply-To: <bug-1397-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1397-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1397-30-7vM9QDF3Vo@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1397

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|ASSIGNED                    |RESOLVED
         Resolution|---                         |INVALID

--- Comment #4 from Andrew John Hughes <gnu.andrew at redhat.com> ---
6 should remain buildable with source/target 5: see
https://java.net/jira/browse/OPENJDK6-18

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/e570b8e1/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Mon Oct  7 17:04:34 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 00:04:34 +0000
Subject: [Bug 1272] [TRACKER] IcedTea6 1.13 Release
In-Reply-To: <bug-1272-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1272-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1272-30-wk7xyIkj6s@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1272

Bug 1272 depends on bug 1397, which changed state.

Bug 1397 Summary: [IcedTea6] Remove needed for override patch by building source/target 6 throughout
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1397

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|ASSIGNED                    |RESOLVED
         Resolution|---                         |INVALID

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/87ae1e68/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Mon Oct  7 22:55:36 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 05:55:36 +0000
Subject: [Bug 1578] New: Applet which mixes jar file and class file throws
	java.lang.LinkageError
Message-ID: <bug-1578-30@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1578

            Bug ID: 1578
           Summary: Applet which mixes jar file and class file throws
                    java.lang.LinkageError
    Classification: Unclassified
           Product: IcedTea-Web
           Version: 1.3.2
          Hardware: x86_64
                OS: Linux
            Status: NEW
          Severity: normal
          Priority: P3
         Component: Plugin
          Assignee: dbhole at redhat.com
          Reporter: pico-icedtea-2af85mds at picomancer.com
                CC: unassigned at icedtea.classpath.org

I'm not sure if this is the right place to file this.  I'm not even sure that
this is a bug and not intended behavior.

I have an applet.  Some of the code I want my applet to run is in .class files.
 Why I can't put them in a jar file is a very long story [1], and not important
to the bug report.

What's important is that I'm using a jar file and a class file in the same
applet.  The applet source is available at
https://github.com/picomancer/icedtea-bugs

I dynamically load the class file with Class.forName() and call it with the
reflection API.  Both the class file and the applet file access a third class
in the jar file, the "API class" Printer in my example (i.e., an API for the
class file to communicate with the rest of the applet).  This causes the applet
to produce a LinkageError on stderr (I had to enable logging in IcedTea control
panel and look at $HOME/.icedtea/log/java.stderr).

I am using Linux Mint 15, an OS based on Ubuntu Raring Ringtail.  I have tried
with my OS's included versions of Firefox and Chromium; the bug is present in
both, which leads me to believe it's unlikely to be a browser problem.  The
openjdk-7-jre package is version 7u25-2.3.10-1ubuntu0.13.04.2.  The icedtea
plugin is listed as 1.3.2-1ubuntu1.1.

The application I was writing when I found this bug is 1000 lines long so far. 
Or maybe 3500, depending on how you count.  So instead, I wrote a small test
case that reproduces the behavior and put it on Github, linked above.

To any IcedTea developer reading this, please run this in IcedTea 3.2 and see
if you can reproduce the LinkageError.  Then run it again in IcedTea current
development version and see if anybody's fixed it.  If it hasn't been fixed
yet, please fix it for the next version.  Thanks!

[1] The short version:  I want to dynamically generate the class file on the
server while the applet is running, in response to a POST request by the applet
containing user input.  Two facts:  (A) Class files are only loaded when
they're referenced, and (B) You can dynamically reference classes with
Class.forName().  I'm trying to combine (A) and (B) to convince the plugin to
load classes that didn't exist when the applet started.  This footnote DOES NOT
apply to the github I linked; that example builds everything ahead of time with
Ant.  But this is the actual problem I was trying to solve when I triggered the
bug.  And I wanted to explain why the obvious solution of "put the loose class
file in the jar file with all your other class files" isn't a practical answer
for my use case; I'd welcome other suggestions/workarounds!

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/aa2e8bf6/attachment.html 

From ptisnovs at icedtea.classpath.org  Tue Oct  8 00:54:17 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 07:54:17 +0000
Subject: /hg/icedtea6: Added --no-check-certificate flag to wget command
Message-ID: <hg.598a353f5405.1381218857.2873452341184383832@icedtea.classpath.org>

changeset 598a353f5405 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=598a353f5405
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue Oct 08 09:53:44 2013 +0200

	Added --no-check-certificate flag to wget command
	to allow downloading OpenJDK tarball using https.


diffstat:

 ChangeLog   |  6 ++++++
 Makefile.am |  2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r 7ce84f82f817 -r 598a353f5405 ChangeLog
--- a/ChangeLog	Mon Oct 07 23:11:18 2013 +0100
+++ b/ChangeLog	Tue Oct 08 09:53:44 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-08  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am:
+	Added --no-check-certificate flag to wget command
+	to allow downloading OpenJDK tarball using https.
+
 2013-10-07  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	* NEWS:
diff -r 7ce84f82f817 -r 598a353f5405 Makefile.am
--- a/Makefile.am	Mon Oct 07 23:11:18 2013 +0100
+++ b/Makefile.am	Tue Oct 08 09:53:44 2013 +0200
@@ -1070,7 +1070,7 @@
 	    if [ -e $(OPENJDK_SRC_ZIP) ] ; then \
 	      mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
 	    fi ; \
-	    $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
+	    $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) --no-check-certificate -O $(OPENJDK_SRC_ZIP); \
 	    if ! echo "$(OPENJDK_SHA256SUM)  $(OPENJDK_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
 	      echo "ERROR: Bad download of OpenJDK zip"; false; \

From ptisnovs at icedtea.classpath.org  Tue Oct  8 01:02:25 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 08:02:25 +0000
Subject: /hg/rhino-tests: Added new test testCast (that checks Class.cast...
Message-ID: <hg.0a809843f715.1381219345.-6019694633368342460@icedtea.classpath.org>

changeset 0a809843f715 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=0a809843f715
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue Oct 08 10:06:10 2013 +0200

	Added new test testCast (that checks Class.cast() method) into test
	test suite ScriptEngineFactoryClassTest.


diffstat:

 ChangeLog                                            |    6 +
 src/org/RhinoTests/ScriptEngineFactoryClassTest.java |  190 +++++++++++++++++++
 2 files changed, 196 insertions(+), 0 deletions(-)

diffs (213 lines):

diff -r 969c6cb3cfb9 -r 0a809843f715 ChangeLog
--- a/ChangeLog	Mon Oct 07 11:17:33 2013 +0200
+++ b/ChangeLog	Tue Oct 08 10:06:10 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-08  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/ScriptEngineFactoryClassTest.java:
+	Added new test testCast (that checks Class.cast() method) into test
+	test suite ScriptEngineFactoryClassTest.
+
 2013-10-07  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptEngineManagerClassTest.java:
diff -r 969c6cb3cfb9 -r 0a809843f715 src/org/RhinoTests/ScriptEngineFactoryClassTest.java
--- a/src/org/RhinoTests/ScriptEngineFactoryClassTest.java	Mon Oct 07 11:17:33 2013 +0200
+++ b/src/org/RhinoTests/ScriptEngineFactoryClassTest.java	Tue Oct 08 10:06:10 2013 +0200
@@ -1324,6 +1324,196 @@
     }
 
     /**
+     * Test for method javax.script.ScriptEngineFactory.getClass().cast()
+     */
+    protected void testCast() {
+        try {
+            this.scriptEngineFactoryClass.cast(new Object());
+            throw new AssertionError("Class.cast(new Object()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(new Object().getClass());
+            throw new AssertionError("Class.cast(new Object().getClass()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(new String());
+            throw new AssertionError("Class.cast(new String()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(Boolean.valueOf(true));
+            throw new AssertionError("Class.cast(Boolean.valueOf(true)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(Boolean.valueOf(false));
+            throw new AssertionError("Class.cast(Boolean.valueOf(false)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(Byte.valueOf((byte)42));
+            throw new AssertionError("Class.cast(Byte.valueOf((byte)42)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(Short.valueOf((short)42));
+            throw new AssertionError("Class.cast(Short.valueOf((short)42)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(Integer.valueOf(42));
+            throw new AssertionError("Class.cast(Integer.valueOf(42)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(Long.valueOf(42L));
+            throw new AssertionError("Class.cast(Long.valueOf(42L)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(Float.valueOf(42f));
+            throw new AssertionError("Class.cast(Float.valueOf(42f)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(Double.valueOf(42.));
+            throw new AssertionError("Class.cast(Double.valueOf(42.)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(new Throwable());
+            throw new AssertionError("Class.cast(new Throwable()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(new RuntimeException());
+            throw new AssertionError("Class.cast(new RuntimeException()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(new Error());
+            throw new AssertionError("Class.cast(new Error()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(new java.lang.String());
+            throw new AssertionError("Class.cast(new java.lang.String()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(new java.lang.StringBuffer());
+            throw new AssertionError("Class.cast(new java.lang.StringBuffer()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(new java.lang.StringBuilder());
+            throw new AssertionError("Class.cast(new java.lang.StringBuilder()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(java.awt.Color.black);
+            throw new AssertionError("Class.cast(java.awt.Color.black) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(new java.awt.Frame());
+            throw new AssertionError("Class.cast(new java.awt.Frame()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(new java.awt.Frame(new String()));
+            throw new AssertionError("Class.cast(new java.awt.Frame(new String())) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(new javax.swing.JLabel());
+            throw new AssertionError("Class.cast(new javax.swing.JLabel()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(new javax.swing.JLabel(new String()));
+            throw new AssertionError("Class.cast(new javax.swing.JLabel(new String())) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineFactoryClass.cast(new javax.swing.JPanel());
+            throw new AssertionError("Class.cast(new javax.swing.JPanel()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+    }
+
+    /**
      * Test for method javax.script.ScriptEngineFactory.getClass().newInstance()
      */
     protected void testNewInstance() {

From ptisnovs at icedtea.classpath.org  Tue Oct  8 01:04:33 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 08:04:33 +0000
Subject: /hg/gfx-test: Ten new tests added into BitBltAffineQuadrantRotat...
Message-ID: <hg.c5fce5c91482.1381219473.-6248649288953172555@icedtea.classpath.org>

changeset c5fce5c91482 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=c5fce5c91482
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue Oct 08 10:08:19 2013 +0200

	Ten new tests added into BitBltAffineQuadrantRotateTransformOp test suite.


diffstat:

 ChangeLog                                                             |    5 +
 src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java |  140 ++++++++++
 2 files changed, 145 insertions(+), 0 deletions(-)

diffs (162 lines):

diff -r 5a50e6dce23d -r c5fce5c91482 ChangeLog
--- a/ChangeLog	Mon Oct 07 11:28:37 2013 +0200
+++ b/ChangeLog	Tue Oct 08 10:08:19 2013 +0200
@@ -1,3 +1,8 @@
+2013-10-08  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java:
+	Ten new tests added into BitBltAffineQuadrantRotateTransformOp test suite.
+
 2013-10-07  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java:
diff -r 5a50e6dce23d -r c5fce5c91482 src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java
--- a/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java	Mon Oct 07 11:28:37 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java	Tue Oct 08 10:08:19 2013 +0200
@@ -501,6 +501,146 @@
     }
 
     /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_INDEXED.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteIndexedRotateTransformation4Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteIndexed(image, graphics2d, RotateTransformationNearest1Op[4]);
+    }
+
+    /**
+      Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_INDEXED.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteIndexedRotateTransformation5Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteIndexed(image, graphics2d, RotateTransformationNearest1Op[5]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteGrayRotateTransformation0Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteGray(image, graphics2d, RotateTransformationNearest1Op[0]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteGrayRotateTransformation1Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteGray(image, graphics2d, RotateTransformationNearest1Op[1]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteGrayRotateTransformation2Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteGray(image, graphics2d, RotateTransformationNearest1Op[2]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteGrayRotateTransformation3Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteGray(image, graphics2d, RotateTransformationNearest1Op[3]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteGrayRotateTransformation4Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteGray(image, graphics2d, RotateTransformationNearest1Op[4]);
+    }
+
+    /**
+      Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteGrayRotateTransformation5Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteGray(image, graphics2d, RotateTransformationNearest1Op[5]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_CUSTOM.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeCustomRotateTransformation0Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeCustom(image, graphics2d, RotateTransformationNearest1Op[0]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_CUSTOM.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeCustomRotateTransformation1Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeCustom(image, graphics2d, RotateTransformationNearest1Op[1]);
+    }
+
+    /**
      * Entry point to the test suite.
      *
      * @param args not used in this case

From gnu.andrew at redhat.com  Tue Oct  8 05:47:20 2013
From: gnu.andrew at redhat.com (Andrew Hughes)
Date: Tue, 8 Oct 2013 08:47:20 -0400 (EDT)
Subject: /hg/icedtea6: Added --no-check-certificate flag to wget command
In-Reply-To: <hg.598a353f5405.1381218857.2873452341184383832@icedtea.classpath.org>
References: <hg.598a353f5405.1381218857.2873452341184383832@icedtea.classpath.org>
Message-ID: <740936920.3227599.1381236440938.JavaMail.root@redhat.com>



----- Original Message -----
> changeset 598a353f5405 in /hg/icedtea6
> details:
> http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=598a353f5405
> author: Pavel Tisnovsky <ptisnovs at redhat.com>
> date: Tue Oct 08 09:53:44 2013 +0200
> 
> 	Added --no-check-certificate flag to wget command
> 	to allow downloading OpenJDK tarball using https.
> 

Why are you making this change?  I tested and wget downloads the tarball fine.
Are you sure this is not a local configuration issue?

> 
> diffstat:
> 
>  ChangeLog   |  6 ++++++
>  Makefile.am |  2 +-
>  2 files changed, 7 insertions(+), 1 deletions(-)
> 
> diffs (25 lines):
> 
> diff -r 7ce84f82f817 -r 598a353f5405 ChangeLog
> --- a/ChangeLog	Mon Oct 07 23:11:18 2013 +0100
> +++ b/ChangeLog	Tue Oct 08 09:53:44 2013 +0200
> @@ -1,3 +1,9 @@
> +2013-10-08  Pavel Tisnovsky  <ptisnovs at redhat.com>
> +
> +	* Makefile.am:
> +	Added --no-check-certificate flag to wget command
> +	to allow downloading OpenJDK tarball using https.
> +
>  2013-10-07  Andrew John Hughes  <gnu.andrew at redhat.com>
>  
>  	* NEWS:
> diff -r 7ce84f82f817 -r 598a353f5405 Makefile.am
> --- a/Makefile.am	Mon Oct 07 23:11:18 2013 +0100
> +++ b/Makefile.am	Tue Oct 08 09:53:44 2013 +0200
> @@ -1070,7 +1070,7 @@
>  	    if [ -e $(OPENJDK_SRC_ZIP) ] ; then \
>  	      mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
>  	    fi ; \
> -	    $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
> +	    $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) --no-check-certificate -O
> $(OPENJDK_SRC_ZIP); \
>  	    if ! echo "$(OPENJDK_SHA256SUM)  $(OPENJDK_SRC_ZIP)" \
>  	      | $(SHA256SUM) --check ; then \
>  	      echo "ERROR: Bad download of OpenJDK zip"; false; \
> 

-- 
Andrew :)

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

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07


From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 06:01:39 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 13:01:39 +0000
Subject: [Bug 1366] [IcedTea6] Replace hgforest support
In-Reply-To: <bug-1366-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1366-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1366-30-cFiiMNZPmk@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1366

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Blocks|1272                        |1503
   Target Milestone|6-1.13.0                    |6-1.14.0

--- Comment #1 from Andrew John Hughes <gnu.andrew at redhat.com> ---
Retarget to 1.14.x.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/daf94762/attachment-0001.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 06:01:39 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 13:01:39 +0000
Subject: [Bug 1272] [TRACKER] IcedTea6 1.13 Release
In-Reply-To: <bug-1272-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1272-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1272-30-pGqFEpPK1e@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1272

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Depends on|1366                        |

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/3ef2f765/attachment-0001.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 06:01:39 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 13:01:39 +0000
Subject: [Bug 1503] [TRACKER] IcedTea6 1.14 Release
In-Reply-To: <bug-1503-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1503-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1503-30-TjgVtoqib4@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1503

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Depends on|                            |1366

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/33c2232f/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 06:03:55 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 13:03:55 +0000
Subject: [Bug 1540] [IcedTea6] Font configuration should check /etc/os-release
In-Reply-To: <bug-1540-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1540-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1540-30-5sRJjKw8NU@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1540

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|6-1.13.0                    |6-1.14.0

--- Comment #1 from Andrew John Hughes <gnu.andrew at redhat.com> ---
Move to 1.14.x series.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/2c256e52/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 06:03:59 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 13:03:59 +0000
Subject: [Bug 1541] [IcedTea6] Sanity check should read /etc/os-release
In-Reply-To: <bug-1541-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1541-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1541-30-WZv9pNt7P0@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1541

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|6-1.13.0                    |6-1.14.0

--- Comment #1 from Andrew John Hughes <gnu.andrew at redhat.com> ---
Move to 1.14.x series.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/055cd61a/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 06:04:05 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 13:04:05 +0000
Subject: [Bug 1542] [IcedTea6] autoconf checks should use /etc/os-release in
	preference to lsb_release
In-Reply-To: <bug-1542-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1542-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1542-30-pKhUrUtvMS@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1542

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|6-1.13.0                    |6-1.14.0

--- Comment #1 from Andrew John Hughes <gnu.andrew at redhat.com> ---
Move to 1.14.x series.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/2968d57e/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 06:04:46 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 13:04:46 +0000
Subject: [Bug 1372] [IcedTea6] Provide option to build without debugging
In-Reply-To: <bug-1372-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1372-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1372-30-DE8HsvMKDA@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1372

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Blocks|1272                        |1503
   Target Milestone|6-1.13.0                    |6-1.14.0

--- Comment #1 from Andrew John Hughes <gnu.andrew at redhat.com> ---
Move to 1.14.x series.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/d12e7dc8/attachment-0001.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 06:04:46 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 13:04:46 +0000
Subject: [Bug 1272] [TRACKER] IcedTea6 1.13 Release
In-Reply-To: <bug-1272-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1272-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1272-30-MUjceLF9gV@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1272

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Depends on|1372                        |

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/d27776df/attachment-0001.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 06:04:46 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 13:04:46 +0000
Subject: [Bug 1503] [TRACKER] IcedTea6 1.14 Release
In-Reply-To: <bug-1503-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1503-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1503-30-i1vAPXozIb@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1503

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Depends on|                            |1372

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/b25b291a/attachment-0001.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 06:04:51 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 13:04:51 +0000
Subject: [Bug 1373] [IcedTea6] Provide option to strip and link debugging
	info after build
In-Reply-To: <bug-1373-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1373-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1373-30-UD5wEgGUbV@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1373

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Blocks|1272                        |1503
   Target Milestone|6-1.13.0                    |6-1.14.0

--- Comment #2 from Andrew John Hughes <gnu.andrew at redhat.com> ---
Move to 1.14.x series.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/7c3d9e3e/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 06:04:51 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 13:04:51 +0000
Subject: [Bug 1272] [TRACKER] IcedTea6 1.13 Release
In-Reply-To: <bug-1272-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1272-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1272-30-75S8hsVxLe@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1272

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Depends on|1373                        |

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/6bcf9c4d/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 06:04:51 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 13:04:51 +0000
Subject: [Bug 1503] [TRACKER] IcedTea6 1.14 Release
In-Reply-To: <bug-1503-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1503-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1503-30-rwd6kDnO6y@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1503

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Depends on|                            |1373

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/9684264b/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 06:05:00 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 13:05:00 +0000
Subject: [Bug 1539] [METABUG] [IcedTea6] Support /etc/os-release
In-Reply-To: <bug-1539-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1539-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1539-30-voC6HdQ5Ml@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1539

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Blocks|1272                        |1503
   Target Milestone|6-1.13.0                    |6-1.14.0

--- Comment #1 from Andrew John Hughes <gnu.andrew at redhat.com> ---
Move to 1.14.x series.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/f41df9c2/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 06:05:00 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 13:05:00 +0000
Subject: [Bug 1272] [TRACKER] IcedTea6 1.13 Release
In-Reply-To: <bug-1272-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1272-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1272-30-PztODuNSFt@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1272

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Depends on|1539                        |

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/523d03f8/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 06:05:00 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 13:05:00 +0000
Subject: [Bug 1503] [TRACKER] IcedTea6 1.14 Release
In-Reply-To: <bug-1503-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1503-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1503-30-aoeYT40NIe@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1503

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Depends on|                            |1539

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/e99f7c16/attachment.html 

From ptisnovs at redhat.com  Tue Oct  8 06:08:23 2013
From: ptisnovs at redhat.com (Pavel Tisnovsky)
Date: Tue, 8 Oct 2013 09:08:23 -0400 (EDT)
Subject: /hg/icedtea6: Added --no-check-certificate flag to wget command
In-Reply-To: <740936920.3227599.1381236440938.JavaMail.root@redhat.com>
References: <hg.598a353f5405.1381218857.2873452341184383832@icedtea.classpath.org>
	<740936920.3227599.1381236440938.JavaMail.root@redhat.com>
Message-ID: <1183394643.3419143.1381237703528.JavaMail.root@redhat.com>

----- Andrew Hughes <gnu.andrew at redhat.com> wrote:
> 
> 
> ----- Original Message -----
> > changeset 598a353f5405 in /hg/icedtea6
> > details:
> > http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=598a353f5405
> > author: Pavel Tisnovsky <ptisnovs at redhat.com>
> > date: Tue Oct 08 09:53:44 2013 +0200
> > 
> > 	Added --no-check-certificate flag to wget command
> > 	to allow downloading OpenJDK tarball using https.
> > 
> 
> Why are you making this change?  I tested and wget downloads the tarball fine.
> Are you sure this is not a local configuration issue?

On stock RHEL 5 (default installation) I got the error message that the tarball
can't be downloaded because of missing/invalid certificate. I think this change
is harmless, but the question is why do we need to use https which is more time
consuming on both sides (http server, wget on clients)?

Cheers,
Pavel

> 
> > 
> > diffstat:
> > 
> >  ChangeLog   |  6 ++++++
> >  Makefile.am |  2 +-
> >  2 files changed, 7 insertions(+), 1 deletions(-)
> > 
> > diffs (25 lines):
> > 
> > diff -r 7ce84f82f817 -r 598a353f5405 ChangeLog
> > --- a/ChangeLog	Mon Oct 07 23:11:18 2013 +0100
> > +++ b/ChangeLog	Tue Oct 08 09:53:44 2013 +0200
> > @@ -1,3 +1,9 @@
> > +2013-10-08  Pavel Tisnovsky  <ptisnovs at redhat.com>
> > +
> > +	* Makefile.am:
> > +	Added --no-check-certificate flag to wget command
> > +	to allow downloading OpenJDK tarball using https.
> > +
> >  2013-10-07  Andrew John Hughes  <gnu.andrew at redhat.com>
> >  
> >  	* NEWS:
> > diff -r 7ce84f82f817 -r 598a353f5405 Makefile.am
> > --- a/Makefile.am	Mon Oct 07 23:11:18 2013 +0100
> > +++ b/Makefile.am	Tue Oct 08 09:53:44 2013 +0200
> > @@ -1070,7 +1070,7 @@
> >  	    if [ -e $(OPENJDK_SRC_ZIP) ] ; then \
> >  	      mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
> >  	    fi ; \
> > -	    $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
> > +	    $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) --no-check-certificate -O
> > $(OPENJDK_SRC_ZIP); \
> >  	    if ! echo "$(OPENJDK_SHA256SUM)  $(OPENJDK_SRC_ZIP)" \
> >  	      | $(SHA256SUM) --check ; then \
> >  	      echo "ERROR: Bad download of OpenJDK zip"; false; \
> > 
> 
> -- 
> Andrew :)
> 
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
> 
> PGP Key: 248BDC07 (https://keys.indymedia.org/)
> Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07
> 


From andrew at icedtea.classpath.org  Tue Oct  8 08:38:09 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 15:38:09 +0000
Subject: /hg/release/icedtea7-forest-2.3/jdk: PR1400: Menu of maximized A...
Message-ID: <hg.7764e0491978.1381246689.4833355912275447704@icedtea.classpath.org>

changeset 7764e0491978 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=7764e0491978
author: andrew
date: Tue Oct 08 16:37:50 2013 +0100

	PR1400: Menu of maximized AWT window not working in Mate


diffstat:

 src/solaris/classes/sun/awt/X11/XWM.java |  14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diffs (59 lines):

diff -r 6e44e8962a31 -r 7764e0491978 src/solaris/classes/sun/awt/X11/XWM.java
--- a/src/solaris/classes/sun/awt/X11/XWM.java	Mon Sep 16 15:43:06 2013 -0400
+++ b/src/solaris/classes/sun/awt/X11/XWM.java	Tue Oct 08 16:37:50 2013 +0100
@@ -104,7 +104,8 @@
         COMPIZ_WM = 12,
         LG3D_WM = 13,
         CWM_WM = 14,
-        MUTTER_WM = 15;
+        MUTTER_WM = 15,
+        MARCO_WM = 16;
     public String toString() {
         switch  (WMID) {
           case NO_WM:
@@ -135,6 +136,8 @@
               return "CWM";
           case MUTTER_WM:
               return "Mutter";
+          case MARCO_WM:
+              return "Marco";
           case UNDETERMINED_WM:
           default:
               return "Undetermined WM";
@@ -581,6 +584,10 @@
         return isNetWMName("Mutter") || isNetWMName("GNOME Shell");
     }
 
+    static boolean isMarco() {
+        return isNetWMName("Marco");
+    }
+
     // TODO: according to wikipedia, compiz is now reparenting. This should
     // probably be updated.
     static boolean isNonReparentingWM() {
@@ -766,6 +773,8 @@
                 awt_wmgr = CWM_WM;
             } else if (doIsIceWM && isIceWM()) {
                 awt_wmgr = XWM.ICE_WM;
+            } else if (isMarco()) {
+                awt_wmgr = XWM.MARCO_WM;
             }
             /*
              * We don't check for legacy WM when we already know that WM
@@ -1065,6 +1074,7 @@
           case XWM.SAWFISH_WM:
           case XWM.ICE_WM:
           case XWM.METACITY_WM:
+          case XWM.MARCO_WM:
               return true;
           case XWM.OPENLOOK_WM:
           case XWM.MOTIF_WM:
@@ -1091,7 +1101,7 @@
                * WMs that talk NET/WIN protocol, but do not support
                * unidirectional maximization.
                */
-              if (getWMID() == METACITY_WM) {
+              if (getWMID() == METACITY_WM || getWMID() == MARCO_WM) {
                   /* "This is a deliberate policy decision." -hp */
                   return false;
               }

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 08:38:17 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 15:38:17 +0000
Subject: [Bug 1400] Menu of maximized AWT window not working in GNOME Shell
In-Reply-To: <bug-1400-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1400-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1400-30-ZX6RrgELZE@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1400

--- Comment #6 from hg commits <mercurial at icedtea.classpath.org> ---
details:
http://icedtea.classpath.org//hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=7764e0491978
author: andrew
date: Tue Oct 08 16:37:50 2013 +0100

    PR1400: Menu of maximized AWT window not working in Mate

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/4a4ef497/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 08:46:41 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 15:46:41 +0000
Subject: [Bug 1513] Applet fails to load
In-Reply-To: <bug-1513-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1513-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1513-30-UhFzNAkU6c@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1513

Andrew Azores <aazores at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |ASSIGNED

--- Comment #3 from Andrew Azores <aazores at redhat.com> ---
[1] seems to be the page multime200 is talking about. The applet on this page
fails to load with IcedTea-Web but does work with Oracle's plugin. I'm working
to identify the cause of failure and think I may have found it. Will need to
discuss with other developers.

[1] https://oasisweb.uga.edu/oasis.html

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/ebe3ffb7/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 09:01:48 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 16:01:48 +0000
Subject: [Bug 1400] Menu of maximized AWT window not working in GNOME Shell
In-Reply-To: <bug-1400-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1400-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1400-30-hPweKpL4yq@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1400

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|---                         |2.3.13

--- Comment #7 from Andrew John Hughes <gnu.andrew at redhat.com> ---
I've backported 8024863 to 7, against which this was filed, and also added a
fix for MATE, which I've treated in the same way as Metacity, though with its
own ID.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/13cd10c5/attachment.html 

From andrew at icedtea.classpath.org  Tue Oct  8 09:02:46 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 16:02:46 +0000
Subject: /hg/release/icedtea7-forest-2.4/jdk: PR1400: Menu of maximized A...
Message-ID: <hg.e4ea4c3db76c.1381248166.9040506844232929411@icedtea.classpath.org>

changeset e4ea4c3db76c in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e4ea4c3db76c
author: andrew
date: Tue Oct 08 16:37:50 2013 +0100

	PR1400: Menu of maximized AWT window not working in Mate


diffstat:

 src/solaris/classes/sun/awt/X11/XWM.java |  14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diffs (59 lines):

diff -r bdced30f70e9 -r e4ea4c3db76c src/solaris/classes/sun/awt/X11/XWM.java
--- a/src/solaris/classes/sun/awt/X11/XWM.java	Wed Sep 18 14:10:24 2013 +0100
+++ b/src/solaris/classes/sun/awt/X11/XWM.java	Tue Oct 08 16:37:50 2013 +0100
@@ -104,7 +104,8 @@
         COMPIZ_WM = 12,
         LG3D_WM = 13,
         CWM_WM = 14,
-        MUTTER_WM = 15;
+        MUTTER_WM = 15,
+        MARCO_WM = 16;
     public String toString() {
         switch  (WMID) {
           case NO_WM:
@@ -135,6 +136,8 @@
               return "CWM";
           case MUTTER_WM:
               return "Mutter";
+          case MARCO_WM:
+              return "Marco";
           case UNDETERMINED_WM:
           default:
               return "Undetermined WM";
@@ -581,6 +584,10 @@
         return isNetWMName("Mutter") || isNetWMName("GNOME Shell");
     }
 
+    static boolean isMarco() {
+        return isNetWMName("Marco");
+    }
+
     // TODO: according to wikipedia, compiz is now reparenting. This should
     // probably be updated.
     static boolean isNonReparentingWM() {
@@ -766,6 +773,8 @@
                 awt_wmgr = CWM_WM;
             } else if (doIsIceWM && isIceWM()) {
                 awt_wmgr = XWM.ICE_WM;
+            } else if (isMarco()) {
+                awt_wmgr = XWM.MARCO_WM;
             }
             /*
              * We don't check for legacy WM when we already know that WM
@@ -1065,6 +1074,7 @@
           case XWM.SAWFISH_WM:
           case XWM.ICE_WM:
           case XWM.METACITY_WM:
+          case XWM.MARCO_WM:
               return true;
           case XWM.OPENLOOK_WM:
           case XWM.MOTIF_WM:
@@ -1091,7 +1101,7 @@
                * WMs that talk NET/WIN protocol, but do not support
                * unidirectional maximization.
                */
-              if (getWMID() == METACITY_WM) {
+              if (getWMID() == METACITY_WM || getWMID() == MARCO_WM) {
                   /* "This is a deliberate policy decision." -hp */
                   return false;
               }

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 09:02:56 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 16:02:56 +0000
Subject: [Bug 1400] Menu of maximized AWT window not working in GNOME Shell
In-Reply-To: <bug-1400-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1400-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1400-30-mPo3LanFYp@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1400

--- Comment #8 from hg commits <mercurial at icedtea.classpath.org> ---
details:
http://icedtea.classpath.org//hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e4ea4c3db76c
author: andrew
date: Tue Oct 08 16:37:50 2013 +0100

    PR1400: Menu of maximized AWT window not working in Mate

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/c83cd636/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 09:04:06 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 16:04:06 +0000
Subject: [Bug 1400] Menu of maximized AWT window not working in GNOME Shell
In-Reply-To: <bug-1400-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1400-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1400-30-z7pfWetBtt@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1400

--- Comment #9 from Andrew John Hughes <gnu.andrew at redhat.com> ---
Is http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1532 the same bug too?

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/3572dd38/attachment-0001.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 09:06:25 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 08 Oct 2013 16:06:25 +0000
Subject: [Bug 1400] Menu of maximized AWT window not working in GNOME Shell
In-Reply-To: <bug-1400-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1400-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1400-30-gkZaWDuXQ8@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1400

--- Comment #10 from hg commits <mercurial at icedtea.classpath.org> ---
details:
http://icedtea.classpath.org//hg/icedtea7-forest/jdk?cmd=changeset;node=0ff397456868
author: andrew
date: Tue Oct 08 16:37:50 2013 +0100

    PR1400: Menu of maximized AWT window not working in Mate

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/6227a97c/attachment.html 

From jvanek at redhat.com  Tue Oct  8 09:41:33 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Tue, 08 Oct 2013 18:41:33 +0200
Subject: [icedtea-web] RFC: Move some proxy logic to
	BrowserAwareProxySelector
In-Reply-To: <5252D26F.8070907@redhat.com>
References: <524F5329.2060103@redhat.com> <5252CDEA.5040004@redhat.com>
	<5252D26F.8070907@redhat.com>
Message-ID: <525435BD.106@redhat.com>

On 10/07/2013 05:25 PM, Omair Majid wrote:
> On 10/07/2013 11:06 AM, Jiri Vanek wrote:
>> On 10/05/2013 01:45 AM, Omair Majid wrote:
>>> Hi,
>>>
>>> The attached patch tries to clean up some code by moving some logic
>>> around asking the browser for proxy into BrowserAwareProxySelector,
>>> which seems more appropriate to keep this logic compared to the
>>> catch-all class PluginAppletViewr.
>>>
>> What is torubeling me a bit is change or parameter from uri to string.
>> Why so?
>
> Because the request to the browser currently takes a string:

Although I would rather keep uri in parameter (no metter that proxy request is string, the parammeter IS uri) you can proceed in your (or with uri-ed) version.

>
> String requestURI = null;
> requestURI = convertUriSchemeForProxyQuery(uri);
> PluginCallRequest request =
>    requestFactory.getPluginCallRequest("proxyinfo",
>                   "plugin PluginProxyInfo reference " + reference + " " +
>                    requestURI, reference)
>
>
> The convertUriSchemeForProxy is now part of the ProxySelector, so this
> method accepts a string directly.
>
>> I think more uri-validity checks ...even better.
>
> Any suggestions? I just refactored code (no functional changes unless I
> screwed up).
>
> Cheers,
> Omair
>


From aazores at redhat.com  Tue Oct  8 13:42:28 2013
From: aazores at redhat.com (Andrew Azores)
Date: Tue, 08 Oct 2013 16:42:28 -0400
Subject: [rfc][icedtea-web] RH976833 ClassLoader deadlock
In-Reply-To: <524F3032.6070509@redhat.com>
References: <520D35CA.9070208@redhat.com> <52286E1C.8030604@redhat.com>
	<52288F54.1000907@redhat.com> <5229A989.2060203@redhat.com>
	<5229F796.4070708@redhat.com> <5229FB6D.2070301@redhat.com>
	<5237102D.4070207@redhat.com> <52371F34.9050207@redhat.com>
	<52372111.8030200@redhat.com> <52374085.5080901@redhat.com>
	<5245B571.6030106@redhat.com> <524F0FFE.60208@redhat.com>
	<524F1A40.10300@redhat.com> <524F249B.3020804@redhat.com>
	<524F2A34.1000305@redhat.com> <524F3032.6070509@redhat.com>
Message-ID: <52546E34.4090904@redhat.com>

On 10/04/2013 05:16 PM, Andrew Azores wrote:
> (snip)
>
> If none of us are able to identify any issues with doing this simple 
> lock replacement trick then I'll make another push-candidate patch later.
>
> Thanks,
>

Seems nobody else has identified anything and neither have I, so the 
patch is attached.

Thanks,

-- 
Andrew A

-------------- next part --------------
A non-text attachment was scrubbed...
Name: classloader-deadlock.patch
Type: text/x-patch
Size: 8012 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131008/d6e561c1/classloader-deadlock.patch 

From andrew at icedtea.classpath.org  Tue Oct  8 17:08:25 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 09 Oct 2013 00:08:25 +0000
Subject: /hg/icedtea6: 2 new changesets
Message-ID: <hg.739dfd3ff255.1381277305.2873452341184383832@icedtea.classpath.org>

changeset 739dfd3ff255 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=739dfd3ff255
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Oct 08 13:53:20 2013 +0100

	Correct ChangeLog entry.


changeset 9e8a68310569 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9e8a68310569
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Oct 09 01:08:04 2013 +0100

	PR1288: Allow JARs to be optionally compressed by setting COMPRESS_JARS

	2012-08-22  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		PR1288: Allow JARs to be optionally compressed by
		setting COMPRESS_JARS
		* Makefile.am:
		(ICEDTEA_ENV): Add COMPRESS_JARS="true" if
		ENABLE_JAR_COMPRESSION is set.
		* NEWS: Updated.
		* acinclude.m4: Add IT_ENABLE_JAR_COMPRESSION macro.
		* configure.ac: Include new macro.


diffstat:

 ChangeLog    |  17 +++++++++++++++--
 Makefile.am  |   5 +++++
 NEWS         |   1 +
 acinclude.m4 |  22 ++++++++++++++++++++++
 configure.ac |   1 +
 5 files changed, 44 insertions(+), 2 deletions(-)

diffs (93 lines):

diff -r 598a353f5405 -r 9e8a68310569 ChangeLog
--- a/ChangeLog	Tue Oct 08 09:53:44 2013 +0200
+++ b/ChangeLog	Wed Oct 09 01:08:04 2013 +0100
@@ -1,8 +1,21 @@
+2012-08-22  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR1288: Allow JARs to be optionally compressed by
+	setting COMPRESS_JARS
+	* Makefile.am:
+	(ICEDTEA_ENV): Add COMPRESS_JARS="true" if
+	ENABLE_JAR_COMPRESSION is set.
+	* NEWS: Updated.
+	* acinclude.m4: Add IT_ENABLE_JAR_COMPRESSION macro.
+	* configure.ac: Include new macro.
+
 2013-10-08  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am:
-	Added --no-check-certificate flag to wget command
-	to allow downloading OpenJDK tarball using https.
+	(download-openjdk): Added --no-check-certificate
+	flag to wget command to allow downloading OpenJDK
+	tarball using https on systems with the necessary
+	certificates.
 
 2013-10-07  Andrew John Hughes  <gnu.andrew at redhat.com>
 
diff -r 598a353f5405 -r 9e8a68310569 Makefile.am
--- a/Makefile.am	Tue Oct 08 09:53:44 2013 +0200
+++ b/Makefile.am	Wed Oct 09 01:08:04 2013 +0100
@@ -846,6 +846,11 @@
 	KRB5_CFLAGS="${KRB5_CFLAGS}"
 endif
 
+if ENABLE_JAR_COMPRESSION
+ICEDTEA_ENV += \
+	COMPRESS_JARS="true"
+endif
+
 # OpenJDK ecj build environment.
 ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \
 	ALT_OUTPUTDIR="$(ECJ_BUILD_OUTPUT_DIR)" \
diff -r 598a353f5405 -r 9e8a68310569 NEWS
--- a/NEWS	Tue Oct 08 09:53:44 2013 +0200
+++ b/NEWS	Wed Oct 09 01:08:04 2013 +0100
@@ -16,6 +16,7 @@
 * New features
   - PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional
   - PR718: Backport LCMS2 support from IcedTea7
+  - PR1288: Allow JARs to be optionally compressed by setting COMPRESS_JARS
 * Import of OpenJDK6 b28
   - OJ1: Confirm that community members can commit to hotspot in OpenJDK6
   - OJ2: Revert unnecessary file added to hotspot repo
diff -r 598a353f5405 -r 9e8a68310569 acinclude.m4
--- a/acinclude.m4	Tue Oct 08 09:53:44 2013 +0200
+++ b/acinclude.m4	Wed Oct 09 01:08:04 2013 +0100
@@ -2083,3 +2083,25 @@
   AM_CONDITIONAL(USE_SYSTEM_KERBEROS, test x"${ENABLE_SYSTEM_KERBEROS}" = "xyes")
   AC_SUBST(ENABLE_SYSTEM_KERBEROS)
 ])
+
+AC_DEFUN([IT_ENABLE_JAR_COMPRESSION],
+[
+  AC_MSG_CHECKING([whether to enable JAR compression])
+  AC_ARG_ENABLE([jar-compression],
+                [AS_HELP_STRING(--enable-jar-compression,compress built jars [[default=yes]])],
+  [
+    case "${enableval}" in
+      no)
+        enable_jar_compression=no
+        ;;
+      *)
+        enable_jar_compression=yes
+        ;;
+    esac
+  ],
+  [
+    enable_jar_compression=yes
+  ])
+  AC_MSG_RESULT([$enable_jar_compression])
+  AM_CONDITIONAL([ENABLE_JAR_COMPRESSION], test x"${enable_jar_compression}" = "xyes")
+])
diff -r 598a353f5405 -r 9e8a68310569 configure.ac
--- a/configure.ac	Tue Oct 08 09:53:44 2013 +0200
+++ b/configure.ac	Wed Oct 09 01:08:04 2013 +0100
@@ -284,6 +284,7 @@
 IT_WITH_JAMVM_SRC_ZIP
 
 IT_DISABLE_OPTIMIZATIONS
+IT_ENABLE_JAR_COMPRESSION
 IT_SET_SHARK_BUILD
 IT_ENABLE_ZERO_BUILD
 IT_CHECK_ADDITIONAL_VMS

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 17:08:44 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 09 Oct 2013 00:08:44 +0000
Subject: [Bug 1288] [IcedTea6] Allow JARs to optionally be compressed by
	setting COMPRESS_JARS
In-Reply-To: <bug-1288-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1288-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1288-30-NRFt7a61YB@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1288

--- Comment #2 from hg commits <mercurial at icedtea.classpath.org> ---
details:
http://icedtea.classpath.org//hg/icedtea6?cmd=changeset;node=9e8a68310569
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Oct 09 01:08:04 2013 +0100

    PR1288: Allow JARs to be optionally compressed by setting COMPRESS_JARS

    2012-08-22  Andrew John Hughes  <gnu_andrew at member.fsf.org>

        PR1288: Allow JARs to be optionally compressed by
        setting COMPRESS_JARS
        * Makefile.am:
        (ICEDTEA_ENV): Add COMPRESS_JARS="true" if
        ENABLE_JAR_COMPRESSION is set.
        * NEWS: Updated.
        * acinclude.m4: Add IT_ENABLE_JAR_COMPRESSION macro.
        * configure.ac: Include new macro.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131009/ec3ebe5d/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 17:18:33 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 09 Oct 2013 00:18:33 +0000
Subject: [Bug 1288] [IcedTea6] Allow JARs to optionally be compressed by
	setting COMPRESS_JARS
In-Reply-To: <bug-1288-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1288-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1288-30-BJaZp0Qwbg@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1288

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|ASSIGNED                    |RESOLVED
         Resolution|---                         |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131009/739783bf/attachment-0001.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct  8 17:18:34 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 09 Oct 2013 00:18:34 +0000
Subject: [Bug 1272] [TRACKER] IcedTea6 1.13 Release
In-Reply-To: <bug-1272-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1272-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1272-30-R3uBySZxwH@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1272

Bug 1272 depends on bug 1288, which changed state.

Bug 1288 Summary: [IcedTea6] Allow JARs to optionally be compressed by setting COMPRESS_JARS
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1288

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|ASSIGNED                    |RESOLVED
         Resolution|---                         |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131009/22568390/attachment-0001.html 

From ptisnovs at icedtea.classpath.org  Wed Oct  9 04:40:32 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Wed, 09 Oct 2013 11:40:32 +0000
Subject: /hg/rhino-tests: Added new test testCast (that checks Class.cast...
Message-ID: <hg.c8b6ebc43fa5.1381318832.-6019694633368342460@icedtea.classpath.org>

changeset c8b6ebc43fa5 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=c8b6ebc43fa5
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Wed Oct 09 13:44:15 2013 +0200

	Added new test testCast (that checks Class.cast() method) into test
	test suite ScriptExceptionClassTest.


diffstat:

 ChangeLog                                        |    6 +
 src/org/RhinoTests/ScriptExceptionClassTest.java |  198 +++++++++++++++++++++++
 2 files changed, 204 insertions(+), 0 deletions(-)

diffs (221 lines):

diff -r 0a809843f715 -r c8b6ebc43fa5 ChangeLog
--- a/ChangeLog	Tue Oct 08 10:06:10 2013 +0200
+++ b/ChangeLog	Wed Oct 09 13:44:15 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-09  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/ScriptExceptionClassTest.java:
+	Added new test testCast (that checks Class.cast() method) into test
+	test suite ScriptExceptionClassTest.
+
 2013-10-08  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptEngineFactoryClassTest.java:
diff -r 0a809843f715 -r c8b6ebc43fa5 src/org/RhinoTests/ScriptExceptionClassTest.java
--- a/src/org/RhinoTests/ScriptExceptionClassTest.java	Tue Oct 08 10:06:10 2013 +0200
+++ b/src/org/RhinoTests/ScriptExceptionClassTest.java	Wed Oct 09 13:44:15 2013 +0200
@@ -1448,6 +1448,204 @@
     }
 
     /**
+     * Test for method javax.script.ScriptException.getClass().cast()
+     */
+    protected void testCast() {
+        try {
+            this.scriptExceptionClass.cast(new javax.script.ScriptException("script exception"));
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            throw new AssertionError(e.getMessage());
+        }
+
+        try {
+            this.scriptExceptionClass.cast(new Object());
+            throw new AssertionError("Class.cast(new Object()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(new Object().getClass());
+            throw new AssertionError("Class.cast(new Object().getClass()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(new String());
+            throw new AssertionError("Class.cast(new String()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(Boolean.valueOf(true));
+            throw new AssertionError("Class.cast(Boolean.valueOf(true)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(Boolean.valueOf(false));
+            throw new AssertionError("Class.cast(Boolean.valueOf(false)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(Byte.valueOf((byte)42));
+            throw new AssertionError("Class.cast(Byte.valueOf((byte)42)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(Short.valueOf((short)42));
+            throw new AssertionError("Class.cast(Short.valueOf((short)42)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(Integer.valueOf(42));
+            throw new AssertionError("Class.cast(Integer.valueOf(42)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(Long.valueOf(42L));
+            throw new AssertionError("Class.cast(Long.valueOf(42L)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(Float.valueOf(42f));
+            throw new AssertionError("Class.cast(Float.valueOf(42f)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(Double.valueOf(42.));
+            throw new AssertionError("Class.cast(Double.valueOf(42.)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(new Throwable());
+            throw new AssertionError("Class.cast(new Throwable()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(new RuntimeException());
+            throw new AssertionError("Class.cast(new RuntimeException()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(new Error());
+            throw new AssertionError("Class.cast(new Error()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(new java.lang.String());
+            throw new AssertionError("Class.cast(new java.lang.String()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(new java.lang.StringBuffer());
+            throw new AssertionError("Class.cast(new java.lang.StringBuffer()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(new java.lang.StringBuilder());
+            throw new AssertionError("Class.cast(new java.lang.StringBuilder()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(java.awt.Color.black);
+            throw new AssertionError("Class.cast(java.awt.Color.black) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(new java.awt.Frame());
+            throw new AssertionError("Class.cast(new java.awt.Frame()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(new java.awt.Frame(new String()));
+            throw new AssertionError("Class.cast(new java.awt.Frame(new String())) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(new javax.swing.JLabel());
+            throw new AssertionError("Class.cast(new javax.swing.JLabel()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(new javax.swing.JLabel(new String()));
+            throw new AssertionError("Class.cast(new javax.swing.JLabel(new String())) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptExceptionClass.cast(new javax.swing.JPanel());
+            throw new AssertionError("Class.cast(new javax.swing.JPanel()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+    }
+
+    /**
      * Test for instanceof operator applied to a class javax.script.ScriptException
      */
     @SuppressWarnings("cast")

From ptisnovs at icedtea.classpath.org  Wed Oct  9 04:43:14 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Wed, 09 Oct 2013 11:43:14 +0000
Subject: /hg/gfx-test: Eight new tests added into BitBltBasicTests test s...
Message-ID: <hg.a81adcc713ae.1381318994.-6248649288953172555@icedtea.classpath.org>

changeset a81adcc713ae in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=a81adcc713ae
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Wed Oct 09 13:46:59 2013 +0200

	Eight new tests added into BitBltBasicTests test suite.


diffstat:

 ChangeLog                                        |    5 +
 src/org/gfxtest/testsuites/BitBltBasicTests.java |  136 +++++++++++++++++++++++
 2 files changed, 141 insertions(+), 0 deletions(-)

diffs (158 lines):

diff -r c5fce5c91482 -r a81adcc713ae ChangeLog
--- a/ChangeLog	Tue Oct 08 10:08:19 2013 +0200
+++ b/ChangeLog	Wed Oct 09 13:46:59 2013 +0200
@@ -1,3 +1,8 @@
+2013-10-09  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltBasicTests.java:
+	Eight new tests added into BitBltBasicTests test suite.
+
 2013-10-08  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java:
diff -r c5fce5c91482 -r a81adcc713ae src/org/gfxtest/testsuites/BitBltBasicTests.java
--- a/src/org/gfxtest/testsuites/BitBltBasicTests.java	Tue Oct 08 10:08:19 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java	Wed Oct 09 13:46:59 2013 +0200
@@ -6429,6 +6429,142 @@
     }
 
     /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image
+     * with type TYPE_BYTE_INDEXED.
+     * 
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture6BufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED);
+    }
+
+    /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image with type TYPE_BYTE_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture6BufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY);
+    }
+
+    /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image with type TYPE_INT_BGR.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture6BufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_INT_BGR);
+    }
+
+    /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image with type TYPE_INT_RGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture6BufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_INT_RGB);
+    }
+
+    /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image with type TYPE_INT_ARGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture6BufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_INT_ARGB);
+    }
+
+    /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image with type TYPE_INT_ARGB_PRE.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture6BufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE);
+    }
+
+    /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image with type TYPE_USHORT_555_RGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture6BufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB);
+    }
+
+    /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image with type TYPE_USHORT_565_RGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture6BufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB);
+    }
+
+    /**
+     * Test basic BitBlt operation for texture RGB pattern #1 buffered image with type TYPE_USHORT_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltRGBTexture6BufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d)
+    {
+        // create new buffered image and then perform basic BitBlt test.
+        return CommonBitmapOperations.doBitBltTestWithRGBTexture6Image(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY);
+    }
+
+    /**
      * Entry point to the test suite.
      *
      * @param args not used in this case

From aazores at redhat.com  Wed Oct  9 06:50:10 2013
From: aazores at redhat.com (Andrew Azores)
Date: Wed, 09 Oct 2013 09:50:10 -0400
Subject: [rfc][icedtea-web] RH976833 ClassLoader deadlock
In-Reply-To: <52546E34.4090904@redhat.com>
References: <520D35CA.9070208@redhat.com> <52286E1C.8030604@redhat.com>
	<52288F54.1000907@redhat.com> <5229A989.2060203@redhat.com>
	<5229F796.4070708@redhat.com> <5229FB6D.2070301@redhat.com>
	<5237102D.4070207@redhat.com> <52371F34.9050207@redhat.com>
	<52372111.8030200@redhat.com> <52374085.5080901@redhat.com>
	<5245B571.6030106@redhat.com> <524F0FFE.60208@redhat.com>
	<524F1A40.10300@redhat.com> <524F249B.3020804@redhat.com>
	<524F2A34.1000305@redhat.com> <524F3032.6070509@redhat.com>
	<52546E34.4090904@redhat.com>
Message-ID: <52555F12.7000502@redhat.com>

On 10/08/2013 04:42 PM, Andrew Azores wrote:
> On 10/04/2013 05:16 PM, Andrew Azores wrote:
>> (snip)
>>
>> If none of us are able to identify any issues with doing this simple 
>> lock replacement trick then I'll make another push-candidate patch 
>> later.
>>
>> Thanks,
>>
>
> Seems nobody else has identified anything and neither have I, so the 
> patch is attached.
>
> Thanks,
>

Oops, I forgot to attach the reproducer patch.

It's a custom reproducer because the deadlock only seems to arise when 
the applet is loaded from plain .class files, not in a JAR. The actual 
content of the two reproducers isn't really important - I just decided 
to make them look more or less the same as the ones in the original bug 
report.

Thanks,

-- 
Andrew A

-------------- next part --------------
A non-text attachment was scrubbed...
Name: reproducer.patch
Type: text/x-patch
Size: 9292 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131009/7e9cf34f/reproducer-0001.patch 

From andrew at icedtea.classpath.org  Wed Oct  9 07:37:33 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 09 Oct 2013 14:37:33 +0000
Subject: /hg/icedtea6: S7025066: Build systems changes to support SE Embe...
Message-ID: <hg.745a52b6cece.1381329453.2873452341184383832@icedtea.classpath.org>

changeset 745a52b6cece in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=745a52b6cece
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Oct 09 15:37:19 2013 +0100

	S7025066: Build systems changes to support SE Embedded Integration

	2013-10-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* Makefile.am:
		(ICEDTEA_PATCHES): Add new patch.
		* patches/ecj/icedtea.patch:
		Regenerated following compressed JAR support.
		* patches/openjdk/7025066-embedded_build.patch:
		Backport to actually provide COMPRESS_JARS support
		in the build.
		* NEWS: Updated.


diffstat:

 ChangeLog                                    |   11 +
 Makefile.am                                  |    3 +-
 NEWS                                         |    1 +
 patches/ecj/icedtea.patch                    |   90 ++--
 patches/openjdk/7025066-embedded_build.patch |  456 +++++++++++++++++++++++++++
 5 files changed, 515 insertions(+), 46 deletions(-)

diffs (truncated from 764 to 500 lines):

diff -r 9e8a68310569 -r 745a52b6cece ChangeLog
--- a/ChangeLog	Wed Oct 09 01:08:04 2013 +0100
+++ b/ChangeLog	Wed Oct 09 15:37:19 2013 +0100
@@ -1,3 +1,14 @@
+2013-10-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patch.
+	* patches/ecj/icedtea.patch:
+	Regenerated following compressed JAR support.
+	* patches/openjdk/7025066-embedded_build.patch:
+	Backport to actually provide COMPRESS_JARS support
+	in the build.
+	* NEWS: Updated.
+
 2012-08-22  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	PR1288: Allow JARs to be optionally compressed by
diff -r 9e8a68310569 -r 745a52b6cece Makefile.am
--- a/Makefile.am	Wed Oct 09 01:08:04 2013 +0100
+++ b/Makefile.am	Wed Oct 09 15:37:19 2013 +0100
@@ -632,7 +632,8 @@
 	patches/arm/cc_compile-04.patch \
 	patches/arm/cc_compile-05.patch \
 	patches/arm/cc_compile-06.patch \
-	patches/hotspot/hs23/arm-hsdis.patch
+	patches/hotspot/hs23/arm-hsdis.patch \
+	patches/openjdk/7025066-embedded_build.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 9e8a68310569 -r 745a52b6cece NEWS
--- a/NEWS	Wed Oct 09 01:08:04 2013 +0100
+++ b/NEWS	Wed Oct 09 15:37:19 2013 +0100
@@ -884,6 +884,7 @@
   - S7000225: Sanity check on sane-alsa-headers is broken
   - S7013519: [parfait] Integer overflows in 2D code
   - S7018912: [parfait] potential buffer overruns in imageio jpeg
+  - S7025066: Build systems changes to support SE Embedded Integration
   - S7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber
   - S8005194: [parfait] #353 sun/awt/image/jpeg/imageioJPEG.c Memory leak of pointer 'scale' allocated with calloc()
   - S8020983, RH976897: OutOfMemoryError caused by non garbage collected JPEGImageWriter Instances
diff -r 9e8a68310569 -r 745a52b6cece patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch	Wed Oct 09 01:08:04 2013 +0100
+++ b/patches/ecj/icedtea.patch	Wed Oct 09 15:37:19 2013 +0100
@@ -1,6 +1,6 @@
 diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile
---- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile	2010-05-26 09:31:18.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile	2012-01-18 21:43:04.134185695 +0000
+--- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile	2013-10-04 15:45:38.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile	2013-10-09 12:46:11.374453549 +0100
 @@ -42,7 +42,7 @@
  # the rmic iiop backend needs some classes that are part of the impl/util
  # package.  These classes use log wrappers, so they must be built after
@@ -12,7 +12,7 @@
  
 diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile
 --- openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile	2012-01-18 21:43:04.146185899 +0000
++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile	2013-10-09 12:46:11.374453549 +0100
 @@ -0,0 +1,38 @@
 +#
 +# Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
@@ -53,7 +53,7 @@
 +#
 +include $(BUILDDIR)/common/Classes.gmk
 diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile
---- openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile	2010-05-26 09:31:18.000000000 +0100
+--- openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile	2013-10-04 15:45:38.000000000 +0100
 +++ openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile	1970-01-01 01:00:00.000000000 +0100
 @@ -1,224 +0,0 @@
 -#
@@ -281,8 +281,8 @@
 -#
 -include $(BUILDDIR)/common/Rules.gmk
 diff -Nru openjdk-ecj.orig/corba/make/common/Defs.gmk openjdk-ecj/corba/make/common/Defs.gmk
---- openjdk-ecj.orig/corba/make/common/Defs.gmk	2011-01-10 21:21:55.000000000 +0000
-+++ openjdk-ecj/corba/make/common/Defs.gmk	2012-01-18 21:43:04.146185899 +0000
+--- openjdk-ecj.orig/corba/make/common/Defs.gmk	2013-10-04 15:45:38.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs.gmk	2013-10-09 12:46:11.374453549 +0100
 @@ -53,6 +53,13 @@
  
  _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -316,8 +316,8 @@
  vpath %.java $(VPATH.java)
  vpath %.class $(CLASSBINDIR)
 diff -Nru openjdk-ecj.orig/corba/make/common/Defs-linux.gmk openjdk-ecj/corba/make/common/Defs-linux.gmk
---- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk	2012-01-18 16:50:50.977002556 +0000
-+++ openjdk-ecj/corba/make/common/Defs-linux.gmk	2012-01-18 21:43:04.146185899 +0000
+--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk	2013-10-09 12:43:59.208422274 +0100
++++ openjdk-ecj/corba/make/common/Defs-linux.gmk	2013-10-09 12:46:11.374453549 +0100
 @@ -271,7 +271,7 @@
  #
  VM_NAME         = server
@@ -328,8 +328,8 @@
  #
  # We want to privatize JVM symbols on Solaris. This is so the user can
 diff -Nru openjdk-ecj.orig/corba/make/org/omg/sources/Makefile openjdk-ecj/corba/make/org/omg/sources/Makefile
---- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile	2010-05-26 09:31:18.000000000 +0100
-+++ openjdk-ecj/corba/make/org/omg/sources/Makefile	2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile	2013-10-04 15:45:38.000000000 +0100
++++ openjdk-ecj/corba/make/org/omg/sources/Makefile	2013-10-09 12:46:11.374453549 +0100
 @@ -93,8 +93,6 @@
  POAHELHOLFILES =    $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
  
@@ -407,8 +407,8 @@
  pi.compile: $(PIGENERATEDFILES)
  
 diff -Nru openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile
---- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile	2010-05-26 09:31:18.000000000 +0100
-+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile	2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile	2013-10-04 15:45:38.000000000 +0100
++++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile	2013-10-09 12:46:11.374453549 +0100
 @@ -172,7 +172,6 @@
  ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
  
@@ -426,8 +426,8 @@
  portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
  
 diff -Nru openjdk-ecj.orig/jaxp/build.xml openjdk-ecj/jaxp/build.xml
---- openjdk-ecj.orig/jaxp/build.xml	2011-01-10 21:21:59.000000000 +0000
-+++ openjdk-ecj/jaxp/build.xml	2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/jaxp/build.xml	2013-10-04 15:50:12.000000000 +0100
++++ openjdk-ecj/jaxp/build.xml	2013-10-09 12:46:11.374453549 +0100
 @@ -131,7 +131,8 @@
               memoryMaximumSize="${javac.memoryMaximumSize}"
               source="${javac.source}"
@@ -439,8 +439,8 @@
              <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
              <src refid="src.dir.id"/>
 diff -Nru openjdk-ecj.orig/jaxws/build.xml openjdk-ecj/jaxws/build.xml
---- openjdk-ecj.orig/jaxws/build.xml	2011-01-10 21:22:02.000000000 +0000
-+++ openjdk-ecj/jaxws/build.xml	2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/jaxws/build.xml	2013-10-04 15:51:17.000000000 +0100
++++ openjdk-ecj/jaxws/build.xml	2013-10-09 12:46:11.374453549 +0100
 @@ -131,7 +131,8 @@
               memoryMaximumSize="${javac.memoryMaximumSize}"
               source="${javac.source}"
@@ -452,9 +452,9 @@
              <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
              <src refid="src.dir.id"/>
 diff -Nru openjdk-ecj.orig/jdk/make/common/Release.gmk openjdk-ecj/jdk/make/common/Release.gmk
---- openjdk-ecj.orig/jdk/make/common/Release.gmk	2012-01-18 16:51:03.177199616 +0000
-+++ openjdk-ecj/jdk/make/common/Release.gmk	2012-01-18 21:43:04.150185964 +0000
-@@ -649,10 +649,23 @@
+--- openjdk-ecj.orig/jdk/make/common/Release.gmk	2013-10-09 12:44:01.020450124 +0100
++++ openjdk-ecj/jdk/make/common/Release.gmk	2013-10-09 13:17:10.126995245 +0100
+@@ -660,10 +660,23 @@
  $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
  	$(prep-target)
  	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
@@ -465,22 +465,22 @@
  	$(prep-target)
 +ifneq (,$(JAR_KNOWS_ATFILE))
 +	(cd $(CLASSBINDIR) && \
- 	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+ 	$(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(JAR_MANIFEST_FILE) $@ \
 -	    @$(RES_JAR_ARGLIST) $(JAR_JFLAGS)
 +	    $(JAR_JFLAGS) @$(RES_JAR_FILELIST))
 +else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
 +	(cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \
-+	$(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
++	$(BOOT_JAR_CMD) $(CREATE_JAR_OPTS)@ $(JAR_MANIFEST_FILE) $@ \
 +	    $(JAR_JFLAGS))
 +else
 +	(cd $(CLASSBINDIR) && \
-+	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
++	$(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(JAR_MANIFEST_FILE) $@ \
 +	    $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
 +endif
  	@$(java-vm-cleanup)
  
  # Create jsse.jar containing SunJSSE implementation classes
-@@ -708,10 +721,22 @@
+@@ -719,10 +732,22 @@
  $(RT_JAR_ARGLIST): $(RT_JAR_FILELIST)
  	$(prep-target)
  	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
@@ -490,22 +490,22 @@
  	$(prep-target)
 +ifneq (,$(JAR_KNOWS_ATFILE))
 +	(cd $(CLASSBINDIR) && \
- 	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+ 	$(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(JAR_MANIFEST_FILE) $@ \
 -	    @$(RT_JAR_ARGLIST) $(JAR_JFLAGS)
 +	    $(JAR_JFLAGS) @$(RT_JAR_FILELIST))
 +else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
 +	(cd $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \
-+	$(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
++	$(BOOT_JAR_CMD) $(CREATE_JAR_OPTS)@ $(JAR_MANIFEST_FILE) $@ \
 +	    $(JAR_JFLAGS))
 +else
 +	(cd $(CLASSBINDIR) && \
-+	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
++	$(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(JAR_MANIFEST_FILE) $@ \
 +	    $(JAR_JFLAGS) `$(CAT) $(RT_JAR_FILELIST)`)
 +endif
  	@$(java-vm-cleanup)
  
  # Meta-index construction to make core class loaders lazier
-@@ -942,19 +967,6 @@
+@@ -969,19 +994,6 @@
  	@$(java-vm-cleanup)
  	$(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar
  	@#
@@ -517,7 +517,7 @@
 -	    -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \
 -	    -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
 -	    $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS)
--	$(BOOT_JAR_CMD) c0f $(LIBDIR)/ct.sym \
+-	$(BOOT_JAR_CMD) $(CREATE_JAR_OPTS_NOMANIFEST) $(LIBDIR)/ct.sym \
 -	    -C $(OUTPUTDIR)/symbols META-INF $(JAR_JFLAGS)
 -	@$(java-vm-cleanup)
 -	$(CP) $(LIBDIR)/ct.sym $(JDK_IMAGE_DIR)/lib/ct.sym
@@ -525,7 +525,7 @@
  	@# CORBA supported orb.idl and ir.idl should be copied to lib
  	@#
  	$(CP) $(LIBDIR)/orb.idl $(JDK_IMAGE_DIR)/lib/orb.idl
-@@ -1023,16 +1035,6 @@
+@@ -1050,16 +1062,6 @@
  	$(CP) $(PLATFORM_SRC)/bin/java_md.h $(JDK_IMAGE_DIR)/src/launcher
  	$(CD) $(JDK_IMAGE_DIR)/src && $(ZIPEXE) -qr ../src.zip *
  	$(RM) -r $(JDK_IMAGE_DIR)/src
@@ -543,9 +543,9 @@
  	$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
  endif # !windows
 diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk openjdk-ecj/jdk/make/common/Rules.gmk
---- openjdk-ecj.orig/jdk/make/common/Rules.gmk	2011-01-07 21:32:51.000000000 +0000
-+++ openjdk-ecj/jdk/make/common/Rules.gmk	2012-01-18 21:43:04.150185964 +0000
-@@ -302,6 +303,8 @@
+--- openjdk-ecj.orig/jdk/make/common/Rules.gmk	2013-10-04 15:55:30.000000000 +0100
++++ openjdk-ecj/jdk/make/common/Rules.gmk	2013-10-09 12:46:11.374453549 +0100
+@@ -302,6 +302,8 @@
  	$(JAVAH_CMD) -d $(CLASSHDRDIR)/ \
  		$(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
  	@$(java-vm-cleanup)
@@ -555,8 +555,8 @@
  
  classheaders.clean:
 diff -Nru openjdk-ecj.orig/jdk/make/java/nio/Makefile openjdk-ecj/jdk/make/java/nio/Makefile
---- openjdk-ecj.orig/jdk/make/java/nio/Makefile	2012-01-18 16:50:50.576996095 +0000
-+++ openjdk-ecj/jdk/make/java/nio/Makefile	2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/jdk/make/java/nio/Makefile	2013-10-09 12:43:55.072358704 +0100
++++ openjdk-ecj/jdk/make/java/nio/Makefile	2013-10-09 12:46:11.374453549 +0100
 @@ -31,7 +31,7 @@
  PACKAGE = java.nio
  LIBRARY = nio
@@ -567,8 +567,8 @@
  
  NIO_SRC = $(SHARE_SRC)/classes/java/nio
 diff -Nru openjdk-ecj.orig/jdk/make/Makefile openjdk-ecj/jdk/make/Makefile
---- openjdk-ecj.orig/jdk/make/Makefile	2011-01-07 21:32:51.000000000 +0000
-+++ openjdk-ecj/jdk/make/Makefile	2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/jdk/make/Makefile	2013-10-04 15:55:30.000000000 +0100
++++ openjdk-ecj/jdk/make/Makefile	2013-10-09 12:46:11.374453549 +0100
 @@ -247,7 +247,7 @@
  
  all build:: sanity-all post-sanity-all
@@ -579,9 +579,9 @@
  	$(SUBDIRS-loop)
  
 diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/Makefile openjdk-ecj/jdk/make/sun/awt/Makefile
---- openjdk-ecj.orig/jdk/make/sun/awt/Makefile	2012-01-18 16:50:52.313024135 +0000
-+++ openjdk-ecj/jdk/make/sun/awt/Makefile	2012-01-18 21:43:04.150185964 +0000
-@@ -438,10 +438,9 @@
+--- openjdk-ecj.orig/jdk/make/sun/awt/Makefile	2013-10-09 12:43:59.532427253 +0100
++++ openjdk-ecj/jdk/make/sun/awt/Makefile	2013-10-09 12:46:11.374453549 +0100
+@@ -434,10 +434,9 @@
  COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
  
  $(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \
@@ -596,8 +596,8 @@
  
  fontconfigs.clean :
 diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile openjdk-ecj/jdk/make/sun/xawt/Makefile
---- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile	2012-01-18 16:51:03.393203105 +0000
-+++ openjdk-ecj/jdk/make/sun/xawt/Makefile	2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile	2013-10-09 12:44:01.268453936 +0100
++++ openjdk-ecj/jdk/make/sun/xawt/Makefile	2013-10-09 12:46:11.374453549 +0100
 @@ -301,11 +301,7 @@
  
  TEMPDIR_CLASSES = $(TEMPDIR)/classes
@@ -638,8 +638,8 @@
  	done
  	$(TOUCH) $@
 diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2011-01-07 21:32:51.000000000 +0000
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2013-10-04 15:55:31.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2013-10-09 12:46:11.374453549 +0100
 @@ -647,9 +647,6 @@
              throws FileNotFoundException, IOException {
          BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
@@ -659,8 +659,8 @@
                  if (plane == 0 && bLatin1 == false) {
              genCaseMapTableDeclaration(result);
 diff -Nru openjdk-ecj.orig/langtools/make/build.properties openjdk-ecj/langtools/make/build.properties
---- openjdk-ecj.orig/langtools/make/build.properties	2010-05-26 09:33:27.000000000 +0100
-+++ openjdk-ecj/langtools/make/build.properties	2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/langtools/make/build.properties	2013-10-04 15:55:57.000000000 +0100
++++ openjdk-ecj/langtools/make/build.properties	2013-10-09 12:46:11.374453549 +0100
 @@ -68,7 +68,7 @@
  # set the following to -version to verify the versions of javac being used
  javac.version.opt =
diff -r 9e8a68310569 -r 745a52b6cece patches/openjdk/7025066-embedded_build.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7025066-embedded_build.patch	Wed Oct 09 15:37:19 2013 +0100
@@ -0,0 +1,456 @@
+diff -Nru openjdk.orig/jdk/make/common/Defs-embedded.gmk openjdk/jdk/make/common/Defs-embedded.gmk
+--- openjdk.orig/jdk/make/common/Defs-embedded.gmk	1970-01-01 01:00:00.000000000 +0100
++++ openjdk/jdk/make/common/Defs-embedded.gmk	2013-10-09 11:57:00.416951716 +0100
+@@ -0,0 +1,53 @@
++#
++# Copyright (c) 2011, 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.  Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# 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.
++#
++
++#
++# Variable definitions for SE Embedded builds.  This file should
++# not contain rules.
++#
++ifdef JAVASE_EMBEDDED
++
++# Compress jar files
++COMPRESS_JARS = true
++
++# Don't mmap zip files
++LIBZIP_CAN_USE_MMAP = false
++
++# Disable ALSA version check
++REQUIRED_ALSA_VERSION =
++
++# Compilation settings
++OTHER_CPPFLAGS += -DJAVASE_EMBEDDED
++
++# Product naming
++PRODUCT_SUFFIX = SE Runtime Environment for Embedded
++RUNTIME_NAME = $(PRODUCT_NAME) $(PRODUCT_SUFFIX)
++
++# Reduced JRE locations
++JRE_REDUCED_HEADLESS_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2re-reduced-headless-image
++JRE_REDUCED_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2re-reduced-image
++
++endif # JAVASE_EMBEDDED
++
+diff -Nru openjdk.orig/jdk/make/common/Defs.gmk openjdk/jdk/make/common/Defs.gmk
+--- openjdk.orig/jdk/make/common/Defs.gmk	2013-10-09 01:32:58.126292030 +0100
++++ openjdk/jdk/make/common/Defs.gmk	2013-10-09 12:02:00.033606462 +0100
+@@ -124,6 +124,12 @@
+ include $(JDK_TOPDIR)/make/common/Defs-$(PLATFORM).gmk
+ 
+ #
++# SE-Embedded support, if enabled
++#
++
++include $(JDK_TOPDIR)/make/common/Defs-embedded.gmk
++
++#
+ # Freetype logic is applicable to OpenJDK only
+ #
+ ifdef OPENJDK
+diff -Nru openjdk.orig/jdk/make/common/Library.gmk openjdk/jdk/make/common/Library.gmk
+--- openjdk.orig/jdk/make/common/Library.gmk	2013-10-09 01:32:58.126292030 +0100
++++ openjdk/jdk/make/common/Library.gmk	2013-10-09 11:57:00.416951716 +0100
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 1995, 2011, 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
+@@ -78,7 +78,7 @@
+ endif
+ 
+ $(ACTUAL_LIBRARY):: $(INIT) $(TEMPDIR) $(LIBDIR) $(BINDIR) $(EXTDIR) classheaders
+-
++	@$(ECHO) Building lib:$(ACTUAL_LIBRARY) 
+ #
+ # COMPILE_APPROACH: Different approaches to compile up the native object
+ #   files as quickly as possible.
+diff -Nru openjdk.orig/jdk/make/common/Release-embedded.gmk openjdk/jdk/make/common/Release-embedded.gmk
+--- openjdk.orig/jdk/make/common/Release-embedded.gmk	1970-01-01 01:00:00.000000000 +0100
++++ openjdk/jdk/make/common/Release-embedded.gmk	2013-10-09 11:57:00.416951716 +0100
+@@ -0,0 +1,232 @@
++#
++# Copyright (c) 2011, 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.  Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# 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.
++#
++
++#
++# SE-Embedded Reduced JRE targets
++#
++ifdef JAVASE_EMBEDDED
++
++reduced-image-jre reduced-headless-image-jre ::
++	@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
++
++# Add the reduced-jre images as pre-reqs. These will be processed last
++images:: reduced-image-jre reduced-headless-image-jre
++
++
++######################################################
++# Create the headless rt.jar
++######################################################
++
++NOT_HEADLESS_RT_JAR_LIST = $(ABS_TEMPDIR)/not_hl_rt_jar.list
++HEADLESS_RT_JAR_FILELIST=$(JARFILELISTS_TEMPDIR)/hl_rt_jar_list
++TOTAL_HEADLESS_JAR_FILELIST=$(REORDER_TEMPDIR)/hl_file_list
++HEADLESS_CLASSLIST=$(ABS_TEMPDIR)/headless_classlist
++
++# Add the jar file directories that we don't want in the
++# headless JRE.  If you want to remove most classes in a
++# directory, put the directory in the NOT_HEADLESS_RT_JAR_LIST
++# and put the individual classes you want to keep in the 
++# HEADLESS_CLASSLIST file. 
++$(NOT_HEADLESS_RT_JAR_LIST): $(NOT_RT_JAR_LIST)
++	$(RM) $(HEADLESS_CLASSLIST)
++	$(RM) $(NOT_HEADLESS_RT_JAR_LIST)
++	$(CP) $(NOT_RT_JAR_LIST) $(NOT_HEADLESS_RT_JAR_LIST)
++	$(ECHO) "sun/awt/motif/" >> $@
++	$(ECHO) "sun/awt/X11/" >> $@
++	$(ECHO) "sun/applet/" >> $@
++	$(ECHO) "sun/java2d/opengl/" >> $@
++	$(ECHO) "com/sun/java/swing/plaf/" >> $@
++	$(ECHO) "sun/awt/motif/MFontConfiguration" >$(HEADLESS_CLASSLIST)
++	$(ECHO) "sun/applet/AppContextCreator" >>$(HEADLESS_CLASSLIST)
++	$(ECHO) "sun/applet/AppletAudioClip" >>$(HEADLESS_CLASSLIST)
++	$(ECHO) "sun/java2d/opengl/GLXSurfaceData" >>$(HEADLESS_CLASSLIST)
++	$(ECHO) "sun/java2d/opengl/GLXSurfaceData"\$$"GLXOffScreenSurfaceData" >>$(HEADLESS_CLASSLIST)
++	$(ECHO) "sun/java2d/opengl/GLXVolatileSurfaceManager" >>$(HEADLESS_CLASSLIST)
++	$(ECHO) "sun/java2d/opengl/OGLSurfaceData" >>$(HEADLESS_CLASSLIST)
++
++$(TOTAL_HEADLESS_JAR_FILELIST): $(JARREORDER_JARFILE) $(NOT_HEADLESS_RT_JAR_LIST)
++	$(prep-target)
++	$(RM) $@.temp
++	$(CD) $(CLASSBINDIR) ; \
++		$(BOOT_JAVA_CMD) -jar $(JARREORDER_JARFILE) \
++		-o  $@.temp $(HEADLESS_CLASSLIST) $(NOT_HEADLESS_RT_JAR_LIST)  .
++	$(MV) $@.temp $@
++	@$(CD) $(CLASSBINDIR); $(java-vm-cleanup)
++
++# Create the headless rt.jar file list & non-class files list
++MakeHeadlessJarFileList: $(TOTAL_HEADLESS_JAR_FILELIST) $(JARSPLIT_JARFILE)
++	@$(RM) $(HEADLESS_RT_JAR_FILELIST) $(RES_JAR_FILELIST)
++	$(BOOT_JAVA_CMD) -jar $(JARSPLIT_JARFILE) $(TOTAL_HEADLESS_JAR_FILELIST) \
++		-o  $(HEADLESS_RT_JAR_FILELIST) $(RES_JAR_FILELIST)
++	@$(java-vm-cleanup)
++
++# Create headless rt.jar
++HL_RT_JAR=$(ABS_TEMPDIR)/rt-hl-orig.jar
++$(HL_RT_JAR): MakeHeadlessJarFileList $(JAR_MANIFEST_FILE)
++	$(prep-target)
++	$(CD) $(CLASSBINDIR) ; \
++		$(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(JAR_MANIFEST_FILE) $@ @$(HEADLESS_RT_JAR_FILELIST) \
++		 $(JAR_JFLAGS)
++	@$(CD) $(CLASSBINDIR); $(java-vm-cleanup)
++
++
++#
++# Produce a reduced Headful JRE for Embedded Devices

From gitne at gmx.de  Wed Oct  9 07:51:29 2013
From: gitne at gmx.de (Jakob Wisor)
Date: Wed, 09 Oct 2013 16:51:29 +0200
Subject: /hg/icedtea6: Added --no-check-certificate flag to wget command
In-Reply-To: <1183394643.3419143.1381237703528.JavaMail.root@redhat.com>
References: <hg.598a353f5405.1381218857.2873452341184383832@icedtea.classpath.org>	<740936920.3227599.1381236440938.JavaMail.root@redhat.com>
	<1183394643.3419143.1381237703528.JavaMail.root@redhat.com>
Message-ID: <52556D71.6020503@gmx.de>

Pavel Tisnovsky wrote:
> ----- Andrew Hughes <gnu.andrew at redhat.com> wrote:
>>
>> ----- Original Message -----
>>> changeset 598a353f5405 in /hg/icedtea6
>>> details:
>>> http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=598a353f5405
>>> author: Pavel Tisnovsky <ptisnovs at redhat.com>
>>> date: Tue Oct 08 09:53:44 2013 +0200
>>>
>>> 	Added --no-check-certificate flag to wget command
>>> 	to allow downloading OpenJDK tarball using https.
>>>
>> Why are you making this change?  I tested and wget downloads the tarball fine.
>> Are you sure this is not a local configuration issue?
> 
> On stock RHEL 5 (default installation) I got the error message that the tarball
> can't be downloaded because of missing/invalid certificate. I think this change
> is harmless, but the question is why do we need to use https which is more time
> consuming on both sides (http server, wget on clients)?

Have you checked the ca store for a missing root certificate? If that's the case 
then I am with Andrew. It's up to the user/developer to keep their ca stores 
up-to-date and sane.

Regards,
Jacob

>>> diffstat:
>>>
>>>  ChangeLog   |  6 ++++++
>>>  Makefile.am |  2 +-
>>>  2 files changed, 7 insertions(+), 1 deletions(-)
>>>
>>> diffs (25 lines):
>>>
>>> diff -r 7ce84f82f817 -r 598a353f5405 ChangeLog
>>> --- a/ChangeLog	Mon Oct 07 23:11:18 2013 +0100
>>> +++ b/ChangeLog	Tue Oct 08 09:53:44 2013 +0200
>>> @@ -1,3 +1,9 @@
>>> +2013-10-08  Pavel Tisnovsky  <ptisnovs at redhat.com>
>>> +
>>> +	* Makefile.am:
>>> +	Added --no-check-certificate flag to wget command
>>> +	to allow downloading OpenJDK tarball using https.
>>> +
>>>  2013-10-07  Andrew John Hughes  <gnu.andrew at redhat.com>
>>>  
>>>  	* NEWS:
>>> diff -r 7ce84f82f817 -r 598a353f5405 Makefile.am
>>> --- a/Makefile.am	Mon Oct 07 23:11:18 2013 +0100
>>> +++ b/Makefile.am	Tue Oct 08 09:53:44 2013 +0200
>>> @@ -1070,7 +1070,7 @@
>>>  	    if [ -e $(OPENJDK_SRC_ZIP) ] ; then \
>>>  	      mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
>>>  	    fi ; \
>>> -	    $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
>>> +	    $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) --no-check-certificate -O
>>> $(OPENJDK_SRC_ZIP); \
>>>  	    if ! echo "$(OPENJDK_SHA256SUM)  $(OPENJDK_SRC_ZIP)" \
>>>  	      | $(SHA256SUM) --check ; then \
>>>  	      echo "ERROR: Bad download of OpenJDK zip"; false; \
>>>
>> -- 
>> Andrew :)

From omajid at icedtea.classpath.org  Wed Oct  9 09:22:51 2013
From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org)
Date: Wed, 09 Oct 2013 16:22:51 +0000
Subject: /hg/icedtea-web: 2 new changesets
Message-ID: <hg.e1509f9d7c19.1381335771.8643924302249223276@icedtea.classpath.org>

changeset e1509f9d7c19 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=e1509f9d7c19
author: Omair Majid <omajid at redhat.com>
date: Wed Oct 09 12:12:44 2013 -0400

	Move some proxy logic to BrowserAwareProxySelector

	The logic for mangling URIs to be compatible with the browser seems
	more appropriate to keep in the ProxySelector rather than the catch-all
	PluginAppletViewer.


changeset 6983282010ca in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6983282010ca
author: Omair Majid <omajid at redhat.com>
date: Wed Oct 09 12:18:49 2013 -0400

	Remove duplicate key computation in proxy code


diffstat:

 ChangeLog                                                 |  21 +++++++
 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java  |  37 ++----------
 plugin/icedteanp/java/sun/applet/PluginProxySelector.java |  43 +++++++++++++-
 tests/netx/unit/sun/applet/PluginAppletViewerTest.java    |  37 ------------
 tests/netx/unit/sun/applet/PluginProxySelectorTest.java   |  41 +++++++++++++-
 5 files changed, 107 insertions(+), 72 deletions(-)

diffs (298 lines):

diff -r 9424264bb603 -r 6983282010ca ChangeLog
--- a/ChangeLog	Mon Oct 07 14:02:15 2013 -0400
+++ b/ChangeLog	Wed Oct 09 12:18:49 2013 -0400
@@ -1,3 +1,24 @@
+2013-10-09  Omair Majid  <oamjid at redhat.com>
+
+	* plugin/icedteanp/java/sun/applet/PluginProxySelector.java
+	(computeKey): New method.
+	(getFromBrowser, checkCache): Call computeKey.
+
+2013-10-09  Omair Majid  <omajid at redhat.com>
+
+	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+	(requestPluginProxyInfo): Accept a String instead of URI.
+	(convertUriSchemeForProxyQuery): Move to ...
+	* plugin/icedteanp/java/sun/applet/PluginProxySelector.java
+	(convertUriSchemeForProxyQuery): Here.
+	(getFromBrowser): Call convertUriSchemeForProxyQuery.
+	* tests/netx/unit/sun/applet/PluginAppletViewerTest.java
+	(testConvertUriSchemeForProxyQuery),
+	(assertQueryForBrowserProxyUsesHttpFallback),
+	(assertQueryForBrowserProxyContainsNoDoubleSlashes),
+	(assertQueryForBrowserProxyDoesNotChangeQuery): Move to ...
+	* tests/netx/unit/sun/applet/PluginProxySelectorTest.java: Here.
+
 2013-10-07  Andrew Azores  <aazores at redhat.com>
 
 	DeploymentConfiguration properties reproducer fix
diff -r 9424264bb603 -r 6983282010ca plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Mon Oct 07 14:02:15 2013 -0400
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Wed Oct 09 12:18:49 2013 -0400
@@ -83,10 +83,8 @@
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
 import java.net.SocketPermission;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.security.AccessController;
@@ -1238,22 +1236,18 @@
         return request.getObject();
     }
 
-    public static Object requestPluginProxyInfo(URI uri) {
-
-        String requestURI = null;
+    /**
+     * Obtain information about the proxy from the browser.
+     *
+     * @param uri a String in url-encoded form
+     * @return a {@link URI} that indicates a proxy.
+     */
+    public static Object requestPluginProxyInfo(String uri) {
         Long reference = getRequestIdentifier();
 
-        try {
-            requestURI = convertUriSchemeForProxyQuery(uri);
-        } catch (Exception e) {
-            PluginDebug.debug("Cannot construct URL from ", uri.toString(), " ... falling back to DIRECT proxy");
-            OutputController.getLogger().log(OutputController.Level.ERROR_ALL,e);
-            return null;
-        }
-
         PluginCallRequest request = requestFactory.getPluginCallRequest("proxyinfo",
                 "plugin PluginProxyInfo reference " + reference + " " +
-                        requestURI, reference);
+                        uri, reference);
 
         PluginMessageConsumer.registerPriorityWait(reference);
         streamhandler.postCallRequest(request);
@@ -1274,21 +1268,6 @@
         return request.getObject();
     }
 
-    public static String convertUriSchemeForProxyQuery(URI uri) throws URISyntaxException, UnsupportedEncodingException {
-        // there is no easy way to get SOCKS proxy info. So, we tell mozilla that we want proxy for
-        // an HTTP uri in case of non http/ftp protocols. If we get back a SOCKS proxy, we can
-        // use that, if we get back an http proxy, we fallback to DIRECT connect
-
-        String scheme = uri.getScheme();
-        if (!scheme.startsWith("http") && !scheme.equals("ftp")) {
-            scheme = "http";
-        }
-
-        URI result = new URI(scheme, uri.getUserInfo(), uri.getHost(), uri.getPort(),
-                uri.getPath(), uri.getQuery(), uri.getFragment());
-        return UrlUtil.encode(result.toString(), "UTF-8");
-    }
-
     public static void JavaScriptFinalize(long internal) {
         Long reference = getRequestIdentifier();
 
diff -r 9424264bb603 -r 6983282010ca plugin/icedteanp/java/sun/applet/PluginProxySelector.java
--- a/plugin/icedteanp/java/sun/applet/PluginProxySelector.java	Mon Oct 07 14:02:15 2013 -0400
+++ b/plugin/icedteanp/java/sun/applet/PluginProxySelector.java	Wed Oct 09 12:18:49 2013 -0400
@@ -37,12 +37,16 @@
 
 package sun.applet;
 
+import java.io.UnsupportedEncodingException;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.sun.jndi.toolkit.url.UrlUtil;
+
 import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import net.sourceforge.jnlp.runtime.JNLPProxySelector;
 import net.sourceforge.jnlp.util.logging.OutputController;
@@ -84,8 +88,19 @@
         }
 
         // Nothing usable in cache. Fetch info from browser
+
+        String requestURI;
+        try {
+            requestURI = convertUriSchemeForProxyQuery(uri);
+        } catch (Exception e) {
+            PluginDebug.debug("Cannot construct URL from ", uri.toString(), " ... falling back to DIRECT proxy");
+            OutputController.getLogger().log(OutputController.Level.ERROR_ALL,e);
+            proxyList.add(Proxy.NO_PROXY);
+            return proxyList;
+        }
+
         Proxy proxy = Proxy.NO_PROXY;
-        Object o = getProxyFromRemoteCallToBrowser(uri);
+        Object o = getProxyFromRemoteCallToBrowser(requestURI);
 
         // If the browser returned anything, try to parse it. If anything in the try block fails, the fallback is direct connection
         try {
@@ -101,7 +116,7 @@
 
                     proxy = new Proxy(type, socketAddr);
 
-                    String uriKey = uri.getScheme() + "://" + uri.getHost();
+                    String uriKey = computeKey(uri);
                     proxyCache.put(uriKey, proxy);
                 } else {
                     PluginDebug.debug("Proxy ", proxyURI, " cannot be used for ", uri, ". Falling back to DIRECT");
@@ -119,7 +134,7 @@
     }
 
     /** For tests to override */
-    protected Object getProxyFromRemoteCallToBrowser(URI uri) {
+    protected Object getProxyFromRemoteCallToBrowser(String uri) {
         return PluginAppletViewer.requestPluginProxyInfo(uri);
     }
 
@@ -130,8 +145,7 @@
      * @return The cached Proxy. null if there is no suitable cached proxy.
      */
     private Proxy checkCache(URI uri) {
-
-        String uriKey = uri.getScheme() + "://" + uri.getHost();
+        String uriKey = computeKey(uri);
         if (proxyCache.get(uriKey) != null) {
             return proxyCache.get(uriKey);
         }
@@ -139,4 +153,23 @@
         return null;
     }
 
+    /** Compute a key to use for the proxy cache */
+    private String computeKey(URI uri) {
+        return uri.getScheme() + "://" + uri.getHost();
+    }
+
+    public static String convertUriSchemeForProxyQuery(URI uri) throws URISyntaxException, UnsupportedEncodingException {
+        // there is no easy way to get SOCKS proxy info. So, we tell mozilla that we want proxy for
+        // an HTTP uri in case of non http/ftp protocols. If we get back a SOCKS proxy, we can
+        // use that, if we get back an http proxy, we fallback to DIRECT connect
+
+        String scheme = uri.getScheme();
+        if (!scheme.startsWith("http") && !scheme.equals("ftp")) {
+            scheme = "http";
+        }
+
+        URI result = new URI(scheme, uri.getUserInfo(), uri.getHost(), uri.getPort(),
+                uri.getPath(), uri.getQuery(), uri.getFragment());
+        return UrlUtil.encode(result.toString(), "UTF-8");
+    }
 }
diff -r 9424264bb603 -r 6983282010ca tests/netx/unit/sun/applet/PluginAppletViewerTest.java
--- a/tests/netx/unit/sun/applet/PluginAppletViewerTest.java	Mon Oct 07 14:02:15 2013 -0400
+++ b/tests/netx/unit/sun/applet/PluginAppletViewerTest.java	Wed Oct 09 12:18:49 2013 -0400
@@ -159,43 +159,6 @@
         assertEquals(expectedReturn, call.join());
     }
 
-    @Test
-    public void testConvertUriSchemeForProxyQuery() throws Exception {
-        URI[] testUris = {
-                new URI("http", "foo.com", "/bar", null),
-                new URI("https", "foo.com", "/bar", null),
-                new URI("ftp", "foo.com", "/app/res/pub/channel.jar?i=1234", null),
-                new URI("socket", "foo.co.uk", "/bar/pub/ale.jar", null),
-        };
-
-        for (URI uri : testUris) {
-            URI result = new URI(PluginAppletViewer.convertUriSchemeForProxyQuery(uri));
-            assertQueryForBrowserProxyUsesHttpFallback(uri, result);
-            String hierarchicalPath = result.getAuthority() + result.getPath();
-            assertQueryForBrowserProxyContainsNoDoubleSlashes(hierarchicalPath);
-            assertQueryForBrowserProxyDoesNotChangeQuery(uri, result);
-        }
-    }
-
-    // Test that only HTTP is used as fallback scheme if a protocol other than HTTP(S) or FTP is specified
-    public void assertQueryForBrowserProxyUsesHttpFallback(URI expected, URI result) {
-        if (expected.getScheme().equals("ftp") || expected.getScheme().startsWith("http")) {
-            Assert.assertEquals(expected.getScheme(), result.getScheme());
-        } else {
-            Assert.assertEquals(result.getScheme(), "http");
-        }
-    }
-
-    // Test that absolute resource paths do not result in double-slashes within the URI
-    public void assertQueryForBrowserProxyContainsNoDoubleSlashes(String uri) {
-        Assert.assertFalse(uri.contains("//"));
-    }
-
-    // Test that the query string of the URI is not changed
-    public void assertQueryForBrowserProxyDoesNotChangeQuery(URI expected, URI result) {
-        Assert.assertEquals(expected.getQuery(), result.getQuery());
-    }
-
    /**************************************************************************
     *                          Test utilities                                *
     **************************************************************************/
diff -r 9424264bb603 -r 6983282010ca tests/netx/unit/sun/applet/PluginProxySelectorTest.java
--- a/tests/netx/unit/sun/applet/PluginProxySelectorTest.java	Mon Oct 07 14:02:15 2013 -0400
+++ b/tests/netx/unit/sun/applet/PluginProxySelectorTest.java	Wed Oct 09 12:18:49 2013 -0400
@@ -38,6 +38,7 @@
 package sun.applet;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 
 import java.net.InetSocketAddress;
@@ -65,7 +66,7 @@
         }
 
         @Override
-        protected Object getProxyFromRemoteCallToBrowser(URI uri) {
+        protected Object getProxyFromRemoteCallToBrowser(String uri) {
             remoteCallCount++;
             return browserResponse;
         }
@@ -192,4 +193,42 @@
         assertEquals(2, proxySelector.getRemoteCallCount());
     }
 
+
+    @Test
+    public void testConvertUriSchemeForProxyQuery() throws Exception {
+        URI[] testUris = {
+                new URI("http", "foo.com", "/bar", null),
+                new URI("https", "foo.com", "/bar", null),
+                new URI("ftp", "foo.com", "/app/res/pub/channel.jar?i=1234", null),
+                new URI("socket", "foo.co.uk", "/bar/pub/ale.jar", null),
+        };
+
+        for (URI uri : testUris) {
+            URI result = new URI(PluginProxySelector.convertUriSchemeForProxyQuery(uri));
+            assertQueryForBrowserProxyUsesHttpFallback(uri, result);
+            String hierarchicalPath = result.getAuthority() + result.getPath();
+            assertQueryForBrowserProxyContainsNoDoubleSlashes(hierarchicalPath);
+            assertQueryForBrowserProxyDoesNotChangeQuery(uri, result);
+        }
+    }
+
+    // Test that only HTTP is used as fallback scheme if a protocol other than HTTP(S) or FTP is specified
+    public void assertQueryForBrowserProxyUsesHttpFallback(URI expected, URI result) {
+        if (expected.getScheme().equals("ftp") || expected.getScheme().startsWith("http")) {
+            assertEquals(expected.getScheme(), result.getScheme());
+        } else {
+            assertEquals(result.getScheme(), "http");
+        }
+    }
+
+    // Test that absolute resource paths do not result in double-slashes within the URI
+    public void assertQueryForBrowserProxyContainsNoDoubleSlashes(String uri) {
+        assertFalse(uri.contains("//"));
+    }
+
+    // Test that the query string of the URI is not changed
+    public void assertQueryForBrowserProxyDoesNotChangeQuery(URI expected, URI result) {
+        assertEquals(expected.getQuery(), result.getQuery());
+    }
+
 }

From aazores at redhat.com  Wed Oct  9 11:02:56 2013
From: aazores at redhat.com (Andrew Azores)
Date: Wed, 09 Oct 2013 14:02:56 -0400
Subject: [rfc][icedtea-web] Malformed messages from
	IcedTeaPluginRequestProcessor (PR539)
Message-ID: <52559A50.309@redhat.com>

Hi,

PR539 was reopened with a comment that the applet at [1] no longer 
works. Looking through the provided logs, an index out of bounds 
exception is occurring at line 53 of GetMemberPluginCallRequest.java. 
This happens because the parseReturn method expects its String param to 
be of the form "reference 28 JavaScriptToString 90", but occasionally it 
can occur that the param is instead of the form "reference 30 
JavaScriptToString ", missing the second numeric value. This happens 
because of _getString and _getMember in 
IcedTeaPluginRequestProcessor.cc. If data->call_successful is false in 
either of these functions, then data->result is never modified from the 
value it held before data was passed into the functions, which means it 
is an empty string. The data->call_successful struct member is set by a 
call to NPNetscapeFuncs so I'm not entirely sure why it is coming back 
false in these cases.

It's certainly not an expected situation for these messages to be 
malformed, which is especially evident looking around the codebase. Many 
other places do similar work as done in 
GetMemberPluginCallRequest.parseReturn(String), where message.split(" ") 
is called and the length of the resulting array never validated. Adding 
a length validation to parseReturn seems to fix this particular bug (the 
applet loads at least, but I'm not sure what else this bug may be 
affecting) but doesn't address the issue of the message being malformed 
in the first place. It seems like the expected behaviour at some point 
in the past would be for these messages instead to have "null" or "void":

         if (!"null".equals(args[3]) && !"void".equals(args[3]))

appended to them rather than the empty string, but that does not seem to 
be the case now. Appending this to the data->result string is easy 
enough, it can just be done in a new else-clause for 
data->call_successful in _getString and _getMember. As far as I'm able 
to tell this would be the earliest feasible place to do the addition. It 
could also be done in IcedTeaPluginRequestProcessor::sendString or 
::sendMember, but these call _getString and _getMember respectively 
through IcedTeaPluginUtilities::callAndWaitForResult anyway. The patch 
takes the approach of adding it to _getString and _getMember. Other 
functions in the file, such as _eval and _call, append "0" when 
call_successful is false, so this approach makes the most sense to me. I 
don't see any problems that this might cause and running the reproducers 
showed no new failures either.

ChangeLog:
Fix array index out of bounds due to malformed plugin message (PR539)
* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: (_getMember, 
_getString) append "null" to result when call is unsuccessful

[1] 
https://www.bankid.no/Hjelp-og-nyttige-verktoy/Nyttige-verktoy/Test-din-BankID/

Thanks,

-- 
Andrew A

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PR539-append-null.patch
Type: text/x-patch
Size: 892 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131009/ff9942e9/PR539-append-null.patch 

From ptisnovs at icedtea.classpath.org  Thu Oct 10 01:38:32 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Thu, 10 Oct 2013 08:38:32 +0000
Subject: /hg/rhino-tests: Added new test testNewInstance into the test suite
Message-ID: <hg.ffa80879d9af.1381394312.-6019694633368342460@icedtea.classpath.org>

changeset ffa80879d9af in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=ffa80879d9af
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Oct 10 10:42:18 2013 +0200

	Added new test testNewInstance into the test suite
	ScriptExceptionClassTest.


diffstat:

 ChangeLog                                        |   6 ++++++
 src/org/RhinoTests/ScriptExceptionClassTest.java |  17 +++++++++++++++++
 2 files changed, 23 insertions(+), 0 deletions(-)

diffs (40 lines):

diff -r c8b6ebc43fa5 -r ffa80879d9af ChangeLog
--- a/ChangeLog	Wed Oct 09 13:44:15 2013 +0200
+++ b/ChangeLog	Thu Oct 10 10:42:18 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-10  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/ScriptExceptionClassTest.java:
+	Added new test testNewInstance into the test suite
+	ScriptExceptionClassTest.
+
 2013-10-09  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptExceptionClassTest.java:
diff -r c8b6ebc43fa5 -r ffa80879d9af src/org/RhinoTests/ScriptExceptionClassTest.java
--- a/src/org/RhinoTests/ScriptExceptionClassTest.java	Wed Oct 09 13:44:15 2013 +0200
+++ b/src/org/RhinoTests/ScriptExceptionClassTest.java	Thu Oct 10 10:42:18 2013 +0200
@@ -1646,6 +1646,23 @@
     }
 
     /**
+     * Test for method javax.script.ScriptException.getClass().newInstance()
+     */
+    protected void testNewInstance() {
+        try {
+            Object o = this.scriptExceptionClass.newInstance();
+            throw new AssertionError("Class.newInstance() does not throw any exception");
+        }
+        catch (InstantiationException e) {
+            // expected exception
+        }
+        catch (IllegalAccessException e) {
+            // expected exception
+        }
+
+    }
+
+    /**
      * Test for instanceof operator applied to a class javax.script.ScriptException
      */
     @SuppressWarnings("cast")

From ptisnovs at icedtea.classpath.org  Thu Oct 10 01:43:37 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Thu, 10 Oct 2013 08:43:37 +0000
Subject: /hg/gfx-test: Ten new tests added into BitBltUsingBgColor test s...
Message-ID: <hg.6d4ddbee3220.1381394617.-6248649288953172555@icedtea.classpath.org>

changeset 6d4ddbee3220 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=6d4ddbee3220
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Oct 10 10:47:24 2013 +0200

	Ten new tests added into BitBltUsingBgColor test suite.


diffstat:

 ChangeLog                                          |    5 +
 src/org/gfxtest/testsuites/BitBltUsingBgColor.java |  150 +++++++++++++++++++++
 2 files changed, 155 insertions(+), 0 deletions(-)

diffs (172 lines):

diff -r a81adcc713ae -r 6d4ddbee3220 ChangeLog
--- a/ChangeLog	Wed Oct 09 13:46:59 2013 +0200
+++ b/ChangeLog	Thu Oct 10 10:47:24 2013 +0200
@@ -1,3 +1,8 @@
+2013-10-10  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltUsingBgColor.java:
+	Ten new tests added into BitBltUsingBgColor test suite.
+
 2013-10-09  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltBasicTests.java:
diff -r a81adcc713ae -r 6d4ddbee3220 src/org/gfxtest/testsuites/BitBltUsingBgColor.java
--- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java	Wed Oct 09 13:46:59 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java	Thu Oct 10 10:47:24 2013 +0200
@@ -4202,6 +4202,156 @@
     }
 
     /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     * Background color is set to Color.blue.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshortGrayBackgroundBlue(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeUshortGray(image, graphics2d, Color.blue);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     * Background color is set to Color.green.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshortGrayBackgroundGreen(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeUshortGray(image, graphics2d, Color.green);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     * Background color is set to Color.cyan.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshortGrayBackgroundCyan(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeUshortGray(image, graphics2d, Color.cyan);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     * Background color is set to Color.red.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshortGrayBackgroundRed(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeUshortGray(image, graphics2d, Color.red);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     * Background color is set to Color.magenta.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshortGrayBackgroundMagenta(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeUshortGray(image, graphics2d, Color.magenta);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     * Background color is set to Color.yellow.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshortGrayBackgroundYellow(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeUshortGray(image, graphics2d, Color.yellow);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     * Background color is set to Color.white.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeUshortGrayBackgroundWhite(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeUshortGray(image, graphics2d, Color.white);
+    }
+
+    /**
+     * Test basic BitBlt operation for BltDiagonalGrid buffered image with type TYPE_3BYTE_BGR.
+     * Background color is set to Color.black.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundBlack(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.black);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR.
+     * Background color is set to Color.blue.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundBlue(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.blue);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR.
+     * Background color is set to Color.green.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundGreen(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.green);
+    }
+
+    /**
      * Entry point to the test suite.
      *
      * @param args not used in this case

From jvanek at redhat.com  Thu Oct 10 01:48:49 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Thu, 10 Oct 2013 10:48:49 +0200
Subject: [rfc][icedtea-web] Malformed messages from
	IcedTeaPluginRequestProcessor (PR539)
In-Reply-To: <52559A50.309@redhat.com>
References: <52559A50.309@redhat.com>
Message-ID: <525669F1.6060106@redhat.com>

On 10/09/2013 08:02 PM, Andrew Azores wrote:
> Hi,
>
> PR539 was reopened with a comment that the applet at [1] no longer works. Looking through the
> provided logs, an index out of bounds exception is occurring at line 53 of
> GetMemberPluginCallRequest.java. This happens because the parseReturn method expects its String
> param to be of the form "reference 28 JavaScriptToString 90", but occasionally it can occur that the
> param is instead of the form "reference 30 JavaScriptToString ", missing the second numeric value.
> This happens because of _getString and _getMember in IcedTeaPluginRequestProcessor.cc. If
> data->call_successful is false in either of these functions, then data->result is never modified
> from the value it held before data was passed into the functions, which means it is an empty string.
> The data->call_successful struct member is set by a call to NPNetscapeFuncs so I'm not entirely sure
> why it is coming back false in these cases.
>
> It's certainly not an expected situation for these messages to be malformed, which is especially
> evident looking around the codebase. Many other places do similar work as done in
> GetMemberPluginCallRequest.parseReturn(String), where message.split(" ") is called and the length of
> the resulting array never validated. Adding a length validation to parseReturn seems to fix this
> particular bug (the applet loads at least, but I'm not sure what else this bug may be affecting) but
> doesn't address the issue of the message being malformed in the first place. It seems like the
> expected behaviour at some point in the past would be for these messages instead to have "null" or
> "void":
>
>          if (!"null".equals(args[3]) && !"void".equals(args[3]))
>
> appended to them rather than the empty string, but that does not seem to be the case now. Appending
> this to the data->result string is easy enough, it can just be done in a new else-clause for
> data->call_successful in _getString and _getMember. As far as I'm able to tell this would be the
> earliest feasible place to do the addition. It could also be done in
> IcedTeaPluginRequestProcessor::sendString or ::sendMember, but these call _getString and _getMember
> respectively through IcedTeaPluginUtilities::callAndWaitForResult anyway. The patch takes the
> approach of adding it to _getString and _getMember. Other functions in the file, such as _eval and
> _call, append "0" when call_successful is false, so this approach makes the most sense to me. I
> don't see any problems that this might cause and running the reproducers showed no new failures either.
>
> ChangeLog:
> Fix array index out of bounds due to malformed plugin message (PR539)
> * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: (_getMember, _getString) append "null" to
> result when call is unsuccessful
>
> [1] https://www.bankid.no/Hjelp-og-nyttige-verktoy/Nyttige-verktoy/Test-din-BankID/
>
> Thanks,
>


What about any test on this? It woould deserve at least C++ test, or mock test or reproducer (in 
best case all three :)

Otherwise give sense to me.


J.

From jvanek at redhat.com  Thu Oct 10 07:35:55 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Thu, 10 Oct 2013 16:35:55 +0200
Subject: [rfc][icedtea-web] RH976833 ClassLoader deadlock
In-Reply-To: <52555F12.7000502@redhat.com>
References: <520D35CA.9070208@redhat.com> <52286E1C.8030604@redhat.com>
	<52288F54.1000907@redhat.com> <5229A989.2060203@redhat.com>
	<5229F796.4070708@redhat.com> <5229FB6D.2070301@redhat.com>
	<5237102D.4070207@redhat.com> <52371F34.9050207@redhat.com>
	<52372111.8030200@redhat.com> <52374085.5080901@redhat.com>
	<5245B571.6030106@redhat.com> <524F0FFE.60208@redhat.com>
	<524F1A40.10300@redhat.com> <524F249B.3020804@redhat.com>
	<524F2A34.1000305@redhat.com> <524F3032.6070509@redhat.com>
	<52546E34.4090904@redhat.com> <52555F12.7000502@redhat.com>
Message-ID: <5256BB4B.8030707@redhat.com>

On 10/09/2013 03:50 PM, Andrew Azores wrote:
> On 10/08/2013 04:42 PM, Andrew Azores wrote:
>> On 10/04/2013 05:16 PM, Andrew Azores wrote:
>>> (snip)
>>>
>>> If none of us are able to identify any issues with doing this simple lock replacement trick then
>>> I'll make another push-candidate patch later.
>>>
>>> Thanks,
>>>
>>
>> Seems nobody else has identified anything and neither have I, so the patch is attached.
>>
>> Thanks,
>>
>
> Oops, I forgot to attach the reproducer patch.
>
> It's a custom reproducer because the deadlock only seems to arise when the applet is loaded from
> plain .class files, not in a JAR. The actual content of the two reproducers isn't really important -
> I just decided to make them look more or less the same as the ones in the original bug report.
>
> Thanks,
>

I think more source codes are missing (only testcase here)

Anyway - I strongly discourage you from close on Both.

J.

From aazores at redhat.com  Thu Oct 10 08:49:00 2013
From: aazores at redhat.com (Andrew Azores)
Date: Thu, 10 Oct 2013 11:49:00 -0400
Subject: [rfc][icedtea-web] RH976833 ClassLoader deadlock
In-Reply-To: <5256BB4B.8030707@redhat.com>
References: <520D35CA.9070208@redhat.com> <52286E1C.8030604@redhat.com>
	<52288F54.1000907@redhat.com> <5229A989.2060203@redhat.com>
	<5229F796.4070708@redhat.com> <5229FB6D.2070301@redhat.com>
	<5237102D.4070207@redhat.com> <52371F34.9050207@redhat.com>
	<52372111.8030200@redhat.com> <52374085.5080901@redhat.com>
	<5245B571.6030106@redhat.com> <524F0FFE.60208@redhat.com>
	<524F1A40.10300@redhat.com> <524F249B.3020804@redhat.com>
	<524F2A34.1000305@redhat.com> <524F3032.6070509@redhat.com>
	<52546E34.4090904@redhat.com> <52555F12.7000502@redhat.com>
	<5256BB4B.8030707@redhat.com>
Message-ID: <5256CC6C.5070505@redhat.com>

On 10/10/2013 10:35 AM, Jiri Vanek wrote:
> On 10/09/2013 03:50 PM, Andrew Azores wrote:
>> On 10/08/2013 04:42 PM, Andrew Azores wrote:
>>> On 10/04/2013 05:16 PM, Andrew Azores wrote:
>>>> (snip)
>>>>
>>>> If none of us are able to identify any issues with doing this 
>>>> simple lock replacement trick then
>>>> I'll make another push-candidate patch later.
>>>>
>>>> Thanks,
>>>>
>>>
>>> Seems nobody else has identified anything and neither have I, so the 
>>> patch is attached.
>>>
>>> Thanks,
>>>
>>
>> Oops, I forgot to attach the reproducer patch.
>>
>> It's a custom reproducer because the deadlock only seems to arise 
>> when the applet is loaded from
>> plain .class files, not in a JAR. The actual content of the two 
>> reproducers isn't really important -
>> I just decided to make them look more or less the same as the ones in 
>> the original bug report.
>>
>> Thanks,
>>
>
> I think more source codes are missing (only testcase here)
>
> Anyway - I strongly discourage you from close on Both.
>
> J.

The previous message in the thread contained the fix itself. I've 
attached it again here along with the reproducers, now using 
close_on_correct_end rather than close_on_both, and printing the magic 
string :)

Thanks,

-- 
Andrew A

-------------- next part --------------
A non-text attachment was scrubbed...
Name: classloader-deadlock.patch
Type: text/x-patch
Size: 8012 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131010/d34c7e37/classloader-deadlock-0001.patch 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: reproducer.patch
Type: text/x-patch
Size: 9411 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131010/d34c7e37/reproducer-0001.patch 

From aazores at redhat.com  Thu Oct 10 11:50:29 2013
From: aazores at redhat.com (Andrew Azores)
Date: Thu, 10 Oct 2013 14:50:29 -0400
Subject: [rfc][icedtea-web] SecurityDialog centers itself after becoming
	visible
Message-ID: <5256F6F5.6080209@redhat.com>

Hi,

It kind of bothered me that our SecurityDialog windows would appear 
briefly in the top left corner of the screen before becoming centered. 
Maybe it's less apparent with other window managers that have fancier 
effects and animations, but it's incredibly obvious with OpenBox at least.

This was happening because the centerDialog() call was being made after 
a windowOpened event was fired, which happens after the window becomes 
visible. Moving the centerDialog call out of that handler and into the 
initialization of the dialog itself, some time after pack() is called, 
fixes this. This way the window position is already set to the middle of 
the screen well before the window becomes visible, and the Dialog is 
much less jarring when it does appear IMO.

Thanks,

-- 
Andrew A

-------------- next part --------------
A non-text attachment was scrubbed...
Name: security-dialog-centering.patch
Type: text/x-patch
Size: 919 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131010/57fdc400/security-dialog-centering.patch 

From gitne at gmx.de  Thu Oct 10 13:36:41 2013
From: gitne at gmx.de (Jacob Wisor)
Date: Thu, 10 Oct 2013 22:36:41 +0200
Subject: [rfc][icedtea-web] SecurityDialog centers itself after becoming
	visible
In-Reply-To: <5256F6F5.6080209@redhat.com>
References: <5256F6F5.6080209@redhat.com>
Message-ID: <52570FD9.20105@gmx.de>

Andrew Azores wrote:
> Hi,
> 
> It kind of bothered me that our SecurityDialog windows would appear 
> briefly in the top left corner of the screen before becoming centered. 
> Maybe it's less apparent with other window managers that have fancier 
> effects and animations, but it's incredibly obvious with OpenBox at least.
> 
> This was happening because the centerDialog() call was being made after 
> a windowOpened event was fired, which happens after the window becomes 
> visible. Moving the centerDialog call out of that handler and into the 
> initialization of the dialog itself, some time after pack() is called, 
> fixes this. This way the window position is already set to the middle of 
> the screen well before the window becomes visible, and the Dialog is 
> much less jarring when it does appear IMO.

Looks good to me and greatly appreciated! :)
Would you mind back porting it to 1.4 too?

Regards,
Jacob

From aazores at redhat.com  Thu Oct 10 14:02:02 2013
From: aazores at redhat.com (Andrew Azores)
Date: Thu, 10 Oct 2013 17:02:02 -0400
Subject: [rfc][icedtea-web] Malformed messages from
	IcedTeaPluginRequestProcessor (PR539)
In-Reply-To: <525669F1.6060106@redhat.com>
References: <52559A50.309@redhat.com> <525669F1.6060106@redhat.com>
Message-ID: <525715CA.7090909@redhat.com>

On 10/10/2013 04:48 AM, Jiri Vanek wrote:
> On 10/09/2013 08:02 PM, Andrew Azores wrote:
>> Hi,
>>
>> PR539 was reopened with a comment that the applet at [1] no longer 
>> works. Looking through the
>> provided logs, an index out of bounds exception is occurring at line 
>> 53 of
>> GetMemberPluginCallRequest.java. This happens because the parseReturn 
>> method expects its String
>> param to be of the form "reference 28 JavaScriptToString 90", but 
>> occasionally it can occur that the
>> param is instead of the form "reference 30 JavaScriptToString ", 
>> missing the second numeric value.
>> This happens because of _getString and _getMember in 
>> IcedTeaPluginRequestProcessor.cc. If
>> data->call_successful is false in either of these functions, then 
>> data->result is never modified
>> from the value it held before data was passed into the functions, 
>> which means it is an empty string.
>> The data->call_successful struct member is set by a call to 
>> NPNetscapeFuncs so I'm not entirely sure
>> why it is coming back false in these cases.
>>
>> It's certainly not an expected situation for these messages to be 
>> malformed, which is especially
>> evident looking around the codebase. Many other places do similar 
>> work as done in
>> GetMemberPluginCallRequest.parseReturn(String), where message.split(" 
>> ") is called and the length of
>> the resulting array never validated. Adding a length validation to 
>> parseReturn seems to fix this
>> particular bug (the applet loads at least, but I'm not sure what else 
>> this bug may be affecting) but
>> doesn't address the issue of the message being malformed in the first 
>> place. It seems like the
>> expected behaviour at some point in the past would be for these 
>> messages instead to have "null" or
>> "void":
>>
>>          if (!"null".equals(args[3]) && !"void".equals(args[3]))
>>
>> appended to them rather than the empty string, but that does not seem 
>> to be the case now. Appending
>> this to the data->result string is easy enough, it can just be done 
>> in a new else-clause for
>> data->call_successful in _getString and _getMember. As far as I'm 
>> able to tell this would be the
>> earliest feasible place to do the addition. It could also be done in
>> IcedTeaPluginRequestProcessor::sendString or ::sendMember, but these 
>> call _getString and _getMember
>> respectively through IcedTeaPluginUtilities::callAndWaitForResult 
>> anyway. The patch takes the
>> approach of adding it to _getString and _getMember. Other functions 
>> in the file, such as _eval and
>> _call, append "0" when call_successful is false, so this approach 
>> makes the most sense to me. I
>> don't see any problems that this might cause and running the 
>> reproducers showed no new failures either.
>>
>> ChangeLog:
>> Fix array index out of bounds due to malformed plugin message (PR539)
>> * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: (_getMember, 
>> _getString) append "null" to
>> result when call is unsuccessful
>>
>> [1] 
>> https://www.bankid.no/Hjelp-og-nyttige-verktoy/Nyttige-verktoy/Test-din-BankID/
>>
>> Thanks,
>>
>
>
> What about any test on this? It woould deserve at least C++ test, or 
> mock test or reproducer (in best case all three :)
>
> Otherwise give sense to me.
>
>
> J.

Took me a while to figure out how to make a JavaScript object that 
doesn't respond to toString(), but I got it. Attached both patches again.

Note that this reproducer will currently fail whether or not you apply 
the fix patch. Note that commit 420d72e5cee7, the one I proposed be 
backed out a while ago, is a blocker on this bug as well. If you "hg 
backout -r 420d72e5cee7" and then apply the reproducer patch, it will 
fail in the manner I intend it to. Then when you apply the fix, the 
reproducer will pass.

Thanks,

-- 
Andrew A

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PR539-append-null.patch
Type: text/x-patch
Size: 892 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131010/34e9a2b7/PR539-append-null.patch 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: PR539-reproducer.patch
Type: text/x-patch
Size: 5437 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131010/34e9a2b7/PR539-reproducer.patch 

From ptisnovs at icedtea.classpath.org  Fri Oct 11 01:17:35 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Fri, 11 Oct 2013 08:17:35 +0000
Subject: /hg/rhino-tests: Added new test testCast (that checks Class.cast...
Message-ID: <hg.00b968a159d4.1381479455.-6019694633368342460@icedtea.classpath.org>

changeset 00b968a159d4 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=00b968a159d4
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Oct 11 10:20:55 2013 +0200

	Added new test testCast (that checks Class.cast() method) into test
	test suite ScriptEngineManagerClassTest.


diffstat:

 ChangeLog                                            |    6 +
 src/org/RhinoTests/ScriptEngineManagerClassTest.java |  198 +++++++++++++++++++
 2 files changed, 204 insertions(+), 0 deletions(-)

diffs (221 lines):

diff -r ffa80879d9af -r 00b968a159d4 ChangeLog
--- a/ChangeLog	Thu Oct 10 10:42:18 2013 +0200
+++ b/ChangeLog	Fri Oct 11 10:20:55 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-11  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/ScriptEngineManagerClassTest.java:
+	Added new test testCast (that checks Class.cast() method) into test
+	test suite ScriptEngineManagerClassTest.
+
 2013-10-10  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptExceptionClassTest.java:
diff -r ffa80879d9af -r 00b968a159d4 src/org/RhinoTests/ScriptEngineManagerClassTest.java
--- a/src/org/RhinoTests/ScriptEngineManagerClassTest.java	Thu Oct 10 10:42:18 2013 +0200
+++ b/src/org/RhinoTests/ScriptEngineManagerClassTest.java	Fri Oct 11 10:20:55 2013 +0200
@@ -1316,6 +1316,204 @@
     }
 
     /**
+     * Test for method javax.script.ScriptEngineManager.getClass().cast()
+     */
+    protected void testCast() {
+        try {
+            this.scriptEngineManagerClass.cast(new javax.script.ScriptEngineManager());
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            throw new AssertionError(e.getMessage());
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(new Object());
+            throw new AssertionError("Class.cast(new Object()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(new Object().getClass());
+            throw new AssertionError("Class.cast(new Object().getClass()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(new String());
+            throw new AssertionError("Class.cast(new String()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(Boolean.valueOf(true));
+            throw new AssertionError("Class.cast(Boolean.valueOf(true)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(Boolean.valueOf(false));
+            throw new AssertionError("Class.cast(Boolean.valueOf(false)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(Byte.valueOf((byte)42));
+            throw new AssertionError("Class.cast(Byte.valueOf((byte)42)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(Short.valueOf((short)42));
+            throw new AssertionError("Class.cast(Short.valueOf((short)42)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(Integer.valueOf(42));
+            throw new AssertionError("Class.cast(Integer.valueOf(42)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(Long.valueOf(42L));
+            throw new AssertionError("Class.cast(Long.valueOf(42L)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(Float.valueOf(42f));
+            throw new AssertionError("Class.cast(Float.valueOf(42f)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(Double.valueOf(42.));
+            throw new AssertionError("Class.cast(Double.valueOf(42.)) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(new Throwable());
+            throw new AssertionError("Class.cast(new Throwable()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(new RuntimeException());
+            throw new AssertionError("Class.cast(new RuntimeException()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(new Error());
+            throw new AssertionError("Class.cast(new Error()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(new java.lang.String());
+            throw new AssertionError("Class.cast(new java.lang.String()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(new java.lang.StringBuffer());
+            throw new AssertionError("Class.cast(new java.lang.StringBuffer()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(new java.lang.StringBuilder());
+            throw new AssertionError("Class.cast(new java.lang.StringBuilder()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(java.awt.Color.black);
+            throw new AssertionError("Class.cast(java.awt.Color.black) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(new java.awt.Frame());
+            throw new AssertionError("Class.cast(new java.awt.Frame()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(new java.awt.Frame(new String()));
+            throw new AssertionError("Class.cast(new java.awt.Frame(new String())) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(new javax.swing.JLabel());
+            throw new AssertionError("Class.cast(new javax.swing.JLabel()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(new javax.swing.JLabel(new String()));
+            throw new AssertionError("Class.cast(new javax.swing.JLabel(new String())) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.cast(new javax.swing.JPanel());
+            throw new AssertionError("Class.cast(new javax.swing.JPanel()) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+    }
+
+    /**
      * Test for method javax.script.ScriptEngineManager.getClass().newInstance()
      */
     protected void testNewInstance() {

From ptisnovs at icedtea.classpath.org  Fri Oct 11 01:36:45 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Fri, 11 Oct 2013 08:36:45 +0000
Subject: /hg/gfx-test: Ten new common test methods added into BitBltBuffe...
Message-ID: <hg.05a0940e2859.1381480605.-6248649288953172555@icedtea.classpath.org>

changeset 05a0940e2859 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=05a0940e2859
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Oct 11 10:40:25 2013 +0200

	Ten new common test methods added into BitBltBufferedImageOp.


diffstat:

 ChangeLog                                             |    5 +
 src/org/gfxtest/testsuites/BitBltBufferedImageOp.java |  169 +++++++++++++++++-
 2 files changed, 166 insertions(+), 8 deletions(-)

diffs (207 lines):

diff -r 6d4ddbee3220 -r 05a0940e2859 ChangeLog
--- a/ChangeLog	Thu Oct 10 10:47:24 2013 +0200
+++ b/ChangeLog	Fri Oct 11 10:40:25 2013 +0200
@@ -1,3 +1,8 @@
+2013-10-11  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltBufferedImageOp.java:
+	Ten new common test methods added into BitBltBufferedImageOp.
+
 2013-10-10  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltUsingBgColor.java:
diff -r 6d4ddbee3220 -r 05a0940e2859 src/org/gfxtest/testsuites/BitBltBufferedImageOp.java
--- a/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java	Thu Oct 10 10:47:24 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java	Fri Oct 11 10:40:25 2013 +0200
@@ -787,9 +787,76 @@
     }
 
     /**
-     * Test basic BitBlt operation for buffered image containing grid pattern
-     * with type TYPE_3BYTE_BGR
-     * 
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltGridBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltGridBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_BYTE_INDEXED}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltGridBufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_CUSTOM}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltGridBufferedImageTypeCustom(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_CUSTOM, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}.
+     *
      * @param image
      *            image used as a destination for BitBlt-type operations
      * @param graphics2d
@@ -805,9 +872,8 @@
     }
 
     /**
-     * Test basic BitBlt operation for buffered image containing diagonal grid pattern
-     * with type TYPE_3BYTE_BGR
-     * 
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR}.
+     *
      * @param image
      *            image used as a destination for BitBlt-type operations
      * @param graphics2d
@@ -816,10 +882,97 @@
      *            selected raster operation
      * @return test result status - PASSED, FAILED or ERROR
      */
-    protected TestResult doBitBltDiagonalGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d,
+    protected TestResult doBitBltGridBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d,
                     BufferedImageOp rasterOp)
     {
-        return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp);
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_4BYTE_ABGR_PRE}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltGridBufferedImageType4ByteABGRPre(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltGridBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_INT_ARGB_PRE}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltGridBufferedImageTypeIntARGBPre(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_INT_BGR}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltGridBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_INT_BGR, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_INT_RGB}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltGridBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_INT_RGB, rasterOp);
+    }
+
     }
 
     /**

From aazores at icedtea.classpath.org  Fri Oct 11 07:32:33 2013
From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org)
Date: Fri, 11 Oct 2013 14:32:33 +0000
Subject: /hg/icedtea-web: SecurityDialog centers itself before becoming v...
Message-ID: <hg.60b47a6ec2e4.1381501953.8643924302249223276@icedtea.classpath.org>

changeset 60b47a6ec2e4 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=60b47a6ec2e4
author: Andrew Azores <aazores at redhat.com>
date: Fri Oct 11 10:31:55 2013 -0400

	SecurityDialog centers itself before becoming visible

	* netx/net/sourceforge/jnlp/security/SecurityDialog.java: (initDialog)
	centerDialog called in init rather than on windowOpened event


diffstat:

 ChangeLog                                              |  5 +++++
 netx/net/sourceforge/jnlp/security/SecurityDialog.java |  3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r 6983282010ca -r 60b47a6ec2e4 ChangeLog
--- a/ChangeLog	Wed Oct 09 12:18:49 2013 -0400
+++ b/ChangeLog	Fri Oct 11 10:31:55 2013 -0400
@@ -1,3 +1,8 @@
+2013-10-11  Andrew Azores  <aazores at redhat.com>
+
+	* netx/net/sourceforge/jnlp/security/SecurityDialog.java: (initDialog)
+	centerDialog called in init rather than on windowOpened event
+
 2013-10-09  Omair Majid  <oamjid at redhat.com>
 
 	* plugin/icedteanp/java/sun/applet/PluginProxySelector.java
diff -r 6983282010ca -r 60b47a6ec2e4 netx/net/sourceforge/jnlp/security/SecurityDialog.java
--- a/netx/net/sourceforge/jnlp/security/SecurityDialog.java	Wed Oct 09 12:18:49 2013 -0400
+++ b/netx/net/sourceforge/jnlp/security/SecurityDialog.java	Fri Oct 11 10:31:55 2013 -0400
@@ -245,6 +245,7 @@
         installPanel();
 
         pack();
+        centerDialog(this);
 
         WindowAdapter adapter = new WindowAdapter() {
             private boolean gotFocus = false;
@@ -263,14 +264,12 @@
                 if (e.getSource() instanceof SecurityDialog) {
                     SecurityDialog dialog = (SecurityDialog) e.getSource();
                     dialog.setResizable(true);
-                    centerDialog(dialog);
                     dialog.setValue(null);
                 }
             }
         };
         addWindowListener(adapter);
         addWindowFocusListener(adapter);
-
     }
 
     public AccessType getAccessType() {

From aazores at icedtea.classpath.org  Fri Oct 11 07:39:47 2013
From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org)
Date: Fri, 11 Oct 2013 14:39:47 +0000
Subject: /hg/release/icedtea-web-1.4: SecurityDialog centers itself befor...
Message-ID: <hg.c43d49d0db97.1381502387.-5934593987637005762@icedtea.classpath.org>

changeset c43d49d0db97 in /hg/release/icedtea-web-1.4
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=c43d49d0db97
author: Andrew Azores <aazores at redhat.com>
date: Fri Oct 11 10:39:07 2013 -0400

	SecurityDialog centers itself before becoming visible

	* netx/net/sourceforge/jnlp/security/SecurityDialog.java: (initDialog)
	centerDialog called in init rather than on windowOpened event


diffstat:

 ChangeLog                                              |  5 +++++
 netx/net/sourceforge/jnlp/security/SecurityDialog.java |  3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r 020590f4872d -r c43d49d0db97 ChangeLog
--- a/ChangeLog	Thu Sep 26 09:36:53 2013 +0200
+++ b/ChangeLog	Fri Oct 11 10:39:07 2013 -0400
@@ -1,3 +1,8 @@
+2013-10-11  Andrew Azores  <aazores at redhat.com>
+
+	* netx/net/sourceforge/jnlp/security/SecurityDialog.java: (initDialog)
+	centerDialog called in init rather than on windowOpened event
+
 2013-09-25  Andrew Azores  <aazores at redhat.com>
 
 	* Makefile.am: clean up summary_unit.txt and summary_reproducers.txt for
diff -r 020590f4872d -r c43d49d0db97 netx/net/sourceforge/jnlp/security/SecurityDialog.java
--- a/netx/net/sourceforge/jnlp/security/SecurityDialog.java	Thu Sep 26 09:36:53 2013 +0200
+++ b/netx/net/sourceforge/jnlp/security/SecurityDialog.java	Fri Oct 11 10:39:07 2013 -0400
@@ -244,6 +244,7 @@
         installPanel();
 
         pack();
+        centerDialog(this);
 
         WindowAdapter adapter = new WindowAdapter() {
             private boolean gotFocus = false;
@@ -262,14 +263,12 @@
                 if (e.getSource() instanceof SecurityDialog) {
                     SecurityDialog dialog = (SecurityDialog) e.getSource();
                     dialog.setResizable(true);
-                    centerDialog(dialog);
                     dialog.setValue(null);
                 }
             }
         };
         addWindowListener(adapter);
         addWindowFocusListener(adapter);
-
     }
 
     public AccessType getAccessType() {

From bugzilla-daemon at icedtea.classpath.org  Fri Oct 11 13:48:00 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 11 Oct 2013 20:48:00 +0000
Subject: [Bug 1578] Applet which mixes jar file and class file throws
	java.lang.LinkageError
In-Reply-To: <bug-1578-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1578-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1578-30-q3Aby78dXI@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1578

Deepak Bhole <dbhole at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Assignee|dbhole at redhat.com           |aazores at redhat.com

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131011/5bbb2004/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Fri Oct 11 14:24:17 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 11 Oct 2013 21:24:17 +0000
Subject: [Bug 1581] New: OpenJDK Crashes on fedora 19 when running a griffon
	app
Message-ID: <bug-1581-30@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1581

            Bug ID: 1581
           Summary: OpenJDK Crashes on fedora 19 when running a griffon
                    app
    Classification: Unclassified
           Product: IcedTea
           Version: unspecified
          Hardware: x86
                OS: Linux
            Status: NEW
          Severity: blocker
          Priority: P3
         Component: IcedTea
          Assignee: gnu.andrew at redhat.com
          Reporter: alleinerwolf at gmail.com
                CC: unassigned at icedtea.classpath.org

Created attachment 952
  --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=952&action=edit
Detailed error report from OpenJDK

I installed griffon in the system, when a type de command: griffon run-app, i
obtain this error:
#
# A fatal error has been detected by the Java Runtime Environment:
#
#  SIGSEGV (0xb) at pc=0x43c788a0, pid=5076, tid=2102676288
#
# JRE version: OpenJDK Runtime Environment (7.0_40-b60) (build
1.7.0_40-mockbuild_2013_10_02_16_55-b00)
# Java VM: OpenJDK Server VM (24.0-b56 mixed mode linux-x86 )
# Problematic frame:
# C  0x43c788a0
#
# Core dump written. Default location:
/home/alexove/Proyectos/Griffon/Qillqana-client-griffon-swing/staging/core or
core.5076
#
# An error report file with more information is saved as:
# /tmp/jvm-5076/hs_error.log
#
# If you would like to submit a bug report, please include
# instructions on how to reproduce the bug and visit:
#   http://icedtea.classpath.org/bugzilla
#

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131011/26e19ae5/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Fri Oct 11 21:03:04 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 12 Oct 2013 04:03:04 +0000
Subject: [Bug 1326] JVM crashes on JavaThread "Java2D Disposer"
In-Reply-To: <bug-1326-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1326-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1326-30-UADWe19BTN@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1326

Adil <adil.akram at globalpay.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |adil.akram at globalpay.com

--- Comment #3 from Adil <adil.akram at globalpay.com> ---

I am having a same bug. We have a application on tomcat 7.0.39 and JVM crashes
every two hours. It generates hs_err_pid.log and has the same content the one
which is attached. 

Is there any patch or resolution to this ?

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131012/c72cf2a4/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Sat Oct 12 15:45:45 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 12 Oct 2013 22:45:45 +0000
Subject: [Bug 1245] Offline launching from a shortcut results in fatal error
In-Reply-To: <bug-1245-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1245-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1245-30-KS8tKKX3of@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1245

wolfgang wagner <wwagner4 at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |wwagner4 at gmail.com
           Severity|major                       |blocker

--- Comment #1 from wolfgang wagner <wwagner4 at gmail.com> ---
I agree that this bug is an absolute blocker if you want to use icedtea.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131012/2527a95c/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Sun Oct 13 12:26:37 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 13 Oct 2013 19:26:37 +0000
Subject: [Bug 1582] New: Plugins don't start - test page just does nothing
Message-ID: <bug-1582-30@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1582

            Bug ID: 1582
           Summary: Plugins don't start - test page just does nothing
    Classification: Unclassified
           Product: IcedTea-Web
           Version: unspecified
          Hardware: x86
                OS: Linux
            Status: NEW
          Severity: normal
          Priority: P3
         Component: Plugin
          Assignee: dbhole at redhat.com
          Reporter: erik at arbat.com
                CC: unassigned at icedtea.classpath.org

To diagnose, I ran the browser (chromium 28) on the terminal and got the
following exception on the command line. It seems that the code assumes there
is a download directory in the cache, but it does not exist.  I have installed
the 13.10.2013 OpenJDK Java Runtime and enabled the web browser plugin.  This
is a 32 bit Ubuntu installation.

java version "1.7.0_25"
OpenJDK Runtime Environment (IcedTea 2.3.10) (7u25-2.3.10-1ubuntu0.12.04.2)
OpenJDK Server VM (build 23.7-b01, mixed mode)
java.io.IOException: Cant rename
/home/sophus/.icedtea/cache/0/http/www.java.com/applet/JavaDetection_applet.jnlp.info.temp
to
/home/sophus/.icedtea/cache/0/http/www.java.com/en/download/../../applet/JavaDetection_applet.jnlp.info
    at
net.sourceforge.jnlp.util.FileUtils.createRestrictedFile(FileUtils.java:209)
    at
net.sourceforge.jnlp.util.FileUtils.createRestrictedFile(FileUtils.java:99)
    at
net.sourceforge.jnlp.cache.CacheUtil.makeNewCacheFile(CacheUtil.java:425)
    at net.sourceforge.jnlp.cache.CacheUtil.getCacheFile(CacheUtil.java:327)
    at net.sourceforge.jnlp.cache.CacheEntry.<init>(CacheEntry.java:56)
    at
net.sourceforge.jnlp.cache.ResourceTracker.initializeResource(ResourceTracker.java:786)
    at
net.sourceforge.jnlp.cache.ResourceTracker.processResource(ResourceTracker.java:628)
    at
net.sourceforge.jnlp.cache.ResourceTracker.access$500(ResourceTracker.java:75)
    at
net.sourceforge.jnlp.cache.ResourceTracker$Downloader$1.run(ResourceTracker.java:1132)
    at
net.sourceforge.jnlp.cache.ResourceTracker$Downloader$1.run(ResourceTracker.java:1130)
    at java.security.AccessController.doPrivileged(Native Method)
    at
net.sourceforge.jnlp.cache.ResourceTracker$Downloader.run(ResourceTracker.java:1130)
    at java.lang.Thread.run(Thread.java:724)
java.io.FileNotFoundException:
/home/sophus/.icedtea/cache/0/http/www.java.com/en/download/../../applet/JavaDetection_applet.jnlp.info
(Ingen s?dan fil eller filkatalog)
    at java.io.RandomAccessFile.open(Native Method)
    at java.io.RandomAccessFile.<init>(RandomAccessFile.java:233)
    at java.io.RandomAccessFile.<init>(RandomAccessFile.java:118)
    at net.sourceforge.jnlp.util.FileUtils.getFileLock(FileUtils.java:310)
    at net.sourceforge.jnlp.cache.CacheUtil.lockFile(CacheUtil.java:685)
    at net.sourceforge.jnlp.cache.CacheEntry.lock(CacheEntry.java:176)
    at
net.sourceforge.jnlp.cache.ResourceTracker.initializeResource(ResourceTracker.java:787)
    at
net.sourceforge.jnlp.cache.ResourceTracker.processResource(ResourceTracker.java:628)
    at
net.sourceforge.jnlp.cache.ResourceTracker.access$500(ResourceTracker.java:75)
    at
net.sourceforge.jnlp.cache.ResourceTracker$Downloader$1.run(ResourceTracker.java:1132)
    at
net.sourceforge.jnlp.cache.ResourceTracker$Downloader$1.run(ResourceTracker.java:1130)
    at java.security.AccessController.doPrivileged(Native Method)
    at
net.sourceforge.jnlp.cache.ResourceTracker$Downloader.run(ResourceTracker.java:1130)
    at java.lang.Thread.run(Thread.java:724)
java.io.IOException: Cant rename
/home/sophus/.icedtea/cache/1/http/www.java.com/applet/JavaDetection_applet.jnlp.info.temp
to
/home/sophus/.icedtea/cache/1/http/www.java.com/en/download/../../applet/JavaDetection_applet.jnlp.info
    at
net.sourceforge.jnlp.util.FileUtils.createRestrictedFile(FileUtils.java:209)
    at
net.sourceforge.jnlp.util.FileUtils.createRestrictedFile(FileUtils.java:99)
    at
net.sourceforge.jnlp.cache.CacheUtil.makeNewCacheFile(CacheUtil.java:425)
    at net.sourceforge.jnlp.cache.CacheUtil.getCacheFile(CacheUtil.java:327)
    at
net.sourceforge.jnlp.cache.ResourceTracker.initializeResource(ResourceTracker.java:790)
    at
net.sourceforge.jnlp.cache.ResourceTracker.processResource(ResourceTracker.java:628)
    at
net.sourceforge.jnlp.cache.ResourceTracker.access$500(ResourceTracker.java:75)
    at
net.sourceforge.jnlp.cache.ResourceTracker$Downloader$1.run(ResourceTracker.java:1132)
    at
net.sourceforge.jnlp.cache.ResourceTracker$Downloader$1.run(ResourceTracker.java:1130)
    at java.security.AccessController.doPrivileged(Native Method)
    at
net.sourceforge.jnlp.cache.ResourceTracker$Downloader.run(ResourceTracker.java:1130)

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131013/c4326201/attachment.html 

From ptisnovs at icedtea.classpath.org  Mon Oct 14 02:43:46 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Mon, 14 Oct 2013 09:43:46 +0000
Subject: /hg/gfx-test: Ten new tests added into BitBltAffineIdentityTrans...
Message-ID: <hg.7614eba20a54.1381743826.-6248649288953172555@icedtea.classpath.org>

changeset 7614eba20a54 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=7614eba20a54
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Mon Oct 14 11:47:31 2013 +0200

	Ten new tests added into BitBltAffineIdentityTransformOp test suite.


diffstat:

 ChangeLog                                                       |    5 +
 src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java |  140 ++++++++++
 2 files changed, 145 insertions(+), 0 deletions(-)

diffs (162 lines):

diff -r 05a0940e2859 -r 7614eba20a54 ChangeLog
--- a/ChangeLog	Fri Oct 11 10:40:25 2013 +0200
+++ b/ChangeLog	Mon Oct 14 11:47:31 2013 +0200
@@ -1,3 +1,8 @@
+2013-10-14  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java:
+	Ten new tests added into BitBltAffineIdentityTransformOp test suite.
+
 2013-10-11  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltBufferedImageOp.java:
diff -r 05a0940e2859 -r 7614eba20a54 src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java
--- a/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java	Fri Oct 11 10:40:25 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java	Mon Oct 14 11:47:31 2013 +0200
@@ -1416,6 +1416,146 @@
     }
 
     /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageType4ByteABGRIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, IdentifyTranspormationOp5);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageType4ByteABGRIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageType4ByteABGR(image, graphics2d, IdentifyTranspormationOp6);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_PRE.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageType4ByteABGRPreIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageType4ByteABGRPre(image, graphics2d, IdentifyTranspormationOp1);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_PRE.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageType4ByteABGRPreIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageType4ByteABGRPre(image, graphics2d, IdentifyTranspormationOp2);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_PRE.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageType4ByteABGRPreIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageType4ByteABGRPre(image, graphics2d, IdentifyTranspormationOp3);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_PRE.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageType4ByteABGRPreIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageType4ByteABGRPre(image, graphics2d, IdentifyTranspormationOp4);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_PRE.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageType4ByteABGRPreIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageType4ByteABGRPre(image, graphics2d, IdentifyTranspormationOp5);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_PRE.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageType4ByteABGRPreIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageType4ByteABGRPre(image, graphics2d, IdentifyTranspormationOp6);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteBinaryIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteBinary(image, graphics2d, IdentifyTranspormationOp1);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteBinaryIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteBinary(image, graphics2d, IdentifyTranspormationOp2);
+    }
+
+    /**
      * Entry point to the test suite.
      *
      * @param args not used in this case

From ptisnovs at icedtea.classpath.org  Mon Oct 14 02:47:19 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Mon, 14 Oct 2013 09:47:19 +0000
Subject: /hg/rhino-tests: Added new test testAsSubclass into the
Message-ID: <hg.91022c9f48b3.1381744039.-6019694633368342460@icedtea.classpath.org>

changeset 91022c9f48b3 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=91022c9f48b3
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Mon Oct 14 11:51:07 2013 +0200

	Added new test testAsSubclass into the
	test suite ScriptEngineManagerClassTest.


diffstat:

 ChangeLog                                            |   12 +-
 src/org/RhinoTests/ScriptEngineManagerClassTest.java |  166 +++++++++++++++++++
 2 files changed, 175 insertions(+), 3 deletions(-)

diffs (210 lines):

diff -r 00b968a159d4 -r 91022c9f48b3 ChangeLog
--- a/ChangeLog	Fri Oct 11 10:20:55 2013 +0200
+++ b/ChangeLog	Mon Oct 14 11:51:07 2013 +0200
@@ -1,7 +1,13 @@
+2013-10-14  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/ScriptEngineManagerClassTest.java:
+	Added new test testAsSubclass into the
+	test suite ScriptEngineManagerClassTest.
+
 2013-10-11  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptEngineManagerClassTest.java:
-	Added new test testCast (that checks Class.cast() method) into test
+	Added new test testCast (that checks Class.cast() method) into the
 	test suite ScriptEngineManagerClassTest.
 
 2013-10-10  Pavel Tisnovsky  <ptisnovs at redhat.com>
@@ -13,13 +19,13 @@
 2013-10-09  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptExceptionClassTest.java:
-	Added new test testCast (that checks Class.cast() method) into test
+	Added new test testCast (that checks Class.cast() method) into the
 	test suite ScriptExceptionClassTest.
 
 2013-10-08  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptEngineFactoryClassTest.java:
-	Added new test testCast (that checks Class.cast() method) into test
+	Added new test testCast (that checks Class.cast() method) into the
 	test suite ScriptEngineFactoryClassTest.
 
 2013-10-07  Pavel Tisnovsky  <ptisnovs at redhat.com>
diff -r 00b968a159d4 -r 91022c9f48b3 src/org/RhinoTests/ScriptEngineManagerClassTest.java
--- a/src/org/RhinoTests/ScriptEngineManagerClassTest.java	Fri Oct 11 10:20:55 2013 +0200
+++ b/src/org/RhinoTests/ScriptEngineManagerClassTest.java	Mon Oct 14 11:51:07 2013 +0200
@@ -1316,6 +1316,172 @@
     }
 
     /**
+     * Test for method javax.script.ScriptEngineManager.getClass().asSubclass()
+     */
+    protected void testAsSubclass() {
+        try {
+            this.scriptEngineManagerClass.asSubclass(scriptEngineManagerClass);
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            throw new AssertionError(e.getMessage());
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(Object.class);
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            throw new AssertionError(e.getMessage());
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(java.lang.Void.class);
+            throw new AssertionError("Class.asSubclass(java.lang.Void.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(java.lang.Number.class);
+            throw new AssertionError("Class.asSubclass(java.lang.Number.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(java.lang.Byte.class);
+            throw new AssertionError("Class.asSubclass(java.lang.Byte.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(java.lang.Double.class);
+            throw new AssertionError("Class.asSubclass(java.lang.Double.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(java.lang.Float.class);
+            throw new AssertionError("Class.asSubclass(java.lang.Float.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(java.lang.Integer.class);
+            throw new AssertionError("Class.asSubclass(java.lang.Integer.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(java.lang.Long.class);
+            throw new AssertionError("Class.asSubclass(java.lang.Long.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(java.lang.Short.class);
+            throw new AssertionError("Class.asSubclass(java.lang.Short.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(java.lang.String.class);
+            throw new AssertionError("Class.asSubclass(java.lang.String.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(java.lang.StringBuffer.class);
+            throw new AssertionError("Class.asSubclass(java.lang.StringBuffer.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(java.lang.StringBuilder.class);
+            throw new AssertionError("Class.asSubclass(java.lang.StringBuilder.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(java.awt.Color.class);
+            throw new AssertionError("Class.asSubclass(java.awt.Color.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(java.awt.Font.class);
+            throw new AssertionError("Class.asSubclass(java.awt.Font.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(java.awt.Image.class);
+            throw new AssertionError("Class.asSubclass(java.awt.Image.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(javax.swing.JPanel.class);
+            throw new AssertionError("Class.asSubclass(javax.swing.JPanel.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(javax.swing.JColorChooser.class);
+            throw new AssertionError("Class.asSubclass(javax.swing.JColorChooser.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(javax.swing.JScrollBar.class);
+            throw new AssertionError("Class.asSubclass(javax.swing.JScrollBar.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+        try {
+            this.scriptEngineManagerClass.asSubclass(javax.swing.JSlider.class);
+            throw new AssertionError("Class.asSubclass(javax.swing.JSlider.class) does not throw any exception");
+        }
+        catch (Exception e) {
+            // expected exception
+        }
+
+    }
+
+    /**
      * Test for method javax.script.ScriptEngineManager.getClass().cast()
      */
     protected void testCast() {

From bugzilla-daemon at icedtea.classpath.org  Mon Oct 14 06:10:32 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 14 Oct 2013 13:10:32 +0000
Subject: [Bug 1581] OpenJDK Crashes on fedora 19 when running a griffon app
In-Reply-To: <bug-1581-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1581-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1581-30-CD842iy4BX@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1581

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Version|unspecified                 |2.4.2
           Severity|blocker                     |normal

--- Comment #1 from Andrew John Hughes <gnu.andrew at redhat.com> ---
Assuming this is 2.4.2 from Fedora's versioning, though they don't use IcedTea
itself.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131014/a12d2d8f/attachment.html 

From ptisnovs at icedtea.classpath.org  Mon Oct 14 23:44:43 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Tue, 15 Oct 2013 06:44:43 +0000
Subject: /hg/gfx-test: Eight new tests added into BitBltAffineQuadrantRot...
Message-ID: <hg.f4329acce073.1381819483.-6248649288953172555@icedtea.classpath.org>

changeset f4329acce073 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=f4329acce073
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue Oct 15 08:48:26 2013 +0200

	Eight new tests added into BitBltAffineQuadrantRotateTransformOp test suite.


diffstat:

 ChangeLog                                                             |    5 +
 src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java |  112 ++++++++++
 2 files changed, 117 insertions(+), 0 deletions(-)

diffs (134 lines):

diff -r 7614eba20a54 -r f4329acce073 ChangeLog
--- a/ChangeLog	Mon Oct 14 11:47:31 2013 +0200
+++ b/ChangeLog	Tue Oct 15 08:48:26 2013 +0200
@@ -1,3 +1,8 @@
+2013-10-15  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java:
+	Eight new tests added into BitBltAffineQuadrantRotateTransformOp test suite.
+
 2013-10-14  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java:
diff -r 7614eba20a54 -r f4329acce073 src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java
--- a/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java	Mon Oct 14 11:47:31 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java	Tue Oct 15 08:48:26 2013 +0200
@@ -641,6 +641,118 @@
     }
 
     /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_CUSTOM.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeCustomRotateTransformation2Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeCustom(image, graphics2d, RotateTransformationNearest1Op[2]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_CUSTOM.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeCustomRotateTransformation3Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeCustom(image, graphics2d, RotateTransformationNearest1Op[3]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_CUSTOM.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeCustomRotateTransformation4Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeCustom(image, graphics2d, RotateTransformationNearest1Op[4]);
+    }
+
+    /**
+      Test basic BitBlt operation for checker buffered image with type TYPE_CUSTOM.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeCustomRotateTransformation5Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeCustom(image, graphics2d, RotateTransformationNearest1Op[5]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeIntARGBRotateTransformation0Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, RotateTransformationNearest1Op[0]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeIntARGBRotateTransformation1Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, RotateTransformationNearest1Op[1]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeIntARGBRotateTransformation2Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, RotateTransformationNearest1Op[2]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeIntARGBRotateTransformation3Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, RotateTransformationNearest1Op[3]);
+    }
+
+    /**
      * Entry point to the test suite.
      *
      * @param args not used in this case

From ptisnovs at icedtea.classpath.org  Tue Oct 15 02:08:47 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Tue, 15 Oct 2013 09:08:47 +0000
Subject: /hg/rhino-tests: Added new testGetResourceNPETest case into
Message-ID: <hg.c1cc99b637bf.1381828127.-6019694633368342460@icedtea.classpath.org>

changeset c1cc99b637bf in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=c1cc99b637bf
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue Oct 15 11:12:28 2013 +0200

	Added new testGetResourceNPETest case into
	AbstractScriptEngineClassTest.


diffstat:

 ChangeLog                                             |   6 ++++++
 src/org/RhinoTests/AbstractScriptEngineClassTest.java |  13 +++++++++++++
 2 files changed, 19 insertions(+), 0 deletions(-)

diffs (36 lines):

diff -r 91022c9f48b3 -r c1cc99b637bf ChangeLog
--- a/ChangeLog	Mon Oct 14 11:51:07 2013 +0200
+++ b/ChangeLog	Tue Oct 15 11:12:28 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-15  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/AbstractScriptEngineClassTest.java:
+	Added new testGetResourceNPETest case into
+	AbstractScriptEngineClassTest.
+
 2013-10-14  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptEngineManagerClassTest.java:
diff -r 91022c9f48b3 -r c1cc99b637bf src/org/RhinoTests/AbstractScriptEngineClassTest.java
--- a/src/org/RhinoTests/AbstractScriptEngineClassTest.java	Mon Oct 14 11:51:07 2013 +0200
+++ b/src/org/RhinoTests/AbstractScriptEngineClassTest.java	Tue Oct 15 11:12:28 2013 +0200
@@ -1694,6 +1694,19 @@
     }
 
     /**
+     * Test for method javax.script.AbstractScriptEngine.getClass().getResourceNPETest()
+     */
+    protected void testGetResourceNPETest() {
+        try {
+            Object resource = this.abstractScriptEngineClass.getResource(null);
+            throw new AssertionError("NullPointerException expected!");
+        }
+        catch (NullPointerException e) {
+            //This is OK OK
+        }
+    }
+
+    /**
      * Test for instanceof operator applied to a class javax.script.AbstractScriptEngine
      */
     @SuppressWarnings("cast")

From bugzilla-daemon at icedtea.classpath.org  Tue Oct 15 07:42:12 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 15 Oct 2013 14:42:12 +0000
Subject: [Bug 1578] Applet which mixes jar file and class file throws
	java.lang.LinkageError
In-Reply-To: <bug-1578-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1578-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1578-30-7MPTxG3Y0O@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1578

Andrew Azores <aazores at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|---                         |FIXED

--- Comment #1 from Andrew Azores <aazores at redhat.com> ---
Hi,

I built your sample applet with ant and copied the dist/www/ contents into my
local webserver directory, then ran "firefox localhost/myapp.html". This is on
Fedora 19 64-bit. With 1.3.2, the LinkageError you reported does in fact
appear. With 1.4.1 and mercurial HEAD, the sample applet throws no exceptions
and appears to work as expected.

Since 1.3.2 is the latest available in the Mint official repositories, you
could try installing 1.4.1 from Debian Testing repositories, or building
IcedTea-Web latest or 1.4 from source.

Thanks for the report.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131015/6200c819/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct 15 11:00:40 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 15 Oct 2013 18:00:40 +0000
Subject: [Bug 1582] Plugins don't start - test page just does nothing
In-Reply-To: <bug-1582-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1582-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1582-30-av0XQprqdr@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1582

Deepak Bhole <dbhole at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Assignee|dbhole at redhat.com           |jvanek at redhat.com

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131015/17f5c6c1/attachment.html 

From andrew at icedtea.classpath.org  Tue Oct 15 16:02:55 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 15 Oct 2013 23:02:55 +0000
Subject: /hg/release/icedtea7-forest-2.4/corba: 3 new changesets
Message-ID: <hg.5a96f217d1e7.1381878175.-523731888714527277@icedtea.classpath.org>

changeset 5a96f217d1e7 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=5a96f217d1e7
author: msheppar
date: Fri Jun 14 17:45:07 2013 +0100

	8011157: Improve CORBA portablility
	Summary: fix also reviewed by Alexander Fomin
	Reviewed-by: alanb, coffeys, skoivu


changeset ceaf0d23ff2f in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=ceaf0d23ff2f
author: mchung
date: Thu Jul 18 17:22:25 2013 -0700

	8017196: Ensure Proxies are handled appropriately
	Reviewed-by: dfuchs, jrose, jdn, ahgross, chegar


changeset a3e056e0bcdb in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a3e056e0bcdb
author: msheppar
date: Mon Aug 19 17:01:51 2013 +0100

	8022940: Enhance CORBA translations
	Reviewed-by: coffeys, alanb, skoivu


diffstat:

 src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java        |  24 ---
 src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java |  14 +-
 src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java                        |   4 +-
 src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java   |  11 +
 src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java                                     |  80 +++++++++-
 5 files changed, 102 insertions(+), 31 deletions(-)

diffs (290 lines):

diff -r 2d78f9ff9655 -r a3e056e0bcdb src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java	Thu Sep 05 15:10:36 2013 +0100
+++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java	Mon Aug 19 17:01:51 2013 +0100
@@ -905,28 +905,4 @@
 
         return contents.toString();
     }
-
-    public static void main(String[] args) {
-
-        Class remoteInterface = java.rmi.Remote.class;
-
-        if( args.length > 0 ) {
-            String className = args[0];
-            try {
-                remoteInterface = Class.forName(className);
-            } catch(Exception e) {
-                e.printStackTrace();
-                System.exit(-1);
-            }
-        }
-
-        System.out.println("Building name translation for " + remoteInterface);
-        try {
-            IDLNameTranslator nameTranslator =
-                IDLNameTranslatorImpl.get(remoteInterface);
-            System.out.println(nameTranslator);
-        } catch(IllegalStateException ise) {
-            ise.printStackTrace();
-        }
-    }
 }
diff -r 2d78f9ff9655 -r a3e056e0bcdb src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java	Thu Sep 05 15:10:36 2013 +0100
+++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java	Mon Aug 19 17:01:51 2013 +0100
@@ -43,6 +43,8 @@
 import com.sun.corba.se.spi.orbutil.proxy.DelegateInvocationHandlerImpl ;
 import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandler ;
 import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandlerImpl ;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 
 public class InvocationHandlerFactoryImpl implements InvocationHandlerFactory
 {
@@ -114,24 +116,32 @@
         // which extends org.omg.CORBA.Object.  This handler delegates all
         // calls directly to a DynamicStubImpl, which extends
         // org.omg.CORBA.portable.ObjectImpl.
-        InvocationHandler dynamicStubHandler =
+        final InvocationHandler dynamicStubHandler =
             DelegateInvocationHandlerImpl.create( stub ) ;
 
         // Create an invocation handler that handles any remote interface
         // methods.
-        InvocationHandler stubMethodHandler = new StubInvocationHandlerImpl(
+        final InvocationHandler stubMethodHandler = new StubInvocationHandlerImpl(
             pm, classData, stub ) ;
 
         // Create a composite handler that handles the DynamicStub interface
         // as well as the remote interfaces.
         final CompositeInvocationHandler handler =
             new CustomCompositeInvocationHandlerImpl( stub ) ;
+
+        AccessController.doPrivileged(new PrivilegedAction<Void>() {
+            @Override
+            public Void run() {
         handler.addInvocationHandler( DynamicStub.class,
             dynamicStubHandler ) ;
         handler.addInvocationHandler( org.omg.CORBA.Object.class,
             dynamicStubHandler ) ;
         handler.addInvocationHandler( Object.class,
             dynamicStubHandler ) ;
+                return null;
+            }
+        });
+
 
         // If the method passed to invoke is not from DynamicStub or its superclasses,
         // it must be from an implemented interface, so we just handle
diff -r 2d78f9ff9655 -r a3e056e0bcdb src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java	Thu Sep 05 15:10:36 2013 +0100
+++ b/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java	Mon Aug 19 17:01:51 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -55,7 +55,7 @@
 /**
  * @author Harold Carr
  */
-public class SelectorImpl
+class SelectorImpl
     extends
         Thread
     implements
diff -r 2d78f9ff9655 -r a3e056e0bcdb src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java
--- a/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java	Thu Sep 05 15:10:36 2013 +0100
+++ b/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java	Mon Aug 19 17:01:51 2013 +0100
@@ -36,6 +36,7 @@
 
 import com.sun.corba.se.spi.logging.CORBALogDomains ;
 import com.sun.corba.se.impl.logging.ORBUtilSystemException ;
+import com.sun.corba.se.impl.presentation.rmi.DynamicAccessPermission;
 
 public class CompositeInvocationHandlerImpl implements
     CompositeInvocationHandler
@@ -46,11 +47,13 @@
     public void addInvocationHandler( Class interf,
         InvocationHandler handler )
     {
+        checkAccess();
         classToInvocationHandler.put( interf, handler ) ;
     }
 
     public void setDefaultHandler( InvocationHandler handler )
     {
+        checkAccess();
         defaultHandler = handler ;
     }
 
@@ -78,4 +81,12 @@
 
         return handler.invoke( proxy, method, args ) ;
     }
+
+    private static final DynamicAccessPermission perm = new DynamicAccessPermission("access");
+    private void checkAccess() {
+        final SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPermission(perm);
 }
+    }
+}
diff -r 2d78f9ff9655 -r a3e056e0bcdb src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java
--- a/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java	Thu Sep 05 15:10:36 2013 +0100
+++ b/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java	Mon Aug 19 17:01:51 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, 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
@@ -34,6 +34,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.SerializablePermission;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Vector;
 import java.util.Hashtable;
 import java.util.Enumeration;
@@ -49,6 +52,7 @@
 import com.sun.corba.se.impl.util.PackagePrefixChecker;
 import sun.rmi.rmic.Main;
 
+
 /**
  * An IIOP stub/tie generator for rmic.
  *
@@ -78,6 +82,7 @@
     protected boolean castArray = false;
     protected Hashtable transactionalObjects = new Hashtable() ;
     protected boolean POATie = false ;
+    protected boolean emitPermissionCheck = false;
 
     /**
      * Default constructor for Main to use.
@@ -193,6 +198,9 @@
                     } else if (argv[i].equals("-standardPackage")) {
                         standardPackage = true;
                         argv[i] = null;
+                    } else if (argv[i].equals("-emitPermissionCheck")) {
+                        emitPermissionCheck = true;
+                        argv[i] = null;
                     } else if (arg.equals("-xstubbase")) {
                         argv[i] = null;
                         if (++i < argv.length && argv[i] != null && !argv[i].startsWith("-")) {
@@ -390,9 +398,22 @@
 
         writePackageAndImports(p);
 
+//        generate
+//        import java.security.AccessController;
+//        import java.security.PrivilegedAction;
+//        import java.io.SerializablePermission;
+        if (emitPermissionCheck) {
+            p.pln("import java.security.AccessController;");
+            p.pln("import java.security.PrivilegedAction;");
+            p.pln("import java.io.SerializablePermission;");
+            p.pln();
+            p.pln();
+        }
+
         // Declare the stub class; implement all remote interfaces.
 
         p.p("public class " + currentClass);
+
         p.p(" extends " + getName(stubBaseClass));
         p.p(" implements ");
         if (remoteInterfaces.length > 0) {
@@ -422,6 +443,56 @@
         writeIds( p, theType, false );
         p.pln();
 
+        if (emitPermissionCheck) {
+
+            // produce the following generated code
+            // private static Void checkPermission() {
+            // SecurityManager sm = System.getSecurityManager();
+            // if (sm != null) {
+            //     sm.checkPermission(new SerializablePermission(
+            // "enableSubclassImplementation")); // testing
+            // }
+            // return null;
+            // }
+            //
+            // private _XXXXXX_Stub(Void ignore) {
+            // }
+            //
+            // public _XXXXXX_Stub() {
+            // this(checkPermission());
+            // }
+            // where XXXXXX is the name of the remote interface
+
+                p.pln();
+                p.plnI("private static Void checkPermission() {");
+                p.plnI("SecurityManager sm = System.getSecurityManager();");
+                p.pln("if (sm != null) {");
+                p.pI();
+                p.plnI("sm.checkPermission(new SerializablePermission(");
+                p.plnI("\"enableSubclassImplementation\"));");
+                p.pO();
+                p.pO();
+                p.pOln("}");
+                p.pln("return null;");
+                p.pO();
+                p.pOln("}");
+                p.pln();
+                p.pO();
+
+                p.pI();
+                p.pln("private " + currentClass + "(Void ignore) {  }");
+                p.pln();
+
+                p.plnI("public " + currentClass + "() { ");
+                p.pln("this(checkPermission());");
+                p.pOln("}");
+                p.pln();
+        }
+
+       if (!emitPermissionCheck) {
+            p.pI();
+       }
+
         // Write the _ids() method...
 
         p.plnI("public String[] _ids() { ");
@@ -815,7 +886,6 @@
                             CompoundType theType) throws IOException {
 
         // Wtite the method declaration and opening brace...
-
         String methodName = method.getName();
         String methodIDLName = method.getIDLName();
 
@@ -1631,7 +1701,7 @@
 
         // Write data members...
         p.pln();
-        p.pln("private " + getName(theType) + " target = null;");
+        p.pln("volatile private " + getName(theType) + " target = null;");
         p.pln();
 
         // Write the ids...
@@ -1695,6 +1765,10 @@
 
         if (remoteMethods.length > 0) {
             p.plnI("try {");
+            p.pln(getName(theType) + " target = this.target;");
+            p.plnI("if (target == null) {");
+            p.pln("throw new java.io.IOException();");
+            p.pOln("}");
             p.plnI(idExtInputStream + " "+in+" = ");
             p.pln("(" + idExtInputStream + ") "+_in+";");
             p.pO();

From andrew at icedtea.classpath.org  Tue Oct 15 16:03:05 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 15 Oct 2013 23:03:05 +0000
Subject: /hg/release/icedtea7-forest-2.4/jaxp: 5 new changesets
Message-ID: <hg.fa7391b1cb53.1381878185.6056160295555406480@icedtea.classpath.org>

changeset fa7391b1cb53 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=fa7391b1cb53
author: joehw
date: Thu Jul 11 09:01:18 2013 -0700

	8013503: Improve stream factories
	Reviewed-by: alanb, dfuchs, mullan


changeset e9af60ad2582 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=e9af60ad2582
author: joehw
date: Wed Oct 09 21:24:38 2013 +0100

	8012425: Transform TransformerFactory
	Reviewed-by: alanb, dfuchs, mullan


changeset 48a0c5216d21 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=48a0c5216d21
author: joehw
date: Thu Oct 10 01:18:45 2013 +0100

	8017298: Better XML support
	Reviewed-by: alanb, dfuchs, mullan


changeset 1dbd732765d0 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=1dbd732765d0
author: joehw
date: Thu Oct 10 02:08:57 2013 +0100

	8014530: Better digital signature processing
	Reviewed-by: alanb, dfuchs, mullan, lancea


changeset 9230de21402d in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=9230de21402d
author: andrew
date: Mon Oct 14 14:04:51 2013 +0100

	SchemaParsingConfig also needs to be updated to initialise a SECURITY_MANAGER


diffstat:

 src/com/sun/org/apache/xalan/internal/XalanConstants.java                                      |  131 ++-
 src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java                            |  449 ++++++++
 src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java                    |   33 +
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java                               |    2 +-
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java                              |    2 +-
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java                               |   17 +-
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java                                |   11 +-
 src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java                     |    4 +-
 src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java                   |   37 +-
 src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java                          |    6 +
 src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java                                     |   25 +
 src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java                           |    8 +
 src/com/sun/org/apache/xerces/internal/impl/Constants.java                                     |  108 +-
 src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java                               |   24 +-
 src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java                    |    4 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java                             |   64 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java                |   72 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java                              |   62 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java                      |    4 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java                                    |   54 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties                         |   11 +-
 src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java                       |   22 +-
 src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java                   |    8 +-
 src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java              |    3 +-
 src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java                      |    6 +-
 src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java                           |   29 +-
 src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java                                 |   77 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java                |   14 +
 src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java              |   37 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java               |    6 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java                   |   31 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java |   51 +-
 src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java                          |   37 +-
 src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java                                  |   14 +-
 src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java                      |    5 +-
 src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java                         |   79 +-
 src/com/sun/org/apache/xerces/internal/util/SecurityManager.java                               |  226 ----
 src/com/sun/org/apache/xerces/internal/util/SymbolTable.java                                   |    4 +-
 src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java                             |  236 ++++
 src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java                           |  521 ++++++++++
 src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java                   |   35 +
 src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java                           |   10 +-
 src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java                                |   46 +-
 src/com/sun/xml/internal/stream/Entity.java                                                    |    2 +-
 src/javax/xml/stream/FactoryFinder.java                                                        |   23 +-
 src/javax/xml/stream/XMLEventFactory.java                                                      |   14 +-
 src/javax/xml/stream/XMLInputFactory.java                                                      |   15 +-
 src/javax/xml/stream/XMLOutputFactory.java                                                     |   13 +-
 48 files changed, 2167 insertions(+), 525 deletions(-)

diffs (truncated from 4420 to 500 lines):

diff -r 9d462cfc07bf -r 9230de21402d src/com/sun/org/apache/xalan/internal/XalanConstants.java
--- a/src/com/sun/org/apache/xalan/internal/XalanConstants.java	Thu Sep 05 15:10:37 2013 +0100
+++ b/src/com/sun/org/apache/xalan/internal/XalanConstants.java	Mon Oct 14 14:04:51 2013 +0100
@@ -39,33 +39,138 @@
     //
     // Constants
     //
+    //Xerces security manager
+    public static final String SECURITY_MANAGER =
+            "http://apache.org/xml/properties/security-manager";
+
+    //
+    // Implementation limits: API properties
+    //
+    /** Oracle JAXP property prefix ("http://www.oracle.com/xml/jaxp/properties/"). */
+    public static final String ORACLE_JAXP_PROPERTY_PREFIX =
+        "http://www.oracle.com/xml/jaxp/properties/";
+    /**
+     * JDK entity expansion limit; Note that the existing system property
+     * "entityExpansionLimit" with no prefix is still observed
+     */
+    public static final String JDK_ENTITY_EXPANSION_LIMIT =
+            ORACLE_JAXP_PROPERTY_PREFIX + "entityExpansionLimit";
+
+    /**
+     * JDK element attribute limit; Note that the existing system property
+     * "elementAttributeLimit" with no prefix is still observed
+     */
+    public static final String JDK_ELEMENT_ATTRIBUTE_LIMIT =
+            ORACLE_JAXP_PROPERTY_PREFIX + "elementAttributeLimit";
+
+    /**
+     * JDK maxOccur limit; Note that the existing system property
+     * "maxOccurLimit" with no prefix is still observed
+     */
+    public static final String JDK_MAX_OCCUR_LIMIT =
+            ORACLE_JAXP_PROPERTY_PREFIX + "maxOccurLimit";
+
+    /**
+     * JDK total entity size limit
+     */
+    public static final String JDK_TOTAL_ENTITY_SIZE_LIMIT =
+            ORACLE_JAXP_PROPERTY_PREFIX + "totalEntitySizeLimit";
+
+    /**
+     * JDK maximum general entity size limit
+     */
+    public static final String JDK_GENEAL_ENTITY_SIZE_LIMIT =
+            ORACLE_JAXP_PROPERTY_PREFIX + "maxGeneralEntitySizeLimit";
+    /**
+     * JDK maximum parameter entity size limit
+     */
+    public static final String JDK_PARAMETER_ENTITY_SIZE_LIMIT =
+            ORACLE_JAXP_PROPERTY_PREFIX + "maxParameterEntitySizeLimit";
+    /**
+     * JDK maximum XML name limit
+     */
+    public static final String JDK_XML_NAME_LIMIT =
+            ORACLE_JAXP_PROPERTY_PREFIX + "maxXMLNameLimit";
+    /**
+     * JDK property indicating whether the parser shall print out entity
+     * count information
+     * Value: a string "yes" means print, "no" or any other string means not.
+     */
+    public static final String JDK_ENTITY_COUNT_INFO =
+            ORACLE_JAXP_PROPERTY_PREFIX + "getEntityCountInfo";
+
+    //
+    // Implementation limits: corresponding System Properties of the above
+    // API properties
+    //
+    /**
+     * JDK entity expansion limit; Note that the existing system property
+     * "entityExpansionLimit" with no prefix is still observed
+     */
+    public static final String SP_ENTITY_EXPANSION_LIMIT = "jdk.xml.entityExpansionLimit";
+
+    /**
+     * JDK element attribute limit; Note that the existing system property
+     * "elementAttributeLimit" with no prefix is still observed
+     */
+    public static final String SP_ELEMENT_ATTRIBUTE_LIMIT =  "jdk.xml.elementAttributeLimit";
+
+    /**
+     * JDK maxOccur limit; Note that the existing system property
+     * "maxOccurLimit" with no prefix is still observed
+     */
+    public static final String SP_MAX_OCCUR_LIMIT = "jdk.xml.maxOccurLimit";
+
+    /**
+     * JDK total entity size limit
+     */
+    public static final String SP_TOTAL_ENTITY_SIZE_LIMIT = "jdk.xml.totalEntitySizeLimit";
+
+    /**
+     * JDK maximum general entity size limit
+     */
+    public static final String SP_GENEAL_ENTITY_SIZE_LIMIT = "jdk.xml.maxGeneralEntitySizeLimit";
+    /**
+     * JDK maximum parameter entity size limit
+     */
+    public static final String SP_PARAMETER_ENTITY_SIZE_LIMIT = "jdk.xml.maxParameterEntitySizeLimit";
+    /**
+     * JDK maximum XML name limit
+     */
+    public static final String SP_XML_NAME_LIMIT = "jdk.xml.maxXMLNameLimit";
+
+    //legacy System Properties
+    public final static String ENTITY_EXPANSION_LIMIT = "entityExpansionLimit";
+    public static final String ELEMENT_ATTRIBUTE_LIMIT = "elementAttributeLimit" ;
+    public final static String MAX_OCCUR_LIMIT = "maxOccurLimit";
+
+    /**
+     * A string "yes" that can be used for properties such as getEntityCountInfo
+     */
+    public static final String JDK_YES = "yes";
+
     // Oracle Feature:
-    /**
-     * <p>Use Service Mechanism</p>
-     *
-     * <ul>
-     *   <li>
+        /**
+         * <p>Use Service Mechanism</p>
+         *
+         * <ul>
+         *   <li>
          * {@code true} instruct an object to use service mechanism to
          * find a service implementation. This is the default behavior.
          *   </li>
          *   <li>
          * {@code false} instruct an object to skip service mechanism and
          * use the default implementation for that service.
-     *   </li>
-     * </ul>
-    */
-
+         *   </li>
+         * </ul>
+         */
     public static final String ORACLE_FEATURE_SERVICE_MECHANISM = "http://www.oracle.com/feature/use-service-mechanism";
 
-    /** Oracle JAXP property prefix ("http://www.oracle.com/xml/jaxp/properties/"). */
-    public static final String ORACLE_JAXP_PROPERTY_PREFIX =
-        "http://www.oracle.com/xml/jaxp/properties/";
 
     //System Properties corresponding to ACCESS_EXTERNAL_* properties
     public static final String SP_ACCESS_EXTERNAL_STYLESHEET = "javax.xml.accessExternalStylesheet";
     public static final String SP_ACCESS_EXTERNAL_DTD = "javax.xml.accessExternalDTD";
 
-
     //all access keyword
     public static final String ACCESS_EXTERNAL_ALL = "all";
 
diff -r 9d462cfc07bf -r 9230de21402d src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java	Mon Oct 14 14:04:51 2013 +0100
@@ -0,0 +1,449 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.sun.org.apache.xalan.internal.utils;
+
+import com.sun.org.apache.xalan.internal.XalanConstants;
+
+
+/**
+ * This class is not the same as that in Xerces. It is used to manage the
+ * state of corresponding Xerces properties and pass the values over to
+ * the Xerces Security Manager.
+ *
+ * @author Joe Wang Oracle Corp.
+ *
+ */
+public final class XMLSecurityManager {
+
+    /**
+     * States of the settings of a property, in the order: default value, value
+     * set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system
+     * properties, and jaxp api properties
+     */
+    public static enum State {
+        //this order reflects the overriding order
+
+        DEFAULT("default"), FSP("FEATURE_SECURE_PROCESSING"),
+        JAXPDOTPROPERTIES("jaxp.properties"), SYSTEMPROPERTY("system property"),
+        APIPROPERTY("property");
+
+        final String literal;
+        State(String literal) {
+            this.literal = literal;
+        }
+
+        String literal() {
+            return literal;
+        }
+    }
+
+    /**
+     * Limits managed by the security manager
+     */
+    public static enum Limit {
+
+        ENTITY_EXPANSION_LIMIT(XalanConstants.JDK_ENTITY_EXPANSION_LIMIT,
+                XalanConstants.SP_ENTITY_EXPANSION_LIMIT, 0, 64000),
+        MAX_OCCUR_NODE_LIMIT(XalanConstants.JDK_MAX_OCCUR_LIMIT,
+                XalanConstants.SP_MAX_OCCUR_LIMIT, 0, 5000),
+        ELEMENT_ATTRIBUTE_LIMIT(XalanConstants.JDK_ELEMENT_ATTRIBUTE_LIMIT,
+                XalanConstants.SP_ELEMENT_ATTRIBUTE_LIMIT, 0, 10000),
+        TOTAL_ENTITY_SIZE_LIMIT(XalanConstants.JDK_TOTAL_ENTITY_SIZE_LIMIT,
+                XalanConstants.SP_TOTAL_ENTITY_SIZE_LIMIT, 0, 50000000),
+        GENEAL_ENTITY_SIZE_LIMIT(XalanConstants.JDK_GENEAL_ENTITY_SIZE_LIMIT,
+                XalanConstants.SP_GENEAL_ENTITY_SIZE_LIMIT, 0, 0),
+        PARAMETER_ENTITY_SIZE_LIMIT(XalanConstants.JDK_PARAMETER_ENTITY_SIZE_LIMIT,
+                XalanConstants.SP_PARAMETER_ENTITY_SIZE_LIMIT, 0, 1000000);
+
+        final String apiProperty;
+        final String systemProperty;
+        final int defaultValue;
+        final int secureValue;
+
+        Limit(String apiProperty, String systemProperty, int value, int secureValue) {
+            this.apiProperty = apiProperty;
+            this.systemProperty = systemProperty;
+            this.defaultValue = value;
+            this.secureValue = secureValue;
+        }
+
+        public boolean equalsAPIPropertyName(String propertyName) {
+            return (propertyName == null) ? false : apiProperty.equals(propertyName);
+        }
+
+        public boolean equalsSystemPropertyName(String propertyName) {
+            return (propertyName == null) ? false : systemProperty.equals(propertyName);
+        }
+
+        public String apiProperty() {
+            return apiProperty;
+        }
+
+        String systemProperty() {
+            return systemProperty;
+        }
+
+        int defaultValue() {
+            return defaultValue;
+        }
+
+        int secureValue() {
+            return secureValue;
+        }
+    }
+
+    /**
+     * Map old property names with the new ones
+     */
+    public static enum NameMap {
+
+        ENTITY_EXPANSION_LIMIT(XalanConstants.SP_ENTITY_EXPANSION_LIMIT,
+                XalanConstants.ENTITY_EXPANSION_LIMIT),
+        MAX_OCCUR_NODE_LIMIT(XalanConstants.SP_MAX_OCCUR_LIMIT,
+                XalanConstants.MAX_OCCUR_LIMIT),
+        ELEMENT_ATTRIBUTE_LIMIT(XalanConstants.SP_ELEMENT_ATTRIBUTE_LIMIT,
+                XalanConstants.ELEMENT_ATTRIBUTE_LIMIT);
+        final String newName;
+        final String oldName;
+
+        NameMap(String newName, String oldName) {
+            this.newName = newName;
+            this.oldName = oldName;
+        }
+
+        String getOldName(String newName) {
+            if (newName.equals(this.newName)) {
+                return oldName;
+            }
+            return null;
+        }
+    }
+    /**
+     * Values of the properties
+     */
+    private final int[] values;
+    /**
+     * States of the settings for each property
+     */
+    private State[] states;
+    /**
+     * States that determine if properties are set explicitly
+     */
+    private boolean[] isSet;
+
+
+    /**
+     * Index of the special entityCountInfo property
+     */
+    private int indexEntityCountInfo = 10000;
+    private String printEntityCountInfo = "";
+
+    /**
+     * Default constructor. Establishes default values for known security
+     * vulnerabilities.
+     */
+    public XMLSecurityManager() {
+        this(false);
+    }
+
+    /**
+     * Instantiate Security Manager in accordance with the status of
+     * secure processing
+     * @param secureProcessing
+     */
+    public XMLSecurityManager(boolean secureProcessing) {
+        values = new int[Limit.values().length];
+        states = new State[Limit.values().length];
+        isSet = new boolean[Limit.values().length];
+        for (Limit limit : Limit.values()) {
+            if (secureProcessing) {
+                values[limit.ordinal()] = limit.secureValue();
+                states[limit.ordinal()] = State.FSP;
+            } else {
+                values[limit.ordinal()] = limit.defaultValue();
+                states[limit.ordinal()] = State.DEFAULT;
+            }
+        }
+        //read system properties or jaxp.properties
+        readSystemProperties();
+    }
+
+    /**
+     * Setting FEATURE_SECURE_PROCESSING explicitly
+     */
+    public void setSecureProcessing(boolean secure) {
+        for (Limit limit : Limit.values()) {
+            if (secure) {
+                setLimit(limit.ordinal(), State.FSP, limit.secureValue());
+            } else {
+                setLimit(limit.ordinal(), State.FSP, limit.defaultValue());
+            }
+        }
+    }
+
+    /**
+     * Set limit by property name and state
+     * @param propertyName property name
+     * @param state the state of the property
+     * @param value the value of the property
+     * @return true if the property is managed by the security manager; false
+     *              if otherwise.
+     */
+    public boolean setLimit(String propertyName, State state, Object value) {
+        int index = getIndex(propertyName);
+        if (index > -1) {
+            setLimit(index, state, value);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Set the value for a specific limit.
+     *
+     * @param limit the limit
+     * @param state the state of the property
+     * @param value the value of the property
+     */
+    public void setLimit(Limit limit, State state, int value) {
+        setLimit(limit.ordinal(), state, value);
+    }
+
+    /**
+     * Set the value of a property by its index
+     *
+     * @param index the index of the property
+     * @param state the state of the property
+     * @param value the value of the property
+     */
+    public void setLimit(int index, State state, Object value) {
+        if (index == indexEntityCountInfo) {
+            //if it's explicitly set, it's treated as yes no matter the value
+            printEntityCountInfo = (String)value;
+        } else {
+            int temp = 0;
+            try {
+                temp = Integer.parseInt((String) value);
+                if (temp < 0) {
+                    temp = 0;
+                }
+            } catch (NumberFormatException e) {}
+            setLimit(index, state, temp);        }
+    }
+
+    /**
+     * Set the value of a property by its index
+     *
+     * @param index the index of the property
+     * @param state the state of the property
+     * @param value the value of the property
+     */
+    public void setLimit(int index, State state, int value) {
+        if (index == indexEntityCountInfo) {
+            //if it's explicitly set, it's treated as yes no matter the value
+            printEntityCountInfo = XalanConstants.JDK_YES;
+        } else {
+            //only update if it shall override
+            if (state.compareTo(states[index]) >= 0) {
+                values[index] = value;
+                states[index] = state;
+                isSet[index] = true;
+            }
+        }
+    }
+
+
+    /**
+     * Return the value of the specified property.
+     *
+     * @param propertyName the property name
+     * @return the value of the property as a string. If a property is managed
+     * by this manager, its value shall not be null.
+     */
+    public String getLimitAsString(String propertyName) {
+        int index = getIndex(propertyName);
+        if (index > -1) {
+            return getLimitValueByIndex(index);
+        }
+
+        return null;
+    }
+
+    /**
+     * Return the value of a property by its ordinal
+     *
+     * @param limit the property
+     * @return value of a property
+     */
+    public String getLimitValueAsString(Limit limit) {
+        return Integer.toString(values[limit.ordinal()]);
+    }
+
+    /**
+     * Return the value of the specified property
+     *
+     * @param limit the property
+     * @return the value of the property
+     */
+    public int getLimit(Limit limit) {
+        return values[limit.ordinal()];
+    }
+
+    /**
+     * Return the value of a property by its ordinal
+     *
+     * @param index the index of a property
+     * @return value of a property
+     */
+    public int getLimitByIndex(int index) {
+        return values[index];
+    }
+    /**
+     * Return the value of a property by its index
+     *
+     * @param index the index of a property

From andrew at icedtea.classpath.org  Tue Oct 15 16:03:12 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 15 Oct 2013 23:03:12 +0000
Subject: /hg/release/icedtea7-forest-2.4/jaxws: 8017505: Better Client Se...
Message-ID: <hg.791aab4989bf.1381878192.1704173005128376975@icedtea.classpath.org>

changeset 791aab4989bf in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=791aab4989bf
author: mkos
date: Wed Jul 31 09:41:04 2013 -0400

	8017505: Better Client Service
	Reviewed-by: mullan, ahgross, mgrebac


diffstat:

 src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java     |    4 +-
 src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java           |  109 ++++++++++
 src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java           |  109 ++++++++++
 src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java              |   27 ++-
 src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java   |  107 +++++++++
 src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java  |    8 +-
 src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java |    4 +-
 src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java               |  109 ++++++++++
 8 files changed, 464 insertions(+), 13 deletions(-)

diffs (truncated from 600 to 500 lines):

diff -r 06bc85a84d42 -r 791aab4989bf src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java	Thu Sep 05 15:10:38 2013 +0100
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java	Wed Jul 31 09:41:04 2013 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -232,7 +232,7 @@
             public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException {
                 T t = resolve(p);
                 try {
-                    return m.invoke(t, args );
+                    return MethodUtil.invoke(t, m, args );
                 } finally {
                     postInvoke(p,t);
                 }
diff -r 06bc85a84d42 -r 791aab4989bf src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java	Wed Jul 31 09:41:04 2013 -0400
@@ -0,0 +1,109 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
+ * to java.lang,reflect.Method.invoke()
+ *
+ * Be careful, copy of this class exists in several packages, iny modification must be done to other copies too!
+ */
+class MethodUtil {
+
+    private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
+    private static final Method INVOKE_METHOD;
+
+    static {
+        Method method;
+        try {
+            Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
+            method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
+            }
+        } catch (Throwable t) {
+            method = null;
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
+            }
+        }
+        INVOKE_METHOD = method;
+    }
+
+    static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
+        if (INVOKE_METHOD != null) {
+            // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
+            }
+            try {
+                return INVOKE_METHOD.invoke(null, method, target, args);
+            } catch (InvocationTargetException ite) {
+                // unwrap invocation exception added by reflection code ...
+                throw unwrapException(ite);
+            }
+        } else {
+            // other then Oracle JDK ...
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
+            }
+            return method.invoke(target, args);
+        }
+    }
+
+    private static InvocationTargetException unwrapException(InvocationTargetException ite) {
+        Throwable targetException = ite.getTargetException();
+        if (targetException != null && targetException instanceof InvocationTargetException) {
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
+            }
+            return (InvocationTargetException) targetException;
+        } else {
+            return ite;
+        }
+    }
+
+}
diff -r 06bc85a84d42 -r 791aab4989bf src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java	Wed Jul 31 09:41:04 2013 -0400
@@ -0,0 +1,109 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.xml.internal.ws.client.sei;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
+ * to java.lang,reflect.Method.invoke()
+ * <p/>
+ * Be careful, copy of this class exists in several packages, iny modification must be done to other copies too!
+ */
+class MethodUtil {
+
+    private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
+    private static final Method INVOKE_METHOD;
+
+    static {
+        Method method;
+        try {
+            Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
+            method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
+            }
+        } catch (Throwable t) {
+            method = null;
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
+            }
+        }
+        INVOKE_METHOD = method;
+    }
+
+    static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
+        if (INVOKE_METHOD != null) {
+            // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
+            }
+            try {
+                return INVOKE_METHOD.invoke(null, method, target, args);
+            } catch (InvocationTargetException ite) {
+                // unwrap invocation exception added by reflection code ...
+                throw unwrapException(ite);
+            }
+        } else {
+            // other then Oracle JDK ...
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
+            }
+            return method.invoke(target, args);
+        }
+    }
+
+    private static InvocationTargetException unwrapException(InvocationTargetException ite) {
+        Throwable targetException = ite.getTargetException();
+        if (targetException != null && targetException instanceof InvocationTargetException) {
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
+            }
+            return (InvocationTargetException) targetException;
+        } else {
+            return ite;
+        }
+    }
+
+}
diff -r 06bc85a84d42 -r 791aab4989bf src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java	Thu Sep 05 15:10:38 2013 +0100
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java	Wed Jul 31 09:41:04 2013 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -28,17 +28,20 @@
 import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.Nullable;
 import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
 import com.sun.xml.internal.ws.api.client.WSPortInfo;
-import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
 import com.sun.xml.internal.ws.api.message.Header;
 import com.sun.xml.internal.ws.api.message.Headers;
 import com.sun.xml.internal.ws.api.message.Packet;
 import com.sun.xml.internal.ws.api.model.MEP;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
+import com.sun.xml.internal.ws.api.pipe.Fiber;
 import com.sun.xml.internal.ws.api.pipe.Tube;
-import com.sun.xml.internal.ws.api.pipe.Fiber;
 import com.sun.xml.internal.ws.binding.BindingImpl;
-import com.sun.xml.internal.ws.client.*;
+import com.sun.xml.internal.ws.client.RequestContext;
+import com.sun.xml.internal.ws.client.ResponseContextReceiver;
+import com.sun.xml.internal.ws.client.Stub;
+import com.sun.xml.internal.ws.client.WSServiceDelegate;
 import com.sun.xml.internal.ws.model.JavaMethodImpl;
 import com.sun.xml.internal.ws.model.SOAPSEIModel;
 import com.sun.xml.internal.ws.wsdl.OperationDispatcher;
@@ -47,6 +50,8 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -124,13 +129,14 @@
     private final Map<Method, MethodHandler> methodHandlers = new HashMap<Method, MethodHandler>();
 
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        validateInputs(proxy, method);
         MethodHandler handler = methodHandlers.get(method);
         if (handler != null) {
             return handler.invoke(proxy, args);
         } else {
             // we handle the other method invocations by ourselves
             try {
-                return method.invoke(this, args);
+                return MethodUtil.invoke(this, method, args);
             } catch (IllegalAccessException e) {
                 // impossible
                 throw new AssertionError(e);
@@ -142,6 +148,17 @@
         }
     }
 
+    private void validateInputs(Object proxy, Method method) {
+        if (proxy == null || !Proxy.isProxyClass(proxy.getClass())) {
+            throw new IllegalStateException("Passed object is not proxy!");
+        }
+        Class<?> declaringClass = method.getDeclaringClass();
+        if (method == null || declaringClass == null
+                || Modifier.isStatic(method.getModifiers())) {
+            throw new IllegalStateException("Invoking static method is not allowed!");
+        }
+    }
+
     public final Packet doProcess(Packet request, RequestContext rc, ResponseContextReceiver receiver) {
         return super.process(request, rc, receiver);
     }
diff -r 06bc85a84d42 -r 791aab4989bf src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java	Wed Jul 31 09:41:04 2013 -0400
@@ -0,0 +1,107 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.xml.internal.ws.policy.privateutil;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
+ * to java.lang,reflect.Method.invoke()
+ */
+class MethodUtil {
+
+    private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
+    private static final Method INVOKE_METHOD;
+
+    static {
+        Method method;
+        try {
+            Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
+            method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
+            }
+        } catch (Throwable t) {
+            method = null;
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
+            }
+        }
+        INVOKE_METHOD = method;
+    }
+
+    static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
+        if (INVOKE_METHOD != null) {
+            // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
+            }
+            try {
+                return INVOKE_METHOD.invoke(null, method, target, args);
+            } catch (InvocationTargetException ite) {
+                // unwrap invocation exception added by reflection code ...
+                throw unwrapException(ite);
+            }
+        } else {
+            // other then Oracle JDK ...
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
+            }
+            return method.invoke(target, args);
+        }
+    }
+
+    private static InvocationTargetException unwrapException(InvocationTargetException ite) {
+        Throwable targetException = ite.getTargetException();
+        if (targetException != null && targetException instanceof InvocationTargetException) {
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
+            }
+            return (InvocationTargetException) targetException;
+        } else {
+            return ite;
+        }
+    }
+
+}
diff -r 06bc85a84d42 -r 791aab4989bf src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java	Thu Sep 05 15:10:38 2013 +0100
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java	Wed Jul 31 09:41:04 2013 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -282,13 +282,13 @@
     /**
      * Reflection utilities wrapper
      */
-    public static class Reflection {
+    static class Reflection {
         private static final PolicyLogger LOGGER = PolicyLogger.getLogger(PolicyUtils.Reflection.class);
 
         /**
          * Reflectively invokes specified method on the specified target
          */
-        public static <T> T invoke(final Object target, final String methodName,
+        static <T> T invoke(final Object target, final String methodName,
                 final Class<T> resultClass, final Object... parameters) throws RuntimePolicyUtilsException {
             Class[] parameterTypes;
             if (parameters != null && parameters.length > 0) {
@@ -311,7 +311,7 @@
                 final Object[] parameters, final Class[] parameterTypes) throws RuntimePolicyUtilsException {
             try {
                 final Method method = target.getClass().getMethod(methodName, parameterTypes);
-                final Object result = method.invoke(target, parameters);
+                final Object result = MethodUtil.invoke(target, method,parameters);
 
                 return resultClass.cast(result);
             } catch (IllegalArgumentException e) {
diff -r 06bc85a84d42 -r 791aab4989bf src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java	Thu Sep 05 15:10:38 2013 +0100
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java	Wed Jul 31 09:41:04 2013 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -157,7 +157,7 @@
                     if (!method.isAccessible()) {
                         method.setAccessible(true);
                     }
-                    method.invoke(instance,args);
+                    MethodUtil.invoke(instance,method,args);
                 } catch (IllegalAccessException e) {
                     throw new ServerRtException("server.rt.err",e);
                 } catch (InvocationTargetException e) {
diff -r 06bc85a84d42 -r 791aab4989bf src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java	Wed Jul 31 09:41:04 2013 -0400
@@ -0,0 +1,109 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can

From andrew at icedtea.classpath.org  Tue Oct 15 16:03:20 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 15 Oct 2013 23:03:20 +0000
Subject: /hg/release/icedtea7-forest-2.4/langtools: 2 new changesets
Message-ID: <hg.165f941f4b85.1381878200.1305664371660628365@icedtea.classpath.org>

changeset 165f941f4b85 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=165f941f4b85
author: robm
date: Tue Jul 09 03:31:34 2013 +0100

	8016653: javadoc should ignore ignoreable characters in names
	Reviewed-by: jjg


changeset 53fe95fe8b16 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=53fe95fe8b16
author: bpatel
date: Fri Jul 19 16:02:59 2013 -0700

	8016675: Make Javadoc pages more robust
	Reviewed-by: jlaskey, ksrini


diffstat:

 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java |  49 +++++++++-
 src/share/classes/com/sun/tools/javac/parser/Scanner.java                   |  42 +++++---
 2 files changed, 74 insertions(+), 17 deletions(-)

diffs (158 lines):

diff -r ee88e143d4ba -r 53fe95fe8b16 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Thu Sep 05 15:10:40 2013 +0100
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Fri Jul 19 16:02:59 2013 -0700
@@ -292,7 +292,7 @@
             script.addAttr(HtmlAttr.TYPE, "text/javascript");
             String scriptCode = "<!--" + DocletConstants.NL +
                     "    if (location.href.indexOf('is-external=true') == -1) {" + DocletConstants.NL +
-                    "        parent.document.title=\"" + winTitle + "\";" + DocletConstants.NL +
+                    "        parent.document.title=\"" + escapeJavaScriptChars(winTitle) + "\";" + DocletConstants.NL +
                     "    }" + DocletConstants.NL +
                     "//-->" + DocletConstants.NL;
             RawHtml scriptContent = new RawHtml(scriptCode);
@@ -302,6 +302,53 @@
     }
 
     /**
+     * Returns a String with escaped special JavaScript characters.
+     *
+     * @param s String that needs to be escaped
+     * @return a valid escaped JavaScript string
+     */
+    private static String escapeJavaScriptChars(String s) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < s.length(); i++) {
+            char ch = s.charAt(i);
+            switch (ch) {
+                case '\b':
+                    sb.append("\\b");
+                    break;
+                case '\t':
+                    sb.append("\\t");
+                    break;
+                case '\n':
+                    sb.append("\\n");
+                    break;
+                case '\f':
+                    sb.append("\\f");
+                    break;
+                case '\r':
+                    sb.append("\\r");
+                    break;
+                case '"':
+                    sb.append("\\\"");
+                    break;
+                case '\'':
+                    sb.append("\\\'");
+                    break;
+                case '\\':
+                    sb.append("\\\\");
+                    break;
+                default:
+                    if (ch < 32 || ch >= 127) {
+                        sb.append(String.format("\\u%04X", (int)ch));
+                    } else {
+                        sb.append(ch);
+                    }
+                    break;
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
      * Returns a content tree for the SCRIPT tag for the main page(index.html).
      *
      * @return a content for the SCRIPT tag
diff -r ee88e143d4ba -r 53fe95fe8b16 src/share/classes/com/sun/tools/javac/parser/Scanner.java
--- a/src/share/classes/com/sun/tools/javac/parser/Scanner.java	Thu Sep 05 15:10:40 2013 +0100
+++ b/src/share/classes/com/sun/tools/javac/parser/Scanner.java	Fri Jul 19 16:02:59 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, 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
@@ -501,11 +501,10 @@
     private void scanIdent() {
         boolean isJavaIdentifierPart;
         char high;
+        if (sp == sbuf.length) putChar(ch); else sbuf[sp++] = ch;
+        // optimization, was: putChar(ch);
+        scanChar();
         do {
-            if (sp == sbuf.length) putChar(ch); else sbuf[sp++] = ch;
-            // optimization, was: putChar(ch);
-
-            scanChar();
             switch (ch) {
             case 'A': case 'B': case 'C': case 'D': case 'E':
             case 'F': case 'G': case 'H': case 'I': case 'J':
@@ -522,6 +521,7 @@
             case '$': case '_':
             case '0': case '1': case '2': case '3': case '4':
             case '5': case '6': case '7': case '8': case '9':
+                break;
             case '\u0000': case '\u0001': case '\u0002': case '\u0003':
             case '\u0004': case '\u0005': case '\u0006': case '\u0007':
             case '\u0008': case '\u000E': case '\u000F': case '\u0010':
@@ -529,30 +529,37 @@
             case '\u0015': case '\u0016': case '\u0017':
             case '\u0018': case '\u0019': case '\u001B':
             case '\u007F':
-                break;
+                scanChar();
+                continue;
             case '\u001A': // EOI is also a legal identifier part
                 if (bp >= buflen) {
                     name = names.fromChars(sbuf, 0, sp);
                     token = keywords.key(name);
                     return;
                 }
-                break;
+                scanChar();
+                continue;
             default:
                 if (ch < '\u0080') {
                     // all ASCII range chars already handled, above
                     isJavaIdentifierPart = false;
                 } else {
-                    high = scanSurrogates();
-                    if (high != 0) {
-                        if (sp == sbuf.length) {
-                            putChar(high);
+                    if (Character.isIdentifierIgnorable(ch)) {
+                        scanChar();
+                        continue;
+                    } else {
+                        high = scanSurrogates();
+                        if (high != 0) {
+                            if (sp == sbuf.length) {
+                                putChar(high);
+                            } else {
+                                sbuf[sp++] = high;
+                            }
+                            isJavaIdentifierPart = Character.isJavaIdentifierPart(
+                                Character.toCodePoint(high, ch));
                         } else {
-                            sbuf[sp++] = high;
+                            isJavaIdentifierPart = Character.isJavaIdentifierPart(ch);
                         }
-                        isJavaIdentifierPart = Character.isJavaIdentifierPart(
-                            Character.toCodePoint(high, ch));
-                    } else {
-                        isJavaIdentifierPart = Character.isJavaIdentifierPart(ch);
                     }
                 }
                 if (!isJavaIdentifierPart) {
@@ -561,6 +568,9 @@
                     return;
                 }
             }
+            if (sp == sbuf.length) putChar(ch); else sbuf[sp++] = ch;
+            // optimization, was: putChar(ch);
+            scanChar();
         } while (true);
     }
 

From andrew at icedtea.classpath.org  Tue Oct 15 16:03:28 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 15 Oct 2013 23:03:28 +0000
Subject: /hg/release/icedtea7-forest-2.4/hotspot: 3 new changesets
Message-ID: <hg.785999574b47.1381878208.8708922617413201811@icedtea.classpath.org>

changeset 785999574b47 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=785999574b47
author: erikj
date: Mon Aug 19 17:50:26 2013 +0200

	8015614: Update build settings
	Reviewed-by: tbell, dholmes, ahgross


changeset 2a52e4b825e6 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2a52e4b825e6
author: sgabdura
date: Mon Jul 15 10:22:43 2013 +0400

	8016256: Make finalization final
	Reviewed-by: hseigel


changeset 1c5a7e22a4d6 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1c5a7e22a4d6
author: iklam
date: Sat Aug 24 00:14:46 2013 -0700

	8023683: Enhance class file parsing
	Summary: Use the value returned by REALLOC_RESOURCE_ARRAY()
	Reviewed-by: coleenp, ahgross


diffstat:

 make/windows/makefiles/compile.make        |   9 +++++++--
 make/windows/makefiles/sa.make             |   3 +++
 src/share/vm/classfile/classFileParser.cpp |  13 ++++++-------
 3 files changed, 16 insertions(+), 9 deletions(-)

diffs (91 lines):

diff -r 18ffb465e2ba -r 1c5a7e22a4d6 make/windows/makefiles/compile.make
--- a/make/windows/makefiles/compile.make	Fri Sep 20 19:17:16 2013 +0100
+++ b/make/windows/makefiles/compile.make	Sat Aug 24 00:14:46 2013 -0700
@@ -172,6 +172,7 @@
 PRODUCT_OPT_OPTION   = /O2 /Oy-
 FASTDEBUG_OPT_OPTION = /O2 /Oy-
 DEBUG_OPT_OPTION     = /Od
+SAFESEH_FLAG = /SAFESEH
 !endif
 
 !if "$(COMPILER_NAME)" == "VS2005"
@@ -190,6 +191,7 @@
 !if "x$(MT)" == "x"
 MT=mt.exe
 !endif
+SAFESEH_FLAG = /SAFESEH
 !endif
 
 !if "$(COMPILER_NAME)" == "VS2008"
@@ -203,6 +205,7 @@
 !if "x$(MT)" == "x"
 MT=mt.exe
 !endif
+SAFESEH_FLAG = /SAFESEH
 !endif
 
 !if "$(COMPILER_NAME)" == "VS2010"
@@ -216,9 +219,11 @@
 !if "x$(MT)" == "x"
 MT=mt.exe
 !endif
+SAFESEH_FLAG = /SAFESEH
+!endif
+
 !if "$(BUILDARCH)" == "i486"
-LD_FLAGS = /SAFESEH $(LD_FLAGS)
-!endif
+LD_FLAGS = $(SAFESEH_FLAG) $(LD_FLAGS)
 !endif
 
 # If NO_OPTIMIZATIONS is defined in the environment, turn everything off
diff -r 18ffb465e2ba -r 1c5a7e22a4d6 make/windows/makefiles/sa.make
--- a/make/windows/makefiles/sa.make	Fri Sep 20 19:17:16 2013 +0100
+++ b/make/windows/makefiles/sa.make	Sat Aug 24 00:14:46 2013 -0700
@@ -107,6 +107,9 @@
 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
 SA_LFLAGS = $(SA_LFLAGS) -map -debug
 !endif
+!if "$(BUILDARCH)" == "i486"
+SA_LFLAGS = $(SAFESEH_FLAG) $(SA_LFLAGS)
+!endif
 
 # Note that we do not keep sawindbj.obj around as it would then
 # get included in the dumpbin command in build_vm_def.sh
diff -r 18ffb465e2ba -r 1c5a7e22a4d6 src/share/vm/classfile/classFileParser.cpp
--- a/src/share/vm/classfile/classFileParser.cpp	Fri Sep 20 19:17:16 2013 +0100
+++ b/src/share/vm/classfile/classFileParser.cpp	Sat Aug 24 00:14:46 2013 -0700
@@ -2028,8 +2028,8 @@
           }
           if (lvt_cnt == max_lvt_cnt) {
             max_lvt_cnt <<= 1;
-            REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt);
-            REALLOC_RESOURCE_ARRAY(u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt);
+            localvariable_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt);
+            localvariable_table_start  = REALLOC_RESOURCE_ARRAY(u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt);
           }
           localvariable_table_start[lvt_cnt] =
             parse_localvariable_table(code_length,
@@ -2058,8 +2058,8 @@
           // Parse local variable type table
           if (lvtt_cnt == max_lvtt_cnt) {
             max_lvtt_cnt <<= 1;
-            REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt);
-            REALLOC_RESOURCE_ARRAY(u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt);
+            localvariable_type_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt);
+            localvariable_type_table_start  = REALLOC_RESOURCE_ARRAY(u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt);
           }
           localvariable_type_table_start[lvtt_cnt] =
             parse_localvariable_table(code_length,
@@ -4051,9 +4051,8 @@
   for (int index = 0; index < num_methods; index++) {
     methodOop m = (methodOop)methods->obj_at(index);
 
-    // skip private, static and <init> methods
-    if ((!m->is_private()) &&
-        (!m->is_static()) &&
+    // skip static and <init> methods
+    if ((!m->is_static()) &&
         (m->name() != vmSymbols::object_initializer_name())) {
 
       Symbol* name = m->name();

From andrew at icedtea.classpath.org  Tue Oct 15 16:03:41 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 15 Oct 2013 23:03:41 +0000
Subject: /hg/release/icedtea7-forest-2.4/jdk: 38 new changesets
Message-ID: <hg.752f90079bab.1381878221.9040506844232929411@icedtea.classpath.org>

changeset 752f90079bab in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=752f90079bab
author: okutsu
date: Fri Jul 19 15:32:01 2013 +0900

	8006900: Add new date/time capability
	Reviewed-by: mchung, hawtin


changeset 3bcfa217049f in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3bcfa217049f
author: dsamersoff
date: Mon Jul 08 14:34:36 2013 +0400

	8008589: Better MBean permission validation
	Summary: Better MBean permission validation
	Reviewed-by: skoivu, dfuchs, mchung, sjiang


changeset c07103437a0d in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c07103437a0d
author: ascarpino
date: Wed Jul 03 15:12:19 2013 -0700

	8011071: Better crypto provider handling
	Reviewed-by: hawtin, valeriep


changeset 09fa1d30e3fd in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=09fa1d30e3fd
author: jbachorik
date: Tue Apr 23 09:37:31 2013 +0200

	8011081: Improve jhat
	Summary: Properly escape HTML output
	Reviewed-by: alanb, mschoene, sundar


changeset 0f0a513e2706 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0f0a513e2706
author: msheppar
date: Fri Jun 14 17:28:36 2013 +0100

	8011157: Improve CORBA portablility
	Summary: fix also reviewed by Alexander Fomin
	Reviewed-by: alanb, coffeys, skoivu


changeset 1cdf150f14a0 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1cdf150f14a0
author: malenkov
date: Mon May 20 17:55:49 2013 +0400

	8012071: Better Building of Beans
	Reviewed-by: art, skoivu


changeset c50d396d7e58 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c50d396d7e58
author: erikj
date: Wed Oct 09 21:14:28 2013 +0100

	8012147: Improve tool support
	Summary: Adding libjli to jdk lib dir and removing now redundant rpath entries from executables
	Reviewed-by: alanb, dholmes, ksrini, ahgross


changeset 77b362782617 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=77b362782617
author: malenkov
date: Fri May 31 20:43:32 2013 +0400

	8012277: Improve AWT DataFlavor
	Reviewed-by: art, skoivu


changeset 5c09a3e36b0b in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5c09a3e36b0b
author: ksrini
date: Tue May 07 13:37:03 2013 -0700

	8013506: Better Pack200 data handling
	Reviewed-by: jrose, kizune, mschoene


changeset 1a39ad6278fc in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1a39ad6278fc
author: jchen
date: Thu May 09 11:23:18 2013 -0700

	8013510: Augment image writing code
	Reviewed-by: bae, prr


changeset c03122854276 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c03122854276
author: vadim
date: Mon May 13 13:24:30 2013 +0400

	8013514: Improve stability of cmap class
	Reviewed-by: mschoene, prr, bae


changeset 5946d358088f in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5946d358088f
author: weijun
date: Thu Jun 13 10:21:06 2013 +0800

	8013739: Better LDAP resource management
	Reviewed-by: ahgross, mchung, xuelei


changeset 5cb795ba0360 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5cb795ba0360
author: alexsch
date: Wed Oct 09 21:35:30 2013 +0100

	8013744: Better tabling for AWT
	Reviewed-by: art, malenkov, skoivu


changeset 297b32c26c3b in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=297b32c26c3b
author: jbachorik
date: Thu Jun 20 08:51:47 2013 +0200

	8014085: Better serialization support in JMX classes
	Reviewed-by: alanb, dfuchs, skoivu


changeset ca6f7b562a16 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ca6f7b562a16
author: bae
date: Fri May 17 16:47:51 2013 +0400

	8014093: Improve parsing of images
	Reviewed-by: prr


changeset 1fecf631a056 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1fecf631a056
author: jchen
date: Thu Jun 13 12:02:15 2013 -0700

	8014098: Better profile validation
	Reviewed-by: bae, prr


changeset 14baa8bbfcbc in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=14baa8bbfcbc
author: bae
date: Tue May 21 13:56:39 2013 +0400

	8014102: Improve image conversion
	Reviewed-by: prr


changeset 2165bf0627ee in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2165bf0627ee
author: weijun
date: Wed May 08 09:21:59 2013 +0800

	8014341: Better service from Kerberos servers
	Summary: read incoming data safely and take care of null return value
	Reviewed-by: valeriep, ahgross


changeset be3468cc1e90 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=be3468cc1e90
author: jfranck
date: Mon Jul 15 18:41:54 2013 +0200

	8014349: (cl) Class.getDeclaredClass problematic in some class loader configurations
	Reviewed-by: mchung, ahgross, darcy


changeset 0d6dc0748fc6 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0d6dc0748fc6
author: sjiang
date: Thu Jul 18 10:12:56 2013 +0200

	8014534: Better profiling support
	Summary: Validation of parameters
	Reviewed-by: sspitsyn, skoivu, mchung


changeset 767ba3a7b3b2 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=767ba3a7b3b2
author: smarks
date: Wed Jul 10 15:28:42 2013 -0700

	8014987: Augment serialization handling
	Reviewed-by: alanb, coffeys, skoivu


changeset 9fd9fac5f584 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9fd9fac5f584
author: erikj
date: Mon Aug 19 17:51:46 2013 +0200

	8015614: Update build settings
	Reviewed-by: tbell, dholmes, ahgross


changeset fd50e525c96e in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fd50e525c96e
author: weijun
date: Thu Jun 13 10:31:21 2013 +0800

	8015731: Subject java.security.auth.subject to improvements
	Reviewed-by: skoivu, mullan


changeset b4ee00591860 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b4ee00591860
author: michaelm
date: Wed Jul 03 17:54:38 2013 +0100

	8015743: Address internet addresses
	Summary: moved Inet6Address fields to holder class
	Reviewed-by: chegar, alanb, skoivu, khazra


changeset 1e9988e47afe in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1e9988e47afe
author: sgabdura
date: Tue Jul 23 10:01:25 2013 +0400

	8016357: Update hotspot diagnostic class
	Summary: Add security check to HotSpotDiagnostic.dumpHeap
	Reviewed-by: fparain, sla, ahgross


changeset 0b74761339e6 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0b74761339e6
author: mchung
date: Thu Jul 18 17:22:11 2013 -0700

	8017196: Ensure Proxies are handled appropriately
	Reviewed-by: dfuchs, jrose, jdn, ahgross, chegar


changeset baabb0b8f417 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=baabb0b8f417
author: bae
date: Mon Jul 01 20:20:50 2013 +0400

	8017287: Better resource disposal
	Reviewed-by: vadim


changeset 34fb14f5ccae in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=34fb14f5ccae
author: mchung
date: Mon Jul 15 03:40:16 2013 -0700

	8017291: Cast Proxies Aside
	Reviewed-by: alanb, ahgross


changeset 6f95d3f686e1 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6f95d3f686e1
author: sundar
date: Wed Oct 09 21:55:51 2013 +0100

	8017300: Improve Interface Implementation
	Reviewed-by: ahgross, jlaskey, mchung


changeset 39c79b1d3ec3 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=39c79b1d3ec3
author: sjiang
date: Tue Aug 06 16:04:14 2013 +0200

	8019292: Better Attribute Value Exceptions
	Reviewed-by: dfuchs, dholmes, ahgross


changeset acbfbe7516d4 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=acbfbe7516d4
author: malenkov
date: Tue Jul 16 21:00:34 2013 +0400

	8019617: Better view of objects
	Reviewed-by: art, skoivu


changeset ee9b6bc011c3 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ee9b6bc011c3
author: jchen
date: Mon Jul 22 14:06:39 2013 -0700

	8020293: JVM crash
	Reviewed-by: prr, jgodinez


changeset f6f6cf073753 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f6f6cf073753
author: serb
date: Mon Aug 12 21:33:59 2013 +0400

	8021275: Better screening for ScreenMenu
	Reviewed-by: art


changeset 9f8b93511a40 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9f8b93511a40
author: serb
date: Sun Aug 04 16:32:14 2013 +0400

	8021282: Better recycling of object instances
	Reviewed-by: art


changeset 6a3f4f71b88d in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6a3f4f71b88d
author: naoto
date: Thu Aug 01 14:15:27 2013 -0700

	8021286: Improve MacOS resourcing
	Reviewed-by: okutsu


changeset 9d21efd51b38 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9d21efd51b38
author: mullan
date: Tue Jul 30 17:20:22 2013 -0400

	8021290: Better signature validation
	Reviewed-by: xuelei, ahgross


changeset 0ee30041355e in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0ee30041355e
author: weijun
date: Sat Aug 17 06:51:46 2013 +0800

	8022931: Enhance Kerberos exceptions
	Reviewed-by: xuelei, ahgross


changeset 69ccd383db92 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=69ccd383db92
author: andrew
date: Thu Oct 10 00:17:59 2013 +0100

	Fix 8015743 to compile after 8020498.


diffstat:

 make/bridge/Jabswitch/Makefile                                                                    |    2 +-
 make/com/sun/jmx/Makefile                                                                         |    4 +-
 make/common/Program.gmk                                                                           |    3 -
 make/common/Release.gmk                                                                           |    7 +-
 make/java/management/mapfile-vers                                                                 |    2 +-
 make/sun/awt/FILES_c_macosx.gmk                                                                   |   28 -
 make/sun/awt/FILES_export_macosx.gmk                                                              |   29 -
 make/sun/awt/Makefile                                                                             |    2 -
 src/macosx/classes/com/apple/laf/AquaLookAndFeel.java                                             |    4 +-
 src/macosx/classes/com/apple/laf/AquaUtils.java                                                   |  193 ++-
 src/macosx/classes/com/apple/laf/ScreenMenu.java                                                  |  144 +-
 src/macosx/classes/com/apple/resources/MacOSXResourceBundle.java                                  |  110 --
 src/macosx/native/com/apple/resources/MacOSXResourceBundle.m                                      |  110 --
 src/share/classes/com/sun/crypto/provider/DHPrivateKey.java                                       |   18 +-
 src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java                                           |   26 +-
 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java                               |    5 +
 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java                               |    4 +-
 src/share/classes/com/sun/jndi/ldap/VersionHelper12.java                                          |   17 +-
 src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java                                 |    5 +
 src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java |   15 +-
 src/share/classes/com/sun/script/util/InterfaceImplementor.java                                   |   29 +-
 src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java                          |    2 +-
 src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java                               |   10 +-
 src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java                               |   10 +-
 src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java                      |    4 +-
 src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java                                  |    5 +-
 src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java                                 |   15 +-
 src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java                             |   17 +-
 src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java                          |    6 +-
 src/share/classes/java/awt/datatransfer/DataFlavor.java                                           |   50 +-
 src/share/classes/java/beans/Beans.java                                                           |    6 +
 src/share/classes/java/beans/DefaultPersistenceDelegate.java                                      |    3 +
 src/share/classes/java/beans/MetaData.java                                                        |   19 +-
 src/share/classes/java/io/ObjectInputStream.java                                                  |   15 +-
 src/share/classes/java/io/ObjectOutputStream.java                                                 |   20 +-
 src/share/classes/java/lang/Class.java                                                            |   12 +-
 src/share/classes/java/lang/ClassLoader.java                                                      |    8 +
 src/share/classes/java/lang/System.java                                                           |    4 +
 src/share/classes/java/lang/Thread.java                                                           |   24 +-
 src/share/classes/java/lang/invoke/MethodHandleNatives.java                                       |    2 +
 src/share/classes/java/lang/invoke/MethodHandles.java                                             |   15 +-
 src/share/classes/java/lang/reflect/Proxy.java                                                    |   16 +-
 src/share/classes/java/net/Inet6Address.java                                                      |  463 ++++++---
 src/share/classes/java/net/InetAddress.java                                                       |    7 +
 src/share/classes/java/util/TimeZone.java                                                         |   61 +-
 src/share/classes/javax/management/BadAttributeValueExpException.java                             |   26 +-
 src/share/classes/javax/management/MBeanNotificationInfo.java                                     |   22 +-
 src/share/classes/javax/management/MBeanTrustPermission.java                                      |   31 +-
 src/share/classes/javax/management/modelmbean/RequiredModelMBean.java                             |   10 +-
 src/share/classes/javax/management/remote/JMXPrincipal.java                                       |   23 +-
 src/share/classes/javax/management/remote/JMXServiceURL.java                                      |   99 +-
 src/share/classes/javax/management/remote/NotificationResult.java                                 |   53 +-
 src/share/classes/javax/management/remote/TargetedNotification.java                               |   34 +-
 src/share/classes/javax/management/remote/rmi/RMIConnector.java                                   |   29 +-
 src/share/classes/javax/security/auth/Subject.java                                                |    8 +-
 src/share/classes/javax/security/auth/kerberos/KeyTab.java                                        |   15 +-
 src/share/classes/javax/swing/JTable.java                                                         |   18 +-
 src/share/classes/javax/swing/UIDefaults.java                                                     |   12 +-
 src/share/classes/javax/swing/text/DefaultFormatter.java                                          |    8 +-
 src/share/classes/javax/swing/text/NumberFormatter.java                                           |    6 +-
 src/share/classes/javax/swing/text/html/ObjectView.java                                           |   28 +-
 src/share/classes/sun/font/FileFont.java                                                          |    4 +-
 src/share/classes/sun/font/GlyphLayout.java                                                       |    7 +-
 src/share/classes/sun/font/StandardGlyphVector.java                                               |    5 +-
 src/share/classes/sun/font/TrueTypeFont.java                                                      |    3 +
 src/share/classes/sun/java2d/Disposer.java                                                        |    7 +-
 src/share/classes/sun/management/HotSpotDiagnostic.java                                           |   12 +-
 src/share/classes/sun/misc/JavaLangAccess.java                                                    |    7 +
 src/share/classes/sun/reflect/misc/ReflectUtil.java                                               |   48 +
 src/share/classes/sun/security/ec/ECPrivateKeyImpl.java                                           |   10 +-
 src/share/classes/sun/security/jgss/GSSCredentialImpl.java                                        |    4 +-
 src/share/classes/sun/security/krb5/KdcComm.java                                                  |   12 +-
 src/share/classes/sun/security/krb5/internal/NetClient.java                                       |   10 +-
 src/share/classes/sun/security/pkcs/PKCS8Key.java                                                 |   13 +-
 src/share/classes/sun/security/pkcs11/P11Key.java                                                 |   48 +-
 src/share/classes/sun/security/provider/DSAPrivateKey.java                                        |    7 +-
 src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java                                      |   27 +-
 src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java                                         |    9 +-
 src/share/classes/sun/swing/SwingLazyValue.java                                                   |    3 +-
 src/share/classes/sun/swing/SwingUtilities2.java                                                  |   13 +
 src/share/demo/jvmti/hprof/hprof_class.c                                                          |   14 +-
 src/share/demo/jvmti/hprof/hprof_event.c                                                          |   27 +-
 src/share/lib/security/java.security-linux                                                        |    2 +
 src/share/lib/security/java.security-macosx                                                       |    2 +
 src/share/lib/security/java.security-solaris                                                      |    2 +
 src/share/lib/security/java.security-windows                                                      |    2 +
 src/share/native/com/sun/java/util/jar/pack/zip.cpp                                               |    8 +-
 src/share/native/java/lang/Class.c                                                                |    2 +-
 src/share/native/java/net/Inet6Address.c                                                          |   17 +-
 src/share/native/java/net/net_util.c                                                              |  124 ++-
 src/share/native/java/net/net_util.h                                                              |   17 +
 src/share/native/sun/awt/image/awt_parseImage.c                                                   |  455 +++------
 src/share/native/sun/awt/image/awt_parseImage.h                                                   |   11 +-
 src/share/native/sun/awt/image/jpeg/imageioJPEG.c                                                 |    9 +
 src/share/native/sun/awt/medialib/awt_ImagingLib.c                                                |  250 +---
 src/share/native/sun/font/layout/SunLayoutEngine.cpp                                              |    4 +
 src/share/native/sun/java2d/cmm/lcms/cmsio0.c                                                     |   26 +-
 src/share/native/sun/management/HotSpotDiagnostic.c                                               |    2 +-
 src/solaris/native/java/net/Inet6AddressImpl.c                                                    |   18 +-
 src/solaris/native/java/net/NetworkInterface.c                                                    |   18 +-
 src/solaris/native/java/net/PlainDatagramSocketImpl.c                                             |    3 +-
 src/solaris/native/java/net/net_util_md.c                                                         |    8 +-
 src/windows/native/java/net/Inet6AddressImpl.c                                                    |   16 +-
 src/windows/native/java/net/NetworkInterface.c                                                    |   16 +-
 src/windows/native/java/net/NetworkInterface_winXP.c                                              |   12 +-
 src/windows/native/java/net/TwoStacksPlainSocketImpl.c                                            |    7 +-
 test/Makefile                                                                                     |    2 +-
 test/java/lang/SecurityManager/CheckPackageAccess.java                                            |    1 +
 108 files changed, 1733 insertions(+), 1564 deletions(-)

diffs (truncated from 6171 to 500 lines):

diff -r e4ea4c3db76c -r 69ccd383db92 make/bridge/Jabswitch/Makefile
--- a/make/bridge/Jabswitch/Makefile	Tue Oct 08 16:37:50 2013 +0100
+++ b/make/bridge/Jabswitch/Makefile	Thu Oct 10 00:17:59 2013 +0100
@@ -53,7 +53,7 @@
 buildexe : 
 	$(CD) $(TEMPDIR)  
 	$(RC) $(RC_FLAGS) $(VERSIONINFO_RESOURCE) 
-	$(CC) $(CPPFLAGS) $(JAB_SRC) $(LDDFLAGS) $(VERSIONRES) -o $(JAB_EXE) 
+	$(CC) $(CPPFLAGS) $(JAB_SRC) $(VERSIONRES) /link $(LDDFLAGS) -out:$(JAB_EXE)
 	$(MT) /nologo /verbose /manifest $(JAB_MANIFEST_INP) /outputresource:$(JAB_EXE)  
 
 copyfilejab : 
diff -r e4ea4c3db76c -r 69ccd383db92 make/com/sun/jmx/Makefile
--- a/make/com/sun/jmx/Makefile	Tue Oct 08 16:37:50 2013 +0100
+++ b/make/com/sun/jmx/Makefile	Thu Oct 10 00:17:59 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2013, 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
@@ -130,11 +130,13 @@
 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
                 -d $(CLASSDESTDIR)              \
                 -iiop -v1.2                     \
+                -emitPermissionCheck            \
                 $(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
 	$(RMIC) $(HOTSPOT_INTERPRETER_FLAG) -classpath "$(CLASSDESTDIR)"    \
                 -d $(CLASSDESTDIR)              \
                 -iiop -v1.2                     \
                 -standardPackage                \
+                -emitPermissionCheck            \
                 $(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
 	@$(java-vm-cleanup)
 
diff -r e4ea4c3db76c -r 69ccd383db92 make/common/Program.gmk
--- a/make/common/Program.gmk	Tue Oct 08 16:37:50 2013 +0100
+++ b/make/common/Program.gmk	Thu Oct 10 00:17:59 2013 +0100
@@ -103,17 +103,14 @@
   ifeq ($(PLATFORM), solaris)
     ifeq ($(ARCH_DATA_MODEL), 32)
       LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli
-      LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli
     else # ! ARCH_DATA_MODEL 64-bit
       LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli
-      LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli
     endif # ARCH_DATA_MODEL
   endif # PLATFORM SOLARIS
   ifeq ($(PLATFORM), linux)
     LDFLAGS += $(LDFLAG_Z_ORIGIN)
     LDFLAGS += -Wl,--allow-shlib-undefined
     LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
-    LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
   endif # PLATFORM LINUX
 endif # PLATFORM linux solaris
 
diff -r e4ea4c3db76c -r 69ccd383db92 make/common/Release.gmk
--- a/make/common/Release.gmk	Tue Oct 08 16:37:50 2013 +0100
+++ b/make/common/Release.gmk	Thu Oct 10 00:17:59 2013 +0100
@@ -982,6 +982,11 @@
   endif
 	$(RM) -rf $(JDK_IMAGE_DIR)/jre/man
 	$(CHMOD) a+rx `$(FIND) $(JDK_IMAGE_DIR) -type d`
+  ifneq (,$(findstring $(PLATFORM), linux solaris)) # If linux or solaris 
+	($(CD) $(LIBDIR)/.. && $(TAR) cf - \
+	    `$(FIND) lib -name $(LIB_PREFIX)jli.$(LIB_SUFFIX) -print `) | \
+	    ($(CD) $(JDK_IMAGE_DIR) && $(TAR) xf -)
+  endif # PLATFORM
 
 initial-image-jdk64-bindemos:
 	for dir in bin demo ; do \
@@ -1030,7 +1035,7 @@
 		    initial-image-jdk-db \
 		    $(JDK_DOCFILES) \
 		    $(JDK_DEMOS_AND_SAMPLES_DOCFILES)
-	$(MKDIR) $(JDK_IMAGE_DIR)/lib
+	$(MKDIR) -p $(JDK_IMAGE_DIR)/lib
 	@#
 	@# Copy in the jars in lib that only belong in the JDK
 	@#
diff -r e4ea4c3db76c -r 69ccd383db92 make/java/management/mapfile-vers
--- a/make/java/management/mapfile-vers	Tue Oct 08 16:37:50 2013 +0100
+++ b/make/java/management/mapfile-vers	Thu Oct 10 00:17:59 2013 +0100
@@ -53,7 +53,7 @@
 	    Java_sun_management_GcInfoBuilder_fillGcAttributeInfo;
 	    Java_sun_management_GcInfoBuilder_getLastGcInfo0;
 	    Java_sun_management_GcInfoBuilder_getNumGcExtAttributes;
-	    Java_sun_management_HotSpotDiagnostic_dumpHeap;
+	    Java_sun_management_HotSpotDiagnostic_dumpHeap0;
 	    Java_sun_management_HotspotThread_getInternalThreadCount;
 	    Java_sun_management_HotspotThread_getInternalThreadTimes0;
 	    Java_sun_management_MemoryImpl_getMemoryManagers0;
diff -r e4ea4c3db76c -r 69ccd383db92 make/sun/awt/FILES_c_macosx.gmk
--- a/make/sun/awt/FILES_c_macosx.gmk	Tue Oct 08 16:37:50 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 1995, 2011, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# 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.
-#
-
-FILES_AWT_objc = \
-        $(TARGDIR)MacOSXResourceBundle.m
-
diff -r e4ea4c3db76c -r 69ccd383db92 make/sun/awt/FILES_export_macosx.gmk
--- a/make/sun/awt/FILES_export_macosx.gmk	Tue Oct 08 16:37:50 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#
-# Copyright (c) 1995, 2011, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# 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.
-#
-
-# FILES_export definitions for Mac OS X
-
-FILES_export += \
-	com/apple/resources/MacOSXResourceBundle.java
diff -r e4ea4c3db76c -r 69ccd383db92 make/sun/awt/Makefile
--- a/make/sun/awt/Makefile	Tue Oct 08 16:37:50 2013 +0100
+++ b/make/sun/awt/Makefile	Thu Oct 10 00:17:59 2013 +0100
@@ -145,8 +145,6 @@
 #
 # Files
 #
-include FILES_c_macosx.gmk
-include FILES_export_macosx.gmk
 
 FILES_objc = $(FILES_AWT_objc)
 OTHER_LDLIBS = -lmlib_image $(JVMLIB) $(LIBM) \
diff -r e4ea4c3db76c -r 69ccd383db92 src/macosx/classes/com/apple/laf/AquaLookAndFeel.java
--- a/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java	Tue Oct 08 16:37:50 2013 +0100
+++ b/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java	Thu Oct 10 00:17:59 2013 +0100
@@ -37,8 +37,6 @@
 import sun.swing.*;
 import apple.laf.*;
 
-import com.apple.resources.MacOSXResourceBundle;
-
 public class AquaLookAndFeel extends BasicLookAndFeel {
     static final String sOldPropertyPrefix = "com.apple.macos."; // old prefix for things like 'useScreenMenuBar'
     static final String sPropertyPrefix = "apple.laf."; // new prefix for things like 'useScreenMenuBar'
@@ -246,7 +244,7 @@
         table.setDefaultLocale(Locale.getDefault());
         table.addResourceBundle(PKG_PREFIX + "resources.aqua");
         try {
-            final ResourceBundle aquaProperties = MacOSXResourceBundle.getMacResourceBundle(PKG_PREFIX + "resources.aqua");
+            final ResourceBundle aquaProperties = ResourceBundle.getBundle(PKG_PREFIX + "resources.aqua");
             final Enumeration<String> propertyKeys = aquaProperties.getKeys();
 
             while (propertyKeys.hasMoreElements()) {
diff -r e4ea4c3db76c -r 69ccd383db92 src/macosx/classes/com/apple/laf/AquaUtils.java
--- a/src/macosx/classes/com/apple/laf/AquaUtils.java	Tue Oct 08 16:37:50 2013 +0100
+++ b/src/macosx/classes/com/apple/laf/AquaUtils.java	Thu Oct 10 00:17:59 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, 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
@@ -29,6 +29,7 @@
 import java.awt.image.*;
 import java.lang.ref.SoftReference;
 import java.lang.reflect.Method;
+import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.*;
 
@@ -41,56 +42,68 @@
 import sun.lwawt.macosx.CImage;
 import sun.lwawt.macosx.CImage.Creator;
 import sun.lwawt.macosx.CPlatformWindow;
+import sun.misc.Launcher;
+import sun.reflect.misc.ReflectUtil;
+import sun.security.action.GetPropertyAction;
 import sun.swing.SwingUtilities2;
 
 import com.apple.laf.AquaImageFactory.SlicedImageControl;
 
-public class AquaUtils {
-    final static String ANIMATIONS_SYSTEM_PROPERTY = "swing.enableAnimations";
+final class AquaUtils {
 
-    /*
+    private static final String ANIMATIONS_PROPERTY = "swing.enableAnimations";
+
+    /**
+     * Suppresses default constructor, ensuring non-instantiability.
+     */
+    private AquaUtils() {
+    }
+
+    /**
      * Convenience function for determining ComponentOrientation.  Helps us
      * avoid having Munge directives throughout the code.
      */
-    public static boolean isLeftToRight(final Component c) {
+    static boolean isLeftToRight(final Component c) {
         return c.getComponentOrientation().isLeftToRight();
     }
 
-    public static void enforceComponentOrientation(Component c, ComponentOrientation orientation) {
+    static void enforceComponentOrientation(final Component c, final ComponentOrientation orientation) {
         c.setComponentOrientation(orientation);
         if (c instanceof Container) {
-            for (Component child : ((Container)c).getComponents()) {
+            for (final Component child : ((Container)c).getComponents()) {
                 enforceComponentOrientation(child, orientation);
             }
         }
     }
 
-    private static CImage.Creator getCImageCreatorInternal() {
-        return java.security.AccessController.doPrivileged(new PrivilegedAction<CImage.Creator>() {
+    private static Creator getCImageCreatorInternal() {
+        return AccessController.doPrivileged(new PrivilegedAction<Creator>() {
+            @Override
             public Creator run() {
                 try {
                     final Method getCreatorMethod = CImage.class.getDeclaredMethod("getCreator", new Class[] {});
                     getCreatorMethod.setAccessible(true);
-                    return (CImage.Creator)getCreatorMethod.invoke(null, new Object[] {});
-                } catch (final Exception e) {
+                    return (Creator)getCreatorMethod.invoke(null, new Object[] {});
+                } catch (final Exception ignored) {
                     return null;
                 }
             }
         });
     }
 
-    private static final RecyclableSingleton<CImage.Creator> cImageCreator = new RecyclableSingleton<CImage.Creator>() {
+    private static final RecyclableSingleton<Creator> cImageCreator = new RecyclableSingleton<Creator>() {
         @Override
         protected Creator getInstance() {
             return getCImageCreatorInternal();
         }
     };
-    static CImage.Creator getCImageCreator() {
+    static Creator getCImageCreator() {
         return cImageCreator.get();
     }
 
-    protected static Image generateSelectedDarkImage(final Image image) {
+    static Image generateSelectedDarkImage(final Image image) {
         final ImageProducer prod = new FilteredImageSource(image.getSource(), new IconImageFilter() {
+            @Override
             int getGreyFor(final int gray) {
                 return gray * 75 / 100;
             }
@@ -98,8 +111,9 @@
         return Toolkit.getDefaultToolkit().createImage(prod);
     }
 
-    protected static Image generateDisabledImage(final Image image) {
+    static Image generateDisabledImage(final Image image) {
         final ImageProducer prod = new FilteredImageSource(image.getSource(), new IconImageFilter() {
+            @Override
             int getGreyFor(final int gray) {
                 return 255 - ((255 - gray) * 65 / 100);
             }
@@ -107,19 +121,20 @@
         return Toolkit.getDefaultToolkit().createImage(prod);
     }
 
-    protected static Image generateLightenedImage(final Image image, final int percent) {
+    static Image generateLightenedImage(final Image image, final int percent) {
         final GrayFilter filter = new GrayFilter(true, percent);
         final ImageProducer prod = new FilteredImageSource(image.getSource(), filter);
         return Toolkit.getDefaultToolkit().createImage(prod);
     }
 
-    static abstract class IconImageFilter extends RGBImageFilter {
-        public IconImageFilter() {
+    private abstract static class IconImageFilter extends RGBImageFilter {
+        IconImageFilter() {
             super();
             canFilterIndexColorModel = true;
         }
 
-        public int filterRGB(final int x, final int y, final int rgb) {
+        @Override
+        public final int filterRGB(final int x, final int y, final int rgb) {
             final int red = (rgb >> 16) & 0xff;
             final int green = (rgb >> 8) & 0xff;
             final int blue = rgb & 0xff;
@@ -135,14 +150,14 @@
             return result;
         }
 
-        abstract int getGreyFor(final int gray);
+        abstract int getGreyFor(int gray);
     }
 
-    public abstract static class RecyclableObject<T> {
-        protected SoftReference<T> objectRef = null;
+    abstract static class RecyclableObject<T> {
+        private SoftReference<T> objectRef;
 
-        public T get() {
-            T referent = null;
+        T get() {
+            T referent;
             if (objectRef != null && (referent = objectRef.get()) != null) return referent;
             referent = create();
             objectRef = new SoftReference<T>(referent);
@@ -152,8 +167,8 @@
         protected abstract T create();
     }
 
-    public abstract static class RecyclableSingleton<T> {
-        public T get() {
+    abstract static class RecyclableSingleton<T> {
+        final T get() {
             final AppContext appContext = AppContext.getAppContext();
             SoftReference<T> ref = (SoftReference<T>) appContext.get(this);
             if (ref != null) {
@@ -166,38 +181,36 @@
             return object;
         }
 
-        public void reset() {
-            AppContext appContext = AppContext.getAppContext();
-            appContext.remove(this);
+        void reset() {
+            AppContext.getAppContext().remove(this);
         }
 
-        protected abstract T getInstance();
+        abstract T getInstance();
     }
 
-    public static class RecyclableSingletonFromDefaultConstructor<T> extends RecyclableSingleton<T> {
-        protected final Class<T> clazz;
+    static class RecyclableSingletonFromDefaultConstructor<T> extends RecyclableSingleton<T> {
+        private final Class<T> clazz;
 
-        public RecyclableSingletonFromDefaultConstructor(final Class<T> clazz) {
+        RecyclableSingletonFromDefaultConstructor(final Class<T> clazz) {
             this.clazz = clazz;
         }
 
-        protected T getInstance() {
+        @Override
+        T getInstance() {
             try {
+                ReflectUtil.checkPackageAccess(clazz);
                 return clazz.newInstance();
-            } catch (final InstantiationException e) {
-                e.printStackTrace();
-            } catch (final IllegalAccessException e) {
-                e.printStackTrace();
+            } catch (InstantiationException | IllegalAccessException ignored) {
             }
             return null;
         }
     }
 
-    public abstract static class LazyKeyedSingleton<K, V> {
-        protected Map<K, V> refs;
+    abstract static class LazyKeyedSingleton<K, V> {
+        private Map<K, V> refs;
 
-        public V get(final K key) {
-            if (refs == null) refs = new HashMap<K, V>();
+        V get(final K key) {
+            if (refs == null) refs = new HashMap<>();
 
             final V cachedValue = refs.get(key);
             if (cachedValue != null) return cachedValue;
@@ -207,44 +220,45 @@
             return value;
         }
 
-        protected abstract V getInstance(final K key);
+        protected abstract V getInstance(K key);
     }
 
-    static final RecyclableSingleton<Boolean> enableAnimations = new RecyclableSingleton<Boolean>() {
+    private static final RecyclableSingleton<Boolean> enableAnimations = new RecyclableSingleton<Boolean>() {
         @Override
         protected Boolean getInstance() {
-            final String sizeProperty = (String)java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.GetPropertyAction(ANIMATIONS_SYSTEM_PROPERTY));
-            return new Boolean(!"false".equals(sizeProperty)); // should be true by default
+            final String sizeProperty = (String) AccessController.doPrivileged((PrivilegedAction<?>)new GetPropertyAction(
+                    ANIMATIONS_PROPERTY));
+            return !"false".equals(sizeProperty); // should be true by default
         }
     };
-    static boolean animationsEnabled() {
+    private static boolean animationsEnabled() {
         return enableAnimations.get();
     }
 
-    static final int MENU_BLINK_DELAY = 50; // 50ms == 3/60 sec, according to the spec
-    protected static void blinkMenu(final Selectable selectable) {
+    private static final int MENU_BLINK_DELAY = 50; // 50ms == 3/60 sec, according to the spec
+    static void blinkMenu(final Selectable selectable) {
         if (!animationsEnabled()) return;
         try {
             selectable.paintSelected(false);
             Thread.sleep(MENU_BLINK_DELAY);
             selectable.paintSelected(true);
             Thread.sleep(MENU_BLINK_DELAY);
-        } catch (final InterruptedException e) { }
+        } catch (final InterruptedException ignored) { }
     }
 
     interface Selectable {
-        void paintSelected(final boolean selected);
+        void paintSelected(boolean selected);
     }
 
     interface JComponentPainter {
-        public void paint(JComponent c, Graphics g, int x, int y, int w, int h);
+        void paint(JComponent c, Graphics g, int x, int y, int w, int h);
     }
 
     interface Painter {
-        public void paint(final Graphics g, int x, int y, int w, int h);
+        void paint(Graphics g, int x, int y, int w, int h);
     }
 
-    public static void paintDropShadowText(final Graphics g, final JComponent c, final Font font, final FontMetrics metrics, final int x, final int y, final int offsetX, final int offsetY, final Color textColor, final Color shadowColor, final String text) {
+    static void paintDropShadowText(final Graphics g, final JComponent c, final Font font, final FontMetrics metrics, final int x, final int y, final int offsetX, final int offsetY, final Color textColor, final Color shadowColor, final String text) {
         g.setFont(font);
         g.setColor(shadowColor);
         SwingUtilities2.drawString(c, g, text, x + offsetX, y + offsetY + metrics.getAscent());
@@ -252,22 +266,22 @@
         SwingUtilities2.drawString(c, g, text, x, y + metrics.getAscent());
     }
 
-    public static class ShadowBorder implements Border {
-        final Painter prePainter;
-        final Painter postPainter;
+    static class ShadowBorder implements Border {
+        private final Painter prePainter;
+        private final Painter postPainter;
 
-        final int offsetX;
-        final int offsetY;
-        final float distance;
-        final int blur;
-        final Insets insets;
-        final ConvolveOp blurOp;
+        private final int offsetX;
+        private final int offsetY;
+        private final float distance;
+        private final int blur;
+        private final Insets insets;
+        private final ConvolveOp blurOp;
 
-        public ShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur) {
+        ShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur) {
             this.prePainter = prePainter; this.postPainter = postPainter;
             this.offsetX = offsetX; this.offsetY = offsetY; this.distance = distance; this.blur = blur;
             final int halfBlur = blur / 2;
-            this.insets = new Insets(halfBlur - offsetY, halfBlur - offsetX, halfBlur + offsetY, halfBlur + offsetX);
+            insets = new Insets(halfBlur - offsetY, halfBlur - offsetX, halfBlur + offsetY, halfBlur + offsetX);

From andrew at icedtea.classpath.org  Tue Oct 15 16:11:36 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 15 Oct 2013 23:11:36 +0000
Subject: /hg/release/icedtea7-forest-2.3/corba: 3 new changesets
Message-ID: <hg.98f4e72a6c49.1381878696.-5398653327640076568@icedtea.classpath.org>

changeset 98f4e72a6c49 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=98f4e72a6c49
author: msheppar
date: Fri Jun 14 17:45:07 2013 +0100

	8011157: Improve CORBA portablility
	Summary: fix also reviewed by Alexander Fomin
	Reviewed-by: alanb, coffeys, skoivu


changeset 0c63d0547372 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=0c63d0547372
author: mchung
date: Thu Jul 18 17:22:25 2013 -0700

	8017196: Ensure Proxies are handled appropriately
	Reviewed-by: dfuchs, jrose, jdn, ahgross, chegar


changeset 3850cca0da9a in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=3850cca0da9a
author: msheppar
date: Mon Aug 19 17:01:51 2013 +0100

	8022940: Enhance CORBA translations
	Reviewed-by: coffeys, alanb, skoivu


diffstat:

 src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java        |  24 ---
 src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java |  14 +-
 src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java                        |   4 +-
 src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java   |  11 +
 src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java                                     |  80 +++++++++-
 5 files changed, 102 insertions(+), 31 deletions(-)

diffs (290 lines):

diff -r db25aa0380d9 -r 3850cca0da9a src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java	Wed Sep 04 17:52:30 2013 +0100
+++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java	Mon Aug 19 17:01:51 2013 +0100
@@ -905,28 +905,4 @@
 
         return contents.toString();
     }
-
-    public static void main(String[] args) {
-
-        Class remoteInterface = java.rmi.Remote.class;
-
-        if( args.length > 0 ) {
-            String className = args[0];
-            try {
-                remoteInterface = Class.forName(className);
-            } catch(Exception e) {
-                e.printStackTrace();
-                System.exit(-1);
-            }
-        }
-
-        System.out.println("Building name translation for " + remoteInterface);
-        try {
-            IDLNameTranslator nameTranslator =
-                IDLNameTranslatorImpl.get(remoteInterface);
-            System.out.println(nameTranslator);
-        } catch(IllegalStateException ise) {
-            ise.printStackTrace();
-        }
-    }
 }
diff -r db25aa0380d9 -r 3850cca0da9a src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java	Wed Sep 04 17:52:30 2013 +0100
+++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java	Mon Aug 19 17:01:51 2013 +0100
@@ -43,6 +43,8 @@
 import com.sun.corba.se.spi.orbutil.proxy.DelegateInvocationHandlerImpl ;
 import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandler ;
 import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandlerImpl ;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 
 public class InvocationHandlerFactoryImpl implements InvocationHandlerFactory
 {
@@ -114,24 +116,32 @@
         // which extends org.omg.CORBA.Object.  This handler delegates all
         // calls directly to a DynamicStubImpl, which extends
         // org.omg.CORBA.portable.ObjectImpl.
-        InvocationHandler dynamicStubHandler =
+        final InvocationHandler dynamicStubHandler =
             DelegateInvocationHandlerImpl.create( stub ) ;
 
         // Create an invocation handler that handles any remote interface
         // methods.
-        InvocationHandler stubMethodHandler = new StubInvocationHandlerImpl(
+        final InvocationHandler stubMethodHandler = new StubInvocationHandlerImpl(
             pm, classData, stub ) ;
 
         // Create a composite handler that handles the DynamicStub interface
         // as well as the remote interfaces.
         final CompositeInvocationHandler handler =
             new CustomCompositeInvocationHandlerImpl( stub ) ;
+
+        AccessController.doPrivileged(new PrivilegedAction<Void>() {
+            @Override
+            public Void run() {
         handler.addInvocationHandler( DynamicStub.class,
             dynamicStubHandler ) ;
         handler.addInvocationHandler( org.omg.CORBA.Object.class,
             dynamicStubHandler ) ;
         handler.addInvocationHandler( Object.class,
             dynamicStubHandler ) ;
+                return null;
+            }
+        });
+
 
         // If the method passed to invoke is not from DynamicStub or its superclasses,
         // it must be from an implemented interface, so we just handle
diff -r db25aa0380d9 -r 3850cca0da9a src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java	Wed Sep 04 17:52:30 2013 +0100
+++ b/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java	Mon Aug 19 17:01:51 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -55,7 +55,7 @@
 /**
  * @author Harold Carr
  */
-public class SelectorImpl
+class SelectorImpl
     extends
         Thread
     implements
diff -r db25aa0380d9 -r 3850cca0da9a src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java
--- a/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java	Wed Sep 04 17:52:30 2013 +0100
+++ b/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java	Mon Aug 19 17:01:51 2013 +0100
@@ -36,6 +36,7 @@
 
 import com.sun.corba.se.spi.logging.CORBALogDomains ;
 import com.sun.corba.se.impl.logging.ORBUtilSystemException ;
+import com.sun.corba.se.impl.presentation.rmi.DynamicAccessPermission;
 
 public class CompositeInvocationHandlerImpl implements
     CompositeInvocationHandler
@@ -46,11 +47,13 @@
     public void addInvocationHandler( Class interf,
         InvocationHandler handler )
     {
+        checkAccess();
         classToInvocationHandler.put( interf, handler ) ;
     }
 
     public void setDefaultHandler( InvocationHandler handler )
     {
+        checkAccess();
         defaultHandler = handler ;
     }
 
@@ -78,4 +81,12 @@
 
         return handler.invoke( proxy, method, args ) ;
     }
+
+    private static final DynamicAccessPermission perm = new DynamicAccessPermission("access");
+    private void checkAccess() {
+        final SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPermission(perm);
 }
+    }
+}
diff -r db25aa0380d9 -r 3850cca0da9a src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java
--- a/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java	Wed Sep 04 17:52:30 2013 +0100
+++ b/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java	Mon Aug 19 17:01:51 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, 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
@@ -34,6 +34,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.SerializablePermission;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Vector;
 import java.util.Hashtable;
 import java.util.Enumeration;
@@ -49,6 +52,7 @@
 import com.sun.corba.se.impl.util.PackagePrefixChecker;
 import sun.rmi.rmic.Main;
 
+
 /**
  * An IIOP stub/tie generator for rmic.
  *
@@ -78,6 +82,7 @@
     protected boolean castArray = false;
     protected Hashtable transactionalObjects = new Hashtable() ;
     protected boolean POATie = false ;
+    protected boolean emitPermissionCheck = false;
 
     /**
      * Default constructor for Main to use.
@@ -193,6 +198,9 @@
                     } else if (argv[i].equals("-standardPackage")) {
                         standardPackage = true;
                         argv[i] = null;
+                    } else if (argv[i].equals("-emitPermissionCheck")) {
+                        emitPermissionCheck = true;
+                        argv[i] = null;
                     } else if (arg.equals("-xstubbase")) {
                         argv[i] = null;
                         if (++i < argv.length && argv[i] != null && !argv[i].startsWith("-")) {
@@ -390,9 +398,22 @@
 
         writePackageAndImports(p);
 
+//        generate
+//        import java.security.AccessController;
+//        import java.security.PrivilegedAction;
+//        import java.io.SerializablePermission;
+        if (emitPermissionCheck) {
+            p.pln("import java.security.AccessController;");
+            p.pln("import java.security.PrivilegedAction;");
+            p.pln("import java.io.SerializablePermission;");
+            p.pln();
+            p.pln();
+        }
+
         // Declare the stub class; implement all remote interfaces.
 
         p.p("public class " + currentClass);
+
         p.p(" extends " + getName(stubBaseClass));
         p.p(" implements ");
         if (remoteInterfaces.length > 0) {
@@ -422,6 +443,56 @@
         writeIds( p, theType, false );
         p.pln();
 
+        if (emitPermissionCheck) {
+
+            // produce the following generated code
+            // private static Void checkPermission() {
+            // SecurityManager sm = System.getSecurityManager();
+            // if (sm != null) {
+            //     sm.checkPermission(new SerializablePermission(
+            // "enableSubclassImplementation")); // testing
+            // }
+            // return null;
+            // }
+            //
+            // private _XXXXXX_Stub(Void ignore) {
+            // }
+            //
+            // public _XXXXXX_Stub() {
+            // this(checkPermission());
+            // }
+            // where XXXXXX is the name of the remote interface
+
+                p.pln();
+                p.plnI("private static Void checkPermission() {");
+                p.plnI("SecurityManager sm = System.getSecurityManager();");
+                p.pln("if (sm != null) {");
+                p.pI();
+                p.plnI("sm.checkPermission(new SerializablePermission(");
+                p.plnI("\"enableSubclassImplementation\"));");
+                p.pO();
+                p.pO();
+                p.pOln("}");
+                p.pln("return null;");
+                p.pO();
+                p.pOln("}");
+                p.pln();
+                p.pO();
+
+                p.pI();
+                p.pln("private " + currentClass + "(Void ignore) {  }");
+                p.pln();
+
+                p.plnI("public " + currentClass + "() { ");
+                p.pln("this(checkPermission());");
+                p.pOln("}");
+                p.pln();
+        }
+
+       if (!emitPermissionCheck) {
+            p.pI();
+       }
+
         // Write the _ids() method...
 
         p.plnI("public String[] _ids() { ");
@@ -815,7 +886,6 @@
                             CompoundType theType) throws IOException {
 
         // Wtite the method declaration and opening brace...
-
         String methodName = method.getName();
         String methodIDLName = method.getIDLName();
 
@@ -1631,7 +1701,7 @@
 
         // Write data members...
         p.pln();
-        p.pln("private " + getName(theType) + " target = null;");
+        p.pln("volatile private " + getName(theType) + " target = null;");
         p.pln();
 
         // Write the ids...
@@ -1695,6 +1765,10 @@
 
         if (remoteMethods.length > 0) {
             p.plnI("try {");
+            p.pln(getName(theType) + " target = this.target;");
+            p.plnI("if (target == null) {");
+            p.pln("throw new java.io.IOException();");
+            p.pOln("}");
             p.plnI(idExtInputStream + " "+in+" = ");
             p.pln("(" + idExtInputStream + ") "+_in+";");
             p.pO();

From andrew at icedtea.classpath.org  Tue Oct 15 16:11:44 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 15 Oct 2013 23:11:44 +0000
Subject: /hg/release/icedtea7-forest-2.3/jaxp: 4 new changesets
Message-ID: <hg.d31a609466d9.1381878704.-8576357044606977631@icedtea.classpath.org>

changeset d31a609466d9 in /hg/release/icedtea7-forest-2.3/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=d31a609466d9
author: joehw
date: Thu Oct 10 16:18:30 2013 +0100

	8013503: Improve stream factories
	Reviewed-by: alanb, dfuchs, mullan


changeset f5d8437f4407 in /hg/release/icedtea7-forest-2.3/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=f5d8437f4407
author: joehw
date: Thu Oct 10 16:30:46 2013 +0100

	8012425: Transform TransformerFactory
	Reviewed-by: alanb, dfuchs, mullan


changeset 00f1d7d220a9 in /hg/release/icedtea7-forest-2.3/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=00f1d7d220a9
author: joehw
date: Thu Oct 10 16:45:02 2013 +0100

	8017298: Better XML support
	Reviewed-by: alanb, dfuchs, mullan


changeset aeaabc10209e in /hg/release/icedtea7-forest-2.3/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=aeaabc10209e
author: joehw
date: Fri Oct 11 11:35:02 2013 +0100

	8014530: Better digital signature processing
	Reviewed-by: alanb, dfuchs, mullan, lancea


diffstat:

 src/com/sun/org/apache/xalan/internal/XalanConstants.java                                      |  110 ++
 src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java                               |   50 +
 src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java                            |  449 ++++++++
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java                               |   16 +
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java                                |   24 +-
 src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java                     |    4 +-
 src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java                   |   10 +
 src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java                          |    8 +
 src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java                                     |   25 +
 src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java                           |   10 +-
 src/com/sun/org/apache/xerces/internal/impl/Constants.java                                     |  109 +-
 src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java                               |   12 +-
 src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java                    |    4 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java                             |   64 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java                |   48 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java                              |   51 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java                      |    4 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java                                    |   54 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties                         |   11 +-
 src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java                       |   22 +-
 src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java              |    3 +-
 src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java                      |    6 +-
 src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java                           |   12 +-
 src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java                                 |   41 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java                  |   23 +
 src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java                |   14 +
 src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java              |   36 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java               |    6 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java                   |   16 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java |   45 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java             |    7 +
 src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java                          |   37 +-
 src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java                                  |    2 +
 src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java                      |    5 +-
 src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java                         |   72 +-
 src/com/sun/org/apache/xerces/internal/util/SecurityManager.java                               |  226 ----
 src/com/sun/org/apache/xerces/internal/util/SymbolTable.java                                   |    4 +-
 src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java                              |   52 +
 src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java                             |  236 ++++
 src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java                           |  521 ++++++++++
 src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java                           |   10 +-
 src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java                                |   57 +-
 src/com/sun/xml/internal/stream/Entity.java                                                    |    2 +-
 src/javax/xml/stream/FactoryFinder.java                                                        |   23 +-
 src/javax/xml/stream/XMLEventFactory.java                                                      |   14 +-
 src/javax/xml/stream/XMLInputFactory.java                                                      |   15 +-
 src/javax/xml/stream/XMLOutputFactory.java                                                     |   13 +-
 47 files changed, 2149 insertions(+), 434 deletions(-)

diffs (truncated from 4095 to 500 lines):

diff -r aac1cda37627 -r aeaabc10209e src/com/sun/org/apache/xalan/internal/XalanConstants.java
--- a/src/com/sun/org/apache/xalan/internal/XalanConstants.java	Thu Aug 08 23:15:34 2013 +0100
+++ b/src/com/sun/org/apache/xalan/internal/XalanConstants.java	Fri Oct 11 11:35:02 2013 +0100
@@ -40,6 +40,116 @@
 
     //
     // Constants
+    //Xerces security manager
+    public static final String SECURITY_MANAGER =
+            "http://apache.org/xml/properties/security-manager";
+
+    //
+    // Implementation limits: API properties
+    //
+    /** Oracle JAXP property prefix ("http://www.oracle.com/xml/jaxp/properties/"). */
+    public static final String ORACLE_JAXP_PROPERTY_PREFIX =
+        "http://www.oracle.com/xml/jaxp/properties/";
+    /**
+     * JDK entity expansion limit; Note that the existing system property
+     * "entityExpansionLimit" with no prefix is still observed
+     */
+    public static final String JDK_ENTITY_EXPANSION_LIMIT =
+            ORACLE_JAXP_PROPERTY_PREFIX + "entityExpansionLimit";
+
+    /**
+     * JDK element attribute limit; Note that the existing system property
+     * "elementAttributeLimit" with no prefix is still observed
+     */
+    public static final String JDK_ELEMENT_ATTRIBUTE_LIMIT =
+            ORACLE_JAXP_PROPERTY_PREFIX + "elementAttributeLimit";
+
+    /**
+     * JDK maxOccur limit; Note that the existing system property
+     * "maxOccurLimit" with no prefix is still observed
+     */
+    public static final String JDK_MAX_OCCUR_LIMIT =
+            ORACLE_JAXP_PROPERTY_PREFIX + "maxOccurLimit";
+
+    /**
+     * JDK total entity size limit
+     */
+    public static final String JDK_TOTAL_ENTITY_SIZE_LIMIT =
+            ORACLE_JAXP_PROPERTY_PREFIX + "totalEntitySizeLimit";
+
+    /**
+     * JDK maximum general entity size limit
+     */
+    public static final String JDK_GENEAL_ENTITY_SIZE_LIMIT =
+            ORACLE_JAXP_PROPERTY_PREFIX + "maxGeneralEntitySizeLimit";
+    /**
+     * JDK maximum parameter entity size limit
+     */
+    public static final String JDK_PARAMETER_ENTITY_SIZE_LIMIT =
+            ORACLE_JAXP_PROPERTY_PREFIX + "maxParameterEntitySizeLimit";
+    /**
+     * JDK maximum XML name limit
+     */
+    public static final String JDK_XML_NAME_LIMIT =
+            ORACLE_JAXP_PROPERTY_PREFIX + "maxXMLNameLimit";
+    /**
+     * JDK property indicating whether the parser shall print out entity
+     * count information
+     * Value: a string "yes" means print, "no" or any other string means not.
+     */
+    public static final String JDK_ENTITY_COUNT_INFO =
+            ORACLE_JAXP_PROPERTY_PREFIX + "getEntityCountInfo";
+
+    //
+    // Implementation limits: corresponding System Properties of the above
+    // API properties
+    //
+    /**
+     * JDK entity expansion limit; Note that the existing system property
+     * "entityExpansionLimit" with no prefix is still observed
+     */
+    public static final String SP_ENTITY_EXPANSION_LIMIT = "jdk.xml.entityExpansionLimit";
+
+    /**
+     * JDK element attribute limit; Note that the existing system property
+     * "elementAttributeLimit" with no prefix is still observed
+     */
+    public static final String SP_ELEMENT_ATTRIBUTE_LIMIT =  "jdk.xml.elementAttributeLimit";
+
+    /**
+     * JDK maxOccur limit; Note that the existing system property
+     * "maxOccurLimit" with no prefix is still observed
+     */
+    public static final String SP_MAX_OCCUR_LIMIT = "jdk.xml.maxOccurLimit";
+
+    /**
+     * JDK total entity size limit
+     */
+    public static final String SP_TOTAL_ENTITY_SIZE_LIMIT = "jdk.xml.totalEntitySizeLimit";
+
+    /**
+     * JDK maximum general entity size limit
+     */
+    public static final String SP_GENEAL_ENTITY_SIZE_LIMIT = "jdk.xml.maxGeneralEntitySizeLimit";
+    /**
+     * JDK maximum parameter entity size limit
+     */
+    public static final String SP_PARAMETER_ENTITY_SIZE_LIMIT = "jdk.xml.maxParameterEntitySizeLimit";
+    /**
+     * JDK maximum XML name limit
+     */
+    public static final String SP_XML_NAME_LIMIT = "jdk.xml.maxXMLNameLimit";
+
+    //legacy System Properties
+    public final static String ENTITY_EXPANSION_LIMIT = "entityExpansionLimit";
+    public static final String ELEMENT_ATTRIBUTE_LIMIT = "elementAttributeLimit" ;
+    public final static String MAX_OCCUR_LIMIT = "maxOccurLimit";
+
+    /**
+     * A string "yes" that can be used for properties such as getEntityCountInfo
+     */
+    public static final String JDK_YES = "yes";
+
     //
     // Oracle Feature:
         /**
diff -r aac1cda37627 -r aeaabc10209e src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java
--- a/src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java	Thu Aug 08 23:15:34 2013 +0100
+++ b/src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java	Fri Oct 11 11:35:02 2013 +0100
@@ -26,6 +26,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 
 import java.security.AccessController;
@@ -36,6 +37,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
+import java.util.Properties;
 
 /**
  * This class is duplicated for each subpackage so keep it in sync. It is
@@ -200,6 +202,54 @@
                 })).longValue();
     }
 
+    /**
+     * Read from $java.home/lib/jaxp.properties for the specified property
+     * The program
+     *
+     * @param propertyId the Id of the property
+     * @return the value of the property
+     */
+    static String readJAXPProperty(String propertyId) {
+        String value = null;
+        InputStream is = null;
+        try {
+            if (firstTime) {
+                synchronized (cacheProps) {
+                    if (firstTime) {
+                        String configFile = getSystemProperty("java.home") + File.separator +
+                            "lib" + File.separator + "jaxp.properties";
+                        File f = new File(configFile);
+                        if (getFileExists(f)) {
+                            is = getFileInputStream(f);
+                            cacheProps.load(is);
+                        }
+                        firstTime = false;
+                    }
+                }
+            }
+            value = cacheProps.getProperty(propertyId);
+
+        }
+        catch (Exception ex) {}
+        finally {
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (IOException ex) {}
+            }
+        }
+        return value;
+    }
+
+    /**
+     * Cache for properties in java.home/lib/jaxp.properties
+     */
+    static final Properties cacheProps = new Properties();
+
+    /**
+     * Flag indicating if the program has tried reading java.home/lib/jaxp.properties
+     */
+    static volatile boolean firstTime = true;
 
     private SecuritySupport() {
     }
diff -r aac1cda37627 -r aeaabc10209e src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java	Fri Oct 11 11:35:02 2013 +0100
@@ -0,0 +1,449 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package com.sun.org.apache.xalan.internal.utils;
+
+import com.sun.org.apache.xalan.internal.XalanConstants;
+
+
+/**
+ * This class is not the same as that in Xerces. It is used to manage the
+ * state of corresponding Xerces properties and pass the values over to
+ * the Xerces Security Manager.
+ *
+ * @author Joe Wang Oracle Corp.
+ *
+ */
+public final class XMLSecurityManager {
+
+    /**
+     * States of the settings of a property, in the order: default value, value
+     * set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system
+     * properties, and jaxp api properties
+     */
+    public static enum State {
+        //this order reflects the overriding order
+
+        DEFAULT("default"), FSP("FEATURE_SECURE_PROCESSING"),
+        JAXPDOTPROPERTIES("jaxp.properties"), SYSTEMPROPERTY("system property"),
+        APIPROPERTY("property");
+
+        final String literal;
+        State(String literal) {
+            this.literal = literal;
+        }
+
+        String literal() {
+            return literal;
+        }
+    }
+
+    /**
+     * Limits managed by the security manager
+     */
+    public static enum Limit {
+
+        ENTITY_EXPANSION_LIMIT(XalanConstants.JDK_ENTITY_EXPANSION_LIMIT,
+                XalanConstants.SP_ENTITY_EXPANSION_LIMIT, 0, 64000),
+        MAX_OCCUR_NODE_LIMIT(XalanConstants.JDK_MAX_OCCUR_LIMIT,
+                XalanConstants.SP_MAX_OCCUR_LIMIT, 0, 5000),
+        ELEMENT_ATTRIBUTE_LIMIT(XalanConstants.JDK_ELEMENT_ATTRIBUTE_LIMIT,
+                XalanConstants.SP_ELEMENT_ATTRIBUTE_LIMIT, 0, 10000),
+        TOTAL_ENTITY_SIZE_LIMIT(XalanConstants.JDK_TOTAL_ENTITY_SIZE_LIMIT,
+                XalanConstants.SP_TOTAL_ENTITY_SIZE_LIMIT, 0, 50000000),
+        GENEAL_ENTITY_SIZE_LIMIT(XalanConstants.JDK_GENEAL_ENTITY_SIZE_LIMIT,
+                XalanConstants.SP_GENEAL_ENTITY_SIZE_LIMIT, 0, 0),
+        PARAMETER_ENTITY_SIZE_LIMIT(XalanConstants.JDK_PARAMETER_ENTITY_SIZE_LIMIT,
+                XalanConstants.SP_PARAMETER_ENTITY_SIZE_LIMIT, 0, 1000000);
+
+        final String apiProperty;
+        final String systemProperty;
+        final int defaultValue;
+        final int secureValue;
+
+        Limit(String apiProperty, String systemProperty, int value, int secureValue) {
+            this.apiProperty = apiProperty;
+            this.systemProperty = systemProperty;
+            this.defaultValue = value;
+            this.secureValue = secureValue;
+        }
+
+        public boolean equalsAPIPropertyName(String propertyName) {
+            return (propertyName == null) ? false : apiProperty.equals(propertyName);
+        }
+
+        public boolean equalsSystemPropertyName(String propertyName) {
+            return (propertyName == null) ? false : systemProperty.equals(propertyName);
+        }
+
+        public String apiProperty() {
+            return apiProperty;
+        }
+
+        String systemProperty() {
+            return systemProperty;
+        }
+
+        int defaultValue() {
+            return defaultValue;
+        }
+
+        int secureValue() {
+            return secureValue;
+        }
+    }
+
+    /**
+     * Map old property names with the new ones
+     */
+    public static enum NameMap {
+
+        ENTITY_EXPANSION_LIMIT(XalanConstants.SP_ENTITY_EXPANSION_LIMIT,
+                XalanConstants.ENTITY_EXPANSION_LIMIT),
+        MAX_OCCUR_NODE_LIMIT(XalanConstants.SP_MAX_OCCUR_LIMIT,
+                XalanConstants.MAX_OCCUR_LIMIT),
+        ELEMENT_ATTRIBUTE_LIMIT(XalanConstants.SP_ELEMENT_ATTRIBUTE_LIMIT,
+                XalanConstants.ELEMENT_ATTRIBUTE_LIMIT);
+        final String newName;
+        final String oldName;
+
+        NameMap(String newName, String oldName) {
+            this.newName = newName;
+            this.oldName = oldName;
+        }
+
+        String getOldName(String newName) {
+            if (newName.equals(this.newName)) {
+                return oldName;
+            }
+            return null;
+        }
+    }
+    /**
+     * Values of the properties
+     */
+    private final int[] values;
+    /**
+     * States of the settings for each property
+     */
+    private State[] states;
+    /**
+     * States that determine if properties are set explicitly
+     */
+    private boolean[] isSet;
+
+
+    /**
+     * Index of the special entityCountInfo property
+     */
+    private int indexEntityCountInfo = 10000;
+    private String printEntityCountInfo = "";
+
+    /**
+     * Default constructor. Establishes default values for known security
+     * vulnerabilities.
+     */
+    public XMLSecurityManager() {
+        this(false);
+    }
+
+    /**
+     * Instantiate Security Manager in accordance with the status of
+     * secure processing
+     * @param secureProcessing
+     */
+    public XMLSecurityManager(boolean secureProcessing) {
+        values = new int[Limit.values().length];
+        states = new State[Limit.values().length];
+        isSet = new boolean[Limit.values().length];
+        for (Limit limit : Limit.values()) {
+            if (secureProcessing) {
+                values[limit.ordinal()] = limit.secureValue();
+                states[limit.ordinal()] = State.FSP;
+            } else {
+                values[limit.ordinal()] = limit.defaultValue();
+                states[limit.ordinal()] = State.DEFAULT;
+            }
+        }
+        //read system properties or jaxp.properties
+        readSystemProperties();
+    }
+
+    /**
+     * Setting FEATURE_SECURE_PROCESSING explicitly
+     */
+    public void setSecureProcessing(boolean secure) {
+        for (Limit limit : Limit.values()) {
+            if (secure) {
+                setLimit(limit.ordinal(), State.FSP, limit.secureValue());
+            } else {
+                setLimit(limit.ordinal(), State.FSP, limit.defaultValue());
+            }
+        }
+    }
+
+    /**
+     * Set limit by property name and state
+     * @param propertyName property name
+     * @param state the state of the property
+     * @param value the value of the property
+     * @return true if the property is managed by the security manager; false
+     *              if otherwise.
+     */
+    public boolean setLimit(String propertyName, State state, Object value) {
+        int index = getIndex(propertyName);
+        if (index > -1) {
+            setLimit(index, state, value);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Set the value for a specific limit.
+     *
+     * @param limit the limit
+     * @param state the state of the property
+     * @param value the value of the property
+     */
+    public void setLimit(Limit limit, State state, int value) {
+        setLimit(limit.ordinal(), state, value);
+    }
+
+    /**
+     * Set the value of a property by its index
+     *
+     * @param index the index of the property
+     * @param state the state of the property
+     * @param value the value of the property
+     */
+    public void setLimit(int index, State state, Object value) {
+        if (index == indexEntityCountInfo) {
+            //if it's explicitly set, it's treated as yes no matter the value
+            printEntityCountInfo = (String)value;
+        } else {
+            int temp = 0;
+            try {
+                temp = Integer.parseInt((String) value);
+                if (temp < 0) {
+                    temp = 0;
+                }
+            } catch (NumberFormatException e) {}
+            setLimit(index, state, temp);        }
+    }
+
+    /**
+     * Set the value of a property by its index
+     *
+     * @param index the index of the property
+     * @param state the state of the property
+     * @param value the value of the property
+     */
+    public void setLimit(int index, State state, int value) {
+        if (index == indexEntityCountInfo) {
+            //if it's explicitly set, it's treated as yes no matter the value
+            printEntityCountInfo = XalanConstants.JDK_YES;
+        } else {
+            //only update if it shall override
+            if (state.compareTo(states[index]) >= 0) {
+                values[index] = value;
+                states[index] = state;
+                isSet[index] = true;
+            }
+        }
+    }
+
+
+    /**
+     * Return the value of the specified property.
+     *
+     * @param propertyName the property name
+     * @return the value of the property as a string. If a property is managed
+     * by this manager, its value shall not be null.
+     */
+    public String getLimitAsString(String propertyName) {
+        int index = getIndex(propertyName);
+        if (index > -1) {

From andrew at icedtea.classpath.org  Tue Oct 15 16:11:51 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 15 Oct 2013 23:11:51 +0000
Subject: /hg/release/icedtea7-forest-2.3/jaxws: 8017505: Better Client Se...
Message-ID: <hg.fea85f749421.1381878711.6608279449221239120@icedtea.classpath.org>

changeset fea85f749421 in /hg/release/icedtea7-forest-2.3/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=fea85f749421
author: mkos
date: Wed Jul 31 09:41:04 2013 -0400

	8017505: Better Client Service
	Reviewed-by: mullan, ahgross, mgrebac


diffstat:

 src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java     |    4 +-
 src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java           |  109 ++++++++++
 src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java           |  109 ++++++++++
 src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java              |   27 ++-
 src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java   |  107 +++++++++
 src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java  |    8 +-
 src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java |    4 +-
 src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java               |  109 ++++++++++
 8 files changed, 464 insertions(+), 13 deletions(-)

diffs (truncated from 600 to 500 lines):

diff -r 3cbb617cd2e4 -r fea85f749421 src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java	Thu Aug 08 23:15:27 2013 +0100
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java	Wed Jul 31 09:41:04 2013 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -232,7 +232,7 @@
             public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException {
                 T t = resolve(p);
                 try {
-                    return m.invoke(t, args );
+                    return MethodUtil.invoke(t, m, args );
                 } finally {
                     postInvoke(p,t);
                 }
diff -r 3cbb617cd2e4 -r fea85f749421 src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java	Wed Jul 31 09:41:04 2013 -0400
@@ -0,0 +1,109 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
+ * to java.lang,reflect.Method.invoke()
+ *
+ * Be careful, copy of this class exists in several packages, iny modification must be done to other copies too!
+ */
+class MethodUtil {
+
+    private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
+    private static final Method INVOKE_METHOD;
+
+    static {
+        Method method;
+        try {
+            Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
+            method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
+            }
+        } catch (Throwable t) {
+            method = null;
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
+            }
+        }
+        INVOKE_METHOD = method;
+    }
+
+    static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
+        if (INVOKE_METHOD != null) {
+            // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
+            }
+            try {
+                return INVOKE_METHOD.invoke(null, method, target, args);
+            } catch (InvocationTargetException ite) {
+                // unwrap invocation exception added by reflection code ...
+                throw unwrapException(ite);
+            }
+        } else {
+            // other then Oracle JDK ...
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
+            }
+            return method.invoke(target, args);
+        }
+    }
+
+    private static InvocationTargetException unwrapException(InvocationTargetException ite) {
+        Throwable targetException = ite.getTargetException();
+        if (targetException != null && targetException instanceof InvocationTargetException) {
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
+            }
+            return (InvocationTargetException) targetException;
+        } else {
+            return ite;
+        }
+    }
+
+}
diff -r 3cbb617cd2e4 -r fea85f749421 src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java	Wed Jul 31 09:41:04 2013 -0400
@@ -0,0 +1,109 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.xml.internal.ws.client.sei;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
+ * to java.lang,reflect.Method.invoke()
+ * <p/>
+ * Be careful, copy of this class exists in several packages, iny modification must be done to other copies too!
+ */
+class MethodUtil {
+
+    private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
+    private static final Method INVOKE_METHOD;
+
+    static {
+        Method method;
+        try {
+            Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
+            method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
+            }
+        } catch (Throwable t) {
+            method = null;
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
+            }
+        }
+        INVOKE_METHOD = method;
+    }
+
+    static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
+        if (INVOKE_METHOD != null) {
+            // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
+            }
+            try {
+                return INVOKE_METHOD.invoke(null, method, target, args);
+            } catch (InvocationTargetException ite) {
+                // unwrap invocation exception added by reflection code ...
+                throw unwrapException(ite);
+            }
+        } else {
+            // other then Oracle JDK ...
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
+            }
+            return method.invoke(target, args);
+        }
+    }
+
+    private static InvocationTargetException unwrapException(InvocationTargetException ite) {
+        Throwable targetException = ite.getTargetException();
+        if (targetException != null && targetException instanceof InvocationTargetException) {
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
+            }
+            return (InvocationTargetException) targetException;
+        } else {
+            return ite;
+        }
+    }
+
+}
diff -r 3cbb617cd2e4 -r fea85f749421 src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java	Thu Aug 08 23:15:27 2013 +0100
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java	Wed Jul 31 09:41:04 2013 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -28,17 +28,20 @@
 import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.Nullable;
 import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
 import com.sun.xml.internal.ws.api.client.WSPortInfo;
-import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
 import com.sun.xml.internal.ws.api.message.Header;
 import com.sun.xml.internal.ws.api.message.Headers;
 import com.sun.xml.internal.ws.api.message.Packet;
 import com.sun.xml.internal.ws.api.model.MEP;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
+import com.sun.xml.internal.ws.api.pipe.Fiber;
 import com.sun.xml.internal.ws.api.pipe.Tube;
-import com.sun.xml.internal.ws.api.pipe.Fiber;
 import com.sun.xml.internal.ws.binding.BindingImpl;
-import com.sun.xml.internal.ws.client.*;
+import com.sun.xml.internal.ws.client.RequestContext;
+import com.sun.xml.internal.ws.client.ResponseContextReceiver;
+import com.sun.xml.internal.ws.client.Stub;
+import com.sun.xml.internal.ws.client.WSServiceDelegate;
 import com.sun.xml.internal.ws.model.JavaMethodImpl;
 import com.sun.xml.internal.ws.model.SOAPSEIModel;
 import com.sun.xml.internal.ws.wsdl.OperationDispatcher;
@@ -47,6 +50,8 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -124,13 +129,14 @@
     private final Map<Method, MethodHandler> methodHandlers = new HashMap<Method, MethodHandler>();
 
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        validateInputs(proxy, method);
         MethodHandler handler = methodHandlers.get(method);
         if (handler != null) {
             return handler.invoke(proxy, args);
         } else {
             // we handle the other method invocations by ourselves
             try {
-                return method.invoke(this, args);
+                return MethodUtil.invoke(this, method, args);
             } catch (IllegalAccessException e) {
                 // impossible
                 throw new AssertionError(e);
@@ -142,6 +148,17 @@
         }
     }
 
+    private void validateInputs(Object proxy, Method method) {
+        if (proxy == null || !Proxy.isProxyClass(proxy.getClass())) {
+            throw new IllegalStateException("Passed object is not proxy!");
+        }
+        Class<?> declaringClass = method.getDeclaringClass();
+        if (method == null || declaringClass == null
+                || Modifier.isStatic(method.getModifiers())) {
+            throw new IllegalStateException("Invoking static method is not allowed!");
+        }
+    }
+
     public final Packet doProcess(Packet request, RequestContext rc, ResponseContextReceiver receiver) {
         return super.process(request, rc, receiver);
     }
diff -r 3cbb617cd2e4 -r fea85f749421 src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java	Wed Jul 31 09:41:04 2013 -0400
@@ -0,0 +1,107 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.xml.internal.ws.policy.privateutil;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
+ * to java.lang,reflect.Method.invoke()
+ */
+class MethodUtil {
+
+    private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
+    private static final Method INVOKE_METHOD;
+
+    static {
+        Method method;
+        try {
+            Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
+            method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
+            }
+        } catch (Throwable t) {
+            method = null;
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
+            }
+        }
+        INVOKE_METHOD = method;
+    }
+
+    static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
+        if (INVOKE_METHOD != null) {
+            // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
+            }
+            try {
+                return INVOKE_METHOD.invoke(null, method, target, args);
+            } catch (InvocationTargetException ite) {
+                // unwrap invocation exception added by reflection code ...
+                throw unwrapException(ite);
+            }
+        } else {
+            // other then Oracle JDK ...
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
+            }
+            return method.invoke(target, args);
+        }
+    }
+
+    private static InvocationTargetException unwrapException(InvocationTargetException ite) {
+        Throwable targetException = ite.getTargetException();
+        if (targetException != null && targetException instanceof InvocationTargetException) {
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
+            }
+            return (InvocationTargetException) targetException;
+        } else {
+            return ite;
+        }
+    }
+
+}
diff -r 3cbb617cd2e4 -r fea85f749421 src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java	Thu Aug 08 23:15:27 2013 +0100
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java	Wed Jul 31 09:41:04 2013 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -282,13 +282,13 @@
     /**
      * Reflection utilities wrapper
      */
-    public static class Reflection {
+    static class Reflection {
         private static final PolicyLogger LOGGER = PolicyLogger.getLogger(PolicyUtils.Reflection.class);
 
         /**
          * Reflectively invokes specified method on the specified target
          */
-        public static <T> T invoke(final Object target, final String methodName,
+        static <T> T invoke(final Object target, final String methodName,
                 final Class<T> resultClass, final Object... parameters) throws RuntimePolicyUtilsException {
             Class[] parameterTypes;
             if (parameters != null && parameters.length > 0) {
@@ -311,7 +311,7 @@
                 final Object[] parameters, final Class[] parameterTypes) throws RuntimePolicyUtilsException {
             try {
                 final Method method = target.getClass().getMethod(methodName, parameterTypes);
-                final Object result = method.invoke(target, parameters);
+                final Object result = MethodUtil.invoke(target, method,parameters);
 
                 return resultClass.cast(result);
             } catch (IllegalArgumentException e) {
diff -r 3cbb617cd2e4 -r fea85f749421 src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java	Thu Aug 08 23:15:27 2013 +0100
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java	Wed Jul 31 09:41:04 2013 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -157,7 +157,7 @@
                     if (!method.isAccessible()) {
                         method.setAccessible(true);
                     }
-                    method.invoke(instance,args);
+                    MethodUtil.invoke(instance,method,args);
                 } catch (IllegalAccessException e) {
                     throw new ServerRtException("server.rt.err",e);
                 } catch (InvocationTargetException e) {
diff -r 3cbb617cd2e4 -r fea85f749421 src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java	Wed Jul 31 09:41:04 2013 -0400
@@ -0,0 +1,109 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can

From andrew at icedtea.classpath.org  Tue Oct 15 16:11:58 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 15 Oct 2013 23:11:58 +0000
Subject: /hg/release/icedtea7-forest-2.3/langtools: 2 new changesets
Message-ID: <hg.06ac20b9a119.1381878718.3891785841192760046@icedtea.classpath.org>

changeset 06ac20b9a119 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=06ac20b9a119
author: bpatel
date: Fri Jul 19 16:02:59 2013 -0700

	8016675: Make Javadoc pages more robust
	Reviewed-by: jlaskey, ksrini


changeset 42a5c234b641 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=42a5c234b641
author: robm
date: Tue Jul 09 03:31:34 2013 +0100

	8016653: javadoc should ignore ignoreable characters in names
	Reviewed-by: jjg


diffstat:

 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java |  49 +++++++++-
 src/share/classes/com/sun/tools/javac/parser/Scanner.java                   |  42 +++++---
 2 files changed, 74 insertions(+), 17 deletions(-)

diffs (158 lines):

diff -r f5971bf5bc5e -r 42a5c234b641 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Thu Aug 08 23:17:58 2013 +0100
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Tue Jul 09 03:31:34 2013 +0100
@@ -292,7 +292,7 @@
             script.addAttr(HtmlAttr.TYPE, "text/javascript");
             String scriptCode = "<!--" + DocletConstants.NL +
                     "    if (location.href.indexOf('is-external=true') == -1) {" + DocletConstants.NL +
-                    "        parent.document.title=\"" + winTitle + "\";" + DocletConstants.NL +
+                    "        parent.document.title=\"" + escapeJavaScriptChars(winTitle) + "\";" + DocletConstants.NL +
                     "    }" + DocletConstants.NL +
                     "//-->" + DocletConstants.NL;
             RawHtml scriptContent = new RawHtml(scriptCode);
@@ -302,6 +302,53 @@
     }
 
     /**
+     * Returns a String with escaped special JavaScript characters.
+     *
+     * @param s String that needs to be escaped
+     * @return a valid escaped JavaScript string
+     */
+    private static String escapeJavaScriptChars(String s) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < s.length(); i++) {
+            char ch = s.charAt(i);
+            switch (ch) {
+                case '\b':
+                    sb.append("\\b");
+                    break;
+                case '\t':
+                    sb.append("\\t");
+                    break;
+                case '\n':
+                    sb.append("\\n");
+                    break;
+                case '\f':
+                    sb.append("\\f");
+                    break;
+                case '\r':
+                    sb.append("\\r");
+                    break;
+                case '"':
+                    sb.append("\\\"");
+                    break;
+                case '\'':
+                    sb.append("\\\'");
+                    break;
+                case '\\':
+                    sb.append("\\\\");
+                    break;
+                default:
+                    if (ch < 32 || ch >= 127) {
+                        sb.append(String.format("\\u%04X", (int)ch));
+                    } else {
+                        sb.append(ch);
+                    }
+                    break;
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
      * Returns a content tree for the SCRIPT tag for the main page(index.html).
      *
      * @return a content for the SCRIPT tag
diff -r f5971bf5bc5e -r 42a5c234b641 src/share/classes/com/sun/tools/javac/parser/Scanner.java
--- a/src/share/classes/com/sun/tools/javac/parser/Scanner.java	Thu Aug 08 23:17:58 2013 +0100
+++ b/src/share/classes/com/sun/tools/javac/parser/Scanner.java	Tue Jul 09 03:31:34 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, 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
@@ -501,11 +501,10 @@
     private void scanIdent() {
         boolean isJavaIdentifierPart;
         char high;
+        if (sp == sbuf.length) putChar(ch); else sbuf[sp++] = ch;
+        // optimization, was: putChar(ch);
+        scanChar();
         do {
-            if (sp == sbuf.length) putChar(ch); else sbuf[sp++] = ch;
-            // optimization, was: putChar(ch);
-
-            scanChar();
             switch (ch) {
             case 'A': case 'B': case 'C': case 'D': case 'E':
             case 'F': case 'G': case 'H': case 'I': case 'J':
@@ -522,6 +521,7 @@
             case '$': case '_':
             case '0': case '1': case '2': case '3': case '4':
             case '5': case '6': case '7': case '8': case '9':
+                break;
             case '\u0000': case '\u0001': case '\u0002': case '\u0003':
             case '\u0004': case '\u0005': case '\u0006': case '\u0007':
             case '\u0008': case '\u000E': case '\u000F': case '\u0010':
@@ -529,30 +529,37 @@
             case '\u0015': case '\u0016': case '\u0017':
             case '\u0018': case '\u0019': case '\u001B':
             case '\u007F':
-                break;
+                scanChar();
+                continue;
             case '\u001A': // EOI is also a legal identifier part
                 if (bp >= buflen) {
                     name = names.fromChars(sbuf, 0, sp);
                     token = keywords.key(name);
                     return;
                 }
-                break;
+                scanChar();
+                continue;
             default:
                 if (ch < '\u0080') {
                     // all ASCII range chars already handled, above
                     isJavaIdentifierPart = false;
                 } else {
-                    high = scanSurrogates();
-                    if (high != 0) {
-                        if (sp == sbuf.length) {
-                            putChar(high);
+                    if (Character.isIdentifierIgnorable(ch)) {
+                        scanChar();
+                        continue;
+                    } else {
+                        high = scanSurrogates();
+                        if (high != 0) {
+                            if (sp == sbuf.length) {
+                                putChar(high);
+                            } else {
+                                sbuf[sp++] = high;
+                            }
+                            isJavaIdentifierPart = Character.isJavaIdentifierPart(
+                                Character.toCodePoint(high, ch));
                         } else {
-                            sbuf[sp++] = high;
+                            isJavaIdentifierPart = Character.isJavaIdentifierPart(ch);
                         }
-                        isJavaIdentifierPart = Character.isJavaIdentifierPart(
-                            Character.toCodePoint(high, ch));
-                    } else {
-                        isJavaIdentifierPart = Character.isJavaIdentifierPart(ch);
                     }
                 }
                 if (!isJavaIdentifierPart) {
@@ -561,6 +568,9 @@
                     return;
                 }
             }
+            if (sp == sbuf.length) putChar(ch); else sbuf[sp++] = ch;
+            // optimization, was: putChar(ch);
+            scanChar();
         } while (true);
     }
 

From andrew at icedtea.classpath.org  Tue Oct 15 16:12:04 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 15 Oct 2013 23:12:04 +0000
Subject: /hg/release/icedtea7-forest-2.3/hotspot: 3 new changesets
Message-ID: <hg.01fe4d85c01c.1381878724.4308599361692689988@icedtea.classpath.org>

changeset 01fe4d85c01c in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=01fe4d85c01c
author: erikj
date: Thu Oct 10 16:41:17 2013 +0100

	8015614: Update build settings
	Reviewed-by: tbell, dholmes, ahgross


changeset 22ef5097ef1a in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=22ef5097ef1a
author: sgabdura
date: Mon Jul 15 10:22:43 2013 +0400

	8016256: Make finalization final
	Reviewed-by: hseigel


changeset a34906833a8a in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=a34906833a8a
author: iklam
date: Sat Aug 24 00:14:46 2013 -0700

	8023683: Enhance class file parsing
	Summary: Use the value returned by REALLOC_RESOURCE_ARRAY()
	Reviewed-by: coleenp, ahgross


diffstat:

 make/windows/makefiles/compile.make        |   7 +++++--
 make/windows/makefiles/sa.make             |   3 +++
 src/share/vm/classfile/classFileParser.cpp |  13 ++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diffs (88 lines):

diff -r fa3171a9cec3 -r a34906833a8a make/windows/makefiles/compile.make
--- a/make/windows/makefiles/compile.make	Thu Sep 19 00:00:25 2013 +0100
+++ b/make/windows/makefiles/compile.make	Sat Aug 24 00:14:46 2013 -0700
@@ -140,6 +140,7 @@
 !if "$(MSC_VER)" == "1600"
 COMPILER_NAME=VS2010
 !endif
+SAFESEH_FLAG = /SAFESEH
 !endif
 
 # By default, we do not want to use the debug version of the msvcrt.dll file
@@ -170,6 +171,7 @@
 PRODUCT_OPT_OPTION   = /O2 /Oy-
 FASTDEBUG_OPT_OPTION = /O2 /Oy-
 DEBUG_OPT_OPTION     = /Od
+SAFESEH_FLAG = /SAFESEH
 !endif
 
 !if "$(COMPILER_NAME)" == "VS2005"
@@ -186,6 +188,7 @@
 # Manifest Tool - used in VS2005 and later to adjust manifests stored
 # as resources inside build artifacts.
 MT=mt.exe
+SAFESEH_FLAG = /SAFESEH
 !endif
 
 !if "$(COMPILER_NAME)" == "VS2008"
@@ -209,8 +212,8 @@
 # as resources inside build artifacts.
 MT=mt.exe
 !if "$(BUILDARCH)" == "i486"
-LD_FLAGS = /SAFESEH $(LD_FLAGS)
-!endif
+LD_FLAGS = $(SAFESEH_FLAG) $(LD_FLAGS)
+SAFESEH_FLAG = /SAFESEH
 !endif
 
 # Compile for space above time.
diff -r fa3171a9cec3 -r a34906833a8a make/windows/makefiles/sa.make
--- a/make/windows/makefiles/sa.make	Thu Sep 19 00:00:25 2013 +0100
+++ b/make/windows/makefiles/sa.make	Sat Aug 24 00:14:46 2013 -0700
@@ -107,6 +107,9 @@
 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
 SA_LFLAGS = $(SA_LFLAGS) /map /debug
 !endif
+!if "$(BUILDARCH)" == "i486"
+SA_LFLAGS = $(SAFESEH_FLAG) $(SA_LFLAGS)
+!endif
 
 # Note that we do not keep sawindbj.obj around as it would then
 # get included in the dumpbin command in build_vm_def.sh
diff -r fa3171a9cec3 -r a34906833a8a src/share/vm/classfile/classFileParser.cpp
--- a/src/share/vm/classfile/classFileParser.cpp	Thu Sep 19 00:00:25 2013 +0100
+++ b/src/share/vm/classfile/classFileParser.cpp	Sat Aug 24 00:14:46 2013 -0700
@@ -1821,8 +1821,8 @@
           }
           if (lvt_cnt == max_lvt_cnt) {
             max_lvt_cnt <<= 1;
-            REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt);
-            REALLOC_RESOURCE_ARRAY(u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt);
+            localvariable_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt);
+            localvariable_table_start  = REALLOC_RESOURCE_ARRAY(u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt);
           }
           localvariable_table_start[lvt_cnt] =
             parse_localvariable_table(code_length,
@@ -1851,8 +1851,8 @@
           // Parse local variable type table
           if (lvtt_cnt == max_lvtt_cnt) {
             max_lvtt_cnt <<= 1;
-            REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt);
-            REALLOC_RESOURCE_ARRAY(u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt);
+            localvariable_type_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt);
+            localvariable_type_table_start  = REALLOC_RESOURCE_ARRAY(u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt);
           }
           localvariable_type_table_start[lvtt_cnt] =
             parse_localvariable_table(code_length,
@@ -3762,9 +3762,8 @@
   for (int index = 0; index < num_methods; index++) {
     methodOop m = (methodOop)methods->obj_at(index);
 
-    // skip private, static and <init> methods
-    if ((!m->is_private()) &&
-        (!m->is_static()) &&
+    // skip static and <init> methods
+    if ((!m->is_static()) &&
         (m->name() != vmSymbols::object_initializer_name())) {
 
       Symbol* name = m->name();

From andrew at icedtea.classpath.org  Tue Oct 15 16:12:15 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 15 Oct 2013 23:12:15 +0000
Subject: /hg/release/icedtea7-forest-2.3/jdk: 38 new changesets
Message-ID: <hg.8d3ec25853a6.1381878735.4833355912275447704@icedtea.classpath.org>

changeset 8d3ec25853a6 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=8d3ec25853a6
author: coffeys
date: Tue Jan 15 10:37:49 2013 +0000

	7196533: TimeZone.getDefault() slow due to synchronization bottleneck
	Reviewed-by: okutsu


changeset c2f898043f95 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c2f898043f95
author: okutsu
date: Fri Jul 19 15:32:01 2013 +0900

	8006900: Add new date/time capability
	Reviewed-by: mchung, hawtin


changeset 5cd735be29d1 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=5cd735be29d1
author: dsamersoff
date: Mon Jul 08 14:34:36 2013 +0400

	8008589: Better MBean permission validation
	Summary: Better MBean permission validation
	Reviewed-by: skoivu, dfuchs, mchung, sjiang


changeset ebcd0fea5f9e in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ebcd0fea5f9e
author: ascarpino
date: Wed Jul 03 15:12:19 2013 -0700

	8011071: Better crypto provider handling
	Reviewed-by: hawtin, valeriep


changeset 572d316989fc in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=572d316989fc
author: jbachorik
date: Tue Apr 23 09:37:31 2013 +0200

	8011081: Improve jhat
	Summary: Properly escape HTML output
	Reviewed-by: alanb, mschoene, sundar


changeset 199b6eeda099 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=199b6eeda099
author: msheppar
date: Fri Jun 14 17:28:36 2013 +0100

	8011157: Improve CORBA portablility
	Summary: fix also reviewed by Alexander Fomin
	Reviewed-by: alanb, coffeys, skoivu


changeset cd073b822141 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=cd073b822141
author: malenkov
date: Mon May 20 17:55:49 2013 +0400

	8012071: Better Building of Beans
	Reviewed-by: art, skoivu


changeset c12d76725313 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c12d76725313
author: erikj
date: Thu Oct 10 15:37:20 2013 +0100

	8012147: Improve tool support
	Summary: Adding libjli to jdk lib dir and removing now redundant rpath entries from executables
	Reviewed-by: alanb, dholmes, ksrini, ahgross


changeset 3d5531b70473 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3d5531b70473
author: malenkov
date: Fri May 31 20:43:32 2013 +0400

	8012277: Improve AWT DataFlavor
	Reviewed-by: art, skoivu


changeset cad67f3054b4 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=cad67f3054b4
author: ksrini
date: Tue May 07 13:37:03 2013 -0700

	8013506: Better Pack200 data handling
	Reviewed-by: jrose, kizune, mschoene


changeset 6b7e8dc5bf84 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6b7e8dc5bf84
author: jchen
date: Thu May 09 11:23:18 2013 -0700

	8013510: Augment image writing code
	Reviewed-by: bae, prr


changeset 210b6fac668a in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=210b6fac668a
author: vadim
date: Mon May 13 13:24:30 2013 +0400

	8013514: Improve stability of cmap class
	Reviewed-by: mschoene, prr, bae


changeset 12a88f98c1f9 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=12a88f98c1f9
author: weijun
date: Thu Jun 13 10:21:06 2013 +0800

	8013739: Better LDAP resource management
	Reviewed-by: ahgross, mchung, xuelei


changeset 026eee952252 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=026eee952252
author: alexsch
date: Thu Oct 10 15:53:02 2013 +0100

	8013744: Better tabling for AWT
	Reviewed-by: art, malenkov, skoivu


changeset 5993a4780363 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=5993a4780363
author: jbachorik
date: Thu Jun 20 08:51:47 2013 +0200

	8014085: Better serialization support in JMX classes
	Reviewed-by: alanb, dfuchs, skoivu


changeset 56163a66f921 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=56163a66f921
author: bae
date: Fri May 17 16:47:51 2013 +0400

	8014093: Improve parsing of images
	Reviewed-by: prr


changeset 1f1d6e607855 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1f1d6e607855
author: jchen
date: Thu Jun 13 12:02:15 2013 -0700

	8014098: Better profile validation
	Reviewed-by: bae, prr


changeset 47a9969695e5 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=47a9969695e5
author: bae
date: Tue May 21 13:56:39 2013 +0400

	8014102: Improve image conversion
	Reviewed-by: prr


changeset 6e1204adde28 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6e1204adde28
author: weijun
date: Wed May 08 09:21:59 2013 +0800

	8014341: Better service from Kerberos servers
	Summary: read incoming data safely and take care of null return value
	Reviewed-by: valeriep, ahgross


changeset daae7d66b624 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=daae7d66b624
author: jfranck
date: Mon Jul 15 18:41:54 2013 +0200

	8014349: (cl) Class.getDeclaredClass problematic in some class loader configurations
	Reviewed-by: mchung, ahgross, darcy


changeset 526c5b36beb9 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=526c5b36beb9
author: sjiang
date: Thu Jul 18 10:12:56 2013 +0200

	8014534: Better profiling support
	Summary: Validation of parameters
	Reviewed-by: sspitsyn, skoivu, mchung


changeset 3d878d8005a5 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3d878d8005a5
author: smarks
date: Wed Jul 10 15:28:42 2013 -0700

	8014987: Augment serialization handling
	Reviewed-by: alanb, coffeys, skoivu


changeset 95763758dc59 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=95763758dc59
author: erikj
date: Mon Aug 19 17:51:46 2013 +0200

	8015614: Update build settings
	Reviewed-by: tbell, dholmes, ahgross


changeset 23de3277d9ed in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=23de3277d9ed
author: weijun
date: Thu Jun 13 10:31:21 2013 +0800

	8015731: Subject java.security.auth.subject to improvements
	Reviewed-by: skoivu, mullan


changeset ca57fd2d417e in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ca57fd2d417e
author: michaelm
date: Wed Jul 03 17:54:38 2013 +0100

	8015743: Address internet addresses
	Summary: moved Inet6Address fields to holder class
	Reviewed-by: chegar, alanb, skoivu, khazra


changeset dd1551343d65 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=dd1551343d65
author: sgabdura
date: Tue Jul 23 10:01:25 2013 +0400

	8016357: Update hotspot diagnostic class
	Summary: Add security check to HotSpotDiagnostic.dumpHeap
	Reviewed-by: fparain, sla, ahgross


changeset 951c38772db3 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=951c38772db3
author: mchung
date: Thu Jul 18 17:22:11 2013 -0700

	8017196: Ensure Proxies are handled appropriately
	Reviewed-by: dfuchs, jrose, jdn, ahgross, chegar


changeset accde587b25a in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=accde587b25a
author: bae
date: Mon Jul 01 20:20:50 2013 +0400

	8017287: Better resource disposal
	Reviewed-by: vadim


changeset e47ebe9e1891 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e47ebe9e1891
author: mchung
date: Mon Jul 15 03:40:16 2013 -0700

	8017291: Cast Proxies Aside
	Reviewed-by: alanb, ahgross


changeset e049e7af186c in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e049e7af186c
author: sundar
date: Thu Oct 10 16:05:52 2013 +0100

	8017300: Improve Interface Implementation
	Reviewed-by: ahgross, jlaskey, mchung


changeset 4c14bd341854 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4c14bd341854
author: sjiang
date: Tue Aug 06 16:04:14 2013 +0200

	8019292: Better Attribute Value Exceptions
	Reviewed-by: dfuchs, dholmes, ahgross


changeset dfea2b7f993d in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=dfea2b7f993d
author: malenkov
date: Tue Jul 16 21:00:34 2013 +0400

	8019617: Better view of objects
	Reviewed-by: art, skoivu


changeset 664dbef2bca9 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=664dbef2bca9
author: jchen
date: Mon Jul 22 14:06:39 2013 -0700

	8020293: JVM crash
	Reviewed-by: prr, jgodinez


changeset e6dbd26e20c2 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e6dbd26e20c2
author: serb
date: Thu Oct 10 16:07:40 2013 +0100

	8021275: Better screening for ScreenMenu
	Reviewed-by: art


changeset 17829ce31387 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=17829ce31387
author: serb
date: Thu Oct 10 16:11:20 2013 +0100

	8021282: Better recycling of object instances
	Reviewed-by: art


changeset 98ac6fa208e7 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=98ac6fa208e7
author: naoto
date: Thu Aug 01 14:15:27 2013 -0700

	8021286: Improve MacOS resourcing
	Reviewed-by: okutsu


changeset c564d18ddeb4 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c564d18ddeb4
author: mullan
date: Tue Jul 30 17:20:22 2013 -0400

	8021290: Better signature validation
	Reviewed-by: xuelei, ahgross


changeset 53b1249d1715 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=53b1249d1715
author: weijun
date: Sat Aug 17 06:51:46 2013 +0800

	8022931: Enhance Kerberos exceptions
	Reviewed-by: xuelei, ahgross


diffstat:

 make/bridge/Jabswitch/Makefile                                                                    |    2 +-
 make/com/sun/jmx/Makefile                                                                         |    4 +-
 make/common/Program.gmk                                                                           |    3 -
 make/common/Release.gmk                                                                           |    7 +-
 make/java/management/mapfile-vers                                                                 |    2 +-
 make/sun/awt/FILES_c_macosx.gmk                                                                   |   28 -
 make/sun/awt/FILES_export_macosx.gmk                                                              |   29 -
 make/sun/awt/Makefile                                                                             |    2 -
 src/macosx/classes/com/apple/laf/AquaLookAndFeel.java                                             |    4 +-
 src/macosx/classes/com/apple/laf/AquaUtils.java                                                   |  184 ++-
 src/macosx/classes/com/apple/laf/ScreenMenu.java                                                  |  130 +-
 src/macosx/classes/com/apple/resources/MacOSXResourceBundle.java                                  |  110 --
 src/macosx/native/com/apple/resources/MacOSXResourceBundle.m                                      |  110 --
 src/share/classes/com/sun/crypto/provider/DHPrivateKey.java                                       |   18 +-
 src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java                                           |   26 +-
 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java                               |    5 +
 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java                               |    4 +-
 src/share/classes/com/sun/jndi/ldap/VersionHelper12.java                                          |   17 +-
 src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java                                 |    5 +
 src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java |   15 +-
 src/share/classes/com/sun/script/util/InterfaceImplementor.java                                   |   29 +-
 src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java                          |    2 +-
 src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java                               |   10 +-
 src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java                               |   10 +-
 src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java                      |    4 +-
 src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java                                  |    5 +-
 src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java                                 |   15 +-
 src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java                             |   17 +-
 src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java                          |    6 +-
 src/share/classes/java/awt/datatransfer/DataFlavor.java                                           |   50 +-
 src/share/classes/java/beans/Beans.java                                                           |    6 +
 src/share/classes/java/beans/DefaultPersistenceDelegate.java                                      |    3 +
 src/share/classes/java/beans/MetaData.java                                                        |   19 +-
 src/share/classes/java/io/ObjectInputStream.java                                                  |   15 +-
 src/share/classes/java/io/ObjectOutputStream.java                                                 |   20 +-
 src/share/classes/java/lang/Class.java                                                            |   12 +-
 src/share/classes/java/lang/ClassLoader.java                                                      |    8 +
 src/share/classes/java/lang/System.java                                                           |    4 +
 src/share/classes/java/lang/Thread.java                                                           |   24 +-
 src/share/classes/java/lang/invoke/MethodHandleNatives.java                                       |    2 +
 src/share/classes/java/lang/invoke/MethodHandles.java                                             |   15 +-
 src/share/classes/java/lang/reflect/Proxy.java                                                    |   16 +-
 src/share/classes/java/net/Inet6Address.java                                                      |  463 ++++++---
 src/share/classes/java/net/InetAddress.java                                                       |    7 +
 src/share/classes/java/util/TimeZone.java                                                         |   87 +-
 src/share/classes/javax/management/BadAttributeValueExpException.java                             |   26 +-
 src/share/classes/javax/management/MBeanNotificationInfo.java                                     |   22 +-
 src/share/classes/javax/management/MBeanTrustPermission.java                                      |   31 +-
 src/share/classes/javax/management/modelmbean/RequiredModelMBean.java                             |   10 +-
 src/share/classes/javax/management/remote/JMXPrincipal.java                                       |   23 +-
 src/share/classes/javax/management/remote/JMXServiceURL.java                                      |   99 +-
 src/share/classes/javax/management/remote/NotificationResult.java                                 |   53 +-
 src/share/classes/javax/management/remote/TargetedNotification.java                               |   34 +-
 src/share/classes/javax/management/remote/rmi/RMIConnector.java                                   |   29 +-
 src/share/classes/javax/security/auth/Subject.java                                                |    8 +-
 src/share/classes/javax/security/auth/kerberos/KeyTab.java                                        |   15 +-
 src/share/classes/javax/swing/JTable.java                                                         |   18 +-
 src/share/classes/javax/swing/UIDefaults.java                                                     |   12 +-
 src/share/classes/javax/swing/text/DefaultFormatter.java                                          |    8 +-
 src/share/classes/javax/swing/text/NumberFormatter.java                                           |    6 +-
 src/share/classes/javax/swing/text/html/ObjectView.java                                           |   28 +-
 src/share/classes/sun/font/FileFont.java                                                          |    4 +-
 src/share/classes/sun/font/GlyphLayout.java                                                       |    7 +-
 src/share/classes/sun/font/StandardGlyphVector.java                                               |    5 +-
 src/share/classes/sun/font/TrueTypeFont.java                                                      |    3 +
 src/share/classes/sun/java2d/Disposer.java                                                        |    7 +-
 src/share/classes/sun/management/HotSpotDiagnostic.java                                           |   12 +-
 src/share/classes/sun/misc/JavaLangAccess.java                                                    |    7 +
 src/share/classes/sun/reflect/misc/ReflectUtil.java                                               |   48 +
 src/share/classes/sun/security/ec/ECPrivateKeyImpl.java                                           |   10 +-
 src/share/classes/sun/security/jgss/GSSCredentialImpl.java                                        |    4 +-
 src/share/classes/sun/security/krb5/KdcComm.java                                                  |   12 +-
 src/share/classes/sun/security/krb5/internal/NetClient.java                                       |   10 +-
 src/share/classes/sun/security/pkcs/PKCS8Key.java                                                 |   13 +-
 src/share/classes/sun/security/pkcs11/P11Key.java                                                 |   48 +-
 src/share/classes/sun/security/provider/DSAPrivateKey.java                                        |    7 +-
 src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java                                      |   27 +-
 src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java                                         |    9 +-
 src/share/classes/sun/swing/SwingLazyValue.java                                                   |    3 +-
 src/share/classes/sun/swing/SwingUtilities2.java                                                  |   13 +
 src/share/demo/jvmti/hprof/hprof_class.c                                                          |   14 +-
 src/share/demo/jvmti/hprof/hprof_event.c                                                          |   27 +-
 src/share/lib/security/java.security                                                              |    2 +
 src/share/lib/security/java.security-macosx                                                       |    2 +
 src/share/lib/security/java.security-solaris                                                      |    2 +
 src/share/lib/security/java.security-windows                                                      |    2 +
 src/share/native/com/sun/java/util/jar/pack/zip.cpp                                               |    8 +-
 src/share/native/java/lang/Class.c                                                                |    2 +-
 src/share/native/java/net/Inet6Address.c                                                          |   17 +-
 src/share/native/java/net/net_util.c                                                              |  124 ++-
 src/share/native/java/net/net_util.h                                                              |   17 +
 src/share/native/sun/awt/image/awt_parseImage.c                                                   |  455 +++------
 src/share/native/sun/awt/image/awt_parseImage.h                                                   |   11 +-
 src/share/native/sun/awt/image/jpeg/imageioJPEG.c                                                 |    9 +
 src/share/native/sun/awt/medialib/awt_ImagingLib.c                                                |  250 +---
 src/share/native/sun/font/layout/SunLayoutEngine.cpp                                              |    4 +
 src/share/native/sun/java2d/cmm/lcms/cmsio0.c                                                     |   26 +-
 src/share/native/sun/management/HotSpotDiagnostic.c                                               |    2 +-
 src/solaris/native/java/net/Inet6AddressImpl.c                                                    |   18 +-
 src/solaris/native/java/net/NetworkInterface.c                                                    |   18 +-
 src/solaris/native/java/net/PlainDatagramSocketImpl.c                                             |    3 +-
 src/solaris/native/java/net/net_util_md.c                                                         |    8 +-
 src/windows/native/java/net/Inet6AddressImpl.c                                                    |   16 +-
 src/windows/native/java/net/NetworkInterface.c                                                    |   16 +-
 src/windows/native/java/net/NetworkInterface_winXP.c                                              |   12 +-
 src/windows/native/java/net/TwoStacksPlainSocketImpl.c                                            |    7 +-
 test/Makefile                                                                                     |    2 +-
 test/java/lang/SecurityManager/CheckPackageAccess.java                                            |    3 +-
 108 files changed, 1738 insertions(+), 1564 deletions(-)

diffs (truncated from 6158 to 500 lines):

diff -r 7764e0491978 -r 53b1249d1715 make/bridge/Jabswitch/Makefile
--- a/make/bridge/Jabswitch/Makefile	Tue Oct 08 16:37:50 2013 +0100
+++ b/make/bridge/Jabswitch/Makefile	Sat Aug 17 06:51:46 2013 +0800
@@ -53,7 +53,7 @@
 buildexe : 
 	$(CD) $(TEMPDIR)  
 	$(RC) $(RC_FLAGS) $(VERSIONINFO_RESOURCE) 
-	$(CC) $(CPPFLAGS) $(JAB_SRC) $(LDDFLAGS) $(VERSIONRES) -o $(JAB_EXE) 
+	$(CC) $(CPPFLAGS) $(JAB_SRC) $(VERSIONRES) /link $(LDDFLAGS) -out:$(JAB_EXE)
 	$(MT) /nologo /verbose /manifest $(JAB_MANIFEST_INP) /outputresource:$(JAB_EXE)  
 
 copyfilejab : 
diff -r 7764e0491978 -r 53b1249d1715 make/com/sun/jmx/Makefile
--- a/make/com/sun/jmx/Makefile	Tue Oct 08 16:37:50 2013 +0100
+++ b/make/com/sun/jmx/Makefile	Sat Aug 17 06:51:46 2013 +0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2013, 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
@@ -130,11 +130,13 @@
 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
                 -d $(CLASSDESTDIR)              \
                 -iiop -v1.2                     \
+                -emitPermissionCheck            \
                 $(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
 	$(RMIC) $(HOTSPOT_INTERPRETER_FLAG) -classpath "$(CLASSDESTDIR)"    \
                 -d $(CLASSDESTDIR)              \
                 -iiop -v1.2                     \
                 -standardPackage                \
+                -emitPermissionCheck            \
                 $(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
 	@$(java-vm-cleanup)
 
diff -r 7764e0491978 -r 53b1249d1715 make/common/Program.gmk
--- a/make/common/Program.gmk	Tue Oct 08 16:37:50 2013 +0100
+++ b/make/common/Program.gmk	Sat Aug 17 06:51:46 2013 +0800
@@ -103,10 +103,8 @@
   ifeq ($(PLATFORM), solaris)
     ifeq ($(ARCH_DATA_MODEL), 32)
       LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli
-      LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli
     else # ! ARCH_DATA_MODEL 64-bit
       LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli
-      LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli
     endif # ARCH_DATA_MODEL
   endif # PLATFORM SOLARIS
   ifeq ($(PLATFORM), linux)
@@ -116,7 +114,6 @@
     LDFLAGS += $(LDFLAG_Z_ORIGIN)
     LDFLAGS += -Wl,--allow-shlib-undefined
     LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
-    LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
   endif # PLATFORM LINUX
 endif # PLATFORM linux solaris
 
diff -r 7764e0491978 -r 53b1249d1715 make/common/Release.gmk
--- a/make/common/Release.gmk	Tue Oct 08 16:37:50 2013 +0100
+++ b/make/common/Release.gmk	Sat Aug 17 06:51:46 2013 +0800
@@ -981,6 +981,11 @@
   endif
 	$(RM) -rf $(JDK_IMAGE_DIR)/jre/man
 	$(CHMOD) a+rx `$(FIND) $(JDK_IMAGE_DIR) -type d`
+  ifneq (,$(findstring $(PLATFORM), linux solaris)) # If linux or solaris 
+	($(CD) $(LIBDIR)/.. && $(TAR) cf - \
+	    `$(FIND) lib -name $(LIB_PREFIX)jli.$(LIB_SUFFIX) -print `) | \
+	    ($(CD) $(JDK_IMAGE_DIR) && $(TAR) xf -)
+  endif # PLATFORM
 
 initial-image-jdk64-bindemos:
 	for dir in bin demo ; do \
@@ -1029,7 +1034,7 @@
 		    initial-image-jdk-db \
 		    $(JDK_DOCFILES) \
 		    $(JDK_DEMOS_AND_SAMPLES_DOCFILES)
-	$(MKDIR) $(JDK_IMAGE_DIR)/lib
+	$(MKDIR) -p $(JDK_IMAGE_DIR)/lib
 	@#
 	@# Copy in the jars in lib that only belong in the JDK
 	@#
diff -r 7764e0491978 -r 53b1249d1715 make/java/management/mapfile-vers
--- a/make/java/management/mapfile-vers	Tue Oct 08 16:37:50 2013 +0100
+++ b/make/java/management/mapfile-vers	Sat Aug 17 06:51:46 2013 +0800
@@ -53,7 +53,7 @@
 	    Java_sun_management_GcInfoBuilder_fillGcAttributeInfo;
 	    Java_sun_management_GcInfoBuilder_getLastGcInfo0;
 	    Java_sun_management_GcInfoBuilder_getNumGcExtAttributes;
-	    Java_sun_management_HotSpotDiagnostic_dumpHeap;
+	    Java_sun_management_HotSpotDiagnostic_dumpHeap0;
 	    Java_sun_management_HotspotThread_getInternalThreadCount;
 	    Java_sun_management_HotspotThread_getInternalThreadTimes0;
 	    Java_sun_management_MemoryImpl_getMemoryManagers0;
diff -r 7764e0491978 -r 53b1249d1715 make/sun/awt/FILES_c_macosx.gmk
--- a/make/sun/awt/FILES_c_macosx.gmk	Tue Oct 08 16:37:50 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 1995, 2011, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# 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.
-#
-
-FILES_AWT_objc = \
-        $(TARGDIR)MacOSXResourceBundle.m
-
diff -r 7764e0491978 -r 53b1249d1715 make/sun/awt/FILES_export_macosx.gmk
--- a/make/sun/awt/FILES_export_macosx.gmk	Tue Oct 08 16:37:50 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#
-# Copyright (c) 1995, 2011, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# 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.
-#
-
-# FILES_export definitions for Mac OS X
-
-FILES_export += \
-	com/apple/resources/MacOSXResourceBundle.java
diff -r 7764e0491978 -r 53b1249d1715 make/sun/awt/Makefile
--- a/make/sun/awt/Makefile	Tue Oct 08 16:37:50 2013 +0100
+++ b/make/sun/awt/Makefile	Sat Aug 17 06:51:46 2013 +0800
@@ -145,8 +145,6 @@
 #
 # Files
 #
-include FILES_c_macosx.gmk
-include FILES_export_macosx.gmk
 
 FILES_objc = $(FILES_AWT_objc)
 OTHER_LDLIBS = -lmlib_image $(JVMLIB) $(LIBM) \
diff -r 7764e0491978 -r 53b1249d1715 src/macosx/classes/com/apple/laf/AquaLookAndFeel.java
--- a/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java	Tue Oct 08 16:37:50 2013 +0100
+++ b/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java	Sat Aug 17 06:51:46 2013 +0800
@@ -37,8 +37,6 @@
 import sun.swing.*;
 import apple.laf.*;
 
-import com.apple.resources.MacOSXResourceBundle;
-
 public class AquaLookAndFeel extends BasicLookAndFeel {
     static final String sOldPropertyPrefix = "com.apple.macos."; // old prefix for things like 'useScreenMenuBar'
     static final String sPropertyPrefix = "apple.laf."; // new prefix for things like 'useScreenMenuBar'
@@ -246,7 +244,7 @@
         table.setDefaultLocale(Locale.getDefault());
         table.addResourceBundle(PKG_PREFIX + "resources.aqua");
         try {
-            final ResourceBundle aquaProperties = MacOSXResourceBundle.getMacResourceBundle(PKG_PREFIX + "resources.aqua");
+            final ResourceBundle aquaProperties = ResourceBundle.getBundle(PKG_PREFIX + "resources.aqua");
             final Enumeration<String> propertyKeys = aquaProperties.getKeys();
 
             while (propertyKeys.hasMoreElements()) {
diff -r 7764e0491978 -r 53b1249d1715 src/macosx/classes/com/apple/laf/AquaUtils.java
--- a/src/macosx/classes/com/apple/laf/AquaUtils.java	Tue Oct 08 16:37:50 2013 +0100
+++ b/src/macosx/classes/com/apple/laf/AquaUtils.java	Sat Aug 17 06:51:46 2013 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, 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
@@ -30,6 +30,7 @@
 import java.lang.ref.SoftReference;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
+import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.*;
 
@@ -40,56 +41,68 @@
 
 import sun.lwawt.macosx.CImage;
 import sun.lwawt.macosx.CImage.Creator;
+import sun.misc.Launcher;
+import sun.reflect.misc.ReflectUtil;
+import sun.security.action.GetPropertyAction;
 import sun.swing.SwingUtilities2;
 
 import com.apple.laf.AquaImageFactory.SlicedImageControl;
 
-public class AquaUtils {
-    final static String ANIMATIONS_SYSTEM_PROPERTY = "swing.enableAnimations";
+final class AquaUtils {
 
-    /*
+    private static final String ANIMATIONS_PROPERTY = "swing.enableAnimations";
+
+    /**
+     * Suppresses default constructor, ensuring non-instantiability.
+     */
+    private AquaUtils() {
+    }
+
+    /**
      * Convenience function for determining ComponentOrientation.  Helps us
      * avoid having Munge directives throughout the code.
      */
-    public static boolean isLeftToRight(final Component c) {
+    static boolean isLeftToRight(final Component c) {
         return c.getComponentOrientation().isLeftToRight();
     }
 
-    public static void enforceComponentOrientation(Component c, ComponentOrientation orientation) {
+    static void enforceComponentOrientation(final Component c, final ComponentOrientation orientation) {
         c.setComponentOrientation(orientation);
         if (c instanceof Container) {
-            for (Component child : ((Container)c).getComponents()) {
+            for (final Component child : ((Container)c).getComponents()) {
                 enforceComponentOrientation(child, orientation);
             }
         }
     }
 
-    private static CImage.Creator getCImageCreatorInternal() {
-        return java.security.AccessController.doPrivileged(new PrivilegedAction<CImage.Creator>() {
+    private static Creator getCImageCreatorInternal() {
+        return AccessController.doPrivileged(new PrivilegedAction<Creator>() {
+            @Override
             public Creator run() {
                 try {
                     final Method getCreatorMethod = CImage.class.getDeclaredMethod("getCreator", new Class[] {});
                     getCreatorMethod.setAccessible(true);
-                    return (CImage.Creator)getCreatorMethod.invoke(null, new Object[] {});
-                } catch (final Exception e) {
+                    return (Creator)getCreatorMethod.invoke(null, new Object[] {});
+                } catch (final Exception ignored) {
                     return null;
                 }
             }
         });
     }
 
-    private static final RecyclableSingleton<CImage.Creator> cImageCreator = new RecyclableSingleton<CImage.Creator>() {
+    private static final RecyclableSingleton<Creator> cImageCreator = new RecyclableSingleton<Creator>() {
         @Override
         protected Creator getInstance() {
             return getCImageCreatorInternal();
         }
     };
-    static CImage.Creator getCImageCreator() {
+    static Creator getCImageCreator() {
         return cImageCreator.get();
     }
 
-    protected static Image generateSelectedDarkImage(final Image image) {
+    static Image generateSelectedDarkImage(final Image image) {
         final ImageProducer prod = new FilteredImageSource(image.getSource(), new IconImageFilter() {
+            @Override
             int getGreyFor(final int gray) {
                 return gray * 75 / 100;
             }
@@ -97,8 +110,9 @@
         return Toolkit.getDefaultToolkit().createImage(prod);
     }
 
-    protected static Image generateDisabledImage(final Image image) {
+    static Image generateDisabledImage(final Image image) {
         final ImageProducer prod = new FilteredImageSource(image.getSource(), new IconImageFilter() {
+            @Override
             int getGreyFor(final int gray) {
                 return 255 - ((255 - gray) * 65 / 100);
             }
@@ -106,19 +120,20 @@
         return Toolkit.getDefaultToolkit().createImage(prod);
     }
 
-    protected static Image generateLightenedImage(final Image image, final int percent) {
+    static Image generateLightenedImage(final Image image, final int percent) {
         final GrayFilter filter = new GrayFilter(true, percent);
         final ImageProducer prod = new FilteredImageSource(image.getSource(), filter);
         return Toolkit.getDefaultToolkit().createImage(prod);
     }
 
-    static abstract class IconImageFilter extends RGBImageFilter {
-        public IconImageFilter() {
+    private abstract static class IconImageFilter extends RGBImageFilter {
+        IconImageFilter() {
             super();
             canFilterIndexColorModel = true;
         }
 
-        public int filterRGB(final int x, final int y, final int rgb) {
+        @Override
+        public final int filterRGB(final int x, final int y, final int rgb) {
             final int red = (rgb >> 16) & 0xff;
             final int green = (rgb >> 8) & 0xff;
             final int blue = rgb & 0xff;
@@ -134,14 +149,14 @@
             return result;
         }
 
-        abstract int getGreyFor(final int gray);
+        abstract int getGreyFor(int gray);
     }
 
-    public abstract static class RecyclableObject<T> {
-        protected SoftReference<T> objectRef = null;
+    abstract static class RecyclableObject<T> {
+        private SoftReference<T> objectRef;
 
-        public T get() {
-            T referent = null;
+        T get() {
+            T referent;
             if (objectRef != null && (referent = objectRef.get()) != null) return referent;
             referent = create();
             objectRef = new SoftReference<T>(referent);
@@ -151,8 +166,8 @@
         protected abstract T create();
     }
 
-    public abstract static class RecyclableSingleton<T> {
-        public T get() {
+    abstract static class RecyclableSingleton<T> {
+        final T get() {
             final AppContext appContext = AppContext.getAppContext();
             SoftReference<T> ref = (SoftReference<T>) appContext.get(this);
             if (ref != null) {
@@ -165,38 +180,36 @@
             return object;
         }
 
-        public void reset() {
-            AppContext appContext = AppContext.getAppContext();
-            appContext.remove(this);
+        void reset() {
+            AppContext.getAppContext().remove(this);
         }
 
-        protected abstract T getInstance();
+        abstract T getInstance();
     }
 
-    public static class RecyclableSingletonFromDefaultConstructor<T> extends RecyclableSingleton<T> {
-        protected final Class<T> clazz;
+    static class RecyclableSingletonFromDefaultConstructor<T> extends RecyclableSingleton<T> {
+        private final Class<T> clazz;
 
-        public RecyclableSingletonFromDefaultConstructor(final Class<T> clazz) {
+        RecyclableSingletonFromDefaultConstructor(final Class<T> clazz) {
             this.clazz = clazz;
         }
 
-        protected T getInstance() {
+        @Override
+        T getInstance() {
             try {
+                ReflectUtil.checkPackageAccess(clazz);
                 return clazz.newInstance();
-            } catch (final InstantiationException e) {
-                e.printStackTrace();
-            } catch (final IllegalAccessException e) {
-                e.printStackTrace();
+            } catch (InstantiationException | IllegalAccessException ignored) {
             }
             return null;
         }
     }
 
-    public abstract static class LazyKeyedSingleton<K, V> {
-        protected Map<K, V> refs;
+    abstract static class LazyKeyedSingleton<K, V> {
+        private Map<K, V> refs;
 
-        public V get(final K key) {
-            if (refs == null) refs = new HashMap<K, V>();
+        V get(final K key) {
+            if (refs == null) refs = new HashMap<>();
 
             final V cachedValue = refs.get(key);
             if (cachedValue != null) return cachedValue;
@@ -206,44 +219,45 @@
             return value;
         }
 
-        protected abstract V getInstance(final K key);
+        protected abstract V getInstance(K key);
     }
 
-    static final RecyclableSingleton<Boolean> enableAnimations = new RecyclableSingleton<Boolean>() {
+    private static final RecyclableSingleton<Boolean> enableAnimations = new RecyclableSingleton<Boolean>() {
         @Override
         protected Boolean getInstance() {
-            final String sizeProperty = (String)java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.GetPropertyAction(ANIMATIONS_SYSTEM_PROPERTY));
-            return new Boolean(!"false".equals(sizeProperty)); // should be true by default
+            final String sizeProperty = (String) AccessController.doPrivileged((PrivilegedAction<?>)new GetPropertyAction(
+                    ANIMATIONS_PROPERTY));
+            return !"false".equals(sizeProperty); // should be true by default
         }
     };
-    static boolean animationsEnabled() {
+    private static boolean animationsEnabled() {
         return enableAnimations.get();
     }
 
-    static final int MENU_BLINK_DELAY = 50; // 50ms == 3/60 sec, according to the spec
-    protected static void blinkMenu(final Selectable selectable) {
+    private static final int MENU_BLINK_DELAY = 50; // 50ms == 3/60 sec, according to the spec
+    static void blinkMenu(final Selectable selectable) {
         if (!animationsEnabled()) return;
         try {
             selectable.paintSelected(false);
             Thread.sleep(MENU_BLINK_DELAY);
             selectable.paintSelected(true);
             Thread.sleep(MENU_BLINK_DELAY);
-        } catch (final InterruptedException e) { }
+        } catch (final InterruptedException ignored) { }
     }
 
     interface Selectable {
-        void paintSelected(final boolean selected);
+        void paintSelected(boolean selected);
     }
 
     interface JComponentPainter {
-        public void paint(JComponent c, Graphics g, int x, int y, int w, int h);
+        void paint(JComponent c, Graphics g, int x, int y, int w, int h);
     }
 
     interface Painter {
-        public void paint(final Graphics g, int x, int y, int w, int h);
+        void paint(Graphics g, int x, int y, int w, int h);
     }
 
-    public static void paintDropShadowText(final Graphics g, final JComponent c, final Font font, final FontMetrics metrics, final int x, final int y, final int offsetX, final int offsetY, final Color textColor, final Color shadowColor, final String text) {
+    static void paintDropShadowText(final Graphics g, final JComponent c, final Font font, final FontMetrics metrics, final int x, final int y, final int offsetX, final int offsetY, final Color textColor, final Color shadowColor, final String text) {
         g.setFont(font);
         g.setColor(shadowColor);
         SwingUtilities2.drawString(c, g, text, x + offsetX, y + offsetY + metrics.getAscent());
@@ -251,22 +265,22 @@
         SwingUtilities2.drawString(c, g, text, x, y + metrics.getAscent());
     }
 
-    public static class ShadowBorder implements Border {
-        final Painter prePainter;
-        final Painter postPainter;
+    static class ShadowBorder implements Border {
+        private final Painter prePainter;
+        private final Painter postPainter;
 
-        final int offsetX;
-        final int offsetY;
-        final float distance;
-        final int blur;
-        final Insets insets;
-        final ConvolveOp blurOp;
+        private final int offsetX;
+        private final int offsetY;
+        private final float distance;
+        private final int blur;
+        private final Insets insets;
+        private final ConvolveOp blurOp;
 
-        public ShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur) {
+        ShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur) {
             this.prePainter = prePainter; this.postPainter = postPainter;
             this.offsetX = offsetX; this.offsetY = offsetY; this.distance = distance; this.blur = blur;
             final int halfBlur = blur / 2;
-            this.insets = new Insets(halfBlur - offsetY, halfBlur - offsetX, halfBlur + offsetY, halfBlur + offsetX);

From ptisnovs at icedtea.classpath.org  Wed Oct 16 00:18:14 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Wed, 16 Oct 2013 07:18:14 +0000
Subject: /hg/rhino-tests: Added new testGetResourceNPETest case into
Message-ID: <hg.a8242550bb5c.1381907894.-6019694633368342460@icedtea.classpath.org>

changeset a8242550bb5c in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=a8242550bb5c
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Wed Oct 16 09:21:59 2013 +0200

	Added new testGetResourceNPETest case into
	BindingsClassTest.


diffstat:

 ChangeLog                                 |   6 ++++++
 src/org/RhinoTests/BindingsClassTest.java |  13 +++++++++++++
 2 files changed, 19 insertions(+), 0 deletions(-)

diffs (36 lines):

diff -r c1cc99b637bf -r a8242550bb5c ChangeLog
--- a/ChangeLog	Tue Oct 15 11:12:28 2013 +0200
+++ b/ChangeLog	Wed Oct 16 09:21:59 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-16  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/BindingsClassTest.java:
+	Added new testGetResourceNPETest case into
+	BindingsClassTest.
+
 2013-10-15  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/AbstractScriptEngineClassTest.java:
diff -r c1cc99b637bf -r a8242550bb5c src/org/RhinoTests/BindingsClassTest.java
--- a/src/org/RhinoTests/BindingsClassTest.java	Tue Oct 15 11:12:28 2013 +0200
+++ b/src/org/RhinoTests/BindingsClassTest.java	Wed Oct 16 09:21:59 2013 +0200
@@ -1510,6 +1510,19 @@
     }
 
     /**
+     * Test for method javax.script.Bindings.getClass().getResourceNPETest()
+     */
+    protected void testGetResourceNPETest() {
+        try {
+            Object resource = this.bindingsClass.getResource(null);
+            throw new AssertionError("NullPointerException expected!");
+        }
+        catch (NullPointerException e) {
+            //This is OK OK
+        }
+    }
+
+    /**
      * Test for instanceof operator applied to a class javax.script.Bindings
      */
     @SuppressWarnings("cast")

From ptisnovs at icedtea.classpath.org  Wed Oct 16 00:39:04 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Wed, 16 Oct 2013 07:39:04 +0000
Subject: /hg/gfx-test: Added five new static helper methods used by vario...
Message-ID: <hg.7035be323664.1381909144.-6248649288953172555@icedtea.classpath.org>

changeset 7035be323664 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=7035be323664
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Wed Oct 16 09:42:48 2013 +0200

	Added five new static helper methods used by various tests.


diffstat:

 ChangeLog                                          |   5 +
 src/org/gfxtest/framework/CommonCAGOperations.java |  81 ++++++++++++++++++++++
 2 files changed, 86 insertions(+), 0 deletions(-)

diffs (101 lines):

diff -r f4329acce073 -r 7035be323664 ChangeLog
--- a/ChangeLog	Tue Oct 15 08:48:26 2013 +0200
+++ b/ChangeLog	Wed Oct 16 09:42:48 2013 +0200
@@ -1,3 +1,8 @@
+2013-10-16  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/framework/CommonCAGOperations.java:
+	Added five new static helper methods used by various tests.
+
 2013-10-15  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java:
diff -r f4329acce073 -r 7035be323664 src/org/gfxtest/framework/CommonCAGOperations.java
--- a/src/org/gfxtest/framework/CommonCAGOperations.java	Tue Oct 15 08:48:26 2013 +0200
+++ b/src/org/gfxtest/framework/CommonCAGOperations.java	Wed Oct 16 09:42:48 2013 +0200
@@ -882,4 +882,85 @@
         area.exclusiveOr(circle2Area);
         return area;
     }
+
+    /**
+     * Create new area composed from a circle and a rectangle.
+     * 
+     * @param image
+     *            image to which area is to be drawn
+     * @return new area composed from a circle and a rectangle
+     */
+    public static Area createAreaFromOverlappingCircleAndRectangleUsingUnionOperator(TestImage image) {
+        Area area = new Area();
+        Area circleArea = createFirstOverlappingCircularArea(image);
+        Area rectangularArea = createSecondOverlappingRectangularArea(image);
+        area.add(circleArea);
+        area.add(rectangularArea);
+        return area;
+    }
+
+    /**
+     * Create new area composed from a circle and a rectangle.
+     * 
+     * @param image
+     *            image to which area is to be drawn
+     * @return new area composed from a circle and a rectangle
+     */
+    public static Area createAreaFromOverlappingCircleAndRectangleUsingSubtractOperator(TestImage image) {
+        Area area = new Area();
+        Area circleArea = createFirstOverlappingCircularArea(image);
+        Area rectangularArea = createSecondOverlappingRectangularArea(image);
+        area.add(circleArea);
+        area.subtract(rectangularArea);
+        return area;
+    }
+
+    /**
+     * Create new area composed from a circle and a rectangle.
+     * 
+     * @param image
+     *            image to which area is to be drawn
+     * @return new area composed from a circle and a rectangle
+     */
+    public static Area createAreaFromOverlappingCircleAndRectangleUsingInverseSubtractOperator(TestImage image) {
+        Area area = new Area();
+        Area circleArea = createFirstOverlappingCircularArea(image);
+        Area rectangularArea = createSecondOverlappingRectangularArea(image);
+        area.add(rectangularArea);
+        area.subtract(circleArea);
+        return area;
+    }
+
+    /**
+     * Create new area composed from a circle and a rectangle.
+     * 
+     * @param image
+     *            image to which area is to be drawn
+     * @return new area composed from a circle and a rectangle
+     */
+    public static Area createAreaFromOverlappingCircleAndRectangleUsingIntersectOperator(TestImage image) {
+        Area area = new Area();
+        Area circleArea = createFirstOverlappingCircularArea(image);
+        Area rectangularArea = createSecondOverlappingRectangularArea(image);
+        area.add(circleArea);
+        area.intersect(rectangularArea);
+        return area;
+    }
+
+    /**
+     * Create new area composed from a circle and a rectangle.
+     * 
+     * @param image
+     *            image to which area is to be drawn
+     * @return new area composed from a circle and a rectangle
+     */
+    public static Area createAreaFromOverlappingCircleAndRectangleUsingXorOperator(TestImage image) {
+        Area area = new Area();
+        Area circleArea = createFirstOverlappingCircularArea(image);
+        Area rectangularArea = createSecondOverlappingRectangularArea(image);
+        area.add(circleArea);
+        area.exclusiveOr(rectangularArea);
+        return area;
+    }
+
 }

From andrew at icedtea.classpath.org  Wed Oct 16 07:27:18 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 16 Oct 2013 14:27:18 +0000
Subject: /hg/release/icedtea7-forest-2.4/jaxp: 60 new changesets
Message-ID: <hg.151f24093998.1381933638.6056160295555406480@icedtea.classpath.org>

changeset 151f24093998 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=151f24093998
author: asaha
date: Thu Jun 20 21:51:04 2013 -0700

	Merge


changeset e87d2da5c22e in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=e87d2da5c22e
author: asaha
date: Fri Jun 21 21:57:38 2013 -0700

	Merge


changeset 1a7e2024963d in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=1a7e2024963d
author: asaha
date: Fri Jun 28 11:36:56 2013 -0700

	Merge


changeset ac201a395412 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=ac201a395412
author: katleman
date: Tue Jul 02 15:17:20 2013 -0700

	Added tag jdk7u45-b01 for changeset 1a7e2024963d


changeset 8426c41b7922 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=8426c41b7922
author: joehw
date: Wed Jul 03 17:11:16 2013 -0700

	8012425: Transform TransformerFactory
	Reviewed-by: alanb, dfuchs, mullan


changeset 72b314bf2ee1 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=72b314bf2ee1
author: asaha
date: Wed Jul 03 17:41:31 2013 -0700

	Merge


changeset 32a6df99656c in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=32a6df99656c
author: joehw
date: Tue Jul 09 18:14:41 2013 -0700

	8017298: Better XML support
	Reviewed-by: alanb, dfuchs, mullan


changeset 0f23a1e40a4c in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=0f23a1e40a4c
author: katleman
date: Tue Jul 09 18:22:51 2013 -0700

	Added tag jdk7u45-b02 for changeset 72b314bf2ee1


changeset 7548ce6c26ac in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=7548ce6c26ac
author: katleman
date: Wed Jul 10 17:02:07 2013 -0700

	Merge


changeset 2e6d1ceda5ee in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=2e6d1ceda5ee
author: asaha
date: Wed Jul 10 17:07:02 2013 -0700

	Merge


changeset 399c58bf22ad in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=399c58bf22ad
author: joehw
date: Thu Jul 11 09:01:18 2013 -0700

	8013503: Improve stream factories
	Reviewed-by: alanb, dfuchs, mullan


changeset 41b81353608d in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=41b81353608d
author: cl
date: Tue Jul 16 05:52:05 2013 -0700

	Added tag jdk7u45-b03 for changeset 399c58bf22ad


changeset e66ea9257ba8 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=e66ea9257ba8
author: asaha
date: Mon Jul 22 08:15:32 2013 -0700

	Merge


changeset 8e3fc2c4d100 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=8e3fc2c4d100
author: cl
date: Tue Jul 23 08:11:24 2013 -0700

	Added tag jdk7u45-b04 for changeset e66ea9257ba8


changeset be81d5007d94 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=be81d5007d94
author: asaha
date: Thu Jul 25 17:15:57 2013 -0700

	Merge


changeset dc1f16423f11 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=dc1f16423f11
author: joehw
date: Tue Jul 30 03:02:14 2013 -0700

	8021366: java_util/Properties/PropertiesWithOtherEncodings fails during 7u45 nightly testing
	Reviewed-by: lancea, alanb, dfuchs, mullan


changeset d103a3b383ad in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=d103a3b383ad
author: asaha
date: Mon Jul 29 11:59:08 2013 -0700

	Merge


changeset 81a6b4a47a92 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=81a6b4a47a92
author: asaha
date: Wed Jul 31 09:57:27 2013 -0700

	Merge


changeset 1610b0a8cafe in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=1610b0a8cafe
author: asaha
date: Wed Jul 31 23:07:40 2013 -0700

	Merge


changeset 7b1609dc89e7 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=7b1609dc89e7
author: joehw
date: Tue Jul 30 01:19:53 2013 -0700

	8014530: Better digital signature processing
	Reviewed-by: alanb, dfuchs, mullan, lancea


changeset 010655015017 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=010655015017
author: joehw
date: Tue Jul 30 03:02:14 2013 -0700

	8021366: java_util/Properties/PropertiesWithOtherEncodings fails during 7u45 nightly testing
	Reviewed-by: lancea, alanb, dfuchs, mullan


changeset ae46ee9bbea0 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=ae46ee9bbea0
author: joehw
date: Tue Jul 30 23:40:58 2013 -0700

	8021933: Add extra check for fix # JDK-8014530
	Reviewed-by: alanb, lancea


changeset 3a6dce39c05c in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=3a6dce39c05c
author: asaha
date: Thu Aug 01 09:34:21 2013 -0700

	Merge


changeset f4fd1b4b9abc in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=f4fd1b4b9abc
author: asaha
date: Fri Aug 02 15:23:01 2013 -0700

	Added tag jdk7u45-b05 for changeset 3a6dce39c05c


changeset 853504c1e317 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=853504c1e317
author: asaha
date: Fri Aug 02 22:25:56 2013 -0700

	Merge


changeset be78d9f152cc in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=be78d9f152cc
author: cl
date: Fri Aug 02 19:03:12 2013 -0700

	Added tag jdk7u45-b05 for changeset ae46ee9bbea0


changeset bf0795a73135 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=bf0795a73135
author: asaha
date: Mon Aug 05 11:52:35 2013 -0700

	8022254: Remove incorrect jdk7u45-b05 tag from jdk7u-cpu forest
	Reviewed-by: cl


changeset 07be083abb61 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=07be083abb61
author: asaha
date: Mon Aug 05 13:46:58 2013 -0700

	Merge


changeset a7b1dcabdebb in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=a7b1dcabdebb
author: asaha
date: Wed Aug 07 12:23:25 2013 -0700

	Merge


changeset 04abe5fcf0fa in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=04abe5fcf0fa
author: cl
date: Thu Aug 08 23:24:10 2013 -0700

	Added tag jdk7u45-b06 for changeset a7b1dcabdebb


changeset 5a54c747be64 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=5a54c747be64
author: asaha
date: Mon Aug 12 12:38:34 2013 -0700

	Merge


changeset abb39bc40bcc in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=abb39bc40bcc
author: mfang
date: Tue Aug 13 15:34:50 2013 -0700

	8022856: 7u45 l10n resource file translation update
	Reviewed-by: joehw, yhuang


changeset 92c9a980216d in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=92c9a980216d
author: cl
date: Thu Aug 15 22:17:07 2013 -0700

	Added tag jdk7u45-b07 for changeset abb39bc40bcc


changeset 72295e1b27e6 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=72295e1b27e6
author: asaha
date: Mon Aug 19 12:44:16 2013 -0700

	Merge


changeset 16cf5bdca914 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=16cf5bdca914
author: cl
date: Tue Aug 20 10:22:41 2013 -0700

	Added tag jdk7u45-b08 for changeset 72295e1b27e6


changeset e26f1ff1468a in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=e26f1ff1468a
author: joehw
date: Mon Aug 19 15:50:57 2013 -0700

	8022682: Supporting XOM
	Reviewed-by: alanb, chegar, lancea


changeset bb44f0ec198f in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=bb44f0ec198f
author: asaha
date: Tue Aug 20 10:50:56 2013 -0700

	Merge


changeset 42b3cccfc39b in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=42b3cccfc39b
author: asaha
date: Thu Aug 22 08:42:11 2013 -0700

	Merge


changeset 255d92f5ed98 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=255d92f5ed98
author: asaha
date: Mon Aug 26 08:44:43 2013 -0700

	Merge


changeset ed0c89b23abe in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=ed0c89b23abe
author: cl
date: Tue Aug 27 10:56:47 2013 -0700

	Added tag jdk7u45-b09 for changeset 255d92f5ed98


changeset 28a18e725bb3 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=28a18e725bb3
author: asaha
date: Tue Aug 27 15:16:06 2013 -0700

	Merge


changeset 4ccb23943a03 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=4ccb23943a03
author: cl
date: Wed Sep 04 11:05:12 2013 -0700

	Added tag jdk7u45-b10 for changeset 28a18e725bb3


changeset 3d3b4da34d58 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=3d3b4da34d58
author: asaha
date: Wed Sep 04 12:09:03 2013 -0700

	Merge


changeset 2ac5c9749223 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=2ac5c9749223
author: cl
date: Wed Sep 11 11:12:27 2013 -0700

	Added tag jdk7u45-b11 for changeset 3d3b4da34d58


changeset 18a009fdfba2 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=18a009fdfba2
author: cl
date: Wed Sep 18 02:16:00 2013 -0700

	Added tag jdk7u45-b12 for changeset 2ac5c9749223


changeset d577bae705f2 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=d577bae705f2
author: cl
date: Mon Sep 23 14:31:30 2013 -0700

	Added tag jdk7u45-b13 for changeset 18a009fdfba2


changeset daadec741c9b in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=daadec741c9b
author: cl
date: Thu Sep 26 10:37:29 2013 -0700

	Added tag jdk7u45-b14 for changeset d577bae705f2


changeset 0a8b95184728 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=0a8b95184728
author: cl
date: Fri Sep 27 11:44:36 2013 -0700

	Added tag jdk7u45-b15 for changeset daadec741c9b


changeset 9e3f8ab9d17b in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=9e3f8ab9d17b
author: katleman
date: Wed Sep 11 10:59:52 2013 -0700

	Added tag jdk7u40-b61 for changeset c500d4ec41ff


changeset 99dcff4454b3 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=99dcff4454b3
author: katleman
date: Tue Sep 17 13:05:26 2013 -0700

	Added tag jdk7u40-b62 for changeset 9e3f8ab9d17b


changeset 0ed1050d54df in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=0ed1050d54df
author: asaha
date: Thu Sep 19 15:00:18 2013 -0700

	Merge


changeset d30751811099 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=d30751811099
author: asaha
date: Fri Sep 27 13:08:23 2013 -0700

	Merge


changeset 2586d303503b in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=2586d303503b
author: cl
date: Thu Oct 03 11:31:50 2013 -0700

	Added tag jdk7u45-b16 for changeset 0a8b95184728


changeset 4beb90ab48f7 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=4beb90ab48f7
author: cl
date: Mon Oct 07 21:52:46 2013 -0700

	Added tag jdk7u45-b17 for changeset 2586d303503b


changeset a456c78a50e2 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=a456c78a50e2
author: cl
date: Tue Oct 08 09:06:57 2013 -0700

	Added tag jdk7u45-b18 for changeset 4beb90ab48f7


changeset 36a2c299f14a in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=36a2c299f14a
author: cl
date: Tue Oct 08 10:57:45 2013 -0700

	Added tag jdk7u45-b30 for changeset a456c78a50e2


changeset 3c34f244296e in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=3c34f244296e
author: asaha
date: Tue Oct 08 11:12:27 2013 -0700

	Merge


changeset f715be7cd8ab in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=f715be7cd8ab
author: andrew
date: Wed Oct 16 15:17:04 2013 +0100

	Merge jdk7u45-b31


changeset 45c1bb989620 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=45c1bb989620
author: aefimov
date: Wed Jul 24 15:21:29 2013 +0400

	8015978: Incorrect transformation of XPath expression "string(-0)"
	Reviewed-by: darcy, joehw


changeset 8f220f7b51c7 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=8f220f7b51c7
author: andrew
date: Wed Oct 16 15:26:07 2013 +0100

	Cleanup Oracle's mess


diffstat:

 .hgtags                                                                                        |   108 +
 .jcheck/conf                                                                                   |     2 -
 THIRD_PARTY_README                                                                             |    33 +-
 src/com/sun/org/apache/bcel/internal/Constants.java                                            |    32 +-
 src/com/sun/org/apache/bcel/internal/classfile/Attribute.java                                  |     3 +
 src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java                          |     6 +
 src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java                               |     1 +
 src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java                     |   146 +
 src/com/sun/org/apache/bcel/internal/classfile/Visitor.java                                    |     1 +
 src/com/sun/org/apache/bcel/internal/generic/BasicType.java                                    |     6 +
 src/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java                            |    32 +-
 src/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java                             |    20 +-
 src/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java                                |    10 +-
 src/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java                             |   101 +-
 src/com/sun/org/apache/bcel/internal/generic/MethodGen.java                                    |    17 +
 src/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java                            |     8 +-
 src/com/sun/org/apache/bcel/internal/generic/Select.java                                       |    22 +-
 src/com/sun/org/apache/bcel/internal/util/Objects.java                                         |    45 +
 src/com/sun/org/apache/xalan/internal/XalanConstants.java                                      |   170 +-
 src/com/sun/org/apache/xalan/internal/utils/Objects.java                                       |    45 +
 src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java                               |   141 +-
 src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java                            |   449 ++
 src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java                    |   225 +
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java                         |    17 +-
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java                               |    26 +-
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java                              |    28 +-
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java                               |    65 +-
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java                      |    17 +-
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java                                |    44 +-
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java                   |     6 +
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java                |     6 +
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java                |     6 +
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java                |     6 +
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java                |     6 +
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java                |     6 +
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java                |     6 +
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java                |     6 +
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java                |     6 +
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java             |     6 +
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java                |     6 +
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java                |     6 +
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java             |     6 +
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java             |     6 +
 src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java                        |     1 +
 src/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java                              |    10 +
 src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java                      |    20 +
 src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java                          |     3 +
 src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java                     |    10 +-
 src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java                            |     8 +
 src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java                   |    84 +-
 src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java                          |    19 +
 src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java                                     |    33 +
 src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java                           |    41 +-
 src/com/sun/org/apache/xerces/internal/impl/Constants.java                                     |   176 +-
 src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java                               |    57 +-
 src/com/sun/org/apache/xerces/internal/impl/Version.java                                       |     2 +-
 src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java                    |     4 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java                             |    64 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java                |   133 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java                        |    69 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java                              |   194 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java                              |     2 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java                      |     4 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java                                    |    54 +-
 src/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java                      |  1703 +++++----
 src/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java                               |    33 +-
 src/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java                      |    87 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties                    |     2 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties                 |     2 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties                 |     2 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties                 |     2 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties                 |     2 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties                 |     2 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties                 |     2 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties              |     2 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties                 |     2 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties              |     2 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties              |     2 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties                         |    14 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties                      |   349 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties                      |   351 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties                      |   353 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties                      |   351 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties                      |   350 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties                      |   351 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties                   |   363 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties                      |   353 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties                   |   362 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties                   |   383 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties                   |     4 +-
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties                |     1 +
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties                |     1 +
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties                |     1 +
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties                |     1 +
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties                |     1 +
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties                |     1 +
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties             |     1 +
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties                |     1 +
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties             |     1 +
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties             |     1 +
 src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java                            |    33 +-
 src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java                         |     9 +-
 src/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java                             |    12 +
 src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java                       |    22 +-
 src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java              |     5 +-
 src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java                      |    44 +-
 src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java                    |    10 +-
 src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java                           |    63 +-
 src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java                          |     3 +-
 src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java                                 |   117 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java                  |    28 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java                |    14 +
 src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java              |    38 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java               |    20 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java                   |    66 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java |    72 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java             |    17 +
 src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java                          |    37 +-
 src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java                                  |    60 +
 src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java                           |    12 +-
 src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java                 |    12 +-
 src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java                                  |    56 +
 src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java                      |     5 +-
 src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java                         |    51 +-
 src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java                                  |    18 +
 src/com/sun/org/apache/xerces/internal/util/SecurityManager.java                               |    69 +-
 src/com/sun/org/apache/xerces/internal/util/SymbolTable.java                                   |     4 +-
 src/com/sun/org/apache/xerces/internal/util/URI.java                                           |    24 +-
 src/com/sun/org/apache/xerces/internal/utils/Objects.java                                      |    45 +
 src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java                              |   142 +-
 src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java                             |   239 +
 src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java                           |   555 +++
 src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java                   |   225 +
 src/com/sun/org/apache/xerces/internal/xinclude/ObjectFactory.java                             |   553 ---
 src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java                           |   161 +-
 src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java                                  |   162 +-
 src/com/sun/org/apache/xml/internal/serialize/ObjectFactory.java                               |   553 ---
 src/com/sun/org/apache/xml/internal/serializer/Encodings.java                                  |   366 +-
 src/com/sun/org/apache/xml/internal/serializer/utils/URI.java                                  |    25 +-
 src/com/sun/org/apache/xml/internal/utils/URI.java                                             |    22 +-
 src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java                                |    79 +-
 src/com/sun/org/apache/xpath/internal/Arg.java                                                 |     9 +-
 src/com/sun/xml/internal/stream/StaxXMLInputSource.java                                        |    13 +
 src/javax/xml/XMLConstants.java                                                                |   222 +-
 src/javax/xml/parsers/DocumentBuilderFactory.java                                              |    25 +
 src/javax/xml/parsers/SAXParser.java                                                           |    23 +
 src/javax/xml/stream/FactoryFinder.java                                                        |    23 +-
 src/javax/xml/stream/XMLEventFactory.java                                                      |    18 +-
 src/javax/xml/stream/XMLInputFactory.java                                                      |    38 +-
 src/javax/xml/stream/XMLOutputFactory.java                                                     |    13 +-
 src/javax/xml/transform/TransformerFactory.java                                                |    40 +
 src/javax/xml/validation/SchemaFactory.java                                                    |    40 +-
 src/javax/xml/validation/Validator.java                                                        |    23 +-
 src/org/xml/sax/helpers/XMLReaderFactory.java                                                  |     7 +-
 154 files changed, 8447 insertions(+), 4426 deletions(-)

diffs (truncated from 19531 to 500 lines):

diff -r 1afb8c1984ac -r 8f220f7b51c7 .hgtags
--- a/.hgtags	Fri Jun 14 18:10:26 2013 -0700
+++ b/.hgtags	Wed Oct 16 15:26:07 2013 +0100
@@ -50,6 +50,7 @@
 feb05980f9f2964e6bc2b3a8532f9b3054c2289b jdk7-b73
 ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74
 555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75
+fb68fd18eb9f9d94bd7f307097b98a5883018da8 icedtea7-1.12
 233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76
 bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77
 7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78
@@ -63,6 +64,7 @@
 81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86
 8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87
 d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88
+826bafcb6c4abbf24887bfc5a78868e13cddd068 icedtea7-1.13
 d2818fd2b036f3b3154a9a7de41afcf4ac679c1b jdk7-b89
 c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90
 b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91
@@ -111,6 +113,7 @@
 d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134
 4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135
 1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136
+1c2f25bf36b1d43920e94fb82a0afdafd29b1735 icedtea-1.14
 1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137
 be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138
 28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139
@@ -123,6 +126,7 @@
 bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
 067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
 fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147
+b8d01501956a0d41f5587ff1bebbfe5a9b8fea5a icedtea-2.0-branchpoint
 104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02
 64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
 2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
@@ -141,6 +145,7 @@
 0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12
 d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13
 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21
+7300d2ab9fb2068250a96ca4afc481c4beb6a42b icedtea-2.1-branchpoint
 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u3-b02
 604dd391203960d0028fc95bc70b0ae161e09d99 jdk7u3-b03
 551c076358f6691999f613db9b155c83ec9a648d jdk7u3-b04
@@ -157,6 +162,7 @@
 7a37651d304de62b18b343b3ae675ab1b08fc5fe jdk7u4-b10
 3fbd87d50fbf4de3987e36ec5f3e8ce1c383ce3d jdk7u4-b11
 b4e5df5b18bb75db15ed97da02e5df086d2c7930 jdk7u4-b12
+c51876b27811ba0f6ea3409ba19d357b7400908a icedtea-2.2-branchpoint
 7d18bccaec3781f3d4f2d71879f91e257db2f0f7 jdk7u4-b13
 82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u4-b14
 36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u5-b01
@@ -191,6 +197,7 @@
 94474d6f28284a1ef492984dd6d6f66f8787de80 jdk7u6-b15
 0b329a8d325b6a58d89c6042dac62ce5852380ab jdk7u6-b16
 5eb867cdd08ca299fe03b31760acd57aac2b5673 jdk7u6-b17
+445dd0b578fc2ed12c539eb6f9a71cbd40bed4f6 icedtea-2.3-branchpoint
 1c4b9671de5c7ed5713f55509cb2ada38b36dffe jdk7u6-b18
 3ba4c395d2cf973c8c603b2aedc846bd4ae54656 jdk7u6-b19
 4f7b77cc3b252098f52a8f30a74f603783a2e0f1 jdk7u6-b20
@@ -240,6 +247,31 @@
 f9fe0d38b1103cb33073538c959d982e28ed7b11 jdk7u13-b10
 0a6a09e5174a4c15632ff7e06d6b215164e3fa15 jdk7u13-b30
 f9fe0d38b1103cb33073538c959d982e28ed7b11 jdk7u13-b20
+1365e7472a3b737dda4a73e06ad41718d667d9be jdk7u8-b01
+0a313d4307930be3a64106b9b8c90f9342673aa0 jdk7u8-b02
+36cba5ea434944cef64fa281112b158fae93c0fa jdk7u8-b03
+07c07608384e1b5b09fc82ff8e42ca72d374b178 jdk7u8-b04
+c579d804e5ca54e3c7f0ba1eb90a7b97c980b889 jdk7u8-b05
+d4e27ea952ad62432d24f7c880227140af5f50ec jdk7u10-b06
+9205eb81886de12f9e3324ac8e0c7cec536b22d5 jdk7u10-b07
+720eb6c26227887ad11eb401f91a10878c3c7b6b jdk7u10-b08
+3a33a35b2d24cb671050e61aa4930a951bc35d2b jdk7u10-b09
+27bab008eee997a2a8a78d6fe72a56c87c1c2b2b jdk7u12-b01
+8e3a4e47ce71a0add89eca5b079e02ae3a81c594 jdk7u12-b02
+1aa52991dfa7468d676557bf9fd6fd0e98c3d097 jdk7u12-b03
+464e19bd9db89b200a002e2001d0e8f352cf5ff9 jdk7u12-b04
+3db0cfb507771458da8978248de7598ebe7c20d8 jdk7u12-b05
+c84c463893504a93a38f4abfa4d057869e9ae918 jdk7u12-b06
+1b914599a6d5560e743b9fecd390924ed0bf7d15 jdk7u12-b07
+427a603569db59f61721e709fcb8a73390d468ae jdk7u12-b08
+366ebbf581df0134d9039b649abc315e87f23772 jdk7u12-b09
+14adb683be4ebc49ee729f0253d012795a4a2ae4 icedtea-2.4-branchpoint
+23191c790e12841f81ac1cf956e7dbc0b45914ee jdk7u14-b10
+825eda7553590ce19eb4fa0686c4405d97daafdb jdk7u14-b11
+560e5cf5b57fc91e2bc6dd1809badd58c6eb25bd jdk7u14-b12
+937bae61a48febcc948b7e10ae781c9077360241 jdk7u14-b13
+7038ca4959e50a02f797e639daffe6b2b4065f86 jdk7u14-b14
+aa6fb94c5e7bc645f478b6f60c5e6e06bebcc2bf jdk7u14-b15
 99c114990b191f32e72c6158072033aec5816aaf jdk7u15-b01
 edbaa584f09a78d0ad3c73389faf20409a552e46 jdk7u15-b02
 14a9b60a2086f4e2f6ec43bee3375042946f6510 jdk7u15-b30
@@ -264,7 +296,9 @@
 bf2d62ea518d5e4130e442e07705e7a50b821ad9 jdk7u21-b10
 3e0e331bdfb8f3adfd0cc78118e0ac588e73a2b5 jdk7u21-b11
 980fe893d8fd86d8aee14771167b6e0ac75fa208 jdk7u21-b30
+a320a590b4cac6eeff53829bde520ef46880b006 jdk7u21-b50
 a320a590b4cac6eeff53829bde520ef46880b006 jdk7u21-b12
+19b243d00f7740072d051d3fb531f01083cbe999 jdk7u21-b31
 5704dc942da676677a820d16c9a08fc6cad5b3bb jdk7u25-b01
 f9c1fe7cd1194e785807f07005369631b35b28d8 jdk7u25-b02
 fe858d7d6a13829d0ef0a1f762bd0e769cd24fa1 jdk7u25-b03
@@ -276,10 +310,84 @@
 5952538d55e624132f97400332a50b71880c874c jdk7u25-b09
 aa00dd983dd0f5b07269d0648a0325e9b3e0d957 jdk7u25-b10
 0fb6d76bcd2e8d54d0a69e1c3d2a85d84b3e17a4 jdk7u25-b11
+7b47e1a26f7cbb8d8d22ea165f2d7fbbbd354c77 jdk7u14-b16
+77ac1ef42b2fd47cc87b9800f63efdd4cf2fa05d jdk7u14-b17
+d47975f80a24b55410fa2e2c5f50f3405d83fe73 jdk7u14-b18
+331e489ecb7b19fa98c60324f7ce5d168284a8c8 jdk7u14-b19
+331e489ecb7b19fa98c60324f7ce5d168284a8c8 jdk7u14-b19
+c3c9f04cf10c2fe576b208f6a8ca3777b1d31145 jdk7u14-b19
+5e1fee011646b4a3ff29b7b9cdc208e0a0577cb4 jdk7u14-b20
+d1c8bb1cbc9183fc994b5fedf26886ceda0d59f9 jdk7u14-b21
+d1c6afebdfe28eb07eb2d03a6911a0f33b619165 jdk7u14-b22
+0e4c549d3635122145ac88bad7b98716976ca49e jdk7u40-b23
+d17acb2ee133811baa8eae3436a8c191fc433da1 jdk7u40-b24
+52bcce690998b4ad91abddae118847f4358c6110 jdk7u40-b25
+cd764ada36b50e2096ba35b4c27ca8f83b3db964 jdk7u40-b26
+7626b3fbc822fd4efd5ba3b5fc18f2fef5749597 jdk7u40-b27
+9186b6efd2b2eafa7fee5be1b043f59f25db12a6 jdk7u40-b28
+740942c76fb668a04bf89feccf069f6958651d54 jdk7u40-b29
 5e87aee78c91efa65bd5aeb37bcc1c1c637a7f0c jdk7u25-b12
 83b80c094befd08cbac4247d9b8f12c6a039f23f jdk7u25-b13
 68cc0d2a49f09b5c611b2775f2e66de1022bdedc jdk7u25-b14
 503f75b55b34ae22f43b2992b1e56c96e35a60de jdk7u25-b15
+35710c8bd73dbfdd4805e8b3c506f500daf553c7 jdk7u25-b31
+c02dbd8fd8ca142e3987537f7ac43da361fcf9d4 jdk7u25-b33
+ebe5d88948e9f2fd707c808eceb9343f4f32e122 jdk7u25-b34
 8c35f2344beeb42e85d718e95813e6fdc2f0a605 jdk7u25-b30
 9cebeb3118aca6e356f80a37ac38088ddcc8fb73 jdk7u25-b16
 0d4cfe518086198516e6729fc28b161f66524a66 jdk7u25-b32
+7b47e1a26f7cbb8d8d22ea165f2d7fbbbd354c77 jdk7u14-b16
+77ac1ef42b2fd47cc87b9800f63efdd4cf2fa05d jdk7u14-b17
+d47975f80a24b55410fa2e2c5f50f3405d83fe73 jdk7u14-b18
+331e489ecb7b19fa98c60324f7ce5d168284a8c8 jdk7u14-b19
+331e489ecb7b19fa98c60324f7ce5d168284a8c8 jdk7u14-b19
+c3c9f04cf10c2fe576b208f6a8ca3777b1d31145 jdk7u14-b19
+5e1fee011646b4a3ff29b7b9cdc208e0a0577cb4 jdk7u14-b20
+7f04ed6cb0c382a16c2ffaad05c6122482e03b2e icedtea-2.4.0
+d1c8bb1cbc9183fc994b5fedf26886ceda0d59f9 jdk7u14-b21
+d1c6afebdfe28eb07eb2d03a6911a0f33b619165 jdk7u14-b22
+0e4c549d3635122145ac88bad7b98716976ca49e jdk7u40-b23
+d17acb2ee133811baa8eae3436a8c191fc433da1 jdk7u40-b24
+52bcce690998b4ad91abddae118847f4358c6110 jdk7u40-b25
+cd764ada36b50e2096ba35b4c27ca8f83b3db964 jdk7u40-b26
+7626b3fbc822fd4efd5ba3b5fc18f2fef5749597 jdk7u40-b27
+9186b6efd2b2eafa7fee5be1b043f59f25db12a6 jdk7u40-b28
+740942c76fb668a04bf89feccf069f6958651d54 jdk7u40-b29
+09b080236bc1a1a68f8b411196cbfa52475c0755 jdk7u40-b30
+5be6b670d08bb0464e0e259ef77fca6adba24b05 icedtea-2.4.1
+5b31380e2e0b6f8386dcf0ca122461154f2d2704 jdk7u40-b31
+75bb397c4ae26c384e1fcb75bbf4b70479f2c5f7 jdk7u40-b32
+ce771024e07d2bb6521735a14ce68745a2376bd8 jdk7u40-b33
+23ba797b9e78231806d837f7fb4f9feef6dcd61a jdk7u40-b34
+4056df34b559b904edc9f94a323769f19cf8f426 jdk7u40-b35
+07024f18376ce9597ec8679ebcb9f2efdc5afab0 jdk7u40-b36
+f40f45bd95d4140f691c03132f2ab2c8a0233a8f jdk7u40-b37
+680bf140cdd58e7878318ecafc41c9db47ebfacd jdk7u40-b38
+322af0a5cdce6cad8421a73c1b9af345361dfba0 jdk7u40-b39
+6ea57bdf603007be4d25568f7759ca0381aa8382 jdk7u40-b40
+7255fb6c9060b0626aeedb1066e73c4bb46b1a7c jdk7u40-b41
+66363323f14d85d4ab28e883a3323b9d72dea5fd jdk7u40-b42
+c0bd71414ea513f54f23965936a837fca093ac91 jdk7u40-b43
+91bc4534851265291bb3b16452a0968d6909979f jdk7u40-b60
+135f46e0e653be2631da1da2fd166f2d52c67aa7 icedtea-2.4.2
+c500d4ec41ff2117eabfa33e640b6df2f21deb3d jdk7u40-b61
+9e3f8ab9d17be6b1a4a097fcc5bc5412013d3e86 jdk7u40-b62
+1a7e2024963d3a8d6cde209de0967ac43418b82a jdk7u45-b01
+72b314bf2ee171bec2157f737ba3bf77fbdf1118 jdk7u45-b02
+399c58bf22ad35a3527a286123497615100746b2 jdk7u45-b03
+e66ea9257ba8a77fc64f6f2924584b183767d82b jdk7u45-b04
+3a6dce39c05c254aba9f3ae57c035bf3facfe8b9 jdk7u45-b05
+a7b1dcabdebbdbf40040a1c6f8411d2f8d25bb37 jdk7u45-b06
+abb39bc40bcc91c7f8ebc2867e98f302d9bc8417 jdk7u45-b07
+72295e1b27e61751cc323b5e4d6781bf7afae0a4 jdk7u45-b08
+255d92f5ed98915a025484360963d7d09bd77313 jdk7u45-b09
+28a18e725bb39d47e920ef910f435321fb891a88 jdk7u45-b10
+3d3b4da34d583e86a3b90b8f69927a37d40f5b57 jdk7u45-b11
+2ac5c9749223f205cd081ecd0028b2f3ea13f8f8 jdk7u45-b12
+18a009fdfba2bbc5036f96cbefffcdefe9580bb1 jdk7u45-b13
+d577bae705f208661733e09a4875d79255897b7b jdk7u45-b14
+daadec741c9bc5067897eb8803123d0af6c5ebc3 jdk7u45-b15
+0a8b95184728548be4b20876e05f76e0262e4195 jdk7u45-b16
+2586d303503b5bb6fd39dc0ce572d6e858caf41c jdk7u45-b17
+4beb90ab48f7fd46c7a9afbe66f8cccb230699ba jdk7u45-b18
+a456c78a50e201a65c9f63565c8291b84a4fbd32 jdk7u45-b30
diff -r 1afb8c1984ac -r 8f220f7b51c7 .jcheck/conf
--- a/.jcheck/conf	Fri Jun 14 18:10:26 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 1afb8c1984ac -r 8f220f7b51c7 THIRD_PARTY_README
--- a/THIRD_PARTY_README	Fri Jun 14 18:10:26 2013 -0700
+++ b/THIRD_PARTY_README	Wed Oct 16 15:26:07 2013 +0100
@@ -1912,6 +1912,35 @@
 
 -------------------------------------------------------------------------------
 
+%% This notice is provided with respect to Sparkle v.1.5,
+which is included with JRE 7 on Mac OS X.
+
+--- begin of LICENSE ---
+
+Copyright (c) 2012 Sparkle.org and Andy Matuschak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
 %% Portions licensed from Taligent, Inc.
 
 -------------------------------------------------------------------------------
@@ -3169,12 +3198,12 @@
 %% This notice is provided with respect to the following which is 
 included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
 
-  Apache Derby 10.8.1.2        [included with JDK 7 only]
+  Apache Derby 10.8.3.0        [included with JDK 7 only]
   Apache Jakarta BCEL 5.2 
   Apache Jakarta Regexp 1.4 
   Apache Santuario XMLSec-Java 1.4.2
   Apache Xalan-Java 2.7.1 
-  Apache Xerces2 Java 2.10.0 
+  Apache Xerces2 Java 2.11.0 
   Apache XML Resolver 1.1 
 
 
diff -r 1afb8c1984ac -r 8f220f7b51c7 src/com/sun/org/apache/bcel/internal/Constants.java
--- a/src/com/sun/org/apache/bcel/internal/Constants.java	Fri Jun 14 18:10:26 2013 -0700
+++ b/src/com/sun/org/apache/bcel/internal/Constants.java	Wed Oct 16 15:26:07 2013 +0100
@@ -746,27 +746,29 @@
 
   /** Attributes and their corresponding names.
    */
-  public static final byte ATTR_UNKNOWN              = -1;
-  public static final byte ATTR_SOURCE_FILE          = 0;
-  public static final byte ATTR_CONSTANT_VALUE       = 1;
-  public static final byte ATTR_CODE                 = 2;
-  public static final byte ATTR_EXCEPTIONS           = 3;
-  public static final byte ATTR_LINE_NUMBER_TABLE    = 4;
-  public static final byte ATTR_LOCAL_VARIABLE_TABLE = 5;
-  public static final byte ATTR_INNER_CLASSES        = 6;
-  public static final byte ATTR_SYNTHETIC            = 7;
-  public static final byte ATTR_DEPRECATED           = 8;
-  public static final byte ATTR_PMG                  = 9;
-  public static final byte ATTR_SIGNATURE            = 10;
-  public static final byte ATTR_STACK_MAP            = 11;
+  public static final byte ATTR_UNKNOWN                                 = -1;
+  public static final byte ATTR_SOURCE_FILE                             = 0;
+  public static final byte ATTR_CONSTANT_VALUE                          = 1;
+  public static final byte ATTR_CODE                                    = 2;
+  public static final byte ATTR_EXCEPTIONS                              = 3;
+  public static final byte ATTR_LINE_NUMBER_TABLE                       = 4;
+  public static final byte ATTR_LOCAL_VARIABLE_TABLE                    = 5;
+  public static final byte ATTR_INNER_CLASSES                           = 6;
+  public static final byte ATTR_SYNTHETIC                               = 7;
+  public static final byte ATTR_DEPRECATED                              = 8;
+  public static final byte ATTR_PMG                                     = 9;
+  public static final byte ATTR_SIGNATURE                               = 10;
+  public static final byte ATTR_STACK_MAP                               = 11;
+  public static final byte ATTR_LOCAL_VARIABLE_TYPE_TABLE               = 12;
 
-  public static final short KNOWN_ATTRIBUTES = 12;
+  public static final short KNOWN_ATTRIBUTES = 13;
 
   public static final String[] ATTRIBUTE_NAMES = {
     "SourceFile", "ConstantValue", "Code", "Exceptions",
     "LineNumberTable", "LocalVariableTable",
     "InnerClasses", "Synthetic", "Deprecated",
-    "PMGClass", "Signature", "StackMap"
+    "PMGClass", "Signature", "StackMap",
+    "LocalVariableTypeTable"
   };
 
   /** Constants used in the StackMap attribute.
diff -r 1afb8c1984ac -r 8f220f7b51c7 src/com/sun/org/apache/bcel/internal/classfile/Attribute.java
--- a/src/com/sun/org/apache/bcel/internal/classfile/Attribute.java	Fri Jun 14 18:10:26 2013 -0700
+++ b/src/com/sun/org/apache/bcel/internal/classfile/Attribute.java	Wed Oct 16 15:26:07 2013 +0100
@@ -206,6 +206,9 @@
     case Constants.ATTR_LOCAL_VARIABLE_TABLE:
       return new LocalVariableTable(name_index, length, file, constant_pool);
 
+    case Constants.ATTR_LOCAL_VARIABLE_TYPE_TABLE:
+      return new LocalVariableTypeTable(name_index, length, file, constant_pool);
+
     case Constants.ATTR_INNER_CLASSES:
       return new InnerClasses(name_index, length, file, constant_pool);
 
diff -r 1afb8c1984ac -r 8f220f7b51c7 src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java
--- a/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java	Fri Jun 14 18:10:26 2013 -0700
+++ b/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java	Wed Oct 16 15:26:07 2013 +0100
@@ -210,6 +210,12 @@
     stack.pop();
   }
 
+  public void visitLocalVariableTypeTable(LocalVariableTypeTable obj) {
+    stack.push(obj);
+    obj.accept(visitor);
+    stack.pop();
+  }
+
   public void visitStackMap(StackMap table) {
     stack.push(table);
     table.accept(visitor);
diff -r 1afb8c1984ac -r 8f220f7b51c7 src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java
--- a/src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java	Fri Jun 14 18:10:26 2013 -0700
+++ b/src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java	Wed Oct 16 15:26:07 2013 +0100
@@ -98,6 +98,7 @@
   public void visitLineNumberTable(LineNumberTable obj) {}
   public void visitLocalVariable(LocalVariable obj) {}
   public void visitLocalVariableTable(LocalVariableTable obj) {}
+  public void visitLocalVariableTypeTable(LocalVariableTypeTable obj) {}
   public void visitMethod(Method obj) {}
   public void visitSignature(Signature obj) {}
   public void visitSourceFile(SourceFile obj) {}
diff -r 1afb8c1984ac -r 8f220f7b51c7 src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java	Wed Oct 16 15:26:07 2013 +0100
@@ -0,0 +1,146 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+package com.sun.org.apache.bcel.internal.classfile;
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+import  com.sun.org.apache.bcel.internal.Constants;
+import  java.io.*;
+
+// The new table is used when generic types are about...
+
+//LocalVariableTable_attribute {
+//         u2 attribute_name_index;
+//         u4 attribute_length;
+//         u2 local_variable_table_length;
+//         {  u2 start_pc;
+//            u2 length;
+//            u2 name_index;
+//            u2 descriptor_index;
+//            u2 index;
+//         } local_variable_table[local_variable_table_length];
+//       }
+
+//LocalVariableTypeTable_attribute {
+//    u2 attribute_name_index;
+//    u4 attribute_length;
+//    u2 local_variable_type_table_length;
+//    {
+//      u2 start_pc;
+//      u2 length;
+//      u2 name_index;
+//      u2 signature_index;
+//      u2 index;
+//    } local_variable_type_table[local_variable_type_table_length];
+//  }
+// J5TODO: Needs some testing !
+public class LocalVariableTypeTable extends Attribute {
+  private static final long serialVersionUID = -1082157891095177114L;
+private int             local_variable_type_table_length; // Table of local
+  private LocalVariable[] local_variable_type_table;        // variables
+
+  public LocalVariableTypeTable(LocalVariableTypeTable c) {
+    this(c.getNameIndex(), c.getLength(), c.getLocalVariableTypeTable(),
+         c.getConstantPool());
+  }
+
+  public LocalVariableTypeTable(int name_index, int length,
+                            LocalVariable[] local_variable_table,
+                            ConstantPool    constant_pool)
+  {
+    super(Constants.ATTR_LOCAL_VARIABLE_TYPE_TABLE, name_index, length, constant_pool);
+    setLocalVariableTable(local_variable_table);
+  }
+
+  LocalVariableTypeTable(int nameIdx, int len, DataInputStream dis,ConstantPool cpool) throws IOException {
+    this(nameIdx, len, (LocalVariable[])null, cpool);
+
+    local_variable_type_table_length = (dis.readUnsignedShort());
+    local_variable_type_table = new LocalVariable[local_variable_type_table_length];
+
+    for(int i=0; i < local_variable_type_table_length; i++)
+      local_variable_type_table[i] = new LocalVariable(dis, cpool);
+  }
+
+  @Override
+public void accept(Visitor v) {
+    v.visitLocalVariableTypeTable(this);
+  }
+
+  @Override
+public final void dump(DataOutputStream file) throws IOException
+  {
+    super.dump(file);
+    file.writeShort(local_variable_type_table_length);
+    for(int i=0; i < local_variable_type_table_length; i++)
+      local_variable_type_table[i].dump(file);
+  }
+
+  public final LocalVariable[] getLocalVariableTypeTable() {
+    return local_variable_type_table;
+  }
+
+  public final LocalVariable getLocalVariable(int index) {
+    for(int i=0; i < local_variable_type_table_length; i++)
+      if(local_variable_type_table[i].getIndex() == index)
+        return local_variable_type_table[i];
+
+    return null;
+  }
+
+  public final void setLocalVariableTable(LocalVariable[] local_variable_table)
+  {
+    this.local_variable_type_table = local_variable_table;
+    local_variable_type_table_length = (local_variable_table == null)? 0 :
+      local_variable_table.length;
+  }
+
+  /**
+   * @return String representation.
+   */
+  @Override
+public final String toString() {
+      StringBuilder buf = new StringBuilder();
+
+    for(int i=0; i < local_variable_type_table_length; i++) {
+      buf.append(local_variable_type_table[i].toString());
+
+      if(i < local_variable_type_table_length - 1) buf.append('\n');
+    }
+
+    return buf.toString();
+  }
+
+  /**
+   * @return deep copy of this attribute
+   */
+  @Override
+public Attribute copy(ConstantPool constant_pool) {
+    LocalVariableTypeTable c = (LocalVariableTypeTable)clone();
+
+    c.local_variable_type_table = new LocalVariable[local_variable_type_table_length];
+    for(int i=0; i < local_variable_type_table_length; i++)
+      c.local_variable_type_table[i] = local_variable_type_table[i].copy();
+
+    c.constant_pool = constant_pool;
+    return c;
+  }
+
+  public final int getTableLength() { return local_variable_type_table_length; }
+}
diff -r 1afb8c1984ac -r 8f220f7b51c7 src/com/sun/org/apache/bcel/internal/classfile/Visitor.java
--- a/src/com/sun/org/apache/bcel/internal/classfile/Visitor.java	Fri Jun 14 18:10:26 2013 -0700
+++ b/src/com/sun/org/apache/bcel/internal/classfile/Visitor.java	Wed Oct 16 15:26:07 2013 +0100
@@ -94,6 +94,7 @@
   public void visitLineNumberTable(LineNumberTable obj);
   public void visitLocalVariable(LocalVariable obj);
   public void visitLocalVariableTable(LocalVariableTable obj);
+  public void visitLocalVariableTypeTable(LocalVariableTypeTable obj);
   public void visitMethod(Method obj);
   public void visitSignature(Signature obj);
   public void visitSourceFile(SourceFile obj);
diff -r 1afb8c1984ac -r 8f220f7b51c7 src/com/sun/org/apache/bcel/internal/generic/BasicType.java
--- a/src/com/sun/org/apache/bcel/internal/generic/BasicType.java	Fri Jun 14 18:10:26 2013 -0700
+++ b/src/com/sun/org/apache/bcel/internal/generic/BasicType.java	Wed Oct 16 15:26:07 2013 +0100
@@ -97,8 +97,14 @@
 

From andrew at icedtea.classpath.org  Wed Oct 16 07:41:13 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 16 Oct 2013 14:41:13 +0000
Subject: /hg/release/icedtea7-forest-2.4: 46 new changesets
Message-ID: <hg.faabf9b83511.1381934473.-6425493795253247641@icedtea.classpath.org>

changeset faabf9b83511 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=faabf9b83511
author: asaha
date: Thu Jun 20 21:50:01 2013 -0700

	Merge


changeset 9e21dad986e5 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=9e21dad986e5
author: asaha
date: Fri Jun 21 21:56:22 2013 -0700

	Merge


changeset e51f24701c60 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=e51f24701c60
author: asaha
date: Fri Jun 28 11:28:49 2013 -0700

	Merge


changeset a1761a968ddb in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a1761a968ddb
author: katleman
date: Tue Jul 02 15:17:09 2013 -0700

	Added tag jdk7u45-b01 for changeset e51f24701c60


changeset 07e41ff8674c in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=07e41ff8674c
author: asaha
date: Wed Jul 03 22:30:45 2013 -0700

	Merge


changeset 7d3cabf032a0 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=7d3cabf032a0
author: katleman
date: Tue Jul 09 18:22:36 2013 -0700

	Added tag jdk7u45-b02 for changeset 07e41ff8674c


changeset 23c983c352a1 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=23c983c352a1
author: asaha
date: Wed Jul 10 21:46:36 2013 -0700

	Merge


changeset e79d085b5666 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=e79d085b5666
author: cl
date: Tue Jul 16 05:51:51 2013 -0700

	Added tag jdk7u45-b03 for changeset 23c983c352a1


changeset 19e4d8fbd509 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=19e4d8fbd509
author: asaha
date: Wed Jul 17 13:53:30 2013 -0700

	Merge


changeset 1018a8ab686d in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=1018a8ab686d
author: asaha
date: Mon Jul 22 22:14:10 2013 -0700

	8020032: 7u fastdebug doesn't generate fastdebuginfo file
	Reviewed-by: tbell
	Contributed-by: tristan.yan at oracle.com


changeset 1a7bcf5b173d in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=1a7bcf5b173d
author: cl
date: Tue Jul 23 08:11:08 2013 -0700

	Added tag jdk7u45-b04 for changeset 1018a8ab686d


changeset 807cce4fa46a in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=807cce4fa46a
author: asaha
date: Thu Jul 25 15:38:00 2013 -0700

	Merge


changeset 5b1e3cb9af72 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=5b1e3cb9af72
author: asaha
date: Mon Jul 29 11:53:26 2013 -0700

	Merge


changeset 22e0ca1fa645 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=22e0ca1fa645
author: asaha
date: Wed Jul 31 23:03:02 2013 -0700

	Merge


changeset 065564878326 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=065564878326
author: asaha
date: Fri Aug 02 15:22:27 2013 -0700

	Added tag jdk7u45-b05 for changeset 22e0ca1fa645


changeset 9a08e6d6eb84 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=9a08e6d6eb84
author: asaha
date: Fri Aug 02 15:45:15 2013 -0700

	Merge


changeset a9e59d09051e in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a9e59d09051e
author: cl
date: Fri Aug 02 19:02:52 2013 -0700

	Added tag jdk7u45-b05 for changeset 807cce4fa46a


changeset cf763e7e864c in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=cf763e7e864c
author: asaha
date: Mon Aug 05 11:50:14 2013 -0700

	8022254: Remove incorrect jdk7u45-b05 tag from jdk7u-cpu forest
	Reviewed-by: cl


changeset 3e965943d66c in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=3e965943d66c
author: asaha
date: Mon Aug 05 13:43:19 2013 -0700

	Merge


changeset 61343f60f25a in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=61343f60f25a
author: asaha
date: Wed Aug 07 12:20:45 2013 -0700

	Merge


changeset 9786d336c678 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=9786d336c678
author: cl
date: Thu Aug 08 23:23:05 2013 -0700

	Added tag jdk7u45-b06 for changeset 61343f60f25a


changeset 24088aaf3f68 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=24088aaf3f68
author: asaha
date: Mon Aug 12 12:30:21 2013 -0700

	Merge


changeset 71e94860715d in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=71e94860715d
author: cl
date: Thu Aug 15 22:16:02 2013 -0700

	Added tag jdk7u45-b07 for changeset 24088aaf3f68


changeset 036425509e31 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=036425509e31
author: asaha
date: Mon Aug 19 12:41:23 2013 -0700

	Merge


changeset 6cc42e1e36b7 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=6cc42e1e36b7
author: cl
date: Tue Aug 20 10:22:10 2013 -0700

	Added tag jdk7u45-b08 for changeset 036425509e31


changeset 247aff49b5cf in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=247aff49b5cf
author: asaha
date: Thu Aug 22 08:38:10 2013 -0700

	Merge


changeset b6af2c522a63 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=b6af2c522a63
author: asaha
date: Mon Aug 26 08:08:45 2013 -0700

	Merge


changeset 57f404092d1a in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=57f404092d1a
author: cl
date: Tue Aug 27 10:55:55 2013 -0700

	Added tag jdk7u45-b09 for changeset b6af2c522a63


changeset 3fedb8c609a0 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=3fedb8c609a0
author: asaha
date: Tue Aug 27 15:13:14 2013 -0700

	Merge


changeset 2c473d04bc4b in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=2c473d04bc4b
author: cl
date: Wed Sep 04 11:04:59 2013 -0700

	Added tag jdk7u45-b10 for changeset 3fedb8c609a0


changeset 142403d9f116 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=142403d9f116
author: asaha
date: Wed Sep 04 11:58:14 2013 -0700

	Merge


changeset a14018a5fa18 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a14018a5fa18
author: cl
date: Wed Sep 11 11:12:07 2013 -0700

	Added tag jdk7u45-b11 for changeset 142403d9f116


changeset 4d38e9adeb81 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=4d38e9adeb81
author: cl
date: Wed Sep 18 02:15:43 2013 -0700

	Added tag jdk7u45-b12 for changeset a14018a5fa18


changeset bab0456ba052 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=bab0456ba052
author: cl
date: Mon Sep 23 14:31:17 2013 -0700

	Added tag jdk7u45-b13 for changeset 4d38e9adeb81


changeset b4b258464902 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=b4b258464902
author: cl
date: Thu Sep 26 10:37:03 2013 -0700

	Added tag jdk7u45-b14 for changeset bab0456ba052


changeset f2479abad143 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=f2479abad143
author: cl
date: Fri Sep 27 11:44:05 2013 -0700

	Added tag jdk7u45-b15 for changeset b4b258464902


changeset a2605cf03226 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a2605cf03226
author: katleman
date: Wed Sep 11 10:59:38 2013 -0700

	Added tag jdk7u40-b61 for changeset 6359fa34199c


changeset 8ae9ebf60745 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=8ae9ebf60745
author: katleman
date: Tue Sep 17 13:05:14 2013 -0700

	Added tag jdk7u40-b62 for changeset a2605cf03226


changeset c782043adf1d in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=c782043adf1d
author: asaha
date: Thu Sep 19 14:38:06 2013 -0700

	Merge


changeset 93c0a4abb398 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=93c0a4abb398
author: asaha
date: Fri Sep 27 13:05:54 2013 -0700

	Merge


changeset 6fd67e0287a9 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=6fd67e0287a9
author: cl
date: Thu Oct 03 11:31:38 2013 -0700

	Added tag jdk7u45-b16 for changeset f2479abad143


changeset f0cdb08a4624 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=f0cdb08a4624
author: cl
date: Mon Oct 07 21:52:16 2013 -0700

	Added tag jdk7u45-b17 for changeset 6fd67e0287a9


changeset 82f1f76c4412 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=82f1f76c4412
author: cl
date: Tue Oct 08 09:06:41 2013 -0700

	Added tag jdk7u45-b18 for changeset f0cdb08a4624


changeset 3a86bbf3f75a in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=3a86bbf3f75a
author: cl
date: Tue Oct 08 10:57:33 2013 -0700

	Added tag jdk7u45-b30 for changeset 82f1f76c4412


changeset f4373de4b75b in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=f4373de4b75b
author: asaha
date: Tue Oct 08 11:10:00 2013 -0700

	Merge


changeset e2f5917da3c1 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=e2f5917da3c1
author: andrew
date: Wed Oct 16 15:17:01 2013 +0100

	Merge jdk7u45-b31


diffstat:

 .hgtags                    |  108 +++++++++++++++++++++++
 .jcheck/conf               |    2 -
 Makefile                   |   22 +++-
 THIRD_PARTY_README         |   33 ++++++-
 make/Defs-internal.gmk     |    3 +-
 make/deploy-rules.gmk      |   32 +------
 make/hotspot-rules.gmk     |    2 +
 make/install-rules.gmk     |   20 ++++-
 make/jprt.gmk              |    6 +-
 make/jprt.properties       |   16 +-
 make/scripts/hgforest.sh   |    2 +-
 make/scripts/normalizer.pl |  208 +++++++++++++++++++++++++++++++++++++++++++++
 make/scripts/webrev.ksh    |   66 ++++++++-----
 test/Makefile              |   12 +-
 14 files changed, 443 insertions(+), 89 deletions(-)

diffs (truncated from 951 to 500 lines):

diff -r faa42104c90a -r e2f5917da3c1 .hgtags
--- a/.hgtags	Fri Jun 14 18:10:14 2013 -0700
+++ b/.hgtags	Wed Oct 16 15:17:01 2013 +0100
@@ -50,6 +50,7 @@
 3ac6dcf7823205546fbbc3d4ea59f37358d0b0d4 jdk7-b73
 2c88089b6e1c053597418099a14232182c387edc jdk7-b74
 d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75
+f0bfd9bd1a0e674288a8a4d17dcbb9e632b42e6d icedtea7-1.12
 c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76
 1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77
 ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
@@ -63,6 +64,7 @@
 433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86
 6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87
 82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88
+195fcceefddce1963bb26ba32920de67806ed2db icedtea7-1.13
 7f1ba4459972bf84b8201dc1cc4f62b1fe1c74f4 jdk7-b89
 425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90
 97d8b6c659c29c8493a8b2b72c2796a021a8cf79 jdk7-b91
@@ -111,6 +113,7 @@
 ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134
 783bd02b4ab4596059c74b10a1793d7bd2f1c157 jdk7-b135
 2fe76e73adaa5133ac559f0b3c2c0707eca04580 jdk7-b136
+d4aea1a51d625f5601c840714c7c94f1de5bc1af icedtea-1.14
 7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137
 fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138
 7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139
@@ -123,6 +126,7 @@
 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
 d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
+3defd24c2671eb2e7796b5dc45b98954341d73a7 icedtea-2.0-branchpoint
 34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02
 bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03
 f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04
@@ -141,6 +145,7 @@
 b2deaf5bde5ec455a06786e8e2aea2e673be13aa jdk7u2-b12
 c95558e566ac3605c480a3d070b1102088dab07f jdk7u2-b13
 e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u2-b21
+a66b58021165f5a43e3974fe5fb9fead29824098 icedtea-2.1-branchpoint
 e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u3-b02
 becd013ae6072a6633ba015fc4f5862fca589cee jdk7u3-b03
 d64361a28584728aa25dca3781cffbaf4199e088 jdk7u3-b04
@@ -157,6 +162,7 @@
 2b07c262a8a9ff78dc908efb9d7b3bb099df9ac4 jdk7u4-b10
 1abfee16e8cc7e3950052befa78dbf14a5ca9cfc jdk7u4-b11
 e6f915094dccbba16df6ebeb002e6867392eda40 jdk7u4-b12
+e7886f5ad6cc837092386fa513e670d4a770456c icedtea-2.2-branchpoint
 9108e3c2f07ffa218641d93893ac9928e95d213a jdk7u4-b13
 d9580838fd08872fc0da648ecfc6782704b4aac1 jdk7u4-b14
 008753000680a2008175d14b25373356f531aa07 jdk7u4-b15
@@ -191,6 +197,7 @@
 528f1589f5f2adf18d5d21384ba668b9aa79841e jdk7u6-b15
 7b77364eb09faac4c37ce9dd2c2308ca5525f18f jdk7u6-b16
 b7c1b441d131c70278de299b5d1e59dce0755dc5 jdk7u6-b17
+0e7b94bd450d4270d4e9bd6c040c94fa4be714a6 icedtea-2.3-branchpoint
 9c41f7b1460b106d18676899d24b6ea07de5a369 jdk7u6-b18
 56291720b5e578046bc02761dcad2a575f99fd8e jdk7u6-b19
 e79fa743fe5a801db4acc7a7daa68f581423e5d3 jdk7u6-b20
@@ -240,6 +247,31 @@
 3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b10
 527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u13-b30
 3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b20
+1ab3edf5061fdde3a6f6510373a92444445af710 jdk7u8-b01
+d7a94c8cbbbfadbd9e2f3e4737eb7deb572dedc9 jdk7u8-b02
+e7c504c99ab60e3b21cdc9460afaa3926d53cff1 jdk7u8-b03
+996e3145029120fd6ef2cacb3d03cb1f20862247 jdk7u8-b04
+891689cc39ff9d67bc4fe43bcb91ecdabda1f9f8 jdk7u8-b05
+f16343fe14acb4118f0a3f78fd735a4a6133c76a jdk7u10-b06
+1fa71ffbbd596086dbade86505d2d7e1c436de76 jdk7u10-b07
+e7014c55a9e55c10fe4f91ca092eb01029c36c75 jdk7u10-b08
+aaf495a24a9bb996b3955e52edff8d93ff62dc5f jdk7u10-b09
+3eddc50eb3574bf4cff4081310fd763e958ed073 jdk7u12-b01
+207c000ac697d052f84cde6e782865b209e60239 jdk7u12-b02
+a3917db5d568d9805b3c46ce67c39c475cf10e0e jdk7u12-b03
+52945b197d7c93d215067034a45e5e9452c67f78 jdk7u12-b04
+eae53fe51e79e04ca28b5790a6ae25d39a06b0ab jdk7u12-b05
+a008905ce525b88e5bdc80fe6ad7570f6f6a19ac jdk7u12-b06
+c3e42860af1cfd997fe1895594f652f0d1e9984e jdk7u12-b07
+1a03ef4794dc8face4de605ae480d4c763e6b494 jdk7u12-b08
+87cf81226f2012e5c21131adac7880f7e4da1133 jdk7u12-b09
+8a10a3c51f1cd88009008cf1b82071797b5f516d icedtea-2.4-branchpoint
+745a15bb6d94765bb5c68048ff146590df9b8441 jdk7u14-b10
+2d8fdaa5bb55b937028e385633ce58de4dcdb69c jdk7u14-b11
+594dbbbb84add4aa310d51af7e298470d8cda458 jdk7u14-b12
+ae5c1b29297dae0375277a0b6428c266d8d77c71 jdk7u14-b13
+bb97ad0c9e5a0566e82b3b4bc43eabe680b89d97 jdk7u14-b14
+b534282bd377e3886b9d0d4760f6fdaa1804bdd3 jdk7u14-b15
 0e52db2d9bb8bc789f6c66f2cfb7cd2d3b0b16c6 jdk7u15-b01
 0324fca94d073b3aad77658224f17679f25c18b1 jdk7u15-b02
 25a9d44cebf2a7ac6dd1748c94e00b242403acb1 jdk7u15-b30
@@ -264,7 +296,9 @@
 602ad1a5b09fb9136e8bf1b708e0524fbdb35324 jdk7u21-b10
 fa322ca378324750ea049f2e92357e51eca27ae4 jdk7u21-b11
 450e8dde919df278fe75ae95e0eb0a6464f5bc41 jdk7u21-b30
+170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b50
 170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b12
+da9a0cdf4afcfae3a7c47565e9acfd9170ba5a30 jdk7u21-b31
 50bfbd21bf42f6ae4167226ac45cd79e0ab7758c jdk7u25-b03
 a94c9aa356bbed13c1e2b4a9a380117ddff1668f jdk7u25-b04
 29a789ae14dc09a50eb45d3445075642e77490a2 jdk7u25-b05
@@ -274,10 +308,84 @@
 84285f4e0aa2f81b80bc6fbe713d768c0d9a7156 jdk7u25-b09
 aae1e27d347b71f65f548c12b918ede98d869b7c jdk7u25-b10
 039f12124903cd0b7633a17a26f6ca281f7aaeae jdk7u25-b11
+210f464368dba0fc4f8d239654fa7432ad2ed31f jdk7u14-b16
+f07712232642fc30dcf7c433ff890e7247b5fd0b jdk7u14-b17
+9e2a9a2c5b240daa4e27ff75d030a77827174753 jdk7u14-b18
+d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
+d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
+b4b7795ef8047e3d2b2ba48a70c08d9184073100 jdk7u14-b19
+f413e7a22c198559af5aca28309356e6d4edd78f jdk7u14-b20
+41686e19d8189a546434a52dd9679e9b6a0a68be jdk7u14-b21
+3e3177719b43f732239d6d51e96d26ee18440960 jdk7u14-b22
+8c6e2197930c79f6beafd83181714cc817b83229 jdk7u40-b23
+5169c92728b54a4b5e9a41071f8bf8701d0fe1fa jdk7u40-b24
+f89fd7e2800c1c35b6c339f54780d5579bb30991 jdk7u40-b25
+4ef57f592525d36487ea6eeb2be84d0e9170b26b jdk7u40-b26
+75167199239375d05b68668023c885c2776fd548 jdk7u40-b27
+ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28
+dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29
 2d02518960053d2b1dcb9aabacd709788e92c549 jdk7u25-b12
 37c4268341d79b16165bdaf7e1fad489d692bc83 jdk7u25-b13
 9de1fc3635def64c19c51f272f09b51d8cf0ca98 jdk7u25-b14
 2197dde877124579204c5266fa9d89166760b44f jdk7u25-b15
+eeb29025d52ab4ea9bc4f5afa37c3a4fbcaf0011 jdk7u25-b31
+e571b5c75bd194c1aaad6e8e75b1d40f6208391c jdk7u25-b33
+161e4656fea4720ececade6892247a73a2e31a42 jdk7u25-b34
 9846c505054fb91762f3fd9b817d1a9760322029 jdk7u25-b30
 12c2f4ce55d074f0be94781d98cbbbcf8299b666 jdk7u25-b16
 40fde76d9b89f5acc63f4eeeccdc261d9999bf39 jdk7u25-b32
+210f464368dba0fc4f8d239654fa7432ad2ed31f jdk7u14-b16
+f07712232642fc30dcf7c433ff890e7247b5fd0b jdk7u14-b17
+9e2a9a2c5b240daa4e27ff75d030a77827174753 jdk7u14-b18
+d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
+d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
+b4b7795ef8047e3d2b2ba48a70c08d9184073100 jdk7u14-b19
+f413e7a22c198559af5aca28309356e6d4edd78f jdk7u14-b20
+30065a72715f046e4a4bdec1c0cc7d65153c9d99 icedtea-2.4.0
+41686e19d8189a546434a52dd9679e9b6a0a68be jdk7u14-b21
+3e3177719b43f732239d6d51e96d26ee18440960 jdk7u14-b22
+8c6e2197930c79f6beafd83181714cc817b83229 jdk7u40-b23
+5169c92728b54a4b5e9a41071f8bf8701d0fe1fa jdk7u40-b24
+f89fd7e2800c1c35b6c339f54780d5579bb30991 jdk7u40-b25
+4ef57f592525d36487ea6eeb2be84d0e9170b26b jdk7u40-b26
+75167199239375d05b68668023c885c2776fd548 jdk7u40-b27
+ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28
+dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29
+1c141e6fde911c4974c87e340eb698754607f422 jdk7u40-b30
+ae86c6974e8ee35ef66121810ea9e748b7e677d9 icedtea-2.4.1
+58a2a470aa3bccd3eb3624e68bca9397c8cc26a2 jdk7u40-b31
+e51f24701c608e57ba7ae69ba28bbc2daab02c4c jdk7u45-b01
+da376fd5e4d68f8a45003a6e175267dc840711cc jdk7u40-b32
+3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33
+a1ae13479e8767329fa20774b5cea5976aaeb37b jdk7u40-b34
+af755d12719e898e3af917e8a56b64ebf83019bc jdk7u40-b35
+59598f7b6a7be5e0470447694c1f5b7d951f6ff1 jdk7u40-b36
+5bfb3aa1655e5364a8c1c17343ff84dad7e13f25 jdk7u40-b37
+7d3e6ccad487d84e764932802cd42d2afebccd7a jdk7u40-b38
+a2ba8e069718677c267b3894df2a719148c15ac8 jdk7u40-b39
+c9157eb582a5deec5bbac671bf628bc45af447d0 jdk7u40-b40
+8773b39be6ac71c06793035b8c72f5c771eb534f jdk7u40-b41
+3af81bfe320c12758234233da6fa27c3c0ffcdc4 jdk7u40-b42
+1d53bd8fd2a62bcf336727ebec377ef7498dd4a6 jdk7u40-b43
+dc1e099cd62d250b4a997ce694b47fe2f50d2905 jdk7u40-b60
+6125b83238df36d96b3f6bf5ca6c740693dd3651 icedtea-2.4.2
+6359fa34199c9619dfec0f41d2eb22a4083ce610 jdk7u40-b61
+a2605cf03226ce2fef7a899ce41521c654300975 jdk7u40-b62
+07e41ff8674c9438cb1124cf78eed8636ed5d4fa jdk7u45-b02
+23c983c352a170d7a5fb7d703081daf1816d257a jdk7u45-b03
+1018a8ab686da6c1be22bec3ab9d01b2dc206333 jdk7u45-b04
+22e0ca1fa645d0518b514159afafe34335699c11 jdk7u45-b05
+61343f60f25a1d0deddc1468b2eb948df5275641 jdk7u45-b06
+24088aaf3f6834e46b486b706fbc6ce1f18814e5 jdk7u45-b07
+036425509e31070700a3956aaca7c33d583b7a5e jdk7u45-b08
+b6af2c522a633de1c7b66204fac7104b410ce23c jdk7u45-b09
+3fedb8c609a0f43bc8084edbecb0435e19dcb9a2 jdk7u45-b10
+142403d9f1167b8559b49627c7199c84623307da jdk7u45-b11
+a14018a5fa18092dcca5084656abb797bdb7b5ff jdk7u45-b12
+4d38e9adeb81df9c24550070df1f358aa9c17477 jdk7u45-b13
+bab0456ba0520f73ee20814ddf7ea0d596e49abd jdk7u45-b14
+b4b2584649027b622c188db7a6c3f9cff0e20130 jdk7u45-b15
+f2479abad143d2d9f33b6c872890ca0c5dd52530 jdk7u45-b16
+6fd67e0287a9893ea1f0090fe127f18a7e235148 jdk7u45-b17
+f0cdb08a4624a623bdd178b04c4bf5a2fa4dc39a jdk7u45-b18
+82f1f76c44124c31cb1151833fc15c13547ab280 jdk7u45-b30
diff -r faa42104c90a -r e2f5917da3c1 .jcheck/conf
--- a/.jcheck/conf	Fri Jun 14 18:10:14 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r faa42104c90a -r e2f5917da3c1 Makefile
--- a/Makefile	Fri Jun 14 18:10:14 2013 -0700
+++ b/Makefile	Wed Oct 16 15:17:01 2013 +0100
@@ -164,16 +164,23 @@
   clobber:: deploy-clobber
 endif
 
+ifeq ($(BUILD_INSTALL_BUNDLES), true)
+  generic_build_repo_series:: install-binaries-jdk-debug
+  clobber:: install-binaries-jdk-debug-clobber
+endif
+
 generic_build_repo_series::
 	@$(call StopTimer,$(if $(DEBUG_NAME),$(DEBUG_NAME)_build,all_product_build))
 
 # The debug build, fastdebug or debug. Needs special handling.
-#  Note that debug builds do NOT do INSTALL steps, but must be done
-#  after the product build and before the INSTALL step of the product build.
+#
+#  Note that debug builds do NOT do INSTALL steps aside from the
+#  install-binaries-jdk-debug or install-binaries-jdk-debug-clobber targets.
 #
 #   DEBUG_NAME is fastdebug or debug
 #   ALT_OUTPUTDIR is changed to have -debug or -fastdebug suffix
 #   The resulting image directory (j2sdk-image) is used by the install makefiles
+#     (only if debug files are present when install checks for them)
 #     to create a debug install bundle jdk-*-debug-** bundle (tar or zip) 
 #     which will install in the debug or fastdebug subdirectory of the
 #     normal product install area.
@@ -189,7 +196,7 @@
 ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk
 FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
 FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(REL_JDK_IMAGE_DIR)
-  
+
 create_fresh_product_bootdir: FRC
 	$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
 		GENERATE_DOCS=false \
@@ -218,7 +225,7 @@
 
 
 ifeq ($(DO_BOOT_CYCLE),true)
-  
+
   # Create the bootdir to use in the build
   product_build:: create_fresh_product_bootdir
   debug_build:: create_fresh_debug_bootdir
@@ -256,6 +263,8 @@
 		ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/$(REL_JDK_OUTPUTDIR) \
 	        DEBUG_NAME=$(DEBUG_NAME) \
 		GENERATE_DOCS=false \
+		$(if $(findstring true,$(BUILD_INSTALL)),BUILD_INSTALL_BUNDLES=true,) \
+		CREATE_DEBUGINFO_BUNDLES=true \
 	        $(BOOT_CYCLE_DEBUG_SETTINGS) \
 		generic_build_repo_series
 
@@ -540,8 +549,8 @@
 ################################################################
 
 .PHONY: all  test test_run test_start test_summary test_clean \
-	generic_build_repo_series \
-	what clobber insane \
+        generic_build_repo_series \
+        what clobber insane \
         dev dev-build dev-sanity dev-clobber \
         product_build \
         fastdebug_build \
@@ -556,4 +565,3 @@
 
 # Force target
 FRC:
-
diff -r faa42104c90a -r e2f5917da3c1 THIRD_PARTY_README
--- a/THIRD_PARTY_README	Fri Jun 14 18:10:14 2013 -0700
+++ b/THIRD_PARTY_README	Wed Oct 16 15:17:01 2013 +0100
@@ -1912,6 +1912,35 @@
 
 -------------------------------------------------------------------------------
 
+%% This notice is provided with respect to Sparkle v.1.5,
+which is included with JRE 7 on Mac OS X.
+
+--- begin of LICENSE ---
+
+Copyright (c) 2012 Sparkle.org and Andy Matuschak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
 %% Portions licensed from Taligent, Inc.
 
 -------------------------------------------------------------------------------
@@ -3169,12 +3198,12 @@
 %% This notice is provided with respect to the following which is 
 included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
 
-  Apache Derby 10.8.1.2        [included with JDK 7 only]
+  Apache Derby 10.8.3.0        [included with JDK 7 only]
   Apache Jakarta BCEL 5.2 
   Apache Jakarta Regexp 1.4 
   Apache Santuario XMLSec-Java 1.4.2
   Apache Xalan-Java 2.7.1 
-  Apache Xerces2 Java 2.10.0 
+  Apache Xerces2 Java 2.11.0 
   Apache XML Resolver 1.1 
 
 
diff -r faa42104c90a -r e2f5917da3c1 make/Defs-internal.gmk
--- a/make/Defs-internal.gmk	Fri Jun 14 18:10:14 2013 -0700
+++ b/make/Defs-internal.gmk	Wed Oct 16 15:17:01 2013 +0100
@@ -322,7 +322,8 @@
     JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) \
     PREVIOUS_MAJOR_VERSION=$(PREVIOUS_MAJOR_VERSION) \
     PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \
-    PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION)
+    PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) \
+    STATIC_CXX=$(STATIC_CXX)
 
 ifdef ARCH_DATA_MODEL
   COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)
diff -r faa42104c90a -r e2f5917da3c1 make/deploy-rules.gmk
--- a/make/deploy-rules.gmk	Fri Jun 14 18:10:14 2013 -0700
+++ b/make/deploy-rules.gmk	Wed Oct 16 15:17:01 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2013, 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
@@ -42,20 +42,6 @@
 endif
 
 DEPLOY_BUILD_TARGETS = sanity deploy 
-# Only build 7-Zip LZMA file compression if it is available
-# Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available
-ifeq ($(ARCH_DATA_MODEL), 32)
-  ifeq ($(PLATFORM), windows)
-      EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \
-        $(ECHO) true ; \
-      else \
-  $(ECHO) false ; \
-      fi )
-  ifeq ($(EC_TMP), true)
-        DEPLOY_BUILD_TARGETS += extra-comp-all
-      endif
-  endif
-endif
 
 ifneq ($(JQS), off)
   ifeq ($(ARCH_DATA_MODEL), 32)
@@ -65,22 +51,6 @@
   endif
 endif
 
-ifeq ($(ARCH_DATA_MODEL), 32)
-  ifeq ($(PLATFORM), windows)
-    # Only set up to use UPX compression if it is available
-    UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
-      $(ECHO) true ; \
-    else \
-      $(ECHO) false ; \
-    fi )
-    ifeq ($(UP_TMP), true)
-      DEPLOY_BUILD_TARGETS += cmd-comp-all
-    endif
-  endif
-endif
-
-
-
 ifndef DEV_ONLY
   DEPLOY_BUILD_TARGETS += images
 else
diff -r faa42104c90a -r e2f5917da3c1 make/hotspot-rules.gmk
--- a/make/hotspot-rules.gmk	Fri Jun 14 18:10:14 2013 -0700
+++ b/make/hotspot-rules.gmk	Wed Oct 16 15:17:01 2013 +0100
@@ -105,6 +105,8 @@
   HOTSPOT_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)"
 endif
 
+-include ${JDK_TOPDIR}/make/closed/common/Defs.gmk
+
 hotspot-build::
 	$(MKDIR) -p $(HOTSPOT_OUTPUTDIR)
 	$(MKDIR) -p $(HOTSPOT_EXPORT_PATH)
diff -r faa42104c90a -r e2f5917da3c1 make/install-rules.gmk
--- a/make/install-rules.gmk	Fri Jun 14 18:10:14 2013 -0700
+++ b/make/install-rules.gmk	Wed Oct 16 15:17:01 2013 +0100
@@ -97,6 +97,23 @@
 	@$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'`
 	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all
 
+
+install-binaries-jdk-debug:
+ifeq ($(BUILD_INSTALL_BUNDLES), true)
+	@$(call MakeStart,install,binaries-jdk-debug)
+	($(CD) $(INSTALL_TOPDIR)/make/installer/binaries/$(PLATFORM) && \
+	  $(MAKE) binaries-jdk-debug $(INSTALL_BUILD_ARGUMENTS))
+	@$(call MakeFinish,install,binaries-jdk-debug)
+endif
+
+install-binaries-jdk-debug-clobber:
+ifeq ($(BUILD_INSTALL_BUNDLES), true)
+	@$(call MakeStart,install,binaries-jdk-debug-clobber)
+	($(CD) $(INSTALL_TOPDIR)/make/installer/binaries/$(PLATFORM) && \
+	  $(MAKE) binaries-jdk-debug-clobber $(INSTALL_BUILD_ARGUMENTS))
+	@$(call MakeFinish,install,binaries-jdk-debug-clobber)
+endif
+
 install-clobber:
 ifeq ($(BUILD_INSTALL), true)
 	@$(call MakeStart,install,clobber)
@@ -116,4 +133,5 @@
 ######################################
 
 .PHONY: install install-build install-clobber install-sanity \
-	update-installer update-patchgen installer
+	update-installer update-patchgen installer \
+        install-binaries-jdk-debug install-binaries-jdk-debug-clobber
diff -r faa42104c90a -r e2f5917da3c1 make/jprt.gmk
--- a/make/jprt.gmk	Fri Jun 14 18:10:14 2013 -0700
+++ b/make/jprt.gmk	Wed Oct 16 15:17:01 2013 +0100
@@ -30,11 +30,9 @@
 # To get all the bundles from JPRT, use:
 #   jprt submit -buildenv HAVE_JPRT_SAVE_BUNDLES=true -control "..." ...
 
-DEFAULT_BUILD_FLAVOR=product
-
 # JPRT will define these when it builds
-JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip
-JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip
+JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
+JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-install-bundle.zip
 
 ifeq ($(PLATFORM),windows)
   ZIPFLAGS=-q
diff -r faa42104c90a -r e2f5917da3c1 make/jprt.properties
--- a/make/jprt.properties	Fri Jun 14 18:10:14 2013 -0700
+++ b/make/jprt.properties	Wed Oct 16 15:17:01 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, 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
@@ -79,20 +79,17 @@
     ${jprt.my.test.target.set:TESTNAME=jdk_util},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_io},			\
     ${jprt.my.test.target.set:TESTNAME=jdk_net},		\
-    ${jprt.my.test.target.set:TESTNAME=jdk_nio1},		\
-    ${jprt.my.test.target.set:TESTNAME=jdk_nio2},		\
-    ${jprt.my.test.target.set:TESTNAME=jdk_nio3},		\
+    ${jprt.my.test.target.set:TESTNAME=jdk_nio},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_security1},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_security2},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_security3},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_rmi},		\
-    ${jprt.my.test.target.set:TESTNAME=jdk_management1},	\
-    ${jprt.my.test.target.set:TESTNAME=jdk_management2},	\
+    ${jprt.my.test.target.set:TESTNAME=jdk_management},	\
+    ${jprt.my.test.target.set:TESTNAME=jdk_jmx},	\
     ${jprt.my.test.target.set:TESTNAME=jdk_text},		\
-    ${jprt.my.test.target.set:TESTNAME=jdk_tools1},		\
-    ${jprt.my.test.target.set:TESTNAME=jdk_tools2},		\
+    ${jprt.my.test.target.set:TESTNAME=jdk_tools},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_jfr},		\
-    ${jprt.my.test.target.set:TESTNAME=jdk_misc}
+    ${jprt.my.test.target.set:TESTNAME=jdk_other}
 
 # All vm test targets (testset=all)
 jprt.vm.all.test.targets=    					\
@@ -107,6 +104,7 @@
     ${jprt.my.test.target.set:TESTNAME=jdk_beans1}		\
     ${jprt.my.test.target.set:TESTNAME=jdk_beans2},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_beans3},		\
+    ${jprt.my.test.target.set:TESTNAME=jdk_jdi},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_sound},              \
     ${jprt.my.test.target.set:TESTNAME=jdk_swing}
 
diff -r faa42104c90a -r e2f5917da3c1 make/scripts/hgforest.sh
--- a/make/scripts/hgforest.sh	Fri Jun 14 18:10:14 2013 -0700
+++ b/make/scripts/hgforest.sh	Wed Oct 16 15:17:01 2013 +0100
@@ -58,7 +58,7 @@
     fi
   done
   if [ "${pull_extra_base}" != "" ] ; then
-    subrepos_extra="jdk/src/closed jdk/make/closed jdk/test/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs"

From andrew at icedtea.classpath.org  Wed Oct 16 07:41:22 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 16 Oct 2013 14:41:22 +0000
Subject: /hg/release/icedtea7-forest-2.4/corba: 53 new changesets
Message-ID: <hg.8dddd1c2fd9e.1381934482.-523731888714527277@icedtea.classpath.org>

changeset 8dddd1c2fd9e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8dddd1c2fd9e
author: msheppar
date: Fri Jun 14 17:45:07 2013 +0100

	8011157: Improve CORBA portablility
	Summary: fix also reviewed by Alexander Fomin
	Reviewed-by: alanb, coffeys, skoivu


changeset fc434680b23c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=fc434680b23c
author: asaha
date: Wed Jun 19 21:51:02 2013 -0700

	Merge


changeset 96c4e7c84230 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=96c4e7c84230
author: asaha
date: Thu Jun 20 21:50:24 2013 -0700

	Merge


changeset 4f54264ca4df in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=4f54264ca4df
author: asaha
date: Fri Jun 21 21:56:37 2013 -0700

	Merge


changeset eb228b67522e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=eb228b67522e
author: katleman
date: Tue Jul 02 15:17:11 2013 -0700

	Added tag jdk7u45-b01 for changeset 4f54264ca4df


changeset 8c4894c44f92 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8c4894c44f92
author: asaha
date: Tue Jul 02 15:25:18 2013 -0700

	Merge


changeset 462d171e9097 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=462d171e9097
author: asaha
date: Tue Jul 02 15:28:07 2013 -0700

	Merge


changeset 1a1a1dedf437 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=1a1a1dedf437
author: asaha
date: Wed Jul 03 17:35:01 2013 -0700

	Merge


changeset 43cf19188238 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=43cf19188238
author: katleman
date: Tue Jul 09 18:22:42 2013 -0700

	Added tag jdk7u45-b02 for changeset 1a1a1dedf437


changeset 3a2cca8c2f20 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3a2cca8c2f20
author: asaha
date: Wed Jul 10 16:29:39 2013 -0700

	Merge


changeset 38acb2b8e5c5 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=38acb2b8e5c5
author: cl
date: Tue Jul 16 05:51:53 2013 -0700

	Added tag jdk7u45-b03 for changeset 3a2cca8c2f20


changeset 8cce3b403b3e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8cce3b403b3e
author: mchung
date: Thu Jul 18 17:22:25 2013 -0700

	8017196: Ensure Proxies are handled appropriately
	Reviewed-by: dfuchs, jrose, jdn, ahgross, chegar


changeset 7cfa75064d07 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=7cfa75064d07
author: asaha
date: Wed Jul 17 13:53:50 2013 -0700

	Merge


changeset 4f4f7869bd65 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=4f4f7869bd65
author: asaha
date: Mon Jul 22 12:09:13 2013 -0700

	Merge


changeset 7fd80a3a030b in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=7fd80a3a030b
author: cl
date: Tue Jul 23 08:11:10 2013 -0700

	Added tag jdk7u45-b04 for changeset 4f4f7869bd65


changeset 4e6f135b2779 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=4e6f135b2779
author: asaha
date: Thu Jul 25 15:39:19 2013 -0700

	Merge


changeset b23aed280f64 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b23aed280f64
author: asaha
date: Mon Jul 29 11:53:43 2013 -0700

	Merge


changeset faee62d13040 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=faee62d13040
author: asaha
date: Wed Jul 31 23:03:33 2013 -0700

	Merge


changeset 45f6e6fc71c4 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=45f6e6fc71c4
author: asaha
date: Fri Aug 02 15:22:29 2013 -0700

	Added tag jdk7u45-b05 for changeset faee62d13040


changeset b7baf058aef2 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b7baf058aef2
author: asaha
date: Fri Aug 02 15:45:38 2013 -0700

	Merge


changeset a23c053ff460 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a23c053ff460
author: cl
date: Fri Aug 02 19:02:54 2013 -0700

	Added tag jdk7u45-b05 for changeset 4e6f135b2779


changeset b2871fcc688f in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b2871fcc688f
author: asaha
date: Mon Aug 05 11:50:20 2013 -0700

	8022254: Remove incorrect jdk7u45-b05 tag from jdk7u-cpu forest
	Reviewed-by: cl


changeset 37de564abe4c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=37de564abe4c
author: asaha
date: Mon Aug 05 14:57:54 2013 -0700

	Merge


changeset 435dd0e1ab9e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=435dd0e1ab9e
author: asaha
date: Wed Aug 07 12:21:06 2013 -0700

	Merge


changeset fb777d9d95dc in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=fb777d9d95dc
author: cl
date: Thu Aug 08 23:23:14 2013 -0700

	Added tag jdk7u45-b06 for changeset 435dd0e1ab9e


changeset 2e19615f6045 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2e19615f6045
author: asaha
date: Mon Aug 12 12:30:45 2013 -0700

	Merge


changeset a2ac8c815b06 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a2ac8c815b06
author: cl
date: Thu Aug 15 22:16:15 2013 -0700

	Added tag jdk7u45-b07 for changeset 2e19615f6045


changeset 771c5c869d16 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=771c5c869d16
author: asaha
date: Mon Aug 19 12:41:46 2013 -0700

	Merge


changeset 30130bd0e11e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=30130bd0e11e
author: cl
date: Tue Aug 20 10:22:16 2013 -0700

	Added tag jdk7u45-b08 for changeset 771c5c869d16


changeset 5f4c2a41513c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=5f4c2a41513c
author: asaha
date: Thu Aug 22 08:38:38 2013 -0700

	Merge


changeset 366385ab5e9b in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=366385ab5e9b
author: msheppar
date: Mon Aug 19 17:01:51 2013 +0100

	8022940: Enhance CORBA translations
	Reviewed-by: coffeys, alanb, skoivu


changeset 1a13a3a11b2e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=1a13a3a11b2e
author: asaha
date: Tue Aug 20 10:50:08 2013 -0700

	Merge


changeset c61913c4ad0a in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=c61913c4ad0a
author: asaha
date: Thu Aug 22 08:53:11 2013 -0700

	Merge


changeset a89d69bef361 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a89d69bef361
author: asaha
date: Mon Aug 26 08:41:01 2013 -0700

	Merge


changeset 1e450f9795be in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=1e450f9795be
author: cl
date: Tue Aug 27 10:56:00 2013 -0700

	Added tag jdk7u45-b09 for changeset a89d69bef361


changeset fd8a2041b75c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=fd8a2041b75c
author: asaha
date: Tue Aug 27 15:13:36 2013 -0700

	Merge


changeset 4723f2a4bf50 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=4723f2a4bf50
author: cl
date: Wed Sep 04 11:05:00 2013 -0700

	Added tag jdk7u45-b10 for changeset fd8a2041b75c


changeset 55e0d3d95143 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=55e0d3d95143
author: asaha
date: Wed Sep 04 12:05:49 2013 -0700

	Merge


changeset 336566c2905a in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=336566c2905a
author: cl
date: Wed Sep 11 11:12:08 2013 -0700

	Added tag jdk7u45-b11 for changeset 55e0d3d95143


changeset 6cadc3dd82a4 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=6cadc3dd82a4
author: cl
date: Wed Sep 18 02:15:45 2013 -0700

	Added tag jdk7u45-b12 for changeset 336566c2905a


changeset 43e22471d0c2 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=43e22471d0c2
author: cl
date: Mon Sep 23 14:31:21 2013 -0700

	Added tag jdk7u45-b13 for changeset 6cadc3dd82a4


changeset 3d7a52de59f0 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3d7a52de59f0
author: cl
date: Thu Sep 26 10:37:08 2013 -0700

	Added tag jdk7u45-b14 for changeset 43e22471d0c2


changeset b1f069eb48ed in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b1f069eb48ed
author: cl
date: Fri Sep 27 11:44:16 2013 -0700

	Added tag jdk7u45-b15 for changeset 3d7a52de59f0


changeset c9c225fb19c3 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=c9c225fb19c3
author: katleman
date: Wed Sep 11 10:59:40 2013 -0700

	Added tag jdk7u40-b61 for changeset 504acad33722


changeset a09bfe5b7f69 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a09bfe5b7f69
author: katleman
date: Tue Sep 17 13:05:15 2013 -0700

	Added tag jdk7u40-b62 for changeset c9c225fb19c3


changeset 19a9832f198c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=19a9832f198c
author: asaha
date: Thu Sep 19 14:38:34 2013 -0700

	Merge


changeset 0e8dd12ebf65 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=0e8dd12ebf65
author: asaha
date: Fri Sep 27 13:06:14 2013 -0700

	Merge


changeset 8b8793f06c56 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8b8793f06c56
author: cl
date: Thu Oct 03 11:31:39 2013 -0700

	Added tag jdk7u45-b16 for changeset b1f069eb48ed


changeset 80f65a8f5850 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=80f65a8f5850
author: cl
date: Mon Oct 07 21:52:19 2013 -0700

	Added tag jdk7u45-b17 for changeset 8b8793f06c56


changeset a15e4a545044 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a15e4a545044
author: cl
date: Tue Oct 08 09:06:43 2013 -0700

	Added tag jdk7u45-b18 for changeset 80f65a8f5850


changeset 264523aa4163 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=264523aa4163
author: cl
date: Tue Oct 08 10:57:34 2013 -0700

	Added tag jdk7u45-b30 for changeset a15e4a545044


changeset b7fb35bbe70d in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=b7fb35bbe70d
author: asaha
date: Tue Oct 08 11:10:17 2013 -0700

	Merge


changeset 8ed5df839fbc in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8ed5df839fbc
author: andrew
date: Wed Oct 16 15:17:36 2013 +0100

	Merge jdk7u45-b31


diffstat:

 .hgtags                                                                                    |  109 ++++++++++
 .jcheck/conf                                                                               |    2 -
 THIRD_PARTY_README                                                                         |   33 ++-
 make/Makefile                                                                              |    2 +-
 make/common/shared/Defs-java.gmk                                                           |    2 +-
 make/common/shared/Platform.gmk                                                            |    9 +
 src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java                            |    5 +-
 src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties             |    8 +-
 src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties             |    2 +-
 src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java        |   24 --
 src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java |   14 +-
 src/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java        |   73 ++++--
 src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java                        |    4 +-
 src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java       |    3 +-
 src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java   |   11 +
 src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp                                    |    8 +-
 src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp                                 |    6 +-
 src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/UnionGen.java                  |   55 +++-
 src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp          |    5 +-
 src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp       |    2 +-
 src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java                                     |   80 +++++++-
 21 files changed, 350 insertions(+), 107 deletions(-)

diffs (truncated from 991 to 500 lines):

diff -r d77153cbe030 -r 8ed5df839fbc .hgtags
--- a/.hgtags	Wed Jun 12 20:18:16 2013 -0700
+++ b/.hgtags	Wed Oct 16 15:17:36 2013 +0100
@@ -50,6 +50,7 @@
 b751c528c55560cf2adeaeef24b39ca1f4d1cbf7 jdk7-b73
 5d0cf59a3203b9f57aceebc33ae656b884987955 jdk7-b74
 0fb137085952c8e47878e240d1cb40f14de463c4 jdk7-b75
+d728db3889da23d9f74e45154b9261a43b4acd8d icedtea7-1.12
 937144222e2219939101b0129d26a872a7956b13 jdk7-b76
 6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77
 a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78
@@ -63,6 +64,7 @@
 6253e28826d16cf1aecc39ce04c8de1f6bf2df5f jdk7-b86
 09a41111a401d327f65e453384d976a10154d9ea jdk7-b87
 39e14d2da687c7e592142137517aaf689544820f jdk7-b88
+e805b4155d76f76d40ffae36a74546f79218c539 icedtea7-1.13
 bb4424c5e778b842c064a8b1aa902b35f4397654 jdk7-b89
 56ce07b0eb47b93a98a72adef0f21e602c460623 jdk7-b90
 bcd2fc089227559ac5be927923609fac29f067fa jdk7-b91
@@ -111,6 +113,7 @@
 918003855fa0dba5acf4bf1fe36526d2fc4c1ba8 jdk7-b134
 e0b72ae5dc5e824b342801c8d1d336a55eb54e2c jdk7-b135
 48ef0c712e7cbf272f47f9224db92a3c6a9e2612 jdk7-b136
+b62418551e20fa19fbf57c49d4378b7096809e60 icedtea-1.14
 a66c01d8bf895261715955df0b95545c000ed6a8 jdk7-b137
 78d8cf04697e9df54f7f11e195b7da29b8e345a2 jdk7-b138
 60b074ec6fcf5cdf9efce22fdfb02326ed8fa2d3 jdk7-b139
@@ -123,6 +126,7 @@
 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147
+d034cc90ecc266d78b87d1429c426669431fcc1f icedtea-2.0-branchpoint
 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
 dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
 eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
@@ -141,6 +145,7 @@
 56b02f8ef70391a67c9fa71157a8faafbdff4b74 jdk7u2-b12
 456ff1f14b14ef8cfe47cef95c8094f8443fa092 jdk7u2-b13
 62b846b0c3259cae732e75df50a1b180a2541178 jdk7u2-b21
+ecb9fc90dea4720f5c1ba1354364ed610f463e41 icedtea-2.1-branchpoint
 1b648adeeefa9b1fb022459e8e4f590b736c0fdd jdk7u3-b02
 730fa05af5a9d10a3a7a1626d248b96d09f8069f jdk7u3-b03
 7f7a9b1addb4925f4f6e17f6eb5cce986c3b626d jdk7u3-b04
@@ -157,6 +162,7 @@
 23777178e7eb61859be3f7240561aa1034ff9221 jdk7u4-b10
 bdc37f3c09b6008667aff77432bb6d31cbae945e jdk7u4-b11
 fddc26b35a31884d64315cf7c296570245e9c481 jdk7u4-b12
+9ffa2340e018131c900e9cc12c9f3a10698aa191 icedtea-2.2-branchpoint
 f7119745898016a98cddab3e69efb41c5a5aaf78 jdk7u4-b13
 6a262c36caebb43972cbae5032cff632ce31d2cc jdk7u4-b14
 d9bf21b76f093abfe451880d5db29e4932b1e72e jdk7u4-b15
@@ -191,6 +197,7 @@
 8da4015f405b0fa267cca4780d20cd012d0a9cb4 jdk7u6-b15
 7674c7ed99a53a8dcf654ab8a6963199ef562a08 jdk7u6-b16
 e4a676826cb3fe2f84e19105a027c15c097f98f1 jdk7u6-b17
+68c35d6e9548bc7be9c3ce73774c6d53b0d72d3b icedtea-2.3-branchpoint
 b3d767dbd67f518168c561e078be5e860bc60cfc jdk7u6-b18
 5c046510b9308bf514f078d48fcf0112a376ad41 jdk7u6-b19
 f0c51b691d34b4a06c1e22c7960be71e0d0ee84e jdk7u6-b20
@@ -240,6 +247,31 @@
 b9ab9b203a41469a274419d26be2c04558b57ce8 jdk7u13-b10
 f5ef46204dba19679edd7492b221110fd1a0bd33 jdk7u13-b30
 b9ab9b203a41469a274419d26be2c04558b57ce8 jdk7u13-b20
+353c15c4bc371f2f8258344c988d1403477cc140 jdk7u8-b01
+d17ca8d088f7cc0dd42230472f534c8d1e415bcb jdk7u8-b02
+7c62cfa17e9613bf69d4f9b2ae74f3724d7a2955 jdk7u8-b03
+86961c802e87688ff264a946ca647d062f538302 jdk7u8-b04
+a274cd0c309b4da766dc73cac644cb44f1c23787 jdk7u8-b05
+292eab1079e7b62db7cf848781eddf1b6fc718e5 jdk7u10-b06
+ff5e33bcfc2bb7c2a69cd20b91490922eb158af2 jdk7u10-b07
+76811225baeccd3ed77a3e2ec7745ba3d42acff5 jdk7u10-b08
+f8e8ef8e0a5eea83938dab38d9a8cf6354f5a92d jdk7u10-b09
+3f309ff1d8ecd0210340ae9cfb40cc9072f66757 jdk7u12-b01
+06a04d95a12f18f07610f5d787324e2ea15e6376 jdk7u12-b02
+665ee21ff3ef309147e7f7872e2d4f446a31b642 jdk7u12-b03
+f89f101d3dfea98b143b693cebccdefc89b691ff jdk7u12-b04
+2516fd4adf4af010c217e073cdb0a1fa9eefd827 jdk7u12-b05
+16287175b517e48da9b24d31a3e9da200b6bc563 jdk7u12-b06
+7969d5f219248de033c296ef75fff7aae7545bbd jdk7u12-b07
+6f4d4c7a254d4aca3a7f2caabb75e6559a290393 jdk7u12-b08
+c8c261b2220c5b966c07784682057a915defb0da jdk7u12-b09
+efbe4cef7fe2d46a197c39eb7a94e127e0bb4c5d icedtea-2.4-branchpoint
+3877f9ae971eefbfbbcb16f2ff79c72ac10ac4bd jdk7u14-b10
+3bd891cd98773cf841ad65f52f25e3e6fa185cef jdk7u14-b11
+fbb83600db33de6211fc58ba2a2bbb6b356aa9c2 jdk7u14-b12
+cd7aaec5accf3f8fbb693153f8d9be846e0f8a05 jdk7u14-b13
+9e8bde2586a1a7fd95f654c7d0043d1eb18f0793 jdk7u14-b14
+2b1fcbe4e78557822b2269b43c8b589aa1f0b522 jdk7u14-b15
 622e370c2d1e8c5f48d8f520f486dc6fcc1239c5 jdk7u15-b01
 30188388048333e213a839363329ac2cb0cf0e0d jdk7u15-b02
 7f0e7ce088ff554f64e2c102ae3718ae4d580c34 jdk7u15-b30
@@ -264,7 +296,9 @@
 b2adfd931a2504948d4fee780e4175122be10484 jdk7u21-b10
 61e2e2d9cfcea20132b50d8fb7ead66a8a373db7 jdk7u21-b11
 3c774492beaaff241c654add2c4e683b9ff002f2 jdk7u21-b30
+fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b50
 fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b12
+c0231d18f496dd0bc133e128f6b667a4d8f569a5 jdk7u21-b31
 3d0f2d5b1866860f7089b51cca8ca0ca41c04d9c jdk7u25-b01
 cdbafc5080eeb8ea3fec9fe7d071e0bf96635581 jdk7u25-b02
 2057de7ee6b17ab3335ec6cd5730f88f4cfe9502 jdk7u25-b03
@@ -276,9 +310,84 @@
 161ec4dd450d59e1b8ad136db231925c97ff6205 jdk7u25-b09
 c9da98e82bb006dccd94a50871d6cdb66fa2d7e7 jdk7u25-b10
 109386df5b8e259d0af802217769a3c448404e49 jdk7u25-b11
+38282b734daefcbb8155b7d7ef9664130330ed14 jdk7u14-b16
+8b1d77697ca4d2a9c29d67fd2ff03aded9b06012 jdk7u14-b17
+862b43d26e03bbceb3465f93354860e0d17eb324 jdk7u14-b18
+bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
+bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
+a921b45a1f9086a7d598a76f920639050386f996 jdk7u14-b19
+54320e5d9da60df24f0e2c57c011809911dc06e1 jdk7u14-b20
+fb590ca4de9aaf1f6bca945be040dffc55b5e8d2 jdk7u14-b21
+e5d89aa2c1a11dba841a646858dda9ea18dc8f57 jdk7u14-b22
+d85df1552f877a1cc51f43bc07a42a0c48f18e0b jdk7u40-b23
+d3ab3b19caa02ee85359cfe07b6e0b74eb7b3d74 jdk7u40-b24
+abfc54516d0b7f9aed34ef175f6bbb93fda4cbb3 jdk7u40-b25
+be9099c54a35c00d0dfe6beeed8ea5d4ab3cd3fe jdk7u40-b26
+f745eeabb0eaabe8c0835c175b31f1e1c0f00bd4 jdk7u40-b27
+c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28
+1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29
 ef8e6f8305d524f3b448a85f901aadf1adc81fc0 jdk7u25-b12
 eca480919c71072a31f62a61cb3aad30677007e3 jdk7u25-b13
 577c4dd1a6e9bc1bb2c2e5d5ecbab8eacb4121af jdk7u25-b14
 4fde7ac2ecf4b170022ebbf8a961e6dbb229ccab jdk7u25-b15
+ddff7b2f69faaa8883e3986447daeab289f25e03 jdk7u25-b31
+9e2247c5d4b82798d393daf4e50cbadcaf0dc844 jdk7u25-b33
+1e888b6e1fb63cff9ea120bc7b0667578d82823b jdk7u25-b34
 f4bec833a24b20f5ae770d0650350fc8950c9dc0 jdk7u25-b30
 65d0e39500d56c6ea1fd52abbd1bef7966c3e87f jdk7u25-b16
+d77153cbe030f91f432fae7c356cf6b5aab12a12 jdk7u25-b32
+38282b734daefcbb8155b7d7ef9664130330ed14 jdk7u14-b16
+8b1d77697ca4d2a9c29d67fd2ff03aded9b06012 jdk7u14-b17
+862b43d26e03bbceb3465f93354860e0d17eb324 jdk7u14-b18
+bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
+bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
+a921b45a1f9086a7d598a76f920639050386f996 jdk7u14-b19
+54320e5d9da60df24f0e2c57c011809911dc06e1 jdk7u14-b20
+47084105fe834aa1c6f2ee2bbea01deaa05059dd icedtea-2.4.0
+fb590ca4de9aaf1f6bca945be040dffc55b5e8d2 jdk7u14-b21
+e5d89aa2c1a11dba841a646858dda9ea18dc8f57 jdk7u14-b22
+d85df1552f877a1cc51f43bc07a42a0c48f18e0b jdk7u40-b23
+d3ab3b19caa02ee85359cfe07b6e0b74eb7b3d74 jdk7u40-b24
+abfc54516d0b7f9aed34ef175f6bbb93fda4cbb3 jdk7u40-b25
+be9099c54a35c00d0dfe6beeed8ea5d4ab3cd3fe jdk7u40-b26
+f745eeabb0eaabe8c0835c175b31f1e1c0f00bd4 jdk7u40-b27
+c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28
+1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29
+651dcadbd9774165e017f8b7d1bde7d7d280ae1d jdk7u40-b30
+23ae4e0e0cce13779c531a704bf95fda1764882b icedtea-2.4.1
+3d2b811b8a798ff3b619f8330b08f551f7fdfd80 jdk7u40-b31
+c5f85903c49aa716ee3cb93361dd60a3e88d866d jdk7u40-b32
+1b7fbfdc31b859097d6a365ad0ba0e8ef92b4063 jdk7u40-b33
+ddd543ddf33017a15623cdf6908ae4ef2958e24e jdk7u40-b34
+fab3339a833da9631ead479621edcf6df2df457d jdk7u40-b35
+cd3871b1516988ea4a3099d6e1886abe2e74e771 jdk7u40-b36
+dc9a63376b39223bfb612d9e8efd275023de6399 jdk7u40-b37
+8391dff270bbf75dc434e53ed68993ab833475e8 jdk7u40-b38
+d7c73fd53c84cbb4333559cf788e554a2ef9326c jdk7u40-b39
+a91b57bf60bd982814bc1616ea46a1069416f5e4 jdk7u40-b40
+acb0571052b8dbef036fc50235ef95c0a46cff6b jdk7u40-b41
+b4a480a039bc19b27bfb5fcbbbf75e651d2718b7 jdk7u40-b42
+e29ea0b297e519010e661603a07bb8d48fa904a2 jdk7u40-b43
+08737d863a7aa5eb39374b26c9585e1770affe92 jdk7u40-b60
+5ea58899ae9f26e8ad21d1be15f73d426e2b5fb1 icedtea-2.4.2
+504acad3372298a79c231696d805f00f3beb2362 jdk7u40-b61
+c9c225fb19c3aa6e1242c051833ecc69d00b7aa1 jdk7u40-b62
+4f54264ca4df2fc50fbb9bb2654dad97776d10ac jdk7u45-b01
+1a1a1dedf437c50797a49c21a12161a79c761757 jdk7u45-b02
+3a2cca8c2f209b533af6c1201cc8aee43628e578 jdk7u45-b03
+4f4f7869bd6585042ad9596426dd1aa0829b8e98 jdk7u45-b04
+faee62d13040eae3d081f0383843a391ceef1edd jdk7u45-b05
+435dd0e1ab9ec9cbc83dc5ed260886f6becbef25 jdk7u45-b06
+2e19615f6045c3f39e39c56c485f7bc1df97e2ce jdk7u45-b07
+771c5c869d16d2da5668e412f505ad75f8f610c1 jdk7u45-b08
+a89d69bef3614f618843f5e9a495b12d13597851 jdk7u45-b09
+fd8a2041b75c4f712f2b08d627388d44a0cf2ee7 jdk7u45-b10
+55e0d3d9514343f380336b68aa8691a89b2e710b jdk7u45-b11
+336566c2905a49fc9a6f90f5ecd30517cfcaefff jdk7u45-b12
+6cadc3dd82a423f6c24460bb1997c0f39159dd93 jdk7u45-b13
+43e22471d0c29451f282b162864c2d3e494d5871 jdk7u45-b14
+3d7a52de59f03589d7a9334a6895063ff3331bfc jdk7u45-b15
+b1f069eb48edfa6fb7428dc045a53e287215ef4a jdk7u45-b16
+8b8793f06c56e343962b473bc0fb79f23b8be734 jdk7u45-b17
+80f65a8f58500ef5d93ddf4426d9c1909b79fadf jdk7u45-b18
+a15e4a54504471f1e34a494ed66235870722a0f5 jdk7u45-b30
diff -r d77153cbe030 -r 8ed5df839fbc .jcheck/conf
--- a/.jcheck/conf	Wed Jun 12 20:18:16 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r d77153cbe030 -r 8ed5df839fbc THIRD_PARTY_README
--- a/THIRD_PARTY_README	Wed Jun 12 20:18:16 2013 -0700
+++ b/THIRD_PARTY_README	Wed Oct 16 15:17:36 2013 +0100
@@ -1912,6 +1912,35 @@
 
 -------------------------------------------------------------------------------
 
+%% This notice is provided with respect to Sparkle v.1.5,
+which is included with JRE 7 on Mac OS X.
+
+--- begin of LICENSE ---
+
+Copyright (c) 2012 Sparkle.org and Andy Matuschak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
 %% Portions licensed from Taligent, Inc.
 
 -------------------------------------------------------------------------------
@@ -3169,12 +3198,12 @@
 %% This notice is provided with respect to the following which is 
 included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
 
-  Apache Derby 10.8.1.2        [included with JDK 7 only]
+  Apache Derby 10.8.3.0        [included with JDK 7 only]
   Apache Jakarta BCEL 5.2 
   Apache Jakarta Regexp 1.4 
   Apache Santuario XMLSec-Java 1.4.2
   Apache Xalan-Java 2.7.1 
-  Apache Xerces2 Java 2.10.0 
+  Apache Xerces2 Java 2.11.0 
   Apache XML Resolver 1.1 
 
 
diff -r d77153cbe030 -r 8ed5df839fbc make/Makefile
--- a/make/Makefile	Wed Jun 12 20:18:16 2013 -0700
+++ b/make/Makefile	Wed Oct 16 15:17:36 2013 +0100
@@ -150,7 +150,7 @@
 
 #----- bin.zip
 
-BIN_ZIP_FILES = $(BUILD_DIR/lib/orb.idl $(BUILD_DIR)/lib/ir.idl
+BIN_ZIP_FILES = $(BUILD_DIR)/lib/orb.idl $(BUILD_DIR)/lib/ir.idl
 
 BIN_ZIP = $(LIB_DIR)/bin.zip
 $(BIN_ZIP): $(BIN_ZIP_FILES)
diff -r d77153cbe030 -r 8ed5df839fbc make/common/shared/Defs-java.gmk
--- a/make/common/shared/Defs-java.gmk	Wed Jun 12 20:18:16 2013 -0700
+++ b/make/common/shared/Defs-java.gmk	Wed Oct 16 15:17:36 2013 +0100
@@ -81,7 +81,7 @@
 ifeq ($(ARCH_DATA_MODEL), 32)
   JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=768
 else
-  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1536
+  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1664
 endif
 JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
 
diff -r d77153cbe030 -r 8ed5df839fbc make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk	Wed Jun 12 20:18:16 2013 -0700
+++ b/make/common/shared/Platform.gmk	Wed Oct 16 15:17:36 2013 +0100
@@ -153,6 +153,9 @@
   OS_VERSION := $(shell uname -r)
   # Arch and OS name/version
   mach := $(shell uname -m)
+  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
+    mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/')
+  endif
   archExpr = case "$(mach)" in \
                 i[3-9]86) \
                     echo i586 \
@@ -169,6 +172,9 @@
                 arm*) \
                     echo arm \
                     ;; \
+                sh*) \
+                    echo sh \
+		    ;; \
                 *) \
                     echo $(mach) \
                     ;; \
@@ -196,6 +202,9 @@
       else
         ARCH_DATA_MODEL=64
       endif
+      ifeq ($(ARCH), sh)
+        ARCH_DATA_MODEL=32
+      endif
     endif
   endif
 
diff -r d77153cbe030 -r 8ed5df839fbc src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java	Wed Jun 12 20:18:16 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java	Wed Oct 16 15:17:36 2013 +0100
@@ -2190,10 +2190,7 @@
 
                 if (labelIndex == _unionLabels.length) {
                     // check if label has not been found
-                    if (_defaultIndex == -1)
-                        // throw exception if default was not expected
-                        throw wrapper.unexpectedUnionDefault() ;
-                    else
+                    if (_defaultIndex != -1)
                         // must be of the default branch type
                         _memberTypes[_defaultIndex].copy(src, dst);
                 }
diff -r d77153cbe030 -r 8ed5df839fbc src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties	Wed Jun 12 20:18:16 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties	Wed Oct 16 15:17:36 2013 +0100
@@ -60,12 +60,12 @@
 servertool.getserverid1=applicationName\u306E\u30B5\u30FC\u30D0\u30FCID\u3092\u8FD4\u3057\u307E\u3059
 servertool.getserverid2=\tapplicationName {0}\u306E\u30B5\u30FC\u30D0\u30FCID\u306F{1}\u3067\u3059
 
-servertool.list=\n\t\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\n
+servertool.list=\n\tlist\n
 servertool.list1=\u767B\u9332\u3055\u308C\u305F\u3059\u3079\u3066\u306E\u30B5\u30FC\u30D0\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059
 servertool.list2=\n\t\u30B5\u30FC\u30D0\u30FCID\t\u30B5\u30FC\u30D0\u30FC\u306E\u30AF\u30E9\u30B9\u540D\t\t\u30B5\u30FC\u30D0\u30FC\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\n\t---------\t----------------\t\t----------------------\n
-servertool.listactive=\n\t\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B5\u30FC\u30D0\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059
+servertool.listactive=\n\tlistactive
 servertool.listactive1=\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B5\u30FC\u30D0\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059
-servertool.listappnames=\tapplicationNames\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\n
+servertool.listappnames=\tlistappnames\n
 servertool.listappnames1=\u73FE\u5728\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308BapplicationNames\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059
 servertool.listappnames2=\u73FE\u5728\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u30B5\u30FC\u30D0\u30FCapplicationNames:
 
@@ -76,7 +76,7 @@
 servertool.startserver1=\u767B\u9332\u3055\u308C\u305F\u30B5\u30FC\u30D0\u30FC\u3092\u8D77\u52D5\u3057\u307E\u3059
 servertool.startserver2=\t\u30B5\u30FC\u30D0\u30FC\u306E\u8D77\u52D5\u306B\u6210\u529F\u3057\u307E\u3057\u305F\u3002
 
-servertool.quit=\n\t\u7D42\u4E86\u3057\u307E\u3059\n
+servertool.quit=\n\tquit\n
 servertool.quit1=\u3053\u306E\u30C4\u30FC\u30EB\u3092\u7D42\u4E86\u3057\u307E\u3059
 
 servertool.help=\thelp\n\t\u307E\u305F\u306F\n\thelp <command name>\n
diff -r d77153cbe030 -r 8ed5df839fbc src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties	Wed Jun 12 20:18:16 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties	Wed Oct 16 15:17:36 2013 +0100
@@ -26,7 +26,7 @@
 orbd.usage=\uC0AC\uC6A9\uBC95: {0} <options> \n\n\uC5EC\uAE30\uC11C <options>\uB294 \uB2E4\uC74C\uACFC \uAC19\uC2B5\uB2C8\uB2E4.\n  -port                  ORBD\uAC00 \uC2DC\uC791\uB418\uC5B4\uC57C \uD558\uB294 \uD65C\uC131 \uD3EC\uD2B8\uB85C, \uAE30\uBCF8\uAC12\uC740 1049\uC785\uB2C8\uB2E4(\uC120\uD0DD \uC0AC\uD56D).\n  -defaultdb             ORBD \uD30C\uC77C\uC758 \uB514\uB809\uD1A0\uB9AC\uB85C, \uAE30\uBCF8\uAC12\uC740 "./orb.db"\uC785\uB2C8\uB2E4(\uC120\uD0DD \uC0AC\uD56D).\n  -serverid              ORBD\uC758 \uC11C\uBC84 ID\uB85C, \uAE30\uBCF8\uAC12\uC740 1 \uC785\uB2C8\uB2E4(\uC120\uD0DD \uC0AC\uD56D).\n  -ORBInitialPort        \uCD08\uAE30 \uD3EC\uD2B8\uC785\uB2C8\uB2E4(\uD544\uC218).\n  -ORBInitialHost        \uCD08\uAE30 HostName\uC785\uB2C8\uB2E4(\uD544\uC218).\n
 
 servertool.usage=\uC0AC\uC6A9\uBC95: {0} <options> \n\n\uC5EC\uAE30\uC11C <options>\uB294 \uB2E4\uC74C\uACFC \uAC19\uC2B5\uB2C8\uB2E4.\n  -ORBInitialPort        \uCD08\uAE30 \uD3EC\uD2B8\uC785\uB2C8\uB2E4(\uD544\uC218).\n  -ORBInitialHost        \uCD08\uAE30 HostName\uC785\uB2C8\uB2E4(\uD544\uC218).\n
-servertool.banner=\n\nJava IDL \uC11C\uBC84 \uD234 \uC2DC\uC791 \n\uD504\uB86C\uD504\uD2B8\uC5D0 \uBA85\uB839\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624.\n
+servertool.banner=\n\nJava IDL \uC11C\uBC84 \uD234 \uC2DC\uC791 \n\uD504\uB86C\uD504\uD2B8\uC5D0 \uBA85\uB839\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624. \n
 servertool.shorthelp=\n\n\t\uC0AC\uC6A9 \uAC00\uB2A5\uD55C \uBA85\uB839: \n\t------------------- \n
 servertool.baddef=\uC798\uBABB\uB41C \uC11C\uBC84 \uC815\uC758: {0}
 servertool.nosuchserver=\t\uD574\uB2F9 \uC11C\uBC84\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
diff -r d77153cbe030 -r 8ed5df839fbc src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java	Wed Jun 12 20:18:16 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java	Wed Oct 16 15:17:36 2013 +0100
@@ -905,28 +905,4 @@
 
         return contents.toString();
     }
-
-    public static void main(String[] args) {
-
-        Class remoteInterface = java.rmi.Remote.class;
-
-        if( args.length > 0 ) {
-            String className = args[0];
-            try {
-                remoteInterface = Class.forName(className);
-            } catch(Exception e) {
-                e.printStackTrace();
-                System.exit(-1);
-            }
-        }
-
-        System.out.println("Building name translation for " + remoteInterface);
-        try {
-            IDLNameTranslator nameTranslator =
-                IDLNameTranslatorImpl.get(remoteInterface);
-            System.out.println(nameTranslator);
-        } catch(IllegalStateException ise) {
-            ise.printStackTrace();
-        }
-    }
 }
diff -r d77153cbe030 -r 8ed5df839fbc src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java	Wed Jun 12 20:18:16 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java	Wed Oct 16 15:17:36 2013 +0100
@@ -43,6 +43,8 @@
 import com.sun.corba.se.spi.orbutil.proxy.DelegateInvocationHandlerImpl ;
 import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandler ;
 import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandlerImpl ;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 
 public class InvocationHandlerFactoryImpl implements InvocationHandlerFactory
 {
@@ -114,24 +116,32 @@
         // which extends org.omg.CORBA.Object.  This handler delegates all
         // calls directly to a DynamicStubImpl, which extends
         // org.omg.CORBA.portable.ObjectImpl.
-        InvocationHandler dynamicStubHandler =
+        final InvocationHandler dynamicStubHandler =
             DelegateInvocationHandlerImpl.create( stub ) ;
 
         // Create an invocation handler that handles any remote interface
         // methods.
-        InvocationHandler stubMethodHandler = new StubInvocationHandlerImpl(
+        final InvocationHandler stubMethodHandler = new StubInvocationHandlerImpl(
             pm, classData, stub ) ;
 
         // Create a composite handler that handles the DynamicStub interface
         // as well as the remote interfaces.
         final CompositeInvocationHandler handler =
             new CustomCompositeInvocationHandlerImpl( stub ) ;
+
+        AccessController.doPrivileged(new PrivilegedAction<Void>() {
+            @Override
+            public Void run() {
         handler.addInvocationHandler( DynamicStub.class,
             dynamicStubHandler ) ;
         handler.addInvocationHandler( org.omg.CORBA.Object.class,
             dynamicStubHandler ) ;
         handler.addInvocationHandler( Object.class,
             dynamicStubHandler ) ;
+                return null;
+            }
+        });
+
 
         // If the method passed to invoke is not from DynamicStub or its superclasses,
         // it must be from an implemented interface, so we just handle
diff -r d77153cbe030 -r 8ed5df839fbc src/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java	Wed Jun 12 20:18:16 2013 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java	Wed Oct 16 15:17:36 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, 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
@@ -25,7 +25,10 @@
 
 package com.sun.corba.se.impl.transport;
 
-import java.util.Hashtable;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 import org.omg.CORBA.CompletionStatus;
 import org.omg.CORBA.SystemException;
@@ -68,7 +71,7 @@
 
     private CorbaConnection connection;
     // Maps requestId to an OutCallDesc.
-    private Hashtable out_calls = null; // REVISIT - use int hastable/map
+    final private Map<Integer, OutCallDesc> out_calls;
 
     public CorbaResponseWaitingRoomImpl(ORB orb, CorbaConnection connection)
     {
@@ -76,7 +79,8 @@
         wrapper = ORBUtilSystemException.get( orb,
             CORBALogDomains.RPC_TRANSPORT ) ;
         this.connection = connection;
-        out_calls = new Hashtable();
+        out_calls =
+            Collections.synchronizedMap(new HashMap<Integer, OutCallDesc>());
     }
 
     ////////////////////////////////////////////////////
@@ -139,7 +143,7 @@
             return null;
         }
 
-        OutCallDesc call = (OutCallDesc)out_calls.get(requestId);
+        OutCallDesc call = out_calls.get(requestId);
         if (call == null) {
             throw wrapper.nullOutCall(CompletionStatus.COMPLETED_MAYBE);
         }
@@ -197,7 +201,7 @@
         LocateReplyOrReplyMessage header = (LocateReplyOrReplyMessage)
             inputObject.getMessageHeader();
         Integer requestId = new Integer(header.getRequestId());
-        OutCallDesc call = (OutCallDesc) out_calls.get(requestId);
+        OutCallDesc call = out_calls.get(requestId);
 
         if (orb.transportDebugFlag) {
             dprint(".responseReceived: id/"
@@ -248,7 +252,6 @@
 
     public int numberRegistered()
     {

From andrew at icedtea.classpath.org  Wed Oct 16 07:42:27 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 16 Oct 2013 14:42:27 +0000
Subject: /hg/release/icedtea7-forest-2.4/jaxws: 47 new changesets
Message-ID: <hg.49b754c39eac.1381934547.1704173005128376975@icedtea.classpath.org>

changeset 49b754c39eac in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=49b754c39eac
author: asaha
date: Thu Jun 20 21:51:41 2013 -0700

	Merge


changeset e3ce837e7593 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=e3ce837e7593
author: asaha
date: Fri Jun 21 21:57:55 2013 -0700

	Merge


changeset 000becfcb945 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=000becfcb945
author: asaha
date: Fri Jun 28 11:37:12 2013 -0700

	Merge


changeset d832a74b195d in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=d832a74b195d
author: katleman
date: Tue Jul 02 15:17:22 2013 -0700

	Added tag jdk7u45-b01 for changeset 000becfcb945


changeset 817632baca26 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=817632baca26
author: asaha
date: Wed Jul 03 17:41:56 2013 -0700

	Merge


changeset 9c574d7d9d5f in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=9c574d7d9d5f
author: katleman
date: Tue Jul 09 18:22:54 2013 -0700

	Added tag jdk7u45-b02 for changeset 817632baca26


changeset f65baba9400a in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=f65baba9400a
author: asaha
date: Wed Jul 10 16:37:10 2013 -0700

	Merge


changeset 1ab1aeff26f3 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=1ab1aeff26f3
author: cl
date: Tue Jul 16 05:52:07 2013 -0700

	Added tag jdk7u45-b03 for changeset f65baba9400a


changeset 80ff2468f520 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=80ff2468f520
author: asaha
date: Wed Jul 17 14:39:02 2013 -0700

	Merge


changeset d7a863258a7a in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=d7a863258a7a
author: cl
date: Tue Jul 23 08:11:25 2013 -0700

	Added tag jdk7u45-b04 for changeset 80ff2468f520


changeset 48ff7ddecc26 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=48ff7ddecc26
author: asaha
date: Thu Jul 25 17:16:21 2013 -0700

	Merge


changeset d569f50b3a3f in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=d569f50b3a3f
author: asaha
date: Mon Jul 29 11:59:20 2013 -0700

	Merge


changeset 1128d3934b64 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=1128d3934b64
author: asaha
date: Wed Jul 31 23:08:22 2013 -0700

	Merge


changeset 59aa99dd5083 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=59aa99dd5083
author: asaha
date: Fri Aug 02 15:23:05 2013 -0700

	Added tag jdk7u45-b05 for changeset 1128d3934b64


changeset c2cc41cf6055 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=c2cc41cf6055
author: asaha
date: Fri Aug 02 22:26:21 2013 -0700

	Merge


changeset 76e34b113c91 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=76e34b113c91
author: mkos
date: Wed Jul 31 09:41:04 2013 -0400

	8017505: Better Client Service
	Reviewed-by: mullan, ahgross, mgrebac


changeset a9036e591b8e in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=a9036e591b8e
author: mkos
date: Thu Aug 01 15:41:32 2013 -0400

	8022086: Fixing licence of newly added files
	Reviewed-by: mullan, ahgross, mgrebac


changeset 0b9d25854c59 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=0b9d25854c59
author: cl
date: Fri Aug 02 19:03:16 2013 -0700

	Added tag jdk7u45-b05 for changeset a9036e591b8e


changeset 5af79e819bc1 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=5af79e819bc1
author: asaha
date: Mon Aug 05 11:52:42 2013 -0700

	8022254: Remove incorrect jdk7u45-b05 tag from jdk7u-cpu forest
	Reviewed-by: cl


changeset 1f63fafc7262 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=1f63fafc7262
author: asaha
date: Mon Aug 05 13:47:31 2013 -0700

	Merge


changeset 8da3d41d9469 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=8da3d41d9469
author: asaha
date: Wed Aug 07 12:23:46 2013 -0700

	Merge


changeset 5516a7f29f36 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=5516a7f29f36
author: cl
date: Thu Aug 08 23:24:23 2013 -0700

	Added tag jdk7u45-b06 for changeset 8da3d41d9469


changeset 38f5b376c380 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=38f5b376c380
author: asaha
date: Mon Aug 12 12:38:59 2013 -0700

	Merge


changeset d6b6aafdeae2 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=d6b6aafdeae2
author: cl
date: Thu Aug 15 22:17:11 2013 -0700

	Added tag jdk7u45-b07 for changeset 38f5b376c380


changeset 86f3efd1edae in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=86f3efd1edae
author: asaha
date: Mon Aug 19 12:44:40 2013 -0700

	Merge


changeset e73af002b621 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=e73af002b621
author: cl
date: Tue Aug 20 10:22:44 2013 -0700

	Added tag jdk7u45-b08 for changeset 86f3efd1edae


changeset 4453cebb0d49 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=4453cebb0d49
author: asaha
date: Thu Aug 22 08:42:34 2013 -0700

	Merge


changeset ab835f7247e4 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=ab835f7247e4
author: asaha
date: Mon Aug 26 08:45:08 2013 -0700

	Merge


changeset 22ad90bdc501 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=22ad90bdc501
author: cl
date: Tue Aug 27 10:56:53 2013 -0700

	Added tag jdk7u45-b09 for changeset ab835f7247e4


changeset bbd594e6cf45 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=bbd594e6cf45
author: asaha
date: Tue Aug 27 15:16:30 2013 -0700

	Merge


changeset 8890679c6f1f in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=8890679c6f1f
author: cl
date: Wed Sep 04 11:05:13 2013 -0700

	Added tag jdk7u45-b10 for changeset bbd594e6cf45


changeset c01eab96821e in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=c01eab96821e
author: asaha
date: Wed Sep 04 12:09:43 2013 -0700

	Merge


changeset 05f1274a8aa0 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=05f1274a8aa0
author: cl
date: Wed Sep 11 11:12:30 2013 -0700

	Added tag jdk7u45-b11 for changeset c01eab96821e


changeset 3271849829b7 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=3271849829b7
author: cl
date: Wed Sep 18 02:16:02 2013 -0700

	Added tag jdk7u45-b12 for changeset 05f1274a8aa0


changeset 842dd63be9c6 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=842dd63be9c6
author: cl
date: Mon Sep 23 14:31:31 2013 -0700

	Added tag jdk7u45-b13 for changeset 3271849829b7


changeset 93a3fb090be5 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=93a3fb090be5
author: cl
date: Thu Sep 26 10:37:30 2013 -0700

	Added tag jdk7u45-b14 for changeset 842dd63be9c6


changeset 5524cced32d3 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=5524cced32d3
author: cl
date: Fri Sep 27 11:44:37 2013 -0700

	Added tag jdk7u45-b15 for changeset 93a3fb090be5


changeset b42a4cb742cf in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=b42a4cb742cf
author: katleman
date: Wed Sep 11 10:59:54 2013 -0700

	Added tag jdk7u40-b61 for changeset 4ee34d2cf2d8


changeset d64adf18c8ae in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=d64adf18c8ae
author: katleman
date: Tue Sep 17 13:05:27 2013 -0700

	Added tag jdk7u40-b62 for changeset b42a4cb742cf


changeset 41efeb4cecae in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=41efeb4cecae
author: asaha
date: Thu Sep 19 15:00:43 2013 -0700

	Merge


changeset 1703349383c3 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=1703349383c3
author: asaha
date: Fri Sep 27 13:08:40 2013 -0700

	Merge


changeset a8baf22b5972 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=a8baf22b5972
author: cl
date: Thu Oct 03 11:31:51 2013 -0700

	Added tag jdk7u45-b16 for changeset 5524cced32d3


changeset 65b0f3ccdc8b in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=65b0f3ccdc8b
author: cl
date: Mon Oct 07 21:52:50 2013 -0700

	Added tag jdk7u45-b17 for changeset a8baf22b5972


changeset c32c6a662d18 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=c32c6a662d18
author: cl
date: Tue Oct 08 09:06:59 2013 -0700

	Added tag jdk7u45-b18 for changeset 65b0f3ccdc8b


changeset 9d95b39ca1d9 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=9d95b39ca1d9
author: cl
date: Tue Oct 08 10:57:46 2013 -0700

	Added tag jdk7u45-b30 for changeset c32c6a662d18


changeset 6802a1c098c4 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=6802a1c098c4
author: asaha
date: Tue Oct 08 11:12:44 2013 -0700

	Merge


changeset 652eb396f959 in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=652eb396f959
author: andrew
date: Wed Oct 16 15:17:05 2013 +0100

	Merge jdk7u45-b31


diffstat:

 .hgtags                                                                                                 |  108 ++++++++++
 .jcheck/conf                                                                                            |    2 -
 THIRD_PARTY_README                                                                                      |   33 ++-
 src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java |    8 +
 src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java                        |    4 +-
 src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java                              |   94 ++++++++
 src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java                              |   94 ++++++++
 src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java                                 |   27 ++-
 src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java                      |   92 ++++++++
 src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java                     |    8 +-
 src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java                    |    4 +-
 src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java                                  |   94 ++++++++
 12 files changed, 551 insertions(+), 17 deletions(-)

diffs (truncated from 804 to 500 lines):

diff -r 426602096a61 -r 652eb396f959 .hgtags
--- a/.hgtags	Fri Jun 14 18:10:27 2013 -0700
+++ b/.hgtags	Wed Oct 16 15:17:05 2013 +0100
@@ -50,6 +50,7 @@
 558985e26fe16f5a6ebb2edb9180a42e1c8e8202 jdk7-b73
 f4466e1b608088c90e11beaa4b600f102608c6a1 jdk7-b74
 fcf2b8b5d606641659419f247fcee4b284c45e6e jdk7-b75
+0dc08d528c998ca993e759b311e7b54c98e0ef28 icedtea7-1.12
 765d2077d1e652e234d27fe85ba58a986b488503 jdk7-b76
 5b4968c110476085225d3a71c4210fad2c1116c1 jdk7-b77
 fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78
@@ -63,6 +64,7 @@
 512b0e924a5ae0c0b7ad326182cae0dc0e4d1aa8 jdk7-b86
 3febd6fab2ac8ffddbaf7bed00d11290262af153 jdk7-b87
 8c666f8f3565974e301ccb58b7538912551a6e26 jdk7-b88
+1661166c82dc2102f3f0364e28d1e4211f25a4cf icedtea7-1.13
 bf3675aa7f20fc6f241ce95760005aef2a30ff41 jdk7-b89
 ead7c4566a0017bcb44b468b3ac03b60dc5333ce jdk7-b90
 cf4686bf35abd1e573f09fa43cbec66403160ae9 jdk7-b91
@@ -111,6 +113,7 @@
 545de8303fec939db3892f7c324dd7df197e8f09 jdk7-b134
 d5fc61f18043765705ef22b57a68c924ab2f1a5b jdk7-b135
 c81d289c9a532d6e94af3c09d856a2a20529040f jdk7-b136
+339c2d381d80dbf9b74604e6ba43ead276b8024e icedtea-1.14
 ccea3282991ce8b678e188cf32a8239f76ff3bfa jdk7-b137
 cc956c8a8255583535597e9a63db23c510e9a063 jdk7-b138
 c025078c8362076503bb83b8e4da14ba7b347940 jdk7-b139
@@ -123,6 +126,7 @@
 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
 c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01
 d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147
+e6cd09c7ef22bbabe31c9f2a32c7e13cfa713fd3 icedtea-2.0-branchpoint
 4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02
 272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03
 48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04
@@ -141,6 +145,7 @@
 21131044a61353ac20e360bce52d8f480e08d7a2 jdk7u2-b12
 9728fd833e01faa5e51484aeaf3c51d32d1175fb jdk7u2-b13
 d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u2-b21
+d26ff33070cb75a0a7349d965ec4f0930ded418d icedtea-2.1-branchpoint
 d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u3-b02
 44e824502fa24440f907205ccdc3959d01bd8109 jdk7u3-b03
 6e1cc321aacea944691aa06558f2bbad89baf5b3 jdk7u3-b04
@@ -157,6 +162,7 @@
 3891fe529057431278394c6341cfabaacd5061f5 jdk7u4-b10
 2df5cd83fab91f050c4bac54aa06e174ecee38f4 jdk7u4-b11
 4d3a9fe44f7531642bc739ec3c8efb2e6d9e08c7 jdk7u4-b12
+1854d8e2547cb18ebcf84db13c22d0987c49c274 icedtea-2.2-branchpoint
 c3b6659aa169b3f249246497a8d5a87baa1e798a jdk7u4-b13
 0f8963feaefda21e72f84b8ea49834a289d537f3 jdk7u4-b14
 61516652b59ec411678b38a232a84413652a4172 jdk7u5-b01
@@ -191,6 +197,7 @@
 f1dba7ebe6a50c22ffcaf85b14b31462ce008556 jdk7u6-b15
 e1d2afbb63d27600dd8c8a021eadff84a901a73c jdk7u6-b16
 401bdbbf89c9187b51dc8906c0e2700ef0ffc8a3 jdk7u6-b17
+8888d2790217c31edbf13ea81d9ac06210092ad2 icedtea-2.3-branchpoint
 a1daf7097c61181216233e4850ef6ec56b0fe6b6 jdk7u6-b18
 58c1c6ecf8f1e59db9b575ae57b2894d0152d319 jdk7u6-b19
 6d17242f12edc643ecab4263e656003a1ca44c03 jdk7u6-b20
@@ -240,6 +247,31 @@
 1d2eb88cadaf29bf577a71c69b04afe2468d8ff6 jdk7u13-b10
 21dbdd72a46a29c148ea3519268447c467540637 jdk7u13-b30
 1d2eb88cadaf29bf577a71c69b04afe2468d8ff6 jdk7u13-b20
+55dcda93e8c8b5c3170def946de35dd0407eab59 jdk7u8-b01
+c025e953f655b375f27f8f94493ceeb43ef1d979 jdk7u8-b02
+705b60b56ead99d64d1b7302cba3a200ab048ff7 jdk7u8-b03
+d8e70e528bbfb0a3fd62936871edb3481e213ea8 jdk7u8-b04
+76e35b812e820e9cb5c9815ee03bd0b3240c749b jdk7u8-b05
+e878887a8ac51f20ce529da2c7a5a1a627670436 jdk7u10-b06
+d89923177680905d0de7501fd67949c2f8c3cb35 jdk7u10-b07
+27853948201f8c9696d00b2ed490bbcd74dfa6fa jdk7u10-b08
+aa14c4c7195613cce35e27b7b7c2cb0817121fd4 jdk7u10-b09
+e43fea2b28aa66647c2116cace8af3294c6bfa06 jdk7u12-b01
+452faa8d6ee8840c19080bee2aba70e48a256c6e jdk7u12-b02
+4362e3ae3e2be92961621f76578d78b1a3fa407c jdk7u12-b03
+2d9e8b5bfbb636b9668b77530a1b24c34fff017d jdk7u12-b04
+8df2f42e2628e7b8d2e0cd69786a1bdc2a8dbe32 jdk7u12-b05
+01111bd50d31c89fe671bccb1400c62a67c7055e jdk7u12-b06
+42ba62cdc1f3c357b6d192612dd1c4b209df2662 jdk7u12-b07
+66f36438f54812e44327d38129d9488e5ea59e73 jdk7u12-b08
+c130f21b16a2b2e2b961362bc4baf40fde2be458 jdk7u12-b09
+a653d06d5b50cacf58aebbab8b55e7e00587cd4c icedtea-2.4-branchpoint
+9207c72345c9e82d4445764df57706f7b33a7981 jdk7u14-b10
+444aa84f38df2607140e9ce35a21fef0965d27a6 jdk7u14-b11
+40afea757379cfaaadca13eeb7dcbc0fe195f73d jdk7u14-b12
+4fe9a362c3277cd4c7a5149853e5cf59dbba7cb7 jdk7u14-b13
+a2b2e716637acdb9884d21fc4b9aef3c8b59e702 jdk7u14-b14
+b5c8ac5253ef735e5aa770b7325843ec89b56633 jdk7u14-b15
 abcaebcead605f89cd0919add20d8ac16637ddc2 jdk7u15-b01
 62f9e7f5eb644fedd93dd93bd36bcf817a8d9c8a jdk7u15-b02
 ed9f270009f2b8606e9e0f58aeedbed36e13963e jdk7u15-b30
@@ -264,7 +296,9 @@
 29c03ced9215a0bb63a4527dc5858b486cc4099d jdk7u21-b10
 fe6f5b57b9e67a7c6f52a5f926ac17e5c337d4a4 jdk7u21-b11
 12183763c6205c5cfe27924ccc4ca5480106c3b4 jdk7u21-b30
+d4eba65d0f776b77ef137022cd7bf49dc3b88a3e jdk7u21-b50
 d4eba65d0f776b77ef137022cd7bf49dc3b88a3e jdk7u21-b12
+4e2481dc6ee6cadb0e7e883a2d8a6f692a2a32cc jdk7u21-b31
 238b59ffddce3b1d7d19114006ae3be0e72b5eed jdk7u25-b01
 8797b25cbeb3005336483063cef2377849bc2088 jdk7u25-b02
 4635a58db6b028f78a30c972ac47f9c5577bedfd jdk7u25-b03
@@ -276,10 +310,84 @@
 0cd0d4e7331f7fc9f9ee77f2275113571bcf67cf jdk7u25-b09
 105cdfd4f40837917d0065e3e58052d2854df7da jdk7u25-b10
 6de7fec036abf91ce962c74f11a6266491df3fd8 jdk7u25-b11
+a367ebf0c21512867f4ab5cdd206dd8c7817c004 jdk7u14-b16
+74c34f35912d8d7145b3ff34fefea2d2f189f2b4 jdk7u14-b17
+c93a35b3638f45de91013d65543217a002577684 jdk7u14-b18
+82be38857de3b2f6d8def98034f3e7b0827fd9f0 jdk7u14-b19
+82be38857de3b2f6d8def98034f3e7b0827fd9f0 jdk7u14-b19
+d63b21e6c3d29305400dbfc1500090cab89f25d1 jdk7u14-b19
+dd695ad6c5ec797fe61db31600a3fd2dbc62247b jdk7u14-b20
+97bbac299eb801709a924fe777b3ee9c96829d8b jdk7u14-b21
+6e74b3e1773cfbac99998431a5a54c70baaf1dc5 jdk7u14-b22
+e9bbdf789d2b512550e0ca80629980e96f02146d jdk7u40-b23
+adaf9cf486fab1b14c5af9fc6525565760bb9c11 jdk7u40-b24
+aafab1efbd4ced5e05695aa1887813f9f5de9d5c jdk7u40-b25
+6581f9739031120bb7515d3b09fa3501653d11af jdk7u40-b26
+46ebac943288218b14d7ce3df23aa42a70fa4cf9 jdk7u40-b27
+016957700ac905ebf3432ae8ba17d3576a51e585 jdk7u40-b28
+15a82c84d9f7f6c99310380d4766fc68a3882671 jdk7u40-b29
 4c5d242efa0d6e0cdb688e41e722bff671dfbfec jdk7u25-b12
 6b4a165221304d809f678a18f51c7a8cb042d60b jdk7u25-b13
 03073e4e6d3f600102d31e862154f56730838b11 jdk7u25-b14
 4a925430bf712d36abb78decda16e04da1b1f6bc jdk7u25-b15
+854a93cd1f89fad2abcbdb6d7935438da0f4afbf jdk7u25-b31
+5d090a0d278f2384cdaaa2d6e8cea4fe30aa6886 jdk7u25-b33
+168023db844d735fa516ec21bb58c30789079c99 jdk7u25-b34
 3ecf7ddefa035bc2c99b03b7a58a0dd0e97089c1 jdk7u25-b30
 1826480d02a3b08eccea90ae56bb4f48e3c6cb29 jdk7u25-b16
 23392fb9b31a6f6892864975601df8f14bdb5e05 jdk7u25-b32
+a367ebf0c21512867f4ab5cdd206dd8c7817c004 jdk7u14-b16
+74c34f35912d8d7145b3ff34fefea2d2f189f2b4 jdk7u14-b17
+c93a35b3638f45de91013d65543217a002577684 jdk7u14-b18
+82be38857de3b2f6d8def98034f3e7b0827fd9f0 jdk7u14-b19
+82be38857de3b2f6d8def98034f3e7b0827fd9f0 jdk7u14-b19
+d63b21e6c3d29305400dbfc1500090cab89f25d1 jdk7u14-b19
+dd695ad6c5ec797fe61db31600a3fd2dbc62247b jdk7u14-b20
+426b7a73ab43aca754c19dc21497ae90c147f91a icedtea-2.4.0
+97bbac299eb801709a924fe777b3ee9c96829d8b jdk7u14-b21
+6e74b3e1773cfbac99998431a5a54c70baaf1dc5 jdk7u14-b22
+e9bbdf789d2b512550e0ca80629980e96f02146d jdk7u40-b23
+adaf9cf486fab1b14c5af9fc6525565760bb9c11 jdk7u40-b24
+aafab1efbd4ced5e05695aa1887813f9f5de9d5c jdk7u40-b25
+6581f9739031120bb7515d3b09fa3501653d11af jdk7u40-b26
+46ebac943288218b14d7ce3df23aa42a70fa4cf9 jdk7u40-b27
+016957700ac905ebf3432ae8ba17d3576a51e585 jdk7u40-b28
+15a82c84d9f7f6c99310380d4766fc68a3882671 jdk7u40-b29
+2f8f617ecc4f0772b090a3be742780d8375c68f6 jdk7u40-b30
+c0e48fdfb6959d4024f49e99321d368810d2d7ef icedtea-2.4.1
+f500fd46c18b783f7b4ab22314f64f131f50c5d5 jdk7u40-b31
+83a688927f16b69690f707a6b579edbe55b01e25 jdk7u40-b32
+3ceef25a8cdd9a27a7a2dea0efd8721100cfa30f jdk7u40-b33
+1ef33d25dd8c776a0b76a8c5c7095f4083ad6993 jdk7u40-b34
+9f74e1f33e6cc89256eb2c61964558460d9d7efe jdk7u40-b35
+b75c19a170c7a1a7b846e4e793e62546b2c54646 jdk7u40-b36
+918e6c87b006e32c80a937c7b0f2f9c65edbecdb jdk7u40-b37
+7ae2e9ed2c448a683f2df8673df145d20f13d585 jdk7u40-b38
+4af46770372d3c433811934e6759f5118e5c7648 jdk7u40-b39
+cd6971747e7a56fef9a3d8b10e39590b349e41c4 jdk7u40-b40
+adc234666397f6bdacd295c87be34c6a1a4d7bf2 jdk7u40-b41
+89f6c9663d75d9e4b672aed16f885b84232e9c93 jdk7u40-b42
+3ee85b3793de16855e20272336a3565af8477b6b jdk7u40-b43
+cbeef786ce489096c39ec5effee4f8f9e770b4af jdk7u40-b60
+a2ff16e5361fdfbc82764eda29a8d6c24bbd1c8e icedtea-2.4.2
+4ee34d2cf2d84d0e1f5f20381ade525665ae424c jdk7u40-b61
+b42a4cb742cf76f6c02d105349a7e8111ab8d68b jdk7u40-b62
+000becfcb945d8592cfdef6ef1704b532af56762 jdk7u45-b01
+817632baca26f7566e36c7708455494c15113d88 jdk7u45-b02
+f65baba9400aec6cb29bc06b3139623bb4663225 jdk7u45-b03
+80ff2468f520ed1940915815ceb85e05bd2bc568 jdk7u45-b04
+1128d3934b643660a219532aa1ca554877d89375 jdk7u45-b05
+8da3d41d946925a07a9f1001795959bfdb4c02c6 jdk7u45-b06
+38f5b376c38035f13ede456f158ee26d0cf8d99c jdk7u45-b07
+86f3efd1edae3c0f47ad14bef992e7566eaa94d4 jdk7u45-b08
+ab835f7247e40dd7fb457830eaa31c550b434413 jdk7u45-b09
+bbd594e6cf45ebfc37c71e217772b7f37a9c5750 jdk7u45-b10
+c01eab96821e3c0315c4637e61a8015cbfe63b6a jdk7u45-b11
+05f1274a8aa019584b4ceb05c73fc89bf7b7f4de jdk7u45-b12
+3271849829b7c8ac32f6bb17b763d8a85a1a0a32 jdk7u45-b13
+842dd63be9c633b8448e1837a5bb7b803dfdaad9 jdk7u45-b14
+93a3fb090be58a5a45464f866a7093f24205dae2 jdk7u45-b15
+5524cced32d3959d95ed414add230273bc10c38d jdk7u45-b16
+a8baf22b5972e269a97f7b3b7eec2ad63a8c5aed jdk7u45-b17
+65b0f3ccdc8bcff0d79e1b543a8cefb817529b3f jdk7u45-b18
+c32c6a662d18d7195fc02125178c7543ce09bb00 jdk7u45-b30
diff -r 426602096a61 -r 652eb396f959 .jcheck/conf
--- a/.jcheck/conf	Fri Jun 14 18:10:27 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 426602096a61 -r 652eb396f959 THIRD_PARTY_README
--- a/THIRD_PARTY_README	Fri Jun 14 18:10:27 2013 -0700
+++ b/THIRD_PARTY_README	Wed Oct 16 15:17:05 2013 +0100
@@ -1912,6 +1912,35 @@
 
 -------------------------------------------------------------------------------
 
+%% This notice is provided with respect to Sparkle v.1.5,
+which is included with JRE 7 on Mac OS X.
+
+--- begin of LICENSE ---
+
+Copyright (c) 2012 Sparkle.org and Andy Matuschak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
 %% Portions licensed from Taligent, Inc.
 
 -------------------------------------------------------------------------------
@@ -3169,12 +3198,12 @@
 %% This notice is provided with respect to the following which is 
 included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
 
-  Apache Derby 10.8.1.2        [included with JDK 7 only]
+  Apache Derby 10.8.3.0        [included with JDK 7 only]
   Apache Jakarta BCEL 5.2 
   Apache Jakarta Regexp 1.4 
   Apache Santuario XMLSec-Java 1.4.2
   Apache Xalan-Java 2.7.1 
-  Apache Xerces2 Java 2.10.0 
+  Apache Xerces2 Java 2.11.0 
   Apache XML Resolver 1.1 
 
 
diff -r 426602096a61 -r 652eb396f959 src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java	Fri Jun 14 18:10:27 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java	Wed Oct 16 15:17:05 2013 +0100
@@ -67,6 +67,14 @@
 
         SchemaFactory sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI);
         sf.setErrorHandler(errorFilter);
+        try {
+            // By default the SchemaFactory imposes a limit of 5000 on
+            // xsd:sequence maxOccurs if a SecurityManager is
+            // installed.  This breaks the specification of xjc,
+            // causing TCK failures.
+            sf.setProperty("http://apache.org/xml/properties/security-manager", null);
+        } catch (SAXException e) {
+        }
         if( entityResolver != null ) {
             sf.setResourceResolver(new LSResourceResolver() {
                 public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) {
diff -r 426602096a61 -r 652eb396f959 src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java	Fri Jun 14 18:10:27 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java	Wed Oct 16 15:17:05 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -232,7 +232,7 @@
             public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException {
                 T t = resolve(p);
                 try {
-                    return m.invoke(t, args );
+                    return MethodUtil.invoke(t, m, args );
                 } finally {
                     postInvoke(p,t);
                 }
diff -r 426602096a61 -r 652eb396f959 src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java	Wed Oct 16 15:17:05 2013 +0100
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2013, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
+ * to java.lang,reflect.Method.invoke()
+ *
+ * Be careful, copy of this class exists in several packages, iny modification must be done to other copies too!
+ */
+class MethodUtil {
+
+    private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
+    private static final Method INVOKE_METHOD;
+
+    static {
+        Method method;
+        try {
+            Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
+            method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
+            }
+        } catch (Throwable t) {
+            method = null;
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
+            }
+        }
+        INVOKE_METHOD = method;
+    }
+
+    static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
+        if (INVOKE_METHOD != null) {
+            // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
+            }
+            try {
+                return INVOKE_METHOD.invoke(null, method, target, args);
+            } catch (InvocationTargetException ite) {
+                // unwrap invocation exception added by reflection code ...
+                throw unwrapException(ite);
+            }
+        } else {
+            // other then Oracle JDK ...
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
+            }
+            return method.invoke(target, args);
+        }
+    }
+
+    private static InvocationTargetException unwrapException(InvocationTargetException ite) {
+        Throwable targetException = ite.getTargetException();
+        if (targetException != null && targetException instanceof InvocationTargetException) {
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
+            }
+            return (InvocationTargetException) targetException;
+        } else {
+            return ite;
+        }
+    }
+
+}
diff -r 426602096a61 -r 652eb396f959 src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java	Wed Oct 16 15:17:05 2013 +0100
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2013, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package com.sun.xml.internal.ws.client.sei;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
+ * to java.lang,reflect.Method.invoke()
+ * <p/>
+ * Be careful, copy of this class exists in several packages, iny modification must be done to other copies too!
+ */
+class MethodUtil {
+
+    private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
+    private static final Method INVOKE_METHOD;
+
+    static {
+        Method method;
+        try {
+            Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
+            method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
+            }
+        } catch (Throwable t) {
+            method = null;
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
+            }
+        }
+        INVOKE_METHOD = method;
+    }
+
+    static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
+        if (INVOKE_METHOD != null) {
+            // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
+            }
+            try {
+                return INVOKE_METHOD.invoke(null, method, target, args);
+            } catch (InvocationTargetException ite) {
+                // unwrap invocation exception added by reflection code ...
+                throw unwrapException(ite);
+            }
+        } else {
+            // other then Oracle JDK ...
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
+            }
+            return method.invoke(target, args);
+        }
+    }
+
+    private static InvocationTargetException unwrapException(InvocationTargetException ite) {
+        Throwable targetException = ite.getTargetException();
+        if (targetException != null && targetException instanceof InvocationTargetException) {
+            if (LOGGER.isLoggable(Level.FINE)) {
+                LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
+            }
+            return (InvocationTargetException) targetException;
+        } else {
+            return ite;
+        }
+    }
+
+}
diff -r 426602096a61 -r 652eb396f959 src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java	Fri Jun 14 18:10:27 2013 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java	Wed Oct 16 15:17:05 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -28,17 +28,20 @@
 import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.Nullable;
 import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
 import com.sun.xml.internal.ws.api.client.WSPortInfo;
-import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
 import com.sun.xml.internal.ws.api.message.Header;
 import com.sun.xml.internal.ws.api.message.Headers;
 import com.sun.xml.internal.ws.api.message.Packet;
 import com.sun.xml.internal.ws.api.model.MEP;

From andrew at icedtea.classpath.org  Wed Oct 16 07:42:37 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 16 Oct 2013 14:42:37 +0000
Subject: /hg/release/icedtea7-forest-2.4/langtools: 48 new changesets
Message-ID: <hg.c7024dda4ff3.1381934557.1305664371660628365@icedtea.classpath.org>

changeset c7024dda4ff3 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=c7024dda4ff3
author: asaha
date: Thu Jun 20 21:27:07 2013 -0700

	Merge


changeset ca9a1ac71131 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=ca9a1ac71131
author: asaha
date: Fri Jun 21 22:00:39 2013 -0700

	Merge


changeset 9bbfba4981e1 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=9bbfba4981e1
author: asaha
date: Fri Jun 28 11:41:33 2013 -0700

	Merge


changeset b8ef7bb9c7b2 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=b8ef7bb9c7b2
author: katleman
date: Tue Jul 02 15:17:32 2013 -0700

	Added tag jdk7u45-b01 for changeset 9bbfba4981e1


changeset d27b39c92849 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=d27b39c92849
author: asaha
date: Wed Jul 03 17:45:42 2013 -0700

	Merge


changeset 61d5b73ae0ac in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=61d5b73ae0ac
author: robm
date: Tue Jul 09 03:31:34 2013 +0100

	8016653: javadoc should ignore ignoreable characters in names
	Reviewed-by: jjg


changeset b9f4c87abb35 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=b9f4c87abb35
author: katleman
date: Tue Jul 09 18:23:05 2013 -0700

	Added tag jdk7u45-b02 for changeset 61d5b73ae0ac


changeset 2fe27ae865e7 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=2fe27ae865e7
author: asaha
date: Wed Jul 10 16:45:12 2013 -0700

	Merge


changeset 57105bd6b5ce in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=57105bd6b5ce
author: cl
date: Tue Jul 16 05:52:21 2013 -0700

	Added tag jdk7u45-b03 for changeset 2fe27ae865e7


changeset de93f4bc2c76 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=de93f4bc2c76
author: bpatel
date: Fri Jul 19 16:02:59 2013 -0700

	8016675: Make Javadoc pages more robust
	Reviewed-by: jlaskey, ksrini


changeset 416fe90ccdf5 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=416fe90ccdf5
author: asaha
date: Wed Jul 17 14:53:16 2013 -0700

	Merge


changeset bede296dc848 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=bede296dc848
author: asaha
date: Mon Jul 22 12:10:39 2013 -0700

	Merge


changeset 4484d9bef277 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=4484d9bef277
author: cl
date: Tue Jul 23 08:11:45 2013 -0700

	Added tag jdk7u45-b04 for changeset bede296dc848


changeset 6eb9444e0f46 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=6eb9444e0f46
author: asaha
date: Thu Jul 25 17:23:14 2013 -0700

	Merge


changeset dd914d8a6085 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=dd914d8a6085
author: asaha
date: Mon Jul 29 12:01:45 2013 -0700

	Merge


changeset e989f2f2b5cb in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e989f2f2b5cb
author: asaha
date: Wed Jul 31 23:12:06 2013 -0700

	Merge


changeset f7a971506d01 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=f7a971506d01
author: asaha
date: Fri Aug 02 15:23:45 2013 -0700

	Added tag jdk7u45-b05 for changeset e989f2f2b5cb


changeset 993a01f0ab41 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=993a01f0ab41
author: asaha
date: Fri Aug 02 22:29:31 2013 -0700

	Merge


changeset 63f7bbf8a72e in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=63f7bbf8a72e
author: cl
date: Fri Aug 02 19:03:50 2013 -0700

	Added tag jdk7u45-b05 for changeset 6eb9444e0f46


changeset a6be1495ff24 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=a6be1495ff24
author: asaha
date: Mon Aug 05 11:54:06 2013 -0700

	8022254: Remove incorrect jdk7u45-b05 tag from jdk7u-cpu forest
	Reviewed-by: cl


changeset c8f4a544ada6 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=c8f4a544ada6
author: asaha
date: Mon Aug 05 13:50:35 2013 -0700

	Merge


changeset 6f492dc935ad in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=6f492dc935ad
author: asaha
date: Wed Aug 07 12:26:10 2013 -0700

	Merge


changeset 56f937be36eb in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=56f937be36eb
author: cl
date: Thu Aug 08 23:26:10 2013 -0700

	Added tag jdk7u45-b06 for changeset 6f492dc935ad


changeset 4c51f98e1eb5 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=4c51f98e1eb5
author: asaha
date: Mon Aug 12 12:41:45 2013 -0700

	Merge


changeset 240a9b79f6f7 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=240a9b79f6f7
author: cl
date: Thu Aug 15 22:17:49 2013 -0700

	Added tag jdk7u45-b07 for changeset 4c51f98e1eb5


changeset 6cf97c9859e7 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=6cf97c9859e7
author: asaha
date: Mon Aug 19 12:47:31 2013 -0700

	Merge


changeset e6be5016d661 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e6be5016d661
author: cl
date: Tue Aug 20 10:23:20 2013 -0700

	Added tag jdk7u45-b08 for changeset 6cf97c9859e7


changeset 14277771a1b2 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=14277771a1b2
author: asaha
date: Thu Aug 22 08:45:06 2013 -0700

	Merge


changeset a9c31d3f8188 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=a9c31d3f8188
author: asaha
date: Mon Aug 26 08:48:00 2013 -0700

	Merge


changeset 1f1c0d891144 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=1f1c0d891144
author: cl
date: Tue Aug 27 10:57:32 2013 -0700

	Added tag jdk7u45-b09 for changeset a9c31d3f8188


changeset 2c09352066ec in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=2c09352066ec
author: asaha
date: Tue Aug 27 15:21:19 2013 -0700

	Merge


changeset da8110204565 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=da8110204565
author: cl
date: Wed Sep 04 11:05:25 2013 -0700

	Added tag jdk7u45-b10 for changeset 2c09352066ec


changeset 53d5c06766b0 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=53d5c06766b0
author: asaha
date: Wed Sep 04 12:12:47 2013 -0700

	Merge


changeset 0b6aa6e95eb9 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=0b6aa6e95eb9
author: cl
date: Wed Sep 11 11:12:45 2013 -0700

	Added tag jdk7u45-b11 for changeset 53d5c06766b0


changeset 68862f365075 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=68862f365075
author: cl
date: Wed Sep 18 02:16:19 2013 -0700

	Added tag jdk7u45-b12 for changeset 0b6aa6e95eb9


changeset 8c799b9f0cd8 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=8c799b9f0cd8
author: cl
date: Mon Sep 23 14:31:40 2013 -0700

	Added tag jdk7u45-b13 for changeset 68862f365075


changeset 36ae3f206b53 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=36ae3f206b53
author: cl
date: Thu Sep 26 10:37:47 2013 -0700

	Added tag jdk7u45-b14 for changeset 8c799b9f0cd8


changeset 18d1864abca9 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=18d1864abca9
author: cl
date: Fri Sep 27 11:44:52 2013 -0700

	Added tag jdk7u45-b15 for changeset 36ae3f206b53


changeset 94ea3d062a3c in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=94ea3d062a3c
author: katleman
date: Wed Sep 11 11:00:04 2013 -0700

	Added tag jdk7u40-b61 for changeset b2e29b79e54e


changeset 89e8f0dd7d92 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=89e8f0dd7d92
author: katleman
date: Tue Sep 17 13:05:39 2013 -0700

	Added tag jdk7u40-b62 for changeset 94ea3d062a3c


changeset da3d82321828 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=da3d82321828
author: asaha
date: Thu Sep 19 15:05:57 2013 -0700

	Merge


changeset 5b0c0a847e13 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5b0c0a847e13
author: asaha
date: Fri Sep 27 13:10:47 2013 -0700

	Merge


changeset b9aeec6b9d5a in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=b9aeec6b9d5a
author: cl
date: Thu Oct 03 11:32:00 2013 -0700

	Added tag jdk7u45-b16 for changeset 18d1864abca9


changeset ba3ff27d4082 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=ba3ff27d4082
author: cl
date: Mon Oct 07 21:53:11 2013 -0700

	Added tag jdk7u45-b17 for changeset b9aeec6b9d5a


changeset 164cf7491ba2 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=164cf7491ba2
author: cl
date: Tue Oct 08 09:07:15 2013 -0700

	Added tag jdk7u45-b18 for changeset ba3ff27d4082


changeset 6daac5a4016a in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=6daac5a4016a
author: cl
date: Tue Oct 08 10:57:59 2013 -0700

	Added tag jdk7u45-b30 for changeset 164cf7491ba2


changeset 7f5cfaedb25c in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=7f5cfaedb25c
author: asaha
date: Tue Oct 08 11:14:47 2013 -0700

	Merge


changeset 3c8eb52a32ea in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=3c8eb52a32ea
author: andrew
date: Wed Oct 16 15:17:06 2013 +0100

	Merge jdk7u45-b31


diffstat:

 .hgtags                                                                                     |  108 ++++++++++
 .jcheck/conf                                                                                |    2 -
 THIRD_PARTY_README                                                                          |   33 ++-
 make/Makefile                                                                               |    4 +
 make/build.properties                                                                       |    3 +-
 make/build.xml                                                                              |    2 +-
 src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java                 |   60 ++--
 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java                 |   49 ++++-
 src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties       |   65 +++--
 src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java                 |   24 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties    |   12 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties |    4 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ExpertTaglet.java          |   24 ++-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java         |   12 +-
 src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java                     |    8 +-
 src/share/classes/com/sun/tools/javac/code/Types.java                                       |    7 +-
 src/share/classes/com/sun/tools/javac/comp/Attr.java                                        |   11 +-
 src/share/classes/com/sun/tools/javac/comp/Check.java                                       |    6 +-
 src/share/classes/com/sun/tools/javac/comp/Flow.java                                        |   10 +-
 src/share/classes/com/sun/tools/javac/comp/Lower.java                                       |    1 -
 src/share/classes/com/sun/tools/javac/comp/MemberEnter.java                                 |    6 +-
 src/share/classes/com/sun/tools/javac/comp/Resolve.java                                     |   23 +-
 src/share/classes/com/sun/tools/javac/parser/Scanner.java                                   |   42 ++-
 src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties                      |   54 ++--
 src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties                   |   18 +-
 src/share/classes/com/sun/tools/javac/resources/javac_ja.properties                         |    8 +-
 src/share/classes/com/sun/tools/javac/tree/TreeInfo.java                                    |   11 +-
 src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties                     |    2 +-
 src/share/classes/com/sun/tools/javah/JavahTask.java                                        |   12 +-
 src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties                          |    6 +-
 src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties                       |    2 +-
 test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java                                   |   81 +++++++
 test/com/sun/javadoc/testDocEncoding/pkg/Test.java                                          |   31 ++
 test/com/sun/javadoc/testSinceTag/TestSinceTag.java                                         |   84 +++++++
 test/com/sun/javadoc/testSinceTag/pkg1/C1.java                                              |  101 +++++++++
 test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java                                   |   82 +++++++
 test/com/sun/javadoc/testWindowTitle/p1/C1.java                                             |   27 ++
 test/com/sun/javadoc/testWindowTitle/p2/C2.java                                             |   27 ++
 test/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java                              |   92 ++++++++
 test/tools/javac/StringsInSwitch/7181320/BinOpInCaseLabel.java                              |   38 +++
 test/tools/javac/StringsInSwitch/7181320/CastInCaseLabel.java                               |   38 +++
 test/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel.java                           |   39 +++
 test/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel1.java                          |   39 +++
 test/tools/javac/StringsInSwitch/7181320/CondExprInCaseLabel2.java                          |   39 +++
 test/tools/javac/T7179353/GenericsAndTWRCompileErrorTest.java                               |   42 +++
 test/tools/javac/TryWithResources/T7178324.java                                             |   43 +++
 test/tools/javac/enum/7160084/T7160084a.java                                                |   60 +++++
 test/tools/javac/enum/7160084/T7160084b.java                                                |   68 ++++++
 test/tools/javac/generics/8004094/B.java                                                    |   47 ++++
 test/tools/javac/generics/8004094/T8004094.java                                             |   32 ++
 test/tools/javah/T7185778.java                                                              |   56 +++++
 51 files changed, 1506 insertions(+), 189 deletions(-)

diffs (truncated from 2625 to 500 lines):

diff -r daf200613bbb -r 3c8eb52a32ea .hgtags
--- a/.hgtags	Fri Jun 14 18:10:38 2013 -0700
+++ b/.hgtags	Wed Oct 16 15:17:06 2013 +0100
@@ -50,6 +50,7 @@
 9596dff460935f09684c11d156ce591f92584f0d jdk7-b73
 1a66b08deed0459054b5b1bea3dfbead30d258fa jdk7-b74
 2485f5641ed0829205aaaeb31ad711c2c2ef0de3 jdk7-b75
+83367f01297bf255f511f5291bbbbaa24a9c8459 icedtea7-1.12
 8fb9b4be3cb1574302acde90549a4d333ef51e93 jdk7-b76
 0398ae15b90ac76d87ee21844453e95ff8613e43 jdk7-b77
 acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78
@@ -63,6 +64,7 @@
 ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86
 409db93d19c002333980df5b797c6b965150c7a0 jdk7-b87
 f9b5d4867a26f8c4b90ad37fe2c345b721e93d6b jdk7-b88
+681f1f51926faf4c73d8905a429ff4ead6e9d622 icedtea7-1.13
 6cea9a143208bc1185ced046942c0f4e45dbeba5 jdk7-b89
 71c2c23a7c35b2896c87004023b9743b6d1b7758 jdk7-b90
 97b6fa97b8ddb3a49394011c2a0ec5d6535e594c jdk7-b91
@@ -111,6 +113,7 @@
 3d7acdbb72cab55deedfd35f60d4732abc9d6ac4 jdk7-b134
 9d0a61ac567b983da7cc8f4a7030f2245bb6dbab jdk7-b135
 ed0f7f1f9511db4f9615b1426d22f8b961629275 jdk7-b136
+8e26c4aee63c04ee129bf9068f5eea47cc385177 icedtea-1.14
 a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137
 53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138
 853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139
@@ -123,6 +126,7 @@
 9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
 d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01
 58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147
+fb7fb3071b642334520e5b9f4a87ce28717af61c icedtea-2.0-branchpoint
 cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02
 82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03
 baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04
@@ -141,6 +145,7 @@
 f0802d8a0909f66ce19d3d44b33ddf4943aee076 jdk7u2-b12
 f474527e77e4797d78bd6c3b31923fddcfd9d5c6 jdk7u2-b13
 fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u2-b21
+58f6a950cd726220e81eddb126ca5c57e3b368f2 icedtea-2.1-branchpoint
 fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u3-b02
 0ffc4995457773085f61c39f6d33edc242b41bcf jdk7u3-b03
 f6de36b195cd315646213c7affd2cc15702edbfb jdk7u3-b04
@@ -157,6 +162,7 @@
 8919b2b02fcba65f833c68374f3bfdd9bc3ba814 jdk7u4-b10
 4672e092f0968d503dc37f860b15ae7e2653f8d7 jdk7u4-b11
 a4bf6a1aff54a98e9ff2b3fb53c719f658bec677 jdk7u4-b12
+e3537a4f75c7fcca16c349c3175bb0cdc2fbc29c icedtea-2.2-branchpoint
 56eb9150d9ffdb71c47d72871e8ecc98b5f402de jdk7u4-b13
 0e55881c2ee2984048c179d1e031cefb56a36bec jdk7u4-b14
 0bea057f7ce1577e1b0306f2027c057e35394398 jdk7u5-b01
@@ -191,6 +197,7 @@
 47ae28da508861d77ee6dd408d822acf507b28ec jdk7u6-b15
 5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16
 66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17
+cee31ee38a190f77b1e21c0515bb28802dcd9678 icedtea-2.3-branchpoint
 6aa859ef42876c51bb1b1d7fb4db32a916a7dcaa jdk7u6-b18
 474a52eeeafb1feccffda68b96f651e65415c01d jdk7u6-b19
 32acb67a79531daf678577c7ef1bde1867da807d jdk7u6-b20
@@ -215,6 +222,15 @@
 1de4a0865a714076b4922a9a7119adb98aee23f2 jdk7u9-b05
 5d1a6a593fa17933683b34ea3a55c7d13c028a13 jdk7u9-b31
 acd27fc7fcf3e9dc0a1ae7e101cc036e960b6295 jdk7u9-b32
+a35ca56cf8d09b92511f0cd71208a2ea05c8a338 jdk7u8-b01
+41bc8da868e58f7182d26b2ab9b6f8a4b09894ed jdk7u8-b02
+df5cbe436d3460af4667d416877e03400de54524 jdk7u8-b03
+d4296a07e45a0cffbca17c608916ff6bcec78d75 jdk7u8-b04
+1b7eaaffd58359639346661196309005a374192f jdk7u8-b05
+e1f380574f5490ef785282b81b6b38626109444b jdk7u10-b06
+cd18b83736af19afbccce4b7351c5a3c857356ac jdk7u10-b07
+3204f355a32d83ffceeed1c0c8a52a2d834ae29f jdk7u10-b08
+0b90d3480dbfc16aa3901df249b3cb21bcfa0b32 jdk7u10-b09
 8dfbebb98865d822ddd9e0b9641d21e8bdb8a866 jdk7u10-b10
 01c6dde274bd520067264231b3015c37e8e62d24 jdk7u10-b11
 1fb02747d3bce646374c2cab95048c516cec6b01 jdk7u10-b12
@@ -225,6 +241,7 @@
 7101b3e80e96b000b0b4f0bd7fe4dd7910d02f74 jdk7u10-b17
 4f529e320d83f517a55065b4710c7f1e5ff692c9 jdk7u10-b18
 1e5aed8511b9bea5c2ebe51a2d9094be8bac73cc jdk7u10-b30
+87683444edad33cc9f4bbcd9008d98ba34350ded jdk7u12-b01
 db426c20b06918feeeaa036d52a5096c2bb646b0 jdk7u10-b31
 b01338429ab6821f44d19601de433b538942b53d jdk7u11-b20
 aeef1c7e43bc2d4a0960ebf42b642f7a34ec8afc jdk7u11-b21
@@ -240,6 +257,21 @@
 761b933e269693fd689c2af5d8317201b2172dbb jdk7u13-b10
 8a12629ea21378f96666628f472cd9a6936a4933 jdk7u13-b30
 761b933e269693fd689c2af5d8317201b2172dbb jdk7u13-b20
+12996c33d506d741ae7c3cc8e2aa2f650a36b839 jdk7u12-b02
+3fe61a8a2cfb02ee2b1cd4cd257b76c5b8668cd3 jdk7u12-b03
+e2adb6f53caaa618521bdf965bc484c7ffae190f jdk7u12-b04
+454ce2fa72e9ad14e83ebf54636c196d75e35509 jdk7u12-b05
+ab820babd394eed07c58bc2bffc58b0d92ca39b8 jdk7u12-b06
+382bab6d9682eefa2185a1643dfa32d65b6c20e5 jdk7u12-b07
+7c0c3aeb2c603baba2cabba9adc5a0a49afb4f47 jdk7u12-b08
+96c4f3ec63552a87a825baabd7f0dfafec299483 jdk7u12-b09
+85fb9d7ce4af53f0a47d2b73d983c96239f9ff33 icedtea-2.4-branchpoint
+e5b1403fa68abe3ac7174c031f19e6ecf77624a0 jdk7u14-b10
+db94066df63468172e074d59e71d82dc874ed7cb jdk7u14-b11
+f9a326e92fafc4724f0af550c2cba82fea202a31 jdk7u14-b12
+5a52c6cc8db94b68eaacb42a9b4df30a40b09d82 jdk7u14-b13
+5febc4e479fad801424cdcce90a0d463a2ef9223 jdk7u14-b14
+5fdb509d1f1a0533b14c61c92d77ff21e0ce2488 jdk7u14-b15
 1298307076c2f0c2a4acd3a2a132cbe98d399009 jdk7u15-b01
 8db0105f00ce9fe6899ece52d46d78995111c456 jdk7u15-b02
 b00c1580ffa95d9edd567835e1b9a77cf8ca2af6 jdk7u15-b30
@@ -265,6 +297,7 @@
 e120818fc321b5d9d8573a58bf5f6a6eb7471229 jdk7u21-b11
 ff6f8ab2635c6e0b0f6bb1a68dca48b4fc31b107 jdk7u21-b30
 a87ad97e80ae1861143b477d8a8990dc6ecc9173 jdk7u21-b12
+55c56025da9d9833aa8fff50cb897f7aa99f4a13 jdk7u21-b31
 884621bb9042cd4a06e230307f1e26f1c518346d jdk7u25-b01
 1311e3618232058b09fe7ea25eda4af8d3fe6807 jdk7u25-b02
 8dc40e209a12638ea18bb7ee436051768afa5d39 jdk7u25-b03
@@ -276,10 +309,85 @@
 17ee569d0c0130824ba27bc1b090114e6075c5f2 jdk7u25-b09
 41c1b02cd6a8fa7746752cc911da3dd4d380098d jdk7u25-b10
 0da9ef0d9fc5b017f960d65ae0cd07860a259621 jdk7u25-b11
+cf80c545434cfe44034e667079673ce42cc9cdbf jdk7u14-b16
+aecd58f25d7f21827ae1b020ae8cfb44857c439f jdk7u14-b17
+577f9625ec558c18e9de6e3428fd0f9cca823033 jdk7u14-b18
+5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19
+5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19
+e8c876a77def120b5eeb26535d0777c9b9f842f8 jdk7u14-b19
+86ae75a68cc375cfc0559699b5270951aab09eb0 jdk7u14-b20
+c31648d7a6ac692371f1e9abe95bc2856a7dc51c jdk7u14-b21
+eb1c9eacea1f07c07e7e700db624649d3573dae4 jdk7u14-b22
+e84535d2c292032669ac75a6a0afc5f23c708064 jdk7u40-b23
+d2b78e3b352dfb9b0cbd808669f9332e898147ed jdk7u40-b24
+e5635f70fe67192142cb5166bee08cc915a18bc4 jdk7u40-b25
+5bd6f156bc01b6a4e901fc5607663dfc249e9105 jdk7u40-b26
+12506bba2b67cd4b229550da67ff85b984549a28 jdk7u40-b27
+9f2eea2fae59c5242d1bb4cbca967bb6fbb99865 jdk7u40-b28
+bfe3575143fddbf71c2e570b580afef007d171e4 jdk7u40-b29
 28358b2489b2ca29c1a6b79f643204da8924a3d7 jdk7u25-b12
 5ed8c453480063838b632c74f528924f529361a2 jdk7u25-b13
 c6342ec6a12f7283e2a73a80a44dcdd3683e2e8b jdk7u25-b14
 3b8323e24a636ac0638604d19fc116eb0eef6cdb jdk7u25-b15
+a87ad97e80ae1861143b477d8a8990dc6ecc9173 jdk7u21-b50
+642f469e52174d47ddb745f7fcc44f80340986f5 jdk7u25-b31
+a825dd3a95fd77b891255e88e1a78f6a476a45b3 jdk7u25-b33
+9ef1ee50dfa7c5a43b61d47435e3bdb53ccf5404 jdk7u25-b34
 5d95c1e7c0913ad4bc0b5f0b559510d32557def2 jdk7u25-b30
 7294a7be7dbde9c3789f9fa881baa6b8fcd51674 jdk7u25-b16
 aaf5e30d5549ec5200b991806e62db3e866181a7 jdk7u25-b32
+cf80c545434cfe44034e667079673ce42cc9cdbf jdk7u14-b16
+aecd58f25d7f21827ae1b020ae8cfb44857c439f jdk7u14-b17
+577f9625ec558c18e9de6e3428fd0f9cca823033 jdk7u14-b18
+5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19
+5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19
+e8c876a77def120b5eeb26535d0777c9b9f842f8 jdk7u14-b19
+86ae75a68cc375cfc0559699b5270951aab09eb0 jdk7u14-b20
+cbb9be4fb46d8dfd3a8c32dc693f9501a64b9a47 icedtea-2.4.0
+c31648d7a6ac692371f1e9abe95bc2856a7dc51c jdk7u14-b21
+eb1c9eacea1f07c07e7e700db624649d3573dae4 jdk7u14-b22
+e84535d2c292032669ac75a6a0afc5f23c708064 jdk7u40-b23
+d2b78e3b352dfb9b0cbd808669f9332e898147ed jdk7u40-b24
+e5635f70fe67192142cb5166bee08cc915a18bc4 jdk7u40-b25
+5bd6f156bc01b6a4e901fc5607663dfc249e9105 jdk7u40-b26
+12506bba2b67cd4b229550da67ff85b984549a28 jdk7u40-b27
+9f2eea2fae59c5242d1bb4cbca967bb6fbb99865 jdk7u40-b28
+bfe3575143fddbf71c2e570b580afef007d171e4 jdk7u40-b29
+0586afeb2caa0b4595bf5b306657a5dd1f0d121c jdk7u40-b30
+91c95fd8eea822b47bcebd7eed22fdf3c404dd62 icedtea-2.4.1
+9c343668b0a95e5510f715014884e5d45df9dfb0 jdk7u40-b31
+056f998e75f87a299808671ecc0d96e270f62dca jdk7u40-b32
+e36d8f754801c9d17585a9469f9b33f9799167f8 jdk7u40-b33
+08c5065870ef40008711a3d3ee3230323e5f5910 jdk7u40-b34
+524b9f7e6cabc8f7bad1824090e9b0dbf14ece74 jdk7u40-b35
+6837776bcdfafd0f963667156633142d433860f3 jdk7u40-b36
+31908290e4c2241ae9a8000c2a80e0f5fbad2a2c jdk7u40-b37
+21672c0e6691cfa1a477e7f0065afecb4148ddff jdk7u40-b38
+81925e555c94bb19c44bc21ff3e513ea19efbd10 jdk7u40-b39
+0e83f513af688a0b9fd6c9d9389c247ef6fb1afb jdk7u40-b40
+95cefc18bea41615c6c9b85ccbdf62af899174cb jdk7u40-b41
+765bea9bfcfc8c472df0a2daced5e576095f46ac jdk7u40-b42
+988ece7b686564084770e99ca26746c45ffb933f jdk7u40-b43
+a67dbf96bf86989d0392cc5b66e5d4139cbceec7 jdk7u40-b60
+06ea051f7ffe0f91213c8e7064ddb045c93ba1b4 icedtea-2.4.2
+b2e29b79e54e58349c1dbcf5449f67fc5d5a235a jdk7u40-b61
+94ea3d062a3c28c64a837fa8f999c6b6956ff7c4 jdk7u40-b62
+9bbfba4981e1db5016bbfbc23025763966021c26 jdk7u45-b01
+61d5b73ae0ac46268490e2f0dfa1f69a5acda73f jdk7u45-b02
+2fe27ae865e723473225756f1920d9d76d47b903 jdk7u45-b03
+bede296dc848533abae859e61584a517df2773ae jdk7u45-b04
+e989f2f2b5cb639a23a5e67da0d52766acf549a2 jdk7u45-b05
+6f492dc935adc6e2878bb6045aee001a829428a7 jdk7u45-b06
+4c51f98e1eb5b8d94dfca08f3b3160ff382b7c3a jdk7u45-b07
+6cf97c9859e731fba6bcff67c46f57dead8d7284 jdk7u45-b08
+a9c31d3f8188b344ed165ec0730ebc2fd11dfa5d jdk7u45-b09
+2c09352066ec34c8608ccff0f933f566a52033af jdk7u45-b10
+53d5c06766b05689cdccfc300b32075878e8aa1d jdk7u45-b11
+0b6aa6e95eb9da58a686edacf5b102116614d3ea jdk7u45-b12
+68862f365075a11dfa291033d05a062590db9337 jdk7u45-b13
+8c799b9f0cd8af3b1cfd151ba075a4f1630967df jdk7u45-b14
+36ae3f206b53f751a0ebf933e5dbf364097b48a5 jdk7u45-b15
+18d1864abca976ca68cb71612e9b20c908455d3d jdk7u45-b16
+b9aeec6b9d5aac0746f8d1764a7740f8b83334ab jdk7u45-b17
+ba3ff27d4082f2cf0d06e635b2b6e01f80e78589 jdk7u45-b18
+164cf7491ba2f371354ba343a604eee4c61c529d jdk7u45-b30
diff -r daf200613bbb -r 3c8eb52a32ea .jcheck/conf
--- a/.jcheck/conf	Fri Jun 14 18:10:38 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r daf200613bbb -r 3c8eb52a32ea THIRD_PARTY_README
--- a/THIRD_PARTY_README	Fri Jun 14 18:10:38 2013 -0700
+++ b/THIRD_PARTY_README	Wed Oct 16 15:17:06 2013 +0100
@@ -1912,6 +1912,35 @@
 
 -------------------------------------------------------------------------------
 
+%% This notice is provided with respect to Sparkle v.1.5,
+which is included with JRE 7 on Mac OS X.
+
+--- begin of LICENSE ---
+
+Copyright (c) 2012 Sparkle.org and Andy Matuschak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
 %% Portions licensed from Taligent, Inc.
 
 -------------------------------------------------------------------------------
@@ -3169,12 +3198,12 @@
 %% This notice is provided with respect to the following which is 
 included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
 
-  Apache Derby 10.8.1.2        [included with JDK 7 only]
+  Apache Derby 10.8.3.0        [included with JDK 7 only]
   Apache Jakarta BCEL 5.2 
   Apache Jakarta Regexp 1.4 
   Apache Santuario XMLSec-Java 1.4.2
   Apache Xalan-Java 2.7.1 
-  Apache Xerces2 Java 2.10.0 
+  Apache Xerces2 Java 2.11.0 
   Apache XML Resolver 1.1 
 
 
diff -r daf200613bbb -r 3c8eb52a32ea make/Makefile
--- a/make/Makefile	Fri Jun 14 18:10:38 2013 -0700
+++ b/make/Makefile	Wed Oct 16 15:17:06 2013 +0100
@@ -111,6 +111,10 @@
   ANT_OPTIONS += -Ddebug.classfiles=true
 endif
 
+ifeq ($(JAVAC_WARNINGS_FATAL), false)
+  ANT_OPTIONS += -Djavac.warnings.fatal=
+endif
+
 # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
 # and the somewhat misnamed CLASS_VERSION (-target NN)
 ifdef TARGET_CLASS_VERSION
diff -r daf200613bbb -r 3c8eb52a32ea make/build.properties
--- a/make/build.properties	Fri Jun 14 18:10:38 2013 -0700
+++ b/make/build.properties	Wed Oct 16 15:17:06 2013 +0100
@@ -68,7 +68,8 @@
 # set the following to -version to verify the versions of javac being used
 javac.version.opt =
 # in time, there should be no exceptions to -Xlint:all
-javac.lint.opts = -Xlint:all,-deprecation -Werror
+javac.warnings.fatal = -Werror
+javac.lint.opts = -Xlint:all,-deprecation ${javac.warnings.fatal}
 
 # options for the <javadoc> task for javac
 #javadoc.jls3.url=http://java.sun.com/docs/books/jls/
diff -r daf200613bbb -r 3c8eb52a32ea make/build.xml
--- a/make/build.xml	Fri Jun 14 18:10:38 2013 -0700
+++ b/make/build.xml	Wed Oct 16 15:17:06 2013 +0100
@@ -877,7 +877,7 @@
         </javac>
         <taskdef name="genstubs"
                  classname="GenStubs$$Ant"
-                 classpath="${build.toolclasses.dir}/"/>
+                 classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/>
     </target>
 
     <target name="-def-javadoc-tool" depends="-check-target.java.home">
diff -r daf200613bbb -r 3c8eb52a32ea src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java	Fri Jun 14 18:10:38 2013 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java	Wed Oct 16 15:17:06 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, 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
@@ -227,46 +227,44 @@
             String[] os = options[oi];
             String opt = os[0].toLowerCase();
             if (opt.equals("-footer")) {
-                footer =  os[1];
-            } else  if (opt.equals("-header")) {
-                header =  os[1];
-            } else  if (opt.equals("-packagesheader")) {
-                packagesheader =  os[1];
-            } else  if (opt.equals("-doctitle")) {
-                doctitle =  os[1];
-            } else  if (opt.equals("-windowtitle")) {
-                windowtitle =  os[1];
-            } else  if (opt.equals("-top")) {
-                top =  os[1];
-            } else  if (opt.equals("-bottom")) {
-                bottom =  os[1];
-            } else  if (opt.equals("-helpfile")) {
-                helpfile =  os[1];
-            } else  if (opt.equals("-stylesheetfile")) {
-                stylesheetfile =  os[1];
-            } else  if (opt.equals("-charset")) {
-                charset =  os[1];
+                footer = os[1];
+            } else if (opt.equals("-header")) {
+                header = os[1];
+            } else if (opt.equals("-packagesheader")) {
+                packagesheader = os[1];
+            } else if (opt.equals("-doctitle")) {
+                doctitle = os[1];
+            } else if (opt.equals("-windowtitle")) {
+                windowtitle = os[1];
+            } else if (opt.equals("-top")) {
+                top = os[1];
+            } else if (opt.equals("-bottom")) {
+                bottom = os[1];
+            } else if (opt.equals("-helpfile")) {
+                helpfile = os[1];
+            } else if (opt.equals("-stylesheetfile")) {
+                stylesheetfile = os[1];
+            } else if (opt.equals("-charset")) {
+                charset = os[1];
             } else if (opt.equals("-xdocrootparent")) {
                 docrootparent = os[1];
-            } else  if (opt.equals("-nohelp")) {
+            } else if (opt.equals("-nohelp")) {
                 nohelp = true;
-            } else  if (opt.equals("-splitindex")) {
+            } else if (opt.equals("-splitindex")) {
                 splitindex = true;
-            } else  if (opt.equals("-noindex")) {
+            } else if (opt.equals("-noindex")) {
                 createindex = false;
-            } else  if (opt.equals("-use")) {
+            } else if (opt.equals("-use")) {
                 classuse = true;
-            } else  if (opt.equals("-notree")) {
+            } else if (opt.equals("-notree")) {
                 createtree = false;
-            } else  if (opt.equals("-nodeprecatedlist")) {
+            } else if (opt.equals("-nodeprecatedlist")) {
                 nodeprecatedlist = true;
-            } else  if (opt.equals("-nosince")) {
-                nosince = true;
-            } else  if (opt.equals("-nonavbar")) {
+            } else if (opt.equals("-nonavbar")) {
                 nonavbar = true;
-            } else  if (opt.equals("-nooverview")) {
+            } else if (opt.equals("-nooverview")) {
                 nooverview = true;
-            } else  if (opt.equals("-overview")) {
+            } else if (opt.equals("-overview")) {
                 overview = true;
             }
         }
diff -r daf200613bbb -r 3c8eb52a32ea src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Fri Jun 14 18:10:38 2013 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Wed Oct 16 15:17:06 2013 +0100
@@ -292,7 +292,7 @@
             script.addAttr(HtmlAttr.TYPE, "text/javascript");
             String scriptCode = "<!--" + DocletConstants.NL +
                     "    if (location.href.indexOf('is-external=true') == -1) {" + DocletConstants.NL +
-                    "        parent.document.title=\"" + winTitle + "\";" + DocletConstants.NL +
+                    "        parent.document.title=\"" + escapeJavaScriptChars(winTitle) + "\";" + DocletConstants.NL +
                     "    }" + DocletConstants.NL +
                     "//-->" + DocletConstants.NL;
             RawHtml scriptContent = new RawHtml(scriptCode);
@@ -302,6 +302,53 @@
     }
 
     /**
+     * Returns a String with escaped special JavaScript characters.
+     *
+     * @param s String that needs to be escaped
+     * @return a valid escaped JavaScript string
+     */
+    private static String escapeJavaScriptChars(String s) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < s.length(); i++) {
+            char ch = s.charAt(i);
+            switch (ch) {
+                case '\b':
+                    sb.append("\\b");
+                    break;
+                case '\t':
+                    sb.append("\\t");
+                    break;
+                case '\n':
+                    sb.append("\\n");
+                    break;
+                case '\f':
+                    sb.append("\\f");
+                    break;
+                case '\r':
+                    sb.append("\\r");
+                    break;
+                case '"':
+                    sb.append("\\\"");
+                    break;
+                case '\'':
+                    sb.append("\\\'");
+                    break;
+                case '\\':
+                    sb.append("\\\\");
+                    break;
+                default:
+                    if (ch < 32 || ch >= 127) {
+                        sb.append(String.format("\\u%04X", (int)ch));
+                    } else {
+                        sb.append(ch);
+                    }
+                    break;
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
      * Returns a content tree for the SCRIPT tag for the main page(index.html).
      *
      * @return a content for the SCRIPT tag
diff -r daf200613bbb -r 3c8eb52a32ea src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
--- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties	Fri Jun 14 18:10:38 2013 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties	Wed Oct 16 15:17:06 2013 +0100
@@ -33,7 +33,7 @@
 doclet.navAnnotationTypeMember=\u8981\u7D20
 doclet.navField=\u30D5\u30A3\u30FC\u30EB\u30C9
 doclet.navProperty=\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.navEnum=\u5217\u6319\u5B9A\u6570
+doclet.navEnum=\u5217\u6319\u578B\u5B9A\u6570
 doclet.navConstructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
 doclet.navMethod=\u30E1\u30BD\u30C3\u30C9
 doclet.Index=\u7D22\u5F15
@@ -46,9 +46,9 @@
 doclet.None=\u306A\u3057
 doclet.Factory_Method_Detail=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u8A73\u7D30
 doclet.navDeprecated=\u975E\u63A8\u5968
-doclet.Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8
-doclet.Window_Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8
-doclet.Note_0_is_deprecated=\u6CE8\u610F: {0}\u306F\u63A8\u5968\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+doclet.Deprecated_List=\u975E\u63A8\u5968\u306E\u30EA\u30B9\u30C8
+doclet.Window_Deprecated_List=\u975E\u63A8\u5968\u306E\u30EA\u30B9\u30C8
+doclet.Note_0_is_deprecated=\u6CE8\u610F: {0}\u306F\u975E\u63A8\u5968\u3067\u3059\u3002
 doclet.Overrides=\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9:
 doclet.in_class=\u30AF\u30E9\u30B9\u5185
 doclet.0_Fields_and_Methods=&quot;{0}&quot;\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9
@@ -69,31 +69,31 @@
 doclet.see.class_or_package_not_accessible=\u30BF\u30B0{0}: \u53C2\u7167\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {1}
 doclet.see.malformed_tag={0}\u30BF\u30B0: \u4E0D\u6B63\u306A{1}\u30BF\u30B0
 doclet.Inherited_API_Summary=\u7D99\u627F\u3055\u308C\u305FAPI\u306E\u6982\u8981
-doclet.Deprecated_API=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044API
-doclet.Deprecated_Packages=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.Deprecated_Classes=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30AF\u30E9\u30B9
-doclet.Deprecated_Enums=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B
-doclet.Deprecated_Interfaces=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Deprecated_Exceptions=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u4F8B\u5916
-doclet.Deprecated_Annotation_Types=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B
-doclet.Deprecated_Errors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30E9\u30FC
-doclet.Deprecated_Fields=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Deprecated_Constructors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.Deprecated_Methods=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30E1\u30BD\u30C3\u30C9
-doclet.Deprecated_Enum_Constants=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B\u5B9A\u6570
-doclet.Deprecated_Annotation_Type_Members=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B\u306E\u8981\u7D20
-doclet.deprecated_packages=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.deprecated_classes=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30AF\u30E9\u30B9
-doclet.deprecated_enums=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B
-doclet.deprecated_interfaces=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.deprecated_exceptions=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u4F8B\u5916
-doclet.deprecated_annotation_types=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B
-doclet.deprecated_errors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30E9\u30FC
-doclet.deprecated_fields=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.deprecated_constructors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF

From andrew at icedtea.classpath.org  Wed Oct 16 07:43:21 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 16 Oct 2013 14:43:21 +0000
Subject: /hg/release/icedtea7-forest-2.4/hotspot: 66 new changesets
Message-ID: <hg.b80a290e6e30.1381934601.8708922617413201811@icedtea.classpath.org>

changeset b80a290e6e30 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b80a290e6e30
author: katleman
date: Tue Jun 11 11:45:16 2013 -0700

	Added tag jdk7u25-b30 for changeset 97a3ebd62052


changeset 273e8afccd6e in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=273e8afccd6e
author: katleman
date: Wed Jun 12 20:18:19 2013 -0700

	Added tag jdk7u25-b16 for changeset b80a290e6e30


changeset fbdcfe2b22f7 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=fbdcfe2b22f7
author: katleman
date: Fri Jun 14 18:10:19 2013 -0700

	Added tag jdk7u25-b32 for changeset 273e8afccd6e


changeset d85fda0cb63d in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d85fda0cb63d
author: amurillo
date: Sat Jun 22 01:05:11 2013 -0700

	Merge


changeset 5fb434aa203c in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5fb434aa203c
author: asaha
date: Fri Jun 28 11:35:45 2013 -0700

	Merge


changeset 2eb5b21ae3a2 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2eb5b21ae3a2
author: katleman
date: Tue Jul 02 15:17:14 2013 -0700

	Added tag jdk7u45-b01 for changeset 5fb434aa203c


changeset 3a431edfd80e in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3a431edfd80e
author: asaha
date: Wed Jul 03 17:38:21 2013 -0700

	Merge


changeset f2039061ba49 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f2039061ba49
author: asaha
date: Mon Jul 08 15:22:30 2013 -0700

	8020088: Increment minor version of HSx for 7u45 and initialize the build number
	Reviewed-by: jcoomes


changeset aaa90a89968d in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=aaa90a89968d
author: katleman
date: Tue Jul 09 18:22:46 2013 -0700

	Added tag jdk7u45-b02 for changeset f2039061ba49


changeset a3bbc959356e in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a3bbc959356e
author: asaha
date: Wed Jul 10 16:33:14 2013 -0700

	Merge


changeset 28e475dfa88b in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=28e475dfa88b
author: sgabdura
date: Mon Jul 15 10:22:43 2013 +0400

	8016256: Make finalization final
	Reviewed-by: hseigel


changeset d6fd3f84a30c in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d6fd3f84a30c
author: asaha
date: Mon Jul 15 15:12:15 2013 -0700

	8020551: increment hsx build to b03 for 7u45-b03
	Reviewed-by: jcoomes


changeset d77632370b2c in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d77632370b2c
author: cl
date: Tue Jul 16 05:51:59 2013 -0700

	Added tag jdk7u45-b03 for changeset d6fd3f84a30c


changeset 7f16aa906738 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7f16aa906738
author: asaha
date: Fri Jul 19 21:55:01 2013 -0700

	Merge


changeset 9ee0d96a61f7 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9ee0d96a61f7
author: cl
date: Tue Jul 23 08:11:17 2013 -0700

	Added tag jdk7u45-b04 for changeset 7f16aa906738


changeset 99cd2b514c4d in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=99cd2b514c4d
author: asaha
date: Thu Jul 25 17:12:37 2013 -0700

	Merge


changeset 2f9e4153cc9c in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2f9e4153cc9c
author: asaha
date: Mon Jul 29 11:58:33 2013 -0700

	Merge


changeset 107f15f2f32f in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=107f15f2f32f
author: asaha
date: Tue Jul 30 08:43:57 2013 -0700

	Merge


changeset 1db90c27640c in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1db90c27640c
author: asaha
date: Tue Jul 30 10:33:09 2013 -0700

	8021901: Increment hsx build to b05 for 7u45-b05
	Reviewed-by: jcoomes


changeset b4fe146b820b in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b4fe146b820b
author: asaha
date: Wed Jul 31 23:04:51 2013 -0700

	Merge


changeset b265ae7b2536 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b265ae7b2536
author: asaha
date: Fri Aug 02 15:22:42 2013 -0700

	Added tag jdk7u45-b05 for changeset b4fe146b820b


changeset a70c27cf8d8d in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a70c27cf8d8d
author: asaha
date: Fri Aug 02 22:23:27 2013 -0700

	Merge


changeset 04cb4c80f821 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=04cb4c80f821
author: cl
date: Fri Aug 02 19:03:04 2013 -0700

	Added tag jdk7u45-b05 for changeset 99cd2b514c4d


changeset 2a71de92a52b in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2a71de92a52b
author: asaha
date: Mon Aug 05 11:51:57 2013 -0700

	8022254: Remove incorrect jdk7u45-b05 tag from jdk7u-cpu forest
	Reviewed-by: cl


changeset 5283790fa36a in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5283790fa36a
author: asaha
date: Mon Aug 05 13:44:48 2013 -0700

	Merge


changeset 63efa616e54d in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=63efa616e54d
author: asaha
date: Wed Aug 07 12:21:32 2013 -0700

	Merge


changeset 3b126aa4940b in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3b126aa4940b
author: cl
date: Thu Aug 08 23:23:36 2013 -0700

	Added tag jdk7u45-b06 for changeset 63efa616e54d


changeset f6748e6123b6 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f6748e6123b6
author: asaha
date: Mon Aug 12 12:36:09 2013 -0700

	Merge


changeset e5f31f17096f in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e5f31f17096f
author: cl
date: Thu Aug 15 22:16:38 2013 -0700

	Added tag jdk7u45-b07 for changeset f6748e6123b6


changeset c228c923f141 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c228c923f141
author: asaha
date: Mon Aug 19 12:42:16 2013 -0700

	Merge


changeset cf07fdc3ad19 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=cf07fdc3ad19
author: asaha
date: Mon Aug 19 20:39:55 2013 -0700

	8023323: Increment hsx build to b06 for 7u45-b08
	Reviewed-by: jcoomes


changeset 75c36a461ecd in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=75c36a461ecd
author: erikj
date: Mon Aug 19 17:50:26 2013 +0200

	8015614: Update build settings
	Reviewed-by: tbell, dholmes, ahgross


changeset 06bcab9ef183 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=06bcab9ef183
author: asaha
date: Mon Aug 19 20:41:54 2013 -0700

	Merge


changeset da0fd3b6c5b0 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=da0fd3b6c5b0
author: cl
date: Tue Aug 20 10:22:27 2013 -0700

	Added tag jdk7u45-b08 for changeset 06bcab9ef183


changeset d69c8260dd7c in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d69c8260dd7c
author: asaha
date: Thu Aug 22 08:40:20 2013 -0700

	Merge


changeset b8a4430c2848 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b8a4430c2848
author: asaha
date: Mon Aug 26 08:42:22 2013 -0700

	Merge


changeset d11e481d58a1 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d11e481d58a1
author: asaha
date: Mon Aug 26 09:45:45 2013 -0700

	8023741: Increment hsx 24.45 build to b07 for 7u45-b09
	Reviewed-by: jcoomes


changeset 565e6fdc63f3 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=565e6fdc63f3
author: sla
date: Wed Aug 21 13:18:52 2013 +0200

	8022808: Kitchensink hangs on macos
	Summary: Use pthread_mach_thread_np() instead of mach_thread_self() to avoid leaking resources
	Reviewed-by: dholmes, rbackman


changeset 306a8b39b345 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=306a8b39b345
author: mgronlun
date: Fri Aug 23 13:52:05 2013 +0200

	8023457: Event based tracing framework needs a mutex for thread groups
	Reviewed-by: acorn, sla


changeset 996b6863b3b2 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=996b6863b3b2
author: asaha
date: Mon Aug 26 09:47:55 2013 -0700

	Merge


changeset 956a9282d989 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=956a9282d989
author: cl
date: Tue Aug 27 10:56:17 2013 -0700

	Added tag jdk7u45-b09 for changeset 996b6863b3b2


changeset ddf4086a9118 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ddf4086a9118
author: asaha
date: Tue Aug 27 22:28:24 2013 -0700

	8023888: Increment hsx 24.45 build to b08 for 7u45-b10
	Reviewed-by: jcoomes


changeset 45c4d9353387 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=45c4d9353387
author: iklam
date: Sat Aug 24 00:14:46 2013 -0700

	8023683: Enhance class file parsing
	Summary: Use the value returned by REALLOC_RESOURCE_ARRAY()
	Reviewed-by: coleenp, ahgross


changeset 319bfff22782 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=319bfff22782
author: asaha
date: Tue Aug 27 15:35:35 2013 -0700

	Merge


changeset 7b028a5f4882 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7b028a5f4882
author: asaha
date: Tue Aug 27 22:32:11 2013 -0700

	Merge


changeset bcaf889eea9e in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=bcaf889eea9e
author: asaha
date: Fri Aug 30 10:52:38 2013 -0700

	Merge


changeset b8266091df35 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b8266091df35
author: cl
date: Wed Sep 04 11:05:04 2013 -0700

	Added tag jdk7u45-b10 for changeset bcaf889eea9e


changeset 7ca907428850 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7ca907428850
author: asaha
date: Wed Sep 04 12:06:58 2013 -0700

	Merge


changeset ed1505510ea0 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ed1505510ea0
author: cl
date: Wed Sep 11 11:12:16 2013 -0700

	Added tag jdk7u45-b11 for changeset 7ca907428850


changeset 89f99af7a7bb in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=89f99af7a7bb
author: cl
date: Wed Sep 18 02:15:51 2013 -0700

	Added tag jdk7u45-b12 for changeset ed1505510ea0


changeset 718d1e9223dd in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=718d1e9223dd
author: cl
date: Mon Sep 23 14:31:24 2013 -0700

	Added tag jdk7u45-b13 for changeset 89f99af7a7bb


changeset 9ad76a08e5ed in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9ad76a08e5ed
author: cl
date: Thu Sep 26 10:37:18 2013 -0700

	Added tag jdk7u45-b14 for changeset 718d1e9223dd


changeset 429884602206 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=429884602206
author: cl
date: Fri Sep 27 11:44:28 2013 -0700

	Added tag jdk7u45-b15 for changeset 9ad76a08e5ed


changeset 09fa1c144a13 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=09fa1c144a13
author: asaha
date: Thu Sep 05 15:42:04 2013 -0700

	8024369: Increment build # of hs24.0 to b57 for 7u40-b61 psu
	Reviewed-by: jcoomes


changeset efaa26fb6de2 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=efaa26fb6de2
author: kevinw
date: Fri Aug 02 12:26:46 2013 +0100

	8020943: Memory leak when GCNotifier uses create_from_platform_dependent_str()
	Reviewed-by: mgerdin, fparain, dcubed


changeset 81bc06715f6c in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=81bc06715f6c
author: katleman
date: Wed Sep 11 10:59:44 2013 -0700

	Added tag jdk7u40-b61 for changeset efaa26fb6de2


changeset df6f37a7311d in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=df6f37a7311d
author: kevinw
date: Mon Sep 16 13:49:10 2013 -0700

	8023478: Test fails with HS crash in GCNotifier.
	Reviewed-by: sla


changeset c75d07d80623 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c75d07d80623
author: katleman
date: Tue Sep 17 13:05:19 2013 -0700

	Added tag jdk7u40-b62 for changeset df6f37a7311d


changeset a61d36ab0338 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a61d36ab0338
author: asaha
date: Thu Sep 19 14:40:06 2013 -0700

	Merge


changeset bdf64a0126d4 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=bdf64a0126d4
author: asaha
date: Fri Sep 27 13:06:59 2013 -0700

	Merge


changeset 0c0dc384915c in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0c0dc384915c
author: cl
date: Thu Oct 03 11:31:44 2013 -0700

	Added tag jdk7u45-b16 for changeset 429884602206


changeset 12374864c655 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=12374864c655
author: cl
date: Mon Oct 07 21:52:30 2013 -0700

	Added tag jdk7u45-b17 for changeset 0c0dc384915c


changeset 3677c8cc3c89 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3677c8cc3c89
author: cl
date: Tue Oct 08 09:06:48 2013 -0700

	Added tag jdk7u45-b18 for changeset 12374864c655


changeset be31e93e1279 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=be31e93e1279
author: cl
date: Tue Oct 08 10:57:38 2013 -0700

	Added tag jdk7u45-b30 for changeset 3677c8cc3c89


changeset 520b7b3d9153 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=520b7b3d9153
author: asaha
date: Tue Oct 08 11:11:02 2013 -0700

	Merge


changeset b59e02d9e72b in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b59e02d9e72b
author: andrew
date: Wed Oct 16 15:17:08 2013 +0100

	Merge jdk7u45-b31


diffstat:

 .hgtags                                                                                       |   203 +
 .jcheck/conf                                                                                  |     2 -
 THIRD_PARTY_README                                                                            |    33 +-
 agent/make/saenv.sh                                                                           |     2 +-
 agent/make/start-debug-server-proc.sh                                                         |     7 +-
 agent/src/os/bsd/MacosxDebuggerLocal.m                                                        |   198 +-
 agent/src/os/bsd/libproc_impl.c                                                               |    10 +-
 agent/src/os/bsd/libproc_impl.h                                                               |     3 +-
 agent/src/os/bsd/ps_proc.c                                                                    |    86 +-
 agent/src/os/linux/LinuxDebuggerLocal.c                                                       |     8 +-
 agent/src/os/linux/Makefile                                                                   |    11 +-
 agent/src/os/linux/libproc.h                                                                  |    40 +-
 agent/src/os/linux/libproc_impl.c                                                             |    10 +-
 agent/src/os/linux/libproc_impl.h                                                             |     3 +-
 agent/src/os/linux/ps_core.c                                                                  |     2 +-
 agent/src/os/linux/ps_proc.c                                                                  |    96 +-
 agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java                                     |    10 +-
 agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java                             |    11 +-
 agent/src/share/classes/sun/jvm/hotspot/code/CodeBlob.java                                    |     1 -
 agent/src/share/classes/sun/jvm/hotspot/code/CodeCache.java                                   |     5 -
 agent/src/share/classes/sun/jvm/hotspot/code/RicochetBlob.java                                |    70 -
 agent/src/share/classes/sun/jvm/hotspot/debugger/ThreadContext.java                           |     4 +
 agent/src/share/classes/sun/jvm/hotspot/debugger/amd64/AMD64ThreadContext.java                |     5 +
 agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java                         |     2 +-
 agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java                    |    19 +-
 agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java                           |    18 +-
 agent/src/share/classes/sun/jvm/hotspot/debugger/ia64/IA64ThreadContext.java                  |     5 +
 agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java                    |     6 +-
 agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java         |    15 +-
 agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java            |     7 +-
 agent/src/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86CFrame.java                |     7 +-
 agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java                  |    18 +-
 agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java             |    16 +-
 agent/src/share/classes/sun/jvm/hotspot/debugger/sparc/SPARCThreadContext.java                |     5 +
 agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64Thread.java          |    18 +-
 agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86Thread.java              |    18 +-
 agent/src/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java                    |     5 +
 agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSeq.java               |     4 +-
 agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetBase.java           |     4 +-
 agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java                            |     5 +-
 agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java                           |    14 +-
 agent/src/share/classes/sun/jvm/hotspot/memory/BinaryTreeDictionary.java                      |     4 +-
 agent/src/share/classes/sun/jvm/hotspot/memory/CMSCollector.java                              |     6 +-
 agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java                  |     1 -
 agent/src/share/classes/sun/jvm/hotspot/memory/FreeList.java                                  |     2 +-
 agent/src/share/classes/sun/jvm/hotspot/oops/AccessFlags.java                                 |     1 +
 agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethod.java                                 |    92 +-
 agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java                                |     7 +-
 agent/src/share/classes/sun/jvm/hotspot/oops/ExceptionTableElement.java                       |    81 +
 agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java                              |    42 +-
 agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java                               |   105 +-
 agent/src/share/classes/sun/jvm/hotspot/oops/Method.java                                      |    18 +-
 agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java                                  |     1 -
 agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java                                  |     1 -
 agent/src/share/classes/sun/jvm/hotspot/runtime/ClassConstants.java                           |     2 +
 agent/src/share/classes/sun/jvm/hotspot/runtime/Frame.java                                    |    16 +-
 agent/src/share/classes/sun/jvm/hotspot/runtime/OSThread.java                                 |     9 +-
 agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java                                  |    12 +-
 agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java                                       |    21 +-
 agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java     |    13 +-
 agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCFrame.java                         |    16 -
 agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCRicochetFrame.java                 |    77 -
 agent/src/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java |    14 +-
 agent/src/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java     |    14 +-
 agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java                             |    11 -
 agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86RicochetFrame.java                     |    81 -
 agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java                          |    27 +-
 agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java                    |    66 +-
 agent/src/share/classes/sun/jvm/hotspot/utilities/AltPlatformInfo.java                        |    31 +
 agent/src/share/classes/sun/jvm/hotspot/utilities/BasicHashtable.java                         |     4 +-
 agent/src/share/classes/sun/jvm/hotspot/utilities/BasicHashtableEntry.java                    |     2 +-
 agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java                              |     2 +-
 agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableBucket.java                        |     2 +-
 agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableEntry.java                         |     2 +-
 agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java                           |     7 +
 agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFrame.java                       |     3 +-
 make/Makefile                                                                                 |   224 +-
 make/bsd/Makefile                                                                             |     2 +-
 make/bsd/makefiles/build_vm_def.sh                                                            |     4 +-
 make/bsd/makefiles/buildtree.make                                                             |    28 +-
 make/bsd/makefiles/defs.make                                                                  |    28 +-
 make/bsd/makefiles/dtrace.make                                                                |    18 +-
 make/bsd/makefiles/gcc.make                                                                   |   111 +-
 make/bsd/makefiles/jvmg.make                                                                  |     4 +-
 make/bsd/makefiles/mapfile-vers-debug                                                         |   487 +-
 make/bsd/makefiles/mapfile-vers-product                                                       |   479 +-
 make/bsd/makefiles/sparcWorks.make                                                            |    13 +-
 make/bsd/makefiles/top.make                                                                   |     6 +-
 make/bsd/makefiles/trace.make                                                                 |   121 +
 make/bsd/makefiles/universal.gmk                                                              |     3 +-
 make/bsd/makefiles/vm.make                                                                    |    28 +-
 make/defs.make                                                                                |    47 +-
 make/hotspot_version                                                                          |     8 +-
 make/jprt.properties                                                                          |    97 +-
 make/linux/Makefile                                                                           |     2 +-
 make/linux/makefiles/adlc.make                                                                |    10 +-
 make/linux/makefiles/buildtree.make                                                           |    31 +-
 make/linux/makefiles/defs.make                                                                |   176 +-
 make/linux/makefiles/dtrace.make                                                              |    40 +-
 make/linux/makefiles/gcc.make                                                                 |   123 +-
 make/linux/makefiles/jsig.make                                                                |     8 +-
 make/linux/makefiles/jvmg.make                                                                |     6 +-
 make/linux/makefiles/rules.make                                                               |    10 -
 make/linux/makefiles/sa.make                                                                  |    14 +-
 make/linux/makefiles/saproc.make                                                              |    22 +-
 make/linux/makefiles/sparcWorks.make                                                          |    13 +-
 make/linux/makefiles/top.make                                                                 |     6 +-
 make/linux/makefiles/trace.make                                                               |   120 +
 make/linux/makefiles/vm.make                                                                  |   101 +-
 make/linux/makefiles/zero.make                                                                |     4 +
 make/linux/platform_zero.in                                                                   |     2 +-
 make/pic.make                                                                                 |     2 +-
 make/solaris/Makefile                                                                         |    20 +-
 make/solaris/makefiles/adlc.make                                                              |     6 +-
 make/solaris/makefiles/buildtree.make                                                         |    27 +-
 make/solaris/makefiles/defs.make                                                              |   162 +-
 make/solaris/makefiles/dtrace.make                                                            |    34 +-
 make/solaris/makefiles/fastdebug.make                                                         |     5 +
 make/solaris/makefiles/gcc.make                                                               |    18 +-
 make/solaris/makefiles/jsig.make                                                              |     4 +
 make/solaris/makefiles/jvmg.make                                                              |     3 +-
 make/solaris/makefiles/kernel.make                                                            |    32 -
 make/solaris/makefiles/optimized.make                                                         |     5 +
 make/solaris/makefiles/product.make                                                           |     5 +
 make/solaris/makefiles/rules.make                                                             |    10 -
 make/solaris/makefiles/saproc.make                                                            |     4 +
 make/solaris/makefiles/sparcWorks.make                                                        |    25 +-
 make/solaris/makefiles/top.make                                                               |     8 +-
 make/solaris/makefiles/trace.make                                                             |   120 +
 make/solaris/makefiles/vm.make                                                                |    37 +-
 make/windows/build.bat                                                                        |     5 +-
 make/windows/build.make                                                                       |    19 +-
 make/windows/create.bat                                                                       |     4 +-
 make/windows/create_obj_files.sh                                                              |    17 +-
 make/windows/makefiles/compile.make                                                           |    26 +-
 make/windows/makefiles/debug.make                                                             |     3 +-
 make/windows/makefiles/defs.make                                                              |   127 +-
 make/windows/makefiles/generated.make                                                         |     8 +-
 make/windows/makefiles/product.make                                                           |     8 -
 make/windows/makefiles/projectcreator.make                                                    |   141 +-
 make/windows/makefiles/rules.make                                                             |    15 +-
 make/windows/makefiles/sa.make                                                                |    53 +-
 make/windows/makefiles/shared.make                                                            |     7 +-
 make/windows/makefiles/trace.make                                                             |   121 +
 make/windows/makefiles/vm.make                                                                |    47 +-
 make/windows/projectfiles/common/Makefile                                                     |    47 +-
 make/windows/projectfiles/kernel/Makefile                                                     |    27 -
 make/windows/projectfiles/kernel/vm.def                                                       |     7 -
 make/windows/projectfiles/kernel/vm.dsw                                                       |    29 -
 src/cpu/sparc/vm/assembler_sparc.cpp                                                          |   242 +-
 src/cpu/sparc/vm/assembler_sparc.hpp                                                          |    18 +-
 src/cpu/sparc/vm/assembler_sparc.inline.hpp                                                   |     6 +-
 src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp                                                       |    79 -
 src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp                                                    |    36 +-
 src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp                                                    |    93 +-
 src/cpu/sparc/vm/cppInterpreter_sparc.cpp                                                     |    29 +-
 src/cpu/sparc/vm/frame_sparc.cpp                                                              |    19 +-
 src/cpu/sparc/vm/frame_sparc.inline.hpp                                                       |     4 +-
 src/cpu/sparc/vm/globals_sparc.hpp                                                            |    41 +-
 src/cpu/sparc/vm/interp_masm_sparc.cpp                                                        |    29 +-
 src/cpu/sparc/vm/interp_masm_sparc.hpp                                                        |     3 +-
 src/cpu/sparc/vm/interpreterGenerator_sparc.hpp                                               |     1 -
 src/cpu/sparc/vm/interpreter_sparc.cpp                                                        |    19 +-
 src/cpu/sparc/vm/methodHandles_sparc.cpp                                                      |  2559 +-----
 src/cpu/sparc/vm/methodHandles_sparc.hpp                                                      |   188 +-
 src/cpu/sparc/vm/sharedRuntime_sparc.cpp                                                      |   621 +-
 src/cpu/sparc/vm/sparc.ad                                                                     |   769 +-
 src/cpu/sparc/vm/stubGenerator_sparc.cpp                                                      |     8 -
 src/cpu/sparc/vm/templateInterpreter_sparc.cpp                                                |    37 +-
 src/cpu/sparc/vm/templateTable_sparc.cpp                                                      |   426 +-
 src/cpu/sparc/vm/templateTable_sparc.hpp                                                      |     7 +
 src/cpu/sparc/vm/vm_version_sparc.cpp                                                         |    19 +-
 src/cpu/sparc/vm/vm_version_sparc.hpp                                                         |    17 +-
 src/cpu/sparc/vm/vtableStubs_sparc.cpp                                                        |    10 +-
 src/cpu/x86/vm/assembler_x86.cpp                                                              |  2686 ++++-
 src/cpu/x86/vm/assembler_x86.hpp                                                              |   377 +-
 src/cpu/x86/vm/c1_CodeStubs_x86.cpp                                                           |    62 -
 src/cpu/x86/vm/c1_LIRAssembler_x86.cpp                                                        |    53 +
 src/cpu/x86/vm/c1_LIRGenerator_x86.cpp                                                        |   129 +-
 src/cpu/x86/vm/c1_LinearScan_x86.cpp                                                          |    75 +-
 src/cpu/x86/vm/c1_Runtime1_x86.cpp                                                            |    22 +-
 src/cpu/x86/vm/c2_globals_x86.hpp                                                             |     2 +-
 src/cpu/x86/vm/cppInterpreter_x86.cpp                                                         |    46 +-
 src/cpu/x86/vm/frame_x86.cpp                                                                  |    90 +-
 src/cpu/x86/vm/frame_x86.inline.hpp                                                           |     5 +-
 src/cpu/x86/vm/globals_x86.hpp                                                                |    54 +-
 src/cpu/x86/vm/interp_masm_x86_32.cpp                                                         |     6 +-
 src/cpu/x86/vm/interp_masm_x86_32.hpp                                                         |     5 +-
 src/cpu/x86/vm/interp_masm_x86_64.cpp                                                         |     6 +-
 src/cpu/x86/vm/interp_masm_x86_64.hpp                                                         |    11 +-
 src/cpu/x86/vm/interpreterGenerator_x86.hpp                                                   |     1 -
 src/cpu/x86/vm/interpreter_x86_32.cpp                                                         |    25 +-
 src/cpu/x86/vm/interpreter_x86_64.cpp                                                         |    21 +-
 src/cpu/x86/vm/methodHandles_x86.cpp                                                          |  2644 +-----
 src/cpu/x86/vm/methodHandles_x86.hpp                                                          |   266 +-
 src/cpu/x86/vm/register_x86.cpp                                                               |     4 +-
 src/cpu/x86/vm/register_x86.hpp                                                               |     6 +-
 src/cpu/x86/vm/sharedRuntime_x86_32.cpp                                                       |   330 +-
 src/cpu/x86/vm/sharedRuntime_x86_64.cpp                                                       |   508 +-
 src/cpu/x86/vm/stubGenerator_x86_32.cpp                                                       |   662 +-
 src/cpu/x86/vm/stubGenerator_x86_64.cpp                                                       |   985 ++-
 src/cpu/x86/vm/stubRoutines_x86_32.cpp                                                        |     1 +
 src/cpu/x86/vm/stubRoutines_x86_32.hpp                                                        |     4 +
 src/cpu/x86/vm/stubRoutines_x86_64.cpp                                                        |     3 +-
 src/cpu/x86/vm/stubRoutines_x86_64.hpp                                                        |    15 +-
 src/cpu/x86/vm/templateInterpreter_x86_32.cpp                                                 |    53 +-
 src/cpu/x86/vm/templateInterpreter_x86_64.cpp                                                 |    56 +-
 src/cpu/x86/vm/templateTable_x86_32.cpp                                                       |   339 +-
 src/cpu/x86/vm/templateTable_x86_32.hpp                                                       |     9 +-
 src/cpu/x86/vm/templateTable_x86_64.cpp                                                       |   281 +-
 src/cpu/x86/vm/templateTable_x86_64.hpp                                                       |     7 +-
 src/cpu/x86/vm/vm_version_x86.cpp                                                             |   112 +-
 src/cpu/x86/vm/vm_version_x86.hpp                                                             |    19 +-
 src/cpu/x86/vm/vmreg_x86.cpp                                                                  |     7 +-
 src/cpu/x86/vm/vmreg_x86.inline.hpp                                                           |     6 +-
 src/cpu/x86/vm/vtableStubs_x86_32.cpp                                                         |     6 +-
 src/cpu/x86/vm/vtableStubs_x86_64.cpp                                                         |     9 +-
 src/cpu/x86/vm/x86.ad                                                                         |  4205 +++++++++-
 src/cpu/x86/vm/x86_32.ad                                                                      |  1595 +--
 src/cpu/x86/vm/x86_64.ad                                                                      |  1156 +-
 src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp                                              |    17 +-
 src/cpu/zero/vm/cppInterpreter_zero.cpp                                                       |   578 +-
 src/cpu/zero/vm/cppInterpreter_zero.hpp                                                       |     6 +-
 src/cpu/zero/vm/entryFrame_zero.hpp                                                           |     4 +-
 src/cpu/zero/vm/frame_zero.cpp                                                                |    11 +-
 src/cpu/zero/vm/frame_zero.inline.hpp                                                         |     8 +-
 src/cpu/zero/vm/globals_zero.hpp                                                              |     5 +-
 src/cpu/zero/vm/interpreterGenerator_zero.hpp                                                 |     1 -
 src/cpu/zero/vm/interpreter_zero.cpp                                                          |     8 -
 src/cpu/zero/vm/methodHandles_zero.cpp                                                        |   169 +-
 src/cpu/zero/vm/methodHandles_zero.hpp                                                        |    14 +-
 src/cpu/zero/vm/register_zero.hpp                                                             |     7 +-
 src/cpu/zero/vm/sharedRuntime_zero.cpp                                                        |    37 +-
 src/os/bsd/vm/attachListener_bsd.cpp                                                          |    26 +-
 src/os/bsd/vm/decoder_machO.cpp                                                               |   133 +
 src/os/bsd/vm/decoder_machO.hpp                                                               |    19 +-
 src/os/bsd/vm/osThread_bsd.hpp                                                                |    60 +-
 src/os/bsd/vm/os_bsd.cpp                                                                      |   778 +-
 src/os/bsd/vm/os_bsd.hpp                                                                      |    53 +-
 src/os/bsd/vm/os_bsd.inline.hpp                                                               |     2 +-
 src/os/bsd/vm/perfMemory_bsd.cpp                                                              |    77 +-
 src/os/linux/vm/attachListener_linux.cpp                                                      |    26 +-
 src/os/linux/vm/globals_linux.hpp                                                             |     5 +-
 src/os/linux/vm/osThread_linux.hpp                                                            |    19 +-
 src/os/linux/vm/os_linux.cpp                                                                  |   843 +-
 src/os/linux/vm/os_linux.hpp                                                                  |    62 +-
 src/os/linux/vm/os_linux.inline.hpp                                                           |     2 +-
 src/os/linux/vm/perfMemory_linux.cpp                                                          |    77 +-
 src/os/linux/vm/vmError_linux.cpp                                                             |     2 +-
 src/os/posix/launcher/launcher.script                                                         |    38 +-
 src/os/posix/vm/os_posix.cpp                                                                  |    81 +-
 src/os/posix/vm/os_posix.hpp                                                                  |    19 +
 src/os/solaris/dtrace/generateJvmOffsets.cpp                                                  |     4 +-
 src/os/solaris/dtrace/hs_private.d                                                            |     1 -
 src/os/solaris/dtrace/jhelper.d                                                               |     8 +-
 src/os/solaris/dtrace/libjvm_db.c                                                             |     6 +-
 src/os/solaris/vm/attachListener_solaris.cpp                                                  |    30 +-
 src/os/solaris/vm/dtraceJSDT_solaris.cpp                                                      |    44 +-
 src/os/solaris/vm/osThread_solaris.cpp                                                        |   174 +-
 src/os/solaris/vm/osThread_solaris.hpp                                                        |    61 +-
 src/os/solaris/vm/os_share_solaris.hpp                                                        |    22 -
 src/os/solaris/vm/os_solaris.cpp                                                              |   778 +-
 src/os/solaris/vm/os_solaris.hpp                                                              |    13 +-
 src/os/solaris/vm/os_solaris.inline.hpp                                                       |     8 +-
 src/os/solaris/vm/perfMemory_solaris.cpp                                                      |    77 +-
 src/os/windows/vm/attachListener_windows.cpp                                                  |     6 +-
 src/os/windows/vm/decoder_windows.cpp                                                         |    82 +-
 src/os/windows/vm/decoder_windows.hpp                                                         |     6 +
 src/os/windows/vm/jvm_windows.h                                                               |     2 +-
 src/os/windows/vm/osThread_windows.hpp                                                        |    10 +-
 src/os/windows/vm/os_windows.cpp                                                              |   505 +-
 src/os/windows/vm/os_windows.hpp                                                              |    28 +-
 src/os/windows/vm/os_windows.inline.hpp                                                       |     8 +-
 src/os/windows/vm/perfMemory_windows.cpp                                                      |   121 +-
 src/os_cpu/bsd_x86/vm/bsd_x86_64.ad                                                           |    18 -
 src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp                                                          |    17 +-
 src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp                                                      |    10 +-
 src/os_cpu/bsd_x86/vm/thread_bsd_x86.hpp                                                      |     7 +
 src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp                                                   |    15 +-
 src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp                                                        |    13 +-
 src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp                                           |    11 +-
 src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp                                                  |    23 +-
 src/os_cpu/linux_sparc/vm/vmStructs_linux_sparc.hpp                                           |     6 +-
 src/os_cpu/linux_x86/vm/linux_x86_64.ad                                                       |    18 -
 src/os_cpu/linux_x86/vm/os_linux_x86.cpp                                                      |    25 +-
 src/os_cpu/linux_x86/vm/thread_linux_x86.cpp                                                  |     9 +-
 src/os_cpu/linux_x86/vm/thread_linux_x86.hpp                                                  |     5 +
 src/os_cpu/linux_x86/vm/vmStructs_linux_x86.hpp                                               |     6 +-
 src/os_cpu/linux_zero/vm/globals_linux_zero.hpp                                               |     2 +-
 src/os_cpu/linux_zero/vm/os_linux_zero.cpp                                                    |    13 +-
 src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp                                              |    55 +-
 src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.cpp                                          |    12 +-
 src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.hpp                                          |     5 +
 src/os_cpu/solaris_sparc/vm/vmStructs_solaris_sparc.hpp                                       |     6 +-
 src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp                                      |    12 +-
 src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp                                                  |    54 +-
 src/os_cpu/solaris_x86/vm/solaris_x86_32.il                                                   |     6 +
 src/os_cpu/solaris_x86/vm/solaris_x86_64.ad                                                   |    29 -
 src/os_cpu/solaris_x86/vm/solaris_x86_64.il                                                   |     6 +
 src/os_cpu/solaris_x86/vm/thread_solaris_x86.cpp                                              |    11 +-
 src/os_cpu/solaris_x86/vm/thread_solaris_x86.hpp                                              |     6 +
 src/os_cpu/solaris_x86/vm/vmStructs_solaris_x86.hpp                                           |     6 +-
 src/os_cpu/windows_x86/vm/os_windows_x86.cpp                                                  |    36 +-
 src/os_cpu/windows_x86/vm/thread_windows_x86.cpp                                              |    12 +
 src/os_cpu/windows_x86/vm/thread_windows_x86.hpp                                              |     6 +
 src/os_cpu/windows_x86/vm/vmStructs_windows_x86.hpp                                           |     5 +-
 src/os_cpu/windows_x86/vm/windows_x86_64.ad                                                   |    27 +-
 src/share/tools/LogCompilation/README                                                         |     6 +-
 src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java               |    11 +-
 src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java            |    26 +-
 src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java         |    10 +-
 src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java              |    80 +-
 src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java                  |    21 +-
 src/share/tools/ProjectCreator/BuildConfig.java                                               |   219 +-
 src/share/tools/ProjectCreator/DirectoryTree.java                                             |   287 -
 src/share/tools/ProjectCreator/DirectoryTreeNode.java                                         |    36 -
 src/share/tools/ProjectCreator/FileFormatException.java                                       |    35 -
 src/share/tools/ProjectCreator/FileTreeCreator.java                                           |    72 +
 src/share/tools/ProjectCreator/FileTreeCreatorVC10.java                                       |   142 +
 src/share/tools/ProjectCreator/FileTreeCreatorVC7.java                                        |   156 +
 src/share/tools/ProjectCreator/ProjectCreator.java                                            |   135 +-
 src/share/tools/ProjectCreator/Util.java                                                      |    13 +-
 src/share/tools/ProjectCreator/WinGammaPlatform.java                                          |   282 +-
 src/share/tools/ProjectCreator/WinGammaPlatformVC10.java                                      |   291 +-
 src/share/tools/ProjectCreator/WinGammaPlatformVC6.java                                       |   297 -
 src/share/tools/ProjectCreator/WinGammaPlatformVC7.java                                       |   988 +-
 src/share/vm/adlc/adlparse.cpp                                                                |   104 +-
 src/share/vm/adlc/archDesc.cpp                                                                |    70 +-
 src/share/vm/adlc/archDesc.hpp                                                                |    13 +-
 src/share/vm/adlc/dfa.cpp                                                                     |    41 +-
 src/share/vm/adlc/dict2.cpp                                                                   |     2 +-
 src/share/vm/adlc/filebuff.hpp                                                                |     8 +-
 src/share/vm/adlc/forms.cpp                                                                   |    37 +-
 src/share/vm/adlc/forms.hpp                                                                   |     9 +-
 src/share/vm/adlc/formsopt.cpp                                                                |    13 +-
 src/share/vm/adlc/formssel.cpp                                                                |   265 +-
 src/share/vm/adlc/formssel.hpp                                                                |    16 +-
 src/share/vm/adlc/main.cpp                                                                    |    39 +-
 src/share/vm/adlc/output_c.cpp                                                                |   257 +-
 src/share/vm/adlc/output_h.cpp                                                                |   181 +-
 src/share/vm/asm/assembler.cpp                                                                |    20 +-
 src/share/vm/asm/assembler.hpp                                                                |    10 +-
 src/share/vm/asm/codeBuffer.cpp                                                               |   142 +-
 src/share/vm/asm/codeBuffer.hpp                                                               |    29 +-
 src/share/vm/asm/register.hpp                                                                 |    47 +-
 src/share/vm/c1/c1_CFGPrinter.cpp                                                             |     4 +-
 src/share/vm/c1/c1_Canonicalizer.cpp                                                          |    31 +-
 src/share/vm/c1/c1_Canonicalizer.hpp                                                          |     2 +
 src/share/vm/c1/c1_CodeStubs.hpp                                                              |    65 -
 src/share/vm/c1/c1_Compilation.cpp                                                            |    38 +-
 src/share/vm/c1/c1_Compilation.hpp                                                            |     3 +
 src/share/vm/c1/c1_Compiler.cpp                                                               |     2 +-
 src/share/vm/c1/c1_FrameMap.cpp                                                               |    22 -
 src/share/vm/c1/c1_FrameMap.hpp                                                               |     6 +-
 src/share/vm/c1/c1_GraphBuilder.cpp                                                           |   716 +-
 src/share/vm/c1/c1_GraphBuilder.hpp                                                           |    18 +-
 src/share/vm/c1/c1_Instruction.cpp                                                            |     9 +-
 src/share/vm/c1/c1_Instruction.hpp                                                            |    77 +-
 src/share/vm/c1/c1_InstructionPrinter.cpp                                                     |    22 +-
 src/share/vm/c1/c1_InstructionPrinter.hpp                                                     |     2 +
 src/share/vm/c1/c1_LIR.cpp                                                                    |    71 +-
 src/share/vm/c1/c1_LIR.hpp                                                                    |    90 +-
 src/share/vm/c1/c1_LIRAssembler.cpp                                                           |    15 +-
 src/share/vm/c1/c1_LIRAssembler.hpp                                                           |     2 +
 src/share/vm/c1/c1_LIRGenerator.cpp                                                           |   308 +-
 src/share/vm/c1/c1_LIRGenerator.hpp                                                           |    12 +-
 src/share/vm/c1/c1_LinearScan.cpp                                                             |    16 +-
 src/share/vm/c1/c1_Optimizer.cpp                                                              |    34 +
 src/share/vm/c1/c1_Runtime1.cpp                                                               |    17 +
 src/share/vm/c1/c1_Runtime1.hpp                                                               |     1 +
 src/share/vm/c1/c1_ValueMap.cpp                                                               |    10 +-
 src/share/vm/c1/c1_ValueMap.hpp                                                               |    20 +-
 src/share/vm/c1/c1_ValueStack.cpp                                                             |     1 +
 src/share/vm/c1/c1_ValueStack.hpp                                                             |     4 +
 src/share/vm/c1/c1_ValueType.cpp                                                              |    17 +
 src/share/vm/c1/c1_ValueType.hpp                                                              |    10 +-
 src/share/vm/c1/c1_globals.hpp                                                                |    11 +-
 src/share/vm/ci/bcEscapeAnalyzer.cpp                                                          |    57 +-
 src/share/vm/ci/bcEscapeAnalyzer.hpp                                                          |     1 +
 src/share/vm/ci/ciClassList.hpp                                                               |     4 +
 src/share/vm/ci/ciEnv.cpp                                                                     |   163 +-
 src/share/vm/ci/ciEnv.hpp                                                                     |     6 +-
 src/share/vm/ci/ciField.cpp                                                                   |     4 +-
 src/share/vm/ci/ciInstanceKlass.cpp                                                           |    45 +-
 src/share/vm/ci/ciInstanceKlass.hpp                                                           |    26 +-
 src/share/vm/ci/ciMemberName.cpp                                                              |    39 +
 src/share/vm/ci/ciMemberName.hpp                                                              |    44 +
 src/share/vm/ci/ciMethod.cpp                                                                  |   142 +-
 src/share/vm/ci/ciMethod.hpp                                                                  |    35 +-
 src/share/vm/ci/ciMethodHandle.cpp                                                            |    82 +-
 src/share/vm/ci/ciMethodHandle.hpp                                                            |    47 +-
 src/share/vm/ci/ciMethodType.hpp                                                              |    76 +
 src/share/vm/ci/ciObject.hpp                                                                  |    75 +-
 src/share/vm/ci/ciObjectFactory.cpp                                                           |     8 +-
 src/share/vm/ci/ciSignature.cpp                                                               |    19 +
 src/share/vm/ci/ciSignature.hpp                                                               |    12 +-
 src/share/vm/ci/ciStreams.cpp                                                                 |    88 +-
 src/share/vm/ci/ciStreams.hpp                                                                 |    15 +-
 src/share/vm/ci/ciSymbol.cpp                                                                  |     4 +
 src/share/vm/ci/ciSymbol.hpp                                                                  |     2 +
 src/share/vm/ci/ciType.cpp                                                                    |    16 +-
 src/share/vm/ci/ciType.hpp                                                                    |     1 +
 src/share/vm/ci/ciTypeFlow.cpp                                                                |    22 +-
 src/share/vm/classfile/classFileParser.cpp                                                    |   560 +-
 src/share/vm/classfile/classFileParser.hpp                                                    |   122 +-
 src/share/vm/classfile/classLoader.cpp                                                        |    40 +-
 src/share/vm/classfile/classLoader.hpp                                                        |     8 +-
 src/share/vm/classfile/dictionary.cpp                                                         |    20 +-
 src/share/vm/classfile/dictionary.hpp                                                         |    38 +-
 src/share/vm/classfile/javaAssertions.cpp                                                     |     2 +-
 src/share/vm/classfile/javaAssertions.hpp                                                     |     2 +-
 src/share/vm/classfile/javaClasses.cpp                                                        |   316 +-
 src/share/vm/classfile/javaClasses.hpp                                                        |   230 +-
 src/share/vm/classfile/loaderConstraints.cpp                                                  |    16 +-
 src/share/vm/classfile/loaderConstraints.hpp                                                  |    14 +-
 src/share/vm/classfile/placeholders.cpp                                                       |     6 +-
 src/share/vm/classfile/placeholders.hpp                                                       |    16 +-
 src/share/vm/classfile/resolutionErrors.cpp                                                   |     6 +-
 src/share/vm/classfile/resolutionErrors.hpp                                                   |    15 +-
 src/share/vm/classfile/stackMapFrame.cpp                                                      |   165 +-
 src/share/vm/classfile/stackMapFrame.hpp                                                      |   100 +-
 src/share/vm/classfile/stackMapTable.cpp                                                      |    58 +-
 src/share/vm/classfile/stackMapTable.hpp                                                      |    10 +-
 src/share/vm/classfile/stackMapTableFormat.hpp                                                |   140 +-
 src/share/vm/classfile/symbolTable.cpp                                                        |   165 +-
 src/share/vm/classfile/symbolTable.hpp                                                        |    94 +-
 src/share/vm/classfile/systemDictionary.cpp                                                   |   575 +-
 src/share/vm/classfile/systemDictionary.hpp                                                   |   253 +-
 src/share/vm/classfile/verificationType.cpp                                                   |    46 +-
 src/share/vm/classfile/verificationType.hpp                                                   |     6 +-
 src/share/vm/classfile/verifier.cpp                                                           |   808 +-
 src/share/vm/classfile/verifier.hpp                                                           |   202 +-
 src/share/vm/classfile/vmSymbols.cpp                                                          |    19 +-
 src/share/vm/classfile/vmSymbols.hpp                                                          |   125 +-
 src/share/vm/code/codeBlob.cpp                                                                |    47 +-
 src/share/vm/code/codeBlob.hpp                                                                |    56 +-
 src/share/vm/code/codeCache.cpp                                                               |    29 +-
 src/share/vm/code/codeCache.hpp                                                               |    10 +
 src/share/vm/code/debugInfoRec.cpp                                                            |     1 +
 src/share/vm/code/dependencies.cpp                                                            |    49 +-
 src/share/vm/code/icBuffer.hpp                                                                |     4 +-
 src/share/vm/code/nmethod.cpp                                                                 |    19 +-
 src/share/vm/code/nmethod.hpp                                                                 |    12 +-
 src/share/vm/code/stubs.cpp                                                                   |    13 +-
 src/share/vm/code/stubs.hpp                                                                   |    20 +-
 src/share/vm/code/vmreg.cpp                                                                   |     4 +-
 src/share/vm/code/vmreg.hpp                                                                   |     4 +
 src/share/vm/code/vtableStubs.hpp                                                             |     3 +
 src/share/vm/compiler/abstractCompiler.hpp                                                    |     2 +-
 src/share/vm/compiler/compileBroker.cpp                                                       |   115 +-
 src/share/vm/compiler/compileBroker.hpp                                                       |    29 +-
 src/share/vm/compiler/compileLog.cpp                                                          |    53 +-
 src/share/vm/compiler/compileLog.hpp                                                          |    12 +
 src/share/vm/compiler/compilerOracle.cpp                                                      |     6 +-
 src/share/vm/compiler/disassembler.cpp                                                        |    12 +-
 src/share/vm/compiler/disassembler.hpp                                                        |     3 +-
 src/share/vm/compiler/methodLiveness.cpp                                                      |    12 +-
 src/share/vm/compiler/oopMap.cpp                                                              |    12 +-
 src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp                   |  1257 --
 src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp                   |   296 -
 src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.cpp                             |     2 +-
 src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp                             |     4 +-
 src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp               |   382 +-
 src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp               |    32 +-
 src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp          |   313 +-
 src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp          |    58 +-
 src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp              |     4 +-
 src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp                    |    60 -
 src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp                    |   103 -
 src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp                              |     3 +-
 src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp                              |    24 +-
 src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp                               |   360 -
 src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp                               |   335 -
 src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp                          |     2 +-
 src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.hpp                          |    18 +-
 src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp                        |    26 +-
 src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp                          |    22 +-
 src/share/vm/gc_implementation/g1/collectionSetChooser.cpp                                    |   293 +-
 src/share/vm/gc_implementation/g1/collectionSetChooser.hpp                                    |   190 +-
 src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp                                      |   442 +-
 src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp                                      |   173 +-
 src/share/vm/gc_implementation/g1/concurrentMark.cpp                                          |  2134 +---
 src/share/vm/gc_implementation/g1/concurrentMark.hpp                                          |   320 +-
 src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp                                   |    72 +-
 src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp                                    |    45 +-
 src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp                                          |     2 +-
 src/share/vm/gc_implementation/g1/evacuationInfo.hpp                                          |    81 +
 src/share/vm/gc_implementation/g1/g1AllocRegion.cpp                                           |     6 +-
 src/share/vm/gc_implementation/g1/g1AllocRegion.hpp                                           |     6 +-
 src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp                                      |    40 +-
 src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp                                      |    67 +-
 src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp                               |     9 +-
 src/share/vm/gc_implementation/g1/g1CardCounts.cpp                                            |   212 +
 src/share/vm/gc_implementation/g1/g1CardCounts.hpp                                            |   134 +
 src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp                                         |  1848 ++-
 src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp                                         |   530 +-
 src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp                                  |    77 +-
 src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp                                       |  1439 +--
 src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp                                       |   528 +-
 src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp                                           |     5 +-
 src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp                                          |   299 +
 src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp                                          |   314 +
 src/share/vm/gc_implementation/g1/g1HotCardCache.cpp                                          |   148 +
 src/share/vm/gc_implementation/g1/g1HotCardCache.hpp                                          |   128 +
 src/share/vm/gc_implementation/g1/g1Log.cpp                                                   |    56 +
 src/share/vm/gc_implementation/g1/g1Log.hpp                                                   |    56 +
 src/share/vm/gc_implementation/g1/g1MMUTracker.hpp                                            |     2 +-
 src/share/vm/gc_implementation/g1/g1MarkSweep.cpp                                             |    50 +-
 src/share/vm/gc_implementation/g1/g1MarkSweep.hpp                                             |     3 +
 src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp                                     |    43 +-
 src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp                                     |     7 +-
 src/share/vm/gc_implementation/g1/g1OopClosures.hpp                                           |    22 +-
 src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp                                    |    31 +-
 src/share/vm/gc_implementation/g1/g1RemSet.cpp                                                |   384 +-
 src/share/vm/gc_implementation/g1/g1RemSet.hpp                                                |    24 +-
 src/share/vm/gc_implementation/g1/g1YCTypes.hpp                                               |    51 +
 src/share/vm/gc_implementation/g1/g1_globals.hpp                                              |    91 +-
 src/share/vm/gc_implementation/g1/heapRegion.cpp                                              |    82 +-
 src/share/vm/gc_implementation/g1/heapRegion.hpp                                              |    87 +-
 src/share/vm/gc_implementation/g1/heapRegion.inline.hpp                                       |     1 -
 src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp                                        |   833 +-
 src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp                                        |    90 +-
 src/share/vm/gc_implementation/g1/heapRegionSeq.cpp                                           |    89 +-
 src/share/vm/gc_implementation/g1/heapRegionSeq.hpp                                           |    38 +-
 src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp                                    |    10 +-
 src/share/vm/gc_implementation/g1/heapRegionSet.cpp                                           |    63 +-
 src/share/vm/gc_implementation/g1/heapRegionSet.hpp                                           |    22 +-
 src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp                                    |    19 +-
 src/share/vm/gc_implementation/g1/ptrQueue.cpp                                                |     4 +-
 src/share/vm/gc_implementation/g1/satbQueue.cpp                                               |     2 +-
 src/share/vm/gc_implementation/g1/sparsePRT.cpp                                               |    15 +-
 src/share/vm/gc_implementation/g1/sparsePRT.hpp                                               |     4 +-
 src/share/vm/gc_implementation/g1/survRateGroup.cpp                                           |    14 +-
 src/share/vm/gc_implementation/g1/survRateGroup.hpp                                           |     2 +-
 src/share/vm/gc_implementation/g1/vmStructs_g1.hpp                                            |     6 +-
 src/share/vm/gc_implementation/g1/vm_operations_g1.cpp                                        |    29 +-
 src/share/vm/gc_implementation/g1/vm_operations_g1.hpp                                        |     2 +-
 src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp                                |     6 +-
 src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp                                    |   344 -
 src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp                                    |   249 -
 src/share/vm/gc_implementation/parNew/parNewGeneration.cpp                                    |   142 +-
 src/share/vm/gc_implementation/parNew/parNewGeneration.hpp                                    |    35 +-
 src/share/vm/gc_implementation/parNew/parOopClosures.hpp                                      |     2 +-
 src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp                      |     2 +-
 src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp                        |    12 +-
 src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp                             |    22 +-
 src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp                             |     6 +-
 src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp                              |     4 +-
 src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp                              |     2 +-
 src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp                          |     6 +
 src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp                          |     2 +-
 src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp                             |    12 +-
 src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp                             |     6 +-
 src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp                      |    57 +-
 src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp                      |    14 +-
 src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp                                   |    30 +-
 src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp                       |     6 +-
 src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp                       |    18 +-
 src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp                      |     2 +-
 src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp                               |    50 +-
 src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp                      |     2 +-
 src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp                                  |     8 +-
 src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp                                  |     6 +-
 src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp                         |   324 +-
 src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp                         |   168 +-
 src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp                                 |     2 +-
 src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp                            |     2 +-
 src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp                        |    18 +-
 src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp                        |    12 +-
 src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp                 |     3 +-
 src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp                                |    84 +-
 src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp                                |    11 +-
 src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp                            |    12 +-
 src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp                            |     2 +-
 src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp                                |    10 +-
 src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp                                |     6 +-
 src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp                                  |     2 +-
 src/share/vm/gc_implementation/shared/allocationStats.hpp                                     |    90 +-
 src/share/vm/gc_implementation/shared/cSpaceCounters.cpp                                      |     2 +-
 src/share/vm/gc_implementation/shared/cSpaceCounters.hpp                                      |     4 +-
 src/share/vm/gc_implementation/shared/collectorCounters.cpp                                   |     2 +-
 src/share/vm/gc_implementation/shared/collectorCounters.hpp                                   |     4 +-
 src/share/vm/gc_implementation/shared/copyFailedInfo.hpp                                      |    90 +
 src/share/vm/gc_implementation/shared/gSpaceCounters.cpp                                      |     2 +-
 src/share/vm/gc_implementation/shared/gSpaceCounters.hpp                                      |     4 +-
 src/share/vm/gc_implementation/shared/gcHeapSummary.hpp                                       |   126 +
 src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp                                    |     2 +-
 src/share/vm/gc_implementation/shared/gcStats.hpp                                             |     2 +-
 src/share/vm/gc_implementation/shared/gcTimer.cpp                                             |   374 +
 src/share/vm/gc_implementation/shared/gcTimer.hpp                                             |   195 +
 src/share/vm/gc_implementation/shared/gcTrace.cpp                                             |   243 +
 src/share/vm/gc_implementation/shared/gcTrace.hpp                                             |   233 +
 src/share/vm/gc_implementation/shared/gcTraceSend.cpp                                         |   281 +
 src/share/vm/gc_implementation/shared/gcTraceTime.cpp                                         |    88 +
 src/share/vm/gc_implementation/shared/gcTraceTime.hpp                                         |    44 +
 src/share/vm/gc_implementation/shared/gcUtil.hpp                                              |     6 +-
 src/share/vm/gc_implementation/shared/gcWhen.hpp                                              |    48 +
 src/share/vm/gc_implementation/shared/generationCounters.cpp                                  |     2 +-
 src/share/vm/gc_implementation/shared/generationCounters.hpp                                  |     4 +-
 src/share/vm/gc_implementation/shared/hSpaceCounters.cpp                                      |     2 +-
 src/share/vm/gc_implementation/shared/hSpaceCounters.hpp                                      |     4 +-
 src/share/vm/gc_implementation/shared/immutableSpace.cpp                                      |     4 +-
 src/share/vm/gc_implementation/shared/immutableSpace.hpp                                      |     6 +-
 src/share/vm/gc_implementation/shared/markSweep.cpp                                           |    23 +-
 src/share/vm/gc_implementation/shared/markSweep.hpp                                           |    20 +-
 src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp                                    |    10 +-
 src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp                                    |     6 +-
 src/share/vm/gc_implementation/shared/mutableSpace.cpp                                        |     4 +-
 src/share/vm/gc_implementation/shared/mutableSpace.hpp                                        |     4 +-
 src/share/vm/gc_implementation/shared/objectCountEventSender.cpp                              |    51 +
 src/share/vm/gc_implementation/shared/objectCountEventSender.hpp                              |    39 +
 src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp                                    |   349 +
 src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp                                    |   264 +
 src/share/vm/gc_implementation/shared/spaceCounters.cpp                                       |     2 +-
 src/share/vm/gc_implementation/shared/spaceCounters.hpp                                       |     4 +-
 src/share/vm/gc_implementation/shared/spaceDecorator.hpp                                      |     2 +-
 src/share/vm/gc_implementation/shared/vmGCOperations.cpp                                      |    39 +-
 src/share/vm/gc_implementation/shared/vmGCOperations.hpp                                      |     2 +
 src/share/vm/gc_interface/allocTracer.cpp                                                     |    48 +
 src/share/vm/gc_interface/allocTracer.hpp                                                     |    37 +
 src/share/vm/gc_interface/collectedHeap.cpp                                                   |   106 +-
 src/share/vm/gc_interface/collectedHeap.hpp                                                   |    93 +-
 src/share/vm/gc_interface/collectedHeap.inline.hpp                                            |    59 +-
 src/share/vm/gc_interface/gcCause.cpp                                                         |     3 +
 src/share/vm/gc_interface/gcCause.hpp                                                         |    33 +
 src/share/vm/gc_interface/gcName.hpp                                                          |    61 +
 src/share/vm/interpreter/abstractInterpreter.hpp                                              |    30 +-
 src/share/vm/interpreter/bytecode.cpp                                                         |    40 +-
 src/share/vm/interpreter/bytecode.hpp                                                         |    28 +-
 src/share/vm/interpreter/bytecodeInterpreter.cpp                                              |   102 +-
 src/share/vm/interpreter/bytecodeInterpreter.hpp                                              |     7 +-
 src/share/vm/interpreter/bytecodes.cpp                                                        |     2 +
 src/share/vm/interpreter/bytecodes.hpp                                                        |    11 +-
 src/share/vm/interpreter/cppInterpreter.cpp                                                   |     8 +-
 src/share/vm/interpreter/interpreter.cpp                                                      |    50 +-
 src/share/vm/interpreter/interpreter.hpp                                                      |     6 +-
 src/share/vm/interpreter/interpreterRuntime.cpp                                               |   150 +-
 src/share/vm/interpreter/interpreterRuntime.hpp                                               |     3 +
 src/share/vm/interpreter/linkResolver.cpp                                                     |   318 +-
 src/share/vm/interpreter/linkResolver.hpp                                                     |    28 +-
 src/share/vm/interpreter/oopMapCache.cpp                                                      |    12 +-
 src/share/vm/interpreter/oopMapCache.hpp                                                      |     2 +-
 src/share/vm/interpreter/rewriter.cpp                                                         |    83 +-
 src/share/vm/interpreter/rewriter.hpp                                                         |     3 +-
 src/share/vm/interpreter/templateInterpreter.cpp                                              |     7 +-
 src/share/vm/interpreter/templateTable.cpp                                                    |     4 +-
 src/share/vm/interpreter/templateTable.hpp                                                    |     3 +-
 src/share/vm/libadt/set.cpp                                                                   |     6 +-
 src/share/vm/libadt/vectset.cpp                                                               |     2 +-
 src/share/vm/memory/allocation.cpp                                                            |   119 +-
 src/share/vm/memory/allocation.hpp                                                            |   165 +-
 src/share/vm/memory/allocation.inline.hpp                                                     |    92 +-
 src/share/vm/memory/barrierSet.hpp                                                            |     2 +-
 src/share/vm/memory/binaryTreeDictionary.cpp                                                  |  1346 +++
 src/share/vm/memory/binaryTreeDictionary.hpp                                                  |   334 +
 src/share/vm/memory/blockOffsetTable.cpp                                                      |     4 +
 src/share/vm/memory/blockOffsetTable.hpp                                                      |     4 +-
 src/share/vm/memory/cardTableModRefBS.cpp                                                     |    32 +-
 src/share/vm/memory/cardTableModRefBS.hpp                                                     |     5 +-
 src/share/vm/memory/cardTableRS.cpp                                                           |    19 +-
 src/share/vm/memory/cardTableRS.hpp                                                           |     8 +-
 src/share/vm/memory/collectorPolicy.cpp                                                       |    28 +-
 src/share/vm/memory/collectorPolicy.hpp                                                       |     2 +-
 src/share/vm/memory/compactingPermGenGen.cpp                                                  |     8 +-
 src/share/vm/memory/compactingPermGenGen.hpp                                                  |     6 +-
 src/share/vm/memory/defNewGeneration.cpp                                                      |    52 +-
 src/share/vm/memory/defNewGeneration.hpp                                                      |    20 +-
 src/share/vm/memory/dump.cpp                                                                  |    30 +-
 src/share/vm/memory/filemap.cpp                                                               |     9 +-
 src/share/vm/memory/filemap.hpp                                                               |     2 +-
 src/share/vm/memory/freeBlockDictionary.cpp                                                   |    68 +
 src/share/vm/memory/freeBlockDictionary.hpp                                                   |   102 +
 src/share/vm/memory/freeList.cpp                                                              |   370 +
 src/share/vm/memory/freeList.hpp                                                              |   329 +
 src/share/vm/memory/genCollectedHeap.cpp                                                      |    72 +-
 src/share/vm/memory/genCollectedHeap.hpp                                                      |     6 +-
 src/share/vm/memory/genMarkSweep.cpp                                                          |    50 +-
 src/share/vm/memory/genOopClosures.hpp                                                        |     8 +-
 src/share/vm/memory/genRemSet.hpp                                                             |     2 +-
 src/share/vm/memory/generation.cpp                                                            |    24 +-
 src/share/vm/memory/generation.hpp                                                            |     8 +-
 src/share/vm/memory/generationSpec.cpp                                                        |     6 +-
 src/share/vm/memory/generationSpec.hpp                                                        |     4 +-
 src/share/vm/memory/heap.cpp                                                                  |     5 +-
 src/share/vm/memory/heap.hpp                                                                  |     2 +-
 src/share/vm/memory/heapInspection.cpp                                                        |   141 +-
 src/share/vm/memory/heapInspection.hpp                                                        |    45 +-
 src/share/vm/memory/memRegion.hpp                                                             |     4 +-
 src/share/vm/memory/oopFactory.cpp                                                            |    17 +-
 src/share/vm/memory/oopFactory.hpp                                                            |     9 +-
 src/share/vm/memory/permGen.hpp                                                               |     2 +-
 src/share/vm/memory/referencePolicy.hpp                                                       |     2 +-
 src/share/vm/memory/referenceProcessor.cpp                                                    |    87 +-
 src/share/vm/memory/referenceProcessor.hpp                                                    |    38 +-
 src/share/vm/memory/referenceProcessorStats.hpp                                               |    73 +
 src/share/vm/memory/referenceType.hpp                                                         |    41 +
 src/share/vm/memory/resourceArea.hpp                                                          |    41 +-
 src/share/vm/memory/restore.cpp                                                               |     8 +-
 src/share/vm/memory/sharedHeap.cpp                                                            |    25 +-
 src/share/vm/memory/sharedHeap.hpp                                                            |     6 +
 src/share/vm/memory/space.cpp                                                                 |    47 +-
 src/share/vm/memory/space.hpp                                                                 |    21 +-
 src/share/vm/memory/space.inline.hpp                                                          |    13 -
 src/share/vm/memory/tenuredGeneration.cpp                                                     |     6 +-
 src/share/vm/memory/threadLocalAllocBuffer.cpp                                                |     2 +-
 src/share/vm/memory/threadLocalAllocBuffer.hpp                                                |     4 +-
 src/share/vm/memory/universe.cpp                                                              |    52 +-
 src/share/vm/memory/universe.hpp                                                              |    19 +-
 src/share/vm/oops/constMethodKlass.cpp                                                        |    59 +-
 src/share/vm/oops/constMethodKlass.hpp                                                        |     3 +-
 src/share/vm/oops/constMethodOop.cpp                                                          |    52 +-
 src/share/vm/oops/constMethodOop.hpp                                                          |    70 +-
 src/share/vm/oops/constantPoolOop.cpp                                                         |   101 +-
 src/share/vm/oops/constantPoolOop.hpp                                                         |    35 +-
 src/share/vm/oops/cpCacheOop.cpp                                                              |   360 +-
 src/share/vm/oops/cpCacheOop.hpp                                                              |   279 +-
 src/share/vm/oops/fieldInfo.hpp                                                               |    18 +-
 src/share/vm/oops/fieldStreams.hpp                                                            |    74 +-
 src/share/vm/oops/generateOopMap.cpp                                                          |    36 +-
 src/share/vm/oops/instanceKlass.cpp                                                           |   191 +-
 src/share/vm/oops/instanceKlass.hpp                                                           |   326 +-
 src/share/vm/oops/instanceKlassKlass.cpp                                                      |   103 +-
 src/share/vm/oops/instanceKlassKlass.hpp                                                      |     5 +-
 src/share/vm/oops/instanceRefKlass.cpp                                                        |    39 +-
 src/share/vm/oops/klass.cpp                                                                   |    18 +-
 src/share/vm/oops/klass.hpp                                                                   |     8 +-
 src/share/vm/oops/methodDataOop.hpp                                                           |     2 +-
 src/share/vm/oops/methodKlass.cpp                                                             |    29 +-
 src/share/vm/oops/methodOop.cpp                                                               |   347 +-
 src/share/vm/oops/methodOop.hpp                                                               |   166 +-
 src/share/vm/oops/objArrayKlass.cpp                                                           |     9 +-
 src/share/vm/oops/objArrayKlass.hpp                                                           |     4 +-
 src/share/vm/oops/objArrayKlass.inline.hpp                                                    |     4 +-
 src/share/vm/oops/objArrayKlassKlass.cpp                                                      |     4 +-
 src/share/vm/oops/oop.cpp                                                                     |    12 +-
 src/share/vm/oops/oop.hpp                                                                     |    10 +-
 src/share/vm/oops/oop.inline.hpp                                                              |    22 +-
 src/share/vm/oops/symbol.cpp                                                                  |    44 +-
 src/share/vm/oops/symbol.hpp                                                                  |    50 +-
 src/share/vm/oops/typeArrayKlass.cpp                                                          |     4 +-
 src/share/vm/opto/addnode.cpp                                                                 |    72 +-
 src/share/vm/opto/block.cpp                                                                   |     6 +-
 src/share/vm/opto/block.hpp                                                                   |     2 +-
 src/share/vm/opto/bytecodeInfo.cpp                                                            |   366 +-
 src/share/vm/opto/c2_globals.hpp                                                              |   167 +-
 src/share/vm/opto/callGenerator.cpp                                                           |   578 +-
 src/share/vm/opto/callGenerator.hpp                                                           |    37 +-
 src/share/vm/opto/callnode.cpp                                                                |   143 +-
 src/share/vm/opto/callnode.hpp                                                                |    70 +-
 src/share/vm/opto/cfgnode.cpp                                                                 |   121 +-
 src/share/vm/opto/cfgnode.hpp                                                                 |     3 +-
 src/share/vm/opto/chaitin.cpp                                                                 |   234 +-
 src/share/vm/opto/chaitin.hpp                                                                 |    19 +-
 src/share/vm/opto/classes.hpp                                                                 |    84 +-
 src/share/vm/opto/compile.cpp                                                                 |   696 +-
 src/share/vm/opto/compile.hpp                                                                 |   242 +-
 src/share/vm/opto/connode.cpp                                                                 |    68 +-
 src/share/vm/opto/connode.hpp                                                                 |    12 +-
 src/share/vm/opto/divnode.cpp                                                                 |   168 +-
 src/share/vm/opto/doCall.cpp                                                                  |   332 +-
 src/share/vm/opto/domgraph.cpp                                                                |     8 +-
 src/share/vm/opto/escape.cpp                                                                  |  4256 +++++----
 src/share/vm/opto/escape.hpp                                                                  |   550 +-
 src/share/vm/opto/gcm.cpp                                                                     |     2 +-
 src/share/vm/opto/generateOptoStub.cpp                                                        |    80 +-
 src/share/vm/opto/graphKit.cpp                                                                |   415 +-
 src/share/vm/opto/graphKit.hpp                                                                |   115 +-
 src/share/vm/opto/idealGraphPrinter.cpp                                                       |    12 +-
 src/share/vm/opto/idealKit.cpp                                                                |    50 +-
 src/share/vm/opto/idealKit.hpp                                                                |    45 +-
 src/share/vm/opto/ifg.cpp                                                                     |    33 +-
 src/share/vm/opto/ifnode.cpp                                                                  |    68 +-
 src/share/vm/opto/lcm.cpp                                                                     |    24 +-
 src/share/vm/opto/library_call.cpp                                                            |  2901 +++---
 src/share/vm/opto/locknode.cpp                                                                |     2 +-
 src/share/vm/opto/loopPredicate.cpp                                                           |    36 +-
 src/share/vm/opto/loopTransform.cpp                                                           |   190 +-
 src/share/vm/opto/loopUnswitch.cpp                                                            |    37 +-
 src/share/vm/opto/loopnode.cpp                                                                |   485 +-
 src/share/vm/opto/loopnode.hpp                                                                |    30 +-
 src/share/vm/opto/loopopts.cpp                                                                |   167 +-
 src/share/vm/opto/machnode.cpp                                                                |    10 +-
 src/share/vm/opto/machnode.hpp                                                                |     7 +-
 src/share/vm/opto/macro.cpp                                                                   |   270 +-
 src/share/vm/opto/macro.hpp                                                                   |     2 +-
 src/share/vm/opto/matcher.cpp                                                                 |   215 +-
 src/share/vm/opto/matcher.hpp                                                                 |    18 +-
 src/share/vm/opto/memnode.cpp                                                                 |   315 +-
 src/share/vm/opto/memnode.hpp                                                                 |   121 +-
 src/share/vm/opto/mulnode.cpp                                                                 |   155 +-
 src/share/vm/opto/mulnode.hpp                                                                 |     6 +-
 src/share/vm/opto/node.cpp                                                                    |   182 +-
 src/share/vm/opto/node.hpp                                                                    |    61 +-
 src/share/vm/opto/opcodes.cpp                                                                 |     6 +-
 src/share/vm/opto/opcodes.hpp                                                                 |     6 +-
 src/share/vm/opto/optoreg.hpp                                                                 |     2 +-
 src/share/vm/opto/output.cpp                                                                  |    52 +-
 src/share/vm/opto/parse.hpp                                                                   |    38 +-
 src/share/vm/opto/parse1.cpp                                                                  |    90 +-
 src/share/vm/opto/parse2.cpp                                                                  |   314 +-
 src/share/vm/opto/parse3.cpp                                                                  |    42 +-
 src/share/vm/opto/parseHelper.cpp                                                             |    36 +-
 src/share/vm/opto/phase.cpp                                                                   |    13 +-
 src/share/vm/opto/phase.hpp                                                                   |     9 +-
 src/share/vm/opto/phaseX.cpp                                                                  |   149 +-
 src/share/vm/opto/phaseX.hpp                                                                  |    36 +-
 src/share/vm/opto/phasetype.hpp                                                               |    96 +
 src/share/vm/opto/postaloc.cpp                                                                |    89 +-
 src/share/vm/opto/reg_split.cpp                                                               |    81 +-
 src/share/vm/opto/regalloc.cpp                                                                |     1 +
 src/share/vm/opto/regmask.cpp                                                                 |   226 +-
 src/share/vm/opto/regmask.hpp                                                                 |    63 +-
 src/share/vm/opto/runtime.cpp                                                                 |   113 +-
 src/share/vm/opto/runtime.hpp                                                                 |    10 +-
 src/share/vm/opto/split_if.cpp                                                                |    14 +-
 src/share/vm/opto/stringopts.cpp                                                              |   221 +-
 src/share/vm/opto/subnode.cpp                                                                 |   195 +-
 src/share/vm/opto/subnode.hpp                                                                 |    41 +-
 src/share/vm/opto/superword.cpp                                                               |   834 +-
 src/share/vm/opto/superword.hpp                                                               |    25 +-
 src/share/vm/opto/type.cpp                                                                    |   153 +-
 src/share/vm/opto/type.hpp                                                                    |   135 +-
 src/share/vm/opto/vectornode.cpp                                                              |   625 +-
 src/share/vm/opto/vectornode.hpp                                                              |  1085 +-
 src/share/vm/precompiled/precompiled.hpp                                                      |     7 +-
 src/share/vm/prims/forte.cpp                                                                  |     9 +-
 src/share/vm/prims/forte.hpp                                                                  |     5 +-
 src/share/vm/prims/jni.cpp                                                                    |    69 +-
 src/share/vm/prims/jniCheck.cpp                                                               |     6 +-
 src/share/vm/prims/jniCheck.hpp                                                               |     4 +-
 src/share/vm/prims/jvm.cpp                                                                    |    81 +-
 src/share/vm/prims/jvm.h                                                                      |     5 +-
 src/share/vm/prims/jvmtiClassFileReconstituter.cpp                                            |    59 +-
 src/share/vm/prims/jvmtiClassFileReconstituter.hpp                                            |     4 +-
 src/share/vm/prims/jvmtiCodeBlobEvents.cpp                                                    |     4 +-
 src/share/vm/prims/jvmtiCodeBlobEvents.hpp                                                    |     4 +-
 src/share/vm/prims/jvmtiEnter.xsl                                                             |     8 +-
 src/share/vm/prims/jvmtiEnv.cpp                                                               |    24 +-
 src/share/vm/prims/jvmtiEnvBase.cpp                                                           |    16 +-
 src/share/vm/prims/jvmtiEnvBase.hpp                                                           |     6 +-
 src/share/vm/prims/jvmtiEnvThreadState.cpp                                                    |     2 +-
 src/share/vm/prims/jvmtiEnvThreadState.hpp                                                    |     4 +-
 src/share/vm/prims/jvmtiExport.cpp                                                            |    32 +-
 src/share/vm/prims/jvmtiExport.hpp                                                            |   126 +-
 src/share/vm/prims/jvmtiExtensions.cpp                                                        |     4 +-
 src/share/vm/prims/jvmtiExtensions.hpp                                                        |     4 +-
 src/share/vm/prims/jvmtiGen.java                                                              |     2 +-
 src/share/vm/prims/jvmtiGetLoadedClasses.cpp                                                  |     2 +-
 src/share/vm/prims/jvmtiImpl.cpp                                                              |    42 +-
 src/share/vm/prims/jvmtiImpl.hpp                                                              |   110 +-
 src/share/vm/prims/jvmtiRawMonitor.cpp                                                        |     4 +-
 src/share/vm/prims/jvmtiRawMonitor.hpp                                                        |     4 +-
 src/share/vm/prims/jvmtiRedefineClasses.cpp                                                   |    93 +-
 src/share/vm/prims/jvmtiTagMap.cpp                                                            |    40 +-
 src/share/vm/prims/jvmtiTagMap.hpp                                                            |     8 +-
 src/share/vm/prims/jvmtiThreadState.hpp                                                       |     2 +-
 src/share/vm/prims/jvmtiUtil.cpp                                                              |     2 +-
 src/share/vm/prims/methodHandleWalk.cpp                                                       |  2089 ----
 src/share/vm/prims/methodHandleWalk.hpp                                                       |   486 -
 src/share/vm/prims/methodHandles.cpp                                                          |  3325 +------
 src/share/vm/prims/methodHandles.hpp                                                          |   833 +-
 src/share/vm/prims/nativeLookup.cpp                                                           |     4 +-
 src/share/vm/prims/unsafe.cpp                                                                 |   103 +-
 src/share/vm/prims/wbtestmethods/parserTests.cpp                                              |   148 +
 src/share/vm/prims/wbtestmethods/parserTests.hpp                                              |    32 +
 src/share/vm/prims/whitebox.cpp                                                               |   226 +
 src/share/vm/prims/whitebox.hpp                                                               |    53 +
 src/share/vm/runtime/advancedThresholdPolicy.cpp                                              |     6 +-
 src/share/vm/runtime/arguments.cpp                                                            |   274 +-
 src/share/vm/runtime/arguments.hpp                                                            |    25 +-
 src/share/vm/runtime/atomic.hpp                                                               |    12 +-
 src/share/vm/runtime/biasedLocking.cpp                                                        |     4 +-
 src/share/vm/runtime/compilationPolicy.cpp                                                    |    32 +-
 src/share/vm/runtime/compilationPolicy.hpp                                                    |     2 +-
 src/share/vm/runtime/deoptimization.cpp                                                       |    33 +-
 src/share/vm/runtime/deoptimization.hpp                                                       |     2 +-
 src/share/vm/runtime/dtraceJSDT.hpp                                                           |     6 +-
 src/share/vm/runtime/fieldDescriptor.cpp                                                      |    19 +
 src/share/vm/runtime/fieldDescriptor.hpp                                                      |     4 +-
 src/share/vm/runtime/fprofiler.cpp                                                            |    20 +-
 src/share/vm/runtime/fprofiler.hpp                                                            |    46 +-
 src/share/vm/runtime/frame.cpp                                                                |    41 +-
 src/share/vm/runtime/frame.hpp                                                                |     9 +-
 src/share/vm/runtime/frame.inline.hpp                                                         |     4 +
 src/share/vm/runtime/globals.cpp                                                              |    56 +-
 src/share/vm/runtime/globals.hpp                                                              |   368 +-
 src/share/vm/runtime/globals_extension.hpp                                                    |    36 +-
 src/share/vm/runtime/handles.cpp                                                              |     9 +-
 src/share/vm/runtime/handles.hpp                                                              |     4 +-
 src/share/vm/runtime/handles.inline.hpp                                                       |     7 +-
 src/share/vm/runtime/init.cpp                                                                 |    13 +-
 src/share/vm/runtime/interfaceSupport.hpp                                                     |     3 +
 src/share/vm/runtime/java.cpp                                                                 |    39 +-
 src/share/vm/runtime/java.hpp                                                                 |    24 +
 src/share/vm/runtime/javaCalls.hpp                                                            |     2 +
 src/share/vm/runtime/jniHandles.hpp                                                           |     2 +-
 src/share/vm/runtime/monitorChunk.cpp                                                         |     2 +-
 src/share/vm/runtime/monitorChunk.hpp                                                         |     2 +-
 src/share/vm/runtime/mutex.cpp                                                                |     6 +-
 src/share/vm/runtime/mutex.hpp                                                                |     2 +-
 src/share/vm/runtime/mutexLocker.cpp                                                          |    25 +-
 src/share/vm/runtime/mutexLocker.hpp                                                          |     8 +-
 src/share/vm/runtime/objectMonitor.cpp                                                        |    66 +-
 src/share/vm/runtime/objectMonitor.hpp                                                        |    13 +-
 src/share/vm/runtime/objectMonitor.inline.hpp                                                 |     6 +-
 src/share/vm/runtime/os.cpp                                                                   |   238 +-
 src/share/vm/runtime/os.hpp                                                                   |   194 +-
 src/share/vm/runtime/osThread.hpp                                                             |    21 +-
 src/share/vm/runtime/park.cpp                                                                 |     2 +-
 src/share/vm/runtime/perfData.cpp                                                             |    16 +-
 src/share/vm/runtime/perfData.hpp                                                             |     9 +-
 src/share/vm/runtime/perfMemory.cpp                                                           |     8 +-
 src/share/vm/runtime/reflection.cpp                                                           |    19 +-
 src/share/vm/runtime/reflectionUtils.cpp                                                      |     2 +-
 src/share/vm/runtime/relocator.cpp                                                            |    35 +-
 src/share/vm/runtime/safepoint.cpp                                                            |     7 +-
 src/share/vm/runtime/safepoint.hpp                                                            |     2 +-
 src/share/vm/runtime/sharedRuntime.cpp                                                        |   404 +-
 src/share/vm/runtime/sharedRuntime.hpp                                                        |    77 +-
 src/share/vm/runtime/signature.hpp                                                            |     2 +
 src/share/vm/runtime/simpleThresholdPolicy.cpp                                                |    33 +-
 src/share/vm/runtime/stubCodeGenerator.cpp                                                    |     2 +-
 src/share/vm/runtime/stubCodeGenerator.hpp                                                    |     2 +-
 src/share/vm/runtime/stubRoutines.cpp                                                         |     5 +-
 src/share/vm/runtime/stubRoutines.hpp                                                         |    17 +-
 src/share/vm/runtime/sweeper.cpp                                                              |    85 +-
 src/share/vm/runtime/sweeper.hpp                                                              |    28 +-
 src/share/vm/runtime/synchronizer.cpp                                                         |    10 +-
 src/share/vm/runtime/task.cpp                                                                 |    85 +-
 src/share/vm/runtime/task.hpp                                                                 |    45 +-
 src/share/vm/runtime/thread.cpp                                                               |   378 +-
 src/share/vm/runtime/thread.hpp                                                               |    66 +-
 src/share/vm/runtime/timer.cpp                                                                |    55 +-
 src/share/vm/runtime/timer.hpp                                                                |    16 +-
 src/share/vm/runtime/unhandledOops.cpp                                                        |     2 +-
 src/share/vm/runtime/vframe.cpp                                                               |     5 +-
 src/share/vm/runtime/vframeArray.cpp                                                          |    55 +-
 src/share/vm/runtime/vframeArray.hpp                                                          |     4 +-
 src/share/vm/runtime/vframe_hp.cpp                                                            |     4 +-
 src/share/vm/runtime/vframe_hp.hpp                                                            |     4 +-
 src/share/vm/runtime/virtualspace.cpp                                                         |    83 +-
 src/share/vm/runtime/virtualspace.hpp                                                         |    15 +
 src/share/vm/runtime/vmStructs.cpp                                                            |   198 +-
 src/share/vm/runtime/vmStructs.hpp                                                            |     4 +-
 src/share/vm/runtime/vmThread.cpp                                                             |    30 +-
 src/share/vm/runtime/vmThread.hpp                                                             |     2 +-
 src/share/vm/runtime/vm_operations.cpp                                                        |    19 +-
 src/share/vm/runtime/vm_operations.hpp                                                        |     5 +-
 src/share/vm/runtime/vm_version.cpp                                                           |    24 +-
 src/share/vm/runtime/vm_version.hpp                                                           |    11 +
 src/share/vm/services/attachListener.cpp                                                      |    10 +-
 src/share/vm/services/attachListener.hpp                                                      |    24 +-
 src/share/vm/services/diagnosticArgument.cpp                                                  |    74 +-
 src/share/vm/services/diagnosticArgument.hpp                                                  |    17 +-
 src/share/vm/services/diagnosticCommand.cpp                                                   |    50 +-
 src/share/vm/services/diagnosticCommand.hpp                                                   |    22 +-
 src/share/vm/services/diagnosticFramework.cpp                                                 |    35 +-
 src/share/vm/services/diagnosticFramework.hpp                                                 |    16 +-
 src/share/vm/services/gcNotifier.cpp                                                          |    16 +-
 src/share/vm/services/gcNotifier.hpp                                                          |     2 +-
 src/share/vm/services/heapDumper.cpp                                                          |    15 +-
 src/share/vm/services/heapDumper.hpp                                                          |     6 +-
 src/share/vm/services/lowMemoryDetector.hpp                                                   |     4 +-
 src/share/vm/services/management.cpp                                                          |    54 +-
 src/share/vm/services/memBaseline.cpp                                                         |   492 +
 src/share/vm/services/memBaseline.hpp                                                         |   449 +
 src/share/vm/services/memPtr.cpp                                                              |    42 +
 src/share/vm/services/memPtr.hpp                                                              |   510 +
 src/share/vm/services/memPtrArray.hpp                                                         |   306 +
 src/share/vm/services/memRecorder.cpp                                                         |   171 +
 src/share/vm/services/memRecorder.hpp                                                         |   271 +
 src/share/vm/services/memReporter.cpp                                                         |   637 +
 src/share/vm/services/memReporter.hpp                                                         |   281 +
 src/share/vm/services/memSnapshot.cpp                                                         |   746 +
 src/share/vm/services/memSnapshot.hpp                                                         |   408 +
 src/share/vm/services/memTrackWorker.cpp                                                      |   212 +
 src/share/vm/services/memTrackWorker.hpp                                                      |   118 +
 src/share/vm/services/memTracker.cpp                                                          |   886 ++
 src/share/vm/services/memTracker.hpp                                                          |   519 +
 src/share/vm/services/memoryManager.cpp                                                       |    12 +-
 src/share/vm/services/memoryManager.hpp                                                       |     2 +-
 src/share/vm/services/memoryPool.hpp                                                          |     2 +-
 src/share/vm/services/memoryService.cpp                                                       |     4 +-
 src/share/vm/services/nmtDCmd.cpp                                                             |   183 +
 src/share/vm/services/nmtDCmd.hpp                                                             |    61 +
 src/share/vm/services/runtimeService.cpp                                                      |     9 +-
 src/share/vm/services/threadService.cpp                                                       |    10 +-
 src/share/vm/services/threadService.hpp                                                       |    12 +-
 src/share/vm/shark/sharkCompiler.cpp                                                          |     4 +-
 src/share/vm/trace/noTraceBackend.hpp                                                         |    48 +
 src/share/vm/trace/trace.dtd                                                                  |    83 +
 src/share/vm/trace/trace.xml                                                                  |   361 +
 src/share/vm/trace/traceBackend.hpp                                                           |    67 +
 src/share/vm/trace/traceDataTypes.hpp                                                         |    69 +
 src/share/vm/trace/traceEvent.hpp                                                             |   148 +
 src/share/vm/trace/traceEventClasses.xsl                                                      |   247 +
 src/share/vm/trace/traceEventIds.xsl                                                          |    72 +
 src/share/vm/trace/traceEventTypes.hpp                                                        |    30 -
 src/share/vm/trace/traceMacros.hpp                                                            |    21 +-
 src/share/vm/trace/traceStream.hpp                                                            |   121 +
 src/share/vm/trace/traceTime.hpp                                                              |    33 +
 src/share/vm/trace/traceTypes.xsl                                                             |    74 +
 src/share/vm/trace/tracetypes.xml                                                             |   356 +
 src/share/vm/trace/tracing.hpp                                                                |     5 +-
 src/share/vm/trace/xinclude.mod                                                               |    37 +
 src/share/vm/trace/xsl_util.xsl                                                               |    78 +
 src/share/vm/utilities/accessFlags.hpp                                                        |    32 +-
 src/share/vm/utilities/array.cpp                                                              |    10 +-
 src/share/vm/utilities/array.hpp                                                              |     4 +-
 src/share/vm/utilities/bitMap.cpp                                                             |    74 +-
 src/share/vm/utilities/bitMap.hpp                                                             |    32 +-
 src/share/vm/utilities/bitMap.inline.hpp                                                      |    20 +-
 src/share/vm/utilities/debug.cpp                                                              |    28 +-
 src/share/vm/utilities/debug.hpp                                                              |    31 +-
 src/share/vm/utilities/decoder.cpp                                                            |    12 +
 src/share/vm/utilities/decoder.hpp                                                            |     9 +-
 src/share/vm/utilities/decoder_elf.hpp                                                        |     4 +
 src/share/vm/utilities/dtrace.hpp                                                             |    51 +-
 src/share/vm/utilities/elfFile.cpp                                                            |    26 +-
 src/share/vm/utilities/elfFile.hpp                                                            |    12 +-
 src/share/vm/utilities/elfStringTable.cpp                                                     |     2 +-
 src/share/vm/utilities/elfStringTable.hpp                                                     |     2 +-
 src/share/vm/utilities/elfSymbolTable.cpp                                                     |     2 +-
 src/share/vm/utilities/elfSymbolTable.hpp                                                     |     2 +-
 src/share/vm/utilities/events.hpp                                                             |     6 +-
 src/share/vm/utilities/exceptions.cpp                                                         |   146 +-
 src/share/vm/utilities/exceptions.hpp                                                         |    54 +-
 src/share/vm/utilities/globalDefinitions.hpp                                                  |    44 +-
 src/share/vm/utilities/growableArray.cpp                                                      |     2 +-
 src/share/vm/utilities/growableArray.hpp                                                      |    37 +-
 src/share/vm/utilities/hashtable.cpp                                                          |   121 +-
 src/share/vm/utilities/hashtable.hpp                                                          |    82 +-
 src/share/vm/utilities/hashtable.inline.hpp                                                   |    25 +-
 src/share/vm/utilities/histogram.cpp                                                          |     2 +-
 src/share/vm/utilities/histogram.hpp                                                          |     4 +-
 src/share/vm/utilities/intHisto.cpp                                                           |     2 +-
 src/share/vm/utilities/intHisto.hpp                                                           |     2 +-
 src/share/vm/utilities/macros.hpp                                                             |    46 +-
 src/share/vm/utilities/numberSeq.cpp                                                          |    24 +-
 src/share/vm/utilities/numberSeq.hpp                                                          |     5 +-
 src/share/vm/utilities/ostream.cpp                                                            |    98 +-
 src/share/vm/utilities/ostream.hpp                                                            |    22 +-
 src/share/vm/utilities/stack.hpp                                                              |    33 +-
 src/share/vm/utilities/stack.inline.hpp                                                       |   158 +-
 src/share/vm/utilities/taskqueue.hpp                                                          |   160 +-
 src/share/vm/utilities/vmError.cpp                                                            |    28 +-
 src/share/vm/utilities/workgroup.cpp                                                          |     7 +-
 src/share/vm/utilities/workgroup.hpp                                                          |     4 +-
 src/share/vm/utilities/xmlstream.cpp                                                          |     8 +-
 test/Makefile                                                                                 |    31 +-
 test/TEST.ROOT                                                                                |     2 +-
 test/compiler/5091921/Test6850611.java                                                        |     4 +-
 test/compiler/5091921/Test6890943.java                                                        |     4 +-
 test/compiler/5091921/Test6890943.sh                                                          |    31 +-
 test/compiler/5091921/Test6905845.java                                                        |     4 +-
 test/compiler/5091921/Test6992759.java                                                        |     4 +-
 test/compiler/5091921/Test7005594.sh                                                          |    23 +-
 test/compiler/6340864/TestByteVect.java                                                       |  1487 +++
 test/compiler/6340864/TestDoubleVect.java                                                     |   560 +
 test/compiler/6340864/TestFloatVect.java                                                      |   560 +
 test/compiler/6340864/TestIntVect.java                                                        |  1225 ++
 test/compiler/6340864/TestLongVect.java                                                       |  1129 ++
 test/compiler/6340864/TestShortVect.java                                                      |  1340 +++
 test/compiler/6431242/Test.java                                                               |     2 +-
 test/compiler/6443505/Test6443505.java                                                        |   107 +
 test/compiler/6589834/Test_ia32.java                                                          |     2 +-
 test/compiler/6636138/Test1.java                                                              |     2 +-
 test/compiler/6636138/Test2.java                                                              |     2 +-
 test/compiler/6795161/Test.java                                                               |     2 +-
 test/compiler/6852078/Test6852078.java                                                        |     8 +-
 test/compiler/6857159/Test6857159.sh                                                          |    23 +-
 test/compiler/6863420/Test.java                                                               |    24 +-
 test/compiler/6865265/StackOverflowBug.java                                                   |     2 +-
 test/compiler/6894807/Test6894807.sh                                                          |    19 +-
 test/compiler/6946040/TestCharShortByteSwap.java                                              |     2 +-
 test/compiler/7009359/Test7009359.java                                                        |     6 +-
 test/compiler/7068051/Test7068051.sh                                                          |    24 +-
 test/compiler/7070134/Test7070134.sh                                                          |    23 +-
 test/compiler/7119644/TestBooleanVect.java                                                    |   952 ++
 test/compiler/7119644/TestByteDoubleVect.java                                                 |   571 +
 test/compiler/7119644/TestByteFloatVect.java                                                  |   571 +
 test/compiler/7119644/TestByteIntVect.java                                                    |   571 +
 test/compiler/7119644/TestByteLongVect.java                                                   |   571 +
 test/compiler/7119644/TestByteShortVect.java                                                  |   571 +
 test/compiler/7119644/TestByteVect.java                                                       |   953 ++
 test/compiler/7119644/TestCharShortVect.java                                                  |   571 +
 test/compiler/7119644/TestCharVect.java                                                       |   953 ++
 test/compiler/7119644/TestDoubleVect.java                                                     |   953 ++
 test/compiler/7119644/TestFloatDoubleVect.java                                                |   571 +
 test/compiler/7119644/TestFloatVect.java                                                      |   953 ++
 test/compiler/7119644/TestIntDoubleVect.java                                                  |   571 +
 test/compiler/7119644/TestIntFloatVect.java                                                   |   571 +
 test/compiler/7119644/TestIntLongVect.java                                                    |   571 +
 test/compiler/7119644/TestIntVect.java                                                        |   953 ++
 test/compiler/7119644/TestLongDoubleVect.java                                                 |   571 +
 test/compiler/7119644/TestLongFloatVect.java                                                  |   571 +
 test/compiler/7119644/TestLongVect.java                                                       |   953 ++
 test/compiler/7119644/TestShortDoubleVect.java                                                |   571 +
 test/compiler/7119644/TestShortFloatVect.java                                                 |   571 +
 test/compiler/7119644/TestShortIntVect.java                                                   |   571 +
 test/compiler/7119644/TestShortLongVect.java                                                  |   571 +
 test/compiler/7119644/TestShortVect.java                                                      |   953 ++
 test/compiler/7160610/Test7160610.java                                                        |    71 +
 test/compiler/7177917/Test7177917.java                                                        |   142 +
 test/compiler/7184394/TestAESBase.java                                                        |   157 +
 test/compiler/7184394/TestAESDecode.java                                                      |    57 +
 test/compiler/7184394/TestAESEncode.java                                                      |    57 +
 test/compiler/7184394/TestAESMain.java                                                        |    58 +
 test/compiler/7190310/Test7190310.java                                                        |    87 +
 test/compiler/7190310/Test7190310_unsafe.java                                                 |   142 +
 test/compiler/7192963/TestByteVect.java                                                       |   203 +
 test/compiler/7192963/TestDoubleVect.java                                                     |   203 +
 test/compiler/7192963/TestFloatVect.java                                                      |   203 +
 test/compiler/7192963/TestIntVect.java                                                        |   203 +
 test/compiler/7192963/TestLongVect.java                                                       |   203 +
 test/compiler/7192963/TestShortVect.java                                                      |   203 +
 test/compiler/7196199/Test7196199.java                                                        |   189 +
 test/compiler/7199742/Test7199742.java                                                        |    54 +
 test/compiler/7200264/Test7200264.sh                                                          |   129 +
 test/compiler/7200264/TestIntVect.java                                                        |   650 +
 test/compiler/8000805/Test8000805.java                                                        |    85 +
 test/compiler/8001183/TestCharVect.java                                                       |  1332 +++
 test/compiler/8002069/Test8002069.java                                                        |    98 +
 test/compiler/8004741/Test8004741.java                                                        |   184 +
 test/compiler/8004867/TestIntAtomicCAS.java                                                   |   969 ++
 test/compiler/8004867/TestIntAtomicOrdered.java                                               |   969 ++
 test/compiler/8004867/TestIntAtomicVolatile.java                                              |   969 ++
 test/compiler/8004867/TestIntUnsafeCAS.java                                                   |   998 ++
 test/compiler/8004867/TestIntUnsafeOrdered.java                                               |   990 ++
 test/compiler/8004867/TestIntUnsafeVolatile.java                                              |   990 ++
 test/compiler/8005033/Test8005033.java                                                        |    50 +
 test/compiler/8005419/Test8005419.java                                                        |   120 +
 test/compiler/8005956/PolynomialRoot.java                                                     |   783 +
 test/compiler/8007294/Test8007294.java                                                        |    98 +
 test/compiler/8007722/Test8007722.java                                                        |    56 +
 test/compiler/8009761/Test8009761.java                                                        |   255 +
 test/compiler/8010927/Test8010927.java                                                        |   153 +
 test/compiler/EscapeAnalysis/Test8020215.java                                                 |    82 +
 test/compiler/cpuflags/RestoreMXCSR.java                                                      |    42 +
 test/compiler/membars/DekkerTest.java                                                         |   163 +
 test/gc/6941923/test6941923.sh                                                                |    41 +-
 test/gc/7072527/TestFullGCCount.java                                                          |    88 +-
 test/gc/7168848/HumongousAlloc.java                                                           |    74 +
 test/gc/TestVerifyBeforeGCDuringStartup.java                                                  |    45 +
 test/gc/g1/TestRegionAlignment.java                                                           |    36 +
 test/gc/heap_inspection/TestPrintClassHistogram.java                                          |    95 +
 test/gc/init/TestHandleExceedingProcessSizeLimitIn32BitBuilds.java                            |    58 +
 test/runtime/6294277/SourceDebugExtension.java                                                |   136 +
 test/runtime/6626217/Test6626217.sh                                                           |    75 +-
 test/runtime/6878713/Test6878713.sh                                                           |    65 +-
 test/runtime/6888954/vmerrors.sh                                                              |    23 +-
 test/runtime/6929067/Test6929067.sh                                                           |   124 +-
 test/runtime/7020373/GenOOMCrashClass.java                                                    |   157 +
 test/runtime/7020373/Test7020373.sh                                                           |    67 +-
 test/runtime/7020373/testcase.jar                                                             |   Bin 
 test/runtime/7051189/Xchecksig.sh                                                             |    59 +-
 test/runtime/7107135/Test.java                                                                |    65 +
 test/runtime/7107135/Test7107135.sh                                                           |    91 +
 test/runtime/7107135/TestMT.java                                                              |    85 +
 test/runtime/7107135/test.c                                                                   |    39 +
 test/runtime/7110720/Test7110720.sh                                                           |    29 +-
 test/runtime/7116786/Test7116786.java                                                         |   486 +
 test/runtime/7116786/testcases.jar                                                            |   Bin 
 test/runtime/7158804/Test7158804.sh                                                           |    11 +-
 test/runtime/7158988/FieldMonitor.java                                                        |   251 +
 test/runtime/7158988/TestPostFieldModification.java                                           |    58 +
 test/runtime/7162488/Test7162488.sh                                                           |    26 +-
 test/runtime/7167069/PrintAsFlag.java                                                         |    38 +
 test/runtime/7196045/Test7196045.java                                                         |    78 +
 test/runtime/8010389/VMThreadDlopen.java                                                      |    44 +
 test/runtime/CommandLine/CompilerConfigFileWarning.java                                       |    50 +
 test/runtime/CommandLine/ConfigFileWarning.java                                               |    50 +
 test/runtime/NMT/BaselineWithParameter.java                                                   |    54 +
 test/runtime/NMT/CommandLineDetail.java                                                       |    45 +
 test/runtime/NMT/CommandLineEmptyArgument.java                                                |    41 +
 test/runtime/NMT/CommandLineInvalidArgument.java                                              |    41 +
 test/runtime/NMT/CommandLineSummary.java                                                      |    45 +
 test/runtime/NMT/CommandLineTurnOffNMT.java                                                   |    44 +
 test/runtime/NMT/JcmdDiffCallsite.java                                                        |    80 +
 test/runtime/NMT/JcmdScale.java                                                               |    67 +
 test/runtime/NMT/JcmdWithNMTDisabled.java                                                     |    63 +
 test/runtime/NMT/MallocTestType.java                                                          |    74 +
 test/runtime/NMT/PrintNMTStatistics.java                                                      |    70 +
 test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java                                       |    44 +
 test/runtime/NMT/ReleaseCommittedMemory.java                                                  |    50 +
 test/runtime/NMT/ShutdownTwice.java                                                           |    56 +
 test/runtime/NMT/SummaryAfterShutdown.java                                                    |    56 +
 test/runtime/NMT/SummarySanityCheck.java                                                      |   120 +
 test/runtime/NMT/ThreadedMallocTestType.java                                                  |    91 +
 test/runtime/NMT/ThreadedVirtualAllocTestType.java                                            |   112 +
 test/runtime/NMT/VirtualAllocTestType.java                                                    |    88 +
 test/sanity/WBApi.java                                                                        |    38 +
 test/serviceability/7170638/SDTProbesGNULinuxTest.sh                                          |    68 +
 test/serviceability/ParserTest.java                                                           |   205 +
 test/serviceability/attach/AttachWithStalePidFile.java                                        |   139 +
 test/serviceability/attach/AttachWithStalePidFileTarget.java                                  |    27 +
 test/test_env.sh                                                                              |   193 +
 test/testlibrary/ClassFileInstaller.java                                                      |    53 +
 test/testlibrary/OutputAnalyzerTest.java                                                      |   176 +
 test/testlibrary/com/oracle/java/testlibrary/JDKToolFinder.java                               |    50 +
 test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java                              |   290 +
 test/testlibrary/com/oracle/java/testlibrary/OutputBuffer.java                                |    59 +
 test/testlibrary/com/oracle/java/testlibrary/Platform.java                                    |    62 +
 test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java                                |   141 +
 test/testlibrary/com/oracle/java/testlibrary/StreamPumper.java                                |    76 +
 test/testlibrary/whitebox/sun/hotspot/WhiteBox.java                                           |    81 +
 test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java                           |    66 +
 1207 files changed, 105754 insertions(+), 48802 deletions(-)

diffs (truncated from 220270 to 500 lines):

diff -r 97a3ebd62052 -r b59e02d9e72b .hgtags
--- a/.hgtags	Thu Jun 06 11:41:33 2013 -0700
+++ b/.hgtags	Wed Oct 16 15:17:08 2013 +0100
@@ -50,6 +50,7 @@
 faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73
 f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74
 d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75
+b4ab978ce52c41bb7e8ee86285e6c9f28122bbe1 icedtea7-1.12
 9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76
 455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77
 e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78
@@ -87,6 +88,7 @@
 07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01
 e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87
 4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b jdk7-b88
+a393ff93e7e54dd94cc4211892605a32f9c77dad icedtea7-1.13
 15836273ac2494f36ef62088bc1cb6f3f011f565 jdk7-b89
 4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b hs18-b02
 605c9707a766ff518cd841fc04f9bb4b36a3a30b jdk7-b90
@@ -160,6 +162,7 @@
 b898f0fc3cedc972d884d31a751afd75969531cf hs21-b05
 bd586e392d93b7ed7a1636dcc8da2b6a4203a102 jdk7-b136
 bd586e392d93b7ed7a1636dcc8da2b6a4203a102 hs21-b06
+591c7dc0b2ee879f87a7b5519a5388e0d81520be icedtea-1.14
 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f jdk7-b137
 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f hs21-b07
 0930dc920c185afbf40fed9a655290b8e5b16783 jdk7-b138
@@ -182,6 +185,7 @@
 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16
 81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147
 81d815b05abb564aa1f4100ae13491c949b9a07e hs21-b17
+7693eb0fce1f6b484cce96c233ea20bdad8a09e0 icedtea-2.0-branchpoint
 9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01
 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
@@ -210,6 +214,7 @@
 3ba0bb2e7c8ddac172f5b995aae57329cdd2dafa hs22-b10
 f17fe2f4b6aacc19cbb8ee39476f2f13a1c4d3cd jdk7u2-b13
 0744602f85c6fe62255326df595785eb2b32166d jdk7u2-b21
+f8f4d3f9b16567b91bcef4caaa8417c8de8015f0 icedtea-2.1-branchpoint
 a40d238623e5b1ab1224ea6b36dc5b23d0a53880 jdk7u3-b02
 6986bfb4c82e00b938c140f2202133350e6e73f8 jdk7u3-b03
 8e6375b46717d74d4885f839b4e72d03f357a45f jdk7u3-b04
@@ -264,6 +269,7 @@
 f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16
 f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16
 931e5f39e365a0d550d79148ff87a7f9e864d2e1 hs23-b16
+a2c5354863dcb3d147b7b6f55ef514b1bfecf920 icedtea-2.2-branchpoint
 efb5f2662c96c472caa3327090268c75a86dd9c0 jdk7u4-b13
 82e719a2e6416838b4421637646cbfd7104c7716 jdk7u4-b14
 e5f7f95411fb9e837800b4152741c962118e5d7a jdk7u5-b01
@@ -311,6 +317,7 @@
 cefe884c708aa6dfd63aff45f6c698a6bc346791 jdk7u6-b16
 270a40a57b3d05ca64070208dcbb895b5b509d8e hs23.2-b08
 7a37cec9d0d44ae6ea3d26a95407e42d99af6843 jdk7u6-b17
+354cfde7db2f1fd46312d883a63c8a76d5381bab icedtea-2.3-branchpoint
 df0df4ae5af2f40b7f630c53a86e8c3d68ef5b66 jdk7u6-b18
 1257f4373a06f788bd656ae1c7a953a026a285b9 jdk7u6-b19
 a0c2fa4baeb6aad6f33dc87b676b21345794d61e hs23.2-b09
@@ -361,6 +368,95 @@
 e0e52e35e0c53a84daadae95f626e36fd74f3eba jdk7u13-b10
 be57a8d7a1a75971c3b1e7777dcacd20f3d33264 jdk7u13-b30
 e0e52e35e0c53a84daadae95f626e36fd74f3eba jdk7u13-b20
+02a6c89432d724119565f9ba25672829b136fc5f jdk7u8-b01
+528502f930967f70c320472a002418f1e38029e0 jdk7u8-b02
+db63a909e1ad950ef2b9050389f51e68581b2d4e jdk7u8-b03
+0948731ccc7fdda064f1d961d0b9d0cbf49e1369 jdk7u8-b04
+21e2648677954145d0f12b91ab283e8908e80b08 hs23.4-b01
+baaa29c3d798ffe883091a5ad2ad1bf8324c49d2 jdk7u8-b05
+dc6893023f1121726178d9ac97df8ea5f170025a jdk7u10-b06
+0000000000000000000000000000000000000000 hs23.4-b01
+21e2648677954145d0f12b91ab283e8908e80b08 hs23.6-b01
+6f4d800251492aefcf13727965e8a7feda1338d6 hs23.6-b02
+5f67ff71653f23d7fbb0e1af26502b68b37da9aa jdk7u10-b07
+042438023396a3886a060ca14a06a4664ef85d9d hs23.6-b03
+4c525a19affa0f69c502a74a01d33f0dd74a1ade jdk7u10-b08
+d14ad18fc5168983f693bb173fa353a3846369ad jdk7u10-b09
+3b24e7e01d20ca590d0f86b1222bb7c3f1a2aa2d jdk8-b27
+975c4105f1e2ef1190a75b77124033f1fd4290b5 hs24-b01
+b183b0863611b85dbac16f3b08b40ba978756d19 jdk8-b28
+030b5306d60f140e822e4a6d301744cb110ff0c8 hs24-b02
+b45b5c564098c58ea69e7cff3f7d341f0254dd1d jdk8-b29
+d61761bf305031c94f7f8eca49abd978b7d3c5da jdk8-b30
+dfae0140457cfb2c381d7679735fbedbae862c62 hs24-b03
+f4767e53d6e0d5da7e3f1775904076cce54247c1 hs24-b04
+0cd147eaa673d1642b2f466f5dc257cf192db524 jdk8-b31
+27863e4586de38be7dd17da4163f542038f4d1d7 hs24-b05
+25410a347ebb0bef166c4338a90d9dea82463a20 jdk8-b32
+cd47da9383cd932cb2b659064057feafa2a91134 hs24-b06
+785bcf415ead2eaa5f6677aaf528481008140bac jdk8-b33
+7c6aba65acd2c334f1c3512b574f9038cddac24b hs24-b07
+f284b08835584517c1ca3dd67341f569e763841f jdk8-b34
+f621660a297baa48fab9dca28e99d318826e8304 jdk8-b35
+dff6e3459210f8dd0430b9b03ccc99280560da30 hs24-b08
+50b4400ca1ecb2ac2fde35f5e53ec8f04b86be7f jdk8-b36
+bfcf92bfefb82da00f7fdbf0d9273feaa0a9456d jdk8-b37
+7d5ec8bf38d1b12e0e09ec381f10976b8beede3b hs24-b09
+637c3f5f068f88fb9ec9c5867341cf59fd5ebedc jdk8-b38
+73147e6c48813b5fee904aa33f79a77103250ff4 hs24-b10
+96a403721094ecdaf6a1f4f52ebd0a82e07df199 jdk8-b39
+14b0e07ab9a6fa1662414496b7e07ac8450cf517 hs24-b11
+ff9decc8235d5af80ea45fda4ecbe643ea252564 jdk8-b40
+785573170238f0eae6dc8e22ecf1050fbc9ea055 hs24-b12
+37add4fa0296705f67481e1fd50e2900cd25e39b jdk8-b41
+bd568544be7fcd12a9327e6c448592198d57b043 hs24-b13
+55954061c6e8750ea39a63523fd65d580db6eeb1 jdk8-b42
+e77b8e0ed1f84e3e268239e276c7ab64fa573baa jdk8-b43
+5ba29a1db46ecb80a321ca873adb56a3fe6ad320 hs24-b14
+831e5c76a20af18f3c08c5a95ed31be0e128a010 jdk8-b44
+9d5f20961bc5846fa8d098d534effafbbdae0a58 jdk8-b45
+40e5a3f2907ed02b335c7caa8ecf068cc801380d hs24-b15
+cf37a594c38db2ea926954154636f9f81da2e032 jdk8-b46
+0c7bb1f4f9c8062b5c5bfa56b3bdca44839b4109 jdk8-b47
+66b0450071c1534e014b131892cc86b63f1d009c hs24-b16
+1e26f61bbb521642639f56fae11326f1932f5a7d jdk8-b48
+bd54fe36b5e50f9ef1e30a5047b27fee5297e268 hs24-b17
+e3619706a7253540a2d94e9e841acaab8ace7038 jdk8-b49
+72e0362c3f0cfacbbac8af8a5b9d2e182f21c17b hs24-b18
+58f237a9e83af6ded0d2e2c81d252cd47c0f4c45 jdk8-b50
+3b3ad16429701b2eb6712851c2f7c5a726eb2cbe hs24-b19
+663fc23da8d51c4c0552cbcb17ffc85f5869d4fd jdk8-b51
+4c8f2a12e757e7a808aa85827573e09f75d7459f hs24-b20
+6d0436885201db3f581523344a734793bb989549 jdk8-b52
+54240c1b8e87758f28da2c6a569a926fd9e0910a jdk8-b53
+9e3ae661284dc04185b029d85440fe7811f1ed07 hs24-b21
+e8fb566b94667f88462164defa654203f0ab6820 jdk8-b54
+09ea7e0752b306b8ae74713aeb4eb6263e1c6836 hs24-b22
+4767c78f350408f67eccb50a89f2f1c9df2328e0 hs24-b23
+b4da4e577c9992d9168d093600aa3c3e3aa5156d hs24-b24
+0601ca30c7b40026d5ac40e8aca39ea71f129f96 jdk7u12-b01
+1e5b6a49c06dd1fac6d2f579c64b7b67a8af0edf hs24-b25
+ce5983a3e0b2937cf9a672e61dbcb234f569b29e jdk7u12-b02
+94984276a8dcba53f63a5de563b14eeb5e336c55 jdk7u12-b03
+b9e0f2c87dd64fad932871fef82ee28ada04d6da hs24-b26
+ed9b424d5e4358b7886c9a115b87ef6f06e57137 jdk7u12-b04
+4e4026772caf17fbd5234d6941af8be56fc0c260 jdk7u12-b05
+364bc54d7096ed229d61fa015626276d4f1cedf5 hs24-b27
+2e497fde1807e9e97cb3dfd90bfbbcdcc19f0883 jdk7u12-b06
+c5ee80cc06234ef93e4b6a6ac77597e62fbd99f4 hs24-b28
+4f7ad6299356bfd2cfb448ea4c11e8ce0fbf69f4 jdk7u12-b07
+3bb803664f3d9c831d094cbe22b4ee5757e780c8 jdk7u12-b08
+92e382c3cccc0afbc7f72fccea4f996e05b66b3e jdk7u12-b09
+6e4feb17117d21e0e4360f2d0fbc68397ed3ba80 icedtea-2.4-branchpoint
+7554f9b2bcc72204ac10ba8b08b8e648459504df hs24-b29
+181528fd1e74863a902f171a2ad46270a2fb15e0 jdk7u14-b10
+4008cf63c30133f2fac148a39903552fe7a33cea hs24-b30
+06a41c6e29c2b1aa9c5f7807fe23f75fe2a0038d jdk7u14-b11
+7b2efda91ffcad410878d2fa14b8704558e35b4d hs24-b31
+bfa88fb4cb016d4e94a338bea3d090b548830ec4 jdk7u14-b12
+88f46d2084529e3476f24209c20c6f035ad99b9f hs24-b32
+38b173289e57d26453891f417f8e8fe5da38684e jdk7u14-b13
+6a431dbf4a336343bb070b614d029d2bc6216bc8 hs24-b33
 5fbe0cae3a2a78a73946cfd08c56a64860f1afd9 jdk7u15-b01
 30d72c9abb560bc424d16d96bfd396ccd3c62cbc jdk7u15-b02
 221c64550c5b4411d78b63820835de1a8cd0c118 jdk7u15-b30
@@ -385,7 +481,9 @@
 d4a4c2bd389abcd80c25d20e0ffb7d5cee356715 jdk7u21-b10
 d07dafb51e1d75f110a3c506c250d995235acca6 jdk7u21-b11
 a977dedec81c346247631ead6f3364c76949d67a jdk7u21-b30
+8386245b59c3e82b7c728b7d3832ea342c62615d jdk7u21-b50
 c5e4585a045fe165d067ec0e98af42eace20c5f8 jdk7u21-b12
+00dbf9fa12ec6b1ba15d9a9a12495f50e10837bf jdk7u21-b31
 bf2d84c5103d98db1697b50071a649ea23c4e33d jdk7u25-b01
 07119340f80f77dfcb03fa568641e80b43d4be74 jdk7u25-b02
 655bea6843fb7beabd8d9eeda59572c0c7055b85 jdk7u25-b03
@@ -401,3 +499,108 @@
 3e145a686fedd9eefdcb6b714241200ed236b41d jdk7u25-b13
 4fafaf293aa5666e8c9f5ca1d96c3f752305f586 jdk7u25-b14
 40acb370626fbc439e4cfed8854960a83a376fba jdk7u25-b15
+97a3ebd62052410e0709035f40032d3f2113ed86 jdk7u25-b30
+b80a290e6e3011097273525c4f352c70b9857464 jdk7u25-b16
+273e8afccd6ef9e10e9fe121f7b323755191f3cc jdk7u25-b32
+e3d2c238e29c421c3b5c001e400acbfb30790cfc jdk7u14-b14
+860ae068f4dff62a77c8315f0335b7e935087e86 hs24-b34
+12619005c5e29be6e65f0dc9891ca19d9ffb1aaa jdk7u14-b15
+be21f8a4d42c03cafde4f616fd80ece791ba2f21 hs24-b35
+10e0043bda0878dbc85f3f280157eab592b47c91 jdk7u14-b16
+7416b0a84e3c5b0eea46affb71cc36cc729c040c hs24-b36
+61822da2b149bd272b5e7b727c142635f1d52d5c jdk7u14-b17
+c5c01d4cd7d9a5141e0945a5811c76267da0df13 hs24-b37
+72e4bc0bcbd2b23d70115fc9d92525bf3c23aa1d jdk7u14-b18
+795212ad5b1b9c43ab3cea5680a37e759641f3bf hs24-b38
+5e622bdc713e05a6a9f8dca35cf4c5887d4d3e4a jdk7u14-b19
+5e622bdc713e05a6a9f8dca35cf4c5887d4d3e4a jdk7u14-b19
+94e094f461041abe877c1f4aaa22f72e252f5512 jdk7u14-b19
+c23596bfe3b8a21076f8454a3cd6606ee7e928a5 jdk7u14-b20
+d6cf0e0eee29e173b8446455991e22249da0e860 hs24-b39
+3295faa5b5cc4f165c0e6798fd40ab4f5c17dd6d hs24-b40
+ed247f9fb4fee475dd6334d20e91779807522bb3 icedtea-2.4.0
+3e88170d8be276660cd4f347bd514c446bb65d58 jdk7u14-b21
+d90c913b810356d43c8e64f08c0f5e60f9c2ca08 hs24-b41
+aa9a5e33e823df5f51e9b5d4e85ae91919424179 jdk7u14-b22
+482ff4e18ca3fb97f62fd9fe2823d48721fdee28 hs24-b42
+34a398422e596f9160335c0376cdfbc13baebb39 jdk7u40-b23
+2efcfec8a6dc4deb84bdfb6d0531556719a118f8 hs24-b43
+a36051465050a52485c29b9eef7135003f528528 jdk7u40-b24
+7eabf05bddea524aa4a00c1fc6f2eba21c06e275 hs24-b44
+a8a071629df4856a44660143c6dd8e7843cdcca2 jdk7u40-b25
+69fecd3e06892e95a32ce4c27f85b1d61e946fc8 hs24-b45
+43fd44b89792fcc931569218dce51df4c2856a17 jdk7u40-b26
+e50c5a1869b1f629508780eda1592674177a9f91 hs24-b46
+f2614c006bb73eabf8fdf8027b042b98149d06a7 jdk7u40-b27
+64aaeeee0a10e568f2234d91dca91608412ae5d1 hs24-b47
+6206774b59597ab260f65ff3b87ad92401f91a52 jdk7u40-b28
+58e723f20009d2703eac040e324620949ca923fe hs24-b48
+d74376b0f20be7982d824e9af6105a75cc24e020 jdk7u40-b29
+88e43f47a8da8093743a1b6ca1ae4b79d994472a hs24-b49
+24f785f94d2f5be0f5c48e80f2a6cc7f8815dd8b jdk7u40-b30
+41118cf72ace4f0cee56a9ff437226e98e46e9d7 hs24-b50
+5f53e771711627b23e8c9ac53121e1e8ea9f00b4 icedtea-2.4.1
+645b68762a367d82c2b55f76cae431b767bee3ac jdk7u40-b31
+2417fa1acf2ba8521f480f2baef9af279ec2bf15 hs24-b51
+9658c969b7cf0de256691a80f44dcfe73d72a02f jdk7u40-b32
+15706a73a506943059a6bbf59e2ec8866a026114 hs24-b52
+0b9149d22ee08fe13b4f198ff258a1348e27b8b2 jdk7u40-b33
+1118c5d38ac0693d98f913485ceb3c57366cfbab hs24-b53
+1274c4750118bbdb3f3aa6dbf79af4568a2cca93 jdk7u40-b34
+f969880098fda55589cae8efaea5eff2c044e81e hs24-b54
+0af6bc95c1cb03ef08b3ef38c2fe0ea4309594d1 jdk7u40-b35
+bf2d84c5103d98db1697b50071a649ea23c4e33d jdk7u25-b01
+07119340f80f77dfcb03fa568641e80b43d4be74 jdk7u25-b02
+655bea6843fb7beabd8d9eeda59572c0c7055b85 jdk7u25-b03
+96a4e612195c0d753be24cf38fea0ee8ce30edcf jdk7u25-b04
+7151c26b838828a20cb28595ef1f70403d1868cf jdk7u25-b05
+fbb5f6083dd00ca7417e4a45311f33918bb2a5f0 jdk7u25-b06
+83abf4b2fc8a5bb7226177c5e4334bd0bfd7a8df jdk7u25-b07
+525252cd9fca4869c3fd81bc61299a85e73ff9c7 jdk7u25-b08
+706a255a8404b7e41579cea278df6bb87c314567 jdk7u25-b09
+402184622f60a2ba35479bdf124a8d4694835406 jdk7u25-b10
+cca49a35bf83664456af112482ffb3a7465d21fa jdk7u25-b11
+7ca68c0674df72fdd784de337c049404d2b5b0c3 jdk7u25-b12
+3e145a686fedd9eefdcb6b714241200ed236b41d jdk7u25-b13
+4fafaf293aa5666e8c9f5ca1d96c3f752305f586 jdk7u25-b14
+40acb370626fbc439e4cfed8854960a83a376fba jdk7u25-b15
+73863f836e343b4b8e3f018e5e8f7f1618529096 jdk7u25-b31
+dd9090ad552134cbb20d5dfc89f682f55e2570e9 jdk7u25-b33
+9af6a8fa6a557311bdf2fc124ae6adad59c9b78d jdk7u25-b34
+675a89fd4548389e3d54a29c6fe271d913e7eee6 hs24-b55
+13edc330a937d4323f38b6a59cc255b6d61c51dc jdk7u40-b36
+295528bfcdd10051f72572a26bfad2317b7de464 jdk7u40-b37
+1f3b0ff9649c4be3b08cc829d37eee98d9c6e605 jdk7u40-b38
+74de360e341530494c05af1ea1358abea0be93e0 jdk7u40-b39
+86673506aeb60dfa66d90233e6bbbb06e864589e jdk7u40-b40
+4445f65c4793f8421c12423396776f36765433a8 jdk7u40-b41
+4e779305ed58e21b433626ac06b5eb884055183b jdk7u40-b42
+b8d8caf6df744d5342b5d284376a005e86c0b108 hs24-b56
+eceae04782438987cd747e1c76e4085f50b43a18 jdk7u40-b43
+af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60
+f3f4df30a4684f077084f374abdebaf3af5618ee icedtea-2.4.2
+f3f4df30a4684f077084f374abdebaf3af5618ee icedtea-2.4.2
+0000000000000000000000000000000000000000 icedtea-2.4.2
+0000000000000000000000000000000000000000 icedtea-2.4.2
+b732355257e3452875a1a8e5a5de2c553dfa705c icedtea-2.4.2
+efaa26fb6de2ecb8506fb8b785a429d040e96768 jdk7u40-b61
+df6f37a7311d35072a07c1425a7aadee469a09b6 jdk7u40-b62
+5fb434aa203c32b4551167b922a70e79831ffdf4 jdk7u45-b01
+f2039061ba49de742ae88cc3123fd1237965d665 jdk7u45-b02
+d6fd3f84a30ce82a37fc39b6e5e9d73bd8054ab2 jdk7u45-b03
+7f16aa9067386aeb3668336aa6cd63ef3dc4f44a jdk7u45-b04
+b4fe146b820b47d8b59bbb9dc9d43221436ed0ae jdk7u45-b05
+63efa616e54dd3545e16a5aa1917662548b18ee5 jdk7u45-b06
+f6748e6123b6745497d69addffdff38e224a77c5 jdk7u45-b07
+06bcab9ef18355dccc87401fc24dbd5f15615db0 jdk7u45-b08
+996b6863b3b2468cece20d7a6f571f9ec1b7830c jdk7u45-b09
+bcaf889eea9e64d30f8c3aefdcdc2c2ee29406f2 jdk7u45-b10
+7ca907428850dc2aa99ee4a906446e479dbeb392 jdk7u45-b11
+ed1505510ea0e94b17f968cdb3e8aba13c99d543 jdk7u45-b12
+89f99af7a7bbdadb5b8cf781c7d899c22df64b71 jdk7u45-b13
+718d1e9223dd0359d9ccef81fb82c32215702fe8 jdk7u45-b14
+9ad76a08e5edfe24e95eef84e15fef261bff1abf jdk7u45-b15
+429884602206fcf5314c8b953c06d54d337558ca jdk7u45-b16
+0c0dc384915cafd9bfaa2fe5792a629a22d1b990 jdk7u45-b17
+12374864c655a2cefb0d65caaacf215d5365ec5f jdk7u45-b18
+3677c8cc3c89c0fa608f485b84396e4cf755634b jdk7u45-b30
diff -r 97a3ebd62052 -r b59e02d9e72b .jcheck/conf
--- a/.jcheck/conf	Thu Jun 06 11:41:33 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 97a3ebd62052 -r b59e02d9e72b THIRD_PARTY_README
--- a/THIRD_PARTY_README	Thu Jun 06 11:41:33 2013 -0700
+++ b/THIRD_PARTY_README	Wed Oct 16 15:17:08 2013 +0100
@@ -1912,6 +1912,35 @@
 
 -------------------------------------------------------------------------------
 
+%% This notice is provided with respect to Sparkle v.1.5,
+which is included with JRE 7 on Mac OS X.
+
+--- begin of LICENSE ---
+
+Copyright (c) 2012 Sparkle.org and Andy Matuschak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
 %% Portions licensed from Taligent, Inc.
 
 -------------------------------------------------------------------------------
@@ -3169,12 +3198,12 @@
 %% This notice is provided with respect to the following which is 
 included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
 
-  Apache Derby 10.8.1.2        [included with JDK 7 only]
+  Apache Derby 10.8.3.0        [included with JDK 7 only]
   Apache Jakarta BCEL 5.2 
   Apache Jakarta Regexp 1.4 
   Apache Santuario XMLSec-Java 1.4.2
   Apache Xalan-Java 2.7.1 
-  Apache Xerces2 Java 2.10.0 
+  Apache Xerces2 Java 2.11.0 
   Apache XML Resolver 1.1 
 
 
diff -r 97a3ebd62052 -r b59e02d9e72b agent/make/saenv.sh
--- a/agent/make/saenv.sh	Thu Jun 06 11:41:33 2013 -0700
+++ b/agent/make/saenv.sh	Wed Oct 16 15:17:08 2013 +0100
@@ -26,7 +26,7 @@
 # This file sets common environment variables for all SA scripts
 
 OS=`uname`
-STARTDIR=`dirname $0`
+STARTDIR=`(cd \`dirname $0 \`; pwd)`
 ARCH=`uname -m`
 
 if [ "x$SA_JAVA" = "x" ]; then
diff -r 97a3ebd62052 -r b59e02d9e72b agent/make/start-debug-server-proc.sh
--- a/agent/make/start-debug-server-proc.sh	Thu Jun 06 11:41:33 2013 -0700
+++ b/agent/make/start-debug-server-proc.sh	Wed Oct 16 15:17:08 2013 +0100
@@ -25,10 +25,11 @@
 
 . `dirname $0`/saenv.sh
 
-if [ -f $STARTDIR/sa.jar ] ; then
-  CP=$STARTDIR/sa.jar
+if [ -f $STARTDIR/../lib/sa-jdi.jar ] ; then
+  CP=$STARTDIR/../lib/sa-jdi.jar
 else
   CP=$STARTDIR/../build/classes
 fi
 
-$SA_JAVA -classpath $CP ${OPTIONS} -Djava.rmi.server.codebase=file:/$CP -Djava.security.policy=$STARTDIR\/grantAll.policy sun.jvm.hotspot.DebugServer $*
+$STARTDIR/java -classpath $CP ${OPTIONS} -Djava.rmi.server.codebase=file://$CP -Djava.security.policy=${STARTDIR}/grantAll.policy sun.jvm.hotspot.DebugServer $*
+
diff -r 97a3ebd62052 -r b59e02d9e72b agent/src/os/bsd/MacosxDebuggerLocal.m
--- a/agent/src/os/bsd/MacosxDebuggerLocal.m	Thu Jun 06 11:41:33 2013 -0700
+++ b/agent/src/os/bsd/MacosxDebuggerLocal.m	Wed Oct 16 15:17:08 2013 +0100
@@ -32,6 +32,8 @@
 #import <mach/mach_types.h>
 #import <sys/sysctl.h>
 #import <stdlib.h>
+#import <sys/types.h>
+#import <sys/ptrace.h>
 
 jboolean debug = JNI_FALSE;
 
@@ -88,7 +90,8 @@
  * Method:    init0
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_init0(JNIEnv *env, jclass cls) {
+JNIEXPORT void JNICALL 
+Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_init0(JNIEnv *env, jclass cls) {
   symbolicatorID = (*env)->GetFieldID(env, cls, "symbolicator", "J");
   taskID = (*env)->GetFieldID(env, cls, "task", "J");
   CHECK_EXCEPTION;
@@ -99,7 +102,11 @@
  * Method:    lookupByName0
  * Signature: (Ljava/lang/String;Ljava/lang/String;)J
  */
-JNIEXPORT jlong JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_lookupByName0(JNIEnv *env, jobject this_obj, jstring objectName, jstring symbolName) {
+JNIEXPORT jlong JNICALL 
+Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_lookupByName0(
+  JNIEnv *env, jobject this_obj, 
+  jstring objectName, jstring symbolName) 
+{
   jlong address = 0;
 
 JNF_COCOA_ENTER(env);
@@ -128,7 +135,11 @@
  * Method:    readBytesFromProcess0
  * Signature: (JJ)Lsun/jvm/hotspot/debugger/ReadResult;
  */
-JNIEXPORT jbyteArray JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_readBytesFromProcess0(JNIEnv *env, jobject this_obj, jlong addr, jlong numBytes) {
+JNIEXPORT jbyteArray JNICALL
+Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_readBytesFromProcess0(
+  JNIEnv *env, jobject this_obj, 
+  jlong addr, jlong numBytes) 
+{
   if (debug) printf("readBytesFromProcess called. addr = %llx numBytes = %lld\n", addr, numBytes);
 
   // must allocate storage instead of using former parameter buf
@@ -200,12 +211,74 @@
   return array;
 }
 
+
 /*
- * Class:     sun_jvm_hotspot_debugger_macosx_MacOSXDebuggerLocal
+ * Lookup the thread_t that corresponds to the given thread_id.
+ * The thread_id should be the result from calling thread_info() with THREAD_IDENTIFIER_INFO
+ * and reading the m_ident_info.thread_id returned.
+ * The returned thread_t is the mach send right to the kernel port for the corresponding thread.
+ *
+ * We cannot simply use the OSThread._thread_id field in the JVM. This is set to ::mach_thread_self()
+ * in the VM, but that thread port is not valid for a remote debugger to access the thread.
+ */
+thread_t
+lookupThreadFromThreadId(task_t task, jlong thread_id) {
+  if (debug) {
+    printf("lookupThreadFromThreadId thread_id=0x%llx\n", thread_id);
+  }
+  
+  thread_array_t thread_list = NULL;
+  mach_msg_type_number_t thread_list_count = 0;
+  thread_t result_thread = 0;
+  int i;
+  
+  // get the list of all the send rights
+  kern_return_t result = task_threads(task, &thread_list, &thread_list_count);
+  if (result != KERN_SUCCESS) {
+    if (debug) {
+      printf("task_threads returned 0x%x\n", result);
+    }
+    return 0;
+  }
+  
+  for(i = 0 ; i < thread_list_count; i++) {
+    thread_identifier_info_data_t m_ident_info;
+    mach_msg_type_number_t count = THREAD_IDENTIFIER_INFO_COUNT;
+
+    // get the THREAD_IDENTIFIER_INFO for the send right
+    result = thread_info(thread_list[i], THREAD_IDENTIFIER_INFO, (thread_info_t) &m_ident_info, &count);
+    if (result != KERN_SUCCESS) {
+      if (debug) {
+        printf("thread_info returned 0x%x\n", result);
+      }
+      break;
+    }
+    
+    // if this is the one we're looking for, return the send right
+    if (thread_id == m_ident_info.thread_id)
+    {
+      result_thread = thread_list[i];
+      break;
+    }
+  }
+  
+  vm_size_t thread_list_size = (vm_size_t) (thread_list_count * sizeof (thread_t));
+  vm_deallocate(mach_task_self(), (vm_address_t) thread_list, thread_list_count);
+  
+  return result_thread;
+}
+
+
+/*
+ * Class:     sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
  * Method:    getThreadIntegerRegisterSet0
- * Signature: (I)[J
+ * Signature: (J)[J
  */
-JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_getThreadIntegerRegisterSet0(JNIEnv *env, jobject this_obj, jint lwp_id) {
+JNIEXPORT jlongArray JNICALL 
+Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_getThreadIntegerRegisterSet0(
+  JNIEnv *env, jobject this_obj, 
+  jlong thread_id) 
+{
   if (debug)
     printf("getThreadRegisterSet0 called\n");
 
@@ -217,8 +290,9 @@
   int i;
   jlongArray registerArray;
   jlong *primitiveArray;
+  task_t gTask = getTask(env, this_obj);
 
-  tid = lwp_id;
+  tid = lookupThreadFromThreadId(gTask, thread_id);
 
   result = thread_get_state(tid, HSDB_THREAD_STATE, (thread_state_t)&state, &count);

From andrew at icedtea.classpath.org  Wed Oct 16 07:44:19 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 16 Oct 2013 14:44:19 +0000
Subject: /hg/release/icedtea7-forest-2.4/jdk: 152 new changesets
Message-ID: <hg.85226f84bc29.1381934659.9040506844232929411@icedtea.classpath.org>

changeset 85226f84bc29 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=85226f84bc29
author: jbachorik
date: Tue Apr 23 09:37:31 2013 +0200

	8011081: Improve jhat
	Summary: Properly escape HTML output
	Reviewed-by: alanb, mschoene, sundar


changeset 84c4ba2a1794 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=84c4ba2a1794
author: asaha
date: Tue Apr 23 22:10:02 2013 -0700

	Merge


changeset b20992035fb7 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b20992035fb7
author: bae
date: Wed Apr 24 15:23:44 2013 +0400

	8012438: Better image validation
	Reviewed-by: mschoene, prr, vadim


changeset f181f42bdbf8 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f181f42bdbf8
author: prr
date: Thu Apr 25 21:37:41 2013 -0700

	8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer
	Reviewed-by: bae, srl


changeset e5046690c014 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e5046690c014
author: bae
date: Fri Apr 26 09:30:54 2013 +0400

	8012601: Better validation of image layouts
	Reviewed-by: mschoene, prr, vadim


changeset c282e264ab00 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c282e264ab00
author: alexsch
date: Mon Apr 29 16:46:18 2013 +0400

	8012330: [macosx] Sometimes the applet showing the modal dialog itself loses the ability to gain focus
	Reviewed-by: serb, ant


changeset 272c3851c0f2 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=272c3851c0f2
author: bae
date: Tue Apr 30 04:20:46 2013 +0400

	8012597: Better image channel verification
	Reviewed-by: ahgross, vadim, prr


changeset c4b57ff3d99e in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c4b57ff3d99e
author: mcherkas
date: Tue Feb 12 16:11:40 2013 +0400

	8005932: Java 7 on mac os x only provides text clipboard formats
	Reviewed-by: alexp, denis


changeset ba16240d53b8 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ba16240d53b8
author: asaha
date: Tue Apr 30 14:30:07 2013 -0700

	Merge


changeset cea62063a49e in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cea62063a49e
author: dfuchs
date: Wed May 01 00:49:21 2013 +0200

	8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21
	Reviewed-by: alanb, skoivu, smarks, mchung


changeset 3095097842e1 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3095097842e1
author: coffeys
date: Wed May 01 21:02:04 2013 +0100

	8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext()
	Reviewed-by: mchung, okutsu


changeset 5872319f9adf in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5872319f9adf
author: mullan
date: Wed May 01 17:19:04 2013 -0400

	8008744: Rework part of fix for JDK-6741606
	Reviewed-by: xuelei, ahgross


changeset 9fb20c70c89d in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9fb20c70c89d
author: mullan
date: Wed May 01 17:25:18 2013 -0400

	Merge


changeset 63bf3f0ba262 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=63bf3f0ba262
author: leonidr
date: Mon May 06 16:30:42 2013 +0400

	8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07
	Summary: Do not mark context as disposed until we've posted all the events
	Reviewed-by: art


changeset b09f318baa8b in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b09f318baa8b
author: ksrini
date: Tue May 07 13:37:03 2013 -0700

	8013506: Better Pack200 data handling
	Reviewed-by: jrose, kizune, mschoene


changeset 9a7df62c2e7f in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9a7df62c2e7f
author: jgish
date: Fri Apr 19 16:50:10 2013 -0700

	8010939: Deadlock in LogManager
	Summary: re-order locks to avoid deadlock
	Reviewed-by: mchung, alanb


changeset 3abe390615e3 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3abe390615e3
author: jchen
date: Thu May 09 11:23:18 2013 -0700

	8013510: Augment image writing code
	Reviewed-by: bae, prr


changeset c2698b462a49 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c2698b462a49
author: mullan
date: Fri May 10 16:28:51 2013 -0400

	8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod
	Reviewed-by: xuelei, hawtin


changeset 2cc8437acff9 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2cc8437acff9
author: mullan
date: Fri May 10 16:36:06 2013 -0400

	Merge


changeset e4305995090b in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e4305995090b
author: vadim
date: Mon May 13 13:24:30 2013 +0400

	8013514: Improve stability of cmap class
	Reviewed-by: mschoene, prr, bae


changeset 6f7486c48aa3 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6f7486c48aa3
author: uta
date: Mon May 13 20:09:20 2013 +0400

	8014046: (process) Runtime.exec(String) fails if command contains spaces [win]
	Reviewed-by: alanb


changeset 6edc9e3e8613 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6edc9e3e8613
author: xuelei
date: Mon May 13 18:30:45 2013 -0700

	8014281: Better checking of XML signature
	Summary: also reviewed by Andrew Gross and Christophe Ravel
	Reviewed-by: mullan


changeset f60425bc184b in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f60425bc184b
author: mchung
date: Tue May 14 08:07:08 2013 -0700

	8010727: WLS fails to add a logger with "" in its own LogManager subclass instance
	Reviewed-by: alanb, jgish


changeset b3b8c06cefff in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b3b8c06cefff
author: serb
date: Tue May 14 20:22:55 2013 +0400

	8014423: [macosx] The scrollbar's block increment performs incorrectly
	Reviewed-by: anthony, art


changeset 692f9aea4365 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=692f9aea4365
author: bae
date: Tue May 14 21:05:20 2013 +0400

	8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09
	Reviewed-by: prr, vadim


changeset 419e6025e324 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=419e6025e324
author: jgish
date: Tue May 14 15:42:14 2013 -0400

	8013380: Removal of stack walk to find resource bundle breaks Glassfish startup
	Summary: Use caller's classloader to load resource as an alternative to thread context classloader and system classloader
	Reviewed-by: mchung, alanb


changeset 694c686c0e8a in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=694c686c0e8a
author: asaha
date: Wed May 15 14:26:26 2013 -0700

	Merge


changeset 5bcbe71b551d in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5bcbe71b551d
author: bae
date: Fri May 17 16:07:14 2013 +0400

	8014205: Most of the Swing dialogs are blank on one win7 MUI
	Reviewed-by: prr, vadim


changeset 26edfc8182bb in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=26edfc8182bb
author: bae
date: Fri May 17 16:47:51 2013 +0400

	8014093: Improve parsing of images
	Reviewed-by: prr


changeset a6e52401ab9a in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a6e52401ab9a
author: dmeetry
date: Fri May 17 19:59:49 2013 +0400

	8014676: Java debugger may fail to run
	Summary: The problem is observed when the binaries for windows are placed under a path which contains a space
	Reviewed-by: alanb
	Contributed-by: ivan.gerasimov at oracle.com


changeset 3c60dc9b19b9 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3c60dc9b19b9
author: mchung
date: Fri May 17 14:29:51 2013 -0700

	8014745: Provide a switch to allow stack walk search of resource bundle
	Reviewed-by: alanb, jgish


changeset 3db0c3b7e851 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3db0c3b7e851
author: malenkov
date: Mon May 20 17:55:49 2013 +0400

	8012071: Better Building of Beans
	Reviewed-by: art, skoivu


changeset 12dfdb90cc90 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=12dfdb90cc90
author: leonidr
date: Mon May 20 18:51:34 2013 +0400

	8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10
	Summary: Removed logging from SunToolkit
	Reviewed-by: art


changeset 0783b9189e71 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0783b9189e71
author: bae
date: Tue May 21 13:56:39 2013 +0400

	8014102: Improve image conversion
	Reviewed-by: prr


changeset 2790e9ace697 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2790e9ace697
author: alexsch
date: Tue May 21 19:04:50 2013 +0400

	8013744: Better tabling for AWT
	Reviewed-by: art, malenkov, skoivu


changeset 10cd25a8c020 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=10cd25a8c020
author: asaha
date: Tue May 21 12:05:38 2013 -0700

	Merge


changeset 65b07e0a2f36 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=65b07e0a2f36
author: asaha
date: Wed May 22 22:52:55 2013 -0700

	Merge


changeset b6ab933f06e0 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b6ab933f06e0
author: malenkov
date: Fri May 31 20:43:32 2013 +0400

	8012277: Improve AWT DataFlavor
	Reviewed-by: art, skoivu


changeset 0b84d3b434c2 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0b84d3b434c2
author: weijun
date: Wed May 08 09:21:59 2013 +0800

	8014341: Better service from Kerberos servers
	Summary: read incoming data safely and take care of null return value
	Reviewed-by: valeriep, ahgross


changeset 49b7500a2ca6 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=49b7500a2ca6
author: asaha
date: Tue Jun 04 13:32:16 2013 -0700

	Merge


changeset 2d070be9a313 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2d070be9a313
author: coffeys
date: Wed Jun 05 18:39:44 2013 +0100

	8015965: (process) Typo in name of property to allow ambiguous commands
	Reviewed-by: alanb


changeset cbd812992676 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cbd812992676
author: asaha
date: Thu Jun 06 12:29:57 2013 -0700

	Merge


changeset 5c09550dfc12 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5c09550dfc12
author: asaha
date: Wed Jun 12 09:31:18 2013 -0700

	Merge


changeset 18479f069dab in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=18479f069dab
author: asaha
date: Wed Jun 12 09:51:44 2013 -0700

	Merge


changeset 600107f4664d in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=600107f4664d
author: weijun
date: Thu Jun 13 10:21:06 2013 +0800

	8013739: Better LDAP resource management
	Reviewed-by: ahgross, mchung, xuelei


changeset e074eb78c8fd in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e074eb78c8fd
author: weijun
date: Thu Jun 13 10:31:21 2013 +0800

	8015731: Subject java.security.auth.subject to improvements
	Reviewed-by: skoivu, mullan


changeset 7bb0a656747b in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7bb0a656747b
author: asaha
date: Wed Jun 12 21:49:30 2013 -0700

	Merge


changeset 7c6cf3cf585f in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7c6cf3cf585f
author: jchen
date: Thu Jun 13 12:02:15 2013 -0700

	8014098: Better profile validation
	Reviewed-by: bae, prr


changeset ff9410fce108 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ff9410fce108
author: msheppar
date: Fri Jun 14 17:28:36 2013 +0100

	8011157: Improve CORBA portablility
	Summary: fix also reviewed by Alexander Fomin
	Reviewed-by: alanb, coffeys, skoivu


changeset e6e9f510b6f2 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e6e9f510b6f2
author: asaha
date: Wed Jun 19 21:51:50 2013 -0700

	Merge


changeset ec7788ebe005 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ec7788ebe005
author: jbachorik
date: Thu Jun 20 08:51:47 2013 +0200

	8014085: Better serialization support in JMX classes
	Reviewed-by: alanb, dfuchs, skoivu


changeset 0bf72cc56dc3 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0bf72cc56dc3
author: erikj
date: Mon Jun 24 10:32:19 2013 +0200

	8012147: Improve tool support
	Summary: Adding libjli to jdk lib dir and removing now redundant rpath entries from executables
	Reviewed-by: alanb, dholmes, ksrini, ahgross


changeset 9b734892dae6 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9b734892dae6
author: asaha
date: Fri Jun 21 19:11:42 2013 -0700

	Merge


changeset 434ca5ec5a3b in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=434ca5ec5a3b
author: asaha
date: Fri Jun 21 21:58:42 2013 -0700

	Merge


changeset ba861ea65297 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ba861ea65297
author: asaha
date: Mon Jun 24 10:10:07 2013 -0700

	Merge


changeset 2cc729dda2f8 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2cc729dda2f8
author: asaha
date: Tue Jun 25 17:20:25 2013 -0700

	Merge


changeset 517a47e66573 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=517a47e66573
author: asaha
date: Fri Jun 28 11:39:50 2013 -0700

	Merge


changeset b06abd965701 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b06abd965701
author: bae
date: Mon Jul 01 20:20:50 2013 +0400

	8017287: Better resource disposal
	Reviewed-by: vadim


changeset 4a9ced03945a in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4a9ced03945a
author: katleman
date: Tue Jul 02 15:17:25 2013 -0700

	Added tag jdk7u45-b01 for changeset b06abd965701


changeset 95eeca6dc691 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=95eeca6dc691
author: michaelm
date: Wed Jul 03 17:54:38 2013 +0100

	8015743: Address internet addresses
	Summary: moved Inet6Address fields to holder class
	Reviewed-by: chegar, alanb, skoivu, khazra


changeset 4fc1467017ea in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4fc1467017ea
author: prr
date: Wed Jul 03 14:50:03 2013 -0700

	8015144: Performance regression in ICU OpenType Layout library
	Reviewed-by: srl, jgodinez


changeset bcd02823f5f5 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=bcd02823f5f5
author: asaha
date: Wed Jul 03 17:43:02 2013 -0700

	Merge


changeset 0c8d67d9e6d3 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0c8d67d9e6d3
author: ascarpino
date: Wed Jul 03 15:12:19 2013 -0700

	8011071: Better crypto provider handling
	Reviewed-by: hawtin, valeriep


changeset d23a877da2d5 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d23a877da2d5
author: dsamersoff
date: Mon Jul 08 14:34:36 2013 +0400

	8008589: Better MBean permission validation
	Summary: Better MBean permission validation
	Reviewed-by: skoivu, dfuchs, mchung, sjiang


changeset 34296e49d95f in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=34296e49d95f
author: katleman
date: Tue Jul 09 18:22:57 2013 -0700

	Added tag jdk7u45-b02 for changeset d23a877da2d5


changeset 57f1db230d23 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=57f1db230d23
author: asaha
date: Wed Jul 10 16:37:57 2013 -0700

	Merge


changeset fe6f6165412a in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fe6f6165412a
author: msheppar
date: Thu Jul 11 23:16:26 2013 +0100

	8020085: Linux ARM build failure for 7u45
	Summary: Amend jdk/make/com/sun/jmx/Makefile to fix 7u45 build failure
	Reviewed-by: coffeys, dholmes


changeset 390752a9e4ee in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=390752a9e4ee
author: smarks
date: Wed Jul 10 15:28:42 2013 -0700

	8014987: Augment serialization handling
	Reviewed-by: alanb, coffeys, skoivu


changeset c378b877f5b6 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c378b877f5b6
author: mchung
date: Mon Jul 15 03:40:16 2013 -0700

	8017291: Cast Proxies Aside
	Reviewed-by: alanb, ahgross


changeset 328d974d2eb8 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=328d974d2eb8
author: michaelm
date: Mon Jul 15 16:00:57 2013 +0100

	8019969: nioNetworkChannelInet6/SetOptionGetOptionTestInet6 test case crashes
	Reviewed-by: chegar


changeset a56eb4f80123 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a56eb4f80123
author: jfranck
date: Mon Jul 15 18:41:54 2013 +0200

	8014349: (cl) Class.getDeclaredClass problematic in some class loader configurations
	Reviewed-by: mchung, ahgross, darcy


changeset 0b2f8e7cfadd in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0b2f8e7cfadd
author: cl
date: Tue Jul 16 05:52:12 2013 -0700

	Added tag jdk7u45-b03 for changeset a56eb4f80123


changeset 1d42f8941555 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1d42f8941555
author: malenkov
date: Tue Jul 16 21:00:34 2013 +0400

	8019617: Better view of objects
	Reviewed-by: art, skoivu


changeset c919b499eb96 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c919b499eb96
author: sundar
date: Tue Jul 16 23:02:21 2013 +0530

	8017300: Improve Interface Implementation
	Reviewed-by: ahgross, jlaskey, mchung


changeset 269dc6aa6b62 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=269dc6aa6b62
author: sjiang
date: Thu Jul 18 10:12:56 2013 +0200

	8014534: Better profiling support
	Summary: Validation of parameters
	Reviewed-by: sspitsyn, skoivu, mchung


changeset 3ebfb90320ef in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3ebfb90320ef
author: mchung
date: Thu Jul 18 17:22:11 2013 -0700

	8017196: Ensure Proxies are handled appropriately
	Reviewed-by: dfuchs, jrose, jdn, ahgross, chegar


changeset 54bd9675a80b in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=54bd9675a80b
author: okutsu
date: Fri Jul 19 15:32:01 2013 +0900

	8006900: Add new date/time capability
	Reviewed-by: mchung, hawtin


changeset 0f7896059207 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0f7896059207
author: jbachorik
date: Fri Jul 19 16:29:26 2013 +0200

	8019584: javax/management/remote/mandatory/loading/MissingClassTest.java failed in nightly against jdk7u45: java.io.InvalidObjectException: Invalid notification: null
	Reviewed-by: mchung, sjiang, dfuchs, ahgross


changeset 447531e39bad in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=447531e39bad
author: jchen
date: Mon Jul 22 14:06:39 2013 -0700

	8020293: JVM crash
	Reviewed-by: prr, jgodinez


changeset ba3da584814b in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ba3da584814b
author: asaha
date: Mon Jul 22 12:21:16 2013 -0700

	Merge


changeset 01b9e1ec3b9b in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=01b9e1ec3b9b
author: asaha
date: Mon Jul 22 15:47:32 2013 -0700

	Merge


changeset 702c8d83dd8c in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=702c8d83dd8c
author: sgabdura
date: Tue Jul 23 10:01:25 2013 +0400

	8016357: Update hotspot diagnostic class
	Summary: Add security check to HotSpotDiagnostic.dumpHeap
	Reviewed-by: fparain, sla, ahgross


changeset aac9848719a9 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=aac9848719a9
author: cl
date: Tue Jul 23 08:11:32 2013 -0700

	Added tag jdk7u45-b04 for changeset 702c8d83dd8c


changeset 31416e6673db in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=31416e6673db
author: asaha
date: Thu Jul 25 17:17:15 2013 -0700

	Merge


changeset 6c81a895ac96 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6c81a895ac96
author: jbachorik
date: Mon Jul 29 04:43:41 2013 -0700

	8021577: JCK test api/javax_management/jmx_serial/modelmbean/ModelMBeanNotificationInfo/serial/index.html#Input has failed since jdk 7u45 b01
	Reviewed-by: alanb, dfuchs, ahgross


changeset a7758faab30d in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a7758faab30d
author: mullan
date: Tue Jul 30 17:20:22 2013 -0400

	8021290: Better signature validation
	Reviewed-by: xuelei, ahgross


changeset c32b22b37cf2 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c32b22b37cf2
author: mullan
date: Tue Jul 30 17:27:44 2013 -0400

	Merge


changeset 4c6eb1390566 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4c6eb1390566
author: asaha
date: Mon Jul 29 12:00:10 2013 -0700

	Merge


changeset 5acb9e506858 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5acb9e506858
author: asaha
date: Tue Jul 30 10:20:57 2013 -0700

	8021899: Re-adjust fix of # 8020498 in 7u45 after mergeing 7u40
	Reviewed-by: chegar


changeset 0547d262d086 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0547d262d086
author: asaha
date: Wed Jul 31 09:58:03 2013 -0700

	Merge


changeset a70540e8a5e9 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a70540e8a5e9
author: asaha
date: Wed Jul 31 23:09:26 2013 -0700

	Merge


changeset feec296936c9 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=feec296936c9
author: asaha
date: Fri Aug 02 15:23:17 2013 -0700

	Added tag jdk7u45-b05 for changeset a70540e8a5e9


changeset a98bcad1f6f0 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a98bcad1f6f0
author: asaha
date: Fri Aug 02 22:27:13 2013 -0700

	Merge


changeset 81ea60e97a31 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=81ea60e97a31
author: asaha
date: Wed Aug 07 12:04:31 2013 -0700

	Merge


changeset 1a2e92866dba in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1a2e92866dba
author: asaha
date: Wed Aug 07 12:24:24 2013 -0700

	Merge


changeset dd5a285302c7 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=dd5a285302c7
author: sjiang
date: Tue Aug 06 16:04:14 2013 +0200

	8019292: Better Attribute Value Exceptions
	Reviewed-by: dfuchs, dholmes, ahgross


changeset cd066f29f36f in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cd066f29f36f
author: malenkov
date: Wed Aug 07 16:51:59 2013 +0400

	8021969: The index_AccessAllowed jnlp can not load successfully with exception thrown in the log.
	Reviewed-by: art, skoivu


changeset 94533c087a66 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=94533c087a66
author: serb
date: Sun Aug 04 16:32:14 2013 +0400

	8021282: Better recycling of object instances
	Reviewed-by: art


changeset 0967554fe14c in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0967554fe14c
author: naoto
date: Thu Aug 01 14:15:27 2013 -0700

	8021286: Improve MacOS resourcing
	Reviewed-by: okutsu


changeset 362a52dcca99 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=362a52dcca99
author: naoto
date: Thu Aug 01 14:15:27 2013 -0700

	8021287: Improve MacOS resourcing
	Reviewed-by: okutsu


changeset ce1e3b62b74e in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ce1e3b62b74e
author: cl
date: Fri Aug 02 19:03:27 2013 -0700

	Added tag jdk7u45-b05 for changeset 362a52dcca99


changeset 5787121ada85 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5787121ada85
author: serb
date: Sun Aug 04 16:32:14 2013 +0400

	8021282: Better recycling of object instances
	Reviewed-by: art


changeset f13f5edb1e09 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f13f5edb1e09
author: asaha
date: Mon Aug 05 11:53:13 2013 -0700

	8022254: Remove incorrect jdk7u45-b05 tag from jdk7u-cpu forest
	Reviewed-by: cl


changeset cb81fafffb8d in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cb81fafffb8d
author: asaha
date: Mon Aug 05 13:48:13 2013 -0700

	Merge


changeset 5d9bbfa0096f in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5d9bbfa0096f
author: sjiang
date: Tue Aug 06 16:04:14 2013 +0200

	8019292: Better Attribute Value Exceptions
	Reviewed-by: dfuchs, dholmes, ahgross


changeset 675b9971b25b in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=675b9971b25b
author: asaha
date: Tue Aug 06 07:34:07 2013 -0700

	Merge


changeset 480b85c53071 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=480b85c53071
author: malenkov
date: Wed Aug 07 16:51:59 2013 +0400

	8021969: The index_AccessAllowed jnlp can not load successfully with exception thrown in the log.
	Reviewed-by: art, skoivu


changeset f39399baf367 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f39399baf367
author: asaha
date: Wed Aug 07 15:12:34 2013 -0700

	Merge


changeset 06345027b0f7 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=06345027b0f7
author: cl
date: Thu Aug 08 23:24:58 2013 -0700

	Added tag jdk7u45-b06 for changeset f39399baf367


changeset 1b96fdac9e9c in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1b96fdac9e9c
author: asaha
date: Mon Aug 12 12:39:39 2013 -0700

	Merge


changeset e87be44883ad in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e87be44883ad
author: jbachorik
date: Thu Aug 08 19:16:27 2013 +0200

	8021360: object not exported" on start of JMXConnectorServer for RMI-IIOP protocol with security manager
	Reviewed-by: alanb, ahgross, smarks, coffeys


changeset 23291ff6e7a7 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=23291ff6e7a7
author: asaha
date: Fri Aug 09 07:41:54 2013 -0700

	Merge


changeset ff72fefa5b8c in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ff72fefa5b8c
author: serb
date: Mon Aug 12 21:33:59 2013 +0400

	8021275: Better screening for ScreenMenu
	Reviewed-by: art


changeset a448d16d000b in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a448d16d000b
author: asaha
date: Mon Aug 12 13:24:54 2013 -0700

	Merge


changeset 4053352342e6 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4053352342e6
author: twisti
date: Mon Aug 12 14:21:11 2013 -0700

	8022066: Evaluation of method reference to signature polymorphic method crashes VM
	Reviewed-by: jrose


changeset a35d4a4ebcfa in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a35d4a4ebcfa
author: ksrini
date: Wed Aug 14 10:17:57 2013 -0700

	8021355: REGRESSION: Five closed/java/awt/SplashScreen tests fail since 7u45 b01 on Linux, Solaris
	Reviewed-by: dholmes, anthony, ahgross, erikj


changeset 868c36150f11 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=868c36150f11
author: cl
date: Thu Aug 15 22:17:20 2013 -0700

	Added tag jdk7u45-b07 for changeset a35d4a4ebcfa


changeset ffe487772a54 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ffe487772a54
author: weijun
date: Sat Aug 17 06:51:46 2013 +0800

	8022931: Enhance Kerberos exceptions
	Reviewed-by: xuelei, ahgross


changeset 12149d2a0a72 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=12149d2a0a72
author: asaha
date: Mon Aug 19 12:45:23 2013 -0700

	Merge


changeset 2f01847eb953 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2f01847eb953
author: erikj
date: Mon Aug 19 17:51:46 2013 +0200

	8015614: Update build settings
	Reviewed-by: tbell, dholmes, ahgross


changeset 8c29637bb097 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8c29637bb097
author: cl
date: Tue Aug 20 10:23:01 2013 -0700

	Added tag jdk7u45-b08 for changeset 2f01847eb953


changeset c33c9d0cbf16 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c33c9d0cbf16
author: asaha
date: Thu Aug 22 08:43:15 2013 -0700

	Merge


changeset 8028c94526f8 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8028c94526f8
author: chegar
date: Fri Aug 09 13:50:13 2013 +0100

	8022661: InetAddress.writeObject() performs flush() on object output stream
	Reviewed-by: michaelm, alanb


changeset 6e2313d45f0c in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6e2313d45f0c
author: asaha
date: Mon Aug 26 08:45:51 2013 -0700

	Merge


changeset 78d2c049f56e in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=78d2c049f56e
author: cl
date: Tue Aug 27 10:57:09 2013 -0700

	Added tag jdk7u45-b09 for changeset 6e2313d45f0c


changeset d4506b816f63 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d4506b816f63
author: asaha
date: Tue Aug 27 15:18:59 2013 -0700

	Merge


changeset afbc9a752e50 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=afbc9a752e50
author: cl
date: Wed Sep 04 11:05:17 2013 -0700

	Added tag jdk7u45-b10 for changeset d4506b816f63


changeset f1969be9db78 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f1969be9db78
author: asaha
date: Wed Sep 04 12:10:32 2013 -0700

	Merge


changeset e045f6a3ad1d in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e045f6a3ad1d
author: coffeys
date: Fri Sep 06 09:38:10 2013 -0700

	8023964: java/io/IOException/LastErrorString.java should be @ignore-d
	Reviewed-by: alanb


changeset 5030eb1a2797 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5030eb1a2797
author: asaha
date: Fri Sep 06 09:40:10 2013 -0700

	Merge


changeset ee87452ba9e2 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ee87452ba9e2
author: sherman
date: Tue Sep 10 15:39:41 2013 -0700

	6614237: missing codepage Cp290 at java runtime
	Summary: to add cp290 and cp300
	Reviewed-by: alanb, coffeys


changeset 8b32ded99544 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8b32ded99544
author: cl
date: Wed Sep 11 11:12:34 2013 -0700

	Added tag jdk7u45-b11 for changeset ee87452ba9e2


changeset 043d8d63ef38 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=043d8d63ef38
author: sherman
date: Thu Sep 12 14:41:14 2013 -0700

	8024668: api/java_nio/charset/Charset/index.html#Methods JCK-runtime test fails with 7u45 b11
	Summary: to add IBM290 into make/sun/nio/cs/FILES_java.gmk
	Reviewed-by: alanb, coffeys


changeset d5e393a55e6a in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d5e393a55e6a
author: bae
date: Fri Sep 13 19:19:55 2013 +0400

	8024697: Fix for 8020983 causes Xcheck:jni warnings
	Reviewed-by: prr, jchen


changeset 05f1f12d7ddb in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=05f1f12d7ddb
author: cl
date: Wed Sep 18 02:16:09 2013 -0700

	Added tag jdk7u45-b12 for changeset d5e393a55e6a


changeset a8f923119eb1 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a8f923119eb1
author: erikj
date: Thu Sep 19 13:32:42 2013 +0200

	8023771: when USER_RELEASE_SUFFIX is set in order to add a string to java -version, build number in the bundles names should not be changed to b00
	Reviewed-by: dholmes, ihse


changeset 34997920efe9 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=34997920efe9
author: erikj
date: Mon Sep 23 17:38:35 2013 +0200

	8025170: jdk7u51 7u-1-prebuild is failing since 9/19
	Reviewed-by: tbell, ihse


changeset 59a78e4ca635 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=59a78e4ca635
author: cl
date: Mon Sep 23 14:31:34 2013 -0700

	Added tag jdk7u45-b13 for changeset 34997920efe9


changeset ae181f7b46ee in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ae181f7b46ee
author: cl
date: Thu Sep 26 10:37:34 2013 -0700

	Added tag jdk7u45-b14 for changeset 59a78e4ca635


changeset 6f6b6f2ee50e in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=6f6b6f2ee50e
author: alanb
date: Wed Sep 18 14:10:24 2013 +0100

	8024883: (se) SelectableChannel.register throws NPE if fd >= 64k (lnx)
	Reviewed-by: alanb, coffeys
	Contributed-by: nmaurer at redhat.com, alan.bateman at oracle.com


changeset 96782fe0c38c in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=96782fe0c38c
author: dxu
date: Fri Sep 27 00:01:04 2013 +0100

	8025128: File.createTempFile fails if prefix is absolute path
	Reviewed-by: alanb, darcy


changeset 3c9a6d9eafd3 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3c9a6d9eafd3
author: cl
date: Fri Sep 27 11:44:40 2013 -0700

	Added tag jdk7u45-b15 for changeset 96782fe0c38c


changeset 26cc60a250a0 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=26cc60a250a0
author: katleman
date: Wed Sep 11 10:59:57 2013 -0700

	Added tag jdk7u40-b61 for changeset e045f6a3ad1d


changeset 5ef3a5490dc7 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5ef3a5490dc7
author: katleman
date: Tue Sep 17 13:05:32 2013 -0700

	Added tag jdk7u40-b62 for changeset 26cc60a250a0


changeset ae5a0572178d in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ae5a0572178d
author: asaha
date: Thu Sep 19 15:01:29 2013 -0700

	Merge


changeset d1eb22609ec2 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d1eb22609ec2
author: asaha
date: Fri Sep 27 13:09:14 2013 -0700

	Merge


changeset 3a65c1b0c6d1 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3a65c1b0c6d1
author: cl
date: Thu Oct 03 11:31:54 2013 -0700

	Added tag jdk7u45-b16 for changeset 3c9a6d9eafd3


changeset c5ca4daec23b in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c5ca4daec23b
author: cl
date: Mon Oct 07 21:52:57 2013 -0700

	Added tag jdk7u45-b17 for changeset 3a65c1b0c6d1


changeset 4797f984f6c9 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4797f984f6c9
author: cl
date: Tue Oct 08 09:07:05 2013 -0700

	Added tag jdk7u45-b18 for changeset c5ca4daec23b


changeset 0d50077be529 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0d50077be529
author: cl
date: Tue Oct 08 10:57:50 2013 -0700

	Added tag jdk7u45-b30 for changeset 4797f984f6c9


changeset 8c343a783777 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8c343a783777
author: asaha
date: Tue Oct 08 11:13:19 2013 -0700

	Merge


changeset 7958751eb9ef in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=7958751eb9ef
author: andrew
date: Wed Oct 16 15:17:14 2013 +0100

	Merge jdk7u45-b31


diffstat:

 .hgtags                                                                                            |   111 +
 .jcheck/conf                                                                                       |     2 -
 make/altclasses/Makefile                                                                           |     3 +-
 make/bridge/Jabswitch/Makefile                                                                     |     2 +-
 make/com/oracle/jfr/Makefile                                                                       |    22 +-
 make/com/sun/Makefile                                                                              |     2 +-
 make/com/sun/java/pack/Makefile                                                                    |     9 +-
 make/com/sun/jmx/Makefile                                                                          |     6 +-
 make/com/sun/nio/sctp/Makefile                                                                     |     2 +
 make/com/sun/security/Makefile                                                                     |     2 +-
 make/com/sun/security/ntlm/Makefile                                                                |    39 +
 make/com/sun/servicetag/Makefile                                                                   |    80 -
 make/common/Defs-linux.gmk                                                                         |    50 +-
 make/common/Defs-windows.gmk                                                                       |    39 +-
 make/common/Defs.gmk                                                                               |     7 +-
 make/common/Demo.gmk                                                                               |    12 +
 make/common/Library.gmk                                                                            |    40 +-
 make/common/Program.gmk                                                                            |    85 +-
 make/common/Release.gmk                                                                            |    56 +-
 make/common/shared/Compiler-gcc.gmk                                                                |    76 +-
 make/common/shared/Defs-java.gmk                                                                   |    13 +-
 make/common/shared/Defs-linux.gmk                                                                  |     5 +
 make/common/shared/Defs-macosx.gmk                                                                 |     5 +
 make/common/shared/Defs-solaris.gmk                                                                |     5 +
 make/common/shared/Defs-versions.gmk                                                               |     2 +-
 make/common/shared/Defs.gmk                                                                        |    14 +-
 make/common/shared/Platform.gmk                                                                    |     9 +
 make/common/shared/Sanity.gmk                                                                      |     8 +
 make/docs/Makefile                                                                                 |    14 +-
 make/java/java/mapfile-vers                                                                        |    13 +-
 make/java/jli/Makefile                                                                             |     4 +-
 make/java/management/mapfile-vers                                                                  |     2 +-
 make/java/net/FILES_c.gmk                                                                          |     7 +
 make/java/net/Makefile                                                                             |    26 +-
 make/java/nio/Makefile                                                                             |   232 +-
 make/java/nio/mapfile-bsd                                                                          |     5 -
 make/java/nio/mapfile-linux                                                                        |     4 +-
 make/java/nio/mapfile-solaris                                                                      |    18 +-
 make/java/security/Makefile                                                                        |    15 +-
 make/java/sun_nio/Makefile                                                                         |     2 +-
 make/java/version/Makefile                                                                         |     5 +
 make/java/zip/Makefile                                                                             |     6 +-
 make/java/zip/mapfile-vers                                                                         |     4 -
 make/javax/crypto/Makefile                                                                         |     7 +-
 make/javax/sound/SoundDefs.gmk                                                                     |    52 +
 make/jdk_generic_profile.sh                                                                        |   108 +-
 make/jprt.properties                                                                               |    16 +-
 make/netbeans/jconsole/build.xml                                                                   |     1 +
 make/sun/awt/FILES_c_macosx.gmk                                                                    |    28 -
 make/sun/awt/FILES_c_unix.gmk                                                                      |    10 +
 make/sun/awt/FILES_export_macosx.gmk                                                               |    29 -
 make/sun/awt/Makefile                                                                              |     4 +-
 make/sun/awt/mawt.gmk                                                                              |    39 +-
 make/sun/cmm/lcms/FILES_c_unix.gmk                                                                 |     7 +-
 make/sun/cmm/lcms/Makefile                                                                         |     8 +-
 make/sun/font/Makefile                                                                             |    12 +-
 make/sun/javazic/tzdata/VERSION                                                                    |     2 +-
 make/sun/javazic/tzdata/africa                                                                     |    16 +-
 make/sun/javazic/tzdata/antarctica                                                                 |    42 +-
 make/sun/javazic/tzdata/asia                                                                       |   102 +-
 make/sun/javazic/tzdata/australasia                                                                |    41 +-
 make/sun/javazic/tzdata/europe                                                                     |     8 +-
 make/sun/javazic/tzdata/iso3166.tab                                                                |    17 +-
 make/sun/javazic/tzdata/southamerica                                                               |    14 +-
 make/sun/javazic/tzdata/zone.tab                                                                   |    14 +-
 make/sun/jawt/Makefile                                                                             |    14 +-
 make/sun/jconsole/FILES.gmk                                                                        |    29 +-
 make/sun/jconsole/Makefile                                                                         |     8 +-
 make/sun/jpeg/FILES_c.gmk                                                                          |     6 +-
 make/sun/jpeg/Makefile                                                                             |    11 +-
 make/sun/lwawt/FILES_c_macosx.gmk                                                                  |     6 +
 make/sun/lwawt/Makefile                                                                            |     7 +-
 make/sun/native2ascii/Makefile                                                                     |     2 +-
 make/sun/net/FILES_java.gmk                                                                        |     1 +
 make/sun/nio/cs/FILES_java.gmk                                                                     |     1 +
 make/sun/nio/cs/Makefile                                                                           |     2 +-
 make/sun/rmi/cgi/Makefile                                                                          |     2 +
 make/sun/rmi/registry/Makefile                                                                     |     3 +
 make/sun/rmi/rmi/Makefile                                                                          |    34 +-
 make/sun/rmi/rmi/mapfile-vers                                                                      |    33 -
 make/sun/rmi/rmid/Makefile                                                                         |     2 +
 make/sun/security/Makefile                                                                         |    11 +-
 make/sun/security/krb5/internal/ccache/Makefile                                                    |    49 +
 make/sun/security/pkcs11/mapfile-vers                                                              |     8 +-
 make/sun/splashscreen/FILES_c.gmk                                                                  |    78 +-
 make/sun/splashscreen/Makefile                                                                     |    38 +-
 make/sun/xawt/FILES_c_unix.gmk                                                                     |    20 +
 make/sun/xawt/Makefile                                                                             |    62 +-
 make/tools/CharsetMapping/GBK.map                                                                  |  1080 +-
 make/tools/CharsetMapping/IBM290.c2b                                                               |   100 +
 make/tools/CharsetMapping/IBM290.map                                                               |   232 +
 make/tools/CharsetMapping/MS936.map                                                                |  1105 +-
 make/tools/CharsetMapping/extsbcs                                                                  |     1 +
 make/tools/Makefile                                                                                |     9 +
 make/tools/freetypecheck/Makefile                                                                  |     2 +-
 make/tools/generate_nimbus/Makefile                                                                |     1 +
 make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java                                      |    22 +-
 make/tools/src/build/tools/compileproperties/CompileProperties.java                                |     9 +-
 make/tools/src/build/tools/dirdiff/DirDiff.java                                                    |     4 +-
 make/tools/src/build/tools/dtdbuilder/DTDBuilder.java                                              |    34 +-
 make/tools/src/build/tools/dtdbuilder/DTDInputStream.java                                          |     6 +-
 make/tools/src/build/tools/dtdbuilder/DTDParser.java                                               |    44 +-
 make/tools/src/build/tools/dtdbuilder/PublicMapping.java                                           |     6 +-
 make/tools/src/build/tools/generatebreakiteratordata/CharSet.java                                  |    16 +-
 make/tools/src/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java      |     8 +-
 make/tools/src/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java                |     6 +-
 make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java            |   201 +-
 make/tools/src/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java               |     6 +-
 make/tools/src/build/tools/generatecharacter/GenerateCharacter.java                                |     4 +-
 make/tools/src/build/tools/generatecharacter/SpecialCaseMap.java                                   |   147 +-
 make/tools/src/build/tools/generatecharacter/UnicodeSpec.java                                      |    22 +-
 make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java                          |     4 +-
 make/tools/src/build/tools/hasher/Hasher.java                                                      |    38 +-
 make/tools/src/build/tools/jarsplit/JarSplit.java                                                  |     5 +-
 make/tools/src/build/tools/javazic/Gen.java                                                        |    14 +-
 make/tools/src/build/tools/javazic/GenDoc.java                                                     |    16 +-
 make/tools/src/build/tools/javazic/Main.java                                                       |     3 +-
 make/tools/src/build/tools/javazic/Rule.java                                                       |     2 +-
 make/tools/src/build/tools/javazic/Simple.java                                                     |    23 +-
 make/tools/src/build/tools/javazic/Time.java                                                       |    10 +-
 make/tools/src/build/tools/javazic/Zoneinfo.java                                                   |    18 +-
 make/tools/src/build/tools/jdwpgen/AbstractCommandNode.java                                        |     7 +-
 make/tools/src/build/tools/jdwpgen/AbstractGroupNode.java                                          |     7 +-
 make/tools/src/build/tools/jdwpgen/AbstractNamedNode.java                                          |    14 +-
 make/tools/src/build/tools/jdwpgen/AbstractTypeListNode.java                                       |    26 +-
 make/tools/src/build/tools/jdwpgen/AltNode.java                                                    |     4 +-
 make/tools/src/build/tools/jdwpgen/CommandSetNode.java                                             |    11 +-
 make/tools/src/build/tools/jdwpgen/ConstantSetNode.java                                            |     9 +-
 make/tools/src/build/tools/jdwpgen/ErrorSetNode.java                                               |     9 +-
 make/tools/src/build/tools/jdwpgen/Node.java                                                       |    25 +-
 make/tools/src/build/tools/jdwpgen/OutNode.java                                                    |    14 +-
 make/tools/src/build/tools/jdwpgen/RootNode.java                                                   |    10 +-
 make/tools/src/build/tools/jdwpgen/SelectNode.java                                                 |    10 +-
 make/tools/src/build/tools/makeclasslist/MakeClasslist.java                                        |    15 +-
 make/tools/src/build/tools/stripproperties/StripProperties.java                                    |     4 +-
 src/bsd/doc/man/java.1                                                                             |   577 +-
 src/bsd/doc/man/jcmd.1                                                                             |   113 +
 src/linux/doc/man/ja/java.1                                                                        |  1334 +-
 src/linux/doc/man/ja/jcmd.1                                                                        |   172 +-
 src/linux/doc/man/java.1                                                                           |   467 +-
 src/linux/doc/man/jcmd.1                                                                           |    79 +-
 src/macosx/bin/java_md_macosx.c                                                                    |    53 +-
 src/macosx/classes/com/apple/eawt/FullScreenHandler.java                                           |     3 +-
 src/macosx/classes/com/apple/eawt/_AppEventHandler.java                                            |   100 +-
 src/macosx/classes/com/apple/eawt/event/GestureHandler.java                                        |     4 +-
 src/macosx/classes/com/apple/laf/AquaButtonBorder.java                                             |     9 +-
 src/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java                                      |    40 +-
 src/macosx/classes/com/apple/laf/AquaComboBoxUI.java                                               |    24 +-
 src/macosx/classes/com/apple/laf/AquaLookAndFeel.java                                              |     4 +-
 src/macosx/classes/com/apple/laf/AquaPainter.java                                                  |   123 +-
 src/macosx/classes/com/apple/laf/AquaPanelUI.java                                                  |    10 +
 src/macosx/classes/com/apple/laf/AquaRootPaneUI.java                                               |     8 +
 src/macosx/classes/com/apple/laf/AquaToolBarUI.java                                                |    12 +-
 src/macosx/classes/com/apple/laf/AquaUtils.java                                                    |   233 +-
 src/macosx/classes/com/apple/laf/ImageCache.java                                                   |    78 +-
 src/macosx/classes/com/apple/laf/ScreenMenu.java                                                   |   153 +-
 src/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties                                   |     2 +-
 src/macosx/classes/com/apple/resources/MacOSXResourceBundle.java                                   |   110 -
 src/macosx/classes/java/util/prefs/MacOSXPreferences.java                                          |    72 +-
 src/macosx/classes/java/util/prefs/MacOSXPreferencesFile.java                                      |    24 +-
 src/macosx/classes/sun/awt/CGraphicsConfig.java                                                    |     2 +-
 src/macosx/classes/sun/awt/CGraphicsDevice.java                                                    |    98 +-
 src/macosx/classes/sun/awt/CGraphicsEnvironment.java                                               |    75 +-
 src/macosx/classes/sun/font/CCharToGlyphMapper.java                                                |   145 +-
 src/macosx/classes/sun/font/CFontManager.java                                                      |     8 +-
 src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java                                        |    69 +-
 src/macosx/classes/sun/java2d/opengl/CGLLayer.java                                                 |    14 +-
 src/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java                                           |    71 +-
 src/macosx/classes/sun/lwawt/LWComponentPeer.java                                                  |   141 +-
 src/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java                                       |    86 +-
 src/macosx/classes/sun/lwawt/LWRepaintArea.java                                                    |     3 -
 src/macosx/classes/sun/lwawt/LWScrollBarPeer.java                                                  |     4 +-
 src/macosx/classes/sun/lwawt/LWTextAreaPeer.java                                                   |    10 -
 src/macosx/classes/sun/lwawt/LWTextComponentPeer.java                                              |     2 +-
 src/macosx/classes/sun/lwawt/LWToolkit.java                                                        |    31 +-
 src/macosx/classes/sun/lwawt/LWWindowPeer.java                                                     |   368 +-
 src/macosx/classes/sun/lwawt/PlatformComponent.java                                                |    33 +-
 src/macosx/classes/sun/lwawt/PlatformEventNotifier.java                                            |     4 +-
 src/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java                                         |     4 +-
 src/macosx/classes/sun/lwawt/macosx/CClipboard.java                                                |     8 +
 src/macosx/classes/sun/lwawt/macosx/CCursorManager.java                                            |    36 -
 src/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java                                    |   138 +-
 src/macosx/classes/sun/lwawt/macosx/CDropTarget.java                                               |    21 +-
 src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java                                            |    47 +-
 src/macosx/classes/sun/lwawt/macosx/CFRetainedResource.java                                        |     4 +-
 src/macosx/classes/sun/lwawt/macosx/CFileDialog.java                                               |     8 +-
 src/macosx/classes/sun/lwawt/macosx/CMouseInfoPeer.java                                            |     7 +-
 src/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java                                        |    40 +-
 src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java                                    |    16 +-
 src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java                                        |    25 +-
 src/macosx/classes/sun/lwawt/macosx/CPlatformView.java                                             |    74 +-
 src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java                                           |   166 +-
 src/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java                                        |     2 +-
 src/macosx/classes/sun/lwawt/macosx/CPrinterJob.java                                               |    66 +-
 src/macosx/classes/sun/lwawt/macosx/CRobot.java                                                    |     8 +-
 src/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java                              |    36 +-
 src/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java                                        |   102 +
 src/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java                                |   225 +
 src/macosx/classes/sun/lwawt/macosx/CWarningWindow.java                                            |    23 +-
 src/macosx/classes/sun/lwawt/macosx/CWrapper.java                                                  |     1 +
 src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java                                                |   138 +-
 src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java                                              |    52 +-
 src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java                                              |     7 +-
 src/macosx/javavm/export/jawt_md.h                                                                 |   110 +
 src/macosx/javavm/export/jni_md.h                                                                  |    41 +
 src/macosx/javavm/export/jvm_md.h                                                                  |    81 +
 src/macosx/lib/flavormap.properties                                                                |     6 +-
 src/macosx/native/com/apple/laf/JRSUIController.m                                                  |     3 +-
 src/macosx/native/com/apple/resources/MacOSXResourceBundle.m                                       |   110 -
 src/macosx/native/java/util/MacOSXPreferencesFile.m                                                |    11 +-
 src/macosx/native/sun/awt/AWTEvent.h                                                               |     3 +-
 src/macosx/native/sun/awt/AWTEvent.m                                                               |   100 +-
 src/macosx/native/sun/awt/AWTSurfaceLayers.h                                                       |     3 +-
 src/macosx/native/sun/awt/AWTSurfaceLayers.m                                                       |    25 +-
 src/macosx/native/sun/awt/AWTView.m                                                                |   145 +-
 src/macosx/native/sun/awt/AWTWindow.h                                                              |     6 +
 src/macosx/native/sun/awt/AWTWindow.m                                                              |   226 +-
 src/macosx/native/sun/awt/ApplicationDelegate.m                                                    |    69 +-
 src/macosx/native/sun/awt/CClipboard.m                                                             |    39 +-
 src/macosx/native/sun/awt/CCursorManager.m                                                         |    23 +-
 src/macosx/native/sun/awt/CDesktopPeer.m                                                           |     4 -
 src/macosx/native/sun/awt/CDragSource.h                                                            |    25 +-
 src/macosx/native/sun/awt/CDragSource.m                                                            |    78 +-
 src/macosx/native/sun/awt/CDragSourceContextPeer.m                                                 |    47 +-
 src/macosx/native/sun/awt/CDropTarget.m                                                            |    30 +-
 src/macosx/native/sun/awt/CFileDialog.h                                                            |     4 +
 src/macosx/native/sun/awt/CFileDialog.m                                                            |     8 +-
 src/macosx/native/sun/awt/CGraphicsDevice.m                                                        |    77 +-
 src/macosx/native/sun/awt/CGraphicsEnv.m                                                           |     7 +-
 src/macosx/native/sun/awt/CImage.m                                                                 |     9 +-
 src/macosx/native/sun/awt/CInputMethod.m                                                           |    12 +-
 src/macosx/native/sun/awt/CMenu.m                                                                  |    14 +-
 src/macosx/native/sun/awt/CMenuBar.m                                                               |    15 +-
 src/macosx/native/sun/awt/CMenuComponent.h                                                         |     2 +-
 src/macosx/native/sun/awt/CMenuComponent.m                                                         |     8 +-
 src/macosx/native/sun/awt/CMenuItem.m                                                              |    46 +-
 src/macosx/native/sun/awt/CPopupMenu.m                                                             |     4 +-
 src/macosx/native/sun/awt/CRobot.m                                                                 |     4 +-
 src/macosx/native/sun/awt/CTextPipe.m                                                              |    37 +-
 src/macosx/native/sun/awt/CTrayIcon.m                                                              |    14 +-
 src/macosx/native/sun/awt/CWrapper.m                                                               |   158 +-
 src/macosx/native/sun/awt/JavaComponentAccessibility.m                                             |    28 +-
 src/macosx/native/sun/awt/LWCToolkit.h                                                             |     2 -
 src/macosx/native/sun/awt/LWCToolkit.m                                                             |   110 +-
 src/macosx/native/sun/awt/awt.m                                                                    |   200 +-
 src/macosx/native/sun/awt/jawt.m                                                                   |     4 +-
 src/macosx/native/sun/font/CoreTextSupport.h                                                       |     2 +-
 src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m                                            |    26 +-
 src/macosx/native/sun/java2d/opengl/CGLLayer.m                                                     |    59 +-
 src/macosx/native/sun/osxapp/QueuingApplicationDelegate.m                                          |     8 +-
 src/macosx/native/sun/osxapp/ThreadUtilities.h                                                     |    17 +-
 src/macosx/native/sun/osxapp/ThreadUtilities.m                                                     |   197 +-
 src/share/back/debugInit.c                                                                         |    35 +-
 src/share/back/error_messages.c                                                                    |    11 +-
 src/share/back/transport.c                                                                         |     6 +-
 src/share/bin/java.c                                                                               |    15 +-
 src/share/classes/com/sun/accessibility/internal/resources/accessibility.properties                |     2 +-
 src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties             |     2 +-
 src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties             |     2 +-
 src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties             |     2 +-
 src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties             |     2 +-
 src/share/classes/com/sun/accessibility/internal/resources/accessibility_ja.properties             |     2 +-
 src/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties             |     2 +-
 src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties          |     2 +-
 src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties             |     2 +-
 src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties          |     2 +-
 src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties          |     2 +-
 src/share/classes/com/sun/beans/TypeResolver.java                                                  |   169 +-
 src/share/classes/com/sun/beans/finder/AbstractFinder.java                                         |    21 +-
 src/share/classes/com/sun/beans/finder/ConstructorFinder.java                                      |    15 +-
 src/share/classes/com/sun/beans/finder/MethodFinder.java                                           |    10 +-
 src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java                                      |     6 +-
 src/share/classes/com/sun/crypto/provider/DHPrivateKey.java                                        |    18 +-
 src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java                                            |    26 +-
 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java                                |     7 +-
 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java                                |     6 +-
 src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java                                       |     3 +-
 src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java                                  |    11 +-
 src/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java                                      |    40 +-
 src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java                                        |     5 +-
 src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties                          |     2 +-
 src/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java                            |    16 +-
 src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java                              |    11 +-
 src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties                         |    10 +-
 src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties                      |    10 +-
 src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties                      |    10 +-
 src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties                      |    10 +-
 src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties                      |    10 +-
 src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties                      |    10 +-
 src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties                      |    10 +-
 src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties                   |    10 +-
 src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties                      |    10 +-
 src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties                   |    10 +-
 src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties                   |    10 +-
 src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java                        |    12 +-
 src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java                          |    25 +-
 src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java                        |     5 +
 src/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java                               |     5 +
 src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties                     |     8 +-
 src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties                  |     8 +-
 src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties                  |     8 +-
 src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties                  |     8 +-
 src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties                  |     8 +-
 src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties                  |     8 +-
 src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties                  |     8 +-
 src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties               |     8 +-
 src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties                  |     8 +-
 src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties               |    14 +-
 src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties               |     8 +-
 src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java                              |    46 +-
 src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java                 |     2 +
 src/share/classes/com/sun/jndi/dns/DnsContextFactory.java                                          |     2 +-
 src/share/classes/com/sun/jndi/ldap/Connection.java                                                |    10 +-
 src/share/classes/com/sun/jndi/ldap/LdapClient.java                                                |   264 +-
 src/share/classes/com/sun/jndi/ldap/VersionHelper12.java                                           |    17 +-
 src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java                                  |     5 +
 src/share/classes/com/sun/naming/internal/ResourceManager.java                                     |    42 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java        |   280 +
 src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java               |     2 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java      |     1 -
 src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java                       |    13 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java                 |    14 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java          |     5 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java                |     3 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java      |    21 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java        |     5 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java             |    39 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java        |     6 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java        |   280 +
 src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java               |     1 -
 src/share/classes/com/sun/org/apache/xml/internal/security/utils/ClassLoaderUtils.java             |   277 -
 src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java                 |    12 +
 src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java  |    15 +-
 src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java                                       |    12 +-
 src/share/classes/com/sun/rmi/rmid/ExecPermission.java                                             |    10 +-
 src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties                             |     2 +-
 src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties                             |     8 +-
 src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java                                 |     2 +-
 src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java                          |     8 +-
 src/share/classes/com/sun/script/javascript/RhinoTopLevel.java                                     |     3 +-
 src/share/classes/com/sun/script/util/InterfaceImplementor.java                                    |    29 +-
 src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java                                |    19 +-
 src/share/classes/com/sun/security/ntlm/Client.java                                                |     3 +-
 src/share/classes/com/sun/security/ntlm/NTLM.java                                                  |    12 +-
 src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Base.java                                   |     3 +-
 src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java                                 |     1 -
 src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java                                 |     1 -
 src/share/classes/com/sun/servicetag/BrowserSupport.java                                           |   199 -
 src/share/classes/com/sun/servicetag/Installer.java                                                |   972 --
 src/share/classes/com/sun/servicetag/LinuxSystemEnvironment.java                                   |   193 -
 src/share/classes/com/sun/servicetag/RegistrationData.java                                         |   475 -
 src/share/classes/com/sun/servicetag/RegistrationDocument.java                                     |   368 -
 src/share/classes/com/sun/servicetag/Registry.java                                                 |   556 -
 src/share/classes/com/sun/servicetag/ServiceTag.java                                               |   634 -
 src/share/classes/com/sun/servicetag/SolarisServiceTag.java                                        |    62 -
 src/share/classes/com/sun/servicetag/SolarisSystemEnvironment.java                                 |   159 -
 src/share/classes/com/sun/servicetag/SunConnection.java                                            |   305 -
 src/share/classes/com/sun/servicetag/SystemEnvironment.java                                        |   338 -
 src/share/classes/com/sun/servicetag/UnauthorizedAccessException.java                              |    53 -
 src/share/classes/com/sun/servicetag/Util.java                                                     |   339 -
 src/share/classes/com/sun/servicetag/WindowsSystemEnvironment.java                                 |   150 -
 src/share/classes/com/sun/servicetag/package.html                                                  |    71 -
 src/share/classes/com/sun/servicetag/resources/Putback-Notes.txt                                   |    25 -
 src/share/classes/com/sun/servicetag/resources/javase_5_swordfish.properties                       |    29 -
 src/share/classes/com/sun/servicetag/resources/javase_6_swordfish.properties                       |    29 -
 src/share/classes/com/sun/servicetag/resources/javase_7_swordfish.properties                       |    29 -
 src/share/classes/com/sun/servicetag/resources/jdk_header.png                                      |   Bin 
 src/share/classes/com/sun/servicetag/resources/product_registration.xsd                            |   301 -
 src/share/classes/com/sun/servicetag/resources/register.html                                       |   105 -
 src/share/classes/com/sun/servicetag/resources/register_ja.html                                    |    91 -
 src/share/classes/com/sun/servicetag/resources/register_zh_CN.html                                 |    92 -
 src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties                     |   373 +-
 src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties                  |     3 +
 src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties                  |     3 +
 src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties                  |     3 +
 src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties                  |     3 +
 src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties                  |     3 +
 src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties                  |     3 +
 src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties               |     5 +-
 src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties                  |     3 +
 src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties               |     3 +
 src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties               |     3 +
 src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties                     |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties                  |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties                  |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties                  |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties                  |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties                  |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties                  |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties               |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties                  |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties               |    14 +-
 src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties               |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties                     |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties                  |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties                  |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties                  |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties                  |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties                  |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties                  |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties               |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties                  |     8 +-
 src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties               |    14 +-
 src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties               |     8 +-
 src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java                             |     2 +-
 src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java                          |     4 +-
 src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java                           |     2 +-
 src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java                                |    10 +-
 src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java                                |    10 +-
 src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java                       |     4 +-
 src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java                                   |     5 +-
 src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java                                  |    15 +-
 src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java                              |    17 +-
 src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java                           |     6 +-
 src/share/classes/com/sun/tools/jdi/AbstractLauncher.java                                          |     2 +-
 src/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java                                    |     2 +-
 src/share/classes/java/awt/Component.java                                                          |     2 +-
 src/share/classes/java/awt/GraphicsDevice.java                                                     |     6 +
 src/share/classes/java/awt/KeyboardFocusManager.java                                               |     2 +-
 src/share/classes/java/awt/TextComponent.java                                                      |     7 +-
 src/share/classes/java/awt/Toolkit.java                                                            |    10 +-
 src/share/classes/java/awt/color/ICC_Profile.java                                                  |     4 +-
 src/share/classes/java/awt/datatransfer/DataFlavor.java                                            |    46 +-
 src/share/classes/java/awt/image/BufferedImage.java                                                |    38 +-
 src/share/classes/java/awt/image/ComponentSampleModel.java                                         |    16 +-
 src/share/classes/java/awt/image/PixelInterleavedSampleModel.java                                  |    10 +-
 src/share/classes/java/awt/image/Raster.java                                                       |    15 +-
 src/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java                                      |     8 +
 src/share/classes/java/beans/Beans.java                                                            |     6 +
 src/share/classes/java/beans/DefaultPersistenceDelegate.java                                       |     3 +
 src/share/classes/java/beans/IndexedPropertyDescriptor.java                                        |     7 +-
 src/share/classes/java/beans/Introspector.java                                                     |   114 +-
 src/share/classes/java/beans/MetaData.java                                                         |   166 +-
 src/share/classes/java/beans/PropertyDescriptor.java                                               |    13 +-
 src/share/classes/java/beans/ReflectionUtils.java                                                  |    75 -
 src/share/classes/java/beans/XMLEncoder.java                                                       |    35 +-
 src/share/classes/java/io/File.java                                                                |   161 +-
 src/share/classes/java/io/FileInputStream.java                                                     |    44 +-
 src/share/classes/java/io/FileOutputStream.java                                                    |    43 +-
 src/share/classes/java/io/InputStream.java                                                         |     2 +-
 src/share/classes/java/io/ObjectInputStream.java                                                   |    20 +-
 src/share/classes/java/io/ObjectOutputStream.java                                                  |    20 +-
 src/share/classes/java/io/ObjectStreamClass.java                                                   |     8 +-
 src/share/classes/java/io/ObjectStreamField.java                                                   |     8 +-
 src/share/classes/java/io/RandomAccessFile.java                                                    |    65 +-
 src/share/classes/java/lang/Class.java                                                             |    12 +-
 src/share/classes/java/lang/ClassLoader.java                                                       |     8 +
 src/share/classes/java/lang/Integer.java                                                           |     2 +-
 src/share/classes/java/lang/ProcessBuilder.java                                                    |     5 +-
 src/share/classes/java/lang/System.java                                                            |     4 +
 src/share/classes/java/lang/Thread.java                                                            |    24 +-
 src/share/classes/java/lang/Throwable.java                                                         |     9 +-
 src/share/classes/java/lang/invoke/AdapterMethodHandle.java                                        |  1204 --
 src/share/classes/java/lang/invoke/BoundMethodHandle.java                                          |   945 +-
 src/share/classes/java/lang/invoke/CallSite.java                                                   |    40 +-
 src/share/classes/java/lang/invoke/CountingMethodHandle.java                                       |    50 -
 src/share/classes/java/lang/invoke/DirectMethodHandle.java                                         |   646 +-
 src/share/classes/java/lang/invoke/DontInline.java                                                 |    37 +
 src/share/classes/java/lang/invoke/FilterGeneric.java                                              |  4500 ----------
 src/share/classes/java/lang/invoke/FilterOneArgument.java                                          |    84 -
 src/share/classes/java/lang/invoke/ForceInline.java                                                |    37 +
 src/share/classes/java/lang/invoke/FromGeneric.java                                                |   633 -
 src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java                                   |  1078 ++
 src/share/classes/java/lang/invoke/Invokers.java                                                   |   351 +-
 src/share/classes/java/lang/invoke/LambdaForm.java                                                 |  1625 +++
 src/share/classes/java/lang/invoke/MemberName.java                                                 |   483 +-
 src/share/classes/java/lang/invoke/MethodHandle.java                                               |   316 +-
 src/share/classes/java/lang/invoke/MethodHandleImpl.java                                           |  1540 +--
 src/share/classes/java/lang/invoke/MethodHandleInfo.java                                           |    71 +
 src/share/classes/java/lang/invoke/MethodHandleNatives.java                                        |   434 +-
 src/share/classes/java/lang/invoke/MethodHandleProxies.java                                        |     2 +-
 src/share/classes/java/lang/invoke/MethodHandleStatics.java                                        |    50 +-
 src/share/classes/java/lang/invoke/MethodHandles.java                                              |   603 +-
 src/share/classes/java/lang/invoke/MethodType.java                                                 |   415 +-
 src/share/classes/java/lang/invoke/MethodTypeForm.java                                             |   273 +-
 src/share/classes/java/lang/invoke/SimpleMethodHandle.java                                         |    70 +
 src/share/classes/java/lang/invoke/SpreadGeneric.java                                              |   682 -
 src/share/classes/java/lang/invoke/ToGeneric.java                                                  |  1066 --
 src/share/classes/java/lang/invoke/WrongMethodTypeException.java                                   |    23 +
 src/share/classes/java/lang/invoke/package-info.java                                               |     7 +
 src/share/classes/java/lang/reflect/Proxy.java                                                     |    16 +-
 src/share/classes/java/net/HttpCookie.java                                                         |    33 +-
 src/share/classes/java/net/InMemoryCookieStore.java                                                |     6 +-
 src/share/classes/java/net/Inet6Address.java                                                       |   463 +-
 src/share/classes/java/net/InetAddress.java                                                        |     8 +-
 src/share/classes/java/net/SocketInputStream.java                                                  |     9 +-
 src/share/classes/java/net/SocketOutputStream.java                                                 |     6 +
 src/share/classes/java/net/SocksSocketImpl.java                                                    |     4 +-
 src/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java                             |    59 +-
 src/share/classes/java/security/Policy.java                                                        |     1 -
 src/share/classes/java/security/Signature.java                                                     |     4 +-
 src/share/classes/java/text/CalendarBuilder.java                                                   |    11 +-
 src/share/classes/java/text/DateFormatSymbols.java                                                 |    24 +-
 src/share/classes/java/text/SimpleDateFormat.java                                                  |     4 +-
 src/share/classes/java/util/AbstractCollection.java                                                |    14 +-
 src/share/classes/java/util/ArrayList.java                                                         |    86 +-
 src/share/classes/java/util/EnumMap.java                                                           |     1 +
 src/share/classes/java/util/HashMap.java                                                           |   197 +-
 src/share/classes/java/util/Hashtable.java                                                         |    85 +-
 src/share/classes/java/util/LocaleISOData.java                                                     |     2 +-
 src/share/classes/java/util/TimeZone.java                                                          |    87 +-
 src/share/classes/java/util/WeakHashMap.java                                                       |     3 +-
 src/share/classes/java/util/concurrent/FutureTask.java                                             |   540 +-
 src/share/classes/java/util/concurrent/PriorityBlockingQueue.java                                  |   155 +-
 src/share/classes/java/util/logging/LogManager.java                                                |   138 +-
 src/share/classes/java/util/logging/Logger.java                                                    |   155 +-
 src/share/classes/java/util/logging/LoggingProxyImpl.java                                          |     5 +
 src/share/classes/java/util/zip/Deflater.java                                                      |    18 +-
 src/share/classes/java/util/zip/Inflater.java                                                      |    15 +-
 src/share/classes/javax/accessibility/AccessibleAction.java                                        |     2 +-
 src/share/classes/javax/crypto/Cipher.java                                                         |   172 +-
 src/share/classes/javax/management/BadAttributeValueExpException.java                              |    26 +-
 src/share/classes/javax/management/MBeanNotificationInfo.java                                      |    17 +-
 src/share/classes/javax/management/MBeanTrustPermission.java                                       |    31 +-
 src/share/classes/javax/management/modelmbean/RequiredModelMBean.java                              |    10 +-
 src/share/classes/javax/management/remote/JMXPrincipal.java                                        |    23 +-
 src/share/classes/javax/management/remote/JMXServiceURL.java                                       |    99 +-
 src/share/classes/javax/management/remote/NotificationResult.java                                  |    54 +-
 src/share/classes/javax/management/remote/TargetedNotification.java                                |    30 +-
 src/share/classes/javax/management/remote/rmi/RMIConnector.java                                    |    29 +-
 src/share/classes/javax/management/remote/rmi/RMIServerImpl.java                                   |     9 +
 src/share/classes/javax/security/auth/Subject.java                                                 |     8 +-
 src/share/classes/javax/security/auth/kerberos/KeyTab.java                                         |    15 +-
 src/share/classes/javax/swing/DefaultComboBoxModel.java                                            |     5 +-
 src/share/classes/javax/swing/JColorChooser.java                                                   |     4 +
 src/share/classes/javax/swing/JComponent.java                                                      |    51 +-
 src/share/classes/javax/swing/JDesktopPane.java                                                    |    11 +-
 src/share/classes/javax/swing/JDialog.java                                                         |     3 +-
 src/share/classes/javax/swing/JEditorPane.java                                                     |    11 +-
 src/share/classes/javax/swing/JFrame.java                                                          |    10 +-
 src/share/classes/javax/swing/JInternalFrame.java                                                  |     6 +-
 src/share/classes/javax/swing/JPopupMenu.java                                                      |    10 +-
 src/share/classes/javax/swing/JTable.java                                                          |    25 +-
 src/share/classes/javax/swing/JToolTip.java                                                        |     6 +
 src/share/classes/javax/swing/JViewport.java                                                       |    10 +-
 src/share/classes/javax/swing/KeyboardManager.java                                                 |     5 +-
 src/share/classes/javax/swing/MenuSelectionManager.java                                            |     5 +-
 src/share/classes/javax/swing/PopupFactory.java                                                    |    14 +-
 src/share/classes/javax/swing/RepaintManager.java                                                  |    34 +-
 src/share/classes/javax/swing/SwingUtilities.java                                                  |     8 +-
 src/share/classes/javax/swing/SwingWorker.java                                                     |     2 +-
 src/share/classes/javax/swing/TimerQueue.java                                                      |     5 +-
 src/share/classes/javax/swing/ToolTipManager.java                                                  |    50 +-
 src/share/classes/javax/swing/UIDefaults.java                                                      |    12 +-
 src/share/classes/javax/swing/colorchooser/ColorChooserPanel.java                                  |     1 +
 src/share/classes/javax/swing/colorchooser/ColorPanel.java                                         |    14 +-
 src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java                          |   138 +-
 src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java                                  |     1 +
 src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java                                      |    71 +-
 src/share/classes/javax/swing/plaf/basic/BasicListUI.java                                          |     5 +-
 src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java                                     |     7 +-
 src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java                                     |    16 +-
 src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java                                    |     2 +
 src/share/classes/javax/swing/plaf/basic/BasicTableUI.java                                         |    14 +-
 src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java                                          |    86 +-
 src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java                                   |    12 +-
 src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java                                     |     3 -
 src/share/classes/javax/swing/plaf/synth/ImagePainter.java                                         |     5 +-
 src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java                                     |     3 +-
 src/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java                                     |     1 +
 src/share/classes/javax/swing/text/DefaultCaret.java                                               |     6 +-
 src/share/classes/javax/swing/text/DefaultFormatter.java                                           |     8 +-
 src/share/classes/javax/swing/text/JTextComponent.java                                             |     6 +-
 src/share/classes/javax/swing/text/NumberFormatter.java                                            |     6 +-
 src/share/classes/javax/swing/text/View.java                                                       |     3 +-
 src/share/classes/javax/swing/text/html/FormView.java                                              |    63 +-
 src/share/classes/javax/swing/text/html/ObjectView.java                                            |    28 +-
 src/share/classes/javax/swing/text/html/parser/Parser.java                                         |    24 +-
 src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java                             |     2 +-
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java                     |    18 +
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java                        |     2 -
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java                            |    15 +
 src/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java                                         |     3 +
 src/share/classes/sun/applet/AppletPanel.java                                                      |    10 +-
 src/share/classes/sun/applet/AppletViewerPanel.java                                                |    18 +-
 src/share/classes/sun/applet/resources/MsgAppletViewer_de.java                                     |     8 +-
 src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java                                  |     2 +-
 src/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java                                  |     4 +-
 src/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java                                  |     2 +-
 src/share/classes/sun/awt/AppContext.java                                                          |    44 +-
 src/share/classes/sun/awt/HToolkit.java                                                            |    18 +-
 src/share/classes/sun/awt/HeadlessToolkit.java                                                     |    23 +-
 src/share/classes/sun/awt/KeyboardFocusManagerPeerImpl.java                                        |     6 -
 src/share/classes/sun/awt/KeyboardFocusManagerPeerProvider.java                                    |     9 +-
 src/share/classes/sun/awt/SunToolkit.java                                                          |    35 +-
 src/share/classes/sun/awt/datatransfer/DataTransferer.java                                         |    49 +-
 src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java                                        |     6 +-
 src/share/classes/sun/awt/im/InputContext.java                                                     |     4 +-
 src/share/classes/sun/awt/im/InputMethodAdapter.java                                               |     3 +-
 src/share/classes/sun/awt/image/ByteBandedRaster.java                                              |    16 +-
 src/share/classes/sun/awt/image/ByteComponentRaster.java                                           |     6 +-
 src/share/classes/sun/awt/image/BytePackedRaster.java                                              |     3 +-
 src/share/classes/sun/awt/image/IntegerComponentRaster.java                                        |     6 +-
 src/share/classes/sun/awt/image/JPEGImageDecoder.java                                              |     2 +-
 src/share/classes/sun/awt/image/ShortBandedRaster.java                                             |    15 +-
 src/share/classes/sun/awt/image/ShortComponentRaster.java                                          |     6 +-
 src/share/classes/sun/awt/image/SurfaceManager.java                                                |    15 +
 src/share/classes/sun/awt/image/VolatileSurfaceManager.java                                        |     3 +-
 src/share/classes/sun/awt/resources/awt_zh_CN.properties                                           |     4 +-
 src/share/classes/sun/font/ExtendedTextSourceLabel.java                                            |    43 +-
 src/share/classes/sun/font/FileFont.java                                                           |     4 +-
 src/share/classes/sun/font/FileFontStrike.java                                                     |    11 +-
 src/share/classes/sun/font/GlyphLayout.java                                                        |    22 +-
 src/share/classes/sun/font/GlyphList.java                                                          |    12 +-
 src/share/classes/sun/font/StandardGlyphVector.java                                                |     5 +-
 src/share/classes/sun/font/TrueTypeFont.java                                                       |     3 +
 src/share/classes/sun/invoke/util/ValueConversions.java                                            |   874 +-
 src/share/classes/sun/invoke/util/VerifyAccess.java                                                |    40 +
 src/share/classes/sun/invoke/util/VerifyType.java                                                  |    36 -
 src/share/classes/sun/invoke/util/Wrapper.java                                                     |   100 +-
 src/share/classes/sun/java2d/Disposer.java                                                         |     7 +-
 src/share/classes/sun/java2d/SunGraphics2D.java                                                    |   214 +-
 src/share/classes/sun/java2d/SurfaceData.java                                                      |    10 +
 src/share/classes/sun/java2d/cmm/lcms/LCMS.java                                                    |     2 +-
 src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java                                         |    41 +-
 src/share/classes/sun/java2d/loops/MaskFill.java                                                   |     4 +
 src/share/classes/sun/java2d/pipe/BufferedContext.java                                             |    16 +-
 src/share/classes/sun/java2d/pipe/DrawImage.java                                                   |    21 +-
 src/share/classes/sun/java2d/pipe/PixelToShapeConverter.java                                       |    14 +-
 src/share/classes/sun/java2d/pipe/Region.java                                                      |    95 +
 src/share/classes/sun/launcher/resources/launcher_de.properties                                    |    15 +-
 src/share/classes/sun/launcher/resources/launcher_es.properties                                    |    15 +-
 src/share/classes/sun/launcher/resources/launcher_fr.properties                                    |    15 +-
 src/share/classes/sun/launcher/resources/launcher_it.properties                                    |    15 +-
 src/share/classes/sun/launcher/resources/launcher_ja.properties                                    |    16 +-
 src/share/classes/sun/launcher/resources/launcher_ko.properties                                    |    15 +-
 src/share/classes/sun/launcher/resources/launcher_pt_BR.properties                                 |    15 +-
 src/share/classes/sun/launcher/resources/launcher_sv.properties                                    |    15 +-
 src/share/classes/sun/launcher/resources/launcher_zh_CN.properties                                 |    15 +-
 src/share/classes/sun/launcher/resources/launcher_zh_TW.properties                                 |    15 +-
 src/share/classes/sun/management/Agent.java                                                        |    95 +-
 src/share/classes/sun/management/HotSpotDiagnostic.java                                            |    12 +-
 src/share/classes/sun/management/jdp/JdpBroadcaster.java                                           |   126 +
 src/share/classes/sun/management/jdp/JdpController.java                                            |   198 +
 src/share/classes/sun/management/jdp/JdpException.java                                             |    42 +
 src/share/classes/sun/management/jdp/JdpGenericPacket.java                                         |    97 +
 src/share/classes/sun/management/jdp/JdpJmxPacket.java                                             |   198 +
 src/share/classes/sun/management/jdp/JdpPacket.java                                                |    64 +
 src/share/classes/sun/management/jdp/JdpPacketReader.java                                          |   141 +
 src/share/classes/sun/management/jdp/JdpPacketWriter.java                                          |    98 +
 src/share/classes/sun/management/jdp/package-info.java                                             |    79 +
 src/share/classes/sun/management/resources/agent_de.properties                                     |     6 +-
 src/share/classes/sun/misc/Hashing.java                                                            |    23 +-
 src/share/classes/sun/misc/IoTrace.java                                                            |   170 +
 src/share/classes/sun/misc/JavaLangAccess.java                                                     |     7 +
 src/share/classes/sun/misc/SharedSecrets.java                                                      |    12 +-
 src/share/classes/sun/misc/URLClassPath.java                                                       |    12 +-
 src/share/classes/sun/misc/Unsafe.java                                                             |     8 +
 src/share/classes/sun/misc/VM.java                                                                 |    26 +
 src/share/classes/sun/misc/Version.java.template                                                   |    58 +-
 src/share/classes/sun/net/ftp/impl/FtpClient.java                                                  |    10 +-
 src/share/classes/sun/net/spi/DefaultProxySelector.java                                            |     2 +-
 src/share/classes/sun/net/www/MessageHeader.java                                                   |     2 +-
 src/share/classes/sun/net/www/http/HttpClient.java                                                 |    91 +-
 src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java                                 |    19 +-
 src/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java               |     9 +-
 src/share/classes/sun/net/www/protocol/https/HttpsClient.java                                      |    81 +-
 src/share/classes/sun/net/www/protocol/jar/JarURLConnection.java                                   |     2 +-
 src/share/classes/sun/nio/ch/DatagramChannelImpl.java                                              |     9 +-
 src/share/classes/sun/nio/ch/FileChannelImpl.java                                                  |    57 +-
 src/share/classes/sun/nio/ch/IOUtil.java                                                           |    24 +-
 src/share/classes/sun/nio/ch/NativeDispatcher.java                                                 |    16 +-
 src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java                                |     4 +-
 src/share/classes/sun/nio/ch/SocketAdaptor.java                                                    |     7 +-
 src/share/classes/sun/nio/ch/SocketChannelImpl.java                                                |    33 +-
 src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java                                             |    18 +
 src/share/classes/sun/nio/cs/ext/IBM300.java                                                       |  1875 ++++
 src/share/classes/sun/print/PSPrinterJob.java                                                      |    43 +-
 src/share/classes/sun/print/resources/serviceui_de.properties                                      |    18 +-
 src/share/classes/sun/reflect/Reflection.java                                                      |    19 +
 src/share/classes/sun/reflect/misc/ReflectUtil.java                                                |    48 +
 src/share/classes/sun/rmi/log/ReliableLog.java                                                     |    21 +-
 src/share/classes/sun/rmi/registry/RegistryImpl.java                                               |    22 +-
 src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties                             |     2 +-
 src/share/classes/sun/rmi/rmic/BatchEnvironment.java                                               |     6 +-
 src/share/classes/sun/rmi/rmic/Main.java                                                           |    30 +-
 src/share/classes/sun/rmi/rmic/RMIGenerator.java                                                   |    17 +-
 src/share/classes/sun/rmi/rmic/newrmic/Main.java                                                   |     2 +-
 src/share/classes/sun/rmi/rmic/newrmic/Resources.java                                              |     2 +-
 src/share/classes/sun/rmi/server/ActivatableRef.java                                               |     6 +-
 src/share/classes/sun/rmi/server/Activation.java                                                   |    38 +-
 src/share/classes/sun/rmi/server/ActivationGroupImpl.java                                          |    15 +-
 src/share/classes/sun/rmi/server/LoaderHandler.java                                                |    68 +-
 src/share/classes/sun/rmi/server/MarshalInputStream.java                                           |    22 +-
 src/share/classes/sun/rmi/server/UnicastRef.java                                                   |     1 +
 src/share/classes/sun/rmi/server/UnicastRef2.java                                                  |     1 +
 src/share/classes/sun/rmi/server/UnicastServerRef.java                                             |     8 +-
 src/share/classes/sun/rmi/server/Util.java                                                         |    38 +-
 src/share/classes/sun/rmi/server/WeakClassHashMap.java                                             |     3 +-
 src/share/classes/sun/rmi/transport/ConnectionInputStream.java                                     |    16 +-
 src/share/classes/sun/rmi/transport/DGCAckHandler.java                                             |     2 +-
 src/share/classes/sun/rmi/transport/DGCClient.java                                                 |    58 +-
 src/share/classes/sun/rmi/transport/DGCImpl.java                                                   |     6 +-
 src/share/classes/sun/rmi/transport/ObjectTable.java                                               |     6 +-
 src/share/classes/sun/rmi/transport/StreamRemoteCall.java                                          |     2 +
 src/share/classes/sun/rmi/transport/Target.java                                                    |    13 +-
 src/share/classes/sun/rmi/transport/Transport.java                                                 |     4 +-
 src/share/classes/sun/rmi/transport/WeakRef.java                                                   |     4 +-
 src/share/classes/sun/rmi/transport/proxy/CGIHandler.java                                          |    18 +-
 src/share/classes/sun/rmi/transport/proxy/HttpSendSocket.java                                      |     2 +-
 src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java                              |    37 +-
 src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java                                 |    41 +-
 src/share/classes/sun/rmi/transport/tcp/TCPChannel.java                                            |     4 +-
 src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java                                           |     7 +-
 src/share/classes/sun/rmi/transport/tcp/TCPTransport.java                                          |     9 +-
 src/share/classes/sun/security/ec/ECPrivateKeyImpl.java                                            |    10 +-
 src/share/classes/sun/security/jgss/GSSCredentialImpl.java                                         |     4 +-
 src/share/classes/sun/security/krb5/Config.java                                                    |   269 +-
 src/share/classes/sun/security/krb5/Credentials.java                                               |    29 +-
 src/share/classes/sun/security/krb5/KdcComm.java                                                   |    12 +-
 src/share/classes/sun/security/krb5/PrincipalName.java                                             |     2 +-
 src/share/classes/sun/security/krb5/internal/NetClient.java                                        |    10 +-
 src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java                      |   108 +-
 src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java                                      |    12 +-
 src/share/classes/sun/security/pkcs/PKCS7.java                                                     |    31 +-
 src/share/classes/sun/security/pkcs/PKCS8Key.java                                                  |    13 +-
 src/share/classes/sun/security/pkcs/PKCS9Attribute.java                                            |    94 +-
 src/share/classes/sun/security/pkcs11/Config.java                                                  |    15 +-
 src/share/classes/sun/security/pkcs11/P11Digest.java                                               |   185 +-
 src/share/classes/sun/security/pkcs11/P11Key.java                                                  |    48 +-
 src/share/classes/sun/security/pkcs11/P11KeyAgreement.java                                         |     4 +-
 src/share/classes/sun/security/pkcs11/P11Signature.java                                            |     7 +-
 src/share/classes/sun/security/pkcs11/P11Util.java                                                 |    16 +-
 src/share/classes/sun/security/pkcs11/Secmod.java                                                  |    17 +-
 src/share/classes/sun/security/pkcs11/SunPKCS11.java                                               |    28 +-
 src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java                                          |   377 +-
 src/share/classes/sun/security/provider/DSAPrivateKey.java                                         |     7 +-
 src/share/classes/sun/security/provider/certpath/CertPathHelper.java                               |     2 +-
 src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java                         |    35 +-
 src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java                     |    40 +-
 src/share/classes/sun/security/provider/certpath/OCSP.java                                         |    46 +-
 src/share/classes/sun/security/provider/certpath/OCSPChecker.java                                  |    13 +-
 src/share/classes/sun/security/provider/certpath/OCSPResponse.java                                 |    46 +-
 src/share/classes/sun/security/provider/certpath/URICertStore.java                                 |    31 +-
 src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java                                       |    27 +-
 src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java                                          |     9 +-
 src/share/classes/sun/security/ssl/HandshakeMessage.java                                           |     2 +-
 src/share/classes/sun/security/ssl/HandshakeOutStream.java                                         |    20 +-
 src/share/classes/sun/security/ssl/Record.java                                                     |     8 +-
 src/share/classes/sun/security/ssl/SSLContextImpl.java                                             |     2 +-
 src/share/classes/sun/security/ssl/SSLEngineImpl.java                                              |    13 +-
 src/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java                                 |     4 +-
 src/share/classes/sun/security/ssl/SSLServerSocketImpl.java                                        |     4 +-
 src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java                                       |     4 +-
 src/share/classes/sun/security/ssl/SSLSocketImpl.java                                              |     8 +-
 src/share/classes/sun/security/timestamp/TSResponse.java                                           |     2 +-
 src/share/classes/sun/security/tools/JarSigner.java                                                |    82 +-
 src/share/classes/sun/security/tools/JarSignerResources_ja.java                                    |    40 +-
 src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java                                 |     4 +-
 src/share/classes/sun/security/tools/KeyTool.java                                                  |    12 +-
 src/share/classes/sun/security/util/AuthResources_zh_CN.java                                       |     2 +-
 src/share/classes/sun/security/util/KeyUtil.java                                                   |    21 +-
 src/share/classes/sun/security/util/ObjectIdentifier.java                                          |     2 +-
 src/share/classes/sun/security/util/Resources_sv.java                                              |     2 +-
 src/share/classes/sun/security/util/Resources_zh_CN.java                                           |     2 +-
 src/share/classes/sun/security/x509/CertAndKeyGen.java                                             |    28 +-
 src/share/classes/sun/security/x509/X509CertImpl.java                                              |    61 +-
 src/share/classes/sun/swing/DefaultLookup.java                                                     |     3 +-
 src/share/classes/sun/swing/FilePane.java                                                          |    12 +
 src/share/classes/sun/swing/SwingLazyValue.java                                                    |     3 +-
 src/share/classes/sun/swing/SwingUtilities2.java                                                   |    38 +-
 src/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java                                     |     1 +
 src/share/classes/sun/text/bidi/BidiBase.java                                                      |     3 +-
 src/share/classes/sun/text/resources/FormatData_sl.java                                            |     4 +-
 src/share/classes/sun/tools/jar/Main.java                                                          |     6 +-
 src/share/classes/sun/tools/jar/resources/jar_de.properties                                        |     4 +-
 src/share/classes/sun/tools/jar/resources/jar_es.properties                                        |     4 +-
 src/share/classes/sun/tools/jar/resources/jar_fr.properties                                        |     4 +-
 src/share/classes/sun/tools/jar/resources/jar_it.properties                                        |     4 +-
 src/share/classes/sun/tools/jar/resources/jar_ja.properties                                        |     4 +-
 src/share/classes/sun/tools/jar/resources/jar_ko.properties                                        |     4 +-
 src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties                                     |     4 +-
 src/share/classes/sun/tools/jar/resources/jar_sv.properties                                        |     6 +-
 src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties                                     |     6 +-
 src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties                                     |     4 +-
 src/share/classes/sun/tools/java/ClassPath.java                                                    |     4 +-
 src/share/classes/sun/tools/jconsole/AboutDialog.java                                              |    32 +-
 src/share/classes/sun/tools/jconsole/BorderedComponent.java                                        |    16 +-
 src/share/classes/sun/tools/jconsole/ClassTab.java                                                 |    49 +-
 src/share/classes/sun/tools/jconsole/ConnectDialog.java                                            |    76 +-
 src/share/classes/sun/tools/jconsole/CreateMBeanDialog.java                                        |    32 +-
 src/share/classes/sun/tools/jconsole/Formatter.java                                                |    30 +-
 src/share/classes/sun/tools/jconsole/HTMLPane.java                                                 |     2 -
 src/share/classes/sun/tools/jconsole/InternalDialog.java                                           |     4 +-
 src/share/classes/sun/tools/jconsole/JConsole.java                                                 |    70 +-
 src/share/classes/sun/tools/jconsole/LabeledComponent.java                                         |     1 -
 src/share/classes/sun/tools/jconsole/LocalVirtualMachine.java                                      |     3 +-
 src/share/classes/sun/tools/jconsole/MBeansTab.java                                                |     2 +-
 src/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java                                 |     2 +-
 src/share/classes/sun/tools/jconsole/MemoryPoolProxy.java                                          |     8 -
 src/share/classes/sun/tools/jconsole/MemoryPoolStat.java                                           |     2 +-
 src/share/classes/sun/tools/jconsole/MemoryTab.java                                                |   119 +-
 src/share/classes/sun/tools/jconsole/Messages.java                                                 |   319 +
 src/share/classes/sun/tools/jconsole/OverviewPanel.java                                            |     6 +-
 src/share/classes/sun/tools/jconsole/OverviewTab.java                                              |    10 +-
 src/share/classes/sun/tools/jconsole/Plotter.java                                                  |    78 +-
 src/share/classes/sun/tools/jconsole/PlotterPanel.java                                             |     1 -
 src/share/classes/sun/tools/jconsole/ProxyClient.java                                              |    15 +-
 src/share/classes/sun/tools/jconsole/Resources.java                                                |   214 +-
 src/share/classes/sun/tools/jconsole/SummaryTab.java                                               |   114 +-
 src/share/classes/sun/tools/jconsole/Tab.java                                                      |     3 -
 src/share/classes/sun/tools/jconsole/ThreadTab.java                                                |    72 +-
 src/share/classes/sun/tools/jconsole/VMInternalFrame.java                                          |    11 +-
 src/share/classes/sun/tools/jconsole/VMPanel.java                                                  |    66 +-
 src/share/classes/sun/tools/jconsole/VariableGridLayout.java                                       |     1 -
 src/share/classes/sun/tools/jconsole/Version.java.template                                         |    17 +-
 src/share/classes/sun/tools/jconsole/inspector/OperationEntry.java                                 |    34 +-
 src/share/classes/sun/tools/jconsole/inspector/TableSorter.java                                    |     2 +-
 src/share/classes/sun/tools/jconsole/inspector/ThreadDialog.java                                   |     1 -
 src/share/classes/sun/tools/jconsole/inspector/Utils.java                                          |     2 +-
 src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java                               |     4 +-
 src/share/classes/sun/tools/jconsole/inspector/XDataViewer.java                                    |     8 +-
 src/share/classes/sun/tools/jconsole/inspector/XMBeanAttributes.java                               |    28 +-
 src/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java                                     |    83 +-
 src/share/classes/sun/tools/jconsole/inspector/XMBeanNotifications.java                            |    21 +-
 src/share/classes/sun/tools/jconsole/inspector/XObject.java                                        |    11 -
 src/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java                                |    62 +-
 src/share/classes/sun/tools/jconsole/inspector/XOperations.java                                    |    14 +-
 src/share/classes/sun/tools/jconsole/inspector/XPlotter.java                                       |     1 -
 src/share/classes/sun/tools/jconsole/inspector/XPlottingViewer.java                                |    10 +-
 src/share/classes/sun/tools/jconsole/inspector/XSheet.java                                         |    60 +-
 src/share/classes/sun/tools/jconsole/inspector/XTable.java                                         |     3 +-
 src/share/classes/sun/tools/jconsole/inspector/XTextField.java                                     |    53 +-
 src/share/classes/sun/tools/jconsole/inspector/XTree.java                                          |    14 +-
 src/share/classes/sun/tools/jconsole/inspector/XTreeRenderer.java                                  |     2 -
 src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java                              |   467 -
 src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java                           |   442 -
 src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java                        |   442 -
 src/share/classes/sun/tools/jconsole/resources/messages.properties                                 |   276 +
 src/share/classes/sun/tools/jconsole/resources/messages_ja.properties                              |     2 +-
 src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties                           |     2 +-
 src/share/classes/sun/tools/native2ascii/Main.java                                                 |     9 +-
 src/share/classes/sun/tools/serialver/serialver_zh_CN.properties                                   |     2 +-
 src/share/classes/sun/util/calendar/ZoneInfoFile.java                                              |    41 +-
 src/share/classes/sun/util/logging/LoggingProxy.java                                               |     2 +
 src/share/classes/sun/util/logging/LoggingSupport.java                                             |     5 +
 src/share/classes/sun/util/logging/PlatformLogger.java                                             |   441 +-
 src/share/classes/sun/util/logging/resources/logging_de.properties                                 |    18 +-
 src/share/classes/sun/util/logging/resources/logging_es.properties                                 |    18 +-
 src/share/classes/sun/util/logging/resources/logging_fr.properties                                 |    18 +-
 src/share/classes/sun/util/logging/resources/logging_it.properties                                 |    18 +-
 src/share/classes/sun/util/logging/resources/logging_ja.properties                                 |    12 +-
 src/share/classes/sun/util/logging/resources/logging_ko.properties                                 |    18 +-
 src/share/classes/sun/util/logging/resources/logging_pt_BR.properties                              |    18 +-
 src/share/classes/sun/util/logging/resources/logging_sv.properties                                 |    18 +-
 src/share/classes/sun/util/logging/resources/logging_zh_CN.properties                              |    18 +-
 src/share/classes/sun/util/logging/resources/logging_zh_TW.properties                              |    12 +-
 src/share/classes/sun/util/resources/CurrencyNames_es_VE.properties                                |     2 +-
 src/share/demo/jfc/Notepad/resources/Notepad_ja.properties                                         |     2 +-
 src/share/demo/jvmti/gctest/sample.makefile.txt                                                    |     6 +-
 src/share/demo/jvmti/heapTracker/sample.makefile.txt                                               |    19 +-
 src/share/demo/jvmti/heapViewer/sample.makefile.txt                                                |     5 +-
 src/share/demo/jvmti/hprof/hprof.h                                                                 |     3 +-
 src/share/demo/jvmti/hprof/hprof_class.c                                                           |    14 +-
 src/share/demo/jvmti/hprof/hprof_event.c                                                           |    27 +-
 src/share/demo/jvmti/hprof/hprof_init.c                                                            |    17 +-
 src/share/demo/jvmti/hprof/sample.makefile.txt                                                     |     6 +-
 src/share/demo/jvmti/minst/sample.makefile.txt                                                     |    19 +-
 src/share/demo/jvmti/mtrace/sample.makefile.txt                                                    |    20 +-
 src/share/demo/jvmti/versionCheck/sample.makefile.txt                                              |     6 +-
 src/share/demo/jvmti/waiters/sample.makefile.txt                                                   |     8 +-
 src/share/demo/management/MemoryMonitor/MemoryMonitor.java                                         |    11 +
 src/share/demo/management/MemoryMonitor/README.txt                                                 |     2 +-
 src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java                                  |    17 +-
 src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java                          |     2 +-
 src/share/javavm/export/jawt.h                                                                     |     4 +-
 src/share/lib/security/java.security                                                               |   426 -
 src/share/lib/security/java.security-linux                                                         |   432 +
 src/share/lib/security/java.security-macosx                                                        |    10 +-
 src/share/lib/security/java.security-solaris                                                       |    14 +-
 src/share/lib/security/java.security-windows                                                       |    14 +-
 src/share/lib/security/nss.cfg.in                                                                  |     5 +
 src/share/lib/security/sunpkcs11-solaris.cfg                                                       |    14 +-
 src/share/native/com/sun/java/util/jar/pack/defines.h                                              |     2 +-
 src/share/native/com/sun/java/util/jar/pack/jni.cpp                                                |     8 +-
 src/share/native/com/sun/java/util/jar/pack/unpack.cpp                                             |     1 -
 src/share/native/com/sun/java/util/jar/pack/zip.cpp                                                |     8 +-
 src/share/native/com/sun/media/sound/SoundDefs.h                                                   |     9 +
 src/share/native/java/io/FileInputStream.c                                                         |     2 +-
 src/share/native/java/io/ObjectInputStream.c                                                       |    13 -
 src/share/native/java/io/RandomAccessFile.c                                                        |     8 +-
 src/share/native/java/io/io_util.h                                                                 |    35 -
 src/share/native/java/lang/Class.c                                                                 |     2 +-
 src/share/native/java/lang/System.c                                                                |     8 +
 src/share/native/java/net/Inet6Address.c                                                           |    17 +-
 src/share/native/java/net/net_util.c                                                               |   143 +-
 src/share/native/java/net/net_util.h                                                               |    20 +
 src/share/native/java/util/zip/Adler32.c                                                           |     2 +-
 src/share/native/java/util/zip/CRC32.c                                                             |     2 +-
 src/share/native/java/util/zip/Deflater.c                                                          |    60 +-
 src/share/native/java/util/zip/Inflater.c                                                          |    20 +-
 src/share/native/java/util/zip/ZipFile.c                                                           |     1 +
 src/share/native/java/util/zip/zip_util.c                                                          |    33 +-
 src/share/native/java/util/zip/zip_util.h                                                          |     2 +-
 src/share/native/java/util/zip/zlib-1.2.3/compress.c                                               |     2 +-
 src/share/native/java/util/zip/zlib-1.2.3/inflate.c                                                |     2 +-
 src/share/native/java/util/zip/zlib-1.2.3/patches/ChangeLog_java                                   |     6 -
 src/share/native/java/util/zip/zlib-1.2.3/zlib.h                                                   |     4 +-
 src/share/native/sun/awt/image/awt_ImageRep.c                                                      |     2 +-
 src/share/native/sun/awt/image/awt_parseImage.c                                                    |   614 +-
 src/share/native/sun/awt/image/awt_parseImage.h                                                    |    11 +-
 src/share/native/sun/awt/image/jpeg/README                                                         |   385 -
 src/share/native/sun/awt/image/jpeg/imageioJPEG.c                                                  |    84 +-
 src/share/native/sun/awt/image/jpeg/jcapimin.c                                                     |   284 -
 src/share/native/sun/awt/image/jpeg/jcapistd.c                                                     |   165 -
 src/share/native/sun/awt/image/jpeg/jccoefct.c                                                     |   453 -
 src/share/native/sun/awt/image/jpeg/jccolor.c                                                      |   462 -
 src/share/native/sun/awt/image/jpeg/jcdctmgr.c                                                     |   391 -
 src/share/native/sun/awt/image/jpeg/jchuff.c                                                       |   913 --
 src/share/native/sun/awt/image/jpeg/jchuff.h                                                       |    51 -
 src/share/native/sun/awt/image/jpeg/jcinit.c                                                       |    76 -
 src/share/native/sun/awt/image/jpeg/jcmainct.c                                                     |   297 -
 src/share/native/sun/awt/image/jpeg/jcmarker.c                                                     |   682 -
 src/share/native/sun/awt/image/jpeg/jcmaster.c                                                     |   594 -
 src/share/native/sun/awt/image/jpeg/jcomapi.c                                                      |   110 -
 src/share/native/sun/awt/image/jpeg/jconfig.h                                                      |    43 -
 src/share/native/sun/awt/image/jpeg/jcparam.c                                                      |   614 -
 src/share/native/sun/awt/image/jpeg/jcphuff.c                                                      |   837 -
 src/share/native/sun/awt/image/jpeg/jcprepct.c                                                     |   358 -
 src/share/native/sun/awt/image/jpeg/jcsample.c                                                     |   523 -
 src/share/native/sun/awt/image/jpeg/jctrans.c                                                      |   392 -
 src/share/native/sun/awt/image/jpeg/jdapimin.c                                                     |   399 -
 src/share/native/sun/awt/image/jpeg/jdapistd.c                                                     |   279 -
 src/share/native/sun/awt/image/jpeg/jdcoefct.c                                                     |   740 -
 src/share/native/sun/awt/image/jpeg/jdcolor.c                                                      |   398 -
 src/share/native/sun/awt/image/jpeg/jdct.h                                                         |   180 -
 src/share/native/sun/awt/image/jpeg/jddctmgr.c                                                     |   273 -
 src/share/native/sun/awt/image/jpeg/jdhuff.c                                                       |   655 -
 src/share/native/sun/awt/image/jpeg/jdhuff.h                                                       |   205 -
 src/share/native/sun/awt/image/jpeg/jdinput.c                                                      |   385 -
 src/share/native/sun/awt/image/jpeg/jdmainct.c                                                     |   516 -
 src/share/native/sun/awt/image/jpeg/jdmarker.c                                                     |  1384 ---
 src/share/native/sun/awt/image/jpeg/jdmaster.c                                                     |   561 -
 src/share/native/sun/awt/image/jpeg/jdmerge.c                                                      |   404 -
 src/share/native/sun/awt/image/jpeg/jdphuff.c                                                      |   672 -
 src/share/native/sun/awt/image/jpeg/jdpostct.c                                                     |   294 -
 src/share/native/sun/awt/image/jpeg/jdsample.c                                                     |   482 -
 src/share/native/sun/awt/image/jpeg/jdtrans.c                                                      |   147 -
 src/share/native/sun/awt/image/jpeg/jerror.c                                                       |   272 -
 src/share/native/sun/awt/image/jpeg/jerror.h                                                       |   295 -
 src/share/native/sun/awt/image/jpeg/jfdctflt.c                                                     |   172 -
 src/share/native/sun/awt/image/jpeg/jfdctfst.c                                                     |   228 -
 src/share/native/sun/awt/image/jpeg/jfdctint.c                                                     |   287 -
 src/share/native/sun/awt/image/jpeg/jidctflt.c                                                     |   246 -
 src/share/native/sun/awt/image/jpeg/jidctfst.c                                                     |   372 -
 src/share/native/sun/awt/image/jpeg/jidctint.c                                                     |   393 -
 src/share/native/sun/awt/image/jpeg/jidctred.c                                                     |   402 -
 src/share/native/sun/awt/image/jpeg/jinclude.h                                                     |    95 -
 src/share/native/sun/awt/image/jpeg/jmemmgr.c                                                      |  1124 --
 src/share/native/sun/awt/image/jpeg/jmemnobs.c                                                     |   113 -
 src/share/native/sun/awt/image/jpeg/jmemsys.h                                                      |   202 -
 src/share/native/sun/awt/image/jpeg/jmorecfg.h                                                     |   378 -
 src/share/native/sun/awt/image/jpeg/jpeg-6b/README                                                 |   385 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcapimin.c                                             |   284 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcapistd.c                                             |   165 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jccoefct.c                                             |   453 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jccolor.c                                              |   462 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcdctmgr.c                                             |   391 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jchuff.c                                               |   913 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jchuff.h                                               |    51 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcinit.c                                               |    76 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmainct.c                                             |   297 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmarker.c                                             |   682 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmaster.c                                             |   594 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcomapi.c                                              |   110 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jconfig.h                                              |    43 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcparam.c                                              |   614 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcphuff.c                                              |   837 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcprepct.c                                             |   358 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcsample.c                                             |   523 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jctrans.c                                              |   392 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdapimin.c                                             |   399 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdapistd.c                                             |   279 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdcoefct.c                                             |   740 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdcolor.c                                              |   398 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdct.h                                                 |   180 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jddctmgr.c                                             |   273 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdhuff.c                                               |   655 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdhuff.h                                               |   205 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdinput.c                                              |   385 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmainct.c                                             |   516 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmarker.c                                             |  1384 +++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmaster.c                                             |   561 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmerge.c                                              |   404 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdphuff.c                                              |   672 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdpostct.c                                             |   294 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdsample.c                                             |   482 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdtrans.c                                              |   147 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jerror.c                                               |   272 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jerror.h                                               |   295 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctflt.c                                             |   172 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctfst.c                                             |   228 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctint.c                                             |   287 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctflt.c                                             |   246 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctfst.c                                             |   372 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctint.c                                             |   393 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctred.c                                             |   402 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jinclude.h                                             |    95 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemmgr.c                                              |  1124 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemnobs.c                                             |   113 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemsys.h                                              |   202 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jmorecfg.h                                             |   378 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jpegint.h                                              |   396 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jpeglib.h                                              |  1100 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jquant1.c                                              |   860 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jquant2.c                                              |  1314 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jutils.c                                               |   183 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jversion.h                                             |    18 +
 src/share/native/sun/awt/image/jpeg/jpegdecoder.c                                                  |     2 +-
 src/share/native/sun/awt/image/jpeg/jpegint.h                                                      |   396 -
 src/share/native/sun/awt/image/jpeg/jpeglib.h                                                      |  1100 --
 src/share/native/sun/awt/image/jpeg/jquant1.c                                                      |   860 -
 src/share/native/sun/awt/image/jpeg/jquant2.c                                                      |  1314 --
 src/share/native/sun/awt/image/jpeg/jutils.c                                                       |   183 -
 src/share/native/sun/awt/image/jpeg/jversion.h                                                     |    18 -
 src/share/native/sun/awt/medialib/awt_ImagingLib.c                                                 |   388 +-
 src/share/native/sun/awt/splashscreen/splashscreen_gif.c                                           |    11 +-
 src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c                                          |     7 +-
 src/share/native/sun/awt/splashscreen/splashscreen_png.c                                           |     2 +-
 src/share/native/sun/font/freetypeScaler.c                                                         |     7 +-
 src/share/native/sun/font/layout/ContextualSubstSubtables.cpp                                      |    12 +
 src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp                                    |     2 +-
 src/share/native/sun/font/layout/ExtensionSubtables.cpp                                            |     6 +-
 src/share/native/sun/font/layout/ExtensionSubtables.h                                              |     3 +-
 src/share/native/sun/font/layout/GlyphIterator.cpp                                                 |    78 +-
 src/share/native/sun/font/layout/GlyphIterator.h                                                   |    10 +-
 src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp                                           |     2 +-
 src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp                                          |     2 +-
 src/share/native/sun/font/layout/KernTable.cpp                                                     |    42 +-
 src/share/native/sun/font/layout/KernTable.h                                                       |     1 -
 src/share/native/sun/font/layout/LETableReference.h                                                |    18 +-
 src/share/native/sun/font/layout/LayoutEngine.cpp                                                  |     1 -
 src/share/native/sun/font/layout/LigatureSubstSubtables.cpp                                        |     4 +
 src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp                                       |     4 +
 src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp                                   |     4 +
 src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp                                       |     4 +
 src/share/native/sun/font/layout/MultipleSubstSubtables.cpp                                        |     4 +
 src/share/native/sun/font/layout/OpenTypeUtilities.cpp                                             |    11 +-
 src/share/native/sun/font/layout/PairPositioningSubtables.cpp                                      |     5 +
 src/share/native/sun/font/layout/SinglePositioningSubtables.cpp                                    |     6 +
 src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp                                   |     6 +
 src/share/native/sun/font/layout/SunLayoutEngine.cpp                                               |    21 +-
 src/share/native/sun/java2d/cmm/lcms/cmsio0.c                                                      |    26 +-
 src/share/native/sun/java2d/loops/TransformHelper.c                                                |    11 +-
 src/share/native/sun/java2d/opengl/OGLBlitLoops.c                                                  |    14 +
 src/share/native/sun/management/HotSpotDiagnostic.c                                                |     2 +-
 src/share/native/sun/misc/VM.c                                                                     |     5 +
 src/share/native/sun/reflect/Reflection.c                                                          |     6 +
 src/share/native/sun/rmi/server/MarshalInputStream.c                                               |    44 -
 src/share/native/sun/security/pkcs11/j2secmod.c                                                    |    65 +-
 src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h                                       |     6 +-
 src/solaris/back/linker_md.c                                                                       |    30 +-
 src/solaris/bin/java_md_solinux.c                                                                  |    53 +-
 src/solaris/bin/java_md_solinux.h                                                                  |     6 +-
 src/solaris/classes/java/lang/Terminator.java                                                      |    12 +-
 src/solaris/classes/sun/awt/X11/GtkFileDialogPeer.java                                             |     9 +-
 src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java                                               |    16 +-
 src/solaris/classes/sun/awt/X11/XChoicePeer.java                                                   |    32 +-
 src/solaris/classes/sun/awt/X11/XComponentPeer.java                                                |     2 +-
 src/solaris/classes/sun/awt/X11/XDecoratedPeer.java                                                |     8 +-
 src/solaris/classes/sun/awt/X11/XDialogPeer.java                                                   |     2 +-
 src/solaris/classes/sun/awt/X11/XEmbedChildProxyPeer.java                                          |     9 +-
 src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java                                            |     2 +-
 src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java                                     |    63 +-
 src/solaris/classes/sun/awt/X11/XLabelPeer.java                                                    |     2 +-
 src/solaris/classes/sun/awt/X11/XListPeer.java                                                     |    13 +-
 src/solaris/classes/sun/awt/X11/XTextAreaPeer.java                                                 |    18 +-
 src/solaris/classes/sun/awt/X11/XTextFieldPeer.java                                                |    30 +-
 src/solaris/classes/sun/awt/X11/XToolkit.java                                                      |    16 +-
 src/solaris/classes/sun/awt/X11/XWM.java                                                           |    26 +-
 src/solaris/classes/sun/awt/X11/XWindowPeer.java                                                   |    37 +-
 src/solaris/classes/sun/awt/X11InputMethod.java                                                    |     6 +-
 src/solaris/classes/sun/awt/motif/MToolkit.java                                                    |     2 +-
 src/solaris/classes/sun/font/FontConfigManager.java                                                |     5 +
 src/solaris/classes/sun/font/XRGlyphCacheEntry.java                                                |    30 +-
 src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java                                   |    32 +-
 src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java                                            |    10 +-
 src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java                                              |   288 +-
 src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java                                              |    23 +-
 src/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java                                          |   170 +
 src/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java                                      |    42 +
 src/solaris/classes/sun/nio/ch/EventPortWrapper.java                                               |   268 +
 src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java                                             |     9 +-
 src/solaris/classes/sun/nio/ch/SinkChannelImpl.java                                                |     2 +-
 src/solaris/classes/sun/nio/ch/SolarisEventPort.java                                               |    76 +-
 src/solaris/classes/sun/nio/ch/SourceChannelImpl.java                                              |     2 +-
 src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java                              |     8 +-
 src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java                                            |     9 +-
 src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java                                      |     2 +-
 src/solaris/classes/sun/nio/fs/DefaultFileTypeDetector.java                                        |     5 +-
 src/solaris/classes/sun/nio/fs/LinuxFileSystem.java                                                |     2 +-
 src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java                                        |     6 +
 src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java                                          |    13 +-
 src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java                              |    14 +-
 src/solaris/classes/sun/nio/fs/LinuxWatchService.java                                              |     4 +-
 src/solaris/classes/sun/nio/fs/MacOSXFileSystem.java                                               |    69 +
 src/solaris/classes/sun/nio/fs/MacOSXFileSystemProvider.java                                       |    45 +
 src/solaris/classes/sun/nio/fs/MacOSXNativeDispatcher.java                                         |    41 +
 src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java                                    |    33 +-
 src/solaris/classes/sun/nio/fs/SolarisFileSystem.java                                              |     2 +-
 src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java                                      |     6 +
 src/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java                                        |     6 +
 src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java                            |    18 +-
 src/solaris/classes/sun/nio/fs/SolarisWatchService.java                                            |     4 +-
 src/solaris/classes/sun/nio/fs/UnixChannelFactory.java                                             |    22 +-
 src/solaris/classes/sun/nio/fs/UnixCopyFile.java                                                   |    16 +-
 src/solaris/classes/sun/nio/fs/UnixException.java                                                  |     8 +-
 src/solaris/classes/sun/nio/fs/UnixFileSystem.java                                                 |    25 +-
 src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java                                         |    26 +-
 src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java                                           |     9 +-
 src/solaris/classes/sun/nio/fs/UnixPath.java                                                       |    24 +-
 src/solaris/classes/sun/print/IPPPrintService.java                                                 |    16 +
 src/solaris/classes/sun/print/UnixPrintJob.java                                                    |    43 +-
 src/solaris/classes/sun/print/UnixPrintServiceLookup.java                                          |    29 +-
 src/solaris/demo/jvmti/hprof/hprof_md.c                                                            |    29 +-
 src/solaris/doc/sun/man/man1/ja/java.1                                                             |  1334 +-
 src/solaris/doc/sun/man/man1/ja/jcmd.1                                                             |   172 +-
 src/solaris/doc/sun/man/man1/java.1                                                                |   467 +-
 src/solaris/doc/sun/man/man1/jcmd.1                                                                |    79 +-
 src/solaris/lib/content-types.properties                                                           |     4 +
 src/solaris/native/com/sun/management/UnixOperatingSystem_md.c                                     |     2 +-
 src/solaris/native/common/deps/cups_fp.c                                                           |   104 +
 src/solaris/native/common/deps/cups_fp.h                                                           |    61 +
 src/solaris/native/common/deps/fontconfig2/fontconfig/fontconfig.h                                 |   302 +
 src/solaris/native/common/deps/fontconfig2/fontconfig_fp.c                                         |   188 +
 src/solaris/native/common/deps/fontconfig2/fontconfig_fp.h                                         |   161 +
 src/solaris/native/common/deps/gconf2/gconf/gconf-client.h                                         |    41 +
 src/solaris/native/common/deps/gconf2/gconf_fp.c                                                   |    76 +
 src/solaris/native/common/deps/gconf2/gconf_fp.h                                                   |    48 +
 src/solaris/native/common/deps/glib2/gio/gio_typedefs.h                                            |    65 +
 src/solaris/native/common/deps/glib2/gio_fp.c                                                      |   109 +
 src/solaris/native/common/deps/glib2/gio_fp.h                                                      |    61 +
 src/solaris/native/common/deps/glib2/glib_fp.h                                                     |    41 +
 src/solaris/native/common/deps/gtk2/gtk/gtk.h                                                      |   567 +
 src/solaris/native/common/deps/gtk2/gtk_fp.c                                                       |   398 +
 src/solaris/native/common/deps/gtk2/gtk_fp.h                                                       |   469 +
 src/solaris/native/common/deps/syscalls_fp.c                                                       |   122 +
 src/solaris/native/common/deps/syscalls_fp.h                                                       |    79 +
 src/solaris/native/java/io/UnixFileSystem_md.c                                                     |     9 +
 src/solaris/native/java/io/io_util_md.c                                                            |    49 +-
 src/solaris/native/java/io/io_util_md.h                                                            |     4 +
 src/solaris/native/java/lang/java_props_macosx.c                                                   |     5 -
 src/solaris/native/java/lang/java_props_md.c                                                       |    12 +-
 src/solaris/native/java/net/Inet4AddressImpl.c                                                     |    32 +-
 src/solaris/native/java/net/Inet6AddressImpl.c                                                     |    44 +-
 src/solaris/native/java/net/NetworkInterface.c                                                     |    80 +-
 src/solaris/native/java/net/PlainDatagramSocketImpl.c                                              |    69 +-
 src/solaris/native/java/net/net_util_md.c                                                          |    18 +-
 src/solaris/native/java/util/TimeZone_md.c                                                         |    64 +
 src/solaris/native/sun/awt/CUPSfuncs.c                                                             |   137 +-
 src/solaris/native/sun/awt/awt_GraphicsEnv.c                                                       |     2 +-
 src/solaris/native/sun/awt/awt_UNIXToolkit.c                                                       |    20 +-
 src/solaris/native/sun/awt/fontconfig.h                                                            |   941 --
 src/solaris/native/sun/awt/fontpath.c                                                              |   403 +-
 src/solaris/native/sun/awt/gtk2_interface.c                                                        |   988 +-
 src/solaris/native/sun/awt/gtk2_interface.h                                                        |   580 +-
 src/solaris/native/sun/awt/splashscreen/splashscreen_config.h                                      |     2 +-
 src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c                                         |    68 +-
 src/solaris/native/sun/awt/swing_GTKEngine.c                                                       |    76 +-
 src/solaris/native/sun/awt/swing_GTKStyle.c                                                        |    20 +-
 src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h                                                 |     2 +-
 src/solaris/native/sun/java2d/x11/X11SurfaceData.c                                                 |    14 +-
 src/solaris/native/sun/java2d/x11/XRBackendNative.c                                                |     8 +-
 src/solaris/native/sun/net/spi/DefaultProxySelector.c                                              |   465 +-
 src/solaris/native/sun/nio/ch/DatagramChannelImpl.c                                                |     4 +-
 src/solaris/native/sun/nio/ch/DatagramDispatcher.c                                                 |    36 +-
 src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c                                                |    17 -
 src/solaris/native/sun/nio/ch/EPollArrayWrapper.c                                                  |    72 +-
 src/solaris/native/sun/nio/ch/FileDispatcherImpl.c                                                 |     2 +-
 src/solaris/native/sun/nio/ch/IOUtil.c                                                             |    17 +
 src/solaris/native/sun/nio/ch/Net.c                                                                |    88 +-
 src/solaris/native/sun/nio/ch/SolarisEventPort.c                                                   |    72 +-
 src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c                                                |     8 +-
 src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c                                              |    99 +-
 src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c                                              |   118 +-
 src/solaris/native/sun/nio/fs/MacOSXNativeDispatcher.c                                             |    76 +
 src/solaris/native/sun/nio/fs/SolarisNativeDispatcher.c                                            |    81 +-
 src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c                                               |   220 +-
 src/solaris/native/sun/nio/fs/genSolarisConstants.c                                                |     2 +-
 src/solaris/native/sun/nio/fs/genUnixConstants.c                                                   |     7 +-
 src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c                                          |     3 -
 src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c                                  |   113 +
 src/solaris/native/sun/security/pkcs11/j2secmod_md.c                                               |     3 -
 src/solaris/native/sun/security/pkcs11/j2secmod_md.h                                               |    11 +-
 src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c                                            |     3 -
 src/solaris/native/sun/security/smartcardio/pcsc_md.c                                              |     3 -
 src/solaris/native/sun/xawt/XlibWrapper.c                                                          |    19 +-
 src/solaris/native/sun/xawt/awt_Desktop.c                                                          |   103 +-
 src/solaris/npt/npt_md.h                                                                           |     7 +-
 src/solaris/transport/socket/socket_md.c                                                           |     7 +-
 src/windows/back/linker_md.c                                                                       |    40 +-
 src/windows/bin/cmdtoargs.c                                                                        |    14 +-
 src/windows/classes/java/lang/ProcessImpl.java                                                     |   197 +-
 src/windows/classes/java/lang/Terminator.java                                                      |    10 +-
 src/windows/classes/sun/awt/shell/Win32ShellFolder2.java                                           |    12 +-
 src/windows/classes/sun/awt/windows/WDesktopPeer.java                                              |    17 +-
 src/windows/classes/sun/awt/windows/WKeyboardFocusManagerPeer.java                                 |    16 +-
 src/windows/classes/sun/awt/windows/WPathGraphics.java                                             |     2 +
 src/windows/classes/sun/awt/windows/WToolkit.java                                                  |     4 +-
 src/windows/classes/sun/java2d/ScreenUpdateManager.java                                            |     5 +
 src/windows/classes/sun/java2d/d3d/D3DSurfaceData.java                                             |     2 +-
 src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java                         |     4 +-
 src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java                                   |    31 +-
 src/windows/classes/sun/nio/ch/FileDispatcherImpl.java                                             |    21 +-
 src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java                                            |    25 +-
 src/windows/classes/sun/nio/fs/WindowsChannelFactory.java                                          |     2 +-
 src/windows/classes/sun/nio/fs/WindowsConstants.java                                               |     5 +
 src/windows/classes/sun/nio/fs/WindowsFileCopy.java                                                |    18 +-
 src/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java                                      |   110 +-
 src/windows/classes/sun/nio/fs/WindowsLinkSupport.java                                             |    16 +-
 src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java                                        |    39 +-
 src/windows/classes/sun/nio/fs/WindowsPath.java                                                    |     2 +-
 src/windows/classes/sun/nio/fs/WindowsSecurity.java                                                |    45 +-
 src/windows/classes/sun/security/krb5/internal/tools/Ktab.java                                     |    46 +-
 src/windows/demo/jvmti/hprof/hprof_md.c                                                            |    39 +-
 src/windows/lib/content-types.properties                                                           |     4 +
 src/windows/native/java/io/WinNTFileSystem_md.c                                                    |    71 +-
 src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c                                     |     5 +-
 src/windows/native/java/net/Inet6AddressImpl.c                                                     |    18 +-
 src/windows/native/java/net/NetworkInterface.c                                                     |    61 +-
 src/windows/native/java/net/NetworkInterface_winXP.c                                               |    18 +-
 src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c                                     |     8 +-
 src/windows/native/java/net/TwoStacksPlainSocketImpl.c                                             |     7 +-
 src/windows/native/java/net/net_util_md.c                                                          |     6 +-
 src/windows/native/java/util/TimeZone_md.c                                                         |    11 +-
 src/windows/native/sun/nio/ch/DatagramChannelImpl.c                                                |     2 +-
 src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c                                            |    56 +-
 src/windows/native/sun/security/pkcs11/j2secmod_md.h                                               |    11 +-
 src/windows/native/sun/windows/awt_Component.cpp                                                   |    52 +-
 src/windows/native/sun/windows/awt_Component.h                                                     |     4 +-
 src/windows/native/sun/windows/awt_Desktop.cpp                                                     |    10 +-
 src/windows/native/sun/windows/awt_Frame.cpp                                                       |     6 +-
 src/windows/native/sun/windows/awt_InputMethod.cpp                                                 |     4 +-
 src/windows/native/sun/windows/awt_TextField.cpp                                                   |    24 +
 src/windows/npt/npt_md.h                                                                           |    22 +-
 test/Makefile                                                                                      |    78 +-
 test/ProblemList.txt                                                                               |   126 +-
 test/com/oracle/security/ucrypto/TestAES.java                                                      |   118 +-
 test/com/oracle/security/ucrypto/TestDigest.java                                                   |    24 +-
 test/com/oracle/security/ucrypto/TestRSA.java                                                      |   276 +-
 test/com/oracle/security/ucrypto/UcryptoTest.java                                                  |    28 +-
 test/com/sun/corba/cachedSocket/7056731.sh                                                         |   122 +
 test/com/sun/corba/cachedSocket/Hello.idl                                                          |    31 +
 test/com/sun/corba/cachedSocket/HelloClient.java                                                   |    67 +
 test/com/sun/corba/cachedSocket/HelloServer.java                                                   |    97 +
 test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java                                             |    13 +-
 test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java                                            |   420 +
 test/com/sun/java/swing/plaf/gtk/4928019/bug4928019.java                                           |   244 +
 test/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI/7089914/bug7089914.java                  |    77 +
 test/com/sun/jndi/ldap/LdapTimeoutTest.java                                                        |   177 +
 test/com/sun/jndi/ldap/LdapsReadTimeoutTest.java                                                   |   118 -
 test/com/sun/jndi/ldap/ReadTimeoutTest.java                                                        |   104 -
 test/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java                                   |    15 +-
 test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java                                    |     1 +
 test/com/sun/org/apache/xml/internal/security/encryption/XMLCipher/GetInstance.java                |    44 +
 test/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java                      |     9 +-
 test/com/sun/org/apache/xml/internal/security/transforms/MyTransform.java                          |    23 +-
 test/com/sun/servicetag/DeleteServiceTag.java                                                      |   129 -
 test/com/sun/servicetag/DuplicateNotFound.java                                                     |    97 -
 test/com/sun/servicetag/FindServiceTags.java                                                       |   141 -
 test/com/sun/servicetag/InstanceUrnCheck.java                                                      |    76 -
 test/com/sun/servicetag/InvalidRegistrationData.java                                               |    65 -
 test/com/sun/servicetag/InvalidServiceTag.java                                                     |    96 -
 test/com/sun/servicetag/JavaServiceTagTest.java                                                    |   177 -
 test/com/sun/servicetag/JavaServiceTagTest1.java                                                   |   250 -
 test/com/sun/servicetag/NewRegistrationData.java                                                   |   105 -
 test/com/sun/servicetag/SvcTagClient.java                                                          |   200 -
 test/com/sun/servicetag/SystemRegistryTest.java                                                    |   139 -
 test/com/sun/servicetag/TestLoadFromXML.java                                                       |    69 -
 test/com/sun/servicetag/UpdateServiceTagTest.java                                                  |   109 -
 test/com/sun/servicetag/Util.java                                                                  |   265 -
 test/com/sun/servicetag/ValidRegistrationData.java                                                 |   112 -
 test/com/sun/servicetag/environ.properties                                                         |     9 -
 test/com/sun/servicetag/missing-environ-field.xml                                                  |    45 -
 test/com/sun/servicetag/newer-registry-version.xml                                                 |    32 -
 test/com/sun/servicetag/registration.xml                                                           |    61 -
 test/com/sun/servicetag/servicetag1.properties                                                     |    13 -
 test/com/sun/servicetag/servicetag2.properties                                                     |    13 -
 test/com/sun/servicetag/servicetag3.properties                                                     |    13 -
 test/com/sun/servicetag/servicetag4.properties                                                     |    13 -
 test/com/sun/servicetag/servicetag5.properties                                                     |    13 -
 test/demo/zipfs/ZFSTests.java                                                                      |    56 +
 test/demo/zipfs/ZipFSTester.java                                                                   |    60 +-
 test/demo/zipfs/basic.sh                                                                           |     1 +
 test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java                                   |     9 +
 test/java/awt/DataFlavor/MissedHtmlAndRtfBug/AbsoluteComponentCenterCalculator.java                |    37 +
 test/java/awt/DataFlavor/MissedHtmlAndRtfBug/DataFlavorSearcher.java                               |    47 +
 test/java/awt/DataFlavor/MissedHtmlAndRtfBug/InterprocessMessages.java                             |    28 +
 test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html                              |    27 +
 test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java                              |   205 +
 test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MyTransferable.java                                   |    62 +
 test/java/awt/DataFlavor/MissedHtmlAndRtfBug/NextFramePositionCalculator.java                      |    20 +
 test/java/awt/DataFlavor/MissedHtmlAndRtfBug/SourcePanel.java                                      |    26 +
 test/java/awt/DataFlavor/MissedHtmlAndRtfBug/TargetPanel.java                                      |    83 +
 test/java/awt/Desktop/OpenByUNCPathNameTest/OpenByUNCPathNameTest.java                             |    98 +
 test/java/awt/Focus/OverrideRedirectWindowActivationTest/OverrideRedirectWindowActivationTest.java |   157 -
 test/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java                     |   157 +
 test/java/awt/FontClass/SurrogateTest/SuppCharTest.java                                            |   127 +
 test/java/awt/Frame/FrameSetSizeStressTest/FrameSetSizeStressTest.java                             |    47 +
 test/java/awt/Frame/ResizeAfterSetFont/ResizeAfterSetFont.java                                     |    75 +
 test/java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java                                    |   156 +
 test/java/awt/Graphics2D/FillTexturePaint/FillTexturePaint.java                                    |    96 +
 test/java/awt/Graphics2D/FlipDrawImage/FlipDrawImage.java                                          |   105 +
 test/java/awt/Graphics2D/Test8004859/Test8004859.java                                              |   102 +
 test/java/awt/Graphics2D/TransformSetGet/TransformSetGet.java                                      |    59 +
 test/java/awt/GraphicsConfiguration/NormalizingTransformTest/NormalizingTransformTest.java         |    55 +
 test/java/awt/GraphicsDevice/IncorrectDisplayModeExitFullscreen.java                               |    94 +
 test/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.java                  |    10 +
 test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.html        |    43 +
 test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.java        |   246 +
 test/java/awt/Mixing/MixingInHwPanel.java                                                          |     8 +-
 test/java/awt/Mouse/EnterExitEvents/DragWindowTest.java                                            |   219 -
 test/java/awt/TextArea/DisposeTest/TestDispose.java                                                |   101 +
 test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java                                 |   113 +
 test/java/awt/TextField/DisposeTest/TestDispose.java                                               |   102 +
 test/java/awt/TrayIcon/DragEventSource/DragEventSource.java                                        |    21 +-
 test/java/awt/WMSpecificTests/Metacity/FullscreenDialogModality.java                               |   146 +
 test/java/awt/Window/Grab/GrabTest.java                                                            |     9 +-
 test/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java                              |    97 +
 test/java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSX.java                                            |   138 +
 test/java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java                                   |   131 +
 test/java/awt/event/TextEvent/TextEventSequenceTest/TextEventSequenceTest.java                     |   138 +
 test/java/awt/font/LineBreakMeasurer/AllFontsLBM.java                                              |    78 +
 test/java/awt/font/TextLayout/KerningLeak.java                                                     |    57 +
 test/java/awt/image/DrawImage/IncorrectBounds.java                                                 |   102 +
 test/java/awt/image/DrawImage/IncorrectOffset.java                                                 |    93 +
 test/java/awt/print/PrinterJob/Collate2DPrintingTest.java                                          |     2 +-
 test/java/awt/print/PrinterJob/PrintLatinCJKTest.java                                              |   102 +
 test/java/beans/EventHandler/Test6277266.java                                                      |     4 +-
 test/java/beans/Introspector/Test7186794.java                                                      |    55 +
 test/java/beans/Introspector/Test7189112.java                                                      |    58 +
 test/java/beans/Introspector/Test7192955.java                                                      |    92 +
 test/java/beans/Performance/Test7122740.java                                                       |    57 +
 test/java/beans/Performance/Test7184799.java                                                       |    71 +
 test/java/beans/XMLEncoder/AbstractTest.java                                                       |    26 +-
 test/java/beans/XMLEncoder/BeanValidator.java                                                      |    37 +-
 test/java/beans/XMLEncoder/Test4631471.java                                                        |     5 -
 test/java/beans/XMLEncoder/Test4679556.java                                                        |     1 -
 test/java/beans/XMLEncoder/Test6989223.java                                                        |    60 +
 test/java/beans/XMLEncoder/Test7080156.java                                                        |    60 +
 test/java/beans/XMLEncoder/Test8013416.java                                                        |    90 +
 test/java/beans/XMLEncoder/Test8013557.java                                                        |    84 +
 test/java/beans/XMLEncoder/java_awt_BorderLayout.java                                              |     6 +-
 test/java/beans/XMLEncoder/java_awt_CardLayout.java                                                |    83 +
 test/java/beans/XMLEncoder/java_awt_GridBagLayout.java                                             |   101 +
 test/java/beans/XMLEncoder/javax_swing_DefaultCellEditor.java                                      |     6 +
 test/java/io/File/CreateNewFile.java                                                               |    19 +-
 test/java/io/File/IsHidden.java                                                                    |    12 +-
 test/java/io/File/MacPathTest.java                                                                 |   166 +
 test/java/io/File/MacPathTest.sh                                                                   |    39 +
 test/java/io/File/NulFile.java                                                                     |   625 +
 test/java/io/File/createTempFile/SpecialTempFile.java                                              |   102 +
 test/java/io/File/isDirectory/Applet.html                                                          |     2 -
 test/java/io/IOException/LastErrorString.java                                                      |     5 +-
 test/java/io/Serializable/accessConstants/AccessConstants.java                                     |    44 -
 test/java/io/Serializable/badSubstByReplace/BadSubstByReplace.java                                 |     1 -
 test/java/io/Serializable/replaceStringArray/ReplaceStringArray.java                               |     1 -
 test/java/io/Serializable/replaceWithNull/ReplaceWithNull.java                                     |     1 -
 test/java/io/Serializable/verifyDynamicObjHandleTable/VerifyDynamicObjHandleTable.java             |     1 -
 test/java/lang/Runtime/exec/ExecCommand.java                                                       |   230 +
 test/java/lang/Runtime/exec/WinCommand.java                                                        |    31 +-
 test/java/lang/SecurityManager/CheckPackageAccess.java                                             |   127 +-
 test/java/lang/System/MacJNUEncoding/ExpectedEncoding.java                                         |    56 +
 test/java/lang/System/MacJNUEncoding/MacJNUEncoding.sh                                             |    96 +
 test/java/lang/Thread/ThreadStateTest.java                                                         |   158 +-
 test/java/lang/Throwable/SuppressedExceptions.java                                                 |    41 +-
 test/java/lang/invoke/7157574/Test7157574.java                                                     |   111 +
 test/java/lang/invoke/BigArityTest.java                                                            |  1044 ++
 test/java/lang/invoke/CallSiteTest.java                                                            |   164 +
 test/java/lang/invoke/ClassValueTest.java                                                          |     4 -
 test/java/lang/invoke/InvokeGenericTest.java                                                       |    52 +-
 test/java/lang/invoke/JavaDocExamplesTest.java                                                     |    43 +
 test/java/lang/invoke/MethodHandleConstants.java                                                   |   188 +
 test/java/lang/invoke/MethodHandlesTest.java                                                       |  1031 +-
 test/java/lang/invoke/MethodTypeTest.java                                                          |     5 +-
 test/java/lang/invoke/PermuteArgsTest.java                                                         |    24 +-
 test/java/lang/invoke/PrivateInvokeTest.java                                                       |   376 +
 test/java/lang/invoke/RicochetTest.java                                                            |   141 +-
 test/java/lang/invoke/ThrowExceptionsTest.java                                                     |   229 +
 test/java/lang/invoke/remote/RemoteExample.java                                                    |    40 +
 test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java                  |     2 +-
 test/java/net/CookieHandler/B6791927.java                                                          |     4 +-
 test/java/net/CookieHandler/CookieManagerTest.java                                                 |     4 +-
 test/java/net/CookieHandler/NullUriCookieTest.java                                                 |    80 +
 test/java/net/DatagramPacket/ReuseBuf.java                                                         |     3 +-
 test/java/net/HttpCookie/ExpiredCookieTest.java                                                    |    98 +
 test/java/net/Inet4Address/PingThis.java                                                           |    91 +
 test/java/net/Inet6Address/serialize/Serialize.java                                                |   181 +-
 test/java/net/ProxySelector/MultiThreadedSystemProxies.java                                        |    63 +
 test/java/net/URL/TestHttps.java                                                                   |    34 +
 test/java/nio/MappedByteBuffer/Basic.java                                                          |    91 +-
 test/java/nio/channels/AsyncCloseAndInterrupt.java                                                 |   148 +-
 test/java/nio/channels/DatagramChannel/Connect.java                                                |     4 +
 test/java/nio/channels/DatagramChannel/ConnectedSend.java                                          |    18 +-
 test/java/nio/channels/DatagramChannel/Disconnect.java                                             |    77 +
 test/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java                              |    11 +-
 test/java/nio/channels/FileChannel/InterruptDeadlock.java                                          |   137 +
 test/java/nio/channels/SelectionKey/RacyRegister.java                                              |    71 +
 test/java/nio/channels/Selector/LotsOfChannels.java                                                |     5 +-
 test/java/nio/channels/Selector/RacyDeregister.java                                                |   148 +
 test/java/nio/channels/Selector/SelectorLimit.java                                                 |     3 +-
 test/java/nio/channels/Selector/lots_of_updates.sh                                                 |     2 +-
 test/java/nio/channels/SocketChannel/Open.sh                                                       |     2 +-
 test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.java                         |     7 +-
 test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so         |   Bin 
 test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so       |   Bin 
 test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so      |   Bin 
 test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so    |   Bin 
 test/java/nio/file/Files/Misc.java                                                                 |     2 +-
 test/java/nio/file/Files/NameLimits.java                                                           |   103 +
 test/java/nio/file/Path/MacPathTest.java                                                           |   177 +
 test/java/nio/file/Path/MacPathTest.sh                                                             |    39 +
 test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java              |     9 +-
 test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java                      |     9 +-
 test/java/security/Signature/VerifyRangeCheckOverflow.java                                         |    56 +
 test/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java             |     9 +-
 test/java/security/cert/pkix/policyChanges/TestPolicy.java                                         |    12 +-
 test/java/text/Bidi/BidiConformance.java                                                           |   151 +-
 test/java/text/Bidi/Bug6850113.java                                                                |     1 +
 test/java/text/Bidi/Bug8005277.java                                                                |    67 +
 test/java/text/Format/DateFormat/Bug7130335.java                                                   |    44 +-
 test/java/util/AbstractCollection/ToArrayTest.java                                                 |   215 +
 test/java/util/EnumMap/ProperEntrySetOnClone.java                                                  |    58 +
 test/java/util/HashMap/HashMapCloneLeak.java                                                       |    70 +
 test/java/util/HashMap/OverrideIsEmpty.java                                                        |    70 +
 test/java/util/Locale/data/deflocale.sol10                                                         |  1725 ---
 test/java/util/Map/BasicSerialization.java                                                         |   221 +
 test/java/util/Map/Collisions.java                                                                 |    46 +-
 test/java/util/Map/EntryHashCode.java                                                              |   110 +
 test/java/util/TimeZone/Bug6912560.java                                                            |     3 +
 test/java/util/TreeMap/Clone.java                                                                  |    58 +
 test/java/util/concurrent/BlockingQueue/LastElement.java                                           |    29 +-
 test/java/util/concurrent/FutureTask/DoneTimedGetLoops.java                                        |   163 +
 test/java/util/concurrent/FutureTask/ExplicitSet.java                                              |    87 +
 test/java/util/logging/DrainFindDeadlockTest.java                                                  |   196 +
 test/java/util/logging/LevelResourceBundle.java                                                    |    52 +
 test/java/util/logging/LogManagerInstanceTest.java                                                 |    76 +
 test/java/util/logging/TestAppletLoggerContext.java                                                |   610 +
 test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java                                     |   127 +-
 test/java/util/logging/bundlesearch/LoadItUp.java                                                  |    62 -
 test/java/util/logging/bundlesearch/LoadItUp1.java                                                 |    49 +
 test/java/util/logging/bundlesearch/LoadItUp2.java                                                 |    62 +
 test/java/util/logging/bundlesearch/LoadItUp2Invoker.java                                          |    60 +
 test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java                                  |   113 +-
 test/java/util/logging/bundlesearch/TwiceIndirectlyLoadABundle.java                                |    91 +
 test/java/util/logging/bundlesearch/resources/CallerSearchableResource_en.properties               |    25 +
 test/java/util/prefs/AddNodeChangeListener.java                                                    |    95 +
 test/java/util/prefs/CheckUserPrefFirst.java                                                       |    43 +
 test/java/util/prefs/CheckUserPrefLater.java                                                       |    45 +
 test/java/util/prefs/CheckUserPrefsStorage.sh                                                      |    68 +
 test/java/util/prefs/CommentsInXml.java                                                            |     3 +-
 test/java/util/prefs/ConflictInFlush.java                                                          |     3 +-
 test/java/util/prefs/ExportNode.java                                                               |     3 +-
 test/java/util/prefs/ExportSubtree.java                                                            |     7 +-
 test/java/util/prefs/PrefsSpi.sh                                                                   |     6 +-
 test/java/util/prefs/RemoveNullKeyCheck.java                                                       |    45 +
 test/java/util/prefs/RemoveReadOnlyNode.java                                                       |     9 +-
 test/java/util/prefs/RemoveUnregedListener.java                                                    |     3 +-
 test/java/util/zip/TotalInOut.java                                                                 |    97 +
 test/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java                                            |   125 +
 test/javax/management/remote/mandatory/connection/ConnectionTest.java                              |    24 +
 test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java                         |     4 +-
 test/javax/management/remote/mandatory/loading/MissingClassTest.java                               |     2 +-
 test/javax/management/remote/mandatory/notif/DeadListenerTest.java                                 |    58 +-
 test/javax/naming/spi/DirectoryManager/GetContDirCtx.java                                          |     1 +
 test/javax/print/PrintServiceLookup/GetPrintServices.java                                          |    58 +
 test/javax/swing/JColorChooser/Test7194184.java                                                    |   113 +
 test/javax/swing/JComboBox/4199622/bug4199622.java                                                 |   243 +
 test/javax/swing/JComboBox/6337518/bug6337518.java                                                 |    48 +
 test/javax/swing/JComponent/7154030/bug7154030.java                                                |   169 +
 test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java                               |   139 +
 test/javax/swing/JMenu/4515762/bug4515762.java                                                     |   172 +
 test/javax/swing/JMenu/4692443/bug4692443.java                                                     |   132 +
 test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java            |    86 +-
 test/javax/swing/JPopupMenu/6827786/bug6827786.java                                                |     8 +-
 test/javax/swing/JRootPane/4670486/bug4670486.java                                                 |   145 +
 test/javax/swing/JScrollBar/7163696/Test7163696.java                                               |   103 +
 test/javax/swing/JTabbedPane/4310381/bug4310381.html                                               |     6 +
 test/javax/swing/JTabbedPane/4310381/bug4310381.java                                               |    83 +
 test/javax/swing/JTabbedPane/4624207/bug4624207.java                                               |     6 +-
 test/javax/swing/JTable/7055065/bug7055065.java                                                    |   178 +
 test/javax/swing/JTable/7068740/bug7068740.java                                                    |   134 +
 test/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java                           |   106 +
 test/javax/swing/JTable/8005019/bug8005019.java                                                    |   103 +
 test/javax/swing/JTextArea/7049024/bug7049024.java                                                 |   134 +
 test/javax/swing/JTree/8003400/Test8003400.java                                                    |   109 +
 test/javax/swing/JTree/8003830/bug8003830.java                                                     |    66 +
 test/javax/swing/JTree/8004298/bug8004298.java                                                     |   121 +
 test/javax/swing/KeyboardManager/8013370/Test8013370.java                                          |   110 +
 test/javax/swing/RepaintManager/IconifyTest/IconifyTest.java                                       |    80 +
 test/javax/swing/SpringLayout/4726194/bug4726194.java                                              |   161 +
 test/javax/swing/ToolTipManager/7123767/bug7123767.java                                            |   220 +
 test/javax/swing/regtesthelpers/Util.java                                                          |    51 +-
 test/javax/swing/text/CSSBorder/6796710/bug6796710.java                                            |    16 +-
 test/javax/swing/text/DefaultCaret/6938583/bug6938583.java                                         |    51 +
 test/javax/swing/text/View/8014863/bug8014863.java                                                 |   146 +
 test/javax/swing/text/html/8008289/bug8008289.java                                                 |   138 +
 test/javax/swing/text/html/parser/Parser/6836089/bug6836089.java                                   |    51 +
 test/javax/xml/jaxp/Encodings/CheckEncodingPropertiesFile.java                                     |   421 +
 test/javax/xml/jaxp/PrecisionDecimalDV/XPrecisionDecimalToString.java                              |   103 +
 test/javax/xml/jaxp/common/8020430/JAXP15RegTest.java                                              |    63 +
 test/javax/xml/jaxp/common/8020430/TestBase.java                                                   |    95 +
 test/javax/xml/jaxp/parsers/8021148/JAXPSAXParserTest.java                                         |   100 +
 test/javax/xml/jaxp/parsers/8021148/TestBase.java                                                  |    95 +
 test/javax/xml/jaxp/parsers/8022548/JDK8022548.xml                                                 |    14 +
 test/javax/xml/jaxp/parsers/8022548/JDK8022548.xsl                                                 |   618 +
 test/javax/xml/jaxp/parsers/8022548/TestBase.java                                                  |    73 +
 test/javax/xml/jaxp/parsers/8022548/XOMParserTest.java                                             |   127 +
 test/lib/testlibrary/OutputAnalyzerTest.java                                                       |   181 +
 test/lib/testlibrary/jdk/testlibrary/JcmdBase.java                                                 |    79 +
 test/lib/testlibrary/jdk/testlibrary/JdkFinder.java                                                |    78 +
 test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java                                           |   324 +
 test/lib/testlibrary/jdk/testlibrary/OutputBuffer.java                                             |    61 +
 test/lib/testlibrary/jdk/testlibrary/ProcessTools.java                                             |   151 +
 test/lib/testlibrary/jdk/testlibrary/StreamPumper.java                                             |    78 +
 test/sun/awt/AppContext/8012933/Test8012933.java                                                   |    92 +
 test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java                                  |   165 +
 test/sun/awt/image/ImagingLib/SamePackingTypeTest.java                                             |   101 +
 test/sun/invoke/util/ValueConversionsTest.java                                                     |   193 +-
 test/sun/java2d/DirectX/DrawBitmaskToSurfaceTest.java                                              |   104 +
 test/sun/java2d/OpenGL/bug7181438.java                                                             |    83 +
 test/sun/java2d/loops/RenderToCustomBufferTest.java                                                |   115 +
 test/sun/java2d/pipe/Test8004821.java                                                              |    60 +
 test/sun/management/AgentCMETest.java                                                              |    73 +
 test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java                              |    14 +-
 test/sun/management/jdp/JdpClient.java                                                             |   160 +
 test/sun/management/jdp/JdpDoSomething.java                                                        |   103 +
 test/sun/management/jdp/JdpTest.sh                                                                 |   338 +
 test/sun/management/jdp/JdpUnitTest.java                                                           |    96 +
 test/sun/management/jmxremote/bootstrap/linux-i586/launcher                                        |   Bin 
 test/sun/management/jmxremote/bootstrap/solaris-i586/launcher                                      |   Bin 
 test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher                                     |   Bin 
 test/sun/management/windows/revokeall.exe                                                          |   Bin 
 test/sun/misc/Cleaner/ExitOnThrow.java                                                             |     6 +-
 test/sun/misc/Cleaner/exitOnThrow.sh                                                               |     3 +-
 test/sun/misc/IoTrace/IoTraceAgent.java                                                            |   182 +
 test/sun/misc/IoTrace/IoTraceBase.java                                                             |   154 +
 test/sun/misc/IoTrace/IoTraceFileChannelReadWrite.java                                             |    77 +
 test/sun/misc/IoTrace/IoTraceFileReadWrite.java                                                    |    90 +
 test/sun/misc/IoTrace/IoTraceListener.java                                                         |   139 +
 test/sun/misc/IoTrace/IoTraceSocketReadWrite.java                                                  |    76 +
 test/sun/misc/IoTrace/ioTraceTest.sh                                                               |    34 +
 test/sun/misc/IoTrace/iotraceagent.mf                                                              |     3 +
 test/sun/net/InetAddress/nameservice/dns/cname.sh                                                  |     2 +-
 test/sun/net/www/MessageHeaderTest.java                                                            |    74 +
 test/sun/net/www/http/HttpClient/IsAvailable.java                                                  |    68 +
 test/sun/net/www/messageheader/0                                                                   |     4 -
 test/sun/net/www/messageheader/1                                                                   |     4 -
 test/sun/net/www/messageheader/2                                                                   |     5 -
 test/sun/net/www/messageheader/3                                                                   |     6 -
 test/sun/net/www/messageheader/4                                                                   |     7 -
 test/sun/net/www/messageheader/5                                                                   |     7 -
 test/sun/net/www/messageheader/6                                                                   |     5 -
 test/sun/net/www/messageheader/HTest.java                                                          |    73 -
 test/sun/net/www/protocol/file/DirPermissionDenied.sh                                              |     1 +
 test/sun/net/www/protocol/http/HttpOnly.java                                                       |    36 +-
 test/sun/nio/ch/SelProvider.java                                                                   |    30 +-
 test/sun/nio/cs/OLD/TestIBMDB.java                                                                 |     1 +
 test/sun/nio/cs/OLD/TestX11CS.java                                                                 |   133 -
 test/sun/reflect/GetCallerClass.java                                                               |   105 +
 test/sun/rmi/rmic/classpath/RMICClassPathTest.java                                                 |    55 +
 test/sun/security/krb5/auto/FileKeyTab.java                                                        |    55 +
 test/sun/security/krb5/auto/SaslGSS.java                                                           |   106 +
 test/sun/security/krb5/auto/UseCacheAndStoreKey.java                                               |    71 +
 test/sun/security/krb5/ccache/EmptyCC.java                                                         |    94 +
 test/sun/security/krb5/config/DNS.java                                                             |    38 +
 test/sun/security/krb5/config/NamingManager.java                                                   |    60 +
 test/sun/security/krb5/config/dns.sh                                                               |    41 +
 test/sun/security/krb5/name/Immutable.java                                                         |    41 +
 test/sun/security/krb5/tools/KtabZero.java                                                         |    78 +
 test/sun/security/krb5/tools/ktzero.sh                                                             |    74 +
 test/sun/security/pkcs/pkcs9/UnknownAttribute.java                                                 |    81 +
 test/sun/security/pkcs11/MessageDigest/TestCloning.java                                            |   141 +
 test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java                                             |   410 +
 test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java                              |     6 +
 test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java                   |     9 +-
 test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java                |     9 +-
 test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorTrustAnchor.java                 |     9 +-
 test/sun/security/provider/certpath/X509CertPath/ForwardBuildCompromised.java                      |   312 -
 test/sun/security/provider/certpath/X509CertPath/ReverseBuildCompromised.java                      |   315 -
 test/sun/security/provider/certpath/X509CertPath/ValidateCompromised.java                          |   297 -
 test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java                                |     1 +
 test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/RSAExport.java                 |     5 +
 test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/InterruptedIO.java                  |   183 -
 test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/CertRequestOverflow.java   |   402 +
 test/sun/security/ssl/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java                               |   433 +
 test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java                                     |     8 +
 test/sun/security/tools/jarsigner/TimestampCheck.java                                              |     3 +
 test/sun/security/tools/keytool/console.sh                                                         |     7 +-
 test/sun/text/resources/LocaleData                                                                 |     8 +-
 test/sun/text/resources/LocaleDataTest.java                                                        |     3 +-
 test/sun/tools/jconsole/ImmutableResourceTest.java                                                 |    60 -
 test/sun/tools/jconsole/ImmutableResourceTest.sh                                                   |   111 -
 test/sun/tools/native2ascii/NativeErrors.java                                                      |     4 +-
 test/sun/util/logging/PlatformLoggerTest.java                                                      |   132 +-
 test/tools/jar/JarBackSlash.java                                                                   |   135 +
 test/tools/launcher/Arrrghs.java                                                                   |    29 +-
 test/tools/launcher/I18NJarTest.java                                                               |    17 +-
 test/tools/launcher/RunpathTest.java                                                               |    84 +
 test/tools/launcher/TestHelper.java                                                                |    61 +-
 test/tools/pack200/MemoryAllocatorTest.java                                                        |   369 +
 1601 files changed, 88174 insertions(+), 67925 deletions(-)

diffs (truncated from 198387 to 500 lines):

diff -r 971a1b285312 -r 7958751eb9ef .hgtags
--- a/.hgtags	Fri Apr 19 15:40:03 2013 -0700
+++ b/.hgtags	Wed Oct 16 15:17:14 2013 +0100
@@ -50,6 +50,7 @@
 f708138c9aca4b389872838fe6773872fce3609e jdk7-b73
 eacb36e30327e7ae33baa068e82ddccbd91eaae2 jdk7-b74
 8885b22565077236a927e824ef450742e434a230 jdk7-b75
+fb2ee5e96b171ae9db67274d87ffaba941e8bfa6 icedtea7-1.12
 8fb602395be0f7d5af4e7e93b7df2d960faf9d17 jdk7-b76
 e6a5d095c356a547cf5b3c8885885aca5e91e09b jdk7-b77
 1143e498f813b8223b5e3a696d79da7ff7c25354 jdk7-b78
@@ -63,6 +64,7 @@
 eae6e9ab26064d9ba0e7665dd646a1fd2506fcc1 jdk7-b86
 2cafbbe9825e911a6ca6c17d9a18eb1f0bf0873c jdk7-b87
 b3c69282f6d3c90ec21056cd1ab70dc0c895b069 jdk7-b88
+2017795af50aebc00f500e58f708980b49bc7cd1 icedtea7-1.13
 4a6abb7e224cc8d9a583c23c5782e4668739a119 jdk7-b89
 7f90d0b9dbb7ab4c60d0b0233e4e77fb4fac597c jdk7-b90
 08a31cab971fcad4695e913d0f3be7bde3a90747 jdk7-b91
@@ -111,6 +113,7 @@
 554adcfb615e63e62af530b1c10fcf7813a75b26 jdk7-b134
 d8ced728159fbb2caa8b6adb477fd8efdbbdf179 jdk7-b135
 aa13e7702cd9d8aca9aa38f1227f966990866944 jdk7-b136
+1571aa7abe47a54510c62a5b59a8c343cdaf67cb icedtea-1.14
 29296ea6529a418037ccce95903249665ef31c11 jdk7-b137
 60d3d55dcc9c31a30ced9caa6ef5c0dcd7db031d jdk7-b138
 d80954a89b49fda47c0c5cace65a17f5a758b8bd jdk7-b139
@@ -123,6 +126,7 @@
 539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
 69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01
 f097ca2434b1412b12ab4a5c2397ce271bf681e7 jdk7-b147
+7ec1845521edfb1843cad3868217983727ece53d icedtea-2.0-branchpoint
 2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02
 a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03
 b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04
@@ -141,6 +145,7 @@
 79c8c4608f60e1f981b17ba4077dfcaa2ed67be4 jdk7u2-b12
 fb2980d7c9439e3d62ab12f40506a2a2db2df0f4 jdk7u2-b13
 24e42f1f9029f9f5a9b1481d523facaf09452e5b jdk7u2-b21
+a75913596199fbb8583f9d74021f54dc76f87b14 icedtea-2.1-branchpoint
 e3790f3ce50aa4e2a1b03089ac0bcd48f9d1d2c2 jdk7u3-b02
 7e8351342f0b22b694bd3c2db979643529f32e71 jdk7u3-b03
 fc6b7b6ac837c9e867b073e13fc14e643f771028 jdk7u3-b04
@@ -157,6 +162,7 @@
 6485e842d7f736b6ca3d7e4a7cdc5de6bbdd870c jdk7u4-b10
 d568e85567ccfdd75f3f0c42aa0d75c440422827 jdk7u4-b11
 16781e84dcdb5f82c287a3b5387dde9f8aaf74e0 jdk7u4-b12
+907555f6191a0cd84886b07c4c40bc6ce498b8b1 icedtea-2.2-branchpoint
 c929e96aa059c8b79ab94d5b0b1a242ca53a5b32 jdk7u4-b13
 09f612bac047b132bb9bf7d4aa8afe6ea4d5b938 jdk7u4-b14
 9e15d1f3fa4b35b8c950323c76b9ed094d434b97 jdk7u5-b01
@@ -191,6 +197,7 @@
 e50c9a5f001c61f49e7e71b25b97ed4095d3557b jdk7u6-b15
 966e21feb7f088e318a35b069c1a61ff6363e554 jdk7u6-b16
 aa0ad405f70bc7a7af95fef109f114ceecf31232 jdk7u6-b17
+8ff5fca08814f1f0eeda40aaec6f2936076b7444 icedtea-2.3-branchpoint
 4a6917092af80481c1fa5b9ec8ccae75411bb72c jdk7u6-b18
 a263f787ced5bc7c14078ae552c82de6bd011611 jdk7u6-b19
 09145b546a2b6ae1f44d5c8a7d2a37d48e4b39e2 jdk7u6-b20
@@ -240,6 +247,31 @@
 cbbb166b38eb15f5d5c68e913ee18f6f352b7af0 jdk7u13-b10
 28700a56b69d80e70aecf230ab7f9ad4bb5acf23 jdk7u13-b30
 8eb180a284b0911b2645d5cbdff5be499a75d6b2 jdk7u13-b20
+df945ef30444adf08f3ef14b0c49c8bda6dda587 jdk7u8-b01
+dd1e513c05b8b8c8402e9ecf9c0d5bdbebb1a089 jdk7u8-b02
+355cf1937d0824b54ac38ee5a5496197647840f9 jdk7u8-b03
+d099fc840e6c0f07e7b6f52d11fae98ae217bc9a jdk7u8-b04
+1c3a91a1dabdcd7e4407f9e7be08718339eafaad jdk7u8-b05
+147401296df6355464007cfb16f76dfe4d6b9fa6 jdk7u10-b06
+fd190f90dc174c89f1bc447aab800f4eb99edda5 jdk7u10-b07
+cd32baf1524847463bab29b83b9fe33740a37313 jdk7u10-b08
+a5b1c01d1929f6b3e9d49e70db3d0263e11c9ab4 jdk7u10-b09
+448626eae40d303a2627a0b3613a98d32d4419f1 jdk7u12-b01
+c49b6f0315799a9deadf8f4661c67ed2dd1bfcfb jdk7u12-b02
+c4f6412aa2dee96cb209b37a0c6ebb4bea482d2c jdk7u12-b03
+0d25ad745892a146e8e4e1fb7caeeee7739b7019 jdk7u12-b04
+fdd0d43ba0f9c3f58959e2de7d1958f771d84565 jdk7u12-b05
+b5449e3dcf1f317002840dc5c2093be47c60fe8c jdk7u12-b06
+cb81ee79a72d84f99b8e7d73b5ae73124b661fe7 jdk7u12-b07
+b5e180ef18a0c823675bcd32edfbf2f5122d9722 jdk7u12-b08
+2e7fe0208e9c928f2f539fecb6dc8a1401ecba9e jdk7u12-b09
+b171007921c3d01066848c88cbcb6a376df3f01c icedtea-2.4-branchpoint
+e012aace90500a88f51ce83fcd27791f5dbf493f jdk7u14-b10
+9eb82fb221f3b34a5df97e7db3c949fdb0b6fee0 jdk7u14-b11
+ee3ab2ed2371dd72ad5a75ebb6b6b69071e29390 jdk7u14-b12
+7c0d4bfd9d2c183ebf8566013af5111927b472f6 jdk7u14-b13
+3982fc37bc256b07a710f25215e5525cfbefe2ed jdk7u14-b14
+2eb3ac105b7fe7609a20c9986ecbccab71f1609f jdk7u14-b15
 835448d525a10bb826f4f7ebe272fc410bdb0f5d jdk7u15-b01
 0443fe2d8023111b52f4c8db32e038f4a5a9f373 jdk7u15-b02
 70b0f967c0649c501fb14a27bb06daeccbff823a jdk7u15-b30
@@ -260,7 +292,9 @@
 f447c3bbf074439ece0ce9fea82c857f93817801 jdk7u21-b10
 f9323b9d020ce8d313af2d2e2682e2b6cabcc40d jdk7u21-b11
 08ed0bfc9668f04ce4e3803f16aad92f6e50f885 jdk7u21-b30
+f3cf02a53684b9fbefabb212c80dfbea0c27f113 jdk7u21-b50
 f3cf02a53684b9fbefabb212c80dfbea0c27f113 jdk7u21-b12
+e87b0b64e8b248b51bc65a8131ce29874f9d6a0b jdk7u21-b31
 a5e712ea6944b1c81bcd5343a50645964f12b107 jdk7u21-b02
 9d87f5f84afef6ba4c92523a76e3c81fd9acfa00 jdk7u21-b03
 139d3e3b62d49374112ce1add84cd3d1e5ed5335 jdk7u21-b04
@@ -271,3 +305,80 @@
 f2d4da9ba0f05165e8a85d0fd5085d707e434eab jdk7u25-b05
 5748526c96f0d3fd5771b72a81fcd61f4e23b0d8 jdk7u25-b06
 fe514475bc17355f5f0a8dc7dd423d0043ed5326 jdk7u25-b07
+f8373784a79eba32b47e655cc5880f594a12423c jdk7u25-b08
+023297d5b047c0b6c54869d6514fa3c1427c206c jdk7u25-b09
+c82ed89b21bcb5279ff2fd4bc54127cd580dea7e jdk7u25-b10
+ef5d29607ccee9712f2c768f269e4b9fa53a6859 jdk7u25-b11
+39282f16234385bbddd19189de2450f8bf88492b jdk7u25-b12
+ba6c3d64b94d17d90b86e36b7a282480a1c6808a jdk7u25-b13
+a71103b8cbb155a4af136baaee4f4bdd30ee817c jdk7u25-b14
+e1768e2070c938ec97325ad48b0d281e3031a29c jdk7u25-b15
+40034a7b7dec4d984139e154008e82e35d0ed212 jdk7u25-b31
+4ed1ef559d7c0058991eaf7e069b851940be432c jdk7u25-b33
+82eb0ebe4ef33f85054faf38a17f9ab4e14c2d60 jdk7u25-b34
+0d68732acbd4b6669512b1d2be496a9e391795a9 jdk7u25-b30
+173b399abd8aa2e4fdc0066c977719670d180125 jdk7u25-b16
+55f01444cf58c8004df9a9634c1bd7ff87caa370 jdk7u25-b32
+555ea0c4e9567294d37793777d521902d43f1a39 jdk7u14-b16
+950fa827c2ec8a3a1ceba755994ae59016daa621 jdk7u14-b17
+e7ba683c15009b166127c3437fe9fbaf4eee6efe jdk7u14-b18
+eb4807b899c84c92959b66f888f8cc8b028c7665 jdk7u14-b19
+eb4807b899c84c92959b66f888f8cc8b028c7665 jdk7u14-b19
+a249c45148c51dc53250c5d0c3d506ec5f9b88ab jdk7u14-b19
+bb8764ec11c2c4ca318bcf6aabdabd29c70b2cd1 jdk7u14-b20
+d1563025e086a464f05414267b84a6408f7b377d icedtea-2.4.0
+0a00f10abb2df203f13a723be158fb759e54b19b jdk7u14-b21
+d4bf5c15837c47d179c71f6df8716ad9bef53ef9 jdk7u14-b22
+a76a886dc057582bf332e60a023d8f8a35526217 jdk7u40-b23
+8e3d618505d33572c7b087f47e60818269f71475 jdk7u40-b24
+889f9b9f79b4ec9ea52754a1ad134ed92d4f9672 jdk7u40-b25
+ac03c48f1d82e0c8c1d5d72b8953be8aef558d87 jdk7u40-b26
+6ce66ba864780251fc44fff65358ef24f68ea51a jdk7u40-b27
+2043900095890e676f5ed0f959f470e2138c2a9a jdk7u40-b28
+d3186a0676dbc7ab80e00fa67f952b67933d5a35 jdk7u40-b29
+60d52db33828bf0355a94be2a82df90c901592f3 jdk7u40-b30
+65d95818d79e340d042457ee1a8155d7658e86b6 icedtea-2.4.1
+c2522d149ff6663ed1d3602c88c286cff25a43a7 jdk7u40-b31
+b9f86896cd0aa9b83e472a90b20ae7c253fba633 jdk7u40-b32
+419939ecee8311c8a38ff624ae67e473f8c60e51 jdk7u40-b33
+7c1d6fc3b6da19c7b7c0aad0716a2d810dbb974b jdk7u40-b34
+0931b4a280b1e9b3b12936222d1bc6d427310f79 jdk7u40-b35
+cd7a4d0b218f98511068d8336aa3f4cbaf10b128 jdk7u40-b36
+04036faa7fc4ec11a268c190cf1712d19c77b4ba jdk7u40-b37
+070b277e1b43cc4b6a4e1ae419d1273970f718ed jdk7u40-b38
+33921df593eda3d241d0d1322effc21486a6bb94 jdk7u40-b39
+42b57fb81c3958fc98e7c5cd81826565f4cedb91 jdk7u40-b40
+ae85cfff71e95c3a1882177779c5f681d2621410 jdk7u40-b41
+b479996d5c924128c3490165b592bf66a3034932 jdk7u40-b42
+fb25cdef17e9610db5cb89fc35c0c4abef5ad781 jdk7u40-b43
+ed444a09a5fd32237deaef6e43804e20ba4f6352 jdk7u40-b60
+e2cdb919c0eed11b1603711bcb066a9bac79709d icedtea-2.4.2
+e2cdb919c0eed11b1603711bcb066a9bac79709d icedtea-2.4.2
+0000000000000000000000000000000000000000 icedtea-2.4.2
+0000000000000000000000000000000000000000 icedtea-2.4.2
+e4526d518dacc59adc253c7a6f49a79441d4e3d9 icedtea-2.4.2
+0000000000000000000000000000000000000000 icedtea-2.4.2
+0000000000000000000000000000000000000000 icedtea-2.4.2
+4bf5ac86e0e46f1d8eafa18fa64c442666975f6a icedtea-2.4.2
+e045f6a3ad1d9f7b8982418addb3803ab63458f2 jdk7u40-b61
+26cc60a250a0d333b1d5d7a9acb233ad62b2fb0b jdk7u40-b62
+55f01444cf58c8004df9a9634c1bd7ff87caa370 jdk7u25-b32
+b06abd965701459a868e88af9a3e564c0301971c jdk7u45-b01
+d23a877da2d5dad6520a268c83f183295a9e7299 jdk7u45-b02
+a56eb4f801232c409d34cd1190df4eec5fefe8a9 jdk7u45-b03
+702c8d83dd8c5b6c76fe53a694244a36d23fa860 jdk7u45-b04
+a70540e8a5e96773b83c7dc0accdb323d946c045 jdk7u45-b05
+f39399baf36761571719f6ff5dc69c514d97842d jdk7u45-b06
+a35d4a4ebcfa895202544c2f6b2d09e0b29bddfc jdk7u45-b07
+2f01847eb9530ed5ec08b1b663f3a02cac57b048 jdk7u45-b08
+6e2313d45f0c50d824531b32d3f577aa0b357551 jdk7u45-b09
+d4506b816f63330489e00ba0b9e3c6583a8a9efa jdk7u45-b10
+ee87452ba9e2b4b7d847bd2a7910a8aaeacfea7b jdk7u45-b11
+d5e393a55e6adc2f1b9aaa752a5004fa07561480 jdk7u45-b12
+34997920efe962b2e4422e2c2de8ae91cd1d563d jdk7u45-b13
+59a78e4ca635a469a763ee408b11f8e1033f2584 jdk7u45-b14
+96782fe0c38c41cc4806e27ee64b20dc647ea808 jdk7u45-b15
+3c9a6d9eafd31be44b0ade0354e60f5078b417a4 jdk7u45-b16
+3a65c1b0c6d15fb24298bcd133d7ab4baa741ae2 jdk7u45-b17
+c5ca4daec23b5e7f99ac8d684f5016ff8bfebbb0 jdk7u45-b18
+4797f984f6c93c433aa797e9b2d8f904cf083f96 jdk7u45-b30
diff -r 971a1b285312 -r 7958751eb9ef .jcheck/conf
--- a/.jcheck/conf	Fri Apr 19 15:40:03 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 971a1b285312 -r 7958751eb9ef make/altclasses/Makefile
--- a/make/altclasses/Makefile	Fri Apr 19 15:40:03 2013 -0700
+++ b/make/altclasses/Makefile	Wed Oct 16 15:17:14 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, 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
@@ -42,6 +42,7 @@
 ALTRT_JAR_FILE = $(LIBDIR)/alt-rt.jar
 ALTRT_JAR_SOURCE_FILE = $(TEMPDIR)/alt-rt.jarsrclist
 ALTRT_JAR_SOURCES = $(wildcard $(ALTCLASSES_SRCDIR)/java/*/*.java)
+ALTRT_JAR_SOURCES += $(wildcard $(ALTCLASSES_SRCDIR)/sun/misc/*.java)
 
 # Use a special file suffix for the file that holds the source list
 
diff -r 971a1b285312 -r 7958751eb9ef make/bridge/Jabswitch/Makefile
--- a/make/bridge/Jabswitch/Makefile	Fri Apr 19 15:40:03 2013 -0700
+++ b/make/bridge/Jabswitch/Makefile	Wed Oct 16 15:17:14 2013 +0100
@@ -53,7 +53,7 @@
 buildexe : 
 	$(CD) $(TEMPDIR)  
 	$(RC) $(RC_FLAGS) $(VERSIONINFO_RESOURCE) 
-	$(CC) $(CPPFLAGS) $(JAB_SRC) $(LDDFLAGS) $(VERSIONRES) -o $(JAB_EXE) 
+	$(CC) $(CPPFLAGS) $(JAB_SRC) $(VERSIONRES) /link $(LDDFLAGS) -out:$(JAB_EXE)
 	$(MT) /nologo /verbose /manifest $(JAB_MANIFEST_INP) /outputresource:$(JAB_EXE)  
 
 copyfilejab : 
diff -r 971a1b285312 -r 7958751eb9ef make/com/oracle/jfr/Makefile
--- a/make/com/oracle/jfr/Makefile	Fri Apr 19 15:40:03 2013 -0700
+++ b/make/com/oracle/jfr/Makefile	Wed Oct 16 15:17:14 2013 +0100
@@ -42,6 +42,11 @@
 
 AUTO_FILES_JAVA_DIRS = com/oracle/jrockit/jfr oracle/jrockit/jfr
 
+JFC_XSD = oracle/jrockit/jfr/settings/jfc.xsd
+JFC_XSD_SRC = $(CLOSED_SHARE_SRC)/classes/$(JFC_XSD)
+JFC_XSD_FILE = $(CLASSDESTDIR)/$(JFC_XSD)
+
+
 # Find C source files
 #
 vpath %.c $(CLOSED_SHARE_SRC)/native/oracle/jfr
@@ -59,15 +64,18 @@
 	$(RM) -r $(CLASSDESTDIR)/com/oracle/jrockit/jfr
 	$(RM) -r $(CLASSDESTDIR)/oracle/jrockit/jfr
 
+# Copy pre-shipped .jfc files
+JFR_LIBDIR = $(LIBDIR)/jfr
+JFC_SRCDIR = $(CLOSED_SHARE_SRC)/classes/oracle/jrockit/jfr/settings
 
-# Copy pre-shipped .jfs files
-JFR_LIBDIR = $(LIBDIR)/jfr
-JFR_SRCDIR = $(CLOSED_SHARE_SRC)/lib/jfr
-
-$(JFR_LIBDIR)/%.jfs: $(JFR_SRCDIR)/%.jfs
+$(JFR_LIBDIR)/%.jfc: $(JFC_SRCDIR)/%.jfc
 	$(install-file)
 
-JFS_FILES := $(subst $(JFR_SRCDIR),$(JFR_LIBDIR),$(wildcard $(JFR_SRCDIR)/*.jfs))
+JFC_FILES := $(subst $(JFC_SRCDIR),$(JFR_LIBDIR),$(wildcard $(JFC_SRCDIR)/*.jfc))
 
-all build : $(JFS_FILES)
+-include ${JDK_TOPDIR}/make/closed/common/jfr.gmk
 
+$(JFC_XSD_FILE) : $(JFC_XSD_SRC)
+	$(install-file)
+
+all build: $(JFC_FILES) $(JFC_XSD_FILE)
diff -r 971a1b285312 -r 7958751eb9ef make/com/sun/Makefile
--- a/make/com/sun/Makefile	Fri Apr 19 15:40:03 2013 -0700
+++ b/make/com/sun/Makefile	Wed Oct 16 15:17:14 2013 +0100
@@ -45,7 +45,7 @@
 SUBDIRS_desktop    = image
 SUBDIRS_enterprise = crypto/provider jndi \
                      org rowset net/httpserver
-SUBDIRS_misc       = $(SCRIPT_SUBDIR) tracing servicetag nio demo
+SUBDIRS_misc       = $(SCRIPT_SUBDIR) tracing nio demo
 
 # Omit mirror since it's built with the apt tool.
 SUBDIRS_tools      = tools
diff -r 971a1b285312 -r 7958751eb9ef make/com/sun/java/pack/Makefile
--- a/make/com/sun/java/pack/Makefile	Fri Apr 19 15:40:03 2013 -0700
+++ b/make/com/sun/java/pack/Makefile	Wed Oct 16 15:17:14 2013 +0100
@@ -75,8 +75,8 @@
   OTHER_CXXFLAGS += $(ZINCLUDE)
   LDDFLAGS += $(ZIPOBJS)
  else
-  LDDFLAGS += -lz
-  OTHER_CXXFLAGS += -DSYSTEM_ZLIB
+  OTHER_LDLIBS += $(ZLIB_LIBS)
+  OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB
  endif
 else
   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
@@ -99,8 +99,7 @@
   RES = $(OBJDIR)/$(PGRM).res
 else
   LDOUTPUT = -o #Have a space 
-  LDDFLAGS += -lc
-  OTHER_LDLIBS  += $(LIBCXX)
+  OTHER_LDLIBS  += -lc $(LIBCXX)
 # setup the list of libraries to link in...
 ifeq ($(PLATFORM), linux)
 ifeq ("$(CC_VER_MAJOR)", "3")
@@ -157,7 +156,7 @@
 	$(prep-target)
 	$(RM) $(TEMPDIR)/mapfile-vers
 	$(CP) mapfile-vers-unpack200 $(TEMPDIR)/mapfile-vers
-	$(LINKER)  $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
+	$(LINKER)  $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
 ifdef MT
 	$(MT) /manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1
 endif
diff -r 971a1b285312 -r 7958751eb9ef make/com/sun/jmx/Makefile
--- a/make/com/sun/jmx/Makefile	Fri Apr 19 15:40:03 2013 -0700
+++ b/make/com/sun/jmx/Makefile	Wed Oct 16 15:17:14 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2013, 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
@@ -115,6 +115,8 @@
 
 ifeq ($(CROSS_COMPILE_ARCH),)
 RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
+else
+RMIC = $(BOOT_JAVA_CMD)  $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
 endif  
 
 $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
@@ -130,11 +132,13 @@
 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
                 -d $(CLASSDESTDIR)              \
                 -iiop -v1.2                     \
+                -emitPermissionCheck            \
                 $(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
 	$(RMIC) $(HOTSPOT_INTERPRETER_FLAG) -classpath "$(CLASSDESTDIR)"    \
                 -d $(CLASSDESTDIR)              \
                 -iiop -v1.2                     \
                 -standardPackage                \
+                -emitPermissionCheck            \
                 $(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
 	@$(java-vm-cleanup)
 
diff -r 971a1b285312 -r 7958751eb9ef make/com/sun/nio/sctp/Makefile
--- a/make/com/sun/nio/sctp/Makefile	Fri Apr 19 15:40:03 2013 -0700
+++ b/make/com/sun/nio/sctp/Makefile	Wed Oct 16 15:17:14 2013 +0100
@@ -60,7 +60,9 @@
   -I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders
 
 ifeq ($(PLATFORM), linux)
+ifneq ($(COMPILER_WARNINGS_FATAL),false)
 COMPILER_WARNINGS_FATAL=true
+endif
 #OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
 OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl
 endif
diff -r 971a1b285312 -r 7958751eb9ef make/com/sun/security/Makefile
--- a/make/com/sun/security/Makefile	Fri Apr 19 15:40:03 2013 -0700
+++ b/make/com/sun/security/Makefile	Wed Oct 16 15:17:14 2013 +0100
@@ -31,7 +31,7 @@
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = auth
-SUBDIRS_misc = jgss sasl auth/module
+SUBDIRS_misc = jgss sasl auth/module ntlm
 include $(BUILDDIR)/common/Subdirs.gmk
 
 all build clean clobber::
diff -r 971a1b285312 -r 7958751eb9ef make/com/sun/security/ntlm/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/com/sun/security/ntlm/Makefile	Wed Oct 16 15:17:14 2013 +0100
@@ -0,0 +1,39 @@
+#
+# Copyright (c) 2012, 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.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
+
+BUILDDIR = ../../../..
+PACKAGE = com.sun.security.ntlm
+PRODUCT = sun
+include $(BUILDDIR)/common/Defs.gmk
+
+#
+# Files
+#
+AUTO_FILES_JAVA_DIRS = com/sun/security/ntlm
+
+#
+# Rules
+#
+include $(BUILDDIR)/common/Classes.gmk
diff -r 971a1b285312 -r 7958751eb9ef make/com/sun/servicetag/Makefile
--- a/make/com/sun/servicetag/Makefile	Fri Apr 19 15:40:03 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-# Copyright (c) 2008, 2011, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# 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.
-
-BUILDDIR = ../../..
-PACKAGE = com.sun.servicetag
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = com/sun/servicetag
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-SERVICETAG_LIBDIR = $(LIBDIR)/servicetag
-SERVICETAG_RESOURCES_DIR = $(CLASSDESTDIR)/com/sun/servicetag/resources
-FILES_copy = $(SERVICETAG_RESOURCES_DIR)/product_registration.xsd \
-             $(SERVICETAG_RESOURCES_DIR)/register.html \
-             $(SERVICETAG_RESOURCES_DIR)/register_ja.html \
-             $(SERVICETAG_RESOURCES_DIR)/register_zh_CN.html \
-             $(SERVICETAG_LIBDIR)/jdk_header.png
-
-# Add all properties files to the FILES_copy list
-SWORDFISH_properties := $(shell \
-       $(CD) $(SHARE_SRC)/classes/com/sun/servicetag/resources; \
-       $(FIND) . -name 'javase_*_swordfish.properties' -print ; \
-    )
-FILES_copy += $(shell \
-   for f in $(SWORDFISH_properties) ; do \
-       echo $(SERVICETAG_RESOURCES_DIR)/$$f ; \
-   done \
-)
-
-
-#
-#OTHER_JAVACFLAGS += -Xlint:unchecked
-
-build: install-servicetag-lib copy-files
-
-copy-files: $(FILES_copy)
-
-$(CLASSBINDIR)/%: $(SHARE_SRC)/classes/%
-	$(install-file)
-
-$(SERVICETAG_LIBDIR)/jdk_header.png: $(SHARE_SRC)/classes/com/sun/servicetag/resources/jdk_header.png
-	$(install-file)
-	$(call chmod-file, 444)
-
-install-servicetag-lib:
-	@$(RM) -rf $(SERVICETAG_LIBDIR)
-	$(MKDIR) $(SERVICETAG_LIBDIR)
-
-clean clobber::
-	@$(RM) $(FILES_copy)
-
-.PHONY: copy-files
diff -r 971a1b285312 -r 7958751eb9ef make/common/Defs-linux.gmk
--- a/make/common/Defs-linux.gmk	Fri Apr 19 15:40:03 2013 -0700
+++ b/make/common/Defs-linux.gmk	Wed Oct 16 15:17:14 2013 +0100
@@ -112,21 +112,18 @@
 # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
 
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-  # Default OBJCOPY comes from GNU Binutils on Linux:
-  DEF_OBJCOPY=/usr/bin/objcopy
-  ifdef CROSS_COMPILE_ARCH
-    # don't try to generate .debuginfo files when cross compiling

From omajid at redhat.com  Wed Oct 16 08:53:45 2013
From: omajid at redhat.com (Omair Majid)
Date: Wed, 16 Oct 2013 11:53:45 -0400
Subject: [rfc][icedtea-web] RH976833 ClassLoader deadlock
In-Reply-To: <52546E34.4090904@redhat.com>
References: <520D35CA.9070208@redhat.com> <52286E1C.8030604@redhat.com>
	<52288F54.1000907@redhat.com> <5229A989.2060203@redhat.com>
	<5229F796.4070708@redhat.com> <5229FB6D.2070301@redhat.com>
	<5237102D.4070207@redhat.com> <52371F34.9050207@redhat.com>
	<52372111.8030200@redhat.com> <52374085.5080901@redhat.com>
	<5245B571.6030106@redhat.com> <524F0FFE.60208@redhat.com>
	<524F1A40.10300@redhat.com> <524F249B.3020804@redhat.com>
	<524F2A34.1000305@redhat.com> <524F3032.6070509@redhat.com>
	<52546E34.4090904@redhat.com>
Message-ID: <525EB689.1090603@redhat.com>

On 10/08/2013 04:42 PM, Andrew Azores wrote:
> On 10/04/2013 05:16 PM, Andrew Azores wrote:
>> (snip)
>>
>> If none of us are able to identify any issues with doing this simple
>> lock replacement trick then I'll make another push-candidate patch later.
>>
> 
> Seems nobody else has identified anything and neither have I, so the
> patch is attached.

Looks okay to me.

Cheers,
Omair

-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681

From andrew at icedtea.classpath.org  Wed Oct 16 09:09:39 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 16 Oct 2013 16:09:39 +0000
Subject: /hg/release/icedtea7-forest-2.3/jaxp: 4 new changesets
Message-ID: <hg.37c7ad440e0d.1381939779.-8576357044606977631@icedtea.classpath.org>

changeset 37c7ad440e0d in /hg/release/icedtea7-forest-2.3/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=37c7ad440e0d
author: joehw
date: Tue Jul 30 03:02:14 2013 -0700

	8021366: java_util/Properties/PropertiesWithOtherEncodings fails during 7u45 nightly testing
	Reviewed-by: lancea, alanb, dfuchs, mullan


changeset 7f09f554bc52 in /hg/release/icedtea7-forest-2.3/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=7f09f554bc52
author: joehw
date: Tue Jul 30 23:40:58 2013 -0700

	8021933: Add extra check for fix # JDK-8014530
	Reviewed-by: alanb, lancea


changeset 7d227aff400a in /hg/release/icedtea7-forest-2.3/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=7d227aff400a
author: mfang
date: Wed Oct 16 16:16:42 2013 +0100

	8022856: 7u45 l10n resource file translation update
	Reviewed-by: joehw, yhuang


changeset 1836b22ca25e in /hg/release/icedtea7-forest-2.3/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=1836b22ca25e
author: joehw
date: Wed Oct 16 17:09:25 2013 +0100

	8022682: Supporting XOM
	Reviewed-by: alanb, chegar, lancea


diffstat:

 src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java                  |   11 +
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties         |  154 ++++----
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties         |  142 ++++----
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties         |  142 ++++----
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties         |  142 ++++----
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties         |  141 ++++----
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties         |  142 ++++----
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties      |  150 ++++----
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties         |  144 ++++----
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties      |  149 ++++----
 src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties      |  164 +++++-----
 src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java |    2 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java      |    4 +-
 src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java                     |   24 +
 src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java              |    6 +-
 src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java    |    6 +-
 src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java                     |    2 +-
 src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java            |    2 -
 src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java                     |   10 +
 src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java                |    3 +
 src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java              |   34 ++
 src/com/sun/xml/internal/stream/Entity.java                                       |    2 +-
 22 files changed, 831 insertions(+), 745 deletions(-)

diffs (truncated from 2461 to 500 lines):

diff -r aeaabc10209e -r 1836b22ca25e src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
--- a/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java	Fri Oct 11 11:35:02 2013 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java	Wed Oct 16 17:09:25 2013 +0100
@@ -168,6 +168,17 @@
             //add internal stax property
             supportedProps.put( Constants.XERCES_PROPERTY_PREFIX + Constants.STAX_ENTITY_RESOLVER_PROPERTY , new StaxEntityResolverWrapper((XMLResolver)value)) ;
         }
+
+        /**
+         * It's possible for users to set a security manager through the interface.
+         * If it's the old SecurityManager, convert it to the new XMLSecurityManager
+         */
+        if (property.equals(Constants.SECURITY_MANAGER)) {
+            fSecurityManager = XMLSecurityManager.convert(value, fSecurityManager);
+            supportedProps.put(Constants.SECURITY_MANAGER, fSecurityManager);
+            return;
+        }
+
         supportedProps.put(property, value ) ;
         if(equivalentProperty != null){
             supportedProps.put(equivalentProperty, value ) ;
diff -r aeaabc10209e -r 1836b22ca25e src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
--- a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties	Fri Oct 11 11:35:02 2013 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties	Wed Oct 16 17:09:25 2013 +0100
@@ -1,30 +1,27 @@
-/*
- * 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-/*
- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
- */
+#
+# Copyright (c) 2009, 2013, 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.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
 
 # This file contains error and warning messages related to XML
 # The messages are arranged in key and value tuples in a ListResourceBundle.
@@ -48,14 +45,14 @@
         InvalidCharInProlog = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde im Prolog des Dokuments gefunden.
         InvalidCharInXMLDecl = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der XML-Deklaration gefunden.
 # 2.4 Character Data and Markup
-        CDEndInContent = Zeichenfolge"\"]]>\" darf nur im Content enthalten sein, wenn sie das Ende eines CDATA-Abschnitts markiert.
+        CDEndInContent = Zeichenfolge""]]>" darf nur im Content enthalten sein, wenn sie das Ende eines CDATA-Abschnitts markiert.
 # 2.7 CDATA Sections
-        CDSectUnterminated = CDATA-Abschnitt muss mit \"]]>\" enden.
+        CDSectUnterminated = CDATA-Abschnitt muss mit "]]>" enden.
 # 2.8 Prolog and Document Type Declaration
         XMLDeclMustBeFirst = XML-Deklaration darf nur ganz am Anfang des Dokuments enthalten sein.
-        EqRequiredInXMLDecl = Zeichen " = " muss auf \"{0}\" in der XML-Deklaration folgen.
-        QuoteRequiredInXMLDecl = Der Wert nach \"{0}\" in der XML-Deklaration muss eine Zeichenfolge in Anf\u00FChrungszeichen sein.
-        XMLDeclUnterminated = XML-Deklaration muss mit \"?>\" enden.
+        EqRequiredInXMLDecl = Zeichen " = " muss auf "{0}" in der XML-Deklaration folgen.
+        QuoteRequiredInXMLDecl = Der Wert nach "{0}" in der XML-Deklaration muss eine Zeichenfolge in Anf\u00FChrungszeichen sein.
+        XMLDeclUnterminated = XML-Deklaration muss mit "?>" enden.
         VersionInfoRequired = Version ist in der XML-Deklaration erforderlich.
         SpaceRequiredBeforeVersionInXMLDecl = Leerstelle vor dem Versionspseudoattribut in der XML-Deklaration erforderlich.
         SpaceRequiredBeforeEncodingInXMLDecl = Leerstelle vor dem Codierungspseudoattribut in der XML-Deklaration erforderlich.
@@ -71,70 +68,71 @@
         ReferenceIllegalInTrailingMisc=Referenz ist nicht zul\u00E4ssig in angeh\u00E4ngtem Abschnitt.
         
 # 2.9 Standalone Document Declaration
-        SDDeclInvalid = Standalone-Dokumentdeklarationswert muss \"Ja\" oder \"Nein\" und nicht \"{0}\" sein.
+        SDDeclInvalid = Standalone-Dokumentdeklarationswert muss "Ja" oder "Nein" und nicht "{0}" sein.
+        SDDeclNameInvalid = Der Standalone-Name in der XML-Deklaration ist m\u00F6glicherweise falsch geschrieben.
 # 2.12 Language Identification
-        XMLLangInvalid = xml:lang-Attributwert \"{0}\" ist eine ung\u00FCltige Sprach-ID.
+        XMLLangInvalid = xml:lang-Attributwert "{0}" ist eine ung\u00FCltige Sprach-ID.
 # 3. Logical Structures
-        ETagRequired = Elementtyp \"{0}\" muss mit dem entsprechenden Endtag \"</{0}>\" beendet werden.
+        ETagRequired = Elementtyp "{0}" muss mit dem entsprechenden Endtag "</{0}>" beendet werden.
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ElementUnterminated = Auf Elementtyp \"{0}\" m\u00FCssen entweder Attributspezifikationen, \">\" oder \"/>\" folgen.
-        EqRequiredInAttribute = Mit Elementtyp \"{0}\" verkn\u00FCpfter Attributname \"{1}\" muss vom Zeichen " = " gefolgt werden.
-        OpenQuoteExpected = \u00D6ffnendes Anf\u00FChrungszeichen wird f\u00FCr Attribut \"{1}\" erwartet, das mit Elementtyp \"{0}\" verkn\u00FCpft ist.
-        CloseQuoteExpected = Schlie\u00DFendes Anf\u00FChrungszeichen wird f\u00FCr Attribut \"{1}\" erwartet, das mit Elementtyp \"{0}\" verkn\u00FCpft ist.
-        AttributeNotUnique = Attribut \"{1}\" wurde bereits f\u00FCr Element \"{0}\" angegeben.
-        AttributeNSNotUnique = An Namespace \"{2}\" gebundenes Attribut \"{1}\" wurde bereits f\u00FCr Element \"{0}\" angegeben.
-        ETagUnterminated = Endtag f\u00FCr Elementtyp \"{0}\" muss mit einem ">"-Begrenzungszeichen enden.
+        ElementUnterminated = Auf Elementtyp "{0}" m\u00FCssen entweder Attributspezifikationen, ">" oder "/>" folgen.
+        EqRequiredInAttribute = Mit Elementtyp "{0}" verkn\u00FCpfter Attributname "{1}" muss vom Zeichen " = " gefolgt werden.
+        OpenQuoteExpected = \u00D6ffnendes Anf\u00FChrungszeichen wird f\u00FCr Attribut "{1}" erwartet, das mit Elementtyp "{0}" verkn\u00FCpft ist.
+        CloseQuoteExpected = Schlie\u00DFendes Anf\u00FChrungszeichen wird f\u00FCr Attribut "{1}" erwartet, das mit Elementtyp "{0}" verkn\u00FCpft ist.
+        AttributeNotUnique = Attribut "{1}" wurde bereits f\u00FCr Element "{0}" angegeben.
+        AttributeNSNotUnique = An Namespace "{2}" gebundenes Attribut "{1}" wurde bereits f\u00FCr Element "{0}" angegeben.
+        ETagUnterminated = Endtag f\u00FCr Elementtyp "{0}" muss mit einem ">"-Begrenzungszeichen enden.
         MarkupNotRecognizedInContent = Der Content von Elementen muss aus ordnungsgem\u00E4\u00DF formatierten Zeichendaten oder Markups bestehen.
         DoctypeIllegalInContent = DOCTYPE ist nicht zul\u00E4ssig in Content.
 # 4.1 Character and Entity References
         ReferenceUnterminated = Referenz muss mit einem ";"-Begrenzungszeichen beendet werden.
 # 4.3.2 Well-Formed Parsed Entities
         ReferenceNotInOneEntity = Referenz muss vollst\u00E4ndig in derselben geparsten Entit\u00E4t enthalten sein.
-        ElementEntityMismatch = Element \"{0}\" muss innerhalb derselben Entit\u00E4t beginnen und enden.
+        ElementEntityMismatch = Element "{0}" muss innerhalb derselben Entit\u00E4t beginnen und enden.
         MarkupEntityMismatch=XML-Dokumentstrukturen m\u00FCssen innerhalb derselben Entit\u00E4t beginnen und enden.
         
 # Messages common to Document and DTD
 # 2.2 Characters
-        InvalidCharInAttValue = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{2}) wurde im Wert des Attributs \"{1}\" gefunden. Element ist \"{0}\".
+        InvalidCharInAttValue = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{2}) wurde im Wert des Attributs "{1}" gefunden. Element ist "{0}".
         InvalidCharInComment = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde im Kommentar gefunden.
         InvalidCharInPI = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der Verarbeitungsanweisung gefunden.
         InvalidCharInInternalSubset = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der internen Teilmenge der DTD gefunden.
         InvalidCharInTextDecl = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der Textdeklaration gefunden.
 # 2.3 Common Syntactic Constructs
-        QuoteRequiredInAttValue = Wert des Attributs \"{1}\" muss mit einem einzelnen oder doppelten Anf\u00FChrungszeichen beginnen.
-        LessthanInAttValue = Wert des Attributs \"{1}\", das mit Elementtyp \"{0}\" verkn\u00FCpft ist, darf nicht das Zeichen "<" enthalten.
-        AttributeValueUnterminated = Wert f\u00FCr Attribut \"{1}\" muss mit dem entsprechenden Anf\u00FChrungszeichen enden.
+        QuoteRequiredInAttValue = Wert des Attributs "{1}" muss mit einem einzelnen oder doppelten Anf\u00FChrungszeichen beginnen.
+        LessthanInAttValue = Wert des Attributs "{1}", das mit Elementtyp "{0}" verkn\u00FCpft ist, darf nicht das Zeichen "<" enthalten.
+        AttributeValueUnterminated = Wert f\u00FCr Attribut "{1}" muss mit dem entsprechenden Anf\u00FChrungszeichen enden.
 # 2.5 Comments
-        InvalidCommentStart = Kommentar muss mit \"<!--\" beginnen.
-        DashDashInComment = Zeichenfolge \"--\" ist in Kommentaren nicht zul\u00E4ssig.
-        CommentUnterminated = Kommentar muss mit \"-->\" enden.
+        InvalidCommentStart = Kommentar muss mit "<!--" beginnen.
+        DashDashInComment = Zeichenfolge "--" ist in Kommentaren nicht zul\u00E4ssig.
+        CommentUnterminated = Kommentar muss mit "-->" enden.
         COMMENT_NOT_IN_ONE_ENTITY = Kommentar ist nicht in derselben Entit\u00E4t enthalten.
 # 2.6 Processing Instructions
         PITargetRequired = Verarbeitungsanweisung muss mit dem Namen des Ziels beginnen.
         SpaceRequiredInPI = Leerstelle ist zwischen dem Ziel der Verarbeitungsanweisung und den Daten erforderlich.
-        PIUnterminated = Verarbeitungsanweisung muss mit \"?>\" enden.
-        ReservedPITarget = Verarbeitungsanweisungsziel, das \"[xX][mM][lL]\" entspricht, ist nicht zul\u00E4ssig.
+        PIUnterminated = Verarbeitungsanweisung muss mit "?>" enden.
+        ReservedPITarget = Verarbeitungsanweisungsziel, das "[xX][mM][lL]" entspricht, ist nicht zul\u00E4ssig.
         PI_NOT_IN_ONE_ENTITY = Verarbeitungsanweisung ist nicht in derselben Entit\u00E4t enthalten.
 # 2.8 Prolog and Document Type Declaration
-        VersionInfoInvalid = Ung\u00FCltige Version \"{0}\".
-        VersionNotSupported = XML-Version \"{0}\" wird nicht unterst\u00FCtzt. Nur XML 1.0 wird unterst\u00FCtzt.
-        VersionNotSupported11 = XML-Version \"{0}\" wird nicht unterst\u00FCtzt. Nur XML 1.0 und XML 1.1 werden unterst\u00FCtzt.
+        VersionInfoInvalid = Ung\u00FCltige Version "{0}".
+        VersionNotSupported = XML-Version "{0}" wird nicht unterst\u00FCtzt. Nur XML 1.0 wird unterst\u00FCtzt.
+        VersionNotSupported11 = XML-Version "{0}" wird nicht unterst\u00FCtzt. Nur XML 1.0 und XML 1.1 werden unterst\u00FCtzt.
         VersionMismatch= Eine Entit\u00E4t kann keine andere Entit\u00E4t einer sp\u00E4teren Version enthalten.
 # 4.1 Character and Entity References
-        DigitRequiredInCharRef = Auf \"&#\" in einer Zeichenreferenz muss umgehend eine Dezimaldarstellung folgen.
-        HexdigitRequiredInCharRef = Auf \"&#x\" in einer Zeichenreferenz muss umgehend eine hexadezimale Darstellung folgen.
+        DigitRequiredInCharRef = Auf "&#" in einer Zeichenreferenz muss umgehend eine Dezimaldarstellung folgen.
+        HexdigitRequiredInCharRef = Auf "&#x" in einer Zeichenreferenz muss umgehend eine hexadezimale Darstellung folgen.
         SemicolonRequiredInCharRef = Zeichenreferenz muss mit dem Begrenzungszeichen ";" enden.
-        InvalidCharRef = Zeichenreferenz \"&#{0}\" ist ein ung\u00FCltiges XML-Zeichen.
+        InvalidCharRef = Zeichenreferenz "&#{0}" ist ein ung\u00FCltiges XML-Zeichen.
         NameRequiredInReference = Auf "&" in der Entit\u00E4tsreferenz muss umgehend der Entit\u00E4tsname folgen.
-        SemicolonRequiredInReference = Referenz zu Entit\u00E4t \"{0}\" muss mit dem Begrenzungszeichen ";" enden.
+        SemicolonRequiredInReference = Referenz zu Entit\u00E4t "{0}" muss mit dem Begrenzungszeichen ";" enden.
 # 4.3.1 The Text Declaration
         TextDeclMustBeFirst = Textdeklaration darf nur ganz am Anfang der externen geparsten Entit\u00E4t enthalten sein.
-        EqRequiredInTextDecl = Zeichen " = " muss auf \"{0}\" in der Textdeklaration folgen.
-        QuoteRequiredInTextDecl = Der Wert nach \"{0}\" in der Textdeklaration muss eine Zeichenfolge in Anf\u00FChrungszeichen sein.
-        CloseQuoteMissingInTextDecl = Schlie\u00DFendes Anf\u00FChrungszeichen im Wert nach \"{0}\" in der Textdeklaration fehlt.
+        EqRequiredInTextDecl = Zeichen " = " muss auf "{0}" in der Textdeklaration folgen.
+        QuoteRequiredInTextDecl = Der Wert nach "{0}" in der Textdeklaration muss eine Zeichenfolge in Anf\u00FChrungszeichen sein.
+        CloseQuoteMissingInTextDecl = Schlie\u00DFendes Anf\u00FChrungszeichen im Wert nach "{0}" in der Textdeklaration fehlt.
         SpaceRequiredBeforeVersionInTextDecl = Leerstelle vor dem Versionspseudoattribut in der Textdeklaration erforderlich.
         SpaceRequiredBeforeEncodingInTextDecl = Leerstelle vor dem Codierungspseudoattribut in der Textdeklaration erforderlich.
-        TextDeclUnterminated = Textdeklaration muss mit \"?>\" enden.
+        TextDeclUnterminated = Textdeklaration muss mit "?>" enden.
         EncodingDeclRequired = Codierungsdeklaration ist in der Textdeklaration erforderlich.
         NoMorePseudoAttributes = Es sind keine weiteren Pseudoattribute zul\u00E4ssig.
         MorePseudoAttributes = Es werden weitere Pseudoattribute erwartet.
@@ -143,13 +141,13 @@
         CommentNotInOneEntity = Kommentar muss vollst\u00E4ndig in derselben geparsten Entit\u00E4t enthalten sein.
         PINotInOneEntity = Verarbeitungsanweisung muss vollst\u00E4ndig in derselben geparsten Entit\u00E4t enthalten sein.
 # 4.3.3 Character Encoding in Entities
-        EncodingDeclInvalid = Ung\u00FCltiger Codierungsname \"{0}\".
-        EncodingByteOrderUnsupported = Angegebene Bytereihenfolge f\u00FCr die Codierung von \"{0}\" wird nicht unterst\u00FCtzt.
+        EncodingDeclInvalid = Ung\u00FCltiger Codierungsname "{0}".
+        EncodingByteOrderUnsupported = Angegebene Bytereihenfolge f\u00FCr die Codierung von "{0}" wird nicht unterst\u00FCtzt.
         InvalidByte = Ung\u00FCltiges Byte {0} von {1}-Byte-UTF-8-Sequenz.
         ExpectedByte = Byte {0} von {1}-Byte-UTF-8-Sequenz erwartet.  
         InvalidHighSurrogate = High-Surrogate-Bits in UTF-8-Sequenz d\u00FCrfen 0x10 nicht \u00FCberschreiten, gefunden wurde aber 0x{0}.
-        OperationNotSupported = Vorgang \"{0}\" nicht unterst\u00FCtzt von {1}-Reader.
-        InvalidASCII = Byte \"{0}\" geh\u00F6rt nicht zum (7-Bit) ASCII-Zeichensatz.
+        OperationNotSupported = Vorgang "{0}" nicht unterst\u00FCtzt von {1}-Reader.
+        InvalidASCII = Byte "{0}" geh\u00F6rt nicht zum (7-Bit) ASCII-Zeichensatz.
         CharConversionFailure = Eine Entit\u00E4t, f\u00FCr die eine bestimmte Codierung ermittelt wurde, darf keine Sequenzen enthalten, die in dieser Codierung ung\u00FCltig sind.
         
 # DTD Messages
@@ -302,14 +300,14 @@
 # Namespaces support
 # 4. Using Qualified Names
         IllegalQName = Element oder Attribut stimmt nicht mit QName-Production \u00FCberein: QName::=(NCName':')?NCName. 
-        ElementXMLNSPrefix = Element \"{0}\" darf nicht \"xmlns\" als Pr\u00E4fix enthalten.
-        ElementPrefixUnbound = Pr\u00E4fix \"{0}\" f\u00FCr Element \"{1}\" ist nicht gebunden.
-        AttributePrefixUnbound = Pr\u00E4fix \"{2}\" f\u00FCr Attribut \"{1}\", das mit Elementtyp \"{0}\" verkn\u00FCpft ist, ist nicht gebunden.
-        EmptyPrefixedAttName = Wert des Attributs \"{0}\" ist ung\u00FCltig. Namespace Bindings mit Pr\u00E4fix d\u00FCrfen nicht leer sein.
-        PrefixDeclared = Namespace-Pr\u00E4fix \"{0}\" wurde nicht deklariert.
+        ElementXMLNSPrefix = Element "{0}" darf nicht "xmlns" als Pr\u00E4fix enthalten.
+        ElementPrefixUnbound = Pr\u00E4fix "{0}" f\u00FCr Element "{1}" ist nicht gebunden.
+        AttributePrefixUnbound = Pr\u00E4fix "{2}" f\u00FCr Attribut "{1}", das mit Elementtyp "{0}" verkn\u00FCpft ist, ist nicht gebunden.
+        EmptyPrefixedAttName = Wert des Attributs "{0}" ist ung\u00FCltig. Namespace Bindings mit Pr\u00E4fix d\u00FCrfen nicht leer sein.
+        PrefixDeclared = Namespace-Pr\u00E4fix "{0}" wurde nicht deklariert.
         CantBindXMLNS = Pr\u00E4fix "xmlns" kann nicht explizit an einen Namespace gebunden werden. Umgekehrt kann auch der Namespace f\u00FCr "xmlns" nicht explizit an ein Pr\u00E4fix gebunden werden.
         CantBindXML = Pr\u00E4fix "xml" kann nicht an einen anderen Namespace als den gew\u00F6hnlichen gebunden werden. Umgekehrt kann auch der Namespace f\u00FCr "xml" nicht an ein anderes Pr\u00E4fix als "xml" gebunden werden.
-        MSG_ATT_DEFAULT_INVALID = defaultValue \"{1}\" von Attribut \"{0}\" ist aufgrund der lexikalischen Constraints dieses Attributtyps nicht g\u00FCltig.
+        MSG_ATT_DEFAULT_INVALID = defaultValue "{1}" von Attribut "{0}" ist aufgrund der lexikalischen Constraints dieses Attributtyps nicht g\u00FCltig.
 
 # REVISIT: These need messages
         MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
@@ -317,8 +315,10 @@
         InvalidCharInLiteral=InvalidCharInLiteral
 
 
-#Application can set the limit of number of entities that should be expanded by the parser.
-EntityExpansionLimitExceeded=Parser hat mehr als \"{0}\" Entit\u00E4tserweiterungen in diesem Dokument gefunden. Dies ist der durch die Anwendung vorgeschriebene Grenzwert.
+# Implementation limits
+        EntityExpansionLimitExceeded=JAXP00010001: Der Parser hat mehr als {0} Entit\u00E4tserweiterungen in diesem Dokument gefunden. Dies ist der von JDK vorgeschriebene Grenzwert.
+        ElementAttributeLimit=JAXP00010002: Element "{0}" hat mehr als {1} Attribute. "{1}" ist der von JDK vorgeschriebene Grenzwert.
+        MaxEntitySizeLimit=JAXP00010003: Die L\u00E4nge von Entit\u00E4t "{0}" ist "{1}" und \u00FCberschreitet den Grenzwert "{2}", der von "{3}" festgelegt wurde.
+        TotalEntitySizeLimit=JAXP00010004: Die akkumulierte Gr\u00F6\u00DFe "{0}" der Entit\u00E4ten \u00FCberschreitet den Grenzwert "{1}", der von "{2}" festgelegt wurde.
+        MaxXMLNameLimit=JAXP00010005: Der Name "{0}" \u00FCberschreitet den Grenzwert "{1}", der von "{2}" festgelegt wurde.
 
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= Element \"{0}\" hat mehr als \"{1}\" Attribute. \"{1}\" ist der durch die Anwendung vorgeschriebene Grenzwert.
diff -r aeaabc10209e -r 1836b22ca25e src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties
--- a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties	Fri Oct 11 11:35:02 2013 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties	Wed Oct 16 17:09:25 2013 +0100
@@ -1,30 +1,27 @@
-/*
- * 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-/*
- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
- */
+#
+# Copyright (c) 2009, 2013, 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.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
 
 # This file contains error and warning messages related to XML
 # The messages are arranged in key and value tuples in a ListResourceBundle.
@@ -48,14 +45,14 @@
         InvalidCharInProlog = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el pr\u00F3logo del documento.
         InvalidCharInXMLDecl = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en la declaraci\u00F3n XML.
 # 2.4 Character Data and Markup
-        CDEndInContent = La secuencia de caracteres \"]]>\" no debe aparecer en el contenido, a menos que se utilice para marcar el final de una secci\u00F3n CDATA.
+        CDEndInContent = La secuencia de caracteres "]]>" no debe aparecer en el contenido, a menos que se utilice para marcar el final de una secci\u00F3n CDATA.
 # 2.7 CDATA Sections
-        CDSectUnterminated = La secci\u00F3n CDATA debe finalizar en \"]]>\".
+        CDSectUnterminated = La secci\u00F3n CDATA debe finalizar en "]]>".
 # 2.8 Prolog and Document Type Declaration
         XMLDeclMustBeFirst = La declaraci\u00F3n XML s\u00F3lo puede aparecer al principio del documento.
-        EqRequiredInXMLDecl = El car\u00E1cter '' = '' debe aparecer despu\u00E9s de \"{0}\" en la declaraci\u00F3n XML.
-        QuoteRequiredInXMLDecl = El valor despu\u00E9s de \"{0}\" en la declaraci\u00F3n XML debe ser una cadena con comillas.
-        XMLDeclUnterminated = La declaraci\u00F3n XML debe finalizar en \"?>\".
+        EqRequiredInXMLDecl = El car\u00E1cter '' = '' debe aparecer despu\u00E9s de "{0}" en la declaraci\u00F3n XML.
+        QuoteRequiredInXMLDecl = El valor despu\u00E9s de "{0}" en la declaraci\u00F3n XML debe ser una cadena con comillas.
+        XMLDeclUnterminated = La declaraci\u00F3n XML debe finalizar en "?>".
         VersionInfoRequired = La versi\u00F3n es necesaria en la declaraci\u00F3n XML.
         SpaceRequiredBeforeVersionInXMLDecl = Es necesario un espacio en blanco antes del pseudo atributo version en la declaraci\u00F3n XML.
         SpaceRequiredBeforeEncodingInXMLDecl = Es necesario un espacio en blanco antes del pseudo atributo encoding en la declaraci\u00F3n XML.
@@ -71,70 +68,71 @@
         ReferenceIllegalInTrailingMisc=La referencia no est\u00E1 permitida en la secci\u00F3n final.
         
 # 2.9 Standalone Document Declaration
-        SDDeclInvalid = El valor de declaraci\u00F3n del documento aut\u00F3nomo debe ser \"yes\" o \"no\", pero nunca \"{0}\".
+        SDDeclInvalid = El valor de declaraci\u00F3n del documento aut\u00F3nomo debe ser "yes" o "no", pero nunca "{0}".
+        SDDeclNameInvalid = Puede que el nombre aut\u00F3nomo de la declaraci\u00F3n XML est\u00E9 mal escrito.
 # 2.12 Language Identification
-        XMLLangInvalid = El valor del atributo xml:lang \"{0}\" es un identificador de idioma no v\u00E1lido.
+        XMLLangInvalid = El valor del atributo xml:lang "{0}" es un identificador de idioma no v\u00E1lido.
 # 3. Logical Structures
-        ETagRequired = El tipo de elemento \"{0}\" debe finalizar por la etiqueta final coincidente \"</{0}>\".
+        ETagRequired = El tipo de elemento "{0}" debe finalizar por la etiqueta final coincidente "</{0}>".
 # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-        ElementUnterminated = El tipo de elemento \"{0}\" debe ir seguido de una de estas especificaciones de atributo: \">\" o \"/>\".
-        EqRequiredInAttribute = El nombre de atributo \"{1}\" asociado a un tipo de elemento \"{0}\" debe ir seguido del car\u00E1cter '' = ''.
-        OpenQuoteExpected = Las comillas de apertura se deben utilizar para el atributo \"{1}\" asociado a un tipo de elemento \"{0}\".
-        CloseQuoteExpected = Las comillas de cierre se deben utilizar para el atributo \"{1}\" asociado a un tipo de elemento \"{0}\".
-        AttributeNotUnique = El atributo \"{1}\" ya se ha especificado para el elemento \"{0}\".
-        AttributeNSNotUnique = El atributo \"{1}\" enlazado al espacio de nombres \"{2}\" ya se ha especificado para el elemento \"{0}\".
-        ETagUnterminated = La etiqueta final para el tipo de elemento \"{0}\" debe finalizar en un delimitador ''>''.
+        ElementUnterminated = El tipo de elemento "{0}" debe ir seguido de una de estas especificaciones de atributo: ">" o "/>".
+        EqRequiredInAttribute = El nombre de atributo "{1}" asociado a un tipo de elemento "{0}" debe ir seguido del car\u00E1cter '' = ''.
+        OpenQuoteExpected = Las comillas de apertura se deben utilizar para el atributo "{1}" asociado a un tipo de elemento "{0}".
+        CloseQuoteExpected = Las comillas de cierre se deben utilizar para el atributo "{1}" asociado a un tipo de elemento "{0}".
+        AttributeNotUnique = El atributo "{1}" ya se ha especificado para el elemento "{0}".
+        AttributeNSNotUnique = El atributo "{1}" enlazado al espacio de nombres "{2}" ya se ha especificado para el elemento "{0}".
+        ETagUnterminated = La etiqueta final para el tipo de elemento "{0}" debe finalizar en un delimitador ''>''.
         MarkupNotRecognizedInContent = El contenido de los elementos debe constar de marcadores o datos de car\u00E1cter con un formato correcto.
         DoctypeIllegalInContent = No se permite un DOCTYPE en el contenido.
 # 4.1 Character and Entity References
         ReferenceUnterminated = La referencia debe finalizar con un delimitador ';'.
 # 4.3.2 Well-Formed Parsed Entities
         ReferenceNotInOneEntity = La referencia debe incluirse totalmente en la misma entidad analizada.
-        ElementEntityMismatch = El elemento \"{0}\" debe empezar y finalizar en la misma entidad.
+        ElementEntityMismatch = El elemento "{0}" debe empezar y finalizar en la misma entidad.
         MarkupEntityMismatch=Las estructuras del documento XML deben empezar y finalizar en la misma entidad.
         
 # Messages common to Document and DTD
 # 2.2 Characters
-        InvalidCharInAttValue = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{2}) no v\u00E1lido en el valor del atributo \"{1}\" y el elemento es \"{0}\".
+        InvalidCharInAttValue = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{2}) no v\u00E1lido en el valor del atributo "{1}" y el elemento es "{0}".
         InvalidCharInComment = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el comentario.
         InvalidCharInPI = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en la instrucci\u00F3n de procesamiento.
         InvalidCharInInternalSubset = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el subconjunto interno del DTD.
         InvalidCharInTextDecl = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en la declaraci\u00F3n de texto.
 # 2.3 Common Syntactic Constructs
-        QuoteRequiredInAttValue = El valor del atributo \"{1}\" debe empezar por un car\u00E1cter de comillas dobles o simples.
-        LessthanInAttValue = El valor del atributo \"{1}\" asociado a un tipo de elemento \"{0}\" no debe contener el car\u00E1cter ''<''.
-        AttributeValueUnterminated = El valor para el atributo \"{1}\" debe finalizar en un car\u00E1cter de comillas coincidentes.
+        QuoteRequiredInAttValue = El valor del atributo "{1}" debe empezar por un car\u00E1cter de comillas dobles o simples.
+        LessthanInAttValue = El valor del atributo "{1}" asociado a un tipo de elemento "{0}" no debe contener el car\u00E1cter ''<''.
+        AttributeValueUnterminated = El valor para el atributo "{1}" debe finalizar en un car\u00E1cter de comillas coincidentes.
 # 2.5 Comments
-        InvalidCommentStart = El comentario debe empezar por \"<!--\".
-        DashDashInComment = La cadena \"--\" no est\u00E1 permitida en los comentarios.
-        CommentUnterminated = El comentario debe finalizar en \"-->\".
+        InvalidCommentStart = El comentario debe empezar por "<!--".
+        DashDashInComment = La cadena "--" no est\u00E1 permitida en los comentarios.
+        CommentUnterminated = El comentario debe finalizar en "-->".
         COMMENT_NOT_IN_ONE_ENTITY = El comentario no est\u00E1 incluido en la misma entidad.
 # 2.6 Processing Instructions
         PITargetRequired = La instrucci\u00F3n de procesamiento debe empezar por el nombre del destino.
         SpaceRequiredInPI = Es necesario un espacio en blanco entre el destino de la instrucci\u00F3n de procesamiento y los datos.
-        PIUnterminated = La instrucci\u00F3n de procesamiento debe finalizar en \"?>\".
-        ReservedPITarget = El destino de la instrucci\u00F3n de procesamiento que coincide con \"[xX][mM][lL]\" no est\u00E1 permitido.
+        PIUnterminated = La instrucci\u00F3n de procesamiento debe finalizar en "?>".
+        ReservedPITarget = El destino de la instrucci\u00F3n de procesamiento que coincide con "[xX][mM][lL]" no est\u00E1 permitido.
         PI_NOT_IN_ONE_ENTITY = La instrucci\u00F3n de procesamiento no est\u00E1 incluida en la misma entidad.
 # 2.8 Prolog and Document Type Declaration
-        VersionInfoInvalid = Versi\u00F3n no v\u00E1lida \"{0}\".
-        VersionNotSupported = La versi\u00F3n XML \"{0}\" no est\u00E1 soportada, s\u00F3lo la versi\u00F3n XML 1.0 est\u00E1 soportada.
-        VersionNotSupported11 = La versi\u00F3n XML \"{0}\" no est\u00E1 soportada, s\u00F3lo las versiones XML 1.0 y XML 1.1 est\u00E1n soportadas.
+        VersionInfoInvalid = Versi\u00F3n no v\u00E1lida "{0}".
+        VersionNotSupported = La versi\u00F3n XML "{0}" no est\u00E1 soportada, s\u00F3lo la versi\u00F3n XML 1.0 est\u00E1 soportada.
+        VersionNotSupported11 = La versi\u00F3n XML "{0}" no est\u00E1 soportada, s\u00F3lo las versiones XML 1.0 y XML 1.1 est\u00E1n soportadas.
         VersionMismatch= Una entidad no puede incluir otra entidad de una versi\u00F3n posterior.
 # 4.1 Character and Entity References
-        DigitRequiredInCharRef = Una representaci\u00F3n decimal debe aparecer inmediatamente despu\u00E9s de \"&#\" en una referencia de caracteres.
-        HexdigitRequiredInCharRef = Una representaci\u00F3n hexadecimal debe aparecer inmediatamente despu\u00E9s de \"&#\" en una referencia de caracteres.
+        DigitRequiredInCharRef = Una representaci\u00F3n decimal debe aparecer inmediatamente despu\u00E9s de "&#" en una referencia de caracteres.
+        HexdigitRequiredInCharRef = Una representaci\u00F3n hexadecimal debe aparecer inmediatamente despu\u00E9s de "&#" en una referencia de caracteres.
         SemicolonRequiredInCharRef = La referencia de caracteres debe finalizar en el delimitador ';'.
-        InvalidCharRef = La referencia de caracteres \"&#{0}\" es un car\u00E1cter XML no v\u00E1lido.
+        InvalidCharRef = La referencia de caracteres "&#{0}" es un car\u00E1cter XML no v\u00E1lido.
         NameRequiredInReference = El nombre de la entidad debe aparecer inmediatamente despu\u00E9s de '&' en la referencia de entidades.
-        SemicolonRequiredInReference = La referencia a la entidad \"{0}\" debe finalizar en el delimitador '';''.
+        SemicolonRequiredInReference = La referencia a la entidad "{0}" debe finalizar en el delimitador '';''.
 # 4.3.1 The Text Declaration
         TextDeclMustBeFirst = La declaraci\u00F3n de texto s\u00F3lo puede aparecer al principio de la entidad analizada externa.
-        EqRequiredInTextDecl = El car\u00E1cter '' = '' debe aparecer despu\u00E9s de \"{0}\" en la declaraci\u00F3n de texto.
-        QuoteRequiredInTextDecl = El valor despu\u00E9s de \"{0}\" en la declaraci\u00F3n de texto debe ser una cadena con comillas.
-        CloseQuoteMissingInTextDecl = Faltan las comillas de cierre en el valor despu\u00E9s de \"{0}\" en la declaraci\u00F3n de texto.
+        EqRequiredInTextDecl = El car\u00E1cter '' = '' debe aparecer despu\u00E9s de "{0}" en la declaraci\u00F3n de texto.
+        QuoteRequiredInTextDecl = El valor despu\u00E9s de "{0}" en la declaraci\u00F3n de texto debe ser una cadena con comillas.
+        CloseQuoteMissingInTextDecl = Faltan las comillas de cierre en el valor despu\u00E9s de "{0}" en la declaraci\u00F3n de texto.
         SpaceRequiredBeforeVersionInTextDecl = Es necesario un espacio en blanco antes del pseudo atributo version en la declaraci\u00F3n de texto.
         SpaceRequiredBeforeEncodingInTextDecl = Es necesario un espacio en blanco antes del pseudo atributo encoding en la declaraci\u00F3n de texto.
-        TextDeclUnterminated = La declaraci\u00F3n de texto debe finalizar en \"?>\".
+        TextDeclUnterminated = La declaraci\u00F3n de texto debe finalizar en "?>".
         EncodingDeclRequired = La declaraci\u00F3n de codificaci\u00F3n es necesaria en la declaraci\u00F3n de texto.
         NoMorePseudoAttributes = No se permiten m\u00E1s pseudo atributos.
         MorePseudoAttributes = Se esperan m\u00E1s pseudo atributos.
@@ -143,13 +141,13 @@
         CommentNotInOneEntity = El comentario debe incluirse totalmente en la misma entidad analizada.
         PINotInOneEntity = La instrucci\u00F3n de procesamiento debe incluirse totalmente en la misma entidad analizada.
 # 4.3.3 Character Encoding in Entities
-        EncodingDeclInvalid = Nombre de codificaci\u00F3n no v\u00E1lido \"{0}\".
-        EncodingByteOrderUnsupported = El orden de bytes proporcionado para la codificaci\u00F3n \"{0}\" no est\u00E1 soportado.
+        EncodingDeclInvalid = Nombre de codificaci\u00F3n no v\u00E1lido "{0}".
+        EncodingByteOrderUnsupported = El orden de bytes proporcionado para la codificaci\u00F3n "{0}" no est\u00E1 soportado.
         InvalidByte = Byte no v\u00E1lido {0} de la secuencia UTF-8 de {1} bytes
         ExpectedByte = Byte esperado {0} de la secuencia UTF-8 de {1} bytes.  
         InvalidHighSurrogate = Los bits de sustituci\u00F3n superior en la secuencia UTF-8 no deben exceder 0x10 pero se han encontrado 0x{0}.
-        OperationNotSupported = La operaci\u00F3n \"{0}\" no est\u00E1 soportada por el lector {1}.
-        InvalidASCII = El byte \"{0}\"no es un miembro del juego de caracteres ASCII (7 bits).
+        OperationNotSupported = La operaci\u00F3n "{0}" no est\u00E1 soportada por el lector {1}.
+        InvalidASCII = El byte "{0}"no es un miembro del juego de caracteres ASCII (7 bits).
         CharConversionFailure = Una entidad con una codificaci\u00F3n determinada no debe contener secuencias no permitidas en dicha codificaci\u00F3n.
         
 # DTD Messages
@@ -317,8 +315,10 @@
         InvalidCharInLiteral=InvalidCharInLiteral
 
 
-#Application can set the limit of number of entities that should be expanded by the parser.
-EntityExpansionLimitExceeded=El analizador ha encontrado m\u00E1s de \"{0}\"ampliaciones de entidad en este documento; \u00E9ste es el l\u00EDmite impuesto por la aplicaci\u00F3n.
+# Implementation limits
+        EntityExpansionLimitExceeded=JAXP00010001: el analizador ha encontrado m\u00E1s de "{0}"ampliaciones de entidad en este documento; \u00E9ste es el l\u00EDmite impuesto por el JDK.
+        ElementAttributeLimit=JAXP00010002: el elemento "{0}" tiene m\u00E1s de "{1}" atributos, "{1}" es el l\u00EDmite impuesto por el JDK.
+        MaxEntitySizeLimit=JAXP00010003: la longitud de la entidad "{0}" es "{1}", que excede el l\u00EDmite de "{2}" que ha definido "{3}".
+        TotalEntitySizeLimit=JAXP00010004: el tama\u00F1o acumulado "{0}" de las entidades ha excedido el l\u00EDmite de "{1}" que ha definido "{2}".
+        MaxXMLNameLimit=JAXP00010005: el nombre "{0}" ha excedido el l\u00EDmite de "{1}" que ha definido "{2}".
 
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= El elemento \"{0}\" tiene m\u00E1s de \"{1}\" atributos, \"{1}\" es el l\u00EDmite impuesto por la aplicaci\u00F3n.
diff -r aeaabc10209e -r 1836b22ca25e src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties
--- a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties	Fri Oct 11 11:35:02 2013 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties	Wed Oct 16 17:09:25 2013 +0100
@@ -1,30 +1,27 @@
-/*
- * 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-/*
- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.

From bugzilla-daemon at icedtea.classpath.org  Wed Oct 16 09:29:37 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 16 Oct 2013 16:29:37 +0000
Subject: [Bug 1583] New: XML Parse error?
Message-ID: <bug-1583-30@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1583

            Bug ID: 1583
           Summary: XML Parse error?
    Classification: Unclassified
           Product: IcedTea-Web
           Version: unspecified
          Hardware: x86_64
                OS: Linux
            Status: NEW
          Severity: normal
          Priority: P3
         Component: NetX (javaws)
          Assignee: omajid at redhat.com
          Reporter: duanev at gmail.com
                CC: unassigned at icedtea.classpath.org

Avocent DSView 4 (a comercial app) has an applet that causes the following. 
Most likely is that the JNLP is not downloading at all so (1) can the error
message be made more accurate [zero length JNLP - download failed: (and here is
why it failed)], and (2) what might cause the download to fail?

stderr:
java version "1.7.0_40"
OpenJDK Runtime Environment (IcedTea 2.4.2) (ArchLinux build
7.u40_2.4.2-1-x86_64)
OpenJDK 64-Bit Server VM (build 24.0-b56, mixed mode)
VideoSessionManagerApplet.init Initializing VideSessionManager applet.
VideoSessionManagerApplet.init - params:
ifaceviewer3,tdid,sessioncookie,name,url,viewerType,sessionType,httpsCertificate,sid,fid,cmdName,cmdArgs,cmdConsole,subToolType,applianceType
VideoSessionManagerApplet.init - assigning parameter:
ifaceviewer3=com.avocent.dsview.client.viewer.InterfaceViewer3Impl
...
VideoSessionManagerApplet.init - assigning parameter: viewerType=serial
VideoSessionManagerApplet.init - assigning parameter: sessionType=NORMAL
VideoSessionManagerApplet.init - assigning parameter: subToolType=
VideoSessionManagerApplet.init - assigning parameter: applianceType=ACS6000
Wrote launch arguments to file /tmp/Arg2062384482.tmp
VideoSessionManagerApplet.isAvocentViewer viewerType=serial
VideoSessionManagerApplet.isAvocentViewer:true
VideoSessionManagerApplet.getParamStringForViewer 
VideoSessionManagerApplet.isViewerSessionRunningUsingTcp session id=null
VideoSessionManagerApplet.isViewerSessionRunningUsingTcp file id=null
VideoSessionManagerApplet.isViewerSessionRunningUsingTcp session id or file id
cannot be found
VideoSessionManagerApplet.launchViewer
VideoSessionManagerApplet.launchViewer unix: Attempting Launch Using
/usr/lib/jvm/java-7-openjdk/jre/bin/javaws
https://dsview.....:443/dsview/common/launchSerialJnlp.do?launchFileId=%2Ftmp%2FArg2062384482.tmp

net.sourceforge.jnlp.LaunchException: Fatal: Read Error: Could not read or
parse the JNLP file. You can try to download this file manually and send it as
bug report to IcedTea-Web team.
    at net.sourceforge.jnlp.Launcher.fromUrl(Launcher.java:472)
    at net.sourceforge.jnlp.Launcher.launch(Launcher.java:278)
    at net.sourceforge.jnlp.runtime.Boot.run(Boot.java:211)
    at net.sourceforge.jnlp.runtime.Boot.run(Boot.java:53)
    at java.security.AccessController.doPrivileged(Native Method)
    at net.sourceforge.jnlp.runtime.Boot.main(Boot.java:177)
Caused by: net.sourceforge.jnlp.ParseException: Invalid XML document syntax.
    at net.sourceforge.jnlp.Parser.getRootNode(Parser.java:1312)
    at net.sourceforge.jnlp.JNLPFile.<init>(JNLPFile.java:206)
    at net.sourceforge.jnlp.JNLPFile.<init>(JNLPFile.java:190)
    at net.sourceforge.jnlp.JNLPFile.<init>(JNLPFile.java:175)
    at net.sourceforge.jnlp.JNLPFile.<init>(JNLPFile.java:161)
    at net.sourceforge.jnlp.Launcher.fromUrl(Launcher.java:452)
    ... 5 more
Caused by: net.sourceforge.nanoxml.XMLParseException: XML Parse Exception
during parsing of the XML definition at line 1: Unexpected end of data reached
    at
net.sourceforge.nanoxml.XMLElement.unexpectedEndOfData(XMLElement.java:1094)
    at net.sourceforge.nanoxml.XMLElement.readChar(XMLElement.java:877)
    at net.sourceforge.nanoxml.XMLElement.scanWhitespace(XMLElement.java:596)
    at net.sourceforge.nanoxml.XMLElement.parseFromReader(XMLElement.java:500)
    at net.sourceforge.nanoxml.XMLElement.parseFromReader(XMLElement.java:464)
    at net.sourceforge.jnlp.Parser.getRootNode(Parser.java:1308)
    ... 10 more

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131016/ca2527ab/attachment.html 

From aazores at icedtea.classpath.org  Wed Oct 16 10:13:57 2013
From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org)
Date: Wed, 16 Oct 2013 17:13:57 +0000
Subject: /hg/icedtea-web: Resolve multiple-applet deadlock issue in JNLPC...
Message-ID: <hg.744442d54cbf.1381943637.8643924302249223276@icedtea.classpath.org>

changeset 744442d54cbf in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=744442d54cbf
author: Andrew Azores <aazores at redhat.com>
date: Wed Oct 16 13:13:19 2013 -0400

	Resolve multiple-applet deadlock issue in JNLPClassLoader

	New lock used for synchronizing JNLPClassLoader#loadClass(String) to avoid
	deadlock condition when multiple applets are being loaded simultaneously.
	Regression test included.

	    * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (loadClassLock)
	    private member for locking of loadClass method. (loadClass) synchronizes
	    using new lock rather than instance intrinsic lock to avoid RH976833
	    deadlock
	    * tests/reproducers/custom/JNLPClassLoaderDeadlock/testcases/JNLPClassLoaderDeadlockTest.java:
	    new test for multiple applet deadlock condition
	    * tests/reproducers/custom/JNLPClassLoaderDeadlock/resources/JNLPClassLoaderDeadlock.html:
	    same
	    * tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_1.java:
	    same
	    * tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_2.java:
	    same
	    * tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile: same


diffstat:

 ChangeLog                                                                                   |   18 +
 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java                                      |  143 +++++----
 tests/reproducers/custom/JNLPClassLoaderDeadlock/resources/JNLPClassLoaderDeadlock.html     |    7 +
 tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_1.java        |   24 +
 tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_2.java        |   83 +++++
 tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile                              |   30 ++
 tests/reproducers/custom/JNLPClassLoaderDeadlock/testcases/JNLPClassLoaderDeadlockTest.java |   70 ++++
 7 files changed, 309 insertions(+), 66 deletions(-)

diffs (435 lines):

diff -r 60b47a6ec2e4 -r 744442d54cbf ChangeLog
--- a/ChangeLog	Fri Oct 11 10:31:55 2013 -0400
+++ b/ChangeLog	Wed Oct 16 13:13:19 2013 -0400
@@ -1,3 +1,21 @@
+2013-10-16  Andrew Azores  <aazores at redhat.com>
+
+	Resolve deadlock issue when multiple applets are loaded simultaneously
+	(RH976833)
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (loadClassLock)
+	private member for locking of loadClass method. (loadClass) synchronizes
+	using new lock rather than instance intrinsic lock to avoid RH976833
+	deadlock
+	* tests/reproducers/custom/JNLPClassLoaderDeadlock/testcases/JNLPClassLoaderDeadlockTest.java:
+	new test for multiple applet deadlock condition
+	* tests/reproducers/custom/JNLPClassLoaderDeadlock/resources/JNLPClassLoaderDeadlock.html:
+	same
+	* tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_1.java:
+	same
+	* tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_2.java:
+	same
+	* tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile: same
+
 2013-10-11  Andrew Azores  <aazores at redhat.com>
 
 	* netx/net/sourceforge/jnlp/security/SecurityDialog.java: (initDialog)
diff -r 60b47a6ec2e4 -r 744442d54cbf netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Fri Oct 11 10:31:55 2013 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Oct 16 13:13:19 2013 -0400
@@ -205,6 +205,16 @@
      */
     private int useCount = 0;
 
+    /* This Object is used as a lock on the loadClass(String) method. This method should not
+     * be entered by multiple threads simultaneously. This Object should be used for no other
+     * purpose than synchronizing the body of the loadClass(String) method. The intrinsic instance
+     * lock is not suitable for this purpose or else deadlock may occur.
+     *
+     * See bug RH976833 and the mailing list archive discussion:
+     * http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-September/024536.html
+     */
+    private final Object loadClassLock = new Object();
+
     /**
      * Create a new JNLPClassLoader from the specified file.
      *
@@ -1410,88 +1420,89 @@
      * classloader, or one of the classloaders for the JNLP file's
      * extensions.
      */
-    public synchronized Class<?> loadClass(String name) throws ClassNotFoundException {
+    public Class<?> loadClass(String name) throws ClassNotFoundException {
+        synchronized (loadClassLock) {
+            Class<?> result = findLoadedClassAll(name);
 
-        Class<?> result = findLoadedClassAll(name);
+            // try parent classloader
+            if (result == null) {
+                try {
+                    ClassLoader parent = getParent();
+                    if (parent == null)
+                        parent = ClassLoader.getSystemClassLoader();
 
-        // try parent classloader
-        if (result == null) {
-            try {
-                ClassLoader parent = getParent();
-                if (parent == null)
-                    parent = ClassLoader.getSystemClassLoader();
+                    return parent.loadClass(name);
+                } catch (ClassNotFoundException ex) {
+                }
+            }
 
-                return parent.loadClass(name);
-            } catch (ClassNotFoundException ex) {
-            }
-        }
+            // filter out 'bad' package names like java, javax
+            // validPackage(name);
 
-        // filter out 'bad' package names like java, javax
-        // validPackage(name);
+            // search this and the extension loaders
+            if (result == null) {
+                try {
+                    result = loadClassExt(name);
+                } catch (ClassNotFoundException cnfe) {
+                    // Not found in external loader either
 
-        // search this and the extension loaders
-        if (result == null) {
-            try {
-                result = loadClassExt(name);
-            } catch (ClassNotFoundException cnfe) {
-                // Not found in external loader either
+                    // Look in 'Class-Path' as specified in the manifest file
+                    try {
+                        for (String classpath : classpaths) {
+                            JARDesc desc;
+                            try {
+                                URL jarUrl = new URL(file.getCodeBase(), classpath);
+                                desc = new JARDesc(jarUrl, null, null, false, true, false, true);
+                            } catch (MalformedURLException mfe) {
+                                throw new ClassNotFoundException(name, mfe);
+                            }
+                            addNewJar(desc);
+                        }
 
-                // Look in 'Class-Path' as specified in the manifest file
-                try {
-                    for (String classpath: classpaths) {
-                        JARDesc desc;
-                        try {
-                            URL jarUrl = new URL(file.getCodeBase(), classpath);
-                            desc = new JARDesc(jarUrl, null, null, false, true, false, true);
-                        } catch (MalformedURLException mfe) {
-                            throw new ClassNotFoundException(name, mfe);
-                        }
-                        addNewJar(desc);
+                        result = loadClassExt(name);
+                        return result;
+                    } catch (ClassNotFoundException cnfe1) {
+                        OutputController.getLogger().log(cnfe1);
                     }
 
-                    result = loadClassExt(name);
-                    return result;
-                } catch (ClassNotFoundException cnfe1) {
-                    OutputController.getLogger().log(cnfe1);
-                }
+                    // As a last resort, look in any available indexes
 
-                // As a last resort, look in any available indexes
+                    // Currently this loads jars directly from the site. We cannot cache it because this
+                    // call is initiated from within the applet, which does not have disk read/write permissions
+                    for (JarIndex index : jarIndexes) {
+                        // Non-generic code in sun.misc.JarIndex
+                        @SuppressWarnings("unchecked")
+                        LinkedList<String> jarList = index.get(name.replace('.', '/'));
 
-                // Currently this loads jars directly from the site. We cannot cache it because this
-                // call is initiated from within the applet, which does not have disk read/write permissions
-                for (JarIndex index : jarIndexes) {
-                    // Non-generic code in sun.misc.JarIndex
-                    @SuppressWarnings("unchecked")
-                    LinkedList<String> jarList = index.get(name.replace('.', '/'));
+                        if (jarList != null) {
+                            for (String jarName : jarList) {
+                                JARDesc desc;
+                                try {
+                                    desc = new JARDesc(new URL(file.getCodeBase(), jarName),
+                                            null, null, false, true, false, true);
+                                } catch (MalformedURLException mfe) {
+                                    throw new ClassNotFoundException(name);
+                                }
+                                try {
+                                    addNewJar(desc);
+                                } catch (Exception e) {
+                                    OutputController.getLogger().log(e);
+                                }
+                            }
 
-                    if (jarList != null) {
-                        for (String jarName : jarList) {
-                            JARDesc desc;
-                            try {
-                                desc = new JARDesc(new URL(file.getCodeBase(), jarName),
-                                        null, null, false, true, false, true);
-                            } catch (MalformedURLException mfe) {
-                                throw new ClassNotFoundException(name);
-                            }
-                            try {
-                                addNewJar(desc);
-                            } catch (Exception e) {
-                                OutputController.getLogger().log(e);
-                            }
+                            // If it still fails, let it error out
+                            result = loadClassExt(name);
                         }
-
-                        // If it still fails, let it error out
-                        result = loadClassExt(name);
                     }
                 }
             }
+
+            if (result == null) {
+                throw new ClassNotFoundException(name);
+            }
+
+            return result;
         }
-
-        if (result == null) {
-            throw new ClassNotFoundException(name);
-        }
-
-        return result;
     }
 
     /**
diff -r 60b47a6ec2e4 -r 744442d54cbf tests/reproducers/custom/JNLPClassLoaderDeadlock/resources/JNLPClassLoaderDeadlock.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/JNLPClassLoaderDeadlock/resources/JNLPClassLoaderDeadlock.html	Wed Oct 16 13:13:19 2013 -0400
@@ -0,0 +1,7 @@
+<html>
+<head></head>
+<body>
+<p><applet code="JNLPClassLoaderDeadlock_1.class" codebase="." width="384" height="32"></applet></p>
+<p><applet code="JNLPClassLoaderDeadlock_2.class" codebase="." width="512" height="512"></applet></p>
+</body>
+</html>
diff -r 60b47a6ec2e4 -r 744442d54cbf tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_1.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_1.java	Wed Oct 16 13:13:19 2013 -0400
@@ -0,0 +1,24 @@
+import java.applet.Applet;
+import java.awt.*;
+
+public class JNLPClassLoaderDeadlock_1 extends Applet {
+
+    @Override
+    public void init() {
+        System.out.println("JNLPClassLoaderDeadlock_1 applet initialized");
+        final String version = System.getProperty("java.version") + " (" + System.getProperty("java.vm.version") + ")";
+        final String vendor = System.getProperty("java.vendor");
+        final TextField tf = new TextField(40);
+        tf.setText(version + " -- " + vendor);
+        tf.setEditable(false);
+        tf.setBackground(Color.white);
+        setBackground(Color.white);
+        add(tf);
+        System.out.println("JNLPClassLoaderDeadlock_1 applet finished");
+        System.out.println("*** APPLET FINISHED ***");
+    }
+
+    public static void main(String[] args) {
+        new JNLPClassLoaderDeadlock_1().init();
+    }
+}
diff -r 60b47a6ec2e4 -r 744442d54cbf tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_2.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_2.java	Wed Oct 16 13:13:19 2013 -0400
@@ -0,0 +1,83 @@
+import java.applet.Applet;
+import java.awt.*;
+
+import java.security.*;
+import java.util.PropertyPermission;
+
+public class JNLPClassLoaderDeadlock_2 extends Applet implements Runnable {
+
+    private static final String propertyNames[] = {
+        "java.version",
+        "java.vendor",
+        "java.vendor.url",
+        "java.home",
+        "java.vm.specification.version",
+        "java.vm.specification.vendor",
+        "java.vm.specification.name",
+        "java.vm.version",
+        "java.vm.name",
+        "java.vm.home",
+        "java.specification.version",
+        "java.specification.vendor",
+        "java.specification.name",
+        "java.class.version",
+        "java.class.path",
+        "os.name",
+        "os.arch",
+        "os.version",
+        "file.separator",
+        "path.separator",
+        "line.separator",
+        "user.home",
+        "user.name",
+        "user.dir",
+    };
+
+    private Label[] propertyValues;
+
+    @Override
+    public void init() {
+        System.out.println("JNLPClassLoaderDeadlock_2 applet initialized");
+        GridBagLayout gridbaglayout = new GridBagLayout();
+        setLayout(gridbaglayout);
+
+        GridBagConstraints leftColumn = new GridBagConstraints();
+        leftColumn.anchor = 20;
+        leftColumn.ipadx = 16;
+
+        GridBagConstraints rightColumn = new GridBagConstraints();
+        rightColumn.fill = 2;
+        rightColumn.gridwidth = 0;
+        rightColumn.weightx = 1.0D;
+
+        Label labels[] = new Label[propertyNames.length];
+        propertyValues = new Label[propertyNames.length];
+        final String preloadText = "...";
+
+        for (int i = 0; i < propertyNames.length; ++i) {
+            labels[i] = new Label(propertyNames[i]);
+            gridbaglayout.setConstraints(labels[i], leftColumn);
+            add(labels[i]);
+
+            propertyValues[i] = new Label(preloadText);
+            gridbaglayout.setConstraints(propertyValues[i], rightColumn);
+            add(propertyValues[i]);
+        }
+
+        Thread t = new Thread(this);
+        t.start();
+    }
+
+    @Override
+    public void run() {
+        for (int i = 0; i < propertyNames.length; ++i) {
+            try {
+                final String propertyValue = System.getProperty(propertyNames[i]);
+                propertyValues[i].setText(propertyValue);
+            } catch (SecurityException securityexception) {
+            }
+        }
+        System.out.println("JNLPClassLoaderDeadlock_2 applet finished");
+        System.out.println("*** APPLET FINISHED ***");
+    }
+}
diff -r 60b47a6ec2e4 -r 744442d54cbf tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile	Wed Oct 16 13:13:19 2013 -0400
@@ -0,0 +1,30 @@
+TESTNAME=JNLPClassLoaderDeadlock
+
+SRC_FILES=JNLPClassLoaderDeadlock_1.java JNLPClassLoaderDeadlock_2.java
+RESOURCE_FILES=JNLPClassLoaderDeadlock.html
+ENTRYPOINT_CLASSES=JNLPClassLoaderDeadlock_1 JNLPClassLoaderDeadlock_2
+
+JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
+JAVAC=$(BOOT_DIR)/bin/javac
+JAR=$(BOOT_DIR)/bin/jar
+
+TMPDIR:=$(shell mktemp -d)
+
+prepare-reproducer:
+	echo PREPARING REPRODUCER $(TESTNAME)
+
+	$(JAVAC) -d $(TMPDIR) -classpath $(JAVAC_CLASSPATH) $(SRC_FILES)
+
+	cd ../resources; \
+	cp $(RESOURCE_FILES) $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \
+	cd -; \
+	for CLASS in $(ENTRYPOINT_CLASSES); \
+	do \
+		mv $(TMPDIR)/"$$CLASS.class" $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \
+	done; \
+
+	echo PREPARED REPRODUCER $(TESTNAME), removing $(TMPDIR)
+	rm -rf $(TMPDIR)
+
+clean-reproducer:
+	echo NOTHING TO CLEAN FOR $(TESTNAME)
diff -r 60b47a6ec2e4 -r 744442d54cbf tests/reproducers/custom/JNLPClassLoaderDeadlock/testcases/JNLPClassLoaderDeadlockTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/JNLPClassLoaderDeadlock/testcases/JNLPClassLoaderDeadlockTest.java	Wed Oct 16 13:13:19 2013 -0400
@@ -0,0 +1,70 @@
+/* JNLPClassLoaderDeadlockTest.java
+Copyright (C) 2013 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+ */
+
+import net.sourceforge.jnlp.ProcessResult;
+import net.sourceforge.jnlp.ServerAccess.AutoClose;
+import net.sourceforge.jnlp.annotations.Bug;
+import net.sourceforge.jnlp.annotations.KnownToFail;
+import net.sourceforge.jnlp.annotations.NeedsDisplay;
+import net.sourceforge.jnlp.annotations.TestInBrowsers;
+import net.sourceforge.jnlp.browsertesting.BrowserTest;
+import net.sourceforge.jnlp.browsertesting.Browsers;
+import net.sourceforge.jnlp.closinglisteners.AutoOkClosingListener;
+
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+public class JNLPClassLoaderDeadlockTest extends BrowserTest {
+
+    @NeedsDisplay
+    @Test
+    @TestInBrowsers(testIn={Browsers.one})
+    @Bug(id="RH976833")
+    public void testClassLoaderDeadlock() throws Exception {
+        ProcessResult pr = server.executeBrowser("JNLPClassLoaderDeadlock.html", AutoClose.CLOSE_ON_CORRECT_END);
+        assertTrue("First applet should have initialized",
+                pr.stdout.contains("JNLPClassLoaderDeadlock_1 applet initialized"));
+        assertTrue("Second applet should have initialized",
+                pr.stdout.contains("JNLPClassLoaderDeadlock_2 applet initialized"));
+
+        assertTrue("First applet should have finished",
+                pr.stdout.contains("JNLPClassLoaderDeadlock_1 applet finished"));
+        assertTrue("Second applet should have finished",
+                pr.stdout.contains("JNLPClassLoaderDeadlock_2 applet finished"));
+    }
+
+}

From aazores at redhat.com  Wed Oct 16 10:15:04 2013
From: aazores at redhat.com (Andrew Azores)
Date: Wed, 16 Oct 2013 13:15:04 -0400
Subject: [rfc][icedtea-web] RH976833 ClassLoader deadlock
In-Reply-To: <525EB689.1090603@redhat.com>
References: <520D35CA.9070208@redhat.com> <52286E1C.8030604@redhat.com>
	<52288F54.1000907@redhat.com> <5229A989.2060203@redhat.com>
	<5229F796.4070708@redhat.com> <5229FB6D.2070301@redhat.com>
	<5237102D.4070207@redhat.com> <52371F34.9050207@redhat.com>
	<52372111.8030200@redhat.com> <52374085.5080901@redhat.com>
	<5245B571.6030106@redhat.com> <524F0FFE.60208@redhat.com>
	<524F1A40.10300@redhat.com> <524F249B.3020804@redhat.com>
	<524F2A34.1000305@redhat.com> <524F3032.6070509@redhat.com>
	<52546E34.4090904@redhat.com> <525EB689.1090603@redhat.com>
Message-ID: <525EC998.1020907@redhat.com>

On 10/16/2013 11:53 AM, Omair Majid wrote:
> On 10/08/2013 04:42 PM, Andrew Azores wrote:
>> On 10/04/2013 05:16 PM, Andrew Azores wrote:
>>> (snip)
>>>
>>> If none of us are able to identify any issues with doing this simple
>>> lock replacement trick then I'll make another push-candidate patch later.
>>>
>> Seems nobody else has identified anything and neither have I, so the
>> patch is attached.
> Looks okay to me.
>
> Cheers,
> Omair
>

How about backport to 1.4?

Thanks,

-- 
Andrew A


From omajid at redhat.com  Wed Oct 16 10:16:11 2013
From: omajid at redhat.com (Omair Majid)
Date: Wed, 16 Oct 2013 13:16:11 -0400
Subject: [rfc][icedtea-web] RH976833 ClassLoader deadlock
In-Reply-To: <525EC998.1020907@redhat.com>
References: <520D35CA.9070208@redhat.com> <52286E1C.8030604@redhat.com>
	<52288F54.1000907@redhat.com> <5229A989.2060203@redhat.com>
	<5229F796.4070708@redhat.com> <5229FB6D.2070301@redhat.com>
	<5237102D.4070207@redhat.com> <52371F34.9050207@redhat.com>
	<52372111.8030200@redhat.com> <52374085.5080901@redhat.com>
	<5245B571.6030106@redhat.com> <524F0FFE.60208@redhat.com>
	<524F1A40.10300@redhat.com> <524F249B.3020804@redhat.com>
	<524F2A34.1000305@redhat.com> <524F3032.6070509@redhat.com>
	<52546E34.4090904@redhat.com> <525EB689.1090603@redhat.com>
	<525EC998.1020907@redhat.com>
Message-ID: <525EC9DB.4030808@redhat.com>

On 10/16/2013 01:15 PM, Andrew Azores wrote:
> How about backport to 1.4?

Sounds okay to me.

Cheers,
Omair

-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681

From aazores at icedtea.classpath.org  Wed Oct 16 10:26:50 2013
From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org)
Date: Wed, 16 Oct 2013 17:26:50 +0000
Subject: /hg/icedtea-web: Add RH976833 fix note to NEWS
Message-ID: <hg.4d64320525d3.1381944410.8643924302249223276@icedtea.classpath.org>

changeset 4d64320525d3 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=4d64320525d3
author: Andrew Azores <aazores at redhat.com>
date: Wed Oct 16 13:26:09 2013 -0400

	Add RH976833 fix note to NEWS


diffstat:

 NEWS |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r 744442d54cbf -r 4d64320525d3 NEWS
--- a/NEWS	Wed Oct 16 13:13:19 2013 -0400
+++ b/NEWS	Wed Oct 16 13:26:09 2013 -0400
@@ -26,6 +26,7 @@
 * Plugin
   - PR854: Resizing an applet several times causes 100% CPU load
   - PR1271: icedtea-web does not handle 'javascript:'-protocol URLs
+  - RH976833: Multiple applets on one page cause deadlock
 * Common
   - PR1474: Can't get javaws to use SOCKS proxy
 * Security Updates

From bugzilla-daemon at icedtea.classpath.org  Wed Oct 16 10:53:53 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 16 Oct 2013 17:53:53 +0000
Subject: [Bug 846] Plugin tries to use a SOCKS proxy even if there is none
	configured
In-Reply-To: <bug-846-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-846-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-846-30-i2eahDenN4@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=846

--- Comment #3 from vogel at folz.de ---
(In reply to comment #2)
> I am not entirely clear on where this problem is. You mention both 'plugin'
> and 'javaws'. These are completely different program and use different ways
> of obtaining the proxy.

It's now 1.75 years later...

AFAIR, with "plugin" I referred to the browser plugin that then uses javaws
to start the app.  When writing the title of the bug I didn't know which
part of the setup is doing wrong, i. e. if it's the browser plugin that
reads the proxy setup from the Firefox configuration, or if that is done
by javaws, or if javaws does nonsense with a configuration read correctly
by the browser plugin.

> 
> I suspect the problem with javaws was fixed by:
> http://icedtea.classpath.org/hg/icedtea-web/rev/c4476a810053
> 
> But I don't see what could be wrong with the plugin. Could follow the steps
> on http://icedtea.classpath.org/wiki/IcedTea-Web#Filing_bugs and attach the
> logs for the plugin?

Fedora 16 is long after EOL, and I've re-installed my computer with
Linux Mint Debian Edition.  This uses packages from Debian, the versions
of the browser plugin and the javaws binary are:
icedtea-6-plugin:amd64 1.3.2-1
icedtea-netx:amd64 1.3.2-1

I've so far not tried to test the error condition with LMDE, because I had
to find my ways around this bug, and I use the workaround ever since.  This
means to use more than one browser, and have Firefox configured with no
proxy, and working proxy settings in the other browsers.

Should version 1.3.2 have the fix you mentioned?  If so, then it would make
sense to test again.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131016/da7e9ff4/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Wed Oct 16 12:48:34 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 16 Oct 2013 19:48:34 +0000
Subject: [Bug 1584] New: Commvault console fails to start due to error in
	JNLP file
Message-ID: <bug-1584-30@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1584

            Bug ID: 1584
           Summary: Commvault console fails to start due to error in JNLP
                    file
    Classification: Unclassified
           Product: IcedTea-Web
           Version: unspecified
          Hardware: x86_64
                OS: Linux
            Status: NEW
          Severity: normal
          Priority: P3
         Component: NetX (javaws)
          Assignee: omajid at redhat.com
          Reporter: robert at leblancnet.us
                CC: unassigned at icedtea.classpath.org

Created attachment 953
  --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=953&action=edit
JNLP file in question

Trying to launch the Commvault console from a web browser or command line fails
with an error in parsing the JNLP file.

netx: Read Error: Could not read or parse the JNLP file. (Invalid XML document
syntax. (XML Parse Exception during parsing of a html element at line 26:
Expected: meta))
net.sourceforge.jnlp.LaunchException: Fatal: Read Error: Could not read or
parse the JNLP file. You can try to download this file manually and send it as
bug report to IcedTea-Web team.
        at net.sourceforge.jnlp.Launcher.fromUrl(Launcher.java:472)
        at net.sourceforge.jnlp.Launcher.launch(Launcher.java:278)
        at net.sourceforge.jnlp.runtime.Boot.run(Boot.java:211)
        at net.sourceforge.jnlp.runtime.Boot.run(Boot.java:53)
        at java.security.AccessController.doPrivileged(Native Method)
        at net.sourceforge.jnlp.runtime.Boot.main(Boot.java:177)
Caused by: net.sourceforge.jnlp.ParseException: Invalid XML document syntax.
        at net.sourceforge.jnlp.Parser.getRootNode(Parser.java:1312)
        at net.sourceforge.jnlp.JNLPFile.<init>(JNLPFile.java:206)
        at net.sourceforge.jnlp.JNLPFile.<init>(JNLPFile.java:190)
        at net.sourceforge.jnlp.JNLPFile.<init>(JNLPFile.java:175)
        at net.sourceforge.jnlp.JNLPFile.<init>(JNLPFile.java:161)
        at net.sourceforge.jnlp.Launcher.fromUrl(Launcher.java:464)
        ... 5 more
Caused by: net.sourceforge.nanoxml.XMLParseException: XML Parse Exception
during parsing of a html element at line 26: Expected: meta
        at
net.sourceforge.nanoxml.XMLElement.expectedInput(XMLElement.java:1126)
        at net.sourceforge.nanoxml.XMLElement.scanElement(XMLElement.java:990)
        at net.sourceforge.nanoxml.XMLElement.scanElement(XMLElement.java:967)
        at net.sourceforge.nanoxml.XMLElement.scanElement(XMLElement.java:967)
        at
net.sourceforge.nanoxml.XMLElement.parseFromReader(XMLElement.java:512)
        at
net.sourceforge.nanoxml.XMLElement.parseFromReader(XMLElement.java:464)
        at net.sourceforge.jnlp.Parser.getRootNode(Parser.java:1308)
        ... 10 more

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131016/0b43b552/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Wed Oct 16 12:49:23 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 16 Oct 2013 19:49:23 +0000
Subject: [Bug 1584] Commvault console fails to start due to error in JNLP file
In-Reply-To: <bug-1584-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1584-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1584-30-SZiADBYWD8@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1584

--- Comment #1 from Robert LeBlanc <robert at leblancnet.us> ---
Created attachment 954
  --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=954&action=edit
javaws log file

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131016/d12f8bb0/attachment.html 

From domuradical at gmail.com  Wed Oct 16 14:59:28 2013
From: domuradical at gmail.com (Adam Domurad)
Date: Wed, 16 Oct 2013 21:59:28 +0000 (UTC)
Subject: /hg/icedtea-web: Do not wait for applet initialization
	=?utf-8?b?d2hlbgliaW5kLi4u?=
References: <hg.420d72e5cee7.1377715818.8643924302249223276@icedtea.classpath.org>
	<524EDE4B.90804@redhat.com>
Message-ID: <loom.20131016T235604-780@post.gmane.org>


> This changeset causes nearly all of our JavaScript-related reproducer 
> tests to fail. [...] As such I'd like to propose that we backout this
changeset.
> 
> [1]
> https://jdk6.java.net/nonav/plugin2/liveconnect/LiveConnectTests/
> 
> Thanks,
> 

Please do. I would like to pick up work on this patch again (school's light
enough for now). Backing out until I investigate (it's been a while since I
touched icedtea-web) sounds like the best course.

(So, backout approved.)

Thanks,
-Adam Domurad


From ptisnovs at icedtea.classpath.org  Thu Oct 17 04:26:53 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Thu, 17 Oct 2013 11:26:53 +0000
Subject: /hg/rhino-tests: Added new testGetResourceNPETest case into
Message-ID: <hg.ccd63d49fe53.1382009213.-6019694633368342460@icedtea.classpath.org>

changeset ccd63d49fe53 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=ccd63d49fe53
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Oct 17 13:30:38 2013 +0200

	Added new testGetResourceNPETest case into
	CompilableClassTest.


diffstat:

 ChangeLog                                   |   6 ++++++
 src/org/RhinoTests/CompilableClassTest.java |  13 +++++++++++++
 2 files changed, 19 insertions(+), 0 deletions(-)

diffs (36 lines):

diff -r a8242550bb5c -r ccd63d49fe53 ChangeLog
--- a/ChangeLog	Wed Oct 16 09:21:59 2013 +0200
+++ b/ChangeLog	Thu Oct 17 13:30:38 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-17  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/CompilableClassTest.java:
+	Added new testGetResourceNPETest case into
+	CompilableClassTest.
+
 2013-10-16  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/BindingsClassTest.java:
diff -r a8242550bb5c -r ccd63d49fe53 src/org/RhinoTests/CompilableClassTest.java
--- a/src/org/RhinoTests/CompilableClassTest.java	Wed Oct 16 09:21:59 2013 +0200
+++ b/src/org/RhinoTests/CompilableClassTest.java	Thu Oct 17 13:30:38 2013 +0200
@@ -1413,6 +1413,19 @@
     }
 
     /**
+     * Test for method javax.script.Compilable.getClass().getResourceNPETest()
+     */
+    protected void testGetResourceNPETest() {
+        try {
+            Object resource = this.compilableClass.getResource(null);
+            throw new AssertionError("NullPointerException expected!");
+        }
+        catch (NullPointerException e) {
+            //This is OK OK
+        }
+    }
+
+    /**
      * Test for instanceof operator applied to a class javax.script.Compilable
      */
     @SuppressWarnings("cast")

From ptisnovs at icedtea.classpath.org  Thu Oct 17 04:34:02 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Thu, 17 Oct 2013 11:34:02 +0000
Subject: /hg/gfx-test: Added five new tests into CAGOperationsOnCircleAnd...
Message-ID: <hg.cb55af58e54c.1382009642.-6248649288953172555@icedtea.classpath.org>

changeset cb55af58e54c in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=cb55af58e54c
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Oct 17 13:37:49 2013 +0200

	Added five new tests into CAGOperationsOnCircleAndRectangle test
	suite.


diffstat:

 ChangeLog                                                         |    6 +
 src/org/gfxtest/testsuites/CAGOperationsOnCircleAndRectangle.java |  135 +++++++++-
 2 files changed, 131 insertions(+), 10 deletions(-)

diffs (228 lines):

diff -r 7035be323664 -r cb55af58e54c ChangeLog
--- a/ChangeLog	Wed Oct 16 09:42:48 2013 +0200
+++ b/ChangeLog	Thu Oct 17 13:37:49 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-17  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/CAGOperationsOnCircleAndRectangle.java:
+	Added five new tests into CAGOperationsOnCircleAndRectangle test
+	suite.
+
 2013-10-16  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/framework/CommonCAGOperations.java:
diff -r 7035be323664 -r cb55af58e54c src/org/gfxtest/testsuites/CAGOperationsOnCircleAndRectangle.java
--- a/src/org/gfxtest/testsuites/CAGOperationsOnCircleAndRectangle.java	Wed Oct 16 09:42:48 2013 +0200
+++ b/src/org/gfxtest/testsuites/CAGOperationsOnCircleAndRectangle.java	Thu Oct 17 13:37:49 2013 +0200
@@ -69,7 +69,7 @@
     /**
      * Checks the process of creating and rendering new geometric shape
      * constructed from circle and rectangle using union operator. The shape is
-     * rendered using stroke.
+     * rendered using stroke paint.
      * 
      * @param image
      *            image to which area is to be drawn
@@ -92,7 +92,7 @@
     /**
      * Checks the process of creating and rendering new geometric shape
      * constructed from circle and rectangle using intersect operator. The shape
-     * is rendered using stroke.
+     * is rendered using stroke paint.
      * 
      * @param image
      *            image to which area is to be drawn
@@ -115,7 +115,7 @@
     /**
      * Checks the process of creating and rendering new geometric shape
      * constructed from circle and rectangle using subtract operator. The shape
-     * is rendered using stroke.
+     * is rendered using stroke paint.
      * 
      * @param image
      *            image to which area is to be drawn
@@ -138,7 +138,7 @@
     /**
      * Checks the process of creating and rendering new geometric shape
      * constructed from circle and rectangle using inverse subtract operator.
-     * The shape is rendered using stroke.
+     * The shape is rendered using stroke paint.
      * 
      * @param image
      *            image to which area is to be drawn
@@ -161,7 +161,7 @@
     /**
      * Checks the process of creating and rendering new geometric shape
      * constructed from circle and rectangle using Xor operator.
-     * The shape is rendered using stroke.
+     * The shape is rendered using stroke paint.
      * 
      * @param image
      *            image to which area is to be drawn
@@ -1010,7 +1010,7 @@
     /**
      * Checks the process of creating and rendering new geometric shape
      * constructed from circle and rectangle using union operator. The shape is
-     * rendered using stroke.
+     * rendered using stroke paint.
      * 
      * @param image
      *            image to which area is to be drawn
@@ -1033,7 +1033,7 @@
     /**
      * Checks the process of creating and rendering new geometric shape
      * constructed from circle and rectangle using subtract operator. The shape
-     * is rendered using stroke.
+     * is rendered using stroke paint.
      * 
      * @param image
      *            image to which area is to be drawn
@@ -1056,7 +1056,7 @@
     /**
      * Checks the process of creating and rendering new geometric shape
      * constructed from circle and rectangle using inverse subtract operator.
-     * The shape is rendered using stroke.
+     * The shape is rendered using stroke paint.
      * 
      * @param image
      *            image to which area is to be drawn
@@ -1079,7 +1079,7 @@
     /**
      * Checks the process of creating and rendering new geometric shape
      * constructed from circle and rectangle using intersect operator. The shape
-     * is rendered using stroke.
+     * is rendered using stroke paint.
      * 
      * @param image
      *            image to which area is to be drawn
@@ -1102,7 +1102,7 @@
     /**
      * Checks the process of creating and rendering new geometric shape
      * constructed from circle and rectangle using XOR operator. The shape is
-     * rendered using stroke.
+     * rendered using stroke paint.
      * 
      * @param image
      *            image to which area is to be drawn
@@ -1949,6 +1949,121 @@
     }
 
     /**
+     * Checks the process of creating and rendering new geometric shape
+     * constructed from circle and rectangle using union operator. The shape is
+     * rendered using stroke paint.
+     * 
+     * @param image
+     *            image to which area is to be drawn
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testOverlappingCircleAndRectangleUnionStrokePaint(TestImage image, Graphics2D graphics2d)
+    {
+        // set stroke color
+        CommonRenderingStyles.setStrokeColor(graphics2d);
+        // create area using union operator
+        Area area = CommonCAGOperations.createAreaFromOverlappingCircleAndRectangleUsingUnionOperator(image);
+        // draw the area
+        graphics2d.draw(area);
+        // test result
+        return TestResult.PASSED;
+    }
+
+    /**
+     * Checks the process of creating and rendering new geometric shape
+     * constructed from circle and rectangle using subtract operator. The shape is
+     * rendered using stroke paint.
+     * 
+     * @param image
+     *            image to which area is to be drawn
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testOverlappingCircleAndRectangleSubtractStrokePaint(TestImage image, Graphics2D graphics2d)
+    {
+        // set stroke color
+        CommonRenderingStyles.setStrokeColor(graphics2d);
+        // create area using union operator
+        Area area = CommonCAGOperations.createAreaFromOverlappingCircleAndRectangleUsingSubtractOperator(image);
+        // draw the area
+        graphics2d.draw(area);
+        // test result
+        return TestResult.PASSED;
+    }
+
+    /**
+     * Checks the process of creating and rendering new geometric shape
+     * constructed from circle and rectangle using inverse subtract operator. The shape is
+     * rendered using stroke paint.
+     * 
+     * @param image
+     *            image to which area is to be drawn
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testOverlappingCircleAndRectangleInverseSubtractStrokePaint(TestImage image, Graphics2D graphics2d)
+    {
+        // set stroke color
+        CommonRenderingStyles.setStrokeColor(graphics2d);
+        // create area using union operator
+        Area area = CommonCAGOperations.createAreaFromOverlappingCircleAndRectangleUsingInverseSubtractOperator(image);
+        // draw the area
+        graphics2d.draw(area);
+        // test result
+        return TestResult.PASSED;
+    }
+
+    /**
+     * Checks the process of creating and rendering new geometric shape
+     * constructed from circle and rectangle using intersect operator. The shape is
+     * rendered using stroke paint.
+     * 
+     * @param image
+     *            image to which area is to be drawn
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testOverlappingCircleAndRectangleIntersectStrokePaint(TestImage image, Graphics2D graphics2d)
+    {
+        // set stroke color
+        CommonRenderingStyles.setStrokeColor(graphics2d);
+        // create area using union operator
+        Area area = CommonCAGOperations.createAreaFromOverlappingCircleAndRectangleUsingIntersectOperator(image);
+        // draw the area
+        graphics2d.draw(area);
+        // test result
+        return TestResult.PASSED;
+    }
+
+    /**
+     * Checks the process of creating and rendering new geometric shape
+     * constructed from circle and rectangle using XOR operator. The shape is
+     * rendered using stroke paint.
+     * 
+     * @param image
+     *            image to which area is to be drawn
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testOverlappingCircleAndRectangleXorStrokePaint(TestImage image, Graphics2D graphics2d)
+    {
+        // set stroke color
+        CommonRenderingStyles.setStrokeColor(graphics2d);
+        // create area using union operator
+        Area area = CommonCAGOperations.createAreaFromOverlappingCircleAndRectangleUsingXorOperator(image);
+        // draw the area
+        graphics2d.draw(area);
+        // test result
+        return TestResult.PASSED;
+    }
+
+    /**
      * Entry point to the test suite.
      *
      * @param args not used in this case

From aazores at icedtea.classpath.org  Thu Oct 17 07:49:36 2013
From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org)
Date: Thu, 17 Oct 2013 14:49:36 +0000
Subject: /hg/icedtea-web: Back out changeset 420d72e5cee7
Message-ID: <hg.bde9b562c85e.1382021376.8643924302249223276@icedtea.classpath.org>

changeset bde9b562c85e in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bde9b562c85e
author: Andrew Azores <aazores at redhat.com>
date: Thu Oct 17 10:32:46 2013 -0400

	Back out changeset 420d72e5cee7

	Back out changeset 420d72e5cee7 due to breaking LiveConnect feature.
	http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-October/024919.html
	* plugin/icedteanp/IcedTeaNPPlugin.cc: undo 420d72e5cee7
	* plugin/icedteanp/IcedTeaPluginUtils.cc: undo 420d72e5cee7
	* plugin/icedteanp/IcedTeaPluginUtils.h: undo 420d72e5cee7
	* plugin/icedteanp/IcedTeaScriptablePluginObject.cc: undo 420d72e5cee7
	* plugin/icedteanp/IcedTeaScriptablePluginObject.h: undo 420d72e5cee7
	* tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc: undo 420d72e5cee7


diffstat:

 ChangeLog                                                 |   11 +
 plugin/icedteanp/IcedTeaNPPlugin.cc                       |   36 ++-
 plugin/icedteanp/IcedTeaPluginUtils.cc                    |  134 ++-----
 plugin/icedteanp/IcedTeaPluginUtils.h                     |   67 +---
 plugin/icedteanp/IcedTeaScriptablePluginObject.cc         |  222 ++++---------
 plugin/icedteanp/IcedTeaScriptablePluginObject.h          |   28 +-
 tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc |   15 +-
 7 files changed, 171 insertions(+), 342 deletions(-)

diffs (truncated from 848 to 500 lines):

diff -r 4d64320525d3 -r bde9b562c85e ChangeLog
--- a/ChangeLog	Wed Oct 16 13:26:09 2013 -0400
+++ b/ChangeLog	Thu Oct 17 10:32:46 2013 -0400
@@ -1,3 +1,14 @@
+2013-10-17  Andrew Azores  <aazores at redhat.com>
+
+	Back out changeset 420d72e5cee7 due to breaking LiveConnect feature.
+	http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-October/024919.html
+	* plugin/icedteanp/IcedTeaNPPlugin.cc: undo 420d72e5cee7
+	* plugin/icedteanp/IcedTeaPluginUtils.cc: undo 420d72e5cee7
+	* plugin/icedteanp/IcedTeaPluginUtils.h: undo 420d72e5cee7
+	* plugin/icedteanp/IcedTeaScriptablePluginObject.cc: undo 420d72e5cee7
+	* plugin/icedteanp/IcedTeaScriptablePluginObject.h: undo 420d72e5cee7
+	* tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc: undo 420d72e5cee7
+
 2013-10-16  Andrew Azores  <aazores at redhat.com>
 
 	Resolve deadlock issue when multiple applets are loaded simultaneously
diff -r 4d64320525d3 -r bde9b562c85e plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Wed Oct 16 13:26:09 2013 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Thu Oct 17 10:32:46 2013 -0400
@@ -2101,6 +2101,14 @@
 
     if (data->is_applet_instance) // dummy instance/package?
     {
+        JavaRequestProcessor java_request = JavaRequestProcessor();
+        JavaResultData* java_result;
+        std::string instance_id = std::string();
+        std::string applet_class_id = std::string();
+
+        int id = get_id_from_instance(instance);
+        gchar* id_str = g_strdup_printf ("%d", id);
+
         // Some browsers.. (e.g. chromium) don't call NPP_SetWindow
         // for 0x0 plugins and therefore require initialization with
         // a 0 handle
@@ -2109,10 +2117,30 @@
             plugin_send_initialization_message(data->instance_id, 0, 0, 0, data->parameters_string);
         }
 
-        NPObjectRef applet_object = IcedTeaScriptableJavaObject::get_scriptable_applet_object(instance);
-        /* Retain because we are returning an NPObject* */
-        applet_object.raw_retain();
-        obj = applet_object.get();
+        java_result = java_request.getAppletObjectInstance(id_str);
+
+        g_free(id_str);
+
+        if (java_result->error_occurred)
+        {
+            printf("Error: Unable to fetch applet instance id from Java side.\n");
+            return NULL;
+        }
+
+        instance_id.append(*(java_result->return_string));
+
+        java_result = java_request.getClassID(instance_id);
+
+        if (java_result->error_occurred)
+        {
+            printf("Error: Unable to fetch applet instance id from Java side.\n");
+            return NULL;
+        }
+
+        applet_class_id.append(*(java_result->return_string));
+
+        obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, applet_class_id, instance_id, false);
+
     } else
     {
         obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(instance, "");
diff -r 4d64320525d3 -r bde9b562c85e plugin/icedteanp/IcedTeaPluginUtils.cc
--- a/plugin/icedteanp/IcedTeaPluginUtils.cc	Wed Oct 16 13:26:09 2013 -0400
+++ b/plugin/icedteanp/IcedTeaPluginUtils.cc	Thu Oct 17 10:32:46 2013 -0400
@@ -53,7 +53,7 @@
 int IcedTeaPluginUtilities::reference = -1;
 pthread_mutex_t IcedTeaPluginUtilities::reference_mutex = PTHREAD_MUTEX_INITIALIZER;
 std::map<void*, NPP>* IcedTeaPluginUtilities::instance_map = new std::map<void*, NPP>();
-std::map<std::string, NPObjectRef> IcedTeaPluginUtilities::object_map;
+std::map<std::string, NPObject*>* IcedTeaPluginUtilities::object_map = new std::map<std::string, NPObject*>();
 
 /* Plugin async call queue */
 static std::vector< PluginThreadCall* >* pendingPluginThreadRequests = new std::vector< PluginThreadCall* >();
@@ -433,9 +433,9 @@
 IcedTeaPluginUtilities::printStringVector(const char* prefix, std::vector<std::string>* str_vector)
 {
 
-    // This is a CPU intensive function. Run only if debugging
-    if (!plugin_debug)
-        return;
+        // This is a CPU intensive function. Run only if debugging
+        if (!plugin_debug)
+            return;
 
 	std::string* str = new std::string();
 	*str += "{ ";
@@ -561,25 +561,27 @@
  * @return The associated active NPObject, NULL otherwise
  */
 
-NPObjectRef
+NPObject*
 IcedTeaPluginUtilities::getNPObjectFromJavaKey(std::string key)
 {
+
+    NPObject* object = NULL;
     PLUGIN_DEBUG("getNPObjectFromJavaKey looking for %s\n", key.c_str());
 
-    std::map<std::string, NPObjectRef>::iterator iterator = object_map.find(key);
+    std::map<std::string, NPObject*>::iterator iterator = object_map->find(key);
 
-    if (iterator != object_map.end())
+    if (iterator != object_map->end())
     {
-        NPObjectRef object = object_map.find(key)->second;
+        NPObject* mapped_object = object_map->find(key)->second;
 
-        if (getInstanceFromMemberPtr(object.get()) != NULL)
+        if (getInstanceFromMemberPtr(mapped_object) != NULL)
         {
-            PLUGIN_DEBUG("getNPObjectFromJavaKey found %s. NPObject = %p\n", key.c_str(), object.get());
-            return object;
+            object = mapped_object;
+            PLUGIN_DEBUG("getNPObjectFromJavaKey found %s. NPObject = %p\n", key.c_str(), object);
         }
     }
 
-    return NPObjectRef(NULL);
+    return object;
 }
 
 /**
@@ -590,10 +592,10 @@
  */
 
 void
-IcedTeaPluginUtilities::storeObjectMapping(std::string key, NPObjectRef object)
+IcedTeaPluginUtilities::storeObjectMapping(std::string key, NPObject* object)
 {
-    PLUGIN_DEBUG("Storing object %p with key %s\n", object.get(), key.c_str());
-    object_map.insert(std::make_pair(key, object));
+    PLUGIN_DEBUG("Storing object %p with key %s\n", object, key.c_str());
+    object_map->insert(std::make_pair(key, object));
 }
 
 /**
@@ -606,14 +608,19 @@
 IcedTeaPluginUtilities::removeObjectMapping(std::string key)
 {
     PLUGIN_DEBUG("Removing key %s from object map\n", key.c_str());
-    object_map.erase(key);
+    object_map->erase(key);
 }
 
 /* Clear object_map. Useful for tests. */
 void
 IcedTeaPluginUtilities::clearObjectMapping()
 {
-    object_map = std::map<std::string, NPObjectRef>();
+    std::map<std::string, NPObject*>::iterator iter = object_map->begin();
+    for (; iter != object_map->end(); ++iter) {
+        browser_functions.releaseobject(iter->second);
+    }
+    delete object_map;
+    object_map = new std::map<std::string, NPObject*>();
 }
 
 /*
@@ -626,9 +633,9 @@
 void
 IcedTeaPluginUtilities::printStringPtrVector(const char* prefix, std::vector<std::string*>* str_ptr_vector)
 {
-    // This is a CPU intensive function. Run only if debugging
-    if (!plugin_debug)
-        return;
+        // This is a CPU intensive function. Run only if debugging
+        if (!plugin_debug)
+            return;
 
 	std::string* str = new std::string();
 	*str += "{ ";
@@ -812,13 +819,18 @@
 
     std::string jclass_id = *jclass_result->return_string;
 
-    bool is_array = (jclass_id.at(0) == '[');
-    NPObjectRef object = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, jclass_id,
-                jobject_id, is_array);
+    NPObject* obj;
+    if (jclass_id.at(0) == '[') // array
+    {
+        obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, jclass_id,
+                jobject_id, true);
+    } else
+    {
+        obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, jclass_id,
+                jobject_id, false);
+    }
 
-    OBJECT_TO_NPVARIANT(object.get(), *variant);
-    /* Retain because we are returning an NPObject* */
-    object.raw_retain();
+    OBJECT_TO_NPVARIANT(obj, *variant);
 
     return true;
 }
@@ -862,12 +874,12 @@
 }
 
 bool
-IcedTeaPluginUtilities::isObjectJSArray(NPP instance, NPObjectRef object)
+IcedTeaPluginUtilities::isObjectJSArray(NPP instance, NPObject* object)
 {
 
     NPVariant constructor_v = NPVariant();
     NPIdentifier constructor_id = browser_functions.getstringidentifier("constructor");
-    browser_functions.getproperty(instance, object.get(), constructor_id, &constructor_v);
+    browser_functions.getproperty(instance, object, constructor_id, &constructor_v);
     IcedTeaPluginUtilities::printNPVariant(constructor_v);
 
     // void constructor => not an array
@@ -1075,34 +1087,6 @@
 	str = str.substr(start, end - start + 1);
 }
 
-std::string
-IcedTeaPluginUtilities::stringPrintf(const char* fmt, /*variable arguments*/ ...)
-{
-  /* Extract the variable arguments */
-  va_list args;
-  va_start(args, fmt);
-
-  gchar* result = NULL;
-  size_t size;
-
-  /* Format the arguments into a new buffer, held in 'result' */
-  size = g_vasprintf (&result, fmt, args);
-
-  if (result == NULL)
-  {
-    // We are out of memory
-    throw std::bad_alloc();
-  }
-
-  /* Wrap as string and free buffer */
-  std::string str(result, size);
-  g_free(result);
-
-  va_end(args); /* Finish using variable arguments */
-
-  return str;
-}
-
 std::string IcedTeaPluginUtilities::NPIdentifierAsString(NPIdentifier id) {
     NPUTF8* cstr = browser_functions.utf8fromidentifier(id);
     if (cstr == NULL) {
@@ -1258,41 +1242,3 @@
     PLUGIN_DEBUG("%p unlocked...\n", &msg_queue_mutex);
 }
 
-void
-NPObjectRef::set(NPObject* new_object)
-{
-    if (new_object != NULL) {
-        /* Increase the new object's reference count */
-        browser_functions.retainobject(new_object);
-    }
-    if (current_object != NULL) {
-        /* Decrease the old object's reference count */
-        browser_functions.releaseobject(current_object);
-    }
-
-    this->current_object = new_object;
-}
-
-NPObjectRef
-NPObjectRef::create(NPP instance, NPClass* np_class)
-{
-    NPObjectRef ref;
-    /* Don't use set(), otherwise we'd double-retain */
-    ref.current_object = browser_functions.createobject(instance, np_class);
-    return ref;
-}
-
-/* Explicit reference counting operations, use only if needed for interoperating with NPObject* */
-void
-NPObjectRef::raw_retain() {
-    if (current_object != NULL) {
-        browser_functions.retainobject(current_object);
-    }
-}
-
-void
-NPObjectRef::raw_release() {
-    if (current_object != NULL) {
-        browser_functions.releaseobject(current_object);
-    }
-}
diff -r 4d64320525d3 -r bde9b562c85e plugin/icedteanp/IcedTeaPluginUtils.h
--- a/plugin/icedteanp/IcedTeaPluginUtils.h	Wed Oct 16 13:26:09 2013 -0400
+++ b/plugin/icedteanp/IcedTeaPluginUtils.h	Thu Oct 17 10:32:46 2013 -0400
@@ -153,61 +153,6 @@
 /* Function to process all pending async calls */
 void processAsyncCallQueue(void*);
 
-/* Reference-counted 'smart pointer' to NPObject */
-class NPObjectRef {
-public:
-    /* Create with browser_functions.createobject.
-     * This ensures the object is not double-retained. */
-    static NPObjectRef create(NPP instance, NPClass* np_class);
-
-    NPObjectRef(NPObject* obj = NULL) {
-        current_object = NULL;
-        set(obj);
-    }
-
-    NPObjectRef(const NPObjectRef& ref) {
-        current_object = NULL;
-        set(ref.current_object);
-    }
-
-    NPObjectRef& operator=(const NPObjectRef& ref) {
-        set(ref.current_object);
-        return *this;
-    }
-
-    ~NPObjectRef() {
-        clear();
-    }
-
-    void set(NPObject* new_object);
-
-    /* Get's the object pointer */
-    NPObject* get() {
-        return current_object;
-    }
-
-    /* Helper for getting object as different type.
-     * NOTE: This cast is unchecked. */
-    template <typename T>
-    T as() {
-        return (T)current_object;
-    }
-
-    /* Explicit reference counting operations, use only if needed for interoperating with NPObject* */
-    void raw_retain();
-    void raw_release();
-
-    bool empty() {
-        return (current_object == NULL);
-    }
-
-    void clear() {
-        set(NULL);
-    }
-private:
-    NPObject* current_object;
-};
-
 class IcedTeaPluginUtilities
 {
 
@@ -220,8 +165,8 @@
         /* Map holding window pointer<->instance relationships */
         static std::map<void*, NPP>* instance_map;
 
-        /* Map holding java-side-obj-key->NPObject relationship. */
-        static std::map<std::string, NPObjectRef> object_map;
+        /* Map holding java-side-obj-key->NPObject relationship  */
+        static std::map<std::string, NPObject*>* object_map;
 
         /* Posts a call in the async call queue */
         static bool postPluginThreadAsyncCall(NPP instance, void (*func) (void *), void* data);
@@ -257,8 +202,6 @@
     	/* Converts the given integer to a string */
     	static void itoa(int i, std::string* result);
 
-    	static std::string stringPrintf(const char* fmt, ...);
-
     	/* Copies a variant data type into a C++ string */
     	static std::string NPVariantAsString(NPVariant variant);
 
@@ -319,9 +262,9 @@
 
     	static NPP getInstanceFromMemberPtr(void* member_ptr);
 
-    	static NPObjectRef getNPObjectFromJavaKey(std::string key);
+    	static NPObject* getNPObjectFromJavaKey(std::string key);
 
-    	static void storeObjectMapping(std::string key, NPObjectRef object);
+    	static void storeObjectMapping(std::string key, NPObject* object);
 
     	static void removeObjectMapping(std::string key);
 
@@ -330,7 +273,7 @@
 
     	static void invalidateInstance(NPP instance);
 
-    	static bool isObjectJSArray(NPP instance, NPObjectRef object);
+    	static bool isObjectJSArray(NPP instance, NPObject* object);
 
     	static void decodeURL(const char* url, char** decoded_url);
 
diff -r 4d64320525d3 -r bde9b562c85e plugin/icedteanp/IcedTeaScriptablePluginObject.cc
--- a/plugin/icedteanp/IcedTeaScriptablePluginObject.cc	Wed Oct 16 13:26:09 2013 -0400
+++ b/plugin/icedteanp/IcedTeaScriptablePluginObject.cc	Thu Oct 17 10:32:46 2013 -0400
@@ -306,26 +306,24 @@
 
 	//NPIdentifier property = browser_functions.getstringidentifier(property_name.c_str());
 
-	NPObjectRef object;
+	NPObject* obj;
 
 	if (isPropertyClass)
 	{
 		PLUGIN_DEBUG("Returning package object\n");
-		object = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(
+		obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(
                                   IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj),
                                   property_name.c_str());
 	}
 	else
 	{
 		PLUGIN_DEBUG("Returning Java object\n");
-		object = IcedTeaScriptableJavaObject::get_scriptable_java_object(
+		obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(
 		                IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj),
 		                *(java_result->return_string), "0", false);
 	}
 
-	OBJECT_TO_NPVARIANT(object.get(), *result);
-	/* Retain because we are returning an NPObject* */
-	object.raw_retain();
+	OBJECT_TO_NPVARIANT(obj, *result);
 
 	return true;
 }
@@ -386,33 +384,32 @@
     return np_class;
 }
 
-/* Creates a scriptable java object (intended to be called asynch.) */
-static void
-create_scriptable_java_object_async(void* data)
-{
-    PLUGIN_DEBUG("Asynchronously creating object ...\n");
-
-    std::vector<void*> parameters = ((AsyncCallThreadData*) data)->parameters;
-    NPP instance = (NPP) parameters.at(0);
-    NPClass* np_class = (NPClass*) parameters.at(1);
-    NPObjectRef* object_ref = (NPObjectRef*) parameters.at(2);
-
-    *object_ref = browser_functions.createobject(instance, np_class);
-
-    ((AsyncCallThreadData*) data)->result_ready = true;
-}
-
-static NPObjectRef
-create_scriptable_java_object(NPP instance)
+NPObject*
+IcedTeaScriptableJavaObject::get_scriptable_java_object(NPP instance,
+                                    std::string class_id,
+                                    std::string instance_id,
+                                    bool isArray)
 {
     /* Shared NPClass instance for IcedTeaScriptablePluginObject */
     static NPClass np_class = scriptable_java_package_object_class();
 
+    std::string obj_key = class_id + ":" + instance_id;
+
+    PLUGIN_DEBUG("get_scriptable_java_object searching for %s...\n", obj_key.c_str());
+    IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*) IcedTeaPluginUtilities::getNPObjectFromJavaKey(obj_key);
+
+    if (scriptable_object != NULL)
+    {
+        PLUGIN_DEBUG("Returning existing object %p\n", scriptable_object);
+        browser_functions.retainobject(scriptable_object);
+        return scriptable_object;
+    }
+
     // try to create normally
-    NPObjectRef np_object = NPObjectRef::create(instance, &np_class);
+    scriptable_object = (IcedTeaScriptableJavaObject*)browser_functions.createobject(instance, &np_class);
 
     // didn't work? try creating asynch
-    if (np_object.empty())
+    if (!scriptable_object)
     {
         AsyncCallThreadData thread_data = AsyncCallThreadData();
         thread_data.result_ready = false;
@@ -421,104 +418,45 @@
 
         thread_data.parameters.push_back(instance);
         thread_data.parameters.push_back(&np_class);
-        thread_data.parameters.push_back(&np_object);
+        thread_data.parameters.push_back(&scriptable_object);
 
-        IcedTeaPluginUtilities::callAndWaitForResult(instance, &create_scriptable_java_object_async, &thread_data);
+        IcedTeaPluginUtilities::callAndWaitForResult(instance, &_createAndRetainJavaObject, &thread_data);

From aazores at icedtea.classpath.org  Thu Oct 17 08:10:06 2013
From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org)
Date: Thu, 17 Oct 2013 15:10:06 +0000
Subject: /hg/release/icedtea-web-1.4: Resolve multiple-applet deadlock is...
Message-ID: <hg.29c1c1f92e09.1382022606.-5934593987637005762@icedtea.classpath.org>

changeset 29c1c1f92e09 in /hg/release/icedtea-web-1.4
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=29c1c1f92e09
author: Andrew Azores <aazores at redhat.com>
date: Thu Oct 17 11:09:51 2013 -0400

	Resolve multiple-applet deadlock issue in JNLPClassLoader

	New lock used for synchronizing JNLPClassLoader#loadClass(String) to avoid
	deadlock condition when multiple applets are being loaded simultaneously.
	Regression test included.

	    * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (loadClassLock)
	    private member for locking of loadClass method. (loadClass) synchronizes
	    using new lock rather than instance intrinsic lock to avoid RH976833
	    deadlock
	    * tests/reproducers/custom/JNLPClassLoaderDeadlock/testcases/JNLPClassLoaderDeadlockTest.java:
	    new test for multiple applet deadlock condition
	    * tests/reproducers/custom/JNLPClassLoaderDeadlock/resources/JNLPClassLoaderDeadlock.html:
	    same
	    * tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_1.java:
	    same
	    * tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_2.java:
	    same
	    * tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile: same


diffstat:

 ChangeLog                                                                                   |   18 +
 NEWS                                                                                        |    3 +
 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java                                      |  145 +++++----
 tests/reproducers/custom/JNLPClassLoaderDeadlock/resources/JNLPClassLoaderDeadlock.html     |    7 +
 tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_1.java        |   24 +
 tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_2.java        |   83 +++++
 tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile                              |   30 ++
 tests/reproducers/custom/JNLPClassLoaderDeadlock/testcases/JNLPClassLoaderDeadlockTest.java |   70 ++++
 8 files changed, 313 insertions(+), 67 deletions(-)

diffs (453 lines):

diff -r c43d49d0db97 -r 29c1c1f92e09 ChangeLog
--- a/ChangeLog	Fri Oct 11 10:39:07 2013 -0400
+++ b/ChangeLog	Thu Oct 17 11:09:51 2013 -0400
@@ -1,3 +1,21 @@
+2013-10-16  Andrew Azores  <aazores at redhat.com>
+
+	Resolve deadlock issue when multiple applets are loaded simultaneously
+	(RH976833)
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (loadClassLock)
+	private member for locking of loadClass method. (loadClass) synchronizes
+	using new lock rather than instance intrinsic lock to avoid RH976833
+	deadlock
+	* tests/reproducers/custom/JNLPClassLoaderDeadlock/testcases/JNLPClassLoaderDeadlockTest.java:
+	new test for multiple applet deadlock condition
+	* tests/reproducers/custom/JNLPClassLoaderDeadlock/resources/JNLPClassLoaderDeadlock.html:
+	same
+	* tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_1.java:
+	same
+	* tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_2.java:
+	same
+	* tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile: same
+
 2013-10-11  Andrew Azores  <aazores at redhat.com>
 
 	* netx/net/sourceforge/jnlp/security/SecurityDialog.java: (initDialog)
diff -r c43d49d0db97 -r 29c1c1f92e09 NEWS
--- a/NEWS	Fri Oct 11 10:39:07 2013 -0400
+++ b/NEWS	Thu Oct 17 11:09:51 2013 -0400
@@ -9,6 +9,9 @@
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
 New in release 1.4.2 (2013-MM-DD):
+* Dialogs center on screen before becoming visible
+* Plugin
+  - RH976833: Multiple applets on one page cause deadlock
 
 New in release 1.4.1 (2013-09-19):
 * Improved and cleaned Temporary internet files panel
diff -r c43d49d0db97 -r 29c1c1f92e09 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Fri Oct 11 10:39:07 2013 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Thu Oct 17 11:09:51 2013 -0400
@@ -205,6 +205,16 @@
      */
     private int useCount = 0;
 
+    /* This Object is used as a lock on the loadClass(String) method. This method should not
+     * be entered by multiple threads simultaneously. This Object should be used for no other
+     * purpose than synchronizing the body of the loadClass(String) method. The intrinsic instance
+     * lock is not suitable for this purpose or else deadlock may occur.
+     *
+     * See bug RH976833 and the mailing list archive discussion:
+     * http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-September/024536.html
+     */
+    private final Object loadClassLock = new Object();
+
     /**
      * Create a new JNLPClassLoader from the specified file.
      *
@@ -1542,92 +1552,93 @@
      * classloader, or one of the classloaders for the JNLP file's
      * extensions.
      */
-    public synchronized Class<?> loadClass(String name) throws ClassNotFoundException {
+    public Class<?> loadClass(String name) throws ClassNotFoundException {
+        synchronized (loadClassLock) {
+            Class<?> result = findLoadedClassAll(name);
 
-        Class<?> result = findLoadedClassAll(name);
+            // try parent classloader
+            if (result == null) {
+                try {
+                    ClassLoader parent = getParent();
+                    if (parent == null)
+                        parent = ClassLoader.getSystemClassLoader();
 
-        // try parent classloader
-        if (result == null) {
-            try {
-                ClassLoader parent = getParent();
-                if (parent == null)
-                    parent = ClassLoader.getSystemClassLoader();
+                    return parent.loadClass(name);
+                } catch (ClassNotFoundException ex) {
+                }
+            }
 
-                return parent.loadClass(name);
-            } catch (ClassNotFoundException ex) {
-            }
-        }
+            // filter out 'bad' package names like java, javax
+            // validPackage(name);
 
-        // filter out 'bad' package names like java, javax
-        // validPackage(name);
+            // search this and the extension loaders
+            if (result == null) {
+                try {
+                    result = loadClassExt(name);
+                } catch (ClassNotFoundException cnfe) {
+                    // Not found in external loader either
 
-        // search this and the extension loaders
-        if (result == null) {
-            try {
-                result = loadClassExt(name);
-            } catch (ClassNotFoundException cnfe) {
-                // Not found in external loader either
+                    // Look in 'Class-Path' as specified in the manifest file
+                    try {
+                        for (String classpath: classpaths) {
+                            JARDesc desc;
+                            try {
+                                URL jarUrl = new URL(file.getCodeBase(), classpath);
+                                desc = new JARDesc(jarUrl, null, null, false, true, false, true);
+                            } catch (MalformedURLException mfe) {
+                                throw new ClassNotFoundException(name, mfe);
+                            }
+                            addNewJar(desc);
+                        }
 
-                // Look in 'Class-Path' as specified in the manifest file
-                try {
-                    for (String classpath: classpaths) {
-                        JARDesc desc;
-                        try {
-                            URL jarUrl = new URL(file.getCodeBase(), classpath);
-                            desc = new JARDesc(jarUrl, null, null, false, true, false, true);
-                        } catch (MalformedURLException mfe) {
-                            throw new ClassNotFoundException(name, mfe);
+                        result = loadClassExt(name);
+                        return result;
+                    } catch (ClassNotFoundException cnfe1) {
+                        if (JNLPRuntime.isDebug()) {
+                            cnfe1.printStackTrace();
                         }
-                        addNewJar(desc);
                     }
 
-                    result = loadClassExt(name);
-                    return result;
-                } catch (ClassNotFoundException cnfe1) {
-                    if (JNLPRuntime.isDebug()) {
-                        cnfe1.printStackTrace();
-                    }
-                }
+                    // As a last resort, look in any available indexes
 
-                // As a last resort, look in any available indexes
+                    // Currently this loads jars directly from the site. We cannot cache it because this
+                    // call is initiated from within the applet, which does not have disk read/write permissions
+                    for (JarIndex index : jarIndexes) {
+                        // Non-generic code in sun.misc.JarIndex
+                        @SuppressWarnings("unchecked")
+                        LinkedList<String> jarList = index.get(name.replace('.', '/'));
 
-                // Currently this loads jars directly from the site. We cannot cache it because this
-                // call is initiated from within the applet, which does not have disk read/write permissions
-                for (JarIndex index : jarIndexes) {
-                    // Non-generic code in sun.misc.JarIndex
-                    @SuppressWarnings("unchecked")
-                    LinkedList<String> jarList = index.get(name.replace('.', '/'));
-
-                    if (jarList != null) {
-                        for (String jarName : jarList) {
-                            JARDesc desc;
-                            try {
-                                desc = new JARDesc(new URL(file.getCodeBase(), jarName),
-                                        null, null, false, true, false, true);
-                            } catch (MalformedURLException mfe) {
-                                throw new ClassNotFoundException(name);
-                            }
-                            try {
-                                addNewJar(desc);
-                            } catch (Exception e) {
-                                if (JNLPRuntime.isDebug()) {
-                                    e.printStackTrace();
+                        if (jarList != null) {
+                            for (String jarName : jarList) {
+                                JARDesc desc;
+                                try {
+                                    desc = new JARDesc(new URL(file.getCodeBase(), jarName),
+                                            null, null, false, true, false, true);
+                                } catch (MalformedURLException mfe) {
+                                    throw new ClassNotFoundException(name);
+                                }
+                                try {
+                                    addNewJar(desc);
+                                } catch (Exception e) {
+                                    if (JNLPRuntime.isDebug()) {
+                                        e.printStackTrace();
+                                    }
                                 }
                             }
+
+                            // If it still fails, let it error out
+                            result = loadClassExt(name);
                         }
-
-                        // If it still fails, let it error out
-                        result = loadClassExt(name);
                     }
                 }
             }
-        }
 
-        if (result == null) {
-            throw new ClassNotFoundException(name);
-        }
+            if (result == null) {
+                throw new ClassNotFoundException(name);
+            }
 
-        return result;
+            return result;
+            }
     }
 
     /**
diff -r c43d49d0db97 -r 29c1c1f92e09 tests/reproducers/custom/JNLPClassLoaderDeadlock/resources/JNLPClassLoaderDeadlock.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/JNLPClassLoaderDeadlock/resources/JNLPClassLoaderDeadlock.html	Thu Oct 17 11:09:51 2013 -0400
@@ -0,0 +1,7 @@
+<html>
+<head></head>
+<body>
+<p><applet code="JNLPClassLoaderDeadlock_1.class" codebase="." width="384" height="32"></applet></p>
+<p><applet code="JNLPClassLoaderDeadlock_2.class" codebase="." width="512" height="512"></applet></p>
+</body>
+</html>
diff -r c43d49d0db97 -r 29c1c1f92e09 tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_1.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_1.java	Thu Oct 17 11:09:51 2013 -0400
@@ -0,0 +1,24 @@
+import java.applet.Applet;
+import java.awt.*;
+
+public class JNLPClassLoaderDeadlock_1 extends Applet {
+
+    @Override
+    public void init() {
+        System.out.println("JNLPClassLoaderDeadlock_1 applet initialized");
+        final String version = System.getProperty("java.version") + " (" + System.getProperty("java.vm.version") + ")";
+        final String vendor = System.getProperty("java.vendor");
+        final TextField tf = new TextField(40);
+        tf.setText(version + " -- " + vendor);
+        tf.setEditable(false);
+        tf.setBackground(Color.white);
+        setBackground(Color.white);
+        add(tf);
+        System.out.println("JNLPClassLoaderDeadlock_1 applet finished");
+        System.out.println("*** APPLET FINISHED ***");
+    }
+
+    public static void main(String[] args) {
+        new JNLPClassLoaderDeadlock_1().init();
+    }
+}
diff -r c43d49d0db97 -r 29c1c1f92e09 tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_2.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_2.java	Thu Oct 17 11:09:51 2013 -0400
@@ -0,0 +1,83 @@
+import java.applet.Applet;
+import java.awt.*;
+
+import java.security.*;
+import java.util.PropertyPermission;
+
+public class JNLPClassLoaderDeadlock_2 extends Applet implements Runnable {
+
+    private static final String propertyNames[] = {
+        "java.version",
+        "java.vendor",
+        "java.vendor.url",
+        "java.home",
+        "java.vm.specification.version",
+        "java.vm.specification.vendor",
+        "java.vm.specification.name",
+        "java.vm.version",
+        "java.vm.name",
+        "java.vm.home",
+        "java.specification.version",
+        "java.specification.vendor",
+        "java.specification.name",
+        "java.class.version",
+        "java.class.path",
+        "os.name",
+        "os.arch",
+        "os.version",
+        "file.separator",
+        "path.separator",
+        "line.separator",
+        "user.home",
+        "user.name",
+        "user.dir",
+    };
+
+    private Label[] propertyValues;
+
+    @Override
+    public void init() {
+        System.out.println("JNLPClassLoaderDeadlock_2 applet initialized");
+        GridBagLayout gridbaglayout = new GridBagLayout();
+        setLayout(gridbaglayout);
+
+        GridBagConstraints leftColumn = new GridBagConstraints();
+        leftColumn.anchor = 20;
+        leftColumn.ipadx = 16;
+
+        GridBagConstraints rightColumn = new GridBagConstraints();
+        rightColumn.fill = 2;
+        rightColumn.gridwidth = 0;
+        rightColumn.weightx = 1.0D;
+
+        Label labels[] = new Label[propertyNames.length];
+        propertyValues = new Label[propertyNames.length];
+        final String preloadText = "...";
+
+        for (int i = 0; i < propertyNames.length; ++i) {
+            labels[i] = new Label(propertyNames[i]);
+            gridbaglayout.setConstraints(labels[i], leftColumn);
+            add(labels[i]);
+
+            propertyValues[i] = new Label(preloadText);
+            gridbaglayout.setConstraints(propertyValues[i], rightColumn);
+            add(propertyValues[i]);
+        }
+
+        Thread t = new Thread(this);
+        t.start();
+    }
+
+    @Override
+    public void run() {
+        for (int i = 0; i < propertyNames.length; ++i) {
+            try {
+                final String propertyValue = System.getProperty(propertyNames[i]);
+                propertyValues[i].setText(propertyValue);
+            } catch (SecurityException securityexception) {
+            }
+        }
+        System.out.println("JNLPClassLoaderDeadlock_2 applet finished");
+        System.out.println("*** APPLET FINISHED ***");
+    }
+}
diff -r c43d49d0db97 -r 29c1c1f92e09 tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile	Thu Oct 17 11:09:51 2013 -0400
@@ -0,0 +1,30 @@
+TESTNAME=JNLPClassLoaderDeadlock
+
+SRC_FILES=JNLPClassLoaderDeadlock_1.java JNLPClassLoaderDeadlock_2.java
+RESOURCE_FILES=JNLPClassLoaderDeadlock.html
+ENTRYPOINT_CLASSES=JNLPClassLoaderDeadlock_1 JNLPClassLoaderDeadlock_2
+
+JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
+JAVAC=$(BOOT_DIR)/bin/javac
+JAR=$(BOOT_DIR)/bin/jar
+
+TMPDIR:=$(shell mktemp -d)
+
+prepare-reproducer:
+	echo PREPARING REPRODUCER $(TESTNAME)
+
+	$(JAVAC) -d $(TMPDIR) -classpath $(JAVAC_CLASSPATH) $(SRC_FILES)
+
+	cd ../resources; \
+	cp $(RESOURCE_FILES) $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \
+	cd -; \
+	for CLASS in $(ENTRYPOINT_CLASSES); \
+	do \
+		mv $(TMPDIR)/"$$CLASS.class" $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \
+	done; \
+
+	echo PREPARED REPRODUCER $(TESTNAME), removing $(TMPDIR)
+	rm -rf $(TMPDIR)
+
+clean-reproducer:
+	echo NOTHING TO CLEAN FOR $(TESTNAME)
diff -r c43d49d0db97 -r 29c1c1f92e09 tests/reproducers/custom/JNLPClassLoaderDeadlock/testcases/JNLPClassLoaderDeadlockTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/JNLPClassLoaderDeadlock/testcases/JNLPClassLoaderDeadlockTest.java	Thu Oct 17 11:09:51 2013 -0400
@@ -0,0 +1,70 @@
+/* JNLPClassLoaderDeadlockTest.java
+Copyright (C) 2013 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+ */
+
+import net.sourceforge.jnlp.ProcessResult;
+import net.sourceforge.jnlp.ServerAccess.AutoClose;
+import net.sourceforge.jnlp.annotations.Bug;
+import net.sourceforge.jnlp.annotations.KnownToFail;
+import net.sourceforge.jnlp.annotations.NeedsDisplay;
+import net.sourceforge.jnlp.annotations.TestInBrowsers;
+import net.sourceforge.jnlp.browsertesting.BrowserTest;
+import net.sourceforge.jnlp.browsertesting.Browsers;
+import net.sourceforge.jnlp.closinglisteners.AutoOkClosingListener;
+
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+public class JNLPClassLoaderDeadlockTest extends BrowserTest {
+
+    @NeedsDisplay
+    @Test
+    @TestInBrowsers(testIn={Browsers.one})
+    @Bug(id="RH976833")
+    public void testClassLoaderDeadlock() throws Exception {
+        ProcessResult pr = server.executeBrowser("JNLPClassLoaderDeadlock.html", AutoClose.CLOSE_ON_CORRECT_END);
+        assertTrue("First applet should have initialized",
+                pr.stdout.contains("JNLPClassLoaderDeadlock_1 applet initialized"));
+        assertTrue("Second applet should have initialized",
+                pr.stdout.contains("JNLPClassLoaderDeadlock_2 applet initialized"));
+
+        assertTrue("First applet should have finished",
+                pr.stdout.contains("JNLPClassLoaderDeadlock_1 applet finished"));
+        assertTrue("Second applet should have finished",
+                pr.stdout.contains("JNLPClassLoaderDeadlock_2 applet finished"));
+    }
+
+}

From bugzilla-daemon at icedtea.classpath.org  Thu Oct 17 08:30:02 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 17 Oct 2013 15:30:02 +0000
Subject: [Bug 1570] Applet fails to load , permission denied
In-Reply-To: <bug-1570-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1570-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1570-30-hNlyE3nuxo@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1570

Andrew Azores <aazores at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
                 CC|                            |aazores at redhat.com
         Resolution|---                         |DUPLICATE

--- Comment #2 from Andrew Azores <aazores at redhat.com> ---


*** This bug has been marked as a duplicate of bug 1465 ***

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131017/2b813d8c/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Thu Oct 17 08:30:02 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 17 Oct 2013 15:30:02 +0000
Subject: [Bug 1465] java.io.FileNotFoundException while trying to download a
	JAR file
In-Reply-To: <bug-1465-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1465-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1465-30-uynJRXpMtO@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465

Andrew Azores <aazores at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |adpengelly at gmail.com

--- Comment #14 from Andrew Azores <aazores at redhat.com> ---
*** Bug 1570 has been marked as a duplicate of this bug. ***

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131017/df34e8e9/attachment.html 

From andrew at icedtea.classpath.org  Thu Oct 17 11:33:21 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Thu, 17 Oct 2013 18:33:21 +0000
Subject: /hg/release/icedtea7-forest-2.3/hotspot: 3 new changesets
Message-ID: <hg.e9d1cc84d754.1382034801.4308599361692689988@icedtea.classpath.org>

changeset e9d1cc84d754 in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=e9d1cc84d754
author: mgronlun
date: Thu Oct 17 19:28:00 2013 +0100

	8023457: Event based tracing framework needs a mutex for thread groups
	Reviewed-by: acorn, sla


changeset 450c62a4a9e5 in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=450c62a4a9e5
author: kevinw
date: Fri Aug 02 12:26:46 2013 +0100

	8020943: Memory leak when GCNotifier uses create_from_platform_dependent_str()
	Reviewed-by: mgerdin, fparain, dcubed


changeset f3744e5f1c26 in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=f3744e5f1c26
author: kevinw
date: Mon Sep 16 13:49:10 2013 -0700

	8023478: Test fails with HS crash in GCNotifier.
	Reviewed-by: sla


diffstat:

 src/share/vm/runtime/mutexLocker.cpp |  15 ++++++++++++---
 src/share/vm/runtime/mutexLocker.hpp |   6 +++++-
 src/share/vm/services/gcNotifier.cpp |  10 +++++-----
 3 files changed, 22 insertions(+), 9 deletions(-)

diffs (96 lines):

diff -r a34906833a8a -r f3744e5f1c26 src/share/vm/runtime/mutexLocker.cpp
--- a/src/share/vm/runtime/mutexLocker.cpp	Sat Aug 24 00:14:46 2013 -0700
+++ b/src/share/vm/runtime/mutexLocker.cpp	Mon Sep 16 13:49:10 2013 -0700
@@ -134,12 +134,16 @@
 
 Mutex*   Management_lock              = NULL;
 Monitor* Service_lock                 = NULL;
-Mutex*   Stacktrace_lock              = NULL;
+Monitor* PeriodicTask_lock            = NULL;
 
+#ifdef INCLUDE_TRACE
 Monitor* JfrQuery_lock                = NULL;
+Mutex*   JfrStacktrace_lock           = NULL;
 Monitor* JfrMsg_lock                  = NULL;
 Mutex*   JfrBuffer_lock               = NULL;
 Mutex*   JfrStream_lock               = NULL;
+Mutex*   JfrThreadGroups_lock         = NULL;
+#endif
 
 #define MAX_NUM_MUTEX 128
 static Monitor * _mutex_array[MAX_NUM_MUTEX];
@@ -215,7 +219,6 @@
   def(Patching_lock                , Mutex  , special,     true ); // used for safepointing and code patching.
   def(ObjAllocPost_lock            , Monitor, special,     false);
   def(Service_lock                 , Monitor, special,     true ); // used for service thread operations
-  def(Stacktrace_lock              , Mutex,   special,     true ); // used for JFR stacktrace database
   def(JmethodIdCreation_lock       , Mutex  , leaf,        true ); // used for creating jmethodIDs.
 
   def(SystemDictionary_lock        , Monitor, leaf,        true ); // lookups done by VM thread
@@ -279,12 +282,18 @@
   def(Debug2_lock                  , Mutex  , nonleaf+4,   true );
   def(Debug3_lock                  , Mutex  , nonleaf+4,   true );
   def(ProfileVM_lock               , Monitor, nonleaf+4,   false); // used for profiling of the VMThread
-  def(CompileThread_lock           , Monitor, nonleaf+5,   false );
+  def(CompileThread_lock           , Monitor, nonleaf+5,   false);
+  def(PeriodicTask_lock            , Monitor, nonleaf+5,   true);
 
+#ifdef INCLUDE_TRACE
   def(JfrQuery_lock                , Monitor, nonleaf,     true);  // JFR locks, keep these in consecutive order
   def(JfrMsg_lock                  , Monitor, nonleaf+2,   true);
   def(JfrBuffer_lock               , Mutex,   nonleaf+3,   true);
+  def(JfrThreadGroups_lock         , Mutex,   nonleaf+1,   true);
   def(JfrStream_lock               , Mutex,   nonleaf+4,   true);
+  def(JfrStacktrace_lock           , Mutex,   special,     true );
+#endif
+
 }
 
 GCMutexLocker::GCMutexLocker(Monitor * mutex) {
diff -r a34906833a8a -r f3744e5f1c26 src/share/vm/runtime/mutexLocker.hpp
--- a/src/share/vm/runtime/mutexLocker.hpp	Sat Aug 24 00:14:46 2013 -0700
+++ b/src/share/vm/runtime/mutexLocker.hpp	Mon Sep 16 13:49:10 2013 -0700
@@ -136,12 +136,16 @@
 
 extern Mutex*   Management_lock;                 // a lock used to serialize JVM management
 extern Monitor* Service_lock;                    // a lock used for service thread operation
-extern Mutex*   Stacktrace_lock;                 // used to guard access to the stacktrace table
+extern Monitor* PeriodicTask_lock;               // protects the periodic task structure
 
+#ifdef INCLUDE_TRACE
+extern Mutex*   JfrStacktrace_lock;              // used to guard access to the JFR stacktrace table
 extern Monitor* JfrQuery_lock;                   // protects JFR use
 extern Monitor* JfrMsg_lock;                     // protects JFR messaging
 extern Mutex*   JfrBuffer_lock;                  // protects JFR buffer operations
 extern Mutex*   JfrStream_lock;                  // protects JFR stream access
+extern Mutex*   JfrThreadGroups_lock;            // protects JFR access to Thread Groups
+#endif
 
 // A MutexLocker provides mutual exclusion with respect to a given mutex
 // for the scope which contains the locker.  The lock is an OS lock, not
diff -r a34906833a8a -r f3744e5f1c26 src/share/vm/services/gcNotifier.cpp
--- a/src/share/vm/services/gcNotifier.cpp	Sat Aug 24 00:14:46 2013 -0700
+++ b/src/share/vm/services/gcNotifier.cpp	Mon Sep 16 13:49:10 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, 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
@@ -209,11 +209,11 @@
   GCNotificationRequest *request = getRequest();
   if (request != NULL) {
     NotificationMark nm(request);
-    Handle objGcInfo = createGcInfo(request->gcManager, request->gcStatInfo, THREAD);
+    Handle objGcInfo = createGcInfo(request->gcManager, request->gcStatInfo, CHECK);
 
-    Handle objName = java_lang_String::create_from_platform_dependent_str(request->gcManager->name(), CHECK);
-    Handle objAction = java_lang_String::create_from_platform_dependent_str(request->gcAction, CHECK);
-    Handle objCause = java_lang_String::create_from_platform_dependent_str(request->gcCause, CHECK);
+    Handle objName = java_lang_String::create_from_str(request->gcManager->name(), CHECK);
+    Handle objAction = java_lang_String::create_from_str(request->gcAction, CHECK);
+    Handle objCause = java_lang_String::create_from_str(request->gcCause, CHECK);
 
     klassOop k = Management::sun_management_GarbageCollectorImpl_klass(CHECK);
     instanceKlassHandle gc_mbean_klass(THREAD, k);

From andrew at icedtea.classpath.org  Thu Oct 17 12:19:03 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Thu, 17 Oct 2013 19:19:03 +0000
Subject: /hg/release/icedtea7-forest-2.3/jaxws: 8022086: Fixing licence o...
Message-ID: <hg.bb0717b2e410.1382037543.6608279449221239120@icedtea.classpath.org>

changeset bb0717b2e410 in /hg/release/icedtea7-forest-2.3/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=bb0717b2e410
author: mkos
date: Thu Aug 01 15:41:32 2013 -0400

	8022086: Fixing licence of newly added files
	Reviewed-by: mullan, ahgross, mgrebac


diffstat:

 src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java         |  51 +++------
 src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java         |  51 +++------
 src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java |  51 +++------
 src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java             |  51 +++------
 4 files changed, 72 insertions(+), 132 deletions(-)

diffs (252 lines):

diff -r fea85f749421 -r bb0717b2e410 src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java	Wed Jul 31 09:41:04 2013 -0400
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java	Thu Aug 01 15:41:32 2013 -0400
@@ -1,41 +1,26 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
  *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * http://glassfish.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
+ * 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).
  *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * 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.
  *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
+ * 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.
  */
 
 package com.sun.xml.internal.ws.api.server;
diff -r fea85f749421 -r bb0717b2e410 src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java	Wed Jul 31 09:41:04 2013 -0400
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java	Thu Aug 01 15:41:32 2013 -0400
@@ -1,41 +1,26 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
  *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * http://glassfish.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
+ * 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).
  *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * 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.
  *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
+ * 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.
  */
 
 package com.sun.xml.internal.ws.client.sei;
diff -r fea85f749421 -r bb0717b2e410 src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java	Wed Jul 31 09:41:04 2013 -0400
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java	Thu Aug 01 15:41:32 2013 -0400
@@ -1,41 +1,26 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
  *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * http://glassfish.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
+ * 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).
  *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * 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.
  *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
+ * 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.
  */
 
 package com.sun.xml.internal.ws.policy.privateutil;
diff -r fea85f749421 -r bb0717b2e410 src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java	Wed Jul 31 09:41:04 2013 -0400
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java	Thu Aug 01 15:41:32 2013 -0400
@@ -1,41 +1,26 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
  *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * http://glassfish.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
+ * 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).
  *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * 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.
  *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
+ * 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.
  */
 
 package com.sun.xml.internal.ws.server;

From andrew at icedtea.classpath.org  Thu Oct 17 16:44:19 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Thu, 17 Oct 2013 23:44:19 +0000
Subject: /hg/release/icedtea7-forest-2.3/jaxp: 8015978: Incorrect transfo...
Message-ID: <hg.d186d96b9af8.1382053459.-8576357044606977631@icedtea.classpath.org>

changeset d186d96b9af8 in /hg/release/icedtea7-forest-2.3/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=d186d96b9af8
author: aefimov
date: Wed Jul 24 15:21:29 2013 +0400

	8015978: Incorrect transformation of XPath expression "string(-0)"
	Reviewed-by: darcy, joehw


diffstat:

 src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (13 lines):

diff -r 1836b22ca25e -r d186d96b9af8 src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java	Wed Oct 16 17:09:25 2013 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java	Wed Jul 24 15:21:29 2013 +0400
@@ -955,6 +955,9 @@
             if (Double.isNaN(d) || Double.isInfinite(d))
                 return(Double.toString(d));
 
+            //Convert -0.0 to +0.0 other values remains the same
+            d = d + 0.0;
+
             // Use the XPath formatter to ignore locales
             StringBuffer result = threadLocalStringBuffer.get();
             result.setLength(0);

From andrew at icedtea.classpath.org  Thu Oct 17 16:44:50 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Thu, 17 Oct 2013 23:44:50 +0000
Subject: /hg/release/icedtea7-forest-2.3/jdk: 20 new changesets
Message-ID: <hg.9a2b43d21270.1382053490.4833355912275447704@icedtea.classpath.org>

changeset 9a2b43d21270 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=9a2b43d21270
author: coffeys
date: Wed Jun 05 18:39:44 2013 +0100

	8015965: (process) Typo in name of property to allow ambiguous commands
	Reviewed-by: alanb


changeset 831666d451b2 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=831666d451b2
author: prr
date: Wed Jul 03 14:50:03 2013 -0700

	8015144: Performance regression in ICU OpenType Layout library
	Reviewed-by: srl, jgodinez


changeset 1dc6f256b3ea in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1dc6f256b3ea
author: msheppar
date: Thu Jul 11 23:16:26 2013 +0100

	8020085: Linux ARM build failure for 7u45
	Summary: Amend jdk/make/com/sun/jmx/Makefile to fix 7u45 build failure
	Reviewed-by: coffeys, dholmes


changeset 3a309ca34b1e in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3a309ca34b1e
author: michaelm
date: Mon Jul 15 16:00:57 2013 +0100

	8019969: nioNetworkChannelInet6/SetOptionGetOptionTestInet6 test case crashes
	Reviewed-by: chegar


changeset 62b609f82191 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=62b609f82191
author: jbachorik
date: Fri Jul 19 16:29:26 2013 +0200

	8019584: javax/management/remote/mandatory/loading/MissingClassTest.java failed in nightly against jdk7u45: java.io.InvalidObjectException: Invalid notification: null
	Reviewed-by: mchung, sjiang, dfuchs, ahgross


changeset d2bda260474f in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d2bda260474f
author: jbachorik
date: Mon Jul 29 04:43:41 2013 -0700

	8021577: JCK test api/javax_management/jmx_serial/modelmbean/ModelMBeanNotificationInfo/serial/index.html#Input has failed since jdk 7u45 b01
	Reviewed-by: alanb, dfuchs, ahgross


changeset 74e96f7edf71 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=74e96f7edf71
author: malenkov
date: Wed Aug 07 16:51:59 2013 +0400

	8021969: The index_AccessAllowed jnlp can not load successfully with exception thrown in the log.
	Reviewed-by: art, skoivu


changeset aea37f1d4592 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=aea37f1d4592
author: jbachorik
date: Thu Aug 08 19:16:27 2013 +0200

	8021360: object not exported" on start of JMXConnectorServer for RMI-IIOP protocol with security manager
	Reviewed-by: alanb, ahgross, smarks, coffeys


changeset c5716b37aaa7 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c5716b37aaa7
author: ksrini
date: Wed Aug 14 10:17:57 2013 -0700

	8021355: REGRESSION: Five closed/java/awt/SplashScreen tests fail since 7u45 b01 on Linux, Solaris
	Reviewed-by: dholmes, anthony, ahgross, erikj


changeset 4fb7c2f43f80 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4fb7c2f43f80
author: chegar
date: Fri Aug 09 13:50:13 2013 +0100

	8022661: InetAddress.writeObject() performs flush() on object output stream
	Reviewed-by: michaelm, alanb


changeset 931e4b56798a in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=931e4b56798a
author: coffeys
date: Fri Sep 06 09:38:10 2013 -0700

	8023964: java/io/IOException/LastErrorString.java should be @ignore-d
	Reviewed-by: alanb


changeset 584ab21cdb1b in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=584ab21cdb1b
author: sherman
date: Tue Sep 10 15:39:41 2013 -0700

	6614237: missing codepage Cp290 at java runtime
	Summary: to add cp290 and cp300
	Reviewed-by: alanb, coffeys


changeset ffc63f0d1203 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ffc63f0d1203
author: sherman
date: Thu Sep 12 14:41:14 2013 -0700

	8024668: api/java_nio/charset/Charset/index.html#Methods JCK-runtime test fails with 7u45 b11
	Summary: to add IBM290 into make/sun/nio/cs/FILES_java.gmk
	Reviewed-by: alanb, coffeys


changeset 95df35b314eb in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=95df35b314eb
author: bae
date: Thu Aug 01 00:00:38 2013 +0400

	8020983: OutOfMemoryError caused by non garbage collected JPEGImageWriter Instances
	Reviewed-by: prr, flar


changeset 728bfc6b1979 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=728bfc6b1979
author: bae
date: Fri Sep 13 19:19:55 2013 +0400

	8024697: Fix for 8020983 causes Xcheck:jni warnings
	Reviewed-by: prr, jchen


changeset 4f121e8c7e4b in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=4f121e8c7e4b
author: erikj
date: Thu Sep 19 13:32:42 2013 +0200

	8023771: when USER_RELEASE_SUFFIX is set in order to add a string to java -version, build number in the bundles names should not be changed to b00
	Reviewed-by: dholmes, ihse


changeset ba78cf016157 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ba78cf016157
author: erikj
date: Mon Sep 23 17:38:35 2013 +0200

	8025170: jdk7u51 7u-1-prebuild is failing since 9/19
	Reviewed-by: tbell, ihse


changeset f6167ed17dd3 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f6167ed17dd3
author: dxu
date: Mon May 06 14:17:59 2013 -0700

	8003992: File and other classes in java.io do not handle embedded nulls properly
	Summary: Have every file operation done with File, FileInputStream, FileOutputStream, or RandomAccessFile that involves a file path containing NUL fail. Also reviewed by fweimer at redhat.com
	Reviewed-by: alanb, sherman, ahgross, mduigou, dholmes, aph, plevart, martin


changeset 6b5c05cfff7c in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6b5c05cfff7c
author: dxu
date: Mon Jun 10 11:06:26 2013 -0700

	8013827: File.createTempFile hangs with temp file starting with 'com1.4'
	8011950: java.io.File.createTempFile enters infinite loop when passed invalid data
	Reviewed-by: alanb


changeset 3e7df93144c6 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3e7df93144c6
author: dxu
date: Fri Sep 27 00:01:04 2013 +0100

	8025128: File.createTempFile fails if prefix is absolute path
	Reviewed-by: alanb, darcy


diffstat:

 make/com/sun/jmx/Makefile                                             |     2 +
 make/common/shared/Defs.gmk                                           |    12 +-
 make/sun/font/Makefile                                                |     6 +-
 make/sun/nio/cs/FILES_java.gmk                                        |     1 +
 make/tools/CharsetMapping/IBM290.c2b                                  |   100 +
 make/tools/CharsetMapping/IBM290.map                                  |   232 +
 make/tools/CharsetMapping/extsbcs                                     |     1 +
 src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java |    46 +-
 src/share/classes/java/awt/datatransfer/DataFlavor.java               |     6 +-
 src/share/classes/java/io/File.java                                   |   161 +-
 src/share/classes/java/io/FileInputStream.java                        |     5 +-
 src/share/classes/java/io/FileOutputStream.java                       |     5 +-
 src/share/classes/java/io/RandomAccessFile.java                       |     5 +-
 src/share/classes/java/net/InetAddress.java                           |     1 -
 src/share/classes/javax/management/MBeanNotificationInfo.java         |     7 +-
 src/share/classes/javax/management/remote/NotificationResult.java     |    17 +-
 src/share/classes/javax/management/remote/TargetedNotification.java   |     8 +-
 src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java                |    18 +
 src/share/classes/sun/nio/cs/ext/IBM300.java                          |  1875 ++++++++++
 src/share/native/sun/awt/image/jpeg/imageioJPEG.c                     |    63 +-
 src/share/native/sun/font/layout/GlyphIterator.cpp                    |    78 +-
 src/share/native/sun/font/layout/GlyphIterator.h                      |    10 +-
 src/share/native/sun/font/layout/LETableReference.h                   |    18 +-
 src/share/native/sun/font/layout/OpenTypeUtilities.cpp                |    11 +-
 src/solaris/bin/java_md_solinux.c                                     |    26 +-
 src/windows/classes/java/lang/ProcessImpl.java                        |     8 +-
 src/windows/native/java/io/WinNTFileSystem_md.c                       |     4 +
 src/windows/native/java/net/net_util_md.c                             |     6 +-
 test/java/io/File/CreateNewFile.java                                  |    19 +-
 test/java/io/File/NulFile.java                                        |   625 +++
 test/java/io/File/createTempFile/SpecialTempFile.java                 |   102 +
 test/java/io/IOException/LastErrorString.java                         |     5 +-
 test/java/lang/Runtime/exec/ExecCommand.java                          |     2 +-
 test/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java               |   125 +
 test/javax/management/remote/mandatory/loading/MissingClassTest.java  |     2 +-
 35 files changed, 3474 insertions(+), 138 deletions(-)

diffs (truncated from 4438 to 500 lines):

diff -r 53b1249d1715 -r 3e7df93144c6 make/com/sun/jmx/Makefile
--- a/make/com/sun/jmx/Makefile	Sat Aug 17 06:51:46 2013 +0800
+++ b/make/com/sun/jmx/Makefile	Fri Sep 27 00:01:04 2013 +0100
@@ -115,6 +115,8 @@
 
 ifeq ($(CROSS_COMPILE_ARCH),)
 RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
+else
+RMIC = $(BOOT_JAVA_CMD)  $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
 endif  
 
 $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
diff -r 53b1249d1715 -r 3e7df93144c6 make/common/shared/Defs.gmk
--- a/make/common/shared/Defs.gmk	Sat Aug 17 06:51:46 2013 +0800
+++ b/make/common/shared/Defs.gmk	Fri Sep 27 00:01:04 2013 +0100
@@ -296,10 +296,8 @@
   RELEASE      = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
 endif
 
-# FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set
-ifdef BUILD_NUMBER
-  FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER)
-else
+# Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set
+ifndef BUILD_NUMBER
   BUILD_NUMBER = b00
   ifndef USER_RELEASE_SUFFIX
     BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M')
@@ -307,6 +305,12 @@
     USER_RELEASE_SUFFIX := $(shell $(ECHO) "$(CLEAN_USERNAME)_$(BUILD_DATE)" | $(TR) '[:upper:]' '[:lower:]' )
   endif
   export USER_RELEASE_SUFFIX
+endif
+
+# FULL_VERSION is RELEASE and BUILD_NUMBER if USER_RELEASE_SUFFIX is not set
+ifndef USER_RELEASE_SUFFIX
+  FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER)
+else
   FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER)
 endif
 
diff -r 53b1249d1715 -r 3e7df93144c6 make/sun/font/Makefile
--- a/make/sun/font/Makefile	Sat Aug 17 06:51:46 2013 +0800
+++ b/make/sun/font/Makefile	Fri Sep 27 00:01:04 2013 +0100
@@ -36,7 +36,11 @@
 CPLUSPLUSLIBRARY=true
 
 # Use higher optimization level
-OPTIMIZATION_LEVEL = HIGHER
+ifeq ($(PLATFORM), windows)
+  OPTIMIZATION_LEVEL = HIGHEST
+else
+  OPTIMIZATION_LEVEL = HIGHER
+endif
 
 include $(BUILDDIR)/common/Defs.gmk
 
diff -r 53b1249d1715 -r 3e7df93144c6 make/sun/nio/cs/FILES_java.gmk
--- a/make/sun/nio/cs/FILES_java.gmk	Sat Aug 17 06:51:46 2013 +0800
+++ b/make/sun/nio/cs/FILES_java.gmk	Fri Sep 27 00:01:04 2013 +0100
@@ -329,6 +329,7 @@
 	sun/nio/cs/ext/IBM280.java \
 	sun/nio/cs/ext/IBM284.java \
 	sun/nio/cs/ext/IBM285.java \
+	sun/nio/cs/ext/IBM290.java \
 	sun/nio/cs/ext/IBM297.java \
 	sun/nio/cs/ext/IBM420.java \
 	sun/nio/cs/ext/IBM424.java \
diff -r 53b1249d1715 -r 3e7df93144c6 make/tools/CharsetMapping/IBM290.c2b
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/tools/CharsetMapping/IBM290.c2b	Fri Sep 27 00:01:04 2013 +0100
@@ -0,0 +1,100 @@
+# 
+# Diff of 
+# b2c: cdctables.zip/Package2.zip/IBM-290.zip/012234B0.TPMAP100
+# c2b: cdctables.zip/Package2.zip/IBM-290.zip/012234B0.UPMAP100
+#
+# fullwidth form
+0x4B    U+FF0E
+0x4C    U+FF1C
+0x4D    U+FF08
+0x4E    U+FF0B
+0x4F    U+FF5C
+0x50    U+FF06
+0x5A    U+FF01
+0x5C    U+FF0A
+0x5D    U+FF09
+0x5E    U+FF1B
+0x60    U+FF0D
+0x61    U+FF0F
+0x62    U+FF41
+0x63    U+FF42
+0x64    U+FF43
+0x65    U+FF44
+0x66    U+FF45
+0x67    U+FF46
+0x68    U+FF47
+0x69    U+FF48
+0x6B    U+FF0C
+0x6C    U+FF05
+0x6D    U+FF3F
+0x6E    U+FF1E
+0x6F    U+FF1F
+0x70    U+FF3B
+0x71    U+FF49
+0x72    U+FF4A
+0x73    U+FF4B
+0x74    U+FF4C
+0x75    U+FF4D
+0x76    U+FF4E
+0x77    U+FF4F
+0x78    U+FF50
+0x79    U+FF40
+0x7A    U+FF1A
+0x7B    U+FF03
+0x7C    U+FF20
+0x7D    U+FF07
+0x7E    U+FF1D
+0x7F    U+FF02
+0x80    U+FF3D
+0x8B    U+FF51
+0x9B    U+FF52
+0xA0    U+FF5E
+0xAB    U+FF53
+0xB0    U+FF3E
+0xB2    U+FF3C
+0xB3    U+FF54
+0xB4    U+FF55
+0xB5    U+FF56
+0xB6    U+FF57
+0xB7    U+FF58
+0xB8    U+FF59
+0xB9    U+FF5A
+0xC0    U+FF5B
+0xC1    U+FF21
+0xC2    U+FF22
+0xC3    U+FF23
+0xC4    U+FF24
+0xC5    U+FF25
+0xC6    U+FF26
+0xC7    U+FF27
+0xC8    U+FF28
+0xC9    U+FF29
+0xD0    U+FF5D
+0xD1    U+FF2A
+0xD2    U+FF2B
+0xD3    U+FF2C
+0xD4    U+FF2D
+0xD5    U+FF2E
+0xD6    U+FF2F
+0xD7    U+FF30
+0xD8    U+FF31
+0xD9    U+FF32
+0xE0    U+FF04
+0xE2    U+FF33
+0xE3    U+FF34
+0xE4    U+FF35
+0xE5    U+FF36
+0xE6    U+FF37
+0xE7    U+FF38
+0xE8    U+FF39
+0xE9    U+FF3A
+0xF0    U+FF10
+0xF1    U+FF11
+0xF2    U+FF12
+0xF3    U+FF13
+0xF4    U+FF14
+0xF5    U+FF15
+0xF6    U+FF16
+0xF7    U+FF17
+0xF8    U+FF18
+0xF9    U+FF19
diff -r 53b1249d1715 -r 3e7df93144c6 make/tools/CharsetMapping/IBM290.map
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/tools/CharsetMapping/IBM290.map	Fri Sep 27 00:01:04 2013 +0100
@@ -0,0 +1,232 @@
+#
+# b2c mapping for IBM290, generated from
+# cdctables.zip/Package2.zip/IBM-290.zip/012234B0.TPMAP100
+#
+0x00    U+0000
+0x01    U+0001
+0x02    U+0002
+0x03    U+0003
+0x04    U+009C
+0x05    U+0009
+0x06    U+0086
+0x07    U+007F
+0x08    U+0097
+0x09    U+008D
+0x0A    U+008E
+0x0B    U+000B
+0x0C    U+000C
+0x0D    U+000D
+0x0E    U+000E
+0x0F    U+000F
+0x10    U+0010
+0x11    U+0011
+0x12    U+0012
+0x13    U+0013
+0x14    U+009D
+0x15    U+0085
+0x16    U+0008
+0x17    U+0087
+0x18    U+0018
+0x19    U+0019
+0x1A    U+0092
+0x1B    U+008F
+0x1C    U+001C
+0x1D    U+001D
+0x1E    U+001E
+0x1F    U+001F
+0x20    U+0080
+0x21    U+0081
+0x22    U+0082
+0x23    U+0083
+0x24    U+0084
+0x25    U+000A
+0x26    U+0017
+0x27    U+001B
+0x28    U+0088
+0x29    U+0089
+0x2A    U+008A
+0x2B    U+008B
+0x2C    U+008C
+0x2D    U+0005
+0x2E    U+0006
+0x2F    U+0007
+0x30    U+0090
+0x31    U+0091
+0x32    U+0016
+0x33    U+0093
+0x34    U+0094
+0x35    U+0095
+0x36    U+0096
+0x37    U+0004
+0x38    U+0098
+0x39    U+0099
+0x3A    U+009A
+0x3B    U+009B
+0x3C    U+0014
+0x3D    U+0015
+0x3E    U+009E
+0x3F    U+001A
+0x40    U+0020
+0x41    U+FF61
+0x42    U+FF62
+0x43    U+FF63
+0x44    U+FF64
+0x45    U+FF65
+0x46    U+FF66
+0x47    U+FF67
+0x48    U+FF68
+0x49    U+FF69
+0x4A    U+00A3
+0x4B    U+002E
+0x4C    U+003C
+0x4D    U+0028
+0x4E    U+002B
+0x4F    U+007C
+0x50    U+0026
+0x51    U+FF6A
+0x52    U+FF6B
+0x53    U+FF6C
+0x54    U+FF6D
+0x55    U+FF6E
+0x56    U+FF6F
+0x58    U+FF70
+0x5A    U+0021
+0x5B    U+00A5
+0x5C    U+002A
+0x5D    U+0029
+0x5E    U+003B
+0x5F    U+00AC
+0x60    U+002D
+0x61    U+002F
+0x62    U+0061
+0x63    U+0062
+0x64    U+0063
+0x65    U+0064
+0x66    U+0065
+0x67    U+0066
+0x68    U+0067
+0x69    U+0068
+0x6B    U+002C
+0x6C    U+0025
+0x6D    U+005F
+0x6E    U+003E
+0x6F    U+003F
+0x70    U+005B
+0x71    U+0069
+0x72    U+006A
+0x73    U+006B
+0x74    U+006C
+0x75    U+006D
+0x76    U+006E
+0x77    U+006F
+0x78    U+0070
+0x79    U+0060
+0x7A    U+003A
+0x7B    U+0023
+0x7C    U+0040
+0x7D    U+0027
+0x7E    U+003D
+0x7F    U+0022
+0x80    U+005D
+0x81    U+FF71
+0x82    U+FF72
+0x83    U+FF73
+0x84    U+FF74
+0x85    U+FF75
+0x86    U+FF76
+0x87    U+FF77
+0x88    U+FF78
+0x89    U+FF79
+0x8A    U+FF7A
+0x8B    U+0071
+0x8C    U+FF7B
+0x8D    U+FF7C
+0x8E    U+FF7D
+0x8F    U+FF7E
+0x90    U+FF7F
+0x91    U+FF80
+0x92    U+FF81
+0x93    U+FF82
+0x94    U+FF83
+0x95    U+FF84
+0x96    U+FF85
+0x97    U+FF86
+0x98    U+FF87
+0x99    U+FF88
+0x9A    U+FF89
+0x9B    U+0072
+0x9D    U+FF8A
+0x9E    U+FF8B
+0x9F    U+FF8C
+0xA0    U+007E
+0xA1    U+203E
+0xA2    U+FF8D
+0xA3    U+FF8E
+0xA4    U+FF8F
+0xA5    U+FF90
+0xA6    U+FF91
+0xA7    U+FF92
+0xA8    U+FF93
+0xA9    U+FF94
+0xAA    U+FF95
+0xAB    U+0073
+0xAC    U+FF96
+0xAD    U+FF97
+0xAE    U+FF98
+0xAF    U+FF99
+0xB0    U+005E
+0xB1    U+00A2
+0xB2    U+005C
+0xB3    U+0074
+0xB4    U+0075
+0xB5    U+0076
+0xB6    U+0077
+0xB7    U+0078
+0xB8    U+0079
+0xB9    U+007A
+0xBA    U+FF9A
+0xBB    U+FF9B
+0xBC    U+FF9C
+0xBD    U+FF9D
+0xBE    U+FF9E
+0xBF    U+FF9F
+0xC0    U+007B
+0xC1    U+0041
+0xC2    U+0042
+0xC3    U+0043
+0xC4    U+0044
+0xC5    U+0045
+0xC6    U+0046
+0xC7    U+0047
+0xC8    U+0048
+0xC9    U+0049
+0xD0    U+007D
+0xD1    U+004A
+0xD2    U+004B
+0xD3    U+004C
+0xD4    U+004D
+0xD5    U+004E
+0xD6    U+004F
+0xD7    U+0050
+0xD8    U+0051
+0xD9    U+0052
+0xE0    U+0024
+0xE2    U+0053
+0xE3    U+0054
+0xE4    U+0055
+0xE5    U+0056
+0xE6    U+0057
+0xE7    U+0058
+0xE8    U+0059
+0xE9    U+005A
+0xF0    U+0030
+0xF1    U+0031
+0xF2    U+0032
+0xF3    U+0033
+0xF4    U+0034
+0xF5    U+0035
+0xF6    U+0036
+0xF7    U+0037
+0xF8    U+0038
+0xF9    U+0039
+0xFF    U+009F
diff -r 53b1249d1715 -r 3e7df93144c6 make/tools/CharsetMapping/extsbcs
--- a/make/tools/CharsetMapping/extsbcs	Sat Aug 17 06:51:46 2013 +0800
+++ b/make/tools/CharsetMapping/extsbcs	Fri Sep 27 00:01:04 2013 +0100
@@ -28,6 +28,7 @@
 IBM280		IBM280		Cp280		false		sun.nio.cs.ext
 IBM284		IBM284		Cp284		false		sun.nio.cs.ext
 IBM285		IBM285		Cp285		false		sun.nio.cs.ext
+IBM290		IBM290		Cp290		false		sun.nio.cs.ext
 IBM297		IBM297		Cp297		false		sun.nio.cs.ext
 IBM420		IBM420		Cp420		false		sun.nio.cs.ext
 IBM424		IBM424		Cp424		false		sun.nio.cs.ext
diff -r 53b1249d1715 -r 3e7df93144c6 src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java
--- a/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java	Sat Aug 17 06:51:46 2013 +0800
+++ b/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java	Fri Sep 27 00:01:04 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009,2013, 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
@@ -36,13 +36,34 @@
 import java.rmi.NoSuchObjectException;
 
 import com.sun.jmx.remote.internal.IIOPProxy;
+import java.io.SerializablePermission;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.Permissions;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.security.ProtectionDomain;
 
 /**
- * An implementatin of IIOPProxy that simply delegates to the appropriate
+ * An implementation of IIOPProxy that simply delegates to the appropriate
  * RMI-IIOP and CORBA APIs.
  */
 
 public class IIOPProxyImpl implements IIOPProxy {
+    // special ACC used to initialize the IIOP stub
+    // the only allowed privilege is SerializablePermission("enableSubclassImplementation")
+    private static final AccessControlContext STUB_ACC;
+
+    static {
+        Permissions p = new Permissions();
+        p.add(new SerializablePermission("enableSubclassImplementation"));
+        STUB_ACC = new AccessControlContext(
+            new ProtectionDomain[]{
+                new ProtectionDomain(null, p)
+            }
+        );
+    }
+
     public IIOPProxyImpl() { }
 
     @Override
@@ -113,7 +134,24 @@
     }
 
     @Override
-    public Remote toStub(Remote obj) throws NoSuchObjectException {
-        return PortableRemoteObject.toStub(obj);
+    public Remote toStub(final Remote obj) throws NoSuchObjectException {
+        if (System.getSecurityManager() == null) {
+            return PortableRemoteObject.toStub(obj);
+        } else {
+            try {
+                return AccessController.doPrivileged(new PrivilegedExceptionAction<Remote>() {
+
+                    @Override
+                    public Remote run() throws Exception {
+                        return PortableRemoteObject.toStub(obj);
+                    }
+                }, STUB_ACC);
+            } catch (PrivilegedActionException e) {
+                if (e.getException() instanceof NoSuchObjectException) {
+                    throw (NoSuchObjectException)e.getException();
+                }
+                throw new RuntimeException("Unexpected exception type", e.getException());
+            }
+        }
     }
 }
diff -r 53b1249d1715 -r 3e7df93144c6 src/share/classes/java/awt/datatransfer/DataFlavor.java
--- a/src/share/classes/java/awt/datatransfer/DataFlavor.java	Sat Aug 17 06:51:46 2013 +0800
+++ b/src/share/classes/java/awt/datatransfer/DataFlavor.java	Fri Sep 27 00:01:04 2013 +0100
@@ -145,11 +145,7 @@
         } catch (SecurityException exception) {
             // ignore secured class loaders
         }
-        if (fallback != null) {

From bugzilla-daemon at icedtea.classpath.org  Thu Oct 17 18:09:49 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 18 Oct 2013 01:09:49 +0000
Subject: [Bug 1400] Menu of maximized AWT window not working in GNOME Shell
In-Reply-To: <bug-1400-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1400-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1400-30-qzHt05SrtY@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1400

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Assignee|omajid at redhat.com           |gnu.andrew at redhat.com

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131018/adefac2a/attachment.html 

From ptisnovs at icedtea.classpath.org  Fri Oct 18 01:29:06 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Fri, 18 Oct 2013 08:29:06 +0000
Subject: /hg/rhino-tests: Added new testGetResourceNegativeTest case into
Message-ID: <hg.c476f3ce848f.1382084946.-6019694633368342460@icedtea.classpath.org>

changeset c476f3ce848f in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=c476f3ce848f
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Oct 18 10:32:51 2013 +0200

	Added new testGetResourceNegativeTest case into
	AbstractScriptEngineClassTest.


diffstat:

 ChangeLog                                             |  6 ++++++
 src/org/RhinoTests/AbstractScriptEngineClassTest.java |  8 ++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diffs (31 lines):

diff -r ccd63d49fe53 -r c476f3ce848f ChangeLog
--- a/ChangeLog	Thu Oct 17 13:30:38 2013 +0200
+++ b/ChangeLog	Fri Oct 18 10:32:51 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-18  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/AbstractScriptEngineClassTest.java:
+	Added new testGetResourceNegativeTest case into
+	AbstractScriptEngineClassTest.
+
 2013-10-17  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/CompilableClassTest.java:
diff -r ccd63d49fe53 -r c476f3ce848f src/org/RhinoTests/AbstractScriptEngineClassTest.java
--- a/src/org/RhinoTests/AbstractScriptEngineClassTest.java	Thu Oct 17 13:30:38 2013 +0200
+++ b/src/org/RhinoTests/AbstractScriptEngineClassTest.java	Fri Oct 18 10:32:51 2013 +0200
@@ -1707,6 +1707,14 @@
     }
 
     /**
+     * Test for method javax.script.AbstractScriptEngine.getClass().getResourceNegativeTest()
+     */
+    protected void testGetResourceNegativeTest() {
+        Object resource = this.abstractScriptEngineClass.getResource("unknown");
+        assertNull(resource, "getResource() does not return null");
+    }
+
+    /**
      * Test for instanceof operator applied to a class javax.script.AbstractScriptEngine
      */
     @SuppressWarnings("cast")

From ptisnovs at icedtea.classpath.org  Fri Oct 18 02:33:34 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Fri, 18 Oct 2013 09:33:34 +0000
Subject: /hg/gfx-test: Added stub for three new tests, updated Makefile.
Message-ID: <hg.68ec6483724e.1382088814.-6248649288953172555@icedtea.classpath.org>

changeset 68ec6483724e in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=68ec6483724e
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Oct 18 11:37:18 2013 +0200

	Added stub for three new tests, updated Makefile.


diffstat:

 ChangeLog                                                                 |   9 +
 Makefile                                                                  |   8 +
 src/org/gfxtest/testsuites/CAGOperationsOnChordAndRectangle.java          |  81 ++++++++++
 src/org/gfxtest/testsuites/CAGOperationsOnPieAndRectangle.java            |  81 ++++++++++
 src/org/gfxtest/testsuites/CAGOperationsOnRoundRectangleAndRectangle.java |  81 ++++++++++
 5 files changed, 260 insertions(+), 0 deletions(-)

diffs (310 lines):

diff -r cb55af58e54c -r 68ec6483724e ChangeLog
--- a/ChangeLog	Thu Oct 17 13:37:49 2013 +0200
+++ b/ChangeLog	Fri Oct 18 11:37:18 2013 +0200
@@ -1,3 +1,12 @@
+2013-10-18  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/CAGOperationsOnChordAndRectangle.java:
+	* src/org/gfxtest/testsuites/CAGOperationsOnPieAndRectangle.java:
+	* src/org/gfxtest/testsuites/CAGOperationsOnRoundRectangleAndRectangle.java:
+	Added stub for three new tests.
+	* Makefile:
+	Updated.
+
 2013-10-17  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/CAGOperationsOnCircleAndRectangle.java:
diff -r cb55af58e54c -r 68ec6483724e Makefile
--- a/Makefile	Thu Oct 17 13:37:49 2013 +0200
+++ b/Makefile	Fri Oct 18 11:37:18 2013 +0200
@@ -149,6 +149,7 @@
 	$(CLASSES)/$(TESTSUITE_DIR)/BitBltScaleImage.class \
 	$(CLASSES)/$(TESTSUITE_DIR)/BitBltUsingBgColor.class \
 	$(CLASSES)/$(TESTSUITE_DIR)/BitBltUsingBgColorAlpha.class \
+	$(CLASSES)/$(TESTSUITE_DIR)/BitBltBufferedImageOp.class \
 	$(CLASSES)/$(TESTSUITE_DIR)/BitBltAffineTransformOp.class \
 	$(CLASSES)/$(TESTSUITE_DIR)/BitBltAffineIdentityTransformOp.class \
 	$(CLASSES)/$(TESTSUITE_DIR)/BitBltAffineQuadrantRotateTransformOp.class \
@@ -198,6 +199,9 @@
 	$(CLASSES)/$(TESTSUITE_DIR)/GradientPaint.class \
 	$(CLASSES)/$(TESTSUITE_DIR)/LinearGradientPaint.class \
 	$(CLASSES)/$(TESTSUITE_DIR)/RadialGradientPaint.class \
+	$(CLASSES)/$(TESTSUITE_DIR)/CAGOperationsOnChordAndRectangle.class \
+	$(CLASSES)/$(TESTSUITE_DIR)/CAGOperationsOnPieAndRectangle.class \
+	$(CLASSES)/$(TESTSUITE_DIR)/CAGOperationsOnRoundRectangleAndRectangle.class \
 	$(CLASSES)/$(TESTSUITE_DIR)/CAGOperationsOnTwoOverlappingCircles.class \
 	$(CLASSES)/$(TESTSUITE_DIR)/CAGOperationsOnTwoTouchingCircles.class \
 	$(CLASSES)/$(TESTSUITE_DIR)/CAGOperationsOnTwoConcentricCircles.class \
@@ -261,6 +265,7 @@
 	$(RESULTS)/BitBltScaleImage \
 	$(RESULTS)/BitBltUsingBgColor \
 	$(RESULTS)/BitBltUsingBgColorAlpha \
+	$(RESULTS)/BitBltBufferedImageOp \
 	$(RESULTS)/BitBltAffineTransformOp \
 	$(RESULTS)/BitBltAffineIdentityTransformOp \
 	$(RESULTS)/BitBltAffineQuadrantRotateTransformOp \
@@ -310,6 +315,9 @@
 	$(RESULTS)/GradientPaint \
 	$(RESULTS)/LinearGradientPaint \
 	$(RESULTS)/RadialGradientPaint \
+	$(RESULTS)/CAGOperationsOnChordAndRectangle \
+	$(RESULTS)/CAGOperationsOnPieAndRectangle \
+	$(RESULTS)/CAGOperationsOnRoundRectangleAndRectangle \
 	$(RESULTS)/CAGOperationsOnTwoOverlappingCircles \
 	$(RESULTS)/CAGOperationsOnTwoTouchingCircles \
 	$(RESULTS)/CAGOperationsOnTwoConcentricCircles \
diff -r cb55af58e54c -r 68ec6483724e src/org/gfxtest/testsuites/CAGOperationsOnChordAndRectangle.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/testsuites/CAGOperationsOnChordAndRectangle.java	Fri Oct 18 11:37:18 2013 +0200
@@ -0,0 +1,81 @@
+/*
+  Java gfx-test framework
+
+   Copyright (C) 2013  Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package org.gfxtest.testsuites;
+
+import org.gfxtest.framework.GfxTest;
+import org.gfxtest.framework.annotations.GraphicsPrimitive;
+import org.gfxtest.framework.annotations.GraphicsPrimitives;
+import org.gfxtest.framework.annotations.RenderStyle;
+import org.gfxtest.framework.annotations.RenderStyles;
+import org.gfxtest.framework.annotations.TestType;
+import org.gfxtest.framework.annotations.TestTypes;
+import org.gfxtest.framework.annotations.Transformation;
+import org.gfxtest.framework.annotations.Transformations;
+import org.gfxtest.framework.annotations.Zoom;
+
+
+
+/**
+ * This test checks the process of creating and rendering new geometric shapes
+ * by performing boolean operations on existing ones. This process is often
+ * called Constructive area geometry (CAG). Various cases are checked by this
+ * test suite.
+ * 
+ * @author Pavel Tisnovsky
+ */
+ at TestType(TestTypes.RENDER_TEST)
+ at GraphicsPrimitive(GraphicsPrimitives.AREA)
+ at RenderStyle(RenderStyles.FILL)
+ at Transformation(Transformations.NONE)
+ at Zoom(1)
+public class CAGOperationsOnChordAndRectangle extends GfxTest
+{
+
+    /**
+     * Entry point to the test suite.
+     *
+     * @param args not used in this case
+     */
+    public static void main(String[] args)
+    {
+        new CAGOperationsOnChordAndRectangle().runTestSuite(args);
+    }
+}
diff -r cb55af58e54c -r 68ec6483724e src/org/gfxtest/testsuites/CAGOperationsOnPieAndRectangle.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/testsuites/CAGOperationsOnPieAndRectangle.java	Fri Oct 18 11:37:18 2013 +0200
@@ -0,0 +1,81 @@
+/*
+  Java gfx-test framework
+
+   Copyright (C) 2013  Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package org.gfxtest.testsuites;
+
+import org.gfxtest.framework.GfxTest;
+import org.gfxtest.framework.annotations.GraphicsPrimitive;
+import org.gfxtest.framework.annotations.GraphicsPrimitives;
+import org.gfxtest.framework.annotations.RenderStyle;
+import org.gfxtest.framework.annotations.RenderStyles;
+import org.gfxtest.framework.annotations.TestType;
+import org.gfxtest.framework.annotations.TestTypes;
+import org.gfxtest.framework.annotations.Transformation;
+import org.gfxtest.framework.annotations.Transformations;
+import org.gfxtest.framework.annotations.Zoom;
+
+
+
+/**
+ * This test checks the process of creating and rendering new geometric shapes
+ * by performing boolean operations on existing ones. This process is often
+ * called Constructive area geometry (CAG). Various cases are checked by this
+ * test suite.
+ * 
+ * @author Pavel Tisnovsky
+ */
+ at TestType(TestTypes.RENDER_TEST)
+ at GraphicsPrimitive(GraphicsPrimitives.AREA)
+ at RenderStyle(RenderStyles.FILL)
+ at Transformation(Transformations.NONE)
+ at Zoom(1)
+public class CAGOperationsOnPieAndRectangle extends GfxTest
+{
+    
+    /**
+     * Entry point to the test suite.
+     *
+     * @param args not used in this case
+     */
+    public static void main(String[] args)
+    {
+        new CAGOperationsOnPieAndRectangle().runTestSuite(args);
+    }
+}
diff -r cb55af58e54c -r 68ec6483724e src/org/gfxtest/testsuites/CAGOperationsOnRoundRectangleAndRectangle.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/testsuites/CAGOperationsOnRoundRectangleAndRectangle.java	Fri Oct 18 11:37:18 2013 +0200
@@ -0,0 +1,81 @@
+/*
+  Java gfx-test framework
+
+   Copyright (C) 2013  Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package org.gfxtest.testsuites;
+
+import org.gfxtest.framework.GfxTest;
+import org.gfxtest.framework.annotations.GraphicsPrimitive;
+import org.gfxtest.framework.annotations.GraphicsPrimitives;
+import org.gfxtest.framework.annotations.RenderStyle;
+import org.gfxtest.framework.annotations.RenderStyles;
+import org.gfxtest.framework.annotations.TestType;
+import org.gfxtest.framework.annotations.TestTypes;
+import org.gfxtest.framework.annotations.Transformation;
+import org.gfxtest.framework.annotations.Transformations;
+import org.gfxtest.framework.annotations.Zoom;
+
+
+
+/**
+ * This test checks the process of creating and rendering new geometric shapes
+ * by performing boolean operations on existing ones. This process is often
+ * called Constructive area geometry (CAG). Various cases are checked by this
+ * test suite.
+ * 
+ * @author Pavel Tisnovsky
+ */
+ at TestType(TestTypes.RENDER_TEST)
+ at GraphicsPrimitive(GraphicsPrimitives.AREA)
+ at RenderStyle(RenderStyles.FILL)
+ at Transformation(Transformations.NONE)
+ at Zoom(1)
+public class CAGOperationsOnRoundRectangleAndRectangle extends GfxTest
+{
+
+    /**
+     * Entry point to the test suite.
+     *
+     * @param args not used in this case
+     */
+    public static void main(String[] args)
+    {
+        new CAGOperationsOnRoundRectangleAndRectangle().runTestSuite(args);
+    }
+}

From jvanek at redhat.com  Fri Oct 18 03:44:57 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Fri, 18 Oct 2013 12:44:57 +0200
Subject: [rfc][icedtea-web] refactored logging
In-Reply-To: <52461A5B.8070800@redhat.com>
References: <522F7EDF.5070407@redhat.com> <52461A5B.8070800@redhat.com>
Message-ID: <52611129.5070707@redhat.com>

On 09/28/2013 01:52 AM, Omair Majid wrote:
> On 09/10/2013 04:19 PM, Jiri Vanek wrote:
>> This patch is introducing bottleneck for all stdout/err and
>> printstacktrace.
>
> Do you have any plans to replace PluginDebug as well?
>
> Thanks,
> Omair
>
I'm not sure if I replied correctly last time (I did not imho)

The pluginDebug.debug was included in refactoring patch:

public class PluginDebug {

     static final boolean DEBUG = JNLPRuntime.isPluginDebug();

     public static void debug(Object... messageChunks) {
         if (DEBUG) {
             if (messageChunks == null) {
                 messageChunks = new Object[] {null};
             }
             StringBuilder b = new StringBuilder();
             for (Object chunk : messageChunks) {
                 b.append(chunk);
             }
             OutputController.getLogger().log(OutputController.Level.ERROR_ALL, b.toString());
         }
     }
}

But I see I made an mistake. It should be

-    static final boolean DEBUG = JNLPRuntime.isPluginDebug();
+    static final boolean DEBUG = JNLPRuntime.isDebug();


Can I push?




The tasks which are now missing are:
  - do in C part the same (debug on/of by same way, file/streams(/system))
  - share file-log between c and java (My intention is  to pass filename in same way as pipes paths 
are sent)
  - implement the sytsem logger


I hope this answer is much better :)

J.

From jvanek at redhat.com  Fri Oct 18 06:13:02 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Fri, 18 Oct 2013 15:13:02 +0200
Subject: Small refactoring in searching for attributes
Message-ID: <526133DE.1070402@redhat.com>

This patch is starting reaction to u45 -  http://www.java.com/en/download/faq/release_changes.xml
I have extracted methods which were searching for main class attribute, and I'm going to use those 
methods in future, when searching for Application-Name, Caller-Allowable-Codebase and 
Application-Library-Allowable-Codebase.


Please note, this have to go also to 1.4, and that tests are already included n itw.

Any thoughts?


Thanx, J.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: PAtch.patch
Type: text/x-patch
Size: 4946 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131018/2ef26a06/PAtch-0001.patch 

From bugzilla-daemon at icedtea.classpath.org  Fri Oct 18 07:12:04 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 18 Oct 2013 14:12:04 +0000
Subject: [Bug 846] Plugin tries to use a SOCKS proxy even if there is none
	configured
In-Reply-To: <bug-846-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-846-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-846-30-2TaXLAzWTr@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=846

--- Comment #4 from Andrew Azores <aazores at redhat.com> ---
(In reply to comment #3)
> Should version 1.3.2 have the fix you mentioned?  If so, then it would make
> sense to test again.

If that particular changeset Omair linked is indeed the fix, then no, it would
not be in 1.3.2. But could you check that 1.3.2 still exhibits this behaviour?
Perhaps it was fixed by some other changeset since 1.1.4.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131018/951449e7/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Fri Oct 18 07:24:18 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 18 Oct 2013 14:24:18 +0000
Subject: [Bug 1530] Fails to find code or object attributes in valid tags
In-Reply-To: <bug-1530-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1530-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1530-30-qQfvQc2gz2@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1530

Andrew Azores <aazores at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|REOPENED                    |RESOLVED
         Resolution|---                         |FIXED

--- Comment #7 from Andrew Azores <aazores at redhat.com> ---
I'm not sure what exactly happened with the "1.3" package from testing/stable
here, but I can't reproduce this and it's confirmed fixed in 1.4 from unstable,
so I'm closing this report again.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131018/4af963f1/attachment.html 

From omajid at redhat.com  Fri Oct 18 08:00:28 2013
From: omajid at redhat.com (Omair Majid)
Date: Fri, 18 Oct 2013 11:00:28 -0400
Subject: Small refactoring in searching for attributes
In-Reply-To: <526133DE.1070402@redhat.com>
References: <526133DE.1070402@redhat.com>
Message-ID: <20131018150028.GA7543@redhat.com>

* Jiri Vanek <jvanek at redhat.com> [2013-10-18 09:14]:
> Please note, this have to go also to 1.4, and that tests are already included n itw.

Patch itself looks okay to me. You have introduced two new public
methods, though:

> +    public String checkForAttributeInJars(List<JARDesc> jars, Attributes.Name name) {

> +    public String getManifestAttribute(URL location, Attributes.Name  attribute) {

Could you add unit tests for these new methods? Just like the previous
unit tests give us some guarantee that users of the old methods are
still covered, it would be nice to have some guarantee that users are
also covered if these new methods were refactored too.

Thanks,
Omair

From aazores at redhat.com  Fri Oct 18 11:02:34 2013
From: aazores at redhat.com (Andrew Azores)
Date: Fri, 18 Oct 2013 14:02:34 -0400
Subject: [icedtea-web] (PR1513) Signed JAR with external main-class
Message-ID: <526177BA.7020301@redhat.com>

Hi,

The applet in the PR1513 report fails to launch due to the following 
check in JNLPClassLoader#initializeResources():

// If jar with main class was not found and there are no more
// available jars, throw a LaunchException
if (file.getLaunchInfo() != null) {
     if (!foundMainJar // && (available == null || available.size() == 0))
         throw new LaunchException(file, null, R("LSFatal"),
                 R("LCClient"), R("LCantDetermineMainClass"),
                 R("LCantDetermineMainClassInfo"));
}

This occurs within a block checking for JarCertVerifier#isFullySigned(). 
The effect is that we require fully-signed applications to only have 
their main-class within one of their JARs. In this particular applet's 
case, for whatever reason, the main class is a separate .class file 
elsewhere in the codebase, which I assume makes some use of the JAR. 
Perhaps the JAR is provided as a library of sorts and universities 
implement their own main-class with it for this student information 
portal system.

Anyway, making IcedTea-Web support this scenario is as simple as 
removing the "throw new LaunchException" noted above. In cases where the 
applet is fully signed and the main-class is not found at all, this 
simply makes the applet launch fail a bit later on. Otherwise some 
reworking of the classloader will be required (searching for external 
main-class *before* the work of initializeResource is done?! Otherwise, 
somehow indicating this condition to be dealt with later on rather than 
letting the applet launch fail).

What I'm wondering however, is if this is actually safe. How do we 
really want to be handling this situation? The JarCertVerified reports 
"fully signed", but then we are going to go ahead and execute an 
arbitrary unverified class file from outside the JAR(s). To me this 
seems a little bit questionable - definitely we shouldn't just fail to 
launch altogether, but what should be done about the permissions for 
this applet? Right now with the exception removed, the user is still 
prompted with a dialog claiming that the applet's signature has been 
validated by a trusted source, but can we really say that now?

Thanks,

-- 
Andrew A


From omajid at redhat.com  Fri Oct 18 13:06:16 2013
From: omajid at redhat.com (Omair Majid)
Date: Fri, 18 Oct 2013 16:06:16 -0400
Subject: [icedtea-web] (PR1513) Signed JAR with external main-class
In-Reply-To: <526177BA.7020301@redhat.com>
References: <526177BA.7020301@redhat.com>
Message-ID: <20131018200616.GA14560@redhat.com>

* Andrew Azores <aazores at redhat.com> [2013-10-18 14:04]:
> Hi,
> 
> The applet in the PR1513 report fails to launch due to the following
> check in JNLPClassLoader#initializeResources():
> 
> // If jar with main class was not found and there are no more
> // available jars, throw a LaunchException
> if (file.getLaunchInfo() != null) {
>     if (!foundMainJar // && (available == null || available.size() == 0))
>         throw new LaunchException(file, null, R("LSFatal"),
>                 R("LCClient"), R("LCantDetermineMainClass"),
>                 R("LCantDetermineMainClassInfo"));
> }

/me grumbles about comments that reiterate what the code is doing
without explaining why.

> What I'm wondering however, is if this is actually safe. How do we
> really want to be handling this situation? The JarCertVerified
> reports "fully signed", but then we are going to go ahead and
> execute an arbitrary unverified class file from outside the JAR(s).
> To me this seems a little bit questionable - definitely we shouldn't
> just fail to launch altogether, but what should be done about the
> permissions for this applet? Right now with the exception removed,
> the user is still prompted with a dialog claiming that the applet's
> signature has been validated by a trusted source, but can we really
> say that now?

I don't think saying "fully signed" is valid even if the main class is
found in the jar. As long as there is a URL which will be used to search
for additional classes, we can not claim we have verified all classes.
We probably should not claim that everything is signed and/or trusted.

Do all applets get a codebase URL for fallback unconditionally?

Thanks,
Omair

From omajid at redhat.com  Fri Oct 18 13:26:07 2013
From: omajid at redhat.com (Omair Majid)
Date: Fri, 18 Oct 2013 16:26:07 -0400
Subject: [rfc][icedtea-web] refactored logging
In-Reply-To: <52611129.5070707@redhat.com>
References: <522F7EDF.5070407@redhat.com> <52461A5B.8070800@redhat.com>
	<52611129.5070707@redhat.com>
Message-ID: <20131018202607.GB14560@redhat.com>

* Jiri Vanek <jvanek at redhat.com> [2013-10-18 06:44]:
> I'm not sure if I replied correctly last time (I did not imho)
> 
> The pluginDebug.debug was included in refactoring patch:
> 
> public class PluginDebug {
> 
>     static final boolean DEBUG = JNLPRuntime.isPluginDebug();
> 
>     public static void debug(Object... messageChunks) {
>         if (DEBUG) {
>             if (messageChunks == null) {
>                 messageChunks = new Object[] {null};
>             }
>             StringBuilder b = new StringBuilder();
>             for (Object chunk : messageChunks) {
>                 b.append(chunk);
>             }
>             OutputController.getLogger().log(OutputController.Level.ERROR_ALL, b.toString());
>         }
>     }
> }
> 
> But I see I made an mistake. It should be
> 
> -    static final boolean DEBUG = JNLPRuntime.isPluginDebug();
> +    static final boolean DEBUG = JNLPRuntime.isDebug();
> 
> 
> Can I push?

Sure. Might as well remove JNLPRuntime.isPluginDebug() too, no?

Actually, out of curiosity, what's the reason for keeping
PluginDebug.debug() ?

> The tasks which are now missing are:
>  - do in C part the same (debug on/of by same way, file/streams(/system))
>  - share file-log between c and java (My intention is  to pass
> filename in same way as pipes paths are sent)
>  - implement the sytsem logger

One more: running 'make check' should not produce >2M of
output :)

> I hope this answer is much better :)

Not that the previous answer was bad, but this one is better :)

Cheers,
Omair

From bugzilla-daemon at icedtea.classpath.org  Fri Oct 18 15:39:42 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 18 Oct 2013 22:39:42 +0000
Subject: [Bug 1474] Can't get javaws to use SOCKS proxy
In-Reply-To: <bug-1474-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1474-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1474-30-lqTufBin77@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1474

--- Comment #5 from Omair Majid <omajid at redhat.com> ---
(In reply to comment #3)
> I realize one could argue that this new "problem" is just a case of
> misconfiguration, but I'm just wondering if the observed behavior is what
> was intended to happen?

I read through the JDK code, and yes, this is how it is handled. That is, proxy
information is only used to establish a connection. Once a connection is made
(even if the connection is to the wrong server) the rest of the proxies are not
used again.

I am closing this as FIXED since fallback to SOCKS is working. If you think
this misconfiguration should be addressed, please file a separate bug.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131018/9da55ded/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Fri Oct 18 15:40:30 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 18 Oct 2013 22:40:30 +0000
Subject: [Bug 1474] Can't get javaws to use SOCKS proxy
In-Reply-To: <bug-1474-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1474-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1474-30-9HRKZfH19I@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1474

Omair Majid <omajid at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|---                         |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131018/25e3d1f1/attachment.html 

From jvanek at icedtea.classpath.org  Sun Oct 20 09:13:45 2013
From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org)
Date: Sun, 20 Oct 2013 16:13:45 +0000
Subject: /hg/icedtea-web: Minor fix in DEBUG initialisation
Message-ID: <hg.594622144855.1382285625.8643924302249223276@icedtea.classpath.org>

changeset 594622144855 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=594622144855
author: Jiri Vanek <jvanek at redhat.com>
date: Sun Oct 20 18:13:43 2013 +0200

	Minor fix in DEBUG initialisation
	* netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: (isPluginDebug) made private to prevent confusion.
	* plugin/icedteanp/java/sun/applet/PluginDebug.java: (DEBUG) initialized from JNLPRuntime.isDebug instead of incorrect JNLPRuntime.isPluginDebug.


diffstat:

 ChangeLog                                          |  7 +++++++
 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java |  2 +-
 plugin/icedteanp/java/sun/applet/PluginDebug.java  |  2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r bde9b562c85e -r 594622144855 ChangeLog
--- a/ChangeLog	Thu Oct 17 10:32:46 2013 -0400
+++ b/ChangeLog	Sun Oct 20 18:13:43 2013 +0200
@@ -1,3 +1,10 @@
+2013-10-20  Jiri Vanek  <jvanek at redhat.com>
+
+	* netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: (isPluginDebug)
+	made private to prevent confusion.
+	* plugin/icedteanp/java/sun/applet/PluginDebug.java: (DEBUG) initialized
+	from JNLPRuntime.isDebug instead of incorrect JNLPRuntime.isPluginDebug.
+
 2013-10-17  Andrew Azores  <aazores at redhat.com>
 
 	Back out changeset 420d72e5cee7 due to breaking LiveConnect feature.
diff -r bde9b562c85e -r 594622144855 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java	Thu Oct 17 10:32:46 2013 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java	Sun Oct 20 18:13:43 2013 +0200
@@ -755,7 +755,7 @@
         JNLPRuntime.ignoreHeaders = ignoreHeaders;
     }
 
-    public static boolean isPluginDebug() {
+    private static boolean isPluginDebug() {
         if (pluginDebug == null) {
             try {
                 //there are cases when this itself is not allowed by security manager, and so
diff -r bde9b562c85e -r 594622144855 plugin/icedteanp/java/sun/applet/PluginDebug.java
--- a/plugin/icedteanp/java/sun/applet/PluginDebug.java	Thu Oct 17 10:32:46 2013 -0400
+++ b/plugin/icedteanp/java/sun/applet/PluginDebug.java	Sun Oct 20 18:13:43 2013 +0200
@@ -42,7 +42,7 @@
 
 public class PluginDebug {
 
-    static final boolean DEBUG = JNLPRuntime.isPluginDebug();
+    static final boolean DEBUG = JNLPRuntime.isDebug();
 
     public static void debug(Object... messageChunks) {
         if (DEBUG) {

From bugzilla-daemon at icedtea.classpath.org  Mon Oct 21 02:42:32 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 21 Oct 2013 09:42:32 +0000
Subject: [Bug 1021] Runescape fails to run
In-Reply-To: <bug-1021-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1021-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1021-30-CBW9NM1dLE@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1021

--- Comment #1 from Julien Gouesse <gouessej at orange.fr> ---
This kind of error has nothing to do with Icedtea-web. The buffered image has
been corrupted when using a particular operation, it doesn't contain the JFIF
APP0 marker or it uses the CMYK color model in the way that is not yet
supported by AWT JPEG decoder.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131021/7036e43d/attachment.html 

From ptisnovs at icedtea.classpath.org  Mon Oct 21 02:50:22 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Mon, 21 Oct 2013 09:50:22 +0000
Subject: /hg/gfx-test: Ten new tests added into BitBltAffineIdentityTrans...
Message-ID: <hg.eded9b7e3e14.1382349022.-6248649288953172555@icedtea.classpath.org>

changeset eded9b7e3e14 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=eded9b7e3e14
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Mon Oct 21 11:54:10 2013 +0200

	Ten new tests added into BitBltAffineIdentityTransformOp test suite.


diffstat:

 ChangeLog                                                       |    5 +
 src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java |  140 ++++++++++
 2 files changed, 145 insertions(+), 0 deletions(-)

diffs (162 lines):

diff -r 68ec6483724e -r eded9b7e3e14 ChangeLog
--- a/ChangeLog	Fri Oct 18 11:37:18 2013 +0200
+++ b/ChangeLog	Mon Oct 21 11:54:10 2013 +0200
@@ -1,3 +1,8 @@
+2013-10-21  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java:
+	Ten new tests added into BitBltAffineIdentityTransformOp test suite.
+
 2013-10-18  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/CAGOperationsOnChordAndRectangle.java:
diff -r 68ec6483724e -r eded9b7e3e14 src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java
--- a/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java	Fri Oct 18 11:37:18 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java	Mon Oct 21 11:54:10 2013 +0200
@@ -1556,6 +1556,146 @@
     }
 
     /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteBinaryIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteBinary(image, graphics2d, IdentifyTranspormationOp3);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteBinaryIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteBinary(image, graphics2d, IdentifyTranspormationOp4);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteBinaryIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteBinary(image, graphics2d, IdentifyTranspormationOp5);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteBinaryIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteBinary(image, graphics2d, IdentifyTranspormationOp6);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_INDEXED.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteIndexedIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteIndexed(image, graphics2d, IdentifyTranspormationOp1);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_INDEXED.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteIndexedIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteIndexed(image, graphics2d, IdentifyTranspormationOp2);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_INDEXED.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteIndexedIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteIndexed(image, graphics2d, IdentifyTranspormationOp3);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_INDEXED.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteIndexedIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteIndexed(image, graphics2d, IdentifyTranspormationOp4);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_INDEXED.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteIndexedIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteIndexed(image, graphics2d, IdentifyTranspormationOp5);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_INDEXED.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteIndexedIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteIndexed(image, graphics2d, IdentifyTranspormationOp6);
+    }
+
+    /**
      * Entry point to the test suite.
      *
      * @param args not used in this case

From ptisnovs at icedtea.classpath.org  Mon Oct 21 02:52:57 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Mon, 21 Oct 2013 09:52:57 +0000
Subject: /hg/rhino-tests: Added new testGetResourceNegativeTest case into
Message-ID: <hg.1f31c258deff.1382349177.-6019694633368342460@icedtea.classpath.org>

changeset 1f31c258deff in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=1f31c258deff
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Mon Oct 21 11:56:47 2013 +0200

	Added new testGetResourceNegativeTest case into
	SimpleScriptContextClassTest.


diffstat:

 ChangeLog                                            |   6 ++++++
 src/org/RhinoTests/SimpleScriptContextClassTest.java |  13 +++++++++++++
 2 files changed, 19 insertions(+), 0 deletions(-)

diffs (36 lines):

diff -r c476f3ce848f -r 1f31c258deff ChangeLog
--- a/ChangeLog	Fri Oct 18 10:32:51 2013 +0200
+++ b/ChangeLog	Mon Oct 21 11:56:47 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-21  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/SimpleScriptContextClassTest.java:
+	Added new testGetResourceNegativeTest case into
+	SimpleScriptContextClassTest.
+
 2013-10-18  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/AbstractScriptEngineClassTest.java:
diff -r c476f3ce848f -r 1f31c258deff src/org/RhinoTests/SimpleScriptContextClassTest.java
--- a/src/org/RhinoTests/SimpleScriptContextClassTest.java	Fri Oct 18 10:32:51 2013 +0200
+++ b/src/org/RhinoTests/SimpleScriptContextClassTest.java	Mon Oct 21 11:56:47 2013 +0200
@@ -1710,6 +1710,19 @@
     }
 
     /**
+     * Test for method javax.script.SimpleScriptContext.getClass().getResourceNPETest()
+     */
+    protected void testGetResourceNPETest() {
+        try {
+            Object resource = this.simpleScriptContextClass.getResource(null);
+            throw new AssertionError("NullPointerException expected!");
+        }
+        catch (NullPointerException e) {
+            //This is OK OK
+        }
+    }
+
+    /**
      * Test for instanceof operator applied to a class javax.script.SimpleScriptContext
      */
     @SuppressWarnings("cast")

From jvanek at icedtea.classpath.org  Mon Oct 21 06:23:28 2013
From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org)
Date: Mon, 21 Oct 2013 13:23:28 +0000
Subject: /hg/icedtea-web: Logic to extract main class attribute generaliz...
Message-ID: <hg.ac458de35801.1382361808.8643924302249223276@icedtea.classpath.org>

changeset ac458de35801 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=ac458de35801
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Oct 21 13:19:10 2013 +0200

	Logic to extract main class attribute generalized to common methods.
	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
	(getMainClassName) is now calling (getManifestAttribute)
	(getManifestAttribute) new method, extract named attribute from url
	specified jar. Called by (checkForAttributeInJars)
	(checkForMain) is now calling (checkForAttributeInJars). Also logic of
	(checkForAttributeInJars) was taken from here.
	(checkForAttributeInJars) new method, read specific attribute from


diffstat:

 ChangeLog                                              |  12 ++
 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |  91 +++++++++++------
 2 files changed, 71 insertions(+), 32 deletions(-)

diffs (155 lines):

diff -r 594622144855 -r ac458de35801 ChangeLog
--- a/ChangeLog	Sun Oct 20 18:13:43 2013 +0200
+++ b/ChangeLog	Mon Oct 21 13:19:10 2013 +0200
@@ -1,3 +1,15 @@
+2013-10-21  Jiri Vanek  <jvanek at redhat.com>
+
+	Logic to extract main class attribute generalized to common methods.
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+	(getMainClassName) is now calling (getManifestAttribute)
+	(getManifestAttribute) new method, extract named attribute from url
+	specified jar. Called by (checkForAttributeInJars)
+	(checkForMain) is now calling (checkForAttributeInJars). Also logic of
+	(checkForAttributeInJars) was taken from here.
+	(checkForAttributeInJars) new method, read specific attribute from
+	application jar(s) in specific order.
+	
 2013-10-20  Jiri Vanek  <jvanek at redhat.com>
 
 	* netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: (isPluginDebug)
diff -r 594622144855 -r ac458de35801 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Sun Oct 20 18:13:43 2013 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Mon Oct 21 13:19:10 2013 +0200
@@ -59,6 +59,7 @@
 import java.util.TreeSet;
 import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.jar.Attributes;
 import java.util.jar.JarEntry;
 import net.sourceforge.jnlp.util.JarFile;
 import java.util.jar.Manifest;
@@ -780,6 +781,47 @@
         activateJars(initialJars);
     }
     
+     /***
+     * Checks for the jar that contains the attribute. 
+     * 
+     * @param jars Jars that are checked to see if they contain the main class
+     * @param  name attribute to be found
+     * @throws LaunchException Thrown if the signed JNLP file, within the main jar, fails to be verified or does not match
+     */
+    public String checkForAttributeInJars(List<JARDesc> jars, Attributes.Name name) {
+       
+        String result = null;
+        
+        // Check main jar
+        JARDesc mainJarDesc = file.getResources().getMainJAR();
+        result = getManifestAttribute(mainJarDesc.getLocation(), name);
+
+        if (result != null) {
+            return result;
+        }
+        
+        // Check first jar
+        JARDesc firstJarDesc = jars.get(0);
+        result = getManifestAttribute(firstJarDesc.getLocation(),name);
+        
+        if (result != null) {
+            return result;
+        }
+
+        // Still not found? Iterate and set if only 1 was found
+        for (JARDesc jarDesc: jars) {
+            String mainClassInThisJar = getManifestAttribute(jarDesc.getLocation(), name);
+                if (mainClassInThisJar != null) {
+                    if (result == null) { // first main class
+                        result = mainClassInThisJar;
+                    } else { // There is more than one main class. Set to null and break.
+                        result = null;
+                        break;
+                }
+            }
+        }
+        return result;
+    }
     /***
      * Checks for the jar that contains the main class. If the main class was
      * found, it checks to see if the jar is signed and whether it contains a
@@ -802,34 +844,8 @@
 
         // The main class may be specified in the manifest
 
-        // Check main jar
         if (mainClass == null) {
-            JARDesc mainJarDesc = file.getResources().getMainJAR();
-            mainClass = getMainClassName(mainJarDesc.getLocation());
-        }
-
-        // Check first jar
-        if (mainClass == null) {
-            JARDesc firstJarDesc = jars.get(0);
-            mainClass = getMainClassName(firstJarDesc.getLocation());
-        }
-
-        // Still not found? Iterate and set if only 1 was found
-        if (mainClass == null) {
-
-            for (JARDesc jarDesc: jars) {
-                String mainClassInThisJar = getMainClassName(jarDesc.getLocation());
-
-                if (mainClassInThisJar != null) {
-
-                    if (mainClass == null) { // first main class
-                        mainClass = mainClassInThisJar;
-                    } else { // There is more than one main class. Set to null and break.
-                        mainClass = null;
-                        break;
-                    }
-                }
-            }
+            mainClass = checkForAttributeInJars(jars, Attributes.Name.MAIN_CLASS);
         }
 
         String desiredJarEntryName = mainClass + ".class";
@@ -877,24 +893,35 @@
      * @return the main class name, null if there isn't one of if there was an error
      */
     String getMainClassName(URL location) {
+        return getManifestAttribute(location, Attributes.Name.MAIN_CLASS);
+    }
+    
+    
+    /**
+     * Gets the name of the main method if specified in the manifest
+     *
+     * @param location The JAR location
+     * @return the attribute value, null if there isn't one of if there was an error
+     */
+    public String getManifestAttribute(URL location, Attributes.Name  attribute) {
 
-        String mainClass = null;
+        String attributeValue = null;
         File f = tracker.getCacheFile(location);
 
         if( f != null) {
             JarFile mainJar = null;
             try {
                 mainJar = new JarFile(f);
-                mainClass = mainJar.getManifest().
-                        getMainAttributes().getValue("Main-Class");
+                attributeValue = mainJar.getManifest().
+                        getMainAttributes().getValue(attribute);
             } catch (IOException ioe) {
-                mainClass = null;
+                attributeValue = null;
             } finally {
                 StreamUtils.closeSilently(mainJar);
             }
         }
 
-        return mainClass;
+        return attributeValue;
     }
 
     /**

From jvanek at icedtea.classpath.org  Mon Oct 21 06:24:44 2013
From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org)
Date: Mon, 21 Oct 2013 13:24:44 +0000
Subject: /hg/release/icedtea-web-1.4: Logic to extract main class attribu...
Message-ID: <hg.eafa63cec4ca.1382361884.-5934593987637005762@icedtea.classpath.org>

changeset eafa63cec4ca in /hg/release/icedtea-web-1.4
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=eafa63cec4ca
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Oct 21 13:19:26 2013 +0200

	Logic to extract main class attribute generalized to common methods.
	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
	(getMainClassName) is now calling (getManifestAttribute)
	(getManifestAttribute) new method, extract named attribute from url
	specified jar. Called by (checkForAttributeInJars)
	(checkForMain) is now calling (checkForAttributeInJars). Also logic of
	(checkForAttributeInJars) was taken from here.
	(checkForAttributeInJars) new method, read specific attribute from


diffstat:

 ChangeLog                                              |  12 ++
 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |  91 +++++++++++------
 2 files changed, 71 insertions(+), 32 deletions(-)

diffs (155 lines):

diff -r 29c1c1f92e09 -r eafa63cec4ca ChangeLog
--- a/ChangeLog	Thu Oct 17 11:09:51 2013 -0400
+++ b/ChangeLog	Mon Oct 21 13:19:26 2013 +0200
@@ -1,3 +1,15 @@
+2013-10-21  Jiri Vanek  <jvanek at redhat.com>
+
+	Logic to extract main class attribute generalized to common methods.
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+	(getMainClassName) is now calling (getManifestAttribute)
+	(getManifestAttribute) new method, extract named attribute from url
+	specified jar. Called by (checkForAttributeInJars)
+	(checkForMain) is now calling (checkForAttributeInJars). Also logic of
+	(checkForAttributeInJars) was taken from here.
+	(checkForAttributeInJars) new method, read specific attribute from
+	application jar(s) in specific order.
+
 2013-10-16  Andrew Azores  <aazores at redhat.com>
 
 	Resolve deadlock issue when multiple applets are loaded simultaneously
diff -r 29c1c1f92e09 -r eafa63cec4ca netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Thu Oct 17 11:09:51 2013 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Mon Oct 21 13:19:26 2013 +0200
@@ -59,6 +59,7 @@
 import java.util.TreeSet;
 import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.jar.Attributes;
 import java.util.jar.JarEntry;
 import net.sourceforge.jnlp.util.JarFile;
 import java.util.jar.Manifest;
@@ -794,6 +795,47 @@
         activateJars(initialJars);
     }
     
+     /***
+     * Checks for the jar that contains the attribute. 
+     * 
+     * @param jars Jars that are checked to see if they contain the main class
+     * @param  name attribute to be found
+     * @throws LaunchException Thrown if the signed JNLP file, within the main jar, fails to be verified or does not match
+     */
+    public String checkForAttributeInJars(List<JARDesc> jars, Attributes.Name name) {
+       
+        String result = null;
+        
+        // Check main jar
+        JARDesc mainJarDesc = file.getResources().getMainJAR();
+        result = getManifestAttribute(mainJarDesc.getLocation(), name);
+
+        if (result != null) {
+            return result;
+        }
+        
+        // Check first jar
+        JARDesc firstJarDesc = jars.get(0);
+        result = getManifestAttribute(firstJarDesc.getLocation(),name);
+        
+        if (result != null) {
+            return result;
+        }
+
+        // Still not found? Iterate and set if only 1 was found
+        for (JARDesc jarDesc: jars) {
+            String mainClassInThisJar = getManifestAttribute(jarDesc.getLocation(), name);
+                if (mainClassInThisJar != null) {
+                    if (result == null) { // first main class
+                        result = mainClassInThisJar;
+                    } else { // There is more than one main class. Set to null and break.
+                        result = null;
+                        break;
+                }
+            }
+        }
+        return result;
+    }
     /***
      * Checks for the jar that contains the main class. If the main class was
      * found, it checks to see if the jar is signed and whether it contains a
@@ -816,34 +858,8 @@
 
         // The main class may be specified in the manifest
 
-        // Check main jar
         if (mainClass == null) {
-            JARDesc mainJarDesc = file.getResources().getMainJAR();
-            mainClass = getMainClassName(mainJarDesc.getLocation());
-        }
-
-        // Check first jar
-        if (mainClass == null) {
-            JARDesc firstJarDesc = jars.get(0);
-            mainClass = getMainClassName(firstJarDesc.getLocation());
-        }
-
-        // Still not found? Iterate and set if only 1 was found
-        if (mainClass == null) {
-
-            for (JARDesc jarDesc: jars) {
-                String mainClassInThisJar = getMainClassName(jarDesc.getLocation());
-
-                if (mainClassInThisJar != null) {
-
-                    if (mainClass == null) { // first main class
-                        mainClass = mainClassInThisJar;
-                    } else { // There is more than one main class. Set to null and break.
-                        mainClass = null;
-                        break;
-                    }
-                }
-            }
+            mainClass = checkForAttributeInJars(jars, Attributes.Name.MAIN_CLASS);
         }
 
         String desiredJarEntryName = mainClass + ".class";
@@ -891,24 +907,35 @@
      * @return the main class name, null if there isn't one of if there was an error
      */
     String getMainClassName(URL location) {
+        return getManifestAttribute(location, Attributes.Name.MAIN_CLASS);
+    }
+    
+    
+    /**
+     * Gets the name of the main method if specified in the manifest
+     *
+     * @param location The JAR location
+     * @return the attribute value, null if there isn't one of if there was an error
+     */
+    public String getManifestAttribute(URL location, Attributes.Name  attribute) {
 
-        String mainClass = null;
+        String attributeValue = null;
         File f = tracker.getCacheFile(location);
 
         if( f != null) {
             JarFile mainJar = null;
             try {
                 mainJar = new JarFile(f);
-                mainClass = mainJar.getManifest().
-                        getMainAttributes().getValue("Main-Class");
+                attributeValue = mainJar.getManifest().
+                        getMainAttributes().getValue(attribute);
             } catch (IOException ioe) {
-                mainClass = null;
+                attributeValue = null;
             } finally {
                 StreamUtils.closeSilently(mainJar);
             }
         }
 
-        return mainClass;
+        return attributeValue;
     }
 
     /**

From jvanek at redhat.com  Mon Oct 21 06:29:01 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Mon, 21 Oct 2013 15:29:01 +0200
Subject: Small refactoring in searching for attributes
In-Reply-To: <20131018150028.GA7543@redhat.com>
References: <526133DE.1070402@redhat.com> <20131018150028.GA7543@redhat.com>
Message-ID: <52652C1D.6020008@redhat.com>

On 10/18/2013 05:00 PM, Omair Majid wrote:
> * Jiri Vanek <jvanek at redhat.com> [2013-10-18 09:14]:
>> Please note, this have to go also to 1.4, and that tests are already included n itw.
>
> Patch itself looks okay to me. You have introduced two new public
> methods, though:

thanx, pushed.

>
>> +    public String checkForAttributeInJars(List<JARDesc> jars, Attributes.Name name) {
>
>> +    public String getManifestAttribute(URL location, Attributes.Name  attribute) {
>
> Could you add unit tests for these new methods? Just like the previous
> unit tests give us some guarantee that users of the old methods are
> still covered, it would be nice to have some guarantee that users are
> also covered if these new methods were refactored too.

Here is test. It growe a bit
  - to test the order during search the dummy jnlp file had to be extended to work with set of jars


changes ala

+++ b/netx/net/sourceforge/jnlp/JARDesc.java	Mon Oct 21 15:25:09 2013 +0200

-    private URL location;
+    private final URL location;

...


Are a bit unrelated, but worthy. I wonted to write setter for "main" field, and realised how wrong 
this class is. So I did not made the api dirty (used refelction in dummyJnlp) and adde those finals.


Ok for head (both patch and fix?)


Also both, or one, or none :) to 1.4 ?


J.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: testForSearchForAttribute.patch
Type: text/x-patch
Size: 12463 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131021/771f799b/testForSearchForAttribute.patch 

From jvanek at redhat.com  Mon Oct 21 06:54:42 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Mon, 21 Oct 2013 15:54:42 +0200
Subject: [rfc][icedtea-web] refactored logging
In-Reply-To: <20131018202607.GB14560@redhat.com>
References: <522F7EDF.5070407@redhat.com> <52461A5B.8070800@redhat.com>
	<52611129.5070707@redhat.com> <20131018202607.GB14560@redhat.com>
Message-ID: <52653222.30702@redhat.com>

On 10/18/2013 10:26 PM, Omair Majid wrote:
> * Jiri Vanek <jvanek at redhat.com> [2013-10-18 06:44]:
>> I'm not sure if I replied correctly last time (I did not imho)
>>
...
>>
>> Can I push?
>
> Sure. Might as well remove JNLPRuntime.isPluginDebug() too, no?

Nope, there is logic. But I made it private.
>
> Actually, out of curiosity, what's the reason for keeping
> PluginDebug.debug() ?

lazines :) It would be needed to refactor (mostly manually or get dirty api in new logger)  another 
hundred of lines of code.

>
>> The tasks which are now missing are:
>>   - do in C part the same (debug on/of by same way, file/streams(/system))
>>   - share file-log between c and java (My intention is  to pass
>> filename in same way as pipes paths are sent)
>>   - implement the sytsem logger
>
> One more: running 'make check' should not produce >2M of
> output :)

hmm:(( I made some digging oi this, and I'm not able to reproduces.

Now -verbose, ICEDTEAPLUGIN_DEBUG, and deployment.log=true in 
~/.config/icedtea-web/deployment.properties enable the same debug "level"

May you verify how output of make check is affected by them?

When I have no deployment.properties (or deployment.log=false), nor ICEDTEAPLUGIN_DEBUG nor -verbose 
on comamndline (hardcoded) then I have normal, nice, clean ouput :(

J.

From gnu_andrew at member.fsf.org  Mon Oct 21 08:09:09 2013
From: gnu_andrew at member.fsf.org (Andrew)
Date: Mon, 21 Oct 2013 16:09:09 +0100
Subject: [SECURITY] IcedTea 2.4.3 Released!
Message-ID: <20131021150909.GA6479@carrie.the212.com>

The IcedTea project provides a harness to build the source code from
OpenJDK using Free Software build tools, along with additional
features such as a PulseAudio sound driver, the ability to build
against system libraries and support for alternative virtual machines
and architectures beyond those supported by OpenJDK.

This release updates our OpenJDK 7 support in the 2.4.x series with a
number of security fixes and synchronises it with the upstream u45 b31 tag.

Existing users of the 2.3.x series are strongly advised to upgrade to
the 2.4.x series.  Although there will be a 2.3.x update, one security
issue (CVE-2013-5838) is resolved by the JSR292 rewrite (S7023639)
which is present in the 2.4.x series, but not 2.3.x.  It may or may
not be possible to backport this for the Zero port, but the safest
solution is to use 2.4.x where possible.

If you find an issue with the release, please report it to our bug
database (http://icedtea.classpath.org/bugzilla) under the appropriate
component. Development discussion takes place on the
distro-pkg-dev at openjdk.java.net mailing list and patches are always
welcome.

Full details of the release can be found below.

What's New?
===========
New in release 2.4.3 (2013-10-21):

* Security fixes
  - S8006900, CVE-2013-3829: Add new date/time capability
  - S8008589: Better MBean permission validation
  - S8011071, CVE-2013-5780: Better crypto provider handling
  - S8011081, CVE-2013-5772: Improve jhat
  - S8011157, CVE-2013-5814: Improve CORBA portablility
  - S8012071, CVE-2013-5790: Better Building of Beans
  - S8012147: Improve tool support
  - S8012277: CVE-2013-5849: Improve AWT DataFlavor
  - S8012425, CVE-2013-5802: Transform TransformerFactory
  - S8013503, CVE-2013-5851: Improve stream factories
  - S8013506: Better Pack200 data handling
  - S8013510, CVE-2013-5809: Augment image writing code
  - S8013514: Improve stability of cmap class
  - S8013739, CVE-2013-5817: Better LDAP resource management
  - S8013744, CVE-2013-5783: Better tabling for AWT
  - S8014085: Better serialization support in JMX classes
  - S8014093, CVE-2013-5782: Improve parsing of images
  - S8014098: Better profile validation
  - S8014102, CVE-2013-5778: Improve image conversion
  - S8014341, CVE-2013-5803: Better service from Kerberos servers
  - S8014349, CVE-2013-5840: (cl) Class.getDeclaredClass problematic in some class loader configurations
  - S8014530, CVE-2013-5825: Better digital signature processing
  - S8014534: Better profiling support
  - S8014987, CVE-2013-5842: Augment serialization handling
  - S8015614: Update build settings
  - S8015731: Subject java.security.auth.subject to improvements
  - S8015743, CVE-2013-5774: Address internet addresses
  - S8016256: Make finalization final
  - S8016653, CVE-2013-5804: javadoc should ignore ignoreable characters in names
  - S8016675, CVE-2013-5797: Make Javadoc pages more robust
  - S8017196, CVE-2013-5850: Ensure Proxies are handled appropriately
  - S8017287, CVE-2013-5829: Better resource disposal
  - S8017291, CVE-2013-5830: Cast Proxies Aside
  - S8017298, CVE-2013-4002: Better XML support
  - S8017300, CVE-2013-5784: Improve Interface Implementation
  - S8017505, CVE-2013-5820: Better Client Service
  - S8019292: Better Attribute Value Exceptions
  - S8019617: Better view of objects
  - S8020293: JVM crash
  - S8021275, CVE-2013-5805: Better screening for ScreenMenu
  - S8021282, CVE-2013-5806: Better recycling of object instances
  - S8021286: Improve MacOS resourcing
  - S8021290, CVE-2013-5823: Better signature validation
  - S8022931, CVE-2013-5800: Enhance Kerberos exceptions
  - S8022940: Enhance CORBA translations
  - S8023683: Enhance class file parsing
* Backports
  - S6614237: missing codepage Cp290 at java runtime
  - S8005932: Java 7 on mac os x only provides text clipboard formats
  - S8014046: (process) Runtime.exec(String) fails if command contains spaces [win]
  - S8015144: Performance regression in ICU OpenType Layout library
  - S8015965: (process) Typo in name of property to allow ambiguous commands
  - S8015978: Incorrect transformation of XPath expression "string(-0)"
  - S8016357: Update hotspot diagnostic class
  - S8019584: javax/management/remote/mandatory/loading/MissingClassTest.java failed in nightly against jdk7u45: java.io.InvalidObjectException: Invalid notification: null
  - S8019969: nioNetworkChannelInet6/SetOptionGetOptionTestInet6 test case crashes
  - S8020032: 7u fastdebug doesn't generate fastdebuginfo file
  - S8020085: Linux ARM build failure for 7u45
  - S8020088: Increment minor version of HSx for 7u45 and initialize the build number
  - S8020551: increment hsx build to b03 for 7u45-b03
  - S8020943: Memory leak when GCNotifier uses create_from_platform_dependent_str()
  - S8021287: Improve MacOS resourcing
  - S8021355: REGRESSION: Five closed/java/awt/SplashScreen tests fail since 7u45 b01 on Linux, Solaris
  - S8021360: object not exported" on start of JMXConnectorServer for RMI-IIOP protocol with security manager
  - S8021366: java_util/Properties/PropertiesWithOtherEncodings fails during 7u45 nightly testing
  - S8021577: JCK test api/javax_management/jmx_serial/modelmbean/ModelMBeanNotificationInfo/serial/index.html#Input has failed since jdk 7u45 b01
  - S8021899: Re-adjust fix of # 8020498 in 7u45 after mergeing 7u40
  - S8021901: Increment hsx build to b05 for 7u45-b05
  - S8021933: Add extra check for fix # JDK-8014530
  - S8021969: The index_AccessAllowed jnlp can not load successfully with exception thrown in the log.
  - S8022066: Evaluation of method reference to signature polymorphic method crashes VM
  - S8022086: Fixing licence of newly added files
  - S8022254: Remove incorrect jdk7u45-b05 tag from jdk7u-cpu forest
  - S8022661: InetAddress.writeObject() performs flush() on object output stream
  - S8022682: Supporting XOM
  - S8022808: Kitchensink hangs on macos
  - S8022856: 7u45 l10n resource file translation update
  - S8023323: Increment hsx build to b06 for 7u45-b08
  - S8023457: Event based tracing framework needs a mutex for thread groups
  - S8023478: Test fails with HS crash in GCNotifier.
  - S8023741: Increment hsx 24.45 build to b07 for 7u45-b09
  - S8023771: when USER_RELEASE_SUFFIX is set in order to add a string to java -version, build number in the bundles names should not be changed to b00
  - S8023888: Increment hsx 24.45 build to b08 for 7u45-b10
  - S8023964: java/io/IOException/LastErrorString.java should be @ignore-d
  - S8024369: Increment build # of hs24.0 to b57 for 7u40-b61 psu
  - S8024668: api/java_nio/charset/Charset/index.html#Methods JCK-runtime test fails with 7u45 b11
  - S8024697: Fix for 8020983 causes Xcheck:jni warnings
  - S8024863: X11: Support GNOME Shell as mutter
  - S8024883: (se) SelectableChannel.register throws NPE if fd >= 64k (lnx)
  - S8025128: File.createTempFile fails if prefix is absolute path
  - S8025170: jdk7u51 7u-1-prebuild is failing since 9/19
* Bug fixes
  - PR1400: Menu of maximized AWT window not working in Mate

The tarball can be downloaded from:

* http://icedtea.classpath.org/download/source/icedtea-2.4.3.tar.gz

or:

* http://icedtea.classpath.org/download/source/icedtea-2.4.3.tar.xz

We provide both gzip and xz tarballs, so that those who are able to
make use of the smaller tarball produced by xz may do so.

The tarballs are accompanied by digital signatures available at:

    http://icedtea.classpath.org/download/source/icedtea-2.4.3.tar.gz.sig
    http://icedtea.classpath.org/download/source/icedtea-2.4.3.tar.xz.sig

These are produced using my public key. See details below.

    PGP Key: 248BDC07 (https://keys.indymedia.org/)
    Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07

SHA256 checksums:

15b1acc1fb43b83ca08d531491261c5eeaea4cad3598300074692acea93bdd3d  icedtea-2.4.3.tar.gz
f9e5c9684432340606d92dd65117f02301250b7757e02ab42d9049296e260367  icedtea-2.4.3.tar.gz.sig
9289d25867b39756d62ba16eda5834655609a6962e0eaf2edacc04e3b629c806  icedtea-2.4.3.tar.xz
94914ad7af3a87246e5212dc6789206c438ea1356dce44ade54ef420983f2e01  icedtea-2.4.3.tar.xz.sig

The following people helped with these releases:

* Andrew Hughes (OpenJDK synchronisation, all other fixes & release management)
* Omair Majid (S8024863)

We would also like to thank the bug reporters and testers!

To get started:

$ tar xzf icedtea-2.4.3.tar.gz

or:

$ tar x -I xz -f icedtea-2.4.3.tar.xz

then:

$ mkdir icedtea-build
$ cd icedtea-build
$ ../icedtea-2.4.3/configure
$ make

Full build requirements and instructions are available in the INSTALL file.

Happy hacking!
-- 
Andrew :)

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

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131021/5d04f0e3/attachment-0001.bin 

From jvanek at redhat.com  Mon Oct 21 08:50:08 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Mon, 21 Oct 2013 17:50:08 +0200
Subject: [rfc][icedtea-web] refactored logging in plugin
Message-ID: <52654D30.507@redhat.com>

Hi!

As I wont to unify java and c sides of plugin, I' suggesting this very small first step for C part.

Also for better readibility I'm thinking about backporting to 1.4 (without strderr-> stdout change 
in PLUGIN_DEBUG)

Any ideas welcommed :)

C lame,
   J.
-------------- next part --------------
diff -r 3abc317c3d92 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Mon Oct 21 16:02:32 2013 +0200
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Mon Oct 21 17:44:56 2013 +0200
@@ -57,19 +57,6 @@
 #include "IcedTeaNPPlugin.h"
 
 
-// Error reporting macros.
-#define PLUGIN_ERROR(message)                                       \
-  g_printerr ("%s:%d: thread %p: Error: %s\n", __FILE__, __LINE__,  \
-              g_thread_self (), message)
-
-#define PLUGIN_ERROR_TWO(first, second)                                 \
-  g_printerr ("%s:%d: thread %p: Error: %s: %s\n", __FILE__, __LINE__,  \
-              g_thread_self (), first, second)
-
-#define PLUGIN_ERROR_THREE(first, second, third)                        \
-  g_printerr ("%s:%d: thread %p: Error: %s: %s: %s\n", __FILE__,        \
-              __LINE__, g_thread_self (), first, second, third)
-
 // Plugin information passed to about:plugins.
 #define PLUGIN_FULL_NAME PLUGIN_NAME " (using " PLUGIN_VERSION ")"
 #define PLUGIN_DESC "The <a href=\"" PACKAGE_URL "\">" PLUGIN_NAME "</a> executes Java applets."
@@ -460,7 +447,7 @@
   PLUGIN_DEBUG ("ITNP_New: creating input fifo: %s\n", in_pipe_name);
   if (mkfifo (in_pipe_name, 0600) == -1 && errno != EEXIST)
     {
-      PLUGIN_ERROR_TWO ("Failed to create input pipe", strerror (errno));
+      PLUGIN_ERROR ("Failed to create input pipe", strerror (errno));
       np_error = NPERR_GENERIC_ERROR;
       goto cleanup_in_pipe_name;
     }
@@ -486,7 +473,7 @@
   PLUGIN_DEBUG ("ITNP_New: creating output fifo: %s\n", out_pipe_name);
   if (mkfifo (out_pipe_name, 0600) == -1 && errno != EEXIST)
     {
-      PLUGIN_ERROR_TWO ("Failed to create output pipe", strerror (errno));
+      PLUGIN_ERROR ("Failed to create output pipe", strerror (errno));
       np_error = NPERR_GENERIC_ERROR;
       goto cleanup_out_pipe_name;
     }
@@ -508,7 +495,7 @@
     {
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO ("Failed to create output channel",
+          PLUGIN_ERROR ("Failed to create output channel",
                             channel_error->message);
           g_error_free (channel_error);
           channel_error = NULL;
@@ -535,7 +522,7 @@
     {
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO ("Failed to create input channel",
+          PLUGIN_ERROR ("Failed to create input channel",
                             channel_error->message);
           g_error_free (channel_error);
           channel_error = NULL;
@@ -998,7 +985,7 @@
         {
           if (channel_error)
             {
-              PLUGIN_ERROR_TWO ("Failed to read line from input channel",
+              PLUGIN_ERROR ("Failed to read line from input channel",
                                 channel_error->message);
               g_error_free (channel_error);
               channel_error = NULL;
@@ -1337,7 +1324,7 @@
     {
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO ("Failed to spawn applet viewer",
+          PLUGIN_ERROR ("Failed to spawn applet viewer",
                             channel_error->message);
           g_error_free (channel_error);
           channel_error = NULL;
@@ -1417,7 +1404,7 @@
     {
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO ("Failed to spawn applet viewer",
+          PLUGIN_ERROR ("Failed to spawn applet viewer",
                             channel_error->message);
           g_error_free (channel_error);
           channel_error = NULL;
@@ -1548,7 +1535,7 @@
         {
           if (channel_error)
             {
-              PLUGIN_ERROR_TWO ("Failed to write bytes to output channel",
+              PLUGIN_ERROR ("Failed to write bytes to output channel",
                                 channel_error->message);
               g_error_free (channel_error);
               channel_error = NULL;
@@ -1562,7 +1549,7 @@
         {
           if (channel_error)
             {
-              PLUGIN_ERROR_TWO ("Failed to flush bytes to output channel",
+              PLUGIN_ERROR ("Failed to flush bytes to output channel",
                                 channel_error->message);
               g_error_free (channel_error);
               channel_error = NULL;
@@ -1629,7 +1616,7 @@
             {
               if (channel_error)
                 {
-                  PLUGIN_ERROR_TWO ("Failed to write shutdown message to"
+                  PLUGIN_ERROR ("Failed to write shutdown message to"
                                     " appletviewer", channel_error->message);
                   g_error_free (channel_error);
                   channel_error = NULL;
@@ -1643,7 +1630,7 @@
             {
               if (channel_error)
                 {
-                  PLUGIN_ERROR_TWO ("Failed to write shutdown message to"
+                  PLUGIN_ERROR ("Failed to write shutdown message to"
                                     " appletviewer", channel_error->message);
                   g_error_free (channel_error);
                   channel_error = NULL;
@@ -1658,7 +1645,7 @@
             {
               if (channel_error)
                 {
-                  PLUGIN_ERROR_TWO ("Failed to shut down appletviewer"
+                  PLUGIN_ERROR ("Failed to shut down appletviewer"
                                     " output channel", channel_error->message);
                   g_error_free (channel_error);
                   channel_error = NULL;
@@ -1676,7 +1663,7 @@
             {
               if (channel_error)
                 {
-                  PLUGIN_ERROR_TWO ("Failed to shut down appletviewer"
+                  PLUGIN_ERROR ("Failed to shut down appletviewer"
                                     " input channel", channel_error->message);
                   g_error_free (channel_error);
                   channel_error = NULL;
@@ -1820,7 +1807,7 @@
     file_error = g_mkdir (data_directory.c_str(), 0700);
     if (file_error != 0)
     {
-      PLUGIN_ERROR_THREE ("Failed to create data directory",
+      PLUGIN_ERROR ("Failed to create data directory",
                           data_directory.c_str(),
                           strerror (errno));
       return NPERR_GENERIC_ERROR;
@@ -1832,7 +1819,7 @@
   if (!g_file_test (data_directory.c_str(),
                     (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
   {
-    PLUGIN_ERROR_THREE ("Temp directory does not exist: ",
+    PLUGIN_ERROR ("Temp directory does not exist: ",
                         data_directory.c_str(),
                         strerror (errno));
     return NPERR_GENERIC_ERROR;
diff -r 3abc317c3d92 plugin/icedteanp/IcedTeaPluginUtils.h
--- a/plugin/icedteanp/IcedTeaPluginUtils.h	Mon Oct 21 16:02:32 2013 +0200
+++ b/plugin/icedteanp/IcedTeaPluginUtils.h	Mon Oct 21 17:44:56 2013 +0200
@@ -59,15 +59,24 @@
 #include <glib.h>
 #include <npruntime.h>
 
-#define PLUGIN_DEBUG(...) \
-  do                                                          \
-  {                                                           \
-    if (plugin_debug)                                         \
-    {                                                         \
-      fprintf (stderr, "ITNPP Thread# %ld: ", pthread_self()); \
-      fprintf (stderr, __VA_ARGS__);                          \
-    }                                                         \
+#define PLUGIN_DEBUG(...)                                      \
+  do                                                           \
+  {                                                            \
+    if (plugin_debug)                                          \
+    {                                                          \
+      fprintf (stdout, "ITNPP Thread# %ld: ", pthread_self()); \
+      fprintf (stdout, __VA_ARGS__);                           \
+    }                                                          \
   } while (0)
+  
+  // Error reporting macros.
+#define PLUGIN_ERROR(...)                                   \
+do                                                          \
+  {                                                         \
+        fprintf  (stderr, "%s:%d: thread %p: Error: %s\n",  \
+               __FILE__, __LINE__,                          \
+              g_thread_self (), __VA_ARGS__);               \
+   } while (0)
 
 #define CHECK_JAVA_RESULT(result_data)                               \
 {                                                                    \

From bugzilla-daemon at icedtea.classpath.org  Mon Oct 21 11:10:17 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 21 Oct 2013 18:10:17 +0000
Subject: [Bug 1021] Runescape fails to run
In-Reply-To: <bug-1021-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1021-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1021-30-9EaVWbm09K@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1021

Deepak Bhole <dbhole at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|---                         |INVALID

--- Comment #2 from Deepak Bhole <dbhole at redhat.com> ---
Thanks for the detailed explanation Julien! Closing as there is nothing we can
do to fix it in ITW. Hopefully support in the decoder will improve soon.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131021/fb4ccd94/attachment.html 

From aazores at redhat.com  Mon Oct 21 12:07:15 2013
From: aazores at redhat.com (Andrew Azores)
Date: Mon, 21 Oct 2013 15:07:15 -0400
Subject: [rfc][icedtea-web] refactored logging in plugin
In-Reply-To: <52654D30.507@redhat.com>
References: <52654D30.507@redhat.com>
Message-ID: <52657B63.4000800@redhat.com>

On 10/21/2013 11:50 AM, Jiri Vanek wrote:
> Hi!
>
> As I wont to unify java and c sides of plugin, I' suggesting this very 
> small first step for C part.

This looks okay to me.

>
> Also for better readibility I'm thinking about backporting to 1.4 
> (without strderr-> stdout change in PLUGIN_DEBUG)

I don't see a particular need for it but go ahead if you think it's 
worthwhile.

>
> Any ideas welcommed :)
>
> C lame,

"C lame" ? But isn't the do-while-0 #define trick just so pretty? :)

>   J.

Thanks,

-- 
Andrew A


From aazores at redhat.com  Mon Oct 21 13:24:50 2013
From: aazores at redhat.com (Andrew Azores)
Date: Mon, 21 Oct 2013 16:24:50 -0400
Subject: [icedtea-web] (PR1513) Signed JAR with external main-class
In-Reply-To: <20131018200616.GA14560@redhat.com>
References: <526177BA.7020301@redhat.com> <20131018200616.GA14560@redhat.com>
Message-ID: <52658D92.7060104@redhat.com>

On 10/18/2013 04:06 PM, Omair Majid wrote:
> * Andrew Azores <aazores at redhat.com> [2013-10-18 14:04]:
>> Hi,
>>
>> The applet in the PR1513 report fails to launch due to the following
>> check in JNLPClassLoader#initializeResources():
>>
>> // If jar with main class was not found and there are no more
>> // available jars, throw a LaunchException
>> if (file.getLaunchInfo() != null) {
>>      if (!foundMainJar // && (available == null || available.size() == 0))
>>          throw new LaunchException(file, null, R("LSFatal"),
>>                  R("LCClient"), R("LCantDetermineMainClass"),
>>                  R("LCantDetermineMainClassInfo"));
>> }
> /me grumbles about comments that reiterate what the code is doing
> without explaining why.

Yep. Sometimes I find comments that I really just want to remove...

// initialize extensions
initializeExtensions();


>
>> What I'm wondering however, is if this is actually safe. How do we
>> really want to be handling this situation? The JarCertVerified
>> reports "fully signed", but then we are going to go ahead and
>> execute an arbitrary unverified class file from outside the JAR(s).
>> To me this seems a little bit questionable - definitely we shouldn't
>> just fail to launch altogether, but what should be done about the
>> permissions for this applet? Right now with the exception removed,
>> the user is still prompted with a dialog claiming that the applet's
>> signature has been validated by a trusted source, but can we really
>> say that now?
> I don't think saying "fully signed" is valid even if the main class is
> found in the jar. As long as there is a URL which will be used to search
> for additional classes, we can not claim we have verified all classes.
> We probably should not claim that everything is signed and/or trusted.
>
> Do all applets get a codebase URL for fallback unconditionally?
>
> Thanks,
> Omair

I'm not sure what you mean but I think my last email might've been a 
little confusing about this. To be clear, the loading/execution of the 
arbitrary class files while also displaying a "fully trusted" message 
only happens when taking the naive approach to making the PR1513 applet 
run, which is just removing that LaunchException completely and doing 
nothing else. This lets the applet run (since other than the signing 
issue, we do generally support applets having the main-class external to 
the JARs) but leaves the ClassLoader and JarCertVerifier and whatever 
else still thinking that the applet is fully trusted, which is wrong. 
What we currently do never involves loading any unverified classes while 
claiming everything is verified, as far as I can tell.

So what I think we need to do is not throw the LaunchException from the 
code hunk I referenced, but instead treat the applet as if it's unsigned 
when given the same conditions. This will not affect signed applets 
where the main-class is within a JAR. It also won't affect unsigned 
applets at all. Applets with signed JARs but with the main-class not 
found will then be treated as if they are unsigned, until either the 
main-class is found externally in the codebase (at which point we run 
the applet as if it's unsigned), or the main-class is just not found at 
all, in which case a LaunchException should occur elsewhere anyway (I'll 
need to verify that this actually happens however, we might end up with 
some other less informative error). Does this seem right?

Thanks,

-- 
Andrew A


From omajid at redhat.com  Mon Oct 21 14:43:13 2013
From: omajid at redhat.com (Omair Majid)
Date: Mon, 21 Oct 2013 17:43:13 -0400
Subject: [icedtea-web] (PR1513) Signed JAR with external main-class
In-Reply-To: <52658D92.7060104@redhat.com>
References: <526177BA.7020301@redhat.com> <20131018200616.GA14560@redhat.com>
	<52658D92.7060104@redhat.com>
Message-ID: <20131021214312.GA1526@redhat.com>

* Andrew Azores <aazores at redhat.com> [2013-10-21 16:24]:
> On 10/18/2013 04:06 PM, Omair Majid wrote:
> >* Andrew Azores <aazores at redhat.com> [2013-10-18 14:04]:
> >>Hi,
> >>
> >>The applet in the PR1513 report fails to launch due to the following
> >>check in JNLPClassLoader#initializeResources():
> >>
> >>// If jar with main class was not found and there are no more
> >>// available jars, throw a LaunchException
> >>if (file.getLaunchInfo() != null) {
> >>     if (!foundMainJar // && (available == null || available.size() == 0))
> >>         throw new LaunchException(file, null, R("LSFatal"),
> >>                 R("LCClient"), R("LCantDetermineMainClass"),
> >>                 R("LCantDetermineMainClassInfo"));
> >>}
> >/me grumbles about comments that reiterate what the code is doing
> >without explaining why.
> 
> Yep. Sometimes I find comments that I really just want to remove...
> 
> // initialize extensions
> initializeExtensions();

Feel free to remove them.

> I'm not sure what you mean but I think my last email might've been a
> little confusing about this. To be clear, the loading/execution of
> the arbitrary class files while also displaying a "fully trusted"
> message only happens when taking the naive approach to making the
> PR1513 applet run, which is just removing that LaunchException
> completely and doing nothing else. This lets the applet run (since
> other than the signing issue, we do generally support applets having
> the main-class external to the JARs) but leaves the ClassLoader and
> JarCertVerifier and whatever else still thinking that the applet is
> fully trusted, which is wrong. What we currently do never involves
> loading any unverified classes while claiming everything is
> verified, as far as I can tell.

I am curious about the current state. Can it ever be that we load
classes from the codebase URL _and_ claim that the applet is fully
signed?

> So what I think we need to do is not throw the LaunchException from
> the code hunk I referenced, but instead treat the applet as if it's
> unsigned when given the same conditions. This will not affect signed
> applets where the main-class is within a JAR. It also won't affect
> unsigned applets at all. Applets with signed JARs but with the
> main-class not found will then be treated as if they are unsigned,
> until either the main-class is found externally in the codebase (at
> which point we run the applet as if it's unsigned), or the
> main-class is just not found at all, in which case a LaunchException
> should occur elsewhere anyway (I'll need to verify that this
> actually happens however, we might end up with some other less
> informative error). Does this seem right?

Yes, this sounds like the correct fix. I don't know if it will be a
simple one (code-wise), though.

Cheers,
Omair

From omajid at redhat.com  Mon Oct 21 15:42:51 2013
From: omajid at redhat.com (Omair Majid)
Date: Mon, 21 Oct 2013 18:42:51 -0400
Subject: [rfc][icedtea-web] refactored logging
In-Reply-To: <52653222.30702@redhat.com>
References: <522F7EDF.5070407@redhat.com> <52461A5B.8070800@redhat.com>
	<52611129.5070707@redhat.com> <20131018202607.GB14560@redhat.com>
	<52653222.30702@redhat.com>
Message-ID: <20131021224251.GB1526@redhat.com>

* Jiri Vanek <jvanek at redhat.com> [2013-10-21 09:54]:
> On 10/18/2013 10:26 PM, Omair Majid wrote:
> >One more: running 'make check' should not produce >2M of
> >output :)
> 
> hmm:(( I made some digging oi this, and I'm not able to reproduces.
> 
> Now -verbose, ICEDTEAPLUGIN_DEBUG, and deployment.log=true in
> ~/.config/icedtea-web/deployment.properties enable the same debug
> "level"
> 
> May you verify how output of make check is affected by them?

It's a bad test. It modifies the global logging configuration and does
not restore the original. The modified logging configuration is not
visible on all machines because the order in which junit runs the test
is not guaranteed; sometimes a later tests modifies the configuration to
something which happens to be the default configuration.

Does the attached patch look okay?

Thanks,
Omair
-------------- next part --------------
diff --git a/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java b/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java
+++ b/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java
@@ -43,6 +43,8 @@
 import net.sourceforge.jnlp.closinglisteners.RulesFolowingClosingListener;
 import net.sourceforge.jnlp.util.StreamUtils;
 import org.junit.Assert;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OutputControllerTest {
@@ -71,6 +73,34 @@
         }
     }
 
+    private boolean savedEnableHeaders;
+    private boolean savedEnableLogging;
+    private boolean savedLogToFile;
+    private boolean savedLogToStreams;
+    private boolean savedLogToSysLog;
+
+    @Before
+    public void setUp() {
+        // back up global logging configuration
+        LogConfig config = LogConfig.getLogConfig();
+        savedEnableHeaders = config.isEnableHeaders();
+        savedEnableLogging = config.isEnableLogging();
+        savedLogToFile = config.isLogToFile();
+        savedLogToStreams = config.isLogToStreams();
+        savedLogToSysLog = config.isLogToSysLog();
+    }
+
+    @After
+    public void tearDown() {
+        // restore global logging configuration
+        LogConfig config = LogConfig.getLogConfig();
+        config.setEnableHeaders(savedEnableHeaders);
+        config.setEnableLogging(savedEnableLogging);
+        config.setLogToFile(savedLogToFile);
+        config.setLogToStreams(savedLogToStreams);
+        config.setLogToSysLog(savedLogToSysLog);
+    }
+
     @Test
     public void isLoggingStdStreams() throws Exception {
         ByteArrayOutputStream os1 = new ByteArrayOutputStream();

From ptisnovs at icedtea.classpath.org  Tue Oct 22 00:34:49 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Tue, 22 Oct 2013 07:34:49 +0000
Subject: /hg/rhino-tests: Added new testGetResourceNegativeTest case into
Message-ID: <hg.21d27ab5696b.1382427289.-6019694633368342460@icedtea.classpath.org>

changeset 21d27ab5696b in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=21d27ab5696b
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue Oct 22 09:38:37 2013 +0200

	Added new testGetResourceNegativeTest case into
	BindingsClassTest.


diffstat:

 ChangeLog                                 |  6 ++++++
 src/org/RhinoTests/BindingsClassTest.java |  8 ++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diffs (31 lines):

diff -r 1f31c258deff -r 21d27ab5696b ChangeLog
--- a/ChangeLog	Mon Oct 21 11:56:47 2013 +0200
+++ b/ChangeLog	Tue Oct 22 09:38:37 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-22  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/BindingsClassTest.java:
+	Added new testGetResourceNegativeTest case into
+	BindingsClassTest.
+
 2013-10-21  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/SimpleScriptContextClassTest.java:
diff -r 1f31c258deff -r 21d27ab5696b src/org/RhinoTests/BindingsClassTest.java
--- a/src/org/RhinoTests/BindingsClassTest.java	Mon Oct 21 11:56:47 2013 +0200
+++ b/src/org/RhinoTests/BindingsClassTest.java	Tue Oct 22 09:38:37 2013 +0200
@@ -1523,6 +1523,14 @@
     }
 
     /**
+     * Test for method javax.script.Bindings.getClass().getResourceNegativeTest()
+     */
+    protected void testGetResourceNegativeTest() {
+        Object resource = this.bindingsClass.getResource("unknown");
+        assertNull(resource, "getResource() does not return null");
+    }
+
+    /**
      * Test for instanceof operator applied to a class javax.script.Bindings
      */
     @SuppressWarnings("cast")

From ptisnovs at icedtea.classpath.org  Tue Oct 22 00:37:15 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Tue, 22 Oct 2013 07:37:15 +0000
Subject: /hg/gfx-test: Ten new tests added into BitBltUsingBgColor test s...
Message-ID: <hg.8ee2bb1d2299.1382427435.-6248649288953172555@icedtea.classpath.org>

changeset 8ee2bb1d2299 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=8ee2bb1d2299
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue Oct 22 09:40:59 2013 +0200

	Ten new tests added into BitBltUsingBgColor test suite.


diffstat:

 ChangeLog                                          |    5 +
 src/org/gfxtest/testsuites/BitBltUsingBgColor.java |  150 +++++++++++++++++++++
 2 files changed, 155 insertions(+), 0 deletions(-)

diffs (172 lines):

diff -r eded9b7e3e14 -r 8ee2bb1d2299 ChangeLog
--- a/ChangeLog	Mon Oct 21 11:54:10 2013 +0200
+++ b/ChangeLog	Tue Oct 22 09:40:59 2013 +0200
@@ -1,3 +1,8 @@
+2013-10-22  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltUsingBgColor.java:
+	Ten new tests added into BitBltUsingBgColor test suite.
+
 2013-10-21  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java:
diff -r eded9b7e3e14 -r 8ee2bb1d2299 src/org/gfxtest/testsuites/BitBltUsingBgColor.java
--- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java	Mon Oct 21 11:54:10 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java	Tue Oct 22 09:40:59 2013 +0200
@@ -4352,6 +4352,156 @@
     }
 
     /**
+     * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR.
+     * Background color is set to Color.cyan.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundCyan(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.cyan);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR.
+     * Background color is set to Color.red.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundRed(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.red);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR.
+     * Background color is set to Color.magenta.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundMagenta(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.magenta);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR.
+     * Background color is set to Color.yellow.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundYellow(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.yellow);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR.
+     * Background color is set to Color.white.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundWhite(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, Color.white);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR.
+     * Background color is set to Color.black.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltDiagonalCheckerBufferedImageType4ByteABGRbackgroundBlack(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltDiagonalCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.black);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR.
+     * Background color is set to Color.blue.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltDiagonalCheckerBufferedImageType4ByteABGRbackgroundBlue(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltDiagonalCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.blue);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR.
+     * Background color is set to Color.green.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltDiagonalCheckerBufferedImageType4ByteABGRbackgroundGreen(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltDiagonalCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.green);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR.
+     * Background color is set to Color.cyan.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltDiagonalCheckerBufferedImageType4ByteABGRbackgroundCyan(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltDiagonalCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.cyan);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR.
+     * Background color is set to Color.red.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltDiagonalCheckerBufferedImageType4ByteABGRbackgroundRed(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltDiagonalCheckerBufferedImageType4ByteABGR(image, graphics2d, Color.red);
+    }
+
+    /**
      * Entry point to the test suite.
      *
      * @param args not used in this case

From jvanek at redhat.com  Tue Oct 22 00:46:20 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Tue, 22 Oct 2013 09:46:20 +0200
Subject: [rfc][icedtea-web] refactored logging
In-Reply-To: <20131021224251.GB1526@redhat.com>
References: <522F7EDF.5070407@redhat.com> <52461A5B.8070800@redhat.com>
	<52611129.5070707@redhat.com>
	<20131018202607.GB14560@redhat.com> <52653222.30702@redhat.com>
	<20131021224251.GB1526@redhat.com>
Message-ID: <52662D4C.6070606@redhat.com>

On 10/22/2013 12:42 AM, Omair Majid wrote:
> * Jiri Vanek<jvanek at redhat.com>  [2013-10-21 09:54]:
>> >  On 10/18/2013 10:26 PM, Omair Majid wrote:
>>> >  >One more: running 'make check' should not produce>2M of
>>> >  >output :)
>> >
>> >  hmm:(( I made some digging oi this, and I'm not able to reproduces.
>> >
>> >  Now -verbose, ICEDTEAPLUGIN_DEBUG, and deployment.log=true in
>> >  ~/.config/icedtea-web/deployment.properties enable the same debug
>> >  "level"
>> >
>> >  May you verify how output of make check is affected by them?
> It's a bad test. It modifies the global logging configuration and does
> not restore the original. The modified logging configuration is not
> visible on all machines because the order in which junit runs the test
> is not guaranteed; sometimes a later tests modifies the configuration to
> something which happens to be the default configuration.
>
> Does the attached patch look okay?

I would vote for backuping whole  LogConfig instead of individual fields, but do as you wish. Thanx for catching it.

J.
>
> Thanks,
> Omair
>
>
> fix-log-configuration-unit-tests-01.patch
>
>
> diff --git a/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java b/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java
> --- a/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java
> +++ b/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java
> @@ -43,6 +43,8 @@
>   import net.sourceforge.jnlp.closinglisteners.RulesFolowingClosingListener;
>   import net.sourceforge.jnlp.util.StreamUtils;
>   import org.junit.Assert;
> +import org.junit.After;
> +import org.junit.Before;
>   import org.junit.Test;
>
>   public class OutputControllerTest {
> @@ -71,6 +73,34 @@
>           }
>       }
>
> +    private boolean savedEnableHeaders;
> +    private boolean savedEnableLogging;
> +    private boolean savedLogToFile;
> +    private boolean savedLogToStreams;
> +    private boolean savedLogToSysLog;
> +
> +    @Before
> +    public void setUp() {
> +        // back up global logging configuration
> +        LogConfig config = LogConfig.getLogConfig();
> +        savedEnableHeaders = config.isEnableHeaders();
> +        savedEnableLogging = config.isEnableLogging();
> +        savedLogToFile = config.isLogToFile();
> +        savedLogToStreams = config.isLogToStreams();
> +        savedLogToSysLog = config.isLogToSysLog();
> +    }
> +
> +    @After
> +    public void tearDown() {
> +        // restore global logging configuration
> +        LogConfig config = LogConfig.getLogConfig();
> +        config.setEnableHeaders(savedEnableHeaders);
> +        config.setEnableLogging(savedEnableLogging);
> +        config.setLogToFile(savedLogToFile);
> +        config.setLogToStreams(savedLogToStreams);
> +        config.setLogToSysLog(savedLogToSysLog);
> +    }
> +
>       @Test
>       public void isLoggingStdStreams() throws Exception {
>           ByteArrayOutputStream os1 = new ByteArrayOutputStream();


From bugzilla-daemon at icedtea.classpath.org  Tue Oct 22 00:55:24 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 22 Oct 2013 07:55:24 +0000
Subject: [Bug 900] Fatal: Application Error: Unknown Main-Class. Could not
	determine the main class for this application.
In-Reply-To: <bug-900-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-900-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-900-30-tQrKgDTu9x@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=900

gerard.fernandes at gmail.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|RESOLVED                    |REOPENED
                 CC|                            |gerard.fernandes at gmail.com
         Resolution|FIXED                       |---

--- Comment #2 from gerard.fernandes at gmail.com ---
Still a bug in 1.4.1:
IcedTea-Web Plugin version: 1.4.1 (fedora-0.fc18-x86_64)
Tue Oct 22 08:54:34 BST 2013
net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: Could not
initialize applet. For more information click "more information button".
    at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:734)
    at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:662)
    at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:914)
Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Application Error:
Unknown Main-Class. Could not determine the main class for this application.
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:708)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.<init>(JNLPClassLoader.java:249)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:382)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420)
    at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:700)
    ... 2 more

 Chain: 
1) at Tue Oct 22 08:54:12 BST 2013
net.sourceforge.jnlp.LaunchException: Fatal: Application Error: Unknown
Main-Class. Could not determine the main class for this application.
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:708)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.<init>(JNLPClassLoader.java:249)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:382)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420)
    at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:700)
    at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:662)
    at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:914)
2) at Tue Oct 22 08:54:12 BST 2013
net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: Could not
initialize applet. For more information click "more information button".
    at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:734)
    at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:662)
    at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:914)
Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Application Error:
Unknown Main-Class. Could not determine the main class for this application.
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:708)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.<init>(JNLPClassLoader.java:249)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:382)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420)
    at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:700)
    ... 2 more
3) at Tue Oct 22 08:54:20 BST 2013
net.sourceforge.jnlp.LaunchException: Fatal: Application Error: Unknown
Main-Class. Could not determine the main class for this application.
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:708)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.<init>(JNLPClassLoader.java:249)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:382)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420)
    at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:700)
    at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:662)
    at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:914)
4) at Tue Oct 22 08:54:20 BST 2013
net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: Could not
initialize applet. For more information click "more information button".
    at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:734)
    at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:662)
    at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:914)
Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Application Error:
Unknown Main-Class. Could not determine the main class for this application.
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:708)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.<init>(JNLPClassLoader.java:249)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:382)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420)
    at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:700)
    ... 2 more

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131022/127370cb/attachment.html 

From jvanek at icedtea.classpath.org  Tue Oct 22 02:40:22 2013
From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org)
Date: Tue, 22 Oct 2013 09:40:22 +0000
Subject: /hg/release/icedtea-web-1.4: More synchronized error/debug methods
Message-ID: <hg.e1dfddeb801d.1382434822.-5934593987637005762@icedtea.classpath.org>

changeset e1dfddeb801d in /hg/release/icedtea-web-1.4
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=e1dfddeb801d
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Oct 22 11:46:27 2013 +0200

	More synchronized error/debug methods
	* plugin/icedteanp/IcedTeaNPPlugin.cc: all occurrences of  PLUGIN_ERROR_TWO and  PLUGIN_ERROR_THREE replaced by PLUGIN_ERROR.  PLUGIN_ERROR itself moved to
	* plugin/icedteanp/IcedTeaPluginUtils.h: (PLUGIN_ERROR) new fuction, now uses ... arguments and printf with __VA_ARGS__ instead of g_printerr


diffstat:

 ChangeLog                             |   9 +++++++
 plugin/icedteanp/IcedTeaNPPlugin.cc   |  43 ++++++++++++----------------------
 plugin/icedteanp/IcedTeaPluginUtils.h |  25 +++++++++++++------
 3 files changed, 41 insertions(+), 36 deletions(-)

diffs (210 lines):

diff -r eafa63cec4ca -r e1dfddeb801d ChangeLog
--- a/ChangeLog	Mon Oct 21 13:19:26 2013 +0200
+++ b/ChangeLog	Tue Oct 22 11:46:27 2013 +0200
@@ -1,3 +1,12 @@
+2013-10-22  Jiri Vanek  <jvanek at redhat.com>
+
+	More synchronized error/debug methods
+	* plugin/icedteanp/IcedTeaNPPlugin.cc: all occurrences of  PLUGIN_ERROR_TWO
+	and  PLUGIN_ERROR_THREE replaced by PLUGIN_ERROR.  PLUGIN_ERROR itself moved 
+	to 
+	* plugin/icedteanp/IcedTeaPluginUtils.h: (PLUGIN_ERROR) new fuction, 
+	now uses ... arguments and printf with __VA_ARGS__ instead of g_printerr
+
 2013-10-21  Jiri Vanek  <jvanek at redhat.com>
 
 	Logic to extract main class attribute generalized to common methods.
diff -r eafa63cec4ca -r e1dfddeb801d plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Mon Oct 21 13:19:26 2013 +0200
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Tue Oct 22 11:46:27 2013 +0200
@@ -56,19 +56,6 @@
 #include "IcedTeaNPPlugin.h"
 
 
-// Error reporting macros.
-#define PLUGIN_ERROR(message)                                       \
-  g_printerr ("%s:%d: thread %p: Error: %s\n", __FILE__, __LINE__,  \
-              g_thread_self (), message)
-
-#define PLUGIN_ERROR_TWO(first, second)                                 \
-  g_printerr ("%s:%d: thread %p: Error: %s: %s\n", __FILE__, __LINE__,  \
-              g_thread_self (), first, second)
-
-#define PLUGIN_ERROR_THREE(first, second, third)                        \
-  g_printerr ("%s:%d: thread %p: Error: %s: %s: %s\n", __FILE__,        \
-              __LINE__, g_thread_self (), first, second, third)
-
 // Plugin information passed to about:plugins.
 #define PLUGIN_FULL_NAME PLUGIN_NAME " (using " PLUGIN_VERSION ")"
 #define PLUGIN_DESC "The <a href=\"" PACKAGE_URL "\">" PLUGIN_NAME "</a> executes Java applets."
@@ -480,7 +467,7 @@
   PLUGIN_DEBUG ("ITNP_New: creating input fifo: %s\n", in_pipe_name);
   if (mkfifo (in_pipe_name, 0600) == -1 && errno != EEXIST)
     {
-      PLUGIN_ERROR_TWO ("Failed to create input pipe", strerror (errno));
+      PLUGIN_ERROR ("Failed to create input pipe", strerror (errno));
       np_error = NPERR_GENERIC_ERROR;
       goto cleanup_in_pipe_name;
     }
@@ -506,7 +493,7 @@
   PLUGIN_DEBUG ("ITNP_New: creating output fifo: %s\n", out_pipe_name);
   if (mkfifo (out_pipe_name, 0600) == -1 && errno != EEXIST)
     {
-      PLUGIN_ERROR_TWO ("Failed to create output pipe", strerror (errno));
+      PLUGIN_ERROR ("Failed to create output pipe", strerror (errno));
       np_error = NPERR_GENERIC_ERROR;
       goto cleanup_out_pipe_name;
     }
@@ -528,7 +515,7 @@
     {
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO ("Failed to create output channel",
+          PLUGIN_ERROR ("Failed to create output channel",
                             channel_error->message);
           g_error_free (channel_error);
           channel_error = NULL;
@@ -555,7 +542,7 @@
     {
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO ("Failed to create input channel",
+          PLUGIN_ERROR ("Failed to create input channel",
                             channel_error->message);
           g_error_free (channel_error);
           channel_error = NULL;
@@ -1020,7 +1007,7 @@
         {
           if (channel_error)
             {
-              PLUGIN_ERROR_TWO ("Failed to read line from input channel",
+              PLUGIN_ERROR ("Failed to read line from input channel",
                                 channel_error->message);
               g_error_free (channel_error);
               channel_error = NULL;
@@ -1359,7 +1346,7 @@
     {
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO ("Failed to spawn applet viewer",
+          PLUGIN_ERROR ("Failed to spawn applet viewer",
                             channel_error->message);
           g_error_free (channel_error);
           channel_error = NULL;
@@ -1439,7 +1426,7 @@
     {
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO ("Failed to spawn applet viewer",
+          PLUGIN_ERROR ("Failed to spawn applet viewer",
                             channel_error->message);
           g_error_free (channel_error);
           channel_error = NULL;
@@ -1570,7 +1557,7 @@
         {
           if (channel_error)
             {
-              PLUGIN_ERROR_TWO ("Failed to write bytes to output channel",
+              PLUGIN_ERROR ("Failed to write bytes to output channel",
                                 channel_error->message);
               g_error_free (channel_error);
               channel_error = NULL;
@@ -1584,7 +1571,7 @@
         {
           if (channel_error)
             {
-              PLUGIN_ERROR_TWO ("Failed to flush bytes to output channel",
+              PLUGIN_ERROR ("Failed to flush bytes to output channel",
                                 channel_error->message);
               g_error_free (channel_error);
               channel_error = NULL;
@@ -1651,7 +1638,7 @@
             {
               if (channel_error)
                 {
-                  PLUGIN_ERROR_TWO ("Failed to write shutdown message to"
+                  PLUGIN_ERROR ("Failed to write shutdown message to"
                                     " appletviewer", channel_error->message);
                   g_error_free (channel_error);
                   channel_error = NULL;
@@ -1665,7 +1652,7 @@
             {
               if (channel_error)
                 {
-                  PLUGIN_ERROR_TWO ("Failed to write shutdown message to"
+                  PLUGIN_ERROR ("Failed to write shutdown message to"
                                     " appletviewer", channel_error->message);
                   g_error_free (channel_error);
                   channel_error = NULL;
@@ -1680,7 +1667,7 @@
             {
               if (channel_error)
                 {
-                  PLUGIN_ERROR_TWO ("Failed to shut down appletviewer"
+                  PLUGIN_ERROR ("Failed to shut down appletviewer"
                                     " output channel", channel_error->message);
                   g_error_free (channel_error);
                   channel_error = NULL;
@@ -1698,7 +1685,7 @@
             {
               if (channel_error)
                 {
-                  PLUGIN_ERROR_TWO ("Failed to shut down appletviewer"
+                  PLUGIN_ERROR ("Failed to shut down appletviewer"
                                     " input channel", channel_error->message);
                   g_error_free (channel_error);
                   channel_error = NULL;
@@ -1929,7 +1916,7 @@
       file_error = g_mkdir (data_directory.c_str(), 0700);
       if (file_error != 0)
         {
-          PLUGIN_ERROR_THREE ("Failed to create data directory",
+          PLUGIN_ERROR ("Failed to create data directory",
                           data_directory.c_str(),
                           strerror (errno));
           return NPERR_GENERIC_ERROR;
@@ -1941,7 +1928,7 @@
   if (!g_file_test (data_directory.c_str(),
                     (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
     {
-      PLUGIN_ERROR_THREE ("Temp directory does not exist: ",
+      PLUGIN_ERROR ("Temp directory does not exist: ",
                           data_directory.c_str(),
                           strerror (errno));
       return NPERR_GENERIC_ERROR;
diff -r eafa63cec4ca -r e1dfddeb801d plugin/icedteanp/IcedTeaPluginUtils.h
--- a/plugin/icedteanp/IcedTeaPluginUtils.h	Mon Oct 21 13:19:26 2013 +0200
+++ b/plugin/icedteanp/IcedTeaPluginUtils.h	Tue Oct 22 11:46:27 2013 +0200
@@ -59,15 +59,24 @@
 #include <glib.h>
 #include <npruntime.h>
 
-#define PLUGIN_DEBUG(...) \
+#define PLUGIN_DEBUG(...)                                      \
+  do                                                           \
+  {                                                            \
+    if (plugin_debug)                                          \
+    {                                                          \
+      fprintf (stderr, "ITNPP Thread# %ld: ", pthread_self()); \
+      fprintf (stderr, __VA_ARGS__);                           \
+    }                                                          \
+  } while (0)
+  
+  // Error reporting macros.
+#define PLUGIN_ERROR(...)                                   \
   do                                                          \
-  {                                                           \
-    if (plugin_debug)                                         \
-    {                                                         \
-      fprintf (stderr, "ITNPP Thread# %ld: ", pthread_self()); \
-      fprintf (stderr, __VA_ARGS__);                          \
-    }                                                         \
-  } while (0)
+  {                                                         \
+        fprintf  (stderr, "%s:%d: thread %p: Error: %s\n",  \
+               __FILE__, __LINE__,                          \
+              g_thread_self (), __VA_ARGS__);               \
+   } while (0)
 
 #define CHECK_JAVA_RESULT(result_data)                               \
 {                                                                    \

From jvanek at icedtea.classpath.org  Tue Oct 22 02:42:28 2013
From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org)
Date: Tue, 22 Oct 2013 09:42:28 +0000
Subject: /hg/icedtea-web: More synchronized error/debug methods
Message-ID: <hg.c91a4eb28c97.1382434948.8643924302249223276@icedtea.classpath.org>

changeset c91a4eb28c97 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c91a4eb28c97
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Oct 22 11:48:27 2013 +0200

	More synchronized error/debug methods
	* plugin/icedteanp/IcedTeaNPPlugin.cc: all occurrences of  PLUGIN_ERROR_TWO and  PLUGIN_ERROR_THREE replaced by PLUGIN_ERROR.  PLUGIN_ERROR itself moved to
	* plugin/icedteanp/IcedTeaPluginUtils.h: (PLUGIN_ERROR) new fuction, now uses ... arguments and printf with __VA_ARGS__ instead of g_printerr (PLUGIN_DEBUG) now prints to stdout, instead of stderr which is used by (PLUGIN_ERROR).


diffstat:

 ChangeLog                             |  11 ++++++++
 plugin/icedteanp/IcedTeaNPPlugin.cc   |  43 ++++++++++++----------------------
 plugin/icedteanp/IcedTeaPluginUtils.h |  25 +++++++++++++------
 3 files changed, 43 insertions(+), 36 deletions(-)

diffs (212 lines):

diff -r ac458de35801 -r c91a4eb28c97 ChangeLog
--- a/ChangeLog	Mon Oct 21 13:19:10 2013 +0200
+++ b/ChangeLog	Tue Oct 22 11:48:27 2013 +0200
@@ -1,3 +1,14 @@
+2013-10-22  Jiri Vanek  <jvanek at redhat.com>
+
+	More synchronized error/debug methods
+	* plugin/icedteanp/IcedTeaNPPlugin.cc: all occurrences of  PLUGIN_ERROR_TWO
+	and  PLUGIN_ERROR_THREE replaced by PLUGIN_ERROR.  PLUGIN_ERROR itself moved 
+	to 
+	* plugin/icedteanp/IcedTeaPluginUtils.h: (PLUGIN_ERROR) new fuction, 
+	now uses ... arguments and printf with __VA_ARGS__ instead of g_printerr
+	(PLUGIN_DEBUG) now prints to stdout, instead of stderr which is used by
+	(PLUGIN_ERROR).
+
 2013-10-21  Jiri Vanek  <jvanek at redhat.com>
 
 	Logic to extract main class attribute generalized to common methods.
diff -r ac458de35801 -r c91a4eb28c97 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Mon Oct 21 13:19:10 2013 +0200
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Tue Oct 22 11:48:27 2013 +0200
@@ -57,19 +57,6 @@
 #include "IcedTeaNPPlugin.h"
 
 
-// Error reporting macros.
-#define PLUGIN_ERROR(message)                                       \
-  g_printerr ("%s:%d: thread %p: Error: %s\n", __FILE__, __LINE__,  \
-              g_thread_self (), message)
-
-#define PLUGIN_ERROR_TWO(first, second)                                 \
-  g_printerr ("%s:%d: thread %p: Error: %s: %s\n", __FILE__, __LINE__,  \
-              g_thread_self (), first, second)
-
-#define PLUGIN_ERROR_THREE(first, second, third)                        \
-  g_printerr ("%s:%d: thread %p: Error: %s: %s: %s\n", __FILE__,        \
-              __LINE__, g_thread_self (), first, second, third)
-
 // Plugin information passed to about:plugins.
 #define PLUGIN_FULL_NAME PLUGIN_NAME " (using " PLUGIN_VERSION ")"
 #define PLUGIN_DESC "The <a href=\"" PACKAGE_URL "\">" PLUGIN_NAME "</a> executes Java applets."
@@ -460,7 +447,7 @@
   PLUGIN_DEBUG ("ITNP_New: creating input fifo: %s\n", in_pipe_name);
   if (mkfifo (in_pipe_name, 0600) == -1 && errno != EEXIST)
     {
-      PLUGIN_ERROR_TWO ("Failed to create input pipe", strerror (errno));
+      PLUGIN_ERROR ("Failed to create input pipe", strerror (errno));
       np_error = NPERR_GENERIC_ERROR;
       goto cleanup_in_pipe_name;
     }
@@ -486,7 +473,7 @@
   PLUGIN_DEBUG ("ITNP_New: creating output fifo: %s\n", out_pipe_name);
   if (mkfifo (out_pipe_name, 0600) == -1 && errno != EEXIST)
     {
-      PLUGIN_ERROR_TWO ("Failed to create output pipe", strerror (errno));
+      PLUGIN_ERROR ("Failed to create output pipe", strerror (errno));
       np_error = NPERR_GENERIC_ERROR;
       goto cleanup_out_pipe_name;
     }
@@ -508,7 +495,7 @@
     {
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO ("Failed to create output channel",
+          PLUGIN_ERROR ("Failed to create output channel",
                             channel_error->message);
           g_error_free (channel_error);
           channel_error = NULL;
@@ -535,7 +522,7 @@
     {
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO ("Failed to create input channel",
+          PLUGIN_ERROR ("Failed to create input channel",
                             channel_error->message);
           g_error_free (channel_error);
           channel_error = NULL;
@@ -998,7 +985,7 @@
         {
           if (channel_error)
             {
-              PLUGIN_ERROR_TWO ("Failed to read line from input channel",
+              PLUGIN_ERROR ("Failed to read line from input channel",
                                 channel_error->message);
               g_error_free (channel_error);
               channel_error = NULL;
@@ -1337,7 +1324,7 @@
     {
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO ("Failed to spawn applet viewer",
+          PLUGIN_ERROR ("Failed to spawn applet viewer",
                             channel_error->message);
           g_error_free (channel_error);
           channel_error = NULL;
@@ -1417,7 +1404,7 @@
     {
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO ("Failed to spawn applet viewer",
+          PLUGIN_ERROR ("Failed to spawn applet viewer",
                             channel_error->message);
           g_error_free (channel_error);
           channel_error = NULL;
@@ -1548,7 +1535,7 @@
         {
           if (channel_error)
             {
-              PLUGIN_ERROR_TWO ("Failed to write bytes to output channel",
+              PLUGIN_ERROR ("Failed to write bytes to output channel",
                                 channel_error->message);
               g_error_free (channel_error);
               channel_error = NULL;
@@ -1562,7 +1549,7 @@
         {
           if (channel_error)
             {
-              PLUGIN_ERROR_TWO ("Failed to flush bytes to output channel",
+              PLUGIN_ERROR ("Failed to flush bytes to output channel",
                                 channel_error->message);
               g_error_free (channel_error);
               channel_error = NULL;
@@ -1629,7 +1616,7 @@
             {
               if (channel_error)
                 {
-                  PLUGIN_ERROR_TWO ("Failed to write shutdown message to"
+                  PLUGIN_ERROR ("Failed to write shutdown message to"
                                     " appletviewer", channel_error->message);
                   g_error_free (channel_error);
                   channel_error = NULL;
@@ -1643,7 +1630,7 @@
             {
               if (channel_error)
                 {
-                  PLUGIN_ERROR_TWO ("Failed to write shutdown message to"
+                  PLUGIN_ERROR ("Failed to write shutdown message to"
                                     " appletviewer", channel_error->message);
                   g_error_free (channel_error);
                   channel_error = NULL;
@@ -1658,7 +1645,7 @@
             {
               if (channel_error)
                 {
-                  PLUGIN_ERROR_TWO ("Failed to shut down appletviewer"
+                  PLUGIN_ERROR ("Failed to shut down appletviewer"
                                     " output channel", channel_error->message);
                   g_error_free (channel_error);
                   channel_error = NULL;
@@ -1676,7 +1663,7 @@
             {
               if (channel_error)
                 {
-                  PLUGIN_ERROR_TWO ("Failed to shut down appletviewer"
+                  PLUGIN_ERROR ("Failed to shut down appletviewer"
                                     " input channel", channel_error->message);
                   g_error_free (channel_error);
                   channel_error = NULL;
@@ -1820,7 +1807,7 @@
     file_error = g_mkdir (data_directory.c_str(), 0700);
     if (file_error != 0)
     {
-      PLUGIN_ERROR_THREE ("Failed to create data directory",
+      PLUGIN_ERROR ("Failed to create data directory",
                           data_directory.c_str(),
                           strerror (errno));
       return NPERR_GENERIC_ERROR;
@@ -1832,7 +1819,7 @@
   if (!g_file_test (data_directory.c_str(),
                     (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
   {
-    PLUGIN_ERROR_THREE ("Temp directory does not exist: ",
+    PLUGIN_ERROR ("Temp directory does not exist: ",
                         data_directory.c_str(),
                         strerror (errno));
     return NPERR_GENERIC_ERROR;
diff -r ac458de35801 -r c91a4eb28c97 plugin/icedteanp/IcedTeaPluginUtils.h
--- a/plugin/icedteanp/IcedTeaPluginUtils.h	Mon Oct 21 13:19:10 2013 +0200
+++ b/plugin/icedteanp/IcedTeaPluginUtils.h	Tue Oct 22 11:48:27 2013 +0200
@@ -59,15 +59,24 @@
 #include <glib.h>
 #include <npruntime.h>
 
-#define PLUGIN_DEBUG(...) \
-  do                                                          \
-  {                                                           \
-    if (plugin_debug)                                         \
-    {                                                         \
-      fprintf (stderr, "ITNPP Thread# %ld: ", pthread_self()); \
-      fprintf (stderr, __VA_ARGS__);                          \
-    }                                                         \
+#define PLUGIN_DEBUG(...)                                      \
+  do                                                           \
+  {                                                            \
+    if (plugin_debug)                                          \
+    {                                                          \
+      fprintf (stdout, "ITNPP Thread# %ld: ", pthread_self()); \
+      fprintf (stdout, __VA_ARGS__);                           \
+    }                                                          \
   } while (0)
+  
+  // Error reporting macros.
+#define PLUGIN_ERROR(...)                                   \
+do                                                          \
+  {                                                         \
+        fprintf  (stderr, "%s:%d: thread %p: Error: %s\n",  \
+               __FILE__, __LINE__,                          \
+              g_thread_self (), __VA_ARGS__);               \
+   } while (0)
 
 #define CHECK_JAVA_RESULT(result_data)                               \
 {                                                                    \

From omajid at redhat.com  Tue Oct 22 06:42:13 2013
From: omajid at redhat.com (Omair Majid)
Date: Tue, 22 Oct 2013 09:42:13 -0400
Subject: [rfc][icedtea-web] refactored logging
In-Reply-To: <52662D4C.6070606@redhat.com>
References: <522F7EDF.5070407@redhat.com> <52461A5B.8070800@redhat.com>
	<52611129.5070707@redhat.com> <20131018202607.GB14560@redhat.com>
	<52653222.30702@redhat.com> <20131021224251.GB1526@redhat.com>
	<52662D4C.6070606@redhat.com>
Message-ID: <20131022134213.GA1536@redhat.com>

* Jiri Vanek <jvanek at redhat.com> [2013-10-22 03:40]:
> On 10/22/2013 12:42 AM, Omair Majid wrote:
> >It's a bad test. It modifies the global logging configuration and does
> >not restore the original. The modified logging configuration is not
> >visible on all machines because the order in which junit runs the test
> >is not guaranteed; sometimes a later tests modifies the configuration to
> >something which happens to be the default configuration.
> >
> >Does the attached patch look okay?
> 
> I would vote for backuping whole  LogConfig instead of individual
> fields, but do as you wish. Thanx for catching it.

Okay, how about the following?

Thanks,
Omair
-------------- next part --------------
diff --git a/netx/net/sourceforge/jnlp/util/logging/LogConfig.java b/netx/net/sourceforge/jnlp/util/logging/LogConfig.java
--- a/netx/net/sourceforge/jnlp/util/logging/LogConfig.java
+++ b/netx/net/sourceforge/jnlp/util/logging/LogConfig.java
@@ -98,6 +98,13 @@
         return logConfig;
     }
 
+    /** For testing only: throw away the previous config */
+    static void resetLogConfig() {
+        if (logConfig != null) {
+            logConfig = new LogConfig();
+        }
+    }
+
     public String getIcedteaLogDir() {
         return icedteaLogDir;
     }
diff --git a/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java b/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java
+++ b/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java
@@ -43,6 +43,8 @@
 import net.sourceforge.jnlp.closinglisteners.RulesFolowingClosingListener;
 import net.sourceforge.jnlp.util.StreamUtils;
 import org.junit.Assert;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OutputControllerTest {
@@ -71,6 +73,16 @@
         }
     }
 
+    @Before
+    public void setUp() {
+        LogConfig.resetLogConfig();
+    }
+
+    @After
+    public void tearDown() {
+        LogConfig.resetLogConfig();
+    }
+
     @Test
     public void isLoggingStdStreams() throws Exception {
         ByteArrayOutputStream os1 = new ByteArrayOutputStream();

From jvanek at redhat.com  Tue Oct 22 07:05:02 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Tue, 22 Oct 2013 16:05:02 +0200
Subject: [rfc][icedtea-web] refactored logging
In-Reply-To: <20131022134213.GA1536@redhat.com>
References: <522F7EDF.5070407@redhat.com> <52461A5B.8070800@redhat.com>
	<52611129.5070707@redhat.com>
	<20131018202607.GB14560@redhat.com> <52653222.30702@redhat.com>
	<20131021224251.GB1526@redhat.com> <52662D4C.6070606@redhat.com>
	<20131022134213.GA1536@redhat.com>
Message-ID: <5266860E.2040408@redhat.com>

On 10/22/2013 03:42 PM, Omair Majid wrote:
> * Jiri Vanek<jvanek at redhat.com>  [2013-10-22 03:40]:
>> >  On 10/22/2013 12:42 AM, Omair Majid wrote:
>>> >  >It's a bad test. It modifies the global logging configuration and does
>>> >  >not restore the original. The modified logging configuration is not
>>> >  >visible on all machines because the order in which junit runs the test
>>> >  >is not guaranteed; sometimes a later tests modifies the configuration to
>>> >  >something which happens to be the default configuration.
>>> >  >
>>> >  >Does the attached patch look okay?
>> >
>> >  I would vote for backuping whole  LogConfig instead of individual
>> >  fields, but do as you wish. Thanx for catching it.
> Okay, how about the following?
>
> Thanks,
> Omair
>
>
> fix-log-configuration-unit-tests-02.patch
>
>
> diff --git a/netx/net/sourceforge/jnlp/util/logging/LogConfig.java b/netx/net/sourceforge/jnlp/util/logging/LogConfig.java
> --- a/netx/net/sourceforge/jnlp/util/logging/LogConfig.java
> +++ b/netx/net/sourceforge/jnlp/util/logging/LogConfig.java
> @@ -98,6 +98,13 @@
>           return logConfig;
>       }
>
Well, much better :) But, isn't set/get much more common?

Again, do as you wish :) I'm ok with all three variants.

> +    /** For testing only: throw away the previous config */
> +    static void resetLogConfig() {
> +        if (logConfig != null) {
> +            logConfig = new LogConfig();
> +        }
> +    }
> +
>       public String getIcedteaLogDir() {
>           return icedteaLogDir;
>       }
> diff --git a/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java b/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java
> --- a/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java
> +++ b/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java
> @@ -43,6 +43,8 @@
>   import net.sourceforge.jnlp.closinglisteners.RulesFolowingClosingListener;
>   import net.sourceforge.jnlp.util.StreamUtils;
>   import org.junit.Assert;
> +import org.junit.After;
> +import org.junit.Before;
>   import org.junit.Test;
>
>   public class OutputControllerTest {
> @@ -71,6 +73,16 @@
>           }
>       }
>
> +    @Before
> +    public void setUp() {
> +        LogConfig.resetLogConfig();
> +    }
> +
> +    @After
> +    public void tearDown() {
> +        LogConfig.resetLogConfig();
> +    }
> +
>       @Test
>       public void isLoggingStdStreams() throws Exception {
>           ByteArrayOutputStream os1 = new ByteArrayOutputStream();


From omajid at redhat.com  Tue Oct 22 07:06:23 2013
From: omajid at redhat.com (Omair Majid)
Date: Tue, 22 Oct 2013 10:06:23 -0400
Subject: [rfc][icedtea-web] refactored logging
In-Reply-To: <5266860E.2040408@redhat.com>
References: <522F7EDF.5070407@redhat.com> <52461A5B.8070800@redhat.com>
	<52611129.5070707@redhat.com> <20131018202607.GB14560@redhat.com>
	<52653222.30702@redhat.com> <20131021224251.GB1526@redhat.com>
	<52662D4C.6070606@redhat.com> <20131022134213.GA1536@redhat.com>
	<5266860E.2040408@redhat.com>
Message-ID: <20131022140623.GB1536@redhat.com>

* Jiri Vanek <jvanek at redhat.com> [2013-10-22 09:58]:
> On 10/22/2013 03:42 PM, Omair Majid wrote:
> >+    /** For testing only: throw away the previous config */
> >+    static void resetLogConfig() {
> >+        if (logConfig != null) {
> >+            logConfig = new LogConfig();
> >+        }
> >+    }
> >+
> >      public String getIcedteaLogDir() {
> >          return icedteaLogDir;
>
> Well, much better :) But, isn't set/get much more common?

It probably is. But I don't think it makes sense here. We don't want to
allow general code to set a new LogConfig, do we? It's only for tests.
And when I look at the tests, the only thing they care about is
resetting it to the default value.

Do you expect any code to ever subclass a LogConfig and use that?
setLogConfig may be worth having in that case. Otherwise, you can just
call set* on individual settings of a LogConfig.

> Again, do as you wish :) I'm ok with all three variants.

Okay, I will push this patch shortly (unless you (or anyone else) have
any concerns).

Cheers,
Omair

From bugzilla-daemon at icedtea.classpath.org  Tue Oct 22 07:06:53 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 22 Oct 2013 14:06:53 +0000
Subject: [Bug 900] Fatal: Application Error: Unknown Main-Class. Could not
	determine the main class for this application.
In-Reply-To: <bug-900-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-900-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-900-30-pVu22TB89T@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=900

Andrew Azores <aazores at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |aazores at redhat.com

--- Comment #3 from Andrew Azores <aazores at redhat.com> ---
I'm unable to reproduce this with 1.4.1. Launching the JNLP file results in a
"BT747 Application V2.X.1975" window opening up and appearing to run properly.
Is there anything in particular that needs to be done to recreate this error?

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131022/f6fcdb90/attachment-0001.html 

From jvanek at redhat.com  Tue Oct 22 07:49:14 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Tue, 22 Oct 2013 16:49:14 +0200
Subject: [rfc][icedtea-web] refactored logging
In-Reply-To: <20131022140623.GB1536@redhat.com>
References: <522F7EDF.5070407@redhat.com> <52461A5B.8070800@redhat.com>
	<52611129.5070707@redhat.com>
	<20131018202607.GB14560@redhat.com> <52653222.30702@redhat.com>
	<20131021224251.GB1526@redhat.com> <52662D4C.6070606@redhat.com>
	<20131022134213.GA1536@redhat.com> <5266860E.2040408@redhat.com>
	<20131022140623.GB1536@redhat.com>
Message-ID: <5266906A.5060403@redhat.com>

On 10/22/2013 04:06 PM, Omair Majid wrote:
> * Jiri Vanek<jvanek at redhat.com>  [2013-10-22 09:58]:
>> On 10/22/2013 03:42 PM, Omair Majid wrote:
>>> +    /** For testing only: throw away the previous config */
>>> +    static void resetLogConfig() {
>>> +        if (logConfig != null) {
>>> +            logConfig = new LogConfig();
>>> +        }
>>> +    }
>>> +
>>>       public String getIcedteaLogDir() {
>>>           return icedteaLogDir;
>>
>> Well, much better :) But, isn't set/get much more common?
>
> It probably is. But I don't think it makes sense here. We don't want to
> allow general code to set a new LogConfig, do we?
no - for this, the package private or reflection should be enough.

It's only for tests.
> And when I look at the tests, the only thing they care about is
> resetting it to the default value.

Yes, thats what I'm worying a bit. That you do not do do backup, restore, but just reset. However it should be ok here..
>
> Do you expect any code to ever subclass a LogConfig and use that?
> setLogConfig may be worth having in that case. Otherwise, you can just
> call set* on individual settings of a LogConfig.
>
>> Again, do as you wish :) I'm ok with all three variants.
>
> Okay, I will push this patch shortly (unless you (or anyone else) have
> any concerns).
>
> Cheers,
> Omair


From omajid at redhat.com  Tue Oct 22 07:50:39 2013
From: omajid at redhat.com (Omair Majid)
Date: Tue, 22 Oct 2013 10:50:39 -0400
Subject: [rfc][icedtea-web] refactored logging
In-Reply-To: <5266906A.5060403@redhat.com>
References: <52461A5B.8070800@redhat.com> <52611129.5070707@redhat.com>
	<20131018202607.GB14560@redhat.com> <52653222.30702@redhat.com>
	<20131021224251.GB1526@redhat.com> <52662D4C.6070606@redhat.com>
	<20131022134213.GA1536@redhat.com> <5266860E.2040408@redhat.com>
	<20131022140623.GB1536@redhat.com> <5266906A.5060403@redhat.com>
Message-ID: <20131022145039.GB3306@redhat.com>

* Jiri Vanek <jvanek at redhat.com> [2013-10-22 10:43]:
> On 10/22/2013 04:06 PM, Omair Majid wrote:
> >And when I look at the tests, the only thing they care about is
> >resetting it to the default value.
> 
> Yes, thats what I'm worying a bit. That you do not do do backup,
> restore, but just reset. However it should be ok here..

I am not sure I follow. The test wants to start off with a clean state,
right? So resetting to the default makes sense. Doing a backup would
make more sense if some tests rely on the modified value of LogConfig.
But that's the opposite of each unit test being self contained and only
testing a 'unit' of the system. I think any test that relies on some
other test to change the logging config (and not explicitly set it) is
broken.

So, can you explain under what conditions doing a backup/reset would be
better?

Cheers,
Omair

From andrew at icedtea.classpath.org  Tue Oct 22 08:39:45 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 22 Oct 2013 15:39:45 +0000
Subject: /hg/release/icedtea7-forest-2.3/jaxp: Resolve differences betwee...
Message-ID: <hg.190a4ffa6a95.1382456385.-8576357044606977631@icedtea.classpath.org>

changeset 190a4ffa6a95 in /hg/release/icedtea7-forest-2.3/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp?cmd=changeset;node=190a4ffa6a95
author: andrew
date: Mon Oct 21 16:53:24 2013 +0100

	Resolve differences between this version and 2.4's


diffstat:

 src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java                                |   38 +-
 src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java                   |   20 +-
 src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java                               |    7 +
 src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java                    |    8 +-
 src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java                           |   14 +-
 src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java                          |    1 +
 src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java                                 |   29 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java                  |    3 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java                   |   19 +-
 src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java |   12 +-
 src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java                                  |   29 +
 src/com/sun/org/apache/xerces/internal/util/SecurityManager.java                               |  215 ++++++++++
 12 files changed, 353 insertions(+), 42 deletions(-)

diffs (truncated from 590 to 500 lines):

diff -r d186d96b9af8 -r 190a4ffa6a95 src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java	Wed Jul 24 15:21:29 2013 +0400
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java	Mon Oct 21 16:53:24 2013 +0100
@@ -172,6 +172,25 @@
     }
 
     /**
+     * Return allowed protocols for accessing external stylesheet.
+     */
+    public Object getProperty(String name) {
+        if (name.equals(XalanConstants.SECURITY_MANAGER)) {
+            return _xmlSecurityManager;
+        }
+        return null;
+    }
+
+    /**
+     * Set allowed protocols for accessing external stylesheet.
+     */
+    public void setProperty(String name, Object value) {
+        if (name.equals(XalanConstants.SECURITY_MANAGER)) {
+            _xmlSecurityManager = (XMLSecurityManager)value;
+        }
+    }
+
+    /**
      * Only for user by the internal TrAX implementation.
      */
     public Parser getParser() {
@@ -922,23 +941,4 @@
         return newDataOffset;
     }
 
-     /**
-      * Return allowed protocols for accessing external stylesheet.
-      */
-    public Object getProperty(String name) {
-        if (name.equals(XalanConstants.SECURITY_MANAGER)) {
-            return _xmlSecurityManager;
-	}
-	return null;
-    }
-
-    /**
-     * Set allowed protocols for accessing external stylesheet.
-     */
-    public void setProperty(String name, Object value) {
-        if (name.equals(XalanConstants.SECURITY_MANAGER)) {
-            _xmlSecurityManager = (XMLSecurityManager)value;
-	}
-    }
-
 }
diff -r d186d96b9af8 -r 190a4ffa6a95 src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java	Wed Jul 24 15:21:29 2013 +0400
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java	Mon Oct 21 16:53:24 2013 +0100
@@ -310,6 +310,13 @@
             return _xmlSecurityManager;
         }
 
+        /** Check to see if the property is managed by the security manager **/
+        String propertyValue = (_xmlSecurityManager != null) ?
+                _xmlSecurityManager.getLimitAsString(name) : null;
+        if (propertyValue != null) {
+            return propertyValue;
+	}
+
         // Throw an exception for all other attributes
         ErrorMsg err = new ErrorMsg(ErrorMsg.JAXP_INVALID_ATTR_ERR, name);
         throw new IllegalArgumentException(err.toString());
@@ -410,6 +417,11 @@
             }
         }
 
+        if (_xmlSecurityManager != null &&
+                _xmlSecurityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, value)) {
+            return;
+        }
+
         // Throw an exception for all other attributes
         final ErrorMsg err
             = new ErrorMsg(ErrorMsg.JAXP_INVALID_ATTR_ERR, name);
@@ -898,7 +910,13 @@
         } else {
             err = new ErrorMsg(ErrorMsg.JAXP_COMPILE_ERR);
         }
-        TransformerConfigurationException exc =  new TransformerConfigurationException(err.toString(), err.getCause());
+        Throwable cause = err.getCause();
+        TransformerConfigurationException exc;
+        if (cause != null) {
+            exc =  new TransformerConfigurationException(cause.getMessage(), cause);
+        } else {
+            exc =  new TransformerConfigurationException(err.toString());
+        }
 
         // Pass compiler errors to the error listener
         if (_errorListener != null) {
diff -r d186d96b9af8 -r 190a4ffa6a95 src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
--- a/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java	Wed Jul 24 15:21:29 2013 +0400
+++ b/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java	Mon Oct 21 16:53:24 2013 +0100
@@ -179,6 +179,13 @@
             return;
         }
 
+        //check if the property is managed by security manager
+        if (fSecurityManager == null ||
+                !fSecurityManager.setLimit(property, XMLSecurityManager.State.APIPROPERTY, value)) {
+	    //fall back to the existing property manager
+	    supportedProps.put(property, value);
+        }
+
         supportedProps.put(property, value ) ;
         if(equivalentProperty != null){
             supportedProps.put(equivalentProperty, value ) ;
diff -r d186d96b9af8 -r 190a4ffa6a95 src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java
--- a/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java	Wed Jul 24 15:21:29 2013 +0400
+++ b/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java	Mon Oct 21 16:53:24 2013 +0100
@@ -191,6 +191,9 @@
 
     public void setFeature(String name, boolean value)
         throws ParserConfigurationException {
+        if (features == null) {
+            features = new Hashtable();
+        }
         // If this is the secure processing feature, save it then return.
         if (name.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
             if (System.getSecurityManager() != null && (!value)) {
@@ -199,11 +202,10 @@
                         "jaxp-secureprocessing-feature", null));
             }
             fSecureProcess = value;
+            features.put(name, value ? Boolean.TRUE : Boolean.FALSE);
             return;
         }
-        if (features == null) {
-            features = new Hashtable();
-        }
+
         features.put(name, value ? Boolean.TRUE : Boolean.FALSE);
         // Test the feature by possibly throwing SAX exceptions
         try {
diff -r d186d96b9af8 -r 190a4ffa6a95 src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
--- a/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java	Wed Jul 24 15:21:29 2013 +0400
+++ b/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java	Mon Oct 21 16:53:24 2013 +0100
@@ -264,12 +264,16 @@
                                                 }
                                         }
                 } else {
-                    // Let Xerces code handle the property
-                    domParser.setProperty(name, val);
-                                }
-                        }
-                }
+                    //check if the property is managed by security manager
+                    if (fSecurityManager == null ||
+                            !fSecurityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, val)) {
+                            //fall back to the existing property manager
+                            domParser.setProperty(name, val);
+		    }
+		}
+	    }
         }
+    }
 
     /**
      * Non-preferred: use the getDOMImplementation() method instead of this
diff -r d186d96b9af8 -r 190a4ffa6a95 src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java
--- a/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java	Wed Jul 24 15:21:29 2013 +0400
+++ b/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java	Mon Oct 21 16:53:24 2013 +0100
@@ -124,6 +124,7 @@
                         "jaxp-secureprocessing-feature", null));
             }
             fSecureProcess = value;
+            putInFeatures(name, value);
             return;
         }
 
diff -r d186d96b9af8 -r 190a4ffa6a95 src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
--- a/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java	Wed Jul 24 15:21:29 2013 +0400
+++ b/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java	Mon Oct 21 16:53:24 2013 +0100
@@ -386,8 +386,10 @@
                 fSecurityManager = new XMLSecurityManager(true);
                 try {
                     super.setProperty(SECURITY_MANAGER, fSecurityManager);
-                } catch (Exception ex) {
-                    //shall not happen
+                } catch (SAXException e) {
+                    throw new UnsupportedOperationException(
+                        SAXMessageFormatter.formatMessage(fConfiguration.getLocale(),
+                        "property-not-recognized", new Object [] {SECURITY_MANAGER}), e);
                 }
             }
         }
@@ -517,14 +519,21 @@
                     return;
                 }
             }
-            if (!fInitProperties.containsKey(name)) {
-                fInitProperties.put(name, super.getProperty(name));
-            }
             /** Forward property to the schema validator if there is one. **/
             if (fSAXParser != null && fSAXParser.fSchemaValidator != null) {
                 setSchemaValidatorProperty(name, value);
             }
-            super.setProperty(name, value);
+
+            //check if the property is managed by security manager
+            if (fSecurityManager == null ||
+                    !fSecurityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, value)) {
+		//fall back to the existing property manager
+		if (!fInitProperties.containsKey(name)) {
+		    fInitProperties.put(name, super.getProperty(name));
+		}
+		super.setProperty(name, value);
+	    }
+
         }
 
         public synchronized Object getProperty(String name)
@@ -537,6 +546,14 @@
                 // JAXP 1.2 support
                 return fSAXParser.schemaLanguage;
             }
+
+            /** Check to see if the property is managed by the security manager **/
+            String propertyValue = (fSecurityManager != null) ?
+                    fSecurityManager.getLimitAsString(name) : null;
+            if (propertyValue != null) {
+                return propertyValue;
+	    }
+
             return super.getProperty(name);
         }
 
diff -r d186d96b9af8 -r 190a4ffa6a95 src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java
--- a/src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java	Wed Jul 24 15:21:29 2013 +0400
+++ b/src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java	Mon Oct 21 16:53:24 2013 +0100
@@ -86,8 +86,7 @@
     /*
      * Other methods
      */
-
-    final void setFeature(String featureId, boolean state) {
+    public final void setFeature(String featureId, boolean state) {
         fFeatures.put(featureId, state ? Boolean.TRUE : Boolean.FALSE);
     }
 
diff -r d186d96b9af8 -r 190a4ffa6a95 src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
--- a/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Wed Jul 24 15:21:29 2013 +0400
+++ b/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Mon Oct 21 16:53:24 2013 +0100
@@ -266,6 +266,7 @@
         else {
             schema = new EmptyXMLSchema();
         }
+        propagateProperties(schema);
         propagateFeatures(schema);
         return schema;
     }
@@ -274,6 +275,7 @@
         // Use a Schema that uses the system id as the equality source.
         AbstractXMLSchema schema = new WeakReferenceXMLSchema();
         propagateFeatures(schema);
+        propagateProperties(schema);
         return schema;
     }
 
@@ -349,7 +351,6 @@
                         "jaxp-secureprocessing-feature", null));
             }
 
-            fSecurityManager = value ? new XMLSecurityManager() : null;
             fSecurityManager.setSecureProcessing(value);
             fXMLSchemaLoader.setProperty(SECURITY_MANAGER, fSecurityManager);
             return;
@@ -393,7 +394,12 @@
                     "property-not-supported", new Object [] {name}));
         }
         try {
-            fXMLSchemaLoader.setProperty(name, object);
+            //check if the property is managed by security manager
+            if (fSecurityManager == null ||
+                    !fSecurityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, object)) {
+		//fall back to the existing property manager
+		fXMLSchemaLoader.setProperty(name, object);
+	    }
         }
         catch (XMLConfigurationException e) {
             String identifier = e.getIdentifier();
@@ -420,6 +426,15 @@
         }
     }
 
+    private void propagateProperties(AbstractXMLSchema schema) {
+        String[] properties = fXMLSchemaLoader.getRecognizedProperties();
+        for (int i = 0; i < properties.length; ++i) {
+            Object state = fXMLSchemaLoader.getProperty(properties[i]);
+            schema.setProperty(properties[i], state);
+        }
+    }
+
+
     /**
      * Extension of XMLGrammarPoolImpl which exposes the number of
      * grammars stored in the grammar pool.
diff -r d186d96b9af8 -r 190a4ffa6a95 src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
--- a/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java	Wed Jul 24 15:21:29 2013 +0400
+++ b/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java	Mon Oct 21 16:53:24 2013 +0100
@@ -371,11 +371,15 @@
             return;
         }
 
-	//fall back to the existing property manager
-	if (!fInitProperties.containsKey(propertyId)) {
-	    fInitProperties.put(propertyId, super.getProperty(propertyId));
+        //check if the property is managed by security manager
+        if (fInitSecurityManager == null ||
+                !fInitSecurityManager.setLimit(propertyId, XMLSecurityManager.State.APIPROPERTY, value)) {
+	    //fall back to the existing property manager
+	    if (!fInitProperties.containsKey(propertyId)) {
+		fInitProperties.put(propertyId, super.getProperty(propertyId));
+	    }
+	    super.setProperty(propertyId, value);
 	}
-	super.setProperty(propertyId, value);
     }
 
     /**
diff -r d186d96b9af8 -r 190a4ffa6a95 src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
--- a/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java	Wed Jul 24 15:21:29 2013 +0400
+++ b/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java	Mon Oct 21 16:53:24 2013 +0100
@@ -25,6 +25,8 @@
 import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
 import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
 import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
 
 /**
  * This is the main Xerces SAX parser class. It uses the abstract SAX
@@ -122,4 +124,31 @@
 
     } // <init>(SymbolTable,XMLGrammarPool)
 
+    /**
+     * Sets the particular property in the underlying implementation of
+     * org.xml.sax.XMLReader.
+     */
+    public void setProperty(String name, Object value)
+        throws SAXNotRecognizedException, SAXNotSupportedException {
+        /**
+         * It's possible for users to set a security manager through the interface.
+         * If it's the old SecurityManager, convert it to the new XMLSecurityManager
+         */
+        if (name.equals(Constants.SECURITY_MANAGER)) {
+            securityManager = XMLSecurityManager.convert(value, securityManager);
+            super.setProperty(Constants.SECURITY_MANAGER, securityManager);
+            return;
+        }
+
+        if (securityManager == null) {
+            securityManager = new XMLSecurityManager(true);
+            super.setProperty(Constants.SECURITY_MANAGER, securityManager);
+        }
+
+	//check if the property is managed by security manager
+	if (!securityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, value)) {
+	    //fall back to the default configuration to handle the property
+	    super.setProperty(name, value);
+	}
+    }
 } // class SAXParser
diff -r d186d96b9af8 -r 190a4ffa6a95 src/com/sun/org/apache/xerces/internal/util/SecurityManager.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java	Mon Oct 21 16:53:24 2013 +0100
@@ -0,0 +1,215 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * The Apache Software License, Version 1.1
+ *
+ *
+ * Copyright (c) 2003 The Apache Software Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Xerces" and "Apache Software Foundation" must
+ *    not be used to endorse or promote products derived from this
+ *    software without prior written permission. For written
+ *    permission, please contact apache at apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    nor may "Apache" appear in their name, without prior written
+ *    permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation and was
+ * originally based on software copyright (c) 1999, International
+ * Business Machines, Inc., http://www.apache.org.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package com.sun.org.apache.xerces.internal.util;
+import com.sun.org.apache.xerces.internal.impl.Constants;
+/**
+ * This class is a container for parser settings that relate to
+ * security, or more specifically, it is intended to be used to prevent denial-of-service
+ * attacks from being launched against a system running Xerces.
+ * Any component that is aware of a denial-of-service attack that can arise
+ * from its processing of a certain kind of document may query its Component Manager
+ * for the property (http://apache.org/xml/properties/security-manager)
+ * whose value will be an instance of this class.
+ * If no value has been set for the property, the component should proceed in the "usual" (spec-compliant)
+ * manner.  If a value has been set, then it must be the case that the component in
+ * question needs to know what method of this class to query.  This class
+ * will provide defaults for all known security issues, but will also provide
+ * setters so that those values can be tailored by applications that care.
+ *
+ * @author  Neil Graham, IBM
+ *
+ */
+public final class SecurityManager {
+
+    //
+    // Constants
+    //
+
+    // default value for entity expansion limit
+    private final static int DEFAULT_ENTITY_EXPANSION_LIMIT = 64000;
+
+    /** Default value of number of nodes created. **/
+    private final static int DEFAULT_MAX_OCCUR_NODE_LIMIT = 5000;
+
+    //
+    // Data
+    //
+
+        private final static int DEFAULT_ELEMENT_ATTRIBUTE_LIMIT = 10000;
+
+    /** Entity expansion limit. **/
+    private int entityExpansionLimit;
+
+    /** W3C XML Schema maxOccurs limit. **/
+    private int maxOccurLimit;
+
+        private int fElementAttributeLimit;
+    // default constructor.  Establishes default values for
+    // all known security holes.
+    /**
+     * Default constructor.  Establishes default values
+     * for known security vulnerabilities.
+     */
+    public SecurityManager() {
+        entityExpansionLimit = DEFAULT_ENTITY_EXPANSION_LIMIT;
+        maxOccurLimit = DEFAULT_MAX_OCCUR_NODE_LIMIT ;
+                fElementAttributeLimit = DEFAULT_ELEMENT_ATTRIBUTE_LIMIT;
+                //We are reading system properties only once ,
+                //at the time of creation of this object ,
+                readSystemProperties();
+    }
+
+    /**
+     * <p>Sets the number of entity expansions that the
+     * parser should permit in a document.</p>
+     *
+     * @param limit the number of entity expansions

From jvanek at redhat.com  Tue Oct 22 08:57:14 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Tue, 22 Oct 2013 17:57:14 +0200
Subject: [rfc][icedtea-web] plugin should read configuration from XDG_CONFIG
	too
Message-ID: <5266A05A.90606@redhat.com>

Hi!

When I migrated java to XDG, i forgot to plugin :)
So this patch is fixing it.
I do not wont to clone whole migrating policy, so thats why it reads old configuration first
run 1:
  - plugin reads pld configuration
  - java migrate all content

run 2
  - plugin tries old configuration, will not find, try XDG new one
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: moreLoggingForPlugin.patch-fixedXDG
Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131022/5f3bdcba/moreLoggingForPlugin.patch-fixedXDG 

From jvanek at redhat.com  Tue Oct 22 09:00:59 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Tue, 22 Oct 2013 18:00:59 +0200
Subject: [rfc][icedtea-web] refactored logging for plugin
Message-ID: <5266A13B.1000509@redhat.com>

Hi!

This is adding possibility to configure plugin debug via itw-settings, is getting rid of uncontrolled print outs, and add java-like headers (if enabled)
Please, do  not look  on duplicated code in PLUGIN_{error,debug} macros, I will get rid of it when I will do  enty points for file log and system log.

I have intentionally ignored way to force plugin debug via -verbose sent via itw-settings jvm parameters. Imho it will be missus.

J.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: moreLoggingForPlugin.patch
Type: text/x-patch
Size: 25239 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131022/10604f18/moreLoggingForPlugin-0001.patch 

From jvanek at redhat.com  Tue Oct 22 09:07:05 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Tue, 22 Oct 2013 18:07:05 +0200
Subject: Fwd: Re: [icedtea-web] Regression after refactoring for XDG
	specification
Message-ID: <5266A2A9.7070504@redhat.com>

Hi!

Can i push? This patch will be soon inapplicable, and it is heavily needed.


J.

-------- Original Message --------
Subject: Re: [icedtea-web] Regression after refactoring for XDG specification
Date: Thu, 12 Sep 2013 11:40:01 +0200
From: Jiri Vanek <jvanek at redhat.com>
To: Jacob Wisor <gitne at gmx.de>
CC: distro-pkg-dev at openjdk.java.net

Ok, painfull review indeed!

I did my best, see below:

On 09/10/2013 09:34 PM, Jacob Wisor wrote:
> Jiri Vanek schrieb:
>> On 07/30/2013 06:14 PM, Jacob Wisor wrote:
..snip...
>>> Nevertheless, thank you for addressing this issue, so please keep up the good work.
>
>> +    private static void ensureMainDirs() {
>
> I am especially unhappy with this method's naming. I am aware that naming is a
> difficult task in CS, but it pays off investing time into it. What does it
> ensure main directories about? What happens if something cannot be or has not
> been ensured? Does possibly a RuntimeException be thrown? Except from that, what
> are main directories supposed to be? Perhaps root directories? What makes a
> directory so distinct to be "main"? So, please find an adequate name and add
> some documentation.

Ok. I refactored it a bit and added javadoc. I hope it is much cleaner now. Thanx for well deserved
kick.

>
> Some language stuff:
>> +                    System.out.println("WARNING: key " + key + " do not have
> value, switching to default");
>
> "WARNING: key " + key + " has no value, setting to default value"
>
>> +                    System.out.println("WARNING: key " + key + " do not have
> value, skipping");
>
> "WARNING: key " + key + " has no value, skipping"
>
>> +                    System.err.println("ERROR: key " + key + " value: " +
> value + " not existed, and was NOT created");
>
> "ERROR: Directory " + value + " denoted by key " + key + " does not exist and
> has not been created"
>
>> +                    System.out.println("OK: key " + key + " value: " + value
> + " not existed, and was created");
>
> "OK: Directory " + value + " denoted by key " + key + " did not exist but has
> been created"

Used. Thank you.
>
>> +    //not private for testing
>> +    static String testMainDir(File f, boolean verbose) {
>
> Since you have made this method not private please add some documentation on
> what this method's purpose is and what it does. It is definitely not
> self-explanatory, even after reading its code. And, as mentioned below it is
> probably unnecessary complex and seems to be mixing functional code with message
I hope fixed by refactoring.

> generating code. If you really want to keep this differentiated error reporting
> feature, I would strongly advise to deglomerate functional and message
> generating code.

Well, nothing else then pure laziness was on my side here:( Sorry!  I have added wrapper class which
is keeping the symptoms of failures, and message is generated later, based on those flags.

>
>> +        StringBuilder messages = new StringBuilder();
>> +        if (!f.exists()) {
>> +            String s = (R("DCmaindircheckNotexists", f.getAbsolutePath()));
>> +            if (verbose) {
>> +                System.err.println(s);
>> +            }
>> +            messages.append(s).append("\n");
>> +        }
>> +        if (!f.isDirectory()) {
>> +            String s = (R("DCmaindircheckNotdir", f.getAbsolutePath()));
>> +            if (verbose) {
>> +                System.err.println(s);
>> +            }
>> +            messages.append(s).append("\n");
>> +        }
>
> These two tests are redundant. File.isDirectory() implies a check for existence.
> It does not matter to the user or the application whether the desired directory
> does not exist or is not a directory. In effect the program cannot read
> from/write to the desired location.

Partially yes, and aprtially no. IsDirectory really implies fileExists, but the message then would
be misleading. I really would like to keep those most common error cases separately.
>
>> +        File testFile = null;
>> +        boolean ok = false;
>
> Naming again. What is ok?

renamed.
>
>> +        try {
>> +            testFile = File.createTempFile("maindir", "check", f);
>> +            if (testFile.exists()) {
>> +                ok = true;
>> +            }
>> +            try {
>> +                FileUtils.saveFile("ww", testFile);
>> +                String s = FileUtils.loadFileAsString(testFile);
>> +                if (!s.trim().equals("ww")) {
>> +                    ok = false;
>> +                }
>
> This test misses probably its point because it is testing for creating a *file*
> not a *directory*. Most file systems with DACLs distinguish between /creating/
> files or directories, and between /creating/ and /writing/ into files or
> directories, so it is important to be precise here. Furthermore, it tests
> writing into a file instead of perhaps writing into a file in a subdirectory.

Fair enough. I forgot about this case utterly. The test is now testing also subdirectory artificaly
created inisde real directory (call to testMainDir one more times)
>
>> +            } catch (Exception ex) {
>> +                if (JNLPRuntime.isDebug()) {
>> +                    ex.printStackTrace();
>> +                }
>> +                ok = false;
>> +            }
>
> No really, you should *not* catch arbitrary exceptions. It ain't just some empty
> words.

Well.. There are cases where it brings moore good then wrong. Endless loops are very often
implemented like:
public void run(){
while (true){
try{
}catch(Throwable r){
log(t)
}
}
}

By otherwords, when exception should not , by no means, disturb the program - eg my case above - it
does not sound so bad...

I would like to keep the exception cough as it is.
>
> After all, this method is overly complex and does not add any value for the
> user. So I would advise you to discard this method.
>
>> diff -r 79bdc074df81 netx/net/sourceforge/jnlp/resources/Messages.properties
>> --- a/netx/net/sourceforge/jnlp/resources/Messages.properties    Fri Aug 30
> 11:02:08 2013 -0400
>> +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties    Tue Sep 03
> 13:56:53 2013 +0200
>> @@ -304,6 +304,9 @@
>>  DCInternal=Internal error: {0}
>>  DCSourceInternal=<internal>
>>  DCUnknownSettingWithName=Property "{0}" is unknown.
>> +DCmaindircheckNotexists=After all tryes your configuration directory {0} do
> not exists
>> +DCmaindircheckNotdir=Your configuration directory {0} is not directory
>> +DCmaindircheckRwproblem=Your configuration directory {0} can not be
> read/written properly
>
> Although it is nice of you to make precise distinctions between error types to
> help the user it is actually not necessary and does not offer any additional
> help when analyzing this problem. All these messages can be fused into one

I really think that two most common cases file instead of dir and insufficient privledges  should be
distinguished.

Unless you stongly insists, I would like to keep the three messages as it was.
> sufficiently explanatory error message: DCCannotAccessConfig="Cannot access
> configuration in file {full path to config file}." This should probably be
> enough for an admin, even for a user. I would really advise this because it
> makes the code simpler and yet serves its purpose.

Well.. eh.. yes.m I admit that the code is complex. Now it is even a bit more complex. I hope that
refactoring made it much more readable, and taht testing is strong enough.

I would like to keep the "three distinguish messages" but any idea to keep them, check all parts,
and make the check algorithm a bit simpler is welcomed.
>
>
Thank you very much,
    J.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: xdgForcingDirs4.patch
Type: text/x-patch
Size: 29967 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131022/e217de8c/xdgForcingDirs4-0001.patch 

From aazores at redhat.com  Tue Oct 22 09:41:53 2013
From: aazores at redhat.com (Andrew Azores)
Date: Tue, 22 Oct 2013 12:41:53 -0400
Subject: [rfc][icedtea-web] plugin should read configuration from
	XDG_CONFIG too
In-Reply-To: <5266A05A.90606@redhat.com>
References: <5266A05A.90606@redhat.com>
Message-ID: <5266AAD1.6060406@redhat.com>

On 10/22/2013 11:57 AM, Jiri Vanek wrote:
> Hi!
>
> When I migrated java to XDG, i forgot to plugin :)
> So this patch is fixing it.
> I do not wont to clone whole migrating policy, so thats why it reads 
> old configuration first
> run 1:
>  - plugin reads pld configuration
>  - java migrate all content
>
> run 2
>  - plugin tries old configuration, will not find, try XDG new one

Looks fine to me.

Thanks,

-- 
Andrew A


From aazores at redhat.com  Tue Oct 22 10:11:40 2013
From: aazores at redhat.com (Andrew Azores)
Date: Tue, 22 Oct 2013 13:11:40 -0400
Subject: [rfc][icedtea-web] refactored logging for plugin
In-Reply-To: <5266A13B.1000509@redhat.com>
References: <5266A13B.1000509@redhat.com>
Message-ID: <5266B1CC.9030009@redhat.com>

On 10/22/2013 12:00 PM, Jiri Vanek wrote:
> Hi!
>
> This is adding possibility to configure plugin debug via itw-settings, 
> is getting rid of uncontrolled print outs, and add java-like headers 
> (if enabled)
> Please, do  not look  on duplicated code in PLUGIN_{error,debug} 
> macros, I will get rid of it when I will do  enty points for file log 
> and system log.
>
> I have intentionally ignored way to force plugin debug via -verbose 
> sent via itw-settings jvm parameters. Imho it will be missus.
>
> J.

Applying this patch makes my Firefox immediately crash when trying to 
visit any page with a Java applet. On my F19 workstation, there is no 
terminal output at all when this happens, but Mozilla's automatic bug 
reporter does open. On my laptop running Arch, there is no bug reporter 
and nothing especially helpful is printed either, but it does tell me 
there was a segfault. On my laptop this can happen at any time, not just 
when visiting a page with an applet. I don't really know why that's 
happening the way it is, but I've never had this behaviour at all before 
applying this patch, and after the patch it's very reproducible :(

Thanks,

-- 
Andrew A


From bugzilla-daemon at icedtea.classpath.org  Tue Oct 22 11:56:47 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 22 Oct 2013 18:56:47 +0000
Subject: [Bug 900] Fatal: Application Error: Unknown Main-Class. Could not
	determine the main class for this application.
In-Reply-To: <bug-900-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-900-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-900-30-qJZrcQFg13@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=900

--- Comment #4 from gerard.fernandes at gmail.com ---
It seems more closely related to:

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1465

Actually, I see this error when trying to log in via the Hoblink RDP applet.
But, is reproducible consistently on IcedTea 1.4.1.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131022/920983e8/attachment.html 

From omajid at icedtea.classpath.org  Tue Oct 22 13:31:44 2013
From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org)
Date: Tue, 22 Oct 2013 20:31:44 +0000
Subject: /hg/icedtea-web: Reset the LogConfig in unit tests
Message-ID: <hg.c6c2998cc359.1382473904.8643924302249223276@icedtea.classpath.org>

changeset c6c2998cc359 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c6c2998cc359
author: Omair Majid <omajid at redhat.com>
date: Tue Oct 22 16:21:40 2013 -0400

	Reset the LogConfig in unit tests

	LogConfig is globally shared. Fix unit tests that modify the logging
	configuration to reset it after (and before) to avoid affecting other
	unit tests or being affected by the results of other tests.

	Before this patch, if the tests were executed in a certain order, it
	was possible for them to leave behind a LogConfig that enabled logging
	in the most verbose manner possible. This would generate megabytes of
	output when running unit tests.

	2013-10-22  Omair Majid  <omajid at redhat.com>

	    * netx/net/sourceforge/jnlp/util/logging/LogConfig.java
	    (resetLogConfig): New method.
	    * tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java
	    (setUp, tearDown): New method.


diffstat:

 ChangeLog                                                                   |   7 +++++
 netx/net/sourceforge/jnlp/util/logging/LogConfig.java                       |   7 +++++
 tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java |  12 ++++++++++
 3 files changed, 26 insertions(+), 0 deletions(-)

diffs (60 lines):

diff -r c91a4eb28c97 -r c6c2998cc359 ChangeLog
--- a/ChangeLog	Tue Oct 22 11:48:27 2013 +0200
+++ b/ChangeLog	Tue Oct 22 16:21:40 2013 -0400
@@ -1,3 +1,10 @@
+2013-10-22  Omair Majid  <omajid at redhat.com>
+
+	* netx/net/sourceforge/jnlp/util/logging/LogConfig.java
+	(resetLogConfig): New method.
+	* tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java
+	(setUp, tearDown): New method.
+
 2013-10-22  Jiri Vanek  <jvanek at redhat.com>
 
 	More synchronized error/debug methods
diff -r c91a4eb28c97 -r c6c2998cc359 netx/net/sourceforge/jnlp/util/logging/LogConfig.java
--- a/netx/net/sourceforge/jnlp/util/logging/LogConfig.java	Tue Oct 22 11:48:27 2013 +0200
+++ b/netx/net/sourceforge/jnlp/util/logging/LogConfig.java	Tue Oct 22 16:21:40 2013 -0400
@@ -98,6 +98,13 @@
         return logConfig;
     }
 
+    /** For testing only: throw away the previous config */
+    static void resetLogConfig() {
+        if (logConfig != null) {
+            logConfig = new LogConfig();
+        }
+    }
+
     public String getIcedteaLogDir() {
         return icedteaLogDir;
     }
diff -r c91a4eb28c97 -r c6c2998cc359 tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java	Tue Oct 22 11:48:27 2013 +0200
+++ b/tests/netx/unit/net/sourceforge/jnlp/util/logging/OutputControllerTest.java	Tue Oct 22 16:21:40 2013 -0400
@@ -43,6 +43,8 @@
 import net.sourceforge.jnlp.closinglisteners.RulesFolowingClosingListener;
 import net.sourceforge.jnlp.util.StreamUtils;
 import org.junit.Assert;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OutputControllerTest {
@@ -71,6 +73,16 @@
         }
     }
 
+    @Before
+    public void setUp() {
+        LogConfig.resetLogConfig();
+    }
+
+    @After
+    public void tearDown() {
+        LogConfig.resetLogConfig();
+    }
+
     @Test
     public void isLoggingStdStreams() throws Exception {
         ByteArrayOutputStream os1 = new ByteArrayOutputStream();

From andrew at icedtea.classpath.org  Tue Oct 22 21:20:52 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 23 Oct 2013 04:20:52 +0000
Subject: /hg/release/icedtea7-2.4: 5 new changesets
Message-ID: <hg.194e13fbc0d7.1382502052.5789328834432805220@icedtea.classpath.org>

changeset 194e13fbc0d7 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=194e13fbc0d7
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Oct 21 04:52:08 2013 +0100

	Bring in u45 changes.

	2013-10-21  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(JDK_UPDATE_VERSION): Bump to 45.
		(BUILD_VERSION): Bump to b31.
		(CORBA_CHANGESET): Update to IcedTea 2.4 branch HEAD.
		(JAXP_CHANGESET): Likewise.
		(JAXWS_CHANGESET): Likewise.
		(JDK_CHANGESET): Likewise.
		(LANGTOOLS_CHANGESET): Likewise.
		(OPENJDK_CHANGESET): Likewise.
		(CORBA_SHA256SUM): Likewise.
		(JAXP_SHA256SUM): Likewise.
		(JAXWS_SHA256SUM): Likewise.
		(JDK_SHA256SUM): Likewise.
		(LANGTOOLS_SHA256SUM): Likewise.
		(OPENJDK_SHA256SUM): Likewise.
		* NEWS: Add changes brought in by bump.
		* hotspot.map: Update to IcedTea 2.4 branch
		HotSpot HEAD.
		* patches/boot/ecj-stringswitch.patch:
		Regenerated.


changeset 3dd8c1e3a5b3 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=3dd8c1e3a5b3
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Oct 21 05:11:22 2013 +0100

	Prepare for 2.4.3 release.

	2013-10-21  Andrew John Hughes  <gnu.andrew at redhat.com>

		* configure.ac: Set to 2.4.3.
		* NEWS: Set date.


changeset 6dfa95b33cd1 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=6dfa95b33cd1
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 23 04:46:40 2013 +0100

	Added tag icedtea-2.4.3 for changeset 3dd8c1e3a5b3


changeset a51186e9a14a in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=a51186e9a14a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 23 05:19:43 2013 +0100

	Add missing bug references.

	2013-10-23  Andrew John Hughes  <gnu.andrew at redhat.com>

		* NEWS: Add missing bug references.


changeset f2caf75a2592 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=f2caf75a2592
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 23 05:20:35 2013 +0100

	Start 2.4.4 release cycle.

	2013-10-23  Andrew John Hughes  <gnu.andrew at redhat.com>

		* configure.ac: Bump to 2.4.4pre.
		* NEWS: Add 2.4.4 section.


diffstat:

 .hgtags                             |   1 +
 ChangeLog                           |  37 +++++++++++++
 Makefile.am                         |  28 +++++-----
 NEWS                                |  99 ++++++++++++++++++++++++++++++++++++-
 configure.ac                        |   2 +-
 hotspot.map                         |   2 +-
 patches/boot/ecj-stringswitch.patch |  37 +++++++------
 7 files changed, 172 insertions(+), 34 deletions(-)

diffs (339 lines):

diff -r 54b900700f8f -r f2caf75a2592 .hgtags
--- a/.hgtags	Tue Sep 24 00:40:30 2013 +0100
+++ b/.hgtags	Wed Oct 23 05:20:35 2013 +0100
@@ -38,3 +38,4 @@
 c753600d9acfbbf87a5b201dde78068fb43f54d4 icedtea-2.4.0
 3fbc8efc5df22013d6834b2ab3e4cf3aa581a35a icedtea-2.4.1
 0fd63b23c711d9892bf565e309789517983d2728 icedtea-2.4.2
+3dd8c1e3a5b3827f1843a78a017c57d0ed45f2c0 icedtea-2.4.3
diff -r 54b900700f8f -r f2caf75a2592 ChangeLog
--- a/ChangeLog	Tue Sep 24 00:40:30 2013 +0100
+++ b/ChangeLog	Wed Oct 23 05:20:35 2013 +0100
@@ -1,3 +1,40 @@
+2013-10-23  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* configure.ac: Bump to 2.4.4pre.
+	* NEWS: Add 2.4.4 section.
+
+2013-10-23  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* NEWS: Add missing bug references.
+
+2013-10-21  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* configure.ac: Set to 2.4.3.
+	* NEWS: Set date.
+
+2013-10-21  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(JDK_UPDATE_VERSION): Bump to 45.
+	(BUILD_VERSION): Bump to b31.
+	(CORBA_CHANGESET): Update to IcedTea 2.4 branch HEAD.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	* NEWS: Add changes brought in by bump.
+	* hotspot.map: Update to IcedTea 2.4 branch
+	HotSpot HEAD.
+	* patches/boot/ecj-stringswitch.patch:
+	Regenerated.
+
 2013-09-23  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	* NEWS: Add 2.4.3 section.
diff -r 54b900700f8f -r f2caf75a2592 Makefile.am
--- a/Makefile.am	Tue Sep 24 00:40:30 2013 +0100
+++ b/Makefile.am	Wed Oct 23 05:20:35 2013 +0100
@@ -1,22 +1,22 @@
 # Dependencies
 
-JDK_UPDATE_VERSION = 40
-BUILD_VERSION = b60
+JDK_UPDATE_VERSION = 45
+BUILD_VERSION = b31
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 5ea58899ae9f
-JAXP_CHANGESET = 135f46e0e653
-JAXWS_CHANGESET = a2ff16e5361f
-JDK_CHANGESET = 4bf5ac86e0e4
-LANGTOOLS_CHANGESET = 06ea051f7ffe
-OPENJDK_CHANGESET = 6125b83238df
+CORBA_CHANGESET = 8ed5df839fbc
+JAXP_CHANGESET = 8f220f7b51c7
+JAXWS_CHANGESET = 652eb396f959
+JDK_CHANGESET = 7958751eb9ef
+LANGTOOLS_CHANGESET = 3c8eb52a32ea
+OPENJDK_CHANGESET = e2f5917da3c1
 
-CORBA_SHA256SUM = 41fc9041d7804bbd519290325c0a21b48405ed96ccf557037189b007391d33a8
-JAXP_SHA256SUM = 3e043ea822cf18232fb0897431a2c900c8d29dce59e33bd8e3236ed1ac6c8fde
-JAXWS_SHA256SUM = ac21931af93267188fb6dac8ed5eb44121e25e55fe432c19184c20c17cc9ceda
-JDK_SHA256SUM = 8cc46ef5d73a3a6445b411637fee5cc5f086e400d42b36f1f42eba4caee2a11a
-LANGTOOLS_SHA256SUM = d2de1d2e98ebea56d2367f0003e5f4b5031d55ed529a7c524df8eba9da08c735
-OPENJDK_SHA256SUM = bc5703a7c31a6f1de53259768f613fa1f451d721d3301c58a59513dc3953d95b
+CORBA_SHA256SUM = 7fab9af64ffcdf635a6fed5abf78cffd1f64be1f3827a1aaf3a0e5e1fdbc599c
+JAXP_SHA256SUM = cec41aebd42f4c8caba9c24c306ba78e8cf5da3d23da1604b98753340a2719ca
+JAXWS_SHA256SUM = fb9c22e92c2a056917b7b5dce6905a01ab2e904cbc3c1c6badcc470d22136518
+JDK_SHA256SUM = 4df06346d197180bbb9d182e3ebc9ab6386562199d9898d057d0df75566349fe
+LANGTOOLS_SHA256SUM = 462ad61fd34708c90362f9e3d3c432b9246833ea8ff0d8a14955ae386bce4a91
+OPENJDK_SHA256SUM = 75a18abd117e3295c6de4d3450f0094a9abc08f2168e2911bce25d1e153107b9
 
 CACAO_VERSION = e215e36be9fc
 CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
diff -r 54b900700f8f -r f2caf75a2592 NEWS
--- a/NEWS	Tue Sep 24 00:40:30 2013 +0100
+++ b/NEWS	Wed Oct 23 05:20:35 2013 +0100
@@ -12,7 +12,104 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
-New in release 2.4.3 (2013-10-XX):
+New in release 2.4.4 (2014-XX-XX):
+
+New in release 2.4.3 (2013-10-21):
+
+* Security fixes
+  - S8006900, CVE-2013-3829: Add new date/time capability
+  - S8008589: Better MBean permission validation
+  - S8011071, CVE-2013-5780: Better crypto provider handling
+  - S8011081, CVE-2013-5772: Improve jhat
+  - S8011157, CVE-2013-5814: Improve CORBA portablility
+  - S8012071, CVE-2013-5790: Better Building of Beans
+  - S8012147: Improve tool support
+  - S8012277: CVE-2013-5849: Improve AWT DataFlavor
+  - S8012425, CVE-2013-5802: Transform TransformerFactory
+  - S8013503, CVE-2013-5851: Improve stream factories
+  - S8013506: Better Pack200 data handling
+  - S8013510, CVE-2013-5809: Augment image writing code
+  - S8013514: Improve stability of cmap class
+  - S8013739, CVE-2013-5817: Better LDAP resource management
+  - S8013744, CVE-2013-5783: Better tabling for AWT
+  - S8014085: Better serialization support in JMX classes
+  - S8014093, CVE-2013-5782: Improve parsing of images
+  - S8014098: Better profile validation
+  - S8014102, CVE-2013-5778: Improve image conversion
+  - S8014341, CVE-2013-5803: Better service from Kerberos servers
+  - S8014349, CVE-2013-5840: (cl) Class.getDeclaredClass problematic in some class loader configurations
+  - S8014530, CVE-2013-5825: Better digital signature processing
+  - S8014534: Better profiling support
+  - S8014987, CVE-2013-5842: Augment serialization handling
+  - S8015614: Update build settings
+  - S8015731: Subject java.security.auth.subject to improvements
+  - S8015743, CVE-2013-5774: Address internet addresses
+  - S8016256: Make finalization final
+  - S8016653, CVE-2013-5804: javadoc should ignore ignoreable characters in names
+  - S8016675, CVE-2013-5797: Make Javadoc pages more robust
+  - S8017196, CVE-2013-5850: Ensure Proxies are handled appropriately
+  - S8017287, CVE-2013-5829: Better resource disposal
+  - S8017291, CVE-2013-5830: Cast Proxies Aside
+  - S8017298, CVE-2013-4002: Better XML support
+  - S8017300, CVE-2013-5784: Improve Interface Implementation
+  - S8017505, CVE-2013-5820: Better Client Service
+  - S8019292: Better Attribute Value Exceptions
+  - S8019617: Better view of objects
+  - S8020293: JVM crash
+  - S8021275, CVE-2013-5805: Better screening for ScreenMenu
+  - S8021282, CVE-2013-5806: Better recycling of object instances
+  - S8021286: Improve MacOS resourcing
+  - S8021290, CVE-2013-5823: Better signature validation
+  - S8022931, CVE-2013-5800: Enhance Kerberos exceptions
+  - S8022940: Enhance CORBA translations
+  - S8023683: Enhance class file parsing
+* Backports
+  - S6614237: missing codepage Cp290 at java runtime
+  - S8005932: Java 7 on mac os x only provides text clipboard formats
+  - S8014046: (process) Runtime.exec(String) fails if command contains spaces [win]
+  - S8015144: Performance regression in ICU OpenType Layout library
+  - S8015965: (process) Typo in name of property to allow ambiguous commands
+  - S8015978: Incorrect transformation of XPath expression "string(-0)"
+  - S8016357: Update hotspot diagnostic class
+  - S8019584: javax/management/remote/mandatory/loading/MissingClassTest.java failed in nightly against jdk7u45: java.io.InvalidObjectException: Invalid notification: null
+  - S8019969: nioNetworkChannelInet6/SetOptionGetOptionTestInet6 test case crashes
+  - S8020032: 7u fastdebug doesn't generate fastdebuginfo file
+  - S8020085: Linux ARM build failure for 7u45
+  - S8020088: Increment minor version of HSx for 7u45 and initialize the build number
+  - S8020551: increment hsx build to b03 for 7u45-b03
+  - S8020943: Memory leak when GCNotifier uses create_from_platform_dependent_str()
+  - S8021287: Improve MacOS resourcing
+  - S8021355: REGRESSION: Five closed/java/awt/SplashScreen tests fail since 7u45 b01 on Linux, Solaris
+  - S8021360: object not exported" on start of JMXConnectorServer for RMI-IIOP protocol with security manager
+  - S8021366: java_util/Properties/PropertiesWithOtherEncodings fails during 7u45 nightly testing
+  - S8021577: JCK test api/javax_management/jmx_serial/modelmbean/ModelMBeanNotificationInfo/serial/index.html#Input has failed since jdk 7u45 b01
+  - S8021899: Re-adjust fix of # 8020498 in 7u45 after mergeing 7u40
+  - S8021901: Increment hsx build to b05 for 7u45-b05
+  - S8021933: Add extra check for fix # JDK-8014530
+  - S8021969: The index_AccessAllowed jnlp can not load successfully with exception thrown in the log.
+  - S8022066: Evaluation of method reference to signature polymorphic method crashes VM
+  - S8022086: Fixing licence of newly added files
+  - S8022254: Remove incorrect jdk7u45-b05 tag from jdk7u-cpu forest
+  - S8022661: InetAddress.writeObject() performs flush() on object output stream
+  - S8022682: Supporting XOM
+  - S8022808: Kitchensink hangs on macos
+  - S8022856: 7u45 l10n resource file translation update
+  - S8023323: Increment hsx build to b06 for 7u45-b08
+  - S8023457: Event based tracing framework needs a mutex for thread groups
+  - S8023478: Test fails with HS crash in GCNotifier.
+  - S8023741: Increment hsx 24.45 build to b07 for 7u45-b09
+  - S8023771: when USER_RELEASE_SUFFIX is set in order to add a string to java -version, build number in the bundles names should not be changed to b00
+  - S8023888: Increment hsx 24.45 build to b08 for 7u45-b10
+  - S8023964: java/io/IOException/LastErrorString.java should be @ignore-d
+  - S8024369: Increment build # of hs24.0 to b57 for 7u40-b61 psu
+  - S8024668: api/java_nio/charset/Charset/index.html#Methods JCK-runtime test fails with 7u45 b11
+  - S8024697: Fix for 8020983 causes Xcheck:jni warnings
+  - S8024863, PR1400: X11: Support GNOME Shell as mutter
+  - S8024883, RH1011051: (se) SelectableChannel.register throws NPE if fd >= 64k (lnx)
+  - S8025128: File.createTempFile fails if prefix is absolute path
+  - S8025170: jdk7u51 7u-1-prebuild is failing since 9/19
+* Bug fixes
+  - PR1400: Menu of maximized AWT window not working in Mate
 
 New in release 2.4.2 (2013-09-20):
 
diff -r 54b900700f8f -r f2caf75a2592 configure.ac
--- a/configure.ac	Tue Sep 24 00:40:30 2013 +0100
+++ b/configure.ac	Wed Oct 23 05:20:35 2013 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.4.3pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.4.4pre], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 
diff -r 54b900700f8f -r f2caf75a2592 hotspot.map
--- a/hotspot.map	Tue Sep 24 00:40:30 2013 +0100
+++ b/hotspot.map	Wed Oct 23 05:20:35 2013 +0100
@@ -1,2 +1,2 @@
 # version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot b732355257e3 4a4a04fa2c49d0a688400f6c9f129f47ba5cd931874c33254a047a1f36e6ac36
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot b59e02d9e72b b7d7e01d7ab9e49b68aa29b55355a019d71f9ae5cabb4ea7378b55855a07df57
diff -r 54b900700f8f -r f2caf75a2592 patches/boot/ecj-stringswitch.patch
--- a/patches/boot/ecj-stringswitch.patch	Tue Sep 24 00:40:30 2013 +0100
+++ b/patches/boot/ecj-stringswitch.patch	Wed Oct 23 05:20:35 2013 +0100
@@ -1,6 +1,6 @@
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2013-07-02 03:38:10.090272900 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2013-10-16 15:17:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2013-10-18 06:03:03.743761153 +0100
 @@ -350,19 +350,16 @@
              if (attrCommands != null) {
                  Object lkey = Attribute.keyForLookup(ctype, name);
@@ -32,8 +32,8 @@
              // Find canonical instance of the requested attribute.
              Attribute a = Attribute.lookup(Package.attrDefs, ctype, name);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2013-10-16 15:17:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2013-10-18 06:03:03.743761153 +0100
 @@ -73,16 +73,14 @@
          {
              // Non-standard, undocumented "--unpack" switch enables unpack mode.
@@ -91,8 +91,8 @@
  
          if (logFile != null && !logFile.equals("")) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2013-10-16 15:17:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2013-10-18 06:03:03.743761153 +0100
 @@ -1116,30 +1116,25 @@
          // what is one of { Debug, Compile, Constant, Exceptions, InnerClasses }
          if (verbose > 0)
@@ -144,8 +144,8 @@
      }
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java	2013-10-16 15:17:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java	2013-10-18 06:03:03.743761153 +0100
 @@ -64,17 +64,23 @@
  
      protected NTLM(String version) throws NTLMException {
@@ -182,8 +182,8 @@
              fac = SecretKeyFactory.getInstance ("DES");
              cipher = Cipher.getInstance ("DES/ECB/NoPadding");
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-07-02 03:42:53.718781065 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-10-16 15:17:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-10-18 14:55:10.324629268 +0100
 @@ -328,12 +328,11 @@
                                       Object[] appendixResult) {
          try {
@@ -202,7 +202,7 @@
              }
          } catch (Throwable ex) {
              if (ex instanceof LinkageError)
-@@ -403,122 +402,118 @@
+@@ -403,124 +402,119 @@
      // this method is also called by test/sun/reflect/CallerSensitiveFinder
      // to validate the hand-maintained list
      private static boolean isCallerSensitiveMethod(Class<?> defc, String method) {
@@ -261,6 +261,7 @@
 -        case "getDeclaredField":
 -        case "getDeclaredMethod":
 -        case "getDeclaredConstructor":
+-        case "getDeclaringClass":
 -        case "getEnclosingClass":
 -        case "getEnclosingMethod":
 -        case "getEnclosingConstructor":
@@ -296,6 +297,7 @@
 -            return defc == java.lang.ClassLoader.class;
 -        case "registerAsParallelCapable":
 -            return defc == java.lang.ClassLoader.class;
+-        case "getInvocationHandler":
 -        case "getProxyClass":
 -        case "newProxyInstance":
 -            return defc == java.lang.reflect.Proxy.class;
@@ -396,6 +398,7 @@
 +        } else if ("registerAsParallelCapable".equals(method)) {
 +             return defc == java.lang.ClassLoader.class;
 +        } else if ("getProxyClass".equals(method) ||
++		   "getInvocationHandler".equals(method) ||
 +		   "newProxyInstance".equals(method)) {
 +             return defc == java.lang.reflect.Proxy.class;
 +        } else if ("asInterfaceInstance".equals(method)) {
@@ -430,8 +433,8 @@
          }
          return false;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java	2013-10-16 15:17:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java	2013-10-18 06:03:03.743761153 +0100
 @@ -269,14 +269,16 @@
  
      private static
@@ -473,8 +476,8 @@
          }
          return null;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2013-10-16 15:17:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2013-10-18 06:03:03.743761153 +0100
 @@ -119,24 +119,20 @@
          String optStr = (opts.length > 1 && opts[1] != null)
                  ? opts[1].trim()
@@ -512,8 +515,8 @@
  
      /*
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java	2013-10-16 15:17:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java	2013-10-18 06:03:03.743761153 +0100
 @@ -378,19 +378,23 @@
              GE;         // ">="
  

From andrew at icedtea.classpath.org  Tue Oct 22 21:24:28 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 23 Oct 2013 04:24:28 +0000
Subject: /hg/release/icedtea7-forest-2.4: Added tag icedtea-2.4.3 for cha...
Message-ID: <hg.63b832c8ec92.1382502268.-6425493795253247641@icedtea.classpath.org>

changeset 63b832c8ec92 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=63b832c8ec92
author: andrew
date: Wed Oct 23 05:21:53 2013 +0100

	Added tag icedtea-2.4.3 for changeset e2f5917da3c1


diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r e2f5917da3c1 -r 63b832c8ec92 .hgtags
--- a/.hgtags	Wed Oct 16 15:17:01 2013 +0100
+++ b/.hgtags	Wed Oct 23 05:21:53 2013 +0100
@@ -389,3 +389,4 @@
 6fd67e0287a9893ea1f0090fe127f18a7e235148 jdk7u45-b17
 f0cdb08a4624a623bdd178b04c4bf5a2fa4dc39a jdk7u45-b18
 82f1f76c44124c31cb1151833fc15c13547ab280 jdk7u45-b30
+e2f5917da3c1b13bf8291d7864afba14ac35736a icedtea-2.4.3

From andrew at icedtea.classpath.org  Tue Oct 22 21:24:37 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 23 Oct 2013 04:24:37 +0000
Subject: /hg/release/icedtea7-forest-2.4/corba: Added tag icedtea-2.4.3 f...
Message-ID: <hg.2b24b81f4555.1382502277.-523731888714527277@icedtea.classpath.org>

changeset 2b24b81f4555 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2b24b81f4555
author: andrew
date: Wed Oct 23 05:22:18 2013 +0100

	Added tag icedtea-2.4.3 for changeset 8ed5df839fbc


diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r 8ed5df839fbc -r 2b24b81f4555 .hgtags
--- a/.hgtags	Wed Oct 16 15:17:36 2013 +0100
+++ b/.hgtags	Wed Oct 23 05:22:18 2013 +0100
@@ -391,3 +391,4 @@
 8b8793f06c56e343962b473bc0fb79f23b8be734 jdk7u45-b17
 80f65a8f58500ef5d93ddf4426d9c1909b79fadf jdk7u45-b18
 a15e4a54504471f1e34a494ed66235870722a0f5 jdk7u45-b30
+8ed5df839fbccdb20f2718626402d28e5ea33542 icedtea-2.4.3

From andrew at icedtea.classpath.org  Tue Oct 22 21:24:46 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 23 Oct 2013 04:24:46 +0000
Subject: /hg/release/icedtea7-forest-2.4/jaxp: Added tag icedtea-2.4.3 fo...
Message-ID: <hg.582213f5560e.1382502286.6056160295555406480@icedtea.classpath.org>

changeset 582213f5560e in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=582213f5560e
author: andrew
date: Wed Oct 23 05:22:27 2013 +0100

	Added tag icedtea-2.4.3 for changeset 8f220f7b51c7


diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r 8f220f7b51c7 -r 582213f5560e .hgtags
--- a/.hgtags	Wed Oct 16 15:26:07 2013 +0100
+++ b/.hgtags	Wed Oct 23 05:22:27 2013 +0100
@@ -391,3 +391,4 @@
 2586d303503b5bb6fd39dc0ce572d6e858caf41c jdk7u45-b17
 4beb90ab48f7fd46c7a9afbe66f8cccb230699ba jdk7u45-b18
 a456c78a50e201a65c9f63565c8291b84a4fbd32 jdk7u45-b30
+8f220f7b51c715a204e09fa6abf326df791b1f1c icedtea-2.4.3

From andrew at icedtea.classpath.org  Tue Oct 22 21:24:53 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 23 Oct 2013 04:24:53 +0000
Subject: /hg/release/icedtea7-forest-2.4/jaxws: Added tag icedtea-2.4.3 f...
Message-ID: <hg.0cb5423008ad.1382502293.1704173005128376975@icedtea.classpath.org>

changeset 0cb5423008ad in /hg/release/icedtea7-forest-2.4/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws?cmd=changeset;node=0cb5423008ad
author: andrew
date: Wed Oct 23 05:22:37 2013 +0100

	Added tag icedtea-2.4.3 for changeset 652eb396f959


diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r 652eb396f959 -r 0cb5423008ad .hgtags
--- a/.hgtags	Wed Oct 16 15:17:05 2013 +0100
+++ b/.hgtags	Wed Oct 23 05:22:37 2013 +0100
@@ -391,3 +391,4 @@
 a8baf22b5972e269a97f7b3b7eec2ad63a8c5aed jdk7u45-b17
 65b0f3ccdc8bcff0d79e1b543a8cefb817529b3f jdk7u45-b18
 c32c6a662d18d7195fc02125178c7543ce09bb00 jdk7u45-b30
+652eb396f959d66025120ffb1e778b606bfa68b3 icedtea-2.4.3

From andrew at icedtea.classpath.org  Tue Oct 22 21:25:01 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 23 Oct 2013 04:25:01 +0000
Subject: /hg/release/icedtea7-forest-2.4/langtools: Added tag icedtea-2.4...
Message-ID: <hg.5216dd4602fe.1382502301.1305664371660628365@icedtea.classpath.org>

changeset 5216dd4602fe in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5216dd4602fe
author: andrew
date: Wed Oct 23 05:23:07 2013 +0100

	Added tag icedtea-2.4.3 for changeset 3c8eb52a32ea


diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r 3c8eb52a32ea -r 5216dd4602fe .hgtags
--- a/.hgtags	Wed Oct 16 15:17:06 2013 +0100
+++ b/.hgtags	Wed Oct 23 05:23:07 2013 +0100
@@ -391,3 +391,4 @@
 b9aeec6b9d5aac0746f8d1764a7740f8b83334ab jdk7u45-b17
 ba3ff27d4082f2cf0d06e635b2b6e01f80e78589 jdk7u45-b18
 164cf7491ba2f371354ba343a604eee4c61c529d jdk7u45-b30
+3c8eb52a32ea6a119657487c40e24c21c1020e51 icedtea-2.4.3

From andrew at icedtea.classpath.org  Tue Oct 22 21:25:08 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 23 Oct 2013 04:25:08 +0000
Subject: /hg/release/icedtea7-forest-2.4/hotspot: Added tag icedtea-2.4.3...
Message-ID: <hg.0505a797849f.1382502308.8708922617413201811@icedtea.classpath.org>

changeset 0505a797849f in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0505a797849f
author: andrew
date: Wed Oct 23 05:23:32 2013 +0100

	Added tag icedtea-2.4.3 for changeset b59e02d9e72b


diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r b59e02d9e72b -r 0505a797849f .hgtags
--- a/.hgtags	Wed Oct 16 15:17:08 2013 +0100
+++ b/.hgtags	Wed Oct 23 05:23:32 2013 +0100
@@ -604,3 +604,4 @@
 0c0dc384915cafd9bfaa2fe5792a629a22d1b990 jdk7u45-b17
 12374864c655a2cefb0d65caaacf215d5365ec5f jdk7u45-b18
 3677c8cc3c89c0fa608f485b84396e4cf755634b jdk7u45-b30
+b59e02d9e72bb06d5cbff39605bce1d2695dbdd0 icedtea-2.4.3

From andrew at icedtea.classpath.org  Tue Oct 22 21:25:18 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 23 Oct 2013 04:25:18 +0000
Subject: /hg/release/icedtea7-forest-2.4/jdk: Added tag icedtea-2.4.3 for...
Message-ID: <hg.cdfd161703ed.1382502318.9040506844232929411@icedtea.classpath.org>

changeset cdfd161703ed in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=cdfd161703ed
author: andrew
date: Wed Oct 23 05:22:55 2013 +0100

	Added tag icedtea-2.4.3 for changeset 7958751eb9ef


diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r 7958751eb9ef -r cdfd161703ed .hgtags
--- a/.hgtags	Wed Oct 16 15:17:14 2013 +0100
+++ b/.hgtags	Wed Oct 23 05:22:55 2013 +0100
@@ -382,3 +382,4 @@
 3a65c1b0c6d15fb24298bcd133d7ab4baa741ae2 jdk7u45-b17
 c5ca4daec23b5e7f99ac8d684f5016ff8bfebbb0 jdk7u45-b18
 4797f984f6c93c433aa797e9b2d8f904cf083f96 jdk7u45-b30
+7958751eb9efc3029e97c2fcbe062567504b8c66 icedtea-2.4.3

From andrew at icedtea.classpath.org  Tue Oct 22 21:28:30 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 23 Oct 2013 04:28:30 +0000
Subject: /hg/icedtea7: Add 2.4.3 release notes.
Message-ID: <hg.2ded946dc6b6.1382502510.2873452341184383833@icedtea.classpath.org>

changeset 2ded946dc6b6 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=2ded946dc6b6
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 23 05:28:22 2013 +0100

	Add 2.4.3 release notes.

	2013-10-23  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* NEWS: Add 2.4.3 release notes.


diffstat:

 ChangeLog |   4 ++
 NEWS      |  97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+), 0 deletions(-)

diffs (118 lines):

diff -r 8599fdfc398d -r 2ded946dc6b6 ChangeLog
--- a/ChangeLog	Wed Oct 02 12:26:39 2013 +0900
+++ b/ChangeLog	Wed Oct 23 05:28:22 2013 +0100
@@ -1,3 +1,7 @@
+2013-10-23  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* NEWS: Add 2.4.3 release notes.
+
 2013-10-02  Yasumasa Suenaga  <yasu at ysfactory.dip.jp>
 
 	* jstack.stp should be adapted CR#7172967
diff -r 8599fdfc398d -r 2ded946dc6b6 NEWS
--- a/NEWS	Wed Oct 02 12:26:39 2013 +0900
+++ b/NEWS	Wed Oct 23 05:28:22 2013 +0100
@@ -14,6 +14,103 @@
 
 New in release 2.5.0 (2012-XX-XX):
 
+New in release 2.4.3 (2013-10-21):
+
+* Security fixes
+  - S8006900, CVE-2013-3829: Add new date/time capability
+  - S8008589: Better MBean permission validation
+  - S8011071, CVE-2013-5780: Better crypto provider handling
+  - S8011081, CVE-2013-5772: Improve jhat
+  - S8011157, CVE-2013-5814: Improve CORBA portablility
+  - S8012071, CVE-2013-5790: Better Building of Beans
+  - S8012147: Improve tool support
+  - S8012277: CVE-2013-5849: Improve AWT DataFlavor
+  - S8012425, CVE-2013-5802: Transform TransformerFactory
+  - S8013503, CVE-2013-5851: Improve stream factories
+  - S8013506: Better Pack200 data handling
+  - S8013510, CVE-2013-5809: Augment image writing code
+  - S8013514: Improve stability of cmap class
+  - S8013739, CVE-2013-5817: Better LDAP resource management
+  - S8013744, CVE-2013-5783: Better tabling for AWT
+  - S8014085: Better serialization support in JMX classes
+  - S8014093, CVE-2013-5782: Improve parsing of images
+  - S8014098: Better profile validation
+  - S8014102, CVE-2013-5778: Improve image conversion
+  - S8014341, CVE-2013-5803: Better service from Kerberos servers
+  - S8014349, CVE-2013-5840: (cl) Class.getDeclaredClass problematic in some class loader configurations
+  - S8014530, CVE-2013-5825: Better digital signature processing
+  - S8014534: Better profiling support
+  - S8014987, CVE-2013-5842: Augment serialization handling
+  - S8015614: Update build settings
+  - S8015731: Subject java.security.auth.subject to improvements
+  - S8015743, CVE-2013-5774: Address internet addresses
+  - S8016256: Make finalization final
+  - S8016653, CVE-2013-5804: javadoc should ignore ignoreable characters in names
+  - S8016675, CVE-2013-5797: Make Javadoc pages more robust
+  - S8017196, CVE-2013-5850: Ensure Proxies are handled appropriately
+  - S8017287, CVE-2013-5829: Better resource disposal
+  - S8017291, CVE-2013-5830: Cast Proxies Aside
+  - S8017298, CVE-2013-4002: Better XML support
+  - S8017300, CVE-2013-5784: Improve Interface Implementation
+  - S8017505, CVE-2013-5820: Better Client Service
+  - S8019292: Better Attribute Value Exceptions
+  - S8019617: Better view of objects
+  - S8020293: JVM crash
+  - S8021275, CVE-2013-5805: Better screening for ScreenMenu
+  - S8021282, CVE-2013-5806: Better recycling of object instances
+  - S8021286: Improve MacOS resourcing
+  - S8021290, CVE-2013-5823: Better signature validation
+  - S8022931, CVE-2013-5800: Enhance Kerberos exceptions
+  - S8022940: Enhance CORBA translations
+  - S8023683: Enhance class file parsing
+* Backports
+  - S6614237: missing codepage Cp290 at java runtime
+  - S8005932: Java 7 on mac os x only provides text clipboard formats
+  - S8014046: (process) Runtime.exec(String) fails if command contains spaces [win]
+  - S8015144: Performance regression in ICU OpenType Layout library
+  - S8015965: (process) Typo in name of property to allow ambiguous commands
+  - S8015978: Incorrect transformation of XPath expression "string(-0)"
+  - S8016357: Update hotspot diagnostic class
+  - S8019584: javax/management/remote/mandatory/loading/MissingClassTest.java failed in nightly against jdk7u45: java.io.InvalidObjectException: Invalid notification: null
+  - S8019969: nioNetworkChannelInet6/SetOptionGetOptionTestInet6 test case crashes
+  - S8020032: 7u fastdebug doesn't generate fastdebuginfo file
+  - S8020085: Linux ARM build failure for 7u45
+  - S8020088: Increment minor version of HSx for 7u45 and initialize the build number
+  - S8020551: increment hsx build to b03 for 7u45-b03
+  - S8020943: Memory leak when GCNotifier uses create_from_platform_dependent_str()
+  - S8021287: Improve MacOS resourcing
+  - S8021355: REGRESSION: Five closed/java/awt/SplashScreen tests fail since 7u45 b01 on Linux, Solaris
+  - S8021360: object not exported" on start of JMXConnectorServer for RMI-IIOP protocol with security manager
+  - S8021366: java_util/Properties/PropertiesWithOtherEncodings fails during 7u45 nightly testing
+  - S8021577: JCK test api/javax_management/jmx_serial/modelmbean/ModelMBeanNotificationInfo/serial/index.html#Input has failed since jdk 7u45 b01
+  - S8021899: Re-adjust fix of # 8020498 in 7u45 after mergeing 7u40
+  - S8021901: Increment hsx build to b05 for 7u45-b05
+  - S8021933: Add extra check for fix # JDK-8014530
+  - S8021969: The index_AccessAllowed jnlp can not load successfully with exception thrown in the log.
+  - S8022066: Evaluation of method reference to signature polymorphic method crashes VM
+  - S8022086: Fixing licence of newly added files
+  - S8022254: Remove incorrect jdk7u45-b05 tag from jdk7u-cpu forest
+  - S8022661: InetAddress.writeObject() performs flush() on object output stream
+  - S8022682: Supporting XOM
+  - S8022808: Kitchensink hangs on macos
+  - S8022856: 7u45 l10n resource file translation update
+  - S8023323: Increment hsx build to b06 for 7u45-b08
+  - S8023457: Event based tracing framework needs a mutex for thread groups
+  - S8023478: Test fails with HS crash in GCNotifier.
+  - S8023741: Increment hsx 24.45 build to b07 for 7u45-b09
+  - S8023771: when USER_RELEASE_SUFFIX is set in order to add a string to java -version, build number in the bundles names should not be changed to b00
+  - S8023888: Increment hsx 24.45 build to b08 for 7u45-b10
+  - S8023964: java/io/IOException/LastErrorString.java should be @ignore-d
+  - S8024369: Increment build # of hs24.0 to b57 for 7u40-b61 psu
+  - S8024668: api/java_nio/charset/Charset/index.html#Methods JCK-runtime test fails with 7u45 b11
+  - S8024697: Fix for 8020983 causes Xcheck:jni warnings
+  - S8024863, PR1400: X11: Support GNOME Shell as mutter
+  - S8024883, RH1011051: (se) SelectableChannel.register throws NPE if fd >= 64k (lnx)
+  - S8025128: File.createTempFile fails if prefix is absolute path
+  - S8025170: jdk7u51 7u-1-prebuild is failing since 9/19
+* Bug fixes
+  - PR1400: Menu of maximized AWT window not working in Mate
+
 New in release 2.4.2 (2013-09-20):
 
 * System LCMS 2 support again enabled by default, requiring 2.5 or above.

From bugzilla-daemon at icedtea.classpath.org  Tue Oct 22 21:29:41 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 23 Oct 2013 04:29:41 +0000
Subject: [Bug 1400] Menu of maximized AWT window not working in GNOME Shell
In-Reply-To: <bug-1400-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1400-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1400-30-521V2Xsmdx@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1400

--- Comment #11 from Andrew John Hughes <gnu.andrew at redhat.com> ---
Included in 2.4.3:

http://blog.fuseyism.com/index.php/2013/10/23/security-icedtea-2-4-3-released/

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131023/72228838/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct 22 21:30:08 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 23 Oct 2013 04:30:08 +0000
Subject: [Bug 1400] Menu of maximized AWT window not working in GNOME Shell
In-Reply-To: <bug-1400-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1400-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1400-30-vJxgyV9Ehi@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1400

Andrew John Hughes <gnu.andrew at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|ASSIGNED                    |RESOLVED
         Resolution|---                         |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131023/960cfa8f/attachment-0001.html 

From ptisnovs at icedtea.classpath.org  Wed Oct 23 01:51:27 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Wed, 23 Oct 2013 08:51:27 +0000
Subject: /hg/gfx-test: Another ten new tests added into BitBltAffineQuadr...
Message-ID: <hg.fbbf2e6b26fd.1382518287.-6248649288953172555@icedtea.classpath.org>

changeset fbbf2e6b26fd in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=fbbf2e6b26fd
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Wed Oct 23 10:55:13 2013 +0200

	Another ten new tests added into BitBltAffineQuadrantRotateTransformOp test suite.


diffstat:

 ChangeLog                                                             |    5 +
 src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java |  140 ++++++++++
 2 files changed, 145 insertions(+), 0 deletions(-)

diffs (162 lines):

diff -r 8ee2bb1d2299 -r fbbf2e6b26fd ChangeLog
--- a/ChangeLog	Tue Oct 22 09:40:59 2013 +0200
+++ b/ChangeLog	Wed Oct 23 10:55:13 2013 +0200
@@ -1,3 +1,8 @@
+2013-10-23  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java:
+	Another ten new tests added into BitBltAffineQuadrantRotateTransformOp test suite.
+
 2013-10-22  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltUsingBgColor.java:
diff -r 8ee2bb1d2299 -r fbbf2e6b26fd src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java
--- a/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java	Tue Oct 22 09:40:59 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java	Wed Oct 23 10:55:13 2013 +0200
@@ -753,6 +753,146 @@
     }
 
     /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeIntARGBRotateTransformation4Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, RotateTransformationNearest1Op[4]);
+    }
+
+    /**
+      Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeIntARGBRotateTransformation5Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeIntARGB(image, graphics2d, RotateTransformationNearest1Op[5]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeIntARGBPreRotateTransformation0Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, RotateTransformationNearest1Op[0]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeIntARGBPreRotateTransformation1Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, RotateTransformationNearest1Op[1]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeIntARGBPreRotateTransformation2Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, RotateTransformationNearest1Op[2]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeIntARGBPreRotateTransformation3Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, RotateTransformationNearest1Op[3]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeIntARGBPreRotateTransformation4Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, RotateTransformationNearest1Op[4]);
+    }
+
+    /**
+      Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeIntARGBPreRotateTransformation5Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeIntARGBPre(image, graphics2d, RotateTransformationNearest1Op[5]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_INT_RGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeIntRGBRotateTransformation0Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, RotateTransformationNearest1Op[0]);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_INT_RGB.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeIntRGBRotateTransformation1Nearest1Op(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeIntRGB(image, graphics2d, RotateTransformationNearest1Op[1]);
+    }
+
+    /**
      * Entry point to the test suite.
      *
      * @param args not used in this case

From ptisnovs at icedtea.classpath.org  Wed Oct 23 01:57:23 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Wed, 23 Oct 2013 08:57:23 +0000
Subject: /hg/rhino-tests: Added new testGetResourceNPETest case into
Message-ID: <hg.142e3c159b8e.1382518643.-6019694633368342460@icedtea.classpath.org>

changeset 142e3c159b8e in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=142e3c159b8e
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Wed Oct 23 11:00:30 2013 +0200

	Added new testGetResourceNPETest case into
	ScriptContextClassTest.


diffstat:

 ChangeLog                                      |   6 ++++++
 src/org/RhinoTests/ScriptContextClassTest.java |  13 +++++++++++++
 2 files changed, 19 insertions(+), 0 deletions(-)

diffs (36 lines):

diff -r 21d27ab5696b -r 142e3c159b8e ChangeLog
--- a/ChangeLog	Tue Oct 22 09:38:37 2013 +0200
+++ b/ChangeLog	Wed Oct 23 11:00:30 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-23  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/ScriptContextClassTest.java:
+	Added new testGetResourceNPETest case into
+	ScriptContextClassTest.
+
 2013-10-22  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/BindingsClassTest.java:
diff -r 21d27ab5696b -r 142e3c159b8e src/org/RhinoTests/ScriptContextClassTest.java
--- a/src/org/RhinoTests/ScriptContextClassTest.java	Tue Oct 22 09:38:37 2013 +0200
+++ b/src/org/RhinoTests/ScriptContextClassTest.java	Wed Oct 23 11:00:30 2013 +0200
@@ -1579,6 +1579,19 @@
     }
 
     /**
+     * Test for method javax.script.ScriptContext.getClass().getResourceNPETest()
+     */
+    protected void testGetResourceNPETest() {
+        try {
+            Object resource = this.scriptContextClass.getResource(null);
+            throw new AssertionError("NullPointerException expected!");
+        }
+        catch (NullPointerException e) {
+            //This is OK OK
+        }
+    }
+
+    /**
      * Test for instanceof operator applied to a class javax.script.ScriptContext
      */
     @SuppressWarnings("cast")

From jvanek at icedtea.classpath.org  Wed Oct 23 08:52:38 2013
From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org)
Date: Wed, 23 Oct 2013 15:52:38 +0000
Subject: /hg/icedtea-web: C-part of plugin is now also trying to follow XDG
Message-ID: <hg.df5cb12080fa.1382543558.8643924302249223276@icedtea.classpath.org>

changeset df5cb12080fa in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=df5cb12080fa
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Oct 23 17:52:18 2013 +0200

	C-part of plugin is now also trying to follow XDG
	* plugin/icedteanp/IcedTeaParseProperties.cc: (user_properties_file) is now using XDG cached dir or its default variant in case that old file do not (should not!) exists


diffstat:

 ChangeLog                                  |   7 +++++++
 plugin/icedteanp/IcedTeaParseProperties.cc |  15 ++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)

diffs (39 lines):

diff -r c6c2998cc359 -r df5cb12080fa ChangeLog
--- a/ChangeLog	Tue Oct 22 16:21:40 2013 -0400
+++ b/ChangeLog	Wed Oct 23 17:52:18 2013 +0200
@@ -1,3 +1,10 @@
+2013-10-23  Jiri Vanek  <jvanek at redhat.com>
+
+	C-part of plugin is now also trying to follow XDG
+	* plugin/icedteanp/IcedTeaParseProperties.cc: (user_properties_file) is
+	now using XDG cached dir or its default variant in case that old file do not
+	(should not!) exists
+
 2013-10-22  Omair Majid  <omajid at redhat.com>
 
 	* netx/net/sourceforge/jnlp/util/logging/LogConfig.java
diff -r c6c2998cc359 -r df5cb12080fa plugin/icedteanp/IcedTeaParseProperties.cc
--- a/plugin/icedteanp/IcedTeaParseProperties.cc	Tue Oct 22 16:21:40 2013 -0400
+++ b/plugin/icedteanp/IcedTeaParseProperties.cc	Wed Oct 23 17:52:18 2013 +0200
@@ -105,7 +105,20 @@
 string  user_properties_file(){
 	int myuid = getuid();
 	struct passwd *mypasswd = getpwuid(myuid);
-	return string(mypasswd->pw_dir)+"/.icedtea/"+default_file_ITW_deploy_props_name;
+	// try pre 1.5  file location
+	string old_name = string(mypasswd->pw_dir)+"/.icedtea/"+default_file_ITW_deploy_props_name;
+	//exists? then itw was not yet migrated. Use it
+	if (IcedTeaPluginUtilities::file_exists(old_name)) {
+		PLUGIN_ERROR("IcedTea-Web plugin is using out-dated configuration");
+		return old_name;
+	}
+	//we are probably  on XDG specification now
+	//is specified custom value?
+	if (getenv ("XDG_CONFIG_HOME") != NULL){
+		return string(getenv ("XDG_CONFIG_HOME"))+"/icedtea-web/"+default_file_ITW_deploy_props_name;
+	}
+	//if not then use default
+	return string(mypasswd->pw_dir)+"/.config/icedtea-web/"+default_file_ITW_deploy_props_name;
 }
 
 

From bugzilla-daemon at icedtea.classpath.org  Wed Oct 23 09:01:09 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 23 Oct 2013 16:01:09 +0000
Subject: [Bug 1588] New: SIGSEGV in Eclipse
Message-ID: <bug-1588-30@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1588

            Bug ID: 1588
           Summary: SIGSEGV in Eclipse
    Classification: Unclassified
           Product: IcedTea
           Version: unspecified
          Hardware: x86_64
                OS: Linux
            Status: NEW
          Severity: normal
          Priority: P3
         Component: IcedTea
          Assignee: gnu.andrew at redhat.com
          Reporter: jochen.wiedmann at gmail.com
                CC: unassigned at icedtea.classpath.org

Created attachment 961
  --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=961&action=edit
hs_error.log, as described in the crash report

#
# A fatal error has been detected by the Java Runtime Environment:
#
#  SIGSEGV (0xb) at pc=0x00007f061c18da78, pid=6240, tid=139664154392320
#
# JRE version: OpenJDK Runtime Environment (7.0_45-b15) (build
1.7.0_45-mockbuild_2013_10_16_17_47-b00)
# Java VM: OpenJDK 64-Bit Server VM (24.45-b08 mixed mode linux-amd64
compressed oops)
# Problematic frame:
# V  [libjvm.so+0x61fa78]  JVM_FindSignal+0x14878
#
# Failed to write core dump. Core dumps have been disabled. To enable core
dumping, try "ulimit -c unlimited" before starting Java again
#
# An error report file with more information is saved as:
# /tmp/jvm-6240/hs_error.log
#
# If you would like to submit a bug report, please include
# instructions on how to reproduce the bug and visit:
#   http://icedtea.classpath.org/bugzilla
#

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131023/c328b04c/attachment.html 

From jvanek at redhat.com  Wed Oct 23 10:37:17 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Wed, 23 Oct 2013 19:37:17 +0200
Subject: [rfc][icedtea-web] refactored logging for plugin
In-Reply-To: <5266B1CC.9030009@redhat.com>
References: <5266A13B.1000509@redhat.com> <5266B1CC.9030009@redhat.com>
Message-ID: <5268094D.2090904@redhat.com>

On 10/22/2013 07:11 PM, Andrew Azores wrote:
> On 10/22/2013 12:00 PM, Jiri Vanek wrote:
>> Hi!
>>
>> This is adding possibility to configure plugin debug via itw-settings, is getting rid of
>> uncontrolled print outs, and add java-like headers (if enabled)
>> Please, do  not look  on duplicated code in PLUGIN_{error,debug} macros, I will get rid of it when
>> I will do  enty points for file log and system log.
>>
>> I have intentionally ignored way to force plugin debug via -verbose sent via itw-settings jvm
>> parameters. Imho it will be missus.
>>
>> J.
>
> Applying this patch makes my Firefox immediately crash when trying to visit any page with a Java
> applet. On my F19 workstation, there is no terminal output at all when this happens, but Mozilla's
> automatic bug reporter does open. On my laptop running Arch, there is no bug reporter and nothing
> especially helpful is printed either, but it does tell me there was a segfault. On my laptop this
> can happen at any time, not just when visiting a page with an applet. I don't really know why that's
> happening the way it is, but I've never had this behaviour at all before applying this patch, and
> after the patch it's very reproducible :(
>
> Thanks,
>

Well yes, I can confirm the issue (now on latest f19).  The initial patch was written on f14, jdk6 
.. legacy gcc... And I swear it was working. (probably not depending on ff as even cpp tests were 
passing on f14, failing on f19)


The attached patch is working fine (needs review!!! :) and only difference is initialisation of 
variables. The initialisation of variables is touching files, loading custom jre and so on, however 
i do not know why they failed when used where they were.

Right now, the initialisation is :

+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Wed Oct 23 19:29:21 2013 +0200
@@ -214,6 +214,10 @@
  static guint appletviewer_watch_id = -1;

  int plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL;
+bool plugin_debug_headers = false;
+bool plugin_debug_to_file = false ;
+bool plugin_debug_to_streams = true ;
+bool plugin_debug_to_system = false;
  int plugin_debug_suspend = (getenv("ICEDTEAPLUGIN_DEBUG") != NULL) &&
          (strcmp(getenv("ICEDTEAPLUGIN_DEBUG"), "suspend") == 0);


... and ...

@@ -1843,6 +1847,11 @@
  NPError
  NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable)
  {
+   plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL || is_debug_on();
+   plugin_debug_headers = is_debug_header_on();
+   plugin_debug_to_file = is_logging_to_file();
+   plugin_debug_to_streams = is_logging_to_stds();
+   plugin_debug_to_system = is_logging_to_system();
    PLUGIN_DEBUG ("NP_Initialize\n");

    if ((browserTable == NULL) || (pluginTable == NULL))


I _hope_ that this is correct place for this call, and I'm  *not* *sure* if some debug information 
can escape with "such an late" initialisation.




Any hint welcomed !-(


J.
-------------- next part --------------
diff -r df5cb12080fa plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc	Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc	Wed Oct 23 19:29:21 2013 +0200
@@ -78,7 +78,7 @@
 					result->error_msg->append(" ");
 				}
 
-				printf("Error on Java side: %s\n", result->error_msg->c_str());
+				PLUGIN_ERROR("Error on Java side: %s\n", result->error_msg->c_str());
 
 				result->error_occurred = true;
 				result_ready = true;
@@ -947,7 +947,7 @@
                 java_result = java_request.newArray(java_array_type, length_str);
 
                 if (java_result->error_occurred) {
-                    printf("Unable to create array\n");
+                    PLUGIN_ERROR("Unable to create array\n");
                     id->append("-1");
                     return;
                 }
@@ -966,7 +966,7 @@
                     createJavaObjectFromVariant(instance, value, &value_id);
 
                     if (value_id == "-1") {
-                        printf("Unable to populate array\n");
+                        PLUGIN_ERROR("Unable to populate array\n");
                         id->clear();
                         id->append("-1");
                         return;
@@ -1002,7 +1002,7 @@
                 // the result we want is in result_string (assuming there was no error)
                 if (java_result->error_occurred)
                 {
-                    printf("Unable to get JSObject class id\n");
+                    PLUGIN_ERROR("Unable to get JSObject class id\n");
                     id->clear();
                     id->append("-1");
                     return;
@@ -1018,7 +1018,7 @@
                 // the result we want is in result_string (assuming there was no error)
                 if (java_result->error_occurred)
                 {
-                    printf("Unable to get JSObject constructor id\n");
+                    PLUGIN_ERROR("Unable to get JSObject constructor id\n");
                     id->clear();
                     id->append("-1");
                     return;
@@ -1042,7 +1042,7 @@
                 // the result we want is in result_string (assuming there was no error)
                 if (java_result->error_occurred)
                 {
-                    printf("Unable to create JSObject\n");
+                    PLUGIN_ERROR("Unable to create JSObject\n");
                     id->clear();
                     id->append("-1");
                     return;
@@ -1059,7 +1059,7 @@
 
 		// the result we want is in result_string (assuming there was no error)
 		if (java_result->error_occurred) {
-			printf("Unable to find classid for %s\n", className.c_str());
+			PLUGIN_ERROR("Unable to find classid for %s\n", className.c_str());
 			id->append("-1");
 			return;
 		}
@@ -1074,7 +1074,7 @@
 
 		// the result we want is in result_string (assuming there was no error)
 		if (java_result->error_occurred) {
-			printf("Unable to find string constructor for %s\n", className.c_str());
+			PLUGIN_ERROR("Unable to find string constructor for %s\n", className.c_str());
 			id->append("-1");
             return;
 		}
@@ -1086,7 +1086,7 @@
 		java_result = java_request.newString(stringArg);
 
 		if (java_result->error_occurred) {
-			printf("Unable to create requested object\n");
+			PLUGIN_ERROR("Unable to create requested object\n");
 			id->append("-1");
             return;
 		}
@@ -1099,7 +1099,7 @@
 		java_result = java_request.newObjectWithConstructor("[System]", jsObjectClassID, jsObjectConstructorID, args);
 
         if (java_result->error_occurred) {
-            printf("Unable to create requested object\n");
+            PLUGIN_ERROR("Unable to create requested object\n");
             id->append("-1");
             return;
         }
diff -r df5cb12080fa plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Wed Oct 23 19:29:21 2013 +0200
@@ -214,6 +214,10 @@
 static guint appletviewer_watch_id = -1;
 
 int plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL;
+bool plugin_debug_headers = false;
+bool plugin_debug_to_file = false ;
+bool plugin_debug_to_streams = true ;
+bool plugin_debug_to_system = false;
 int plugin_debug_suspend = (getenv("ICEDTEAPLUGIN_DEBUG") != NULL) &&
         (strcmp(getenv("ICEDTEAPLUGIN_DEBUG"), "suspend") == 0);
 
@@ -248,7 +252,7 @@
             if (IcedTeaPluginUtilities::file_exists(custom_jre+"/bin/java")){
                   return custom_jre+"/bin/java";
             } else {
-                 fprintf(stderr, "Your custom jre (/bin/java check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
+                 PLUGIN_ERROR("Your custom jre (/bin/java check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
             }
       }
       return appletviewer_default_executable;      
@@ -261,7 +265,7 @@
             if (IcedTeaPluginUtilities::file_exists(custom_jre+"/lib/rt.jar")){
                   return custom_jre+"/lib/rt.jar";
             } else {
-                  fprintf(stderr, "Your custom jre (/lib/rt.jar check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
+                  PLUGIN_ERROR("Your custom jre (/lib/rt.jar check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
             }
       }
       return appletviewer_default_rtjar;      
@@ -317,7 +321,7 @@
   identifier = browser_functions.getstringidentifier("document");
   if (!browser_functions.hasproperty(instance, window_ptr, identifier))
   {
-	printf("%s not found!\n", "document");
+	PLUGIN_ERROR("%s not found!\n", "document");
   }
   browser_functions.getproperty(instance, window_ptr, identifier, &member_ptr);
 
@@ -1843,6 +1847,11 @@
 NPError
 NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable)
 {
+   plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL || is_debug_on();
+   plugin_debug_headers = is_debug_header_on();
+   plugin_debug_to_file = is_logging_to_file();
+   plugin_debug_to_streams = is_logging_to_stds();
+   plugin_debug_to_system = is_logging_to_system();
   PLUGIN_DEBUG ("NP_Initialize\n");
 
   if ((browserTable == NULL) || (pluginTable == NULL))
@@ -1903,7 +1912,7 @@
   np_error = plugin_test_appletviewer ();
   if (np_error != NPERR_NO_ERROR)
     {
-      fprintf(stderr, "Unable to find java executable %s\n", get_plugin_executable().c_str());
+      PLUGIN_ERROR("Unable to find java executable %s\n", get_plugin_executable().c_str());
       return np_error;
     }
 
@@ -2110,7 +2119,7 @@
 
         if (java_result->error_occurred)
         {
-            printf("Error: Unable to fetch applet instance id from Java side.\n");
+            PLUGIN_ERROR("Error: Unable to fetch applet instance id from Java side.\n");
             return NULL;
         }
 
@@ -2120,7 +2129,7 @@
 
         if (java_result->error_occurred)
         {
-            printf("Error: Unable to fetch applet instance id from Java side.\n");
+            PLUGIN_ERROR("Error: Unable to fetch applet instance id from Java side.\n");
             return NULL;
         }
 
diff -r df5cb12080fa plugin/icedteanp/IcedTeaNPPlugin.h
--- a/plugin/icedteanp/IcedTeaNPPlugin.h	Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaNPPlugin.h	Wed Oct 23 19:29:21 2013 +0200
@@ -115,8 +115,12 @@
 /* Mutex around plugin async call queue ops */
 extern pthread_mutex_t pluginAsyncCallMutex;
 
-// debug switch
+// debug switches
 extern int plugin_debug;
+extern bool plugin_debug_headers;
+extern bool plugin_debug_to_file;
+extern bool plugin_debug_to_streams;
+extern bool plugin_debug_to_system;
 
 // Browser function table.
 extern NPNetscapeFuncs browser_functions;
diff -r df5cb12080fa plugin/icedteanp/IcedTeaParseProperties.cc
--- a/plugin/icedteanp/IcedTeaParseProperties.cc	Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaParseProperties.cc	Wed Oct 23 19:29:21 2013 +0200
@@ -50,7 +50,7 @@
 
 
 #include "IcedTeaPluginUtils.h"
-
+#include "IcedTeaNPPlugin.h"
 #include "IcedTeaParseProperties.h"
 /*
  The public api is nearly impossible to test due to "hardcoded paths"
@@ -197,6 +197,35 @@
 	bool found = find_system_config_file(futurefile);
 	return read_deploy_property_value(user_properties_file(), futurefile, found, property, dest);
 }
+
+bool  read_bool_property(string key, bool defaultValue){
+	string value;
+	if (!read_deploy_property_value(key, value)) {
+		return defaultValue;
+	}
+	if (value == "true") {
+		return true;
+	} else {
+		return false;
+	}
+}	
+
+bool  is_debug_on(){
+	return 	read_bool_property("deployment.log",false);
+}
+bool  is_debug_header_on(){
+	return 	read_bool_property("deployment.log.headers",false);
+}
+bool  is_logging_to_file(){
+	return 	read_bool_property("deployment.log.file",false);
+}
+bool  is_logging_to_stds(){
+	return 	read_bool_property("deployment.log.stdstreams",true);
+}
+bool  is_logging_to_system(){
+	return 	read_bool_property("deployment.log.system",true);
+}
+
 //abstraction for testing purposes
 bool  read_deploy_property_value(string user_file, string system_file, bool usesystem_file, string property, string& dest){
 	//is it in user's file?
diff -r df5cb12080fa plugin/icedteanp/IcedTeaParseProperties.h
--- a/plugin/icedteanp/IcedTeaParseProperties.h	Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaParseProperties.h	Wed Oct 23 19:29:21 2013 +0200
@@ -47,6 +47,11 @@
 bool  find_system_config_file(std::string& dest);
 bool  find_custom_jre(std::string& dest);
 bool  read_deploy_property_value(std::string property, std::string& dest);
+bool  is_debug_on();
+bool  is_debug_header_on();
+bool  is_logging_to_file();
+bool  is_logging_to_stds();
+bool  is_logging_to_system();
 //half public api
 const std::string default_file_ITW_deploy_props_name = "deployment.properties";
 const std::string custom_jre_key = "deployment.jre.dir";
diff -r df5cb12080fa plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Wed Oct 23 19:29:21 2013 +0200
@@ -440,7 +440,7 @@
         // the result we want is in result_string (assuming there was no error)
         if (java_result->error_occurred)
         {
-	    printf("Unable to get member name for setMember. Error occurred: %s\n", java_result->error_msg->c_str());
+	    PLUGIN_ERROR("Unable to get member name for setMember. Error occurred: %s\n", java_result->error_msg->c_str());
             //goto cleanup;
         }
 
@@ -521,7 +521,7 @@
         // the result we want is in result_string (assuming there was no error)
         if (java_result->error_occurred)
         {
-	    printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
+	    PLUGIN_ERROR("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
             //goto cleanup;
         }
 
@@ -800,7 +800,7 @@
 
     if (!browser_functions.hasproperty(instance, parent_ptr, member_identifier))
     {
-        printf("%s not found!\n", IcedTeaPluginUtilities::NPIdentifierAsString(member_identifier).c_str());
+        PLUGIN_ERROR("%s not found!\n", IcedTeaPluginUtilities::NPIdentifierAsString(member_identifier).c_str());
     }
     ((AsyncCallThreadData*) data)->call_successful = browser_functions.getproperty(instance, parent_ptr, member_identifier, member_ptr);
 
diff -r df5cb12080fa plugin/icedteanp/IcedTeaPluginUtils.cc
--- a/plugin/icedteanp/IcedTeaPluginUtils.cc	Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaPluginUtils.cc	Wed Oct 23 19:29:21 2013 +0200
@@ -399,7 +399,7 @@
 
 	wchar_t c;
 
-	if (plugin_debug) printf("Converted UTF-16LE string: ");
+	PLUGIN_DEBUG("Converted UTF-16LE string: ");
 
 	result_unicode_str->clear();
 	for (int i = begin; i < begin+length; i+=2)
@@ -413,14 +413,14 @@
         	(c >= 'A' && c <= 'Z') ||
         	(c >= '0' && c <= '9'))
         {
-        	if (plugin_debug) printf("%c", c);
+        	PLUGIN_DEBUG("%c", c);
         }
 
         result_unicode_str->push_back(c);
 	}
 
 	// not routing via debug print macros due to wide-string issues
-	if (plugin_debug) printf(". Length=%d\n", result_unicode_str->length());
+	PLUGIN_DEBUG(". Length=%d\n", result_unicode_str->length());
 }
 
 /*
diff -r df5cb12080fa plugin/icedteanp/IcedTeaPluginUtils.h
--- a/plugin/icedteanp/IcedTeaPluginUtils.h	Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaPluginUtils.h	Wed Oct 23 19:29:21 2013 +0200
@@ -45,6 +45,8 @@
 
 #include <pthread.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
 
 #include <cstring>
 #include <iostream>
@@ -59,30 +61,50 @@
 #include <glib.h>
 #include <npruntime.h>
 
-#define PLUGIN_DEBUG(...)                                      \
-  do                                                           \
-  {                                                            \
-    if (plugin_debug)                                          \
-    {                                                          \
-      fprintf (stdout, "ITNPP Thread# %ld: ", pthread_self()); \
-      fprintf (stdout, __VA_ARGS__);                           \
-    }                                                          \
+
+// debugging macro.
+#define PLUGIN_DEBUG(...)                                          \
+  do                                                               \
+  {                                                                \
+    if (plugin_debug)  {                                           \
+      if (plugin_debug_to_streams) {                               \
+	    if (plugin_debug_headers) {                                \
+          char s[1000];                                            \
+          time_t t = time(NULL);                                   \
+          struct tm * p = localtime(&t);                           \
+          strftime(s, 1000, "%a %b %d %H:%M:%S %Z %Y", p);                    \
+          const char *userNameforDebug = (getenv("USERNAME") == NULL) ? "unknown user" : getenv("USERNAME"); \
+	      fprintf  (stdout, "[%s][ITW-C-PLUGIN][MESSAGE_DEBUG][%s][%s:%d] ITNPP Thread# %ld: ",          \
+            userNameforDebug, s, __FILE__, __LINE__,  pthread_self());                                     \
+	    }                                                          \
+      fprintf (stdout, __VA_ARGS__);                               \
+	  }                                                            \
+    }                                                              \
   } while (0)
   
-  // Error reporting macros.
+// Error reporting macro.
 #define PLUGIN_ERROR(...)                                   \
-do                                                          \
+  do                                                        \
   {                                                         \
-        fprintf  (stderr, "%s:%d: thread %p: Error: %s\n",  \
-               __FILE__, __LINE__,                          \
-              g_thread_self (), __VA_ARGS__);               \
+    if (plugin_debug_to_streams) {                          \
+      if (plugin_debug_headers) {                           \
+        char s[1000];                                       \
+        time_t t = time(NULL);                              \
+        struct tm * p = localtime(&t);                      \
+        strftime(s, 1000, "%A, %B %d %Y", p);               \
+        const char *userNameforDebug = (getenv("USERNAME") == NULL) ? "unknown user" : getenv("USERNAME"); \
+        fprintf  (stderr, "[%s][ITW-C-PLUGIN][ERROR_ALL][%s][%s:%d] thread %p: ",  \
+          userNameforDebug, s, __FILE__, __LINE__, g_thread_self ());                \
+		}                                                   \
+		fprintf  (stderr,  __VA_ARGS__);                    \
+	  }                                                     \
    } while (0)
 
 #define CHECK_JAVA_RESULT(result_data)                               \
 {                                                                    \
     if (((JavaResultData*) result_data)->error_occurred)             \
     {                                                                \
-        printf("Error: Error occurred on Java side: %s.\n",          \
+        PLUGIN_ERROR("Error: Error occurred on Java side: %s.\n",    \
                ((JavaResultData*) result_data)->error_msg->c_str()); \
         return;                                                      \
     }                                                                \
diff -r df5cb12080fa plugin/icedteanp/IcedTeaScriptablePluginObject.cc
--- a/plugin/icedteanp/IcedTeaScriptablePluginObject.cc	Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaScriptablePluginObject.cc	Wed Oct 23 19:29:21 2013 +0200
@@ -49,19 +49,19 @@
 void
 IcedTeaScriptablePluginObject::deAllocate(NPObject *npobj)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::deAllocate %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::deAllocate %p\n", npobj);
 }
 
 void
 IcedTeaScriptablePluginObject::invalidate(NPObject *npobj)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::invalidate %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::invalidate %p\n", npobj);
 }
 
 bool
 IcedTeaScriptablePluginObject::hasMethod(NPObject *npobj, NPIdentifier name_id)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::hasMethod %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::hasMethod %p\n", npobj);
 	return false;
 }
 
@@ -69,7 +69,7 @@
 IcedTeaScriptablePluginObject::invoke(NPObject *npobj, NPIdentifier name_id, const NPVariant *args,
 			uint32_t argCount,NPVariant *result)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::invoke %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::invoke %p\n", npobj);
 	return false;
 }
 
@@ -77,14 +77,14 @@
 IcedTeaScriptablePluginObject::invokeDefault(NPObject *npobj, const NPVariant *args,
 			       uint32_t argCount, NPVariant *result)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::invokeDefault %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::invokeDefault %p\n", npobj);
 	return false;
 }
 
 bool
 IcedTeaScriptablePluginObject::hasProperty(NPObject *npobj, NPIdentifier name_id)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::hasProperty %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::hasProperty %p\n", npobj);
 	return false;
 }
 
@@ -97,7 +97,7 @@
 		//NPObject* obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(getInstanceFromMemberPtr(npobj), name);
 		//OBJECT_TO_NPVARIANT(obj, *result);
 
-		//printf ("Filling variant %p with object %p\n", result);
+		//PLUGIN_ERROR ("Filling variant %p with object %p\n", result);
 	}
 
 	return false;
@@ -106,21 +106,21 @@
 bool
 IcedTeaScriptablePluginObject::setProperty(NPObject *npobj, NPIdentifier name_id, const NPVariant *value)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::setProperty %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::setProperty %p\n", npobj);
 	return false;
 }
 
 bool
 IcedTeaScriptablePluginObject::removeProperty(NPObject *npobj, NPIdentifier name_id)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::removeProperty %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::removeProperty %p\n", npobj);
 	return false;
 }
 
 bool
 IcedTeaScriptablePluginObject::enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::enumerate %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::enumerate %p\n", npobj);
 	return false;
 }
 
@@ -128,7 +128,7 @@
 IcedTeaScriptablePluginObject::construct(NPObject *npobj, const NPVariant *args, uint32_t argCount,
 	           NPVariant *result)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::construct %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::construct %p\n", npobj);
 	return false;
 }
 
@@ -221,7 +221,7 @@
 IcedTeaScriptableJavaPackageObject::invoke(NPObject *npobj, NPIdentifier name_id, const NPVariant *args,
 			uint32_t argCount,NPVariant *result)
 {
-	printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::invoke %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::invoke %p\n", npobj);
 	return false;
 }
 
@@ -229,7 +229,7 @@
 IcedTeaScriptableJavaPackageObject::invokeDefault(NPObject *npobj, const NPVariant *args,
 			       uint32_t argCount, NPVariant *result)
 {
-	printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::invokeDefault %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::invokeDefault %p\n", npobj);
 	return false;
 }
 
@@ -338,14 +338,14 @@
 bool
 IcedTeaScriptableJavaPackageObject::removeProperty(NPObject *npobj, NPIdentifier name_id)
 {
-	printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::removeProperty %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::removeProperty %p\n", npobj);
 	return false;
 }
 
 bool
 IcedTeaScriptableJavaPackageObject::enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
 {
-	printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::enumerate %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::enumerate %p\n", npobj);
 	return false;
 }
 
@@ -353,7 +353,7 @@
 IcedTeaScriptableJavaPackageObject::construct(NPObject *npobj, const NPVariant *args, uint32_t argCount,
 	           NPVariant *result)
 {
-	printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::construct %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::construct %p\n", npobj);
 	return false;
 }
 
@@ -524,7 +524,7 @@
 
         if (id == "-1")
         {
-            printf("Unable to create arguments on Java side\n");
+            PLUGIN_ERROR("Unable to create arguments on Java side\n");
             return false;
         }
 
@@ -622,7 +622,7 @@
             java_result = java_request.getArrayLength(instance_id);
             if (java_result->error_occurred)
             {
-                printf("ERROR: Couldn't fetch array length\n");
+                PLUGIN_ERROR("ERROR: Couldn't fetch array length\n");
                 return false;
             }
 
@@ -698,7 +698,7 @@
         // If array
         if (scriptable_object->is_object_array && name == "length")
         {
-            printf("ERROR: Array length is not a modifiable property\n");
+            PLUGIN_ERROR("ERROR: Array length is not a modifiable property\n");
             return false;
         } else if ( scriptable_object->is_object_array &&
                     browser_functions.intfromidentifier(name_id) >= 0) // else if array and requesting index
@@ -707,7 +707,7 @@
             JavaResultData* java_result = java_request.getArrayLength(instance_id);
             if (java_result->error_occurred)
             {
-                printf("ERROR: Couldn't fetch array length\n");
+                PLUGIN_ERROR("ERROR: Couldn't fetch array length\n");
                 return false;
             }
 
diff -r df5cb12080fa plugin/icedteanp/IcedTeaScriptablePluginObject.h
--- a/plugin/icedteanp/IcedTeaScriptablePluginObject.h	Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaScriptablePluginObject.h	Wed Oct 23 19:29:21 2013 +0200
@@ -175,7 +175,7 @@
             const NPVariant *args, uint32_t argCount, NPVariant *result);
     static bool invokeDefault(NPObject *npobj, const NPVariant *args,
             uint32_t argCount, NPVariant *result) {
-        printf ("** Unimplemented: IcedTeaScriptableJavaObject::invokeDefault %p\n", npobj);
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaObject::invokeDefault %p\n", npobj);
         return false;
     }
     static bool hasProperty(NPObject *npobj, NPIdentifier name_id);
@@ -185,12 +185,12 @@
             const NPVariant *value);
 
     static bool removeProperty(NPObject *npobj, NPIdentifier name_id) {
-        printf ("** Unimplemented: IcedTeaScriptableJavaObject::removeProperty %p\n", npobj);
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaObject::removeProperty %p\n", npobj);
         return false;
     }
     static bool enumerate(NPObject *npobj, NPIdentifier **value,
             uint32_t *count) {
-        printf ("** Unimplemented: IcedTeaScriptableJavaObject::enumerate %p\n", npobj);
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaObject::enumerate %p\n", npobj);
         return false;
     }
     static bool construct(NPObject *npobj, const NPVariant *args,

From aazores at redhat.com  Wed Oct 23 13:36:10 2013
From: aazores at redhat.com (Andrew Azores)
Date: Wed, 23 Oct 2013 16:36:10 -0400
Subject: [icedtea-web] (PR1513) Signed JAR with external main-class
In-Reply-To: <20131021214312.GA1526@redhat.com>
References: <526177BA.7020301@redhat.com> <20131018200616.GA14560@redhat.com>
	<52658D92.7060104@redhat.com> <20131021214312.GA1526@redhat.com>
Message-ID: <5268333A.5080507@redhat.com>

On 10/21/2013 05:43 PM, Omair Majid wrote:
> * Andrew Azores <aazores at redhat.com> [2013-10-21 16:24]:
>> On 10/18/2013 04:06 PM, Omair Majid wrote:
>>> * Andrew Azores <aazores at redhat.com> [2013-10-18 14:04]:
>>>> Hi,
>>>>
>>>> The applet in the PR1513 report fails to launch due to the following
>>>> check in JNLPClassLoader#initializeResources():
>>>>
>>>> // If jar with main class was not found and there are no more
>>>> // available jars, throw a LaunchException
>>>> if (file.getLaunchInfo() != null) {
>>>>      if (!foundMainJar // && (available == null || available.size() == 0))
>>>>          throw new LaunchException(file, null, R("LSFatal"),
>>>>                  R("LCClient"), R("LCantDetermineMainClass"),
>>>>                  R("LCantDetermineMainClassInfo"));
>>>> }
>>> /me grumbles about comments that reiterate what the code is doing
>>> without explaining why.
>> Yep. Sometimes I find comments that I really just want to remove...
>>
>> // initialize extensions
>> initializeExtensions();
> Feel free to remove them.
>
>> I'm not sure what you mean but I think my last email might've been a
>> little confusing about this. To be clear, the loading/execution of
>> the arbitrary class files while also displaying a "fully trusted"
>> message only happens when taking the naive approach to making the
>> PR1513 applet run, which is just removing that LaunchException
>> completely and doing nothing else. This lets the applet run (since
>> other than the signing issue, we do generally support applets having
>> the main-class external to the JARs) but leaves the ClassLoader and
>> JarCertVerifier and whatever else still thinking that the applet is
>> fully trusted, which is wrong. What we currently do never involves
>> loading any unverified classes while claiming everything is
>> verified, as far as I can tell.
> I am curious about the current state. Can it ever be that we load
> classes from the codebase URL _and_ claim that the applet is fully
> signed?

I don't think so, but I'll look into it further to be sure.

>
>> So what I think we need to do is not throw the LaunchException from
>> the code hunk I referenced, but instead treat the applet as if it's
>> unsigned when given the same conditions. This will not affect signed
>> applets where the main-class is within a JAR. It also won't affect
>> unsigned applets at all. Applets with signed JARs but with the
>> main-class not found will then be treated as if they are unsigned,
>> until either the main-class is found externally in the codebase (at
>> which point we run the applet as if it's unsigned), or the
>> main-class is just not found at all, in which case a LaunchException
>> should occur elsewhere anyway (I'll need to verify that this
>> actually happens however, we might end up with some other less
>> informative error). Does this seem right?
> Yes, this sounds like the correct fix. I don't know if it will be a
> simple one (code-wise), though.
>
> Cheers,
> Omair

Fix and reproducer patches attached. The fix is a little bit of an ugly 
workaround I guess, but I think a nicer solution would involve rewriting 
a lot of other things. Maybe that can come later on down the road.

What happens here is that if the JNLPFile's main-class is marked as 
external by the JNLPClassLoader, then the AppVerifiers will never use 
AccessType.VERIFIED. Instead, either SIGNING_ERROR or UNVERIFIED will be 
used. Which one depends on CertInformation#isRootInCaCerts(). If this 
returns true then you get the "signing error" dialog box, else you get 
the "unverified" message. The classloader still considers the applet to 
be signed, however. I figured it was better to tell the user there's a 
signing trust issue and ask for confirmation to run with full 
permissions, rather than restricting the applet to sandbox permissions, 
since the signed portion of the applet could very well require more 
permissions than that.

I guess now this mail has become an [rfc]...

ChangeLog:

Fix bug where signed applets with main-class located outside of JAR(s) 
would not be able to launch (PR1513)
* netx/net/sourceforge/jnlp/JNLPFile.java: (externalMainClass, 
setMainClassIsExternal, isMainClassExternal) new field and methods for 
marking or checking that an applet's main-class is external to its JAR(s)
* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: 
(initializeResources) mark JNLPFile with external main-class as 
appropriate. Do not throw LaunchExceptions for signed applets with 
external main-class
* netx/net/sourceforge/jnlp/security/JNLPAppVerifier.java: 
(checkTrustWithUser) if main-class is external, do not claim applet is 
verified
* netx/net/sourceforge/jnlp/security/PluginAppVerifier.java: 
(checkTrustWithUser) if main-class is external, do not claim applet is 
verified

* 
tests/reproducers/custom/SignedAppletExternalMainClass/resources/SignedAppletExternalMainClass.html: 
new test to ensure signed applets with external main classes can launch
* tests/reproducers/custom/SignedAppletExternalMainClass/srcs/Makefile: same
* 
tests/reproducers/custom/SignedAppletExternalMainClass/srcs/SignedAppletExternalMainClass.java: 
same
* 
tests/reproducers/custom/SignedAppletExternalMainClass/srcs/SignedAppletExternalMainClassHelper.java: 
same
* 
tests/reproducers/custom/SignedAppletExternalMainClass/testcases/SignedAppletExternalMainClassTest.java: 
same


Thanks,

-- 
Andrew A

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signed-applet-external-main-class.patch
Type: text/x-patch
Size: 5905 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131023/9354262e/signed-applet-external-main-class.patch 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signed-applet-external-main-class-reproducer.patch
Type: text/x-patch
Size: 11684 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131023/9354262e/signed-applet-external-main-class-reproducer.patch 

From aazores at redhat.com  Wed Oct 23 13:45:16 2013
From: aazores at redhat.com (Andrew Azores)
Date: Wed, 23 Oct 2013 16:45:16 -0400
Subject: [rfc][icedtea-web] Malformed messages from
	IcedTeaPluginRequestProcessor (PR539)
In-Reply-To: <525715CA.7090909@redhat.com>
References: <52559A50.309@redhat.com> <525669F1.6060106@redhat.com>
	<525715CA.7090909@redhat.com>
Message-ID: <5268355C.1020406@redhat.com>

On 10/10/2013 05:02 PM, Andrew Azores wrote:
> On 10/10/2013 04:48 AM, Jiri Vanek wrote:
>> On 10/09/2013 08:02 PM, Andrew Azores wrote:
>>> Hi,
>>>
>>> PR539 was reopened with a comment that the applet at [1] no longer 
>>> works. Looking through the
>>> provided logs, an index out of bounds exception is occurring at line 
>>> 53 of
>>> GetMemberPluginCallRequest.java. This happens because the 
>>> parseReturn method expects its String
>>> param to be of the form "reference 28 JavaScriptToString 90", but 
>>> occasionally it can occur that the
>>> param is instead of the form "reference 30 JavaScriptToString ", 
>>> missing the second numeric value.
>>> This happens because of _getString and _getMember in 
>>> IcedTeaPluginRequestProcessor.cc. If
>>> data->call_successful is false in either of these functions, then 
>>> data->result is never modified
>>> from the value it held before data was passed into the functions, 
>>> which means it is an empty string.
>>> The data->call_successful struct member is set by a call to 
>>> NPNetscapeFuncs so I'm not entirely sure
>>> why it is coming back false in these cases.
>>>
>>> It's certainly not an expected situation for these messages to be 
>>> malformed, which is especially
>>> evident looking around the codebase. Many other places do similar 
>>> work as done in
>>> GetMemberPluginCallRequest.parseReturn(String), where 
>>> message.split(" ") is called and the length of
>>> the resulting array never validated. Adding a length validation to 
>>> parseReturn seems to fix this
>>> particular bug (the applet loads at least, but I'm not sure what 
>>> else this bug may be affecting) but
>>> doesn't address the issue of the message being malformed in the 
>>> first place. It seems like the
>>> expected behaviour at some point in the past would be for these 
>>> messages instead to have "null" or
>>> "void":
>>>
>>>          if (!"null".equals(args[3]) && !"void".equals(args[3]))
>>>
>>> appended to them rather than the empty string, but that does not 
>>> seem to be the case now. Appending
>>> this to the data->result string is easy enough, it can just be done 
>>> in a new else-clause for
>>> data->call_successful in _getString and _getMember. As far as I'm 
>>> able to tell this would be the
>>> earliest feasible place to do the addition. It could also be done in
>>> IcedTeaPluginRequestProcessor::sendString or ::sendMember, but these 
>>> call _getString and _getMember
>>> respectively through IcedTeaPluginUtilities::callAndWaitForResult 
>>> anyway. The patch takes the
>>> approach of adding it to _getString and _getMember. Other functions 
>>> in the file, such as _eval and
>>> _call, append "0" when call_successful is false, so this approach 
>>> makes the most sense to me. I
>>> don't see any problems that this might cause and running the 
>>> reproducers showed no new failures either.
>>>
>>> ChangeLog:
>>> Fix array index out of bounds due to malformed plugin message (PR539)
>>> * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: (_getMember, 
>>> _getString) append "null" to
>>> result when call is unsuccessful
>>>
>>> [1] 
>>> https://www.bankid.no/Hjelp-og-nyttige-verktoy/Nyttige-verktoy/Test-din-BankID/
>>>
>>> Thanks,
>>>
>>
>>
>> What about any test on this? It woould deserve at least C++ test, or 
>> mock test or reproducer (in best case all three :)
>>
>> Otherwise give sense to me.
>>
>>
>> J.
>
> Took me a while to figure out how to make a JavaScript object that 
> doesn't respond to toString(), but I got it. Attached both patches again.
>
> Note that this reproducer will currently fail whether or not you apply 
> the fix patch. Note that commit 420d72e5cee7, the one I proposed be 
> backed out a while ago, is a blocker on this bug as well. If you "hg 
> backout -r 420d72e5cee7" and then apply the reproducer patch, it will 
> fail in the manner I intend it to. Then when you apply the fix, the 
> reproducer will pass.
>
> Thanks,
>

Ping?

Thanks,

-- 
Andrew A


From ptisnovs at icedtea.classpath.org  Thu Oct 24 00:13:54 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Thu, 24 Oct 2013 07:13:54 +0000
Subject: /hg/gfx-test: Eight new common test methods added into BitBltBuf...
Message-ID: <hg.444715779c21.1382598834.-6248649288953172555@icedtea.classpath.org>

changeset 444715779c21 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=444715779c21
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Oct 24 09:17:28 2013 +0200

	Eight new common test methods added into BitBltBufferedImageOp.


diffstat:

 ChangeLog                                             |    5 +
 src/org/gfxtest/testsuites/BitBltBufferedImageOp.java |  136 ++++++++++++++++++
 2 files changed, 141 insertions(+), 0 deletions(-)

diffs (158 lines):

diff -r fbbf2e6b26fd -r 444715779c21 ChangeLog
--- a/ChangeLog	Wed Oct 23 10:55:13 2013 +0200
+++ b/ChangeLog	Thu Oct 24 09:17:28 2013 +0200
@@ -1,3 +1,8 @@
+2013-10-24  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltBufferedImageOp.java:
+	Eight new common test methods added into BitBltBufferedImageOp.
+
 2013-10-23  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java:
diff -r fbbf2e6b26fd -r 444715779c21 src/org/gfxtest/testsuites/BitBltBufferedImageOp.java
--- a/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java	Wed Oct 23 10:55:13 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltBufferedImageOp.java	Thu Oct 24 09:17:28 2013 +0200
@@ -973,6 +973,142 @@
         return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_INT_RGB, rasterOp);
     }
 
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltGridBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltGridBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_USHORT_GRAY}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltGridBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_BYTE_BINARY}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltDiagonalGridBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltDiagonalGridBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_BYTE_INDEXED}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltDiagonalGridBufferedImageTypeByteIndexed(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_BYTE_INDEXED, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_CUSTOM}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltDiagonalGridBufferedImageTypeCustom(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_CUSTOM, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for diagonal grid buffered image with type {@link BufferedImage#TYPE_3BYTE_BGR}.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    protected TestResult doBitBltDiagonalGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp);
+    }
+
     }
 
     /**

From ptisnovs at icedtea.classpath.org  Thu Oct 24 00:16:16 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Thu, 24 Oct 2013 07:16:16 +0000
Subject: /hg/rhino-tests: Added new testGetResourcePositiveTest case into
Message-ID: <hg.13dbbf4ccc49.1382598976.-6019694633368342460@icedtea.classpath.org>

changeset 13dbbf4ccc49 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=13dbbf4ccc49
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Oct 24 09:20:05 2013 +0200

	Added new testGetResourcePositiveTest case into
	BindingsClassTest.


diffstat:

 ChangeLog                                 |  6 ++++++
 src/org/RhinoTests/BindingsClassTest.java |  9 +++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

diffs (32 lines):

diff -r 142e3c159b8e -r 13dbbf4ccc49 ChangeLog
--- a/ChangeLog	Wed Oct 23 11:00:30 2013 +0200
+++ b/ChangeLog	Thu Oct 24 09:20:05 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-24  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/BindingsClassTest.java:
+	Added new testGetResourcePositiveTest case into
+	BindingsClassTest.
+
 2013-10-23  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptContextClassTest.java:
diff -r 142e3c159b8e -r 13dbbf4ccc49 src/org/RhinoTests/BindingsClassTest.java
--- a/src/org/RhinoTests/BindingsClassTest.java	Wed Oct 23 11:00:30 2013 +0200
+++ b/src/org/RhinoTests/BindingsClassTest.java	Thu Oct 24 09:20:05 2013 +0200
@@ -1531,6 +1531,15 @@
     }
 
     /**
+     * Test for method javax.script.Bindings.getClass().getResourceAsStreamPositiveTest()
+     */
+    protected void testGetResourceAsStreamPositiveTest() {
+        Object stream;
+        stream = this.bindingsClass.getResourceAsStream("/org/RhinoTests/AbstractScriptEngineClassTest.class");
+        assertNotNull(stream, "getResourceAsStream(\"/org/RhinoTests/AbstractScriptEngineClassTest.class\") returns null");
+    }
+
+    /**
      * Test for instanceof operator applied to a class javax.script.Bindings
      */
     @SuppressWarnings("cast")

From jvanek at redhat.com  Thu Oct 24 01:48:43 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Thu, 24 Oct 2013 10:48:43 +0200
Subject: [rfc][icedtea-web] Malformed messages from
	IcedTeaPluginRequestProcessor (PR539)
In-Reply-To: <5268355C.1020406@redhat.com>
References: <52559A50.309@redhat.com> <525669F1.6060106@redhat.com>
	<525715CA.7090909@redhat.com> <5268355C.1020406@redhat.com>
Message-ID: <5268DEEB.5040506@redhat.com>

> Ping?

Thanx for ping, yes, ok for head. Nice reproducer - plain cpp-unittest would be probably enough for 
this. If you find time, do you think you can add cpp unittest?

Sorry for delay,
   J.


From aazores at icedtea.classpath.org  Thu Oct 24 07:15:26 2013
From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org)
Date: Thu, 24 Oct 2013 14:15:26 +0000
Subject: /hg/icedtea-web: Fix array index out of bounds due to malformed ...
Message-ID: <hg.2ab117a919e5.1382624127.8643924302249223276@icedtea.classpath.org>

changeset 2ab117a919e5 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2ab117a919e5
author: Andrew Azores <aazores at redhat.com>
date: Thu Oct 24 10:11:37 2013 -0400

	Fix array index out of bounds due to malformed plugin message (PR539)
	Failed calls to getString and getMember on JSObjects should not produce malformed
	result strings. "null" is appended to result rather than empty string.

	* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: (_getMember,
	_getString) append "null" to result when call is unsuccessful
	* tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.html:
	new test to ensure failed calls to getMember and getString on JSObject do
	not produce malformed results
	* tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.js:
	same
	* tests/reproducers/simple/JSObjectWithoutToString/srcs/JSObjectWithoutToString.java:
	same
	* tests/reproducers/simple/JSObjectWithoutToString/testcases/JSObjectWithoutToStringTest.java:
	same


diffstat:

 ChangeLog                                                                                   |  15 ++
 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc                                           |   7 +-
 tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.html     |  25 +++
 tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.js       |   8 +
 tests/reproducers/simple/JSObjectWithoutToString/srcs/JSObjectWithoutToString.java          |  11 +
 tests/reproducers/simple/JSObjectWithoutToString/testcases/JSObjectWithoutToStringTest.java |  64 ++++++++++
 6 files changed, 129 insertions(+), 1 deletions(-)

diffs (170 lines):

diff -r df5cb12080fa -r 2ab117a919e5 ChangeLog
--- a/ChangeLog	Wed Oct 23 17:52:18 2013 +0200
+++ b/ChangeLog	Thu Oct 24 10:11:37 2013 -0400
@@ -1,3 +1,18 @@
+2013-10-24  Andrew Azores  <aazores at redhat.com>
+
+	Fix array index out of bounds due to malformed plugin message (PR539)
+	* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: (_getMember,
+	_getString) append "null" to result when call is unsuccessful
+	* tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.html:
+	new test to ensure failed calls to getMember and getString on JSObject do
+	not produce malformed results
+	* tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.js:
+	same
+	* tests/reproducers/simple/JSObjectWithoutToString/srcs/JSObjectWithoutToString.java:
+	same
+	* tests/reproducers/simple/JSObjectWithoutToString/testcases/JSObjectWithoutToStringTest.java:
+	same
+
 2013-10-23  Jiri Vanek  <jvanek at redhat.com>
 
 	C-part of plugin is now also trying to follow XDG
diff -r df5cb12080fa -r 2ab117a919e5 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Thu Oct 24 10:11:37 2013 -0400
@@ -810,7 +810,9 @@
     {
         createJavaObjectFromVariant(instance, *member_ptr, &member_ptr_str);
         ((AsyncCallThreadData*) data)->result.append(member_ptr_str);
-
+    } else
+    {
+        ((AsyncCallThreadData*) data)->result.append("null");
     }
     ((AsyncCallThreadData*) data)->result_ready = true;
 
@@ -956,6 +958,9 @@
     if (((AsyncCallThreadData*) data)->call_successful)
     {
         createJavaObjectFromVariant(instance, tostring_result, &(((AsyncCallThreadData*) data)->result));
+    } else
+    {
+        ((AsyncCallThreadData*) data)->result.append("null");
     }
     ((AsyncCallThreadData*) data)->result_ready = true;
 
diff -r df5cb12080fa -r 2ab117a919e5 tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.html	Thu Oct 24 10:11:37 2013 -0400
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="en-US">
+  <head>
+    <title>JavaScript to Java LiveConnect - Function return values from applet</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+
+    <script language="JavaScript" src="JSObjectWithoutToString.js"></script>
+
+  </head>
+  <body>
+
+    <h2> The JSObjectWithoutToString html page</h2> 
+
+
+    <applet code="JSObjectWithoutToString" archive="JSObjectWithoutToString.jar" width="1000" height="100" id="jswithouttostring" MAYSCRIPT>
+    </applet>
+
+    <div id="messageDiv"></div>
+
+    <script laguage="javascript">
+        doToStringTest();
+    </script> 
+
+  </body>
+</html>
diff -r df5cb12080fa -r 2ab117a919e5 tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.js	Thu Oct 24 10:11:37 2013 -0400
@@ -0,0 +1,8 @@
+function doToStringTest(){
+    var applet = document.getElementById('jswithouttostring');
+
+    var null_obj = Object.create(null);
+
+    applet.callJSToString(null_obj);
+}
+
diff -r df5cb12080fa -r 2ab117a919e5 tests/reproducers/simple/JSObjectWithoutToString/srcs/JSObjectWithoutToString.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/JSObjectWithoutToString/srcs/JSObjectWithoutToString.java	Thu Oct 24 10:11:37 2013 -0400
@@ -0,0 +1,11 @@
+import java.applet.Applet;
+import netscape.javascript.JSObject;
+
+public class JSObjectWithoutToString extends Applet {
+
+    public void callJSToString(JSObject jso) {
+        System.out.println(jso.toString());
+        System.out.println("*** APPLET FINISHED ***");
+    }
+
+}
diff -r df5cb12080fa -r 2ab117a919e5 tests/reproducers/simple/JSObjectWithoutToString/testcases/JSObjectWithoutToStringTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/JSObjectWithoutToString/testcases/JSObjectWithoutToStringTest.java	Thu Oct 24 10:11:37 2013 -0400
@@ -0,0 +1,64 @@
+/* JSObjectWithoutToStringTest.java
+Copyright (C) 2013 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+ */
+
+import net.sourceforge.jnlp.ProcessResult;
+import net.sourceforge.jnlp.ServerAccess;
+import net.sourceforge.jnlp.ServerAccess.AutoClose;
+import net.sourceforge.jnlp.browsertesting.BrowserTest;
+import net.sourceforge.jnlp.browsertesting.Browsers;
+import net.sourceforge.jnlp.closinglisteners.AutoOkClosingListener;
+import net.sourceforge.jnlp.annotations.KnownToFail;
+import net.sourceforge.jnlp.annotations.NeedsDisplay;
+import net.sourceforge.jnlp.annotations.TestInBrowsers;
+import org.junit.Assert;
+
+import org.junit.Test;
+
+public class JSObjectWithoutToStringTest extends BrowserTest {
+
+	private static final String appletCloseString = AutoOkClosingListener.MAGICAL_OK_CLOSING_STRING;
+
+    @Test
+    @NeedsDisplay
+    @TestInBrowsers(testIn={Browsers.one})
+    public void testJSObjectWithoutToString() throws Exception {
+		ProcessResult pr = server.executeBrowser("/JSObjectWithoutToString.html", AutoClose.CLOSE_ON_CORRECT_END);
+        Assert.assertFalse("IndexOutOfBounds exception should not have occurred", pr.stderr.contains("java.lang.ArrayIndexOutOfBoundsException"));
+        Assert.assertTrue("Applet should have completed normally", pr.stdout.contains(appletCloseString));
+    }
+
+}

From jvanek at redhat.com  Thu Oct 24 07:40:11 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Thu, 24 Oct 2013 16:40:11 +0200
Subject: [rfc][icedtea-web] refactored logging for plugin
In-Reply-To: <5268094D.2090904@redhat.com>
References: <5266A13B.1000509@redhat.com> <5266B1CC.9030009@redhat.com>
	<5268094D.2090904@redhat.com>
Message-ID: <5269314B.3020204@redhat.com>

On 10/23/2013 07:37 PM, Jiri Vanek wrote:
> On 10/22/2013 07:11 PM, Andrew Azores wrote:
>> On 10/22/2013 12:00 PM, Jiri Vanek wrote:
>>> Hi!
>>>
>>> This is adding possibility to configure plugin debug via itw-settings, is getting rid of
>>> uncontrolled print outs, and add java-like headers (if enabled)
>>> Please, do  not look  on duplicated code in PLUGIN_{error,debug} macros, I will get rid of it when
>>> I will do  enty points for file log and system log.
>>>
>>> I have intentionally ignored way to force plugin debug via -verbose sent via itw-settings jvm
>>> parameters. Imho it will be missus.
>>>
>>> J.
>>
>> Applying this patch makes my Firefox immediately crash when trying to visit any page with a Java
>> applet. On my F19 workstation, there is no terminal output at all when this happens, but Mozilla's
>> automatic bug reporter does open. On my laptop running Arch, there is no bug reporter and nothing
>> especially helpful is printed either, but it does tell me there was a segfault. On my laptop this
>> can happen at any time, not just when visiting a page with an applet. I don't really know why that's
>> happening the way it is, but I've never had this behaviour at all before applying this patch, and
>> after the patch it's very reproducible :(
>>
>> Thanks,
>>
>
> Well yes, I can confirm the issue (now on latest f19).  The initial patch was written on f14, jdk6
> .. legacy gcc... And I swear it was working. (probably not depending on ff as even cpp tests were
> passing on f14, failing on f19)
>
>

Ok, here is much better set of patches:

the refactoredPrintfToPLUGIN_X+tests must be applied first, and is just plain refactoring printf -> 
PLUGIN_{DEBUG,ERROR} . with "profiling" test. And (maybe with small changes) I would like to propose 
it also to 1.4 to make backporting easier.

The second patch - includedUsageOfProeprtiesIntoLoggingMechanism - is adding the connection to 
deployment_properties in time when PLUGIN_* is first called.

Good think is, that (according to excellent profiling ) when debug is none, then it do no measurable 
slowdown. On the other side, when also headers are on, then the  logging was 100times slower. But 
considering that headers can be simply of and are providing many additional information, then  it is 
worthy.

J.

ps, the:
 >>> Please, do  not look  on duplicated code in PLUGIN_{error,debug} macros, I will get rid of it when
 >>> I will do  enty points for file log and system log.
IS still valid :)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: refactoredPrintfToPLUGIN_X+tests.patch
Type: text/x-patch
Size: 20812 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131024/62f8b957/refactoredPrintfToPLUGIN_Xtests-0001.patch 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: includedUsageOfProeprtiesIntoLoggingMechanism.patch
Type: text/x-patch
Size: 10645 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131024/62f8b957/includedUsageOfProeprtiesIntoLoggingMechanism-0001.patch 

From aazores at redhat.com  Thu Oct 24 08:04:44 2013
From: aazores at redhat.com (Andrew Azores)
Date: Thu, 24 Oct 2013 11:04:44 -0400
Subject: [rfc][icedtea-web] refactored logging for plugin
In-Reply-To: <5269314B.3020204@redhat.com>
References: <5266A13B.1000509@redhat.com> <5266B1CC.9030009@redhat.com>
	<5268094D.2090904@redhat.com> <5269314B.3020204@redhat.com>
Message-ID: <5269370C.4080805@redhat.com>

On 10/24/2013 10:40 AM, Jiri Vanek wrote:
> On 10/23/2013 07:37 PM, Jiri Vanek wrote:
>> On 10/22/2013 07:11 PM, Andrew Azores wrote:
>>> On 10/22/2013 12:00 PM, Jiri Vanek wrote:
>>>> Hi!
>>>>
>>>> This is adding possibility to configure plugin debug via 
>>>> itw-settings, is getting rid of
>>>> uncontrolled print outs, and add java-like headers (if enabled)
>>>> Please, do  not look  on duplicated code in PLUGIN_{error,debug} 
>>>> macros, I will get rid of it when
>>>> I will do  enty points for file log and system log.
>>>>
>>>> I have intentionally ignored way to force plugin debug via -verbose 
>>>> sent via itw-settings jvm
>>>> parameters. Imho it will be missus.
>>>>
>>>> J.
>>>
>>> Applying this patch makes my Firefox immediately crash when trying 
>>> to visit any page with a Java
>>> applet. On my F19 workstation, there is no terminal output at all 
>>> when this happens, but Mozilla's
>>> automatic bug reporter does open. On my laptop running Arch, there 
>>> is no bug reporter and nothing
>>> especially helpful is printed either, but it does tell me there was 
>>> a segfault. On my laptop this
>>> can happen at any time, not just when visiting a page with an 
>>> applet. I don't really know why that's
>>> happening the way it is, but I've never had this behaviour at all 
>>> before applying this patch, and
>>> after the patch it's very reproducible :(
>>>
>>> Thanks,
>>>
>>
>> Well yes, I can confirm the issue (now on latest f19).  The initial 
>> patch was written on f14, jdk6
>> .. legacy gcc... And I swear it was working. (probably not depending 
>> on ff as even cpp tests were
>> passing on f14, failing on f19)
>>
>>
>
> Ok, here is much better set of patches:
>
> the refactoredPrintfToPLUGIN_X+tests must be applied first, and is 
> just plain refactoring printf -> PLUGIN_{DEBUG,ERROR} . with 
> "profiling" test. And (maybe with small changes) I would like to 
> propose it also to 1.4 to make backporting easier.
>
> The second patch - includedUsageOfProeprtiesIntoLoggingMechanism - is 
> adding the connection to deployment_properties in time when PLUGIN_* 
> is first called.
>
> Good think is, that (according to excellent profiling ) when debug is 
> none, then it do no measurable slowdown. On the other side, when also 
> headers are on, then the  logging was 100times slower. But considering 
> that headers can be simply of and are providing many additional 
> information, then  it is worthy.
>
> J.
>
> ps, the:
> >>> Please, do  not look  on duplicated code in PLUGIN_{error,debug} 
> macros, I will get rid of it when
> >>> I will do  enty points for file log and system log.
> IS still valid :)

This looks good to me and seems like it works fine. IMO okay for head 
and 1.4.

Thanks,

-- 
Andrew A


From jvanek at redhat.com  Thu Oct 24 08:04:49 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Thu, 24 Oct 2013 17:04:49 +0200
Subject: [rfc][icedtea-web] better line location for logging injava side
Message-ID: <52693711.80107@redhat.com>

ais

J.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: betterSourceDetection.patch
Type: text/x-patch
Size: 855 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131024/22c5cf00/betterSourceDetection.patch 

From gitne at gmx.de  Thu Oct 24 14:25:42 2013
From: gitne at gmx.de (Jacob Wisor)
Date: Thu, 24 Oct 2013 23:25:42 +0200
Subject: [icedtea-web] Regression after refactoring for XDG specification
In-Reply-To: <5266A2A9.7070504@redhat.com>
References: <5266A2A9.7070504@redhat.com>
Message-ID: <52699056.8000406@gmx.de>

Hello!

Jiri Vanek wrote:
> Hi!
> 
> Can i push? This patch will be soon inapplicable, and it is heavily needed.

Generally speaking, as I already mentioned this approach is too complex in my 
opinion. And, I don't care really anymore because the initial requirement or 
intention was to
1. check whether the system implements the XDG specification and
2. if it does, make sure that all necessary parent directories are created in a 
"virgin" user's home directory.
Not much else. So I think this has got a little bit out of hand. But, I won't 
oppose this patch as long as it does what it should do. And, I like the new 
DirectoryValidator class. ;-)
Nevertheless, I would be happier if some other IcedTea-Web hacker would review 
this patch too, with my remarks on it in mind.

I also have to mention that I did not have the time to actually apply this patch 
and test it.

 > diff -r 6124fd87eaba
 > tests/netx/unit/net/sourceforge/jnlp/config/DirectoryValidatorTest.java
 > --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 > +++ b/tests/netx/unit/net/sourceforge/jnlp/config/DirectoryValidatorTest.java
 > Thu Sep 12 11:14:54 2013 +0200
 > @@ -0,0 +1,271 @@
 > +/*
 > + Copyright (C) 2012 Red Hat, Inc.

It's 2013 already ;-)

Since you are so eager to have three different error messages, please at least 
rewrite them into proper and rather simple English. See the examples below.

 > diff -r 6124fd87eaba netx/net/sourceforge/jnlp/resources/Messages.properties
 > --- a/netx/net/sourceforge/jnlp/resources/Messages.properties	Wed Sep 11
 > 12:05:44 2013 +0200
 > +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties	Thu Sep 12
 > 11:14:54 2013 +0200
 > @@ -304,6 +304,9 @@
 >  DCInternal=Internal error: {0}
 >  DCSourceInternal=<internal>
 >  DCUnknownSettingWithName=Property "{0}" is unknown.
 > +DCmaindircheckNotexists=After all tryes your configuration directory {0} do
 > not exists

IcedTea-Web's configuration directory {0} does not exist.

I do not actually understand what you have meant with this message. Should it 
rather say: Could not create IcedTea-Web's configuration directory {0}.?

 > +DCmaindircheckNotdir=Your configuration directory {0} is not directory

IcedTea-Web's configuration directory {0} is a file instead of a directory.

 > +DCmaindircheckRwproblem=Your configuration directory {0} can not be
 > read/written properly

Cannot write to or read from IcedTea-Web's configuration directory {0}.

> [?]
> 
> Ok, painfull review indeed!
> 
> I did my best, see below:
> 
> On 09/10/2013 09:34 PM, Jacob Wisor wrote:
>> Jiri Vanek schrieb:
>>> On 07/30/2013 06:14 PM, Jacob Wisor wrote:
> ..snip...
>>>> Nevertheless, thank you for addressing this issue, so please keep up 
>>>> the good work.
>>
>>> +    private static void ensureMainDirs() {
>>
>> I am especially unhappy with this method's naming. I am aware that 
>> naming is a
>> difficult task in CS, but it pays off investing time into it. What 
>> does it
>> ensure main directories about? What happens if something cannot be or 
>> has not
>> been ensured? Does possibly a RuntimeException be thrown? Except from 
>> that, what
>> are main directories supposed to be? Perhaps root directories? What 
>> makes a
>> directory so distinct to be "main"? So, please find an adequate name 
>> and add
>> some documentation.
> 
> Ok. I refactored it a bit and added javadoc. I hope it is much cleaner 
> now. Thanx for well deserved
> kick.

Well, my comment was not meant to sound or feel like a kick. But, it obviously 
has met its purpose. :-D

As a side note; some quote from Disney's Mulan comes to my mind: "But I don't 
want to kick the other kid's butt" :-D

>>
>> Some language stuff:
>>> +                    System.out.println("WARNING: key " + key + " do 
>>> not have
>> value, switching to default");
>>
>> "WARNING: key " + key + " has no value, setting to default value"
>>
>>> +                    System.out.println("WARNING: key " + key + " do 
>>> not have
>> value, skipping");
>>
>> "WARNING: key " + key + " has no value, skipping"
>>
>>> +                    System.err.println("ERROR: key " + key + " 
>>> value: " +
>> value + " not existed, and was NOT created");
>>
>> "ERROR: Directory " + value + " denoted by key " + key + " does not 
>> exist and
>> has not been created"
>>
>>> +                    System.out.println("OK: key " + key + " value: " 
>>> + value
>> + " not existed, and was created");
>>
>> "OK: Directory " + value + " denoted by key " + key + " did not exist 
>> but has
>> been created"
> 
> Used. Thank you.
>>
>>> +    //not private for testing
>>> +    static String testMainDir(File f, boolean verbose) {
>>
>> Since you have made this method not private please add some 
>> documentation on
>> what this method's purpose is and what it does. It is definitely not
>> self-explanatory, even after reading its code. And, as mentioned below 
>> it is
>> probably unnecessary complex and seems to be mixing functional code 
>> with message
> I hope fixed by refactoring.
> 
>> generating code. If you really want to keep this differentiated error 
>> reporting
>> feature, I would strongly advise to deglomerate functional and message
>> generating code.
> 
> Well, nothing else then pure laziness was on my side here:( Sorry!  I 
> have added wrapper class which
> is keeping the symptoms of failures, and message is generated later, 
> based on those flags.
> 
>>
>>> +        StringBuilder messages = new StringBuilder();
>>> +        if (!f.exists()) {
>>> +            String s = (R("DCmaindircheckNotexists", 
>>> f.getAbsolutePath()));
>>> +            if (verbose) {
>>> +                System.err.println(s);
>>> +            }
>>> +            messages.append(s).append("\n");
>>> +        }
>>> +        if (!f.isDirectory()) {
>>> +            String s = (R("DCmaindircheckNotdir", 
>>> f.getAbsolutePath()));
>>> +            if (verbose) {
>>> +                System.err.println(s);
>>> +            }
>>> +            messages.append(s).append("\n");
>>> +        }
>>
>> These two tests are redundant. File.isDirectory() implies a check for 
>> existence.
>> It does not matter to the user or the application whether the desired 
>> directory
>> does not exist or is not a directory. In effect the program cannot read
>> from/write to the desired location.
> 
> Partially yes, and aprtially no. IsDirectory really implies fileExists, 
> but the message then would
> be misleading. I really would like to keep those most common error cases 
> separately.
>>
>>> +        File testFile = null;
>>> +        boolean ok = false;
>>
>> Naming again. What is ok?
> 
> renamed.
>>
>>> +        try {
>>> +            testFile = File.createTempFile("maindir", "check", f);
>>> +            if (testFile.exists()) {
>>> +                ok = true;
>>> +            }
>>> +            try {
>>> +                FileUtils.saveFile("ww", testFile);
>>> +                String s = FileUtils.loadFileAsString(testFile);
>>> +                if (!s.trim().equals("ww")) {
>>> +                    ok = false;
>>> +                }
>>
>> This test misses probably its point because it is testing for creating 
>> a *file*
>> not a *directory*. Most file systems with DACLs distinguish between 
>> /creating/
>> files or directories, and between /creating/ and /writing/ into files or
>> directories, so it is important to be precise here. Furthermore, it tests
>> writing into a file instead of perhaps writing into a file in a 
>> subdirectory.
> 
> Fair enough. I forgot about this case utterly. The test is now testing 
> also subdirectory artificaly
> created inisde real directory (call to testMainDir one more times)
>>
>>> +            } catch (Exception ex) {
>>> +                if (JNLPRuntime.isDebug()) {
>>> +                    ex.printStackTrace();
>>> +                }
>>> +                ok = false;
>>> +            }
>>
>> No really, you should *not* catch arbitrary exceptions. It ain't just 
>> some empty
>> words.
> 
> Well.. There are cases where it brings moore good then wrong. Endless 
> loops are very often
> implemented like:
> public void run(){
> while (true){
> try{
> }catch(Throwable r){
> log(t)
> }
> }
> }
> 
> By otherwords, when exception should not , by no means, disturb the 
> program - eg my case above - it
> does not sound so bad...

Yes indeed, but this is because exceptions in such constructs usually get 
handled properly by restoring or resetting whatever state is necessary so that 
the code in the try block can continue or restart.

> I would like to keep the exception cough as it is.

The core of the problem is that you actually cannot guard any piece of code from 
being subject to exceptions. You can only try handling an exception. In Java, 
there is no way to define a critical section that guarantees successful code 
execution unconditionally (of course, as long as the code is logically and 
formally correct). Btw, this is exactly one reason why Java is not suitable for 
real-time applications per se.
The most commonly forgotten kind of exception is an OutOfMemoryException. This 
exception can disturb the flow of code at any time - not only when creating new 
objects! Almost exactly the same is true for a general RuntimeException. Please 
do not forget that not only Java code can throw exceptions but native code can 
do too. Ignoring all exceptions is neither actually handling an exception nor a 
solution. It is only acceptable if and only if the state of the application 
after the exception has been ignored is consistent or in other words can be 
dealt with by the following code. I am not really sure about it in this case.

>>
>> After all, this method is overly complex and does not add any value 
>> for the
>> user. So I would advise you to discard this method.
>>
>>> diff -r 79bdc074df81 
>>> netx/net/sourceforge/jnlp/resources/Messages.properties
>>> --- a/netx/net/sourceforge/jnlp/resources/Messages.properties    Fri 
>>> Aug 30
>> 11:02:08 2013 -0400
>>> +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties    Tue 
>>> Sep 03
>> 13:56:53 2013 +0200
>>> @@ -304,6 +304,9 @@
>>>  DCInternal=Internal error: {0}
>>>  DCSourceInternal=<internal>
>>>  DCUnknownSettingWithName=Property "{0}" is unknown.
>>> +DCmaindircheckNotexists=After all tryes your configuration directory 
>>> {0} do
>> not exists
>>> +DCmaindircheckNotdir=Your configuration directory {0} is not directory
>>> +DCmaindircheckRwproblem=Your configuration directory {0} can not be
>> read/written properly
>>
>> Although it is nice of you to make precise distinctions between error 
>> types to
>> help the user it is actually not necessary and does not offer any 
>> additional
>> help when analyzing this problem. All these messages can be fused into 
>> one
> 
> I really think that two most common cases file instead of dir and 
> insufficient privledges  should be
> distinguished.
> 
> Unless you stongly insists, I would like to keep the three messages as 
> it was.
>> sufficiently explanatory error message: DCCannotAccessConfig="Cannot 
>> access
>> configuration in file {full path to config file}." This should 
>> probably be
>> enough for an admin, even for a user. I would really advise this 
>> because it
>> makes the code simpler and yet serves its purpose.
> 
> Well.. eh.. yes.m I admit that the code is complex. Now it is even a bit 
> more complex. I hope that
> refactoring made it much more readable, and taht testing is strong enough.
> 
> I would like to keep the "three distinguish messages" but any idea to 
> keep them, check all parts,
> and make the check algorithm a bit simpler is welcomed.
>>
>>

Finally I would like to mention that it have been nice of you that you have 
taken care of it. Good luck!
Jacob

From ptisnovs at icedtea.classpath.org  Fri Oct 25 01:59:19 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Fri, 25 Oct 2013 08:59:19 +0000
Subject: /hg/gfx-test: Six new tests added into BitBitBltAffineIdentityTr...
Message-ID: <hg.9a22e2aabf85.1382691559.-6248649288953172555@icedtea.classpath.org>

changeset 9a22e2aabf85 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=9a22e2aabf85
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Oct 25 11:02:45 2013 +0200

	Six new tests added into BitBitBltAffineIdentityTransformOp.java:


diffstat:

 ChangeLog                                                       |   5 +
 src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java |  84 ++++++++++
 2 files changed, 89 insertions(+), 0 deletions(-)

diffs (106 lines):

diff -r 444715779c21 -r 9a22e2aabf85 ChangeLog
--- a/ChangeLog	Thu Oct 24 09:17:28 2013 +0200
+++ b/ChangeLog	Fri Oct 25 11:02:45 2013 +0200
@@ -1,3 +1,8 @@
+2013-10-25  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BBitBltAffineIdentityTransformOp.java:
+	Six new tests added into BitBitBltAffineIdentityTransformOp.java:
+
 2013-10-24  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltBufferedImageOp.java:
diff -r 444715779c21 -r 9a22e2aabf85 src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java
--- a/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java	Thu Oct 24 09:17:28 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltAffineIdentityTransformOp.java	Fri Oct 25 11:02:45 2013 +0200
@@ -1696,6 +1696,90 @@
     }
 
     /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteGrayIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteGray(image, graphics2d, IdentifyTranspormationOp1);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteGrayIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteGray(image, graphics2d, IdentifyTranspormationOp2);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteGrayIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteGray(image, graphics2d, IdentifyTranspormationOp3);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteGrayIdentifyTranspormationOp4(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteGray(image, graphics2d, IdentifyTranspormationOp4);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteGrayIdentifyTranspormationOp5(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteGray(image, graphics2d, IdentifyTranspormationOp5);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageTypeByteGrayIdentifyTranspormationOp6(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageTypeByteGray(image, graphics2d, IdentifyTranspormationOp6);
+    }
+
+    /**
      * Entry point to the test suite.
      *
      * @param args not used in this case

From ptisnovs at icedtea.classpath.org  Fri Oct 25 02:01:26 2013
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Fri, 25 Oct 2013 09:01:26 +0000
Subject: /hg/rhino-tests: Added new testGetResourceNPETest case into Invo...
Message-ID: <hg.1ac6ba772ad8.1382691687.-6019694633368342460@icedtea.classpath.org>

changeset 1ac6ba772ad8 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=1ac6ba772ad8
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Oct 25 11:05:15 2013 +0200

	Added new testGetResourceNPETest case into InvocableClassTest.


diffstat:

 ChangeLog                                  |   6 ++++++
 src/org/RhinoTests/InvocableClassTest.java |  13 +++++++++++++
 2 files changed, 19 insertions(+), 0 deletions(-)

diffs (36 lines):

diff -r 13dbbf4ccc49 -r 1ac6ba772ad8 ChangeLog
--- a/ChangeLog	Thu Oct 24 09:20:05 2013 +0200
+++ b/ChangeLog	Fri Oct 25 11:05:15 2013 +0200
@@ -1,3 +1,9 @@
+2013-10-25  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/InvocableClassTest.java:
+	Added new testGetResourceNPETest case into
+	InvocableClassTest.
+
 2013-10-24  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/BindingsClassTest.java:
diff -r 13dbbf4ccc49 -r 1ac6ba772ad8 src/org/RhinoTests/InvocableClassTest.java
--- a/src/org/RhinoTests/InvocableClassTest.java	Thu Oct 24 09:20:05 2013 +0200
+++ b/src/org/RhinoTests/InvocableClassTest.java	Fri Oct 25 11:05:15 2013 +0200
@@ -1437,6 +1437,19 @@
     }
 
     /**
+     * Test for method javax.script.Invocable.getClass().getResourceNPETest()
+     */
+    protected void testGetResourceNPETest() {
+        try {
+            Object resource = this.invocableClass.getResource(null);
+            throw new AssertionError("NullPointerException expected!");
+        }
+        catch (NullPointerException e) {
+            //This is OK OK
+        }
+    }
+
+    /**
      * Test for instanceof operator applied to a class javax.script.Invocable
      */
     @SuppressWarnings("cast")

From jvanek at redhat.com  Fri Oct 25 03:17:22 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Fri, 25 Oct 2013 12:17:22 +0200
Subject: Small refactoring in searching for attributes
Message-ID: <526A4532.4000401@redhat.com>

ping?

-------- Original Message --------
Subject: Re: Small refactoring in searching for attributes
Date: Mon, 21 Oct 2013 15:29:01 +0200
From: Jiri Vanek <jvanek at redhat.com>
To: Omair Majid <omajid at redhat.com>
CC: IcedTea Distro List <distro-pkg-dev at openjdk.java.net>

On 10/18/2013 05:00 PM, Omair Majid wrote:
> * Jiri Vanek <jvanek at redhat.com> [2013-10-18 09:14]:
>> Please note, this have to go also to 1.4, and that tests are already included n itw.
>
> Patch itself looks okay to me. You have introduced two new public
> methods, though:

thanx, pushed.

>
>> +    public String checkForAttributeInJars(List<JARDesc> jars, Attributes.Name name) {
>
>> +    public String getManifestAttribute(URL location, Attributes.Name  attribute) {
>
> Could you add unit tests for these new methods? Just like the previous
> unit tests give us some guarantee that users of the old methods are
> still covered, it would be nice to have some guarantee that users are
> also covered if these new methods were refactored too.

Here is test. It growe a bit
   - to test the order during search the dummy jnlp file had to be extended to work with set of jars


changes ala

+++ b/netx/net/sourceforge/jnlp/JARDesc.java	Mon Oct 21 15:25:09 2013 +0200

-    private URL location;
+    private final URL location;

...


Are a bit unrelated, but worthy. I wonted to write setter for "main" field, and realised how wrong
this class is. So I did not made the api dirty (used refelction in dummyJnlp) and adde those finals.


Ok for head (both patch and fix?)


Also both, or one, or none :) to 1.4 ?


J.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: testForSearchForAttribute.patch
Type: text/x-patch
Size: 12464 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131025/3d153c57/testForSearchForAttribute-0001.patch 

From jvanek at icedtea.classpath.org  Fri Oct 25 03:16:31 2013
From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org)
Date: Fri, 25 Oct 2013 10:16:31 +0000
Subject: /hg/icedtea-web: 3 new changesets
Message-ID: <hg.00db867f53be.1382696191.8643924302249223276@icedtea.classpath.org>

changeset 00db867f53be in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=00db867f53be
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Oct 25 09:43:24 2013 +0200

	OutputController.getCallerClass now gets out also from sun.applet.PluginDebug class.


changeset bdbeab87f803 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bdbeab87f803
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Oct 25 11:10:25 2013 +0200

	All output messages redirected to PLUGIN_{DEBUG,ERROR} macros


changeset cdb796a6195b in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=cdb796a6195b
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Oct 25 12:19:15 2013 +0200

	Plugin debug can now be controlled from itw_settings, in same way java side. For now ICEDTEAPLUGIN_DEBUG on the debug in same way as deployment.log itw-settings property. Individual logging streams are controlled by deployment.log.{headers,file,stdstreams,system} System and file are not yet fully done (same as java side in this moment). Streams are true, all others  false by default.
	* plugin/icedteanp/IcedTeaNPPlugin.cc: initialized variables new bool variables (debug_initiated), (plugin_debug_headers), (plugin_debug_to_file), 	(plugin_debug_to_system) as false and (plugin_debug_to_streams) as true.
	* plugin/icedteanp/IcedTeaNPPlugin.h: above variables declared as extern * plugin/icedteanp/IcedTeaParseProperties.cc: initialization of (default_file_ITW_deploy_props_name) and (custom_jre_key) moved here from IcedTeaNPPlugin.h. New method (read_bool_property) and its more concrete  shortcuts (is_debug_on) (is_debug_header_on) (is_logging_to_file) 	(is_logging_to_stds) (is_logging_to_system) implemented to access properties.
	* plugin/icedteanp/IcedTeaParseProperties.h: above methods declared.
	* plugin/icedteanp/IcedTeaPluginUtils.h: (PLUGIN_{ERROR,DEBUG}) methods adapted headers/debug/streams logic as described in title. Headers made more informative (like java side)
	* tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc: TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_on) extended to TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_on_headers_off).TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_off)  extended to TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_off_headers_off), and new testsTEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_on_headers_on) TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_off_headers_on) (100x slower then without headers)


diffstat:

 ChangeLog                                                    |  50 ++++++
 netx/net/sourceforge/jnlp/util/logging/OutputController.java |   4 +-
 plugin/icedteanp/IcedTeaJavaRequestProcessor.cc              |  20 +-
 plugin/icedteanp/IcedTeaNPPlugin.cc                          |  17 +-
 plugin/icedteanp/IcedTeaNPPlugin.h                           |   7 +-
 plugin/icedteanp/IcedTeaParseProperties.cc                   |  36 ++++-
 plugin/icedteanp/IcedTeaParseProperties.h                    |   9 +-
 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc            |   6 +-
 plugin/icedteanp/IcedTeaPluginUtils.cc                       |   6 +-
 plugin/icedteanp/IcedTeaPluginUtils.h                        |  70 +++++++--
 plugin/icedteanp/IcedTeaScriptablePluginObject.cc            |  40 ++--
 plugin/icedteanp/IcedTeaScriptablePluginObject.h             |   6 +-
 tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc               |  88 ++++++++++++
 13 files changed, 293 insertions(+), 66 deletions(-)

diffs (truncated from 798 to 500 lines):

diff -r 2ab117a919e5 -r cdb796a6195b ChangeLog
--- a/ChangeLog	Thu Oct 24 10:11:37 2013 -0400
+++ b/ChangeLog	Fri Oct 25 12:19:15 2013 +0200
@@ -1,3 +1,53 @@
+2013-10-25  Jiri Vanek  <jvanek at redhat.com>
+
+	Plugin debug can now be controlled from itw_settings, in same way java side.
+	For now ICEDTEAPLUGIN_DEBUG on the debug in same way as deployment.log
+	itw-settings property. Individual logging streams are controlled by
+	deployment.log.{headers,file,stdstreams,system} System and file are not yet
+	fully done (same as java side in this moment). Streams are true, all others 
+	false by default.
+	* plugin/icedteanp/IcedTeaNPPlugin.cc: initialized variables new bool
+	variables (debug_initiated), (plugin_debug_headers), (plugin_debug_to_file),
+	(plugin_debug_to_system) as false and (plugin_debug_to_streams) as true.
+	* plugin/icedteanp/IcedTeaNPPlugin.h: above variables declared as extern
+	* plugin/icedteanp/IcedTeaParseProperties.cc: initialization of 
+	(default_file_ITW_deploy_props_name) and (custom_jre_key) moved here from
+	IcedTeaNPPlugin.h. New method (read_bool_property) and its more concrete
+	shortcuts (is_debug_on) (is_debug_header_on) (is_logging_to_file)
+	(is_logging_to_stds) (is_logging_to_system) implemented to access properties.
+	* plugin/icedteanp/IcedTeaParseProperties.h: above methods declared.
+	* plugin/icedteanp/IcedTeaPluginUtils.h: (PLUGIN_{ERROR,DEBUG}) methods
+	adapted headers/debug/streams logic as described in title. Headers made more 
+	informative (like java side)
+	* tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc: 
+	TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_on) extended to
+	TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_on_headers_off).
+	TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_off)  extended to
+	TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_off_headers_off), and new tests
+	TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_on_headers_on) 
+	TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_off_headers_on) (100x slower then 
+	without headers)
+	
+2013-10-25  Jiri Vanek  <jvanek at redhat.com>
+
+	all output messages redirected to PLUGIN_{DEBUG,ERROR} macros
+	* plugin/icedteanp/IcedTeaJavaRequestProcessor.cc: affected
+	* plugin/icedteanp/IcedTeaNPPlugin.cc: affected
+	* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: affected
+	* plugin/icedteanp/IcedTeaPluginUtils.cc: affected
+	* plugin/icedteanp/IcedTeaPluginUtils.h: affected
+	* plugin/icedteanp/IcedTeaRunnable.cc: affected
+	* plugin/icedteanp/IcedTeaScriptablePluginObject.cc: affected
+	* tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc: added 
+	(TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_on)) and
+	(TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_off)) which call new
+	(doDebugErrorRun) and are measuring refactoring impacts.
+
+2013-10-25  Jiri Vanek  <jvanek at redhat.com>
+
+	* netx/net/sourceforge/jnlp/util/logging/OutputController.java:
+	(getCallerClass) now gets out also from sun.applet.PluginDebug class.
+
 2013-10-24  Andrew Azores  <aazores at redhat.com>
 
 	Fix array index out of bounds due to malformed plugin message (PR539)
diff -r 2ab117a919e5 -r cdb796a6195b netx/net/sourceforge/jnlp/util/logging/OutputController.java
--- a/netx/net/sourceforge/jnlp/util/logging/OutputController.java	Thu Oct 24 10:11:37 2013 -0400
+++ b/netx/net/sourceforge/jnlp/util/logging/OutputController.java	Fri Oct 25 12:19:15 2013 +0200
@@ -362,7 +362,9 @@
             int i = 1;
             for (; i < stack.length; i++) {
                 result = stack[i];//at least moving up
-                if (stack[i].getClassName().contains(OutputController.class.getName())) {
+                if (stack[i].getClassName().contains(OutputController.class.getName()) ||
+                    //PluginDebug.class.getName() not avaiable during netx make
+                    stack[i].getClassName().contains("sun.applet.PluginDebug") ) {
                     continue;
                 } else {
                     break;
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc	Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc	Fri Oct 25 12:19:15 2013 +0200
@@ -78,7 +78,7 @@
 					result->error_msg->append(" ");
 				}
 
-				printf("Error on Java side: %s\n", result->error_msg->c_str());
+				PLUGIN_ERROR("Error on Java side: %s\n", result->error_msg->c_str());
 
 				result->error_occurred = true;
 				result_ready = true;
@@ -947,7 +947,7 @@
                 java_result = java_request.newArray(java_array_type, length_str);
 
                 if (java_result->error_occurred) {
-                    printf("Unable to create array\n");
+                    PLUGIN_ERROR("Unable to create array\n");
                     id->append("-1");
                     return;
                 }
@@ -966,7 +966,7 @@
                     createJavaObjectFromVariant(instance, value, &value_id);
 
                     if (value_id == "-1") {
-                        printf("Unable to populate array\n");
+                        PLUGIN_ERROR("Unable to populate array\n");
                         id->clear();
                         id->append("-1");
                         return;
@@ -1002,7 +1002,7 @@
                 // the result we want is in result_string (assuming there was no error)
                 if (java_result->error_occurred)
                 {
-                    printf("Unable to get JSObject class id\n");
+                    PLUGIN_ERROR("Unable to get JSObject class id\n");
                     id->clear();
                     id->append("-1");
                     return;
@@ -1018,7 +1018,7 @@
                 // the result we want is in result_string (assuming there was no error)
                 if (java_result->error_occurred)
                 {
-                    printf("Unable to get JSObject constructor id\n");
+                    PLUGIN_ERROR("Unable to get JSObject constructor id\n");
                     id->clear();
                     id->append("-1");
                     return;
@@ -1042,7 +1042,7 @@
                 // the result we want is in result_string (assuming there was no error)
                 if (java_result->error_occurred)
                 {
-                    printf("Unable to create JSObject\n");
+                    PLUGIN_ERROR("Unable to create JSObject\n");
                     id->clear();
                     id->append("-1");
                     return;
@@ -1059,7 +1059,7 @@
 
 		// the result we want is in result_string (assuming there was no error)
 		if (java_result->error_occurred) {
-			printf("Unable to find classid for %s\n", className.c_str());
+			PLUGIN_ERROR("Unable to find classid for %s\n", className.c_str());
 			id->append("-1");
 			return;
 		}
@@ -1074,7 +1074,7 @@
 
 		// the result we want is in result_string (assuming there was no error)
 		if (java_result->error_occurred) {
-			printf("Unable to find string constructor for %s\n", className.c_str());
+			PLUGIN_ERROR("Unable to find string constructor for %s\n", className.c_str());
 			id->append("-1");
             return;
 		}
@@ -1086,7 +1086,7 @@
 		java_result = java_request.newString(stringArg);
 
 		if (java_result->error_occurred) {
-			printf("Unable to create requested object\n");
+			PLUGIN_ERROR("Unable to create requested object\n");
 			id->append("-1");
             return;
 		}
@@ -1099,7 +1099,7 @@
 		java_result = java_request.newObjectWithConstructor("[System]", jsObjectClassID, jsObjectConstructorID, args);
 
         if (java_result->error_occurred) {
-            printf("Unable to create requested object\n");
+            PLUGIN_ERROR("Unable to create requested object\n");
             id->append("-1");
             return;
         }
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Fri Oct 25 12:19:15 2013 +0200
@@ -213,7 +213,12 @@
 static GPid appletviewer_pid = -1;
 static guint appletviewer_watch_id = -1;
 
+bool debug_initiated = false;
 int plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL;
+bool plugin_debug_headers = false;
+bool plugin_debug_to_file = false ;
+bool plugin_debug_to_streams = true ;
+bool plugin_debug_to_system = false;
 int plugin_debug_suspend = (getenv("ICEDTEAPLUGIN_DEBUG") != NULL) &&
         (strcmp(getenv("ICEDTEAPLUGIN_DEBUG"), "suspend") == 0);
 
@@ -248,7 +253,7 @@
             if (IcedTeaPluginUtilities::file_exists(custom_jre+"/bin/java")){
                   return custom_jre+"/bin/java";
             } else {
-                 fprintf(stderr, "Your custom jre (/bin/java check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
+                 PLUGIN_ERROR("Your custom jre (/bin/java check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
             }
       }
       return appletviewer_default_executable;      
@@ -261,7 +266,7 @@
             if (IcedTeaPluginUtilities::file_exists(custom_jre+"/lib/rt.jar")){
                   return custom_jre+"/lib/rt.jar";
             } else {
-                  fprintf(stderr, "Your custom jre (/lib/rt.jar check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
+                  PLUGIN_ERROR("Your custom jre (/lib/rt.jar check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
             }
       }
       return appletviewer_default_rtjar;      
@@ -317,7 +322,7 @@
   identifier = browser_functions.getstringidentifier("document");
   if (!browser_functions.hasproperty(instance, window_ptr, identifier))
   {
-	printf("%s not found!\n", "document");
+	PLUGIN_ERROR("%s not found!\n", "document");
   }
   browser_functions.getproperty(instance, window_ptr, identifier, &member_ptr);
 
@@ -1903,7 +1908,7 @@
   np_error = plugin_test_appletviewer ();
   if (np_error != NPERR_NO_ERROR)
     {
-      fprintf(stderr, "Unable to find java executable %s\n", get_plugin_executable().c_str());
+      PLUGIN_ERROR("Unable to find java executable %s\n", get_plugin_executable().c_str());
       return np_error;
     }
 
@@ -2110,7 +2115,7 @@
 
         if (java_result->error_occurred)
         {
-            printf("Error: Unable to fetch applet instance id from Java side.\n");
+            PLUGIN_ERROR("Error: Unable to fetch applet instance id from Java side.\n");
             return NULL;
         }
 
@@ -2120,7 +2125,7 @@
 
         if (java_result->error_occurred)
         {
-            printf("Error: Unable to fetch applet instance id from Java side.\n");
+            PLUGIN_ERROR("Error: Unable to fetch applet instance id from Java side.\n");
             return NULL;
         }
 
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaNPPlugin.h
--- a/plugin/icedteanp/IcedTeaNPPlugin.h	Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.h	Fri Oct 25 12:19:15 2013 +0200
@@ -115,8 +115,13 @@
 /* Mutex around plugin async call queue ops */
 extern pthread_mutex_t pluginAsyncCallMutex;
 
-// debug switch
+// debug switches
+extern bool debug_initiated;
 extern int plugin_debug;
+extern bool plugin_debug_headers;
+extern bool plugin_debug_to_file;
+extern bool plugin_debug_to_streams;
+extern bool plugin_debug_to_system;
 
 // Browser function table.
 extern NPNetscapeFuncs browser_functions;
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaParseProperties.cc
--- a/plugin/icedteanp/IcedTeaParseProperties.cc	Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaParseProperties.cc	Fri Oct 25 12:19:15 2013 +0200
@@ -50,7 +50,7 @@
 
 
 #include "IcedTeaPluginUtils.h"
-
+#include "IcedTeaNPPlugin.h"
 #include "IcedTeaParseProperties.h"
 /*
  The public api is nearly impossible to test due to "hardcoded paths"
@@ -75,7 +75,8 @@
 //for passing two dummy files
 bool  find_custom_jre(string user_file, string main_file,string& dest);
 //end of non-public IcedTeaParseProperties api
-
+const std::string default_file_ITW_deploy_props_name = "deployment.properties";
+const std::string custom_jre_key = "deployment.jre.dir";
 
 void remove_all_spaces(string& str)
 {
@@ -147,6 +148,37 @@
 	}
 	return find_system_config_file(main_properties_file(), jdest, found, default_java_properties_file(), dest);
 }
+
+
+bool  read_bool_property(string key, bool defaultValue){
+	string value;
+	if (!read_deploy_property_value(key, value)) {
+		return defaultValue;
+	}
+	if (value == "true") {
+		return true;
+	} else {
+		return false;
+	}
+}	
+
+bool  is_debug_on(){
+	return 	read_bool_property("deployment.log",false);
+}
+bool  is_debug_header_on(){
+	return 	read_bool_property("deployment.log.headers",false);
+}
+bool  is_logging_to_file(){
+	return 	read_bool_property("deployment.log.file",false);
+}
+bool  is_logging_to_stds(){
+	return 	read_bool_property("deployment.log.stdstreams",true);
+}
+bool  is_logging_to_system(){
+	return 	read_bool_property("deployment.log.system",true);
+}
+
+
 //abstraction for testing purposes
 bool find_system_config_file(string main_file, string custom_jre_file, bool usecustom_jre, string default_java_file, string& dest){
 	if (IcedTeaPluginUtilities::file_exists(main_file)) {
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaParseProperties.h
--- a/plugin/icedteanp/IcedTeaParseProperties.h	Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaParseProperties.h	Fri Oct 25 12:19:15 2013 +0200
@@ -47,7 +47,12 @@
 bool  find_system_config_file(std::string& dest);
 bool  find_custom_jre(std::string& dest);
 bool  read_deploy_property_value(std::string property, std::string& dest);
+bool  is_debug_on();
+bool  is_debug_header_on();
+bool  is_logging_to_file();
+bool  is_logging_to_stds();
+bool  is_logging_to_system();
 //half public api
-const std::string default_file_ITW_deploy_props_name = "deployment.properties";
-const std::string custom_jre_key = "deployment.jre.dir";
+extern const std::string default_file_ITW_deploy_props_name;
+extern const std::string custom_jre_key;
 //end of public api
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Fri Oct 25 12:19:15 2013 +0200
@@ -440,7 +440,7 @@
         // the result we want is in result_string (assuming there was no error)
         if (java_result->error_occurred)
         {
-	    printf("Unable to get member name for setMember. Error occurred: %s\n", java_result->error_msg->c_str());
+	    PLUGIN_ERROR("Unable to get member name for setMember. Error occurred: %s\n", java_result->error_msg->c_str());
             //goto cleanup;
         }
 
@@ -521,7 +521,7 @@
         // the result we want is in result_string (assuming there was no error)
         if (java_result->error_occurred)
         {
-	    printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
+	    PLUGIN_ERROR("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
             //goto cleanup;
         }
 
@@ -800,7 +800,7 @@
 
     if (!browser_functions.hasproperty(instance, parent_ptr, member_identifier))
     {
-        printf("%s not found!\n", IcedTeaPluginUtilities::NPIdentifierAsString(member_identifier).c_str());
+        PLUGIN_ERROR("%s not found!\n", IcedTeaPluginUtilities::NPIdentifierAsString(member_identifier).c_str());
     }
     ((AsyncCallThreadData*) data)->call_successful = browser_functions.getproperty(instance, parent_ptr, member_identifier, member_ptr);
 
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaPluginUtils.cc
--- a/plugin/icedteanp/IcedTeaPluginUtils.cc	Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaPluginUtils.cc	Fri Oct 25 12:19:15 2013 +0200
@@ -399,7 +399,7 @@
 
 	wchar_t c;
 
-	if (plugin_debug) printf("Converted UTF-16LE string: ");
+	PLUGIN_DEBUG("Converted UTF-16LE string: ");
 
 	result_unicode_str->clear();
 	for (int i = begin; i < begin+length; i+=2)
@@ -413,14 +413,14 @@
         	(c >= 'A' && c <= 'Z') ||
         	(c >= '0' && c <= '9'))
         {
-        	if (plugin_debug) printf("%c", c);
+        	PLUGIN_DEBUG("%c", c);
         }
 
         result_unicode_str->push_back(c);
 	}
 
 	// not routing via debug print macros due to wide-string issues
-	if (plugin_debug) printf(". Length=%d\n", result_unicode_str->length());
+	PLUGIN_DEBUG(". Length=%d\n", result_unicode_str->length());
 }
 
 /*
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaPluginUtils.h
--- a/plugin/icedteanp/IcedTeaPluginUtils.h	Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaPluginUtils.h	Fri Oct 25 12:19:15 2013 +0200
@@ -45,6 +45,8 @@
 
 #include <pthread.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
 
 #include <cstring>
 #include <iostream>
@@ -59,30 +61,68 @@
 #include <glib.h>
 #include <npruntime.h>
 
-#define PLUGIN_DEBUG(...)                                      \
-  do                                                           \
-  {                                                            \
-    if (plugin_debug)                                          \
-    {                                                          \
-      fprintf (stdout, "ITNPP Thread# %ld: ", pthread_self()); \
-      fprintf (stdout, __VA_ARGS__);                           \
-    }                                                          \
+#include "IcedTeaParseProperties.h"
+
+// debugging macro.
+#define initialize_debug()                                                    \
+  do                                                                          \
+  {                                                                           \
+    if (!debug_initiated) {                                                   \
+	  debug_initiated = true;                                                 \
+      plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL || is_debug_on(); \
+      plugin_debug_headers = is_debug_header_on();                            \
+      plugin_debug_to_file = is_logging_to_file();                            \
+      plugin_debug_to_streams = is_logging_to_stds();                         \
+      plugin_debug_to_system = is_logging_to_system();                        \
+    }                                                                         \
+  } while (0) 
+
+
+#define PLUGIN_DEBUG(...)                                          \
+  do                                                               \
+  {                                                                \
+	initialize_debug();                                            \
+    if (plugin_debug)  {                                           \
+      if (plugin_debug_to_streams) {                               \
+	    if (plugin_debug_headers) {                                \
+          char s[1000];                                            \
+          time_t t = time(NULL);                                   \
+          struct tm * p = localtime(&t);                           \
+          strftime(s, 1000, "%a %b %d %H:%M:%S %Z %Y", p);         \
+          const char *userNameforDebug = (getenv("USERNAME") == NULL) ? "unknown user" : getenv("USERNAME");  \
+	      fprintf  (stdout, "[%s][ITW-C-PLUGIN][MESSAGE_DEBUG][%s][%s:%d] ITNPP Thread# %ld: ",               \
+            userNameforDebug, s, __FILE__, __LINE__,  pthread_self());                                        \
+	    }                                                          \
+      fprintf (stdout, __VA_ARGS__);                               \
+	  }                                                            \
+    }                                                              \
   } while (0)
-  
-  // Error reporting macros.
+
+// Error reporting macro.
 #define PLUGIN_ERROR(...)                                   \
-do                                                          \
+  do                                                        \
   {                                                         \
-        fprintf  (stderr, "%s:%d: thread %p: Error: %s\n",  \
-               __FILE__, __LINE__,                          \
-              g_thread_self (), __VA_ARGS__);               \
+	initialize_debug();                                     \
+    if (plugin_debug_to_streams) {                          \
+      if (plugin_debug_headers) {                           \
+        char s[1000];                                       \
+        time_t t = time(NULL);                              \
+        struct tm * p = localtime(&t);                      \
+        strftime(s, 1000, "%A, %B %d %Y", p);               \
+        const char *userNameforDebug = (getenv("USERNAME") == NULL) ? "unknown user" : getenv("USERNAME"); \
+        fprintf  (stderr, "[%s][ITW-C-PLUGIN][ERROR_ALL][%s][%s:%d] thread %p: ",                          \
+          userNameforDebug, s, __FILE__, __LINE__, g_thread_self ());                                      \
+		}                                                   \
+		fprintf  (stderr,  __VA_ARGS__);                    \
+	  }                                                     \
    } while (0)
 
+
 #define CHECK_JAVA_RESULT(result_data)                               \
 {                                                                    \
     if (((JavaResultData*) result_data)->error_occurred)             \
     {                                                                \
-        printf("Error: Error occurred on Java side: %s.\n",          \
+        PLUGIN_ERROR("Error: Error occurred on Java side: %s.\n",    \
                ((JavaResultData*) result_data)->error_msg->c_str()); \
         return;                                                      \
     }                                                                \
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaScriptablePluginObject.cc
--- a/plugin/icedteanp/IcedTeaScriptablePluginObject.cc	Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaScriptablePluginObject.cc	Fri Oct 25 12:19:15 2013 +0200
@@ -49,19 +49,19 @@
 void
 IcedTeaScriptablePluginObject::deAllocate(NPObject *npobj)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::deAllocate %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::deAllocate %p\n", npobj);
 }
 
 void
 IcedTeaScriptablePluginObject::invalidate(NPObject *npobj)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::invalidate %p\n", npobj);

From jvanek at icedtea.classpath.org  Fri Oct 25 03:17:10 2013
From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org)
Date: Fri, 25 Oct 2013 10:17:10 +0000
Subject: /hg/release/icedtea-web-1.4: all output messages redirected to P...
Message-ID: <hg.175dda8f15e5.1382696230.-5934593987637005762@icedtea.classpath.org>

changeset 175dda8f15e5 in /hg/release/icedtea-web-1.4
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=175dda8f15e5
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Oct 25 11:07:08 2013 +0200

	all output messages redirected to PLUGIN_{DEBUG,ERROR} macros


diffstat:

 ChangeLog                                         |  15 +++++
 plugin/icedteanp/IcedTeaJavaRequestProcessor.cc   |  20 +++---
 plugin/icedteanp/IcedTeaNPPlugin.cc               |  12 ++--
 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc |   6 +-
 plugin/icedteanp/IcedTeaPluginUtils.cc            |   6 +-
 plugin/icedteanp/IcedTeaPluginUtils.h             |   2 +-
 plugin/icedteanp/IcedTeaRunnable.cc               |   3 +-
 plugin/icedteanp/IcedTeaScriptablePluginObject.cc |  46 ++++++++--------
 tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc    |  61 +++++++++++++++++++++++
 9 files changed, 124 insertions(+), 47 deletions(-)

diffs (truncated from 547 to 500 lines):

diff -r e1dfddeb801d -r 175dda8f15e5 ChangeLog
--- a/ChangeLog	Tue Oct 22 11:46:27 2013 +0200
+++ b/ChangeLog	Fri Oct 25 11:07:08 2013 +0200
@@ -1,3 +1,18 @@
+2013-10-25  Jiri Vanek  <jvanek at redhat.com>
+
+	all output messages redirected to PLUGIN_{DEBUG,ERROR} macros
+	* plugin/icedteanp/IcedTeaJavaRequestProcessor.cc: affected
+	* plugin/icedteanp/IcedTeaNPPlugin.cc: affected
+	* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: affected
+	* plugin/icedteanp/IcedTeaPluginUtils.cc: affected
+	* plugin/icedteanp/IcedTeaPluginUtils.h: affected
+	* plugin/icedteanp/IcedTeaRunnable.cc: affected
+	* plugin/icedteanp/IcedTeaScriptablePluginObject.cc: affected
+	* tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc: added 
+	(TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_on)) and
+	(TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_off)) which call new
+	(doDebugErrorRun) and are measuring refactoring impacts.
+
 2013-10-22  Jiri Vanek  <jvanek at redhat.com>
 
 	More synchronized error/debug methods
diff -r e1dfddeb801d -r 175dda8f15e5 plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc	Tue Oct 22 11:46:27 2013 +0200
+++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc	Fri Oct 25 11:07:08 2013 +0200
@@ -78,7 +78,7 @@
 					result->error_msg->append(" ");
 				}
 
-				printf("Error on Java side: %s\n", result->error_msg->c_str());
+				PLUGIN_ERROR("Error on Java side: %s\n", result->error_msg->c_str());
 
 				result->error_occurred = true;
 				result_ready = true;
@@ -965,7 +965,7 @@
                 java_result = java_request.newArray(java_array_type, length_str);
 
                 if (java_result->error_occurred) {
-                    printf("Unable to create array\n");
+                    PLUGIN_ERROR("Unable to create array\n");
                     id->append("-1");
                     return;
                 }
@@ -984,7 +984,7 @@
                     createJavaObjectFromVariant(instance, value, &value_id);
 
                     if (value_id == "-1") {
-                        printf("Unable to populate array\n");
+                        PLUGIN_ERROR("Unable to populate array\n");
                         id->clear();
                         id->append("-1");
                         return;
@@ -1020,7 +1020,7 @@
                 // the result we want is in result_string (assuming there was no error)
                 if (java_result->error_occurred)
                 {
-                    printf("Unable to get JSObject class id\n");
+                    PLUGIN_ERROR("Unable to get JSObject class id\n");
                     id->clear();
                     id->append("-1");
                     return;
@@ -1036,7 +1036,7 @@
                 // the result we want is in result_string (assuming there was no error)
                 if (java_result->error_occurred)
                 {
-                    printf("Unable to get JSObject constructor id\n");
+                    PLUGIN_ERROR("Unable to get JSObject constructor id\n");
                     id->clear();
                     id->append("-1");
                     return;
@@ -1060,7 +1060,7 @@
                 // the result we want is in result_string (assuming there was no error)
                 if (java_result->error_occurred)
                 {
-                    printf("Unable to create JSObject\n");
+                    PLUGIN_ERROR("Unable to create JSObject\n");
                     id->clear();
                     id->append("-1");
                     return;
@@ -1077,7 +1077,7 @@
 
 		// the result we want is in result_string (assuming there was no error)
 		if (java_result->error_occurred) {
-			printf("Unable to find classid for %s\n", className.c_str());
+			PLUGIN_ERROR("Unable to find classid for %s\n", className.c_str());
 			id->append("-1");
 			return;
 		}
@@ -1092,7 +1092,7 @@
 
 		// the result we want is in result_string (assuming there was no error)
 		if (java_result->error_occurred) {
-			printf("Unable to find string constructor for %s\n", className.c_str());
+			PLUGIN_ERROR("Unable to find string constructor for %s\n", className.c_str());
 			id->append("-1");
             return;
 		}
@@ -1104,7 +1104,7 @@
 		java_result = java_request.newString(stringArg);
 
 		if (java_result->error_occurred) {
-			printf("Unable to create requested object\n");
+			PLUGIN_ERROR("Unable to create requested object\n");
 			id->append("-1");
             return;
 		}
@@ -1117,7 +1117,7 @@
 		java_result = java_request.newObjectWithConstructor("[System]", jsObjectClassID, jsObjectConstructorID, args);
 
         if (java_result->error_occurred) {
-            printf("Unable to create requested object\n");
+            PLUGIN_ERROR("Unable to create requested object\n");
             id->append("-1");
             return;
         }
diff -r e1dfddeb801d -r 175dda8f15e5 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Tue Oct 22 11:46:27 2013 +0200
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Fri Oct 25 11:07:08 2013 +0200
@@ -249,7 +249,7 @@
             if (IcedTeaPluginUtilities::file_exists(custom_jre+"/bin/java")){
                   return custom_jre+"/bin/java";
             } else {
-                 fprintf(stderr, "Your custom jre (/bin/java check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
+                 PLUGIN_ERROR("Your custom jre (/bin/java check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
             }
       }
       return appletviewer_default_executable;      
@@ -262,7 +262,7 @@
             if (IcedTeaPluginUtilities::file_exists(custom_jre+"/lib/rt.jar")){
                   return custom_jre+"/lib/rt.jar";
             } else {
-                  fprintf(stderr, "Your custom jre (/lib/rt.jar check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
+                  PLUGIN_ERROR("Your custom jre (/lib/rt.jar check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
             }
       }
       return appletviewer_default_rtjar;      
@@ -318,7 +318,7 @@
   identifier = browser_functions.getstringidentifier("document");
   if (!browser_functions.hasproperty(instance, window_ptr, identifier))
   {
-	printf("%s not found!\n", "document");
+	PLUGIN_ERROR("%s not found!\n", "document");
   }
   browser_functions.getproperty(instance, window_ptr, identifier, &member_ptr);
 
@@ -1939,7 +1939,7 @@
   np_error = plugin_test_appletviewer ();
   if (np_error != NPERR_NO_ERROR)
     {
-      fprintf(stderr, "Unable to find java executable %s\n", get_plugin_executable().c_str());
+      PLUGIN_ERROR("Unable to find java executable %s\n", get_plugin_executable().c_str());
       return np_error;
     }
 
@@ -2150,7 +2150,7 @@
 
         if (java_result->error_occurred)
         {
-            printf("Error: Unable to fetch applet instance id from Java side.\n");
+            PLUGIN_ERROR("Error: Unable to fetch applet instance id from Java side.\n");
             return NULL;
         }
 
@@ -2160,7 +2160,7 @@
 
         if (java_result->error_occurred)
         {
-            printf("Error: Unable to fetch applet instance id from Java side.\n");
+            PLUGIN_ERROR("Error: Unable to fetch applet instance id from Java side.\n");
             return NULL;
         }
 
diff -r e1dfddeb801d -r 175dda8f15e5 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Tue Oct 22 11:46:27 2013 +0200
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Fri Oct 25 11:07:08 2013 +0200
@@ -440,7 +440,7 @@
         // the result we want is in result_string (assuming there was no error)
         if (java_result->error_occurred)
         {
-	    printf("Unable to get member name for setMember. Error occurred: %s\n", java_result->error_msg->c_str());
+	    PLUGIN_ERROR("Unable to get member name for setMember. Error occurred: %s\n", java_result->error_msg->c_str());
             //goto cleanup;
         }
 
@@ -521,7 +521,7 @@
         // the result we want is in result_string (assuming there was no error)
         if (java_result->error_occurred)
         {
-	    printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
+	    PLUGIN_ERROR("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
             //goto cleanup;
         }
 
@@ -799,7 +799,7 @@
 
     if (!browser_functions.hasproperty(instance, parent_ptr, member_identifier))
     {
-        printf("%s not found!\n", browser_functions.utf8fromidentifier(member_identifier));
+        PLUGIN_ERROR("%s not found!\n", browser_functions.utf8fromidentifier(member_identifier));
     }
     ((AsyncCallThreadData*) data)->call_successful = browser_functions.getproperty(instance, parent_ptr, member_identifier, member_ptr);
 
diff -r e1dfddeb801d -r 175dda8f15e5 plugin/icedteanp/IcedTeaPluginUtils.cc
--- a/plugin/icedteanp/IcedTeaPluginUtils.cc	Tue Oct 22 11:46:27 2013 +0200
+++ b/plugin/icedteanp/IcedTeaPluginUtils.cc	Fri Oct 25 11:07:08 2013 +0200
@@ -399,7 +399,7 @@
 
 	wchar_t c;
 
-	if (plugin_debug) printf("Converted UTF-16LE string: ");
+	PLUGIN_DEBUG("Converted UTF-16LE string: ");
 
 	result_unicode_str->clear();
 	for (int i = begin; i < begin+length; i+=2)
@@ -413,14 +413,14 @@
         	(c >= 'A' && c <= 'Z') ||
         	(c >= '0' && c <= '9'))
         {
-        	if (plugin_debug) printf("%c", c);
+        	PLUGIN_DEBUG("%c", c);
         }
 
         result_unicode_str->push_back(c);
 	}
 
 	// not routing via debug print macros due to wide-string issues
-	if (plugin_debug) printf(". Length=%d\n", result_unicode_str->length());
+	PLUGIN_DEBUG(". Length=%d\n", result_unicode_str->length());
 }
 
 /*
diff -r e1dfddeb801d -r 175dda8f15e5 plugin/icedteanp/IcedTeaPluginUtils.h
--- a/plugin/icedteanp/IcedTeaPluginUtils.h	Tue Oct 22 11:46:27 2013 +0200
+++ b/plugin/icedteanp/IcedTeaPluginUtils.h	Fri Oct 25 11:07:08 2013 +0200
@@ -82,7 +82,7 @@
 {                                                                    \
     if (((JavaResultData*) result_data)->error_occurred)             \
     {                                                                \
-        printf("Error: Error occurred on Java side: %s.\n",          \
+        PLUGIN_ERROR("Error: Error occurred on Java side: %s.\n",    \
                ((JavaResultData*) result_data)->error_msg->c_str()); \
         return;                                                      \
     }                                                                \
diff -r e1dfddeb801d -r 175dda8f15e5 plugin/icedteanp/IcedTeaRunnable.cc
--- a/plugin/icedteanp/IcedTeaRunnable.cc	Tue Oct 22 11:46:27 2013 +0200
+++ b/plugin/icedteanp/IcedTeaRunnable.cc	Fri Oct 25 11:07:08 2013 +0200
@@ -38,6 +38,7 @@
 
 #include <stdio.h>
 #include "IcedTeaRunnable.h"
+#include "IcedTeaPluginUtils.h"
 
 NS_IMPL_ISUPPORTS1 (IcedTeaRunnable, nsIRunnable)
 
@@ -69,7 +70,7 @@
 NS_IMETHODIMP
 IcedTeaRunnableMethod::Run ()
 {
-    printf("Running method...\n");
+    PLUGIN_DEBUG("Running method...\n");
     (*method) (thread_data, result);
     return NS_OK;
 }
diff -r e1dfddeb801d -r 175dda8f15e5 plugin/icedteanp/IcedTeaScriptablePluginObject.cc
--- a/plugin/icedteanp/IcedTeaScriptablePluginObject.cc	Tue Oct 22 11:46:27 2013 +0200
+++ b/plugin/icedteanp/IcedTeaScriptablePluginObject.cc	Fri Oct 25 11:07:08 2013 +0200
@@ -49,19 +49,19 @@
 void
 IcedTeaScriptablePluginObject::deAllocate(NPObject *npobj)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::deAllocate %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::deAllocate %p\n", npobj);
 }
 
 void
 IcedTeaScriptablePluginObject::invalidate(NPObject *npobj)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::invalidate %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::invalidate %p\n", npobj);
 }
 
 bool
 IcedTeaScriptablePluginObject::hasMethod(NPObject *npobj, NPIdentifier name)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::hasMethod %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::hasMethod %p\n", npobj);
 	return false;
 }
 
@@ -69,7 +69,7 @@
 IcedTeaScriptablePluginObject::invoke(NPObject *npobj, NPIdentifier name, const NPVariant *args,
 			uint32_t argCount,NPVariant *result)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::invoke %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::invoke %p\n", npobj);
 	return false;
 }
 
@@ -77,14 +77,14 @@
 IcedTeaScriptablePluginObject::invokeDefault(NPObject *npobj, const NPVariant *args,
 			       uint32_t argCount, NPVariant *result)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::invokeDefault %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::invokeDefault %p\n", npobj);
 	return false;
 }
 
 bool
 IcedTeaScriptablePluginObject::hasProperty(NPObject *npobj, NPIdentifier name)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::hasProperty %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::hasProperty %p\n", npobj);
 	return false;
 }
 
@@ -97,7 +97,7 @@
 		//NPObject* obj = IcedTeaScriptablePluginObject::get_scriptable_java_package_object(getInstanceFromMemberPtr(npobj), name);
 		//OBJECT_TO_NPVARIANT(obj, *result);
 
-		//printf ("Filling variant %p with object %p\n", result);
+		//PLUGIN_ERROR ("Filling variant %p with object %p\n", result);
 	}
 
 	return false;
@@ -106,21 +106,21 @@
 bool
 IcedTeaScriptablePluginObject::setProperty(NPObject *npobj, NPIdentifier name, const NPVariant *value)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::setProperty %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::setProperty %p\n", npobj);
 	return false;
 }
 
 bool
 IcedTeaScriptablePluginObject::removeProperty(NPObject *npobj, NPIdentifier name)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::removeProperty %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::removeProperty %p\n", npobj);
 	return false;
 }
 
 bool
 IcedTeaScriptablePluginObject::enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::enumerate %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::enumerate %p\n", npobj);
 	return false;
 }
 
@@ -128,7 +128,7 @@
 IcedTeaScriptablePluginObject::construct(NPObject *npobj, const NPVariant *args, uint32_t argCount,
 	           NPVariant *result)
 {
-	printf ("** Unimplemented: IcedTeaScriptablePluginObject::construct %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::construct %p\n", npobj);
 	return false;
 }
 
@@ -217,7 +217,7 @@
 IcedTeaScriptableJavaPackageObject::invoke(NPObject *npobj, NPIdentifier name, const NPVariant *args,
 			uint32_t argCount,NPVariant *result)
 {
-	printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::invoke %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::invoke %p\n", npobj);
 	return false;
 }
 
@@ -225,7 +225,7 @@
 IcedTeaScriptableJavaPackageObject::invokeDefault(NPObject *npobj, const NPVariant *args,
 			       uint32_t argCount, NPVariant *result)
 {
-	printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::invokeDefault %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::invokeDefault %p\n", npobj);
 	return false;
 }
 
@@ -331,14 +331,14 @@
 bool
 IcedTeaScriptableJavaPackageObject::removeProperty(NPObject *npobj, NPIdentifier name)
 {
-	printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::removeProperty %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::removeProperty %p\n", npobj);
 	return false;
 }
 
 bool
 IcedTeaScriptableJavaPackageObject::enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
 {
-	printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::enumerate %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::enumerate %p\n", npobj);
 	return false;
 }
 
@@ -346,7 +346,7 @@
 IcedTeaScriptableJavaPackageObject::construct(NPObject *npobj, const NPVariant *args, uint32_t argCount,
 	           NPVariant *result)
 {
-	printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::construct %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::construct %p\n", npobj);
 	return false;
 }
 
@@ -566,7 +566,7 @@
 
         if (id == "-1")
         {
-            printf("Unable to create arguments on Java side\n");
+            PLUGIN_ERROR("Unable to create arguments on Java side\n");
             return false;
         }
 
@@ -603,7 +603,7 @@
 IcedTeaScriptableJavaObject::invokeDefault(NPObject *npobj, const NPVariant *args,
 			       uint32_t argCount, NPVariant *result)
 {
-	printf ("** Unimplemented: IcedTeaScriptableJavaObject::invokeDefault %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaObject::invokeDefault %p\n", npobj);
 	return false;
 }
 
@@ -676,7 +676,7 @@
             java_result = java_request.getArrayLength(instance_id);
             if (java_result->error_occurred)
             {
-                printf("ERROR: Couldn't fetch array length\n");
+                PLUGIN_ERROR("ERROR: Couldn't fetch array length\n");
                 return false;
             }
 
@@ -752,7 +752,7 @@
              browser_functions.utf8fromidentifier(name) &&
              !strcmp(browser_functions.utf8fromidentifier(name), "length"))
         {
-            printf("ERROR: Array length is not a modifiable property\n");
+            PLUGIN_ERROR("ERROR: Array length is not a modifiable property\n");
             return false;
         } else if ( ((IcedTeaScriptableJavaObject*) npobj)->isArray() &&
                     browser_functions.intfromidentifier(name) >= 0) // else if array and requesting index
@@ -761,7 +761,7 @@
             java_result = java_request.getArrayLength(instance_id);
             if (java_result->error_occurred)
             {
-                printf("ERROR: Couldn't fetch array length\n");
+                PLUGIN_ERROR("ERROR: Couldn't fetch array length\n");
                 return false;
             }
 
@@ -813,14 +813,14 @@
 bool
 IcedTeaScriptableJavaObject::removeProperty(NPObject *npobj, NPIdentifier name)
 {
-	printf ("** Unimplemented: IcedTeaScriptableJavaObject::removeProperty %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaObject::removeProperty %p\n", npobj);
 	return false;
 }
 
 bool
 IcedTeaScriptableJavaObject::enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
 {
-	printf ("** Unimplemented: IcedTeaScriptableJavaObject::enumerate %p\n", npobj);
+	PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaObject::enumerate %p\n", npobj);
 	return false;
 }
 
diff -r e1dfddeb801d -r 175dda8f15e5 tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc
--- a/tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc	Tue Oct 22 11:46:27 2013 +0200
+++ b/tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc	Fri Oct 25 11:07:08 2013 +0200
@@ -34,7 +34,9 @@
  obligated to do so.  If you do not wish to do so, delete this
  exception statement from your version. */
 
+#include <fstream>
 #include <UnitTest++.h>
+#include <stdio.h>
 
 #include <npapi.h>
 
@@ -47,6 +49,8 @@
 extern void trim(std::string& str);
 extern bool file_exists(std::string filename);
 
+void doDebugErrorRun();
+
 TEST(NPVariantAsString) {
     NPVariant var;
     STRINGZ_TO_NPVARIANT("test", var);
@@ -122,3 +126,60 @@
 	bool b = IcedTeaPluginUtilities::file_exists(f1);
 	CHECK_EQUAL(b, false);
 }
+
+
+void doDebugErrorRun() {
+	FILE* old1 = stdout;
+	FILE* old2 = stderr;
+	char* buf1 = " 	                         ";
+	char* buf2 = "                           ";
+	stdout = fmemopen (buf1, strlen (buf1), "rw");
+	stderr = fmemopen (buf2, strlen (buf2), "rw");
+	

From omajid at redhat.com  Sat Oct 26 06:53:11 2013
From: omajid at redhat.com (Omair Majid)
Date: Sat, 26 Oct 2013 09:53:11 -0400
Subject: Small refactoring in searching for attributes
In-Reply-To: <526A4532.4000401@redhat.com>
References: <526A4532.4000401@redhat.com>
Message-ID: <20131026135310.GA1983@redhat.com>

Hi,

* Jiri Vanek <jvanek at redhat.com> [2013-10-25 06:11]:
> ping?

Sorry, fell off my radar. Comments below.

> -------- Original Message --------
> Subject: Re: Small refactoring in searching for attributes
> Date: Mon, 21 Oct 2013 15:29:01 +0200
> From: Jiri Vanek <jvanek at redhat.com>
> To: Omair Majid <omajid at redhat.com>
> CC: IcedTea Distro List <distro-pkg-dev at openjdk.java.net>
> 
> On 10/18/2013 05:00 PM, Omair Majid wrote:
> >* Jiri Vanek <jvanek at redhat.com> [2013-10-18 09:14]:
> >>Please note, this have to go also to 1.4, and that tests are already included n itw.
> >
> >Patch itself looks okay to me. You have introduced two new public
> >methods, though:
> 
> thanx, pushed.
> 
> >
> >>+    public String checkForAttributeInJars(List<JARDesc> jars, Attributes.Name name) {
> >
> >>+    public String getManifestAttribute(URL location, Attributes.Name  attribute) {
> >
> >Could you add unit tests for these new methods? Just like the previous
> >unit tests give us some guarantee that users of the old methods are
> >still covered, it would be nice to have some guarantee that users are
> >also covered if these new methods were refactored too.
> 
> Here is test. It growe a bit
>   - to test the order during search the dummy jnlp file had to be extended to work with set of jars
> 
> 
> changes ala
> 
> +++ b/netx/net/sourceforge/jnlp/JARDesc.java	Mon Oct 21 15:25:09 2013 +0200
> 
> -    private URL location;
> +    private final URL location;
> 
> ...
> 
> 
> Are a bit unrelated, but worthy.

Yup. This is actually very nice to have! I think all the fields in JARDesc
are now final. Can you mark the class (maybe in the javadoc) as
immutable/thread-safe ?

> I wonted to write setter for "main" field, and realised how wrong
> this class is. So I did not made the api dirty (used refelction in dummyJnlp) and adde those finals.

I have mixed feelings about this. If you need to peek at a field to find
out that this class is working correctly, maybe that fields needs to be
public (or accessible through a getter/setter)?

The way I see it, the unit tests are verifying the API/functionality. If
something is not visible externally (at all), does it really have any
purpose? Does it need to be tested?

> Ok for head (both patch and fix?)

The patch was okay. It's just that I generally put fix and test in one
commit (because creating a good test often exposes deficiencies in the
fix).

> Also both, or one, or none :) to 1.4 ?

There are no functional changes, right? Sounds okay to me.

> +++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java	Mon Oct 21 15:25:09 2013 +0200

> +    public void getCustomAtributes() throws Exception {
> +        File tempDirectory = FileTestUtils.createTempDirectory();
> +        File jarLocation = new File(tempDirectory, "testX.jar");

Can you decouple the unit test from the file system? The more this unit
test does, the less useful it becomes as a 'unit' test (since the 'unit'
now becomes 3 large classes and the file system).

> +        /* Test with attributes in manifest */ {

When you feel tempted to write comments like this, it's an indication
that it should be a separate unit test :)

> +      @Test
> +    public void checkOrderWhenReadingAttributes() throws Exception {
> +        File tempDirectory = FileTestUtils.createTempDirectory();
> +        File jarLocation5 = new File(tempDirectory, "test5.jar");
> +
> +        /* Test with main-class in manifest */ {
> +            Manifest manifest1 = new Manifest();
> +            manifest1.getMainAttributes().put(Attributes.Name.MAIN_CLASS, "DummyClass1"); //two times, but one in main jar, see jnlpFile.setMainJar(3);

Something is wrong in the indentation here. Please following the coding
style: http://icedtea.classpath.org/wiki/IcedTea-Web#Code_style

> +            Manifest manifest2 = new Manifest();
> +            manifest2.getMainAttributes().put(Attributes.Name.IMPLEMENTATION_VENDOR, "rh1"); //two times, both in not main jar, see jnlpFile.setMainJar(3);
> +            
> +            Manifest manifest3 = new Manifest();
> +            manifest3.getMainAttributes().put(Attributes.Name.IMPLEMENTATION_TITLE, "it"); //jsut once in not main jar, see jnlpFile.setMainJar(3);

What's setMainJar(3) ?

> +            assertNoFileLeak(new Runnable() {

Not leaking files is good, but it's better to not use files in unit
tests.

> +++ b/tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java	Mon Oct 21 15:25:09 2013 +0200

> +    public void setMainJar(int i) throws Exception {
> +        Field field = JARDesc.class.getDeclaredField("main");
> +        Field modifiersField = Field.class.getDeclaredField("modifiers");
> +        modifiersField.setAccessible(true);
> +        modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
> +        modifiersField.setInt(field, field.getModifiers() & ~Modifier.PRIVATE);
> +        modifiersField.setInt(field, Modifier.PUBLIC);
> +        field.set(jarDescs[i], true);

Uhm. Please consider a different implementation.

From bugzilla-daemon at icedtea.classpath.org  Sat Oct 26 09:19:26 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 26 Oct 2013 16:19:26 +0000
Subject: [Bug 1147] wrongly assume DNS available even behind a proxy
In-Reply-To: <bug-1147-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1147-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1147-30-1qGy7q2GKF@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1147

--- Comment #3 from Omair Majid <omajid at redhat.com> ---
(In reply to comment #2)
> > update the jnlp and jars from it's original source.
> 
> Do you mean update the .icedtea/cache directory ?

Yes. (The paths maybe different, but the local disk cache is what I mean).

> > skips DNS resolution but still uses the most-up-to-date version of the
> > jars from the original location
> 
> I do not understand why my patch would disable the update of the jars. My
> understanding was that updating or not updating was decided by the
> JNLPClassLoader and CachedJarFileCallback classes.
> 
> Do you mean that if there is no <offline-allowed/> the application should
> not be ran even if it's available in the cache directory ?

Yes. As far as I understand, this is the purpose behind <offline-allowed/> in
the first place.

> If yes, do you
> agree that this behaviour should be implemented in JNLPClassLoader and not
> in Launcher ?

JNLPClassLoader is already doing too much and is too complex, I think. But I
agree that this functionality does not belong in Launcher either.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131026/6a21a95c/attachment.html 

From helpcrypto at gmail.com  Mon Oct 28 05:15:12 2013
From: helpcrypto at gmail.com (helpcrypto helpcrypto)
Date: Mon, 28 Oct 2013 13:15:12 +0100
Subject: Icedtea supports something called "Pepper"?
Message-ID: <CAHMQSgvSDkeT39MDV8GmUL3L=0puS_x98bHf3j=PvkrFac-ZiQ@mail.gmail.com>

Hi all.


Last days I have seen a couple of sources claiming (Google) Chrome and
(Mozilla) Firefox are going to abandon NPAPI and start using *Peeper *
plugins.

Is Icetea "ready" for that possible change?
Will all my applets fail to work next year? (as they are doing with latest
Oracle releases)

Thanks for the info!
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131028/8028df11/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Mon Oct 28 06:33:25 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 28 Oct 2013 13:33:25 +0000
Subject: [Bug 900] Fatal: Application Error: Unknown Main-Class. Could not
	determine the main class for this application.
In-Reply-To: <bug-900-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-900-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-900-30-ZuUARIgjK5@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=900

--- Comment #5 from Andrew Azores <aazores at redhat.com> ---
Can you try launching the RDP applet with the ICEDTEAPLUGIN_DEBUG=true
environment veriable set? This will produce some more verbose log output that
may help with troubleshooting.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131028/188ac1d4/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Mon Oct 28 06:50:42 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 28 Oct 2013 13:50:42 +0000
Subject: [Bug 900] Fatal: Application Error: Unknown Main-Class. Could not
	determine the main class for this application.
In-Reply-To: <bug-900-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-900-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-900-30-rYsmK0mcZj@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=900

--- Comment #6 from gerard.fernandes at gmail.com ---
I tried it by:

[gerry at ajax ~]$ ICEDTEAPLUGIN_DEBUG=true firefox 2>&1 | tee plugin.log

I still get the same exception and nothing in plugin.log


IcedTea-Web Plugin version: 1.4.1 (fedora-0.fc18-x86_64)
Mon Oct 28 13:48:34 GMT 2013
net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: Could not
initialize applet. For more information click "more information button".
    at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:734)
    at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:662)
    at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:914)
Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Application Error:
Unknown Main-Class. Could not determine the main class for this application.
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:708)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.<init>(JNLPClassLoader.java:249)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:382)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420)
    at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:700)
    ... 2 more

 Chain: 
1) at Mon Oct 28 13:48:22 GMT 2013
net.sourceforge.jnlp.LaunchException: Fatal: Application Error: Unknown
Main-Class. Could not determine the main class for this application.
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:708)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.<init>(JNLPClassLoader.java:249)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:382)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420)
    at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:700)
    at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:662)
    at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:914)
2) at Mon Oct 28 13:48:22 GMT 2013
net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: Could not
initialize applet. For more information click "more information button".
    at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:734)
    at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:662)
    at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:914)
Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Application Error:
Unknown Main-Class. Could not determine the main class for this application.
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:708)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.<init>(JNLPClassLoader.java:249)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:382)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420)
    at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:700)
    ... 2 more
3) at Mon Oct 28 13:48:31 GMT 2013
net.sourceforge.jnlp.LaunchException: Fatal: Application Error: Unknown
Main-Class. Could not determine the main class for this application.
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:708)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.<init>(JNLPClassLoader.java:249)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:382)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420)
    at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:700)
    at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:662)
    at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:914)
4) at Mon Oct 28 13:48:31 GMT 2013
net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: Could not
initialize applet. For more information click "more information button".
    at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:734)
    at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:662)
    at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:914)
Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Application Error:
Unknown Main-Class. Could not determine the main class for this application.
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:708)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.<init>(JNLPClassLoader.java:249)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.createInstance(JNLPClassLoader.java:382)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:444)
    at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:420)
    at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:700)
    ... 2 more

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131028/8bf14c24/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Mon Oct 28 06:51:55 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 28 Oct 2013 13:51:55 +0000
Subject: [Bug 1582] Plugins don't start - test page just does nothing
In-Reply-To: <bug-1582-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1582-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1582-30-64JPioV3hA@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1582

Andrew Azores <aazores at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |aazores at redhat.com

--- Comment #1 from Andrew Azores <aazores at redhat.com> ---
What are the ownership/permissions on your ~/.icedtea/cache directory? What
happens inside your cache directory when this error occurs? Does the directory
structure (eg 0/http/www.java.com/applet) get created at all, does the
JavaDetection_applet.jnlp.info.temp file appear within it?

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131028/65848d4f/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Mon Oct 28 07:02:14 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 28 Oct 2013 14:02:14 +0000
Subject: [Bug 1582] Plugins don't start - test page just does nothing
In-Reply-To: <bug-1582-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1582-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1582-30-YoSBWGZ4AW@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1582

--- Comment #2 from Erik Corry <erik at arbat.com> ---
I don't have the system right here, but I blew away the .icedtea directory and
let it be recreated.  It was recreated, but with the same issue.

Note that the rename fails not because of permissions, but because of a missing
directory.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131028/ae516823/attachment-0001.html 

From omajid at redhat.com  Mon Oct 28 07:22:45 2013
From: omajid at redhat.com (Omair Majid)
Date: Mon, 28 Oct 2013 10:22:45 -0400
Subject: Icedtea supports something called "Pepper"?
In-Reply-To: <CAHMQSgvSDkeT39MDV8GmUL3L=0puS_x98bHf3j=PvkrFac-ZiQ@mail.gmail.com>
References: <CAHMQSgvSDkeT39MDV8GmUL3L=0puS_x98bHf3j=PvkrFac-ZiQ@mail.gmail.com>
Message-ID: <20131028142245.GB1596@redhat.com>

Hi,

* helpcrypto helpcrypto <helpcrypto at gmail.com> [2013-10-28 08:25]:
> Last days I have seen a couple of sources claiming (Google) Chrome and
> (Mozilla) Firefox are going to abandon NPAPI and start using Peeper plugins.

There's quite a few sources saying that for Chrom(ium|e), but this is
the first I am hearing of Firefox doing the same. Most other source say
this is not going to happen [1][2].

> Is Icetea "ready" for that possible change?

No. IcedTea-Web uses NPAPI. Porting it to use the Pepper API is a
non-trivial task. As far as I know, there's no compatibility layer in
Pepper for NPAPI.

Personally, I would be more than happy to okay (otherwise sane) patches
adding Pepper support to IcedTea-Web.

> Will all my applets fail to work next year? (as they are doing with latest
> Oracle releases)

Yes, if the browsers break the plugin API IcedTea-Web uses, IcedTea-Web
will not be able to run any applets :(

Thanks,
Omair

[1] https://bugzilla.mozilla.org/show_bug.cgi?id=729481
[2] https://wiki.mozilla.org/NPAPI:Pepper

From bugzilla-daemon at icedtea.classpath.org  Mon Oct 28 07:33:30 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 28 Oct 2013 14:33:30 +0000
Subject: [Bug 1582] Plugins don't start - test page just does nothing
In-Reply-To: <bug-1582-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1582-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1582-30-ID3WNGHlyG@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1582

--- Comment #3 from Andrew Azores <aazores at redhat.com> ---
The exception occurs after an apparently successful call to create the temp
file so I'm surprised that the directory structure it resides in doesn't exist
in the expected state at the time this exception is thrown. Do you remember
what the exact problem was with the directory structure?

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131028/68826ce7/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Mon Oct 28 07:45:23 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 28 Oct 2013 14:45:23 +0000
Subject: [Bug 900] Fatal: Application Error: Unknown Main-Class. Could not
	determine the main class for this application.
In-Reply-To: <bug-900-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-900-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-900-30-eOxI1XDOr5@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=900

--- Comment #7 from Andrew Azores <aazores at redhat.com> ---
That is odd that the environment variable did not enable the debugging output.
Without it, this issue is very difficult to pinpoint, as the exception you've
posted could arise for a number of reasons. It may be (somehow) bug 1465 again
as you've suggested, or it could have an entirely different cause and yet
produce the same stack trace, eg [1].

You can also try to enable the debugging output by running the itweb-settings
command. Choose "debugging" from the left pane and tick the "Enable logging"
box, then run Firefox from the terminal again.

[1] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1513

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131028/ef043b7d/attachment.html 

From gnu.andrew at redhat.com  Mon Oct 28 11:07:10 2013
From: gnu.andrew at redhat.com (Andrew)
Date: Mon, 28 Oct 2013 14:07:10 -0400 (EDT)
Subject: Icedtea supports something called "Pepper"?
In-Reply-To: <20131028142245.GB1596@redhat.com>
References: <CAHMQSgvSDkeT39MDV8GmUL3L=0puS_x98bHf3j=PvkrFac-ZiQ@mail.gmail.com>
	<20131028142245.GB1596@redhat.com>
Message-ID: <745247739.14687998.1382983630713.JavaMail.root@redhat.com>

----- Original Message -----
> Hi,
> 
> * helpcrypto helpcrypto <helpcrypto at gmail.com> [2013-10-28 08:25]:
> > Last days I have seen a couple of sources claiming (Google) Chrome and
> > (Mozilla) Firefox are going to abandon NPAPI and start using Peeper
> > plugins.
> 
> There's quite a few sources saying that for Chrom(ium|e), but this is
> the first I am hearing of Firefox doing the same. Most other source say
> this is not going to happen [1][2].
> 
> > Is Icetea "ready" for that possible change?
> 
> No. IcedTea-Web uses NPAPI. Porting it to use the Pepper API is a
> non-trivial task. As far as I know, there's no compatibility layer in
> Pepper for NPAPI.
> 
> Personally, I would be more than happy to okay (otherwise sane) patches
> adding Pepper support to IcedTea-Web.
> 
> > Will all my applets fail to work next year? (as they are doing with latest
> > Oracle releases)
> 
> Yes, if the browsers break the plugin API IcedTea-Web uses, IcedTea-Web
> will not be able to run any applets :(
> 

I don't think it's "if" is it, but when? It's certainly on the cards for
Chrome/Chromium and that's the most popular FOSS web browser.

> Thanks,
> Omair
> 
> [1] https://bugzilla.mozilla.org/show_bug.cgi?id=729481
> [2] https://wiki.mozilla.org/NPAPI:Pepper
> 

-- 
Andrew :)

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

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07


From bugzilla-daemon at icedtea.classpath.org  Mon Oct 28 13:01:51 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 28 Oct 2013 20:01:51 +0000
Subject: [Bug 1582] Plugins don't start - test page just does nothing
In-Reply-To: <bug-1582-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1582-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1582-30-iJOg5PU2vt@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1582

--- Comment #4 from Erik Corry <erik at arbat.com> ---
Under the .icedtea/cache/0/http/www.java.com directory there is no subdir
called "en".  This may have something to do with the browser being in Danish,
but there is no "da" directory either.  This makes the move of the file fail.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131028/90d4453d/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Mon Oct 28 13:02:33 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 28 Oct 2013 20:02:33 +0000
Subject: [Bug 1582] Plugins don't start - test page just does nothing
In-Reply-To: <bug-1582-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1582-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1582-30-swn0tfg6oe@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1582

--- Comment #5 from Erik Corry <erik at arbat.com> ---
Under the .icedtea/cache/0/http/www.java.com directory there is no subdir
called "en".  This may have something to do with the browser being in Danish,
but there is no "da" directory either.  This makes the move of the file fail.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131028/ab80e271/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Mon Oct 28 13:11:30 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 28 Oct 2013 20:11:30 +0000
Subject: [Bug 1582] Plugins don't start - test page just does nothing
In-Reply-To: <bug-1582-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1582-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1582-30-IwS3Pf1iXP@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1582

--- Comment #6 from Andrew Azores <aazores at redhat.com> ---
Ah yes, sorry, somehow I missed that difference in the paths from the
stacktrace you posted. My mistake.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131028/a9637014/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Mon Oct 28 13:19:44 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 28 Oct 2013 20:19:44 +0000
Subject: [Bug 1590] New: Icedtea segfaults while compiling the Rakudo Perl 6
	compiler
Message-ID: <bug-1590-30@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1590

            Bug ID: 1590
           Summary: Icedtea segfaults while compiling the Rakudo Perl 6
                    compiler
    Classification: Unclassified
           Product: IcedTea
           Version: unspecified
          Hardware: x86_64
                OS: Linux
            Status: NEW
          Severity: normal
          Priority: P3
         Component: IcedTea
          Assignee: gnu.andrew at redhat.com
          Reporter: moritz at faui2k3.org
                CC: unassigned at icedtea.classpath.org

Created attachment 963
  --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=963&action=edit
Error log

Icedtea segfaulted for me while building the Rakudo Perl 6 compiler with the
JVM backend.

To reproduce, run

git clone git at github.com:rakudo/rakudo.git
cd rakudo
git checkout 99520735ea80d0d8ce7d38fd2b38b902f0ca37b7
perl Configure.pl --backends=jvm --gen-nqp
make -j3

on an amd64 Debian GNU/Linux. The error log is attached.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131028/fd50c81c/attachment.html 

From aph at redhat.com  Mon Oct 28 14:42:18 2013
From: aph at redhat.com (Andrew Haley)
Date: Mon, 28 Oct 2013 21:42:18 +0000
Subject: Icedtea supports something called "Pepper"?
In-Reply-To: <745247739.14687998.1382983630713.JavaMail.root@redhat.com>
References: <CAHMQSgvSDkeT39MDV8GmUL3L=0puS_x98bHf3j=PvkrFac-ZiQ@mail.gmail.com>
	<20131028142245.GB1596@redhat.com>
	<745247739.14687998.1382983630713.JavaMail.root@redhat.com>
Message-ID: <526EDA3A.8060708@redhat.com>

On 10/28/2013 06:07 PM, Andrew wrote:
>>
>> Personally, I would be more than happy to okay (otherwise sane) patches
>> adding Pepper support to IcedTea-Web.
>>
>>> Will all my applets fail to work next year? (as they are doing with latest
>>> Oracle releases)
>>
>> Yes, if the browsers break the plugin API IcedTea-Web uses, IcedTea-Web
>> will not be able to run any applets :(
> 
> I don't think it's "if" is it, but when? It's certainly on the cards for
> Chrome/Chromium and that's the most popular FOSS web browser.

Is it really?  Chrome isn't FOSS, and Chromium is what, maybe 1% ?  I
suppose no-one knows because no-one is gathering the statistics.

Andrew.



From gnu.andrew at redhat.com  Mon Oct 28 23:44:17 2013
From: gnu.andrew at redhat.com (Andrew)
Date: Tue, 29 Oct 2013 02:44:17 -0400 (EDT)
Subject: Icedtea supports something called "Pepper"?
In-Reply-To: <526EDA3A.8060708@redhat.com>
References: <CAHMQSgvSDkeT39MDV8GmUL3L=0puS_x98bHf3j=PvkrFac-ZiQ@mail.gmail.com>
	<20131028142245.GB1596@redhat.com>
	<745247739.14687998.1382983630713.JavaMail.root@redhat.com>
	<526EDA3A.8060708@redhat.com>
Message-ID: <2091863181.15048143.1383029057989.JavaMail.root@redhat.com>

----- Original Message -----
> On 10/28/2013 06:07 PM, Andrew wrote:
> >>
> >> Personally, I would be more than happy to okay (otherwise sane) patches
> >> adding Pepper support to IcedTea-Web.
> >>
> >>> Will all my applets fail to work next year? (as they are doing with
> >>> latest
> >>> Oracle releases)
> >>
> >> Yes, if the browsers break the plugin API IcedTea-Web uses, IcedTea-Web
> >> will not be able to run any applets :(
> > 
> > I don't think it's "if" is it, but when? It's certainly on the cards for
> > Chrome/Chromium and that's the most popular FOSS web browser.
> 
> Is it really?  Chrome isn't FOSS, and Chromium is what, maybe 1% ?  I
> suppose no-one knows because no-one is gathering the statistics.
> 

The relationship between Chrome & Chromium is much the same as that between
the proprietary Oracle JDK and OpenJDK; the differences are mainly branding
and the inclusion of proprietary plugins & codecs [0].  If a plugin supports
one, it supports the other.

As to usage, [1] suggests that Chrome has now overtaken Internet Explorer.

[0] https://en.wikipedia.org/wiki/Chromium_(web_browser)#Differences_from_Google_Chrome
[1] https://en.wikipedia.org/wiki/Usage_share_of_web_browsers

> Andrew.
> 
> 
> 

-- 
Andrew :)

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

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07


From helpcrypto at gmail.com  Tue Oct 29 00:29:32 2013
From: helpcrypto at gmail.com (helpcrypto helpcrypto)
Date: Tue, 29 Oct 2013 08:29:32 +0100
Subject: Icedtea supports something called "Pepper"?
In-Reply-To: <2091863181.15048143.1383029057989.JavaMail.root@redhat.com>
References: <CAHMQSgvSDkeT39MDV8GmUL3L=0puS_x98bHf3j=PvkrFac-ZiQ@mail.gmail.com>
	<20131028142245.GB1596@redhat.com>
	<745247739.14687998.1382983630713.JavaMail.root@redhat.com>
	<526EDA3A.8060708@redhat.com>
	<2091863181.15048143.1383029057989.JavaMail.root@redhat.com>
Message-ID: <CAHMQSgvwbd=SM3VK0akLH3REmwrUUX7EakYfw1cH873fHkCTTw@mail.gmail.com>

Thanks a lot for your answers!
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131029/0336791a/attachment.html 

From andrew at icedtea.classpath.org  Tue Oct 29 07:25:16 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 29 Oct 2013 14:25:16 +0000
Subject: /hg/icedtea6: Add security fixes from 2013/10/15.
Message-ID: <hg.e98b0ef70b26.1383056716.2873452341184383832@icedtea.classpath.org>

changeset e98b0ef70b26 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e98b0ef70b26
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Oct 29 14:24:52 2013 +0000

	Add security fixes from 2013/10/15.

	2013-10-29  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/openjdk/8002070-remove_logger_stack_search_2.patch,
		* patches/openjdk/8009463-space_and_final_backslash.patch,
		* patches/openjdk/8013380-handle_renames.patch:
		Removed as incorporated in other patches.
		* Makefile.am:
		(SECURITY_PATCHES): Add security update.
		* patches/jtreg-LastErrorString.patch: Regenerated.
		* patches/openjdk/4075303-javap_update.patch,
		* patches/openjdk/4111861-static_fields.patch,
		* patches/openjdk/4501661-disallow_mixing.patch,
		* patches/openjdk/4884240-javap_additional_option.patch,
		* patches/openjdk/6708729-javap_makefile_update.patch,
		* patches/openjdk/6715767-javap_crash.patch,
		* patches/openjdk/6819246-javap_instruction_decoding.patch,
		* patches/openjdk/6824493-experimental.patch,
		* patches/openjdk/6841419-classfile_iterator.patch,
		* patches/openjdk/6841420-classfile_methods.patch,
		* patches/openjdk/6843013-missing_experimental.patch,
		* patches/openjdk/6852856-javap_subclasses.patch,
		* patches/openjdk/6867671-javap_whitespace.patch,
		* patches/openjdk/6868539-constant_pool_tags.patch,
		* patches/openjdk/6902264-fix_indentation.patch,
		* patches/openjdk/6954275-big_xml_signatures.patch,
		* patches/openjdk/7146431-java.security_files.patch,
		* patches/openjdk/7162902-corba_fixes.patch,
		* patches/openjdk/7196533-timezone_bottleneck.patch,
		* patches/openjdk/8000450-restrict_access.patch,
		* patches/openjdk/8002070-remove_logger_stack_search.patch,
		* patches/openjdk/8003992-embedded_nulls.patch,
		* patches/openjdk/8004188-rename_java.security.patch,
		* patches/openjdk/8006882-jmockit.patch,
		* patches/openjdk/8006900-new_date_time.patch,
		* patches/openjdk/8008589-better_mbean_permission_validation.patch,
		* patches/openjdk/8010118-caller_sensitive.patch,
		* patches/openjdk/8010727-empty_logger_name.patch,
		* patches/openjdk/8010939-logmanager_deadlock.patch,
		* patches/openjdk/8011071-better_crypto_provider_handling.patch,
		* patches/openjdk/8011081-improve_jhat.patch,
		* patches/openjdk/8011139-revise_checking_getenclosingclass.patch,
		* patches/openjdk/8011157-improve_corba_portability-jdk.patch,
		* patches/openjdk/8011157-improve_corba_portability.patch,
		* patches/openjdk/8011990-logger_test_urls.patch,
		* patches/openjdk/8012071-better_bean_building.patch,
		* patches/openjdk/8012147-improve_tool.patch,
		* patches/openjdk/8012243-serial_regression.patch,
		* patches/openjdk/8012277-improve_dataflavour.patch,
		* patches/openjdk/8012425-transform_transformfactory.patch,
		* patches/openjdk/8012453-runtime.exec.patch,
		* patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch,
		* patches/openjdk/8013380-logger_stack_walk_glassfish.patch,
		* patches/openjdk/8013503-improve_stream_factories.patch,
		* patches/openjdk/8013506-better_pack200.patch,
		* patches/openjdk/8013510-augment_image_writing.patch,
		* patches/openjdk/8013514-improve_cmap_stability.patch,
		* patches/openjdk/8013739-better_ldap_resource_management.patch,
		* patches/openjdk/8013744-better_tabling.patch,
		* patches/openjdk/8013827-createtempfile_hang.patch,
		* patches/openjdk/8014085-better_serialization.patch,
		* patches/openjdk/8014093-improve_image_parsing.patch,
		* patches/openjdk/8014102-improve_image_conversion.patch,
		* patches/openjdk/8014341-better_kerberos_service.patch,
		* patches/openjdk/8014349-getdeclaredclass_fix.patch,
		* patches/openjdk/8014530-better_dsp.patch,
		* patches/openjdk/8014534-better_profiling.patch,
		* patches/openjdk/8014718-remove_logging_suntoolkit.patch,
		* patches/openjdk/8014745-logger_stack_walk_switch.patch,
		* patches/openjdk/8014987-augment_serialization.patch,
		* patches/openjdk/8015144-performance_regression.patch,
		* patches/openjdk/8015614-update_build.patch,
		* patches/openjdk/8015731-auth_improvements.patch,
		* patches/openjdk/8015743-address_internet_addresses.patch,
		* patches/openjdk/8015965-typo_in_property_name.patch,
		* patches/openjdk/8015978-incorrect_transformation.patch,
		* patches/openjdk/8016256-finalization_final.patch,
		* patches/openjdk/8016357-update_hs_diagnostic_class.patch,
		* patches/openjdk/8016653-ignoreable_characters.patch,
		* patches/openjdk/8016675-robust_javadoc.patch,
		* patches/openjdk/8017196-ensure_proxies_are_handled_appropriately-jdk.patch,
		* patches/openjdk/8017196-ensure_proxies_are_handled_appropriately.patch,
		* patches/openjdk/8017287-better_resource_disposal.patch,
		* patches/openjdk/8017291-cast_proxies_aside.patch,
		* patches/openjdk/8017298-better_xml_support.patch,
		* patches/openjdk/8017300-improve_interface_implementation.patch,
		* patches/openjdk/8017505-better_client_service.patch,
		* patches/openjdk/8017566-backout_part_of_8000450.patch,
		* patches/openjdk/8019292-better_attribute_value_exceptions.patch,
		* patches/openjdk/8019584-invalid_notification_fix.patch,
		* patches/openjdk/8019617-better_view_of_objects.patch,
		* patches/openjdk/8019969-inet6_test_case_fix.patch,
		* patches/openjdk/8019979-better_access_test.patch,
		* patches/openjdk/8020293-jvm_crash.patch,
		* patches/openjdk/8020943-memory_leak.patch,
		* patches/openjdk/8021290-signature_validation.patch,
		* patches/openjdk/8021355-splashscreen_regression.patch,
		* patches/openjdk/8021366-jaxp_test_fix-01.patch,
		* patches/openjdk/8021577-bean_serialization_fix.patch,
		* patches/openjdk/8021933-jaxp_test_fix-02.patch,
		* patches/openjdk/8021969-jnlp_load_failure.patch,
		* patches/openjdk/8022661-writeobject_flush.patch,
		* patches/openjdk/8022682-supporting_xom.patch,
		* patches/openjdk/8022940-enhance_corba_translations.patch,
		* patches/openjdk/8023457-tracing_mutex.patch,
		* patches/openjdk/8023478-hs_crash.patch,
		* patches/openjdk/8023683-enhance_class_file_parsing.patch,
		* patches/openjdk/8023964-ignore_test.patch,
		* patches/openjdk/8024914-swapped_usage.patch,
		* patches/openjdk/8025128-createtempfile_absolute_prefix.patch,
		* patches/openjdk/oj6-19-fix_8010118_test_cases.patch,
		* patches/openjdk/oj6-20-merge.patch,
		* patches/openjdk/oj6-21-overrides.patch: Added.
		* NEWS: Updated.


diffstat:

 ChangeLog                                                                  |    114 +
 Makefile.am                                                                |    119 +-
 NEWS                                                                       |    122 +-
 patches/jtreg-LastErrorString.patch                                        |     31 +-
 patches/openjdk/4075303-javap_update.patch                                 |  12081 ++++++++++
 patches/openjdk/4111861-static_fields.patch                                |    280 +
 patches/openjdk/4501661-disallow_mixing.patch                              |    222 +
 patches/openjdk/4884240-javap_additional_option.patch                      |    288 +
 patches/openjdk/6708729-javap_makefile_update.patch                        |     59 +
 patches/openjdk/6715767-javap_crash.patch                                  |    135 +
 patches/openjdk/6819246-javap_instruction_decoding.patch                   |   2065 +
 patches/openjdk/6824493-experimental.patch                                 |   1304 +
 patches/openjdk/6841419-classfile_iterator.patch                           |    142 +
 patches/openjdk/6841420-classfile_methods.patch                            |     34 +
 patches/openjdk/6843013-missing_experimental.patch                         |    334 +
 patches/openjdk/6852856-javap_subclasses.patch                             |    508 +
 patches/openjdk/6867671-javap_whitespace.patch                             |   1041 +
 patches/openjdk/6868539-constant_pool_tags.patch                           |    163 +
 patches/openjdk/6902264-fix_indentation.patch                              |    159 +
 patches/openjdk/6954275-big_xml_signatures.patch                           |    194 +
 patches/openjdk/7146431-java.security_files.patch                          |     82 +
 patches/openjdk/7162902-corba_fixes.patch                                  |      7 -
 patches/openjdk/7196533-timezone_bottleneck.patch                          |     15 +-
 patches/openjdk/8000450-restrict_access.patch                              |    108 +
 patches/openjdk/8002070-remove_logger_stack_search.patch                   |    552 +-
 patches/openjdk/8002070-remove_logger_stack_search_2.patch                 |    546 -
 patches/openjdk/8003992-embedded_nulls.patch                               |   1026 +
 patches/openjdk/8004188-rename_java.security.patch                         |    652 +
 patches/openjdk/8006882-jmockit.patch                                      |     90 +
 patches/openjdk/8006900-new_date_time.patch                                |    115 +
 patches/openjdk/8008589-better_mbean_permission_validation.patch           |     61 +
 patches/openjdk/8009463-space_and_final_backslash.patch                    |     33 -
 patches/openjdk/8010118-caller_sensitive.patch                             |    401 +-
 patches/openjdk/8010727-empty_logger_name.patch                            |     18 +-
 patches/openjdk/8010939-logmanager_deadlock.patch                          |     22 +-
 patches/openjdk/8011071-better_crypto_provider_handling.patch              |    287 +
 patches/openjdk/8011081-improve_jhat.patch                                 |    267 +
 patches/openjdk/8011139-revise_checking_getenclosingclass.patch            |     22 +-
 patches/openjdk/8011157-improve_corba_portability-jdk.patch                |    125 +
 patches/openjdk/8011157-improve_corba_portability.patch                    |    183 +
 patches/openjdk/8011990-logger_test_urls.patch                             |     15 +-
 patches/openjdk/8012071-better_bean_building.patch                         |     87 +
 patches/openjdk/8012147-improve_tool.patch                                 |     67 +
 patches/openjdk/8012243-serial_regression.patch                            |     17 +-
 patches/openjdk/8012277-improve_dataflavour.patch                          |     83 +
 patches/openjdk/8012425-transform_transformfactory.patch                   |    380 +
 patches/openjdk/8012453-runtime.exec.patch                                 |    383 +
 patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch      |    131 +-
 patches/openjdk/8013380-handle_renames.patch                               |    107 -
 patches/openjdk/8013380-logger_stack_walk_glassfish.patch                  |     87 +-
 patches/openjdk/8013503-improve_stream_factories.patch                     |    224 +
 patches/openjdk/8013506-better_pack200.patch                               |     39 +
 patches/openjdk/8013510-augment_image_writing.patch                        |     57 +
 patches/openjdk/8013514-improve_cmap_stability.patch                       |     51 +
 patches/openjdk/8013739-better_ldap_resource_management.patch              |    148 +
 patches/openjdk/8013744-better_tabling.patch                               |    196 +
 patches/openjdk/8013827-createtempfile_hang.patch                          |    176 +
 patches/openjdk/8014085-better_serialization.patch                         |    412 +
 patches/openjdk/8014093-improve_image_parsing.patch                        |    719 +
 patches/openjdk/8014102-improve_image_conversion.patch                     |    190 +
 patches/openjdk/8014341-better_kerberos_service.patch                      |     66 +
 patches/openjdk/8014349-getdeclaredclass_fix.patch                         |     43 +
 patches/openjdk/8014530-better_dsp.patch                                   |   3121 ++
 patches/openjdk/8014534-better_profiling.patch                             |    156 +
 patches/openjdk/8014718-remove_logging_suntoolkit.patch                    |     47 +-
 patches/openjdk/8014745-logger_stack_walk_switch.patch                     |     38 +-
 patches/openjdk/8014987-augment_serialization.patch                        |    100 +
 patches/openjdk/8015144-performance_regression.patch                       |    273 +
 patches/openjdk/8015614-update_build.patch                                 |     60 +
 patches/openjdk/8015731-auth_improvements.patch                            |     28 +
 patches/openjdk/8015743-address_internet_addresses.patch                   |   1290 +
 patches/openjdk/8015965-typo_in_property_name.patch                        |     42 +
 patches/openjdk/8015978-incorrect_transformation.patch                     |     22 +
 patches/openjdk/8016256-finalization_final.patch                           |     24 +
 patches/openjdk/8016357-update_hs_diagnostic_class.patch                   |     71 +
 patches/openjdk/8016653-ignoreable_characters.patch                        |    101 +
 patches/openjdk/8016675-robust_javadoc.patch                               |     75 +
 patches/openjdk/8017196-ensure_proxies_are_handled_appropriately-jdk.patch |    107 +
 patches/openjdk/8017196-ensure_proxies_are_handled_appropriately.patch     |     94 +
 patches/openjdk/8017287-better_resource_disposal.patch                     |     22 +
 patches/openjdk/8017291-cast_proxies_aside.patch                           |     34 +
 patches/openjdk/8017298-better_xml_support.patch                           |    999 +
 patches/openjdk/8017300-improve_interface_implementation.patch             |    129 +
 patches/openjdk/8017505-better_client_service.patch                        |    560 +
 patches/openjdk/8017566-backout_part_of_8000450.patch                      |     77 +
 patches/openjdk/8019292-better_attribute_value_exceptions.patch            |     57 +
 patches/openjdk/8019584-invalid_notification_fix.patch                     |     69 +
 patches/openjdk/8019617-better_view_of_objects.patch                       |     68 +
 patches/openjdk/8019969-inet6_test_case_fix.patch                          |     33 +
 patches/openjdk/8019979-better_access_test.patch                           |    154 +
 patches/openjdk/8020293-jvm_crash.patch                                    |     40 +
 patches/openjdk/8020943-memory_leak.patch                                  |     32 +
 patches/openjdk/8021290-signature_validation.patch                         |     55 +
 patches/openjdk/8021355-splashscreen_regression.patch                      |     53 +
 patches/openjdk/8021366-jaxp_test_fix-01.patch                             |     21 +
 patches/openjdk/8021577-bean_serialization_fix.patch                       |     25 +
 patches/openjdk/8021933-jaxp_test_fix-02.patch                             |     33 +
 patches/openjdk/8021969-jnlp_load_failure.patch                            |     25 +
 patches/openjdk/8022661-writeobject_flush.patch                            |     20 +
 patches/openjdk/8022682-supporting_xom.patch                               |    250 +
 patches/openjdk/8022940-enhance_corba_translations.patch                   |     41 +
 patches/openjdk/8023457-tracing_mutex.patch                                |     79 +
 patches/openjdk/8023478-hs_crash.patch                                     |     21 +
 patches/openjdk/8023683-enhance_class_file_parsing.patch                   |     35 +
 patches/openjdk/8023964-ignore_test.patch                                  |     29 +
 patches/openjdk/8024914-swapped_usage.patch                                |     58 +
 patches/openjdk/8025128-createtempfile_absolute_prefix.patch               |    139 +
 patches/openjdk/oj6-19-fix_8010118_test_cases.patch                        |    499 +
 patches/openjdk/oj6-20-merge.patch                                         |    599 +
 patches/openjdk/oj6-21-overrides.patch                                     |     20 +
 110 files changed, 36495 insertions(+), 1115 deletions(-)

diffs (truncated from 39544 to 500 lines):

diff -r 745a52b6cece -r e98b0ef70b26 ChangeLog
--- a/ChangeLog	Wed Oct 09 15:37:19 2013 +0100
+++ b/ChangeLog	Tue Oct 29 14:24:52 2013 +0000
@@ -1,3 +1,117 @@
+2013-10-29  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/openjdk/8002070-remove_logger_stack_search_2.patch,
+	* patches/openjdk/8009463-space_and_final_backslash.patch,
+	* patches/openjdk/8013380-handle_renames.patch:
+	Removed as incorporated in other patches.
+	* Makefile.am:
+	(SECURITY_PATCHES): Add security update.
+	* patches/jtreg-LastErrorString.patch: Regenerated.
+	* patches/openjdk/4075303-javap_update.patch,
+	* patches/openjdk/4111861-static_fields.patch,
+	* patches/openjdk/4501661-disallow_mixing.patch,
+	* patches/openjdk/4884240-javap_additional_option.patch,
+	* patches/openjdk/6708729-javap_makefile_update.patch,
+	* patches/openjdk/6715767-javap_crash.patch,
+	* patches/openjdk/6819246-javap_instruction_decoding.patch,
+	* patches/openjdk/6824493-experimental.patch,
+	* patches/openjdk/6841419-classfile_iterator.patch,
+	* patches/openjdk/6841420-classfile_methods.patch,
+	* patches/openjdk/6843013-missing_experimental.patch,
+	* patches/openjdk/6852856-javap_subclasses.patch,
+	* patches/openjdk/6867671-javap_whitespace.patch,
+	* patches/openjdk/6868539-constant_pool_tags.patch,
+	* patches/openjdk/6902264-fix_indentation.patch,
+	* patches/openjdk/6954275-big_xml_signatures.patch,
+	* patches/openjdk/7146431-java.security_files.patch,
+	* patches/openjdk/7162902-corba_fixes.patch,
+	* patches/openjdk/7196533-timezone_bottleneck.patch,
+	* patches/openjdk/8000450-restrict_access.patch,
+	* patches/openjdk/8002070-remove_logger_stack_search.patch,
+	* patches/openjdk/8003992-embedded_nulls.patch,
+	* patches/openjdk/8004188-rename_java.security.patch,
+	* patches/openjdk/8006882-jmockit.patch,
+	* patches/openjdk/8006900-new_date_time.patch,
+	* patches/openjdk/8008589-better_mbean_permission_validation.patch,
+	* patches/openjdk/8010118-caller_sensitive.patch,
+	* patches/openjdk/8010727-empty_logger_name.patch,
+	* patches/openjdk/8010939-logmanager_deadlock.patch,
+	* patches/openjdk/8011071-better_crypto_provider_handling.patch,
+	* patches/openjdk/8011081-improve_jhat.patch,
+	* patches/openjdk/8011139-revise_checking_getenclosingclass.patch,
+	* patches/openjdk/8011157-improve_corba_portability-jdk.patch,
+	* patches/openjdk/8011157-improve_corba_portability.patch,
+	* patches/openjdk/8011990-logger_test_urls.patch,
+	* patches/openjdk/8012071-better_bean_building.patch,
+	* patches/openjdk/8012147-improve_tool.patch,
+	* patches/openjdk/8012243-serial_regression.patch,
+	* patches/openjdk/8012277-improve_dataflavour.patch,
+	* patches/openjdk/8012425-transform_transformfactory.patch,
+	* patches/openjdk/8012453-runtime.exec.patch,
+	* patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch,
+	* patches/openjdk/8013380-logger_stack_walk_glassfish.patch,
+	* patches/openjdk/8013503-improve_stream_factories.patch,
+	* patches/openjdk/8013506-better_pack200.patch,
+	* patches/openjdk/8013510-augment_image_writing.patch,
+	* patches/openjdk/8013514-improve_cmap_stability.patch,
+	* patches/openjdk/8013739-better_ldap_resource_management.patch,
+	* patches/openjdk/8013744-better_tabling.patch,
+	* patches/openjdk/8013827-createtempfile_hang.patch,
+	* patches/openjdk/8014085-better_serialization.patch,
+	* patches/openjdk/8014093-improve_image_parsing.patch,
+	* patches/openjdk/8014102-improve_image_conversion.patch,
+	* patches/openjdk/8014341-better_kerberos_service.patch,
+	* patches/openjdk/8014349-getdeclaredclass_fix.patch,
+	* patches/openjdk/8014530-better_dsp.patch,
+	* patches/openjdk/8014534-better_profiling.patch,
+	* patches/openjdk/8014718-remove_logging_suntoolkit.patch,
+	* patches/openjdk/8014745-logger_stack_walk_switch.patch,
+	* patches/openjdk/8014987-augment_serialization.patch,
+	* patches/openjdk/8015144-performance_regression.patch,
+	* patches/openjdk/8015614-update_build.patch,
+	* patches/openjdk/8015731-auth_improvements.patch,
+	* patches/openjdk/8015743-address_internet_addresses.patch,
+	* patches/openjdk/8015965-typo_in_property_name.patch,
+	* patches/openjdk/8015978-incorrect_transformation.patch,
+	* patches/openjdk/8016256-finalization_final.patch,
+	* patches/openjdk/8016357-update_hs_diagnostic_class.patch,
+	* patches/openjdk/8016653-ignoreable_characters.patch,
+	* patches/openjdk/8016675-robust_javadoc.patch,
+	* patches/openjdk/8017196-ensure_proxies_are_handled_appropriately-jdk.patch,
+	* patches/openjdk/8017196-ensure_proxies_are_handled_appropriately.patch,
+	* patches/openjdk/8017287-better_resource_disposal.patch,
+	* patches/openjdk/8017291-cast_proxies_aside.patch,
+	* patches/openjdk/8017298-better_xml_support.patch,
+	* patches/openjdk/8017300-improve_interface_implementation.patch,
+	* patches/openjdk/8017505-better_client_service.patch,
+	* patches/openjdk/8017566-backout_part_of_8000450.patch,
+	* patches/openjdk/8019292-better_attribute_value_exceptions.patch,
+	* patches/openjdk/8019584-invalid_notification_fix.patch,
+	* patches/openjdk/8019617-better_view_of_objects.patch,
+	* patches/openjdk/8019969-inet6_test_case_fix.patch,
+	* patches/openjdk/8019979-better_access_test.patch,
+	* patches/openjdk/8020293-jvm_crash.patch,
+	* patches/openjdk/8020943-memory_leak.patch,
+	* patches/openjdk/8021290-signature_validation.patch,
+	* patches/openjdk/8021355-splashscreen_regression.patch,
+	* patches/openjdk/8021366-jaxp_test_fix-01.patch,
+	* patches/openjdk/8021577-bean_serialization_fix.patch,
+	* patches/openjdk/8021933-jaxp_test_fix-02.patch,
+	* patches/openjdk/8021969-jnlp_load_failure.patch,
+	* patches/openjdk/8022661-writeobject_flush.patch,
+	* patches/openjdk/8022682-supporting_xom.patch,
+	* patches/openjdk/8022940-enhance_corba_translations.patch,
+	* patches/openjdk/8023457-tracing_mutex.patch,
+	* patches/openjdk/8023478-hs_crash.patch,
+	* patches/openjdk/8023683-enhance_class_file_parsing.patch,
+	* patches/openjdk/8023964-ignore_test.patch,
+	* patches/openjdk/8024914-swapped_usage.patch,
+	* patches/openjdk/8025128-createtempfile_absolute_prefix.patch,
+	* patches/openjdk/oj6-19-fix_8010118_test_cases.patch,
+	* patches/openjdk/oj6-20-merge.patch,
+	* patches/openjdk/oj6-21-overrides.patch: Added.
+	* NEWS: Updated.
+
 2013-10-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r 745a52b6cece -r e98b0ef70b26 Makefile.am
--- a/Makefile.am	Wed Oct 09 15:37:19 2013 +0100
+++ b/Makefile.am	Tue Oct 29 14:24:52 2013 +0000
@@ -281,7 +281,109 @@
 DROP_PATCHES =
 
 SECURITY_PATCHES = \
-	patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch
+	patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \
+	patches/openjdk/8017196-ensure_proxies_are_handled_appropriately.patch \
+	patches/openjdk/8011157-improve_corba_portability.patch \
+	patches/openjdk/8022940-enhance_corba_translations.patch \
+	patches/openjdk/8013503-improve_stream_factories.patch \
+	patches/openjdk/8012425-transform_transformfactory.patch \
+	patches/openjdk/8017298-better_xml_support.patch \
+	patches/openjdk/8014530-better_dsp.patch \
+	patches/openjdk/8021366-jaxp_test_fix-01.patch \
+	patches/openjdk/8021933-jaxp_test_fix-02.patch \
+	patches/openjdk/8022682-supporting_xom.patch \
+	patches/openjdk/8015978-incorrect_transformation.patch \
+	patches/openjdk/oj6-20-merge.patch \
+	patches/openjdk/8024914-swapped_usage.patch \
+	patches/openjdk/8017505-better_client_service.patch \
+	patches/openjdk/8015614-update_build.patch \
+	patches/openjdk/8016256-finalization_final.patch \
+	patches/openjdk/8023683-enhance_class_file_parsing.patch \
+	patches/openjdk/8023457-tracing_mutex.patch \
+	patches/openjdk/8020943-memory_leak.patch \
+	patches/openjdk/8023478-hs_crash.patch \
+	patches/openjdk/4075303-javap_update.patch \
+	patches/openjdk/6819246-javap_instruction_decoding.patch \
+	patches/openjdk/6715767-javap_crash.patch \
+	patches/openjdk/6841420-classfile_methods.patch \
+	patches/openjdk/6841419-classfile_iterator.patch \
+	patches/openjdk/4111861-static_fields.patch \
+	patches/openjdk/4884240-javap_additional_option.patch \
+	patches/openjdk/6852856-javap_subclasses.patch \
+	patches/openjdk/6867671-javap_whitespace.patch \
+	patches/openjdk/6868539-constant_pool_tags.patch \
+	patches/openjdk/4501661-disallow_mixing.patch \
+	patches/openjdk/6824493-experimental.patch \
+	patches/openjdk/6843013-missing_experimental.patch \
+	patches/openjdk/6902264-fix_indentation.patch \
+	patches/openjdk/8016675-robust_javadoc.patch \
+	patches/openjdk/8016653-ignoreable_characters.patch \
+	patches/openjdk/7196533-timezone_bottleneck.patch \
+	patches/openjdk/8006900-new_date_time.patch \
+	patches/openjdk/8008589-better_mbean_permission_validation.patch \
+	patches/openjdk/8011071-better_crypto_provider_handling.patch \
+	patches/openjdk/8011081-improve_jhat.patch \
+	patches/openjdk/8011157-improve_corba_portability-jdk.patch \
+	patches/openjdk/8012071-better_bean_building.patch \
+	patches/openjdk/8012147-improve_tool.patch \
+	patches/openjdk/8012277-improve_dataflavour.patch \
+	patches/openjdk/8013506-better_pack200.patch \
+	patches/openjdk/8013510-augment_image_writing.patch \
+	patches/openjdk/8013514-improve_cmap_stability.patch \
+	patches/openjdk/8013744-better_tabling.patch \
+	patches/openjdk/8014085-better_serialization.patch \
+	patches/openjdk/8014093-improve_image_parsing.patch \
+	patches/openjdk/8014102-improve_image_conversion.patch \
+	patches/openjdk/8014341-better_kerberos_service.patch \
+	patches/openjdk/8014534-better_profiling.patch \
+	patches/openjdk/8014987-augment_serialization.patch \
+	patches/openjdk/8015731-auth_improvements.patch \
+	patches/openjdk/8015743-address_internet_addresses.patch \
+	patches/openjdk/8016357-update_hs_diagnostic_class.patch \
+	patches/openjdk/8002070-remove_logger_stack_search.patch \
+	patches/openjdk/6708729-javap_makefile_update.patch \
+	patches/openjdk/8010118-caller_sensitive.patch \
+	patches/openjdk/oj6-19-fix_8010118_test_cases.patch \
+	patches/openjdk/8010727-empty_logger_name.patch \
+	patches/openjdk/8010939-logmanager_deadlock.patch \
+	patches/openjdk/8011990-logger_test_urls.patch \
+	patches/openjdk/8013380-logger_stack_walk_glassfish.patch \
+	patches/openjdk/8014745-logger_stack_walk_switch.patch \
+	patches/openjdk/8012243-serial_regression.patch \
+	patches/openjdk/8014718-remove_logging_suntoolkit.patch \
+	patches/openjdk/8011139-revise_checking_getenclosingclass.patch \
+	patches/openjdk/8017196-ensure_proxies_are_handled_appropriately-jdk.patch \
+	patches/openjdk/8017287-better_resource_disposal.patch \
+	patches/openjdk/8017291-cast_proxies_aside.patch \
+	patches/openjdk/7146431-java.security_files.patch \
+	patches/openjdk/8006882-jmockit.patch \
+	patches/openjdk/8000450-restrict_access.patch \
+	patches/openjdk/8019979-better_access_test.patch \
+	patches/openjdk/8004188-rename_java.security.patch \
+	patches/openjdk/8017566-backout_part_of_8000450.patch \
+	patches/openjdk/8017300-improve_interface_implementation.patch \
+	patches/openjdk/8019292-better_attribute_value_exceptions.patch \
+	patches/openjdk/8019617-better_view_of_objects.patch \
+	patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch \
+	patches/openjdk/8020293-jvm_crash.patch \
+	patches/openjdk/8013739-better_ldap_resource_management.patch \
+	patches/openjdk/8014349-getdeclaredclass_fix.patch \
+	patches/openjdk/6954275-big_xml_signatures.patch \
+	patches/openjdk/8021290-signature_validation.patch \
+	patches/openjdk/8012453-runtime.exec.patch \
+	patches/openjdk/8015965-typo_in_property_name.patch \
+	patches/openjdk/8015144-performance_regression.patch \
+	patches/openjdk/8019969-inet6_test_case_fix.patch \
+	patches/openjdk/8019584-invalid_notification_fix.patch \
+	patches/openjdk/8021577-bean_serialization_fix.patch \
+	patches/openjdk/8021969-jnlp_load_failure.patch \
+	patches/openjdk/8021355-splashscreen_regression.patch \
+	patches/openjdk/8022661-writeobject_flush.patch \
+	patches/openjdk/8023964-ignore_test.patch \
+	patches/openjdk/8003992-embedded_nulls.patch \
+	patches/openjdk/8013827-createtempfile_hang.patch \
+	patches/openjdk/8025128-createtempfile_absolute_prefix.patch \
+	patches/openjdk/oj6-21-overrides.patch
 
 SPECIAL_SECURITY_PATCH_1 = patches/security/20120214/7112642.patch
 SPECIAL_SECURITY_PATCH_2 = patches/security/20130618/8009071-improve_shape_handling.patch
@@ -515,7 +617,6 @@
 	patches/openjdk/8006536-remove_trailing_slashes.patch \
 	patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch \
 	patches/openjdk/8009217-fix_test_compile.patch \
-	patches/openjdk/8009463-space_and_final_backslash.patch \
 	patches/openjdk/8009610-blacklist_malware_certificate.patch \
 	patches/openjdk/8010213-set_socketoptions_windows.patch \
 	patches/openjdk/8010714-xml_dsig_retrievalmethod.patch \
@@ -523,25 +624,12 @@
 	patches/openjdk/8011313-OCSP_timeout_wrong_value.patch \
 	patches/openjdk/8011992-MlibOpsTest_failed.patch \
 	patches/openjdk/8012112-MlibOpsTest_fails.patch \
-	patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch \
 	patches/openjdk/8012933-appcontext_disposed_too_early.patch \
 	patches/openjdk/8013196-timezone_getdefault_throws_exception.patch \
 	patches/openjdk/8014205-blank_swing_dialogs_windows.patch \
 	patches/openjdk/8014427-raster_regression.patch \
 	patches/openjdk/8014676-javadebugger_space_in_paths.patch \
 	patches/openjdk/8014968-OCSP_timeout_default.patch \
-	patches/openjdk/8002070-remove_logger_stack_search.patch \
-	patches/openjdk/8002070-remove_logger_stack_search_2.patch \
-	patches/openjdk/8010118-caller_sensitive.patch \
-	patches/openjdk/8010727-empty_logger_name.patch \
-	patches/openjdk/8010939-logmanager_deadlock.patch \
-	patches/openjdk/8011990-logger_test_urls.patch \
-	patches/openjdk/8013380-logger_stack_walk_glassfish.patch \
-	patches/openjdk/8013380-handle_renames.patch \
-	patches/openjdk/8014745-logger_stack_walk_switch.patch \
-	patches/openjdk/8012243-serial_regression.patch \
-	patches/openjdk/8014718-remove_logging_suntoolkit.patch \
-	patches/openjdk/8011139-revise_checking_getenclosingclass.patch \
 	patches/openjdk/6541350-tz_display_names_l10n.patch \
 	patches/openjdk/6821191-tz_display_names_l10n.patch \
 	patches/openjdk/6977550-tzdata2010l.patch \
@@ -558,7 +646,6 @@
 	patches/openjdk/7198570-tzdata2012f.patch \
 	patches/openjdk/8002225-tzdata2012i.patch \
 	patches/openjdk/8009987-tzdata2013b.patch \
-	patches/openjdk/7196533-timezone_bottleneck.patch \
 	patches/openjdk/6636370-appcontext_simplification.patch \
 	patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch \
 	patches/sparc-ptracefix.patch \
diff -r 745a52b6cece -r e98b0ef70b26 NEWS
--- a/NEWS	Wed Oct 09 15:37:19 2013 +0100
+++ b/NEWS	Tue Oct 29 14:24:52 2013 +0000
@@ -13,6 +13,48 @@
 
 New in release 1.13.0 (201X-XX-XX):
 
+* Security fixes
+  - S8006900, CVE-2013-3829: Add new date/time capability
+  - S8008589: Better MBean permission validation
+  - S8011071, CVE-2013-5780: Better crypto provider handling
+  - S8011081, CVE-2013-5772: Improve jhat
+  - S8011157, CVE-2013-5814: Improve CORBA portablility
+  - S8012071, CVE-2013-5790: Better Building of Beans
+  - S8012147: Improve tool support
+  - S8012277: CVE-2013-5849: Improve AWT DataFlavor
+  - S8012425, CVE-2013-5802: Transform TransformerFactory
+  - S8013503, CVE-2013-5851: Improve stream factories
+  - S8013506: Better Pack200 data handling
+  - S8013510, CVE-2013-5809: Augment image writing code
+  - S8013514: Improve stability of cmap class
+  - S8013739, CVE-2013-5817: Better LDAP resource management
+  - S8013744, CVE-2013-5783: Better tabling for AWT
+  - S8014085: Better serialization support in JMX classes
+  - S8014093, CVE-2013-5782: Improve parsing of images
+  - S8014102, CVE-2013-5778: Improve image conversion
+  - S8014341, CVE-2013-5803: Better service from Kerberos servers
+  - S8014349, CVE-2013-5840: (cl) Class.getDeclaredClass problematic in some class loader configurations
+  - S8014530, CVE-2013-5825: Better digital signature processing
+  - S8014534: Better profiling support
+  - S8014987, CVE-2013-5842: Augment serialization handling
+  - S8015614: Update build settings
+  - S8015731: Subject java.security.auth.subject to improvements
+  - S8015743, CVE-2013-5774: Address internet addresses
+  - S8016256: Make finalization final
+  - S8016653, CVE-2013-5804: javadoc should ignore ignoreable characters in names
+  - S8016675, CVE-2013-5797: Make Javadoc pages more robust
+  - S8017196, CVE-2013-5850: Ensure Proxies are handled appropriately
+  - S8017287, CVE-2013-5829: Better resource disposal
+  - S8017291, CVE-2013-5830: Cast Proxies Aside
+  - S8017298, CVE-2013-4002: Better XML support
+  - S8017300, CVE-2013-5784: Improve Interface Implementation
+  - S8017505, CVE-2013-5820: Better Client Service
+  - S8019292: Better Attribute Value Exceptions
+  - S8019617: Better view of objects
+  - S8020293: JVM crash
+  - S8021290, CVE-2013-5823: Better signature validation
+  - S8022940: Enhance CORBA translations
+  - S8023683: Enhance class file parsing
 * New features
   - PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional
   - PR718: Backport LCMS2 support from IcedTea7
@@ -868,15 +910,49 @@
   - S8014312: Fork hs23.25 hsx from hs23.21 for jdk7u25 and reinitialize build number
   - S8014464: Update jcheck for 6-open
 * Backports
+  - S4075303: Use javap to enquire about a specific inner class
+  - S4111861: static final field contents are not displayed
+  - S4348375: Javap is not internationalized
+  - S4459541: "javap -l" shows line numbers as signed short; they should be unsigned
+  - S4501660: change diagnostic of -help as 'print this help message and exit'
+  - S4501661: disallow mixing -public, -private, and -protected options at the same time
+  - S4776241: unused source file in javap...
+  - S4870651: javap should recognize generics, varargs, enum
+  - S4876942: javap invoked without args does not print help screen
+  - S4880663: javap could output whitespace between class name and opening brace
+  - S4884240: additional option required for javap
   - S4893408: JPEGReader throws IllegalArgException when setting the destination to BYTE_GRAY
+  - S4975569: javap doesn't print new flag bits
+  - S6271787: javap dumps LocalVariableTypeTable attribute in hex, needs to print a table
+  - S6305779: javap: support annotations
+  - S6439940: Clean up javap implementation
+  - S6469569: wrong check of searchpath in JavapEnvironment
+  - S6474890: javap does not open .zip files in -classpath
   - S6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles)
+  - S6587786: Javap throws error : "ERROR:Could not find <classname>" for JRE classes
+  - S6622215: javap ignores certain relevant access flags
+  - S6622216: javap names some attributes incorrectly
+  - S6622232: javap gets whitespace confused
+  - S6622260: javap prints negative bytes incorrectly in hex
   - S6631559: Registration of ImageIO plugins should not cause loading of jpeg.dlli and cmm.dll
+  - S6708729: update jdk Makefiles for new javap
+  - S6715767: javap on java.lang.ClassLoader crashes
   - S6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
   - S6791502: IIOException "Invalid icc profile" on jpeg after update from JDK5 to JDK6
   - S6793818: JpegImageReader is too greedy creating color profiles
   - S6799141: Build with --hash-style=both so that binaries can work on SuSE 10
   - S6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
+  - S6819246: improve support for decoding instructions in classfile library
+  - S6824493: experimental support for additional info for instructions
+  - S6841419: classfile: add constant pool iterator
+  - S6841420: classfile: add new methods to ConstantClassInfo
+  - S6843013: missing files in fix for 6824493
+  - S6852856: javap changes to facilitate subclassing javap for variants
+  - S6867671: javap whitespace formatting issues
+  - S6868539: javap should use current names for constant pool tags
   - S6888215: memory leak in jpeg plugin
+  - S6902264: fix indentation of tableswitch and lookupswitch
+  - S6954275: XML signatures with reference data larger 16KB and cacheRef on fails to validate
   - S6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches)
   - S6980281: SWAT: SwingSet2 got core dumped in Solaris-AMD64 using b107 swat build
   - S6989760: cmm native compiler warnings
@@ -886,15 +962,55 @@
   - S7018912: [parfait] potential buffer overruns in imageio jpeg
   - S7025066: Build systems changes to support SE Embedded Integration
   - S7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber
-  - S8005194: [parfait] #353 sun/awt/image/jpeg/imageioJPEG.c Memory leak of pointer 'scale' allocated with calloc()
-  - S8020983, RH976897: OutOfMemoryError caused by non garbage collected JPEGImageWriter Instances
+  - S7146431: java.security files out-of-sync
+   -S8000450: Restrict access to com/sun/corba/se/impl package
+  - S8002070: Remove the stack search for a resource bundle for Logger to use
+  - S8003992: File and other classes in java.io do not handle embedded nulls properly
+  - S8004188: Rename src/share/lib/security/java.security to java.security-linux
+  - S8006882: Proxy generated classes in sun.proxy package breaks JMockit
+  - S8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive
+  - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance
+  - S8010939: Deadlock in LogManager
+  - S8011139: (reflect) Revise checking in getEnclosingClass
+  - S8011950: java.io.File.createTempFile enters infinite loop when passed invalid data
+  - S8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows
+  - S8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21
+  - S8012453: (process) Runtime.exec(String) fails if command contains spaces [win]
+  - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer
+  - S8013380: Removal of stack walk to find resource bundle breaks Glassfish startup
+  - S8013827: File.createTempFile hangs with temp file starting with 'com1.4'
+  - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10
+  - S8014745: Provide a switch to allow stack walk search of resource bundle
+  - S8015144: Performance regression in ICU OpenType Layout library
+  - S8015965: (process) Typo in name of property to allow ambiguous commands
+  - S8015978: Incorrect transformation of XPath expression "string(-0)"
+  - S8016357: Update hotspot diagnostic class
+  - S8017566: Backout 8000450 - Cannot access to com.sun.corba.se.impl.orb.ORBImpl
+  - S8019584: javax/management/remote/mandatory/loading/MissingClassTest.java failed in nightly against jdk7u45: java.io.InvalidObjectException: Invalid notification: null
+  - S8019969: nioNetworkChannelInet6/SetOptionGetOptionTestInet6 test case crashes
+  - S8019979: Replace CheckPackageAccess test with better one from closed repo
+  - S8020943: Memory leak when GCNotifier uses create_from_platform_dependent_str()
+  - S8021355: REGRESSION: Five closed/java/awt/SplashScreen tests fail since 7u45 b01 on Linux, Solaris
+  - S8021366: java_util/Properties/PropertiesWithOtherEncodings fails during 7u45 nightly testing
+  - S8021577: JCK test api/javax_management/jmx_serial/modelmbean/ModelMBeanNotificationInfo/serial/index.html#Input has failed since jdk 7u45 b01
+  - S8021933: Add extra check for fix # JDK-8014530
+  - S8021969: The index_AccessAllowed jnlp can not load successfully with exception thrown in the log.
+  - S8022661: InetAddress.writeObject() performs flush() on object output stream
+  - S8022682: Supporting XOM
+  - S8023457: Event based tracing framework needs a mutex for thread groups
+  - S8023478: Test fails with HS crash in GCNotifier.
+  - S8023964: java/io/IOException/LastErrorString.java should be @ignore-d
+  - S8024914: Swapped usage of idx_t and bm_word_t types in bitMap.inline.hpp
+  - S8025128: File.createTempFile fails if prefix is absolute path
+  - OJ19: Fix test cases from 8010118 to work with OpenJDK 6
+  - OJ20: Resolve merge issues with JAXP security fixes
+  - OJ21: Remove @Override annotation added on interface by 2013/10/15 security fixes
 * Bug fixes
   - PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel.
   - PR1318: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM.
   - RH902004: very bad performance with E-Porto Add-In f??r OpenOffice Writer installed (hs23 only)
   - RH991170: java does not use correct kerberos credential cache
   - PR1535: Allow use of system Kerberos to obtain cache location
-  - RH995488: Java thinks that the default timezone is Busingen instead of Zurich
 * JamVM
   - JSR 335: Lambda Expressions
   - JEP 171: Implement fence methods in sun.misc.Unsafe
diff -r 745a52b6cece -r e98b0ef70b26 patches/jtreg-LastErrorString.patch
--- a/patches/jtreg-LastErrorString.patch	Wed Oct 09 15:37:19 2013 +0100
+++ b/patches/jtreg-LastErrorString.patch	Tue Oct 29 14:24:52 2013 +0000
@@ -1,16 +1,15 @@
-diff -Nru IOException/LastErrorString.java /home/brq/ptisnovs/IOException/LastErrorString.java
---- openjdk-old/jdk/test/java/io/IOException/LastErrorString.java	2011-01-21 00:54:47.000000000 +0100
-+++ openjdk/jdk/test/java/io/IOException/LastErrorString.java	2011-02-21 15:34:58.972481000 +0100
-@@ -21,9 +21,13 @@
-  * questions.
+diff -Nru openjdk.orig/jdk/test/java/io/IOException/LastErrorString.java openjdk/jdk/test/java/io/IOException/LastErrorString.java
+--- openjdk.orig/jdk/test/java/io/IOException/LastErrorString.java	2013-10-29 09:39:12.978000311 +0000
++++ openjdk/jdk/test/java/io/IOException/LastErrorString.java	2013-10-29 09:41:26.024030445 +0000
+@@ -22,9 +22,12 @@
   */
  
--/* @test
--   @bug 4167937
+ /* @test
+-   @bug 4167937 8023964
+-   @ignore Test truncates system files when run as root, see 7042603
 -   @summary Test code paths that use the JVM_LastErrorString procedure
-+/*
-+ * @test
-+ * @bug 4167937
++ * @bug 4167937 8023964
++ * @ignore Test truncates system files when run as root, see 7042603
 + * @summary Test code paths that use the JVM_LastErrorString procedure
 + *
 + * @compile LastErrorString.java
@@ -18,7 +17,7 @@
   */
  
  import java.io.IOException;
-@@ -37,33 +41,11 @@
+@@ -38,33 +41,11 @@
  
      static String UNWRITEABLE_DIR;
      static String UNREADABLE_FILE;
@@ -53,7 +52,7 @@
      static abstract class Test {
  
          String name;
-@@ -197,7 +179,7 @@
+@@ -198,7 +179,7 @@
  
          new Test("FileOutputStream") {
              public void run() throws IOException {
@@ -62,7 +61,7 @@
              }}.go();
  
          new ClosedFOSTest("write()") {
-@@ -257,8 +239,29 @@
+@@ -258,8 +239,29 @@
  
      }
  
@@ -92,9 +91,9 @@
          go();
      }
  
-diff -Nru IOException/LastErrorString.sh /home/brq/ptisnovs/IOException/LastErrorString.sh
---- /dev/null	1970-01-01 01:00:00.000000000 +0100

From aazores at redhat.com  Tue Oct 29 10:16:51 2013
From: aazores at redhat.com (Andrew Azores)
Date: Tue, 29 Oct 2013 13:16:51 -0400
Subject: [icedtea-web] (PR1513) Signed JAR with external main-class
In-Reply-To: <5268333A.5080507@redhat.com>
References: <526177BA.7020301@redhat.com> <20131018200616.GA14560@redhat.com>
	<52658D92.7060104@redhat.com> <20131021214312.GA1526@redhat.com>
	<5268333A.5080507@redhat.com>
Message-ID: <526FED83.3050802@redhat.com>

On 10/23/2013 04:36 PM, Andrew Azores wrote:
> On 10/21/2013 05:43 PM, Omair Majid wrote:
>> * Andrew Azores <aazores at redhat.com> [2013-10-21 16:24]:
>>> On 10/18/2013 04:06 PM, Omair Majid wrote:
>>>> * Andrew Azores <aazores at redhat.com> [2013-10-18 14:04]:
>>>>> Hi,
>>>>>
>>>>> The applet in the PR1513 report fails to launch due to the following
>>>>> check in JNLPClassLoader#initializeResources():
>>>>>
>>>>> // If jar with main class was not found and there are no more
>>>>> // available jars, throw a LaunchException
>>>>> if (file.getLaunchInfo() != null) {
>>>>>      if (!foundMainJar // && (available == null || 
>>>>> available.size() == 0))
>>>>>          throw new LaunchException(file, null, R("LSFatal"),
>>>>>                  R("LCClient"), R("LCantDetermineMainClass"),
>>>>>                  R("LCantDetermineMainClassInfo"));
>>>>> }
>>>> /me grumbles about comments that reiterate what the code is doing
>>>> without explaining why.
>>> Yep. Sometimes I find comments that I really just want to remove...
>>>
>>> // initialize extensions
>>> initializeExtensions();
>> Feel free to remove them.
>>
>>> I'm not sure what you mean but I think my last email might've been a
>>> little confusing about this. To be clear, the loading/execution of
>>> the arbitrary class files while also displaying a "fully trusted"
>>> message only happens when taking the naive approach to making the
>>> PR1513 applet run, which is just removing that LaunchException
>>> completely and doing nothing else. This lets the applet run (since
>>> other than the signing issue, we do generally support applets having
>>> the main-class external to the JARs) but leaves the ClassLoader and
>>> JarCertVerifier and whatever else still thinking that the applet is
>>> fully trusted, which is wrong. What we currently do never involves
>>> loading any unverified classes while claiming everything is
>>> verified, as far as I can tell.
>> I am curious about the current state. Can it ever be that we load
>> classes from the codebase URL _and_ claim that the applet is fully
>> signed?
>
> I don't think so, but I'll look into it further to be sure.
>
>>
>>> So what I think we need to do is not throw the LaunchException from
>>> the code hunk I referenced, but instead treat the applet as if it's
>>> unsigned when given the same conditions. This will not affect signed
>>> applets where the main-class is within a JAR. It also won't affect
>>> unsigned applets at all. Applets with signed JARs but with the
>>> main-class not found will then be treated as if they are unsigned,
>>> until either the main-class is found externally in the codebase (at
>>> which point we run the applet as if it's unsigned), or the
>>> main-class is just not found at all, in which case a LaunchException
>>> should occur elsewhere anyway (I'll need to verify that this
>>> actually happens however, we might end up with some other less
>>> informative error). Does this seem right?
>> Yes, this sounds like the correct fix. I don't know if it will be a
>> simple one (code-wise), though.
>>
>> Cheers,
>> Omair
>
> Fix and reproducer patches attached. The fix is a little bit of an 
> ugly workaround I guess, but I think a nicer solution would involve 
> rewriting a lot of other things. Maybe that can come later on down the 
> road.
>
> What happens here is that if the JNLPFile's main-class is marked as 
> external by the JNLPClassLoader, then the AppVerifiers will never use 
> AccessType.VERIFIED. Instead, either SIGNING_ERROR or UNVERIFIED will 
> be used. Which one depends on CertInformation#isRootInCaCerts(). If 
> this returns true then you get the "signing error" dialog box, else 
> you get the "unverified" message. The classloader still considers the 
> applet to be signed, however. I figured it was better to tell the user 
> there's a signing trust issue and ask for confirmation to run with 
> full permissions, rather than restricting the applet to sandbox 
> permissions, since the signed portion of the applet could very well 
> require more permissions than that.
>
> I guess now this mail has become an [rfc]...
>
> ChangeLog:
>
> Fix bug where signed applets with main-class located outside of JAR(s) 
> would not be able to launch (PR1513)
> * netx/net/sourceforge/jnlp/JNLPFile.java: (externalMainClass, 
> setMainClassIsExternal, isMainClassExternal) new field and methods for 
> marking or checking that an applet's main-class is external to its JAR(s)
> * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: 
> (initializeResources) mark JNLPFile with external main-class as 
> appropriate. Do not throw LaunchExceptions for signed applets with 
> external main-class
> * netx/net/sourceforge/jnlp/security/JNLPAppVerifier.java: 
> (checkTrustWithUser) if main-class is external, do not claim applet is 
> verified
> * netx/net/sourceforge/jnlp/security/PluginAppVerifier.java: 
> (checkTrustWithUser) if main-class is external, do not claim applet is 
> verified
>
> * 
> tests/reproducers/custom/SignedAppletExternalMainClass/resources/SignedAppletExternalMainClass.html: 
> new test to ensure signed applets with external main classes can launch
> * 
> tests/reproducers/custom/SignedAppletExternalMainClass/srcs/Makefile: 
> same
> * 
> tests/reproducers/custom/SignedAppletExternalMainClass/srcs/SignedAppletExternalMainClass.java: 
> same
> * 
> tests/reproducers/custom/SignedAppletExternalMainClass/srcs/SignedAppletExternalMainClassHelper.java: 
> same
> * 
> tests/reproducers/custom/SignedAppletExternalMainClass/testcases/SignedAppletExternalMainClassTest.java: 
> same
>
>
> Thanks,
>

Ping?

-- 
Andrew A


From omajid at redhat.com  Tue Oct 29 11:09:52 2013
From: omajid at redhat.com (Omair Majid)
Date: Tue, 29 Oct 2013 14:09:52 -0400
Subject: [icedtea-web] (PR1513) Signed JAR with external main-class
In-Reply-To: <5268333A.5080507@redhat.com>
References: <526177BA.7020301@redhat.com> <20131018200616.GA14560@redhat.com>
	<52658D92.7060104@redhat.com> <20131021214312.GA1526@redhat.com>
	<5268333A.5080507@redhat.com>
Message-ID: <20131029180951.GB8304@redhat.com>

* Andrew Azores <aazores at redhat.com> [2013-10-23 16:36]:
> Fix and reproducer patches attached. The fix is a little bit of an
> ugly workaround I guess, but I think a nicer solution would involve
> rewriting a lot of other things. Maybe that can come later on down
> the road.
> 
> What happens here is that if the JNLPFile's main-class is marked as
> external by the JNLPClassLoader, then the AppVerifiers will never
> use AccessType.VERIFIED. Instead, either SIGNING_ERROR or UNVERIFIED
> will be used. Which one depends on
> CertInformation#isRootInCaCerts(). If this returns true then you get
> the "signing error" dialog box, else you get the "unverified"
> message. The classloader still considers the applet to be signed,
> however. I figured it was better to tell the user there's a signing
> trust issue and ask for confirmation to run with full permissions,
> rather than restricting the applet to sandbox permissions, since the
> signed portion of the applet could very well require more
> permissions than that.

I am still concerned that we will load other classes from the code base
without warning, but will only warn about main class. I dont know if the
main class is special enough to make this distinction, if this can
happen with other classes too.

I would be okay with handling the main class and ignoring others (if
that even happens), but since the patch is a bit of a hack, I want to be
sure of this.

Thanks,
Omair

From aazores at redhat.com  Tue Oct 29 13:01:45 2013
From: aazores at redhat.com (Andrew Azores)
Date: Tue, 29 Oct 2013 16:01:45 -0400
Subject: [icedtea-web] (PR1513) Signed JAR with external main-class
In-Reply-To: <20131029180951.GB8304@redhat.com>
References: <526177BA.7020301@redhat.com> <20131018200616.GA14560@redhat.com>
	<52658D92.7060104@redhat.com> <20131021214312.GA1526@redhat.com>
	<5268333A.5080507@redhat.com> <20131029180951.GB8304@redhat.com>
Message-ID: <52701429.2060309@redhat.com>

On 10/29/2013 02:09 PM, Omair Majid wrote:
> * Andrew Azores <aazores at redhat.com> [2013-10-23 16:36]:
>> Fix and reproducer patches attached. The fix is a little bit of an
>> ugly workaround I guess, but I think a nicer solution would involve
>> rewriting a lot of other things. Maybe that can come later on down
>> the road.
>>
>> What happens here is that if the JNLPFile's main-class is marked as
>> external by the JNLPClassLoader, then the AppVerifiers will never
>> use AccessType.VERIFIED. Instead, either SIGNING_ERROR or UNVERIFIED
>> will be used. Which one depends on
>> CertInformation#isRootInCaCerts(). If this returns true then you get
>> the "signing error" dialog box, else you get the "unverified"
>> message. The classloader still considers the applet to be signed,
>> however. I figured it was better to tell the user there's a signing
>> trust issue and ask for confirmation to run with full permissions,
>> rather than restricting the applet to sandbox permissions, since the
>> signed portion of the applet could very well require more
>> permissions than that.
> I am still concerned that we will load other classes from the code base
> without warning, but will only warn about main class. I dont know if the
> main class is special enough to make this distinction, if this can
> happen with other classes too.
>
> I would be okay with handling the main class and ignoring others (if
> that even happens), but since the patch is a bit of a hack, I want to be
> sure of this.
>
> Thanks,
> Omair

If the main-class is outside of the JAR then the user is given a general 
warning message about the applet having a signing error, with no mention 
of which class(es) are unsigned and causing this message to appear. If 
we're allowing any unsigned code to run at all (with user approval) then 
I don't think it matters too much if that code is marked as the 
main-class or not. Either way it's unverified code being run as part of 
a signed, all-permissions-granted applet, so the user just needs to know 
that this is definitely risky.

If the main-class is within a signed JAR, as it should be, but the 
applet tries to load loose classes from the codebase - well, it would 
definitely be a problem if we allowed those unverified classes to be 
executed with signed privileges. I don't think we are doing that now, 
and I don't think this patch would introduce that problem, since signed 
applets with the main-class within a JAR are not really affected by this 
change.

I've attached another patch which does the job and is easier to reason 
about. I think I prefer the dialog presented by the last patch, as 
there's only one dialog that appears in that one - this patch causes 
there to be two, and they might be a little confusing to see in 
succession. See the applet at [1] with either patch applied to see the 
difference. As well, marking the main-class as external as in the older 
patch might be useful in the future for other purposes. But at least for 
fixing the particular bug report which caused this investigation, I 
think this new patch is sufficient and importantly, easier to verify as 
not introducing any issues with loading unverified classes. If we have 
any problems like that, they are pre-existing and can be addressed 
separately from this changeset IMHO.

Also the reproducers added last time require intervention to approve and 
run with this new patch as the other dialog box still appears even if 
you have security set to never prompt. Which, really, might be something 
else to look into changing.

[1] https://oasisweb.uga.edu/oasis.html

Thanks,

-- 
Andrew A

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signed-applet-external-main-class-simplefix.patch
Type: text/x-patch
Size: 2618 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131029/753572b0/signed-applet-external-main-class-simplefix.patch 

From omajid at redhat.com  Tue Oct 29 13:37:56 2013
From: omajid at redhat.com (Omair Majid)
Date: Tue, 29 Oct 2013 16:37:56 -0400
Subject: [icedtea-web] (PR1513) Signed JAR with external main-class
In-Reply-To: <52701429.2060309@redhat.com>
References: <526177BA.7020301@redhat.com> <20131018200616.GA14560@redhat.com>
	<52658D92.7060104@redhat.com> <20131021214312.GA1526@redhat.com>
	<5268333A.5080507@redhat.com> <20131029180951.GB8304@redhat.com>
	<52701429.2060309@redhat.com>
Message-ID: <20131029203756.GC8304@redhat.com>

* Andrew Azores <aazores at redhat.com> [2013-10-29 16:01]:
> I've attached another patch which does the job and is easier to
> reason about. I think I prefer the dialog presented by the last
> patch, as there's only one dialog that appears in that one - this
> patch causes there to be two, and they might be a little confusing
> to see in succession. See the applet at [1] with either patch
> applied to see the difference. As well, marking the main-class as
> external as in the older patch might be useful in the future for
> other purposes. But at least for fixing the particular bug report
> which caused this investigation, I think this new patch is
> sufficient and importantly, easier to verify as not introducing any
> issues with loading unverified classes. If we have any problems like
> that, they are pre-existing and can be addressed separately from
> this changeset IMHO.

I like this patch a little more. It's easier to reason about and keeps
things localized. I am not terribly happy about two dialogs, but since
this is such a corner case, it should be okay.

> Also the reproducers added last time require intervention to approve
> and run with this new patch as the other dialog box still appears
> even if you have security set to never prompt. Which, really, might
> be something else to look into changing.

You might want to hold off on the reproducers, then. They are supposed
to be completely automated.

> -                                R("LCClient"), R("LCantDetermineMainClass"),
> -                                R("LCantDetermineMainClassInfo"));

If these two strings are not used anywhere, please remove them from the
messages file too.

Thanks,
Omair

From aazores at redhat.com  Tue Oct 29 13:57:06 2013
From: aazores at redhat.com (Andrew Azores)
Date: Tue, 29 Oct 2013 16:57:06 -0400
Subject: [icedtea-web] (PR1513) Signed JAR with external main-class
In-Reply-To: <20131029203756.GC8304@redhat.com>
References: <526177BA.7020301@redhat.com> <20131018200616.GA14560@redhat.com>
	<52658D92.7060104@redhat.com> <20131021214312.GA1526@redhat.com>
	<5268333A.5080507@redhat.com> <20131029180951.GB8304@redhat.com>
	<52701429.2060309@redhat.com> <20131029203756.GC8304@redhat.com>
Message-ID: <52702122.9080906@redhat.com>

On 10/29/2013 04:37 PM, Omair Majid wrote:
> * Andrew Azores <aazores at redhat.com> [2013-10-29 16:01]:
>> I've attached another patch which does the job and is easier to
>> reason about. I think I prefer the dialog presented by the last
>> patch, as there's only one dialog that appears in that one - this
>> patch causes there to be two, and they might be a little confusing
>> to see in succession. See the applet at [1] with either patch
>> applied to see the difference. As well, marking the main-class as
>> external as in the older patch might be useful in the future for
>> other purposes. But at least for fixing the particular bug report
>> which caused this investigation, I think this new patch is
>> sufficient and importantly, easier to verify as not introducing any
>> issues with loading unverified classes. If we have any problems like
>> that, they are pre-existing and can be addressed separately from
>> this changeset IMHO.
> I like this patch a little more. It's easier to reason about and keeps
> things localized. I am not terribly happy about two dialogs, but since
> this is such a corner case, it should be okay.

Okay for head then?

>
>> Also the reproducers added last time require intervention to approve
>> and run with this new patch as the other dialog box still appears
>> even if you have security set to never prompt. Which, really, might
>> be something else to look into changing.
> You might want to hold off on the reproducers, then. They are supposed
> to be completely automated.

Yea. I'll start a new discussion thread, because I really don't think it 
makes sense for this dialog to still appear when security is set to 
never prompt.

>
>> -                                R("LCClient"), R("LCantDetermineMainClass"),
>> -                                R("LCantDetermineMainClassInfo"));
> If these two strings are not used anywhere, please remove them from the
> messages file too.

They still appear in Launcher.

>
> Thanks,
> Omair

Thanks,

-- 
Andrew A


From omajid at redhat.com  Tue Oct 29 14:24:24 2013
From: omajid at redhat.com (Omair Majid)
Date: Tue, 29 Oct 2013 17:24:24 -0400
Subject: [icedtea-web] (PR1513) Signed JAR with external main-class
In-Reply-To: <52702122.9080906@redhat.com>
References: <526177BA.7020301@redhat.com> <20131018200616.GA14560@redhat.com>
	<52658D92.7060104@redhat.com> <20131021214312.GA1526@redhat.com>
	<5268333A.5080507@redhat.com> <20131029180951.GB8304@redhat.com>
	<52701429.2060309@redhat.com> <20131029203756.GC8304@redhat.com>
	<52702122.9080906@redhat.com>
Message-ID: <20131029212424.GD8304@redhat.com>

* Andrew Azores <aazores at redhat.com> [2013-10-29 16:58]:
> Okay for head then?

Yes, please!

Cheers,
Omair

From aazores at icedtea.classpath.org  Tue Oct 29 14:30:56 2013
From: aazores at icedtea.classpath.org (aazores at icedtea.classpath.org)
Date: Tue, 29 Oct 2013 21:30:56 +0000
Subject: /hg/icedtea-web: Fix PR1513, signed applets with external main-c...
Message-ID: <hg.39ff18bc291f.1383082256.8643924302249223276@icedtea.classpath.org>

changeset 39ff18bc291f in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=39ff18bc291f
author: Andrew Azores <aazores at redhat.com>
date: Tue Oct 29 17:30:18 2013 -0400

	Fix PR1513, signed applets with external main-class support

	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
	(initializeResources) ask for user approval rather than throwing
	LaunchException for signed applets with external main-class


diffstat:

 ChangeLog                                              |   7 +++++
 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |  23 ++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diffs (59 lines):

diff -r cdb796a6195b -r 39ff18bc291f ChangeLog
--- a/ChangeLog	Fri Oct 25 12:19:15 2013 +0200
+++ b/ChangeLog	Tue Oct 29 17:30:18 2013 -0400
@@ -1,3 +1,10 @@
+2013-10-29  Andrew Azores  <aazores at redhat.com>
+
+	Fix PR1513, signed applets with external main-class support
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+	(initializeResources) ask for user approval rather than throwing
+	LaunchException for signed applets with external main-class
+
 2013-10-25  Jiri Vanek  <jvanek at redhat.com>
 
 	Plugin debug can now be controlled from itw_settings, in same way java side.
diff -r cdb796a6195b -r 39ff18bc291f netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Fri Oct 25 12:19:15 2013 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Tue Oct 29 17:30:18 2013 -0400
@@ -682,33 +682,26 @@
             if (jcv.isFullySigned()) {
                 signing = true;
 
-                if (!jcv.allJarsSigned() &&
-                                    !SecurityDialogs.showNotAllSignedWarningDialog(file))
-                    throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo"));
-
                 // Check for main class in the downloaded jars, and check/verify signed JNLP fill
                 checkForMain(initialJars);
 
                 // If jar with main class was not found, check available resources
-                while (!foundMainJar && available != null && available.size() != 0) 
+                while (!foundMainJar && available != null && available.size() != 0)
                     addNextResource();
 
                 // If the jar with main class was not found, check extension
                 // jnlp's resources
                 foundMainJar = foundMainJar || hasMainInExtensions();
 
-                // If jar with main class was not found and there are no more
-                // available jars, throw a LaunchException
-                if (file.getLaunchInfo() != null) {
-                    if (!foundMainJar
-                            && (available == null || available.size() == 0))
-                        throw new LaunchException(file, null, R("LSFatal"),
-                                R("LCClient"), R("LCantDetermineMainClass"),
-                                R("LCantDetermineMainClassInfo"));
-                }
+                boolean externalMainClass = (file.getLaunchInfo() != null && !foundMainJar
+                        && (available == null || available.size() == 0));
+
+                if ((!jcv.allJarsSigned() || externalMainClass) &&
+                                    !SecurityDialogs.showNotAllSignedWarningDialog(file))
+                    throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo"));
 
                 // If main jar was found, but a signed JNLP file was not located
-                if (!isSignedJNLP && foundMainJar) 
+                if (!isSignedJNLP && foundMainJar)
                     file.setSignedJNLPAsMissing();
 
                 //user does not trust this publisher

From bugzilla-daemon at icedtea.classpath.org  Tue Oct 29 14:31:06 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 29 Oct 2013 21:31:06 +0000
Subject: [Bug 1513] Applet fails to load
In-Reply-To: <bug-1513-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1513-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1513-30-IzinP47dbK@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1513

--- Comment #4 from hg commits <mercurial at icedtea.classpath.org> ---
details:
http://icedtea.classpath.org//hg/icedtea-web?cmd=changeset;node=39ff18bc291f
author: Andrew Azores <aazores at redhat.com>
date: Tue Oct 29 17:30:18 2013 -0400

    Fix PR1513, signed applets with external main-class support

    * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
    (initializeResources) ask for user approval rather than throwing
    LaunchException for signed applets with external main-class

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131029/9c9d9389/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Oct 29 14:32:10 2013
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 29 Oct 2013 21:32:10 +0000
Subject: [Bug 1513] Applet fails to load
In-Reply-To: <bug-1513-30@http.icedtea.classpath.org/bugzilla/>
References: <bug-1513-30@http.icedtea.classpath.org/bugzilla/>
Message-ID: <bug-1513-30-76RunhVi5B@http.icedtea.classpath.org/bugzilla/>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1513

Andrew Azores <aazores at redhat.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|ASSIGNED                    |RESOLVED
         Resolution|---                         |FIXED

--- Comment #5 from Andrew Azores <aazores at redhat.com> ---
This is now fixed in hg head.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131029/fdf17593/attachment-0001.html 

From jvanek at icedtea.classpath.org  Wed Oct 30 02:50:18 2013
From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org)
Date: Wed, 30 Oct 2013 09:50:18 +0000
Subject: /hg/release/icedtea-web-1.4: netx/net/sourceforge/jnlp/JARDesc.j...
Message-ID: <hg.511a213f0206.1383126618.-5934593987637005762@icedtea.classpath.org>

changeset 511a213f0206 in /hg/release/icedtea-web-1.4
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=511a213f0206
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Oct 30 10:36:43 2013 +0100

	netx/net/sourceforge/jnlp/JARDesc.java: made immutable
	 (location)(version)(part)(lazy)(main)(nativeJar)(cacheable) made final


diffstat:

 ChangeLog                              |   5 +++++
 netx/net/sourceforge/jnlp/JARDesc.java |  15 ++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r 175dda8f15e5 -r 511a213f0206 ChangeLog
--- a/ChangeLog	Fri Oct 25 11:07:08 2013 +0200
+++ b/ChangeLog	Wed Oct 30 10:36:43 2013 +0100
@@ -1,3 +1,8 @@
+2013-10-30  Jiri Vanek  <jvanek at redhat.com>
+
+	* netx/net/sourceforge/jnlp/JARDesc.java: made immutable
+	(location)(version)(part)(lazy)(main)(nativeJar)(cacheable) made final
+
 2013-10-25  Jiri Vanek  <jvanek at redhat.com>
 
 	all output messages redirected to PLUGIN_{DEBUG,ERROR} macros
diff -r 175dda8f15e5 -r 511a213f0206 netx/net/sourceforge/jnlp/JARDesc.java
--- a/netx/net/sourceforge/jnlp/JARDesc.java	Fri Oct 25 11:07:08 2013 +0200
+++ b/netx/net/sourceforge/jnlp/JARDesc.java	Wed Oct 30 10:36:43 2013 +0100
@@ -21,31 +21,32 @@
 /**
  * The JAR element.
  *
+ * This class is immutable and thread safe
  * @author <a href="mailto:jmaxwell at users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
  * @version $Revision: 1.6 $
  */
 public class JARDesc {
 
     /** the location of the JAR file */
-    private URL location;
+    private final URL location;
 
     /** the required JAR versions, or null */
-    private Version version;
+    private final Version version;
 
     /** the part name */
-    private String part;
+    private final String part;
 
     /** whether to load the JAR on demand */
-    private boolean lazy;
+    private final boolean lazy;
 
     /** whether the JAR contains the main class */
-    private boolean main;
+    private final boolean main;
 
     /** whether the JAR contains native libraries */
-    private boolean nativeJar;
+    private final boolean nativeJar;
 
     /** whether the JAR can be cached */
-    private boolean cacheable;
+    private final boolean cacheable;
 
     /**
      * Create a JAR descriptor.

From jvanek at icedtea.classpath.org  Wed Oct 30 02:50:48 2013
From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org)
Date: Wed, 30 Oct 2013 09:50:48 +0000
Subject: /hg/icedtea-web: netx/net/sourceforge/jnlp/JARDesc.java: made im...
Message-ID: <hg.14a8ee171687.1383126648.8643924302249223276@icedtea.classpath.org>

changeset 14a8ee171687 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=14a8ee171687
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Oct 30 10:36:03 2013 +0100

	netx/net/sourceforge/jnlp/JARDesc.java: made immutable
	 (location)(version)(part)(lazy)(main)(nativeJar)(cacheable) made final


diffstat:

 ChangeLog                              |   5 +++++
 netx/net/sourceforge/jnlp/JARDesc.java |  15 ++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r 39ff18bc291f -r 14a8ee171687 ChangeLog
--- a/ChangeLog	Tue Oct 29 17:30:18 2013 -0400
+++ b/ChangeLog	Wed Oct 30 10:36:03 2013 +0100
@@ -1,3 +1,8 @@
+2013-10-30  Jiri Vanek  <jvanek at redhat.com>
+
+	* netx/net/sourceforge/jnlp/JARDesc.java: made immutable
+	(location)(version)(part)(lazy)(main)(nativeJar)(cacheable) made final
+
 2013-10-29  Andrew Azores  <aazores at redhat.com>
 
 	Fix PR1513, signed applets with external main-class support
diff -r 39ff18bc291f -r 14a8ee171687 netx/net/sourceforge/jnlp/JARDesc.java
--- a/netx/net/sourceforge/jnlp/JARDesc.java	Tue Oct 29 17:30:18 2013 -0400
+++ b/netx/net/sourceforge/jnlp/JARDesc.java	Wed Oct 30 10:36:03 2013 +0100
@@ -21,31 +21,32 @@
 /**
  * The JAR element.
  *
+ * This class is immutable and thread safe
  * @author <a href="mailto:jmaxwell at users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
  * @version $Revision: 1.6 $
  */
 public class JARDesc {
 
     /** the location of the JAR file */
-    private URL location;
+    private final URL location;
 
     /** the required JAR versions, or null */
-    private Version version;
+    private final Version version;
 
     /** the part name */
-    private String part;
+    private final String part;
 
     /** whether to load the JAR on demand */
-    private boolean lazy;
+    private final boolean lazy;
 
     /** whether the JAR contains the main class */
-    private boolean main;
+    private final boolean main;
 
     /** whether the JAR contains native libraries */
-    private boolean nativeJar;
+    private final boolean nativeJar;
 
     /** whether the JAR can be cached */
-    private boolean cacheable;
+    private final boolean cacheable;
 
     /**
      * Create a JAR descriptor.

From jvanek at redhat.com  Wed Oct 30 04:14:14 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Wed, 30 Oct 2013 12:14:14 +0100
Subject: Small refactoring in searching for attributes
In-Reply-To: <20131026135310.GA1983@redhat.com>
References: <526A4532.4000401@redhat.com> <20131026135310.GA1983@redhat.com>
Message-ID: <5270EA06.70009@redhat.com>

On 10/26/2013 03:53 PM, Omair Majid wrote:
...
>>
>> ...
>>
>>
>> Are a bit unrelated, but worthy.
>
> Yup. This is actually very nice to have! I think all the fields in JARDesc
> are now final. Can you mark the class (maybe in the javadoc) as
> immutable/thread-safe ?

Thanx, mentioned and pushed as separate chngeset.
>
>> I wonted to write setter for "main" field, and realised how wrong
>> this class is. So I did not made the api dirty (used refelction in dummyJnlp) and adde those finals.
>
> I have mixed feelings about this. If you need to peek at a field to find
> out that this class is working correctly, maybe that fields needs to be
> public (or accessible through a getter/setter)?

Nope. But I fixed it. Now the "main" is set in constructor so it is as it should be. JArdesc 
immutability is correct, and field is set during construction. Ideal. This is best on review 
process. One is forced to read patch at least one more times :)

>
> The way I see it, the unit tests are verifying the API/functionality. If
> something is not visible externally (at all), does it really have any
> purpose? Does it need to be tested?
>
>> Ok for head (both patch and fix?)
>
> The patch was okay. It's just that I generally put fix and test in one
> commit (because creating a good test often exposes deficiencies in the
> fix).

immutable jarDesc pushed to 1.4 as well.
>
>> Also both, or one, or none :) to 1.4 ?
>
> There are no functional changes, right? Sounds okay to me.

correct.
>
>> +++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java	Mon Oct 21 15:25:09 2013 +0200
>
>> +    public void getCustomAtributes() throws Exception {
>> +        File tempDirectory = FileTestUtils.createTempDirectory();
>> +        File jarLocation = new File(tempDirectory, "testX.jar");
>
> Can you decouple the unit test from the file system? The more this unit
> test does, the less useful it becomes as a 'unit' test (since the 'unit'
> now becomes 3 large classes and the file system).

Sorry, not in time to investiage this. So no right now ;(
>
>> +        /* Test with attributes in manifest */ {
>
> When you feel tempted to write comments like this, it's an indication
> that it should be a separate unit test :)
>
>> +      @Test
>> +    public void checkOrderWhenReadingAttributes() throws Exception {
>> +        File tempDirectory = FileTestUtils.createTempDirectory();
>> +        File jarLocation5 = new File(tempDirectory, "test5.jar");
>> +
>> +        /* Test with main-class in manifest */ {
>> +            Manifest manifest1 = new Manifest();
>> +            manifest1.getMainAttributes().put(Attributes.Name.MAIN_CLASS, "DummyClass1"); //two times, but one in main jar, see jnlpFile.setMainJar(3);
>
> Something is wrong in the indentation here. Please following the coding
> style: http://icedtea.classpath.org/wiki/IcedTea-Web#Code_style

restyled

>
>> +            Manifest manifest2 = new Manifest();
>> +            manifest2.getMainAttributes().put(Attributes.Name.IMPLEMENTATION_VENDOR, "rh1"); //two times, both in not main jar, see jnlpFile.setMainJar(3);
>> +
>> +            Manifest manifest3 = new Manifest();
>> +            manifest3.getMainAttributes().put(Attributes.Name.IMPLEMENTATION_TITLE, "it"); //jsut once in not main jar, see jnlpFile.setMainJar(3);
>
> What's setMainJar(3) ?

There is no such method :P (in new version :)

>
>> +            assertNoFileLeak(new Runnable() {
>
> Not leaking files is good, but it's better to not use files in unit
> tests.
>
>> +++ b/tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java	Mon Oct 21 15:25:09 2013 +0200
>
>> +    public void setMainJar(int i) throws Exception {
>> +        Field field = JARDesc.class.getDeclaredField("main");
>> +        Field modifiersField = Field.class.getDeclaredField("modifiers");
>> +        modifiersField.setAccessible(true);
>> +        modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
>> +        modifiersField.setInt(field, field.getModifiers() & ~Modifier.PRIVATE);
>> +        modifiersField.setInt(field, Modifier.PUBLIC);
>> +        field.set(jarDescs[i], true);
>
> Uhm. Please consider a different implementation.
Yah, really nasty from me. Fixed (set in constructor)



Thnx for eyabl. Should e much better now!

J.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: testForSearchForAttribute2.patch
Type: text/x-patch
Size: 10894 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131030/b8680e00/testForSearchForAttribute2.patch 

From omajid at redhat.com  Wed Oct 30 09:19:58 2013
From: omajid at redhat.com (Omair Majid)
Date: Wed, 30 Oct 2013 12:19:58 -0400
Subject: Small refactoring in searching for attributes
In-Reply-To: <5270EA06.70009@redhat.com>
References: <526A4532.4000401@redhat.com> <20131026135310.GA1983@redhat.com>
	<5270EA06.70009@redhat.com>
Message-ID: <20131030161958.GB1540@redhat.com>

* Jiri Vanek <jvanek at redhat.com> [2013-10-30 07:14]:
> On 10/26/2013 03:53 PM, Omair Majid wrote:
> >I have mixed feelings about this. If you need to peek at a field to find
> >out that this class is working correctly, maybe that fields needs to be
> >public (or accessible through a getter/setter)?
> 
> Nope. But I fixed it. Now the "main" is set in constructor so it is
> as it should be. JArdesc immutability is correct, and field is set
> during construction. Ideal. This is best on review process. One is
> forced to read patch at least one more times :)

Awesome!

> >>+++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java	Mon Oct 21 15:25:09 2013 +0200
> >
> >>+    public void getCustomAtributes() throws Exception {
> >>+        File tempDirectory = FileTestUtils.createTempDirectory();
> >>+        File jarLocation = new File(tempDirectory, "testX.jar");
> >
> >Can you decouple the unit test from the file system? The more this unit
> >test does, the less useful it becomes as a 'unit' test (since the 'unit'
> >now becomes 3 large classes and the file system).
> 
> Sorry, not in time to investiage this. So no right now ;(

Long term, this is bad. Maybe you want to hold onto this patch until you
get time to sort it out completely?

> >>+        /* Test with attributes in manifest */ {
> >
> >When you feel tempted to write comments like this, it's an indication
> >that it should be a separate unit test :)

This is still not fixed. Is there any specific reason you want to stick
to this style?

> >>+      @Test
> >>+    public void checkOrderWhenReadingAttributes() throws Exception {
> >>+        File tempDirectory = FileTestUtils.createTempDirectory();
> >>+        File jarLocation5 = new File(tempDirectory, "test5.jar");
> >>+
> >>+        /* Test with main-class in manifest */ {
> >>+            Manifest manifest1 = new Manifest();
> >>+            manifest1.getMainAttributes().put(Attributes.Name.MAIN_CLASS, "DummyClass1"); //two times, but one in main jar, see jnlpFile.setMainJar(3);
> >
> >Something is wrong in the indentation here. Please following the coding
> >style: http://icedtea.classpath.org/wiki/IcedTea-Web#Code_style
> 
> restyled

The annotation's indentation is okay, but the indentation after the
comment is still funny looking.

Thanks,
Omair

From jvanek at redhat.com  Wed Oct 30 09:49:56 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Wed, 30 Oct 2013 17:49:56 +0100
Subject: Small refactoring in searching for attributes
In-Reply-To: <20131030161958.GB1540@redhat.com>
References: <526A4532.4000401@redhat.com> <20131026135310.GA1983@redhat.com>
	<5270EA06.70009@redhat.com> <20131030161958.GB1540@redhat.com>
Message-ID: <527138B4.7040204@redhat.com>

On 10/30/2013 05:19 PM, Omair Majid wrote:
> * Jiri Vanek <jvanek at redhat.com> [2013-10-30 07:14]:
>> On 10/26/2013 03:53 PM, Omair Majid wrote:
>>> I have mixed feelings about this. If you need to peek at a field to find
>>> out that this class is working correctly, maybe that fields needs to be
>>> public (or accessible through a getter/setter)?
>>
>> Nope. But I fixed it. Now the "main" is set in constructor so it is
>> as it should be. JArdesc immutability is correct, and field is set
>> during construction. Ideal. This is best on review process. One is
>> forced to read patch at least one more times :)
>
> Awesome!
>
>>>> +++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java	Mon Oct 21 15:25:09 2013 +0200
>>>
>>>> +    public void getCustomAtributes() throws Exception {
>>>> +        File tempDirectory = FileTestUtils.createTempDirectory();
>>>> +        File jarLocation = new File(tempDirectory, "testX.jar");
>>>
>>> Can you decouple the unit test from the file system? The more this unit
>>> test does, the less useful it becomes as a 'unit' test (since the 'unit'
>>> now becomes 3 large classes and the file system).
>>
>> Sorry, not in time to investiage this. So no right now ;(
>
> Long term, this is bad. Maybe you want to hold onto this patch until you
> get time to sort it out completely?

please, not yet. from quick glance there is no easy solution :(
>
>>>> +        /* Test with attributes in manifest */ {
>>>
>>> When you feel tempted to write comments like this, it's an indication
>>> that it should be a separate unit test :)
>
> This is still not fixed. Is there any specific reason you want to stick
> to this style?


I must admit that I do not understand what you wont me to do :(
>
>>>> +      @Test
>>>> +    public void checkOrderWhenReadingAttributes() throws Exception {
>>>> +        File tempDirectory = FileTestUtils.createTempDirectory();
>>>> +        File jarLocation5 = new File(tempDirectory, "test5.jar");
>>>> +
>>>> +        /* Test with main-class in manifest */ {
>>>> +            Manifest manifest1 = new Manifest();
>>>> +            manifest1.getMainAttributes().put(Attributes.Name.MAIN_CLASS, "DummyClass1"); //two times, but one in main jar, see jnlpFile.setMainJar(3);
>>>
>>> Something is wrong in the indentation here. Please following the coding
>>> style: http://icedtea.classpath.org/wiki/IcedTea-Web#Code_style
>>
>> restyled
>
> The annotation's indentation is okay, but the indentation after the
> comment is still funny looking.

Crap will restyle again after previous comment is fixed

J.

From omajid at redhat.com  Wed Oct 30 09:58:29 2013
From: omajid at redhat.com (Omair Majid)
Date: Wed, 30 Oct 2013 12:58:29 -0400
Subject: Small refactoring in searching for attributes
In-Reply-To: <527138B4.7040204@redhat.com>
References: <526A4532.4000401@redhat.com> <20131026135310.GA1983@redhat.com>
	<5270EA06.70009@redhat.com> <20131030161958.GB1540@redhat.com>
	<527138B4.7040204@redhat.com>
Message-ID: <20131030165828.GD1540@redhat.com>

* Jiri Vanek <jvanek at redhat.com> [2013-10-30 12:49]:
> On 10/30/2013 05:19 PM, Omair Majid wrote:
> >* Jiri Vanek <jvanek at redhat.com> [2013-10-30 07:14]:
> >>On 10/26/2013 03:53 PM, Omair Majid wrote:
> >>>Can you decouple the unit test from the file system? The more this unit
> >>>test does, the less useful it becomes as a 'unit' test (since the 'unit'
> >>>now becomes 3 large classes and the file system).
> >>
> >>Sorry, not in time to investiage this. So no right now ;(
> >
> >Long term, this is bad. Maybe you want to hold onto this patch until you
> >get time to sort it out completely?
> 
> please, not yet. from quick glance there is no easy solution :(
> >

Okay, but more things like this make unit tests brittle. If they are
brittle and break on other setups, they are not really helping.

> >>>>+        /* Test with attributes in manifest */ {
> >>>
> >>>When you feel tempted to write comments like this, it's an indication
> >>>that it should be a separate unit test :)
> >
> >This is still not fixed. Is there any specific reason you want to stick
> >to this style?
> 
> 
> I must admit that I do not understand what you wont me to do :(

Basically, when you have code like this:

@Test public void testSomething() {

    /* test variant 1 */

    // lots of code, part 1

    /* test variant 2 */

    // lots of code, part 2
}

It's more clear if you split it into:

@Test public void testSomethingVariant1() {
    // lots of code, part 1
}

@Test public void testSomethingVariant2() {
    // lots of code, part 2
}

That gives you smaller tests, makes it clear what the test is doing (and
what to look at in case of a failure), clarifies that variant 1 and
variant 2 are not related in terms of code dependency in the test.

Thanks,
Omair

From jvanek at redhat.com  Wed Oct 30 10:18:26 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Wed, 30 Oct 2013 18:18:26 +0100
Subject: Small refactoring in searching for attributes
In-Reply-To: <20131030165828.GD1540@redhat.com>
References: <526A4532.4000401@redhat.com> <20131026135310.GA1983@redhat.com>
	<5270EA06.70009@redhat.com> <20131030161958.GB1540@redhat.com>
	<527138B4.7040204@redhat.com> <20131030165828.GD1540@redhat.com>
Message-ID: <52713F62.10302@redhat.com>

On 10/30/2013 05:58 PM, Omair Majid wrote:
> * Jiri Vanek <jvanek at redhat.com> [2013-10-30 12:49]:
>> On 10/30/2013 05:19 PM, Omair Majid wrote:
>>> * Jiri Vanek <jvanek at redhat.com> [2013-10-30 07:14]:
>>>> On 10/26/2013 03:53 PM, Omair Majid wrote:
>>>>> Can you decouple the unit test from the file system? The more this unit
>>>>> test does, the less useful it becomes as a 'unit' test (since the 'unit'
>>>>> now becomes 3 large classes and the file system).
>>>>
>>>> Sorry, not in time to investiage this. So no right now ;(
>>>
>>> Long term, this is bad. Maybe you want to hold onto this patch until you
>>> get time to sort it out completely?
>>
>> please, not yet. from quick glance there is no easy solution :(
>>>
>
> Okay, but more things like this make unit tests brittle. If they are
> brittle and break on other setups, they are not really helping.
>
>>>>>> +        /* Test with attributes in manifest */ {
>>>>>
>>>>> When you feel tempted to write comments like this, it's an indication
>>>>> that it should be a separate unit test :)
>>>
>>> This is still not fixed. Is there any specific reason you want to stick
>>> to this style?
>>
>>
>> I must admit that I do not understand what you wont me to do :(
>
> Basically, when you have code like this:
>
> @Test public void testSomething() {
>
>      /* test variant 1 */
>
>      // lots of code, part 1
>
>      /* test variant 2 */
>
>      // lots of code, part 2
> }
>
> It's more clear if you split it into:
>
> @Test public void testSomethingVariant1() {
>      // lots of code, part 1
> }
>
> @Test public void testSomethingVariant2() {
>      // lots of code, part 2
> }


Sure, thats clear, Sorry for me not understanding it:(
>
> That gives you smaller tests, makes it clear what the test is doing (and
> what to look at in case of a failure), clarifies that variant 1 and
> variant 2 are not related in terms of code dependency in the test.
>
> Thanks,
> Omair
>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: testForSearchForAttribute3.patch
Type: text/x-patch
Size: 11440 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131030/a0dbf63a/testForSearchForAttribute3.patch 

From thomas at m3y3r.de  Wed Oct 30 11:17:10 2013
From: thomas at m3y3r.de (Thomas Meyer)
Date: Wed, 30 Oct 2013 19:17:10 +0100
Subject: icedtea-web hangs in JNLPRuntime (L&F gtk)
Message-ID: <1383157030.5362.3.camel@localhost.localdomain>

Hi,

the current version of icedtea-web (rev.cdb796a6195b) hangs for me at
net.sourceforge.jnlp.runtime.JNLPRuntime.initialize(boolean):236 while
trying to set the look and feel of the application.

Adding this line to the deployment.properties files:

swing.systemlaf=javax.swing.plaf.metal.MetalLookAndFeel

make the hang go away.

Do anybody else also experience this bug? I'm using Fedora 19,
icedtea-web is at cdb796a6195b and java version is:

java version "1.7.0_45"
OpenJDK Runtime Environment (fedora-2.4.3.0.fc19-x86_64 u45-b15)
OpenJDK 64-Bit Server VM (build 24.45-b08, mixed mode)

with kind regards
thomas


From andrew at icedtea.classpath.org  Wed Oct 30 17:22:42 2013
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Thu, 31 Oct 2013 00:22:42 +0000
Subject: /hg/release/icedtea6-1.11: Add 2013/10/15 security fixes.
Message-ID: <hg.d667440f2973.1383178962.-53431993501496595@icedtea.classpath.org>

changeset d667440f2973 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=d667440f2973
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Oct 31 00:22:07 2013 +0000

	Add 2013/10/15 security fixes.

	2013-10-29  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/ecj/bootver.patch:
		Removed as unapplied & incorporated in other patches.
		* Makefile.am:
		(SECURITY_PATCHES): Add security update.
		* NEWS: Updated.
		* patches/jtreg-LastErrorString.patch,
		* patches/openjdk/7196533-timezone_bottleneck.patch,
		* patches/openjdk/8010727-empty_logger_name.patch,
		* patches/openjdk/8010939-logmanager_deadlock.patch,
		* patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch,
		* patches/openjdk/8014718-remove_logging_suntoolkit.patch:
		Regenerated.
		* patches/nss-config.patch: Fix path to java.security.
		* patches/openjdk/4075303-javap_update.patch,
		* patches/openjdk/4111861-static_fields.patch,
		* patches/openjdk/4501661-disallow_mixing.patch,
		* patches/openjdk/4884240-javap_additional_option.patch,
		* patches/openjdk/6708729-javap_makefile_update.patch,
		* patches/openjdk/6715767-javap_crash.patch,
		* patches/openjdk/6819246-javap_instruction_decoding.patch,
		* patches/openjdk/6824493-experimental.patch,
		* patches/openjdk/6841419-classfile_iterator.patch,
		* patches/openjdk/6841420-classfile_methods.patch,
		* patches/openjdk/6843013-missing_experimental.patch,
		* patches/openjdk/6852856-javap_subclasses.patch,
		* patches/openjdk/6867671-javap_whitespace.patch,
		* patches/openjdk/6868539-constant_pool_tags.patch,
		* patches/openjdk/6902264-fix_indentation.patch,
		* patches/openjdk/6954275-big_xml_signatures.patch,
		* patches/openjdk/7146431-java.security_files.patch,
		* patches/openjdk/8000450-restrict_access.patch,
		* patches/openjdk/8002070-remove_logger_stack_search.patch,
		* patches/openjdk/8003992-embedded_nulls.patch,
		* patches/openjdk/8004188-rename_java.security.patch,
		* patches/openjdk/8006882-jmockit.patch,
		* patches/openjdk/8006900-new_date_time.patch,
		* patches/openjdk/8008589-better_mbean_permission_validation.patch,
		* patches/openjdk/8010118-caller_sensitive.patch,
		* patches/openjdk/8011071-better_crypto_provider_handling.patch,
		* patches/openjdk/8011081-improve_jhat.patch,
		* patches/openjdk/8011139-revise_checking_getenclosingclass.patch,
		* patches/openjdk/8011157-improve_corba_portability-jdk.patch,
		* patches/openjdk/8011157-improve_corba_portability.patch,
		* patches/openjdk/8011990-logger_test_urls.patch,
		* patches/openjdk/8012071-better_bean_building.patch,
		* patches/openjdk/8012147-improve_tool.patch,
		* patches/openjdk/8012243-serial_regression.patch,
		* patches/openjdk/8012277-improve_dataflavour.patch,
		* patches/openjdk/8012425-transform_transformfactory.patch,
		* patches/openjdk/8012453-runtime.exec.patch,
		* patches/openjdk/8013380-logger_stack_walk_glassfish.patch,
		* patches/openjdk/8013503-improve_stream_factories.patch,
		* patches/openjdk/8013506-better_pack200.patch,
		* patches/openjdk/8013510-augment_image_writing.patch,
		* patches/openjdk/8013514-improve_cmap_stability.patch,
		* patches/openjdk/8013739-better_ldap_resource_management.patch,
		* patches/openjdk/8013744-better_tabling.patch,
		* patches/openjdk/8013827-createtempfile_hang.patch,
		* patches/openjdk/8014085-better_serialization.patch,
		* patches/openjdk/8014093-improve_image_parsing.patch,
		* patches/openjdk/8014102-improve_image_conversion.patch,
		* patches/openjdk/8014341-better_kerberos_service.patch,
		* patches/openjdk/8014349-getdeclaredclass_fix.patch,
		* patches/openjdk/8014530-better_dsp.patch,
		* patches/openjdk/8014534-better_profiling.patch,
		* patches/openjdk/8014745-logger_stack_walk_switch.patch,
		* patches/openjdk/8014987-augment_serialization.patch,
		* patches/openjdk/8015144-performance_regression.patch,
		* patches/openjdk/8015614-update_build.patch,
		* patches/openjdk/8015731-auth_improvements.patch,
		* patches/openjdk/8015743-address_internet_addresses.patch,
		* patches/openjdk/8015965-typo_in_property_name.patch,
		* patches/openjdk/8015978-incorrect_transformation.patch,
		* patches/openjdk/8016256-finalization_final.patch,
		* patches/openjdk/8016357-update_hs_diagnostic_class.patch,
		* patches/openjdk/8016653-ignoreable_characters.patch,
		* patches/openjdk/8016675-robust_javadoc.patch,
		* patches/openjdk/8017196-ensure_proxies_are_handled_appropriately-jdk.patch,
		* patches/openjdk/8017196-ensure_proxies_are_handled_appropriately.patch,
		* patches/openjdk/8017287-better_resource_disposal.patch,
		* patches/openjdk/8017291-cast_proxies_aside.patch,
		* patches/openjdk/8017298-better_xml_support.patch,
		* patches/openjdk/8017300-improve_interface_implementation.patch,
		* patches/openjdk/8017505-better_client_service.patch,
		* patches/openjdk/8017566-backout_part_of_8000450.patch,
		* patches/openjdk/8019292-better_attribute_value_exceptions.patch,
		* patches/openjdk/8019584-invalid_notification_fix.patch,
		* patches/openjdk/8019617-better_view_of_objects.patch,
		* patches/openjdk/8019969-inet6_test_case_fix.patch,
		* patches/openjdk/8019979-better_access_test.patch,
		* patches/openjdk/8020293-jvm_crash.patch,
		* patches/openjdk/8021290-signature_validation.patch,
		* patches/openjdk/8021355-splashscreen_regression.patch,
		* patches/openjdk/8021366-jaxp_test_fix-01.patch,
		* patches/openjdk/8021577-bean_serialization_fix.patch,
		* patches/openjdk/8021933-jaxp_test_fix-02.patch,
		* patches/openjdk/8021969-jnlp_load_failure.patch,
		* patches/openjdk/8022661-writeobject_flush.patch,
		* patches/openjdk/8022682-supporting_xom.patch,
		* patches/openjdk/8022940-enhance_corba_translations.patch,
		* patches/openjdk/8023683-enhance_class_file_parsing.patch,
		* patches/openjdk/8023964-ignore_test.patch,
		* patches/openjdk/8024914-swapped_usage.patch,
		* patches/openjdk/8025128-createtempfile_absolute_prefix.patch,
		* patches/openjdk/oj6-19-fix_8010118_test_cases.patch,
		* patches/openjdk/oj6-20-merge.patch,
		* patches/openjdk/oj6-21-overrides.patch: Added.


diffstat:

 ChangeLog                                                                  |    110 +
 Makefile.am                                                                |    106 +-
 NEWS                                                                       |    118 +
 patches/ecj/bootver.patch                                                  |     14 -
 patches/jtreg-LastErrorString.patch                                        |     31 +-
 patches/nss-config.patch                                                   |      4 +-
 patches/openjdk/4075303-javap_update.patch                                 |  12081 ++++++++++
 patches/openjdk/4111861-static_fields.patch                                |    280 +
 patches/openjdk/4501661-disallow_mixing.patch                              |    222 +
 patches/openjdk/4884240-javap_additional_option.patch                      |    288 +
 patches/openjdk/6708729-javap_makefile_update.patch                        |     59 +
 patches/openjdk/6715767-javap_crash.patch                                  |    135 +
 patches/openjdk/6819246-javap_instruction_decoding.patch                   |   2065 +
 patches/openjdk/6824493-experimental.patch                                 |   1304 +
 patches/openjdk/6841419-classfile_iterator.patch                           |    142 +
 patches/openjdk/6841420-classfile_methods.patch                            |     34 +
 patches/openjdk/6843013-missing_experimental.patch                         |    334 +
 patches/openjdk/6852856-javap_subclasses.patch                             |    508 +
 patches/openjdk/6867671-javap_whitespace.patch                             |   1041 +
 patches/openjdk/6868539-constant_pool_tags.patch                           |    163 +
 patches/openjdk/6902264-fix_indentation.patch                              |    159 +
 patches/openjdk/6954275-big_xml_signatures.patch                           |    194 +
 patches/openjdk/7146431-java.security_files.patch                          |     82 +
 patches/openjdk/7196533-timezone_bottleneck.patch                          |     15 +-
 patches/openjdk/8000450-restrict_access.patch                              |    108 +
 patches/openjdk/8002070-remove_logger_stack_search.patch                   |    658 +
 patches/openjdk/8003992-embedded_nulls.patch                               |   1026 +
 patches/openjdk/8004188-rename_java.security.patch                         |    652 +
 patches/openjdk/8006882-jmockit.patch                                      |     90 +
 patches/openjdk/8006900-new_date_time.patch                                |    115 +
 patches/openjdk/8008589-better_mbean_permission_validation.patch           |     61 +
 patches/openjdk/8010118-caller_sensitive.patch                             |   2981 ++
 patches/openjdk/8010727-empty_logger_name.patch                            |     18 +-
 patches/openjdk/8010939-logmanager_deadlock.patch                          |     22 +-
 patches/openjdk/8011071-better_crypto_provider_handling.patch              |    287 +
 patches/openjdk/8011081-improve_jhat.patch                                 |    267 +
 patches/openjdk/8011139-revise_checking_getenclosingclass.patch            |     58 +
 patches/openjdk/8011157-improve_corba_portability-jdk.patch                |    125 +
 patches/openjdk/8011157-improve_corba_portability.patch                    |    183 +
 patches/openjdk/8011990-logger_test_urls.patch                             |     58 +
 patches/openjdk/8012071-better_bean_building.patch                         |     87 +
 patches/openjdk/8012147-improve_tool.patch                                 |     67 +
 patches/openjdk/8012243-serial_regression.patch                            |     45 +
 patches/openjdk/8012277-improve_dataflavour.patch                          |     83 +
 patches/openjdk/8012425-transform_transformfactory.patch                   |    380 +
 patches/openjdk/8012453-runtime.exec.patch                                 |    383 +
 patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch      |    131 +-
 patches/openjdk/8013380-logger_stack_walk_glassfish.patch                  |    941 +
 patches/openjdk/8013503-improve_stream_factories.patch                     |    224 +
 patches/openjdk/8013506-better_pack200.patch                               |     39 +
 patches/openjdk/8013510-augment_image_writing.patch                        |     57 +
 patches/openjdk/8013514-improve_cmap_stability.patch                       |     51 +
 patches/openjdk/8013739-better_ldap_resource_management.patch              |    148 +
 patches/openjdk/8013744-better_tabling.patch                               |    196 +
 patches/openjdk/8013827-createtempfile_hang.patch                          |    176 +
 patches/openjdk/8014085-better_serialization.patch                         |    412 +
 patches/openjdk/8014093-improve_image_parsing.patch                        |    719 +
 patches/openjdk/8014102-improve_image_conversion.patch                     |    190 +
 patches/openjdk/8014341-better_kerberos_service.patch                      |     66 +
 patches/openjdk/8014349-getdeclaredclass_fix.patch                         |     43 +
 patches/openjdk/8014530-better_dsp.patch                                   |   3121 ++
 patches/openjdk/8014534-better_profiling.patch                             |    156 +
 patches/openjdk/8014718-remove_logging_suntoolkit.patch                    |     47 +-
 patches/openjdk/8014745-logger_stack_walk_switch.patch                     |    205 +
 patches/openjdk/8014987-augment_serialization.patch                        |    100 +
 patches/openjdk/8015144-performance_regression.patch                       |    273 +
 patches/openjdk/8015614-update_build.patch                                 |     41 +
 patches/openjdk/8015731-auth_improvements.patch                            |     28 +
 patches/openjdk/8015743-address_internet_addresses.patch                   |   1290 +
 patches/openjdk/8015965-typo_in_property_name.patch                        |     42 +
 patches/openjdk/8015978-incorrect_transformation.patch                     |     22 +
 patches/openjdk/8016256-finalization_final.patch                           |     24 +
 patches/openjdk/8016357-update_hs_diagnostic_class.patch                   |     71 +
 patches/openjdk/8016653-ignoreable_characters.patch                        |    101 +
 patches/openjdk/8016675-robust_javadoc.patch                               |     75 +
 patches/openjdk/8017196-ensure_proxies_are_handled_appropriately-jdk.patch |    107 +
 patches/openjdk/8017196-ensure_proxies_are_handled_appropriately.patch     |     94 +
 patches/openjdk/8017287-better_resource_disposal.patch                     |     22 +
 patches/openjdk/8017291-cast_proxies_aside.patch                           |     34 +
 patches/openjdk/8017298-better_xml_support.patch                           |    999 +
 patches/openjdk/8017300-improve_interface_implementation.patch             |    129 +
 patches/openjdk/8017505-better_client_service.patch                        |    560 +
 patches/openjdk/8017566-backout_part_of_8000450.patch                      |     77 +
 patches/openjdk/8019292-better_attribute_value_exceptions.patch            |     57 +
 patches/openjdk/8019584-invalid_notification_fix.patch                     |     69 +
 patches/openjdk/8019617-better_view_of_objects.patch                       |     68 +
 patches/openjdk/8019969-inet6_test_case_fix.patch                          |     33 +
 patches/openjdk/8019979-better_access_test.patch                           |    154 +
 patches/openjdk/8020293-jvm_crash.patch                                    |     40 +
 patches/openjdk/8021290-signature_validation.patch                         |     55 +
 patches/openjdk/8021355-splashscreen_regression.patch                      |     53 +
 patches/openjdk/8021366-jaxp_test_fix-01.patch                             |     21 +
 patches/openjdk/8021577-bean_serialization_fix.patch                       |     25 +
 patches/openjdk/8021933-jaxp_test_fix-02.patch                             |     33 +
 patches/openjdk/8021969-jnlp_load_failure.patch                            |     25 +
 patches/openjdk/8022661-writeobject_flush.patch                            |     20 +
 patches/openjdk/8022682-supporting_xom.patch                               |    250 +
 patches/openjdk/8022940-enhance_corba_translations.patch                   |     41 +
 patches/openjdk/8023683-enhance_class_file_parsing.patch                   |     35 +
 patches/openjdk/8023964-ignore_test.patch                                  |     29 +
 patches/openjdk/8024914-swapped_usage.patch                                |     58 +
 patches/openjdk/8025128-createtempfile_absolute_prefix.patch               |    139 +
 patches/openjdk/oj6-19-fix_8010118_test_cases.patch                        |    499 +
 patches/openjdk/oj6-20-merge.patch                                         |    599 +
 patches/openjdk/oj6-21-overrides.patch                                     |     20 +
 patches/use-idx_t.patch                                                    |     81 +-
 106 files changed, 40480 insertions(+), 178 deletions(-)

diffs (truncated from 41484 to 500 lines):

diff -r 5fb5a0032329 -r d667440f2973 ChangeLog
--- a/ChangeLog	Sat Sep 07 04:25:38 2013 +0100
+++ b/ChangeLog	Thu Oct 31 00:22:07 2013 +0000
@@ -1,3 +1,113 @@
+2013-10-29  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/ecj/bootver.patch:
+	Removed as unapplied & incorporated in other patches.
+	* Makefile.am:
+	(SECURITY_PATCHES): Add security update.
+	* NEWS: Updated.
+	* patches/jtreg-LastErrorString.patch,
+	* patches/openjdk/7196533-timezone_bottleneck.patch,
+	* patches/openjdk/8010727-empty_logger_name.patch,
+	* patches/openjdk/8010939-logmanager_deadlock.patch,
+	* patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch,
+	* patches/openjdk/8014718-remove_logging_suntoolkit.patch:
+	Regenerated.
+	* patches/nss-config.patch: Fix path to java.security.
+	* patches/openjdk/4075303-javap_update.patch,
+	* patches/openjdk/4111861-static_fields.patch,
+	* patches/openjdk/4501661-disallow_mixing.patch,
+	* patches/openjdk/4884240-javap_additional_option.patch,
+	* patches/openjdk/6708729-javap_makefile_update.patch,
+	* patches/openjdk/6715767-javap_crash.patch,
+	* patches/openjdk/6819246-javap_instruction_decoding.patch,
+	* patches/openjdk/6824493-experimental.patch,
+	* patches/openjdk/6841419-classfile_iterator.patch,
+	* patches/openjdk/6841420-classfile_methods.patch,
+	* patches/openjdk/6843013-missing_experimental.patch,
+	* patches/openjdk/6852856-javap_subclasses.patch,
+	* patches/openjdk/6867671-javap_whitespace.patch,
+	* patches/openjdk/6868539-constant_pool_tags.patch,
+	* patches/openjdk/6902264-fix_indentation.patch,
+	* patches/openjdk/6954275-big_xml_signatures.patch,
+	* patches/openjdk/7146431-java.security_files.patch,
+	* patches/openjdk/8000450-restrict_access.patch,
+	* patches/openjdk/8002070-remove_logger_stack_search.patch,
+	* patches/openjdk/8003992-embedded_nulls.patch,
+	* patches/openjdk/8004188-rename_java.security.patch,
+	* patches/openjdk/8006882-jmockit.patch,
+	* patches/openjdk/8006900-new_date_time.patch,
+	* patches/openjdk/8008589-better_mbean_permission_validation.patch,
+	* patches/openjdk/8010118-caller_sensitive.patch,
+	* patches/openjdk/8011071-better_crypto_provider_handling.patch,
+	* patches/openjdk/8011081-improve_jhat.patch,
+	* patches/openjdk/8011139-revise_checking_getenclosingclass.patch,
+	* patches/openjdk/8011157-improve_corba_portability-jdk.patch,
+	* patches/openjdk/8011157-improve_corba_portability.patch,
+	* patches/openjdk/8011990-logger_test_urls.patch,
+	* patches/openjdk/8012071-better_bean_building.patch,
+	* patches/openjdk/8012147-improve_tool.patch,
+	* patches/openjdk/8012243-serial_regression.patch,
+	* patches/openjdk/8012277-improve_dataflavour.patch,
+	* patches/openjdk/8012425-transform_transformfactory.patch,
+	* patches/openjdk/8012453-runtime.exec.patch,
+	* patches/openjdk/8013380-logger_stack_walk_glassfish.patch,
+	* patches/openjdk/8013503-improve_stream_factories.patch,
+	* patches/openjdk/8013506-better_pack200.patch,
+	* patches/openjdk/8013510-augment_image_writing.patch,
+	* patches/openjdk/8013514-improve_cmap_stability.patch,
+	* patches/openjdk/8013739-better_ldap_resource_management.patch,
+	* patches/openjdk/8013744-better_tabling.patch,
+	* patches/openjdk/8013827-createtempfile_hang.patch,
+	* patches/openjdk/8014085-better_serialization.patch,
+	* patches/openjdk/8014093-improve_image_parsing.patch,
+	* patches/openjdk/8014102-improve_image_conversion.patch,
+	* patches/openjdk/8014341-better_kerberos_service.patch,
+	* patches/openjdk/8014349-getdeclaredclass_fix.patch,
+	* patches/openjdk/8014530-better_dsp.patch,
+	* patches/openjdk/8014534-better_profiling.patch,
+	* patches/openjdk/8014745-logger_stack_walk_switch.patch,
+	* patches/openjdk/8014987-augment_serialization.patch,
+	* patches/openjdk/8015144-performance_regression.patch,
+	* patches/openjdk/8015614-update_build.patch,
+	* patches/openjdk/8015731-auth_improvements.patch,
+	* patches/openjdk/8015743-address_internet_addresses.patch,
+	* patches/openjdk/8015965-typo_in_property_name.patch,
+	* patches/openjdk/8015978-incorrect_transformation.patch,
+	* patches/openjdk/8016256-finalization_final.patch,
+	* patches/openjdk/8016357-update_hs_diagnostic_class.patch,
+	* patches/openjdk/8016653-ignoreable_characters.patch,
+	* patches/openjdk/8016675-robust_javadoc.patch,
+	* patches/openjdk/8017196-ensure_proxies_are_handled_appropriately-jdk.patch,
+	* patches/openjdk/8017196-ensure_proxies_are_handled_appropriately.patch,
+	* patches/openjdk/8017287-better_resource_disposal.patch,
+	* patches/openjdk/8017291-cast_proxies_aside.patch,
+	* patches/openjdk/8017298-better_xml_support.patch,
+	* patches/openjdk/8017300-improve_interface_implementation.patch,
+	* patches/openjdk/8017505-better_client_service.patch,
+	* patches/openjdk/8017566-backout_part_of_8000450.patch,
+	* patches/openjdk/8019292-better_attribute_value_exceptions.patch,
+	* patches/openjdk/8019584-invalid_notification_fix.patch,
+	* patches/openjdk/8019617-better_view_of_objects.patch,
+	* patches/openjdk/8019969-inet6_test_case_fix.patch,
+	* patches/openjdk/8019979-better_access_test.patch,
+	* patches/openjdk/8020293-jvm_crash.patch,
+	* patches/openjdk/8021290-signature_validation.patch,
+	* patches/openjdk/8021355-splashscreen_regression.patch,
+	* patches/openjdk/8021366-jaxp_test_fix-01.patch,
+	* patches/openjdk/8021577-bean_serialization_fix.patch,
+	* patches/openjdk/8021933-jaxp_test_fix-02.patch,
+	* patches/openjdk/8021969-jnlp_load_failure.patch,
+	* patches/openjdk/8022661-writeobject_flush.patch,
+	* patches/openjdk/8022682-supporting_xom.patch,
+	* patches/openjdk/8022940-enhance_corba_translations.patch,
+	* patches/openjdk/8023683-enhance_class_file_parsing.patch,
+	* patches/openjdk/8023964-ignore_test.patch,
+	* patches/openjdk/8024914-swapped_usage.patch,
+	* patches/openjdk/8025128-createtempfile_absolute_prefix.patch,
+	* patches/openjdk/oj6-19-fix_8010118_test_cases.patch,
+	* patches/openjdk/oj6-20-merge.patch,
+	* patches/openjdk/oj6-21-overrides.patch: Added.
+
 2013-09-07  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	* configure.ac: Set to 1.11.14pre.
diff -r 5fb5a0032329 -r d667440f2973 Makefile.am
--- a/Makefile.am	Sat Sep 07 04:25:38 2013 +0100
+++ b/Makefile.am	Thu Oct 31 00:22:07 2013 +0000
@@ -395,7 +395,106 @@
 	patches/security/20130618/langtools_merge-01.patch \
 	patches/security/20130618/langtools_merge-02.patch \
 	patches/security/20130618/langtools_generics.patch \
-	patches/security/20130618/langtools_merge-03.patch
+	patches/security/20130618/langtools_merge-03.patch \
+	patches/openjdk/8017196-ensure_proxies_are_handled_appropriately.patch \
+	patches/openjdk/8011157-improve_corba_portability.patch \
+	patches/openjdk/8022940-enhance_corba_translations.patch \
+	patches/openjdk/8013503-improve_stream_factories.patch \
+	patches/openjdk/8012425-transform_transformfactory.patch \
+	patches/openjdk/8017298-better_xml_support.patch \
+	patches/openjdk/8014530-better_dsp.patch \
+	patches/openjdk/8021366-jaxp_test_fix-01.patch \
+	patches/openjdk/8021933-jaxp_test_fix-02.patch \
+	patches/openjdk/8022682-supporting_xom.patch \
+	patches/openjdk/8015978-incorrect_transformation.patch \
+	patches/openjdk/oj6-20-merge.patch \
+	patches/openjdk/8024914-swapped_usage.patch \
+	patches/openjdk/8017505-better_client_service.patch \
+	patches/openjdk/8015614-update_build.patch \
+	patches/openjdk/8016256-finalization_final.patch \
+	patches/openjdk/8023683-enhance_class_file_parsing.patch \
+	patches/openjdk/4075303-javap_update.patch \
+	patches/openjdk/6819246-javap_instruction_decoding.patch \
+	patches/openjdk/6715767-javap_crash.patch \
+	patches/openjdk/6841420-classfile_methods.patch \
+	patches/openjdk/6841419-classfile_iterator.patch \
+	patches/openjdk/4111861-static_fields.patch \
+	patches/openjdk/4884240-javap_additional_option.patch \
+	patches/openjdk/6852856-javap_subclasses.patch \
+	patches/openjdk/6867671-javap_whitespace.patch \
+	patches/openjdk/6868539-constant_pool_tags.patch \
+	patches/openjdk/4501661-disallow_mixing.patch \
+	patches/openjdk/6824493-experimental.patch \
+	patches/openjdk/6843013-missing_experimental.patch \
+	patches/openjdk/6902264-fix_indentation.patch \
+	patches/openjdk/8016675-robust_javadoc.patch \
+	patches/openjdk/8016653-ignoreable_characters.patch \
+	patches/openjdk/7196533-timezone_bottleneck.patch \
+	patches/openjdk/8006900-new_date_time.patch \
+	patches/openjdk/8008589-better_mbean_permission_validation.patch \
+	patches/openjdk/8011071-better_crypto_provider_handling.patch \
+	patches/openjdk/8011081-improve_jhat.patch \
+	patches/openjdk/8011157-improve_corba_portability-jdk.patch \
+	patches/openjdk/8012071-better_bean_building.patch \
+	patches/openjdk/8012147-improve_tool.patch \
+	patches/openjdk/8012277-improve_dataflavour.patch \
+	patches/openjdk/8013506-better_pack200.patch \
+	patches/openjdk/8013510-augment_image_writing.patch \
+	patches/openjdk/8013514-improve_cmap_stability.patch \
+	patches/openjdk/8013744-better_tabling.patch \
+	patches/openjdk/8014085-better_serialization.patch \
+	patches/openjdk/8014093-improve_image_parsing.patch \
+	patches/openjdk/8014102-improve_image_conversion.patch \
+	patches/openjdk/8014341-better_kerberos_service.patch \
+	patches/openjdk/8014534-better_profiling.patch \
+	patches/openjdk/8014987-augment_serialization.patch \
+	patches/openjdk/8015731-auth_improvements.patch \
+	patches/openjdk/8015743-address_internet_addresses.patch \
+	patches/openjdk/8016357-update_hs_diagnostic_class.patch \
+	patches/openjdk/8002070-remove_logger_stack_search.patch \
+	patches/openjdk/6708729-javap_makefile_update.patch \
+	patches/openjdk/8010118-caller_sensitive.patch \
+	patches/openjdk/oj6-19-fix_8010118_test_cases.patch \
+	patches/openjdk/8010727-empty_logger_name.patch \
+	patches/openjdk/8010939-logmanager_deadlock.patch \
+	patches/openjdk/8011990-logger_test_urls.patch \
+	patches/openjdk/8013380-logger_stack_walk_glassfish.patch \
+	patches/openjdk/8014745-logger_stack_walk_switch.patch \
+	patches/openjdk/8012243-serial_regression.patch \
+	patches/openjdk/8014718-remove_logging_suntoolkit.patch \
+	patches/openjdk/8011139-revise_checking_getenclosingclass.patch \
+	patches/openjdk/8017196-ensure_proxies_are_handled_appropriately-jdk.patch \
+	patches/openjdk/8017287-better_resource_disposal.patch \
+	patches/openjdk/8017291-cast_proxies_aside.patch \
+	patches/openjdk/7146431-java.security_files.patch \
+	patches/openjdk/8006882-jmockit.patch \
+	patches/openjdk/8000450-restrict_access.patch \
+	patches/openjdk/8019979-better_access_test.patch \
+	patches/openjdk/8004188-rename_java.security.patch \
+	patches/openjdk/8017566-backout_part_of_8000450.patch \
+	patches/openjdk/8017300-improve_interface_implementation.patch \
+	patches/openjdk/8019292-better_attribute_value_exceptions.patch \
+	patches/openjdk/8019617-better_view_of_objects.patch \
+	patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch \
+	patches/openjdk/8020293-jvm_crash.patch \
+	patches/openjdk/8013739-better_ldap_resource_management.patch \
+	patches/openjdk/8014349-getdeclaredclass_fix.patch \
+	patches/openjdk/6954275-big_xml_signatures.patch \
+	patches/openjdk/8021290-signature_validation.patch \
+	patches/openjdk/8012453-runtime.exec.patch \
+	patches/openjdk/8015965-typo_in_property_name.patch \
+	patches/openjdk/8015144-performance_regression.patch \
+	patches/openjdk/8019969-inet6_test_case_fix.patch \
+	patches/openjdk/8019584-invalid_notification_fix.patch \
+	patches/openjdk/8021577-bean_serialization_fix.patch \
+	patches/openjdk/8021969-jnlp_load_failure.patch \
+	patches/openjdk/8021355-splashscreen_regression.patch \
+	patches/openjdk/8022661-writeobject_flush.patch \
+	patches/openjdk/8023964-ignore_test.patch \
+	patches/openjdk/8003992-embedded_nulls.patch \
+	patches/openjdk/8013827-createtempfile_hang.patch \
+	patches/openjdk/8025128-createtempfile_absolute_prefix.patch \
+	patches/openjdk/oj6-21-overrides.patch
 
 SPECIAL_SECURITY_PATCH_1 = patches/security/20120214/7112642.patch
 SPECIAL_SECURITY_PATCH_2 = patches/security/20130618/8009071-improve_shape_handling.patch
@@ -636,13 +735,9 @@
 	patches/openjdk/8011154-awt_regression.patch \
 	patches/openjdk/8011992-MlibOpsTest_failed.patch \
 	patches/openjdk/8012112-MlibOpsTest_fails.patch \
-	patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch \
 	patches/openjdk/8012933-appcontext_disposed_too_early.patch \
 	patches/openjdk/8013196-timezone_getdefault_throws_exception.patch \
 	patches/openjdk/8014427-raster_regression.patch \
-	patches/openjdk/8010727-empty_logger_name.patch \
-	patches/openjdk/8010939-logmanager_deadlock.patch \
-	patches/openjdk/8014718-remove_logging_suntoolkit.patch \
 	patches/openjdk/8009996-emitter_bean.patch \
 	patches/openjdk/6541350-tz_display_names_l10n.patch \
 	patches/openjdk/6821191-tz_display_names_l10n.patch \
@@ -664,7 +759,6 @@
 	patches/openjdk/8020054-tzdata2013d.patch \
 	patches/openjdk/6840152-jvm_crashes_with_heavyweight_monitors.patch \
 	patches/openjdk/7022999-fastlocking_compiler1_only.patch \
-	patches/openjdk/7196533-timezone_bottleneck.patch \
 	patches/openjdk/6636370-appcontext_simplification.patch \
 	patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch \
 	patches/imageiojpeg_sync.patch \
diff -r 5fb5a0032329 -r d667440f2973 NEWS
--- a/NEWS	Sat Sep 07 04:25:38 2013 +0100
+++ b/NEWS	Thu Oct 31 00:22:07 2013 +0000
@@ -13,6 +13,124 @@
 
 New in release 1.11.14 (2013-10-XX):
 
+* Security fixes
+  - S8006900, CVE-2013-3829: Add new date/time capability
+  - S8008589: Better MBean permission validation
+  - S8011071, CVE-2013-5780: Better crypto provider handling
+  - S8011081, CVE-2013-5772: Improve jhat
+  - S8011157, CVE-2013-5814: Improve CORBA portablility
+  - S8012071, CVE-2013-5790: Better Building of Beans
+  - S8012147: Improve tool support
+  - S8012277: CVE-2013-5849: Improve AWT DataFlavor
+  - S8012425, CVE-2013-5802: Transform TransformerFactory
+  - S8013503, CVE-2013-5851: Improve stream factories
+  - S8013506: Better Pack200 data handling
+  - S8013510, CVE-2013-5809: Augment image writing code
+  - S8013514: Improve stability of cmap class
+  - S8013739, CVE-2013-5817: Better LDAP resource management
+  - S8013744, CVE-2013-5783: Better tabling for AWT
+  - S8014085: Better serialization support in JMX classes
+  - S8014093, CVE-2013-5782: Improve parsing of images
+  - S8014102, CVE-2013-5778: Improve image conversion
+  - S8014341, CVE-2013-5803: Better service from Kerberos servers
+  - S8014349, CVE-2013-5840: (cl) Class.getDeclaredClass problematic in some class loader configurations
+  - S8014530, CVE-2013-5825: Better digital signature processing
+  - S8014534: Better profiling support
+  - S8014987, CVE-2013-5842: Augment serialization handling
+  - S8015614: Update build settings
+  - S8015731: Subject java.security.auth.subject to improvements
+  - S8015743, CVE-2013-5774: Address internet addresses
+  - S8016256: Make finalization final
+  - S8016653, CVE-2013-5804: javadoc should ignore ignoreable characters in names
+  - S8016675, CVE-2013-5797: Make Javadoc pages more robust
+  - S8017196, CVE-2013-5850: Ensure Proxies are handled appropriately
+  - S8017287, CVE-2013-5829: Better resource disposal
+  - S8017291, CVE-2013-5830: Cast Proxies Aside
+  - S8017298, CVE-2013-4002: Better XML support
+  - S8017300, CVE-2013-5784: Improve Interface Implementation
+  - S8017505, CVE-2013-5820: Better Client Service
+  - S8019292: Better Attribute Value Exceptions
+  - S8019617: Better view of objects
+  - S8020293: JVM crash
+  - S8021290, CVE-2013-5823: Better signature validation
+  - S8022940: Enhance CORBA translations
+  - S8023683: Enhance class file parsing
+* Backports
+  - S4075303: Use javap to enquire about a specific inner class
+  - S4111861: static final field contents are not displayed
+  - S4348375: Javap is not internationalized
+  - S4459541: "javap -l" shows line numbers as signed short; they should be unsigned
+  - S4501660: change diagnostic of -help as 'print this help message and exit'
+  - S4501661: disallow mixing -public, -private, and -protected options at the same time
+  - S4776241: unused source file in javap...
+  - S4870651: javap should recognize generics, varargs, enum
+  - S4876942: javap invoked without args does not print help screen
+  - S4880663: javap could output whitespace between class name and opening brace
+  - S4884240: additional option required for javap
+  - S4975569: javap doesn't print new flag bits
+  - S6271787: javap dumps LocalVariableTypeTable attribute in hex, needs to print a table
+  - S6305779: javap: support annotations
+  - S6439940: Clean up javap implementation
+  - S6469569: wrong check of searchpath in JavapEnvironment
+  - S6474890: javap does not open .zip files in -classpath
+  - S6587786: Javap throws error : "ERROR:Could not find <classname>" for JRE classes
+  - S6622215: javap ignores certain relevant access flags
+  - S6622216: javap names some attributes incorrectly
+  - S6622232: javap gets whitespace confused
+  - S6622260: javap prints negative bytes incorrectly in hex
+  - S6708729: update jdk Makefiles for new javap
+  - S6715767: javap on java.lang.ClassLoader crashes
+  - S6819246: improve support for decoding instructions in classfile library
+  - S6824493: experimental support for additional info for instructions
+  - S6841419: classfile: add constant pool iterator
+  - S6841420: classfile: add new methods to ConstantClassInfo
+  - S6843013: missing files in fix for 6824493
+  - S6852856: javap changes to facilitate subclassing javap for variants
+  - S6867671: javap whitespace formatting issues
+  - S6868539: javap should use current names for constant pool tags
+  - S6902264: fix indentation of tableswitch and lookupswitch
+  - S6954275: XML signatures with reference data larger 16KB and cacheRef on fails to validate
+  - S7146431: java.security files out-of-sync
+   -S8000450: Restrict access to com/sun/corba/se/impl package
+  - S8002070: Remove the stack search for a resource bundle for Logger to use
+  - S8003992: File and other classes in java.io do not handle embedded nulls properly
+  - S8004188: Rename src/share/lib/security/java.security to java.security-linux
+  - S8006882: Proxy generated classes in sun.proxy package breaks JMockit
+  - S8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive
+  - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance
+  - S8010939: Deadlock in LogManager
+  - S8011139: (reflect) Revise checking in getEnclosingClass
+  - S8011950: java.io.File.createTempFile enters infinite loop when passed invalid data
+  - S8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails on Windows
+  - S8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21
+  - S8012453: (process) Runtime.exec(String) fails if command contains spaces [win]
+  - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer
+  - S8013380: Removal of stack walk to find resource bundle breaks Glassfish startup
+  - S8013827: File.createTempFile hangs with temp file starting with 'com1.4'
+  - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10
+  - S8014745: Provide a switch to allow stack walk search of resource bundle
+  - S8015144: Performance regression in ICU OpenType Layout library
+  - S8015965: (process) Typo in name of property to allow ambiguous commands
+  - S8015978: Incorrect transformation of XPath expression "string(-0)"
+  - S8016357: Update hotspot diagnostic class
+  - S8017566: Backout 8000450 - Cannot access to com.sun.corba.se.impl.orb.ORBImpl
+  - S8019584: javax/management/remote/mandatory/loading/MissingClassTest.java failed in nightly against jdk7u45: java.io.InvalidObjectException: Invalid notification: null
+  - S8019969: nioNetworkChannelInet6/SetOptionGetOptionTestInet6 test case crashes
+  - S8019979: Replace CheckPackageAccess test with better one from closed repo
+  - S8021355: REGRESSION: Five closed/java/awt/SplashScreen tests fail since 7u45 b01 on Linux, Solaris
+  - S8021366: java_util/Properties/PropertiesWithOtherEncodings fails during 7u45 nightly testing
+  - S8021577: JCK test api/javax_management/jmx_serial/modelmbean/ModelMBeanNotificationInfo/serial/index.html#Input has failed since jdk 7u45 b01
+  - S8021933: Add extra check for fix # JDK-8014530
+  - S8021969: The index_AccessAllowed jnlp can not load successfully with exception thrown in the log.
+  - S8022661: InetAddress.writeObject() performs flush() on object output stream
+  - S8022682: Supporting XOM
+  - S8023964: java/io/IOException/LastErrorString.java should be @ignore-d
+  - S8024914: Swapped usage of idx_t and bm_word_t types in bitMap.inline.hpp
+  - S8025128: File.createTempFile fails if prefix is absolute path
+  - OJ19: Fix test cases from 8010118 to work with OpenJDK 6
+  - OJ20: Resolve merge issues with JAXP security fixes
+  - OJ21: Remove @Override annotation added on interface by 2013/10/15 security fixes
+
 New in release 1.11.13 (2013-09-06):
 
 * Backports
diff -r 5fb5a0032329 -r d667440f2973 patches/ecj/bootver.patch
--- a/patches/ecj/bootver.patch	Sat Sep 07 04:25:38 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-diff -r b6701047e287 make/common/shared/Platform.gmk
---- openjdk-ecj.orig/jdk/make/common/shared/Platform.gmk	Sat Jun 12 00:15:32 2010 +0100
-+++ openjdk-ecj/jdk/make/common/shared/Platform.gmk	Sun Jun 13 23:54:02 2010 +0100
-@@ -88,8 +88,8 @@
- 
- SYSTEM_UNAME := $(shell uname)
- 
--# Normal boot jdk is previous release, but a hard requirement is a 1.6 boot
--REQUIRED_BOOT_VER = 1.6
-+# Normal boot jdk is previous release, but a hard requirement is a 1.5 boot
-+REQUIRED_BOOT_VER = 1.5
- 
- # If we are using freetype, this is the required version
- REQUIRED_FREETYPE_VERSION=2.3.0
diff -r 5fb5a0032329 -r d667440f2973 patches/jtreg-LastErrorString.patch
--- a/patches/jtreg-LastErrorString.patch	Sat Sep 07 04:25:38 2013 +0100
+++ b/patches/jtreg-LastErrorString.patch	Thu Oct 31 00:22:07 2013 +0000
@@ -1,16 +1,15 @@
-diff -Nru IOException/LastErrorString.java /home/brq/ptisnovs/IOException/LastErrorString.java
---- openjdk-old/jdk/test/java/io/IOException/LastErrorString.java	2011-01-21 00:54:47.000000000 +0100
-+++ openjdk/jdk/test/java/io/IOException/LastErrorString.java	2011-02-21 15:34:58.972481000 +0100
-@@ -21,9 +21,13 @@
-  * questions.
+diff -Nru openjdk.orig/jdk/test/java/io/IOException/LastErrorString.java openjdk/jdk/test/java/io/IOException/LastErrorString.java
+--- openjdk.orig/jdk/test/java/io/IOException/LastErrorString.java	2013-10-29 09:39:12.978000311 +0000
++++ openjdk/jdk/test/java/io/IOException/LastErrorString.java	2013-10-29 09:41:26.024030445 +0000
+@@ -22,9 +22,12 @@
   */
  
--/* @test
--   @bug 4167937
+ /* @test
+-   @bug 4167937 8023964
+-   @ignore Test truncates system files when run as root, see 7042603
 -   @summary Test code paths that use the JVM_LastErrorString procedure
-+/*
-+ * @test
-+ * @bug 4167937
++ * @bug 4167937 8023964
++ * @ignore Test truncates system files when run as root, see 7042603
 + * @summary Test code paths that use the JVM_LastErrorString procedure
 + *
 + * @compile LastErrorString.java
@@ -18,7 +17,7 @@
   */
  
  import java.io.IOException;
-@@ -37,33 +41,11 @@
+@@ -38,33 +41,11 @@
  
      static String UNWRITEABLE_DIR;
      static String UNREADABLE_FILE;
@@ -53,7 +52,7 @@
      static abstract class Test {
  
          String name;
-@@ -197,7 +179,7 @@
+@@ -198,7 +179,7 @@
  
          new Test("FileOutputStream") {
              public void run() throws IOException {
@@ -62,7 +61,7 @@
              }}.go();
  
          new ClosedFOSTest("write()") {
-@@ -257,8 +239,29 @@
+@@ -258,8 +239,29 @@
  
      }
  
@@ -92,9 +91,9 @@
          go();
      }
  
-diff -Nru IOException/LastErrorString.sh /home/brq/ptisnovs/IOException/LastErrorString.sh
---- /dev/null	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/test/java/io/IOException/LastErrorString.sh	2011-02-21 15:34:58.972481000 +0100
+diff -Nru openjdk.orig/jdk/test/java/io/IOException/LastErrorString.sh openjdk/jdk/test/java/io/IOException/LastErrorString.sh
+--- openjdk.orig/jdk/test/java/io/IOException/LastErrorString.sh	1970-01-01 01:00:00.000000000 +0100
++++ openjdk/jdk/test/java/io/IOException/LastErrorString.sh	2013-10-29 09:40:29.223163741 +0000
 @@ -0,0 +1,103 @@
 +#!/bin/sh
 +
diff -r 5fb5a0032329 -r d667440f2973 patches/nss-config.patch
--- a/patches/nss-config.patch	Sat Sep 07 04:25:38 2013 +0100
+++ b/patches/nss-config.patch	Thu Oct 31 00:22:07 2013 +0000
@@ -1,5 +1,5 @@
---- openjdk.orig/jdk/src/share/lib/security/java.security	2009-08-25 11:43:59.000000000 +0100
-+++ openjdk/jdk/src/share/lib/security/java.security		2009-08-27 14:23:54.000000000 +0100
+--- openjdk.orig/jdk/src/share/lib/security/java.security-linux		2009-08-25 11:43:59.000000000 +0100
++++ openjdk/jdk/src/share/lib/security/java.security-linux		2009-08-27 14:23:54.000000000 +0100
 @@ -51,6 +51,7 @@
  security.provider.6=com.sun.security.sasl.Provider
  security.provider.7=org.jcp.xml.dsig.internal.dom.XMLDSigRI
diff -r 5fb5a0032329 -r d667440f2973 patches/openjdk/4075303-javap_update.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/4075303-javap_update.patch	Thu Oct 31 00:22:07 2013 +0000
@@ -0,0 +1,12081 @@
+# HG changeset patch
+# User jjg
+# Date 1382400229 -3600
+#      Tue Oct 22 01:03:49 2013 +0100
+# Node ID bfd7bb4218253bac4f57abbc90b987f16e4b7f6c
+# Parent  8e38c8fe0a0beaef943e754071be0358c34e76dd
+4075303: Use javap to enquire about a specific inner class
+4348375: Javap is not internationalized
+4459541: "javap -l" shows line numbers as signed short; they should be unsigned
+4501660: change diagnostic of -help as 'print this help message and exit'
+4776241: unused source file in javap...
+4870651: javap should recognize generics, varargs, enum
+4876942: javap invoked without args does not print help screen
+4880663: javap could output whitespace between class name and opening brace
+4975569: javap doesn't print new flag bits
+6271787: javap dumps LocalVariableTypeTable attribute in hex, needs to print a table
+6305779: javap: support annotations
+6439940: Clean up javap implementation
+6469569: wrong check of searchpath in JavapEnvironment
+6474890: javap does not open .zip files in -classpath

From omajid at redhat.com  Thu Oct 31 09:26:30 2013
From: omajid at redhat.com (Omair Majid)
Date: Thu, 31 Oct 2013 12:26:30 -0400
Subject: Small refactoring in searching for attributes
In-Reply-To: <52713F62.10302@redhat.com>
References: <526A4532.4000401@redhat.com> <20131026135310.GA1983@redhat.com>
	<5270EA06.70009@redhat.com> <20131030161958.GB1540@redhat.com>
	<527138B4.7040204@redhat.com> <20131030165828.GD1540@redhat.com>
	<52713F62.10302@redhat.com>
Message-ID: <20131031162630.GC1546@redhat.com>

* Jiri Vanek <jvanek at redhat.com> [2013-10-30 13:18]:
> +++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java	Wed Oct 30 18:09:13 2013 +0100

> +        File jarLocation5 = new File(tempDirectory, "test5.jar");
> +
> +        /* Test with various attributes in manifest!s! */ {
> +            Manifest manifest1 = new Manifest();

Something in the indentation still looks wrong here.

Thanks,
Omair

From jvanek at redhat.com  Thu Oct 31 09:58:36 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Thu, 31 Oct 2013 17:58:36 +0100
Subject: [rfc][icedtea-web] synced headers between PLUGIN_ERROR, PLUGIN_DEBUG
	and java
Message-ID: <52728C3C.2010302@redhat.com>

ais
-------------- next part --------------
A non-text attachment was scrubbed...
Name: moreSyncedHeaders.patch
Type: text/x-patch
Size: 4345 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131031/1edb618d/moreSyncedHeaders.patch 

From jvanek at redhat.com  Thu Oct 31 10:02:07 2013
From: jvanek at redhat.com (Jiri Vanek)
Date: Thu, 31 Oct 2013 18:02:07 +0100
Subject: Small refactoring in searching for attributes
In-Reply-To: <20131031162630.GC1546@redhat.com>
References: <526A4532.4000401@redhat.com> <20131026135310.GA1983@redhat.com>
	<5270EA06.70009@redhat.com> <20131030161958.GB1540@redhat.com>
	<527138B4.7040204@redhat.com>
	<20131030165828.GD1540@redhat.com> <52713F62.10302@redhat.com>
	<20131031162630.GC1546@redhat.com>
Message-ID: <52728D0F.5090503@redhat.com>

On 10/31/2013 05:26 PM, Omair Majid wrote:
> * Test with various attributes in manifest!s! */ {

Actually it was not, there was bracket bahind comment, so indentation was correct. However I removed 
this useless bracket.

Thanx for sharp eyes of yours!


J.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: testForSearchForAttribute4.patch
Type: text/x-patch
Size: 11285 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20131031/9ed5c38e/testForSearchForAttribute4.patch 

From omajid at redhat.com  Thu Oct 31 11:10:52 2013
From: omajid at redhat.com (Omair Majid)
Date: Thu, 31 Oct 2013 14:10:52 -0400
Subject: [rfc][icedtea-web] synced headers between PLUGIN_ERROR,
	PLUGIN_DEBUG and java
In-Reply-To: <52728C3C.2010302@redhat.com>
References: <52728C3C.2010302@redhat.com>
Message-ID: <20131031181052.GD1546@redhat.com>

Hi Jiri,

* Jiri Vanek <jvanek at redhat.com> [2013-10-31 13:12]:
> diff -r 14a8ee171687 netx/net/sourceforge/jnlp/util/logging/OutputController.java
> --- a/netx/net/sourceforge/jnlp/util/logging/OutputController.java	Wed Oct 30 10:36:03 2013 +0100
> +++ b/netx/net/sourceforge/jnlp/util/logging/OutputController.java	Thu Oct 31 17:57:00 2013 +0100
> @@ -346,6 +346,7 @@
>              if (stack != null) {
>                  sb.append('[').append(getCallerClass(stack)).append(']');
>              }
> +            sb.append(" NETX Thread# ").append(Integer.toHexString(((Object)Thread.currentThread()).hashCode())).append(", name ").append(Thread.currentThread().getName());

Some nits, here.

You probably don't need to cast Thread.currentThread() to Object,
hashCode is defined on all types.

The output of this will be NETX Thread# 0x<ThreadID>, name <Thread Name>.
Maybe it would be more readable as:

NETX Thread 0x<Thread Id> [<Thread Name>]

Please consider appropriate line-wrapping. Something like this is a
little easier to read:

    sb.append(" NETX Thread#")
      .append(Integer.toHexString(((Object)Thread.currentThread()).hashCode()))
      .append(", name ")
      .append(Thread.currentThread.getName());

I am far from an expert on C++, so take the next bit of advice with a
grain of salt.

> +++ b/plugin/icedteanp/IcedTeaPluginUtils.h	Thu Oct 31 17:57:00 2013 +0100

> +#define CREATE_HEADER(f)                                     \

Please document f. Is it a FILE*, a char*, or a fd?

> +  do                                                         \
> +  {                                                          \
> +	char s[200];                                             \
> +    time_t t = time(NULL);                                   \
> +    struct tm * p = localtime(&t);                           \

If you are expecting to have multiple threads run this code, please use
_r variants of function calls (localtime_r). These non-_r variants use
static data and are not thread safe.

Cheers,
Omair

From omajid at redhat.com  Thu Oct 31 11:47:43 2013
From: omajid at redhat.com (Omair Majid)
Date: Thu, 31 Oct 2013 14:47:43 -0400
Subject: Small refactoring in searching for attributes
In-Reply-To: <52728D0F.5090503@redhat.com>
References: <526A4532.4000401@redhat.com> <20131026135310.GA1983@redhat.com>
	<5270EA06.70009@redhat.com> <20131030161958.GB1540@redhat.com>
	<527138B4.7040204@redhat.com> <20131030165828.GD1540@redhat.com>
	<52713F62.10302@redhat.com> <20131031162630.GC1546@redhat.com>
	<52728D0F.5090503@redhat.com>
Message-ID: <20131031184742.GF1546@redhat.com>

* Jiri Vanek <jvanek at redhat.com> [2013-10-31 13:02]:
> On 10/31/2013 05:26 PM, Omair Majid wrote:
> >* Test with various attributes in manifest!s! */ {
> 
> Actually it was not, there was bracket bahind comment, so
> indentation was correct. However I removed this useless bracket.

New patch looks good to me.

Cheers,
Omair

From luto at amacapital.net  Fri Oct 18 11:15:09 2013
From: luto at amacapital.net (Andy Lutomirski)
Date: Fri, 18 Oct 2013 18:15:09 -0000
Subject: Web start sandboxing and security
Message-ID: <CALCETrV6yytof5Kr-HUOwAXjpcgNYBX4592zTiFQtk1X1Y0B3w@mail.gmail.com>

This is an attempt to turn bug #1264
(http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1264) into a
real discussion.

When I start a Java Web Start app, I get asked "Do you want to run the
application?" means.  It is far from obvious what that means.  I
researched it a bit, and AFAICT it means: if the application is signed
(by anyone at all), then run it with full permissions; if the
application is unsigned, then run it sandboxed.

This is an awful state of affairs.  For one thing, it means that I'd
rather run an unsigned app than a signed app -- just because I believe
that a certain company wrote the app does *not* mean that I want to
trust that app with full rights to my computer.

There are several improvements that could be made:

1. The dialog box could be much clearer.  It could say "Do you want to
grant this application unrestricted access to your computer?" in the
signed case and "Do you want to run this application?  It will not
have access to your data." in the unsigned case.

2. Even if the app is signed, there should still be a way to run it in
the sandbox.  I've yet to encounter a JNLP app in the wild that has
any legitimate reason to do anything other than access the internet,
create some temporary files, and occasionally use the file picker.
Let me run it in the sandbox, please.

Every modern application deployment system (Android, the new GNOME
thing, and to a more limited extent Metro and iOS) has sensible, if
minimally configurable, sandboxing.  Java has had the ability to do
this for decades.  Please enable it in some sensible manner.


Thanks,
Andy