From ptisnovs at icedtea.classpath.org Mon Jan 2 05:26:21 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 02 Jan 2012 13:26:21 +0000 Subject: /hg/gfx-test: 2012-01-02 Pavel Tisnovsky Message-ID: changeset 26efcf025825 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=26efcf025825 author: Pavel Tisnovsky date: Mon Jan 02 14:27:23 2012 +0100 2012-01-02 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java: Added five new tests to this test case. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java | 125 +++++++++++- 2 files changed, 127 insertions(+), 3 deletions(-) diffs (189 lines): diff -r e42aff9d3457 -r 26efcf025825 ChangeLog --- a/ChangeLog Fri Dec 23 12:49:45 2011 +0100 +++ b/ChangeLog Mon Jan 02 14:27:23 2012 +0100 @@ -1,3 +1,8 @@ +2012-01-02 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java: + Added five new tests to this test case. + 2011-12-23 Pavel Tisnovsky * src/org/gfxtest/framework/CommonRenderingStyles.java: diff -r e42aff9d3457 -r 26efcf025825 src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java --- a/src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java Fri Dec 23 12:49:45 2011 +0100 +++ b/src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java Mon Jan 02 14:27:23 2012 +0100 @@ -40,6 +40,7 @@ package org.gfxtest.testsuites; +import java.awt.BasicStroke; import java.awt.Graphics2D; @@ -627,7 +628,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipLinePathByRectangleAreaDashedStroke(TestImage image, Graphics2D graphics2d) + public TestResult testClipLinePathByRectangleAreaDashedStrokePaint(TestImage image, Graphics2D graphics2d) { // render clip rectangle CommonClippingOperations.renderClipRectangle(image, graphics2d); @@ -640,6 +641,28 @@ } /** + * Check if closed path could be clipped by a rectangle area. Path is + * rendered using stroke paint with default stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipClosedPathByRectangleAreaDashedStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set dashed pattern + CommonRenderingStyles.setDashedStrokePattern(graphics2d); + // set clip region and draw the path + drawClosedPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** * Check if line path could be clipped by a rectangle area. Path is * rendered using stroke paint with thick stroke width. * @@ -649,7 +672,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipLinePathByRectangleAreaDashedThickStroke(TestImage image, Graphics2D graphics2d) + public TestResult testClipLinePathByRectangleAreaDashedThickStrokePaint(TestImage image, Graphics2D graphics2d) { // render clip rectangle CommonClippingOperations.renderClipRectangle(image, graphics2d); @@ -664,6 +687,30 @@ } /** + * Check if closed path could be clipped by a rectangle area. Path is + * rendered using stroke paint with thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipClosedPathByRectangleAreaDashedThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d); + // set dashed pattern + CommonRenderingStyles.setDashedStrokePattern(graphics2d); + // set clip region and draw the path + drawClosedPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** * Check if line path could be clipped by a rectangle area. Path is * rendered using stroke paint with thick stroke width. * @@ -673,7 +720,7 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipLinePathByRectangleAreaDashedExtraThickStroke(TestImage image, Graphics2D graphics2d) + public TestResult testClipLinePathByRectangleAreaDashedExtraThickStrokePaint(TestImage image, Graphics2D graphics2d) { // render clip rectangle CommonClippingOperations.renderClipRectangle(image, graphics2d); @@ -688,6 +735,78 @@ } /** + * Check if closed path could be clipped by a rectangle area. Path is + * rendered using stroke paint with thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipClosedPathByRectangleAreaDashedExtraThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeExtraThickWidth(graphics2d); + // set dashed pattern + CommonRenderingStyles.setDashedStrokePatternForExtraThickPaths(graphics2d); + // set clip region and draw the path + drawClosedPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if line path could be clipped by a rectangle area. Path is rendered + * using stroke paint with thick stroke width and using round cap style. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipLinePathByRectangleAreaDottedStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d, BasicStroke.CAP_ROUND); + // set dashed pattern + CommonRenderingStyles.setDashedStrokePattern(graphics2d, new float[] {1,20}); + // set clip region and draw the path + drawLinePathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if closed path could be clipped by a rectangle area. Path is rendered + * using stroke paint with thick stroke width and using round cap style. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipClosedPathByRectangleAreaDottedStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d, BasicStroke.CAP_ROUND); + // set dashed pattern + CommonRenderingStyles.setDashedStrokePattern(graphics2d, new float[] {1,20}); + // set clip region and draw the path + drawClosedPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** * Entry point to the test suite. * * @param args From bugzilla-daemon at icedtea.classpath.org Mon Jan 2 10:00:24 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 02 Jan 2012 18:00:24 +0000 Subject: [Bug 845] New: Plugin not working with Chromium and Brazilian bank "Banco do Brasil" site Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=845 Bug #: 845 Summary: Plugin not working with Chromium and Brazilian bank "Banco do Brasil" site Classification: Unclassified Product: IcedTea-Web Version: unspecified Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: Plugin AssignedTo: dbhole at redhat.com ReportedBy: naoliv at gmail.com CC: unassigned at icedtea.classpath.org Created attachment 629 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=629 Page that should be displayed when Java is correctly detected Hi! After migrating from Sun java plugin (version 6.26, Debian's package 6.26-3) to icedtea plugin (Debian's 1.1.4-1; openjdk is Debian's 6b24~pre2-1) I started to have issues with Chromium + an important Brazilian bank (Banco do Brasil). Login page for the bank is https://www2.bancobrasil.com.br/aapf/login.jsp?aapf.IDH=sim&perfil=1 Attached is a both a page that should be seen (working.png) and the page that is being displayed (not-working.png). The not-working image basically says that it was not possible to install the security module and that it's necessary to have Java installed on the computer. It has been tested on two different machines (one amd64 and one i386) with Chromium versions 15.0.874.121 and 16.0.912.63. Note that it works on the same systems with Iceweasel (tested with alpha versions 10.0 and 11.0). When the plugin is properly detected and the page loaded it creates two files in the users directory (~/.gbas.so and ~/.gbas.so_u). I can attach them if needed. I can also provide more info where needed and test patches if necessary. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Mon Jan 2 10:01:11 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 02 Jan 2012 18:01:11 +0000 Subject: [Bug 845] Plugin not working with Chromium and Brazilian bank "Banco do Brasil" site In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=845 --- Comment #1 from Nelson A. de Oliveira 2012-01-02 18:01:11 UTC --- Created attachment 630 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=630 Page that is displayed with Chromium + icedtea plugin (saying that Java was not detected) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Mon Jan 2 10:20:15 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 02 Jan 2012 18:20:15 +0000 Subject: [Bug 845] Plugin not working with Chromium and Brazilian bank "Banco do Brasil" site In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=845 --- Comment #2 from Nelson A. de Oliveira 2012-01-02 18:20:15 UTC --- Created attachment 631 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=631 JAR file from ~/.icedtea/cache when properly loaded in Iceweasel -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From doko at ubuntu.com Mon Jan 2 23:18:20 2012 From: doko at ubuntu.com (Matthias Klose) Date: Tue, 03 Jan 2012 08:18:20 +0100 Subject: Reviewer needed: Use of correct path to excludelist.jdk.jtx in IcedTea6 HEAD In-Reply-To: <4EF4AED0.3080303@redhat.com> References: <4EF4AED0.3080303@redhat.com> Message-ID: <4F02ABBC.8010208@ubuntu.com> On 12/23/2011 05:39 PM, Pavel Tisnovsky wrote: > Hi, > > here's another attempt to fix "absolute/relative JTreg path" issue. It's based > on Andrew's and Matthias's suggestion (TYVM) and it's been tested for target: > > make check -k > and > make dist > too (in case of "make dist" the tarball contains "src/jtreg" directory too). > > > Changelog entry: > > 2011-12-23 Pavel Tisnovsky > > * Makefile.am: Fixed path to excludelist.jdk.jtx > file containing black list of JDK JTreg tests. > > > Could anybody please review this change I'd like to push to IcedTea6 HEAD? looks fine, both make dist & the checks do work for me. From ptisnovs at icedtea.classpath.org Tue Jan 3 03:27:25 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 03 Jan 2012 11:27:25 +0000 Subject: /hg/gfx-test: 2012-01-03 Pavel Tisnovsky Message-ID: changeset 4a93bf078e59 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=4a93bf078e59 author: Pavel Tisnovsky date: Tue Jan 03 12:29:49 2012 +0100 2012-01-03 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingPathByEllipseShape.java: Added 15 new tests. * src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java: Fixed tests which renders various shapes using zero-wide stroke. diffstat: ChangeLog | 7 + src/org/gfxtest/testsuites/ClippingPathByEllipseShape.java | 360 ++++++++++++ src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java | 20 + 3 files changed, 387 insertions(+), 0 deletions(-) diffs (442 lines): diff -r 26efcf025825 -r 4a93bf078e59 ChangeLog --- a/ChangeLog Mon Jan 02 14:27:23 2012 +0100 +++ b/ChangeLog Tue Jan 03 12:29:49 2012 +0100 @@ -1,3 +1,10 @@ +2012-01-03 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingPathByEllipseShape.java: + Added 15 new tests. + * src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java: + Fixed tests which renders various shapes using zero-wide stroke. + 2012-01-02 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java: diff -r 26efcf025825 -r 4a93bf078e59 src/org/gfxtest/testsuites/ClippingPathByEllipseShape.java --- a/src/org/gfxtest/testsuites/ClippingPathByEllipseShape.java Mon Jan 02 14:27:23 2012 +0100 +++ b/src/org/gfxtest/testsuites/ClippingPathByEllipseShape.java Tue Jan 03 12:29:49 2012 +0100 @@ -278,6 +278,366 @@ } /** + * Check if line path could be clipped by an ellipse shape. Path is rendered + * using stroke paint with thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipLinePathByEllipseShapeThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render ellipse which is used as a clip shape + CommonClippingOperations.renderClipEllipse(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d); + // set clip region and draw the path + drawLinePathClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if quadratic Bezier path could be clipped by an ellipse shape. Path + * is rendered using stroke paint with thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipQuadraticPathByEllipseShapeThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render ellipse which is used as a clip shape + CommonClippingOperations.renderClipEllipse(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d); + // set clip region and draw the path + drawQuadraticPathClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if cubic Bezier path could be clipped by an ellipse shape. Path + * is rendered using stroke paint with thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCubicPathByEllipseShapeThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render ellipse which is used as a clip shape + CommonClippingOperations.renderClipEllipse(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d); + // set clip region and draw the path + drawCubicPathClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if closed path could be clipped by an ellipse shape. Path + * is rendered using stroke paint with thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipClosedPathByEllipseShapeThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render ellipse which is used as a clip shape + CommonClippingOperations.renderClipEllipse(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d); + // set clip region and draw the path + drawClosedPathClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if crossed closed path could be clipped by an ellipse shape. Path + * is rendered using stroke paint with thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCrossedClosedPathByEllipseShapeThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render ellipse which is used as a clip shape + CommonClippingOperations.renderClipEllipse(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d); + // set clip region and draw the path + drawCrossedPathClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if line path could be clipped by an ellipse shape. Path is rendered + * using stroke paint with extra thick width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipLinePathByEllipseShapeExtraThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render ellipse which is used as a clip shape + CommonClippingOperations.renderClipEllipse(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeExtraThickWidth(graphics2d); + // set clip region and draw the path + drawLinePathClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if quadratic Bezier path could be clipped by an ellipse shape. Path + * is rendered using stroke paint with extra thick width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipQuadraticPathByEllipseShapeExtraThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render ellipse which is used as a clip shape + CommonClippingOperations.renderClipEllipse(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeExtraThickWidth(graphics2d); + // set clip region and draw the path + drawQuadraticPathClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if cubic Bezier path could be clipped by an ellipse shape. Path + * is rendered using stroke paint with extra thick width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCubicPathByEllipseShapeExtraThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render ellipse which is used as a clip shape + CommonClippingOperations.renderClipEllipse(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeExtraThickWidth(graphics2d); + // set clip region and draw the path + drawCubicPathClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if closed path could be clipped by an ellipse shape. Path + * is rendered using stroke paint with extra thick width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipClosedPathByEllipseShapeExtraThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render ellipse which is used as a clip shape + CommonClippingOperations.renderClipEllipse(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeExtraThickWidth(graphics2d); + // set clip region and draw the path + drawClosedPathClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if crossed closed path could be clipped by an ellipse shape. Path + * is rendered using stroke paint with extra thick width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCrossedClosedPathByEllipseShapeExtraThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render ellipse which is used as a clip shape + CommonClippingOperations.renderClipEllipse(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeExtraThickWidth(graphics2d); + // set clip region and draw the path + drawCrossedPathClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if line path could be clipped by an ellipse shape. Path is rendered + * using stroke paint with zero width stroke. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipLinePathByEllipseShapeZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render ellipse which is used as a clip shape + CommonClippingOperations.renderClipEllipse(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // set clip region and draw the path + drawLinePathClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if quadratic Bezier path could be clipped by an ellipse shape. Path + * is rendered using stroke paint with zero width stroke. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipQuadraticPathByEllipseShapeZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render ellipse which is used as a clip shape + CommonClippingOperations.renderClipEllipse(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // set clip region and draw the path + drawQuadraticPathClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if cubic Bezier path could be clipped by an ellipse shape. Path + * is rendered using stroke paint with zero width stroke. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCubicPathByEllipseShapeZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render ellipse which is used as a clip shape + CommonClippingOperations.renderClipEllipse(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // set clip region and draw the path + drawCubicPathClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if closed path could be clipped by an ellipse shape. Path + * is rendered using stroke paint with zero width stroke. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipClosedPathByEllipseShapeZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render ellipse which is used as a clip shape + CommonClippingOperations.renderClipEllipse(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // set clip region and draw the path + drawClosedPathClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if crossed closed path could be clipped by an ellipse shape. Path + * is rendered using stroke paint with zero width stroke. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCrossedClosedPathByEllipseShapeZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render ellipse which is used as a clip shape + CommonClippingOperations.renderClipEllipse(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // set clip region and draw the path + drawCrossedPathClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** * Entry point to the test suite. * * @param args diff -r 26efcf025825 -r 4a93bf078e59 src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java --- a/src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java Mon Jan 02 14:27:23 2012 +0100 +++ b/src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java Tue Jan 03 12:29:49 2012 +0100 @@ -292,6 +292,10 @@ { // render clip rectangle CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); // set clip region and draw the path drawLinePathClippedByRectangleArea(image, graphics2d); // test result @@ -312,6 +316,10 @@ { // render clip rectangle CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); // set clip region and draw the path drawQuadraticPathClippedByRectangleArea(image, graphics2d); // test result @@ -332,6 +340,10 @@ { // render clip rectangle CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); // set clip region and draw the path drawCubicPathClippedByRectangleArea(image, graphics2d); // test result @@ -352,6 +364,10 @@ { // render clip rectangle CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); // set clip region and draw the path drawClosedPathClippedByRectangleArea(image, graphics2d); // test result @@ -372,6 +388,10 @@ { // render clip rectangle CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); // set clip region and draw the path drawCrossedClosedPathClippedByRectangleArea(image, graphics2d); // test result From ptisnovs at icedtea.classpath.org Tue Jan 3 03:55:55 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 03 Jan 2012 11:55:55 +0000 Subject: /hg/icedtea6: 2012-01-03 Pavel Tisnovsky Message-ID: changeset 91e9227e579a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=91e9227e579a author: ptisnovs date: Tue Jan 03 13:54:53 2012 +0100 2012-01-03 Pavel Tisnovsky * Makefile.am: Fixed path to excludelist.jdk.jtx file containing black list of JDK JTreg tests. diffstat: ChangeLog | 5 +++++ Makefile.am | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diffs (35 lines): diff -r 95c9b736240d -r 91e9227e579a ChangeLog --- a/ChangeLog Fri Dec 23 14:55:03 2011 +0000 +++ b/ChangeLog Tue Jan 03 13:54:53 2012 +0100 @@ -1,3 +1,8 @@ +2012-01-03 Pavel Tisnovsky + + * Makefile.am: Fixed path to excludelist.jdk.jtx + file containing black list of JDK JTreg tests. + 2011-12-23 Andrew John Hughes * NEWS: Add RH bug number which alerted us to diff -r 95c9b736240d -r 91e9227e579a Makefile.am --- a/Makefile.am Fri Dec 23 14:55:03 2011 +0000 +++ b/Makefile.am Tue Jan 03 13:54:53 2012 +0100 @@ -193,7 +193,9 @@ # Sources list REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java -JTREG_SRCS = $(top_srcdir)/src/jtreg +# Relative path to JTreg tool +JTREG_DIR = src/jtreg +JTREG_SRCS = $(top_srcdir)/$(JTREG_DIR) # Patch list @@ -2177,7 +2179,7 @@ -w:test/jdk/JTwork -r:test/jdk/JTreport \ \ -jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \ - -exclude:$(JTREG_SRCS)/excludelist.jdk.jtx \ + -exclude:$(abs_top_srcdir)/$(JTREG_DIR)/excludelist.jdk.jtx \ $(ICEDTEA_JTREG_OPTIONS) \ `pwd`/openjdk/jdk/test \ | tee test/$@.log From jvanek at redhat.com Tue Jan 3 06:01:39 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 03 Jan 2012 15:01:39 +0100 Subject: IcedTea-Web 1.2 branching In-Reply-To: <20111223193756.GR22758@redhat.com> References: <20111223193756.GR22758@redhat.com> Message-ID: <4F030A43.1070504@redhat.com> On 12/23/2011 08:37 PM, Deepak Bhole wrote: > Hi, > > I would like to branch IcedTea-Web for a rather long due 1.2 release. I > plan to branch on Friday, Jan 6th 2012. > > Please commit any outstanding patches you'd like to see go into 1.2, > before that date. If you don't think there is enough time, let me know > and we can work on a more feasible branch date. > > Cheers, > Deepak If this one is worthy of waiting, than IO would like to push it befor branching. Re: [RFC][icedtea-web] PR833 - icedtea-web is failing when cache is corupted. J. From jvanek at redhat.com Tue Jan 3 06:03:55 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 03 Jan 2012 15:03:55 +0100 Subject: icedtea6 1.11 branching on 2012-01-06 In-Reply-To: <20111225202450.GK22074@rivendell.middle-earth.co.uk> References: <4EF49ECF.7060004@redhat.com> <20111225202450.GK22074@rivendell.middle-earth.co.uk> Message-ID: <4F030ACB.1000502@redhat.com> On 12/25/2011 09:24 PM, Dr Andrew John Hughes wrote: > On 10:31 Fri 23 Dec , Omair Majid wrote: >> Hi all, >> >> As noted elsewhere, a number of important features and fixes have been >> added to icedtea6 that are not in any release. This seems like a good >> time as any to try and get a release out. To that end, I am planning to >> branch icedtea6 1.11 on 2012-01-06. I dont have an exact release date in >> mind right now, but it probably will be at least a week after that. >> >> Once icedtea6 1.11 is branched, only fixes will be accepted. >> >> Please try to get any changes you are working on in by that date. If you >> can't make the date, but you would really like to get your work in, let >> me know and I will see what I can do about pushing the date further back. >> > > Thanks for starting the ball rolling. I've got the backports in that I wanted > to now, so for me, we're good to go with the branch. > >> Thanks, >> Omair > I would like to have "[rfc][icedtea] makefiel part of fix of rhbz 580478" inside. But it is small change and I think it will be done soon following already given advices. J. From ddadacha at redhat.com Tue Jan 3 06:38:58 2012 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Tue, 03 Jan 2012 09:38:58 -0500 Subject: [RFC][icedtea-web] made xsltproc to be checked mandatory tool, instead of ignore its failure In-Reply-To: <4EF0A90A.8080901@redhat.com> References: <4EEA17C8.8060905@redhat.com> <20111219164724.GD752@redhat.com> <4EEF92EE.5000602@redhat.com> <4EF0A90A.8080901@redhat.com> Message-ID: <4F031302.3060109@redhat.com> Sorry for the slow reply! On 20/12/11 10:26 AM, Jiri Vanek wrote: > On 12/19/2011 08:39 PM, Danesh Dadachanji wrote: >> Deepak: Changelog in the email? =) >> >> Jiri: Comments inline. >> On 19/12/11 11:47 AM, Deepak Bhole wrote: >>> * Jiri Vanek [2011-12-15 11:02]: >>>> 2011-12-15 Jiri Vanek >>>> >>>> * configure.ac: added search for xsltproc program and setting >>>> WITH_CSLTPROC variable >>>> * makefile.am: xsltproc result is no longer ignored, command >>>> itself is in conditional block >>>> >> >> ChangeLog indenting looks incorrect. Some (more) typos: > Yes... it seams that emails are changing tabs/spaces somehow magically > on theirs ways. > >> s/WITH_CSLTPROC/WITH_XSLTPROC >> s/makefile.am/Makefile.am > > Thanx for catching them! > > 2011-12-15 Jiri Vanek > > * configure.ac: added search for xsltproc program and setting > WITH_XSLTPROC variable > * Makefile.am: xsltproc result is no longer ignored, command > itself is in conditional block >> >>>> cat stderr.log>&2 >>>> - -xsltproc $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl >>>> $(JNLP_TESTS_ENGINE_DIR)/tests-output.xml> >>>> $(TESTS_DIR)/index_reproducers.html >>>> +if WITH_XSLTPROC >>>> + $(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl >>>> $(JNLP_TESTS_ENGINE_DIR)/tests-output.xml> >>>> $(TESTS_DIR)/index_reproducers.html >>>> +endif >> >> Perhaps for consistency's sake, there should be a ' ; \ ' at the end >> of the cat and $(XSLTPROC) lines (similar to the 'cat stdout...' >> line). I'm pretty sure that building won't make a difference but I've >> had experience where everything with the buildbot complaining and >> failing because of minor syntax. I doubt it will because it did not >> for the -xsltproc line but I don't see the harm in being more precise. =) >> >>>> - cat stderr.log>&2 ; >>>> - -xsltproc $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl >>>> $(NETX_UNIT_TEST_DIR)/tests-output.xml> $(TESTS_DIR)/index_unit.html >>>> + cat stderr.log>&2 >>>> +if WITH_XSLTPROC >>>> + $(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl >>>> $(NETX_UNIT_TEST_DIR)/tests-output.xml> $(TESTS_DIR)/index_unit.html >>>> +endif >> >> Same as above. > > I really want to do it as separate command in this target. I think it is > good idea to keep targets composited from as many separate commands as > possible. It is very useful during debuging. It just stops on corrupted > line and you immediately know.... > But what is more conventional I would like to kept for wiser then me:) > (me believes that as separate commands as possible O:) > Well if it helps with debugging then it might be better to leave it as it is then. This looks good to me, nice work! Regards, Danesh From bugzilla-daemon at icedtea.classpath.org Tue Jan 3 09:33:53 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 03 Jan 2012 17:33:53 +0000 Subject: [Bug 844] SIGSEGV (0xb) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=844 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |dbhole at redhat.com Resolution| |INVALID --- Comment #1 from Deepak Bhole 2012-01-03 17:33:53 UTC --- This is a bug in Eclipse native code: C [libgobject-2.0.so.0+0x195c0] g_object_get_qdata+0x20 j org.eclipse.swt.internal.gtk.OS._g_object_get_qdata(JI)J+0 j org.eclipse.swt.internal.gtk.OS.g_object_get_qdata(JI)J+9 Please re-file the bug with Eclipse as there is nothing IcedTea/OpenJDK can do about it: https://bugs.eclipse.org/bugs/ Note that the bug may also be with GObject -- the Eclipse folk can comment on that. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ptisnovs at icedtea.classpath.org Wed Jan 4 03:28:14 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 04 Jan 2012 11:28:14 +0000 Subject: /hg/gfx-test: 2012-01-04 Pavel Tisnovsky Message-ID: changeset 1eb14355e32c in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=1eb14355e32c author: Pavel Tisnovsky date: Wed Jan 04 12:30:34 2012 +0100 2012-01-04 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: Created new test suite - check for raster operation BitBlt. * Makefile: updated diffstat: ChangeLog | 6 + Makefile | 8 +- src/org/gfxtest/testsuites/BitBltBasicTests.java | 145 +++++++++++++++++++++++ 3 files changed, 156 insertions(+), 3 deletions(-) diffs (194 lines): diff -r 4a93bf078e59 -r 1eb14355e32c ChangeLog --- a/ChangeLog Tue Jan 03 12:29:49 2012 +0100 +++ b/ChangeLog Wed Jan 04 12:30:34 2012 +0100 @@ -1,3 +1,9 @@ +2012-01-04 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Created new test suite - check for raster operation BitBlt. + * Makefile: updated + 2012-01-03 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingPathByEllipseShape.java: diff -r 4a93bf078e59 -r 1eb14355e32c Makefile --- a/Makefile Tue Jan 03 12:29:49 2012 +0100 +++ b/Makefile Wed Jan 04 12:30:34 2012 +0100 @@ -106,6 +106,7 @@ $(CLASSES)/$(TESTSUITE_DIR)/AAEllipses.class \ $(CLASSES)/$(TESTSUITE_DIR)/AlphaComposite.class \ $(CLASSES)/$(TESTSUITE_DIR)/BlankImage.class \ + $(CLASSES)/$(TESTSUITE_DIR)/BitBltBasicTests.class \ $(CLASSES)/$(TESTSUITE_DIR)/ColorPaint.class \ $(CLASSES)/$(TESTSUITE_DIR)/NormalArcs.class \ $(CLASSES)/$(TESTSUITE_DIR)/NormalLines.class \ @@ -167,6 +168,7 @@ $(RESULTS)/AAEllipses \ $(RESULTS)/AlphaComposite \ $(RESULTS)/BlankImage \ + $(RESULTS)/BitBltBasicTests \ $(RESULTS)/ColorPaint \ $(RESULTS)/NormalArcs \ $(RESULTS)/NormalLines \ @@ -290,9 +292,9 @@ mkdir -p masks # for output/NormalLines the internal macros are set to following: -# $@ - results/NormalLines -# $< - output/NormalLines -# $* - NormalLines +# $@ -results/NormalLines +# $< -output/NormalLines +# $* -NormalLines $(RESULTS)/%: $(OUTPUT)/% mkdir -p $@ java -cp gfxtest.jar org.gfxtest.ImageDiffer.Main -s1=$(SAMPLES)/$* -s2=$< -o=$@ --html --html-results --xml-results --diff-images --struct-diff-images diff -r 4a93bf078e59 -r 1eb14355e32c src/org/gfxtest/testsuites/BitBltBasicTests.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed Jan 04 12:30:34 2012 +0100 @@ -0,0 +1,145 @@ +/* + Java gfx-test framework + + Copyright (C) 2010, 2011, 2012 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 java.awt.Graphics2D; +import java.awt.image.BufferedImage; + + + +import org.gfxtest.framework.GfxTest; +import org.gfxtest.framework.TestImage; +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; +import org.gfxtest.framework.TestResult; + + + +/** + * This test check the rendering of buffered images (so callet bit block + * transfers or Bit Blt) created by various constructors. + * + * @author Pavel Tisnovsky + */ + at TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.COMMON_BITMAP) + at RenderStyle(RenderStyles.NORMAL_AA) + at Transformation(Transformations.NONE) + at Zoom(1) +public class BitBltBasicTests extends GfxTest +{ + /** + * Width of tested buffered image. + */ + private final static int DEFAULT_TEST_IMAGE_WIDTH = 256; + + /** + * Height of tested buffered image. + */ + private final static int DEFAULT_TEST_IMAGE_HEIGHT = 256; + + /** + * Performs BitBlt operation + * + * @param destinationImage + * destination image for BitBlt graphics canvas + * @param sourceImage + * source image for BitBlt + * @return if the image has completely loaded and its pixels are no longer + * being changed, then returns true. Otherwise, returns false + */ + private boolean BitBlt(TestImage destinationImage, Graphics2D graphics2d, BufferedImage sourceImage) + { + // compute top-left corner coordinates + final int x = (destinationImage.getWidth() - DEFAULT_TEST_IMAGE_WIDTH) >> 1; + final int y = (destinationImage.getHeight() - DEFAULT_TEST_IMAGE_HEIGHT) >> 1; + return graphics2d.drawImage(sourceImage, x, y, null); + } + + /** + * Create buffered bitmap with given type. + * + * @param type + * type of the created image + * @return new buffered bitmap + */ + private BufferedImage createBufferedBitmap(int type) + { + return new BufferedImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, type); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d) + { + BufferedImage bufferedImage = createBufferedBitmap(BufferedImage.TYPE_3BYTE_BGR); + if (bufferedImage == null) + { + return TestResult.FAILED; + } + return BitBlt(image, graphics2d, bufferedImage) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Entry point to the test suite. + * + * @param args not used in this case + */ + public static void main(String[] args) + { + new BitBltBasicTests().runTestSuite(args); + } + +} From bugzilla-daemon at icedtea.classpath.org Wed Jan 4 09:43:00 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Jan 2012 17:43:00 +0000 Subject: [Bug 841] Games on gaikai.com do not start In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=841 --- Comment #2 from corvinus 2012-01-04 17:43:00 UTC --- When I tried it again and got browser freeze like before, I noticed following error on stdin: java.lang.OutOfMemoryError: unable to create new native thread So I'm reporting it just to suggest that the freeze I reported could have been for completely different reason. Meanwhile, are there any news regarding the bug? Can anyone confirm or deny that this bug was the one mentioned on rpmfind.net page linked above? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From omajid at redhat.com Wed Jan 4 13:56:19 2012 From: omajid at redhat.com (Omair Majid) Date: Wed, 04 Jan 2012 16:56:19 -0500 Subject: RFC: backport S7102369 In-Reply-To: <20111212224951.GB31950@rivendell.middle-earth.co.uk> References: <4EE65054.1090503@redhat.com> <20111212224137.GA31950@rivendell.middle-earth.co.uk> <4EE6842E.608@redhat.com> <20111212224951.GB31950@rivendell.middle-earth.co.uk> Message-ID: <4F04CB03.5050006@redhat.com> On 12/12/2011 05:49 PM, Dr Andrew John Hughes wrote: > On 17:46 Mon 12 Dec , Omair Majid wrote: >> On 12/12/2011 05:41 PM, Dr Andrew John Hughes wrote: >>> On 14:04 Mon 12 Dec , Omair Majid wrote: >>>> Hi, >>>> >>>> I would like to backport the fix for S7102369 to icedtea6. >>>> >>>> The fix is already in jdk6, but missed the jdk6b24 cutoff: >>>> http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/6b46f3c7c97c >>>> >>>> This fixes a regression caused by the recent security update that >>>> requires rmiregistry to be started with java.rmi.server.codebase >>>> property set. Additional details can be found in this bug report: >>>> https://bugzilla.redhat.com/show_bug.cgi?id=751203 >>>> >>>> The patch for HEAD is attached. If no one has any objections, I will >>>> prepare patches for 1.9 and 1.10 as well. >>>> >>>> ChangeLog: >>>> 2011-12-12 Omair Majid >>>> >>>> S7102369, S7094468: remove java.rmi.server.codebase property >>>> parsing from rmiregistry >>>> * patches/openjdk/7102369-7094468-rmiregistry.patch: New file. >>>> Backport from OpenJDK6. >>>> * Makefile.am (ICEDTEA_PATCHES): Apply the patch. >>>> >>>> Any thoughts or comments? >>>> >>> > I would suggest adding it there, then posting the backports in a week's time if no > issues arise. > It's been more than a week and I have not heard any issues. Patches for 1.8, 1.9 and 1.10 attached. Thanks, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: 7102369-icedtea6-1.8.patch Type: text/x-patch Size: 20543 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120104/7644a730/7102369-icedtea6-1.8.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: 7102369-icedtea6-1.9.patch Type: text/x-patch Size: 20469 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120104/7644a730/7102369-icedtea6-1.9.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: 7102369-icedtea6-1.10.patch Type: text/x-patch Size: 20639 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120104/7644a730/7102369-icedtea6-1.10.patch From dbhole at redhat.com Wed Jan 4 14:48:56 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Wed, 4 Jan 2012 17:48:56 -0500 Subject: RFC: Backport HugePage support to IcedTea6 1.10 Message-ID: <20120104224856.GA8560@redhat.com> Hi, Attached patch backports HugePage support into 1.10. It combines these two patches, merged into one because the latter renames files from the first for the most part and neither will apply without updating anyway: http://icedtea.classpath.org/hg/icedtea6/rev/e32979d54978 http://icedtea.classpath.org/hg/icedtea6/rev/320b7ef798ed ChangeLog: 2012-01-04 Deepak Bhole S7037939, S7034464: Import Andrew Haley's HugePage support patches * Makefile (ICEDTEA_PATCHES): Add 7034464-hugepage.patch, 7037939-hugepage.patch and 7043564-hugepage.patch. * patches/openjdk/7034464-hugepage.patch: Support transparent huge pages on Linux available since 2.6.38 * patches/openjdk/7037939-hugepage.patch: Disable adaptive resizing if SHM large pages are used * patches/openjdk/7043564-hugepage.patch: Import from upstream * NEWS: Add S7037939, S7034464 Okay for push? Cheers, Deepak -------------- next part -------------- diff -r 7a2f446f71e1 Makefile.am --- a/Makefile.am Fri Oct 21 15:04:36 2011 +0100 +++ b/Makefile.am Wed Jan 04 17:43:09 2012 -0500 @@ -362,7 +362,10 @@ patches/openjdk/7036148-npe-null-jmenu-name.patch \ patches/jtreg-bug7036148-test.patch \ patches/support_linux_3.patch \ - patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch + patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \ + patches/openjdk/7034464-hugepage.patch \ + patches/openjdk/7037939-hugepage.patch \ + patches/openjdk/7043564-hugepage.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r 7a2f446f71e1 NEWS --- a/NEWS Fri Oct 21 15:04:36 2011 +0100 +++ b/NEWS Wed Jan 04 17:43:09 2012 -0500 @@ -10,6 +10,9 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY New in release 1.10.5 (20XX-XX-XX): +* Backports + - S7034464: Support transparent large pages on Linux + - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used New in release 1.10.4 (2011-10-18): diff -r 7a2f446f71e1 patches/openjdk/7034464-hugepage.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7034464-hugepage.patch Wed Jan 04 17:43:09 2012 -0500 @@ -0,0 +1,458 @@ +# HG changeset patch +# User iveresov +# Date 1303344724 25200 +# Node ID 139667d9836ae218ab06a74d5813a5a700a076c9 +# Parent 49a67202bc671d23d719c9e14752d80295a9e8f6 +7034464: Support transparent large pages on Linux +Summary: Support transparent huge pages on Linux available since 2.6.38 +Reviewed-by: iveresov, ysr +Contributed-by: aph at redhat.com +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp openjdk/hotspot/src/os/linux/vm/globals_linux.hpp +--- openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp 2011-03-16 02:30:16.000000000 +0000 ++++ openjdk/hotspot/src/os/linux/vm/globals_linux.hpp 2011-05-04 11:57:15.083470027 +0100 +@@ -29,13 +29,19 @@ + // Defines Linux specific flags. They are not available on other platforms. + // + #define RUNTIME_OS_FLAGS(develop, develop_pd, product, product_pd, diagnostic, notproduct) \ +- product(bool, UseOprofile, false, \ +- "enable support for Oprofile profiler") \ +- \ +- product(bool, UseLinuxPosixThreadCPUClocks, true, \ +- "enable fast Linux Posix clocks where available") +-// NB: The default value of UseLinuxPosixThreadCPUClocks may be +-// overridden in Arguments::parse_each_vm_init_arg. ++ product(bool, UseOprofile, false, \ ++ "enable support for Oprofile profiler") \ ++ \ ++ product(bool, UseLinuxPosixThreadCPUClocks, true, \ ++ "enable fast Linux Posix clocks where available") \ ++/* NB: The default value of UseLinuxPosixThreadCPUClocks may be \ ++ overridden in Arguments::parse_each_vm_init_arg. */ \ ++ \ ++ product(bool, UseHugeTLBFS, false, \ ++ "Use MAP_HUGETLB for large pages") \ ++ \ ++ product(bool, UseSHM, false, \ ++ "Use SYSV shared memory for large pages") + + // + // Defines Linux-specific default values. The flags are available on all +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-03 14:32:54.285722656 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-09 14:31:51.358502774 +0100 +@@ -2495,16 +2495,40 @@ + return res != (uintptr_t) MAP_FAILED; + } + ++// Define MAP_HUGETLB here so we can build HotSpot on old systems. ++#ifndef MAP_HUGETLB ++#define MAP_HUGETLB 0x40000 ++#endif ++ ++// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. ++#ifndef MADV_HUGEPAGE ++#define MADV_HUGEPAGE 14 ++#endif ++ + bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, + bool exec) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; ++ uintptr_t res = ++ (uintptr_t) ::mmap(addr, size, prot, ++ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, ++ -1, 0); ++ return res != (uintptr_t) MAP_FAILED; ++ } ++ + return commit_memory(addr, size, exec); + } + +-void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } ++void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ // We don't check the return value: madvise(MADV_HUGEPAGE) may not ++ // be supported or the memory may already be backed by huge pages. ++ ::madvise(addr, bytes, MADV_HUGEPAGE); ++ } ++} + + void os::free_memory(char *addr, size_t bytes) { +- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, +- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); ++ ::madvise(addr, bytes, MADV_DONTNEED); + } + + void os::numa_make_global(char *addr, size_t bytes) { +@@ -2870,7 +2894,16 @@ + static size_t _large_page_size = 0; + + bool os::large_page_init() { +- if (!UseLargePages) return false; ++ if (!UseLargePages) { ++ UseHugeTLBFS = false; ++ UseSHM = false; ++ return false; ++ } ++ ++ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { ++ // Our user has not expressed a preference, so we'll try both. ++ UseHugeTLBFS = UseSHM = true; ++ } + + if (LargePageSizeInBytes) { + _large_page_size = LargePageSizeInBytes; +@@ -2915,6 +2948,9 @@ + } + } + ++ // print a warning if any large page related flag is specified on command line ++ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); ++ + const size_t default_page_size = (size_t)Linux::page_size(); + if (_large_page_size > default_page_size) { + _page_sizes[0] = _large_page_size; +@@ -2922,6 +2958,14 @@ + _page_sizes[2] = 0; + } + ++ UseHugeTLBFS = UseHugeTLBFS && ++ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); ++ ++ if (UseHugeTLBFS) ++ UseSHM = false; ++ ++ UseLargePages = UseHugeTLBFS || UseSHM; ++ + // Large page support is available on 2.6 or newer kernel, some vendors + // (e.g. Redhat) have backported it to their 2.4 based distributions. + // We optimistically assume the support is available. If later it turns out +@@ -2936,7 +2980,7 @@ + char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { + // "exec" is passed in but not used. Creating the shared image for + // the code cache doesn't have an SHM_X executable permission to check. +- assert(UseLargePages, "only for large pages"); ++ assert(UseLargePages && UseSHM, "only for SHM large pages"); + + key_t key = IPC_PRIVATE; + char *addr; +@@ -3003,19 +3047,19 @@ + return _large_page_size; + } + +-// Linux does not support anonymous mmap with large page memory. The only way +-// to reserve large page memory without file backing is through SysV shared +-// memory API. The entire memory region is committed and pinned upfront. +-// Hopefully this will change in the future... ++// HugeTLBFS allows application to commit large page memory on demand; ++// with SysV SHM the entire memory region must be allocated as shared ++// memory. + bool os::can_commit_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + bool os::can_execute_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + // Reserve memory at an arbitrary address, only if that area is ++// Reserve memory at an arbitrary address, only if that area is + // available (and not reserved for something else). + + char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { +@@ -5009,6 +5053,43 @@ + // JSR166 + // ------------------------------------------------------- + ++bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { ++ bool result = false; ++ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, ++ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, ++ -1, 0); ++ ++ if (p != (void *) -1) { ++ // We don't know if this really is a huge page or not. ++ FILE *fp = fopen("/proc/self/maps", "r"); ++ if (fp) { ++ while (!feof(fp)) { ++ char chars[257]; ++ long x = 0; ++ if (fgets(chars, sizeof(chars), fp)) { ++ if (sscanf(chars, "%lx-%*lx", &x) == 1 ++ && x == (long)p) { ++ if (strstr (chars, "hugepage")) { ++ result = true; ++ break; ++ } ++ } ++ } ++ } ++ fclose(fp); ++ } ++ munmap (p, page_size); ++ if (result) ++ return true; ++ } ++ ++ if (warn) { ++ warning("HugeTLBFS is not supported by the operating system."); ++ } ++ ++ return result; ++} ++ + /* + * The solaris and linux implementations of park/unpark are fairly + * conservative for now, but can be improved. They currently use a +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-03 14:32:53.972649764 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-04 11:57:15.085470494 +0100 +@@ -117,6 +117,10 @@ + # include + # include + ++#if __x86_64__ ++#include ++#endif ++ + #define MAX_PATH (2 * K) + + // for timer info max values which include all bits +@@ -2491,16 +2495,40 @@ + return res != (uintptr_t) MAP_FAILED; + } + ++// Define MAP_HUGETLB here so we can build HotSpot on old systems. ++#ifndef MAP_HUGETLB ++#define MAP_HUGETLB 0x40000 ++#endif ++ ++// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. ++#ifndef MADV_HUGEPAGE ++#define MADV_HUGEPAGE 14 ++#endif ++ + bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, + bool exec) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; ++ uintptr_t res = ++ (uintptr_t) ::mmap(addr, size, prot, ++ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, ++ -1, 0); ++ return res != (uintptr_t) MAP_FAILED; ++ } ++ + return commit_memory(addr, size, exec); + } + +-void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } ++void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ // We don't check the return value: madvise(MADV_HUGEPAGE) may not ++ // be supported or the memory may already be backed by huge pages. ++ ::madvise(addr, bytes, MADV_HUGEPAGE); ++ } ++} + + void os::free_memory(char *addr, size_t bytes) { +- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, +- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); ++ ::madvise(addr, bytes, MADV_DONTNEED); + } + + void os::numa_make_global(char *addr, size_t bytes) { +@@ -2544,6 +2572,21 @@ + return end; + } + ++static int sched_getcpu_syscall(void) { ++ unsigned int cpu; ++ int retval = -1; ++ ++#if __x86_64__ ++ typedef long (*vgetcpu_t)(unsigned int *cpu, unsigned int *node, unsigned long *tcache); ++ vgetcpu_t vgetcpu = (vgetcpu_t)VSYSCALL_ADDR(__NR_vgetcpu); ++ retval = vgetcpu(&cpu, NULL, NULL); ++#elif __i386__ ++ retval = syscall(SYS_getcpu, &cpu, NULL, NULL); ++#endif ++ ++ return (retval == -1) ? retval : cpu; ++} ++ + extern "C" void numa_warn(int number, char *where, ...) { } + extern "C" void numa_error(char *where) { } + +@@ -2565,6 +2608,10 @@ + set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, + dlsym(RTLD_DEFAULT, "sched_getcpu"))); + ++ // If it's not, try a direct syscall. ++ if (sched_getcpu() == -1) ++ set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, (void*)&sched_getcpu_syscall)); ++ + if (sched_getcpu() != -1) { // Does it work? + void *handle = dlopen("libnuma.so.1", RTLD_LAZY); + if (handle != NULL) { +@@ -2847,7 +2894,16 @@ + static size_t _large_page_size = 0; + + bool os::large_page_init() { +- if (!UseLargePages) return false; ++ if (!UseLargePages) { ++ UseHugeTLBFS = false; ++ UseSHM = false; ++ return false; ++ } ++ ++ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { ++ // Our user has not expressed a preference, so we'll try both. ++ UseHugeTLBFS = UseSHM = true; ++ } + + if (LargePageSizeInBytes) { + _large_page_size = LargePageSizeInBytes; +@@ -2892,6 +2948,9 @@ + } + } + ++ // print a warning if any large page related flag is specified on command line ++ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); ++ + const size_t default_page_size = (size_t)Linux::page_size(); + if (_large_page_size > default_page_size) { + _page_sizes[0] = _large_page_size; +@@ -2899,6 +2958,14 @@ + _page_sizes[2] = 0; + } + ++ UseHugeTLBFS = UseHugeTLBFS && ++ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); ++ ++ if (UseHugeTLBFS) ++ UseSHM = false; ++ ++ UseLargePages = UseHugeTLBFS || UseSHM; ++ + // Large page support is available on 2.6 or newer kernel, some vendors + // (e.g. Redhat) have backported it to their 2.4 based distributions. + // We optimistically assume the support is available. If later it turns out +@@ -2913,7 +2980,7 @@ + char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { + // "exec" is passed in but not used. Creating the shared image for + // the code cache doesn't have an SHM_X executable permission to check. +- assert(UseLargePages, "only for large pages"); ++ assert(UseLargePages && UseSHM, "only for SHM large pages"); + + key_t key = IPC_PRIVATE; + char *addr; +@@ -2980,19 +3047,19 @@ + return _large_page_size; + } + +-// Linux does not support anonymous mmap with large page memory. The only way +-// to reserve large page memory without file backing is through SysV shared +-// memory API. The entire memory region is committed and pinned upfront. +-// Hopefully this will change in the future... ++// HugeTLBFS allows application to commit large page memory on demand; ++// with SysV SHM the entire memory region must be allocated as shared ++// memory. + bool os::can_commit_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + bool os::can_execute_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + // Reserve memory at an arbitrary address, only if that area is ++// Reserve memory at an arbitrary address, only if that area is + // available (and not reserved for something else). + + char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { +@@ -4081,6 +4148,23 @@ + UseNUMA = false; + } + } ++ // With SHM large pages we cannot uncommit a page, so there's not way ++ // we can make the adaptive lgrp chunk resizing work. If the user specified ++ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and ++ // disable adaptive resizing. ++ if (UseNUMA && UseLargePages && UseSHM) { ++ if (!FLAG_IS_DEFAULT(UseNUMA)) { ++ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { ++ UseLargePages = false; ++ } else { ++ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); ++ UseAdaptiveSizePolicy = false; ++ UseAdaptiveNUMAChunkSizing = false; ++ } ++ } else { ++ UseNUMA = false; ++ } ++ } + if (!UseNUMA && ForceNUMA) { + UseNUMA = true; + } +@@ -4986,6 +5070,43 @@ + // JSR166 + // ------------------------------------------------------- + ++bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { ++ bool result = false; ++ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, ++ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, ++ -1, 0); ++ ++ if (p != (void *) -1) { ++ // We don't know if this really is a huge page or not. ++ FILE *fp = fopen("/proc/self/maps", "r"); ++ if (fp) { ++ while (!feof(fp)) { ++ char chars[257]; ++ long x = 0; ++ if (fgets(chars, sizeof(chars), fp)) { ++ if (sscanf(chars, "%lx-%*lx", &x) == 1 ++ && x == (long)p) { ++ if (strstr (chars, "hugepage")) { ++ result = true; ++ break; ++ } ++ } ++<+ } ++ } ++ fclose(fp); ++ } ++ munmap (p, page_size); ++ if (result) ++ return true; ++ } ++ ++ if (warn) { ++ warning("HugeTLBFS is not supported by the operating system."); ++ } ++ ++ return result; ++} ++ + /* + * The solaris and linux implementations of park/unpark are fairly + * conservative for now, but can be improved. They currently use a +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp openjdk/hotspot/src/os/linux/vm/os_linux.hpp +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp 2011-03-16 02:30:16.000000000 +0000 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp 2011-05-04 11:57:15.088471194 +0100 +@@ -86,6 +86,9 @@ + + static void rebuild_cpu_to_node_map(); + static GrowableArray* cpu_to_node() { return _cpu_to_node; } ++ ++ static bool hugetlbfs_sanity_check(bool warn, size_t page_size); ++ + public: + static void init_thread_fpu_state(); + static int get_fpu_control_word(); diff -r 7a2f446f71e1 patches/openjdk/7037939-hugepage.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7037939-hugepage.patch Wed Jan 04 17:43:09 2012 -0500 @@ -0,0 +1,71 @@ + +# HG changeset patch +# User iveresov +# Date 1303843594 25200 +# Node ID c303b3532d4ada074facc42292219952c2a4204e +# Parent d6cdc6c77582408f6450bdda3ffc831d44298714 +7037939: NUMA: Disable adaptive resizing if SHM large pages are used +Summary: Make the NUMA allocator behave properly with SHM and ISM large pages. +Reviewed-by: ysr + +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp Sat Apr 23 04:20:09 2011 -0700 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue Apr 26 11:46:34 2011 -0700 +@@ -4170,6 +4170,23 @@ jint os::init_2(void) + UseNUMA = false; + } + } ++ // With SHM large pages we cannot uncommit a page, so there's not way ++ // we can make the adaptive lgrp chunk resizing work. If the user specified ++ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and ++ // disable adaptive resizing. ++ if (UseNUMA && UseLargePages && UseSHM) { ++ if (!FLAG_IS_DEFAULT(UseNUMA)) { ++ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { ++ UseLargePages = false; ++ } else { ++ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); ++ UseAdaptiveSizePolicy = false; ++ UseAdaptiveNUMAChunkSizing = false; ++ } ++ } else { ++ UseNUMA = false; ++ } ++ } + if (!UseNUMA && ForceNUMA) { + UseNUMA = true; + } +--- openjdk.patched/hotspot/src/os/solaris/vm/os_solaris.cpp Sat Apr 23 04:20:09 2011 -0700 ++++ openjdk/hotspot/src/os/solaris/vm/os_solaris.cpp Tue Apr 26 11:46:34 2011 -0700 +@@ -2826,7 +2826,9 @@ void os::realign_memory(char *addr, size + void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { + assert((intptr_t)addr % alignment_hint == 0, "Address should be aligned."); + assert((intptr_t)(addr + bytes) % alignment_hint == 0, "End should be aligned."); +- Solaris::set_mpss_range(addr, bytes, alignment_hint); ++ if (UseLargePages && UseMPSS) { ++ Solaris::set_mpss_range(addr, bytes, alignment_hint); ++ } + } + + // Tell the OS to make the range local to the first-touching LWP +@@ -5041,6 +5043,20 @@ jint os::init_2(void) { + FREE_C_HEAP_ARRAY(int, lgrp_ids); + if (lgrp_num < 2) { + // There's only one locality group, disable NUMA. ++ UseNUMA = false; ++ } ++ } ++ // ISM is not compatible with the NUMA allocator - it always allocates ++ // pages round-robin across the lgroups. ++ if (UseNUMA && UseLargePages && UseISM) { ++ if (!FLAG_IS_DEFAULT(UseNUMA)) { ++ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseISM)) { ++ UseLargePages = false; ++ } else { ++ warning("UseNUMA is not compatible with ISM large pages, disabling NUMA allocator"); ++ UseNUMA = false; ++ } ++ } else { + UseNUMA = false; + } + } + diff -r 7a2f446f71e1 patches/openjdk/7043564-hugepage.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7043564-hugepage.patch Wed Jan 04 17:43:09 2012 -0500 @@ -0,0 +1,21 @@ + +# HG changeset patch +# User iveresov +# Date 1305055570 25200 +# Node ID 97b64f73103bddbcd9d987fd13854957d2a80600 +# Parent fc2b798ab316df025526f208aeeef19609ad51b3 +7043564: compile warning and copyright fixes +Summary: Fixed the warning, also fixed copyrights in a bunch of files. +Reviewed-by: johnc, kvn + +--- openjdk.prev/hotspot/src/os/linux/vm/os_linux.cpp Tue May 10 00:33:21 2011 -0700 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue May 10 12:26:10 2011 -0700 +@@ -2850,7 +2850,7 @@ bool os::Linux::hugetlbfs_sanity_check(b + char chars[257]; + long x = 0; + if (fgets(chars, sizeof(chars), fp)) { +- if (sscanf(chars, "%lx-%*lx", &x) == 1 ++ if (sscanf(chars, "%lx-%*x", &x) == 1 + && x == (long)p) { + if (strstr (chars, "hugepage")) { + result = true; From ahughes at redhat.com Wed Jan 4 16:02:52 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 5 Jan 2012 00:02:52 +0000 Subject: RFC: Backport HugePage support to IcedTea6 1.10 In-Reply-To: <20120104224856.GA8560@redhat.com> References: <20120104224856.GA8560@redhat.com> Message-ID: <20120105000252.GA18480@rivendell.middle-earth.co.uk> On 17:48 Wed 04 Jan , Deepak Bhole wrote: > Hi, > > Attached patch backports HugePage support into 1.10. It combines these two > patches, merged into one because the latter renames files from the first for > the most part and neither will apply without updating anyway: > http://icedtea.classpath.org/hg/icedtea6/rev/e32979d54978 > http://icedtea.classpath.org/hg/icedtea6/rev/320b7ef798ed > > ChangeLog: > 2012-01-04 Deepak Bhole > > S7037939, S7034464: Import Andrew Haley's HugePage support patches > * Makefile (ICEDTEA_PATCHES): Add 7034464-hugepage.patch, > 7037939-hugepage.patch and 7043564-hugepage.patch. > * patches/openjdk/7034464-hugepage.patch: Support transparent huge > pages on Linux available since 2.6.38 > * patches/openjdk/7037939-hugepage.patch: Disable adaptive > resizing if SHM large pages are used > * patches/openjdk/7043564-hugepage.patch: Import from upstream > * NEWS: Add S7037939, S7034464 > > Okay for push? > > Cheers, > Deepak Looks good, assuming it builds. Please add a newline after the 'New in release...' line in NEWS. Then it's good to push. -- 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/20120105/805ea965/attachment.bin From ahughes at redhat.com Wed Jan 4 16:10:37 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 5 Jan 2012 00:10:37 +0000 Subject: RFC: backport S7102369 In-Reply-To: <4F04CB03.5050006@redhat.com> References: <4EE65054.1090503@redhat.com> <20111212224137.GA31950@rivendell.middle-earth.co.uk> <4EE6842E.608@redhat.com> <20111212224951.GB31950@rivendell.middle-earth.co.uk> <4F04CB03.5050006@redhat.com> Message-ID: <20120105001037.GC18480@rivendell.middle-earth.co.uk> On 16:56 Wed 04 Jan , Omair Majid wrote: > On 12/12/2011 05:49 PM, Dr Andrew John Hughes wrote: > > On 17:46 Mon 12 Dec , Omair Majid wrote: > >> On 12/12/2011 05:41 PM, Dr Andrew John Hughes wrote: > >>> On 14:04 Mon 12 Dec , Omair Majid wrote: > >>>> Hi, > >>>> > >>>> I would like to backport the fix for S7102369 to icedtea6. > >>>> > >>>> The fix is already in jdk6, but missed the jdk6b24 cutoff: > >>>> http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/6b46f3c7c97c > >>>> > >>>> This fixes a regression caused by the recent security update that > >>>> requires rmiregistry to be started with java.rmi.server.codebase > >>>> property set. Additional details can be found in this bug report: > >>>> https://bugzilla.redhat.com/show_bug.cgi?id=751203 > >>>> > >>>> The patch for HEAD is attached. If no one has any objections, I will > >>>> prepare patches for 1.9 and 1.10 as well. > >>>> > >>>> ChangeLog: > >>>> 2011-12-12 Omair Majid > >>>> > >>>> S7102369, S7094468: remove java.rmi.server.codebase property > >>>> parsing from rmiregistry > >>>> * patches/openjdk/7102369-7094468-rmiregistry.patch: New file. > >>>> Backport from OpenJDK6. > >>>> * Makefile.am (ICEDTEA_PATCHES): Apply the patch. > >>>> > >>>> Any thoughts or comments? > >>>> > >>> > > I would suggest adding it there, then posting the backports in a week's time if no > > issues arise. > > > > It's been more than a week and I have not heard any issues. Patches for > 1.8, 1.9 and 1.10 attached. > > Thanks, > Omair > This is a regression so I think it needs to go in. Approved. I'll post separately about doing a new bunch of update releases. -- 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/20120105/b7a24331/attachment.bin From ahughes at redhat.com Wed Jan 4 16:14:59 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 5 Jan 2012 00:14:59 +0000 Subject: Next Batch of Update Releases (1.10.5, etc.) Message-ID: <20120105001459.GD18480@rivendell.middle-earth.co.uk> There are a number of regressions due to the last batch of security fixes (one I posted here http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-December/016583.html related to SSL and one Omair just posted http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-January/016623.html). There's also a 1.10 regression with javadoc that should be fixed: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-December/016582.html I propose we do a new batch of update releases next Wednesday around 2pm UTC. Please get any fixes approved and backported prior to that date. Let me know if there are any blockers on such a release. 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 -------------- 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/20120105/8ddc841a/attachment.bin From ahughes at redhat.com Thu Jan 5 05:45:35 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 5 Jan 2012 13:45:35 +0000 Subject: icedtea6 1.11 branching on 2012-01-06 In-Reply-To: <4F030ACB.1000502@redhat.com> References: <4EF49ECF.7060004@redhat.com> <20111225202450.GK22074@rivendell.middle-earth.co.uk> <4F030ACB.1000502@redhat.com> Message-ID: <20120105134535.GH18480@rivendell.middle-earth.co.uk> On 15:03 Tue 03 Jan , Jiri Vanek wrote: > On 12/25/2011 09:24 PM, Dr Andrew John Hughes wrote: > > On 10:31 Fri 23 Dec , Omair Majid wrote: > >> Hi all, > >> > >> As noted elsewhere, a number of important features and fixes have been > >> added to icedtea6 that are not in any release. This seems like a good > >> time as any to try and get a release out. To that end, I am planning to > >> branch icedtea6 1.11 on 2012-01-06. I dont have an exact release date in > >> mind right now, but it probably will be at least a week after that. > >> > >> Once icedtea6 1.11 is branched, only fixes will be accepted. > >> > >> Please try to get any changes you are working on in by that date. If you > >> can't make the date, but you would really like to get your work in, let > >> me know and I will see what I can do about pushing the date further back. > >> > > > > Thanks for starting the ball rolling. I've got the backports in that I wanted > > to now, so for me, we're good to go with the branch. > > > >> Thanks, > >> Omair > > > I would like to have > "[rfc][icedtea] makefiel part of fix of rhbz 580478" inside. But it is small change and I think it will be done soon following already given advices. > > J. Is there any progress on this? -- 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/20120105/e9117ee6/attachment.bin From doko at ubuntu.com Thu Jan 5 06:48:53 2012 From: doko at ubuntu.com (Matthias Klose) Date: Thu, 05 Jan 2012 15:48:53 +0100 Subject: icedtea6 1.11 branching on 2012-01-06 In-Reply-To: <4EF49ECF.7060004@redhat.com> References: <4EF49ECF.7060004@redhat.com> Message-ID: <4F05B855.1080204@ubuntu.com> On 12/23/2011 04:31 PM, Omair Majid wrote: > Hi all, > > As noted elsewhere, a number of important features and fixes have been added to > icedtea6 that are not in any release. This seems like a good time as any to try > and get a release out. To that end, I am planning to branch icedtea6 1.11 on > 2012-01-06. I dont have an exact release date in mind right now, but it probably > will be at least a week after that. there's a regression: shark is completely broken. seen on the buildbot http://builder.classpath.org/icedtea/buildbot/builders/icedtea6-squeeze-x86_64-quick-shark/builds/188 using llvm-2.7, and checked with llvm-2.9 and llvm-3.0 as well. If not fixed, please mention it in the release notes. From bugzilla-daemon at icedtea.classpath.org Thu Jan 5 07:05:00 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 05 Jan 2012 15:05:00 +0000 Subject: [Bug 846] New: Plugin tries to use a SOCKS proxy even if there is none configured Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=846 Bug #: 846 Summary: Plugin tries to use a SOCKS proxy even if there is none configured Classification: Unclassified Product: IcedTea-Web Version: unspecified Platform: x86_64 OS/Version: Linux Status: NEW Severity: major Priority: P3 Component: Plugin AssignedTo: dbhole at redhat.com ReportedBy: vogel at folz.de CC: unassigned at icedtea.classpath.org Created attachment 632 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=632 Log from "javaws -verbose" when using direct internet connection I'm using icedtea-web-1.1.4, i. e. the icedtea-web-1.1.4-3.fc16.x86_64.rpm in Fedora 16, with the Firefox browser. The applet in question gets started properly via HTTP, regardless if using a proxy for HTTP or not. But shortly after the applet was started, it tries to open a TCP connection. This works, if the browser is configured for direct internet access, i. e. without a proxy. When configuring the browser to use a proxy for HTTP, HTTPS and GOPHER, but leaving the SOCKS proxy configuration empty (i. e. when there is no SOCKS proxy needed and available), the applet is not able to open this very same TCP connection, but fails instead. I've created a small shell script to run javaws (from icedtea-web) with the -verbose option and configured Firefox to use this script instead of /usr/bin/javaws. With this setup I created two log files, using the applet with and without a configured proxy, as described above. I'll attach these logs. The interesting part is after the line that says "Selecting proxy for: socket://platane-irmc.mgt.folz.de:80": When having no proxy for HTTP, then it says "Selected proxies: [DIRECT]", but when having a valid proxy for HTTP and an empty proxy configuration for SOCKS, it says nothing. This is the point where the TCP connection of the applet fails and the applet complains with an alert box containing: "java.lang.illegalArgumentException: port out of range:-2147483648" So, icedtea-web's javaws tries to use a SOCKS proxy when there is none configured, but when proxy configurations exist for other protocols. This is a bad idea, since there is no other option to say that there is no SOCKS proxy. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 5 07:06:28 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 05 Jan 2012 15:06:28 +0000 Subject: [Bug 846] Plugin tries to use a SOCKS proxy even if there is none configured In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=846 --- Comment #1 from vogel at folz.de 2012-01-05 15:06:28 UTC --- Created attachment 633 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=633 Log from "javaws -verbose" when using a proxy for HTTP -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ptisnovs at icedtea.classpath.org Thu Jan 5 07:29:26 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 05 Jan 2012 15:29:26 +0000 Subject: /hg/MauveTestCoverage: 2012-01-05 Pavel Tisnovsky changeset 17f81193758a in /hg/MauveTestCoverage details: http://icedtea.classpath.org/hg/MauveTestCoverage?cmd=changeset;node=17f81193758a author: ptisnovs date: Thu Jan 05 16:38:45 2012 +0100 2012-01-05 Pavel Tisnovsky * adding Makefile: Make sure that ./bin and ./report directories are created during build. diffstat: ChangeLog | 6 ++++++ Makefile | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diffs (69 lines): diff -r 29318fe8d6d0 -r 17f81193758a ChangeLog --- a/ChangeLog Wed Jan 04 11:20:55 2012 +0100 +++ b/ChangeLog Thu Jan 05 16:38:45 2012 +0100 @@ -1,3 +1,9 @@ +2012-01-05 Pavel Tisnovsky + + * adding Makefile: + Make sure that ./bin and ./report directories + are created during build. + 2012-01-04 Pavel Tisnovsky * adding .classpath: diff -r 29318fe8d6d0 -r 17f81193758a Makefile --- a/Makefile Wed Jan 04 11:20:55 2012 +0100 +++ b/Makefile Thu Jan 05 16:38:45 2012 +0100 @@ -68,14 +68,15 @@ rm -f $(CLASSDIR)/*.class rm -f $(REPORTDIR)/* -build: $(CLASSDIR)/PrintClassList.class \ +build: $(CLASSDIR) \ + $(CLASSDIR)/PrintClassList.class \ $(CLASSDIR)/PrintPublicMethods.class \ $(CLASSDIR)/PrintTestCoverage.class \ $(CLASSDIR)/ReportGenerator.class -api_class_list: $(REPORTDIR)/$(ALL_CLASS_LIST) +api_class_list: $(REPORTDIR) $(REPORTDIR)/$(ALL_CLASS_LIST) -public_method_list: $(CLASS_LIST) +public_method_list: $(REPORTDIR) $(CLASS_LIST) if [ ! -f $(CLASS_LIST) ]; \ then \ echo "Please create file $(CLASS_LIST) containing list of classes to check"; \ @@ -89,7 +90,7 @@ java -cp $(CLASSDIR) PrintPublicMethods $${line} > $(REPORTDIR)/$${line}_api.txt; \ done < $(CLASS_LIST); -tested_method_list: $(TEST_DIRECTORY_FILE) +tested_method_list: $(REPORTDIR) $(TEST_DIRECTORY_FILE) if [ ! -f $(TEST_DIRECTORY_FILE) ]; \ then \ echo "Please create file $(TEST_DIRECTORY_FILE) containing path to test directory"; \ @@ -110,9 +111,15 @@ java -cp $(CLASSDIR) PrintTestCoverage $${line} > $(REPORTDIR)/$${line}_test.txt; \ done < $(CLASS_LIST); +$(CLASSDIR): + mkdir -p $(CLASSDIR) + $(CLASSDIR)/%.class: $(SOURCEPATH)/%.java $(JAVAC) -d $(CLASSDIR) -sourcepath $(SOURCEPATH)/ $< +$(REPORTDIR): + mkdir -p $(REPORTDIR) + # Target to make the file containing list of all API classes $(REPORTDIR)/$(ALL_CLASS_LIST): $(PATH_TO_RT_JAR_FILE) if [ ! -f $(PATH_TO_RT_JAR_FILE) ]; \ @@ -131,7 +138,7 @@ fi $(JAVA) -cp $(CLASSDIR) PrintClassList `cat $(PATH_TO_RT_JAR_FILE)` > $(REPORTDIR)/$(ALL_CLASS_LIST) -gen_report: +gen_report: $(REPORTDIR) cp -u $(SOURCEPATH)/index.html $(REPORTDIR) cp -u $(SOURCEPATH)/style.css $(REPORTDIR) java -cp $(CLASSDIR) ReportGenerator $(REPORTDIR)/$(ALL_CLASS_LIST) $(CLASS_LIST) $(REPORTDIR) From jvanek at redhat.com Thu Jan 5 07:33:48 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 05 Jan 2012 16:33:48 +0100 Subject: [rfc][icedtea] makefiel part of fix of rhbz 580478 In-Reply-To: <4EF20C4F.8080803@redhat.com> References: <4EF1FBB5.1070701@redhat.com> <4EF20C4F.8080803@redhat.com> Message-ID: <4F05C2DC.6010805@redhat.com> 2011-12-21 Jiri Vanek fixes rhbz#580478 * Makefile.am: (EXTRA_DIST) console.desktop policytool.desktop replaced by *.in files (clean-local) now depends on new target clean-desktop-files (jconsole.desktop) new target which transforms jconsole.desktop.in to jconsole.desktop, using default or set value (policytool.desktop) new target which transforms policytool.desktop.in to policytool.desktop, using default or set value (clean-desktop-files) new target, removes policytool.desktop and jconsole.desktop (stamps/icedtea.stamp) now depends also on console.desktop policytool.desktop (stamps/icedtea-debug.stamp) likewise, as enforced by stamps/icedtea.stamp comment * configure.ac: abs-install-dir block moved outside conditional ENABLE_SYSTEMTAP block * jconsole.desktop: removed, replaced by jconsole.desktop.in * jconsole.desktop.in: new file, stub for desktop file, have variable to be substitued during make * policytool.desktop: removed, replaced by policytool.desktop.in * policytool.desktop.in: new file, stub for desktop file, have variable to be substituted during make Flowing Andrew's advice, now using abs-install-dir. Your remaining hints were also fixed. Looks better now :). On 12/21/2011 05:41 PM, Omair Majid wrote: > On 12/21/2011 10:31 AM, Jiri Vanek wrote: >> hi all! > > Hi Jiri, > > I would be nice to know some background about the problem to you are trying to fix without having to look into the bugzilla :) > > It seems like the right "fix" for this sort of problem would be to support 'make install' in icedtea6. But given that's something not possible at the moment, a bandaid like this will do. > >> Second part of fix will be to use this new --with-val in spec files >> > > I am not sure if --with-jconsole is a good name. On first look, it looks like you are saying which jconosle to use to build icedtea6. See what the autoconf docs have to say about --with-foo: > http://www.gnu.org/software/autoconf/manual/autoconf.html#External-Software > >> 2011-12-21 Jiri Vanek >> >> partially fixes rhbz#580478 >> * Makefile.am: >> (EXTRA_DIST) removed console.desktop policytool.desktop targets >> to be available during make, and not only during make dist >> (clean-local) now depends on new target clean-desktop-files >> (jconsole.desktop) new target which transforms >> jconsole.desktop.in to jconsole.desktop, using default or set value >> (policytool.desktop) new target which transforms >> policytool.desktop.in to policytool.desktop, using default or set >> value >> (clean-desktop-files) new target, removes policytool.desktop and >> jconsole.desktop >> (stamps/icedtea.stamp) now depends also on console.desktop >> policytool.desktop >> (stamps/icedtea-debug.stamp) likewise, as enforced by >> stamps/icedtea.stamp comment >> * acinclude.m4: >> added definitions of IT_SET_JCONSOLE_DESKTOP and >> IT_SET_POLICYTOOL_DESKTOP, >> which allows to set user paths used in jconsole and policytool >> desktop files, >> or use defaults >> * configure.ac: called IT_SET_JCONSOLE_DESKTOP and >> IT_SET_POLICYTOOL_DESKTOP >> * jconsole.desktop: removed, replaced by jconsole.desktop.in >> * jconsole.desktop.in: new file, stub for desktop file, have variable >> to be substitued during make >> * policytool.desktop: removed, replaced by policytool.desktop.in >> * policytool.desktop.in: new file, stub for desktop file, have >> variable >> to be substituted during make >> > > More comments on the patch below. > >> To fulfil the bug, it will needs probably backport to 1.9 and 1.10 (1.11?) >> >> Regards, J. >> >> setableDesktpsPaths.patch >> >> >> diff -r cf80d2049346 Makefile.am >> --- a/Makefile.am Tue Dec 20 13:49:11 2011 -0500 >> +++ b/Makefile.am Wed Dec 21 15:58:05 2011 +0100 >> @@ -616,7 +616,6 @@ >> $(top_srcdir)/patches/* \ >> contrib arm_port \ >> overlays \ >> - jconsole.desktop policytool.desktop \ > > You probably want to add the *.in files here. Otherwise 'make dist' will not include the jconsole.desktop.in file. > >> $(JTREG_SRCS) HACKING pulseaudio fsg.sh \ >> hotspot.map \ >> autogen.sh \ >> @@ -641,7 +640,7 @@ >> clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \ >> clean-rewriter clean-rewrite-rhino clean-rt clean-bootstrap-directory \ >> clean-bootstrap-directory-ecj clean-bootstrap-directory-symlink \ >> - clean-bootstrap-directory-symlink-ecj clean-fonts >> + clean-bootstrap-directory-symlink-ecj clean-fonts clean-desktop-files >> if [ -e bootstrap ]; then \ >> rmdir bootstrap ; \ >> fi >> @@ -702,8 +701,13 @@ >> # OpenJDK Source Preparation Targets >> # ================================== >> >> -# Download OpenJDK sources. >> +jconsole.desktop: > > Perhaps this should be: > jconsole.destkop: jconsole.desktop.in > >> + cat jconsole.desktop.in | sed s,JCONSOLE_DESKTOP,$(JCONSOLE_DESKTOP),> jconsole.desktop >> > > You can use '<' on sed to save the invocation of the cat command: > sed -e regular_expression_here < jconsole.desktop.in > jconsole.desktop > >> +policytool.desktop: >> + cat policytool.desktop.in | sed s,POLICYTOOL_DESKTOP,$(POLICYTOOL_DESKTOP),> policytool.desktop >> + >> +# Download OpenJDK sources. >> stamps/hgforest.stamp: >> if !USE_HG >> else >> @@ -1073,6 +1077,10 @@ >> clean-fonts: >> rm -f stamps/fonts.stamp >> >> +clean-desktop-files: >> + -rm -f policytool.desktop >> + -rm -f jconsole.desktop >> + >> stamps/patch-fsg.stamp: stamps/fonts.stamp >> mkdir -p stamps ; \ >> rm -f stamps/patch-fsg.stamp.tmp ; \ >> @@ -1381,7 +1389,7 @@ >> # you change it in the icedtea-debug target as well. >> stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ >> $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \ >> - stamps/jamvm.stamp >> + stamps/jamvm.stamp jconsole.desktop policytool.desktop >> $(ARCH_PREFIX) $(MAKE) -j1 \ >> $(ICEDTEA_ENV) \ >> -C openjdk \ >> @@ -1412,7 +1420,7 @@ >> >> stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ >> $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \ >> - stamps/jamvm.stamp >> + stamps/jamvm.stamp jconsole.desktop policytool.desktop >> $(ARCH_PREFIX) $(MAKE) -j1 \ >> $(ICEDTEA_ENV) \ >> -C openjdk \ >> diff -r cf80d2049346 acinclude.m4 >> --- a/acinclude.m4 Tue Dec 20 13:49:11 2011 -0500 >> +++ b/acinclude.m4 Wed Dec 21 15:58:05 2011 +0100 >> @@ -129,6 +129,37 @@ >> AC_SUBST(OS_PATH) >> ]) >> >> +AC_DEFUN([IT_SET_JCONSOLE_DESKTOP], >> +[ >> + AC_MSG_CHECKING([which jconsole path will be used]) >> + AC_ARG_WITH([jconsole], >> + [AS_HELP_STRING(--with-jconsole,specify location of the jconsole used in jconsole.desktop file)], >> + [ >> + JCONSOLE_DESKTOP="${withval}" >> + ], >> + [ >> + JCONSOLE_DESKTOP="/usr/bin/jconsole" >> + ]) >> + AC_MSG_RESULT([${JCONSOLE_DESKTOP}]) >> + AC_SUBST(JCONSOLE_DESKTOP) >> +]) >> + >> +AC_DEFUN([IT_SET_POLICYTOOL_DESKTOP], >> +[ >> + AC_MSG_CHECKING([which policytool path will be used]) >> + AC_ARG_WITH([policytool], >> + [AS_HELP_STRING(--with-policytool,specify location of the policytool used in policytool.desktop file)], >> + [ >> + POLICYTOOL_DESKTOP="${withval}" >> + ], >> + [ >> + POLICYTOOL_DESKTOP="/usr/bin/policytool" >> + ]) >> + AC_MSG_RESULT([${POLICYTOOL_DESKTOP}]) >> + AC_SUBST(POLICYTOOL_DESKTOP) >> +]) >> + >> + >> AC_DEFUN([IT_FIND_JAVAC], >> [ >> JAVAC=${SYSTEM_JDK_DIR}/bin/javac >> diff -r cf80d2049346 configure.ac >> --- a/configure.ac Tue Dec 20 13:49:11 2011 -0500 >> +++ b/configure.ac Wed Dec 21 15:58:05 2011 +0100 >> @@ -31,6 +31,9 @@ >> IT_FIND_TOOL([UNZIP], [unzip]) >> IT_FIND_TOOL([CPIO], [cpio]) >> IT_FIND_TOOL([FILE], [file]) >> +IT_SET_JCONSOLE_DESKTOP >> +IT_SET_POLICYTOOL_DESKTOP >> + >> AC_CHECK_TOOLS([FASTJAR], [fastjar jar]) >> if test "x$FASTJAR" = x; then >> AC_MSG_ERROR([Can't find fastjar or jar]) >> diff -r cf80d2049346 jconsole.desktop >> --- a/jconsole.desktop Tue Dec 20 13:49:11 2011 -0500 >> +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 >> @@ -1,10 +0,0 @@ >> -[Desktop Entry] >> -Name=OpenJDK Monitoring& Management Console >> -Comment=Monitor and manage OpenJDK applications >> -Exec=/usr/bin/jconsole >> -Icon=java >> -Terminal=false >> -Type=Application >> -StartupWMClass=sun-tools-jconsole-JConsole >> -Categories=Development;Monitor;Java; >> -Version=1.0 >> diff -r cf80d2049346 jconsole.desktop.in >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/jconsole.desktop.in Wed Dec 21 15:58:05 2011 +0100 >> @@ -0,0 +1,11 @@ >> +[Desktop Entry] >> +Name=OpenJDK Monitoring& Management Console >> +Comment=Monitor and manage OpenJDK applications >> +Exec=JCONSOLE_DESKTOP > > It might be a good idea to use @ around JCONSOLE_DESKTOP (as in @JCONSOLE_DESKTOP@). This is the normal convention for specifying a variable that will be replaced in a .in file. > >> +Icon=java >> +Terminal=false >> +Type=Application >> +StartupWMClass=sun-tools-jconsole-JConsole >> +Categories=Development;Monitor;Java; >> +Version=1.0 >> +Name[en_US]=jconsole.desktop > > This Name doesn't look right. Shouldn't this be "OpenJDK Monitoring & Management Console"? Name (and Name[*], since name is of type localestring) is supposed to be the name of the application: > http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html > >> diff -r cf80d2049346 policytool.desktop >> --- a/policytool.desktop Tue Dec 20 13:49:11 2011 -0500 >> +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 >> @@ -1,10 +0,0 @@ >> -[Desktop Entry] >> -Name=OpenJDK Policy Tool >> -Comment=Manage OpenJDK policy files >> -Exec=/usr/bin/policytool >> -Icon=java >> -Terminal=false >> -Type=Application >> -StartupWMClass=sun-security-tools-PolicyTool >> -Categories=Development;Java; >> -Version=1.0 >> diff -r cf80d2049346 policytool.desktop.in >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/policytool.desktop.in Wed Dec 21 15:58:05 2011 +0100 >> @@ -0,0 +1,11 @@ >> +[Desktop Entry] >> +Name=OpenJDK Policy Tool >> +Comment=Manage OpenJDK policy files >> +Exec=POLICYTOOL_DESKTOP >> +Icon=java >> +Terminal=false >> +Type=Application >> +StartupWMClass=sun-security-tools-PolicyTool >> +Categories=Development;Java; >> +Version=1.0 >> +Name[en_US]=policytool.desktop >> > > Cheers, > Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: setableDesktpsPaths2.patch Type: text/x-patch Size: 5885 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120105/2ff3ff6d/setableDesktpsPaths2.patch From dbhole at icedtea.classpath.org Thu Jan 5 07:37:24 2012 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Thu, 05 Jan 2012 15:37:24 +0000 Subject: /hg/release/icedtea6-1.10: S7037939, S7034464: Import Andrew Hal... Message-ID: changeset 2aa0bd4d0654 in /hg/release/icedtea6-1.10 details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=2aa0bd4d0654 author: Deepak Bhole date: Thu Jan 05 10:37:17 2012 -0500 S7037939, S7034464: Import Andrew Haley's HugePage support patches diffstat: ChangeLog | 12 + Makefile.am | 6 +- NEWS | 4 + patches/openjdk/7034464-hugepage.patch | 454 +++++++++++++++++++++++++++++++++ patches/openjdk/7037939-hugepage.patch | 69 +++++ patches/openjdk/7043564-hugepage.patch | 20 + 6 files changed, 564 insertions(+), 1 deletions(-) diffs (truncated from 618 to 500 lines): diff -r 7a2f446f71e1 -r 2aa0bd4d0654 ChangeLog --- a/ChangeLog Fri Oct 21 15:04:36 2011 +0100 +++ b/ChangeLog Thu Jan 05 10:37:17 2012 -0500 @@ -1,3 +1,15 @@ +2012-01-04 Deepak Bhole + + S7037939, S7034464: Import Andrew Haley's HugePage support patches + * Makefile (ICEDTEA_PATCHES): Add 7034464-hugepage.patch, + 7037939-hugepage.patch and 7043564-hugepage.patch. + * patches/openjdk/7034464-hugepage.patch: Support transparent huge + pages on Linux available since 2.6.38 + * patches/openjdk/7037939-hugepage.patch: Disable adaptive + resizing if SHM large pages are used + * patches/openjdk/7043564-hugepage.patch: Import from upstream + * NEWS: Add S7037939, S7034464 + 2011-10-21 Andrew John Hughes * patches/security/20111018/7083012.patch: diff -r 7a2f446f71e1 -r 2aa0bd4d0654 Makefile.am --- a/Makefile.am Fri Oct 21 15:04:36 2011 +0100 +++ b/Makefile.am Thu Jan 05 10:37:17 2012 -0500 @@ -362,7 +362,10 @@ patches/openjdk/7036148-npe-null-jmenu-name.patch \ patches/jtreg-bug7036148-test.patch \ patches/support_linux_3.patch \ - patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch + patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \ + patches/openjdk/7034464-hugepage.patch \ + patches/openjdk/7037939-hugepage.patch \ + patches/openjdk/7043564-hugepage.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ @@ -1274,6 +1277,7 @@ ln -sf $(abs_top_builddir)/javac $(ECJ_BOOT_DIR)/bin/javac ln -sf $(abs_top_builddir)/javap $(ECJ_BOOT_DIR)/bin/javap mkdir -p $(ECJ_BOOT_DIR)/lib/endorsed && \ + ln -sf /usr/share/java/xml-commons-apis.jar $(ECJ_BOOT_DIR)/lib/endorsed/xml-commons-apis.jar && \ ln -sf $(XALAN2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2.jar && \ ln -sf $(XALAN2_SERIALIZER_JAR) \ $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2-serializer.jar && \ diff -r 7a2f446f71e1 -r 2aa0bd4d0654 NEWS --- a/NEWS Fri Oct 21 15:04:36 2011 +0100 +++ b/NEWS Thu Jan 05 10:37:17 2012 -0500 @@ -11,6 +11,10 @@ New in release 1.10.5 (20XX-XX-XX): +* Backports + - S7034464: Support transparent large pages on Linux + - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used + New in release 1.10.4 (2011-10-18): * Security fixes diff -r 7a2f446f71e1 -r 2aa0bd4d0654 patches/openjdk/7034464-hugepage.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7034464-hugepage.patch Thu Jan 05 10:37:17 2012 -0500 @@ -0,0 +1,458 @@ +# HG changeset patch +# User iveresov +# Date 1303344724 25200 +# Node ID 139667d9836ae218ab06a74d5813a5a700a076c9 +# Parent 49a67202bc671d23d719c9e14752d80295a9e8f6 +7034464: Support transparent large pages on Linux +Summary: Support transparent huge pages on Linux available since 2.6.38 +Reviewed-by: iveresov, ysr +Contributed-by: aph at redhat.com +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp openjdk/hotspot/src/os/linux/vm/globals_linux.hpp +--- openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp 2011-03-16 02:30:16.000000000 +0000 ++++ openjdk/hotspot/src/os/linux/vm/globals_linux.hpp 2011-05-04 11:57:15.083470027 +0100 +@@ -29,13 +29,19 @@ + // Defines Linux specific flags. They are not available on other platforms. + // + #define RUNTIME_OS_FLAGS(develop, develop_pd, product, product_pd, diagnostic, notproduct) \ +- product(bool, UseOprofile, false, \ +- "enable support for Oprofile profiler") \ +- \ +- product(bool, UseLinuxPosixThreadCPUClocks, true, \ +- "enable fast Linux Posix clocks where available") +-// NB: The default value of UseLinuxPosixThreadCPUClocks may be +-// overridden in Arguments::parse_each_vm_init_arg. ++ product(bool, UseOprofile, false, \ ++ "enable support for Oprofile profiler") \ ++ \ ++ product(bool, UseLinuxPosixThreadCPUClocks, true, \ ++ "enable fast Linux Posix clocks where available") \ ++/* NB: The default value of UseLinuxPosixThreadCPUClocks may be \ ++ overridden in Arguments::parse_each_vm_init_arg. */ \ ++ \ ++ product(bool, UseHugeTLBFS, false, \ ++ "Use MAP_HUGETLB for large pages") \ ++ \ ++ product(bool, UseSHM, false, \ ++ "Use SYSV shared memory for large pages") + + // + // Defines Linux-specific default values. The flags are available on all +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-03 14:32:54.285722656 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-09 14:31:51.358502774 +0100 +@@ -2495,16 +2495,40 @@ + return res != (uintptr_t) MAP_FAILED; + } + ++// Define MAP_HUGETLB here so we can build HotSpot on old systems. ++#ifndef MAP_HUGETLB ++#define MAP_HUGETLB 0x40000 ++#endif ++ ++// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. ++#ifndef MADV_HUGEPAGE ++#define MADV_HUGEPAGE 14 ++#endif ++ + bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, + bool exec) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; ++ uintptr_t res = ++ (uintptr_t) ::mmap(addr, size, prot, ++ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, ++ -1, 0); ++ return res != (uintptr_t) MAP_FAILED; ++ } ++ + return commit_memory(addr, size, exec); + } + +-void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } ++void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ // We don't check the return value: madvise(MADV_HUGEPAGE) may not ++ // be supported or the memory may already be backed by huge pages. ++ ::madvise(addr, bytes, MADV_HUGEPAGE); ++ } ++} + + void os::free_memory(char *addr, size_t bytes) { +- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, +- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); ++ ::madvise(addr, bytes, MADV_DONTNEED); + } + + void os::numa_make_global(char *addr, size_t bytes) { +@@ -2870,7 +2894,16 @@ + static size_t _large_page_size = 0; + + bool os::large_page_init() { +- if (!UseLargePages) return false; ++ if (!UseLargePages) { ++ UseHugeTLBFS = false; ++ UseSHM = false; ++ return false; ++ } ++ ++ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { ++ // Our user has not expressed a preference, so we'll try both. ++ UseHugeTLBFS = UseSHM = true; ++ } + + if (LargePageSizeInBytes) { + _large_page_size = LargePageSizeInBytes; +@@ -2915,6 +2948,9 @@ + } + } + ++ // print a warning if any large page related flag is specified on command line ++ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); ++ + const size_t default_page_size = (size_t)Linux::page_size(); + if (_large_page_size > default_page_size) { + _page_sizes[0] = _large_page_size; +@@ -2922,6 +2958,14 @@ + _page_sizes[2] = 0; + } + ++ UseHugeTLBFS = UseHugeTLBFS && ++ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); ++ ++ if (UseHugeTLBFS) ++ UseSHM = false; ++ ++ UseLargePages = UseHugeTLBFS || UseSHM; ++ + // Large page support is available on 2.6 or newer kernel, some vendors + // (e.g. Redhat) have backported it to their 2.4 based distributions. + // We optimistically assume the support is available. If later it turns out +@@ -2936,7 +2980,7 @@ + char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { + // "exec" is passed in but not used. Creating the shared image for + // the code cache doesn't have an SHM_X executable permission to check. +- assert(UseLargePages, "only for large pages"); ++ assert(UseLargePages && UseSHM, "only for SHM large pages"); + + key_t key = IPC_PRIVATE; + char *addr; +@@ -3003,19 +3047,19 @@ + return _large_page_size; + } + +-// Linux does not support anonymous mmap with large page memory. The only way +-// to reserve large page memory without file backing is through SysV shared +-// memory API. The entire memory region is committed and pinned upfront. +-// Hopefully this will change in the future... ++// HugeTLBFS allows application to commit large page memory on demand; ++// with SysV SHM the entire memory region must be allocated as shared ++// memory. + bool os::can_commit_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + bool os::can_execute_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + // Reserve memory at an arbitrary address, only if that area is ++// Reserve memory at an arbitrary address, only if that area is + // available (and not reserved for something else). + + char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { +@@ -5009,6 +5053,43 @@ + // JSR166 + // ------------------------------------------------------- + ++bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { ++ bool result = false; ++ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, ++ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, ++ -1, 0); ++ ++ if (p != (void *) -1) { ++ // We don't know if this really is a huge page or not. ++ FILE *fp = fopen("/proc/self/maps", "r"); ++ if (fp) { ++ while (!feof(fp)) { ++ char chars[257]; ++ long x = 0; ++ if (fgets(chars, sizeof(chars), fp)) { ++ if (sscanf(chars, "%lx-%*lx", &x) == 1 ++ && x == (long)p) { ++ if (strstr (chars, "hugepage")) { ++ result = true; ++ break; ++ } ++ } ++ } ++ } ++ fclose(fp); ++ } ++ munmap (p, page_size); ++ if (result) ++ return true; ++ } ++ ++ if (warn) { ++ warning("HugeTLBFS is not supported by the operating system."); ++ } ++ ++ return result; ++} ++ + /* + * The solaris and linux implementations of park/unpark are fairly + * conservative for now, but can be improved. They currently use a +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-03 14:32:53.972649764 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-04 11:57:15.085470494 +0100 +@@ -117,6 +117,10 @@ + # include + # include + ++#if __x86_64__ ++#include ++#endif ++ + #define MAX_PATH (2 * K) + + // for timer info max values which include all bits +@@ -2491,16 +2495,40 @@ + return res != (uintptr_t) MAP_FAILED; + } + ++// Define MAP_HUGETLB here so we can build HotSpot on old systems. ++#ifndef MAP_HUGETLB ++#define MAP_HUGETLB 0x40000 ++#endif ++ ++// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. ++#ifndef MADV_HUGEPAGE ++#define MADV_HUGEPAGE 14 ++#endif ++ + bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, + bool exec) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; ++ uintptr_t res = ++ (uintptr_t) ::mmap(addr, size, prot, ++ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, ++ -1, 0); ++ return res != (uintptr_t) MAP_FAILED; ++ } ++ + return commit_memory(addr, size, exec); + } + +-void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } ++void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ // We don't check the return value: madvise(MADV_HUGEPAGE) may not ++ // be supported or the memory may already be backed by huge pages. ++ ::madvise(addr, bytes, MADV_HUGEPAGE); ++ } ++} + + void os::free_memory(char *addr, size_t bytes) { +- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, +- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); ++ ::madvise(addr, bytes, MADV_DONTNEED); + } + + void os::numa_make_global(char *addr, size_t bytes) { +@@ -2544,6 +2572,21 @@ + return end; + } + ++static int sched_getcpu_syscall(void) { ++ unsigned int cpu; ++ int retval = -1; ++ ++#if __x86_64__ ++ typedef long (*vgetcpu_t)(unsigned int *cpu, unsigned int *node, unsigned long *tcache); ++ vgetcpu_t vgetcpu = (vgetcpu_t)VSYSCALL_ADDR(__NR_vgetcpu); ++ retval = vgetcpu(&cpu, NULL, NULL); ++#elif __i386__ ++ retval = syscall(SYS_getcpu, &cpu, NULL, NULL); ++#endif ++ ++ return (retval == -1) ? retval : cpu; ++} ++ + extern "C" void numa_warn(int number, char *where, ...) { } + extern "C" void numa_error(char *where) { } + +@@ -2565,6 +2608,10 @@ + set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, + dlsym(RTLD_DEFAULT, "sched_getcpu"))); + ++ // If it's not, try a direct syscall. ++ if (sched_getcpu() == -1) ++ set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, (void*)&sched_getcpu_syscall)); ++ + if (sched_getcpu() != -1) { // Does it work? + void *handle = dlopen("libnuma.so.1", RTLD_LAZY); + if (handle != NULL) { +@@ -2847,7 +2894,16 @@ + static size_t _large_page_size = 0; + + bool os::large_page_init() { +- if (!UseLargePages) return false; ++ if (!UseLargePages) { ++ UseHugeTLBFS = false; ++ UseSHM = false; ++ return false; ++ } ++ ++ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { ++ // Our user has not expressed a preference, so we'll try both. ++ UseHugeTLBFS = UseSHM = true; ++ } + + if (LargePageSizeInBytes) { + _large_page_size = LargePageSizeInBytes; +@@ -2892,6 +2948,9 @@ + } + } + ++ // print a warning if any large page related flag is specified on command line ++ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); ++ + const size_t default_page_size = (size_t)Linux::page_size(); + if (_large_page_size > default_page_size) { + _page_sizes[0] = _large_page_size; +@@ -2899,6 +2958,14 @@ + _page_sizes[2] = 0; + } + ++ UseHugeTLBFS = UseHugeTLBFS && ++ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); ++ ++ if (UseHugeTLBFS) ++ UseSHM = false; ++ ++ UseLargePages = UseHugeTLBFS || UseSHM; ++ + // Large page support is available on 2.6 or newer kernel, some vendors + // (e.g. Redhat) have backported it to their 2.4 based distributions. + // We optimistically assume the support is available. If later it turns out +@@ -2913,7 +2980,7 @@ + char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { + // "exec" is passed in but not used. Creating the shared image for + // the code cache doesn't have an SHM_X executable permission to check. +- assert(UseLargePages, "only for large pages"); ++ assert(UseLargePages && UseSHM, "only for SHM large pages"); + + key_t key = IPC_PRIVATE; + char *addr; +@@ -2980,19 +3047,19 @@ + return _large_page_size; + } + +-// Linux does not support anonymous mmap with large page memory. The only way +-// to reserve large page memory without file backing is through SysV shared +-// memory API. The entire memory region is committed and pinned upfront. +-// Hopefully this will change in the future... ++// HugeTLBFS allows application to commit large page memory on demand; ++// with SysV SHM the entire memory region must be allocated as shared ++// memory. + bool os::can_commit_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + bool os::can_execute_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + // Reserve memory at an arbitrary address, only if that area is ++// Reserve memory at an arbitrary address, only if that area is + // available (and not reserved for something else). + + char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { +@@ -4081,6 +4148,23 @@ + UseNUMA = false; + } + } ++ // With SHM large pages we cannot uncommit a page, so there's not way ++ // we can make the adaptive lgrp chunk resizing work. If the user specified ++ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and ++ // disable adaptive resizing. ++ if (UseNUMA && UseLargePages && UseSHM) { ++ if (!FLAG_IS_DEFAULT(UseNUMA)) { ++ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { ++ UseLargePages = false; ++ } else { ++ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); ++ UseAdaptiveSizePolicy = false; ++ UseAdaptiveNUMAChunkSizing = false; ++ } ++ } else { ++ UseNUMA = false; ++ } ++ } + if (!UseNUMA && ForceNUMA) { + UseNUMA = true; + } +@@ -4986,6 +5070,43 @@ + // JSR166 + // ------------------------------------------------------- + ++bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { ++ bool result = false; ++ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, ++ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, ++ -1, 0); ++ ++ if (p != (void *) -1) { ++ // We don't know if this really is a huge page or not. ++ FILE *fp = fopen("/proc/self/maps", "r"); ++ if (fp) { ++ while (!feof(fp)) { ++ char chars[257]; ++ long x = 0; ++ if (fgets(chars, sizeof(chars), fp)) { ++ if (sscanf(chars, "%lx-%*lx", &x) == 1 ++ && x == (long)p) { ++ if (strstr (chars, "hugepage")) { ++ result = true; ++ break; ++ } ++ } ++<+ } ++ } ++ fclose(fp); ++ } ++ munmap (p, page_size); ++ if (result) ++ return true; ++ } ++ ++ if (warn) { ++ warning("HugeTLBFS is not supported by the operating system."); ++ } ++ ++ return result; From dbhole at redhat.com Thu Jan 5 07:37:46 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Thu, 5 Jan 2012 10:37:46 -0500 Subject: RFC: Backport HugePage support to IcedTea6 1.10 In-Reply-To: <20120105000252.GA18480@rivendell.middle-earth.co.uk> References: <20120104224856.GA8560@redhat.com> <20120105000252.GA18480@rivendell.middle-earth.co.uk> Message-ID: <20120105153745.GA18450@redhat.com> * Dr Andrew John Hughes [2012-01-04 19:02]: > On 17:48 Wed 04 Jan , Deepak Bhole wrote: > > Hi, > > > > Attached patch backports HugePage support into 1.10. It combines these two > > patches, merged into one because the latter renames files from the first for > > the most part and neither will apply without updating anyway: > > http://icedtea.classpath.org/hg/icedtea6/rev/e32979d54978 > > http://icedtea.classpath.org/hg/icedtea6/rev/320b7ef798ed > > > > ChangeLog: > > 2012-01-04 Deepak Bhole > > > > S7037939, S7034464: Import Andrew Haley's HugePage support patches > > * Makefile (ICEDTEA_PATCHES): Add 7034464-hugepage.patch, > > 7037939-hugepage.patch and 7043564-hugepage.patch. > > * patches/openjdk/7034464-hugepage.patch: Support transparent huge > > pages on Linux available since 2.6.38 > > * patches/openjdk/7037939-hugepage.patch: Disable adaptive > > resizing if SHM large pages are used > > * patches/openjdk/7043564-hugepage.patch: Import from upstream > > * NEWS: Add S7037939, S7034464 > > > > Okay for push? > > > > Cheers, > > Deepak > > Looks good, assuming it builds. Please add a newline after the 'New in release...' > line in NEWS. Then it's good to push. Thanks, new line added and pushed. Cheers, Deepak > > -- > 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 Thu Jan 5 07:57:28 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 05 Jan 2012 15:57:28 +0000 Subject: [Bug 846] Plugin tries to use a SOCKS proxy even if there is none configured In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=846 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|dbhole at redhat.com |omajid at redhat.com -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From jvanek at icedtea.classpath.org Thu Jan 5 08:32:36 2012 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 05 Jan 2012 16:32:36 +0000 Subject: /hg/icedtea-web: Added check for xsltproc tool Message-ID: changeset 64979652c3b7 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=64979652c3b7 author: Jiri Vanek date: Thu Jan 05 17:33:06 2012 +0100 Added check for xsltproc tool diffstat: ChangeLog | 7 +++++++ Makefile.am | 10 +++++++--- configure.ac | 2 ++ 3 files changed, 16 insertions(+), 3 deletions(-) diffs (53 lines): diff -r 95dee11ecb8a -r 64979652c3b7 ChangeLog --- a/ChangeLog Thu Dec 22 16:15:54 2011 -0500 +++ b/ChangeLog Thu Jan 05 17:33:06 2012 +0100 @@ -1,3 +1,10 @@ +2011-12-15 Jiri Vanek + + * configure.ac: added search for xsltproc program and setting + WITH_XSLTPROC variable + * Makefile.am: xsltproc result is no longer ignored, command + itself is in conditional block + 2011-12-22 Thomas Meyer * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc(sendMember): Use diff -r 95dee11ecb8a -r 64979652c3b7 Makefile.am --- a/Makefile.am Thu Dec 22 16:15:54 2011 -0500 +++ b/Makefile.am Thu Jan 05 17:33:06 2012 +0100 @@ -564,7 +564,9 @@ > stdout.log 2> stderr.log ; \ cat stdout.log ; \ cat stderr.log >&2 - -xsltproc $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(JNLP_TESTS_ENGINE_DIR)/tests-output.xml > $(TESTS_DIR)/index_reproducers.html +if WITH_XSLTPROC + $(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(JNLP_TESTS_ENGINE_DIR)/tests-output.xml > $(TESTS_DIR)/index_reproducers.html +endif touch $@ netx-unit-tests-source-files.txt: @@ -609,8 +611,10 @@ $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names \ > stdout.log 2> stderr.log ; \ cat stdout.log ; \ - cat stderr.log >&2 ; - -xsltproc $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml > $(TESTS_DIR)/index_unit.html + cat stderr.log >&2 +if WITH_XSLTPROC + $(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml > $(TESTS_DIR)/index_unit.html +endif touch $@ #warning, during this target tests.build/netx/unit/tests-output.xml is backup and rewriten (but not coresponding html file) diff -r 95dee11ecb8a -r 64979652c3b7 configure.ac --- a/configure.ac Thu Dec 22 16:15:54 2011 -0500 +++ b/configure.ac Thu Jan 05 17:33:06 2012 +0100 @@ -87,6 +87,8 @@ # Find optional depedencies # +AC_CHECK_PROGS([XSLTPROC],[xsltproc],[], []) +AM_CONDITIONAL([WITH_XSLTPROC], [test x"$XSLTPROC" != x ]) IT_FIND_OPTIONAL_JAR([rhino], RHINO, [/usr/share/java/js.jar /usr/share/rhino-1.6/lib/js.jar]) IT_FIND_OPTIONAL_JAR([junit], JUNIT, From omajid at icedtea.classpath.org Thu Jan 5 08:46:01 2012 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Thu, 05 Jan 2012 16:46:01 +0000 Subject: /hg/release/icedtea6-1.8: S7102369, S7094468: remove java.rmi.se... Message-ID: changeset 33616a2b4d2e in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=33616a2b4d2e author: Omair Majid date: Thu Jan 05 11:45:54 2012 -0500 S7102369, S7094468: remove java.rmi.server.codebase property parsing from rmiregistry Backport of: S7102369: remove java.rmi.server.codebase property parsing from registyimpl S7094468: rmiregistry clean up Upstream changeset: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/6b46f3c7c97c Fixes RH751203 2011-12-12 Omair Majid S7102369, S7094468: remove java.rmi.server.codebase property parsing from rmiregistry * patches/openjdk/7102369-7094468-rmiregistry.patch: New file. Backport from OpenJDK6. * Makefile.am (ICEDTEA_PATCHES): Apply the patch. diffstat: ChangeLog | 8 + Makefile.am | 3 +- NEWS | 4 + patches/openjdk/7102369-7094468-rmiregistry.patch | 466 ++++++++++++++++++++++ 4 files changed, 480 insertions(+), 1 deletions(-) diffs (truncated from 519 to 500 lines): diff -r 0e6611b4f2d9 -r 33616a2b4d2e ChangeLog --- a/ChangeLog Tue Nov 08 23:12:16 2011 +0000 +++ b/ChangeLog Thu Jan 05 11:45:54 2012 -0500 @@ -1,3 +1,11 @@ +2012-01-04 Omair Majid + + S7102369, S7094468: remove java.rmi.server.codebase property parsing from + rmiregistry + * patches/openjdk/7102369-7094468-rmiregistry.patch: New file. Backport + from OpenJDK6. + * Makefile.am (ICEDTEA_PATCHES): Apply the patch. + 2011-11-08 Andrew John Hughes * NEWS: Prepare for 1.8.12. diff -r 0e6611b4f2d9 -r 33616a2b4d2e Makefile.am --- a/Makefile.am Tue Nov 08 23:12:16 2011 +0000 +++ b/Makefile.am Thu Jan 05 11:45:54 2012 -0500 @@ -401,7 +401,8 @@ patches/jtreg-LastErrorString.patch \ patches/mark_sun_toolkit_privileged_code.patch \ patches/support_linux_3.patch \ - patches/libpng-1.5.patch + patches/libpng-1.5.patch \ + patches/openjdk/7102369-7094468-rmiregistry.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \ diff -r 0e6611b4f2d9 -r 33616a2b4d2e NEWS --- a/NEWS Tue Nov 08 23:12:16 2011 +0000 +++ b/NEWS Thu Jan 05 11:45:54 2012 -0500 @@ -10,6 +10,10 @@ New in release 1.8.12 (20XX-XX-XX): +* Backports + - S7102369: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468: rmiregistry clean up + New in release 1.8.11 (2011-11-08): * Security fixes diff -r 0e6611b4f2d9 -r 33616a2b4d2e patches/openjdk/7102369-7094468-rmiregistry.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7102369-7094468-rmiregistry.patch Thu Jan 05 11:45:54 2012 -0500 @@ -0,0 +1,473 @@ +# HG changeset patch +# User coffeys +# Date 1321449297 0 +# Node ID 6b46f3c7c97cb060f88b196171b95d33bff80b7c +# Parent 020dcd6d69ac9406809aabe8888a0b8d52912e7f +7102369: remove java.rmi.server.codebase property parsing from registyimpl +7094468: rmiregistry clean up +Reviewed-by: smarks + +diff -r 020dcd6d69ac -r 6b46f3c7c97c src/share/classes/sun/rmi/registry/RegistryImpl.java +--- openjdk/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java Tue Nov 15 16:44:14 2011 -0800 ++++ openjdk/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java Wed Nov 16 13:14:57 2011 +0000 +@@ -29,6 +29,7 @@ + import java.util.Hashtable; + import java.util.MissingResourceException; + import java.util.ResourceBundle; ++import java.io.FilePermission; + import java.io.IOException; + import java.net.*; + import java.rmi.*; +@@ -41,12 +42,12 @@ + import java.security.AccessControlContext; + import java.security.AccessController; + import java.security.CodeSource; +-import java.security.Policy; ++import java.security.Policy; + import java.security.PrivilegedActionException; + import java.security.PrivilegedExceptionAction; + import java.security.PermissionCollection; + import java.security.Permissions; +-import java.security.ProtectionDomain; ++import java.security.ProtectionDomain; + import java.text.MessageFormat; + import sun.rmi.server.LoaderHandler; + import sun.rmi.server.UnicastServerRef; +@@ -54,7 +55,6 @@ + import sun.rmi.transport.LiveRef; + import sun.rmi.transport.ObjectTable; + import sun.rmi.transport.Target; +-import sun.security.action.GetPropertyAction; + + /** + * A "registry" exists on every node that allows RMI connections to +@@ -76,8 +76,10 @@ + + /* indicate compatibility with JDK 1.1.x version of class */ + private static final long serialVersionUID = 4666870661827494597L; +- private Hashtable bindings = new Hashtable(101); +- private static Hashtable allowedAccessCache = new Hashtable(3); ++ private Hashtable bindings ++ = new Hashtable(101); ++ private static Hashtable allowedAccessCache ++ = new Hashtable(3); + private static RegistryImpl registry; + private static ObjID id = new ObjID(ObjID.REGISTRY_ID); + +@@ -129,7 +131,7 @@ + throws RemoteException, NotBoundException + { + synchronized (bindings) { +- Remote obj = (Remote)bindings.get(name); ++ Remote obj = bindings.get(name); + if (obj == null) + throw new NotBoundException(name); + return obj; +@@ -146,7 +148,7 @@ + { + checkAccess("Registry.bind"); + synchronized (bindings) { +- Remote curr = (Remote)bindings.get(name); ++ Remote curr = bindings.get(name); + if (curr != null) + throw new AlreadyBoundException(name); + bindings.put(name, obj); +@@ -163,7 +165,7 @@ + { + checkAccess("Registry.unbind"); + synchronized (bindings) { +- Remote obj = (Remote)bindings.get(name); ++ Remote obj = bindings.get(name); + if (obj == null) + throw new NotBoundException(name); + bindings.remove(name); +@@ -213,10 +215,9 @@ + InetAddress clientHost; + + try { +- clientHost = (InetAddress) +- java.security.AccessController.doPrivileged( +- new java.security.PrivilegedExceptionAction() { +- public Object run() ++ clientHost = java.security.AccessController.doPrivileged( ++ new java.security.PrivilegedExceptionAction() { ++ public InetAddress run() + throws java.net.UnknownHostException + { + return InetAddress.getByName(clientHostName); +@@ -238,8 +239,8 @@ + final InetAddress finalClientHost = clientHost; + + java.security.AccessController.doPrivileged( +- new java.security.PrivilegedExceptionAction() { +- public Object run() throws java.io.IOException { ++ new java.security.PrivilegedExceptionAction() { ++ public Void run() throws java.io.IOException { + /* + * if a ServerSocket can be bound to the client's + * address then that address must be local +@@ -334,19 +335,6 @@ + URL[] urls = sun.misc.URLClassPath.pathToURLs(envcp); + ClassLoader cl = new URLClassLoader(urls); + +- String codebaseProperty = null; +- String prop = java.security.AccessController.doPrivileged( +- new GetPropertyAction("java.rmi.server.codebase")); +- if (prop != null && prop.trim().length() > 0) { +- codebaseProperty = prop; +- } +- URL[] codebaseURLs = null; +- if (codebaseProperty != null) { +- codebaseURLs = sun.misc.URLClassPath.pathToURLs(codebaseProperty); +- } else { +- codebaseURLs = new URL[0]; +- } +- + /* + * Fix bugid 4242317: Classes defined by this class loader should + * be annotated with the value of the "java.rmi.server.codebase" +@@ -364,7 +352,7 @@ + public RegistryImpl run() throws RemoteException { + return new RegistryImpl(regPort); + } +- }, getAccessControlContext(codebaseURLs)); ++ }, getAccessControlContext()); + } catch (PrivilegedActionException ex) { + throw (RemoteException) ex.getException(); + } +@@ -390,11 +378,11 @@ + } + + /** +- * Generates an AccessControlContext from several URLs. ++ * Generates an AccessControlContext with minimal permissions. + * The approach used here is taken from the similar method + * getAccessControlContext() in the sun.applet.AppletPanel class. + */ +- private static AccessControlContext getAccessControlContext(URL[] urls) { ++ private static AccessControlContext getAccessControlContext() { + // begin with permissions granted to all code in current policy + PermissionCollection perms = AccessController.doPrivileged( + new java.security.PrivilegedAction() { +@@ -419,17 +407,15 @@ + + perms.add(new RuntimePermission("accessClassInPackage.sun.*")); + +- // add permissions required to load from codebase URL path +- LoaderHandler.addPermissionsForURLs(urls, perms, false); ++ perms.add(new FilePermission("<>", "read")); + + /* + * Create an AccessControlContext that consists of a single + * protection domain with only the permissions calculated above. + */ + ProtectionDomain pd = new ProtectionDomain( +- new CodeSource((urls.length > 0 ? urls[0] : null), +- (java.security.cert.Certificate[]) null), +- perms); ++ new CodeSource(null, ++ (java.security.cert.Certificate[]) null), perms); + return new AccessControlContext(new ProtectionDomain[] { pd }); + } + } +diff -r 020dcd6d69ac -r 6b46f3c7c97c src/share/classes/sun/rmi/server/LoaderHandler.java +--- openjdk/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java Tue Nov 15 16:44:14 2011 -0800 ++++ openjdk/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java Wed Nov 16 13:14:57 2011 +0000 +@@ -1028,7 +1028,7 @@ + * loader. A given permission is only added to the collection if + * it is not already implied by the collection. + */ +- public static void addPermissionsForURLs(URL[] urls, ++ private static void addPermissionsForURLs(URL[] urls, + PermissionCollection perms, + boolean forLoader) + { +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/readTest.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/readTest.java Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,59 @@ ++/* ++ * 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. ++ * ++ * 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. ++ */ ++ ++import java.rmi.registry.Registry; ++import java.rmi.registry.LocateRegistry; ++import java.rmi.RemoteException; ++import java.rmi.server.UnicastRemoteObject; ++ ++ ++public class readTest { ++ ++ public static void main(String args[]) throws Exception { ++ int port = 7491; ++ try { ++ testPkg.Server obj = new testPkg.Server(); ++ testPkg.Hello stub = (testPkg.Hello) UnicastRemoteObject.exportObject(obj, 0); ++ // Bind the remote object's stub in the registry ++ Registry registry = LocateRegistry.getRegistry(port); ++ registry.bind("Hello", stub); ++ ++ System.err.println("Server ready"); ++ ++ // now, let's test client ++ testPkg.Client client = new testPkg.Client(port); ++ String testStubReturn = client.testStub(); ++ if(!testStubReturn.equals(obj.hello)) { ++ throw new RuntimeException("Test Fails : unexpected string from stub call"); ++ } else { ++ System.out.println("Test passed"); ++ } ++ registry.unbind("Hello"); ++ ++ } catch (Exception e) { ++ System.err.println("Server exception: " + e.toString()); ++ e.printStackTrace(); ++ } ++ ++ } ++} +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/readTest.sh +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/readTest.sh Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,95 @@ ++# ++# 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. ++# ++# 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 7102369 7094468 7100592 ++# @summary remove java.rmi.server.codebase property parsing from registyimpl ++# @run shell readTest.sh ++ ++OS=`uname -s` ++case "$OS" in ++ SunOS | Linux ) ++ PS=":" ++ FS="/" ++ FILEURL="file:" ++ ;; ++ Windows* | CYGWIN* ) ++ PS=";" ++ FS="\\" ++ FILEURL="file:/" ++ ;; ++ * ) ++ echo "Unrecognized system!" ++ exit 1; ++ ;; ++esac ++ ++cp -r ${TESTSRC}${FS}* . ++${TESTJAVA}${FS}bin${FS}javac testPkg${FS}*java ++${TESTJAVA}${FS}bin${FS}javac readTest.java ++ ++mkdir rmi_tmp ++RMIREG_OUT=rmi.out ++#start rmiregistry without any local classes on classpath ++cd rmi_tmp ++${TESTJAVA}${FS}bin${FS}rmiregistry 7491 > ..${FS}${RMIREG_OUT} 2>&1 & ++RMIREG_PID=$! ++# allow some time to start ++sleep 3 ++cd .. ++ ++# trailing / after code base is important for rmi codebase property. ++${TESTJAVA}${FS}bin${FS}java -Djava.rmi.server.codebase=${FILEURL}`pwd`/ readTest > OUT.TXT 2>&1 & ++TEST_PID=$! ++#bulk of testcase - let it run for a while ++sleep 5 ++ ++#we're done, kill processes first ++kill -9 ${RMIREG_PID} ${TEST_PID} ++sleep 3 ++ ++echo "Test output : " ++ ++cat OUT.TXT ++echo "==============" ++echo "rmiregistry output : " ++cat ${RMIREG_OUT} ++echo "==============" ++ ++grep "Server ready" OUT.TXT ++result1=$? ++grep "Test passed" OUT.TXT ++result2=$? ++ ++if [ $result1 -eq 0 -a $result2 -eq 0 ] ++then ++ echo "Passed" ++ exitCode=0; ++else ++ echo "Failed" ++ exitCode=1 ++fi ++rm -rf OUT.TXT ${RMIREG_OUT} rmi_tmp ++exit ${exitCode} ++ ++ +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/testPkg/Client.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/testPkg/Client.java Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,48 @@ ++/* ++ * 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. ++ * ++ * 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 testPkg; ++ ++import java.rmi.registry.LocateRegistry; ++import java.rmi.registry.Registry; ++ ++public class Client { ++ int port; ++ ++ public Client(int p) { ++ port = p; ++ } ++ ++ public String testStub() throws Exception { ++ try { ++ Registry registry = LocateRegistry.getRegistry(port); ++ Hello stub = (Hello) registry.lookup("Hello"); ++ String response = stub.sayHello(); ++ return response; ++ } catch (Exception e) { ++ System.err.println("Client exception: " + e.toString()); ++ throw e; ++ } ++ } ++ } ++ +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/testPkg/Hello.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/testPkg/Hello.java Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,31 @@ ++/* ++ * 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. ++ * ++ * 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 testPkg; ++ ++import java.rmi.Remote; ++import java.rmi.RemoteException; ++ ++public interface Hello extends Remote { ++ String sayHello() throws RemoteException; ++} +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/testPkg/Server.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/testPkg/Server.java Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,36 @@ ++/* ++ * 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. ++ * ++ * 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. From omajid at icedtea.classpath.org Thu Jan 5 08:47:58 2012 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Thu, 05 Jan 2012 16:47:58 +0000 Subject: /hg/release/icedtea6-1.9: S7102369, S7094468: remove java.rmi.se... Message-ID: changeset 05bf6d3edab6 in /hg/release/icedtea6-1.9 details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=05bf6d3edab6 author: Omair Majid date: Thu Jan 05 11:47:52 2012 -0500 S7102369, S7094468: remove java.rmi.server.codebase property parsing from rmiregistry Backport of: S7102369: remove java.rmi.server.codebase property parsing from registyimpl S7094468: rmiregistry clean up Upstream changeset: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/6b46f3c7c97c Fixes RH751203 2011-12-12 Omair Majid S7102369, S7094468: remove java.rmi.server.codebase property parsing from rmiregistry * patches/openjdk/7102369-7094468-rmiregistry.patch: New file. Backport from OpenJDK6. * Makefile.am (ICEDTEA_PATCHES): Apply the patch. diffstat: ChangeLog | 8 + Makefile.am | 3 +- NEWS | 4 + patches/openjdk/7102369-7094468-rmiregistry.patch | 466 ++++++++++++++++++++++ 4 files changed, 480 insertions(+), 1 deletions(-) diffs (truncated from 519 to 500 lines): diff -r 65ae83133df3 -r 05bf6d3edab6 ChangeLog --- a/ChangeLog Tue Nov 08 22:47:10 2011 +0000 +++ b/ChangeLog Thu Jan 05 11:47:52 2012 -0500 @@ -1,3 +1,11 @@ +2012-01-04 Omair Majid + + S7102369, S7094468: remove java.rmi.server.codebase property parsing from + rmiregistry + * patches/openjdk/7102369-7094468-rmiregistry.patch: New file. Backport + from OpenJDK6. + * Makefile.am (ICEDTEA_PATCHES): Apply the patch. + 2011-11-08 Andrew John Hughes * NEWS: Prepare for 1.9.12. diff -r 65ae83133df3 -r 05bf6d3edab6 Makefile.am --- a/Makefile.am Tue Nov 08 22:47:10 2011 +0000 +++ b/Makefile.am Thu Jan 05 11:47:52 2012 -0500 @@ -368,7 +368,8 @@ patches/mark_sun_toolkit_privileged_code.patch \ patches/fonts-rhel-version.patch \ patches/support_linux_3.patch \ - patches/libpng-1.5.patch + patches/libpng-1.5.patch \ + patches/openjdk/7102369-7094468-rmiregistry.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r 65ae83133df3 -r 05bf6d3edab6 NEWS --- a/NEWS Tue Nov 08 22:47:10 2011 +0000 +++ b/NEWS Thu Jan 05 11:47:52 2012 -0500 @@ -10,6 +10,10 @@ New in release 1.9.12 (20XX-XX-XX): +* Backports + - S7102369: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468: rmiregistry clean up + New in release 1.9.11 (2011-11-08): * Security fixes diff -r 65ae83133df3 -r 05bf6d3edab6 patches/openjdk/7102369-7094468-rmiregistry.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7102369-7094468-rmiregistry.patch Thu Jan 05 11:47:52 2012 -0500 @@ -0,0 +1,473 @@ +# HG changeset patch +# User coffeys +# Date 1321449297 0 +# Node ID 6b46f3c7c97cb060f88b196171b95d33bff80b7c +# Parent 020dcd6d69ac9406809aabe8888a0b8d52912e7f +7102369: remove java.rmi.server.codebase property parsing from registyimpl +7094468: rmiregistry clean up +Reviewed-by: smarks + +diff -r 020dcd6d69ac -r 6b46f3c7c97c src/share/classes/sun/rmi/registry/RegistryImpl.java +--- openjdk/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java Tue Nov 15 16:44:14 2011 -0800 ++++ openjdk/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java Wed Nov 16 13:14:57 2011 +0000 +@@ -29,6 +29,7 @@ + import java.util.Hashtable; + import java.util.MissingResourceException; + import java.util.ResourceBundle; ++import java.io.FilePermission; + import java.io.IOException; + import java.net.*; + import java.rmi.*; +@@ -41,12 +42,12 @@ + import java.security.AccessControlContext; + import java.security.AccessController; + import java.security.CodeSource; +-import java.security.Policy; ++import java.security.Policy; + import java.security.PrivilegedActionException; + import java.security.PrivilegedExceptionAction; + import java.security.PermissionCollection; + import java.security.Permissions; +-import java.security.ProtectionDomain; ++import java.security.ProtectionDomain; + import java.text.MessageFormat; + import sun.rmi.server.LoaderHandler; + import sun.rmi.server.UnicastServerRef; +@@ -54,7 +55,6 @@ + import sun.rmi.transport.LiveRef; + import sun.rmi.transport.ObjectTable; + import sun.rmi.transport.Target; +-import sun.security.action.GetPropertyAction; + + /** + * A "registry" exists on every node that allows RMI connections to +@@ -76,8 +76,10 @@ + + /* indicate compatibility with JDK 1.1.x version of class */ + private static final long serialVersionUID = 4666870661827494597L; +- private Hashtable bindings = new Hashtable(101); +- private static Hashtable allowedAccessCache = new Hashtable(3); ++ private Hashtable bindings ++ = new Hashtable(101); ++ private static Hashtable allowedAccessCache ++ = new Hashtable(3); + private static RegistryImpl registry; + private static ObjID id = new ObjID(ObjID.REGISTRY_ID); + +@@ -129,7 +131,7 @@ + throws RemoteException, NotBoundException + { + synchronized (bindings) { +- Remote obj = (Remote)bindings.get(name); ++ Remote obj = bindings.get(name); + if (obj == null) + throw new NotBoundException(name); + return obj; +@@ -146,7 +148,7 @@ + { + checkAccess("Registry.bind"); + synchronized (bindings) { +- Remote curr = (Remote)bindings.get(name); ++ Remote curr = bindings.get(name); + if (curr != null) + throw new AlreadyBoundException(name); + bindings.put(name, obj); +@@ -163,7 +165,7 @@ + { + checkAccess("Registry.unbind"); + synchronized (bindings) { +- Remote obj = (Remote)bindings.get(name); ++ Remote obj = bindings.get(name); + if (obj == null) + throw new NotBoundException(name); + bindings.remove(name); +@@ -213,10 +215,9 @@ + InetAddress clientHost; + + try { +- clientHost = (InetAddress) +- java.security.AccessController.doPrivileged( +- new java.security.PrivilegedExceptionAction() { +- public Object run() ++ clientHost = java.security.AccessController.doPrivileged( ++ new java.security.PrivilegedExceptionAction() { ++ public InetAddress run() + throws java.net.UnknownHostException + { + return InetAddress.getByName(clientHostName); +@@ -238,8 +239,8 @@ + final InetAddress finalClientHost = clientHost; + + java.security.AccessController.doPrivileged( +- new java.security.PrivilegedExceptionAction() { +- public Object run() throws java.io.IOException { ++ new java.security.PrivilegedExceptionAction() { ++ public Void run() throws java.io.IOException { + /* + * if a ServerSocket can be bound to the client's + * address then that address must be local +@@ -334,19 +335,6 @@ + URL[] urls = sun.misc.URLClassPath.pathToURLs(envcp); + ClassLoader cl = new URLClassLoader(urls); + +- String codebaseProperty = null; +- String prop = java.security.AccessController.doPrivileged( +- new GetPropertyAction("java.rmi.server.codebase")); +- if (prop != null && prop.trim().length() > 0) { +- codebaseProperty = prop; +- } +- URL[] codebaseURLs = null; +- if (codebaseProperty != null) { +- codebaseURLs = sun.misc.URLClassPath.pathToURLs(codebaseProperty); +- } else { +- codebaseURLs = new URL[0]; +- } +- + /* + * Fix bugid 4242317: Classes defined by this class loader should + * be annotated with the value of the "java.rmi.server.codebase" +@@ -364,7 +352,7 @@ + public RegistryImpl run() throws RemoteException { + return new RegistryImpl(regPort); + } +- }, getAccessControlContext(codebaseURLs)); ++ }, getAccessControlContext()); + } catch (PrivilegedActionException ex) { + throw (RemoteException) ex.getException(); + } +@@ -390,11 +378,11 @@ + } + + /** +- * Generates an AccessControlContext from several URLs. ++ * Generates an AccessControlContext with minimal permissions. + * The approach used here is taken from the similar method + * getAccessControlContext() in the sun.applet.AppletPanel class. + */ +- private static AccessControlContext getAccessControlContext(URL[] urls) { ++ private static AccessControlContext getAccessControlContext() { + // begin with permissions granted to all code in current policy + PermissionCollection perms = AccessController.doPrivileged( + new java.security.PrivilegedAction() { +@@ -419,17 +407,15 @@ + + perms.add(new RuntimePermission("accessClassInPackage.sun.*")); + +- // add permissions required to load from codebase URL path +- LoaderHandler.addPermissionsForURLs(urls, perms, false); ++ perms.add(new FilePermission("<>", "read")); + + /* + * Create an AccessControlContext that consists of a single + * protection domain with only the permissions calculated above. + */ + ProtectionDomain pd = new ProtectionDomain( +- new CodeSource((urls.length > 0 ? urls[0] : null), +- (java.security.cert.Certificate[]) null), +- perms); ++ new CodeSource(null, ++ (java.security.cert.Certificate[]) null), perms); + return new AccessControlContext(new ProtectionDomain[] { pd }); + } + } +diff -r 020dcd6d69ac -r 6b46f3c7c97c src/share/classes/sun/rmi/server/LoaderHandler.java +--- openjdk/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java Tue Nov 15 16:44:14 2011 -0800 ++++ openjdk/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java Wed Nov 16 13:14:57 2011 +0000 +@@ -1028,7 +1028,7 @@ + * loader. A given permission is only added to the collection if + * it is not already implied by the collection. + */ +- public static void addPermissionsForURLs(URL[] urls, ++ private static void addPermissionsForURLs(URL[] urls, + PermissionCollection perms, + boolean forLoader) + { +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/readTest.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/readTest.java Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,59 @@ ++/* ++ * 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. ++ * ++ * 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. ++ */ ++ ++import java.rmi.registry.Registry; ++import java.rmi.registry.LocateRegistry; ++import java.rmi.RemoteException; ++import java.rmi.server.UnicastRemoteObject; ++ ++ ++public class readTest { ++ ++ public static void main(String args[]) throws Exception { ++ int port = 7491; ++ try { ++ testPkg.Server obj = new testPkg.Server(); ++ testPkg.Hello stub = (testPkg.Hello) UnicastRemoteObject.exportObject(obj, 0); ++ // Bind the remote object's stub in the registry ++ Registry registry = LocateRegistry.getRegistry(port); ++ registry.bind("Hello", stub); ++ ++ System.err.println("Server ready"); ++ ++ // now, let's test client ++ testPkg.Client client = new testPkg.Client(port); ++ String testStubReturn = client.testStub(); ++ if(!testStubReturn.equals(obj.hello)) { ++ throw new RuntimeException("Test Fails : unexpected string from stub call"); ++ } else { ++ System.out.println("Test passed"); ++ } ++ registry.unbind("Hello"); ++ ++ } catch (Exception e) { ++ System.err.println("Server exception: " + e.toString()); ++ e.printStackTrace(); ++ } ++ ++ } ++} +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/readTest.sh +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/readTest.sh Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,95 @@ ++# ++# 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. ++# ++# 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 7102369 7094468 7100592 ++# @summary remove java.rmi.server.codebase property parsing from registyimpl ++# @run shell readTest.sh ++ ++OS=`uname -s` ++case "$OS" in ++ SunOS | Linux ) ++ PS=":" ++ FS="/" ++ FILEURL="file:" ++ ;; ++ Windows* | CYGWIN* ) ++ PS=";" ++ FS="\\" ++ FILEURL="file:/" ++ ;; ++ * ) ++ echo "Unrecognized system!" ++ exit 1; ++ ;; ++esac ++ ++cp -r ${TESTSRC}${FS}* . ++${TESTJAVA}${FS}bin${FS}javac testPkg${FS}*java ++${TESTJAVA}${FS}bin${FS}javac readTest.java ++ ++mkdir rmi_tmp ++RMIREG_OUT=rmi.out ++#start rmiregistry without any local classes on classpath ++cd rmi_tmp ++${TESTJAVA}${FS}bin${FS}rmiregistry 7491 > ..${FS}${RMIREG_OUT} 2>&1 & ++RMIREG_PID=$! ++# allow some time to start ++sleep 3 ++cd .. ++ ++# trailing / after code base is important for rmi codebase property. ++${TESTJAVA}${FS}bin${FS}java -Djava.rmi.server.codebase=${FILEURL}`pwd`/ readTest > OUT.TXT 2>&1 & ++TEST_PID=$! ++#bulk of testcase - let it run for a while ++sleep 5 ++ ++#we're done, kill processes first ++kill -9 ${RMIREG_PID} ${TEST_PID} ++sleep 3 ++ ++echo "Test output : " ++ ++cat OUT.TXT ++echo "==============" ++echo "rmiregistry output : " ++cat ${RMIREG_OUT} ++echo "==============" ++ ++grep "Server ready" OUT.TXT ++result1=$? ++grep "Test passed" OUT.TXT ++result2=$? ++ ++if [ $result1 -eq 0 -a $result2 -eq 0 ] ++then ++ echo "Passed" ++ exitCode=0; ++else ++ echo "Failed" ++ exitCode=1 ++fi ++rm -rf OUT.TXT ${RMIREG_OUT} rmi_tmp ++exit ${exitCode} ++ ++ +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/testPkg/Client.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/testPkg/Client.java Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,48 @@ ++/* ++ * 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. ++ * ++ * 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 testPkg; ++ ++import java.rmi.registry.LocateRegistry; ++import java.rmi.registry.Registry; ++ ++public class Client { ++ int port; ++ ++ public Client(int p) { ++ port = p; ++ } ++ ++ public String testStub() throws Exception { ++ try { ++ Registry registry = LocateRegistry.getRegistry(port); ++ Hello stub = (Hello) registry.lookup("Hello"); ++ String response = stub.sayHello(); ++ return response; ++ } catch (Exception e) { ++ System.err.println("Client exception: " + e.toString()); ++ throw e; ++ } ++ } ++ } ++ +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/testPkg/Hello.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/testPkg/Hello.java Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,31 @@ ++/* ++ * 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. ++ * ++ * 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 testPkg; ++ ++import java.rmi.Remote; ++import java.rmi.RemoteException; ++ ++public interface Hello extends Remote { ++ String sayHello() throws RemoteException; ++} +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/testPkg/Server.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/testPkg/Server.java Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,36 @@ ++/* ++ * 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. ++ * ++ * 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. From omajid at icedtea.classpath.org Thu Jan 5 09:05:49 2012 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Thu, 05 Jan 2012 17:05:49 +0000 Subject: /hg/release/icedtea6-1.10: S7102369, S7094468: remove java.rmi.s... Message-ID: changeset f844632b05a0 in /hg/release/icedtea6-1.10 details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=f844632b05a0 author: Omair Majid date: Thu Jan 05 12:05:12 2012 -0500 S7102369, S7094468: remove java.rmi.server.codebase property parsing from rmiregistry Backport of: S7102369: remove java.rmi.server.codebase property parsing from registyimpl S7094468: rmiregistry clean up Upstream changeset: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/6b46f3c7c97c Fixes RH751203 2012-01-05 Omair Majid S7102369, S7094468: remove java.rmi.server.codebase property parsing from rmiregistry * patches/openjdk/7102369-7094468-rmiregistry.patch: New file. Backport from OpenJDK6. * Makefile.am (ICEDTEA_PATCHES): Apply the patch. diffstat: ChangeLog | 8 + Makefile.am | 4 +- NEWS | 2 + patches/openjdk/7102369-7094468-rmiregistry.patch | 466 ++++++++++++++++++++++ 4 files changed, 478 insertions(+), 2 deletions(-) diffs (truncated from 525 to 500 lines): diff -r 2aa0bd4d0654 -r f844632b05a0 ChangeLog --- a/ChangeLog Thu Jan 05 10:37:17 2012 -0500 +++ b/ChangeLog Thu Jan 05 12:05:12 2012 -0500 @@ -1,3 +1,11 @@ +2012-01-04 Omair Majid + + S7102369, S7094468: remove java.rmi.server.codebase property parsing from + rmiregistry + * patches/openjdk/7102369-7094468-rmiregistry.patch: New file. Backport + from OpenJDK6. + * Makefile.am (ICEDTEA_PATCHES): Apply the patch. + 2012-01-04 Deepak Bhole S7037939, S7034464: Import Andrew Haley's HugePage support patches diff -r 2aa0bd4d0654 -r f844632b05a0 Makefile.am --- a/Makefile.am Thu Jan 05 10:37:17 2012 -0500 +++ b/Makefile.am Thu Jan 05 12:05:12 2012 -0500 @@ -365,7 +365,8 @@ patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \ patches/openjdk/7034464-hugepage.patch \ patches/openjdk/7037939-hugepage.patch \ - patches/openjdk/7043564-hugepage.patch + patches/openjdk/7043564-hugepage.patch \ + patches/openjdk/7102369-7094468-rmiregistry.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ @@ -1277,7 +1278,6 @@ ln -sf $(abs_top_builddir)/javac $(ECJ_BOOT_DIR)/bin/javac ln -sf $(abs_top_builddir)/javap $(ECJ_BOOT_DIR)/bin/javap mkdir -p $(ECJ_BOOT_DIR)/lib/endorsed && \ - ln -sf /usr/share/java/xml-commons-apis.jar $(ECJ_BOOT_DIR)/lib/endorsed/xml-commons-apis.jar && \ ln -sf $(XALAN2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2.jar && \ ln -sf $(XALAN2_SERIALIZER_JAR) \ $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2-serializer.jar && \ diff -r 2aa0bd4d0654 -r f844632b05a0 NEWS --- a/NEWS Thu Jan 05 10:37:17 2012 -0500 +++ b/NEWS Thu Jan 05 12:05:12 2012 -0500 @@ -14,6 +14,8 @@ * Backports - S7034464: Support transparent large pages on Linux - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used + - S7102369: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468: rmiregistry clean up New in release 1.10.4 (2011-10-18): diff -r 2aa0bd4d0654 -r f844632b05a0 patches/openjdk/7102369-7094468-rmiregistry.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7102369-7094468-rmiregistry.patch Thu Jan 05 12:05:12 2012 -0500 @@ -0,0 +1,473 @@ +# HG changeset patch +# User coffeys +# Date 1321449297 0 +# Node ID 6b46f3c7c97cb060f88b196171b95d33bff80b7c +# Parent 020dcd6d69ac9406809aabe8888a0b8d52912e7f +7102369: remove java.rmi.server.codebase property parsing from registyimpl +7094468: rmiregistry clean up +Reviewed-by: smarks + +diff -r 020dcd6d69ac -r 6b46f3c7c97c src/share/classes/sun/rmi/registry/RegistryImpl.java +--- openjdk/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java Tue Nov 15 16:44:14 2011 -0800 ++++ openjdk/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java Wed Nov 16 13:14:57 2011 +0000 +@@ -29,6 +29,7 @@ + import java.util.Hashtable; + import java.util.MissingResourceException; + import java.util.ResourceBundle; ++import java.io.FilePermission; + import java.io.IOException; + import java.net.*; + import java.rmi.*; +@@ -41,12 +42,12 @@ + import java.security.AccessControlContext; + import java.security.AccessController; + import java.security.CodeSource; +-import java.security.Policy; ++import java.security.Policy; + import java.security.PrivilegedActionException; + import java.security.PrivilegedExceptionAction; + import java.security.PermissionCollection; + import java.security.Permissions; +-import java.security.ProtectionDomain; ++import java.security.ProtectionDomain; + import java.text.MessageFormat; + import sun.rmi.server.LoaderHandler; + import sun.rmi.server.UnicastServerRef; +@@ -54,7 +55,6 @@ + import sun.rmi.transport.LiveRef; + import sun.rmi.transport.ObjectTable; + import sun.rmi.transport.Target; +-import sun.security.action.GetPropertyAction; + + /** + * A "registry" exists on every node that allows RMI connections to +@@ -76,8 +76,10 @@ + + /* indicate compatibility with JDK 1.1.x version of class */ + private static final long serialVersionUID = 4666870661827494597L; +- private Hashtable bindings = new Hashtable(101); +- private static Hashtable allowedAccessCache = new Hashtable(3); ++ private Hashtable bindings ++ = new Hashtable(101); ++ private static Hashtable allowedAccessCache ++ = new Hashtable(3); + private static RegistryImpl registry; + private static ObjID id = new ObjID(ObjID.REGISTRY_ID); + +@@ -129,7 +131,7 @@ + throws RemoteException, NotBoundException + { + synchronized (bindings) { +- Remote obj = (Remote)bindings.get(name); ++ Remote obj = bindings.get(name); + if (obj == null) + throw new NotBoundException(name); + return obj; +@@ -146,7 +148,7 @@ + { + checkAccess("Registry.bind"); + synchronized (bindings) { +- Remote curr = (Remote)bindings.get(name); ++ Remote curr = bindings.get(name); + if (curr != null) + throw new AlreadyBoundException(name); + bindings.put(name, obj); +@@ -163,7 +165,7 @@ + { + checkAccess("Registry.unbind"); + synchronized (bindings) { +- Remote obj = (Remote)bindings.get(name); ++ Remote obj = bindings.get(name); + if (obj == null) + throw new NotBoundException(name); + bindings.remove(name); +@@ -213,10 +215,9 @@ + InetAddress clientHost; + + try { +- clientHost = (InetAddress) +- java.security.AccessController.doPrivileged( +- new java.security.PrivilegedExceptionAction() { +- public Object run() ++ clientHost = java.security.AccessController.doPrivileged( ++ new java.security.PrivilegedExceptionAction() { ++ public InetAddress run() + throws java.net.UnknownHostException + { + return InetAddress.getByName(clientHostName); +@@ -238,8 +239,8 @@ + final InetAddress finalClientHost = clientHost; + + java.security.AccessController.doPrivileged( +- new java.security.PrivilegedExceptionAction() { +- public Object run() throws java.io.IOException { ++ new java.security.PrivilegedExceptionAction() { ++ public Void run() throws java.io.IOException { + /* + * if a ServerSocket can be bound to the client's + * address then that address must be local +@@ -334,19 +335,6 @@ + URL[] urls = sun.misc.URLClassPath.pathToURLs(envcp); + ClassLoader cl = new URLClassLoader(urls); + +- String codebaseProperty = null; +- String prop = java.security.AccessController.doPrivileged( +- new GetPropertyAction("java.rmi.server.codebase")); +- if (prop != null && prop.trim().length() > 0) { +- codebaseProperty = prop; +- } +- URL[] codebaseURLs = null; +- if (codebaseProperty != null) { +- codebaseURLs = sun.misc.URLClassPath.pathToURLs(codebaseProperty); +- } else { +- codebaseURLs = new URL[0]; +- } +- + /* + * Fix bugid 4242317: Classes defined by this class loader should + * be annotated with the value of the "java.rmi.server.codebase" +@@ -364,7 +352,7 @@ + public RegistryImpl run() throws RemoteException { + return new RegistryImpl(regPort); + } +- }, getAccessControlContext(codebaseURLs)); ++ }, getAccessControlContext()); + } catch (PrivilegedActionException ex) { + throw (RemoteException) ex.getException(); + } +@@ -390,11 +378,11 @@ + } + + /** +- * Generates an AccessControlContext from several URLs. ++ * Generates an AccessControlContext with minimal permissions. + * The approach used here is taken from the similar method + * getAccessControlContext() in the sun.applet.AppletPanel class. + */ +- private static AccessControlContext getAccessControlContext(URL[] urls) { ++ private static AccessControlContext getAccessControlContext() { + // begin with permissions granted to all code in current policy + PermissionCollection perms = AccessController.doPrivileged( + new java.security.PrivilegedAction() { +@@ -419,17 +407,15 @@ + + perms.add(new RuntimePermission("accessClassInPackage.sun.*")); + +- // add permissions required to load from codebase URL path +- LoaderHandler.addPermissionsForURLs(urls, perms, false); ++ perms.add(new FilePermission("<>", "read")); + + /* + * Create an AccessControlContext that consists of a single + * protection domain with only the permissions calculated above. + */ + ProtectionDomain pd = new ProtectionDomain( +- new CodeSource((urls.length > 0 ? urls[0] : null), +- (java.security.cert.Certificate[]) null), +- perms); ++ new CodeSource(null, ++ (java.security.cert.Certificate[]) null), perms); + return new AccessControlContext(new ProtectionDomain[] { pd }); + } + } +diff -r 020dcd6d69ac -r 6b46f3c7c97c src/share/classes/sun/rmi/server/LoaderHandler.java +--- openjdk/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java Tue Nov 15 16:44:14 2011 -0800 ++++ openjdk/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java Wed Nov 16 13:14:57 2011 +0000 +@@ -1028,7 +1028,7 @@ + * loader. A given permission is only added to the collection if + * it is not already implied by the collection. + */ +- public static void addPermissionsForURLs(URL[] urls, ++ private static void addPermissionsForURLs(URL[] urls, + PermissionCollection perms, + boolean forLoader) + { +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/readTest.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/readTest.java Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,59 @@ ++/* ++ * 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. ++ * ++ * 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. ++ */ ++ ++import java.rmi.registry.Registry; ++import java.rmi.registry.LocateRegistry; ++import java.rmi.RemoteException; ++import java.rmi.server.UnicastRemoteObject; ++ ++ ++public class readTest { ++ ++ public static void main(String args[]) throws Exception { ++ int port = 7491; ++ try { ++ testPkg.Server obj = new testPkg.Server(); ++ testPkg.Hello stub = (testPkg.Hello) UnicastRemoteObject.exportObject(obj, 0); ++ // Bind the remote object's stub in the registry ++ Registry registry = LocateRegistry.getRegistry(port); ++ registry.bind("Hello", stub); ++ ++ System.err.println("Server ready"); ++ ++ // now, let's test client ++ testPkg.Client client = new testPkg.Client(port); ++ String testStubReturn = client.testStub(); ++ if(!testStubReturn.equals(obj.hello)) { ++ throw new RuntimeException("Test Fails : unexpected string from stub call"); ++ } else { ++ System.out.println("Test passed"); ++ } ++ registry.unbind("Hello"); ++ ++ } catch (Exception e) { ++ System.err.println("Server exception: " + e.toString()); ++ e.printStackTrace(); ++ } ++ ++ } ++} +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/readTest.sh +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/readTest.sh Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,95 @@ ++# ++# 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. ++# ++# 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 7102369 7094468 7100592 ++# @summary remove java.rmi.server.codebase property parsing from registyimpl ++# @run shell readTest.sh ++ ++OS=`uname -s` ++case "$OS" in ++ SunOS | Linux ) ++ PS=":" ++ FS="/" ++ FILEURL="file:" ++ ;; ++ Windows* | CYGWIN* ) ++ PS=";" ++ FS="\\" ++ FILEURL="file:/" ++ ;; ++ * ) ++ echo "Unrecognized system!" ++ exit 1; ++ ;; ++esac ++ ++cp -r ${TESTSRC}${FS}* . ++${TESTJAVA}${FS}bin${FS}javac testPkg${FS}*java ++${TESTJAVA}${FS}bin${FS}javac readTest.java ++ ++mkdir rmi_tmp ++RMIREG_OUT=rmi.out ++#start rmiregistry without any local classes on classpath ++cd rmi_tmp ++${TESTJAVA}${FS}bin${FS}rmiregistry 7491 > ..${FS}${RMIREG_OUT} 2>&1 & ++RMIREG_PID=$! ++# allow some time to start ++sleep 3 ++cd .. ++ ++# trailing / after code base is important for rmi codebase property. ++${TESTJAVA}${FS}bin${FS}java -Djava.rmi.server.codebase=${FILEURL}`pwd`/ readTest > OUT.TXT 2>&1 & ++TEST_PID=$! ++#bulk of testcase - let it run for a while ++sleep 5 ++ ++#we're done, kill processes first ++kill -9 ${RMIREG_PID} ${TEST_PID} ++sleep 3 ++ ++echo "Test output : " ++ ++cat OUT.TXT ++echo "==============" ++echo "rmiregistry output : " ++cat ${RMIREG_OUT} ++echo "==============" ++ ++grep "Server ready" OUT.TXT ++result1=$? ++grep "Test passed" OUT.TXT ++result2=$? ++ ++if [ $result1 -eq 0 -a $result2 -eq 0 ] ++then ++ echo "Passed" ++ exitCode=0; ++else ++ echo "Failed" ++ exitCode=1 ++fi ++rm -rf OUT.TXT ${RMIREG_OUT} rmi_tmp ++exit ${exitCode} ++ ++ +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/testPkg/Client.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/testPkg/Client.java Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,48 @@ ++/* ++ * 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. ++ * ++ * 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 testPkg; ++ ++import java.rmi.registry.LocateRegistry; ++import java.rmi.registry.Registry; ++ ++public class Client { ++ int port; ++ ++ public Client(int p) { ++ port = p; ++ } ++ ++ public String testStub() throws Exception { ++ try { ++ Registry registry = LocateRegistry.getRegistry(port); ++ Hello stub = (Hello) registry.lookup("Hello"); ++ String response = stub.sayHello(); ++ return response; ++ } catch (Exception e) { ++ System.err.println("Client exception: " + e.toString()); ++ throw e; ++ } ++ } ++ } ++ +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/testPkg/Hello.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/testPkg/Hello.java Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,31 @@ ++/* ++ * 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. ++ * ++ * 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 testPkg; ++ ++import java.rmi.Remote; ++import java.rmi.RemoteException; ++ ++public interface Hello extends Remote { ++ String sayHello() throws RemoteException; ++} +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/testPkg/Server.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/testPkg/Server.java Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,36 @@ ++/* ++ * 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. ++ * ++ * 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 From omajid at redhat.com Thu Jan 5 09:07:53 2012 From: omajid at redhat.com (Omair Majid) Date: Thu, 05 Jan 2012 12:07:53 -0500 Subject: RFC: backport S7102369 In-Reply-To: <20120105001037.GC18480@rivendell.middle-earth.co.uk> References: <4EE65054.1090503@redhat.com> <20111212224137.GA31950@rivendell.middle-earth.co.uk> <4EE6842E.608@redhat.com> <20111212224951.GB31950@rivendell.middle-earth.co.uk> <4F04CB03.5050006@redhat.com> <20120105001037.GC18480@rivendell.middle-earth.co.uk> Message-ID: <4F05D8E9.9070106@redhat.com> On 01/04/2012 07:10 PM, Dr Andrew John Hughes wrote: > On 16:56 Wed 04 Jan , Omair Majid wrote: >> On 12/12/2011 05:49 PM, Dr Andrew John Hughes wrote: >>> On 17:46 Mon 12 Dec , Omair Majid wrote: >>>> On 12/12/2011 05:41 PM, Dr Andrew John Hughes wrote: >>>>> On 14:04 Mon 12 Dec , Omair Majid wrote: >>>>>> Hi, >>>>>> >>>>>> I would like to backport the fix for S7102369 to icedtea6. >>>>>> >>>>>> The fix is already in jdk6, but missed the jdk6b24 cutoff: >>>>>> http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/6b46f3c7c97c >>>>>> >>>>>> This fixes a regression caused by the recent security update that >>>>>> requires rmiregistry to be started with java.rmi.server.codebase >>>>>> property set. Additional details can be found in this bug report: >>>>>> https://bugzilla.redhat.com/show_bug.cgi?id=751203 >>>>>> >>>>>> The patch for HEAD is attached. If no one has any objections, I will >>>>>> prepare patches for 1.9 and 1.10 as well. >>>>>> >>>>>> ChangeLog: >>>>>> 2011-12-12 Omair Majid >>>>>> >>>>>> S7102369, S7094468: remove java.rmi.server.codebase property >>>>>> parsing from rmiregistry >>>>>> * patches/openjdk/7102369-7094468-rmiregistry.patch: New file. >>>>>> Backport from OpenJDK6. >>>>>> * Makefile.am (ICEDTEA_PATCHES): Apply the patch. >>>>>> >>>>>> Any thoughts or comments? >>>>>> >>>>> >>> I would suggest adding it there, then posting the backports in a week's time if no >>> issues arise. >>> >> >> It's been more than a week and I have not heard any issues. Patches for >> 1.8, 1.9 and 1.10 attached. >> > > This is a regression so I think it needs to go in. Approved. > Thanks for the review. I have pushed the changesets: http://icedtea.classpath.org/hg/release/icedtea6-1.10/rev/f844632b05a0 http://icedtea.classpath.org/hg/release/icedtea6-1.9/rev/05bf6d3edab6 http://icedtea.classpath.org/hg/release/icedtea6-1.8/rev/33616a2b4d2e Cheers, Omair From omajid at redhat.com Thu Jan 5 11:27:14 2012 From: omajid at redhat.com (Omair Majid) Date: Thu, 05 Jan 2012 14:27:14 -0500 Subject: [rfc][icedtea] makefiel part of fix of rhbz 580478 In-Reply-To: <4F05C2DC.6010805@redhat.com> References: <4EF1FBB5.1070701@redhat.com> <4EF20C4F.8080803@redhat.com> <4F05C2DC.6010805@redhat.com> Message-ID: <4F05F992.4040600@redhat.com> On 01/05/2012 10:33 AM, Jiri Vanek wrote: > 2011-12-21 Jiri Vanek > > fixes rhbz#580478 > * Makefile.am: > (EXTRA_DIST) console.desktop policytool.desktop replaced by *.in files > (clean-local) now depends on new target clean-desktop-files > (jconsole.desktop) new target which transforms > jconsole.desktop.in to jconsole.desktop, using default or set value > (policytool.desktop) new target which transforms > policytool.desktop.in to policytool.desktop, using default or set > value > (clean-desktop-files) new target, removes policytool.desktop and > jconsole.desktop > (stamps/icedtea.stamp) now depends also on console.desktop > policytool.desktop > (stamps/icedtea-debug.stamp) likewise, as enforced by > stamps/icedtea.stamp comment > * configure.ac: abs-install-dir block moved outside conditional > ENABLE_SYSTEMTAP block > * jconsole.desktop: removed, replaced by jconsole.desktop.in > * jconsole.desktop.in: new file, stub for desktop file, have variable > to be substitued during make > * policytool.desktop: removed, replaced by policytool.desktop.in > * policytool.desktop.in: new file, stub for desktop file, have > variable > to be substituted during make > > > Flowing Andrew's advice, now using abs-install-dir. > Your remaining hints were also fixed. Looks better now :). > Thanks. The patch looks fine to me. I do have some notes/suggestions below, but you can ignore them. > > > diff -r cf80d2049346 Makefile.am > --- a/Makefile.am Tue Dec 20 13:49:11 2011 -0500 > +++ b/Makefile.am Thu Jan 05 15:59:47 2012 +0100 > @@ -616,7 +616,7 @@ > $(top_srcdir)/patches/* \ > contrib arm_port \ > overlays \ > - jconsole.desktop policytool.desktop \ > + jconsole.desktop.in policytool.desktop.in \ > $(JTREG_SRCS) HACKING pulseaudio fsg.sh \ > hotspot.map \ > autogen.sh \ > @@ -641,7 +641,7 @@ > clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \ > clean-rewriter clean-rewrite-rhino clean-rt clean-bootstrap-directory \ > clean-bootstrap-directory-ecj clean-bootstrap-directory-symlink \ > - clean-bootstrap-directory-symlink-ecj clean-fonts > + clean-bootstrap-directory-symlink-ecj clean-fonts clean-desktop-files > if [ -e bootstrap ]; then \ > rmdir bootstrap ; \ > fi > @@ -702,8 +702,21 @@ > # OpenJDK Source Preparation Targets > # ================================== > > -# Download OpenJDK sources. > +jconsole.desktop: jconsole.desktop.in > + xabs_path=$(ABS_JAVA_HOME_DIR) ; \ > + if [ "$$xabs_path" = "" ]; then \ > + xabs_path=/usr ; \ > + fi ; \ > + sed s, at JCONSOLE_DESKTOP@,$$xabs_path/bin/jconsole,< jconsole.desktop.in> jconsole.desktop It might be safer to use @JCONSOLE_DESTKOP[@] (or some variation involving putting the @ in square brackets) to ensure that if an autoconf var named JCONSOLE_DESKTOP is ever defined it wont replace @JCONSOLE_DESTKOP@ at configure-time. > > +policytool.desktop: policytool.desktop.in > + xabs_path=$(ABS_JAVA_HOME_DIR) ; \ > + if [ "$$xabs_path" = "" ]; then \ > + xabs_path=/usr ; \ > + fi ; \ > + sed s, at POLICYTOOL_DESKTOP@,$$xabs_path/bin/policytool,< policytool.desktop.in> policytool.desktop > + As it stands, you could also have used AC_CONFIG_FILES to perform the substitution at configure-time. However this version will work better once prefix is supported in icedtea6. Nice! > > +clean-desktop-files: > + -rm -f policytool.desktop > + -rm -f jconsole.desktop > + I am curious why the '-' is required. I thought -f will stop rm from returning an error exit status if the file is not present. Anyway, okay for HEAD. Cheers, Omair From omajid at redhat.com Thu Jan 5 14:20:55 2012 From: omajid at redhat.com (Omair Majid) Date: Thu, 05 Jan 2012 17:20:55 -0500 Subject: [icedtea-web] RFC: fix findbugs communal cloud jnlps Message-ID: <4F062247.3050608@redhat.com> Hi, It was recently brought to my attention that the jnlps listed at http://findbugs.sourceforge.net/index.html (under the section "New") are broken, throwing exceptions when trying to run. The attached fixes the problems. The first problem was that icedtea-web was trying to ensure that all jnlps, including extension jnlps have a main class. I wonder what other applications were broken by this check. This patch modifies the check to only check for main class when a main class is possible (applets and applications). The second second problem was that (in the extension jnlp file) the jnlp element did not contain a codebase attribute. IcedTea-Web tried to add this null codebase when merging the jnlp file, causing an exception. The patch simply ignores this null. ChangeLog: 2012-01-05 Omair Majid * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (initializeResources): Only throw exceptions about the main class not being found when the jnlp file can have a main class. (addToCodeBaseLoader): Dont try to process null URLs. Any thoughts or comments? Thanks, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: findbugs-issues-01.patch Type: text/x-patch Size: 1667 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120105/e405d143/findbugs-issues-01.patch From andrew at icedtea.classpath.org Thu Jan 5 23:02:34 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 06 Jan 2012 07:02:34 +0000 Subject: /hg/release/icedtea6-1.10: S7103725, RH767129: REGRESSION - 6u29... Message-ID: changeset 9316ce0e3600 in /hg/release/icedtea6-1.10 details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=9316ce0e3600 author: Andrew John Hughes date: Fri Jan 06 07:02:20 2012 +0000 S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA 2011-12-22 Andrew John Hughes * Makefile.am: Add new patch. * patches/openjdk/7103725-ssl_beast_regression.patch: Add OpenJDK backport. * NEWS: Updated. diffstat: ChangeLog | 7 +++++++ Makefile.am | 3 ++- NEWS | 1 + patches/openjdk/7103725-ssl_beast_regression.patch | 21 +++++++++++++++++++++ 4 files changed, 31 insertions(+), 1 deletions(-) diffs (64 lines): diff -r f844632b05a0 -r 9316ce0e3600 ChangeLog --- a/ChangeLog Thu Jan 05 12:05:12 2012 -0500 +++ b/ChangeLog Fri Jan 06 07:02:20 2012 +0000 @@ -1,3 +1,10 @@ +2011-12-22 Andrew John Hughes + + * Makefile.am: Add new patch. + * patches/openjdk/7103725-ssl_beast_regression.patch: + Add OpenJDK backport. + * NEWS: Updated. + 2012-01-04 Omair Majid S7102369, S7094468: remove java.rmi.server.codebase property parsing from diff -r f844632b05a0 -r 9316ce0e3600 Makefile.am --- a/Makefile.am Thu Jan 05 12:05:12 2012 -0500 +++ b/Makefile.am Fri Jan 06 07:02:20 2012 +0000 @@ -366,7 +366,8 @@ patches/openjdk/7034464-hugepage.patch \ patches/openjdk/7037939-hugepage.patch \ patches/openjdk/7043564-hugepage.patch \ - patches/openjdk/7102369-7094468-rmiregistry.patch + patches/openjdk/7102369-7094468-rmiregistry.patch \ + patches/openjdk/7103725-ssl_beast_regression.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r f844632b05a0 -r 9316ce0e3600 NEWS --- a/NEWS Thu Jan 05 12:05:12 2012 -0500 +++ b/NEWS Fri Jan 06 07:02:20 2012 +0000 @@ -16,6 +16,7 @@ - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used - S7102369: remove java.rmi.server.codebase property parsing from registyimpl - S7094468: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA New in release 1.10.4 (2011-10-18): diff -r f844632b05a0 -r 9316ce0e3600 patches/openjdk/7103725-ssl_beast_regression.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7103725-ssl_beast_regression.patch Fri Jan 06 07:02:20 2012 +0000 @@ -0,0 +1,22 @@ +# HG changeset patch +# User robm +# Date 1324518632 0 +# Node ID cb20ed4b953add8f2443831a0552640efca53ab7 +# Parent 6b46f3c7c97cb060f88b196171b95d33bff80b7c +7103725: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA +Summary: resolving an issue with 7064341. +Reviewed-by: wetmore, coffeys + +diff -r 6b46f3c7c97c -r cb20ed4b953a src/share/classes/sun/security/ssl/AppOutputStream.java +--- openjdk/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java Wed Nov 16 13:14:57 2011 +0000 ++++ openjdk/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java Thu Dec 22 01:50:32 2011 +0000 +@@ -90,7 +90,8 @@ + do { + int howmuch; + if (isFirstRecordOfThePayload && c.needToSplitPayload()) { +- howmuch = Math.min(0x01, r.availableDataBytes()); ++ howmuch = (len == 0) ? 0 : Math.min( ++ 0x01, r.availableDataBytes()); + } else { + howmuch = Math.min(len, r.availableDataBytes()); + } From ahughes at redhat.com Thu Jan 5 23:16:03 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 6 Jan 2012 07:16:03 +0000 Subject: icedtea6 1.11 branching on 2012-01-06 In-Reply-To: <4F05B855.1080204@ubuntu.com> References: <4EF49ECF.7060004@redhat.com> <4F05B855.1080204@ubuntu.com> Message-ID: <20120106071603.GB25062@rivendell.middle-earth.co.uk> On 15:48 Thu 05 Jan , Matthias Klose wrote: > On 12/23/2011 04:31 PM, Omair Majid wrote: > > Hi all, > > > > As noted elsewhere, a number of important features and fixes have been added to > > icedtea6 that are not in any release. This seems like a good time as any to try > > and get a release out. To that end, I am planning to branch icedtea6 1.11 on > > 2012-01-06. I dont have an exact release date in mind right now, but it probably > > will be at least a week after that. > > there's a regression: shark is completely broken. seen on the buildbot > http://builder.classpath.org/icedtea/buildbot/builders/icedtea6-squeeze-x86_64-quick-shark/builds/188 > using llvm-2.7, and checked with llvm-2.9 and llvm-3.0 as well. If not fixed, > please mention it in the release notes. Do you plan to fix it? -- 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/20120106/b292c71b/attachment.bin From ahughes at redhat.com Thu Jan 5 23:20:34 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 6 Jan 2012 07:20:34 +0000 Subject: [rfc][icedtea] makefiel part of fix of rhbz 580478 In-Reply-To: <4F05C2DC.6010805@redhat.com> References: <4EF1FBB5.1070701@redhat.com> <4EF20C4F.8080803@redhat.com> <4F05C2DC.6010805@redhat.com> Message-ID: <20120106072034.GC25062@rivendell.middle-earth.co.uk> On 16:33 Thu 05 Jan , Jiri Vanek wrote: > 2011-12-21 Jiri Vanek > > fixes rhbz#580478 > * Makefile.am: > (EXTRA_DIST) console.desktop policytool.desktop replaced by *.in files > (clean-local) now depends on new target clean-desktop-files > (jconsole.desktop) new target which transforms > jconsole.desktop.in to jconsole.desktop, using default or set value > (policytool.desktop) new target which transforms > policytool.desktop.in to policytool.desktop, using default or set value > (clean-desktop-files) new target, removes policytool.desktop and jconsole.desktop > (stamps/icedtea.stamp) now depends also on console.desktop policytool.desktop > (stamps/icedtea-debug.stamp) likewise, as enforced by stamps/icedtea.stamp comment > * configure.ac: abs-install-dir block moved outside conditional ENABLE_SYSTEMTAP block > * jconsole.desktop: removed, replaced by jconsole.desktop.in > * jconsole.desktop.in: new file, stub for desktop file, have variable > to be substitued during make > * policytool.desktop: removed, replaced by policytool.desktop.in > * policytool.desktop.in: new file, stub for desktop file, have variable > to be substituted during make > > > Flowing Andrew's advice, now using abs-install-dir. > Your remaining hints were also fixed. Looks better now :). > Mostly fine, but you can use configure to do the replacement and it'll automatically handle removal too. > > diff -r cf80d2049346 Makefile.am > --- a/Makefile.am Tue Dec 20 13:49:11 2011 -0500 > +++ b/Makefile.am Thu Jan 05 15:59:47 2012 +0100 > @@ -616,7 +616,7 @@ > $(top_srcdir)/patches/* \ > contrib arm_port \ > overlays \ > - jconsole.desktop policytool.desktop \ > + jconsole.desktop.in policytool.desktop.in \ > $(JTREG_SRCS) HACKING pulseaudio fsg.sh \ > hotspot.map \ > autogen.sh \ > @@ -641,7 +641,7 @@ > clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \ > clean-rewriter clean-rewrite-rhino clean-rt clean-bootstrap-directory \ > clean-bootstrap-directory-ecj clean-bootstrap-directory-symlink \ > - clean-bootstrap-directory-symlink-ecj clean-fonts > + clean-bootstrap-directory-symlink-ecj clean-fonts clean-desktop-files > if [ -e bootstrap ]; then \ > rmdir bootstrap ; \ > fi Looks ok. > @@ -702,8 +702,21 @@ > # OpenJDK Source Preparation Targets > # ================================== > > -# Download OpenJDK sources. > +jconsole.desktop: jconsole.desktop.in > + xabs_path=$(ABS_JAVA_HOME_DIR) ; \ > + if [ "$$xabs_path" = "" ]; then \ > + xabs_path=/usr ; \ > + fi ; \ > + sed s, at JCONSOLE_DESKTOP@,$$xabs_path/bin/jconsole, < jconsole.desktop.in > jconsole.desktop > > +policytool.desktop: policytool.desktop.in > + xabs_path=$(ABS_JAVA_HOME_DIR) ; \ > + if [ "$$xabs_path" = "" ]; then \ > + xabs_path=/usr ; \ > + fi ; \ > + sed s, at POLICYTOOL_DESKTOP@,$$xabs_path/bin/policytool, < policytool.desktop.in > policytool.desktop > + > +# Download OpenJDK sources. You don't need to do this. configure will do it for you. AC_CONFIG_FILES([jconsole.desktop]) AC_CONFIG_FILES([policytool.desktop]) Look at how SystemTap does it. > stamps/hgforest.stamp: > if !USE_HG > else > @@ -1073,6 +1086,10 @@ > clean-fonts: > rm -f stamps/fonts.stamp > > +clean-desktop-files: > + -rm -f policytool.desktop > + -rm -f jconsole.desktop > + Likewise, this is unnecessary if you let configure handle it. > stamps/patch-fsg.stamp: stamps/fonts.stamp > mkdir -p stamps ; \ > rm -f stamps/patch-fsg.stamp.tmp ; \ > @@ -1381,7 +1398,7 @@ > # you change it in the icedtea-debug target as well. > stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \ > - stamps/jamvm.stamp > + stamps/jamvm.stamp jconsole.desktop policytool.desktop > $(ARCH_PREFIX) $(MAKE) -j1 \ > $(ICEDTEA_ENV) \ > -C openjdk \ > @@ -1412,7 +1429,7 @@ > > stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ > $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \ > - stamps/jamvm.stamp > + stamps/jamvm.stamp jconsole.desktop policytool.desktop > $(ARCH_PREFIX) $(MAKE) -j1 \ > $(ICEDTEA_ENV) \ > -C openjdk \ > diff -r cf80d2049346 configure.ac > --- a/configure.ac Tue Dec 20 13:49:11 2011 -0500 > +++ b/configure.ac Thu Jan 05 15:59:47 2012 +0100 > @@ -265,6 +265,18 @@ > fi > fi > > +AC_MSG_CHECKING([for absolute java home install dir]) > +AC_ARG_WITH([abs-install-dir], > + [AS_HELP_STRING([--with-abs-install-dir], > + [The absolute path where the j2sdk-image dir will be installed])], > + [if test "x${withval}" = x; then > + ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image" > + else > + ABS_JAVA_HOME_DIR="${withval}" > + fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"]) > +AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}]) > +AC_SUBST(ABS_JAVA_HOME_DIR) > + > if test "x${ENABLE_SYSTEMTAP}" = xyes; then > AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], > [SDT_H_FOUND='no'; > @@ -306,19 +318,8 @@ > ]])], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([systemtap sdt.h or g++ too old])]) > AC_LANG_POP([C++]) > > - AC_MSG_CHECKING([for absolute java home install dir]) > - AC_ARG_WITH([abs-install-dir], > - [AS_HELP_STRING([--with-abs-install-dir], > - [The absolute path where the j2sdk-image dir will be installed])], > - [if test "x${withval}" = x; then > - ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image" > - else > - ABS_JAVA_HOME_DIR="${withval}" > - fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"]) > - AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}]) > ABS_CLIENT_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so" > ABS_SERVER_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so" > - AC_SUBST(ABS_JAVA_HOME_DIR) > AC_SUBST(ABS_CLIENT_LIBJVM_SO) > AC_SUBST(ABS_SERVER_LIBJVM_SO) > AC_CONFIG_FILES([tapset/hotspot.stp]) > diff -r cf80d2049346 jconsole.desktop > --- a/jconsole.desktop Tue Dec 20 13:49:11 2011 -0500 > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > @@ -1,10 +0,0 @@ > -[Desktop Entry] > -Name=OpenJDK Monitoring & Management Console > -Comment=Monitor and manage OpenJDK applications > -Exec=/usr/bin/jconsole > -Icon=java > -Terminal=false > -Type=Application > -StartupWMClass=sun-tools-jconsole-JConsole > -Categories=Development;Monitor;Java; > -Version=1.0 > diff -r cf80d2049346 jconsole.desktop.in > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/jconsole.desktop.in Thu Jan 05 15:59:47 2012 +0100 > @@ -0,0 +1,10 @@ > +[Desktop Entry] > +Name=OpenJDK Monitoring & Management Console > +Comment=Monitor and manage OpenJDK applications > +Exec=@JCONSOLE_DESKTOP@ > +Icon=java > +Terminal=false > +Type=Application > +StartupWMClass=sun-tools-jconsole-JConsole > +Categories=Development;Monitor;Java; > +Version=1.0 > diff -r cf80d2049346 policytool.desktop > --- a/policytool.desktop Tue Dec 20 13:49:11 2011 -0500 > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > @@ -1,10 +0,0 @@ > -[Desktop Entry] > -Name=OpenJDK Policy Tool > -Comment=Manage OpenJDK policy files > -Exec=/usr/bin/policytool > -Icon=java > -Terminal=false > -Type=Application > -StartupWMClass=sun-security-tools-PolicyTool > -Categories=Development;Java; > -Version=1.0 > diff -r cf80d2049346 policytool.desktop.in > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/policytool.desktop.in Thu Jan 05 15:59:47 2012 +0100 > @@ -0,0 +1,10 @@ > +[Desktop Entry] > +Name=OpenJDK Policy Tool > +Comment=Manage OpenJDK policy files > +Exec=@POLICYTOOL_DESKTOP@ > +Icon=java > +Terminal=false > +Type=Application > +StartupWMClass=sun-security-tools-PolicyTool > +Categories=Development;Java; > +Version=1.0 -- 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/20120106/e058c440/attachment.bin From jvanek at redhat.com Fri Jan 6 00:33:07 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 06 Jan 2012 09:33:07 +0100 Subject: [rfc][icedtea] makefiel part of fix of rhbz 580478 In-Reply-To: <20120106072034.GC25062@rivendell.middle-earth.co.uk> References: <4EF1FBB5.1070701@redhat.com> <4EF20C4F.8080803@redhat.com> <4F05C2DC.6010805@redhat.com> <20120106072034.GC25062@rivendell.middle-earth.co.uk> Message-ID: <4F06B1C3.1070005@redhat.com> On 01/06/2012 08:20 AM, Dr Andrew John Hughes wrote: Can you this time live with keeping it as it is? Next time I will try to do this during configure. Thanx a lot for advices, J. > On 16:33 Thu 05 Jan , Jiri Vanek wrote: >> 2011-12-21 Jiri Vanek >> >> fixes rhbz#580478 >> * Makefile.am: >> (EXTRA_DIST) console.desktop policytool.desktop replaced by *.in files >> (clean-local) now depends on new target clean-desktop-files >> (jconsole.desktop) new target which transforms >> jconsole.desktop.in to jconsole.desktop, using default or set value >> (policytool.desktop) new target which transforms >> policytool.desktop.in to policytool.desktop, using default or set value >> (clean-desktop-files) new target, removes policytool.desktop and jconsole.desktop >> (stamps/icedtea.stamp) now depends also on console.desktop policytool.desktop >> (stamps/icedtea-debug.stamp) likewise, as enforced by stamps/icedtea.stamp comment >> * configure.ac: abs-install-dir block moved outside conditional ENABLE_SYSTEMTAP block >> * jconsole.desktop: removed, replaced by jconsole.desktop.in >> * jconsole.desktop.in: new file, stub for desktop file, have variable >> to be substitued during make >> * policytool.desktop: removed, replaced by policytool.desktop.in >> * policytool.desktop.in: new file, stub for desktop file, have variable >> to be substituted during make >> >> >> Flowing Andrew's advice, now using abs-install-dir. >> Your remaining hints were also fixed. Looks better now :). >> > > Mostly fine, but you can use configure to do the replacement and it'll automatically handle > removal too. > >> > >> diff -r cf80d2049346 Makefile.am >> --- a/Makefile.am Tue Dec 20 13:49:11 2011 -0500 >> +++ b/Makefile.am Thu Jan 05 15:59:47 2012 +0100 >> @@ -616,7 +616,7 @@ >> $(top_srcdir)/patches/* \ >> contrib arm_port \ >> overlays \ >> - jconsole.desktop policytool.desktop \ >> + jconsole.desktop.in policytool.desktop.in \ >> $(JTREG_SRCS) HACKING pulseaudio fsg.sh \ >> hotspot.map \ >> autogen.sh \ >> @@ -641,7 +641,7 @@ >> clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \ >> clean-rewriter clean-rewrite-rhino clean-rt clean-bootstrap-directory \ >> clean-bootstrap-directory-ecj clean-bootstrap-directory-symlink \ >> - clean-bootstrap-directory-symlink-ecj clean-fonts >> + clean-bootstrap-directory-symlink-ecj clean-fonts clean-desktop-files >> if [ -e bootstrap ]; then \ >> rmdir bootstrap ; \ >> fi > > Looks ok. > >> @@ -702,8 +702,21 @@ >> # OpenJDK Source Preparation Targets >> # ================================== >> >> -# Download OpenJDK sources. >> +jconsole.desktop: jconsole.desktop.in >> + xabs_path=$(ABS_JAVA_HOME_DIR) ; \ >> + if [ "$$xabs_path" = "" ]; then \ >> + xabs_path=/usr ; \ >> + fi ; \ >> + sed s, at JCONSOLE_DESKTOP@,$$xabs_path/bin/jconsole,< jconsole.desktop.in> jconsole.desktop >> >> +policytool.desktop: policytool.desktop.in >> + xabs_path=$(ABS_JAVA_HOME_DIR) ; \ >> + if [ "$$xabs_path" = "" ]; then \ >> + xabs_path=/usr ; \ >> + fi ; \ >> + sed s, at POLICYTOOL_DESKTOP@,$$xabs_path/bin/policytool,< policytool.desktop.in> policytool.desktop >> + >> +# Download OpenJDK sources. > > You don't need to do this. configure will do it for you. > > AC_CONFIG_FILES([jconsole.desktop]) > AC_CONFIG_FILES([policytool.desktop]) > > Look at how SystemTap does it. > >> stamps/hgforest.stamp: >> if !USE_HG >> else >> @@ -1073,6 +1086,10 @@ >> clean-fonts: >> rm -f stamps/fonts.stamp >> >> +clean-desktop-files: >> + -rm -f policytool.desktop >> + -rm -f jconsole.desktop >> + > > Likewise, this is unnecessary if you let configure handle it. > >> stamps/patch-fsg.stamp: stamps/fonts.stamp >> mkdir -p stamps ; \ >> rm -f stamps/patch-fsg.stamp.tmp ; \ >> @@ -1381,7 +1398,7 @@ >> # you change it in the icedtea-debug target as well. >> stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ >> $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \ >> - stamps/jamvm.stamp >> + stamps/jamvm.stamp jconsole.desktop policytool.desktop >> $(ARCH_PREFIX) $(MAKE) -j1 \ >> $(ICEDTEA_ENV) \ >> -C openjdk \ >> @@ -1412,7 +1429,7 @@ >> >> stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ >> $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \ >> - stamps/jamvm.stamp >> + stamps/jamvm.stamp jconsole.desktop policytool.desktop >> $(ARCH_PREFIX) $(MAKE) -j1 \ >> $(ICEDTEA_ENV) \ >> -C openjdk \ >> diff -r cf80d2049346 configure.ac >> --- a/configure.ac Tue Dec 20 13:49:11 2011 -0500 >> +++ b/configure.ac Thu Jan 05 15:59:47 2012 +0100 >> @@ -265,6 +265,18 @@ >> fi >> fi >> >> +AC_MSG_CHECKING([for absolute java home install dir]) >> +AC_ARG_WITH([abs-install-dir], >> + [AS_HELP_STRING([--with-abs-install-dir], >> + [The absolute path where the j2sdk-image dir will be installed])], >> + [if test "x${withval}" = x; then >> + ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image" >> + else >> + ABS_JAVA_HOME_DIR="${withval}" >> + fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"]) >> +AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}]) >> +AC_SUBST(ABS_JAVA_HOME_DIR) >> + >> if test "x${ENABLE_SYSTEMTAP}" = xyes; then >> AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], >> [SDT_H_FOUND='no'; >> @@ -306,19 +318,8 @@ >> ]])], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([systemtap sdt.h or g++ too old])]) >> AC_LANG_POP([C++]) >> >> - AC_MSG_CHECKING([for absolute java home install dir]) >> - AC_ARG_WITH([abs-install-dir], >> - [AS_HELP_STRING([--with-abs-install-dir], >> - [The absolute path where the j2sdk-image dir will be installed])], >> - [if test "x${withval}" = x; then >> - ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image" >> - else >> - ABS_JAVA_HOME_DIR="${withval}" >> - fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"]) >> - AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}]) >> ABS_CLIENT_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so" >> ABS_SERVER_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so" >> - AC_SUBST(ABS_JAVA_HOME_DIR) >> AC_SUBST(ABS_CLIENT_LIBJVM_SO) >> AC_SUBST(ABS_SERVER_LIBJVM_SO) >> AC_CONFIG_FILES([tapset/hotspot.stp]) >> diff -r cf80d2049346 jconsole.desktop >> --- a/jconsole.desktop Tue Dec 20 13:49:11 2011 -0500 >> +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 >> @@ -1,10 +0,0 @@ >> -[Desktop Entry] >> -Name=OpenJDK Monitoring& Management Console >> -Comment=Monitor and manage OpenJDK applications >> -Exec=/usr/bin/jconsole >> -Icon=java >> -Terminal=false >> -Type=Application >> -StartupWMClass=sun-tools-jconsole-JConsole >> -Categories=Development;Monitor;Java; >> -Version=1.0 >> diff -r cf80d2049346 jconsole.desktop.in >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/jconsole.desktop.in Thu Jan 05 15:59:47 2012 +0100 >> @@ -0,0 +1,10 @@ >> +[Desktop Entry] >> +Name=OpenJDK Monitoring& Management Console >> +Comment=Monitor and manage OpenJDK applications >> +Exec=@JCONSOLE_DESKTOP@ >> +Icon=java >> +Terminal=false >> +Type=Application >> +StartupWMClass=sun-tools-jconsole-JConsole >> +Categories=Development;Monitor;Java; >> +Version=1.0 >> diff -r cf80d2049346 policytool.desktop >> --- a/policytool.desktop Tue Dec 20 13:49:11 2011 -0500 >> +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 >> @@ -1,10 +0,0 @@ >> -[Desktop Entry] >> -Name=OpenJDK Policy Tool >> -Comment=Manage OpenJDK policy files >> -Exec=/usr/bin/policytool >> -Icon=java >> -Terminal=false >> -Type=Application >> -StartupWMClass=sun-security-tools-PolicyTool >> -Categories=Development;Java; >> -Version=1.0 >> diff -r cf80d2049346 policytool.desktop.in >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/policytool.desktop.in Thu Jan 05 15:59:47 2012 +0100 >> @@ -0,0 +1,10 @@ >> +[Desktop Entry] >> +Name=OpenJDK Policy Tool >> +Comment=Manage OpenJDK policy files >> +Exec=@POLICYTOOL_DESKTOP@ >> +Icon=java >> +Terminal=false >> +Type=Application >> +StartupWMClass=sun-security-tools-PolicyTool >> +Categories=Development;Java; >> +Version=1.0 > > From andrew at icedtea.classpath.org Fri Jan 6 01:30:51 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 06 Jan 2012 09:30:51 +0000 Subject: /hg/icedtea6: Update NEWS with missing releases 1.9.11, 1.8.11, ... Message-ID: changeset 72b7e37e64a5 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=72b7e37e64a5 author: Andrew John Hughes date: Fri Jan 06 09:30:37 2012 +0000 Update NEWS with missing releases 1.9.11, 1.8.11, 1.10.3, 1.9.9 and 1.8.9. 2012-01-06 Andrew John Hughes * NEWS: Add missing entries for 1.9.11, 1.8.11, 1.10.3, 1.9.9 and 1.8.9. Remove duplicates in 1.11 listing. diffstat: ChangeLog | 6 ++++++ NEWS | 45 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 45 insertions(+), 6 deletions(-) diffs (96 lines): diff -r 91e9227e579a -r 72b7e37e64a5 ChangeLog --- a/ChangeLog Tue Jan 03 13:54:53 2012 +0100 +++ b/ChangeLog Fri Jan 06 09:30:37 2012 +0000 @@ -1,3 +1,9 @@ +2012-01-06 Andrew John Hughes + + * NEWS: + Add missing entries for 1.9.11, 1.8.11, 1.10.3, + 1.9.9 and 1.8.9. Remove duplicates in 1.11 listing. + 2012-01-03 Pavel Tisnovsky * Makefile.am: Fixed path to excludelist.jdk.jtx diff -r 91e9227e579a -r 72b7e37e64a5 NEWS --- a/NEWS Tue Jan 03 13:54:53 2012 +0100 +++ b/NEWS Fri Jan 06 09:30:37 2012 +0000 @@ -15,8 +15,6 @@ * Use HotSpot 20 as the default virtual machine. * Bug fixes - PR637: make check should exit with an error code if any regression test failed. - - PR748: Icedtea6 fails to build with Linux 3.0. - - PR744: icedtea6-1.10.2 : patching error - PR752: ImageFormatException extends Exception not RuntimeException - PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan - RH727195: Japanese font mappings are broken @@ -27,7 +25,6 @@ - S7099148: increment build number of hs20.0 to b12 - S7108221: Backport to jdk6 Hotspot defaults for AMD Bulldozer processor - S7080038: (ann) Serializable types in sun.reflect.annotation do not declare serialVersionUIDs - - S6578583: Regression: Modality is broken in windows vista home premium from jdk1.7 b02 onwards. - S6815182: GSSAPI/SPNEGO does not work with server using MIT Kerberos library - S6979329: CCacheInputStream fails to read ticket cache files from Kerberos 1.8.1 - S7092186: adjust package access in rmiregistry @@ -347,9 +344,6 @@ - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used - S7018387: Xrender pipeline may leak GC's - S7036754: Stroked quads sometimes contain NaN - - S6769607, PR677: Modal frame hangs for a while. - - S6610244: modal dialog closes with fatal error if -Xcheck:jni is set - - S7037283, RH712211: Null Pointer Exception in SwingUtilities2. - S7008106: com/sun/awt/Translucency/WindowOpacity.java test fails. - S6956668: misbehavior of XOR operator (^) with int - S6699843: IllegalArgumentException when using Graphics.drawString( "", 0, 0 ) @@ -456,6 +450,16 @@ - PR690: Shark fails to JIT using hs20. - PR696: Zero fails to handle fast_aldc and fast_aldc_w in hs20. +New in release 1.9.11 (2011-11-08): + +* Security fixes + - RH742515, CVE-2011-3377: IcedTea-Web: second-level domain subdomains and suffix domain SOP bypass + +New in release 1.8.11 (2011-11-08): + +* Security fixes + - RH742515, CVE-2011-3377: IcedTea-Web: second-level domain subdomains and suffix domain SOP bypass + New in release 1.10.4 (2011-10-18): * Security fixes @@ -522,6 +526,35 @@ * Fixes - G356743: Support libpng 1.5. +New in release 1.10.3 (2011-07-21): + +* Bug fixes + - PR748: Icedtea6 fails to build with Linux 3.0. + - PR744: icedtea6-1.10.2 : patching error +* Backports: + - S7037283, RH712211: Null Pointer Exception in SwingUtilities2. + - S6769607, PR677: Modal frame hangs for a while. + - S6578583: Modality is broken in windows vista home premium from jdk1.7 b02 onwards. + - S6610244: modal dialog closes with fatal error if -Xcheck:jni is set + +New in release 1.9.9 (2011-07-20): + +* Security fixes + - RH718164, CVE-2011-2513: Home directory path disclosure to untrusted apps +* Bug Fixes + - PR744: icedtea6-1.10.2 : patching error + - PR748: Icedtea6 fails to build with Linux 3.0. +* Shark + - PR632: patches/security/20110215/6878713.patch breaks shark zero build + +New in release 1.8.9 (2011-07-20): + +* Security fixes + - RH718164, CVE-2011-2513: Home directory path disclosure to untrusted apps +* Bug fixes + - PR744: icedtea6-1.10.2 : patching error + - PR748: Icedtea6 fails to build with Linux 3.0. + New in release 1.10.2 (2011-06-07): * Security fixes From aph at redhat.com Fri Jan 6 02:10:15 2012 From: aph at redhat.com (Andrew Haley) Date: Fri, 06 Jan 2012 10:10:15 +0000 Subject: icedtea6 1.11 branching on 2012-01-06 In-Reply-To: <20120106071603.GB25062@rivendell.middle-earth.co.uk> References: <4EF49ECF.7060004@redhat.com> <4F05B855.1080204@ubuntu.com> <20120106071603.GB25062@rivendell.middle-earth.co.uk> Message-ID: <4F06C887.1010408@redhat.com> On 01/06/2012 07:16 AM, Dr Andrew John Hughes wrote: > On 15:48 Thu 05 Jan , Matthias Klose wrote: >> On 12/23/2011 04:31 PM, Omair Majid wrote: >>> Hi all, >>> >>> As noted elsewhere, a number of important features and fixes have been added to >>> icedtea6 that are not in any release. This seems like a good time as any to try >>> and get a release out. To that end, I am planning to branch icedtea6 1.11 on >>> 2012-01-06. I dont have an exact release date in mind right now, but it probably >>> will be at least a week after that. >> >> there's a regression: shark is completely broken. seen on the buildbot >> http://builder.classpath.org/icedtea/buildbot/builders/icedtea6-squeeze-x86_64-quick-shark/builds/188 >> using llvm-2.7, and checked with llvm-2.9 and llvm-3.0 as well. If not fixed, >> please mention it in the release notes. > > Do you plan to fix it? As I understand it, LLVM-JIT is horribly broken while they rewrite the JIT back-end. If that's true, we don't want to update Shark until they're done. However, I don't read the LLVM lists, so this may all be nonsense. Andrew. From jvanek at redhat.com Fri Jan 6 02:12:41 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 06 Jan 2012 11:12:41 +0100 Subject: [rfc][icedtea] makefiel part of fix of rhbz 580478 In-Reply-To: <4F06B1C3.1070005@redhat.com> References: <4EF1FBB5.1070701@redhat.com> <4EF20C4F.8080803@redhat.com> <4F05C2DC.6010805@redhat.com> <20120106072034.GC25062@rivendell.middle-earth.co.uk> <4F06B1C3.1070005@redhat.com> Message-ID: <4F06C919.30403@redhat.com> On 01/06/2012 09:33 AM, Jiri Vanek wrote: > On 01/06/2012 08:20 AM, Dr Andrew John Hughes wrote: > > Can you this time live with keeping it as it is? > Next time I will try to do this during configure. > > > Thanx a lot for advices, > J. > Looks that we can not :)) 2012-01-06 Jiri Vanek fixes rhbz#580478 * configure.ac: abs-install-dir block moved outside conditional ENABLE_SYSTEMTAP block Added policytool.desktop and jconsole.desktop as AC_CONFIG_FILES * jconsole.desktop: removed, replaced by jconsole.desktop.in * jconsole.desktop.in: new file, stub for desktop file, have variable to be substituted during configure * policytool.desktop: removed, replaced by policytool.desktop.in * policytool.desktop.in: new file, stub for desktop file, have variable to be substituted during configure ok for head, 1.10 and 1.11 ? >> On 16:33 Thu 05 Jan , Jiri Vanek wrote: >>> 2011-12-21 Jiri Vanek >>> >>> fixes rhbz#580478 >>> * Makefile.am: >>> (EXTRA_DIST) console.desktop policytool.desktop replaced by *.in files >>> (clean-local) now depends on new target clean-desktop-files >>> (jconsole.desktop) new target which transforms >>> jconsole.desktop.in to jconsole.desktop, using default or set value >>> (policytool.desktop) new target which transforms >>> policytool.desktop.in to policytool.desktop, using default or set value >>> (clean-desktop-files) new target, removes policytool.desktop and jconsole.desktop >>> (stamps/icedtea.stamp) now depends also on console.desktop policytool.desktop >>> (stamps/icedtea-debug.stamp) likewise, as enforced by stamps/icedtea.stamp comment >>> * configure.ac: abs-install-dir block moved outside conditional ENABLE_SYSTEMTAP block >>> * jconsole.desktop: removed, replaced by jconsole.desktop.in >>> * jconsole.desktop.in: new file, stub for desktop file, have variable >>> to be substitued during make >>> * policytool.desktop: removed, replaced by policytool.desktop.in >>> * policytool.desktop.in: new file, stub for desktop file, have variable >>> to be substituted during make >>> >>> >>> Flowing Andrew's advice, now using abs-install-dir. >>> Your remaining hints were also fixed. Looks better now :). >>> >> >> Mostly fine, but you can use configure to do the replacement and it'll automatically handle >> removal too. >> >>> >> >>> diff -r cf80d2049346 Makefile.am >>> --- a/Makefile.am Tue Dec 20 13:49:11 2011 -0500 >>> +++ b/Makefile.am Thu Jan 05 15:59:47 2012 +0100 >>> @@ -616,7 +616,7 @@ >>> $(top_srcdir)/patches/* \ >>> contrib arm_port \ >>> overlays \ >>> - jconsole.desktop policytool.desktop \ >>> + jconsole.desktop.in policytool.desktop.in \ >>> $(JTREG_SRCS) HACKING pulseaudio fsg.sh \ >>> hotspot.map \ >>> autogen.sh \ >>> @@ -641,7 +641,7 @@ >>> clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \ >>> clean-rewriter clean-rewrite-rhino clean-rt clean-bootstrap-directory \ >>> clean-bootstrap-directory-ecj clean-bootstrap-directory-symlink \ >>> - clean-bootstrap-directory-symlink-ecj clean-fonts >>> + clean-bootstrap-directory-symlink-ecj clean-fonts clean-desktop-files >>> if [ -e bootstrap ]; then \ >>> rmdir bootstrap ; \ >>> fi >> >> Looks ok. >> >>> @@ -702,8 +702,21 @@ >>> # OpenJDK Source Preparation Targets >>> # ================================== >>> >>> -# Download OpenJDK sources. >>> +jconsole.desktop: jconsole.desktop.in >>> + xabs_path=$(ABS_JAVA_HOME_DIR) ; \ >>> + if [ "$$xabs_path" = "" ]; then \ >>> + xabs_path=/usr ; \ >>> + fi ; \ >>> + sed s, at JCONSOLE_DESKTOP@,$$xabs_path/bin/jconsole,< jconsole.desktop.in> jconsole.desktop >>> >>> +policytool.desktop: policytool.desktop.in >>> + xabs_path=$(ABS_JAVA_HOME_DIR) ; \ >>> + if [ "$$xabs_path" = "" ]; then \ >>> + xabs_path=/usr ; \ >>> + fi ; \ >>> + sed s, at POLICYTOOL_DESKTOP@,$$xabs_path/bin/policytool,< policytool.desktop.in> policytool.desktop >>> + >>> +# Download OpenJDK sources. >> >> You don't need to do this. configure will do it for you. >> >> AC_CONFIG_FILES([jconsole.desktop]) >> AC_CONFIG_FILES([policytool.desktop]) >> >> Look at how SystemTap does it. >> >>> stamps/hgforest.stamp: >>> if !USE_HG >>> else >>> @@ -1073,6 +1086,10 @@ >>> clean-fonts: >>> rm -f stamps/fonts.stamp >>> >>> +clean-desktop-files: >>> + -rm -f policytool.desktop >>> + -rm -f jconsole.desktop >>> + >> >> Likewise, this is unnecessary if you let configure handle it. >> >>> stamps/patch-fsg.stamp: stamps/fonts.stamp >>> mkdir -p stamps ; \ >>> rm -f stamps/patch-fsg.stamp.tmp ; \ >>> @@ -1381,7 +1398,7 @@ >>> # you change it in the icedtea-debug target as well. >>> stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ >>> $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \ >>> - stamps/jamvm.stamp >>> + stamps/jamvm.stamp jconsole.desktop policytool.desktop >>> $(ARCH_PREFIX) $(MAKE) -j1 \ >>> $(ICEDTEA_ENV) \ >>> -C openjdk \ >>> @@ -1412,7 +1429,7 @@ >>> >>> stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ >>> $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \ >>> - stamps/jamvm.stamp >>> + stamps/jamvm.stamp jconsole.desktop policytool.desktop >>> $(ARCH_PREFIX) $(MAKE) -j1 \ >>> $(ICEDTEA_ENV) \ >>> -C openjdk \ >>> diff -r cf80d2049346 configure.ac >>> --- a/configure.ac Tue Dec 20 13:49:11 2011 -0500 >>> +++ b/configure.ac Thu Jan 05 15:59:47 2012 +0100 >>> @@ -265,6 +265,18 @@ >>> fi >>> fi >>> >>> +AC_MSG_CHECKING([for absolute java home install dir]) >>> +AC_ARG_WITH([abs-install-dir], >>> + [AS_HELP_STRING([--with-abs-install-dir], >>> + [The absolute path where the j2sdk-image dir will be installed])], >>> + [if test "x${withval}" = x; then >>> + ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image" >>> + else >>> + ABS_JAVA_HOME_DIR="${withval}" >>> + fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"]) >>> +AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}]) >>> +AC_SUBST(ABS_JAVA_HOME_DIR) >>> + >>> if test "x${ENABLE_SYSTEMTAP}" = xyes; then >>> AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], >>> [SDT_H_FOUND='no'; >>> @@ -306,19 +318,8 @@ >>> ]])], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([systemtap sdt.h or g++ too old])]) >>> AC_LANG_POP([C++]) >>> >>> - AC_MSG_CHECKING([for absolute java home install dir]) >>> - AC_ARG_WITH([abs-install-dir], >>> - [AS_HELP_STRING([--with-abs-install-dir], >>> - [The absolute path where the j2sdk-image dir will be installed])], >>> - [if test "x${withval}" = x; then >>> - ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image" >>> - else >>> - ABS_JAVA_HOME_DIR="${withval}" >>> - fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"]) >>> - AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}]) >>> ABS_CLIENT_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so" >>> ABS_SERVER_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so" >>> - AC_SUBST(ABS_JAVA_HOME_DIR) >>> AC_SUBST(ABS_CLIENT_LIBJVM_SO) >>> AC_SUBST(ABS_SERVER_LIBJVM_SO) >>> AC_CONFIG_FILES([tapset/hotspot.stp]) >>> diff -r cf80d2049346 jconsole.desktop >>> --- a/jconsole.desktop Tue Dec 20 13:49:11 2011 -0500 >>> +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 >>> @@ -1,10 +0,0 @@ >>> -[Desktop Entry] >>> -Name=OpenJDK Monitoring& Management Console >>> -Comment=Monitor and manage OpenJDK applications >>> -Exec=/usr/bin/jconsole >>> -Icon=java >>> -Terminal=false >>> -Type=Application >>> -StartupWMClass=sun-tools-jconsole-JConsole >>> -Categories=Development;Monitor;Java; >>> -Version=1.0 >>> diff -r cf80d2049346 jconsole.desktop.in >>> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >>> +++ b/jconsole.desktop.in Thu Jan 05 15:59:47 2012 +0100 >>> @@ -0,0 +1,10 @@ >>> +[Desktop Entry] >>> +Name=OpenJDK Monitoring& Management Console >>> +Comment=Monitor and manage OpenJDK applications >>> +Exec=@JCONSOLE_DESKTOP@ >>> +Icon=java >>> +Terminal=false >>> +Type=Application >>> +StartupWMClass=sun-tools-jconsole-JConsole >>> +Categories=Development;Monitor;Java; >>> +Version=1.0 >>> diff -r cf80d2049346 policytool.desktop >>> --- a/policytool.desktop Tue Dec 20 13:49:11 2011 -0500 >>> +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 >>> @@ -1,10 +0,0 @@ >>> -[Desktop Entry] >>> -Name=OpenJDK Policy Tool >>> -Comment=Manage OpenJDK policy files >>> -Exec=/usr/bin/policytool >>> -Icon=java >>> -Terminal=false >>> -Type=Application >>> -StartupWMClass=sun-security-tools-PolicyTool >>> -Categories=Development;Java; >>> -Version=1.0 >>> diff -r cf80d2049346 policytool.desktop.in >>> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >>> +++ b/policytool.desktop.in Thu Jan 05 15:59:47 2012 +0100 >>> @@ -0,0 +1,10 @@ >>> +[Desktop Entry] >>> +Name=OpenJDK Policy Tool >>> +Comment=Manage OpenJDK policy files >>> +Exec=@POLICYTOOL_DESKTOP@ >>> +Icon=java >>> +Terminal=false >>> +Type=Application >>> +StartupWMClass=sun-security-tools-PolicyTool >>> +Categories=Development;Java; >>> +Version=1.0 >> >> > -------------- next part -------------- A non-text attachment was scrubbed... Name: setableDesktpsPaths3.patch Type: text/x-patch Size: 3572 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120106/f9850ac1/setableDesktpsPaths3.patch From ahughes at redhat.com Fri Jan 6 03:19:24 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 6 Jan 2012 11:19:24 +0000 Subject: [rfc][icedtea] makefiel part of fix of rhbz 580478 In-Reply-To: <4F06C919.30403@redhat.com> References: <4EF1FBB5.1070701@redhat.com> <4EF20C4F.8080803@redhat.com> <4F05C2DC.6010805@redhat.com> <20120106072034.GC25062@rivendell.middle-earth.co.uk> <4F06B1C3.1070005@redhat.com> <4F06C919.30403@redhat.com> Message-ID: <20120106111924.GF25062@rivendell.middle-earth.co.uk> On 11:12 Fri 06 Jan , Jiri Vanek wrote: > On 01/06/2012 09:33 AM, Jiri Vanek wrote: > > On 01/06/2012 08:20 AM, Dr Andrew John Hughes wrote: > > > > Can you this time live with keeping it as it is? > > Next time I will try to do this during configure. > > > > > > Thanx a lot for advices, > > J. > > > > Looks that we can not :)) > > 2012-01-06 Jiri Vanek > > fixes rhbz#580478 > * configure.ac: abs-install-dir block moved outside conditional ENABLE_SYSTEMTAP block > Added policytool.desktop and jconsole.desktop as AC_CONFIG_FILES > * jconsole.desktop: removed, replaced by jconsole.desktop.in > * jconsole.desktop.in: new file, stub for desktop file, have variable > to be substituted during configure > * policytool.desktop: removed, replaced by policytool.desktop.in > * policytool.desktop.in: new file, stub for desktop file, have variable > to be substituted during configure > > > ok for head, 1.10 and 1.11 ? > Looks good. Let's get it in to HEAD. Give it until Monday before porting to the branches so it gets a few builds first. -- 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/20120106/8f4158e7/attachment.bin From ptisnovs at icedtea.classpath.org Fri Jan 6 03:23:02 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 06 Jan 2012 11:23:02 +0000 Subject: /hg/MauveTestCoverage: 2012-01-06 Pavel Tisnovsky changeset 8612fcdfab82 in /hg/MauveTestCoverage details: http://icedtea.classpath.org/hg/MauveTestCoverage?cmd=changeset;node=8612fcdfab82 author: Pavel Tisnovsky date: Fri Jan 06 12:25:10 2012 +0100 2012-01-06 Pavel Tisnovsky * src/PrintClassList.java: Fixed: closing Java archive when it is read Refactoring, added JavaDoc to all methods * src/PrintTestCoverage.java: Fixed exception thrown if the log file does not exists It's ok because some classes are not covered by tests at all. diffstat: ChangeLog | 11 ++++- src/PrintClassList.java | 93 +++++++++++++++++++++++++++++++++++---------- src/PrintTestCoverage.java | 5 +- 3 files changed, 85 insertions(+), 24 deletions(-) diffs (206 lines): diff -r 17f81193758a -r 8612fcdfab82 ChangeLog --- a/ChangeLog Thu Jan 05 16:38:45 2012 +0100 +++ b/ChangeLog Fri Jan 06 12:25:10 2012 +0100 @@ -1,6 +1,15 @@ +2012-01-06 Pavel Tisnovsky + + * src/PrintClassList.java: + Fixed: closing Java archive when it is read + Refactoring, added JavaDoc to all methods + * src/PrintTestCoverage.java: + Fixed exception thrown if the log file does not exists + It's ok because some classes are not covered by tests at all. + 2012-01-05 Pavel Tisnovsky - * adding Makefile: + * Makefile: Make sure that ./bin and ./report directories are created during build. diff -r 17f81193758a -r 8612fcdfab82 src/PrintClassList.java --- a/src/PrintClassList.java Thu Jan 05 16:38:45 2012 +0100 +++ b/src/PrintClassList.java Fri Jan 06 12:25:10 2012 +0100 @@ -45,49 +45,95 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; + + /** - * Generate and print list of all public classes which are stored in given JAR - * archive. This JAR archive should be accessible through classloader (this - * means that -cp should be used in certain situations). + * This class is used to generate and print list of all public classes which are + * stored in specified JAR archive. This JAR archive should be accessible + * through classloader (this means that -cp should be used in certain + * situations). * - * This tool could be used against "rt.jar" + * This tool could be used (and is plannet to be used) against "rt.jar" * * @author Pavel Tisnovsky */ public class PrintClassList { /** - * Generate and print sorted list of public classes. + * Default path to system-wide rt.jar. + */ + private static final String DEFAULT_PATH_TO_SYSTEM_RT_JAR = "/usr/lib/jvm/java-1.6.0/jre/lib/rt.jar"; + + /** + * Generate and print sorted list of public all classes. * * @param pathToJarArchive * path to rt.jar or other JAR archive to be investigated. */ private static void generateClassList(String pathToJarArchive) { + // it's better to print sorted class names + // and TreeSet sorted its elements by default + Set setOfClassNames = new TreeSet(); + // try to read all public classes from Java archive + readAllPublicClassesFromJarFile(pathToJarArchive, setOfClassNames); + // now we have the list filled, time to print them + printAllPublicClassNames(setOfClassNames); + } + + /** + * Read all public classes from Java archive + * + * @param pathToJarArchive + * path to Java archive + * @param setOfClassNames + * set containing all public class names + */ + private static void readAllPublicClassesFromJarFile(String pathToJarArchive, Set setOfClassNames) + { + JarFile jarFile = null; try { // open the archive and acquire all its entries - JarFile jarFile = new JarFile(pathToJarArchive); + jarFile = new JarFile(pathToJarArchive); + + // entries inside Java archive Enumeration entries = jarFile.entries(); - // it's better to print sorted class names - // and TreeSet sorted its elements by default - Set setOfClassNames = new TreeSet(); - // test each JAR entry while (entries.hasMoreElements()) { JarEntry entry = entries.nextElement(); String className = generateClassName(entry.getName()); - // only public classes are interesting + // only public classes are interesting at this moment if (isPublicClass(className)) { setOfClassNames.add(className); } } - // now we have the list filled, time to print it - for (String className : setOfClassNames) { - System.out.println(className); - } } catch (IOException e) { e.printStackTrace(); } + finally { + // Java archive should be closed in all cases + if (jarFile != null) { + try { + jarFile.close(); + } + catch (IOException e) { + e.printStackTrace(); + } + } + } + } + + /** + * Print all public class names + * + * @param setOfClassNames + * set containing all public class names + */ + private static void printAllPublicClassNames(Set setOfClassNames) + { + for (String className : setOfClassNames) { + System.out.println(className); + } } /** @@ -102,7 +148,7 @@ private static boolean isPublicClass(String className) { try { Class clazz = Class.forName(className); - // interfaces are not our job + // interfaces are not our job at this moment if (clazz.isInterface()) { return false; } @@ -114,26 +160,26 @@ } catch (ClassNotFoundException e) { // it might happen because jar file could - // include other files + // include other types of files files return false; } catch (UnsatisfiedLinkError e) { - // it might happen too + // it might happen too in some cases return false; } catch (ExceptionInInitializerError e) { - // it might happen too + // it might happen too in some cases return false; } catch (NoClassDefFoundError e) { - // it might happen too + // it might happen too in some cases return false; } return true; } /** - * Tries to change given JAR entry into proper class name. + * Try to change given JAR entry into proper class name. * * @param name * JAR entry name @@ -160,9 +206,12 @@ * * @param args * first argument should contains path to JAR file. + * If the first argument does not exists, constant + * path is used instead. */ public static void main(String[] args) { - String pathToRtJar = "/usr/lib/jvm/java-1.6.0/jre/lib/rt.jar"; + String pathToRtJar = DEFAULT_PATH_TO_SYSTEM_RT_JAR; + // path to rt.jar could be specified as first command line argument if (args.length == 1) { pathToRtJar = args[0]; } diff -r 17f81193758a -r 8612fcdfab82 src/PrintTestCoverage.java --- a/src/PrintTestCoverage.java Thu Jan 05 16:38:45 2012 +0100 +++ b/src/PrintTestCoverage.java Fri Jan 06 12:25:10 2012 +0100 @@ -818,9 +818,12 @@ Set methodSet = new TreeSet(); String className = testedClassName.replace('.', '/'); File list = new File(pathToTests, className); + + /* check if directory containing tests for given class name exists */ if (!list.isDirectory()) { - throw new RuntimeException(list.getAbsolutePath() + " is not a proper directory name"); + System.err.println(list.getAbsolutePath() + " is not a proper directory name"); + return; } for (String fileName : list.list()) { From ptisnovs at icedtea.classpath.org Fri Jan 6 04:41:38 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 06 Jan 2012 12:41:38 +0000 Subject: /hg/gfx-test: 2012-01-06 Pavel Tisnovsky Message-ID: changeset 662a5e1dcbd5 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=662a5e1dcbd5 author: Pavel Tisnovsky date: Fri Jan 06 13:44:05 2012 +0100 2012-01-06 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingPathByRectangleShape.java: New 15 tests added to this test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/ClippingPathByRectangleShape.java | 390 ++++++++++- 2 files changed, 380 insertions(+), 15 deletions(-) diffs (495 lines): diff -r 1eb14355e32c -r 662a5e1dcbd5 ChangeLog --- a/ChangeLog Wed Jan 04 12:30:34 2012 +0100 +++ b/ChangeLog Fri Jan 06 13:44:05 2012 +0100 @@ -1,3 +1,8 @@ +2012-01-06 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingPathByRectangleShape.java: + New 15 tests added to this test suite. + 2012-01-04 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r 1eb14355e32c -r 662a5e1dcbd5 src/org/gfxtest/testsuites/ClippingPathByRectangleShape.java --- a/src/org/gfxtest/testsuites/ClippingPathByRectangleShape.java Wed Jan 04 12:30:34 2012 +0100 +++ b/src/org/gfxtest/testsuites/ClippingPathByRectangleShape.java Fri Jan 06 13:44:05 2012 +0100 @@ -95,7 +95,7 @@ * @param graphics2d * graphics canvas */ - private static void drawLinePathClippedByRectangleArea(TestImage image, Graphics2D graphics2d) + private static void drawLinePathClippedByRectangleShape(TestImage image, Graphics2D graphics2d) { // prepare canvas for the rendering basicSetupForRendering(image, graphics2d); @@ -113,7 +113,7 @@ * @param graphics2d * graphics canvas */ - private static void drawQuadraticPathClippedByRectangleArea(TestImage image, Graphics2D graphics2d) + private static void drawQuadraticPathClippedByRectangleShape(TestImage image, Graphics2D graphics2d) { // prepare canvas for the rendering basicSetupForRendering(image, graphics2d); @@ -131,7 +131,7 @@ * @param graphics2d * graphics canvas */ - private static void drawCubicPathClippedByRectangleArea(TestImage image, Graphics2D graphics2d) + private static void drawCubicPathClippedByRectangleShape(TestImage image, Graphics2D graphics2d) { // prepare canvas for the rendering basicSetupForRendering(image, graphics2d); @@ -149,7 +149,7 @@ * @param graphics2d * graphics canvas */ - private static void drawClosedPathClippedByRectangleArea(TestImage image, Graphics2D graphics2d) + private static void drawClosedPathClippedByRectangleShape(TestImage image, Graphics2D graphics2d) { // prepare canvas for the rendering basicSetupForRendering(image, graphics2d); @@ -167,7 +167,7 @@ * @param graphics2d * graphics canvas */ - private static void drawCrossedClosedPathClippedByRectangleArea(TestImage image, Graphics2D graphics2d) + private static void drawCrossedClosedPathClippedByRectangleShape(TestImage image, Graphics2D graphics2d) { // prepare canvas for the rendering basicSetupForRendering(image, graphics2d); @@ -187,12 +187,12 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipLinePathByRectangleAreaStrokePaint(TestImage image, Graphics2D graphics2d) + public TestResult testClipLinePathByRectangleShapeStrokePaint(TestImage image, Graphics2D graphics2d) { // render clip rectangle CommonClippingOperations.renderClipRectangle(image, graphics2d); // set clip region and draw the path - drawLinePathClippedByRectangleArea(image, graphics2d); + drawLinePathClippedByRectangleShape(image, graphics2d); // test result return TestResult.PASSED; } @@ -207,12 +207,12 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipQuadraticPathByRectangleAreaStrokePaint(TestImage image, Graphics2D graphics2d) + public TestResult testClipQuadraticPathByRectangleShapeStrokePaint(TestImage image, Graphics2D graphics2d) { // render clip rectangle CommonClippingOperations.renderClipRectangle(image, graphics2d); // set clip region and draw the path - drawQuadraticPathClippedByRectangleArea(image, graphics2d); + drawQuadraticPathClippedByRectangleShape(image, graphics2d); // test result return TestResult.PASSED; } @@ -227,12 +227,12 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipCubicPathByRectangleAreaStrokePaint(TestImage image, Graphics2D graphics2d) + public TestResult testClipCubicPathByRectangleShapeStrokePaint(TestImage image, Graphics2D graphics2d) { // render clip rectangle CommonClippingOperations.renderClipRectangle(image, graphics2d); // set clip region and draw the path - drawCubicPathClippedByRectangleArea(image, graphics2d); + drawCubicPathClippedByRectangleShape(image, graphics2d); // test result return TestResult.PASSED; } @@ -247,12 +247,12 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipClosedPathByRectangleAreaStrokePaint(TestImage image, Graphics2D graphics2d) + public TestResult testClipClosedPathByRectangleShapeStrokePaint(TestImage image, Graphics2D graphics2d) { // render clip rectangle CommonClippingOperations.renderClipRectangle(image, graphics2d); // set clip region and draw the path - drawClosedPathClippedByRectangleArea(image, graphics2d); + drawClosedPathClippedByRectangleShape(image, graphics2d); // test result return TestResult.PASSED; } @@ -267,12 +267,372 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testClipCrossedClosedPathByRectangleAreaStrokePaint(TestImage image, Graphics2D graphics2d) + public TestResult testClipCrossedClosedPathByRectangleShapeStrokePaint(TestImage image, Graphics2D graphics2d) { // render clip rectangle CommonClippingOperations.renderClipRectangle(image, graphics2d); // set clip region and draw the path - drawCrossedClosedPathClippedByRectangleArea(image, graphics2d); + drawCrossedClosedPathClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if line path could be clipped by a rectangle shape. Path is rendered + * using stroke paint with thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipLinePathByRectangleShapeThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render rectangle which is used as a clip shape + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d); + // set clip region and draw the path + drawCrossedClosedPathClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if quadratic Bezier path could be clipped by a rectangle shape. Path + * is rendered using stroke paint with thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipQuadraticPathByRectangleShapeThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render rectangle which is used as a clip shape + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d); + // set clip region and draw the path + drawQuadraticPathClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if cubic Bezier path could be clipped by a rectangle shape. Path + * is rendered using stroke paint with thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCubicPathByRectangleShapeThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render rectangle which is used as a clip shape + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d); + // set clip region and draw the path + drawCubicPathClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if closed path could be clipped by a rectangle shape. Path + * is rendered using stroke paint with thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipClosedPathByRectangleShapeThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render rectangle which is used as a clip shape + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d); + // set clip region and draw the path + drawClosedPathClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if crossed closed path could be clipped by a rectangle shape. Path + * is rendered using stroke paint with thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCrossedClosedPathByRectangleShapeThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render rectangle which is used as a clip shape + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d); + // set clip region and draw the path + drawCrossedClosedPathClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if line path could be clipped by a rectangle shape. Path is rendered + * using stroke paint with extra thick width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipLinePathByRectangleShapeExtraThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render rectangle which is used as a clip shape + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeExtraThickWidth(graphics2d); + // set clip region and draw the path + drawCrossedClosedPathClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if quadratic Bezier path could be clipped by a rectangle shape. Path + * is rendered using stroke paint with extra thick width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipQuadraticPathByRectangleShapeExtraThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render rectangle which is used as a clip shape + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeExtraThickWidth(graphics2d); + // set clip region and draw the path + drawQuadraticPathClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if cubic Bezier path could be clipped by a rectangle shape. Path + * is rendered using stroke paint with extra thick width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCubicPathByRectangleShapeExtraThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render rectangle which is used as a clip shape + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeExtraThickWidth(graphics2d); + // set clip region and draw the path + drawCubicPathClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if closed path could be clipped by a rectangle shape. Path + * is rendered using stroke paint with extra thick width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipClosedPathByRectangleShapeExtraThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render rectangle which is used as a clip shape + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeExtraThickWidth(graphics2d); + // set clip region and draw the path + drawClosedPathClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if crossed closed path could be clipped by a rectangle shape. Path + * is rendered using stroke paint with extra thick width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCrossedClosedPathByRectangleShapeExtraThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render rectangle which is used as a clip shape + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeExtraThickWidth(graphics2d); + // set clip region and draw the path + drawCrossedClosedPathClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if line path could be clipped by a rectangle shape. Path is rendered + * using stroke paint with zero width stroke. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipLinePathByRectangleShapeZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render rectangle which is used as a clip shape + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // set clip region and draw the path + drawCrossedClosedPathClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if quadratic Bezier path could be clipped by a rectangle shape. Path + * is rendered using stroke paint with zero width stroke. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipQuadraticPathByRectangleShapeZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render rectangle which is used as a clip shape + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // set clip region and draw the path + drawQuadraticPathClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if cubic Bezier path could be clipped by a rectangle shape. Path + * is rendered using stroke paint with zero width stroke. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCubicPathByRectangleShapeZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render rectangle which is used as a clip shape + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // set clip region and draw the path + drawCubicPathClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if closed path could be clipped by a rectangle shape. Path + * is rendered using stroke paint with zero width stroke. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipClosedPathByRectangleShapeZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render rectangle which is used as a clip shape + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // set clip region and draw the path + drawClosedPathClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if crossed closed path could be clipped by a rectangle shape. Path + * is rendered using stroke paint with zero width stroke. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCrossedClosedPathByRectangleShapeZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render rectangle which is used as a clip shape + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // set clip region and draw the path + drawCrossedClosedPathClippedByRectangleShape(image, graphics2d); // test result return TestResult.PASSED; } From andrew at icedtea.classpath.org Fri Jan 6 05:18:04 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 06 Jan 2012 13:18:04 +0000 Subject: /hg/release/icedtea6-1.9: S7103725, RH767129: REGRESSION - 6u29 ... Message-ID: changeset 740d04cb2b9a in /hg/release/icedtea6-1.9 details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=740d04cb2b9a author: Andrew John Hughes date: Fri Jan 06 13:17:57 2012 +0000 S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA 2011-12-22 Andrew John Hughes * Makefile.am: Add new patch. * patches/openjdk/7103725-ssl_beast_regression.patch: Add OpenJDK backport. * NEWS: Updated. diffstat: ChangeLog | 7 +++++++ Makefile.am | 3 ++- NEWS | 1 + patches/openjdk/7103725-ssl_beast_regression.patch | 21 +++++++++++++++++++++ 4 files changed, 31 insertions(+), 1 deletions(-) diffs (64 lines): diff -r 05bf6d3edab6 -r 740d04cb2b9a ChangeLog --- a/ChangeLog Thu Jan 05 11:47:52 2012 -0500 +++ b/ChangeLog Fri Jan 06 13:17:57 2012 +0000 @@ -1,3 +1,10 @@ +2011-12-22 Andrew John Hughes + + * Makefile.am: Add new patch. + * patches/openjdk/7103725-ssl_beast_regression.patch: + Add OpenJDK backport. + * NEWS: Updated. + 2012-01-04 Omair Majid S7102369, S7094468: remove java.rmi.server.codebase property parsing from diff -r 05bf6d3edab6 -r 740d04cb2b9a Makefile.am --- a/Makefile.am Thu Jan 05 11:47:52 2012 -0500 +++ b/Makefile.am Fri Jan 06 13:17:57 2012 +0000 @@ -369,7 +369,8 @@ patches/fonts-rhel-version.patch \ patches/support_linux_3.patch \ patches/libpng-1.5.patch \ - patches/openjdk/7102369-7094468-rmiregistry.patch + patches/openjdk/7102369-7094468-rmiregistry.patch \ + patches/openjdk/7103725-ssl_beast_regression.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r 05bf6d3edab6 -r 740d04cb2b9a NEWS --- a/NEWS Thu Jan 05 11:47:52 2012 -0500 +++ b/NEWS Fri Jan 06 13:17:57 2012 +0000 @@ -13,6 +13,7 @@ * Backports - S7102369: remove java.rmi.server.codebase property parsing from registyimpl - S7094468: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA New in release 1.9.11 (2011-11-08): diff -r 05bf6d3edab6 -r 740d04cb2b9a patches/openjdk/7103725-ssl_beast_regression.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7103725-ssl_beast_regression.patch Fri Jan 06 13:17:57 2012 +0000 @@ -0,0 +1,22 @@ +# HG changeset patch +# User robm +# Date 1324518632 0 +# Node ID cb20ed4b953add8f2443831a0552640efca53ab7 +# Parent 6b46f3c7c97cb060f88b196171b95d33bff80b7c +7103725: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA +Summary: resolving an issue with 7064341. +Reviewed-by: wetmore, coffeys + +diff -r 6b46f3c7c97c -r cb20ed4b953a src/share/classes/sun/security/ssl/AppOutputStream.java +--- openjdk/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java Wed Nov 16 13:14:57 2011 +0000 ++++ openjdk/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java Thu Dec 22 01:50:32 2011 +0000 +@@ -90,7 +90,8 @@ + do { + int howmuch; + if (isFirstRecordOfThePayload && c.needToSplitPayload()) { +- howmuch = Math.min(0x01, r.availableDataBytes()); ++ howmuch = (len == 0) ? 0 : Math.min( ++ 0x01, r.availableDataBytes()); + } else { + howmuch = Math.min(len, r.availableDataBytes()); + } From andrew at icedtea.classpath.org Fri Jan 6 06:19:58 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 06 Jan 2012 14:19:58 +0000 Subject: /hg/icedtea6: 2 new changesets Message-ID: changeset e1a19f0d4c1f in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e1a19f0d4c1f author: Andrew John Hughes date: Fri Jan 06 09:43:52 2012 +0000 Fix NEWS formatting. 2012-01-06 Andrew John Hughes * NEWS: Fix formatting. changeset 9e2ccd629e7b in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9e2ccd629e7b author: Andrew John Hughes date: Fri Jan 06 14:17:21 2012 +0000 Remove outdated NIO2 backport. NIO2 users should use the 2.x series. 2012-01-06 Andrew John Hughes Remove outdated NIO2 backport. * overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile, * overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile, * overlays/nio2/openjdk/jdk/make/mksample/nio/aio/Makefile, * overlays/nio2/openjdk/jdk/make/mksample/nio/file/Makefile, * overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/Extende dCopyOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/Extende dOpenOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/Extende dWatchEventModifier.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/io/File.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/io/FilePermission.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/io/Inputs.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/io/Outputs.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/net/ProtocolFamily.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/net/SocketOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/net/StandardProtocolFamily.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/net/StandardSocketOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/AsynchronousByteChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/AsynchronousChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/AsynchronousChannelGroup.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/AsynchronousDatagramChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/AsynchronousFileChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/AsynchronousServerSocketChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/AsynchronousSocketChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/Channels.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/CompletionHandler.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/DatagramChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/FileChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/FileLock.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/MembershipKey.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/MulticastChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/NetworkChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/SeekableByteChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/exceptions, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/package-info.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/spi/AsynchronousChannelProvider.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/spi/SelectorProvider.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/spi/package.html, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/AccessDeniedException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/AccessMode.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/AtomicMoveNotSupportedException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/ClosedDirectoryStreamException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/ClosedFileSystemException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/ClosedWatchServiceException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/CopyOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/DirectoryNotEmptyException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/DirectoryStream.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/DirectoryStreamFilters.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileAction.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileAlreadyExistsException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileRef.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileStore.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileSystem.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileSystemAlreadyExistsException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileSystemException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileSystemNotFoundException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileSystems.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileTreeWalker.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileVisitOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileVisitResult.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileVisitor.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/Files.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/InvalidPathException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/LinkOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/LinkPermission.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/NoSuchFileException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/NotDirectoryException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/NotLinkException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/OpenOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/Path.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/PathMatcher.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/Paths.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/ProviderMismatchException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/ProviderNotFoundException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/ReadOnlyFileSystemException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/SecureDirectoryStream.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/SimpleFileVisitor.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/StandardCopyOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/StandardOpenOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/StandardWatchEventKind.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/WatchEvent.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/WatchKey.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/WatchService.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/Watchable.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/AclEntry.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/AclEntryFlag.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/AclEntryPermission.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/AclEntryType.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/AclFileAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/AttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/Attributes.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/BasicFileAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/BasicFileAttributes.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/DosFileAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/DosFileAttributes.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/FileAttribute.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/FileAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/FileOwnerAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/FileStoreAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/FileStoreSpaceAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/FileStoreSpaceAttributes.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/GroupPrincipal.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/NamedAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/PosixFileAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/PosixFileAttributes.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/PosixFilePermission.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/PosixFilePermissions.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/UserPrincipal.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/UserPrincipalLookupService.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/UserPrincipalNotFoundException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/package-info.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/package-info.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/spi/AbstractPath.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/spi/FileSystemProvider.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/spi/FileTypeDetector.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/spi/package-info.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/util/Scanner.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/util/concurrent/ScheduledThreadPoolExecutor.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/mi sc/JavaIODeleteOnExitAccess.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/mi sc/JavaNetGetIndexAccess.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/mi sc/JavaUtilConcurrentThreadPoolExecutorAccess.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/mi sc/SharedSecrets.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AbstractFutur e.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousC hannelGroupImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousF ileChannelImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousF ileLockImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousS erverSocketChannelImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousS ocketChannelImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Cancellable.j ava, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/CompletedFutu re.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ExtendedSocke tOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/FileLockTable .java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Groupable.jav a, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Invoker.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipKey Impl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipReg istry.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/OptionKey.jav a, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/PendingFuture .java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchr onousDatagramChannelImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchr onousFileChannelImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ThreadPool.ja va, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractAclFi leAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractBasic FileAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileS toreSpaceAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileT ypeDetector.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractNamed AttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractPolle r.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatch Key.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatch Service.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Cancellable.j ava, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/FileOwnerAttr ibuteViewImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Globs.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/MimeType.java , * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffer. java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffers .java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchS ervice.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Reflect.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/META- INF/services/java.nio.file.spi.FileSystemProvider, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/README.tx t, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/JarEntryInfo.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/JarFileAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/JarFileAttributes.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipEntryInfo.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFileAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFileAttributes.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFileBasicAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFileBasicAttributes.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFilePath.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFileStore.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFileStream.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFileSystem.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFileSystemProvider.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipHeaderConstants.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipPathParser.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipUtils.java, * overlays/nio2/openjdk/jdk/src/share/native/sun/nio/ch/genSocketOptio nRegistry.c, * overlays/nio2/openjdk/jdk/src/share/sample/nio/aio/EchoServer.java, * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/AclEdit.java, * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Chmod.java, * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Copy.java, * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/DiskUsage.java, * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/FileType.java, * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/WatchDir.java, * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Xdd.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultAsyn chronousChannelProvider.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/EPollPort.j ava, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/LinuxAsynch ronousChannelProvider.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/Port.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisAsyn chronousChannelProvider.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisEven tPort.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchr onousServerSocketChannelImpl.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchr onousSocketChannelImpl.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFile SystemProvider.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFile TypeDetector.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/GnomeFileTy peDetector.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFil eAttributeView.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSt ore.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSy stem.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSy stemProvider.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedA ttributeView.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNative Dispatcher.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchS ervice.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisAclF ileAttributeView.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFile Store.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFile System.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFile SystemProvider.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisName dAttributeView.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNati veDispatcher.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisWatc hService.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixChannel Factory.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixCopyFil e.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixDirecto ryStream.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixExcepti on.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAtt ributeViews.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAtt ributes.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileKey .java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileMod eAttribute.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSto re.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSto reAttributes.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSys tem.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSys temProvider.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixMountEn try.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixNativeD ispatcher.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixPath.ja va, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixSecureD irectoryStream.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUriUtil s.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUserPri ncipals.java, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/EPollPort.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/SolarisEvent Port.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchro nousServerSocketChannelImpl.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchro nousSocketChannelImpl.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/GnomeFileTyp eDetector.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeD ispatcher.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxWatchSe rvice.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisNativ eDispatcher.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisWatch Service.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixCopyFile .c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDi spatcher.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genSolarisCo nstants.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genUnixConst ants.c, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultAsyn chronousChannelProvider.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/Iocp.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/PendingIoCa che.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsyn chronousChannelProvider.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsyn chronousFileChannelImpl.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsyn chronousServerSocketChannelImpl.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsyn chronousSocketChannelImpl.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFile SystemProvider.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFile TypeDetector.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/RegistryFil eTypeDetector.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsAclF ileAttributeView.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsChan nelFactory.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsCons tants.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsDire ctoryStream.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsExce ption.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile AttributeViews.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile Attributes.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile Copy.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile Store.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile System.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile SystemProvider.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsLink Support.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsName dAttributeView.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNati veDispatcher.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPath .java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPath Parser.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPath Type.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecu rity.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecu rityDescriptor.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUriS upport.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUser Principals.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsWatc hService.java, * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/Iocp.c, * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsync hronousFileChannelImpl.c, * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsync hronousServerSocketChannelImpl.c, * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsync hronousSocketChannelImpl.c, * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/RegistryFile TypeDetector.c, * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/WindowsNativ eDispatcher.c, * overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/Sanity.java, * overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/sanity.sh, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/io/Inputs/ Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/AsExecutor.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/Attack.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/GroupOfOne.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/Identity.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/PrivilegedThreadFactory.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/Restart.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/Unbounded.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/run_any_task.sh, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousDatagramChannel/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousFileChannel/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousFileChannel/CustomThreadPool.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousFileChannel/Lock.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousFileChannel/MyThreadFactory.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousServerSocketChannel/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousServerSocketChannel/WithSecurityManager.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousServerSocketChannel/java.policy.allow, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousServerSocketChannel/java.policy.deny, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousSocketChannel/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousSocketChannel/Leaky.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/Channels/Basic2.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/spi/AsynchronousChannelProvider/CheckProvider.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/spi/AsynchronousChannelProvider/META- INF/services/java.nio.channels.spi.AsynchronousChannelProvider, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/spi/AsynchronousChannelProvider/Provider1.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/spi/AsynchronousChannelProvider/Provider2.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/spi/AsynchronousChannelProvider/custom_provider.sh, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/D irectoryStream/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/D irectoryStream/Filters.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/D irectoryStream/SecureDS.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F ileStore/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F ileSystem/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/ContentType.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/CreateFileTree.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/ForceLoad.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/META-INF/services/java.nio.file.spi.FileTypeDetector, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/Misc.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/PrintFileTree.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/SimpleFileTypeDetector.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/SkipSiblings.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/TerminateWalk.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/content_type.sh, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/walk_file_tree.sh, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/CopyAndMove.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/DeleteOnClose.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/InterruptCopy.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/Links.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/Misc.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/PathOps.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/SBC.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/TemporaryFiles.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/UriImportExport.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/delete_on_close.sh, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/temporary_files.sh, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P athMatcher/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/T estUtil.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W atchService/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W atchService/FileTreeModifier.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W atchService/WithSecurityManager.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W atchService/denyAll.policy, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W atchService/grantDirAndOneLevel.policy, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W atchService/grantDirAndTree.policy, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W atchService/grantDirOnly.policy, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a ttribute/AclFileAttributeView/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a ttribute/Attributes/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a ttribute/BasicFileAttributeView/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a ttribute/DosFileAttributeView/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a ttribute/FileStoreAttributeView/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a ttribute/NamedAttributeView/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a ttribute/PosixFileAttributeView/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/s pi/SetDefaultProvider.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/s pi/TestProvider.java: Removed. * patches/nio2.patch: Dropped. * Makefile.am: Remove ENABLE_NIO2 conditional blocks from overlays, patch and rt. * configure.ac: Remove --enable-nio2 option. * NEWS: Mention removal. diffstat: ChangeLog | 365 + Makefile.am | 12 - NEWS | 11 +- configure.ac | 8 - overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile | 37 - overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile | 40 - overlays/nio2/openjdk/jdk/make/mksample/nio/aio/Makefile | 50 - overlays/nio2/openjdk/jdk/make/mksample/nio/file/Makefile | 56 - overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedCopyOption.java | 43 - overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedOpenOption.java | 50 - overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java | 43 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/File.java | 450 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/FilePermission.java | 852 --- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/Inputs.java | 391 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/Outputs.java | 362 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/ProtocolFamily.java | 40 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/SocketOption.java | 56 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardProtocolFamily.java | 46 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardSocketOption.java | 370 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousByteChannel.java | 206 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousChannel.java | 118 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup.java | 317 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel.java | 707 -- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel.java | 777 -- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel.java | 305 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel.java | 672 -- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/Channels.java | 214 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/CompletionHandler.java | 78 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/DatagramChannel.java | 223 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java | 404 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileLock.java | 321 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/MembershipKey.java | 183 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/MulticastChannel.java | 216 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/NetworkChannel.java | 165 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/SeekableByteChannel.java | 170 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/exceptions | 68 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/package-info.java | 293 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider.java | 284 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/SelectorProvider.java | 199 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/package.html | 45 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AccessDeniedException.java | 69 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AccessMode.java | 50 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AtomicMoveNotSupportedException.java | 57 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedDirectoryStreamException.java | 46 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedFileSystemException.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedWatchServiceException.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/CopyOption.java | 42 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryNotEmptyException.java | 50 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryStream.java | 139 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryStreamFilters.java | 211 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileAction.java | 65 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileAlreadyExistsException.java | 64 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileRef.java | 425 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileStore.java | 173 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystem.java | 426 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemAlreadyExistsException.java | 54 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemException.java | 126 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemNotFoundException.java | 53 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystems.java | 415 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileTreeWalker.java | 247 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitOption.java | 46 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitResult.java | 63 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitor.java | 177 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Files.java | 405 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/InvalidPathException.java | 131 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/LinkOption.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/LinkPermission.java | 108 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NoSuchFileException.java | 64 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NotDirectoryException.java | 50 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NotLinkException.java | 64 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/OpenOption.java | 46 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Path.java | 1575 ----- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/PathMatcher.java | 50 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Paths.java | 126 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ProviderMismatchException.java | 54 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ProviderNotFoundException.java | 53 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ReadOnlyFileSystemException.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/SecureDirectoryStream.java | 327 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/SimpleFileVisitor.java | 123 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardCopyOption.java | 48 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardOpenOption.java | 126 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardWatchEventKind.java | 95 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchEvent.java | 117 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchKey.java | 138 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchService.java | 179 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Watchable.java | 128 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntry.java | 395 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryFlag.java | 66 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryPermission.java | 131 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryType.java | 57 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView.java | 211 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AttributeView.java | 119 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/Attributes.java | 714 -- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView.java | 185 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributes.java | 164 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView.java | 180 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributes.java | 85 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileAttribute.java | 51 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileAttributeView.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileOwnerAttributeView.java | 102 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView.java | 39 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreSpaceAttributeView.java | 94 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreSpaceAttributes.java | 67 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/GroupPrincipal.java | 43 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView.java | 231 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributeView.java | 196 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributes.java | 78 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFilePermission.java | 87 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFilePermissions.java | 190 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipal.java | 55 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipalLookupService.java | 105 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipalNotFoundException.java | 65 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/package-info.java | 120 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/package-info.java | 116 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/AbstractPath.java | 542 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/FileSystemProvider.java | 441 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/FileTypeDetector.java | 102 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/package-info.java | 39 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/util/Scanner.java | 2657 --------- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/util/concurrent/ScheduledThreadPoolExecutor.java | 1371 ---- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaIODeleteOnExitAccess.java | 43 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaNetGetIndexAccess.java | 46 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaUtilConcurrentThreadPoolExecutorAccess.java | 58 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/SharedSecrets.java | 102 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AbstractFuture.java | 64 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java | 359 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java | 169 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java | 68 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java | 222 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java | 546 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Cancellable.java | 39 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/CompletedFuture.java | 114 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ExtendedSocketOption.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/FileLockTable.java | 287 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Groupable.java | 35 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Invoker.java | 274 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipKeyImpl.java | 224 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipRegistry.java | 132 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/OptionKey.java | 48 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/PendingFuture.java | 259 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java | 425 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java | 437 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ThreadPool.java | 168 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java | 113 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java | 210 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileStoreSpaceAttributeView.java | 121 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java | 70 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractNamedAttributeView.java | 125 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java | 296 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatchKey.java | 179 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatchService.java | 166 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Cancellable.java | 137 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java | 116 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Globs.java | 155 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/MimeType.java | 73 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffer.java | 87 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffers.java | 140 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java | 454 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Reflect.java | 63 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/META-INF/services/java.nio.file.spi.FileSystemProvider | 1 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/README.txt | 29 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarEntryInfo.java | 44 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributeView.java | 76 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributes.java | 57 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipEntryInfo.java | 76 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributeView.java | 154 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributes.java | 93 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributeView.java | 187 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributes.java | 125 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFilePath.java | 1027 --- overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStore.java | 230 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStream.java | 166 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystem.java | 319 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystemProvider.java | 243 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipHeaderConstants.java | 75 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipPathParser.java | 308 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipUtils.java | 481 - overlays/nio2/openjdk/jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c | 129 - overlays/nio2/openjdk/jdk/src/share/sample/nio/aio/EchoServer.java | 165 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/AclEdit.java | 301 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Chmod.java | 363 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Copy.java | 227 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/DiskUsage.java | 78 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/FileType.java | 62 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/WatchDir.java | 204 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Xdd.java | 119 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java | 57 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/EPollPort.java | 362 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java | 100 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/Port.java | 170 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java | 103 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java | 243 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java | 320 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java | 685 -- overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java | 74 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileTypeDetector.java | 36 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java | 99 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java | 300 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java | 102 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java | 186 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java | 41 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedAttributeView.java | 344 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java | 126 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java | 469 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java | 408 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileStore.java | 102 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java | 178 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java | 41 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNamedAttributeView.java | 293 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java | 56 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisWatchService.java | 771 -- overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixChannelFactory.java | 289 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixCopyFile.java | 615 -- overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java | 270 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixException.java | 117 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java | 401 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java | 312 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileKey.java | 60 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileModeAttribute.java | 86 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java | 289 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileStoreAttributes.java | 59 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystem.java | 375 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java | 151 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixMountEntry.java | 82 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java | 556 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java | 1201 ---- overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java | 664 -- overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUriUtils.java | 216 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java | 179 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/EPollPort.c | 173 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/SolarisEventPort.c | 155 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.c | 47 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c | 53 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c | 205 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c | 160 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c | 156 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisNativeDispatcher.c | 70 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisWatchService.c | 141 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixCopyFile.c | 85 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c | 1059 --- overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genSolarisConstants.c | 104 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c | 129 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java | 43 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/Iocp.java | 435 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/PendingIoCache.java | 161 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java | 96 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java | 736 -- overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java | 367 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java | 911 --- overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java | 38 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java | 36 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java | 82 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java | 226 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsChannelFactory.java | 348 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java | 191 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java | 225 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsException.java | 109 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java | 296 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributes.java | 296 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileCopy.java | 527 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileStore.java | 324 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java | 318 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java | 148 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsLinkSupport.java | 466 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNamedAttributeView.java | 342 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java | 1131 ---- overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java | 1312 ---- overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPathParser.java | 225 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPathType.java | 38 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecurity.java | 123 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java | 392 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUriSupport.java | 167 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUserPrincipals.java | 169 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsWatchService.java | 581 -- overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/Iocp.c | 144 - overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousFileChannelImpl.c | 132 - overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.c | 142 - overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c | 222 - overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/RegistryFileTypeDetector.c | 62 - overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c | 1328 ---- overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/Sanity.java | 168 - overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/sanity.sh | 71 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/io/Inputs/Basic.java | 218 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java | 84 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Attack.java | 63 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Basic.java | 261 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java | 137 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Identity.java | 167 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/PrivilegedThreadFactory.java | 50 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Restart.java | 134 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Unbounded.java | 120 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh | 52 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel/Basic.java | 377 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Basic.java | 585 -- overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java | 67 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Lock.java | 340 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/MyThreadFactory.java | 49 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/Basic.java | 136 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java | 76 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow | 3 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny | 3 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Basic.java | 805 -- overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Leaky.java | 104 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/Channels/Basic2.java | 172 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/CheckProvider.java | 38 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/META-INF/services/java.nio.channels.spi.AsynchronousChannelProvider | 1 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java | 62 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java | 62 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh | 71 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/Basic.java | 153 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/Filters.java | 241 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/SecureDS.java | 370 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/FileStore/Basic.java | 79 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/FileSystem/Basic.java | 82 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/ContentType.java | 91 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/CreateFileTree.java | 96 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/ForceLoad.java | 38 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector | 1 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/Misc.java | 126 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/PrintFileTree.java | 78 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/SimpleFileTypeDetector.java | 47 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/SkipSiblings.java | 85 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/TerminateWalk.java | 70 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/content_type.sh | 70 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/walk_file_tree.sh | 86 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/CopyAndMove.java | 983 --- overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/DeleteOnClose.java | 77 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/InterruptCopy.java | 119 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/Links.java | 143 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/Misc.java | 349 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/PathOps.java | 646 -- overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/SBC.java | 468 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/TemporaryFiles.java | 76 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/UriImportExport.java | 80 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/delete_on_close.sh | 61 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/temporary_files.sh | 65 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/PathMatcher/Basic.java | 163 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/TestUtil.java | 117 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/Basic.java | 493 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/FileTreeModifier.java | 148 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/WithSecurityManager.java | 83 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/denyAll.policy | 3 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirAndOneLevel.policy | 5 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirAndTree.policy | 5 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirOnly.policy | 4 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView/Basic.java | 166 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/Attributes/Basic.java | 254 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView/Basic.java | 150 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView/Basic.java | 155 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView/Basic.java | 170 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView/Basic.java | 273 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributeView/Basic.java | 398 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/spi/SetDefaultProvider.java | 44 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/spi/TestProvider.java | 128 - patches/nio2.patch | 2792 ---------- 355 files changed, 369 insertions(+), 79029 deletions(-) diffs (truncated from 80889 to 500 lines): diff -r 72b7e37e64a5 -r 9e2ccd629e7b ChangeLog --- a/ChangeLog Fri Jan 06 09:30:37 2012 +0000 +++ b/ChangeLog Fri Jan 06 14:17:21 2012 +0000 @@ -1,3 +1,368 @@ +2012-01-06 Andrew John Hughes + + Remove outdated NIO2 backport. + * overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile, + * overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile, + * overlays/nio2/openjdk/jdk/make/mksample/nio/aio/Makefile, + * overlays/nio2/openjdk/jdk/make/mksample/nio/file/Makefile, + * overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedCopyOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedOpenOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/File.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/FilePermission.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/Inputs.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/Outputs.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/ProtocolFamily.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/SocketOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardProtocolFamily.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardSocketOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousByteChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/Channels.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/CompletionHandler.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/DatagramChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileLock.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/MembershipKey.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/MulticastChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/NetworkChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/SeekableByteChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/exceptions, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/package-info.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/SelectorProvider.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/package.html, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AccessDeniedException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AccessMode.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AtomicMoveNotSupportedException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedDirectoryStreamException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedFileSystemException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedWatchServiceException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/CopyOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryNotEmptyException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryStream.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryStreamFilters.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileAction.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileAlreadyExistsException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileRef.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileStore.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystem.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemAlreadyExistsException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemNotFoundException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystems.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileTreeWalker.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitResult.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitor.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Files.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/InvalidPathException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/LinkOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/LinkPermission.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NoSuchFileException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NotDirectoryException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NotLinkException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/OpenOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Path.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/PathMatcher.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Paths.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ProviderMismatchException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ProviderNotFoundException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ReadOnlyFileSystemException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/SecureDirectoryStream.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/SimpleFileVisitor.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardCopyOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardOpenOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardWatchEventKind.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchEvent.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchKey.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchService.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Watchable.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntry.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryFlag.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryPermission.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryType.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/Attributes.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileAttribute.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileOwnerAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreSpaceAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreSpaceAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/GroupPrincipal.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFilePermission.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFilePermissions.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipal.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipalLookupService.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipalNotFoundException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/package-info.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/package-info.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/AbstractPath.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/FileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/FileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/package-info.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/util/Scanner.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/util/concurrent/ScheduledThreadPoolExecutor.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaIODeleteOnExitAccess.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaNetGetIndexAccess.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaUtilConcurrentThreadPoolExecutorAccess.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/SharedSecrets.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AbstractFuture.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Cancellable.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/CompletedFuture.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ExtendedSocketOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/FileLockTable.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Groupable.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Invoker.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipKeyImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipRegistry.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/OptionKey.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/PendingFuture.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ThreadPool.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileStoreSpaceAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractNamedAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatchKey.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatchService.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Cancellable.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Globs.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/MimeType.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffer.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffers.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Reflect.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/META-INF/services/java.nio.file.spi.FileSystemProvider, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/README.txt, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarEntryInfo.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipEntryInfo.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFilePath.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStore.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStream.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystem.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipHeaderConstants.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipPathParser.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipUtils.java, + * overlays/nio2/openjdk/jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/aio/EchoServer.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/AclEdit.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Chmod.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Copy.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/DiskUsage.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/FileType.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/WatchDir.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Xdd.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/EPollPort.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/Port.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedAttributeView.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileStore.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNamedAttributeView.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisWatchService.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixChannelFactory.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixCopyFile.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixException.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileKey.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileModeAttribute.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileStoreAttributes.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystem.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixMountEntry.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUriUtils.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/EPollPort.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/SolarisEventPort.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisNativeDispatcher.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisWatchService.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixCopyFile.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genSolarisConstants.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/Iocp.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/PendingIoCache.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsChannelFactory.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsException.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileCopy.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileStore.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsLinkSupport.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNamedAttributeView.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPathParser.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPathType.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecurity.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUriSupport.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUserPrincipals.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsWatchService.java, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/Iocp.c, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousFileChannelImpl.c, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.c, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/RegistryFileTypeDetector.c, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c, + * overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/Sanity.java, + * overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/sanity.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/io/Inputs/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Attack.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Identity.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/PrivilegedThreadFactory.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Restart.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Unbounded.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Lock.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/MyThreadFactory.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Leaky.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/Channels/Basic2.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/CheckProvider.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/META-INF/services/java.nio.channels.spi.AsynchronousChannelProvider, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/Filters.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/SecureDS.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/FileStore/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/FileSystem/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/ContentType.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/CreateFileTree.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/ForceLoad.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/Misc.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/PrintFileTree.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/SimpleFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/SkipSiblings.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/TerminateWalk.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/content_type.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/walk_file_tree.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/CopyAndMove.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/DeleteOnClose.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/InterruptCopy.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/Links.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/Misc.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/PathOps.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/SBC.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/TemporaryFiles.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/UriImportExport.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/delete_on_close.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/temporary_files.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/PathMatcher/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/TestUtil.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/FileTreeModifier.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/WithSecurityManager.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/denyAll.policy, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirAndOneLevel.policy, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirAndTree.policy, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirOnly.policy, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/Attributes/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributeView/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/spi/SetDefaultProvider.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/spi/TestProvider.java: + Removed. + * patches/nio2.patch: Dropped. + * Makefile.am: + Remove ENABLE_NIO2 conditional blocks from + overlays, patch and rt. + * configure.ac: Remove --enable-nio2 option. + * NEWS: Mention removal. + +2012-01-06 Andrew John Hughes + + * NEWS: Fix formatting. + 2012-01-06 Andrew John Hughes * NEWS: diff -r 72b7e37e64a5 -r 9e2ccd629e7b Makefile.am --- a/Makefile.am Fri Jan 06 09:30:37 2012 +0000 +++ b/Makefile.am Fri Jan 06 14:17:21 2012 +0000 @@ -434,10 +434,6 @@ patches/openjdk/7018387-xrender_gc_leak.patch endif -if ENABLE_NIO2 -ICEDTEA_PATCHES += patches/nio2.patch -endif - if ENABLE_SYSTEMTAP ICEDTEA_PATCHES += patches/systemtap.patch \ patches/systemtap-gcc-4.5.patch \ @@ -1205,9 +1201,6 @@ cp -a $(abs_top_srcdir)/overlays overlays.build chmod -R ug+rwX overlays.build cp -a overlays.build/openjdk/* openjdk/ -if ENABLE_NIO2 - cp -a overlays.build/nio2/openjdk/* openjdk/ -endif cp -a overlays.build/jpeg/openjdk/* openjdk/ rm -rf overlays.build touch stamps/overlay.stamp @@ -2266,11 +2259,6 @@ if BOOTSTRAPPING $(BOOT_DIR)/bin/jar uf $(RUNTIME) -C lib/rt com -C lib/rt java \ -C lib/rt javax -C lib/rt sun -if ENABLE_NIO2 - if [ -e lib/rt/org/classpath ] ; then \ - $(BOOT_DIR)/bin/jar uf $(RUNTIME) -C lib/rt org/classpath ; \ - fi -endif endif touch stamps/rt.stamp diff -r 72b7e37e64a5 -r 9e2ccd629e7b NEWS --- a/NEWS Fri Jan 06 09:30:37 2012 +0000 +++ b/NEWS Fri Jan 06 14:17:21 2012 +0000 @@ -13,6 +13,7 @@ New in release 1.11 (2011-XX-XX): * Use HotSpot 20 as the default virtual machine. +* Drop the outdated NIO2 backport. Users who want NIO2 should use IcedTea 2.x. * Bug fixes - PR637: make check should exit with an error code if any regression test failed. - PR752: ImageFormatException extends Exception not RuntimeException @@ -393,14 +394,10 @@ - ARM: Remove hack for return value in float registers. - ARM: Fixed use of uninitialized variable. - ARM: removed unused ICMD_GETSTATIC branch. - - ARM: Designate function labels as such; - required for thumb interworking. - - src/vm/javaobjects.cpp (java_lang_reflect_Method::invoke): [OPENJDK] stack - index of caller was off by one, causing many apt - (Annotation Processing Tool) failures. + - ARM: Designate function labels as such; required for thumb interworking. + - src/vm/javaobjects.cpp (java_lang_reflect_Method::invoke): stack index of caller was off by one, causing apt failures. - Set thread to RUNNABLE during Thread.start. - - Removed state-setting function call that would be done by the thread itself, - creating a nasty race. + - Removed state-setting function call that would be done by the thread itself, creating a nasty race. - Threadlist & threadobject improvements. * JamVM - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. diff -r 72b7e37e64a5 -r 9e2ccd629e7b configure.ac --- a/configure.ac Fri Jan 06 09:30:37 2012 +0000 +++ b/configure.ac Fri Jan 06 14:17:21 2012 +0000 @@ -112,14 +112,6 @@ AM_CONDITIONAL([ENABLE_XRENDER], [test x$ENABLE_XRENDER = xyes]) AC_MSG_RESULT(${ENABLE_XRENDER}) -AC_MSG_CHECKING([whether to include NIO2 support]) -AC_ARG_ENABLE([nio2], - [AS_HELP_STRING([--enable-nio2], - [Enable inclusion of backported NIO2])], - [ENABLE_NIO2="${enableval}"], [ENABLE_NIO2='no']) -AM_CONDITIONAL([ENABLE_NIO2], [test x$ENABLE_NIO2 = xyes]) -AC_MSG_RESULT(${ENABLE_NIO2}) - AC_MSG_CHECKING([whether to include SystemTap tracing support]) AC_ARG_ENABLE([systemtap], [AS_HELP_STRING([--enable-systemtap], diff -r 72b7e37e64a5 -r 9e2ccd629e7b overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile --- a/overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile Fri Jan 06 09:30:37 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -# -# Copyright 2007-2008 Sun Microsystems, Inc. All Rights Reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Sun designates this -# particular file as subject to the "Classpath" exception as provided -# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -# CA 95054 USA or visit www.sun.com if you need additional information or -# have any questions. -# - -# -# Makefile for building the NIO demo(s) -# - -BUILDDIR = ../.. -PRODUCT = demos -include $(BUILDDIR)/common/Defs.gmk - -SUBDIRS = ZipFileSystem - -all build clean clobber:: - $(SUBDIRS-loop) diff -r 72b7e37e64a5 -r 9e2ccd629e7b overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile --- a/overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile Fri Jan 06 09:30:37 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ From ahughes at redhat.com Fri Jan 6 06:21:18 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 6 Jan 2012 14:21:18 +0000 Subject: For NIO2 lovers... Message-ID: <20120106142118.GI25062@rivendell.middle-earth.co.uk> I've just removed the NIO2 backport from IcedTea6. It's been outdated for a while (compared with the one in IcedTea 2.x) and I'm not aware of anyone actually using it (please scream if you are...) By far the best place to go for NIO2 is the 2.x series now it's available, and I'd rather we weren't carrying this dead weight around into the 1.11 series. -- 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/20120106/5c1bfa1f/attachment.bin From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 06:52:10 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 14:52:10 +0000 Subject: [Bug 847] New: [TRACKER] IcedTea6 1.12 Release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=847 Bug #: 847 Summary: [TRACKER] IcedTea6 1.12 Release Classification: Unclassified Product: IcedTea Version: 6-hg Platform: x86_64 OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: ahughes at redhat.com Tracker for 1.12. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 06:52:29 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 14:52:29 +0000 Subject: [Bug 847] [TRACKER] IcedTea6 1.12 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=847 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |26 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 06:52:39 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 14:52:39 +0000 Subject: [Bug 847] [TRACKER] IcedTea6 1.12 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=847 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |94 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 06:53:02 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 14:53:02 +0000 Subject: [Bug 847] [TRACKER] IcedTea6 1.12 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=847 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |718 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 06:54:14 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 14:54:14 +0000 Subject: [Bug 848] New: Use XML for AUTHORS/NEWS to ensure reliable formatting for producing e.g. release notes. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=848 Bug #: 848 Summary: Use XML for AUTHORS/NEWS to ensure reliable formatting for producing e.g. release notes. Classification: Unclassified Product: IcedTea Version: 6-hg Platform: x86_64 OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: ahughes at redhat.com Plan: AUTHORS.xml and NEWS.xml are main edited formats. make dist produces usual AUTHORS/NEWS. Same XML files can be used to produce HTML release notes for blog rather than the current haphazard approach of my tool. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 06:55:23 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 14:55:23 +0000 Subject: [Bug 848] Use XML for AUTHORS/NEWS to ensure reliable formatting for producing e.g. release notes. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=848 --- Comment #1 from Andrew John Hughes 2012-01-06 14:55:23 UTC --- Note; for IcedTea7 too. Perhaps time we combined categories... -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 06:55:44 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 14:55:44 +0000 Subject: [Bug 848] Use XML for AUTHORS/NEWS to ensure reliable formatting for producing e.g. release notes. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=848 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |847 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 06:55:44 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 14:55:44 +0000 Subject: [Bug 847] [TRACKER] IcedTea6 1.12 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=847 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |848 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 07:01:06 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 15:01:06 +0000 Subject: [Bug 849] New: Use XML for AUTHORS/NEWS for use in about.jnlp Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=849 Bug #: 849 Summary: Use XML for AUTHORS/NEWS for use in about.jnlp Classification: Unclassified Product: IcedTea-Web Version: unspecified Platform: x86_64 OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: General AssignedTo: unassigned at icedtea.classpath.org ReportedBy: ahughes at redhat.com CC: unassigned at icedtea.classpath.org See dependent IcedTea bug. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 07:01:14 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 15:01:14 +0000 Subject: [Bug 849] Use XML for AUTHORS/NEWS for use in about.jnlp In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=849 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |848 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 07:01:14 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 15:01:14 +0000 Subject: [Bug 848] Use XML for AUTHORS/NEWS to ensure reliable formatting for producing e.g. release notes. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=848 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |849 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 07:02:46 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 15:02:46 +0000 Subject: [Bug 849] Use XML for AUTHORS/NEWS for use in about.jnlp In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=849 Pavel Tisnovsky changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ptisnovs at redhat.com AssignedTo|unassigned at icedtea.classpat |ptisnovs at redhat.com |h.org | -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 07:03:06 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 15:03:06 +0000 Subject: [Bug 825] OpenOffice crash on opening file (attached) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=825 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Severity|critical |normal -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 07:03:15 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 15:03:15 +0000 Subject: [Bug 849] Use XML for AUTHORS/NEWS for use in about.jnlp In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=849 Pavel Tisnovsky changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 07:04:49 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 15:04:49 +0000 Subject: [Bug 838] IcedTeam plugin crashes with chrome browser when javascript is executed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=838 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Severity|critical |normal --- Comment #1 from Andrew John Hughes 2012-01-06 15:04:49 UTC --- Please try with the latest version of the IcedTea plugin available in the IcedTea-Web project: http://icedtea.classpath.org/wiki/IcedTea-Web -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 07:05:18 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 15:05:18 +0000 Subject: [Bug 838] IcedTeam plugin crashes with chrome browser when javascript is executed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=838 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |unassigned at icedtea.classpat | |h.org Component|IcedTea6 |Plugin AssignedTo|unassigned at icedtea.classpat |dbhole at redhat.com |h.org | -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 07:05:47 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 15:05:47 +0000 Subject: [Bug 805] os_linux_zero.cpp:236 Error: caught unhandled signal 11 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=805 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Severity|blocker |normal -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 07:06:03 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 15:06:03 +0000 Subject: [Bug 834] When starting Eclipse this error happens In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=834 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |ahughes at redhat.com Resolution| |INVALID --- Comment #2 from Andrew John Hughes 2012-01-06 15:06:03 UTC --- Closing as inapplicable. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 07:07:46 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 15:07:46 +0000 Subject: [Bug 830] icedtea6: Important Channel Binding Patch is missing In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=830 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com --- Comment #2 from Andrew John Hughes 2012-01-06 15:07:46 UTC --- This backport is in HEAD and will be released in 1.11. I'll look at backporting it to older versions so it'll be in the upcoming 1.10.5 release too. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 07:08:04 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 15:08:04 +0000 Subject: [Bug 830] icedtea6: Important Channel Binding Patch is missing In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=830 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Target Milestone|--- |6-1.8.11 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From jvanek at redhat.com Fri Jan 6 07:14:54 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 06 Jan 2012 16:14:54 +0100 Subject: [icedtea-web] RFC: fix findbugs communal cloud jnlps In-Reply-To: <4F062247.3050608@redhat.com> References: <4F062247.3050608@redhat.com> Message-ID: <4F070FEE.8000404@redhat.com> On 01/05/2012 11:20 PM, Omair Majid wrote: > Hi, > > It was recently brought to my attention that the jnlps listed at http://findbugs.sourceforge.net/index.html (under the section "New") are broken, throwing exceptions when trying to run. > > The attached fixes the problems. > > The first problem was that icedtea-web was trying to ensure that all jnlps, including extension jnlps have a main class. I wonder what other applications were broken by this check. This patch modifies the check to only check for main class when a main class is possible (applets and applications). > > The second second problem was that (in the extension jnlp file) the jnlp element did not contain a codebase attribute. IcedTea-Web tried to add this null codebase when merging the jnlp file, causing an exception. The patch simply ignores this null. > > ChangeLog: > > 2012-01-05 Omair Majid > > * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > (initializeResources): Only throw exceptions about the main class not > being found when the jnlp file can have a main class. > (addToCodeBaseLoader): Dont try to process null URLs. > > Any thoughts or comments? > Give sense. Thank you for fast and nice fix. J. > Thanks, > Omair > > > findbugs-issues-01.patch > > > diff -r 64979652c3b7 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Jan 05 17:33:06 2012 +0100 > +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Jan 05 17:11:04 2012 -0500 > @@ -488,11 +488,14 @@ > > // If jar with main class was not found and there are no more > // available jars, throw a LaunchException > - if (!foundMainJar > -&& (available == null || available.size() == 0)) > - throw new LaunchException(file, null, R("LSFatal"), > - R("LCClient"), R("LCantDetermineMainClass"), > - R("LCantDetermineMainClassInfo")); > + if (file.getLaunchInfo() instanceof AppletDesc || > + file.getLaunchInfo() instanceof ApplicationDesc) { > + if (!foundMainJar > +&& (available == null || available.size() == 0)) > + throw new LaunchException(file, null, R("LSFatal"), > + R("LCClient"), R("LCantDetermineMainClass"), > + R("LCantDetermineMainClassInfo")); > + } > > // If main jar was found, but a signed JNLP file was not located > if (!isSignedJNLP&& foundMainJar) > @@ -1700,6 +1703,9 @@ > * @throws IllegalArgumentException If the given url is not a path > */ > private void addToCodeBaseLoader(URL u) { > + if (u == null) { > + return; > + } > > // Only paths may be added > if (!u.getFile().endsWith("/")) { From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 07:32:36 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 15:32:36 +0000 Subject: [Bug 805] os_linux_zero.cpp:236 Error: caught unhandled signal 11 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=805 Andrew Haley changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |aph at redhat.com --- Comment #1 from Andrew Haley 2012-01-06 15:32:36 UTC --- It's very hard to understand this because there isn't enough information. I can't see how that particular line would segfault. We really need a debugger to see where the segfault really happens. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From omajid at redhat.com Fri Jan 6 07:58:20 2012 From: omajid at redhat.com (Omair Majid) Date: Fri, 06 Jan 2012 10:58:20 -0500 Subject: [rfc][icedtea] makefiel part of fix of rhbz 580478 In-Reply-To: <20120106072034.GC25062@rivendell.middle-earth.co.uk> References: <4EF1FBB5.1070701@redhat.com> <4EF20C4F.8080803@redhat.com> <4F05C2DC.6010805@redhat.com> <20120106072034.GC25062@rivendell.middle-earth.co.uk> Message-ID: <4F071A1C.2030303@redhat.com> On 01/06/2012 02:20 AM, Dr Andrew John Hughes wrote: > > Mostly fine, but you can use configure to do the replacement and it'll automatically handle > removal too. > Yes, that's true. But as I mentioned in my review, this approach will continue working once we fully support 'make install' (along with custom prefixes and destdirs), while the configure approach will not work as well. We had this discussion a while back when we were trying to add shell scripts to serve as launchers in icedtea-web: http://thread.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/12440/focus=12774 Cheers, Omair From ahughes at redhat.com Fri Jan 6 08:04:54 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 6 Jan 2012 16:04:54 +0000 Subject: [rfc][icedtea] makefiel part of fix of rhbz 580478 In-Reply-To: <4F071A1C.2030303@redhat.com> References: <4EF1FBB5.1070701@redhat.com> <4EF20C4F.8080803@redhat.com> <4F05C2DC.6010805@redhat.com> <20120106072034.GC25062@rivendell.middle-earth.co.uk> <4F071A1C.2030303@redhat.com> Message-ID: <20120106160454.GB29761@rivendell.middle-earth.co.uk> On 10:58 Fri 06 Jan , Omair Majid wrote: > On 01/06/2012 02:20 AM, Dr Andrew John Hughes wrote: > > > > Mostly fine, but you can use configure to do the replacement and it'll automatically handle > > removal too. > > > > Yes, that's true. But as I mentioned in my review, this approach will > continue working once we fully support 'make install' (along with custom > prefixes and destdirs), while the configure approach will not work as well. > > We had this discussion a while back when we were trying to add shell > scripts to serve as launchers in icedtea-web: > http://thread.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/12440/focus=12774 > Yeah, I'm still of the mind that this is the best solution, rather than maintaining our own. If someone is going to override prefix only via make, they deserve all they get IMHO. Is there somewhere that actually recommends/documents doing that? If we really want to support it, it's something that can be looked at on HEAD but I want the least disruptive change for the release branches and that's the one that uses configure. > Cheers, > Omair -- 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/20120106/592d747f/attachment.bin From omajid at redhat.com Fri Jan 6 08:13:26 2012 From: omajid at redhat.com (Omair Majid) Date: Fri, 06 Jan 2012 11:13:26 -0500 Subject: [rfc][icedtea] makefiel part of fix of rhbz 580478 In-Reply-To: <20120106160454.GB29761@rivendell.middle-earth.co.uk> References: <4EF1FBB5.1070701@redhat.com> <4EF20C4F.8080803@redhat.com> <4F05C2DC.6010805@redhat.com> <20120106072034.GC25062@rivendell.middle-earth.co.uk> <4F071A1C.2030303@redhat.com> <20120106160454.GB29761@rivendell.middle-earth.co.uk> Message-ID: <4F071DA6.1040702@redhat.com> On 01/06/2012 11:04 AM, Dr Andrew John Hughes wrote: > On 10:58 Fri 06 Jan , Omair Majid wrote: >> On 01/06/2012 02:20 AM, Dr Andrew John Hughes wrote: >>> >>> Mostly fine, but you can use configure to do the replacement and it'll automatically handle >>> removal too. >>> >> >> Yes, that's true. But as I mentioned in my review, this approach will >> continue working once we fully support 'make install' (along with custom >> prefixes and destdirs), while the configure approach will not work as well. >> >> We had this discussion a while back when we were trying to add shell >> scripts to serve as launchers in icedtea-web: >> http://thread.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/12440/focus=12774 >> > > Yeah, I'm still of the mind that this is the best solution, rather than maintaining our > own. If someone is going to override prefix only via make, they deserve all they get IMHO. > Is there somewhere that actually recommends/documents doing that? > > If we really want to support it, it's something that can be looked at on HEAD but > I want the least disruptive change for the release branches and that's the one that uses > configure. > Fair enough. FWIW, I am fine with this new patch too. Cheers, Omair From aph at icedtea.classpath.org Fri Jan 6 08:16:25 2012 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Fri, 06 Jan 2012 16:16:25 +0000 Subject: /hg/icedtea6: 2 new changesets Message-ID: changeset 4d842f482132 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4d842f482132 author: aph date: Fri Jan 06 16:12:57 2012 +0000 NEWS: ARM assembly langguage port. 2012-01-06 Andrew Haley * NEWS: ARM assembly langguage port. changeset e02f88881494 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e02f88881494 author: aph date: Fri Jan 06 16:15:13 2012 +0000 Typo in ChangeLog. diffstat: ChangeLog | 4 ++++ NEWS | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diffs (24 lines): diff -r 9e2ccd629e7b -r e02f88881494 ChangeLog --- a/ChangeLog Fri Jan 06 14:17:21 2012 +0000 +++ b/ChangeLog Fri Jan 06 16:15:13 2012 +0000 @@ -1,3 +1,7 @@ +2012-01-06 Andrew Haley + + * NEWS: ARM assembly language port. + 2012-01-06 Andrew John Hughes Remove outdated NIO2 backport. diff -r 9e2ccd629e7b -r e02f88881494 NEWS --- a/NEWS Fri Jan 06 14:17:21 2012 +0000 +++ b/NEWS Fri Jan 06 16:15:13 2012 +0000 @@ -13,6 +13,9 @@ New in release 1.11 (2011-XX-XX): * Use HotSpot 20 as the default virtual machine. +* ARM assembly language port reinstated, ported to the EABI hard-fp + model, and locking for multi-core operation added. Many minor bugs + fixed. * Drop the outdated NIO2 backport. Users who want NIO2 should use IcedTea 2.x. * Bug fixes - PR637: make check should exit with an error code if any regression test failed. From dbhole at redhat.com Fri Jan 6 08:19:24 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 6 Jan 2012 11:19:24 -0500 Subject: [icedtea-web] RFC: fix findbugs communal cloud jnlps In-Reply-To: <4F062247.3050608@redhat.com> References: <4F062247.3050608@redhat.com> Message-ID: <20120106161923.GH4961@redhat.com> * Omair Majid [2012-01-05 18:38]: > Hi, > > It was recently brought to my attention that the jnlps listed at > http://findbugs.sourceforge.net/index.html (under the section "New") > are broken, throwing exceptions when trying to run. > > The attached fixes the problems. > > The first problem was that icedtea-web was trying to ensure that all > jnlps, including extension jnlps have a main class. I wonder what > other applications were broken by this check. This patch modifies > the check to only check for main class when a main class is possible > (applets and applications). > > The second second problem was that (in the extension jnlp file) the > jnlp element did not contain a codebase attribute. IcedTea-Web tried > to add this null codebase when merging the jnlp file, causing an > exception. The patch simply ignores this null. > > ChangeLog: > > 2012-01-05 Omair Majid > > * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > (initializeResources): Only throw exceptions about the main class not > being found when the jnlp file can have a main class. > (addToCodeBaseLoader): Dont try to process null URLs. > > Any thoughts or comments? > Looks good to me, OK for HEAD and 1.1. Cheers, Deepak > Thanks, > Omair > diff -r 64979652c3b7 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Jan 05 17:33:06 2012 +0100 > +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Jan 05 17:11:04 2012 -0500 > @@ -488,11 +488,14 @@ > > // If jar with main class was not found and there are no more > // available jars, throw a LaunchException > - if (!foundMainJar > - && (available == null || available.size() == 0)) > - throw new LaunchException(file, null, R("LSFatal"), > - R("LCClient"), R("LCantDetermineMainClass"), > - R("LCantDetermineMainClassInfo")); > + if (file.getLaunchInfo() instanceof AppletDesc || > + file.getLaunchInfo() instanceof ApplicationDesc) { > + if (!foundMainJar > + && (available == null || available.size() == 0)) > + throw new LaunchException(file, null, R("LSFatal"), > + R("LCClient"), R("LCantDetermineMainClass"), > + R("LCantDetermineMainClassInfo")); > + } > > // If main jar was found, but a signed JNLP file was not located > if (!isSignedJNLP && foundMainJar) > @@ -1700,6 +1703,9 @@ > * @throws IllegalArgumentException If the given url is not a path > */ > private void addToCodeBaseLoader(URL u) { > + if (u == null) { > + return; > + } > > // Only paths may be added > if (!u.getFile().endsWith("/")) { From omajid at redhat.com Fri Jan 6 08:24:47 2012 From: omajid at redhat.com (Omair Majid) Date: Fri, 06 Jan 2012 11:24:47 -0500 Subject: icedtea6 1.11 branching on 2012-01-06 In-Reply-To: <4F06C887.1010408@redhat.com> References: <4EF49ECF.7060004@redhat.com> <4F05B855.1080204@ubuntu.com> <20120106071603.GB25062@rivendell.middle-earth.co.uk> <4F06C887.1010408@redhat.com> Message-ID: <4F07204F.8090408@redhat.com> On 01/06/2012 05:10 AM, Andrew Haley wrote: > On 01/06/2012 07:16 AM, Dr Andrew John Hughes wrote: >> On 15:48 Thu 05 Jan , Matthias Klose wrote: >>> On 12/23/2011 04:31 PM, Omair Majid wrote: >>>> Hi all, >>>> >>>> As noted elsewhere, a number of important features and fixes have been added to >>>> icedtea6 that are not in any release. This seems like a good time as any to try >>>> and get a release out. To that end, I am planning to branch icedtea6 1.11 on >>>> 2012-01-06. I dont have an exact release date in mind right now, but it probably >>>> will be at least a week after that. >>> >>> there's a regression: shark is completely broken. seen on the buildbot >>> http://builder.classpath.org/icedtea/buildbot/builders/icedtea6-squeeze-x86_64-quick-shark/builds/188 >>> using llvm-2.7, and checked with llvm-2.9 and llvm-3.0 as well. If not fixed, >>> please mention it in the release notes. >> >> Do you plan to fix it? > > As I understand it, LLVM-JIT is horribly broken while they rewrite > the JIT back-end. If that's true, we don't want to update Shark > until they're done. However, I don't read the LLVM lists, so this > may all be nonsense. Does that mean shark works fine with older versions of llvm? Would that be llvm-2.6? I ask because I have vague memories of testing shark with llvm-2.6 which contained enough bugs that made shark not work. And unless I am mistake things were working better with llvm-2.7. Have there been changes to shark that have made it not work on 2.7? I am trying to figure out what level of shark support should claim to offer in icedtea6 1.11 ("works if the stars are aligned just right" vs "nope, broken"). Thanks, Omair From omajid at redhat.com Fri Jan 6 08:28:03 2012 From: omajid at redhat.com (Omair Majid) Date: Fri, 06 Jan 2012 11:28:03 -0500 Subject: [icedtea-web] RFC: fix findbugs communal cloud jnlps In-Reply-To: <20120106161923.GH4961@redhat.com> References: <4F062247.3050608@redhat.com> <20120106161923.GH4961@redhat.com> Message-ID: <4F072113.7090706@redhat.com> On 01/06/2012 11:19 AM, Deepak Bhole wrote: > * Omair Majid [2012-01-05 18:38]: >> Hi, >> >> It was recently brought to my attention that the jnlps listed at >> http://findbugs.sourceforge.net/index.html (under the section "New") >> are broken, throwing exceptions when trying to run. >> >> The attached fixes the problems. >> >> The first problem was that icedtea-web was trying to ensure that all >> jnlps, including extension jnlps have a main class. I wonder what >> other applications were broken by this check. This patch modifies >> the check to only check for main class when a main class is possible >> (applets and applications). >> >> The second second problem was that (in the extension jnlp file) the >> jnlp element did not contain a codebase attribute. IcedTea-Web tried >> to add this null codebase when merging the jnlp file, causing an >> exception. The patch simply ignores this null. >> >> ChangeLog: >> >> 2012-01-05 Omair Majid >> >> * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java >> (initializeResources): Only throw exceptions about the main class not >> being found when the jnlp file can have a main class. >> (addToCodeBaseLoader): Dont try to process null URLs. >> >> Any thoughts or comments? >> > > Looks good to me, OK for HEAD and 1.1. > I guess I should have been more explicit. This patch was only for HEAD. I have not tested 1.1 at all. I dont think the first problem will occur in 1.1 anyway since it does not support signed jnlp files. I will test and post a patch for 1.1 separately. Thanks for the review! Cheers, Omair From aph at redhat.com Fri Jan 6 08:29:41 2012 From: aph at redhat.com (Andrew Haley) Date: Fri, 06 Jan 2012 16:29:41 +0000 Subject: icedtea6 1.11 branching on 2012-01-06 In-Reply-To: <4F07204F.8090408@redhat.com> References: <4EF49ECF.7060004@redhat.com> <4F05B855.1080204@ubuntu.com> <20120106071603.GB25062@rivendell.middle-earth.co.uk> <4F06C887.1010408@redhat.com> <4F07204F.8090408@redhat.com> Message-ID: <4F072175.5040900@redhat.com> On 01/06/2012 04:24 PM, Omair Majid wrote: > I am trying to figure out what level of shark support should claim to > offer in icedtea6 1.11 ("works if the stars are aligned just right" vs > "nope, broken"). None, unless someone wants to do a lot of testing right now. I think of this as a temporary withdrawal to be followed by a better-than-ever-whiter-than-white-super-duper-new release later this year. Andrew. From chphilli at redhat.com Fri Jan 6 08:30:18 2012 From: chphilli at redhat.com (Chris Phillips) Date: Fri, 06 Jan 2012 11:30:18 -0500 Subject: icedtea6 1.11 branching on 2012-01-06 In-Reply-To: <4F07204F.8090408@redhat.com> References: <4EF49ECF.7060004@redhat.com> <4F05B855.1080204@ubuntu.com> <20120106071603.GB25062@rivendell.middle-earth.co.uk> <4F06C887.1010408@redhat.com> <4F07204F.8090408@redhat.com> Message-ID: <4F07219A.8030901@redhat.com> Hi Omair I think its pretty badly broken all across the board, I've never gotten -XComp to work reliably with shark/llvm with any combination of llvm / hs. HS20+ is definitely broken in several ways. After we get zero / jsr 292 functional, then maybe LLVM's new interfaces will have stabilized and it can be fixed. Chris On 06/01/12 11:24 AM, Omair Majid wrote: > On 01/06/2012 05:10 AM, Andrew Haley wrote: >> On 01/06/2012 07:16 AM, Dr Andrew John Hughes wrote: >>> On 15:48 Thu 05 Jan , Matthias Klose wrote: >>>> On 12/23/2011 04:31 PM, Omair Majid wrote: >>>>> Hi all, >>>>> >>>>> As noted elsewhere, a number of important features and fixes have >>>>> been added to >>>>> icedtea6 that are not in any release. This seems like a good time >>>>> as any to try >>>>> and get a release out. To that end, I am planning to branch >>>>> icedtea6 1.11 on >>>>> 2012-01-06. I dont have an exact release date in mind right now, >>>>> but it probably >>>>> will be at least a week after that. >>>> >>>> there's a regression: shark is completely broken. seen on the buildbot >>>> http://builder.classpath.org/icedtea/buildbot/builders/icedtea6-squeeze-x86_64-quick-shark/builds/188 >>>> >>>> using llvm-2.7, and checked with llvm-2.9 and llvm-3.0 as well. If >>>> not fixed, >>>> please mention it in the release notes. >>> >>> Do you plan to fix it? >> >> As I understand it, LLVM-JIT is horribly broken while they rewrite >> the JIT back-end. If that's true, we don't want to update Shark >> until they're done. However, I don't read the LLVM lists, so this >> may all be nonsense. > > Does that mean shark works fine with older versions of llvm? Would > that be llvm-2.6? I ask because I have vague memories of testing shark > with llvm-2.6 which contained enough bugs that made shark not work. > And unless I am mistake things were working better with llvm-2.7. Have > there been changes to shark that have made it not work on 2.7? > > I am trying to figure out what level of shark support should claim to > offer in icedtea6 1.11 ("works if the stars are aligned just right" vs > "nope, broken"). > > Thanks, > Omair -- -- -- Woda: "Java: write once, debug anywhere" Hong Zhang http://thehenrys.ca | Chris Phillips @ T.O. Red Hat OpenJDK JVM Engineer, | | mailto:ChPhilli at RedHat.Com (416)483-3768 | | http://LGonQn.Org/www/Chris.Phillips cell: (416)505-3610 | "EPIC stands for Expects Perfectly Intuitive Compilers" P. Bannon http://www.hazmatmodine.com NOTICE: This email message is for the sole use of the intended recipient(s) and may contain confidential and privileged information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. "blah blah blah - Ginger!" -- From dbhole at redhat.com Fri Jan 6 08:31:46 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 6 Jan 2012 11:31:46 -0500 Subject: [icedtea-web] RFC: fix findbugs communal cloud jnlps In-Reply-To: <4F072113.7090706@redhat.com> References: <4F062247.3050608@redhat.com> <20120106161923.GH4961@redhat.com> <4F072113.7090706@redhat.com> Message-ID: <20120106163146.GK4961@redhat.com> * Omair Majid [2012-01-06 11:28]: > On 01/06/2012 11:19 AM, Deepak Bhole wrote: > >* Omair Majid [2012-01-05 18:38]: > >>Hi, > >> > >>It was recently brought to my attention that the jnlps listed at > >>http://findbugs.sourceforge.net/index.html (under the section "New") > >>are broken, throwing exceptions when trying to run. > >> > >>The attached fixes the problems. > >> > >>The first problem was that icedtea-web was trying to ensure that all > >>jnlps, including extension jnlps have a main class. I wonder what > >>other applications were broken by this check. This patch modifies > >>the check to only check for main class when a main class is possible > >>(applets and applications). > >> > >>The second second problem was that (in the extension jnlp file) the > >>jnlp element did not contain a codebase attribute. IcedTea-Web tried > >>to add this null codebase when merging the jnlp file, causing an > >>exception. The patch simply ignores this null. > >> > >>ChangeLog: > >> > >>2012-01-05 Omair Majid > >> > >> * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > >> (initializeResources): Only throw exceptions about the main class not > >> being found when the jnlp file can have a main class. > >> (addToCodeBaseLoader): Dont try to process null URLs. > >> > >>Any thoughts or comments? > >> > > > >Looks good to me, OK for HEAD and 1.1. > > > > I guess I should have been more explicit. This patch was only for > HEAD. I have not tested 1.1 at all. I dont think the first problem > will occur in 1.1 anyway since it does not support signed jnlp > files. > > I will test and post a patch for 1.1 separately. > Ah ok, I thought it was for both. Fair enough. Yes, please try with 1.1 -- it is going to be supported for a while and we need a fix there too. Thanks! Cheers, Deepak From andrew at icedtea.classpath.org Fri Jan 6 08:32:47 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 06 Jan 2012 16:32:47 +0000 Subject: /hg/icedtea6: 2 new changesets Message-ID: changeset 2c7d274c2a07 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2c7d274c2a07 author: Andrew John Hughes date: Fri Jan 06 16:28:25 2012 +0000 Add ARM assembly language port changes to NEWS. 2012-01-06 Andrew Haley * NEWS: ARM assembly language port. changeset b6a6575c1788 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b6a6575c1788 author: Andrew John Hughes date: Fri Jan 06 16:32:35 2012 +0000 Cleanup ARM entry, separating details into their own section. 2012-01-06 Andrew John Hughes * NEWS: Cleanup ARM entry, separating details into their own section. diffstat: ChangeLog | 9 +++++++++ NEWS | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diffs (40 lines): diff -r 9e2ccd629e7b -r b6a6575c1788 ChangeLog --- a/ChangeLog Fri Jan 06 14:17:21 2012 +0000 +++ b/ChangeLog Fri Jan 06 16:32:35 2012 +0000 @@ -1,3 +1,12 @@ +2012-01-06 Andrew John Hughes + + * NEWS: Cleanup ARM entry, separating + details into their own section. + +2012-01-06 Andrew Haley + + * NEWS: ARM assembly language port. + 2012-01-06 Andrew John Hughes Remove outdated NIO2 backport. diff -r 9e2ccd629e7b -r b6a6575c1788 NEWS --- a/NEWS Fri Jan 06 14:17:21 2012 +0000 +++ b/NEWS Fri Jan 06 16:32:35 2012 +0000 @@ -13,6 +13,8 @@ New in release 1.11 (2011-XX-XX): * Use HotSpot 20 as the default virtual machine. +* ARM assembly language port reinstated and updated; details below. +* Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools" * Drop the outdated NIO2 backport. Users who want NIO2 should use IcedTea 2.x. * Bug fixes - PR637: make check should exit with an error code if any regression test failed. @@ -383,7 +385,10 @@ - S6851973: ignore incoming channel binding if acceptor does not set one - S7091528: javadoc attempts to parse .class files - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA -* Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools" +* ARM Port + - Ported to the EABI hard-fp model + - Locking for multi-core operation added. + - Many minor bugs fixed. * CACAO - CA149: Used wrong class loader. - CA159: Exception handler blocks / register mixup. From ddadacha at redhat.com Fri Jan 6 08:44:14 2012 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Fri, 06 Jan 2012 11:44:14 -0500 Subject: [RFC][icedtea-web] Plugin doesn't halt when required elements from JNLP files are missing. Message-ID: <4F0724DE.5000508@redhat.com> Hi, Looking at the plugin docs[1], and <vendor> are required elements of <information>, without them the plugin should stop with a fatal error. Currently, icedtea-web just returns null from their respective getters and handles null accordingly. However it should not even reach that far. Here's a simple patch that throws a ParseException when not found. ChangeLog +2012-01-06 Danesh Dadachanji <ddadacha at redhat.com> + + Applications using JNLP files without a title or vendor section + still run, despite them being required elements. + * netx/net/sourceforge/jnlp/Parser.java: + (getInformationDesc): If title or vendor are not found in info, + a new ParseException is thrown. + * netx/net/sourceforge/jnlp/resources/Messages.properties: Add + PNoTitleElement and PNoVendorElement + Any comments? Is this okay for HEAD? Regards, Danesh [1] http://docs.oracle.com/javase/7/docs/technotes/guides/javaws/developersguide/syntax.html -------------- next part -------------- A non-text attachment was scrubbed... Name: title-vendor-required-01.patch Type: text/x-patch Size: 1396 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120106/50bc1f22/title-vendor-required-01.patch From jvanek at icedtea.classpath.org Fri Jan 6 08:47:03 2012 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Fri, 06 Jan 2012 16:47:03 +0000 Subject: /hg/icedtea6: resolves rhbz#580478, is adding full paths to des... Message-ID: <hg.24c5bd2e7d57.1325868423.2873452341184383832@icedtea.classpath.org> changeset 24c5bd2e7d57 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=24c5bd2e7d57 author: Jiri Vanek <jvanek at redhat.com> date: Fri Jan 06 17:48:27 2012 +0100 resolves rhbz#580478, is adding full paths to desktop files diffstat: ChangeLog | 12 ++++++++++++ configure.ac | 26 +++++++++++++++----------- jconsole.desktop | 10 ---------- jconsole.desktop.in | 10 ++++++++++ policytool.desktop | 10 ---------- policytool.desktop.in | 10 ++++++++++ 6 files changed, 47 insertions(+), 31 deletions(-) diffs (120 lines): diff -r b6a6575c1788 -r 24c5bd2e7d57 ChangeLog --- a/ChangeLog Fri Jan 06 16:32:35 2012 +0000 +++ b/ChangeLog Fri Jan 06 17:48:27 2012 +0100 @@ -1,3 +1,15 @@ +2012-01-06 Jiri Vanek <jvanek at redhat.com> + + fixes rhbz#580478 + * configure.ac: abs-install-dir block moved outside conditional ENABLE_SYSTEMTAP block + Added policytool.desktop and jconsole.desktop as AC_CONFIG_FILES + * jconsole.desktop: removed, replaced by jconsole.desktop.in + * jconsole.desktop.in: new file, stub for desktop file, have variable + to be substitued during configure + * policytool.desktop: removed, replaced by policytool.desktop.in + * policytool.desktop.in: new file, stub for desktop file, have variable + to be substituted during configure + 2012-01-06 Andrew John Hughes <ahughes at redhat.com> * NEWS: Cleanup ARM entry, separating diff -r b6a6575c1788 -r 24c5bd2e7d57 configure.ac --- a/configure.ac Fri Jan 06 16:32:35 2012 +0000 +++ b/configure.ac Fri Jan 06 17:48:27 2012 +0100 @@ -257,6 +257,21 @@ fi fi +AC_MSG_CHECKING([for absolute java home install dir]) +AC_ARG_WITH([abs-install-dir], + [AS_HELP_STRING([--with-abs-install-dir], + [The absolute path where the j2sdk-image dir will be installed])], + [if test "x${withval}" = x; then + ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image" + else + ABS_JAVA_HOME_DIR="${withval}" + fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"]) +AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}]) +AC_SUBST(ABS_JAVA_HOME_DIR) + +AC_CONFIG_FILES([jconsole.desktop]) +AC_CONFIG_FILES([policytool.desktop]) + if test "x${ENABLE_SYSTEMTAP}" = xyes; then AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], [SDT_H_FOUND='no'; @@ -298,19 +313,8 @@ ]])], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([systemtap sdt.h or g++ too old])]) AC_LANG_POP([C++]) - AC_MSG_CHECKING([for absolute java home install dir]) - AC_ARG_WITH([abs-install-dir], - [AS_HELP_STRING([--with-abs-install-dir], - [The absolute path where the j2sdk-image dir will be installed])], - [if test "x${withval}" = x; then - ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image" - else - ABS_JAVA_HOME_DIR="${withval}" - fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"]) - AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}]) ABS_CLIENT_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so" ABS_SERVER_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so" - AC_SUBST(ABS_JAVA_HOME_DIR) AC_SUBST(ABS_CLIENT_LIBJVM_SO) AC_SUBST(ABS_SERVER_LIBJVM_SO) AC_CONFIG_FILES([tapset/hotspot.stp]) diff -r b6a6575c1788 -r 24c5bd2e7d57 jconsole.desktop --- a/jconsole.desktop Fri Jan 06 16:32:35 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=OpenJDK Monitoring & Management Console -Comment=Monitor and manage OpenJDK applications -Exec=/usr/bin/jconsole -Icon=java -Terminal=false -Type=Application -StartupWMClass=sun-tools-jconsole-JConsole -Categories=Development;Monitor;Java; -Version=1.0 diff -r b6a6575c1788 -r 24c5bd2e7d57 jconsole.desktop.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jconsole.desktop.in Fri Jan 06 17:48:27 2012 +0100 @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=OpenJDK Monitoring & Management Console +Comment=Monitor and manage OpenJDK applications +Exec=@ABS_JAVA_HOME_DIR@/bin/jconsole +Icon=java +Terminal=false +Type=Application +StartupWMClass=sun-tools-jconsole-JConsole +Categories=Development;Monitor;Java; +Version=1.0 diff -r b6a6575c1788 -r 24c5bd2e7d57 policytool.desktop --- a/policytool.desktop Fri Jan 06 16:32:35 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=OpenJDK Policy Tool -Comment=Manage OpenJDK policy files -Exec=/usr/bin/policytool -Icon=java -Terminal=false -Type=Application -StartupWMClass=sun-security-tools-PolicyTool -Categories=Development;Java; -Version=1.0 diff -r b6a6575c1788 -r 24c5bd2e7d57 policytool.desktop.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policytool.desktop.in Fri Jan 06 17:48:27 2012 +0100 @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=OpenJDK Policy Tool +Comment=Manage OpenJDK policy files +Exec=@ABS_JAVA_HOME_DIR@/bin/policytool +Icon=java +Terminal=false +Type=Application +StartupWMClass=sun-security-tools-PolicyTool +Categories=Development;Java; +Version=1.0 From omajid at icedtea.classpath.org Fri Jan 6 09:17:46 2012 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Fri, 06 Jan 2012 17:17:46 +0000 Subject: /hg/icedtea-web: fix findbugs cloud jnlps Message-ID: <hg.0e524d940827.1325870266.8643924302249223276@icedtea.classpath.org> changeset 0e524d940827 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=0e524d940827 author: Omair Majid <omajid at redhat.com> date: Fri Jan 06 12:14:56 2012 -0500 fix findbugs cloud jnlps Someone reported that the following JNLP was not starting: http://findbugs.cs.umd.edu/cloud/eclipse.jnlp The first problem was that icedtea-web was trying to ensure that all jnlps, including extension jnlps have a main class. I wonder what other applications were broken by this check. This patch modifies the check to only check for main class when a main class is possible (applets and applications). The second second problem was that (in the extension jnlp file) the jnlp element did not contain a codebase attribute. IcedTea-Web tried to add this null codebase when merging the jnlp file, causing an exception. The patch simply ignores this null. 2012-01-05 Omair Majid <omajid at redhat.com> * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (initializeResources): Only throw exceptions about the main class not being found when the jnlp file can have a main class. (addToCodeBaseLoader): Dont try to process null URLs. diffstat: ChangeLog | 7 +++++++ netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 16 +++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diffs (47 lines): diff -r 64979652c3b7 -r 0e524d940827 ChangeLog --- a/ChangeLog Thu Jan 05 17:33:06 2012 +0100 +++ b/ChangeLog Fri Jan 06 12:14:56 2012 -0500 @@ -1,3 +1,10 @@ +2012-01-05 Omair Majid <omajid at redhat.com> + + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java + (initializeResources): Only throw exceptions about the main class not + being found when the jnlp file can have a main class. + (addToCodeBaseLoader): Dont try to process null URLs. + 2011-12-15 Jiri Vanek <jvanek at redhat.com> * configure.ac: added search for xsltproc program and setting diff -r 64979652c3b7 -r 0e524d940827 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Jan 05 17:33:06 2012 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Jan 06 12:14:56 2012 -0500 @@ -488,11 +488,14 @@ // If jar with main class was not found and there are no more // available jars, throw a LaunchException - if (!foundMainJar - && (available == null || available.size() == 0)) - throw new LaunchException(file, null, R("LSFatal"), - R("LCClient"), R("LCantDetermineMainClass"), - R("LCantDetermineMainClassInfo")); + if (file.getLaunchInfo() instanceof AppletDesc || + file.getLaunchInfo() instanceof ApplicationDesc) { + if (!foundMainJar + && (available == null || available.size() == 0)) + throw new LaunchException(file, null, R("LSFatal"), + R("LCClient"), R("LCantDetermineMainClass"), + R("LCantDetermineMainClassInfo")); + } // If main jar was found, but a signed JNLP file was not located if (!isSignedJNLP && foundMainJar) @@ -1700,6 +1703,9 @@ * @throws IllegalArgumentException If the given url is not a path */ private void addToCodeBaseLoader(URL u) { + if (u == null) { + return; + } // Only paths may be added if (!u.getFile().endsWith("/")) { From jvanek at redhat.com Fri Jan 6 09:37:15 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 06 Jan 2012 18:37:15 +0100 Subject: [RFC][icedtea-web] Plugin doesn't halt when required elements from JNLP files are missing. In-Reply-To: <4F0724DE.5000508@redhat.com> References: <4F0724DE.5000508@redhat.com> Message-ID: <4F07314B.1050300@redhat.com> On 01/06/2012 05:44 PM, Danesh Dadachanji wrote: > Hi, > > Looking at the plugin docs[1], <title> and <vendor> are required elements of <information>, without them the plugin should stop with a fatal error. Currently, icedtea-web just returns null from their respective getters and handles null accordingly. However it should not even reach that far. Here's a simple patch that throws a ParseException when not found. > > ChangeLog > +2012-01-06 Danesh Dadachanji <ddadacha at redhat.com> > + > + Applications using JNLP files without a title or vendor section > + still run, despite them being required elements. > + * netx/net/sourceforge/jnlp/Parser.java: > + (getInformationDesc): If title or vendor are not found in info, > + a new ParseException is thrown. > + * netx/net/sourceforge/jnlp/resources/Messages.properties: Add > + PNoTitleElement and PNoVendorElement > + > > Any comments? Is this okay for HEAD? > > Regards, > Danesh > > [1] http://docs.oracle.com/javase/7/docs/technotes/guides/javaws/developersguide/syntax.html I do not like the idea of forcing somebody to have elements, when they can be still empty. But if documentation say so.... How proprietary plugin is dealing with it? J. From a.radke at arcor.de Fri Jan 6 10:17:16 2012 From: a.radke at arcor.de (Andreas Radke) Date: Fri, 6 Jan 2012 19:17:16 +0100 Subject: glibc 2.15 breaks build in icedtea2.0 Message-ID: <20120106191716.3e105ae9@laptop64.home> g++ -DLINUX -D_GNU_SOURCE -DAMD64 -DPRODUCT -I. -I/build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/prims -I/build/src/icedtea-2.0/openjdk/hotspot/src/share/vm -I/build/src/icedtea-2.0/openjdk/hotspot/src/cpu/x86/vm -I/build/src/icedtea-2.0/openjdk/hotspot/src/os_cpu/linux_x86/vm -I/build/src/icedtea-2.0/openjdk/hotspot/src/os/linux/vm -I/build/src/icedtea-2.0/openjdk/hotspot/src/os/posix/vm -I../generated -DHOTSPOT_RELEASE_VERSION="\"21.0-b17\"" -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"nobody\"" -DHOTSPOT_LIB_ARCH=\"amd64\" -DJRE_RELEASE_VERSION="\"1.7.0_147-b147\"" -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDERIVATIVE_ID="\"IcedTea7 2.0\"" -DDISTRIBUTION_ID="\"Custom build (Fri Jan 6 18:01:40 UTC 2012)\"" -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -DTARGET_OS_FAMILY_linux -DTARGET_ARCH_x86 -DTARGET_ARCH_MODEL_x86_64 -DTARGET_OS_ARCH_linux_x86 -DTARGET_OS_ARCH_MODEL_linux_x86_64 -DTARGET_COMPILER_gcc -DCOMPILER2 -DCOMPILER1 -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -fvisibility=hidden -m64 -pipe -g -DTARGET_OS_FAMILY_linux -DTARGET_ARCH_x86 -DTARGET_ARCH_MODEL_x86_64 -DTARGET_OS_ARCH_linux_x86 -DTARGET_OS_ARCH_MODEL_linux_x86_64 -DTARGET_COMPILER_gcc -DCOMPILER2 -DCOMPILER1 -fpic -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -fvisibility=hidden -m64 -pipe -g -O3 -fno-strict-aliasing -DVM_LITTLE_ENDIAN -D_LP64=1 -fno-omit-frame-pointer -Werror -Wpointer-arith -Wsign-compare -c -MMD -MP -MF ../generated/dependencies/precompiled.hpp.gch.d -x c++-header /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/precompiled.hpp -o precompiled.hpp.gch In file included from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/prims/methodHandles.hpp:32:0, from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/ci/ciMethod.hpp:33, from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/code/debugInfoRec.hpp:30, from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/ci/ciEnv.hpp:31, from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/ci/ciUtilities.hpp:28, from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/ci/ciNullObject.hpp:30, from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/ci/ciConstant.hpp:29, from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/precompiled.hpp:36: /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp:430:0: error: "__LEAF" redefined [-Werror] /usr/include/sys/cdefs.h:44:0: note: this is the location of the previous definition cc1plus: all warnings being treated as errors make[7]: *** [precompiled.hpp.gch] Error 1 Any idea for a fix? -Andy From ahughes at redhat.com Fri Jan 6 09:29:03 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 6 Jan 2012 17:29:03 +0000 Subject: icedtea6 1.11 branching on 2012-01-06 In-Reply-To: <4F072175.5040900@redhat.com> References: <4EF49ECF.7060004@redhat.com> <4F05B855.1080204@ubuntu.com> <20120106071603.GB25062@rivendell.middle-earth.co.uk> <4F06C887.1010408@redhat.com> <4F07204F.8090408@redhat.com> <4F072175.5040900@redhat.com> Message-ID: <20120106172903.GC32411@rivendell.middle-earth.co.uk> On 16:29 Fri 06 Jan , Andrew Haley wrote: > On 01/06/2012 04:24 PM, Omair Majid wrote: > > I am trying to figure out what level of shark support should claim to > > offer in icedtea6 1.11 ("works if the stars are aligned just right" vs > > "nope, broken"). > > None, unless someone wants to do a lot of testing right now. I > think of this as a temporary withdrawal to be followed by a > better-than-ever-whiter-than-white-super-duper-new release later > this year. > Personally, I've not had it working under previous releases, so I wouldn't even consider it a regression as such. Unless someone is offering to fix it under a fairly immediate timeframe, we have to press on with the release in its current state. I don't think it helps to hold back the release for everyone (and particularly the ARM port improvements) for a handful of people who are interested in Shark, most of whom probably work with HEAD anyway. > 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 -------------- 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/20120106/c986e2b1/attachment.bin From ddadacha at redhat.com Fri Jan 6 11:08:55 2012 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Fri, 06 Jan 2012 14:08:55 -0500 Subject: [RFC][icedtea-web] Plugin doesn't halt when required elements from JNLP files are missing. In-Reply-To: <4F07314B.1050300@redhat.com> References: <4F0724DE.5000508@redhat.com> <4F07314B.1050300@redhat.com> Message-ID: <4F0746C7.10801@redhat.com> On 06/01/12 12:37 PM, Jiri Vanek wrote: > On 01/06/2012 05:44 PM, Danesh Dadachanji wrote: >> Hi, >> >> Looking at the plugin docs[1], <title> and <vendor> are required >> elements of <information>, without them the plugin should stop with a >> fatal error. Currently, icedtea-web just returns null from their >> respective getters and handles null accordingly. However it should not >> even reach that far. Here's a simple patch that throws a >> ParseException when not found. >> >> ChangeLog >> +2012-01-06 Danesh Dadachanji <ddadacha at redhat.com> >> + >> + Applications using JNLP files without a title or vendor section >> + still run, despite them being required elements. >> + * netx/net/sourceforge/jnlp/Parser.java: >> + (getInformationDesc): If title or vendor are not found in info, >> + a new ParseException is thrown. >> + * netx/net/sourceforge/jnlp/resources/Messages.properties: Add >> + PNoTitleElement and PNoVendorElement >> + >> >> Any comments? Is this okay for HEAD? >> >> Regards, >> Danesh >> >> [1] >> http://docs.oracle.com/javase/7/docs/technotes/guides/javaws/developersguide/syntax.html >> > > I do not like the idea of forcing somebody to have elements, when they > can be still empty. But if documentation say so.... How proprietary > plugin is dealing with it? It throws an exception, stopping further execution - the same as what this patch does for icedtea-web. =) If you'd like to test it, remove a title/vendor tag from a JNLP file and run it. You may need to with the java console being set to "Show console" - especially if it's an applet. Regards, Danesh From ddadacha at redhat.com Fri Jan 6 11:46:09 2012 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Fri, 06 Jan 2012 14:46:09 -0500 Subject: [RFC][icedtea-web] Plugin does not make JNLP's <information> available when using jnlp_href Message-ID: <4F074F81.20900@redhat.com> Hi, The JNLP file's information elements are not available for use when using the plugin through the browser and jnlp_href. For example when access dialogs pop up, they try to use PluginBridge.getInformation(). This is set to return a new (and so, empty) ArrayList rather than the contents of the information tag. To test this, use this applet[1] and click Open. I've setup the info instance var in the PluginBridge constructor to either be the JNLP file's info or to be a new ArrayList if jnlp_href is not being used. PluginBridge.getInformation() is no longer needed because the superclass's method does what we want so I've removed it. There was the following comment in the method: "Should we populate this list with applet attribute tags?" I left this as is for now because JNLPFile.getInformation's javadoc states it only returns the <information> tag's elements. It might cause some confusion/inconsistency with the javadoc if we were to store the applet's attribute here. If we were to add a PluginBridge.getInformation, it would be identical in implementation. Apart from this, I don't see the harm in adding the attributes to the info - they are visible to the public anyway through ^U! The "name" attribute could also be used if there is no <title> so it might be useful to do so. I've also added "(unverified)" to the ends of the Publisher label of access dialogs because this can easily be spoofed. ChangeLog +2012-01-06 Danesh Dadachanji <ddadacha at redhat.com> + + Use the JNLP file's information section for the Name and + Publisher labels of access dialogs, if available. + * netx/net/sourceforge/jnlp/PluginBridge.java: + (PluginBridge): Assigned info variable to JNLP file's information + section (if one is used), otherwise to a new, empty ArrayList. + (getInformation): Removed method, superclass method + should be used instead. + * netx/net/sourceforge/jnlp/resources/Messages.properties: + Adding SUnverified. + * a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java: + (addComponents): Append unverified note to the publisher label. + Thoughts/comments? If this is alright, I'd like to push it to HEAD. Regards, Danesh [1] http://docs.oracle.com/javase/tutorial/deployment/doingMoreWithRIA/examples/dist/applet_JNLP_API/AppletPage.html From dbhole at redhat.com Fri Jan 6 11:47:25 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 6 Jan 2012 14:47:25 -0500 Subject: [icedtea-web] RFC: Simple fix for PR838 In-Reply-To: <20111221215556.GH752@redhat.com> References: <20111221215556.GH752@redhat.com> Message-ID: <20120106194724.GB11545@redhat.com> * Deepak Bhole <dbhole at redhat.com> [2011-12-21 16:57]: > Attached patch fixes PR838. > > Given the nature of the issue and the simplicity of the fix, I also > propose backporting to 1.0 and 1.1. > > ChangeLog: > 2011-12-21 Deepak Bhole <dbhole at redhat.com> > > PR838: IcedTea plugin crashes with chrome browser when javascript is executed > * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc (eval): Added a check > to ensure that the result pointer is valid before attempting to create an > NPVariant from it. > > Okay for HEAD, 1.0 and 1.1? > ping? > Cheers, > Deepak > diff -r c5faf63fc34e NEWS > --- a/NEWS Wed Dec 21 09:46:46 2011 +0100 > +++ b/NEWS Wed Dec 21 16:53:51 2011 -0500 > @@ -21,6 +21,7 @@ > * Plugin > - PR749: sun.applet.PluginStreamHandler#handleMessage(String) really slow > - PR782: Support building against npapi-sdk as well > + - PR838: IcedTea plugin crashes with chrome browser when javascript is executed > - RH718693: MindTerm SSH Applet doesn't work > Common > - PR768: Signed applets/Web Start apps don't work with OpenJDK7 and up > diff -r c5faf63fc34e plugin/icedteanp/IcedTeaPluginRequestProcessor.cc > --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Wed Dec 21 09:46:46 2011 +0100 > +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Wed Dec 21 16:53:51 2011 -0500 > @@ -243,7 +243,13 @@ > > NPVariant* result_variant = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(thread_data.result); > std::string result_variant_jniid = std::string(); > - createJavaObjectFromVariant(instance, *result_variant, &result_variant_jniid); > + if (result_variant) > + { > + createJavaObjectFromVariant(instance, *result_variant, &result_variant_jniid); > + } else > + { > + result_variant_jniid = "0"; > + } > > IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response); > response += " JavaScriptEval "; From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 11:48:04 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 19:48:04 +0000 Subject: [Bug 838] IcedTeam plugin crashes with chrome browser when javascript is executed In-Reply-To: <bug-838-30@http.icedtea.classpath.org/bugzilla/> References: <bug-838-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-838-30-F1kClacaOL@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=838 --- Comment #2 from Deepak Bhole <dbhole at redhat.com> 2012-01-06 19:48:04 UTC --- The bug exists on all branches. I posted a patch in December, but it is still waiting for review: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-December/016558.html -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From dbhole at redhat.com Fri Jan 6 11:49:32 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 6 Jan 2012 14:49:32 -0500 Subject: [RFC][icedtea-web] Plugin does not make JNLP's <information> available when using jnlp_href In-Reply-To: <4F074F81.20900@redhat.com> References: <4F074F81.20900@redhat.com> Message-ID: <20120106194932.GD11545@redhat.com> You forgot to attach the patch :) Deepak * Danesh Dadachanji <ddadacha at redhat.com> [2012-01-06 14:48]: > Hi, > > The JNLP file's information elements are not available for use when > using the plugin through the browser and jnlp_href. For example when > access dialogs pop up, they try to use > PluginBridge.getInformation(). This is set to return a new (and so, > empty) ArrayList rather than the contents of the information tag. To > test this, use this applet[1] and click Open. > > I've setup the info instance var in the PluginBridge constructor to > either be the JNLP file's info or to be a new ArrayList if jnlp_href > is not being used. > > PluginBridge.getInformation() is no longer needed because the > superclass's method does what we want so I've removed it. There was > the following comment in the method: > > "Should we populate this list with applet attribute tags?" > > I left this as is for now because JNLPFile.getInformation's javadoc > states it only returns the <information> tag's elements. It might > cause some confusion/inconsistency with the javadoc if we were to > store the applet's attribute here. If we were to add a > PluginBridge.getInformation, it would be identical in > implementation. Apart from this, I don't see the harm in adding the > attributes to the info - they are visible to the public anyway > through ^U! The "name" attribute could also be used if there is no > <title> so it might be useful to do so. > > I've also added "(unverified)" to the ends of the Publisher label of > access dialogs because this can easily be spoofed. > > ChangeLog > +2012-01-06 Danesh Dadachanji <ddadacha at redhat.com> > + > + Use the JNLP file's information section for the Name and > + Publisher labels of access dialogs, if available. > + * netx/net/sourceforge/jnlp/PluginBridge.java: > + (PluginBridge): Assigned info variable to JNLP file's information > + section (if one is used), otherwise to a new, empty ArrayList. > + (getInformation): Removed method, superclass method > + should be used instead. > + * netx/net/sourceforge/jnlp/resources/Messages.properties: > + Adding SUnverified. > + * a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java: > + (addComponents): Append unverified note to the publisher label. > + > > Thoughts/comments? If this is alright, I'd like to push it to HEAD. > > Regards, > Danesh > > [1] http://docs.oracle.com/javase/tutorial/deployment/doingMoreWithRIA/examples/dist/applet_JNLP_API/AppletPage.html From ddadacha at redhat.com Fri Jan 6 11:52:25 2012 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Fri, 06 Jan 2012 14:52:25 -0500 Subject: [RFC][icedtea-web] Plugin does not make JNLP's <information> available when using jnlp_href In-Reply-To: <4F074F81.20900@redhat.com> References: <4F074F81.20900@redhat.com> Message-ID: <4F0750F9.5050906@redhat.com> Aaand here's the patch. On 06/01/12 02:46 PM, Danesh Dadachanji wrote: > Hi, > > The JNLP file's information elements are not available for use when > using the plugin through the browser and jnlp_href. For example when > access dialogs pop up, they try to use PluginBridge.getInformation(). > This is set to return a new (and so, empty) ArrayList rather than the > contents of the information tag. To test this, use this applet[1] and > click Open. > > I've setup the info instance var in the PluginBridge constructor to > either be the JNLP file's info or to be a new ArrayList if jnlp_href is > not being used. > > PluginBridge.getInformation() is no longer needed because the > superclass's method does what we want so I've removed it. There was the > following comment in the method: > > "Should we populate this list with applet attribute tags?" > > I left this as is for now because JNLPFile.getInformation's javadoc > states it only returns the <information> tag's elements. It might cause > some confusion/inconsistency with the javadoc if we were to store the > applet's attribute here. If we were to add a > PluginBridge.getInformation, it would be identical in implementation. > Apart from this, I don't see the harm in adding the attributes to the > info - they are visible to the public anyway through ^U! The "name" > attribute could also be used if there is no <title> so it might be > useful to do so. > > I've also added "(unverified)" to the ends of the Publisher label of > access dialogs because this can easily be spoofed. > > ChangeLog > +2012-01-06 Danesh Dadachanji <ddadacha at redhat.com> > + > + Use the JNLP file's information section for the Name and > + Publisher labels of access dialogs, if available. > + * netx/net/sourceforge/jnlp/PluginBridge.java: > + (PluginBridge): Assigned info variable to JNLP file's information > + section (if one is used), otherwise to a new, empty ArrayList. > + (getInformation): Removed method, superclass method > + should be used instead. > + * netx/net/sourceforge/jnlp/resources/Messages.properties: > + Adding SUnverified. > + * a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java: > + (addComponents): Append unverified note to the publisher label. > + > > Thoughts/comments? If this is alright, I'd like to push it to HEAD. > > Regards, > Danesh > > [1] > http://docs.oracle.com/javase/tutorial/deployment/doingMoreWithRIA/examples/dist/applet_JNLP_API/AppletPage.html > -------------- next part -------------- A non-text attachment was scrubbed... Name: plugin-bridge-info-01.patch Type: text/x-patch Size: 3450 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120106/32546d4c/plugin-bridge-info-01.patch From bugzilla-daemon at icedtea.classpath.org Fri Jan 6 12:15:47 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jan 2012 20:15:47 +0000 Subject: [Bug 825] OpenOffice crash on opening file (attached) In-Reply-To: <bug-825-30@http.icedtea.classpath.org/bugzilla/> References: <bug-825-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-825-30-KxYg0OQQxD@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=825 --- Comment #6 from Winfried Huber <bugzilla at huber-und-boehm.de> 2012-01-06 20:15:47 UTC --- I want to note that LibreOffice 3.5 (pre release) is far more stable - almost no more crashes. Maybe the problem is related to LibreOffice, not to java. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From omajid at redhat.com Fri Jan 6 13:28:35 2012 From: omajid at redhat.com (Omair Majid) Date: Fri, 06 Jan 2012 16:28:35 -0500 Subject: glibc 2.15 breaks build in icedtea2.0 In-Reply-To: <20120106191716.3e105ae9@laptop64.home> References: <20120106191716.3e105ae9@laptop64.home> Message-ID: <4F076783.1070109@redhat.com> On 01/06/2012 01:17 PM, Andreas Radke wrote: > g++ -DLINUX -D_GNU_SOURCE -DAMD64 -DPRODUCT -I. -I/build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/prims -I/build/src/icedtea-2.0/openjdk/hotspot/src/share/vm -I/build/src/icedtea-2.0/openjdk/hotspot/src/cpu/x86/vm -I/build/src/icedtea-2.0/openjdk/hotspot/src/os_cpu/linux_x86/vm -I/build/src/icedtea-2.0/openjdk/hotspot/src/os/linux/vm -I/build/src/icedtea-2.0/openjdk/hotspot/src/os/posix/vm -I../generated -DHOTSPOT_RELEASE_VERSION="\"21.0-b17\"" -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"nobody\"" -DHOTSPOT_LIB_ARCH=\"amd64\" -DJRE_RELEASE_VERSION="\"1.7.0_147-b147\"" -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDERIVATIVE_ID="\"IcedTea7 2.0\"" -DDISTRIBUTION_ID="\"Custom build (Fri Jan 6 18:01:40 UTC 2012)\"" -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -DTARGET_OS_FAMILY_linux -DTARGET_ARCH_x86 -DTARGET_ARCH_MODEL_x86_64 -DTARGET_OS_ARCH_linux_x86 -DTARGET_OS_ARCH_MODEL_linux_x86_64 -DTARGET_COMPILER_g cc > -DCOMPILER2 -DCOMPILER1 -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -fvisibility=hidden -m64 -pipe -g -DTARGET_OS_FAMILY_linux -DTARGET_ARCH_x86 -DTARGET_ARCH_MODEL_x86_64 -DTARGET_OS_ARCH_linux_x86 -DTARGET_OS_ARCH_MODEL_linux_x86_64 -DTARGET_COMPILER_gcc -DCOMPILER2 -DCOMPILER1 -fpic -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -fvisibility=hidden -m64 -pipe -g -O3 -fno-strict-aliasing -DVM_LITTLE_ENDIAN -D_LP64=1 -fno-omit-frame-pointer -Werror -Wpointer-arith -Wsign-compare -c -MMD -MP -MF ../generated/dependencies/precompiled.hpp.gch.d -x c++-header /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/precompiled.hpp -o precompiled.hpp.gch > In file included from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/prims/methodHandles.hpp:32:0, > from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/ci/ciMethod.hpp:33, > from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/code/debugInfoRec.hpp:30, > from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/ci/ciEnv.hpp:31, > from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/ci/ciUtilities.hpp:28, > from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/ci/ciNullObject.hpp:30, > from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/ci/ciConstant.hpp:29, > from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/precompiled.hpp:36: > /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp:430:0: error: "__LEAF" redefined [-Werror] > /usr/include/sys/cdefs.h:44:0: note: this is the location of the previous definition > cc1plus: all warnings being treated as errors > > make[7]: *** [precompiled.hpp.gch] Error 1 > > > Any idea for a fix? Upstream hotspot has the fix: http://hg.openjdk.java.net/hsx/hotspot-comp/hotspot/rev/a6eef545f1a2 Cheers, Omair From omajid at icedtea.classpath.org Fri Jan 6 14:01:02 2012 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Fri, 06 Jan 2012 22:01:02 +0000 Subject: /hg/release/icedtea6-1.11: Added tag icedtea6-1.11-branch for ch... Message-ID: <hg.7e179e0b02ca.1325887262.-53431993501496595@icedtea.classpath.org> changeset 7e179e0b02ca in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=7e179e0b02ca author: Omair Majid <omajid at redhat.com> date: Fri Jan 06 17:00:51 2012 -0500 Added tag icedtea6-1.11-branch for changeset 24c5bd2e7d57 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 24c5bd2e7d57 -r 7e179e0b02ca .hgtags --- a/.hgtags Fri Jan 06 17:48:27 2012 +0100 +++ b/.hgtags Fri Jan 06 17:00:51 2012 -0500 @@ -20,3 +20,4 @@ 1188b1a313b9e968d57ff44eb879d70f543b20fd icedtea6-1.8-branchpoint cb463b94b82da269ea089c481ed5e39700525a8a icedtea6-1.9-branchpoint 21f2a8d158545a161ba0d997c13bdba1e6166394 icedtea6-1.10-branchpoint +24c5bd2e7d574441813bfb8f9e4636e50c5d7c28 icedtea6-1.11-branch From omajid at icedtea.classpath.org Fri Jan 6 14:01:05 2012 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Fri, 06 Jan 2012 22:01:05 +0000 Subject: /hg/icedtea6: 2 new changesets Message-ID: <hg.2607221d6f5e.1325887265.2873452341184383832@icedtea.classpath.org> changeset 2607221d6f5e in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2607221d6f5e author: Omair Majid <omajid at redhat.com> date: Fri Jan 06 16:32:56 2012 -0500 Added tag icedtea6-1.11-branchpoint for changeset 24c5bd2e7d57 changeset 283c180aa38a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=283c180aa38a author: Omair Majid <omajid at redhat.com> date: Fri Jan 06 16:40:02 2012 -0500 Prepare for 1.12. 2012-01-06 Omair Majid <omajid at redhat.com> * NEWS: Add 1.12 section * configure.ac: Bump to 1.12pre. diffstat: .hgtags | 1 + ChangeLog | 5 +++++ NEWS | 4 +++- configure.ac | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diffs (43 lines): diff -r 24c5bd2e7d57 -r 283c180aa38a .hgtags --- a/.hgtags Fri Jan 06 17:48:27 2012 +0100 +++ b/.hgtags Fri Jan 06 16:40:02 2012 -0500 @@ -20,3 +20,4 @@ 1188b1a313b9e968d57ff44eb879d70f543b20fd icedtea6-1.8-branchpoint cb463b94b82da269ea089c481ed5e39700525a8a icedtea6-1.9-branchpoint 21f2a8d158545a161ba0d997c13bdba1e6166394 icedtea6-1.10-branchpoint +24c5bd2e7d574441813bfb8f9e4636e50c5d7c28 icedtea6-1.11-branchpoint diff -r 24c5bd2e7d57 -r 283c180aa38a ChangeLog --- a/ChangeLog Fri Jan 06 17:48:27 2012 +0100 +++ b/ChangeLog Fri Jan 06 16:40:02 2012 -0500 @@ -1,3 +1,8 @@ +2012-01-06 Omair Majid <omajid at redhat.com> + + * NEWS: Add 1.12 section + * configure.ac: Bump to 1.12pre. + 2012-01-06 Jiri Vanek <jvanek at redhat.com> fixes rhbz#580478 diff -r 24c5bd2e7d57 -r 283c180aa38a NEWS --- a/NEWS Fri Jan 06 17:48:27 2012 +0100 +++ b/NEWS Fri Jan 06 16:40:02 2012 -0500 @@ -10,7 +10,9 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 1.11 (2011-XX-XX): +New in release 1.12 (2012-XX-XX): + +New in release 1.11 (2012-XX-XX): * Use HotSpot 20 as the default virtual machine. * ARM assembly language port reinstated and updated; details below. diff -r 24c5bd2e7d57 -r 283c180aa38a configure.ac --- a/configure.ac Fri Jan 06 17:48:27 2012 +0100 +++ b/configure.ac Fri Jan 06 16:40:02 2012 -0500 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.11pre],[distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6],[1.12pre],[distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From omajid at redhat.com Fri Jan 6 14:12:08 2012 From: omajid at redhat.com (Omair Majid) Date: Fri, 06 Jan 2012 17:12:08 -0500 Subject: IcedTea6 1.11 has been branched. Release on 2011-01-18. Message-ID: <4F0771B8.4080106@redhat.com> Hi, IcedTea6 has now branched for the 1.11 release. I am planning to release IcedTea6 1.11 on *2011-01-18*. Feel free to subject this branch to as much testing as you need. Please note that all commits to this branch should be posted for discussion and need to be reviewed. The only known issue is: * Shark: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=701 From what I have heard, shark is not in the best condition anyway thanks to changes in llvm. Unless someone steps up to fix this, shark will most likely be broken in the final release too. Thanks, Omair From omajid at icedtea.classpath.org Fri Jan 6 23:48:16 2012 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Sat, 07 Jan 2012 07:48:16 +0000 Subject: /hg/release/icedtea-web-1.1: fix findbugs cloud jnlps Message-ID: <hg.f0647c938535.1325922496.-5934593987637005765@icedtea.classpath.org> changeset f0647c938535 in /hg/release/icedtea-web-1.1 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=f0647c938535 author: Omair Majid <omajid at redhat.com> date: Sat Jan 07 02:48:05 2012 -0500 fix findbugs cloud jnlps Someone reported that the following JNLP was not starting: http://findbugs.cs.umd.edu/cloud/eclipse.jnlp The attached fixes the problem, which was that (in the extension jnlp file) the jnlp element did not contain a codebase attribute. IcedTea-Web tried to add this null codebase when merging the jnlp file, causing an exception. The patch simply ignores this null. ChangeLog: 2012-01-07 Omair Majid <omajid at redhat.com> * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (addToCodeBaseLoader): Do not try to process null urls. diffstat: ChangeLog | 5 +++++ netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 3 +++ 2 files changed, 8 insertions(+), 0 deletions(-) diffs (25 lines): diff -r 9f7d46c3314d -r f0647c938535 ChangeLog --- a/ChangeLog Thu Dec 22 16:15:54 2011 -0500 +++ b/ChangeLog Sat Jan 07 02:48:05 2012 -0500 @@ -1,3 +1,8 @@ +2012-01-07 Omair Majid <omajid at redhat.com> + + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java + (addToCodeBaseLoader): Do not try to process null urls. + 2011-12-22 Thomas Meyer <thomas at m3y3r.de> * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc(sendMember): Use diff -r 9f7d46c3314d -r f0647c938535 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Dec 22 16:15:54 2011 -0500 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Sat Jan 07 02:48:05 2012 -0500 @@ -1413,6 +1413,9 @@ * @throws IllegalArgumentException If the given url is not a path */ private void addToCodeBaseLoader(URL u) { + if (u == null) { + return; + } // Only paths may be added if (!u.getFile().endsWith("/")) { From omajid at redhat.com Fri Jan 6 23:50:27 2012 From: omajid at redhat.com (Omair Majid) Date: Sat, 07 Jan 2012 02:50:27 -0500 Subject: [icedtea-web] RFC: fix findbugs communal cloud jnlps In-Reply-To: <20120106163146.GK4961@redhat.com> References: <4F062247.3050608@redhat.com> <20120106161923.GH4961@redhat.com> <4F072113.7090706@redhat.com> <20120106163146.GK4961@redhat.com> Message-ID: <4F07F943.5070904@redhat.com> On 01/06/2012 11:31 AM, Deepak Bhole wrote: > > Ah ok, I thought it was for both. Fair enough. Yes, please try with 1.1 > -- it is going to be supported for a while and we need a fix there too. > Thanks! I finally got around to testing icedtea-web 1.1. It only needed the second fix. Since you already reviewed the patch which skips null codebases, I have gone ahead and pushed the changeset: http://icedtea.classpath.org/hg/release/icedtea-web-1.1/rev/f0647c938535 Thanks, Omair From jvanek at redhat.com Sat Jan 7 01:56:13 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Sat, 07 Jan 2012 10:56:13 +0100 Subject: ping [rfc][icedteaweb] two more tests for icedtea web Message-ID: <4F0816BD.7040505@redhat.com> 2011-12-19 Jiri Vanek <jvanek at redhat.com> * tests/jnlp_tests/simple/AppletTest/ : test for loading applets by jnlp file 2011-12-19 Jiri Vanek <jvanek at redhat.com> Added test for -Xnofork option * tests/jnlp_tests/simple/deadlocktest/resources/deadlocktest_1.jnlp: new file By specifying new max heap size, should invoke jvm to fork when launched * tests/jnlp_tests/simple/deadlocktest/srcs/DeadlockTest.java: improved indentation, added debug output that main method was lunched * tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java: small refactoring, add lunching of deadlocktest_1.jnlp with and without -Xnofork, and counting java instances during runtime * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java (ThreadedProcess.run) fixed situation, when process ended, but not all the output was read by its stdout/stderr readers (ContentReader.run) enabled exception printing to stderr. Regards J. -------------- next part -------------- A non-text attachment was scrubbed... Name: xforkTests.diff Type: text/x-patch Size: 11944 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120107/0a4d6d06/xforkTests.diff -------------- next part -------------- A non-text attachment was scrubbed... Name: appletTest.diff Type: text/x-patch Size: 9487 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120107/0a4d6d06/appletTest.diff From bugzilla-daemon at icedtea.classpath.org Sun Jan 8 12:21:58 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 08 Jan 2012 20:21:58 +0000 Subject: [Bug 774] How to build from scrach icedtea 1.10.3/openjdk 1.6.0_b22 on Slack In-Reply-To: <bug-774-30@http.icedtea.classpath.org/bugzilla/> References: <bug-774-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-774-30-KNDkeUrXjM@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=774 Robert Gabriel <robert at linux-source.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED Resolution|INVALID | --- Comment #19 from Robert Gabriel <robert at linux-source.org> 2012-01-08 20:21:58 UTC --- OK after months, I've done it and now icedtea builds, but it fails with this error: /tmp/kng/icedtea6-1.10.4/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/obj/XlibWrapper.o: In function `Java_sun_awt_X11_XlibWrapper_PrintXErrorEvent': /tmp/kng/icedtea6-1.10.4/openjdk-ecj/jdk/make/sun/xawt/../../../src/solaris/native/sun/xawt/XlibWrapper.c:1172: undefined reference to `jio_fprintf' /tmp/kng/icedtea6-1.10.4/openjdk-ecj/jdk/make/sun/xawt/../../../src/solaris/native/sun/xawt/XlibWrapper.c:1173: undefined reference to `jio_snprintf' /tmp/kng/icedtea6-1.10.4/openjdk-ecj/jdk/make/sun/xawt/../../../src/solaris/native/sun/xawt/XlibWrapper.c:1175: undefined reference to `jio_fprintf' /tmp/kng/icedtea6-1.10.4/openjdk-ecj/jdk/make/sun/xawt/../../../src/solaris/native/sun/xawt/XlibWrapper.c:1177: undefined reference to `jio_fprintf' /tmp/kng/icedtea6-1.10.4/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/obj/awt_GraphicsEnv.o: In function `xioerror_handler': /tmp/kng/icedtea6-1.10.4/openjdk-ecj/jdk/make/sun/xawt/../../../src/solaris/native/sun/awt/awt_GraphicsEnv.c:186: undefined reference to `jio_fprintf' /tmp/kng/icedtea6-1.10.4/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/obj/awt_GraphicsEnv.o: In function `awt_init_Display': /tmp/kng/icedtea6-1.10.4/openjdk-ecj/jdk/make/sun/xawt/../../../src/solaris/native/sun/awt/awt_GraphicsEnv.c:850: undefined reference to `jio_snprintf' /tmp/kng/icedtea6-1.10.4/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/obj/awt_InputMethod.o: In function `createXIC': /tmp/kng/icedtea6-1.10.4/openjdk-ecj/jdk/make/sun/xawt/../../../src/solaris/native/sun/awt/awt_InputMethod.c:1050: undefined reference to `jio_fprintf' /tmp/kng/icedtea6-1.10.4/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/obj/OGLContext.o: In function `Java_sun_java2d_opengl_OGLContext_getOGLIdString': /tmp/kng/icedtea6-1.10.4/openjdk-ecj/jdk/make/sun/xawt/../../../src/share/native/sun/java2d/opengl/OGLContext.c:1051: undefined reference to `jio_snprintf' /tmp/kng/icedtea6-1.10.4/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/obj/awt_Font.o: In function `loadFont': /tmp/kng/icedtea6-1.10.4/openjdk-ecj/jdk/make/sun/xawt/../../../src/solaris/native/sun/awt/awt_Font.c:343: undefined reference to `jio_snprintf' /tmp/kng/icedtea6-1.10.4/openjdk-ecj/jdk/make/sun/xawt/../../../src/solaris/native/sun/awt/awt_Font.c:359: undefined reference to `jio_snprintf' /tmp/kng/icedtea6-1.10.4/openjdk-ecj/jdk/make/sun/xawt/../../../src/solaris/native/sun/awt/awt_Font.c:365: undefined reference to `jio_snprintf' /tmp/kng/icedtea6-1.10.4/openjdk-ecj/jdk/make/sun/xawt/../../../src/solaris/native/sun/awt/awt_Font.c:372: undefined reference to `jio_snprintf' /tmp/kng/icedtea6-1.10.4/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/obj/awt_Font.o:/tmp/kng/icedtea6-1.10.4/openjdk-ecj/jdk/make/sun/xawt/../../../src/solaris/native/sun/awt/awt_Font.c:377: more undefined references to `jio_snprintf' follow collect2: ld returned 1 exit status make[5]: *** [/tmp/kng/icedtea6-1.10.4/openjdk.build-ecj/lib/i386/xawt/libmawt.so] Error 1 make[5]: Leaving directory `/tmp/kng/icedtea6-1.10.4/openjdk-ecj/jdk/make/sun/xawt' make[4]: *** [all] Error 1 make[4]: Leaving directory `/tmp/kng/icedtea6-1.10.4/openjdk-ecj/jdk/make/sun' make[3]: *** [all] Error 1 make[3]: Leaving directory `/tmp/kng/icedtea6-1.10.4/openjdk-ecj/jdk/make' make[2]: *** [jdk-build] Error 2 make[2]: Leaving directory `/tmp/kng/icedtea6-1.10.4/openjdk-ecj' make[1]: *** [build_product_image] Error 2 make[1]: Leaving directory `/tmp/kng/icedtea6-1.10.4/openjdk-ecj' make: *** [stamps/icedtea-ecj.stamp] Error 2 This is when bootstrap not disabled and if I disable bootstrap then I get this: WARNING: Your build environment has the variable NO_DOCS defined. This will result in a development-only build of the JDK, lacking the documentation build. ERROR: Your BOOTDIR environment variable does not point to a valid JDK for bootstrapping this build. A JDK 6 Update 22 build must be bootstrapped using JDK 1.6.0 fcs (or later). Apparently, your bootstrap JDK is version 1.5 Please update your ALT_BOOTDIR setting and start your build again. Exiting because of the above error(s). make[1]: *** [post-sanity] Error 1 make[1]: Leaving directory `/tmp/kng/icedtea6-1.10.4/openjdk' make: *** [stamps/icedtea.stamp] Error 2 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Mon Jan 9 03:38:51 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Jan 2012 11:38:51 +0000 Subject: [Bug 827] unable to start davmail In-Reply-To: <bug-827-30@http.icedtea.classpath.org/bugzilla/> References: <bug-827-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-827-30-YwiBf1qZPk@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=827 Andrew John Hughes <ahughes at redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |ahughes at redhat.com Version|unspecified |6-1.7.4 Resolution| |WONTFIX Severity|blocker |normal --- Comment #3 from Andrew John Hughes <ahughes at redhat.com> 2012-01-09 11:38:51 UTC --- The 1.7.x series is no longer supported. Please reopen if you can replicate this on a supported version of IcedTea. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Mon Jan 9 03:39:39 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Jan 2012 11:39:39 +0000 Subject: [Bug 831] Crash every time opening SoapUI In-Reply-To: <bug-831-30@http.icedtea.classpath.org/bugzilla/> References: <bug-831-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-831-30-PPs4a9sS7b@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=831 Andrew John Hughes <ahughes at redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Version|unspecified |6-1.10.4 Severity|blocker |normal -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Mon Jan 9 03:40:06 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Jan 2012 11:40:06 +0000 Subject: [Bug 831] Crash every time opening SoapUI In-Reply-To: <bug-831-30@http.icedtea.classpath.org/bugzilla/> References: <bug-831-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-831-30-I5KRVX5BYw@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=831 Andrew John Hughes <ahughes at redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #622|text/x-log |text/plain mime type| | -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Mon Jan 9 03:43:11 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Jan 2012 11:43:11 +0000 Subject: [Bug 831] Crash every time opening SoapUI In-Reply-To: <bug-831-30@http.icedtea.classpath.org/bugzilla/> References: <bug-831-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-831-30-ZRDuPmKMpV@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=831 --- Comment #3 from Andrew John Hughes <ahughes at redhat.com> 2012-01-09 11:43:11 UTC --- This failure is occurring in a native gconf call made by Mozilla's org.mozilla.xpcom code. I suggest filing a bug with whoever wrote the org.mozilla.xpcom code. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From andrew at icedtea.classpath.org Mon Jan 9 03:45:50 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 09 Jan 2012 11:45:50 +0000 Subject: /hg/release/icedtea6-1.8: S7103725, RH767129: REGRESSION - 6u29 ... Message-ID: <hg.e7e4c22d1946.1326109550.1785565629229908550@icedtea.classpath.org> changeset e7e4c22d1946 in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=e7e4c22d1946 author: Andrew John Hughes <ahughes at redhat.com> date: Fri Jan 06 13:17:57 2012 +0000 S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA 2011-12-22 Andrew John Hughes <ahughes at redhat.com> * Makefile.am: Add new patch. * patches/openjdk/7103725-ssl_beast_regression.patch: Add OpenJDK backport. * NEWS: Updated. diffstat: ChangeLog | 7 +++++++ Makefile.am | 3 ++- NEWS | 1 + patches/openjdk/7103725-ssl_beast_regression.patch | 21 +++++++++++++++++++++ 4 files changed, 31 insertions(+), 1 deletions(-) diffs (64 lines): diff -r 33616a2b4d2e -r e7e4c22d1946 ChangeLog --- a/ChangeLog Thu Jan 05 11:45:54 2012 -0500 +++ b/ChangeLog Fri Jan 06 13:17:57 2012 +0000 @@ -1,3 +1,10 @@ +2011-12-22 Andrew John Hughes <ahughes at redhat.com> + + * Makefile.am: Add new patch. + * patches/openjdk/7103725-ssl_beast_regression.patch: + Add OpenJDK backport. + * NEWS: Updated. + 2012-01-04 Omair Majid <omajid at redhat.com> S7102369, S7094468: remove java.rmi.server.codebase property parsing from diff -r 33616a2b4d2e -r e7e4c22d1946 Makefile.am --- a/Makefile.am Thu Jan 05 11:45:54 2012 -0500 +++ b/Makefile.am Fri Jan 06 13:17:57 2012 +0000 @@ -402,7 +402,8 @@ patches/mark_sun_toolkit_privileged_code.patch \ patches/support_linux_3.patch \ patches/libpng-1.5.patch \ - patches/openjdk/7102369-7094468-rmiregistry.patch + patches/openjdk/7102369-7094468-rmiregistry.patch \ + patches/openjdk/7103725-ssl_beast_regression.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \ diff -r 33616a2b4d2e -r e7e4c22d1946 NEWS --- a/NEWS Thu Jan 05 11:45:54 2012 -0500 +++ b/NEWS Fri Jan 06 13:17:57 2012 +0000 @@ -13,6 +13,7 @@ * Backports - S7102369: remove java.rmi.server.codebase property parsing from registyimpl - S7094468: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA New in release 1.8.11 (2011-11-08): diff -r 33616a2b4d2e -r e7e4c22d1946 patches/openjdk/7103725-ssl_beast_regression.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7103725-ssl_beast_regression.patch Fri Jan 06 13:17:57 2012 +0000 @@ -0,0 +1,22 @@ +# HG changeset patch +# User robm +# Date 1324518632 0 +# Node ID cb20ed4b953add8f2443831a0552640efca53ab7 +# Parent 6b46f3c7c97cb060f88b196171b95d33bff80b7c +7103725: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA +Summary: resolving an issue with 7064341. +Reviewed-by: wetmore, coffeys + +diff -r 6b46f3c7c97c -r cb20ed4b953a src/share/classes/sun/security/ssl/AppOutputStream.java +--- openjdk/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java Wed Nov 16 13:14:57 2011 +0000 ++++ openjdk/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java Thu Dec 22 01:50:32 2011 +0000 +@@ -90,7 +90,8 @@ + do { + int howmuch; + if (isFirstRecordOfThePayload && c.needToSplitPayload()) { +- howmuch = Math.min(0x01, r.availableDataBytes()); ++ howmuch = (len == 0) ? 0 : Math.min( ++ 0x01, r.availableDataBytes()); + } else { + howmuch = Math.min(len, r.availableDataBytes()); + } From bugzilla-daemon at icedtea.classpath.org Mon Jan 9 04:10:01 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Jan 2012 12:10:01 +0000 Subject: [Bug 827] unable to start davmail In-Reply-To: <bug-827-30@http.icedtea.classpath.org/bugzilla/> References: <bug-827-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-827-30-Tb69J7PMLR@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=827 inpost at gmail.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED Resolution|WONTFIX | --- Comment #4 from inpost at gmail.com 2012-01-09 12:10:01 UTC --- This latest version of centos is using this version of java, which refuse to solve when this version is supplied with latest version of centos? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ahughes at redhat.com Mon Jan 9 04:39:53 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 9 Jan 2012 12:39:53 +0000 Subject: glibc 2.15 breaks build in icedtea2.0 In-Reply-To: <4F076783.1070109@redhat.com> References: <20120106191716.3e105ae9@laptop64.home> <4F076783.1070109@redhat.com> Message-ID: <20120109123952.GA3936@rivendell.middle-earth.co.uk> On 16:28 Fri 06 Jan , Omair Majid wrote: > On 01/06/2012 01:17 PM, Andreas Radke wrote: > > g++ -DLINUX -D_GNU_SOURCE -DAMD64 -DPRODUCT -I. -I/build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/prims -I/build/src/icedtea-2.0/openjdk/hotspot/src/share/vm -I/build/src/icedtea-2.0/openjdk/hotspot/src/cpu/x86/vm -I/build/src/icedtea-2.0/openjdk/hotspot/src/os_cpu/linux_x86/vm -I/build/src/icedtea-2.0/openjdk/hotspot/src/os/linux/vm -I/build/src/icedtea-2.0/openjdk/hotspot/src/os/posix/vm -I../generated -DHOTSPOT_RELEASE_VERSION="\"21.0-b17\"" -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"nobody\"" -DHOTSPOT_LIB_ARCH=\"amd64\" -DJRE_RELEASE_VERSION="\"1.7.0_147-b147\"" -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDERIVATIVE_ID="\"IcedTea7 2.0\"" -DDISTRIBUTION_ID="\"Custom build (Fri Jan 6 18:01:40 UTC 2012)\"" -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -DTARGET_OS_FAMILY_linux -DTARGET_ARCH_x86 -DTARGET_ARCH_MODEL_x86_64 -DTARGET_OS_ARCH_linux_x86 -DTARGET_OS_ARCH_MODEL_linux_x86_64 -DTARGET_COMPILER_g > cc > > -DCOMPILER2 -DCOMPILER1 -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -fvisibility=hidden -m64 -pipe -g -DTARGET_OS_FAMILY_linux -DTARGET_ARCH_x86 -DTARGET_ARCH_MODEL_x86_64 -DTARGET_OS_ARCH_linux_x86 -DTARGET_OS_ARCH_MODEL_linux_x86_64 -DTARGET_COMPILER_gcc -DCOMPILER2 -DCOMPILER1 -fpic -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -fvisibility=hidden -m64 -pipe -g -O3 -fno-strict-aliasing -DVM_LITTLE_ENDIAN -D_LP64=1 -fno-omit-frame-pointer -Werror -Wpointer-arith -Wsign-compare -c -MMD -MP -MF ../generated/dependencies/precompiled.hpp.gch.d -x c++-header /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/precompiled.hpp -o precompiled.hpp.gch > > In file included from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/prims/methodHandles.hpp:32:0, > > from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/ci/ciMethod.hpp:33, > > from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/code/debugInfoRec.hpp:30, > > from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/ci/ciEnv.hpp:31, > > from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/ci/ciUtilities.hpp:28, > > from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/ci/ciNullObject.hpp:30, > > from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/ci/ciConstant.hpp:29, > > from /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/precompiled.hpp:36: > > /build/src/icedtea-2.0/openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp:430:0: error: "__LEAF" redefined [-Werror] > > /usr/include/sys/cdefs.h:44:0: note: this is the location of the previous definition > > cc1plus: all warnings being treated as errors > > > > make[7]: *** [precompiled.hpp.gch] Error 1 > > > > > > Any idea for a fix? > > Upstream hotspot has the fix: > http://hg.openjdk.java.net/hsx/hotspot-comp/hotspot/rev/a6eef545f1a2 > > Cheers, > Omair Then we need to backport this to IcedTea7 HEAD & 2.0. -- 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/20120109/7cbf3b3d/attachment.bin From bugzilla-daemon at icedtea.classpath.org Mon Jan 9 04:46:25 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Jan 2012 12:46:25 +0000 Subject: [Bug 850] New: Segfault when trying to run Bukkit Minecraft Server on ARM platform Message-ID: <bug-850-30@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=850 Bug #: 850 Summary: Segfault when trying to run Bukkit Minecraft Server on ARM platform Classification: Unclassified Product: IcedTea Version: unspecified Platform: x86_64 OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea7 AssignedTo: ahughes at redhat.com ReportedBy: hpirschen at online.de CC: unassigned at icedtea.classpath.org Created attachment 634 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=634 Error log I'm trying to run a Bukkit Minecraft server on the ARM platform (Debian Wheezy, BeagleBoard xM). A segfault occurs shortly after starting the server (with OpenJDK6 and OpenJDK7). The error is fully reproducible. java -version: java version "1.7.0_147-icedtea" OpenJDK Runtime Environment (IcedTea7 2.0) (7~b147-2.0-1) OpenJDK Zero VM (build 21.0-b17, interpreted mode) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Mon Jan 9 04:49:10 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Jan 2012 12:49:10 +0000 Subject: [Bug 757] IA32 Hotspot FTBFS regression after 7009309 JSR292 fix In-Reply-To: <bug-757-30@http.icedtea.classpath.org/bugzilla/> References: <bug-757-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-757-30-t2lrOCJacr@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=757 Xerxes R?nby <xerxes at zafena.se> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |doko at ubuntu.com --- Comment #2 from Xerxes R?nby <xerxes at zafena.se> 2012-01-09 12:49:10 UTC --- *** Bug 608 has been marked as a duplicate of this bug. *** -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ahughes at redhat.com Mon Jan 9 05:06:31 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 9 Jan 2012 13:06:31 +0000 Subject: IcedTea6 1.11 has been branched. Release on 2011-01-18. In-Reply-To: <4F0771B8.4080106@redhat.com> References: <4F0771B8.4080106@redhat.com> Message-ID: <20120109130631.GB3936@rivendell.middle-earth.co.uk> On 17:12 Fri 06 Jan , Omair Majid wrote: > Hi, > > IcedTea6 has now branched for the 1.11 release. > > I am planning to release IcedTea6 1.11 on *2011-01-18*. Feel free to > subject this branch to as much testing as you need. > Great news! > Please note that all commits to this branch should be posted for > discussion and need to be reviewed. > > The only known issue is: > * Shark: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=701 > From what I have heard, shark is not in the best condition anyway > thanks to changes in llvm. Unless someone steps up to fix this, > shark will most likely be broken in the final release too. > As noted previously, I don't think Shark should block the release, unless someone has a reasonable (i.e. this month) ETA for fixing these issues. It's nearly a year since the 1.10 release (2011-03-02) so 1.11 is overdue. There has already been plenty of time for Shark issues to be resolved. > Thanks, > Omair -- 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/20120109/109a9f5f/attachment.bin From bugzilla-daemon at icedtea.classpath.org Mon Jan 9 05:31:04 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Jan 2012 13:31:04 +0000 Subject: [Bug 850] Segfault when trying to run Bukkit Minecraft Server on ARM platform In-Reply-To: <bug-850-30@http.icedtea.classpath.org/bugzilla/> References: <bug-850-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-850-30-RXdMAq913i@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=850 Andrew John Hughes <ahughes at redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |2.0 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Mon Jan 9 05:31:46 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Jan 2012 13:31:46 +0000 Subject: [Bug 850] Segfault when trying to run Bukkit Minecraft Server on ARM platform In-Reply-To: <bug-850-30@http.icedtea.classpath.org/bugzilla/> References: <bug-850-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-850-30-lyisahm7b0@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=850 Andrew John Hughes <ahughes at redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Component|IcedTea7 |Zero AssignedTo|ahughes at redhat.com |chphilli at redhat.com -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Mon Jan 9 05:32:02 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Jan 2012 13:32:02 +0000 Subject: [Bug 850] Segfault when trying to run Bukkit Minecraft Server on ARM platform In-Reply-To: <bug-850-30@http.icedtea.classpath.org/bugzilla/> References: <bug-850-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-850-30-b6Z91X4YTQ@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=850 Andrew John Hughes <ahughes at redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com --- Comment #1 from Andrew John Hughes <ahughes at redhat.com> 2012-01-09 13:32:02 UTC --- Reassigning to Zero. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Mon Jan 9 05:33:29 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Jan 2012 13:33:29 +0000 Subject: [Bug 821] Deadlock in java.awt.EventQueue on OpenJDK7 In-Reply-To: <bug-821-30@http.icedtea.classpath.org/bugzilla/> References: <bug-821-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-821-30-gOHTfhBuDy@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=821 Andrew John Hughes <ahughes at redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |2.0 Severity|major |normal -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ahughes at redhat.com Mon Jan 9 05:37:39 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 9 Jan 2012 13:37:39 +0000 Subject: [1.8, 1.9, 1.10 BACKPORT] 6851973: ignore incoming channel binding if acceptor does not set one Message-ID: <20120109133738.GE3936@rivendell.middle-earth.co.uk> I'd like to backport 6851973 to 1.8, 1.9 and 1.10. http://hg.openjdk.java.net/jdk7/tl/jdk/rev/37ed72fe7561 Without this patch, interoperability issues occur between OpenJDK Kerberos and Kerberos on Microsoft Windows; see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=830 It's been on HEAD since before the holidays. Ok for the branches? -- 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 -------------- # HG changeset patch # User weijun # Date 1245405807 -28800 # Node ID 37ed72fe7561c143a882d03944a7d2240cbafe89 # Parent 81c176909720561ec1c44fa3d94b18845e350ee9 6851973: ignore incoming channel binding if acceptor does not set one Reviewed-by: valeriep diff -r 81c176909720 -r 37ed72fe7561 src/share/classes/sun/security/jgss/krb5/InitialToken.java --- openjdk/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java Thu Jun 18 10:38:21 2009 -0400 +++ openjdk/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java Fri Jun 19 18:03:27 2009 +0800 @@ -33,6 +33,7 @@ import java.net.Inet6Address; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.util.Arrays; import sun.security.krb5.*; import sun.security.jgss.HttpCaller; import sun.security.krb5.internal.Krb5; @@ -219,43 +220,35 @@ "Incorrect checksum"); } - byte[] remoteBindingBytes = new byte[CHECKSUM_BINDINGS_SIZE]; - System.arraycopy(checksumBytes, 4, remoteBindingBytes, 0, - CHECKSUM_BINDINGS_SIZE); - - byte[] noBindings = new byte[CHECKSUM_BINDINGS_SIZE]; - boolean tokenContainsBindings = - (!java.util.Arrays.equals(noBindings, remoteBindingBytes)); - ChannelBinding localBindings = context.getChannelBinding(); - if (tokenContainsBindings || - localBindings != null) { + // Ignore remote channel binding info when not requested at + // local side (RFC 4121 4.1.1.2: the acceptor MAY ignore...). + // + // All major krb5 implementors implement this "MAY", + // and some applications depend on it as a workaround + // for not having a way to negotiate the use of channel + // binding -- the initiator application always uses CB + // and hopes the acceptor will ignore the CB if the + // acceptor doesn't support CB. + if (localBindings != null) { + byte[] remoteBindingBytes = new byte[CHECKSUM_BINDINGS_SIZE]; + System.arraycopy(checksumBytes, 4, remoteBindingBytes, 0, + CHECKSUM_BINDINGS_SIZE); - boolean badBindings = false; - String errorMessage = null; - - if (tokenContainsBindings && - localBindings != null) { + byte[] noBindings = new byte[CHECKSUM_BINDINGS_SIZE]; + if (!Arrays.equals(noBindings, remoteBindingBytes)) { byte[] localBindingsBytes = computeChannelBinding(localBindings); - // System.out.println("ChannelBinding hash: " - // + getHexBytes(localBindingsBytes)); - badBindings = - (!java.util.Arrays.equals(localBindingsBytes, - remoteBindingBytes)); - errorMessage = "Bytes mismatch!"; - } else if (localBindings == null) { - errorMessage = "ChannelBinding not provided!"; - badBindings = true; + if (!Arrays.equals(localBindingsBytes, + remoteBindingBytes)) { + throw new GSSException(GSSException.BAD_BINDINGS, -1, + "Bytes mismatch!"); + } } else { - errorMessage = "Token missing ChannelBinding!"; - badBindings = true; + throw new GSSException(GSSException.BAD_BINDINGS, -1, + "Token missing ChannelBinding!"); } - - if (badBindings) - throw new GSSException(GSSException.BAD_BINDINGS, -1, - errorMessage); } flags = readLittleEndian(checksumBytes, 20, 4); diff -r 81c176909720 -r 37ed72fe7561 test/sun/security/krb5/auto/IgnoreChannelBinding.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ openjdk/jdk/test/sun/security/krb5/auto/IgnoreChannelBinding.java Fri Jun 19 18:03:27 2009 +0800 @@ -0,0 +1,113 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* + * @test + * @bug 6851973 + * @summary ignore incoming channel binding if acceptor does not set one + */ + +import java.net.InetAddress; +import org.ietf.jgss.ChannelBinding; +import org.ietf.jgss.GSSException; +import sun.security.jgss.GSSUtil; + +public class IgnoreChannelBinding { + + public static void main(String[] args) + throws Exception { + + new OneKDC(null).writeJAASConf(); + + Context c = Context.fromJAAS("client"); + Context s = Context.fromJAAS("server"); + + // All silent + c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); + s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); + Context.handshake(c, s); + + // Initiator req, acceptor ignore + c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); + c.x().setChannelBinding(new ChannelBinding( + InetAddress.getByName("client.rabbit.hole"), + InetAddress.getByName("host.rabbit.hole"), + new byte[0] + )); + s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); + Context.handshake(c, s); + + // Both req, and match + c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); + c.x().setChannelBinding(new ChannelBinding( + InetAddress.getByName("client.rabbit.hole"), + InetAddress.getByName("host.rabbit.hole"), + new byte[0] + )); + s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); + s.x().setChannelBinding(new ChannelBinding( + InetAddress.getByName("client.rabbit.hole"), + InetAddress.getByName("host.rabbit.hole"), + new byte[0] + )); + Context.handshake(c, s); + + // Both req, NOT match + c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); + c.x().setChannelBinding(new ChannelBinding( + InetAddress.getByName("client.rabbit.hole"), + InetAddress.getByName("host.rabbit.hole"), + new byte[0] + )); + s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); + s.x().setChannelBinding(new ChannelBinding( + InetAddress.getByName("client.rabbit.hole"), + InetAddress.getByName("host.rabbit.hole"), + new byte[1] // 0 -> 1 + )); + try { + Context.handshake(c, s); + throw new Exception("Acceptor should reject initiator"); + } catch (GSSException ge) { + // Expected bahavior + } + + // Acceptor req, reject + c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); + s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); + s.x().setChannelBinding(new ChannelBinding( + InetAddress.getByName("client.rabbit.hole"), + InetAddress.getByName("host.rabbit.hole"), + new byte[0] + )); + try { + Context.handshake(c, s); + throw new Exception("Acceptor should reject initiator"); + } catch (GSSException ge) { + // Expected bahavior + if (ge.getMajor() != GSSException.BAD_BINDINGS) { + throw ge; + } + } + } +} -------------- 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/20120109/39b49daf/attachment.bin From ptisnovs at icedtea.classpath.org Mon Jan 9 05:58:10 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 09 Jan 2012 13:58:10 +0000 Subject: /hg/MauveTestCoverage: 2012-01-09 Pavel Tisnovsky <ptisnovs@re... Message-ID: <hg.61f453c6b172.1326117490.8533365281664943086@icedtea.classpath.org> changeset 61f453c6b172 in /hg/MauveTestCoverage details: http://icedtea.classpath.org/hg/MauveTestCoverage?cmd=changeset;node=61f453c6b172 author: Pavel Tisnovsky <ptisnovs at redhat.com> date: Mon Jan 09 14:57:59 2012 +0100 2012-01-09 Pavel Tisnovsky <ptisnovs at redhat.com> * src/index.html: * src/style.css: * templates/index.html: * templates/style.css: Moved into other directory. * templates/all_classes_template.html: * templates/all_packages_template.html: * templates/package_template.html: Prepared templates for test coverage HTML report. * src/PrintPublicMethods.java: * src/PrintTestCoverage.java: Refactoring and Javadoc. * Makefile: Updated diffstat: ChangeLog | 17 ++++++++++++ Makefile | 5 ++- src/PrintPublicMethods.java | 50 +++++++++++++++++++++++++++++++++++- src/PrintTestCoverage.java | 7 +++++ src/index.html | 20 -------------- src/style.css | 27 ------------------- templates/all_classes_template.html | 15 ++++++++++ templates/all_packages_template.html | 16 +++++++++++ templates/index.html | 20 ++++++++++++++ templates/package_template.html | 15 ++++++++++ templates/style.css | 27 +++++++++++++++++++ 11 files changed, 169 insertions(+), 50 deletions(-) diffs (360 lines): diff -r 8612fcdfab82 -r 61f453c6b172 ChangeLog --- a/ChangeLog Fri Jan 06 12:25:10 2012 +0100 +++ b/ChangeLog Mon Jan 09 14:57:59 2012 +0100 @@ -1,3 +1,20 @@ +2012-01-09 Pavel Tisnovsky <ptisnovs at redhat.com> + + * src/index.html: + * src/style.css: + * templates/index.html: + * templates/style.css: + Moved into other directory. + * templates/all_classes_template.html: + * templates/all_packages_template.html: + * templates/package_template.html: + Prepared templates for test coverage HTML report. + * src/PrintPublicMethods.java: + * src/PrintTestCoverage.java: + Refactoring and Javadoc. + * Makefile: + Updated + 2012-01-06 Pavel Tisnovsky <ptisnovs at redhat.com> * src/PrintClassList.java: diff -r 8612fcdfab82 -r 61f453c6b172 Makefile --- a/Makefile Fri Jan 06 12:25:10 2012 +0100 +++ b/Makefile Mon Jan 09 14:57:59 2012 +0100 @@ -40,6 +40,7 @@ CLASSDIR=bin REPORTDIR=reports DOCS=docs +TEMPLATEDIR=templates JAVA=java JAVAC=javac @@ -139,7 +140,7 @@ $(JAVA) -cp $(CLASSDIR) PrintClassList `cat $(PATH_TO_RT_JAR_FILE)` > $(REPORTDIR)/$(ALL_CLASS_LIST) gen_report: $(REPORTDIR) - cp -u $(SOURCEPATH)/index.html $(REPORTDIR) - cp -u $(SOURCEPATH)/style.css $(REPORTDIR) + cp -u $(TEMPLATEDIR)/index.html $(REPORTDIR) + cp -u $(TEMPLATEDIR)/style.css $(REPORTDIR) java -cp $(CLASSDIR) ReportGenerator $(REPORTDIR)/$(ALL_CLASS_LIST) $(CLASS_LIST) $(REPORTDIR) diff -r 8612fcdfab82 -r 61f453c6b172 src/PrintPublicMethods.java --- a/src/PrintPublicMethods.java Fri Jan 06 12:25:10 2012 +0100 +++ b/src/PrintPublicMethods.java Mon Jan 09 14:57:59 2012 +0100 @@ -64,10 +64,13 @@ Class clazz = null; try { clazz = Class.forName(className); + // we need to get a list of public classes only + // (Interfaces and non public classes is not interesting ATM) if (!clazz.isInterface() && Modifier.isPublic(clazz.getModifiers())) { return clazz; } } + // some exceptions could be thrown by Class.forName() catch (ClassNotFoundException e) { return null; } @@ -92,9 +95,12 @@ * @return method name without prefixes */ private static String acquireMethodName(String methodName) { + // please note, that sequence of prefixes is very important final String[] prefixes = new String[] {"public", "final", "native", "synchronized", "static"}; String methodNameString = methodName; + // remove all prefixes for (String prefix : prefixes) { + // remove one prefix methodNameString = removePrefix(methodNameString, prefix); } return removeThrowsFromDeclaration(methodNameString); @@ -143,19 +149,22 @@ } /** - * Print all public method from given class name (if such class exists). + * Get all public methods from given class name (if such class exists). * * @param className * name of a class (including package name) + * @return set of all public methods */ @SuppressWarnings("unchecked") private static Set<String> getAllPublicMethodsForClass(String className) { Set<String> out = new TreeSet<String>(); Class clazz = getClass(className); + // in case of error, empty set is returned (not null) if (clazz == null) { return out; } Method[] methods = clazz.getDeclaredMethods(); + // process all methods select add only public ones for (Method method : methods) { if (Modifier.isPublic(method.getModifiers())) { String methodName = acquireMethodName(method.toString()); @@ -165,14 +174,24 @@ return out; } + /** + * Get all public methods from given class name (if such class exists). + * + * + * @param className + * name of a class (including package name) + * @return set of all public constructors + */ @SuppressWarnings("unchecked") private static Set<String> getAllConstructors(String className) { Set<String> out = new TreeSet<String>(); Class clazz = getClass(className); + // in case of error, empty set is returned (not null) if (clazz == null) { return out; } Constructor[] constructors = clazz.getConstructors(); + // process all constructors select add only public ones for (Constructor constructor : constructors) { if (Modifier.isPublic(constructor.getModifiers())) { String methodName = acquireMethodName(constructor.toString()); @@ -182,12 +201,40 @@ return out; } + /** + * List all public methods and public constructors for given class + * + * @param className + * name of class to list + */ private static void printAllPublicMethodsAndConstructors(String className) { + printAllConstructors(className); + printAllPublicMethods(className); + } + + /** + * List all public constructors for given class + * + * @param className + * name of class to list + */ + private static void printAllConstructors(String className) + { for (String methodSignature : getAllConstructors(className)) { System.out.println(methodSignature); } + } + + /** + * List all public methods for given class + * + * @param className + * name of class to list + */ + private static void printAllPublicMethods(String className) + { for (String methodSignature : getAllPublicMethodsForClass(className)) { System.out.println(methodSignature); @@ -202,6 +249,7 @@ * list. */ public static void main(String[] args) { + // first argument should exists - it should contains path to file with class list if (args.length == 1) { printAllPublicMethodsAndConstructors(args[0].trim()); diff -r 8612fcdfab82 -r 61f453c6b172 src/PrintTestCoverage.java --- a/src/PrintTestCoverage.java Fri Jan 06 12:25:10 2012 +0100 +++ b/src/PrintTestCoverage.java Mon Jan 09 14:57:59 2012 +0100 @@ -860,8 +860,15 @@ } } + /** + * Entry point to this tool. + * + * @param args + * should contain one argument - full name of class to check + */ public static void main(String[] args) { + // full name of class to check should be specified on command line if (args.length == 1) { String className = args[0].trim(); diff -r 8612fcdfab82 -r 61f453c6b172 src/index.html --- a/src/index.html Fri Jan 06 12:25:10 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd"> -<html> - <head> - <title>Test coverage report - - - - - - - - - <h2>Frame Alert</h2> - <p>This document is designed to be viewed using the frames - feature. If you see this message, you are using a - non-frame-capable web client.</p> - - - - diff -r 8612fcdfab82 -r 61f453c6b172 src/style.css --- a/src/style.css Fri Jan 06 12:25:10 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -body {font-family: arial, helvetica, sans-serif; color:#000000; text-align:justify; background-color:#ffffff; margin-left: 0px; margin-top: 0px} -h1 {font-family: arial, helvetica, sans-serif; color:#000000; background:#80a0a0; text-align:center; padding-left: 1em; margin: 0} -h2 {font-family: arial, helvetica, sans-serif; color:#000000; background:#80a0a0; padding-left: 1em; padding-right:1cm} -h3 {font-family: arial, helvetica, sans-serif; color:#000000; background:#a0a080; padding-left: 1em; padding-right:1cm} -h4 {font-family: arial, helvetica, sans-serif; color:#000000; background:#c0c0a0; padding-left: 1em; padding-right:1cm; margin-bottom: 5px} -a {font-family: arial, helvetica, sans-serif; color:#0000ff; text-decoration:none} -a:link {color:#0000ff} -a:visited {color:#0000ff} -a:visited {color:#0000ff} -a:hover {color:#ffffff; background:#404040} -p {font-family: arial, helvetica, sans-serif; color:#000000; text-align:justify; padding-left:1em; padding-right:1em} -li {font-family: arial, helvetica, sans-serif; color:#000000; text-align:justify} -pre {} -tr {font-family: arial, helvetica, sans-serif; text-align:left} -td {font-family: arial, helvetica, sans-serif; text-align:left} -td.center {font-family: arial, helvetica, sans-serif; text-align:center} -th.center {font-family: arial, helvetica, sans-serif; text-align:center} - -.forms {background-color: #f0f0dd; vertical-align: top; width: 720px; border-collapse: collapse; border-color:#808080; margin-left:32px} - -.present-method {background-color:#006000} -.absent-method {background-color:#600000} - -.method-return-type {} -.method-name {} -.method-params {} - diff -r 8612fcdfab82 -r 61f453c6b172 templates/all_classes_template.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/all_classes_template.html Mon Jan 09 14:57:59 2012 +0100 @@ -0,0 +1,15 @@ + + + + Class list + + + + + +

Class list

+${PACKAGE_AND_CLASS_LIST} + + + diff -r 8612fcdfab82 -r 61f453c6b172 templates/all_packages_template.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/all_packages_template.html Mon Jan 09 14:57:59 2012 +0100 @@ -0,0 +1,16 @@ + + + + Package list + + + + + +

Package list

+all classes

+${PACKAGE_LIST} + + + diff -r 8612fcdfab82 -r 61f453c6b172 templates/index.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/index.html Mon Jan 09 14:57:59 2012 +0100 @@ -0,0 +1,20 @@ + + + + Test coverage report + + + + + + + + + <h2>Frame Alert</h2> + <p>This document is designed to be viewed using the frames + feature. If you see this message, you are using a + non-frame-capable web client.</p> + + + + diff -r 8612fcdfab82 -r 61f453c6b172 templates/package_template.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/package_template.html Mon Jan 09 14:57:59 2012 +0100 @@ -0,0 +1,15 @@ + + + + Class list + + + + + +

Class list

+${CLASS_LIST} + + + diff -r 8612fcdfab82 -r 61f453c6b172 templates/style.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/style.css Mon Jan 09 14:57:59 2012 +0100 @@ -0,0 +1,27 @@ +body {font-family: arial, helvetica, sans-serif; color:#000000; text-align:justify; background-color:#ffffff; margin-left: 0px; margin-top: 0px} +h1 {font-family: arial, helvetica, sans-serif; color:#000000; background:#80a0a0; text-align:center; padding-left: 1em; margin: 0} +h2 {font-family: arial, helvetica, sans-serif; color:#000000; background:#c0c060; padding-left: 1em; padding-right:1cm} +h3 {font-family: arial, helvetica, sans-serif; color:#000000; background:#a0a080; padding-left: 1em; padding-right:1cm} +h4 {font-family: arial, helvetica, sans-serif; color:#000000; background:#c0c0a0; padding-left: 1em; padding-right:1cm; margin-bottom: 5px} +a {font-family: arial, helvetica, sans-serif; color:#0000ff; text-decoration:none} +a:link {color:#0000ff} +a:visited {color:#0000ff} +a:visited {color:#0000ff} +a:hover {color:#ffffff; background:#404040} +p {font-family: arial, helvetica, sans-serif; color:#000000; text-align:justify; padding-left:1em; padding-right:1em} +li {font-family: arial, helvetica, sans-serif; color:#000000; text-align:justify} +pre {} +tr {font-family: arial, helvetica, sans-serif; text-align:left} +td {font-family: arial, helvetica, sans-serif; text-align:left} +td.center {font-family: arial, helvetica, sans-serif; text-align:center} +th.center {font-family: arial, helvetica, sans-serif; text-align:center} + +.forms {background-color: #f0f0dd; vertical-align: top; width: 720px; border-collapse: collapse; border-color:#808080; margin-left:32px} + +.present-method {background-color:#006000} +.absent-method {background-color:#600000} + +.method-return-type {} +.method-name {} +.method-params {} + From ptisnovs at redhat.com Mon Jan 9 06:05:01 2012 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Mon, 09 Jan 2012 15:05:01 +0100 Subject: [1.8, 1.9, 1.10 BACKPORT] 6851973: ignore incoming channel binding if acceptor does not set one In-Reply-To: <20120109133738.GE3936@rivendell.middle-earth.co.uk> References: <20120109133738.GE3936@rivendell.middle-earth.co.uk> Message-ID: <4F0AF40D.2090400@redhat.com> Dr Andrew John Hughes wrote: > I'd like to backport 6851973 to 1.8, 1.9 and 1.10. > > http://hg.openjdk.java.net/jdk7/tl/jdk/rev/37ed72fe7561 > > Without this patch, interoperability issues occur between OpenJDK > Kerberos and Kerberos on Microsoft Windows; see > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=830 > > It's been on HEAD since before the holidays. > > Ok for the branches? > Hi Andrew, please note, that the regresiion test contained in this patch failed due to compilation error. I'm going to figure what's wrong... Cheers, Pavel From bugzilla-daemon at icedtea.classpath.org Mon Jan 9 06:49:57 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Jan 2012 14:49:57 +0000 Subject: [Bug 850] Segfault when trying to run Bukkit Minecraft Server on ARM platform In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=850 Xerxes R?nby changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |xerxes at zafena.se Platform|x86_64 |arm --- Comment #2 from Xerxes R?nby 2012-01-09 14:49:57 UTC --- Hi, can you provide some pointers on how to setup a testcase that can reproduce this bug using the Bukkit Minecraft server? We will use this bug ID to track the reported Zero crash in the cpp interpreter compiled from OpenJDK 7 source-code. Feel free to open a new bug report for the OpenJDK 6 crash (OpenJDK 6 and OpenJDK 7 uses different code and optimizations in the JVM). -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Mon Jan 9 07:53:43 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Jan 2012 15:53:43 +0000 Subject: [Bug 851] New: Java VM Just Crashes Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=851 Bug #: 851 Summary: Java VM Just Crashes Classification: Unclassified Product: IcedTea Version: 6-1.6 Platform: x86_64 OS/Version: Linux Status: NEW Severity: blocker Priority: P3 Component: JamVM AssignedTo: xerxes at zafena.se ReportedBy: dale_abcs at yahoo.com CC: unassigned at icedtea.classpath.org Created attachment 635 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=635 Error log just typed jconsole at the prompt. java version "1.6.0_18" Java(TM) SE Runtime Environment (build 1.6.0_18-b07) Java HotSpot(TM) 64-Bit Server VM (build 16.0-b13, mixed mode) # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00000034e52148a0, pid=32215, tid=139860580357904 # # JRE version: 6.0-b16 # Java VM: OpenJDK 64-Bit Server VM (14.0-b16 mixed mode linux-amd64 ) # Distribution: Custom build (Thu Nov 12 09:47:56 EST 2009) # Problematic frame: # C [ld-linux-x86-64.so.2+0x148a0] # # An error report file with more information is saved as: # /data/log/jboss/hs_err_pid32215.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # The crash happened outside the Java Virtual Machine in native code. # See problematic frame for where to report the bug. # -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From omajid at redhat.com Mon Jan 9 08:39:49 2012 From: omajid at redhat.com (Omair Majid) Date: Mon, 09 Jan 2012 11:39:49 -0500 Subject: IcedTea6 1.11 has been branched. Release on 2011-01-18. In-Reply-To: <20120109130631.GB3936@rivendell.middle-earth.co.uk> References: <4F0771B8.4080106@redhat.com> <20120109130631.GB3936@rivendell.middle-earth.co.uk> Message-ID: <4F0B1855.3050703@redhat.com> On 01/09/2012 08:06 AM, Dr Andrew John Hughes wrote: > On 17:12 Fri 06 Jan , Omair Majid wrote: >> The only known issue is: >> * Shark: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=701 >> From what I have heard, shark is not in the best condition anyway >> thanks to changes in llvm. Unless someone steps up to fix this, >> shark will most likely be broken in the final release too. >> > > As noted previously, I don't think Shark should block the release, unless > someone has a reasonable (i.e. this month) ETA for fixing these issues. > > It's nearly a year since the 1.10 release (2011-03-02) so 1.11 is overdue. > There has already been plenty of time for Shark issues to be resolved. > Yes, I think I am going to remove shark as a blocker from this release. Andrew Haley and Xerxes R?nby seem to be in agreement that a number of factors (hotspot changes + llvm changes) have resulted in shark being very unstable and it will take a while before shark can be stabilized. Does anyone have any thoughts about which of the following options is the preferred way to communicate that shark is very unstable? 1. Document that shark is not stable explicitly in the release notes (and highlight it too) but leave shark otherwise untouched in the build. 2. Disable shark support. --enable-shark will cause configure to fail. Thoughts? Thanks, Omair From aph at redhat.com Mon Jan 9 08:57:59 2012 From: aph at redhat.com (Andrew Haley) Date: Mon, 09 Jan 2012 16:57:59 +0000 Subject: IcedTea6 1.11 has been branched. Release on 2011-01-18. In-Reply-To: <4F0B1855.3050703@redhat.com> References: <4F0771B8.4080106@redhat.com> <20120109130631.GB3936@rivendell.middle-earth.co.uk> <4F0B1855.3050703@redhat.com> Message-ID: <4F0B1C97.5080402@redhat.com> On 01/09/2012 04:39 PM, Omair Majid wrote: > Does anyone have any thoughts about which of the following options is > the preferred way to communicate that shark is very unstable? > > 1. Document that shark is not stable explicitly in the release notes > (and highlight it too) but leave shark otherwise untouched in the build. > > 2. Disable shark support. --enable-shark will cause configure to fail. #2. Andrew. From bugzilla-daemon at icedtea.classpath.org Mon Jan 9 11:09:48 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Jan 2012 19:09:48 +0000 Subject: [Bug 827] unable to start davmail In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=827 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Status|REOPENED |RESOLVED CC| |dbhole at redhat.com Resolution| |WONTFIX --- Comment #5 from Deepak Bhole 2012-01-09 19:09:48 UTC --- (In reply to comment #4) > This latest version of centos is using this version of java, which refuse to > solve when this version is supplied with latest version of centos? You need to upgrade to the latest CentOS 6. CentOS only supports the latest point release: http://wiki.centos.org/FAQ/General#head-6e2c3746ec45ac3142917466760321e868f43c0e "Since all updates within a major release (CentOS 4, CentOS 5 or CentOS 6) always upgrade to the latest version when updates are performed (thus mimicking upstream behavior), only the latest version is maintained in each main tree on the CentOS mirrors." The newest version of IcedTea in CentOS6 (6.2) is 1.10.4: http://mirrors.kernel.org/centos/6.2/os/i386/Packages/java-1.6.0-openjdk-1.6.0.0-1.41.1.10.4.el6.i686.rpm DavMail starts fine for me with Fedora/IcedTea6 1.10.3 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From dbhole at redhat.com Mon Jan 9 11:29:41 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 9 Jan 2012 14:29:41 -0500 Subject: [icedtea-web] RFC: Backport threadgroup fix to 1.1 Message-ID: <20120109192941.GH2930@redhat.com> Hi, I would like to backport http://icedtea.classpath.org/hg/icedtea-web/rev/d57169ddb76a to 1.1 to fix an issue with OpenJDK7: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-December/016535.html I have looked over the patch and it looks like it'd be fine to backport. Okay for 1.1? Cheers, Deepak From omajid at redhat.com Mon Jan 9 11:32:17 2012 From: omajid at redhat.com (Omair Majid) Date: Mon, 09 Jan 2012 14:32:17 -0500 Subject: [icedtea-web] RFC: Backport threadgroup fix to 1.1 In-Reply-To: <20120109192941.GH2930@redhat.com> References: <20120109192941.GH2930@redhat.com> Message-ID: <4F0B40C1.4070702@redhat.com> On 01/09/2012 02:29 PM, Deepak Bhole wrote: > Hi, > > I would like to backport > http://icedtea.classpath.org/hg/icedtea-web/rev/d57169ddb76a to 1.1 to > fix an issue with OpenJDK7: > > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-December/016535.html > > I have looked over the patch and it looks like it'd be fine to backport. > > Okay for 1.1? > Looks fine to me. Cheers, Omair From omajid at redhat.com Mon Jan 9 11:36:03 2012 From: omajid at redhat.com (Omair Majid) Date: Mon, 09 Jan 2012 14:36:03 -0500 Subject: [icedtea-web] RFC: Simple fix for PR838 In-Reply-To: <20120106194724.GB11545@redhat.com> References: <20111221215556.GH752@redhat.com> <20120106194724.GB11545@redhat.com> Message-ID: <4F0B41A3.6020004@redhat.com> On 01/06/2012 02:47 PM, Deepak Bhole wrote: > * Deepak Bhole [2011-12-21 16:57]: >> Attached patch fixes PR838. >> >> Given the nature of the issue and the simplicity of the fix, I also >> propose backporting to 1.0 and 1.1. >> >> ChangeLog: >> 2011-12-21 Deepak Bhole >> >> PR838: IcedTea plugin crashes with chrome browser when javascript is executed >> * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc (eval): Added a check >> to ensure that the result pointer is valid before attempting to create an >> NPVariant from it. >> >> Okay for HEAD, 1.0 and 1.1? >> > > ping? > Looks fine to me. Cheers, Omair From omajid at redhat.com Mon Jan 9 14:07:56 2012 From: omajid at redhat.com (Omair Majid) Date: Mon, 09 Jan 2012 17:07:56 -0500 Subject: [IcedTea6 1.11] Disable shark Message-ID: <4F0B653C.2060903@redhat.com> Hi, I am currently testing the attached patch which disables shark. I would like to add it to the IcedTea6 1.11 branch. Can others please give this a spin to make sure it doesn't break anything (else)? Once this is committed, I will also re-target all shark 1.11 "blocker" bugs to 1.12. Thanks, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: disable-shark-01.patch Type: text/x-patch Size: 1680 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120109/a5b40b01/disable-shark-01.patch From bugzilla-daemon at icedtea.classpath.org Mon Jan 9 15:32:05 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Jan 2012 23:32:05 +0000 Subject: [Bug 852] New: Classloader not being flushed after last applet from a site is closed Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=852 Bug #: 852 Summary: Classloader not being flushed after last applet from a site is closed Classification: Unclassified Product: IcedTea-Web Version: unspecified Platform: x86_64 OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: Plugin AssignedTo: dbhole at redhat.com ReportedBy: dbhole at redhat.com CC: unassigned at icedtea.classpath.org When an applet is closed, currently there is no code in place to discard its classloader if that was the last applet from that site. This issue was identified by Thomas Meyer with the Juniper VPN applet: https://bugzilla.redhat.com/show_bug.cgi?id=586194#c59 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Mon Jan 9 15:34:15 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Jan 2012 23:34:15 +0000 Subject: [Bug 852] Classloader not being flushed after last applet from a site is closed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=852 --- Comment #1 from Deepak Bhole 2012-01-09 23:34:15 UTC --- Created attachment 636 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=636 Test case for this bug Attached is a minimal test case. To reproduce, load the applet, then close it, then re-load it. It pops an alert showing classloader not flushed. If the loader is cleared, the alert should not show up. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From dbhole at icedtea.classpath.org Mon Jan 9 15:52:43 2012 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Mon, 09 Jan 2012 23:52:43 +0000 Subject: /hg/release/icedtea-web-1.0: PR838: IcedTea plugin crashes with ... Message-ID: changeset 06a4e046a700 in /hg/release/icedtea-web-1.0 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.0?cmd=changeset;node=06a4e046a700 author: Deepak Bhole date: Mon Jan 09 18:45:31 2012 -0500 PR838: IcedTea plugin crashes with chrome browser when javascript is executed diffstat: ChangeLog | 7 +++++++ NEWS | 1 + plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 8 +++++++- 3 files changed, 15 insertions(+), 1 deletions(-) diffs (43 lines): diff -r 990dc0dd5c48 -r 06a4e046a700 ChangeLog --- a/ChangeLog Thu Dec 22 16:15:54 2011 -0500 +++ b/ChangeLog Mon Jan 09 18:45:31 2012 -0500 @@ -1,3 +1,10 @@ +2012-01-09 Deepak Bhole + + PR838: IcedTea plugin crashes with chrome browser when javascript is executed + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc (eval): Added a check + to ensure that the result pointer is valid before attempting to create an + NPVariant from it. + 2011-12-22 Thomas Meyer * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc(sendMember): Use diff -r 990dc0dd5c48 -r 06a4e046a700 NEWS --- a/NEWS Thu Dec 22 16:15:54 2011 -0500 +++ b/NEWS Mon Jan 09 18:45:31 2012 -0500 @@ -11,6 +11,7 @@ New in release 1.0.7 (2011-XX-XX): * Plugin - RH586194: Unable to connect to connect with Juniper VPN client + - PR838: IcedTea plugin crashes with chrome browser when javascript is executed New in release 1.0.6 (2011-11-08): * Security updates diff -r 990dc0dd5c48 -r 06a4e046a700 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Thu Dec 22 16:15:54 2011 -0500 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Mon Jan 09 18:45:31 2012 -0500 @@ -243,7 +243,13 @@ NPVariant* result_variant = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(thread_data.result); std::string result_variant_jniid = std::string(); - createJavaObjectFromVariant(instance, *result_variant, &result_variant_jniid); + if (result_variant) + { + createJavaObjectFromVariant(instance, *result_variant, &result_variant_jniid); + } else + { + result_variant_jniid = "0"; + } IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response); response += " JavaScriptEval "; From dbhole at icedtea.classpath.org Mon Jan 9 15:52:52 2012 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Mon, 09 Jan 2012 23:52:52 +0000 Subject: /hg/release/icedtea-web-1.1: 2 new changesets Message-ID: changeset 77640d74d21c in /hg/release/icedtea-web-1.1 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=77640d74d21c author: Denis Lila date: Fri Apr 29 16:58:05 2011 -0400 Fix appcontext related plugin bugs. changeset 360bd0a75304 in /hg/release/icedtea-web-1.1 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=360bd0a75304 author: Deepak Bhole date: Mon Jan 09 18:45:31 2012 -0500 PR838: IcedTea plugin crashes with chrome browser when javascript is executed diffstat: ChangeLog | 31 +++++ NEWS | 1 + netx/net/sourceforge/jnlp/Launcher.java | 17 +- netx/net/sourceforge/jnlp/NetxPanel.java | 89 ++++++++++++--- netx/net/sourceforge/jnlp/PluginBridge.java | 32 +----- netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java | 63 ----------- plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 8 +- plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 36 ++++- 8 files changed, 144 insertions(+), 133 deletions(-) diffs (446 lines): diff -r f0647c938535 -r 360bd0a75304 ChangeLog --- a/ChangeLog Sat Jan 07 02:48:05 2012 -0500 +++ b/ChangeLog Mon Jan 09 18:45:31 2012 -0500 @@ -1,3 +1,34 @@ +2012-01-09 Deepak Bhole + + PR838: IcedTea plugin crashes with chrome browser when javascript is executed + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc (eval): Added a check + to ensure that the result pointer is valid before attempting to create an + NPVariant from it. + +2011-04-28 Denis Lila + + * netx/net/sourceforge/jnlp/NetxPanel.java: + Remove unused import; add imports. + (uKey, uKeyToTG, appContextCreated): New members. + (getThreadGroup, createNewAppContext): New methods. + (runLoader): Pass uKey to PluginBridge's constructor. + (run): Remove. No longer needed. + (NetxPanel): Initialize uKey. If it is a new key, make a new thread + group for it and save it in the hash map. + (createAppletThread): Use getFutureTG instead of creating a thread + group on the spot. + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: + (createPanel): Initialize and frame the panel in a separate thread. + * netx/net/sourceforge/jnlp/Launcher.java: + Remove unused import. + (createApplet, createApplication, createThreadGroup): Replace + AppThreadGroup with ThreadGroup. Remove all calls to setApplication. + * netx/net/sourceforge/jnlp/PluginBridge.java: + (PluginBridge): Remove the uniqueKey initialization logic. Set + uniqueKey to the uKey parameter. + * netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java: + Remove file. + 2012-01-07 Omair Majid * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java diff -r f0647c938535 -r 360bd0a75304 NEWS --- a/NEWS Sat Jan 07 02:48:05 2012 -0500 +++ b/NEWS Mon Jan 09 18:45:31 2012 -0500 @@ -11,6 +11,7 @@ New in release 1.1.5 (2011-XX-XX): * Plugin - RH586194: Unable to connect to connect with Juniper VPN client + - PR838: IcedTea plugin crashes with chrome browser when javascript is executed New in release 1.1.4 (2011-11-08): * Security updates: diff -r f0647c938535 -r 360bd0a75304 netx/net/sourceforge/jnlp/Launcher.java --- a/netx/net/sourceforge/jnlp/Launcher.java Sat Jan 07 02:48:05 2012 -0500 +++ b/netx/net/sourceforge/jnlp/Launcher.java Mon Jan 09 18:45:31 2012 -0500 @@ -33,7 +33,6 @@ import net.sourceforge.jnlp.cache.CacheUtil; import net.sourceforge.jnlp.cache.UpdatePolicy; -import net.sourceforge.jnlp.runtime.AppThreadGroup; import net.sourceforge.jnlp.runtime.AppletInstance; import net.sourceforge.jnlp.runtime.ApplicationInstance; import net.sourceforge.jnlp.runtime.JNLPClassLoader; @@ -707,7 +706,7 @@ throw new ClassNotFoundException("Can't do a codebase look up and there are no jars. Failing sooner rather than later"); } - AppThreadGroup group = (AppThreadGroup) Thread.currentThread().getThreadGroup(); + ThreadGroup group = Thread.currentThread().getThreadGroup(); String appletName = file.getApplet().getMainClass(); @@ -723,7 +722,6 @@ else appletInstance = new AppletInstance(file, group, loader, applet, cont); - group.setApplication(appletInstance); loader.setApplication(appletInstance); setContextClassLoaderForAllThreads(appletInstance.getThreadGroup(), appletInstance.getClassLoader()); @@ -770,10 +768,9 @@ protected ApplicationInstance createApplication(JNLPFile file) throws LaunchException { try { JNLPClassLoader loader = JNLPClassLoader.getInstance(file, updatePolicy); - AppThreadGroup group = (AppThreadGroup) Thread.currentThread().getThreadGroup(); + ThreadGroup group = Thread.currentThread().getThreadGroup(); ApplicationInstance app = new ApplicationInstance(file, group, loader); - group.setApplication(app); loader.setApplication(app); return app; @@ -789,16 +786,16 @@ * then this method simply returns the existing ThreadGroup. The applet * ThreadGroup has to be created at an earlier point in the applet code. */ - protected AppThreadGroup createThreadGroup(JNLPFile file) { - AppThreadGroup appThreadGroup = null; + protected ThreadGroup createThreadGroup(JNLPFile file) { + ThreadGroup tg = null; if (file instanceof PluginBridge) { - appThreadGroup = (AppThreadGroup) Thread.currentThread().getThreadGroup(); + tg = Thread.currentThread().getThreadGroup(); } else { - appThreadGroup = new AppThreadGroup(mainGroup, file.getTitle()); + tg = new ThreadGroup(mainGroup, file.getTitle()); } - return appThreadGroup; + return tg; } /** diff -r f0647c938535 -r 360bd0a75304 netx/net/sourceforge/jnlp/NetxPanel.java --- a/netx/net/sourceforge/jnlp/NetxPanel.java Sat Jan 07 02:48:05 2012 -0500 +++ b/netx/net/sourceforge/jnlp/NetxPanel.java Mon Jan 09 18:45:31 2012 -0500 @@ -23,12 +23,13 @@ package net.sourceforge.jnlp; import net.sourceforge.jnlp.AppletLog; -import net.sourceforge.jnlp.runtime.AppThreadGroup; import net.sourceforge.jnlp.runtime.AppletInstance; import net.sourceforge.jnlp.runtime.JNLPRuntime; import java.net.URL; import java.util.Hashtable; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import sun.applet.AppletViewerPanel; import sun.awt.SunToolkit; @@ -44,9 +45,58 @@ private boolean exitOnFailure = true; private AppletInstance appInst = null; private boolean appletAlive; + private final String uKey; + + // We use this so that we can create exactly one thread group + // for all panels with the same uKey. + private static final ConcurrentMap uKeyToTG = + new ConcurrentHashMap(); + + // This map is actually a set (unfortunately there is no ConcurrentSet + // in java.util.concurrent). If KEY is in this map, then we know that + // an app context has been created for the panel that has uKey.equals(KEY), + // so we avoid creating it a second time for panels with the same uKey. + // Because it's a set, only the keys matter. However, we can't insert + // null values in because if we did, we couldn't use null checks to see + // if a key was absent before a putIfAbsent. + private static final ConcurrentMap appContextCreated = + new ConcurrentHashMap(); public NetxPanel(URL documentURL, Hashtable atts) { super(documentURL, atts); + + /* According to http://download.oracle.com/javase/6/docs/technotes/guides/deployment/deployment-guide/applet-compatibility.html, + * classloaders are shared iff these properties match: + * codebase, cache_archive, java_archive, archive + * + * To achieve this, we create the uniquekey based on those 4 values, + * always in the same order. The initial "=" parts ensure a + * bad tag cannot trick the loader into getting shared with another. + */ + + // Firefox sometimes skips the codebase if it is default -- ".", + // so set it that way if absent + String codebaseAttr = atts.get("codebase") != null ? + atts.get("codebase") : "."; + + String cache_archiveAttr = atts.get("cache_archive") != null ? + atts.get("cache_archive") : ""; + + String java_archiveAttr = atts.get("java_archive") != null ? + atts.get("java_archive") : ""; + + String archiveAttr = atts.get("archive") != null ? + atts.get("archive") : ""; + + this.uKey = "codebase=" + codebaseAttr + + "cache_archive=" + cache_archiveAttr + + "java_archive=" + java_archiveAttr + + "archive=" + archiveAttr; + + // when this was being done (incorrectly) in Launcher, the call was + // new AppThreadGroup(mainGroup, file.getTitle()); + ThreadGroup tg = new ThreadGroup(Launcher.mainGroup, this.documentURL.toString()); + uKeyToTG.putIfAbsent(this.uKey, tg); } // overloaded constructor, called when initialized via plugin @@ -58,18 +108,6 @@ } @Override - public void run() { - /* - * create an AppContext for this thread associated with this particular - * plugin instance (which runs in a different thread group from the rest - * of the plugin). - */ - SunToolkit.createNewAppContext(); - - super.run(); - } - - @Override protected void showAppletException(Throwable t) { /* * Log any exceptions thrown while loading, initializing, starting, @@ -78,7 +116,7 @@ AppletLog.log(t); super.showAppletException(t); } - + //Overriding to use Netx classloader. You might need to relax visibility //in sun.applet.AppletPanel for runLoader(). protected void runLoader() { @@ -90,7 +128,7 @@ getCode(), getWidth(), getHeight(), - atts); + atts, uKey); doInit = true; dispatchAppletEvent(APPLET_LOADING, null); @@ -154,11 +192,7 @@ } } - // when this was being done (incorrectly) in Launcher, the call was - // new AppThreadGroup(mainGroup, file.getTitle()); - ThreadGroup tg = new AppThreadGroup(Launcher.mainGroup, - this.documentURL.toString()); - handler = new Thread(tg, this); + handler = new Thread(getThreadGroup(), this); handler.start(); } @@ -174,4 +208,19 @@ public boolean isAlive() { return handler != null && handler.isAlive() && this.appletAlive; } + + public ThreadGroup getThreadGroup() { + return uKeyToTG.get(uKey); + } + + public void createNewAppContext() { + if (Thread.currentThread().getThreadGroup() != getThreadGroup()) { + throw new RuntimeException("createNewAppContext called from the wrong thread."); + } + // only create a new context if one hasn't already been created for the + // applets with this unique key. + if (null == appContextCreated.putIfAbsent(uKey, Boolean.TRUE)) { + SunToolkit.createNewAppContext(); + } + } } diff -r f0647c938535 -r 360bd0a75304 netx/net/sourceforge/jnlp/PluginBridge.java --- a/netx/net/sourceforge/jnlp/PluginBridge.java Sat Jan 07 02:48:05 2012 -0500 +++ b/netx/net/sourceforge/jnlp/PluginBridge.java Mon Jan 09 18:45:31 2012 -0500 @@ -44,7 +44,8 @@ private boolean codeBaseLookup; public PluginBridge(URL codebase, URL documentBase, String jar, String main, - int width, int height, Hashtable atts) + int width, int height, Hashtable atts, + String uKey) throws Exception { specVersion = new Version("1.0"); fileVersion = new Version("1.1"); @@ -132,34 +133,7 @@ else security = null; - /* According to http://download.oracle.com/javase/6/docs/technotes/guides/deployment/deployment-guide/applet-compatibility.html, - * classloaders are shared iff these properties match: - * codebase, cache_archive, java_archive, archive - * - * To achieve this, we create the uniquekey based on those 4 values, - * always in the same order. The initial "=" parts ensure a - * bad tag cannot trick the loader into getting shared with another. - */ - - // Firefox sometimes skips the codebase if it is default -- ".", - // so set it that way if absent - String codebaseAttr = atts.get("codebase") != null ? - atts.get("codebase") : "."; - - String cache_archiveAttr = atts.get("cache_archive") != null ? - atts.get("cache_archive") : ""; - - String java_archiveAttr = atts.get("java_archive") != null ? - atts.get("java_archive") : ""; - - String archiveAttr = atts.get("archive") != null ? - atts.get("archive") : ""; - - this.uniqueKey = "codebase=" + codebaseAttr + - "cache_archive=" + cache_archiveAttr + - "java_archive=" + java_archiveAttr + - "archive=" + archiveAttr; - + this.uniqueKey = uKey; usePack = false; useVersion = false; String jargs = atts.get("java_arguments"); diff -r f0647c938535 -r 360bd0a75304 netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java --- a/netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java Sat Jan 07 02:48:05 2012 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -// Copyright (C) 2001-2003 Jon A. Maxwell (JAM) -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library 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 -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -package net.sourceforge.jnlp.runtime; - -/** - * Thread group for a JNLP application. - * - * @author Jon A. Maxwell (JAM) - initial author - * @version $Revision: 1.5 $ - */ -public class AppThreadGroup extends ThreadGroup { - - /** the app */ - private ApplicationInstance app = null; - - /** - * Creates new JavaAppThreadGroup - * - * @param name of the App - */ - public AppThreadGroup(ThreadGroup parent, String name) { - super(parent, name); - } - - /** - * Sets the JNLP app this group is for; can only be called once. - */ - public void setApplication(ApplicationInstance app) { - if (this.app != null) - throw new IllegalStateException("Application can only be set once"); - - this.app = app; - } - - /** - * Returns the JNLP app for this thread group. - */ - public ApplicationInstance getApplication() { - return app; - } - - /** - * Handle uncaught exceptions for the app. - */ - public void uncaughtException(Thread t, Throwable e) { - super.uncaughtException(t, e); - } - -} diff -r f0647c938535 -r 360bd0a75304 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Sat Jan 07 02:48:05 2012 -0500 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Mon Jan 09 18:45:31 2012 -0500 @@ -243,7 +243,13 @@ NPVariant* result_variant = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(thread_data.result); std::string result_variant_jniid = std::string(); - createJavaObjectFromVariant(instance, *result_variant, &result_variant_jniid); + if (result_variant) + { + createJavaObjectFromVariant(instance, *result_variant, &result_variant_jniid); + } else + { + result_variant_jniid = "0"; + } IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response); response += " JavaScriptEval "; diff -r f0647c938535 -r 360bd0a75304 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Sat Jan 07 02:48:05 2012 -0500 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Jan 09 18:45:31 2012 -0500 @@ -123,10 +123,10 @@ class PluginAppletPanelFactory { public AppletPanel createPanel(PluginStreamHandler streamhandler, - int identifier, - long handle, int x, int y, - final URL doc, - final Hashtable atts) { + final int identifier, + final long handle, int x, int y, + final URL doc, + final Hashtable atts) { final NetxPanel panel = AccessController.doPrivileged(new PrivilegedAction() { public NetxPanel run() { NetxPanel panel = new NetxPanel(doc, atts, false); @@ -136,13 +136,29 @@ } }); - // create the frame. - PluginAppletViewer.framePanel(identifier, handle, panel); + // Framing the panel needs to happen in a thread whose thread group + // is the same as the threadgroup of the applet thread. If this + // isn't the case, the awt eventqueue thread's context classloader + // won't be set to a JNLPClassLoader, and when an applet class needs + // to be loaded from the awt eventqueue, it won't be found. + Thread panelInit = new Thread(panel.getThreadGroup(), new Runnable() { + @Override public void run() { + panel.createNewAppContext(); + // create the frame. + PluginAppletViewer.framePanel(identifier, handle, panel); + panel.init(); + // Start the applet + initEventQueue(panel); + } + }, "NetXPanel initializer"); - panel.init(); - - // Start the applet - initEventQueue(panel); + panelInit.start(); + while(panelInit.isAlive()) { + try { + panelInit.join(); + } catch (InterruptedException e) { + } + } // Wait for the panel to initialize PluginAppletViewer.waitForAppletInit(panel); From dbhole at redhat.com Mon Jan 9 15:53:40 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 9 Jan 2012 18:53:40 -0500 Subject: [icedtea-web] RFC: Simple fix for PR838 In-Reply-To: <4F0B41A3.6020004@redhat.com> References: <20111221215556.GH752@redhat.com> <20120106194724.GB11545@redhat.com> <4F0B41A3.6020004@redhat.com> Message-ID: <20120109235340.GN2930@redhat.com> * Omair Majid [2012-01-09 14:36]: > On 01/06/2012 02:47 PM, Deepak Bhole wrote: > >* Deepak Bhole [2011-12-21 16:57]: > >>Attached patch fixes PR838. > >> > >>Given the nature of the issue and the simplicity of the fix, I also > >>propose backporting to 1.0 and 1.1. > >> > >>ChangeLog: > >>2011-12-21 Deepak Bhole > >> > >> PR838: IcedTea plugin crashes with chrome browser when javascript is executed > >> * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc (eval): Added a check > >> to ensure that the result pointer is valid before attempting to create an > >> NPVariant from it. > >> > >>Okay for HEAD, 1.0 and 1.1? > >> > > > >ping? > > > > Looks fine to me. > Thanks! Pushed: http://icedtea.classpath.org/hg/release/icedtea-web-1.0/rev/06a4e046a700 http://icedtea.classpath.org/hg/release/icedtea-web-1.1/rev/360bd0a75304 Cheers, Deepak > Cheers, > Omair > From dbhole at redhat.com Mon Jan 9 15:53:59 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 9 Jan 2012 18:53:59 -0500 Subject: [icedtea-web] RFC: Backport threadgroup fix to 1.1 In-Reply-To: <4F0B40C1.4070702@redhat.com> References: <20120109192941.GH2930@redhat.com> <4F0B40C1.4070702@redhat.com> Message-ID: <20120109235359.GO2930@redhat.com> * Omair Majid [2012-01-09 14:32]: > On 01/09/2012 02:29 PM, Deepak Bhole wrote: > >Hi, > > > >I would like to backport > >http://icedtea.classpath.org/hg/icedtea-web/rev/d57169ddb76a to 1.1 to > >fix an issue with OpenJDK7: > > > >http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-December/016535.html > > > >I have looked over the patch and it looks like it'd be fine to backport. > > > >Okay for 1.1? > > > > Looks fine to me. > Thanks! Pushed: http://icedtea.classpath.org/hg/release/icedtea-web-1.1/rev/77640d74d21c Cheers, Deepak > Cheers, > Omair From dbhole at icedtea.classpath.org Mon Jan 9 15:56:27 2012 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Mon, 09 Jan 2012 23:56:27 +0000 Subject: /hg/icedtea-web: PR838: IcedTea plugin crashes with chrome brows... Message-ID: changeset 41f03d932cdf in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=41f03d932cdf author: Deepak Bhole date: Mon Jan 09 18:45:31 2012 -0500 PR838: IcedTea plugin crashes with chrome browser when javascript is executed diffstat: ChangeLog | 7 +++++++ NEWS | 1 + plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 8 +++++++- 3 files changed, 15 insertions(+), 1 deletions(-) diffs (43 lines): diff -r 0e524d940827 -r 41f03d932cdf ChangeLog --- a/ChangeLog Fri Jan 06 12:14:56 2012 -0500 +++ b/ChangeLog Mon Jan 09 18:45:31 2012 -0500 @@ -1,3 +1,10 @@ +2012-01-09 Deepak Bhole + + PR838: IcedTea plugin crashes with chrome browser when javascript is executed + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc (eval): Added a check + to ensure that the result pointer is valid before attempting to create an + NPVariant from it. + 2012-01-05 Omair Majid * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java diff -r 0e524d940827 -r 41f03d932cdf NEWS --- a/NEWS Fri Jan 06 12:14:56 2012 -0500 +++ b/NEWS Mon Jan 09 18:45:31 2012 -0500 @@ -21,6 +21,7 @@ * Plugin - PR749: sun.applet.PluginStreamHandler#handleMessage(String) really slow - PR782: Support building against npapi-sdk as well + - PR838: IcedTea plugin crashes with chrome browser when javascript is executed - RH586194: Unable to connect to connect with Juniper VPN client - RH718693: MindTerm SSH Applet doesn't work Common diff -r 0e524d940827 -r 41f03d932cdf plugin/icedteanp/IcedTeaPluginRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Fri Jan 06 12:14:56 2012 -0500 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Mon Jan 09 18:45:31 2012 -0500 @@ -243,7 +243,13 @@ NPVariant* result_variant = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(thread_data.result); std::string result_variant_jniid = std::string(); - createJavaObjectFromVariant(instance, *result_variant, &result_variant_jniid); + if (result_variant) + { + createJavaObjectFromVariant(instance, *result_variant, &result_variant_jniid); + } else + { + result_variant_jniid = "0"; + } IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response); response += " JavaScriptEval "; From bugzilla-daemon at icedtea.classpath.org Mon Jan 9 15:56:59 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Jan 2012 23:56:59 +0000 Subject: [Bug 838] IcedTeam plugin crashes with chrome browser when javascript is executed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=838 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED --- Comment #3 from Deepak Bhole 2012-01-09 23:56:59 UTC --- Fixed: http://icedtea.classpath.org/hg/release/icedtea-web-1.0/rev/06a4e046a700 http://icedtea.classpath.org/hg/release/icedtea-web-1.1/rev/360bd0a75304 http://icedtea.classpath.org/hg/icedtea-web/rev/41f03d932cdf -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From dbhole at redhat.com Mon Jan 9 15:58:49 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 9 Jan 2012 18:58:49 -0500 Subject: java plugin fails test with OpenJDK7 In-Reply-To: <20111223193025.GQ22758@redhat.com> References: <20111220193443.52725925@workstation64.home> <20111223193025.GQ22758@redhat.com> Message-ID: <20120109235849.GQ2930@redhat.com> * Deepak Bhole [2011-12-23 14:30]: > * Andreas Radke [2011-12-20 13:36]: > > Running ArchLinux we provide both latest OpenJDK6 and OpenJDK7 releases > > together with icedtea-web 1.1.4. The Plugin test page > > http://www.java.com/en/download/testjava.jsp works well with java ver6 > > but fails with ver7. The Oracle prebuilt 7u2 jre shows the plugin test > > well again. > > > > Any idea? I get this in the non-debug output: > > > > It works with HEAD. I have narrowed it down to this fix: > http://icedtea.classpath.org/hg/icedtea-web/rev/d57169ddb76a > > However it seems to complex to port into 1.1 without proper study first. > I'll do it once I get back from holidays. > Hi Andreas, I have backported the fix and it will be in the next release: http://icedtea.classpath.org/hg/release/icedtea-web-1.1/rev/77640d74d21c Cheers, Deepak > Cheers, > Deepak > > > [andyrtr at laptop64 ~]$ firefox > > java version "1.7.0_147-icedtea" > > OpenJDK Runtime Environment (IcedTea7 2.0) (ArchLinux-7.b147_2.0-4-x86_64) > > OpenJDK 64-Bit Server VM (build 21.0-b17, mixed mode) > > AWT blocker activation interrupted: > > java.lang.InterruptedException > > at java.lang.Object.wait(Native Method) > > at java.lang.Object.wait(Object.java:503) > > at sun.awt.AWTAutoShutdown.activateBlockerThread(AWTAutoShutdown.java:337) > > at sun.awt.AWTAutoShutdown.notifyPeerMapUpdated(AWTAutoShutdown.java:215) > > at sun.awt.AWTAutoShutdown.registerPeer(AWTAutoShutdown.java:348) > > at sun.awt.SunToolkit.targetCreatedPeer(SunToolkit.java:375) > > at sun.awt.X11.XToolkit.createEmbeddedFrame(XToolkit.java:1118) > > at sun.awt.X11.XEmbeddedFrame.addNotify(XEmbeddedFrame.java:67) > > at sun.awt.X11.XEmbeddedFrame.(XEmbeddedFrame.java:56) > > at sun.awt.X11.XEmbeddedFrame.(XEmbeddedFrame.java:73) > > at sun.applet.PluginAppletViewer.(PluginAppletViewer.java:345) > > at sun.applet.PluginAppletViewer.framePanel(PluginAppletViewer.java:323) > > at sun.applet.PluginAppletPanelFactory.createPanel(PluginAppletViewer.java:140) > > at sun.applet.PluginAppletViewer.parse(PluginAppletViewer.java:1886) > > at sun.applet.PluginAppletViewer$6.run(PluginAppletViewer.java:1810) > > at sun.applet.PluginAppletViewer$6.run(PluginAppletViewer.java:1808) > > at java.security.AccessController.doPrivileged(Native Method) > > at sun.applet.PluginAppletViewer.parse(PluginAppletViewer.java:1808) > > at sun.applet.PluginAppletViewer.handleMessage(PluginAppletViewer.java:475) > > at sun.applet.PluginStreamHandler.handleMessage(PluginStreamHandler.java:232) > > at sun.applet.PluginMessageHandlerWorker.run(PluginMessageHandlerWorker.java:78) > > SYNC: in sync > > SYNC: in sync > > @@@@ readline > > @@@@ readline > > SYNC: version in sync=1.6.0_30 > > SYNC: send notification > > Exception in thread "Thread-18" java.lang.IllegalMonitorStateException > > at java.lang.Object.notify(Native Method) > > at testJava2_1.TestVM$1.run(TestVM.java:90) > > SYNC: version in sync=1.6.0_30 > > SYNC: send notification > > Exception in thread "Thread-12" java.lang.IllegalMonitorStateException > > at java.lang.Object.notify(Native Method) > > at testJava2_1.TestVM$1.run(TestVM.java:90) > > expect: en actual: de > > locale: 'en' > > expect: en actual: de > > > > > > Do Mozilla (Firefox 9/ built with Xulrunner 8, also tested npapi-sdk) guys block the old ver.7 java > > release or is this a bug? I can provide a debug log if needed. > > > > -Andy From dbhole at redhat.com Mon Jan 9 19:31:47 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 9 Jan 2012 22:31:47 -0500 Subject: [RFC][icedtea-web] PR833 - icedtea-web is failing when cache is corupted. In-Reply-To: <4EF0B4DA.5060902@redhat.com> References: <4EE77F01.8060803@redhat.com> <20111219154104.GB31743@redhat.com> <4EF0B4DA.5060902@redhat.com> Message-ID: <20120110033146.GT2930@redhat.com> Hi Jiri, Sorry for the lateness on this. Haven't been able to get to it till now. Overall, I think the patch is fine. I do have a few minor nitpicks below though: * Jiri Vanek [2011-12-20 11:15]: > On 12/19/2011 04:41 PM, Deepak Bhole wrote: > >* Jiri Vanek [2011-12-13 11:36]: > >>2011-12-13 Jiri Vanek > >> > >> Fix for PR844 > >> * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: (getLRUSortedEntries) > >> instead of error throwing own LRU exception. Also catches more then NumberFormatException > >> (clearLRUSortedEntries) new method - making soft clearing of cache public > >> (clearCache) now return true if cache was cleared, false otherwise (or exception) > >> * netx/net/sourceforge/jnlp/cache/CacheUtil.java: (getCacheFileIfExist) does three tires to load cache. > >> If ifrst fails, then recently_used file is emptied both in memory and on disc. > >> When second attemmpt fails, then LRU cache is forcibly cleared. if clearing fails, then error is thrown. > >> If it pass, then one more try to load entries is allowed. When third attempt fails, then error is thrown. > >> * /netx/net/sourceforge/jnlp/cache/LruCacheException.java: > >> new file, for purpose of catching this particular exception > >> * netx/net/sourceforge/jnlp/util/PropertiesFile.java: (store) tries to mkdirs to its path. > >> It is better then to fail when no cache directory exists. > >> * tests/jnlp_tests/signed/CacheReproducer: new reproducr trying severals way of corupted cache > >> on several types of jnlp files. Is signed because of reflection used. > >> * tests/jnlp_tests/signed/SimpletestSigned1: signed hello world to be used in CacheReproducer tests. > >> * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java: timeout for processes doubled, > >> as clear cache methods sometimes took more then original allowed. > >> The lines above seem to be longer than 80 chars. > /** > @@ -322,7 +323,37 @@ > private static File getCacheFileIfExist(File urlPath) { > synchronized (lruHandler) { > File cacheFile = null; > - List> entries = lruHandler.getLRUSortedEntries(); > + int tries=0; > + List> entries=null; > + do{ > + try{ > + tries++; > + entries = lruHandler.getLRUSortedEntries(); > + }catch(LruCacheException ex){ > + if (tries==1){ > + ex.printStackTrace(); > + System.out.println("Cache is corupted, will be faked now"); > + lruHandler.clearLRUSortedEntries(); > + lruHandler.store(); > + System.out.println("Faked, continuing. It is strongly recomanded to run javaws -Xclearcache and rerun your application as soon as possible."); > + }else if (tries==2){ > + ex.printStackTrace(); > + System.out.println("Cache is still corupted, will be cleared now"); > + boolean clearingresult=CacheUtil.clearCache(); > + if (!clearingresult){ > + throw new InternalError("Clearing was not sucessfull, probably due to another javaws instance runnin.. Try to shut down all instances of javaws, run javaws -Xclearcache and rerun yout jnlp file"); > + } > + System.out.println("Cleared, reloading"); > + lruHandler.clearLRUSortedEntries(); > + lruHandler.store(); > + System.out.println("Reload, restarting, it is strongly recomanded to run javaws -Xclearcache and rerun your application as soon as possible."); > + > + }else{ > + throw new InternalError("LRU cache was corrupted. Was cleared, but still is corrupted. Try to shut down all instances of javaws, run javaws -Xclearcache and rerun yout jnlp file"); > + } > + > + } > + }while(entries==null); There are spacing issues in the above code e.g. no space between "do" and "{" .. please follow the convention here: http://icedtea.classpath.org/wiki/IcedTea-Web#Code_style Also, the test in the above messages should use the R function, not the direct text itself. Please also check for spelling and grammar errors e.g. "and rerun yout jnlp" is incorrect. Logic wise, the code seems fine to me. > // Start searching from the most recent to least recent. > for (Entry e : entries) { > final String key = e.getKey(); > diff -r 71f338e881d2 netx/net/sourceforge/jnlp/cache/LruCacheException.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/netx/net/sourceforge/jnlp/cache/LruCacheException.java Tue Dec 20 17:35:08 2011 +0100 > @@ -0,0 +1,23 @@ > +/* > + * To change this template, choose Tools | Templates > + * and open the template in the editor. > + */ > + > +package net.sourceforge.jnlp.cache; > + > +/** > + * > + * @author jvanek Just a minor nitpick, please remove the above :) I know the IDE adds them but we don't use it in most files, and most of the files are modified by many people over time anyway. Also, please add the license header. > diff -r 71f338e881d2 tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer1_1.jnlp > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer1_1.jnlp Tue Dec 20 17:35:08 2011 +0100 > @@ -0,0 +1,16 @@ > + > + + codebase="./" > + href="CacheReproducer1_1.jnlp"> > + > + read properties using System.getenv() Few things: 1. The title in all of the jnlp's appear to be incorrect -- they should be fixed to be more correct. 2. Can we change the file naming to more accurately reflect what is being tested? > + @Test > + public void cacheIsWorkingTestSigned() throws Exception { > + clearAndEvaluateCache(); > + evaluateSimpleTest1OkCache(runSimpleTest1Signed()); > + assertCacheIsNotEmpty(); > + > + } > + private class ParalelSimpleTestRunner extends Thread { Parallel is spelt incorrectly here and in the function below it. Also, There also seems to be a missing newline before the function, an extra new-line in the function above it, extra space between "extends" and "Thread" etc. > + } > + > + @Test > + public void assertBreakersAreWorking() { > + String s = "#netx file\n" > + + "#Mon Dec 12 16:20:46 CET 2011\n" > + + "1323703236508,0=/home/jvanek/.icedtea/cache/0/http/localhost/ReadPropertiesBySignedHack.jnlp\n" > + + "1323703243086,2=/home/jvanek/.icedtea/cache/2/http/localhost/ReadProperties.jar\n" > + + "1323703243082,1=/home/jvanek/.icedtea/cache/1/http/localhost/ReadPropertiesBySignedHack.jar"; If the hardcoded username on purpose? Lastly, please check code styling overall. I have pointed it out wherever I saw it, but just in case I missed it somewhere.. Everything else looks good! Thanks, Deepak From thomas at m3y3r.de Mon Jan 9 23:16:32 2012 From: thomas at m3y3r.de (Thomas Meyer) Date: Tue, 10 Jan 2012 08:16:32 +0100 Subject: [RFC] Always answer a message with a reference In-Reply-To: <201201092339.q09NdYVW010885@bzweb01.app.bz.hst.phx2.redhat.com> References: <201201092339.q09NdYVW010885@bzweb01.app.bz.hst.phx2.redhat.com> Message-ID: <1326179792.1352.7.camel@localhost.localdomain> Am Montag, den 09.01.2012, 18:39 -0500 schrieb bugzilla at redhat.com: > Hi Thomas, Hi, > As for the issue about having consume_message return null, that is a separate > issue IMO whereby the Java side is not notified about the C++ side having > discarded the message. The idea of consume message returning null is not a bad > one, but will need some testing to cover the various requests Java makes to > C++. I tried this patch to achieve an always answer a message with a reference, but I think it incomplete. comments are welcome. diff -r 7d090bfa3819 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Tue Dec 13 12:45:36 2011 +0100 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Tue Jan 10 08:03:52 2012 +0100 @@ -1202,6 +1202,15 @@ if (instance_id > 0 && !instance) { PLUGIN_DEBUG("Instance %d is not active. Refusing to consume message \"%s\"\n", instance_id, message); + // if the message has a reference send back a NULL to make java side unwait + if(g_str_has_prefix(parts[2], "reference")) + { + // type + identifier + reference + ref_id + validFinishCallRequest + NULL + gchar* null_resp = g_strconcat ("context 0 reference ", parts[3], " JavaScriptGetWindow 0", NULL); + plugin_send_message_to_appletviewer(null_resp); + g_free(null_resp); + null_resp = NULL; + } return; } else if (instance) diff -r 7d090bfa3819 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue Dec 13 12:45:36 2011 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue Jan 10 08:03:52 2012 +0100 @@ -985,7 +985,7 @@ PluginDebug.debug("wait request 1"); synchronized (request) { PluginDebug.debug("wait request 2"); - while ((Long) request.getObject() == 0) + while (request.isDone() == false) request.wait(); PluginDebug.debug("wait request 3"); } -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 490 bytes Desc: This is a digitally signed message part Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120110/d07116d2/attachment.bin From thomas at m3y3r.de Tue Jan 10 00:27:55 2012 From: thomas at m3y3r.de (Thomas Meyer) Date: Tue, 10 Jan 2012 09:27:55 +0100 Subject: [RFC] Introduce PAV.isStatusActive() for static JSObject.getWindow() Message-ID: <1326184075.1352.12.camel@localhost.localdomain> Check in static JSObject.getWindow() if the PAV containing the applet is usable by the user. diff -r 7d090bfa3819 plugin/icedteanp/java/netscape/javascript/JSObject.java --- a/plugin/icedteanp/java/netscape/javascript/JSObject.java Tue Dec 13 12:45:36 2011 +0100 +++ b/plugin/icedteanp/java/netscape/javascript/JSObject.java Tue Jan 10 09:20:54 2012 +0100 @@ -242,10 +242,14 @@ */ public static JSObject getWindow(Applet applet) { PluginDebug.debug("JSObject.getWindow"); + PluginAppletViewer pav = (PluginAppletViewer) applet.getAppletContext(); + + if(!pav.isStatusActive()) + throw new IllegalArgumentException("PAV is not usable/inactive"); + // FIXME: handle long case as well. long internal = 0; - internal = ((PluginAppletViewer) - applet.getAppletContext()).getWindow(); + internal = pav.getWindow(); PluginDebug.debug("GOT IT: ", internal); return new JSObject(internal); } diff -r 7d090bfa3819 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue Dec 13 12:45:36 2011 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue Jan 10 09:20:54 2012 +0100 @@ -675,6 +675,16 @@ PluginDebug.debug("Applet panel ", panel, " initialized"); } + /** + * Is this PAV usable by the user + * + * @return true, when usable by the user + */ + public boolean isStatusActive() { + + return status.get(identifier).equals(PAV_INIT_STATUS.REFRAME_COMPLETE); + } + public void handleMessage(int reference, String message) { if (message.startsWith("width")) { -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 490 bytes Desc: This is a digitally signed message part Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120110/e4f27d40/attachment.bin From ptisnovs at icedtea.classpath.org Tue Jan 10 02:01:16 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 10 Jan 2012 10:01:16 +0000 Subject: /hg/gfx-test: 2012-01-10 Pavel Tisnovsky Message-ID: changeset adb101be6e61 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=adb101be6e61 author: Pavel Tisnovsky date: Tue Jan 10 11:03:38 2012 +0100 2012-01-10 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: Added eleven new tests. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltBasicTests.java | 181 ++++++++++++++++++++++- 2 files changed, 180 insertions(+), 6 deletions(-) diffs (210 lines): diff -r 662a5e1dcbd5 -r adb101be6e61 ChangeLog --- a/ChangeLog Fri Jan 06 13:44:05 2012 +0100 +++ b/ChangeLog Tue Jan 10 11:03:38 2012 +0100 @@ -1,3 +1,8 @@ +2012-01-10 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Added eleven new tests. + 2012-01-06 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingPathByRectangleShape.java: diff -r 662a5e1dcbd5 -r adb101be6e61 src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Fri Jan 06 13:44:05 2012 +0100 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Tue Jan 10 11:03:38 2012 +0100 @@ -114,6 +114,26 @@ } /** + * Create new buffered image and then do basic BitBlt test. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @param type + * type of the created image + */ + private TestResult doBitBltTest(TestImage image, Graphics2D graphics2d, int type) + { + BufferedImage bufferedImage = createBufferedBitmap(type); + if (bufferedImage == null) + { + return TestResult.FAILED; + } + return BitBlt(image, graphics2d, bufferedImage) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. * * @param image @@ -124,12 +144,161 @@ */ public TestResult testBitBltEmptyBufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d) { - BufferedImage bufferedImage = createBufferedBitmap(BufferedImage.TYPE_3BYTE_BGR); - if (bufferedImage == null) - { - return TestResult.FAILED; - } - return BitBlt(image, graphics2d, bufferedImage) ? TestResult.PASSED : TestResult.FAILED; + return doBitBltTest(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d) + { + return doBitBltTest(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR_PRE. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltEmptyBufferedImageType4ByteABGR_Pre(TestImage image, Graphics2D graphics2d) + { + return doBitBltTest(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_BINARY. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltEmptyBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + return doBitBltTest(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_RGB. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltEmptyBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d) + { + return doBitBltTest(image, graphics2d, BufferedImage.TYPE_INT_RGB); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltEmptyBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d) + { + return doBitBltTest(image, graphics2d, BufferedImage.TYPE_INT_ARGB); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltEmptyBufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d) + { + return doBitBltTest(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_BGR. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltEmptyBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d) + { + return doBitBltTest(image, graphics2d, BufferedImage.TYPE_INT_BGR); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d) + { + return doBitBltTest(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d) + { + return doBitBltTest(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_GRAY. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltEmptyBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d) + { + return doBitBltTest(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_GRAY. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltEmptyBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d) + { + return doBitBltTest(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY); } /** From andrew at icedtea.classpath.org Tue Jan 10 02:38:45 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 10 Jan 2012 10:38:45 +0000 Subject: /hg/icedtea6: 6706974: Add krb5 test infrastructure Message-ID: changeset f3e9a1730116 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f3e9a1730116 author: Andrew John Hughes date: Tue Jan 10 10:38:33 2012 +0000 6706974: Add krb5 test infrastructure 2012-01-10 Andrew John Hughes * Makefile.am: Add new patch. * NEWS: Mention backport. * patches/openjdk/6706974-krb5_test_infrastructure.patch: Add Kerberos 5 test infrastructure so the test in the 6851973 backport works. diffstat: ChangeLog | 10 +- Makefile.am | 3 +- NEWS | 3 + patches/openjdk/6706974-krb5_test_infrastructure.patch | 2081 ++++++++++++++++ 4 files changed, 2095 insertions(+), 2 deletions(-) diffs (truncated from 2144 to 500 lines): diff -r 283c180aa38a -r f3e9a1730116 ChangeLog --- a/ChangeLog Fri Jan 06 16:40:02 2012 -0500 +++ b/ChangeLog Tue Jan 10 10:38:33 2012 +0000 @@ -1,3 +1,11 @@ +2012-01-10 Andrew John Hughes + + * Makefile.am: Add new patch. + * NEWS: Mention backport. + * patches/openjdk/6706974-krb5_test_infrastructure.patch: + Add Kerberos 5 test infrastructure so the test in + the 6851973 backport works. + 2012-01-06 Omair Majid * NEWS: Add 1.12 section @@ -13,7 +21,7 @@ to be substitued during configure * policytool.desktop: removed, replaced by policytool.desktop.in * policytool.desktop.in: new file, stub for desktop file, have variable - to be substituted during configure + to be substituted during configure 2012-01-06 Andrew John Hughes diff -r 283c180aa38a -r f3e9a1730116 Makefile.am --- a/Makefile.am Fri Jan 06 16:40:02 2012 -0500 +++ b/Makefile.am Tue Jan 10 10:38:33 2012 +0000 @@ -403,7 +403,8 @@ patches/openjdk/7102369-7094468-rmiregistry.patch \ patches/openjdk/6851973-kerberos.patch \ patches/openjdk/7091528-javadoc_class_files.patch \ - patches/openjdk/7103725-ssl_beast_regression.patch + patches/openjdk/7103725-ssl_beast_regression.patch \ + patches/openjdk/6706974-krb5_test_infrastructure.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r 283c180aa38a -r f3e9a1730116 NEWS --- a/NEWS Fri Jan 06 16:40:02 2012 -0500 +++ b/NEWS Tue Jan 10 10:38:33 2012 +0000 @@ -12,6 +12,9 @@ New in release 1.12 (2012-XX-XX): +* Backports + - 6706974: Add krb5 test infrastructure + New in release 1.11 (2012-XX-XX): * Use HotSpot 20 as the default virtual machine. diff -r 283c180aa38a -r f3e9a1730116 patches/openjdk/6706974-krb5_test_infrastructure.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6706974-krb5_test_infrastructure.patch Tue Jan 10 10:38:33 2012 +0000 @@ -0,0 +1,2090 @@ +# HG changeset patch +# User weijun +# Date 1224219720 -28800 +# Node ID 3f051f3ba5bba355ddd6df6d0cb1528aef631a2d +# Parent 8b2d7e577d4a89fab8a892623cb4dff4e6fca0a6 +6706974: Add krb5 test infrastructure +Reviewed-by: valeriep + +diff -r 8b2d7e577d4a -r 3f051f3ba5bb test/sun/security/krb5/auto/Action.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/sun/security/krb5/auto/Action.java Fri Oct 17 13:02:00 2008 +0800 +@@ -0,0 +1,33 @@ ++/* ++ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. ++ */ ++ ++/** ++ * Action used in Context.doAs ++ */ ++public interface Action { ++ /** ++ * This method always reads a byte block and emits another one ++ */ ++ byte[] run(Context s, byte[] input) throws Exception; ++} ++ +diff -r 8b2d7e577d4a -r 3f051f3ba5bb test/sun/security/krb5/auto/BasicKrb5Test.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/sun/security/krb5/auto/BasicKrb5Test.java Fri Oct 17 13:02:00 2008 +0800 +@@ -0,0 +1,111 @@ ++/* ++ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. ++ */ ++ ++/* ++ * @test ++ * @bug 6706974 ++ * @summary Add krb5 test infrastructure ++ */ ++ ++import org.ietf.jgss.GSSName; ++import sun.security.jgss.GSSUtil; ++import sun.security.krb5.Config; ++import sun.security.krb5.internal.crypto.EType; ++ ++/** ++ * Basic JGSS/krb5 test with 3 parties: client, server, backend server. Each ++ * party uses JAAS login to get subjects and executes JGSS calls using ++ * Subject.doAs. ++ */ ++public class BasicKrb5Test { ++ ++ /** ++ * @param args empty or etype ++ */ ++ public static void main(String[] args) ++ throws Exception { ++ ++ String etype = null; ++ if (args.length > 0) { ++ etype = args[0]; ++ } ++ System.out.println("Testing etype " + etype); ++ if (etype != null && !EType.isSupported(Config.getInstance().getType(etype))) { ++ System.out.println("Not supported."); ++ System.exit(0); ++ } ++ ++ // Creates and starts the KDC ++ new OneKDC(etype).writeJAASConf(); ++ new BasicKrb5Test().go(OneKDC.SERVER, OneKDC.BACKEND); ++ } ++ ++ void go(final String server, final String backend) throws Exception { ++ Context c, s, s2, b; ++ c = Context.fromJAAS("client"); ++ s = Context.fromJAAS("server"); ++ b = Context.fromJAAS("backend"); ++ ++ c.startAsClient(server, GSSUtil.GSS_KRB5_MECH_OID); ++ c.x().requestCredDeleg(true); ++ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); ++ ++ c.status(); ++ s.status(); ++ ++ Context.handshake(c, s); ++ GSSName client = c.x().getSrcName(); ++ ++ c.status(); ++ s.status(); ++ ++ Context.transmit("i say high --", c, s); ++ Context.transmit(" you say low", s, c); ++ ++ s2 = s.delegated(); ++ s.dispose(); ++ s = null; ++ ++ s2.startAsClient(backend, GSSUtil.GSS_KRB5_MECH_OID); ++ b.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); ++ ++ s2.status(); ++ b.status(); ++ ++ Context.handshake(s2, b); ++ GSSName client2 = b.x().getSrcName(); ++ ++ if (!client.equals(client2)) { ++ throw new Exception("Delegation failed"); ++ } ++ ++ s2.status(); ++ b.status(); ++ ++ Context.transmit("you say hello --", s2, b); ++ Context.transmit(" i say goodbye", b, s2); ++ ++ s2.dispose(); ++ b.dispose(); ++ } ++} +diff -r 8b2d7e577d4a -r 3f051f3ba5bb test/sun/security/krb5/auto/CleanState.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/sun/security/krb5/auto/CleanState.java Fri Oct 17 13:02:00 2008 +0800 +@@ -0,0 +1,75 @@ ++/* ++ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. ++ */ ++ ++/* ++ * @test ++ * @bug 6716534 ++ * @summary Krb5LoginModule has not cleaned temp info between authentication attempts ++ */ ++import com.sun.security.auth.module.Krb5LoginModule; ++import java.util.HashMap; ++import java.util.Map; ++import javax.security.auth.Subject; ++import javax.security.auth.callback.Callback; ++import javax.security.auth.callback.CallbackHandler; ++import javax.security.auth.callback.NameCallback; ++import javax.security.auth.callback.PasswordCallback; ++ ++public class CleanState { ++ public static void main(String[] args) throws Exception { ++ CleanState x = new CleanState(); ++ new OneKDC(null); ++ x.go(); ++ } ++ ++ void go() throws Exception { ++ Krb5LoginModule krb5 = new Krb5LoginModule(); ++ ++ final String name = OneKDC.USER; ++ final char[] password = OneKDC.PASS; ++ char[] badpassword = "hellokitty".toCharArray(); ++ ++ Map map = new HashMap(); ++ map.put("useTicketCache", "false"); ++ map.put("doNotPrompt", "false"); ++ map.put("tryFirstPass", "true"); ++ Map shared = new HashMap(); ++ shared.put("javax.security.auth.login.name", name); ++ shared.put("javax.security.auth.login.password", badpassword); ++ ++ krb5.initialize(new Subject(), new CallbackHandler() { ++ @Override ++ public void handle(Callback[] callbacks) { ++ for(Callback callback: callbacks) { ++ if (callback instanceof NameCallback) { ++ ((NameCallback)callback).setName(name); ++ } ++ if (callback instanceof PasswordCallback) { ++ ((PasswordCallback)callback).setPassword(password); ++ } ++ } ++ } ++ }, shared, map); ++ krb5.login(); ++ } ++} +diff -r 8b2d7e577d4a -r 3f051f3ba5bb test/sun/security/krb5/auto/Context.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/sun/security/krb5/auto/Context.java Fri Oct 17 13:02:00 2008 +0800 +@@ -0,0 +1,386 @@ ++/* ++ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. ++ */ ++ ++import com.sun.security.auth.module.Krb5LoginModule; ++import java.security.PrivilegedActionException; ++import java.security.PrivilegedExceptionAction; ++import java.util.Arrays; ++import java.util.HashMap; ++import java.util.Map; ++import javax.security.auth.Subject; ++import javax.security.auth.kerberos.KerberosKey; ++import javax.security.auth.kerberos.KerberosTicket; ++import javax.security.auth.login.LoginContext; ++import org.ietf.jgss.GSSContext; ++import org.ietf.jgss.GSSCredential; ++import org.ietf.jgss.GSSException; ++import org.ietf.jgss.GSSManager; ++import org.ietf.jgss.GSSName; ++import org.ietf.jgss.MessageProp; ++import org.ietf.jgss.Oid; ++ ++/** ++ * Context of a JGSS subject, encapsulating Subject and GSSContext. ++ * ++ * Three "constructors", which acquire the (private) credentials and fill ++ * it into the Subject: ++ * ++ * 1. static fromJAAS(): Creates a Context using a JAAS login config entry ++ * 2. static fromUserPass(): Creates a Context using a username and a password ++ * 3. delegated(): A new context which uses the delegated credentials from a ++ * previously established acceptor Context ++ * ++ * Two context initiators, which create the GSSContext object inside: ++ * ++ * 1. startAsClient() ++ * 2. startAsServer() ++ * ++ * Privileged action: ++ * doAs(): Performs an action in the name of the Subject ++ * ++ * Handshake process: ++ * static handShake(initiator, acceptor) ++ * ++ * A four-phase typical data communication which includes all four GSS ++ * actions (wrap, unwrap, getMic and veryfyMiC): ++ * static transmit(message, from, to) ++ */ ++public class Context { ++ ++ private Subject s; ++ private GSSContext x; ++ private boolean f; // context established? ++ private String name; ++ private GSSCredential cred; // see static method delegated(). ++ ++ private Context() {} ++ ++ /** ++ * Using the delegated credentials from a previous acceptor ++ * @param c ++ */ ++ public Context delegated() throws Exception { ++ Context out = new Context(); ++ out.s = s; ++ out.cred = x.getDelegCred(); ++ out.name = name + " as " + out.cred.getName().toString(); ++ return out; ++ } ++ ++ /** ++ * Logins with a JAAS login config entry name ++ */ ++ public static Context fromJAAS(final String name) throws Exception { ++ Context out = new Context(); ++ out.name = name; ++ LoginContext lc = new LoginContext(name); ++ lc.login(); ++ out.s = lc.getSubject(); ++ return out; ++ } ++ ++ /** ++ * Logins with a username and a password, using Krb5LoginModule directly ++ * @param storeKey true if key should be saved, used on acceptor side ++ */ ++ public static Context fromUserPass(String user, char[] pass, boolean storeKey) throws Exception { ++ Context out = new Context(); ++ out.name = user; ++ out.s = new Subject(); ++ Krb5LoginModule krb5 = new Krb5LoginModule(); ++ Map map = new HashMap(); ++ map.put("tryFirstPass", "true"); ++ if (storeKey) { ++ map.put("storeKey", "true"); ++ } ++ Map shared = new HashMap(); ++ shared.put("javax.security.auth.login.name", user); ++ shared.put("javax.security.auth.login.password", pass); ++ ++ krb5.initialize(out.s, null, shared, map); ++ krb5.login(); ++ krb5.commit(); ++ return out; ++ } ++ ++ /** ++ * Starts as a client ++ * @param target communication peer ++ * @param mech GSS mech ++ * @throws java.lang.Exception ++ */ ++ public void startAsClient(final String target, final Oid mech) throws Exception { ++ doAs(new Action() { ++ @Override ++ public byte[] run(Context me, byte[] dummy) throws Exception { ++ GSSManager m = GSSManager.getInstance(); ++ me.x = m.createContext( ++ target.indexOf('@') < 0 ? ++ m.createName(target, null) : ++ m.createName(target, GSSName.NT_HOSTBASED_SERVICE), ++ mech, ++ cred, ++ GSSContext.DEFAULT_LIFETIME); ++ return null; ++ } ++ }, null); ++ f = false; ++ } ++ ++ /** ++ * Starts as a server ++ * @param mech GSS mech ++ * @throws java.lang.Exception ++ */ ++ public void startAsServer(final Oid mech) throws Exception { ++ doAs(new Action() { ++ @Override ++ public byte[] run(Context me, byte[] dummy) throws Exception { ++ GSSManager m = GSSManager.getInstance(); ++ me.x = m.createContext(m.createCredential( ++ null, ++ GSSCredential.INDEFINITE_LIFETIME, ++ mech, ++ GSSCredential.ACCEPT_ONLY)); ++ return null; ++ } ++ }, null); ++ f = false; ++ } ++ ++ /** ++ * Accesses the internal GSSContext object. Currently it's used for -- ++ * ++ * 1. calling requestXXX() before handshake ++ * 2. accessing source name ++ * ++ * Note: If the application needs to do any privileged call on this ++ * object, please use doAs(). Otherwise, it can be done directly. The ++ * methods listed above are all non-privileged calls. ++ * ++ * @return the GSSContext object ++ */ ++ public GSSContext x() { ++ return x; ++ } ++ ++ /** ++ * Disposes the GSSContext within ++ * @throws org.ietf.jgss.GSSException ++ */ ++ public void dispose() throws GSSException { ++ x.dispose(); ++ } ++ ++ /** ++ * Does something using the Subject inside ++ * @param action the action ++ * @param in the input byte ++ * @return the output byte ++ * @throws java.lang.Exception ++ */ ++ public byte[] doAs(final Action action, final byte[] in) throws Exception { ++ try { From bugzilla-daemon at icedtea.classpath.org Tue Jan 10 04:42:16 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 10 Jan 2012 12:42:16 +0000 Subject: [Bug 827] unable to start davmail In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=827 --- Comment #6 from Andrew John Hughes 2012-01-10 12:42:16 UTC --- It is not up to us which versions distros choose to support or not support. The IcedTea policy is to support three minor releases for each major branch. Currently, these are 1.8, 1.9 and 1.10 for 6, but this will shortly become 1.9, 1.10 and 1.11 with the release of 1.11. If the distro is shipping an unsupported version, then you should file a bug with them. Even if we were to look into this on 1.7 and patch it, there would not be a new version of 1.7 with the patch, as that branch is obsolete. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Tue Jan 10 04:45:56 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 10 Jan 2012 12:45:56 +0000 Subject: [Bug 847] [TRACKER] IcedTea6 1.12 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=847 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Target Milestone|--- |6-1.12 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Tue Jan 10 04:46:29 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 10 Jan 2012 12:46:29 +0000 Subject: [Bug 848] Use XML for AUTHORS/NEWS to ensure reliable formatting for producing e.g. release notes. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=848 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Target Milestone|--- |6-1.12 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ahughes at redhat.com Tue Jan 10 04:55:48 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 10 Jan 2012 12:55:48 +0000 Subject: [1.8, 1.9, 1.10 BACKPORT] 6851973: ignore incoming channel binding if acceptor does not set one In-Reply-To: <4F0AF40D.2090400@redhat.com> References: <20120109133738.GE3936@rivendell.middle-earth.co.uk> <4F0AF40D.2090400@redhat.com> Message-ID: <20120110125548.GC17107@rivendell.middle-earth.co.uk> On 15:05 Mon 09 Jan , Pavel Tisnovsky wrote: > Dr Andrew John Hughes wrote: > > I'd like to backport 6851973 to 1.8, 1.9 and 1.10. > > > > http://hg.openjdk.java.net/jdk7/tl/jdk/rev/37ed72fe7561 > > > > Without this patch, interoperability issues occur between OpenJDK > > Kerberos and Kerberos on Microsoft Windows; see > > > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=830 > > > > It's been on HEAD since before the holidays. > > > > Ok for the branches? > > > > Hi Andrew, > > please note, that the regresiion test contained in this patch failed due to compilation error. I'm going to figure > what's wrong... > > Cheers, > Pavel Are you ok with the main patch? I'd like to get this in for the release on Wednesday as it fixes an issue users are experiencing and which makes OpenJDK look inferior to the proprietary JDK where this is fixed. I've pushed 6706974: Add krb5 test infrastructure to HEAD to try and rectify the test issue. Can you let me know if this works? If so, we can backport both. -- 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/20120110/06c15e5f/attachment.bin From ptisnovs at redhat.com Tue Jan 10 05:02:39 2012 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Tue, 10 Jan 2012 14:02:39 +0100 Subject: [1.8, 1.9, 1.10 BACKPORT] 6851973: ignore incoming channel binding if acceptor does not set one In-Reply-To: <20120110125548.GC17107@rivendell.middle-earth.co.uk> References: <20120109133738.GE3936@rivendell.middle-earth.co.uk> <4F0AF40D.2090400@redhat.com> <20120110125548.GC17107@rivendell.middle-earth.co.uk> Message-ID: <4F0C36EF.5010509@redhat.com> Dr Andrew John Hughes wrote: > On 15:05 Mon 09 Jan , Pavel Tisnovsky wrote: >> Dr Andrew John Hughes wrote: >>> I'd like to backport 6851973 to 1.8, 1.9 and 1.10. >>> >>> http://hg.openjdk.java.net/jdk7/tl/jdk/rev/37ed72fe7561 >>> >>> Without this patch, interoperability issues occur between OpenJDK >>> Kerberos and Kerberos on Microsoft Windows; see >>> >>> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=830 >>> >>> It's been on HEAD since before the holidays. >>> >>> Ok for the branches? >>> >> Hi Andrew, >> >> please note, that the regresiion test contained in this patch failed due to compilation error. I'm going to figure >> what's wrong... >> >> Cheers, >> Pavel > > Are you ok with the main patch? I'd like to get this in for the release > on Wednesday as it fixes an issue users are experiencing and which makes > OpenJDK look inferior to the proprietary JDK where this is fixed. Yes, I'm ok with adding this patch to 1.8, 1.9 and 1.10. > > I've pushed 6706974: Add krb5 test infrastructure to HEAD to try and rectify > the test issue. Can you let me know if this works? If so, we can backport both. I'm testing it just now. Cheers, Pavel From ahughes at redhat.com Tue Jan 10 05:01:44 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 10 Jan 2012 13:01:44 +0000 Subject: [icedtea-web] RFC: Backport threadgroup fix to 1.1 In-Reply-To: <20120109192941.GH2930@redhat.com> References: <20120109192941.GH2930@redhat.com> Message-ID: <20120110130144.GD17107@rivendell.middle-earth.co.uk> On 14:29 Mon 09 Jan , Deepak Bhole wrote: > Hi, > > I would like to backport > http://icedtea.classpath.org/hg/icedtea-web/rev/d57169ddb76a to 1.1 to > fix an issue with OpenJDK7: > > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-December/016535.html > > I have looked over the patch and it looks like it'd be fine to backport. > > Okay for 1.1? > This seems like quite a significant change. Can you give a quick explanation as to why you think it's safe to backport? > Cheers, > Deepak -- 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/20120110/64726dfd/attachment.bin From ptisnovs at icedtea.classpath.org Tue Jan 10 05:06:28 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 10 Jan 2012 13:06:28 +0000 Subject: /hg/MauveTestCoverage: 2012-01-10 Pavel Tisnovsky changeset 730c5549c0f9 in /hg/MauveTestCoverage details: http://icedtea.classpath.org/hg/MauveTestCoverage?cmd=changeset;node=730c5549c0f9 author: Pavel Tisnovsky date: Tue Jan 10 14:08:47 2012 +0100 2012-01-10 Pavel Tisnovsky * src/FileUtils.java: Added new helper class. * src/ReportGenerator.java: Updated to use HTML templates for test coverage report. * Makefile: Updated diffstat: ChangeLog | 9 + Makefile | 3 +- src/FileUtils.java | 233 +++++++++++++++++++++++++++++++++++++ src/ReportGenerator.java | 293 +++++++++++++++++++++++++--------------------- 4 files changed, 401 insertions(+), 137 deletions(-) diffs (truncated from 631 to 500 lines): diff -r 61f453c6b172 -r 730c5549c0f9 ChangeLog --- a/ChangeLog Mon Jan 09 14:57:59 2012 +0100 +++ b/ChangeLog Tue Jan 10 14:08:47 2012 +0100 @@ -1,3 +1,12 @@ +2012-01-10 Pavel Tisnovsky + + * src/FileUtils.java: + Added new helper class. + * src/ReportGenerator.java: + Updated to use HTML templates for test coverage report. + * Makefile: + Updated + 2012-01-09 Pavel Tisnovsky * src/index.html: diff -r 61f453c6b172 -r 730c5549c0f9 Makefile --- a/Makefile Mon Jan 09 14:57:59 2012 +0100 +++ b/Makefile Tue Jan 10 14:08:47 2012 +0100 @@ -73,7 +73,8 @@ $(CLASSDIR)/PrintClassList.class \ $(CLASSDIR)/PrintPublicMethods.class \ $(CLASSDIR)/PrintTestCoverage.class \ - $(CLASSDIR)/ReportGenerator.class + $(CLASSDIR)/ReportGenerator.class \ + $(CLASSDIR)/FileUtils.class api_class_list: $(REPORTDIR) $(REPORTDIR)/$(ALL_CLASS_LIST) diff -r 61f453c6b172 -r 730c5549c0f9 src/FileUtils.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FileUtils.java Tue Jan 10 14:08:47 2012 +0100 @@ -0,0 +1,233 @@ +/* + Test coverage tool. + + Copyright (C) 2012 Red Hat + +This tool 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. + +This tool 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 this tool; 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 java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.LinkedList; +import java.util.List; + +/** + * Basic file utilities to avoid boring file handling. + * + * @author Pavel Tisnovsky + */ +class FileUtils +{ + /** + * Read content of given text file and return it as list of strings. No + * exception is thrown during reading. + * + * @param fileName + * name of file to be read + * @return list of string containing content of text file + */ + static List readTextFile(String fileName) + { + BufferedReader reader = null; + List out = new LinkedList(); + try + { + // try to open file for reading + reader = new BufferedReader(new FileReader(fileName)); + readAllLinesFromTextFile(reader, out); + } + catch (FileNotFoundException e) + { + // might happen - empty list is returned in this case + e.printStackTrace(); + } + catch (IOException e) + { + // might happen - empty list is returned in this case + // make sure the list is empty + out.clear(); + e.printStackTrace(); + } + finally + { + closeBufferedReader(reader); + } + // return list containing content of text file + return out; + } + + /** + * Write list of string to a file with given name. No exception is thrown + * during reading. + * + * @param fileName + * name of file to be read + * @param lines + * of string containing content of text file + */ + static void writeTextFile(String fileName, List lines) + { + BufferedWriter fout = null; + try + { + fout = new BufferedWriter(new FileWriter(fileName)); + // write all lines to a text file + writeAllLinesToTextFile(fout, lines); + } + catch (IOException e) + { + // might happen - empty list is returned in this case + e.printStackTrace(); + } + finally + { + closeBufferedWriter(fout); + } + } + + /** + * Write list of string to a file with given name. No exception is thrown + * during reading. + * + * @param reportDirectory + * @param string + * @param lines of string containing content of text file + */ + static void writeTextFile(String reportDirectory, String string, List lines) + { + writeTextFile(new File(reportDirectory, string), lines); + } + + /** + * Write list of string to a file with given name. No exception is thrown + * during reading. + * + * @param file + * representing file name + * @param lines + * of string containing content of text file + */ + static void writeTextFile(File file, List lines) + { + writeTextFile(file.getPath(), lines); + } + + /** + * Try to close buffered reader. + * + * @param bufferedReader instance of buffered reader or null + */ + private static void closeBufferedReader(BufferedReader bufferedReader) + { + // try to close the buffered reader + try + { + if (bufferedReader != null) + { + bufferedReader.close(); + } + } + catch (IOException e) + { + e.printStackTrace(); + } + } + + /** + * Try to close buffered reader. + * + * @param bufferedWriter + * instance of buffered writer or null + */ + private static void closeBufferedWriter(BufferedWriter bufferedWriter) + { + // try to close the buffered writer + try + { + if (bufferedWriter != null) + { + bufferedWriter.close(); + } + } + catch (IOException e) + { + e.printStackTrace(); + } + } + + /** + * Read all lines from text file and add them to a list of strings. + * + * @param bufferedReader + * instance of buffered reader + * @param lines + * list of string to be filled + * @throws IOException + * thrown if an I/O error occurs + */ + private static void readAllLinesFromTextFile(BufferedReader bufferedReader, List lines) throws IOException + { + String line; + // read lines from a text file + while ((line = bufferedReader.readLine()) != null) + { + lines.add(line); + } + } + + /** + * Write content of the list of strings to a file. + * + * @param bufferedWriter + * instance of buffered writer + * @param lines + * list of string + * @throws IOException + * thrown if an I/O error occurs + */ + private static void writeAllLinesToTextFile(BufferedWriter bufferedWriter, List lines) throws IOException + { + for (String line : lines) + { + bufferedWriter.write(line); + // new line character should be added after each string + bufferedWriter.write('\n'); + } + } + +} diff -r 61f453c6b172 -r 730c5549c0f9 src/ReportGenerator.java --- a/src/ReportGenerator.java Mon Jan 09 14:57:59 2012 +0100 +++ b/src/ReportGenerator.java Tue Jan 10 14:08:47 2012 +0100 @@ -43,6 +43,8 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.util.LinkedList; +import java.util.List; import java.util.Set; import java.util.TreeSet; @@ -56,131 +58,180 @@ */ public class ReportGenerator { + /** + * Read all classes from a file containing its list. + * + * @param allClassListFileName + * @return + */ private static Set readAllClasses(String allClassListFileName) { - BufferedReader reader = null; + // read file content + List fileContent = FileUtils.readTextFile(allClassListFileName); + // set of classes should be sorted Set allClasses = new TreeSet(); - try - { - reader = new BufferedReader(new FileReader(allClassListFileName)); - String line; - while ((line = reader.readLine()) != null) - { - allClasses.add(line); - } - } - catch (FileNotFoundException e) - { - e.printStackTrace(); - } - catch (IOException e) - { - e.printStackTrace(); - } - finally - { - try - { - if (reader != null) - { - reader.close(); - } - } - catch (IOException e) - { - e.printStackTrace(); - } - } + allClasses.addAll(fileContent); return allClasses; } - private static Set preparePackageNames(Set allClasses) + /** + * Creates file "all_packages.html" which contains link to all checked + * packages. Structure of this file is based on template stored in + * "templates/all_packages_template.html". + * + * @param reportDirectory + * directory where report is generated + * @param allClasses + * set of all classes + * @param packageNames + * set of package names + */ + private static void printPackageListToFile(String reportDirectory, Set allClasses, Set packageNames) { - Set packages = new TreeSet(); - for (String className : allClasses) + List template = FileUtils.readTextFile("templates/all_packages_template.html"); + List out = new LinkedList(); + for (String templateLine : template) { - String packageName = className.substring(0, className.lastIndexOf('.')); - if (!packageName.startsWith("com.") && !packageName.startsWith("sun")) + // replace text in template where needed + if ("${PACKAGE_LIST}".equals(templateLine)) { - packages.add(packageName); + addPackageList(packageNames, out); + } + else + { + out.add(templateLine); } } - return packages; + FileUtils.writeTextFile(reportDirectory, "all_packages.html", out); } - private static void printPackageListToFile(String reportDirectory, Set allClasses, Set packageNames) + /** + * Create file containing test coverage report for given package. Structure + * of this file is based on template stored in + * "templates/all_packages_template.html". + * + * @param reportDirectory + * directory where report is generated + * @param packageName + * package for which the report is generated + * @param testedClasses + * set of tested classes + */ + private static void printReportForPackageToFile(String reportDirectory, String packageName, Set testedClasses) { - BufferedWriter fout = null; - try + List template = FileUtils.readTextFile("templates/package_template.html"); + List out = new LinkedList(); + for (String templateLine : template) { - fout = new BufferedWriter(new FileWriter(new File(reportDirectory, "all_packages.html"))); - fout.write("\n"); - fout.write("\n"); - fout.write("

Package list

\n"); - fout.write("all classes

\n"); - for (String packageName : packageNames) + // replace text in template where needed + if ("${CLASS_LIST}".equals(templateLine)) { - fout.write("" + packageName + "
\n"); + addClassList(packageName, testedClasses, out); } - fout.write("\n"); - fout.write("\n"); + else + { + out.add(templateLine); + } } - catch (IOException e) + FileUtils.writeTextFile(reportDirectory, packageName + ".html", out); + } + + /** + * Create file containing test coverage report for all classes. Structure of + * this file is based on template stored in + * "templates/all_classes_template.html". + * + * @param reportDirectory + * directory where report is generated + * @param usedPackageNames + * all checked package names + * @param testedClasses + * set of tested classes + */ + private static void printReportForAllClassesInOneFile(String reportDirectory, Set usedPackageNames, + Set testedClasses) + { + List template = FileUtils.readTextFile("templates/all_classes_template.html"); + List out = new LinkedList(); + for (String templateLine : template) { - e.printStackTrace(); + // replace text in template where needed + if ("${PACKAGE_AND_CLASS_LIST}".equals(templateLine)) + { + addPackageAndClassList(usedPackageNames, testedClasses, out); + } + else + { + out.add(templateLine); + } } - finally + FileUtils.writeTextFile(reportDirectory, "all_classes.html", out); + } + + /** + * Add list of all packages to a list of string which represents generated + * report. + * + * @param packageNames + * set of package names + * @param out + * list of string which represents generated report + */ + private static void addPackageList(Set packageNames, List out) + { + for (String packageName : packageNames) { - try + out.add("" + packageName + "
"); + } + } + + /** + * Add list of all classes to a list of string which represents generated + * report. + * + * @param packageName + * package for which the report is generated + * @param testedClasses + * set of tested classes + * @param out + * list of string which represents generated report + */ + private static void addClassList(String packageName, Set testedClasses, List out) + { + for (String className : testedClasses) + { + // list only classes from given package + if (className.startsWith(packageName)) { - if (fout != null) - { - fout.close(); - } - } - catch (IOException e) - { - e.printStackTrace(); + out.add("" + className + "
"); } } } - private static void createFileForPackage(String reportDirectory, String packageName, Set testedClasses) + /** + * Add list of all packages and all its classes to a list of string which + * represents generated report. + * From ahughes at redhat.com Tue Jan 10 05:08:01 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 10 Jan 2012 13:08:01 +0000 Subject: [IcedTea6 1.11] Disable shark In-Reply-To: <4F0B653C.2060903@redhat.com> References: <4F0B653C.2060903@redhat.com> Message-ID: <20120110130801.GE17107@rivendell.middle-earth.co.uk> On 17:07 Mon 09 Jan , Omair Majid wrote: > Hi, > > I am currently testing the attached patch which disables shark. I would > like to add it to the IcedTea6 1.11 branch. > > Can others please give this a spin to make sure it doesn't break > anything (else)? > The patch looks sane. I'll try and give it a test run later once I have a copy of 1.11 set up. The logic in IT_SET_SHARK_BUILD is odd. I see no reason for having both shark_selected and use_shark. Obviously, not something we should change here though. > Once this is committed, I will also re-target all shark 1.11 "blocker" > bugs to 1.12. > I've made a separate tracker for Shark: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=853 I don't think it's appropriate to make decisions about this and 1.12 just yet, until we seem some progress on these issues. > Thanks, > Omair > diff -r 7e179e0b02ca ChangeLog > --- a/ChangeLog Fri Jan 06 17:00:51 2012 -0500 > +++ b/ChangeLog Mon Jan 09 17:01:26 2012 -0500 > @@ -1,3 +1,8 @@ > +2012-01-09 Omair Majid > + > + * acinclude.m4 (IT_SET_SHARK_BUILD): Error out if shark is enabled. > + * NEWS: Update with note describing shark has been disabled. > + > 2012-01-06 Jiri Vanek > > fixes rhbz#580478 > diff -r 7e179e0b02ca NEWS > --- a/NEWS Fri Jan 06 17:00:51 2012 -0500 > +++ b/NEWS Mon Jan 09 17:01:26 2012 -0500 > @@ -16,6 +16,7 @@ > * ARM assembly language port reinstated and updated; details below. > * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools" > * Drop the outdated NIO2 backport. Users who want NIO2 should use IcedTea 2.x. > +* Shark has been disabled > * Bug fixes > - PR637: make check should exit with an error code if any regression test failed. > - PR752: ImageFormatException extends Exception not RuntimeException > diff -r 7e179e0b02ca acinclude.m4 > --- a/acinclude.m4 Fri Jan 06 17:00:51 2012 -0500 > +++ b/acinclude.m4 Mon Jan 09 17:01:26 2012 -0500 > @@ -786,6 +786,8 @@ > AC_CONFIG_FILES([ergo.c]) > ]) > > +# shark has been very unstable (and/or broken) recently due to various > +# changes in hotspot and llvm. It is not supported in this release. > AC_DEFUN([IT_SET_SHARK_BUILD], > [ > AC_MSG_CHECKING(whether to use the Shark JIT) > @@ -806,7 +808,10 @@ > use_shark=yes > fi > AC_MSG_RESULT($use_shark) > - > +# remove the following check to enable shark > + if test "x${shark_selected}" = "xyes"; then > + AC_MSG_ERROR([shark is unsupported in this release]) > + fi > AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes) > ]) > -- 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/20120110/0e674d7a/attachment.bin From ahughes at redhat.com Tue Jan 10 05:11:41 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 10 Jan 2012 13:11:41 +0000 Subject: [1.10 BACKPORT] 7091528: javadoc attempts to parse .class files Message-ID: <20120110131141.GF17107@rivendell.middle-earth.co.uk> I'd like to backport this patch to the 1.10 branch. It's already on HEAD & 1.11 and fixes an issue I've encountered when trying to build java-gnome's documentation with 1.10.x. The issue is a regression due to the big OpenJDK6 langtools backport performed by Oracle which has caused other issues too in the past. The patch is attached. Ok for 1.10 with the usual NEWS & ChangeLog? -- 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 -------------- # HG changeset patch # User jjg # Date 1316215126 25200 # Node ID dea82aa3ca4fc15712cc8cfce72caf0d3fb210fc # Parent c0835c8489b0fc6c5c20095ed0f0d6c1b01b69e0 7091528: javadoc attempts to parse .class files Reviewed-by: darcy diff -r c0835c8489b0 -r dea82aa3ca4f src/share/classes/com/sun/tools/javadoc/JavadocTool.java --- openjdk/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java Fri Sep 16 14:16:11 2011 +0100 +++ openjdk/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java Fri Sep 16 16:18:46 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 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 @@ -257,24 +257,15 @@ for (String p: excludedPackages) includedPackages.put(p, false); - if (docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH)) { - searchSubPackages(subPackages, - includedPackages, - packages, packageFiles, - StandardLocation.SOURCE_PATH, - EnumSet.of(JavaFileObject.Kind.SOURCE)); - searchSubPackages(subPackages, - includedPackages, - packages, packageFiles, - StandardLocation.CLASS_PATH, - EnumSet.of(JavaFileObject.Kind.CLASS)); - } else { - searchSubPackages(subPackages, - includedPackages, - packages, packageFiles, - StandardLocation.CLASS_PATH, - EnumSet.of(JavaFileObject.Kind.SOURCE, JavaFileObject.Kind.CLASS)); - } + StandardLocation path = docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH) + ? StandardLocation.SOURCE_PATH : StandardLocation.CLASS_PATH; + + searchSubPackages(subPackages, + includedPackages, + packages, packageFiles, + path, + EnumSet.of(JavaFileObject.Kind.SOURCE)); + return packageFiles; } diff -r c0835c8489b0 -r dea82aa3ca4f test/tools/javadoc/parser/7091528/T7091528.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ openjdk/langtools/test/tools/javadoc/parser/7091528/T7091528.java Fri Sep 16 16:18:46 2011 -0700 @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2009, 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. + * + * 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 7091528 + * @summary javadoc attempts to parse .class files + * @compile p/C1.java p/q/C2.java + * @run main T7091528 + */ + +import java.io.File; +import java.io.PrintWriter; +import java.io.StringWriter; + +public class T7091528 { + public static void main(String... args) { + new T7091528().run(); + } + + void run() { + File testSrc = new File(System.getProperty("test.src")); + File testClasses = new File(System.getProperty("test.classes")); + String[] args = { + "-d", ".", + "-sourcepath", testClasses + File.pathSeparator + testSrc, + "-subpackages", + "p" + }; + + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + String doclet = com.sun.tools.doclets.standard.Standard.class.getName(); + int rc = com.sun.tools.javadoc.Main.execute("javadoc", pw, pw, pw, doclet, args); + pw.close(); + + String out = sw.toString(); + if (!out.isEmpty()) { + System.err.println(out); + } + + if (rc != 0) + System.err.println("javadoc failed: exit code = " + rc); + + if (out.matches("(?s).*p/[^ ]+\\.class.*")) + throw new Error("reading .class files"); + + if (!new File("index.html").exists()) + throw new Error("index.html not found"); + } +} diff -r c0835c8489b0 -r dea82aa3ca4f test/tools/javadoc/parser/7091528/p/C1.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ openjdk/langtools/test/tools/javadoc/parser/7091528/p/C1.java Fri Sep 16 16:18:46 2011 -0700 @@ -0,0 +1,28 @@ +/* + * 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. + * + * 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 p1; + +/** This is class C1. */ +public class C1 { } + diff -r c0835c8489b0 -r dea82aa3ca4f test/tools/javadoc/parser/7091528/p/q/C2.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ openjdk/langtools/test/tools/javadoc/parser/7091528/p/q/C2.java Fri Sep 16 16:18:46 2011 -0700 @@ -0,0 +1,28 @@ +/* + * 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. + * + * 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 p.q; + +/** This is class p.q.C2. */ +public class C2 { } + -------------- 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/20120110/a6d67bc1/attachment.bin From ahughes at redhat.com Tue Jan 10 05:31:49 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 10 Jan 2012 13:31:49 +0000 Subject: IcedTea6 1.11 has been branched. Release on 2011-01-18. In-Reply-To: <4F0B1855.3050703@redhat.com> References: <4F0771B8.4080106@redhat.com> <20120109130631.GB3936@rivendell.middle-earth.co.uk> <4F0B1855.3050703@redhat.com> Message-ID: <20120110133148.GK17107@rivendell.middle-earth.co.uk> On 11:39 Mon 09 Jan , Omair Majid wrote: > On 01/09/2012 08:06 AM, Dr Andrew John Hughes wrote: > > On 17:12 Fri 06 Jan , Omair Majid wrote: > >> The only known issue is: > >> * Shark: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=701 > >> From what I have heard, shark is not in the best condition anyway > >> thanks to changes in llvm. Unless someone steps up to fix this, > >> shark will most likely be broken in the final release too. > >> > > > > As noted previously, I don't think Shark should block the release, unless > > someone has a reasonable (i.e. this month) ETA for fixing these issues. > > > > It's nearly a year since the 1.10 release (2011-03-02) so 1.11 is overdue. > > There has already been plenty of time for Shark issues to be resolved. > > > > Yes, I think I am going to remove shark as a blocker from this release. > Andrew Haley and Xerxes R?nby seem to be in agreement that a number of > factors (hotspot changes + llvm changes) have resulted in shark being > very unstable and it will take a while before shark can be stabilized. > > Does anyone have any thoughts about which of the following options is > the preferred way to communicate that shark is very unstable? > > 1. Document that shark is not stable explicitly in the release notes > (and highlight it too) but leave shark otherwise untouched in the build. > > 2. Disable shark support. --enable-shark will cause configure to fail. > Option 3. It should be both disabled in configure AND mentioned in the release notes. Your posted patch does this. > Thoughts? > > Thanks, > Omair -- 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/20120110/4e93a283/attachment.bin From ahughes at redhat.com Tue Jan 10 05:34:57 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 10 Jan 2012 13:34:57 +0000 Subject: IcedTea7 forest & OpenJDK7 u2 Message-ID: <20120110133456.GL17107@rivendell.middle-earth.co.uk> I've done a merge of the OpenJDK7 u2 changes into the IcedTea7 forest and made them available at: http://icedtea.classpath.org/people/andrew/icedtea7-forest Please test this out over the next few days. If there are no issues by the end of the week, I'll push the changes to the main tree. We should follow this with a 2.1 release shortly after. -- 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/20120110/273d4948/attachment.bin From bugzilla-daemon at icedtea.classpath.org Tue Jan 10 06:12:07 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 10 Jan 2012 14:12:07 +0000 Subject: [Bug 712] [TRACKER] IcedTea7 2.0 release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=712 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution| |FIXED --- Comment #4 from Andrew John Hughes 2012-01-10 14:12:07 UTC --- 2.0 is out. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From aph at redhat.com Tue Jan 10 06:31:43 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 10 Jan 2012 14:31:43 +0000 Subject: ARM: Enable safepoints for JIT-compiled code Message-ID: <4F0C4BCF.1040102@redhat.com> I've found the bug that broke safepoints. It turns out that safepoints do not convert a PC address to a bytecode index, so you have to set the bytecode pointer explicitly whenever at a safepoint. I'm intend to apply this to trunk and branch, given RM approval. Andrew. 2012-01-09 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_disass): Flush the output streams. (Thumb2_Safepoint): Add the bci as a new argument. Pass it to the safepoint handler. (Thumb2_Branch): Pass the bci to Thumb2_Safepoint(). (Thumb2_Goto): Likewise. (Thumb2_Return): Add the bci as a new argument. Pass it to Thumb2_Safepoint(). Add braces for clarity. move call to Thumb2_Safepoint() to point before retval is popped. (Thumb2_codegen): Pass the bci to Thumb2_Return(). (Thumb2_Initialize): Disassemble the codebuf we just created. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (method_entry_freq_count_overflow): Make sure self_link is set when re-entering JIT-compiled code. comparing with ssh://icedtea.classpath.org/hg/icedtea6 searching for changes changeset: 2769:57ae0e361acf tag: tip user: aph date: Mon Jan 09 13:34:27 2012 -0500 summary: ARM: Enable safepoints for JIT-compiled code. diff -r 4d6b4215b78f -r 57ae0e361acf arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Thu Dec 22 11:54:40 2011 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Jan 09 13:34:27 2012 -0500 @@ -3371,6 +3371,7 @@ #ifdef THUMB2EE #define THUMB2_MAXLOCALS 1000 call_thumb2: + str istate, [istate, #ISTATE_SELF_LINK] mov ip, r1 sub r1, locals, #THUMB2_MAXLOCALS * 4 ldr r2, [istate, #ISTATE_THREAD] diff -r 4d6b4215b78f -r 57ae0e361acf arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Dec 22 11:54:40 2011 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Jan 09 13:34:27 2012 -0500 @@ -791,6 +791,9 @@ } #endif + fflush(stdout); + fflush(stderr); + opcodes.init_disassemble_info(&info, stdout, (fprintf_ftype)fprintf); info.arch = bfd_arch_arm; opcodes.disassemble_init_for_target(&info); @@ -950,6 +953,7 @@ } } } + fflush(stdout); } #endif @@ -4342,9 +4346,8 @@ // Insert code to poll the SafepointSynchronize state and call // Helper_SafePoint. -void Thumb2_Safepoint(Thumb2_Info *jinfo, int stackdepth) -{ -#if 0 // Causes maysterious segfaults +void Thumb2_Safepoint(Thumb2_Info *jinfo, int stackdepth, int bci) +{ Thumb2_Flush(jinfo); int r_tmp = Thumb2_Tmp(jinfo, 0); mov_imm(jinfo->codebuf, r_tmp, (u32)SafepointSynchronize::address_of_state()); @@ -4353,11 +4356,11 @@ { unsigned loc = forward_16(jinfo->codebuf); Thumb2_save_locals(jinfo, stackdepth); + mov_imm(jinfo->codebuf, ARM_R1, bci+CONSTMETHOD_CODEOFFSET); bl(jinfo->codebuf, handlers[H_SAFEPOINT]); Thumb2_restore_locals(jinfo, stackdepth); bcc_patch(jinfo->codebuf, COND_NE, loc); } -#endif } int Thumb2_Branch(Thumb2_Info *jinfo, unsigned bci, unsigned cond, int stackdepth) @@ -4369,7 +4372,7 @@ if (jinfo->bc_stackinfo[dest_taken] & BC_COMPILED) { loc = forward_16(jinfo->codebuf); - Thumb2_Safepoint(jinfo, stackdepth); + Thumb2_Safepoint(jinfo, stackdepth, bci); branch_uncond(jinfo->codebuf, jinfo->bc_stackinfo[dest_taken] & ~BC_FLAGS_MASK); bcc_patch(jinfo->codebuf, NEG_COND(cond), loc); return dest_not_taken; @@ -4388,7 +4391,7 @@ unsigned loc; if (jinfo->bc_stackinfo[dest_taken] & BC_COMPILED) { - Thumb2_Safepoint(jinfo, stackdepth); + Thumb2_Safepoint(jinfo, stackdepth, bci); branch_uncond(jinfo->codebuf, jinfo->bc_stackinfo[dest_taken] & ~BC_FLAGS_MASK); return dest_not_taken; } @@ -4399,7 +4402,7 @@ return -1; } -void Thumb2_Return(Thumb2_Info *jinfo, unsigned opcode) +void Thumb2_Return(Thumb2_Info *jinfo, unsigned opcode, int bci) { Reg r_lo, r; Thumb2_Stack *jstack = jinfo->jstack; @@ -4467,6 +4470,8 @@ cbz_patch(jinfo->codebuf, ARM_R3, loc_success2); } + Thumb2_Safepoint(jinfo, 0, bci); + if (opcode != opc_return) { if (opcode == opc_lreturn || opcode == opc_dreturn) { Thumb2_Fill(jinfo, 2); @@ -4490,8 +4495,9 @@ if (opcode == opc_lreturn || opcode == opc_dreturn) { str_imm(jinfo->codebuf, r, Rstack, jinfo->method->max_locals() * sizeof(int), 1, 0); str_imm(jinfo->codebuf, r_lo, Rstack, jinfo->method->max_locals() * sizeof(int)-4, 1, 1); - } else + } else { str_imm(jinfo->codebuf, r, Rstack, jinfo->method->max_locals() * sizeof(int), 1, 1); + } } // sub_imm(jinfo->codebuf, Ristate, ARM_LR, ISTATE_NEXT_FRAME); @@ -4500,8 +4506,6 @@ Thumb2_Debug(jinfo, H_DEBUG_METHODEXIT); // enter_leave(jinfo->codebuf, 0); - Thumb2_Safepoint(jinfo, 0); - // deoptimized_frames = 0 // FIXME: This should be done in the slow entry, but only three // words are allocated there for the instructions. @@ -6354,7 +6358,7 @@ case opc_ireturn: case opc_freturn: case opc_areturn: - Thumb2_Return(jinfo, opcode); + Thumb2_Return(jinfo, opcode, bci); if (!jinfo->compiled_return) jinfo->compiled_return = bci; break; @@ -6389,7 +6393,7 @@ it(jinfo->codebuf, COND_NE, IT_MASK_T); bl(jinfo->codebuf, handlers[H_HANDLE_EXCEPTION]); bcc_patch(jinfo->codebuf, COND_EQ, loc_eq); - Thumb2_Return(jinfo, opc_return); + Thumb2_Return(jinfo, opc_return, bci); break; } @@ -7742,11 +7746,20 @@ // H_SAFEPOINT handlers[H_SAFEPOINT] = out_pos(&codebuf); stm(&codebuf, (1<_bcp for the GC + // bci+CONSTMETHOD_CODEOFFSET is passed in ARM_R1 + ldr_imm(&codebuf, ARM_R0, Ristate, ISTATE_METHOD, 1, 0); + ldr_imm(&codebuf, ARM_R0, ARM_R0, METHOD_CONSTMETHOD, 1, 0); + add_reg(&codebuf, ARM_R0, ARM_R0, ARM_R1); + str_imm(&codebuf, ARM_R0, Ristate, ISTATE_BCP, 1, 0); + mov_imm(&codebuf, ARM_IP, (u32)Helper_SafePoint); mov_reg(&codebuf, ARM_R0, Rthread); blx_reg(&codebuf, ARM_IP); ldm(&codebuf, (1<hp += codebuf.idx * 2; thumb2_codebuf = cb; + +#if 0 // Disassemble the codebuf we just created. For debugging + Opcodes opcodes; + if (t2ee_print_disass) { + struct disassemble_info info; + info.arch = bfd_arch_arm; + opcodes.disassemble_init_for_target(&info); + opcodes.init_disassemble_info(&info, stdout, (fprintf_ftype)fprintf); + info.endian = BFD_ENDIAN_LITTLE; + info.endian_code = BFD_ENDIAN_LITTLE; + info.buffer = (bfd_byte *)codebuf.codebuf; + info.buffer_vma = (bfd_vma)codebuf.codebuf; + info.buffer_length = codebuf.idx * sizeof(short); + info.disassembler_options = (char *)"force-thumb"; + int len; + for (unsigned int i = 0; i < codebuf.idx * sizeof(short); i += len) { + printf("0x%08x:\t", ((int)codebuf.codebuf)+i); + len = opcodes.print_insn_little_arm(((bfd_vma)codebuf.codebuf)+i, &info); + if (len == -1) len = 2; + putchar('\n'); + } + } +#endif } #endif // THUMB2EE From bugzilla-daemon at icedtea.classpath.org Tue Jan 10 06:52:12 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 10 Jan 2012 14:52:12 +0000 Subject: [Bug 850] Segfault when trying to run Bukkit Minecraft Server on ARM platform In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=850 --- Comment #3 from Hans Pirschen 2012-01-10 14:52:12 UTC --- Hi, here's a way that works for me: 1. Change to an empty directory 2. wget http://ci.bukkit.org/job/dev-CraftBukkit/Recommended/artifact/target/craftbukkit-1.0.1-R1.jar 2. java -Xincgc -jar craftbukkit-1.0.1-R1.jar Actually I found out that no JVM error occurs at all when omitting -Xincgc. I can also provide a coredump if you need one. Best regards -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From drazzib at drazzib.com Tue Jan 10 07:22:07 2012 From: drazzib at drazzib.com (Damien Raude-Morvan) Date: Tue, 10 Jan 2012 16:22:07 +0100 Subject: IcedTea7 forest & OpenJDK7 u2 In-Reply-To: <20120110133456.GL17107@rivendell.middle-earth.co.uk> References: <20120110133456.GL17107@rivendell.middle-earth.co.uk> Message-ID: Hi Andrew, On Tue, 10 Jan 2012 13:34:57 +0000, Dr Andrew John Hughes wrote: > I've done a merge of the OpenJDK7 u2 changes into the IcedTea7 forest > and made them available at: > > http://icedtea.classpath.org/people/andrew/icedtea7-forest > > Please test this out over the next few days. If there are no issues > by the end of the week, I'll push the changes to the main tree. > > We should follow this with a 2.1 release shortly after. Thanks, I'll have a look shortly and report any issues. Regards, -- Damien From dbhole at redhat.com Tue Jan 10 06:51:37 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 10 Jan 2012 09:51:37 -0500 Subject: [1.10 BACKPORT] 7091528: javadoc attempts to parse .class files In-Reply-To: <20120110131141.GF17107@rivendell.middle-earth.co.uk> References: <20120110131141.GF17107@rivendell.middle-earth.co.uk> Message-ID: <20120110145136.GW2930@redhat.com> * Dr Andrew John Hughes [2012-01-10 08:27]: > I'd like to backport this patch to the 1.10 branch. It's already > on HEAD & 1.11 and fixes an issue I've encountered when trying > to build java-gnome's documentation with 1.10.x. The issue > is a regression due to the big OpenJDK6 langtools backport performed > by Oracle which has caused other issues too in the past. > > The patch is attached. Ok for 1.10 with the usual NEWS & ChangeLog? Okay for 1.10. Cheers, Deepak > -- > 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 > # HG changeset patch > # User jjg > # Date 1316215126 25200 > # Node ID dea82aa3ca4fc15712cc8cfce72caf0d3fb210fc > # Parent c0835c8489b0fc6c5c20095ed0f0d6c1b01b69e0 > 7091528: javadoc attempts to parse .class files > Reviewed-by: darcy > > diff -r c0835c8489b0 -r dea82aa3ca4f src/share/classes/com/sun/tools/javadoc/JavadocTool.java > --- openjdk/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java Fri Sep 16 14:16:11 2011 +0100 > +++ openjdk/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java Fri Sep 16 16:18:46 2011 -0700 > @@ -1,5 +1,5 @@ > /* > - * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved. > + * Copyright (c) 2001, 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 > @@ -257,24 +257,15 @@ > for (String p: excludedPackages) > includedPackages.put(p, false); > > - if (docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH)) { > - searchSubPackages(subPackages, > - includedPackages, > - packages, packageFiles, > - StandardLocation.SOURCE_PATH, > - EnumSet.of(JavaFileObject.Kind.SOURCE)); > - searchSubPackages(subPackages, > - includedPackages, > - packages, packageFiles, > - StandardLocation.CLASS_PATH, > - EnumSet.of(JavaFileObject.Kind.CLASS)); > - } else { > - searchSubPackages(subPackages, > - includedPackages, > - packages, packageFiles, > - StandardLocation.CLASS_PATH, > - EnumSet.of(JavaFileObject.Kind.SOURCE, JavaFileObject.Kind.CLASS)); > - } > + StandardLocation path = docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH) > + ? StandardLocation.SOURCE_PATH : StandardLocation.CLASS_PATH; > + > + searchSubPackages(subPackages, > + includedPackages, > + packages, packageFiles, > + path, > + EnumSet.of(JavaFileObject.Kind.SOURCE)); > + > return packageFiles; > } > > diff -r c0835c8489b0 -r dea82aa3ca4f test/tools/javadoc/parser/7091528/T7091528.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ openjdk/langtools/test/tools/javadoc/parser/7091528/T7091528.java Fri Sep 16 16:18:46 2011 -0700 > @@ -0,0 +1,71 @@ > +/* > + * Copyright (c) 2009, 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. > + * > + * 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 7091528 > + * @summary javadoc attempts to parse .class files > + * @compile p/C1.java p/q/C2.java > + * @run main T7091528 > + */ > + > +import java.io.File; > +import java.io.PrintWriter; > +import java.io.StringWriter; > + > +public class T7091528 { > + public static void main(String... args) { > + new T7091528().run(); > + } > + > + void run() { > + File testSrc = new File(System.getProperty("test.src")); > + File testClasses = new File(System.getProperty("test.classes")); > + String[] args = { > + "-d", ".", > + "-sourcepath", testClasses + File.pathSeparator + testSrc, > + "-subpackages", > + "p" > + }; > + > + StringWriter sw = new StringWriter(); > + PrintWriter pw = new PrintWriter(sw); > + String doclet = com.sun.tools.doclets.standard.Standard.class.getName(); > + int rc = com.sun.tools.javadoc.Main.execute("javadoc", pw, pw, pw, doclet, args); > + pw.close(); > + > + String out = sw.toString(); > + if (!out.isEmpty()) { > + System.err.println(out); > + } > + > + if (rc != 0) > + System.err.println("javadoc failed: exit code = " + rc); > + > + if (out.matches("(?s).*p/[^ ]+\\.class.*")) > + throw new Error("reading .class files"); > + > + if (!new File("index.html").exists()) > + throw new Error("index.html not found"); > + } > +} > diff -r c0835c8489b0 -r dea82aa3ca4f test/tools/javadoc/parser/7091528/p/C1.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ openjdk/langtools/test/tools/javadoc/parser/7091528/p/C1.java Fri Sep 16 16:18:46 2011 -0700 > @@ -0,0 +1,28 @@ > +/* > + * 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. > + * > + * 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 p1; > + > +/** This is class C1. */ > +public class C1 { } > + > diff -r c0835c8489b0 -r dea82aa3ca4f test/tools/javadoc/parser/7091528/p/q/C2.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ openjdk/langtools/test/tools/javadoc/parser/7091528/p/q/C2.java Fri Sep 16 16:18:46 2011 -0700 > @@ -0,0 +1,28 @@ > +/* > + * 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. > + * > + * 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 p.q; > + > +/** This is class p.q.C2. */ > +public class C2 { } > + From aph at redhat.com Tue Jan 10 08:09:30 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 10 Jan 2012 16:09:30 +0000 Subject: Fwd: ARM: Enable safepoints for JIT-compiled code Message-ID: <4F0C62BA.4070709@redhat.com> OK for branch? Andrew. -------------- next part -------------- An embedded message was scrubbed... From: Andrew Haley Subject: ARM: Enable safepoints for JIT-compiled code Date: Tue, 10 Jan 2012 14:31:43 +0000 Size: 11197 Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120110/7bb9afcb/EnablesafepointsforJIT-compiledcode.eml From ptisnovs at redhat.com Tue Jan 10 08:16:10 2012 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Tue, 10 Jan 2012 17:16:10 +0100 Subject: Reviewer needed: backport of "6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe" into IcedTea6 HEAD Message-ID: <4F0C644A.6090006@redhat.com> Hi, I'd like to add patch containing backport of "6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe" into IcedTea6 HEAD. hg diff generated against recent HEAD version is stored in an attachment. Here's ChangeLog entry: 2012-01-10 Pavel Tisnovsky * Makefile.am: Add new patch. * NEWS: Mention backport. * patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch: Backport of 6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe. Ok to push? Thank you in advance, Pavel -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hg.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120110/56138060/hg.diff From omajid at redhat.com Tue Jan 10 08:17:26 2012 From: omajid at redhat.com (Omair Majid) Date: Tue, 10 Jan 2012 11:17:26 -0500 Subject: Fwd: ARM: Enable safepoints for JIT-compiled code In-Reply-To: <4F0C62BA.4070709@redhat.com> References: <4F0C62BA.4070709@redhat.com> Message-ID: <4F0C6496.8090501@redhat.com> On 01/10/2012 11:09 AM, Andrew Haley wrote: > OK for branch? > Yes, if this is going into trunk then it should be added to the 1.11 branch as well. I will leave it to others to actually comment on the patch itself. Cheers, Omair From aph at icedtea.classpath.org Tue Jan 10 08:48:20 2012 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Tue, 10 Jan 2012 16:48:20 +0000 Subject: /hg/icedtea6: 2 new changesets Message-ID: changeset 57ae0e361acf in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=57ae0e361acf author: aph date: Mon Jan 09 13:34:27 2012 -0500 ARM: Enable safepoints for JIT-compiled code. 2012-01-09 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_disass): Flush the output streams. (Thumb2_Safepoint): Add the bci as a new argument. Pass it to the safepoint handler. (Thumb2_Branch): Pass the bci to Thumb2_Safepoint(). (Thumb2_Goto): Likewise. (Thumb2_Return): Add the bci as a new argument. Pass it to Thumb2_Safepoint(). Add braces for clarity. move call to Thumb2_Safepoint() to point before retval is popped. (Thumb2_codegen): Pass the bci to Thumb2_Return(). (Thumb2_Initialize): Disassemble the codebuf we just created. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (method_entry_freq_count_overflow): Make sure self_link is set when re-entering JIT-compiled code. changeset 79014132e844 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=79014132e844 author: aph date: Tue Jan 10 16:47:52 2012 +0000 merge diffstat: .hgtags | 1 + ChangeLog | 443 + Makefile.am | 24 +- NEWS | 73 +- arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 1 + arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 60 +- configure.ac | 36 +- jconsole.desktop | 10 - jconsole.desktop.in | 10 + overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile | 37 - overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile | 40 - overlays/nio2/openjdk/jdk/make/mksample/nio/aio/Makefile | 50 - overlays/nio2/openjdk/jdk/make/mksample/nio/file/Makefile | 56 - overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedCopyOption.java | 43 - overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedOpenOption.java | 50 - overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java | 43 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/File.java | 450 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/FilePermission.java | 852 --- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/Inputs.java | 391 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/Outputs.java | 362 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/ProtocolFamily.java | 40 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/SocketOption.java | 56 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardProtocolFamily.java | 46 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardSocketOption.java | 370 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousByteChannel.java | 206 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousChannel.java | 118 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup.java | 317 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel.java | 707 -- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel.java | 777 -- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel.java | 305 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel.java | 672 -- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/Channels.java | 214 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/CompletionHandler.java | 78 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/DatagramChannel.java | 223 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java | 404 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileLock.java | 321 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/MembershipKey.java | 183 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/MulticastChannel.java | 216 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/NetworkChannel.java | 165 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/SeekableByteChannel.java | 170 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/exceptions | 68 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/package-info.java | 293 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider.java | 284 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/SelectorProvider.java | 199 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/package.html | 45 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AccessDeniedException.java | 69 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AccessMode.java | 50 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AtomicMoveNotSupportedException.java | 57 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedDirectoryStreamException.java | 46 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedFileSystemException.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedWatchServiceException.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/CopyOption.java | 42 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryNotEmptyException.java | 50 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryStream.java | 139 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryStreamFilters.java | 211 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileAction.java | 65 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileAlreadyExistsException.java | 64 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileRef.java | 425 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileStore.java | 173 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystem.java | 426 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemAlreadyExistsException.java | 54 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemException.java | 126 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemNotFoundException.java | 53 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystems.java | 415 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileTreeWalker.java | 247 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitOption.java | 46 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitResult.java | 63 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitor.java | 177 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Files.java | 405 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/InvalidPathException.java | 131 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/LinkOption.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/LinkPermission.java | 108 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NoSuchFileException.java | 64 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NotDirectoryException.java | 50 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NotLinkException.java | 64 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/OpenOption.java | 46 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Path.java | 1575 ----- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/PathMatcher.java | 50 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Paths.java | 126 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ProviderMismatchException.java | 54 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ProviderNotFoundException.java | 53 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ReadOnlyFileSystemException.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/SecureDirectoryStream.java | 327 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/SimpleFileVisitor.java | 123 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardCopyOption.java | 48 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardOpenOption.java | 126 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardWatchEventKind.java | 95 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchEvent.java | 117 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchKey.java | 138 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchService.java | 179 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Watchable.java | 128 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntry.java | 395 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryFlag.java | 66 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryPermission.java | 131 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryType.java | 57 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView.java | 211 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AttributeView.java | 119 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/Attributes.java | 714 -- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView.java | 185 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributes.java | 164 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView.java | 180 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributes.java | 85 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileAttribute.java | 51 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileAttributeView.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileOwnerAttributeView.java | 102 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView.java | 39 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreSpaceAttributeView.java | 94 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreSpaceAttributes.java | 67 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/GroupPrincipal.java | 43 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView.java | 231 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributeView.java | 196 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributes.java | 78 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFilePermission.java | 87 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFilePermissions.java | 190 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipal.java | 55 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipalLookupService.java | 105 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipalNotFoundException.java | 65 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/package-info.java | 120 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/package-info.java | 116 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/AbstractPath.java | 542 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/FileSystemProvider.java | 441 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/FileTypeDetector.java | 102 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/package-info.java | 39 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/util/Scanner.java | 2657 --------- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/util/concurrent/ScheduledThreadPoolExecutor.java | 1371 ---- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaIODeleteOnExitAccess.java | 43 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaNetGetIndexAccess.java | 46 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaUtilConcurrentThreadPoolExecutorAccess.java | 58 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/SharedSecrets.java | 102 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AbstractFuture.java | 64 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java | 359 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java | 169 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java | 68 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java | 222 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java | 546 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Cancellable.java | 39 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/CompletedFuture.java | 114 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ExtendedSocketOption.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/FileLockTable.java | 287 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Groupable.java | 35 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Invoker.java | 274 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipKeyImpl.java | 224 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipRegistry.java | 132 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/OptionKey.java | 48 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/PendingFuture.java | 259 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java | 425 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java | 437 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ThreadPool.java | 168 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java | 113 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java | 210 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileStoreSpaceAttributeView.java | 121 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java | 70 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractNamedAttributeView.java | 125 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java | 296 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatchKey.java | 179 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatchService.java | 166 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Cancellable.java | 137 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java | 116 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Globs.java | 155 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/MimeType.java | 73 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffer.java | 87 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffers.java | 140 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java | 454 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Reflect.java | 63 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/META-INF/services/java.nio.file.spi.FileSystemProvider | 1 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/README.txt | 29 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarEntryInfo.java | 44 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributeView.java | 76 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributes.java | 57 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipEntryInfo.java | 76 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributeView.java | 154 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributes.java | 93 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributeView.java | 187 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributes.java | 125 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFilePath.java | 1027 --- overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStore.java | 230 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStream.java | 166 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystem.java | 319 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystemProvider.java | 243 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipHeaderConstants.java | 75 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipPathParser.java | 308 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipUtils.java | 481 - overlays/nio2/openjdk/jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c | 129 - overlays/nio2/openjdk/jdk/src/share/sample/nio/aio/EchoServer.java | 165 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/AclEdit.java | 301 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Chmod.java | 363 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Copy.java | 227 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/DiskUsage.java | 78 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/FileType.java | 62 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/WatchDir.java | 204 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Xdd.java | 119 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java | 57 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/EPollPort.java | 362 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java | 100 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/Port.java | 170 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java | 103 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java | 243 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java | 320 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java | 685 -- overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java | 74 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileTypeDetector.java | 36 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java | 99 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java | 300 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java | 102 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java | 186 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java | 41 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedAttributeView.java | 344 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java | 126 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java | 469 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java | 408 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileStore.java | 102 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java | 178 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java | 41 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNamedAttributeView.java | 293 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java | 56 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisWatchService.java | 771 -- overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixChannelFactory.java | 289 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixCopyFile.java | 615 -- overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java | 270 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixException.java | 117 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java | 401 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java | 312 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileKey.java | 60 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileModeAttribute.java | 86 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java | 289 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileStoreAttributes.java | 59 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystem.java | 375 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java | 151 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixMountEntry.java | 82 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java | 556 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java | 1201 ---- overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java | 664 -- overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUriUtils.java | 216 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java | 179 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/EPollPort.c | 173 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/SolarisEventPort.c | 155 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.c | 47 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c | 53 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c | 205 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c | 160 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c | 156 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisNativeDispatcher.c | 70 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisWatchService.c | 141 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixCopyFile.c | 85 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c | 1059 --- overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genSolarisConstants.c | 104 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c | 129 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java | 43 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/Iocp.java | 435 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/PendingIoCache.java | 161 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java | 96 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java | 736 -- overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java | 367 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java | 911 --- overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java | 38 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java | 36 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java | 82 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java | 226 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsChannelFactory.java | 348 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java | 191 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java | 225 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsException.java | 109 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java | 296 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributes.java | 296 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileCopy.java | 527 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileStore.java | 324 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java | 318 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java | 148 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsLinkSupport.java | 466 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNamedAttributeView.java | 342 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java | 1131 ---- overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java | 1312 ---- overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPathParser.java | 225 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPathType.java | 38 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecurity.java | 123 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java | 392 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUriSupport.java | 167 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUserPrincipals.java | 169 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsWatchService.java | 581 -- overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/Iocp.c | 144 - overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousFileChannelImpl.c | 132 - overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.c | 142 - overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c | 222 - overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/RegistryFileTypeDetector.c | 62 - overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c | 1328 ---- overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/Sanity.java | 168 - overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/sanity.sh | 71 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/io/Inputs/Basic.java | 218 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java | 84 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Attack.java | 63 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Basic.java | 261 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java | 137 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Identity.java | 167 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/PrivilegedThreadFactory.java | 50 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Restart.java | 134 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Unbounded.java | 120 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh | 52 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel/Basic.java | 377 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Basic.java | 585 -- overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java | 67 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Lock.java | 340 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/MyThreadFactory.java | 49 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/Basic.java | 136 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java | 76 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow | 3 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny | 3 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Basic.java | 805 -- overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Leaky.java | 104 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/Channels/Basic2.java | 172 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/CheckProvider.java | 38 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/META-INF/services/java.nio.channels.spi.AsynchronousChannelProvider | 1 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java | 62 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java | 62 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh | 71 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/Basic.java | 153 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/Filters.java | 241 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/SecureDS.java | 370 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/FileStore/Basic.java | 79 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/FileSystem/Basic.java | 82 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/ContentType.java | 91 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/CreateFileTree.java | 96 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/ForceLoad.java | 38 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector | 1 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/Misc.java | 126 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/PrintFileTree.java | 78 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/SimpleFileTypeDetector.java | 47 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/SkipSiblings.java | 85 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/TerminateWalk.java | 70 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/content_type.sh | 70 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/walk_file_tree.sh | 86 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/CopyAndMove.java | 983 --- overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/DeleteOnClose.java | 77 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/InterruptCopy.java | 119 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/Links.java | 143 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/Misc.java | 349 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/PathOps.java | 646 -- overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/SBC.java | 468 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/TemporaryFiles.java | 76 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/UriImportExport.java | 80 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/delete_on_close.sh | 61 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/temporary_files.sh | 65 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/PathMatcher/Basic.java | 163 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/TestUtil.java | 117 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/Basic.java | 493 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/FileTreeModifier.java | 148 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/WithSecurityManager.java | 83 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/denyAll.policy | 3 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirAndOneLevel.policy | 5 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirAndTree.policy | 5 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirOnly.policy | 4 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView/Basic.java | 166 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/Attributes/Basic.java | 254 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView/Basic.java | 150 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView/Basic.java | 155 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView/Basic.java | 170 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView/Basic.java | 273 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributeView/Basic.java | 398 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/spi/SetDefaultProvider.java | 44 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/spi/TestProvider.java | 128 - patches/nio2.patch | 2792 ---------- patches/openjdk/6706974-krb5_test_infrastructure.patch | 2081 +++++++ patches/openjdk/6851973-kerberos.patch | 200 + patches/openjdk/7091528-javadoc_class_files.patch | 187 + patches/openjdk/7103725-ssl_beast_regression.patch | 21 + policytool.desktop | 10 - policytool.desktop.in | 10 + 366 files changed, 3085 insertions(+), 79084 deletions(-) diffs (truncated from 83916 to 500 lines): diff -r 4d6b4215b78f -r 79014132e844 .hgtags --- a/.hgtags Thu Dec 22 11:54:40 2011 -0500 +++ b/.hgtags Tue Jan 10 16:47:52 2012 +0000 @@ -20,3 +20,4 @@ 1188b1a313b9e968d57ff44eb879d70f543b20fd icedtea6-1.8-branchpoint cb463b94b82da269ea089c481ed5e39700525a8a icedtea6-1.9-branchpoint 21f2a8d158545a161ba0d997c13bdba1e6166394 icedtea6-1.10-branchpoint +24c5bd2e7d574441813bfb8f9e4636e50c5d7c28 icedtea6-1.11-branchpoint diff -r 4d6b4215b78f -r 79014132e844 ChangeLog --- a/ChangeLog Thu Dec 22 11:54:40 2011 -0500 +++ b/ChangeLog Tue Jan 10 16:47:52 2012 +0000 @@ -1,3 +1,446 @@ +2012-01-10 Andrew John Hughes + + * Makefile.am: Add new patch. + * NEWS: Mention backport. + * patches/openjdk/6706974-krb5_test_infrastructure.patch: + Add Kerberos 5 test infrastructure so the test in + the 6851973 backport works. + +2012-01-09 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_disass): + Flush the output streams. + (Thumb2_Safepoint): Add the bci as a new argument. Pass it to + the safepoint handler. + (Thumb2_Branch): Pass the bci to Thumb2_Safepoint(). + (Thumb2_Goto): Likewise. + (Thumb2_Return): Add the bci as a new argument. Pass it to + Thumb2_Safepoint(). + Add braces for clarity. + move call to Thumb2_Safepoint() to point before retval is popped. + (Thumb2_codegen): Pass the bci to Thumb2_Return(). + (Thumb2_Initialize): Disassemble the codebuf we just created. + + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (method_entry_freq_count_overflow): Make sure self_link is set + when re-entering JIT-compiled code. + +2012-01-06 Omair Majid + + * NEWS: Add 1.12 section + * configure.ac: Bump to 1.12pre. + +2012-01-06 Jiri Vanek + + fixes rhbz#580478 + * configure.ac: abs-install-dir block moved outside conditional ENABLE_SYSTEMTAP block + Added policytool.desktop and jconsole.desktop as AC_CONFIG_FILES + * jconsole.desktop: removed, replaced by jconsole.desktop.in + * jconsole.desktop.in: new file, stub for desktop file, have variable + to be substitued during configure + * policytool.desktop: removed, replaced by policytool.desktop.in + * policytool.desktop.in: new file, stub for desktop file, have variable + to be substituted during configure + +2012-01-06 Andrew John Hughes + + * NEWS: Cleanup ARM entry, separating + details into their own section. + +2012-01-06 Andrew Haley + + * NEWS: ARM assembly language port. + +2012-01-06 Andrew John Hughes + + Remove outdated NIO2 backport. + * overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile, + * overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile, + * overlays/nio2/openjdk/jdk/make/mksample/nio/aio/Makefile, + * overlays/nio2/openjdk/jdk/make/mksample/nio/file/Makefile, + * overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedCopyOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedOpenOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/File.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/FilePermission.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/Inputs.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/Outputs.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/ProtocolFamily.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/SocketOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardProtocolFamily.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardSocketOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousByteChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/Channels.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/CompletionHandler.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/DatagramChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileLock.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/MembershipKey.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/MulticastChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/NetworkChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/SeekableByteChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/exceptions, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/package-info.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/SelectorProvider.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/package.html, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AccessDeniedException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AccessMode.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AtomicMoveNotSupportedException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedDirectoryStreamException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedFileSystemException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedWatchServiceException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/CopyOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryNotEmptyException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryStream.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryStreamFilters.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileAction.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileAlreadyExistsException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileRef.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileStore.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystem.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemAlreadyExistsException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemNotFoundException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystems.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileTreeWalker.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitResult.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitor.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Files.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/InvalidPathException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/LinkOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/LinkPermission.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NoSuchFileException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NotDirectoryException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NotLinkException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/OpenOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Path.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/PathMatcher.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Paths.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ProviderMismatchException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ProviderNotFoundException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ReadOnlyFileSystemException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/SecureDirectoryStream.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/SimpleFileVisitor.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardCopyOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardOpenOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardWatchEventKind.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchEvent.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchKey.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchService.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Watchable.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntry.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryFlag.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryPermission.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryType.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/Attributes.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileAttribute.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileOwnerAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreSpaceAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreSpaceAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/GroupPrincipal.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFilePermission.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFilePermissions.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipal.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipalLookupService.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipalNotFoundException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/package-info.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/package-info.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/AbstractPath.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/FileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/FileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/package-info.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/util/Scanner.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/util/concurrent/ScheduledThreadPoolExecutor.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaIODeleteOnExitAccess.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaNetGetIndexAccess.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaUtilConcurrentThreadPoolExecutorAccess.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/SharedSecrets.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AbstractFuture.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Cancellable.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/CompletedFuture.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ExtendedSocketOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/FileLockTable.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Groupable.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Invoker.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipKeyImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipRegistry.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/OptionKey.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/PendingFuture.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ThreadPool.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileStoreSpaceAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractNamedAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatchKey.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatchService.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Cancellable.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Globs.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/MimeType.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffer.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffers.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Reflect.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/META-INF/services/java.nio.file.spi.FileSystemProvider, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/README.txt, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarEntryInfo.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipEntryInfo.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFilePath.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStore.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStream.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystem.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipHeaderConstants.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipPathParser.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipUtils.java, + * overlays/nio2/openjdk/jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/aio/EchoServer.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/AclEdit.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Chmod.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Copy.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/DiskUsage.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/FileType.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/WatchDir.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Xdd.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/EPollPort.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/Port.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedAttributeView.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileStore.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNamedAttributeView.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisWatchService.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixChannelFactory.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixCopyFile.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixException.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileKey.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileModeAttribute.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileStoreAttributes.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystem.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixMountEntry.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUriUtils.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/EPollPort.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/SolarisEventPort.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisNativeDispatcher.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisWatchService.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixCopyFile.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genSolarisConstants.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/Iocp.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/PendingIoCache.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsChannelFactory.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsException.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileCopy.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileStore.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsLinkSupport.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNamedAttributeView.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPathParser.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPathType.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecurity.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUriSupport.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUserPrincipals.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsWatchService.java, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/Iocp.c, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousFileChannelImpl.c, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.c, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/RegistryFileTypeDetector.c, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c, + * overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/Sanity.java, + * overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/sanity.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/io/Inputs/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Attack.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Identity.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/PrivilegedThreadFactory.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Restart.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Unbounded.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Lock.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/MyThreadFactory.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Leaky.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/Channels/Basic2.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/CheckProvider.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/META-INF/services/java.nio.channels.spi.AsynchronousChannelProvider, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/Filters.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/SecureDS.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/FileStore/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/FileSystem/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/ContentType.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/CreateFileTree.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/ForceLoad.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/Misc.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/PrintFileTree.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/SimpleFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/SkipSiblings.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/TerminateWalk.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/content_type.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/walk_file_tree.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/CopyAndMove.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/DeleteOnClose.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/InterruptCopy.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/Links.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/Misc.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/PathOps.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/SBC.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/TemporaryFiles.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/UriImportExport.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/delete_on_close.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/temporary_files.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/PathMatcher/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/TestUtil.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/FileTreeModifier.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/WithSecurityManager.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/denyAll.policy, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirAndOneLevel.policy, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirAndTree.policy, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirOnly.policy, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/Attributes/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributeView/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/spi/SetDefaultProvider.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/spi/TestProvider.java: + Removed. + * patches/nio2.patch: Dropped. + * Makefile.am: + Remove ENABLE_NIO2 conditional blocks from + overlays, patch and rt. + * configure.ac: Remove --enable-nio2 option. + * NEWS: Mention removal. + +2012-01-06 Andrew John Hughes + + * NEWS: Fix formatting. + +2012-01-06 Andrew John Hughes + + * NEWS: + Add missing entries for 1.9.11, 1.8.11, 1.10.3, + 1.9.9 and 1.8.9. Remove duplicates in 1.11 listing. + +2012-01-03 Pavel Tisnovsky + + * Makefile.am: Fixed path to excludelist.jdk.jtx + file containing black list of JDK JTreg tests. + +2011-12-23 Andrew John Hughes + + * NEWS: Add RH bug number which alerted us to + the problem to the 7103725 backport. + +2011-12-22 Andrew John Hughes + + * Makefile.am: Add new patches. + * patches/openjdk/6851973-kerberos.patch, + * patches/openjdk/7091528-javadoc_class_files.patch, + * patches/openjdk/7103725-ssl_beast_regression.patch: + Add OpenJDK backports. + * NEWS: Updated. + 2011-12-22 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Safepoint): diff -r 4d6b4215b78f -r 79014132e844 Makefile.am --- a/Makefile.am Thu Dec 22 11:54:40 2011 -0500 +++ b/Makefile.am Tue Jan 10 16:47:52 2012 +0000 @@ -193,7 +193,9 @@ # Sources list REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java -JTREG_SRCS = $(top_srcdir)/src/jtreg +# Relative path to JTreg tool +JTREG_DIR = src/jtreg +JTREG_SRCS = $(top_srcdir)/$(JTREG_DIR) # Patch list @@ -398,7 +400,11 @@ patches/openjdk/7103224-glibc_name_collision.patch \ patches/arm-debug.patch \ patches/openjdk/683768-System-tray-icon.patch \ - patches/openjdk/7102369-7094468-rmiregistry.patch + patches/openjdk/7102369-7094468-rmiregistry.patch \ + patches/openjdk/6851973-kerberos.patch \ + patches/openjdk/7091528-javadoc_class_files.patch \ + patches/openjdk/7103725-ssl_beast_regression.patch \ + patches/openjdk/6706974-krb5_test_infrastructure.patch if WITH_RHINO ICEDTEA_PATCHES += \ @@ -429,10 +435,6 @@ patches/openjdk/7018387-xrender_gc_leak.patch endif -if ENABLE_NIO2 -ICEDTEA_PATCHES += patches/nio2.patch -endif - if ENABLE_SYSTEMTAP ICEDTEA_PATCHES += patches/systemtap.patch \ patches/systemtap-gcc-4.5.patch \ @@ -1200,9 +1202,6 @@ cp -a $(abs_top_srcdir)/overlays overlays.build chmod -R ug+rwX overlays.build cp -a overlays.build/openjdk/* openjdk/ From xerxes at zafena.se Tue Jan 10 09:11:17 2012 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Tue, 10 Jan 2012 18:11:17 +0100 Subject: ARM: Enable safepoints for JIT-compiled code In-Reply-To: <4F0C4BCF.1040102@redhat.com> References: <4F0C4BCF.1040102@redhat.com> Message-ID: <4F0C7135.1040409@zafena.se> 2012-01-10 15:31, Andrew Haley skrev: > I've found the bug that broke safepoints. It turns out that safepoints > do not convert a PC address to a bytecode index, so you have to set the > bytecode pointer explicitly whenever at a safepoint. I'm intend to apply > this to trunk and branch, given RM approval. > > Andrew. Thank you for making the garbage collector happy. one question and one suggestion inline below: > > 2012-01-09 Andrew Haley ... > > * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S > (method_entry_freq_count_overflow): Make sure self_link is set > when re-entering JIT-compiled code. > diff -r 4d6b4215b78f -r 57ae0e361acf arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S > --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Thu Dec 22 11:54:40 2011 -0500 > +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Jan 09 13:34:27 2012 -0500 > @@ -3371,6 +3371,7 @@ > #ifdef THUMB2EE > #define THUMB2_MAXLOCALS 1000 > call_thumb2: > + str istate, [istate, #ISTATE_SELF_LINK] What makes the self-link un-set? > diff -r 4d6b4215b78f -r 57ae0e361acf arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp > --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Dec 22 11:54:40 2011 -0500 > +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Jan 09 13:34:27 2012 -0500 > @@ -791,6 +791,9 @@ > } > #endif > > + fflush(stdout); > + fflush(stderr); > + > opcodes.init_disassemble_info(&info, stdout, (fprintf_ftype)fprintf); > info.arch = bfd_arch_arm; > opcodes.disassemble_init_for_target(&info); > @@ -950,6 +953,7 @@ > } > } > } > + fflush(stdout); > } > #endif Ok. > > @@ -4342,9 +4346,8 @@ > > // Insert code to poll the SafepointSynchronize state and call > // Helper_SafePoint. > -void Thumb2_Safepoint(Thumb2_Info *jinfo, int stackdepth) > -{ > -#if 0 // Causes maysterious segfaults > +void Thumb2_Safepoint(Thumb2_Info *jinfo, int stackdepth, int bci) > +{ > Thumb2_Flush(jinfo); > int r_tmp = Thumb2_Tmp(jinfo, 0); > mov_imm(jinfo->codebuf, r_tmp, (u32)SafepointSynchronize::address_of_state()); > @@ -4353,11 +4356,11 @@ > { > unsigned loc = forward_16(jinfo->codebuf); > Thumb2_save_locals(jinfo, stackdepth); > + mov_imm(jinfo->codebuf, ARM_R1, bci+CONSTMETHOD_CODEOFFSET); Can we improve this part and calculate bci+CONSTMETHOD_CODEOFFSET+METHOD_CONSTMETHOD here? to reduce jit code buffer usage, see below. > bl(jinfo->codebuf, handlers[H_SAFEPOINT]); > Thumb2_restore_locals(jinfo, stackdepth); > bcc_patch(jinfo->codebuf, COND_NE, loc); > } > -#endif > } > > int Thumb2_Branch(Thumb2_Info *jinfo, unsigned bci, unsigned cond, int stackdepth) > @@ -4369,7 +4372,7 @@ > > if (jinfo->bc_stackinfo[dest_taken] & BC_COMPILED) { > loc = forward_16(jinfo->codebuf); > - Thumb2_Safepoint(jinfo, stackdepth); > + Thumb2_Safepoint(jinfo, stackdepth, bci); ... > - Thumb2_Return(jinfo, opc_return); > + Thumb2_Return(jinfo, opc_return, bci); > break; > } > OK > @@ -7742,11 +7746,20 @@ > // H_SAFEPOINT > handlers[H_SAFEPOINT] = out_pos(&codebuf); > stm(&codebuf, (1< + > + // Set up BytecodeInterpreter->_bcp for the GC > + // bci+CONSTMETHOD_CODEOFFSET is passed in ARM_R1 > + ldr_imm(&codebuf, ARM_R0, Ristate, ISTATE_METHOD, 1, 0); > + ldr_imm(&codebuf, ARM_R0, ARM_R0, METHOD_CONSTMETHOD, 1, 0); > + add_reg(&codebuf, ARM_R0, ARM_R0, ARM_R1); since METHOD_CONSTMETHOD are constant and generaded by the asm_helper can we move this ldr_imm and add_reg to the Thumb2_Safepoint c++ function? > + str_imm(&codebuf, ARM_R0, Ristate, ISTATE_BCP, 1, 0); > + > mov_imm(&codebuf, ARM_IP, (u32)Helper_SafePoint); > mov_reg(&codebuf, ARM_R0, Rthread); > blx_reg(&codebuf, ARM_IP); > ldm(&codebuf, (1< cmp_imm(&codebuf, ARM_R0, 0); > + > // The sequence here is delicate. We need to seet things up so that > // it looks as though Thumb2_Handle_Exception_NoRegs was called > // directly from a compiled method. > @@ -7759,6 +7772,29 @@ > cb->hp += codebuf.idx * 2; > > thumb2_codebuf = cb; > + > +#if 0 // Disassemble the codebuf we just created. For debugging > + Opcodes opcodes; > + if (t2ee_print_disass) { > + struct disassemble_info info; > + info.arch = bfd_arch_arm; > + opcodes.disassemble_init_for_target(&info); > + opcodes.init_disassemble_info(&info, stdout, (fprintf_ftype)fprintf); > + info.endian = BFD_ENDIAN_LITTLE; > + info.endian_code = BFD_ENDIAN_LITTLE; > + info.buffer = (bfd_byte *)codebuf.codebuf; > + info.buffer_vma = (bfd_vma)codebuf.codebuf; > + info.buffer_length = codebuf.idx * sizeof(short); > + info.disassembler_options = (char *)"force-thumb"; > + int len; > + for (unsigned int i = 0; i < codebuf.idx * sizeof(short); i += len) { > + printf("0x%08x:\t", ((int)codebuf.codebuf)+i); > + len = opcodes.print_insn_little_arm(((bfd_vma)codebuf.codebuf)+i, &info); > + if (len == -1) len = 2; > + putchar('\n'); > + } > + } > +#endif > } > > #endif // THUMB2EE OK All in all good. Cheers Xerxes From aph at redhat.com Tue Jan 10 09:15:29 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 10 Jan 2012 17:15:29 +0000 Subject: ARM: Enable safepoints for JIT-compiled code In-Reply-To: <4F0C7135.1040409@zafena.se> References: <4F0C4BCF.1040102@redhat.com> <4F0C7135.1040409@zafena.se> Message-ID: <4F0C7231.9020403@redhat.com> On 01/10/2012 05:11 PM, Xerxes R?nby wrote: > 2012-01-10 15:31, Andrew Haley skrev: >> I've found the bug that broke safepoints. It turns out that safepoints >> do not convert a PC address to a bytecode index, so you have to set the >> bytecode pointer explicitly whenever at a safepoint. I'm intend to apply >> this to trunk and branch, given RM approval. >> >> Andrew. > > Thank you for making the garbage collector happy. > one question and one suggestion inline below: > >> >> 2012-01-09 Andrew Haley > ... >> >> * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S >> (method_entry_freq_count_overflow): Make sure self_link is set >> when re-entering JIT-compiled code. > >> diff -r 4d6b4215b78f -r 57ae0e361acf arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S >> --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Thu Dec 22 11:54:40 2011 -0500 >> +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Jan 09 13:34:27 2012 -0500 >> @@ -3371,6 +3371,7 @@ >> #ifdef THUMB2EE >> #define THUMB2_MAXLOCALS 1000 >> call_thumb2: >> + str istate, [istate, #ISTATE_SELF_LINK] > > What makes the self-link un-set? I have no idea. There are so many paths into compiled code, and not all of them set it. >> @@ -4342,9 +4346,8 @@ >> >> // Insert code to poll the SafepointSynchronize state and call >> // Helper_SafePoint. >> -void Thumb2_Safepoint(Thumb2_Info *jinfo, int stackdepth) >> -{ >> -#if 0 // Causes maysterious segfaults >> +void Thumb2_Safepoint(Thumb2_Info *jinfo, int stackdepth, int bci) >> +{ >> Thumb2_Flush(jinfo); >> int r_tmp = Thumb2_Tmp(jinfo, 0); >> mov_imm(jinfo->codebuf, r_tmp, (u32)SafepointSynchronize::address_of_state()); >> @@ -4353,11 +4356,11 @@ >> { >> unsigned loc = forward_16(jinfo->codebuf); >> Thumb2_save_locals(jinfo, stackdepth); >> + mov_imm(jinfo->codebuf, ARM_R1, bci+CONSTMETHOD_CODEOFFSET); > > Can we improve this part and calculate bci+CONSTMETHOD_CODEOFFSET+METHOD_CONSTMETHOD here? No. METHOD_CONSTMETHOD is an offset into the method structure; it's not added to the bci. >> @@ -7742,11 +7746,20 @@ >> // H_SAFEPOINT >> handlers[H_SAFEPOINT] = out_pos(&codebuf); >> stm(&codebuf, (1<> + >> + // Set up BytecodeInterpreter->_bcp for the GC >> + // bci+CONSTMETHOD_CODEOFFSET is passed in ARM_R1 >> + ldr_imm(&codebuf, ARM_R0, Ristate, ISTATE_METHOD, 1, 0); > >> + ldr_imm(&codebuf, ARM_R0, ARM_R0, METHOD_CONSTMETHOD, 1, 0); >> + add_reg(&codebuf, ARM_R0, ARM_R0, ARM_R1); > > since METHOD_CONSTMETHOD are constant and generaded by the asm_helper > can we move this ldr_imm and add_reg to the Thumb2_Safepoint c++ function? No, as above. Andrew. From dalibor.topic at oracle.com Tue Jan 10 09:51:16 2012 From: dalibor.topic at oracle.com (Dalibor Topic) Date: Tue, 10 Jan 2012 18:51:16 +0100 Subject: JDK 7u2 is now GA In-Reply-To: <8B0AF6D4-30CC-4D06-9315-41C1E9A830F3@oracle.com> References: <8B0AF6D4-30CC-4D06-9315-41C1E9A830F3@oracle.com> Message-ID: <4F0C7A94.5060902@oracle.com> On 12/13/11 9:56 PM, Edvard Wendelin wrote: > Hi, > > I'd like to announce that JDK 7u2 is now generally available [1]. We would like to thank all of you for the contributions you've made! The final build number of OpenJDK 7u2 is b13. OpenJDK source code is available on the Mercurial server [2] and we will also publish source drops in the near future. Once they are available I will send out a link. The source code zip file has been published at http://download.java.net/openjdk/jdk7u2/ . cheers, dalibor topic -- Oracle Dalibor Topic | Java F/OSS Ambassador Phone: +494023646738 | Mobile: +491772664192 Oracle Java Platform Group ORACLE Deutschland B.V. & Co. KG | Nagelsweg 55 | 20097 Hamburg ORACLE Deutschland B.V. & Co. KG Hauptverwaltung: Riesstr. 25, D-80992 M?nchen Registergericht: Amtsgericht M?nchen, HRA 95603 Gesch?ftsf?hrer: J?rgen Kunz Komplement?rin: ORACLE Deutschland Verwaltung B.V. Hertogswetering 163/167, 3543 AS Utrecht, Niederlande Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697 Gesch?ftsf?hrer: Alexander van der Ven, Astrid Kepper, Val Maher Green Oracle Oracle is committed to developing practices and products that help protect the environment From andrew at icedtea.classpath.org Wed Jan 11 04:01:40 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 11 Jan 2012 12:01:40 +0000 Subject: /hg/release/icedtea6-1.10: S6851973, PR830: ignore incoming chan... Message-ID: changeset fab44a791e0f in /hg/release/icedtea6-1.10 details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=fab44a791e0f author: Andrew John Hughes date: Wed Jan 11 12:01:29 2012 +0000 S6851973, PR830: ignore incoming channel binding if acceptor does not set one 2011-12-22 Andrew John Hughes * Makefile.am: Add new patch. * NEWS: Updated. * patches/openjdk/6851973-kerberos.patch: Add OpenJDK backport. diffstat: ChangeLog | 7 + Makefile.am | 3 +- NEWS | 1 + patches/openjdk/6851973-kerberos.patch | 200 +++++++++++++++++++++++++++++++++ 4 files changed, 210 insertions(+), 1 deletions(-) diffs (244 lines): diff -r 9316ce0e3600 -r fab44a791e0f ChangeLog --- a/ChangeLog Fri Jan 06 07:02:20 2012 +0000 +++ b/ChangeLog Wed Jan 11 12:01:29 2012 +0000 @@ -1,3 +1,10 @@ +2011-12-22 Andrew John Hughes + + * Makefile.am: Add new patch. + * NEWS: Updated. + * patches/openjdk/6851973-kerberos.patch: + Add OpenJDK backport. + 2011-12-22 Andrew John Hughes * Makefile.am: Add new patch. diff -r 9316ce0e3600 -r fab44a791e0f Makefile.am --- a/Makefile.am Fri Jan 06 07:02:20 2012 +0000 +++ b/Makefile.am Wed Jan 11 12:01:29 2012 +0000 @@ -367,7 +367,8 @@ patches/openjdk/7037939-hugepage.patch \ patches/openjdk/7043564-hugepage.patch \ patches/openjdk/7102369-7094468-rmiregistry.patch \ - patches/openjdk/7103725-ssl_beast_regression.patch + patches/openjdk/7103725-ssl_beast_regression.patch \ + patches/openjdk/6851973-kerberos.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r 9316ce0e3600 -r fab44a791e0f NEWS --- a/NEWS Fri Jan 06 07:02:20 2012 +0000 +++ b/NEWS Wed Jan 11 12:01:29 2012 +0000 @@ -17,6 +17,7 @@ - S7102369: remove java.rmi.server.codebase property parsing from registyimpl - S7094468: rmiregistry clean up - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one New in release 1.10.4 (2011-10-18): diff -r 9316ce0e3600 -r fab44a791e0f patches/openjdk/6851973-kerberos.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6851973-kerberos.patch Wed Jan 11 12:01:29 2012 +0000 @@ -0,0 +1,202 @@ +# HG changeset patch +# User weijun +# Date 1245405807 -28800 +# Node ID 37ed72fe7561c143a882d03944a7d2240cbafe89 +# Parent 81c176909720561ec1c44fa3d94b18845e350ee9 +6851973: ignore incoming channel binding if acceptor does not set one +Reviewed-by: valeriep + +diff -r 81c176909720 -r 37ed72fe7561 src/share/classes/sun/security/jgss/krb5/InitialToken.java +--- openjdk/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java Thu Jun 18 10:38:21 2009 -0400 ++++ openjdk/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java Fri Jun 19 18:03:27 2009 +0800 +@@ -33,6 +33,7 @@ + import java.net.Inet6Address; + import java.security.MessageDigest; + import java.security.NoSuchAlgorithmException; ++import java.util.Arrays; + import sun.security.krb5.*; + import sun.security.jgss.HttpCaller; + import sun.security.krb5.internal.Krb5; +@@ -219,43 +220,35 @@ + "Incorrect checksum"); + } + +- byte[] remoteBindingBytes = new byte[CHECKSUM_BINDINGS_SIZE]; +- System.arraycopy(checksumBytes, 4, remoteBindingBytes, 0, +- CHECKSUM_BINDINGS_SIZE); +- +- byte[] noBindings = new byte[CHECKSUM_BINDINGS_SIZE]; +- boolean tokenContainsBindings = +- (!java.util.Arrays.equals(noBindings, remoteBindingBytes)); +- + ChannelBinding localBindings = context.getChannelBinding(); + +- if (tokenContainsBindings || +- localBindings != null) { ++ // Ignore remote channel binding info when not requested at ++ // local side (RFC 4121 4.1.1.2: the acceptor MAY ignore...). ++ // ++ // All major krb5 implementors implement this "MAY", ++ // and some applications depend on it as a workaround ++ // for not having a way to negotiate the use of channel ++ // binding -- the initiator application always uses CB ++ // and hopes the acceptor will ignore the CB if the ++ // acceptor doesn't support CB. ++ if (localBindings != null) { ++ byte[] remoteBindingBytes = new byte[CHECKSUM_BINDINGS_SIZE]; ++ System.arraycopy(checksumBytes, 4, remoteBindingBytes, 0, ++ CHECKSUM_BINDINGS_SIZE); + +- boolean badBindings = false; +- String errorMessage = null; +- +- if (tokenContainsBindings && +- localBindings != null) { ++ byte[] noBindings = new byte[CHECKSUM_BINDINGS_SIZE]; ++ if (!Arrays.equals(noBindings, remoteBindingBytes)) { + byte[] localBindingsBytes = + computeChannelBinding(localBindings); +- // System.out.println("ChannelBinding hash: " +- // + getHexBytes(localBindingsBytes)); +- badBindings = +- (!java.util.Arrays.equals(localBindingsBytes, +- remoteBindingBytes)); +- errorMessage = "Bytes mismatch!"; +- } else if (localBindings == null) { +- errorMessage = "ChannelBinding not provided!"; +- badBindings = true; ++ if (!Arrays.equals(localBindingsBytes, ++ remoteBindingBytes)) { ++ throw new GSSException(GSSException.BAD_BINDINGS, -1, ++ "Bytes mismatch!"); ++ } + } else { +- errorMessage = "Token missing ChannelBinding!"; +- badBindings = true; ++ throw new GSSException(GSSException.BAD_BINDINGS, -1, ++ "Token missing ChannelBinding!"); + } +- +- if (badBindings) +- throw new GSSException(GSSException.BAD_BINDINGS, -1, +- errorMessage); + } + + flags = readLittleEndian(checksumBytes, 20, 4); +diff -r 81c176909720 -r 37ed72fe7561 test/sun/security/krb5/auto/IgnoreChannelBinding.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/sun/security/krb5/auto/IgnoreChannelBinding.java Fri Jun 19 18:03:27 2009 +0800 +@@ -0,0 +1,113 @@ ++/* ++ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. ++ */ ++ ++/* ++ * @test ++ * @bug 6851973 ++ * @summary ignore incoming channel binding if acceptor does not set one ++ */ ++ ++import java.net.InetAddress; ++import org.ietf.jgss.ChannelBinding; ++import org.ietf.jgss.GSSException; ++import sun.security.jgss.GSSUtil; ++ ++public class IgnoreChannelBinding { ++ ++ public static void main(String[] args) ++ throws Exception { ++ ++ new OneKDC(null).writeJAASConf(); ++ ++ Context c = Context.fromJAAS("client"); ++ Context s = Context.fromJAAS("server"); ++ ++ // All silent ++ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); ++ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); ++ Context.handshake(c, s); ++ ++ // Initiator req, acceptor ignore ++ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); ++ c.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[0] ++ )); ++ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); ++ Context.handshake(c, s); ++ ++ // Both req, and match ++ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); ++ c.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[0] ++ )); ++ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); ++ s.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[0] ++ )); ++ Context.handshake(c, s); ++ ++ // Both req, NOT match ++ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); ++ c.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[0] ++ )); ++ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); ++ s.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[1] // 0 -> 1 ++ )); ++ try { ++ Context.handshake(c, s); ++ throw new Exception("Acceptor should reject initiator"); ++ } catch (GSSException ge) { ++ // Expected bahavior ++ } ++ ++ // Acceptor req, reject ++ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); ++ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); ++ s.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[0] ++ )); ++ try { ++ Context.handshake(c, s); ++ throw new Exception("Acceptor should reject initiator"); ++ } catch (GSSException ge) { ++ // Expected bahavior ++ if (ge.getMajor() != GSSException.BAD_BINDINGS) { ++ throw ge; ++ } ++ } ++ } ++} From ptisnovs at icedtea.classpath.org Wed Jan 11 04:10:02 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 11 Jan 2012 12:10:02 +0000 Subject: /hg/gfx-test: 2012-01-11 Pavel Tisnovsky Message-ID: changeset a92f5b0ae82b in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=a92f5b0ae82b author: Pavel Tisnovsky date: Wed Jan 11 13:12:29 2012 +0100 2012-01-11 Pavel Tisnovsky * src/org/gfxtest/framework/ImageFactory.java: New class containing (ATM) one helper method used by BitBlt tests. * src/org/gfxtest/framework/ProceduralTextureFactory.java: Updated. * src/org/gfxtest/testsuites/BitBltBasicTests.java: Added two new tests. * Makefile: updated diffstat: ChangeLog | 10 ++ Makefile | 1 + src/org/gfxtest/framework/ImageFactory.java | 80 ++++++++++++++++ src/org/gfxtest/framework/ProceduralTextureFactory.java | 6 +- src/org/gfxtest/testsuites/BitBltBasicTests.java | 82 ++++++++++++++-- 5 files changed, 162 insertions(+), 17 deletions(-) diffs (344 lines): diff -r adb101be6e61 -r a92f5b0ae82b ChangeLog --- a/ChangeLog Tue Jan 10 11:03:38 2012 +0100 +++ b/ChangeLog Wed Jan 11 13:12:29 2012 +0100 @@ -1,3 +1,13 @@ +2012-01-11 Pavel Tisnovsky + * src/org/gfxtest/framework/ImageFactory.java: + New class containing (ATM) one helper method used by + BitBlt tests. + * src/org/gfxtest/framework/ProceduralTextureFactory.java: + Updated. + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Added two new tests. + * Makefile: updated + 2012-01-10 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r adb101be6e61 -r a92f5b0ae82b Makefile --- a/Makefile Tue Jan 10 11:03:38 2012 +0100 +++ b/Makefile Wed Jan 11 13:12:29 2012 +0100 @@ -89,6 +89,7 @@ $(CLASSES)/$(FRAMEWORK_DIR)/GfxTest.class \ $(CLASSES)/$(FRAMEWORK_DIR)/Log.class \ $(CLASSES)/$(FRAMEWORK_DIR)/ProceduralTextureFactory.class \ + $(CLASSES)/$(FRAMEWORK_DIR)/ImageFactory.class \ $(CLASSES)/$(IMAGE_DIFFER_DIR)/ComparisonResult.class \ $(CLASSES)/$(IMAGE_DIFFER_DIR)/Configuration.class \ $(CLASSES)/$(IMAGE_DIFFER_DIR)/ImageComparator.class \ diff -r adb101be6e61 -r a92f5b0ae82b src/org/gfxtest/framework/ImageFactory.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/framework/ImageFactory.java Wed Jan 11 13:12:29 2012 +0100 @@ -0,0 +1,80 @@ +/* + Java gfx-test framework + + Copyright (C) 2010, 2011, 2012 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.framework; + +import java.awt.image.BufferedImage; + + + +/** + * This class contains static method used for creating various procedural images + * which is used by (for example) BitBlt tests. + * + * @author Pavel Tisnovsky + */ +public class ImageFactory +{ + public static BufferedImage createCheckerImage(int gridSize, int width, int height, int imageType) + { + // used by test for a tile colors + int doubledGridSize = gridSize << 1; + + // create new texture instead + BufferedImage image = new BufferedImage(width, height, imageType); + + // for all lines in a raster image + for (int y = 0; y < height; y++) + { + // for all columns on a line + for (int x = 0; x < width; x++) + { + // compute color for each tile + boolean evenColumn = (x % doubledGridSize) >= gridSize; + boolean evenRow = (y % doubledGridSize) >= gridSize; + // compute color for each pixel + boolean whiteField = evenColumn ^ evenRow; + int color = whiteField ? 0x00ffffff: 0x00000000; + image.setRGB(x, y, color); + } + } + return image; + } +} diff -r adb101be6e61 -r a92f5b0ae82b src/org/gfxtest/framework/ProceduralTextureFactory.java --- a/src/org/gfxtest/framework/ProceduralTextureFactory.java Tue Jan 10 11:03:38 2012 +0100 +++ b/src/org/gfxtest/framework/ProceduralTextureFactory.java Wed Jan 11 13:12:29 2012 +0100 @@ -122,7 +122,7 @@ /** * Eight basic colors. */ - private static final int[] BASIC_COLORS = { + private static final int[] EIGHT_BASIC_COLOR_PALETTE = { 0xff000000, 0xff0000ff, 0xff00ffff, @@ -397,7 +397,7 @@ for (int y = 0; y < height; y++) { // compute color for each pixel - int color = BASIC_COLORS[y % 8]; + int color = EIGHT_BASIC_COLOR_PALETTE[y % 8]; // for all columns on a line for (int x = 0; x < width; x++) { @@ -434,7 +434,7 @@ for (int x = 0; x < width; x++) { // compute color for each pixel - int color = BASIC_COLORS[x % 8]; + int color = EIGHT_BASIC_COLOR_PALETTE[x % 8]; verticalColorStripesTexture.setRGB(x, y, color); } } diff -r adb101be6e61 -r a92f5b0ae82b src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Tue Jan 10 11:03:38 2012 +0100 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed Jan 11 13:12:29 2012 +0100 @@ -46,6 +46,7 @@ import org.gfxtest.framework.GfxTest; +import org.gfxtest.framework.ImageFactory; import org.gfxtest.framework.TestImage; import org.gfxtest.framework.annotations.GraphicsPrimitive; import org.gfxtest.framework.annotations.GraphicsPrimitives; @@ -74,6 +75,11 @@ public class BitBltBasicTests extends GfxTest { /** + * Grid size for images with checker pattern. + */ + private static final int GRID_SIZE = 20; + + /** * Width of tested buffered image. */ private final static int DEFAULT_TEST_IMAGE_WIDTH = 256; @@ -117,13 +123,13 @@ * Create new buffered image and then do basic BitBlt test. * * @param image - * image to which line is to be drawn + * image to which another image is to be drawn * @param graphics2d * graphics canvas * @param type * type of the created image */ - private TestResult doBitBltTest(TestImage image, Graphics2D graphics2d, int type) + private TestResult doBitBltTestWithEmptyImage(TestImage image, Graphics2D graphics2d, int type) { BufferedImage bufferedImage = createBufferedBitmap(type); if (bufferedImage == null) @@ -134,6 +140,26 @@ } /** + * Create new buffered image containing checker pattern and then do basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + */ + private TestResult doBitBltTestWithCheckerImage(TestImage image, Graphics2D graphics2d, int imageType) + { + BufferedImage bufferedImage = ImageFactory.createCheckerImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + if (bufferedImage == null) + { + return TestResult.FAILED; + } + return BitBlt(image, graphics2d, bufferedImage) ? TestResult.PASSED : TestResult.FAILED; + } + + /** * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. * * @param image @@ -144,7 +170,7 @@ */ public TestResult testBitBltEmptyBufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d) { - return doBitBltTest(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR); + return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR); } /** @@ -158,7 +184,7 @@ */ public TestResult testBitBltEmptyBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d) { - return doBitBltTest(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR); + return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR); } /** @@ -172,7 +198,7 @@ */ public TestResult testBitBltEmptyBufferedImageType4ByteABGR_Pre(TestImage image, Graphics2D graphics2d) { - return doBitBltTest(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); + return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); } /** @@ -186,7 +212,7 @@ */ public TestResult testBitBltEmptyBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) { - return doBitBltTest(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); } /** @@ -200,7 +226,7 @@ */ public TestResult testBitBltEmptyBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d) { - return doBitBltTest(image, graphics2d, BufferedImage.TYPE_INT_RGB); + return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_INT_RGB); } /** @@ -214,7 +240,7 @@ */ public TestResult testBitBltEmptyBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d) { - return doBitBltTest(image, graphics2d, BufferedImage.TYPE_INT_ARGB); + return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB); } /** @@ -228,7 +254,7 @@ */ public TestResult testBitBltEmptyBufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d) { - return doBitBltTest(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE); + return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE); } /** @@ -242,7 +268,7 @@ */ public TestResult testBitBltEmptyBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d) { - return doBitBltTest(image, graphics2d, BufferedImage.TYPE_INT_BGR); + return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_INT_BGR); } /** @@ -256,7 +282,7 @@ */ public TestResult testBitBltEmptyBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d) { - return doBitBltTest(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB); + return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB); } /** @@ -270,7 +296,7 @@ */ public TestResult testBitBltEmptyBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d) { - return doBitBltTest(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB); + return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB); } /** @@ -284,7 +310,7 @@ */ public TestResult testBitBltEmptyBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d) { - return doBitBltTest(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); + return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); } /** @@ -298,7 +324,35 @@ */ public TestResult testBitBltEmptyBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d) { - return doBitBltTest(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY); + return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltCheckerBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + return doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_RGB. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltCheckerBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d) + { + return doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_INT_RGB); } /** From ahughes at redhat.com Wed Jan 11 04:59:14 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 11 Jan 2012 12:59:14 +0000 Subject: /hg/icedtea6: 2 new changesets In-Reply-To: References: Message-ID: <20120111125914.GC31802@rivendell.middle-earth.co.uk> On 16:48 Tue 10 Jan , aph at icedtea.classpath.org wrote: > changeset 57ae0e361acf in /hg/icedtea6 > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=57ae0e361acf > author: aph > date: Mon Jan 09 13:34:27 2012 -0500 > > ARM: Enable safepoints for JIT-compiled code. 2012-01-09 Andrew > Haley > > * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp > (Thumb2_disass): Flush the output streams. > (Thumb2_Safepoint): Add the bci as a new argument. Pass it to > the safepoint handler. (Thumb2_Branch): Pass the bci to > Thumb2_Safepoint(). (Thumb2_Goto): Likewise. > (Thumb2_Return): Add the bci as a new argument. Pass it to > Thumb2_Safepoint(). Add braces for clarity. move > call to Thumb2_Safepoint() to point before retval is popped. > (Thumb2_codegen): Pass the bci to Thumb2_Return(). > (Thumb2_Initialize): Disassemble the codebuf we just created. > > * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S > (method_entry_freq_count_overflow): Make sure self_link is set > when re-entering JIT-compiled code. > > > changeset 79014132e844 in /hg/icedtea6 > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=79014132e844 > author: aph > date: Tue Jan 10 16:47:52 2012 +0000 > > merge > You should get into the habit of pulling before committing, so you don't get all these merge changesets. -- 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/20120111/43316843/attachment.bin From aph at icedtea.classpath.org Wed Jan 11 05:00:53 2012 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Wed, 11 Jan 2012 13:00:53 +0000 Subject: /hg/release/icedtea6-1.11: ARM: Enable safepoints for JIT-compil... Message-ID: changeset ec36b4069f06 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=ec36b4069f06 author: aph date: Mon Jan 09 13:34:27 2012 -0500 ARM: Enable safepoints for JIT-compiled code. 2012-01-09 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_disass): Flush the output streams. (Thumb2_Safepoint): Add the bci as a new argument. Pass it to the safepoint handler. (Thumb2_Branch): Pass the bci to Thumb2_Safepoint(). (Thumb2_Goto): Likewise. (Thumb2_Return): Add the bci as a new argument. Pass it to Thumb2_Safepoint(). Add braces for clarity. move call to Thumb2_Safepoint() to point before retval is popped. (Thumb2_codegen): Pass the bci to Thumb2_Return(). (Thumb2_Initialize): Disassemble the codebuf we just created. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (method_entry_freq_count_overflow): Make sure self_link is set when re-entering JIT-compiled code. diffstat: ChangeLog | 19 ++++++ arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 1 + arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 60 +++++++++++++++--- 3 files changed, 68 insertions(+), 12 deletions(-) diffs (211 lines): diff -r 7e179e0b02ca -r ec36b4069f06 ChangeLog --- a/ChangeLog Fri Jan 06 17:00:51 2012 -0500 +++ b/ChangeLog Mon Jan 09 13:34:27 2012 -0500 @@ -409,6 +409,25 @@ Add OpenJDK backports. * NEWS: Updated. +2012-01-09 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_disass): + Flush the output streams. + (Thumb2_Safepoint): Add the bci as a new argument. Pass it to + the safepoint handler. + (Thumb2_Branch): Pass the bci to Thumb2_Safepoint(). + (Thumb2_Goto): Likewise. + (Thumb2_Return): Add the bci as a new argument. Pass it to + Thumb2_Safepoint(). + Add braces for clarity. + move call to Thumb2_Safepoint() to point before retval is popped. + (Thumb2_codegen): Pass the bci to Thumb2_Return(). + (Thumb2_Initialize): Disassemble the codebuf we just created. + + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (method_entry_freq_count_overflow): Make sure self_link is set + when re-entering JIT-compiled code. + 2011-12-22 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Safepoint): diff -r 7e179e0b02ca -r ec36b4069f06 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Fri Jan 06 17:00:51 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Jan 09 13:34:27 2012 -0500 @@ -3371,6 +3371,7 @@ #ifdef THUMB2EE #define THUMB2_MAXLOCALS 1000 call_thumb2: + str istate, [istate, #ISTATE_SELF_LINK] mov ip, r1 sub r1, locals, #THUMB2_MAXLOCALS * 4 ldr r2, [istate, #ISTATE_THREAD] diff -r 7e179e0b02ca -r ec36b4069f06 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Fri Jan 06 17:00:51 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Jan 09 13:34:27 2012 -0500 @@ -791,6 +791,9 @@ } #endif + fflush(stdout); + fflush(stderr); + opcodes.init_disassemble_info(&info, stdout, (fprintf_ftype)fprintf); info.arch = bfd_arch_arm; opcodes.disassemble_init_for_target(&info); @@ -950,6 +953,7 @@ } } } + fflush(stdout); } #endif @@ -4342,9 +4346,8 @@ // Insert code to poll the SafepointSynchronize state and call // Helper_SafePoint. -void Thumb2_Safepoint(Thumb2_Info *jinfo, int stackdepth) -{ -#if 0 // Causes maysterious segfaults +void Thumb2_Safepoint(Thumb2_Info *jinfo, int stackdepth, int bci) +{ Thumb2_Flush(jinfo); int r_tmp = Thumb2_Tmp(jinfo, 0); mov_imm(jinfo->codebuf, r_tmp, (u32)SafepointSynchronize::address_of_state()); @@ -4353,11 +4356,11 @@ { unsigned loc = forward_16(jinfo->codebuf); Thumb2_save_locals(jinfo, stackdepth); + mov_imm(jinfo->codebuf, ARM_R1, bci+CONSTMETHOD_CODEOFFSET); bl(jinfo->codebuf, handlers[H_SAFEPOINT]); Thumb2_restore_locals(jinfo, stackdepth); bcc_patch(jinfo->codebuf, COND_NE, loc); } -#endif } int Thumb2_Branch(Thumb2_Info *jinfo, unsigned bci, unsigned cond, int stackdepth) @@ -4369,7 +4372,7 @@ if (jinfo->bc_stackinfo[dest_taken] & BC_COMPILED) { loc = forward_16(jinfo->codebuf); - Thumb2_Safepoint(jinfo, stackdepth); + Thumb2_Safepoint(jinfo, stackdepth, bci); branch_uncond(jinfo->codebuf, jinfo->bc_stackinfo[dest_taken] & ~BC_FLAGS_MASK); bcc_patch(jinfo->codebuf, NEG_COND(cond), loc); return dest_not_taken; @@ -4388,7 +4391,7 @@ unsigned loc; if (jinfo->bc_stackinfo[dest_taken] & BC_COMPILED) { - Thumb2_Safepoint(jinfo, stackdepth); + Thumb2_Safepoint(jinfo, stackdepth, bci); branch_uncond(jinfo->codebuf, jinfo->bc_stackinfo[dest_taken] & ~BC_FLAGS_MASK); return dest_not_taken; } @@ -4399,7 +4402,7 @@ return -1; } -void Thumb2_Return(Thumb2_Info *jinfo, unsigned opcode) +void Thumb2_Return(Thumb2_Info *jinfo, unsigned opcode, int bci) { Reg r_lo, r; Thumb2_Stack *jstack = jinfo->jstack; @@ -4467,6 +4470,8 @@ cbz_patch(jinfo->codebuf, ARM_R3, loc_success2); } + Thumb2_Safepoint(jinfo, 0, bci); + if (opcode != opc_return) { if (opcode == opc_lreturn || opcode == opc_dreturn) { Thumb2_Fill(jinfo, 2); @@ -4490,8 +4495,9 @@ if (opcode == opc_lreturn || opcode == opc_dreturn) { str_imm(jinfo->codebuf, r, Rstack, jinfo->method->max_locals() * sizeof(int), 1, 0); str_imm(jinfo->codebuf, r_lo, Rstack, jinfo->method->max_locals() * sizeof(int)-4, 1, 1); - } else + } else { str_imm(jinfo->codebuf, r, Rstack, jinfo->method->max_locals() * sizeof(int), 1, 1); + } } // sub_imm(jinfo->codebuf, Ristate, ARM_LR, ISTATE_NEXT_FRAME); @@ -4500,8 +4506,6 @@ Thumb2_Debug(jinfo, H_DEBUG_METHODEXIT); // enter_leave(jinfo->codebuf, 0); - Thumb2_Safepoint(jinfo, 0); - // deoptimized_frames = 0 // FIXME: This should be done in the slow entry, but only three // words are allocated there for the instructions. @@ -6354,7 +6358,7 @@ case opc_ireturn: case opc_freturn: case opc_areturn: - Thumb2_Return(jinfo, opcode); + Thumb2_Return(jinfo, opcode, bci); if (!jinfo->compiled_return) jinfo->compiled_return = bci; break; @@ -6389,7 +6393,7 @@ it(jinfo->codebuf, COND_NE, IT_MASK_T); bl(jinfo->codebuf, handlers[H_HANDLE_EXCEPTION]); bcc_patch(jinfo->codebuf, COND_EQ, loc_eq); - Thumb2_Return(jinfo, opc_return); + Thumb2_Return(jinfo, opc_return, bci); break; } @@ -7742,11 +7746,20 @@ // H_SAFEPOINT handlers[H_SAFEPOINT] = out_pos(&codebuf); stm(&codebuf, (1<_bcp for the GC + // bci+CONSTMETHOD_CODEOFFSET is passed in ARM_R1 + ldr_imm(&codebuf, ARM_R0, Ristate, ISTATE_METHOD, 1, 0); + ldr_imm(&codebuf, ARM_R0, ARM_R0, METHOD_CONSTMETHOD, 1, 0); + add_reg(&codebuf, ARM_R0, ARM_R0, ARM_R1); + str_imm(&codebuf, ARM_R0, Ristate, ISTATE_BCP, 1, 0); + mov_imm(&codebuf, ARM_IP, (u32)Helper_SafePoint); mov_reg(&codebuf, ARM_R0, Rthread); blx_reg(&codebuf, ARM_IP); ldm(&codebuf, (1<hp += codebuf.idx * 2; thumb2_codebuf = cb; + +#if 0 // Disassemble the codebuf we just created. For debugging + Opcodes opcodes; + if (t2ee_print_disass) { + struct disassemble_info info; + info.arch = bfd_arch_arm; + opcodes.disassemble_init_for_target(&info); + opcodes.init_disassemble_info(&info, stdout, (fprintf_ftype)fprintf); + info.endian = BFD_ENDIAN_LITTLE; + info.endian_code = BFD_ENDIAN_LITTLE; + info.buffer = (bfd_byte *)codebuf.codebuf; + info.buffer_vma = (bfd_vma)codebuf.codebuf; + info.buffer_length = codebuf.idx * sizeof(short); + info.disassembler_options = (char *)"force-thumb"; + int len; + for (unsigned int i = 0; i < codebuf.idx * sizeof(short); i += len) { + printf("0x%08x:\t", ((int)codebuf.codebuf)+i); + len = opcodes.print_insn_little_arm(((bfd_vma)codebuf.codebuf)+i, &info); + if (len == -1) len = 2; + putchar('\n'); + } + } +#endif } #endif // THUMB2EE From ahughes at redhat.com Wed Jan 11 05:05:48 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 11 Jan 2012 13:05:48 +0000 Subject: ARM: Enable safepoints for JIT-compiled code In-Reply-To: <4F0C4BCF.1040102@redhat.com> References: <4F0C4BCF.1040102@redhat.com> Message-ID: <20120111130548.GD31802@rivendell.middle-earth.co.uk> On 14:31 Tue 10 Jan , Andrew Haley wrote: > I've found the bug that broke safepoints. It turns out that safepoints > do not convert a PC address to a bytecode index, so you have to set the > bytecode pointer explicitly whenever at a safepoint. I'm intend to apply > this to trunk and branch, given RM approval. > Patches to branches require approval by one other developer, not specifically the release manager. In this case, I'd suggest someone else familiar with the ARM port gives backport approval, as seems to already be happening via Xerxes. > 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 -------------- 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/20120111/0f7e7d3b/attachment.bin From aph at redhat.com Wed Jan 11 05:11:59 2012 From: aph at redhat.com (Andrew Haley) Date: Wed, 11 Jan 2012 13:11:59 +0000 Subject: ARM: Enable safepoints for JIT-compiled code In-Reply-To: <20120111130548.GD31802@rivendell.middle-earth.co.uk> References: <4F0C4BCF.1040102@redhat.com> <20120111130548.GD31802@rivendell.middle-earth.co.uk> Message-ID: <4F0D8A9F.1030509@redhat.com> On 01/11/2012 01:05 PM, Dr Andrew John Hughes wrote: > On 14:31 Tue 10 Jan , Andrew Haley wrote: >> I've found the bug that broke safepoints. It turns out that safepoints >> do not convert a PC address to a bytecode index, so you have to set the >> bytecode pointer explicitly whenever at a safepoint. I'm intend to apply >> this to trunk and branch, given RM approval. >> > > Patches to branches require approval by one other developer, not specifically > the release manager. They require at least RM approval, for the obvious practical reasons. It doesn't make much sense for technical reviews (for correctness, appropriateness, and so on) to be done on the release branch patches: that should get done on trunk. The only matter for the branch is whether that patch is appropriate for the branch. Andrew. From ahughes at redhat.com Wed Jan 11 05:26:03 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 11 Jan 2012 13:26:03 +0000 Subject: ARM: Enable safepoints for JIT-compiled code In-Reply-To: <4F0D8A9F.1030509@redhat.com> References: <4F0C4BCF.1040102@redhat.com> <20120111130548.GD31802@rivendell.middle-earth.co.uk> <4F0D8A9F.1030509@redhat.com> Message-ID: <20120111132603.GE31802@rivendell.middle-earth.co.uk> On 13:11 Wed 11 Jan , Andrew Haley wrote: > On 01/11/2012 01:05 PM, Dr Andrew John Hughes wrote: > > On 14:31 Tue 10 Jan , Andrew Haley wrote: > >> I've found the bug that broke safepoints. It turns out that safepoints > >> do not convert a PC address to a bytecode index, so you have to set the > >> bytecode pointer explicitly whenever at a safepoint. I'm intend to apply > >> this to trunk and branch, given RM approval. > >> > > > > Patches to branches require approval by one other developer, not specifically > > the release manager. > > They require at least RM approval, for the obvious practical reasons. > I'm not sure what 'obvious practical reasons' you're referring to, but no they don't, and haven't for about the last two years. It would have been a tremendous bottleneck if this was the case. Also what happens in the case that the maintainer of the branch submits a patch? Should they get the right to dump whatever they want on the branch, but block the work of others? I don't think that's fair, which is why all release patches have required approval by another developer, regardless of author, for some time. > It doesn't make much sense for technical reviews (for correctness, > appropriateness, and so on) to be done on the release branch patches: > that should get done on trunk. This doesn't happen. It would be nice if it did, but it just doesn't on IcedTea. We do seem to have managed it with IcedTea-Web, mainly because it was there from the start, but there's also a smaller pool of committers there (mainly Deepak, Omair and Jiri from what I've seen). > The only matter for the branch is > whether that patch is appropriate for the branch. This we agree on. But that obviously requires understanding the impact of said patch. > > 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 -------------- 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/20120111/721b452f/attachment.bin From andrew at icedtea.classpath.org Wed Jan 11 05:29:04 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 11 Jan 2012 13:29:04 +0000 Subject: /hg/release/icedtea6-1.9: S6851973, PR830: ignore incoming chann... Message-ID: changeset a59a7c9e0f8b in /hg/release/icedtea6-1.9 details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=a59a7c9e0f8b author: Andrew John Hughes date: Wed Jan 11 12:01:29 2012 +0000 S6851973, PR830: ignore incoming channel binding if acceptor does not set one 2011-12-22 Andrew John Hughes * Makefile.am: Add new patch. * NEWS: Updated. * patches/openjdk/6851973-kerberos.patch: Add OpenJDK backport. diffstat: ChangeLog | 7 + Makefile.am | 3 +- NEWS | 1 + patches/openjdk/6851973-kerberos.patch | 200 +++++++++++++++++++++++++++++++++ 4 files changed, 210 insertions(+), 1 deletions(-) diffs (244 lines): diff -r 740d04cb2b9a -r a59a7c9e0f8b ChangeLog --- a/ChangeLog Fri Jan 06 13:17:57 2012 +0000 +++ b/ChangeLog Wed Jan 11 12:01:29 2012 +0000 @@ -1,3 +1,10 @@ +2011-12-22 Andrew John Hughes + + * Makefile.am: Add new patch. + * NEWS: Updated. + * patches/openjdk/6851973-kerberos.patch: + Add OpenJDK backport. + 2011-12-22 Andrew John Hughes * Makefile.am: Add new patch. diff -r 740d04cb2b9a -r a59a7c9e0f8b Makefile.am --- a/Makefile.am Fri Jan 06 13:17:57 2012 +0000 +++ b/Makefile.am Wed Jan 11 12:01:29 2012 +0000 @@ -370,7 +370,8 @@ patches/support_linux_3.patch \ patches/libpng-1.5.patch \ patches/openjdk/7102369-7094468-rmiregistry.patch \ - patches/openjdk/7103725-ssl_beast_regression.patch + patches/openjdk/7103725-ssl_beast_regression.patch \ + patches/openjdk/6851973-kerberos.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r 740d04cb2b9a -r a59a7c9e0f8b NEWS --- a/NEWS Fri Jan 06 13:17:57 2012 +0000 +++ b/NEWS Wed Jan 11 12:01:29 2012 +0000 @@ -14,6 +14,7 @@ - S7102369: remove java.rmi.server.codebase property parsing from registyimpl - S7094468: rmiregistry clean up - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one New in release 1.9.11 (2011-11-08): diff -r 740d04cb2b9a -r a59a7c9e0f8b patches/openjdk/6851973-kerberos.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6851973-kerberos.patch Wed Jan 11 12:01:29 2012 +0000 @@ -0,0 +1,202 @@ +# HG changeset patch +# User weijun +# Date 1245405807 -28800 +# Node ID 37ed72fe7561c143a882d03944a7d2240cbafe89 +# Parent 81c176909720561ec1c44fa3d94b18845e350ee9 +6851973: ignore incoming channel binding if acceptor does not set one +Reviewed-by: valeriep + +diff -r 81c176909720 -r 37ed72fe7561 src/share/classes/sun/security/jgss/krb5/InitialToken.java +--- openjdk/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java Thu Jun 18 10:38:21 2009 -0400 ++++ openjdk/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java Fri Jun 19 18:03:27 2009 +0800 +@@ -33,6 +33,7 @@ + import java.net.Inet6Address; + import java.security.MessageDigest; + import java.security.NoSuchAlgorithmException; ++import java.util.Arrays; + import sun.security.krb5.*; + import sun.security.jgss.HttpCaller; + import sun.security.krb5.internal.Krb5; +@@ -219,43 +220,35 @@ + "Incorrect checksum"); + } + +- byte[] remoteBindingBytes = new byte[CHECKSUM_BINDINGS_SIZE]; +- System.arraycopy(checksumBytes, 4, remoteBindingBytes, 0, +- CHECKSUM_BINDINGS_SIZE); +- +- byte[] noBindings = new byte[CHECKSUM_BINDINGS_SIZE]; +- boolean tokenContainsBindings = +- (!java.util.Arrays.equals(noBindings, remoteBindingBytes)); +- + ChannelBinding localBindings = context.getChannelBinding(); + +- if (tokenContainsBindings || +- localBindings != null) { ++ // Ignore remote channel binding info when not requested at ++ // local side (RFC 4121 4.1.1.2: the acceptor MAY ignore...). ++ // ++ // All major krb5 implementors implement this "MAY", ++ // and some applications depend on it as a workaround ++ // for not having a way to negotiate the use of channel ++ // binding -- the initiator application always uses CB ++ // and hopes the acceptor will ignore the CB if the ++ // acceptor doesn't support CB. ++ if (localBindings != null) { ++ byte[] remoteBindingBytes = new byte[CHECKSUM_BINDINGS_SIZE]; ++ System.arraycopy(checksumBytes, 4, remoteBindingBytes, 0, ++ CHECKSUM_BINDINGS_SIZE); + +- boolean badBindings = false; +- String errorMessage = null; +- +- if (tokenContainsBindings && +- localBindings != null) { ++ byte[] noBindings = new byte[CHECKSUM_BINDINGS_SIZE]; ++ if (!Arrays.equals(noBindings, remoteBindingBytes)) { + byte[] localBindingsBytes = + computeChannelBinding(localBindings); +- // System.out.println("ChannelBinding hash: " +- // + getHexBytes(localBindingsBytes)); +- badBindings = +- (!java.util.Arrays.equals(localBindingsBytes, +- remoteBindingBytes)); +- errorMessage = "Bytes mismatch!"; +- } else if (localBindings == null) { +- errorMessage = "ChannelBinding not provided!"; +- badBindings = true; ++ if (!Arrays.equals(localBindingsBytes, ++ remoteBindingBytes)) { ++ throw new GSSException(GSSException.BAD_BINDINGS, -1, ++ "Bytes mismatch!"); ++ } + } else { +- errorMessage = "Token missing ChannelBinding!"; +- badBindings = true; ++ throw new GSSException(GSSException.BAD_BINDINGS, -1, ++ "Token missing ChannelBinding!"); + } +- +- if (badBindings) +- throw new GSSException(GSSException.BAD_BINDINGS, -1, +- errorMessage); + } + + flags = readLittleEndian(checksumBytes, 20, 4); +diff -r 81c176909720 -r 37ed72fe7561 test/sun/security/krb5/auto/IgnoreChannelBinding.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/sun/security/krb5/auto/IgnoreChannelBinding.java Fri Jun 19 18:03:27 2009 +0800 +@@ -0,0 +1,113 @@ ++/* ++ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. ++ */ ++ ++/* ++ * @test ++ * @bug 6851973 ++ * @summary ignore incoming channel binding if acceptor does not set one ++ */ ++ ++import java.net.InetAddress; ++import org.ietf.jgss.ChannelBinding; ++import org.ietf.jgss.GSSException; ++import sun.security.jgss.GSSUtil; ++ ++public class IgnoreChannelBinding { ++ ++ public static void main(String[] args) ++ throws Exception { ++ ++ new OneKDC(null).writeJAASConf(); ++ ++ Context c = Context.fromJAAS("client"); ++ Context s = Context.fromJAAS("server"); ++ ++ // All silent ++ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); ++ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); ++ Context.handshake(c, s); ++ ++ // Initiator req, acceptor ignore ++ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); ++ c.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[0] ++ )); ++ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); ++ Context.handshake(c, s); ++ ++ // Both req, and match ++ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); ++ c.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[0] ++ )); ++ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); ++ s.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[0] ++ )); ++ Context.handshake(c, s); ++ ++ // Both req, NOT match ++ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); ++ c.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[0] ++ )); ++ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); ++ s.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[1] // 0 -> 1 ++ )); ++ try { ++ Context.handshake(c, s); ++ throw new Exception("Acceptor should reject initiator"); ++ } catch (GSSException ge) { ++ // Expected bahavior ++ } ++ ++ // Acceptor req, reject ++ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); ++ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); ++ s.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[0] ++ )); ++ try { ++ Context.handshake(c, s); ++ throw new Exception("Acceptor should reject initiator"); ++ } catch (GSSException ge) { ++ // Expected bahavior ++ if (ge.getMajor() != GSSException.BAD_BINDINGS) { ++ throw ge; ++ } ++ } ++ } ++} From aph at redhat.com Wed Jan 11 05:32:50 2012 From: aph at redhat.com (Andrew Haley) Date: Wed, 11 Jan 2012 13:32:50 +0000 Subject: ARM: Enable safepoints for JIT-compiled code In-Reply-To: <20120111132603.GE31802@rivendell.middle-earth.co.uk> References: <4F0C4BCF.1040102@redhat.com> <20120111130548.GD31802@rivendell.middle-earth.co.uk> <4F0D8A9F.1030509@redhat.com> <20120111132603.GE31802@rivendell.middle-earth.co.uk> Message-ID: <4F0D8F82.9020103@redhat.com> On 01/11/2012 01:26 PM, Dr Andrew John Hughes wrote: > On 13:11 Wed 11 Jan , Andrew Haley wrote: >> On 01/11/2012 01:05 PM, Dr Andrew John Hughes wrote: >>> On 14:31 Tue 10 Jan , Andrew Haley wrote: >>>> I've found the bug that broke safepoints. It turns out that safepoints >>>> do not convert a PC address to a bytecode index, so you have to set the >>>> bytecode pointer explicitly whenever at a safepoint. I'm intend to apply >>>> this to trunk and branch, given RM approval. >>> >>> Patches to branches require approval by one other developer, not specifically >>> the release manager. >> >> They require at least RM approval, for the obvious practical reasons. > I'm not sure what 'obvious practical reasons' you're referring to, > but no they don't, and haven't for about the last two years. It > would have been a tremendous bottleneck if this was the case. The business of doing a release branch requires co-ordination of testing and patches. The RM knows about the testing cycle, and needs to know when patches get committed, in order to synchronize the test cycle. > Also what happens in the case that the maintainer of the branch > submits a patch? Should they get the right to dump whatever they > want on the branch, but block the work of others? The RM is the maintainer of the branch. It's their baby. It's a given that we trust them to do the right thing. I take it for granted that no RM will ever block the work of others. >> It doesn't make much sense for technical reviews (for correctness, >> appropriateness, and so on) to be done on the release branch patches: >> that should get done on trunk. > > This doesn't happen. It would be nice if it did, but it just > doesn't on IcedTea. It's still the right place to do it. >> The only matter for the branch is >> whether that patch is appropriate for the branch. > > This we agree on. But that obviously requires understanding the > impact of said patch. Of course. Andrew. From bugzilla-daemon at icedtea.classpath.org Wed Jan 11 06:56:12 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 11 Jan 2012 14:56:12 +0000 Subject: [Bug 811] javaws is not handling urls with spaces correctly In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=811 Jimmy changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jivedude at gmail.com --- Comment #1 from Jimmy 2012-01-11 14:56:12 UTC --- This also affect urls with ampersands eg. in urls with request parameters. If invoked through a webbrowser this works fine, but if executed through the commandline the request params are not send too the server. I think this could be the same problem as with the spaces the url is not properly encoded. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ahughes at redhat.com Wed Jan 11 07:48:29 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 11 Jan 2012 15:48:29 +0000 Subject: ARM: Enable safepoints for JIT-compiled code In-Reply-To: <4F0D8F82.9020103@redhat.com> References: <4F0C4BCF.1040102@redhat.com> <20120111130548.GD31802@rivendell.middle-earth.co.uk> <4F0D8A9F.1030509@redhat.com> <20120111132603.GE31802@rivendell.middle-earth.co.uk> <4F0D8F82.9020103@redhat.com> Message-ID: <20120111154829.GB28950@rivendell.middle-earth.co.uk> On 13:32 Wed 11 Jan , Andrew Haley wrote: > On 01/11/2012 01:26 PM, Dr Andrew John Hughes wrote: > > On 13:11 Wed 11 Jan , Andrew Haley wrote: > >> On 01/11/2012 01:05 PM, Dr Andrew John Hughes wrote: > >>> On 14:31 Tue 10 Jan , Andrew Haley wrote: > >>>> I've found the bug that broke safepoints. It turns out that safepoints > >>>> do not convert a PC address to a bytecode index, so you have to set the > >>>> bytecode pointer explicitly whenever at a safepoint. I'm intend to apply > >>>> this to trunk and branch, given RM approval. > >>> > >>> Patches to branches require approval by one other developer, not specifically > >>> the release manager. > >> > >> They require at least RM approval, for the obvious practical reasons. > > > I'm not sure what 'obvious practical reasons' you're referring to, > > but no they don't, and haven't for about the last two years. It > > would have been a tremendous bottleneck if this was the case. > > The business of doing a release branch requires co-ordination of testing > and patches. The RM knows about the testing cycle, and needs to know > when patches get committed, in order to synchronize the test cycle. > Knowing when patches are committed doesn't require them having sole say over approval. > > Also what happens in the case that the maintainer of the branch > > submits a patch? Should they get the right to dump whatever they > > want on the branch, but block the work of others? > > The RM is the maintainer of the branch. It's their baby. It's a > given that we trust them to do the right thing. I take it for granted > that no RM will ever block the work of others. > Not purposefully maybe, but it does occur as a result of having one person as a bottleneck for release branch approvals, especially when we have people working in different timezones. That's why I allow others to approve patches for the release branches I maintain and it hasn't caused any noticeable problems. On the contrary, it's solved the problem of patches getting held up awaiting approval. To continue the baby analogy, think of it as me allowing relatives or childminders to also look after it. In some cases, Granny might know best what to do as she's spent a lifetime hacking on ARM architectures... > >> It doesn't make much sense for technical reviews (for correctness, > >> appropriateness, and so on) to be done on the release branch patches: > >> that should get done on trunk. > > > > This doesn't happen. It would be nice if it did, but it just > > doesn't on IcedTea. > > It's still the right place to do it. I concur. It even says as much here: "The following cases are exempt from review: Trivial fixes Typos, spelling mistakes Forgetting to add a required file in a previous commit Commits to IcedTea6 HEAD (for legacy reasons) Commits to IcedTea7 HEAD / forest prior to 2.0 For the latter two cases, we strongly recommend that reviews are requested, even though they are not required at present." http://icedtea.classpath.org/wiki/CommitPolicy Note that this does suggest that we'd enforce it on 7 post-2.0. This is something we need to discuss separately. > > 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 -------------- 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/20120111/11907a0a/attachment.bin From aph at redhat.com Wed Jan 11 07:55:08 2012 From: aph at redhat.com (Andrew Haley) Date: Wed, 11 Jan 2012 15:55:08 +0000 Subject: ARM: Enable safepoints for JIT-compiled code In-Reply-To: <20120111154829.GB28950@rivendell.middle-earth.co.uk> References: <4F0C4BCF.1040102@redhat.com> <20120111130548.GD31802@rivendell.middle-earth.co.uk> <4F0D8A9F.1030509@redhat.com> <20120111132603.GE31802@rivendell.middle-earth.co.uk> <4F0D8F82.9020103@redhat.com> <20120111154829.GB28950@rivendell.middle-earth.co.uk> Message-ID: <4F0DB0DC.5090407@redhat.com> On 01/11/2012 03:48 PM, Dr Andrew John Hughes wrote: > On 13:32 Wed 11 Jan , Andrew Haley wrote: >> On 01/11/2012 01:26 PM, Dr Andrew John Hughes wrote: >>> On 13:11 Wed 11 Jan , Andrew Haley wrote: >>>> On 01/11/2012 01:05 PM, Dr Andrew John Hughes wrote: >>>>> On 14:31 Tue 10 Jan , Andrew Haley wrote: >>>>>> I've found the bug that broke safepoints. It turns out that safepoints >>>>>> do not convert a PC address to a bytecode index, so you have to set the >>>>>> bytecode pointer explicitly whenever at a safepoint. I'm intend to apply >>>>>> this to trunk and branch, given RM approval. >>>>> >>>>> Patches to branches require approval by one other developer, not specifically >>>>> the release manager. >>>> >>>> They require at least RM approval, for the obvious practical reasons. >> >>> I'm not sure what 'obvious practical reasons' you're referring to, >>> but no they don't, and haven't for about the last two years. It >>> would have been a tremendous bottleneck if this was the case. >> >> The business of doing a release branch requires co-ordination of testing >> and patches. The RM knows about the testing cycle, and needs to know >> when patches get committed, in order to synchronize the test cycle. > > Knowing when patches are committed doesn't require them having sole > say over approval. Indeed not, but if a patch is good enough for trunk and submitted for branch, the RM is at the helm. Of course, the RM will solicit consensus. >>> Also what happens in the case that the maintainer of the branch >>> submits a patch? Should they get the right to dump whatever they >>> want on the branch, but block the work of others? >> >> The RM is the maintainer of the branch. It's their baby. It's a >> given that we trust them to do the right thing. I take it for granted >> that no RM will ever block the work of others. > > Not purposefully maybe, but it does occur as a result of having one > person as a bottleneck for release branch approvals, especially when > we have people working in different timezones. That's why I allow > others to approve patches for the release branches I maintain and it > hasn't caused any noticeable problems. On the contrary, it's solved > the problem of patches getting held up awaiting approval. Fair enough: it's up to the RM to decide to allow that. Andrew. From andrew at icedtea.classpath.org Wed Jan 11 08:00:51 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 11 Jan 2012 16:00:51 +0000 Subject: /hg/release/icedtea6-1.8: S6851973, PR830: ignore incoming chann... Message-ID: changeset c7e5b058721a in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=c7e5b058721a author: Andrew John Hughes date: Wed Jan 11 12:01:29 2012 +0000 S6851973, PR830: ignore incoming channel binding if acceptor does not set one 2011-12-22 Andrew John Hughes * Makefile.am: Add new patch. * NEWS: Updated. * patches/openjdk/6851973-kerberos.patch: Add OpenJDK backport. diffstat: ChangeLog | 7 + Makefile.am | 3 +- NEWS | 1 + patches/openjdk/6851973-kerberos.patch | 200 +++++++++++++++++++++++++++++++++ 4 files changed, 210 insertions(+), 1 deletions(-) diffs (244 lines): diff -r e7e4c22d1946 -r c7e5b058721a ChangeLog --- a/ChangeLog Fri Jan 06 13:17:57 2012 +0000 +++ b/ChangeLog Wed Jan 11 12:01:29 2012 +0000 @@ -1,3 +1,10 @@ +2011-12-22 Andrew John Hughes + + * Makefile.am: Add new patch. + * NEWS: Updated. + * patches/openjdk/6851973-kerberos.patch: + Add OpenJDK backport. + 2011-12-22 Andrew John Hughes * Makefile.am: Add new patch. diff -r e7e4c22d1946 -r c7e5b058721a Makefile.am --- a/Makefile.am Fri Jan 06 13:17:57 2012 +0000 +++ b/Makefile.am Wed Jan 11 12:01:29 2012 +0000 @@ -403,7 +403,8 @@ patches/support_linux_3.patch \ patches/libpng-1.5.patch \ patches/openjdk/7102369-7094468-rmiregistry.patch \ - patches/openjdk/7103725-ssl_beast_regression.patch + patches/openjdk/7103725-ssl_beast_regression.patch \ + patches/openjdk/6851973-kerberos.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \ diff -r e7e4c22d1946 -r c7e5b058721a NEWS --- a/NEWS Fri Jan 06 13:17:57 2012 +0000 +++ b/NEWS Wed Jan 11 12:01:29 2012 +0000 @@ -14,6 +14,7 @@ - S7102369: remove java.rmi.server.codebase property parsing from registyimpl - S7094468: rmiregistry clean up - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one New in release 1.8.11 (2011-11-08): diff -r e7e4c22d1946 -r c7e5b058721a patches/openjdk/6851973-kerberos.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6851973-kerberos.patch Wed Jan 11 12:01:29 2012 +0000 @@ -0,0 +1,202 @@ +# HG changeset patch +# User weijun +# Date 1245405807 -28800 +# Node ID 37ed72fe7561c143a882d03944a7d2240cbafe89 +# Parent 81c176909720561ec1c44fa3d94b18845e350ee9 +6851973: ignore incoming channel binding if acceptor does not set one +Reviewed-by: valeriep + +diff -r 81c176909720 -r 37ed72fe7561 src/share/classes/sun/security/jgss/krb5/InitialToken.java +--- openjdk/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java Thu Jun 18 10:38:21 2009 -0400 ++++ openjdk/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java Fri Jun 19 18:03:27 2009 +0800 +@@ -33,6 +33,7 @@ + import java.net.Inet6Address; + import java.security.MessageDigest; + import java.security.NoSuchAlgorithmException; ++import java.util.Arrays; + import sun.security.krb5.*; + import sun.security.jgss.HttpCaller; + import sun.security.krb5.internal.Krb5; +@@ -219,43 +220,35 @@ + "Incorrect checksum"); + } + +- byte[] remoteBindingBytes = new byte[CHECKSUM_BINDINGS_SIZE]; +- System.arraycopy(checksumBytes, 4, remoteBindingBytes, 0, +- CHECKSUM_BINDINGS_SIZE); +- +- byte[] noBindings = new byte[CHECKSUM_BINDINGS_SIZE]; +- boolean tokenContainsBindings = +- (!java.util.Arrays.equals(noBindings, remoteBindingBytes)); +- + ChannelBinding localBindings = context.getChannelBinding(); + +- if (tokenContainsBindings || +- localBindings != null) { ++ // Ignore remote channel binding info when not requested at ++ // local side (RFC 4121 4.1.1.2: the acceptor MAY ignore...). ++ // ++ // All major krb5 implementors implement this "MAY", ++ // and some applications depend on it as a workaround ++ // for not having a way to negotiate the use of channel ++ // binding -- the initiator application always uses CB ++ // and hopes the acceptor will ignore the CB if the ++ // acceptor doesn't support CB. ++ if (localBindings != null) { ++ byte[] remoteBindingBytes = new byte[CHECKSUM_BINDINGS_SIZE]; ++ System.arraycopy(checksumBytes, 4, remoteBindingBytes, 0, ++ CHECKSUM_BINDINGS_SIZE); + +- boolean badBindings = false; +- String errorMessage = null; +- +- if (tokenContainsBindings && +- localBindings != null) { ++ byte[] noBindings = new byte[CHECKSUM_BINDINGS_SIZE]; ++ if (!Arrays.equals(noBindings, remoteBindingBytes)) { + byte[] localBindingsBytes = + computeChannelBinding(localBindings); +- // System.out.println("ChannelBinding hash: " +- // + getHexBytes(localBindingsBytes)); +- badBindings = +- (!java.util.Arrays.equals(localBindingsBytes, +- remoteBindingBytes)); +- errorMessage = "Bytes mismatch!"; +- } else if (localBindings == null) { +- errorMessage = "ChannelBinding not provided!"; +- badBindings = true; ++ if (!Arrays.equals(localBindingsBytes, ++ remoteBindingBytes)) { ++ throw new GSSException(GSSException.BAD_BINDINGS, -1, ++ "Bytes mismatch!"); ++ } + } else { +- errorMessage = "Token missing ChannelBinding!"; +- badBindings = true; ++ throw new GSSException(GSSException.BAD_BINDINGS, -1, ++ "Token missing ChannelBinding!"); + } +- +- if (badBindings) +- throw new GSSException(GSSException.BAD_BINDINGS, -1, +- errorMessage); + } + + flags = readLittleEndian(checksumBytes, 20, 4); +diff -r 81c176909720 -r 37ed72fe7561 test/sun/security/krb5/auto/IgnoreChannelBinding.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/sun/security/krb5/auto/IgnoreChannelBinding.java Fri Jun 19 18:03:27 2009 +0800 +@@ -0,0 +1,113 @@ ++/* ++ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. ++ */ ++ ++/* ++ * @test ++ * @bug 6851973 ++ * @summary ignore incoming channel binding if acceptor does not set one ++ */ ++ ++import java.net.InetAddress; ++import org.ietf.jgss.ChannelBinding; ++import org.ietf.jgss.GSSException; ++import sun.security.jgss.GSSUtil; ++ ++public class IgnoreChannelBinding { ++ ++ public static void main(String[] args) ++ throws Exception { ++ ++ new OneKDC(null).writeJAASConf(); ++ ++ Context c = Context.fromJAAS("client"); ++ Context s = Context.fromJAAS("server"); ++ ++ // All silent ++ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); ++ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); ++ Context.handshake(c, s); ++ ++ // Initiator req, acceptor ignore ++ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); ++ c.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[0] ++ )); ++ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); ++ Context.handshake(c, s); ++ ++ // Both req, and match ++ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); ++ c.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[0] ++ )); ++ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); ++ s.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[0] ++ )); ++ Context.handshake(c, s); ++ ++ // Both req, NOT match ++ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); ++ c.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[0] ++ )); ++ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); ++ s.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[1] // 0 -> 1 ++ )); ++ try { ++ Context.handshake(c, s); ++ throw new Exception("Acceptor should reject initiator"); ++ } catch (GSSException ge) { ++ // Expected bahavior ++ } ++ ++ // Acceptor req, reject ++ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID); ++ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); ++ s.x().setChannelBinding(new ChannelBinding( ++ InetAddress.getByName("client.rabbit.hole"), ++ InetAddress.getByName("host.rabbit.hole"), ++ new byte[0] ++ )); ++ try { ++ Context.handshake(c, s); ++ throw new Exception("Acceptor should reject initiator"); ++ } catch (GSSException ge) { ++ // Expected bahavior ++ if (ge.getMajor() != GSSException.BAD_BINDINGS) { ++ throw ge; ++ } ++ } ++ } ++} From jvanek at redhat.com Wed Jan 11 08:31:21 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 11 Jan 2012 17:31:21 +0100 Subject: [RFC][icedtea-web] Plugin doesn't halt when required elements from JNLP files are missing. In-Reply-To: <4F0746C7.10801@redhat.com> References: <4F0724DE.5000508@redhat.com> <4F07314B.1050300@redhat.com> <4F0746C7.10801@redhat.com> Message-ID: <4F0DB959.6030709@redhat.com> On 01/06/2012 08:08 PM, Danesh Dadachanji wrote: > On 06/01/12 12:37 PM, Jiri Vanek wrote: >> On 01/06/2012 05:44 PM, Danesh Dadachanji wrote: >>> Hi, >>> >>> Looking at the plugin docs[1], and <vendor> are required >>> elements of <information>, without them the plugin should stop with a >>> fatal error. Currently, icedtea-web just returns null from their >>> respective getters and handles null accordingly. However it should not >>> even reach that far. Here's a simple patch that throws a >>> ParseException when not found. >>> >>> ChangeLog >>> +2012-01-06 Danesh Dadachanji <ddadacha at redhat.com> >>> + >>> + Applications using JNLP files without a title or vendor section >>> + still run, despite them being required elements. >>> + * netx/net/sourceforge/jnlp/Parser.java: >>> + (getInformationDesc): If title or vendor are not found in info, >>> + a new ParseException is thrown. >>> + * netx/net/sourceforge/jnlp/resources/Messages.properties: Add >>> + PNoTitleElement and PNoVendorElement >>> + >>> >>> Any comments? Is this okay for HEAD? >>> >>> Regards, >>> Danesh >>> >>> [1] >>> http://docs.oracle.com/javase/7/docs/technotes/guides/javaws/developersguide/syntax.html >>> >> >> I do not like the idea of forcing somebody to have elements, when they >> can be still empty. But if documentation say so.... How proprietary >> plugin is dealing with it? > > It throws an exception, stopping further execution - the same as what this patch does for icedtea-web. =) > > If you'd like to test it, remove a title/vendor tag from a JNLP file and run it. You may need to with the java console being set to "Show console" - especially if it's an applet. > > Regards, > Danesh Jsut from couriosity - how does proprietary plugin is dealing when vendor or title is empty? I still don't like the idea of exiting when element is not present, but continue when element is empty :( But specification is clear - they are required and existence of content is not mentioned. In that case I think it is ok for head. But please wait until branching is done. Thanx for reading the specification :) Regards J. From ahughes at redhat.com Wed Jan 11 08:31:18 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 11 Jan 2012 16:31:18 +0000 Subject: Reviewer needed: backport of "6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe" into IcedTea6 HEAD In-Reply-To: <4F0C644A.6090006@redhat.com> References: <4F0C644A.6090006@redhat.com> Message-ID: <20120111163118.GA30516@rivendell.middle-earth.co.uk> On 17:16 Tue 10 Jan , Pavel Tisnovsky wrote: > Hi, > > I'd like to add patch containing backport of > "6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe" > into IcedTea6 HEAD. > > hg diff generated against recent HEAD version is stored in an attachment. > > Here's ChangeLog entry: > > 2012-01-10 Pavel Tisnovsky <ptisnovs at redhat.com> > > * Makefile.am: Add new patch. > * NEWS: Mention backport. > * patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch: > Backport of 6764553: > com.sun.org.apache.xml.internal.security.utils.IdResolver is not > thread safe. > > > Ok to push? > > Thank you in advance, > Pavel Changes look fine. Approved. Can you submit this to OpenJDK6 too? -- 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/20120111/bad91f91/attachment.bin From omajid at icedtea.classpath.org Wed Jan 11 08:39:31 2012 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Wed, 11 Jan 2012 16:39:31 +0000 Subject: /hg/release/icedtea6-1.11: Disable shark Message-ID: <hg.ad4d331b4cd0.1326299971.-53431993501496595@icedtea.classpath.org> changeset ad4d331b4cd0 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=ad4d331b4cd0 author: Omair Majid <omajid at redhat.com> date: Wed Jan 11 11:38:55 2012 -0500 Disable shark shark has been very unstable (and/or broken) recently due to various changes in hotspot and llvm. It is not supported in this release. diffstat: ChangeLog | 5 +++++ NEWS | 1 + acinclude.m4 | 7 ++++++- 3 files changed, 12 insertions(+), 1 deletions(-) diffs (47 lines): diff -r ec36b4069f06 -r ad4d331b4cd0 ChangeLog --- a/ChangeLog Mon Jan 09 13:34:27 2012 -0500 +++ b/ChangeLog Wed Jan 11 11:38:55 2012 -0500 @@ -1,3 +1,8 @@ +2012-01-09 Omair Majid <omajid at redhat.com> + + * acinclude.m4 (IT_SET_SHARK_BUILD): Error out if shark is enabled. + * NEWS: Update with note describing shark has been disabled. + 2012-01-06 Jiri Vanek <jvanek at redhat.com> fixes rhbz#580478 diff -r ec36b4069f06 -r ad4d331b4cd0 NEWS --- a/NEWS Mon Jan 09 13:34:27 2012 -0500 +++ b/NEWS Wed Jan 11 11:38:55 2012 -0500 @@ -16,6 +16,7 @@ * ARM assembly language port reinstated and updated; details below. * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools" * Drop the outdated NIO2 backport. Users who want NIO2 should use IcedTea 2.x. +* Shark has been disabled * Bug fixes - PR637: make check should exit with an error code if any regression test failed. - PR752: ImageFormatException extends Exception not RuntimeException diff -r ec36b4069f06 -r ad4d331b4cd0 acinclude.m4 --- a/acinclude.m4 Mon Jan 09 13:34:27 2012 -0500 +++ b/acinclude.m4 Wed Jan 11 11:38:55 2012 -0500 @@ -786,6 +786,8 @@ AC_CONFIG_FILES([ergo.c]) ]) +# shark has been very unstable (and/or broken) recently due to various +# changes in hotspot and llvm. It is not supported in this release. AC_DEFUN([IT_SET_SHARK_BUILD], [ AC_MSG_CHECKING(whether to use the Shark JIT) @@ -806,7 +808,10 @@ use_shark=yes fi AC_MSG_RESULT($use_shark) - +# remove the following check to enable shark + if test "x${shark_selected}" = "xyes"; then + AC_MSG_ERROR([shark is unsupported in this release]) + fi AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes) ]) From ptisnovs at redhat.com Wed Jan 11 09:00:05 2012 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Wed, 11 Jan 2012 18:00:05 +0100 Subject: Reviewer needed: backport of "6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe" into IcedTea6 HEAD In-Reply-To: <20120111163118.GA30516@rivendell.middle-earth.co.uk> References: <4F0C644A.6090006@redhat.com> <20120111163118.GA30516@rivendell.middle-earth.co.uk> Message-ID: <4F0DC015.4060902@redhat.com> Dr Andrew John Hughes wrote: > On 17:16 Tue 10 Jan , Pavel Tisnovsky wrote: >> Hi, >> >> I'd like to add patch containing backport of >> "6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe" >> into IcedTea6 HEAD. >> >> hg diff generated against recent HEAD version is stored in an attachment. >> >> Here's ChangeLog entry: >> >> 2012-01-10 Pavel Tisnovsky <ptisnovs at redhat.com> >> >> * Makefile.am: Add new patch. >> * NEWS: Mention backport. >> * patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch: >> Backport of 6764553: >> com.sun.org.apache.xml.internal.security.utils.IdResolver is not >> thread safe. >> >> >> Ok to push? >> >> Thank you in advance, >> Pavel > > Changes look fine. Approved. > Thank you very much. > Can you submit this to OpenJDK6 too? Yeah, I think it's worth to push this to OpenJDK6 too, I'll will try to get an ACK for this. Pavel From ddadacha at redhat.com Wed Jan 11 11:18:33 2012 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Wed, 11 Jan 2012 14:18:33 -0500 Subject: [RFC][icedtea-web] Plugin doesn't halt when required elements from JNLP files are missing. In-Reply-To: <4F0DB959.6030709@redhat.com> References: <4F0724DE.5000508@redhat.com> <4F07314B.1050300@redhat.com> <4F0746C7.10801@redhat.com> <4F0DB959.6030709@redhat.com> Message-ID: <4F0DE089.6090101@redhat.com> On 11/01/12 11:31 AM, Jiri Vanek wrote: > On 01/06/2012 08:08 PM, Danesh Dadachanji wrote: >> On 06/01/12 12:37 PM, Jiri Vanek wrote: >>> On 01/06/2012 05:44 PM, Danesh Dadachanji wrote: >>>> Hi, >>>> >>>> Looking at the plugin docs[1], <title> and <vendor> are required >>>> elements of <information>, without them the plugin should stop with a >>>> fatal error. Currently, icedtea-web just returns null from their >>>> respective getters and handles null accordingly. However it should not >>>> even reach that far. Here's a simple patch that throws a >>>> ParseException when not found. >>>> >>>> ChangeLog >>>> +2012-01-06 Danesh Dadachanji <ddadacha at redhat.com> >>>> + >>>> + Applications using JNLP files without a title or vendor section >>>> + still run, despite them being required elements. >>>> + * netx/net/sourceforge/jnlp/Parser.java: >>>> + (getInformationDesc): If title or vendor are not found in info, >>>> + a new ParseException is thrown. >>>> + * netx/net/sourceforge/jnlp/resources/Messages.properties: Add >>>> + PNoTitleElement and PNoVendorElement >>>> + >>>> >>>> Any comments? Is this okay for HEAD? >>>> >>>> Regards, >>>> Danesh >>>> >>>> [1] >>>> http://docs.oracle.com/javase/7/docs/technotes/guides/javaws/developersguide/syntax.html >>>> >>>> >>> >>> I do not like the idea of forcing somebody to have elements, when they >>> can be still empty. But if documentation say so.... How proprietary >>> plugin is dealing with it? >> >> It throws an exception, stopping further execution - the same as what >> this patch does for icedtea-web. =) >> >> If you'd like to test it, remove a title/vendor tag from a JNLP file >> and run it. You may need to with the java console being set to "Show >> console" - especially if it's an applet. >> >> Regards, >> Danesh > > Jsut from couriosity - how does proprietary plugin is dealing when > vendor or title is empty? Nice catch, I did not think about this. The proprietary plugin behaves the same way if either are empty - it throws a fatal exception. I've attached an updated patch to take this into consideration. Note that if the tags are only white spaces, this is also considered empty but the parser handles that case already. (e.g. <title> ) > I still don't like the idea of exiting when element is not present, but > continue when element is empty :( > IMO, it helps end-users of applets/webstarts. It forces devs to add more information to their jnlp files and therefore gives end-users more detailed warning dialogs when the app is asking for more access. It also acts as a reminder for any dev that's forgotten or does not know about this attribute. Obviously this can be used to spoof end-users but that's what my other patch is for =) > But specification is clear - they are required and existence of content > is not mentioned. > > In that case I think it is ok for head. But please wait until branching > is done. > Once the updated patch is good with you, I'll push to HEAD after branching is finished. > Thanx for reading the specification :) > Thanks for the comments! They are much appreciated. =) Regards, Danesh -------------- next part -------------- A non-text attachment was scrubbed... Name: title-vendor-required-02.patch Type: text/x-patch Size: 1458 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120111/17663700/title-vendor-required-02.patch From ahughes at redhat.com Wed Jan 11 09:59:09 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 11 Jan 2012 17:59:09 +0000 Subject: BRANCH FREEZE: 1.8, 1.9 and 1.10 Message-ID: <20120111175909.GD31616@rivendell.middle-earth.co.uk> A little later than planned, but as mentioned here: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-January/016627.html please consider the 1.8, 1.9 and 1.10 release branches frozen as I prepare the release. Please note that, due to the impending release of 1.11, this will be the last release of the 1.8 series. Once 1.11 is released, 1.9, 1.10 and 1.11 will be the supported branches. -- 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/20120111/9c9e363c/attachment.bin From dbhole at redhat.com Wed Jan 11 12:07:11 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Wed, 11 Jan 2012 15:07:11 -0500 Subject: IcedTea-Web branched for 1.2 release Message-ID: <20120111200710.GD32482@redhat.com> IcedTea-Web has been branched for a 1.2 release: http://icedtea.classpath.org/hg/release/icedtea-web-1.2/ The release is tentatively scheduled for Jan 30th, 2012. The late date is to accommodate a pending patch from Jiri Vanek who is away until the 23rd. If there are any issues with the above date, please let me know. Cheers, Deepak From andrew at icedtea.classpath.org Wed Jan 11 16:04:08 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 12 Jan 2012 00:04:08 +0000 Subject: /hg/release/icedtea6-1.8: 2 new changesets Message-ID: changeset 70d67528801d in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=70d67528801d author: Andrew John Hughes date: Wed Jan 11 20:29:25 2012 +0000 Prepare for 1.8.12 release. 2012-01-11 Andrew John Hughes * NEWS: Set release date. * configure.ac: Bump to 1.8.12 proper. changeset 03a903854e20 in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=03a903854e20 author: Andrew John Hughes date: Thu Jan 12 00:03:33 2012 +0000 Added tag icedtea6-1.8.12 for changeset 70d67528801d diffstat: .hgtags | 1 + ChangeLog | 5 +++++ NEWS | 2 +- configure.ac | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diffs (41 lines): diff -r c7e5b058721a -r 03a903854e20 .hgtags --- a/.hgtags Wed Jan 11 12:01:29 2012 +0000 +++ b/.hgtags Thu Jan 12 00:03:33 2012 +0000 @@ -32,3 +32,4 @@ ae7e52528576f9f176761d4d41219084682be3df icedtea6-1.8.9 17524de1ad5c9871b0e2a96381630ef4d11ee737 icedtea6-1.8.10 14bad91b28f287279c937f4e2c0e8665cdd9bdcf icedtea6-1.8.11 +70d67528801dbbb4fc8f841cc3ece3f65cf7ec9e icedtea6-1.8.12 diff -r c7e5b058721a -r 03a903854e20 ChangeLog --- a/ChangeLog Wed Jan 11 12:01:29 2012 +0000 +++ b/ChangeLog Thu Jan 12 00:03:33 2012 +0000 @@ -1,3 +1,8 @@ +2012-01-11 Andrew John Hughes + + * NEWS: Set release date. + * configure.ac: Bump to 1.8.12 proper. + 2011-12-22 Andrew John Hughes * Makefile.am: Add new patch. diff -r c7e5b058721a -r 03a903854e20 NEWS --- a/NEWS Wed Jan 11 12:01:29 2012 +0000 +++ b/NEWS Thu Jan 12 00:03:33 2012 +0000 @@ -8,7 +8,7 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 1.8.12 (20XX-XX-XX): +New in release 1.8.12 (2012-01-11): * Backports - S7102369: remove java.rmi.server.codebase property parsing from registyimpl diff -r c7e5b058721a -r 03a903854e20 configure.ac --- a/configure.ac Wed Jan 11 12:01:29 2012 +0000 +++ b/configure.ac Thu Jan 12 00:03:33 2012 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.8.12pre],[distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6],[1.8.12],[distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From andrew at icedtea.classpath.org Wed Jan 11 16:04:31 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 12 Jan 2012 00:04:31 +0000 Subject: /hg/release/icedtea6-1.9: 2 new changesets Message-ID: changeset cf5b7f41e0e9 in /hg/release/icedtea6-1.9 details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=cf5b7f41e0e9 author: Andrew John Hughes date: Wed Jan 11 20:28:10 2012 +0000 Prepare for 1.9.12 release. 2012-01-11 Andrew John Hughes * NEWS: Set release date. * configure.ac: Bump to 1.9.12 proper. changeset 72827fac9393 in /hg/release/icedtea6-1.9 details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=72827fac9393 author: Andrew John Hughes date: Thu Jan 12 00:04:25 2012 +0000 Added tag icedtea6-1.9.12 for changeset cf5b7f41e0e9 diffstat: .hgtags | 1 + ChangeLog | 5 +++++ NEWS | 2 +- configure.ac | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diffs (41 lines): diff -r a59a7c9e0f8b -r 72827fac9393 .hgtags --- a/.hgtags Wed Jan 11 12:01:29 2012 +0000 +++ b/.hgtags Thu Jan 12 00:04:25 2012 +0000 @@ -31,3 +31,4 @@ 5eedbbda2c822758fd693f7b1ad9a73caca53471 icedtea6-1.9.9 7451a7b2b43e5c529c53a28361693cd51fc41a18 icedtea6-1.9.10 fc3dc6228784993d02959aac8796f2accdedb857 icedtea6-1.9.11 +cf5b7f41e0e9a0c963bf8c5953797ae8db50bb6e icedtea6-1.9.12 diff -r a59a7c9e0f8b -r 72827fac9393 ChangeLog --- a/ChangeLog Wed Jan 11 12:01:29 2012 +0000 +++ b/ChangeLog Thu Jan 12 00:04:25 2012 +0000 @@ -1,3 +1,8 @@ +2012-01-11 Andrew John Hughes + + * NEWS: Set release date. + * configure.ac: Bump to 1.9.12 proper. + 2011-12-22 Andrew John Hughes * Makefile.am: Add new patch. diff -r a59a7c9e0f8b -r 72827fac9393 NEWS --- a/NEWS Wed Jan 11 12:01:29 2012 +0000 +++ b/NEWS Thu Jan 12 00:04:25 2012 +0000 @@ -8,7 +8,7 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 1.9.12 (20XX-XX-XX): +New in release 1.9.12 (2012-01-11): * Backports - S7102369: remove java.rmi.server.codebase property parsing from registyimpl diff -r a59a7c9e0f8b -r 72827fac9393 configure.ac --- a/configure.ac Wed Jan 11 12:01:29 2012 +0000 +++ b/configure.ac Thu Jan 12 00:04:25 2012 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.9.12pre],[distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6],[1.9.12],[distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From andrew at icedtea.classpath.org Wed Jan 11 16:05:22 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 12 Jan 2012 00:05:22 +0000 Subject: /hg/release/icedtea6-1.10: 3 new changesets Message-ID: changeset 6abe8599992e in /hg/release/icedtea6-1.10 details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=6abe8599992e author: Andrew John Hughes date: Wed Jan 11 19:46:13 2012 +0000 S7091528: javadoc attempts to parse .class files 2011-12-22 Andrew John Hughes * Makefile.am: Add new patch. * NEWS: Updated. * patches/openjdk/7091528-javadoc_class_files.patch: Add OpenJDK backport to fix javadoc issue. changeset 6c62647fb675 in /hg/release/icedtea6-1.10 details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=6c62647fb675 author: Andrew John Hughes date: Wed Jan 11 19:47:30 2012 +0000 Prepare for 1.10.5 release. 2012-01-11 Andrew John Hughes * NEWS: Set release date. * configure.ac: Bump to 1.10.5 proper. changeset 04966a13f65a in /hg/release/icedtea6-1.10 details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=04966a13f65a author: Andrew John Hughes date: Thu Jan 12 00:05:06 2012 +0000 Added tag icedtea6-1.10.5 for changeset 6c62647fb675 diffstat: .hgtags | 1 + ChangeLog | 12 + Makefile.am | 3 +- NEWS | 3 +- configure.ac | 2 +- patches/openjdk/7091528-javadoc_class_files.patch | 187 ++++++++++++++++++++++ 6 files changed, 205 insertions(+), 3 deletions(-) diffs (264 lines): diff -r fab44a791e0f -r 04966a13f65a .hgtags --- a/.hgtags Wed Jan 11 12:01:29 2012 +0000 +++ b/.hgtags Thu Jan 12 00:05:06 2012 +0000 @@ -25,3 +25,4 @@ e0ac0f52f73819683e794410c2b37305287327c8 icedtea6-1.10.2 7ba3ed55131e6fffd788ed4ce2d703eea7ba1eaa icedtea6-1.10.3 0b6f66c472a11535e07672a94fe530a771c5099e icedtea6-1.10.4 +6c62647fb6754bcf7972409e48b4ff8e8f813999 icedtea6-1.10.5 diff -r fab44a791e0f -r 04966a13f65a ChangeLog --- a/ChangeLog Wed Jan 11 12:01:29 2012 +0000 +++ b/ChangeLog Thu Jan 12 00:05:06 2012 +0000 @@ -1,3 +1,15 @@ +2012-01-11 Andrew John Hughes + + * NEWS: Set release date. + * configure.ac: Bump to 1.10.5 proper. + +2011-12-22 Andrew John Hughes + + * Makefile.am: Add new patch. + * NEWS: Updated. + * patches/openjdk/7091528-javadoc_class_files.patch: + Add OpenJDK backport to fix javadoc issue. + 2011-12-22 Andrew John Hughes * Makefile.am: Add new patch. diff -r fab44a791e0f -r 04966a13f65a Makefile.am --- a/Makefile.am Wed Jan 11 12:01:29 2012 +0000 +++ b/Makefile.am Thu Jan 12 00:05:06 2012 +0000 @@ -368,7 +368,8 @@ patches/openjdk/7043564-hugepage.patch \ patches/openjdk/7102369-7094468-rmiregistry.patch \ patches/openjdk/7103725-ssl_beast_regression.patch \ - patches/openjdk/6851973-kerberos.patch + patches/openjdk/6851973-kerberos.patch \ + patches/openjdk/7091528-javadoc_class_files.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r fab44a791e0f -r 04966a13f65a NEWS --- a/NEWS Wed Jan 11 12:01:29 2012 +0000 +++ b/NEWS Thu Jan 12 00:05:06 2012 +0000 @@ -9,7 +9,7 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 1.10.5 (20XX-XX-XX): +New in release 1.10.5 (2012-01-11): * Backports - S7034464: Support transparent large pages on Linux @@ -18,6 +18,7 @@ - S7094468: rmiregistry clean up - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA - S6851973, PR830: ignore incoming channel binding if acceptor does not set one + - S7091528: javadoc attempts to parse .class files New in release 1.10.4 (2011-10-18): diff -r fab44a791e0f -r 04966a13f65a configure.ac --- a/configure.ac Wed Jan 11 12:01:29 2012 +0000 +++ b/configure.ac Thu Jan 12 00:05:06 2012 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.10.5pre],[distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6],[1.10.5],[distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) diff -r fab44a791e0f -r 04966a13f65a patches/openjdk/7091528-javadoc_class_files.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7091528-javadoc_class_files.patch Thu Jan 12 00:05:06 2012 +0000 @@ -0,0 +1,191 @@ +# HG changeset patch +# User jjg +# Date 1316215126 25200 +# Node ID dea82aa3ca4fc15712cc8cfce72caf0d3fb210fc +# Parent c0835c8489b0fc6c5c20095ed0f0d6c1b01b69e0 +7091528: javadoc attempts to parse .class files +Reviewed-by: darcy + +diff -r c0835c8489b0 -r dea82aa3ca4f src/share/classes/com/sun/tools/javadoc/JavadocTool.java +--- openjdk/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java Fri Sep 16 14:16:11 2011 +0100 ++++ openjdk/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java Fri Sep 16 16:18:46 2011 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2001, 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 +@@ -257,24 +257,15 @@ + for (String p: excludedPackages) + includedPackages.put(p, false); + +- if (docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH)) { +- searchSubPackages(subPackages, +- includedPackages, +- packages, packageFiles, +- StandardLocation.SOURCE_PATH, +- EnumSet.of(JavaFileObject.Kind.SOURCE)); +- searchSubPackages(subPackages, +- includedPackages, +- packages, packageFiles, +- StandardLocation.CLASS_PATH, +- EnumSet.of(JavaFileObject.Kind.CLASS)); +- } else { +- searchSubPackages(subPackages, +- includedPackages, +- packages, packageFiles, +- StandardLocation.CLASS_PATH, +- EnumSet.of(JavaFileObject.Kind.SOURCE, JavaFileObject.Kind.CLASS)); +- } ++ StandardLocation path = docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH) ++ ? StandardLocation.SOURCE_PATH : StandardLocation.CLASS_PATH; ++ ++ searchSubPackages(subPackages, ++ includedPackages, ++ packages, packageFiles, ++ path, ++ EnumSet.of(JavaFileObject.Kind.SOURCE)); ++ + return packageFiles; + } + +diff -r c0835c8489b0 -r dea82aa3ca4f test/tools/javadoc/parser/7091528/T7091528.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/langtools/test/tools/javadoc/parser/7091528/T7091528.java Fri Sep 16 16:18:46 2011 -0700 +@@ -0,0 +1,71 @@ ++/* ++ * Copyright (c) 2009, 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. ++ * ++ * 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 7091528 ++ * @summary javadoc attempts to parse .class files ++ * @compile p/C1.java p/q/C2.java ++ * @run main T7091528 ++ */ ++ ++import java.io.File; ++import java.io.PrintWriter; ++import java.io.StringWriter; ++ ++public class T7091528 { ++ public static void main(String... args) { ++ new T7091528().run(); ++ } ++ ++ void run() { ++ File testSrc = new File(System.getProperty("test.src")); ++ File testClasses = new File(System.getProperty("test.classes")); ++ String[] args = { ++ "-d", ".", ++ "-sourcepath", testClasses + File.pathSeparator + testSrc, ++ "-subpackages", ++ "p" ++ }; ++ ++ StringWriter sw = new StringWriter(); ++ PrintWriter pw = new PrintWriter(sw); ++ String doclet = com.sun.tools.doclets.standard.Standard.class.getName(); ++ int rc = com.sun.tools.javadoc.Main.execute("javadoc", pw, pw, pw, doclet, args); ++ pw.close(); ++ ++ String out = sw.toString(); ++ if (!out.isEmpty()) { ++ System.err.println(out); ++ } ++ ++ if (rc != 0) ++ System.err.println("javadoc failed: exit code = " + rc); ++ ++ if (out.matches("(?s).*p/[^ ]+\\.class.*")) ++ throw new Error("reading .class files"); ++ ++ if (!new File("index.html").exists()) ++ throw new Error("index.html not found"); ++ } ++} +diff -r c0835c8489b0 -r dea82aa3ca4f test/tools/javadoc/parser/7091528/p/C1.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/langtools/test/tools/javadoc/parser/7091528/p/C1.java Fri Sep 16 16:18:46 2011 -0700 +@@ -0,0 +1,28 @@ ++/* ++ * 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. ++ * ++ * 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 p1; ++ ++/** This is class C1. */ ++public class C1 { } ++ +diff -r c0835c8489b0 -r dea82aa3ca4f test/tools/javadoc/parser/7091528/p/q/C2.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/langtools/test/tools/javadoc/parser/7091528/p/q/C2.java Fri Sep 16 16:18:46 2011 -0700 +@@ -0,0 +1,28 @@ ++/* ++ * 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. ++ * ++ * 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 p.q; ++ ++/** This is class p.q.C2. */ ++public class C2 { } ++ From ptisnovs at icedtea.classpath.org Thu Jan 12 01:46:27 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 12 Jan 2012 09:46:27 +0000 Subject: /hg/icedtea6: 2012-01-12 Pavel Tisnovsky Message-ID: changeset 459e476245c6 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=459e476245c6 author: ptisnovs date: Thu Jan 12 11:46:17 2012 +0100 2012-01-12 Pavel Tisnovsky * Makefile.am: Add new patch. * NEWS: Mention backport. * patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch: Backport of 6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe. diffstat: ChangeLog | 9 ++ Makefile.am | 3 +- NEWS | 1 + patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch | 40 +++++++++++++ 4 files changed, 52 insertions(+), 1 deletions(-) diffs (85 lines): diff -r 79014132e844 -r 459e476245c6 ChangeLog --- a/ChangeLog Tue Jan 10 16:47:52 2012 +0000 +++ b/ChangeLog Thu Jan 12 11:46:17 2012 +0100 @@ -1,3 +1,12 @@ +2012-01-12 Pavel Tisnovsky + + * Makefile.am: Add new patch. + * NEWS: Mention backport. + * patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch: + Backport of 6764553: + com.sun.org.apache.xml.internal.security.utils.IdResolver is not + thread safe. + 2012-01-10 Andrew John Hughes * Makefile.am: Add new patch. diff -r 79014132e844 -r 459e476245c6 Makefile.am --- a/Makefile.am Tue Jan 10 16:47:52 2012 +0000 +++ b/Makefile.am Thu Jan 12 11:46:17 2012 +0100 @@ -404,7 +404,8 @@ patches/openjdk/6851973-kerberos.patch \ patches/openjdk/7091528-javadoc_class_files.patch \ patches/openjdk/7103725-ssl_beast_regression.patch \ - patches/openjdk/6706974-krb5_test_infrastructure.patch + patches/openjdk/6706974-krb5_test_infrastructure.patch \ + patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r 79014132e844 -r 459e476245c6 NEWS --- a/NEWS Tue Jan 10 16:47:52 2012 +0000 +++ b/NEWS Thu Jan 12 11:46:17 2012 +0100 @@ -14,6 +14,7 @@ * Backports - 6706974: Add krb5 test infrastructure + - 6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe New in release 1.11 (2012-XX-XX): diff -r 79014132e844 -r 459e476245c6 patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch Thu Jan 12 11:46:17 2012 +0100 @@ -0,0 +1,41 @@ +# HG changeset patch +# User mullan +# Date 1225401848 14400 +# Node ID 4ff842aee1fdf3e8302c0a5f4dcd511cfc8ccb5a +# Parent 58e52eb46bd33e155ed4cbeaee7ce077a0459932 +6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe +Reviewed-by: valeriep + +diff -r 58e52eb46bd3 -r 4ff842aee1fd src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java +--- openjdk.orig/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java Tue Oct 28 18:21:36 2008 +0100 ++++ openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java Thu Oct 30 17:24:08 2008 -0400 +@@ -73,10 +73,13 @@ + */ + public static void registerElementById(Element element, String idValue) { + Document doc = element.getOwnerDocument(); +- WeakHashMap elementMap = (WeakHashMap) docMap.get(doc); +- if(elementMap == null) { +- elementMap = new WeakHashMap(); +- docMap.put(doc, elementMap); ++ WeakHashMap elementMap; ++ synchronized (docMap) { ++ elementMap = (WeakHashMap) docMap.get(doc); ++ if (elementMap == null) { ++ elementMap = new WeakHashMap(); ++ docMap.put(doc, elementMap); ++ } + } + elementMap.put(idValue, new WeakReference(element)); + } +@@ -158,7 +161,10 @@ + private static Element getElementByIdType(Document doc, String id) { + if (true) + if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "getElementByIdType() Search for ID " + id); +- WeakHashMap elementMap = (WeakHashMap) docMap.get(doc); ++ WeakHashMap elementMap; ++ synchronized (docMap) { ++ elementMap = (WeakHashMap) docMap.get(doc); ++ } + if (elementMap != null) { + WeakReference weakReference = (WeakReference) elementMap.get(id); + if (weakReference != null) From ptisnovs at icedtea.classpath.org Thu Jan 12 02:51:42 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 12 Jan 2012 10:51:42 +0000 Subject: /hg/gfx-test: 2012-01-12 Pavel Tisnovsky Message-ID: changeset 70e12dbf96c3 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=70e12dbf96c3 author: Pavel Tisnovsky date: Thu Jan 12 11:54:02 2012 +0100 2012-01-12 Pavel Tisnovsky * src/org/gfxtest/framework/CommonBitmapOperations.java: Refactored common bitmapt operations into class. * src/org/gfxtest/framework/ImageFactory.java: Simple fix for images with alpha channel. * src/org/gfxtest/testsuites/BitBltBasicTests.java: Added new tests. * src/org/gfxtest/testsuites/BitBltScaleImage.java: New test case. * Makefile: updated diffstat: ChangeLog | 13 + Makefile | 3 + src/org/gfxtest/framework/CommonBitmapOperations.java | 177 ++++++++++++ src/org/gfxtest/framework/ImageFactory.java | 2 +- src/org/gfxtest/testsuites/BitBltBasicTests.java | 257 ++++++++++------- src/org/gfxtest/testsuites/BitBltScaleImage.java | 151 ++++++++++ 6 files changed, 501 insertions(+), 102 deletions(-) diffs (truncated from 776 to 500 lines): diff -r a92f5b0ae82b -r 70e12dbf96c3 ChangeLog --- a/ChangeLog Wed Jan 11 13:12:29 2012 +0100 +++ b/ChangeLog Thu Jan 12 11:54:02 2012 +0100 @@ -1,4 +1,17 @@ +2012-01-12 Pavel Tisnovsky + + * src/org/gfxtest/framework/CommonBitmapOperations.java: + Refactored common bitmapt operations into class. + * src/org/gfxtest/framework/ImageFactory.java: + Simple fix for images with alpha channel. + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Added new tests. + * src/org/gfxtest/testsuites/BitBltScaleImage.java: + New test case. + * Makefile: updated + 2012-01-11 Pavel Tisnovsky + * src/org/gfxtest/framework/ImageFactory.java: New class containing (ATM) one helper method used by BitBlt tests. diff -r a92f5b0ae82b -r 70e12dbf96c3 Makefile --- a/Makefile Wed Jan 11 13:12:29 2012 +0100 +++ b/Makefile Thu Jan 12 11:54:02 2012 +0100 @@ -81,6 +81,7 @@ $(CLASSES)/$(FRAMEWORK_DIR)/CommonShapesRenderer.class \ $(CLASSES)/$(FRAMEWORK_DIR)/CommonClippingOperations.class \ $(CLASSES)/$(FRAMEWORK_DIR)/CommonPathsGenerator.class \ + $(CLASSES)/$(FRAMEWORK_DIR)/CommonBitmapOperations.class \ $(CLASSES)/$(FRAMEWORK_DIR)/EntityRenderingStyle.class \ $(CLASSES)/$(FRAMEWORK_DIR)/TestResult.class \ $(CLASSES)/$(FRAMEWORK_DIR)/ParameterNotFoundException.class \ @@ -108,6 +109,7 @@ $(CLASSES)/$(TESTSUITE_DIR)/AlphaComposite.class \ $(CLASSES)/$(TESTSUITE_DIR)/BlankImage.class \ $(CLASSES)/$(TESTSUITE_DIR)/BitBltBasicTests.class \ + $(CLASSES)/$(TESTSUITE_DIR)/BitBltScaleImage.class \ $(CLASSES)/$(TESTSUITE_DIR)/ColorPaint.class \ $(CLASSES)/$(TESTSUITE_DIR)/NormalArcs.class \ $(CLASSES)/$(TESTSUITE_DIR)/NormalLines.class \ @@ -170,6 +172,7 @@ $(RESULTS)/AlphaComposite \ $(RESULTS)/BlankImage \ $(RESULTS)/BitBltBasicTests \ + $(RESULTS)/BitBltScaleImage \ $(RESULTS)/ColorPaint \ $(RESULTS)/NormalArcs \ $(RESULTS)/NormalLines \ diff -r a92f5b0ae82b -r 70e12dbf96c3 src/org/gfxtest/framework/CommonBitmapOperations.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/framework/CommonBitmapOperations.java Thu Jan 12 11:54:02 2012 +0100 @@ -0,0 +1,177 @@ +/* + Java gfx-test framework + + Copyright (C) 2010, 2011, 2012 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.framework; + +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; + +public class CommonBitmapOperations +{ + /** + * Grid size for images with checker pattern. + */ + private static final int GRID_SIZE = 20; + + /** + * Width of tested buffered image. + */ + public final static int DEFAULT_TEST_IMAGE_WIDTH = 256; + + /** + * Height of tested buffered image. + */ + public final static int DEFAULT_TEST_IMAGE_HEIGHT = 256; + + /** + * Performs BitBlt operation. + * + * @param sourceImage + * source image for BitBlt + * @param destinationImage + * destination image for BitBlt graphics canvas + * @param graphics2d + * instance of class used during rendering + * @return if the image has completely loaded and its pixels are no longer + * being changed, then returns true. Otherwise, returns false + */ + private static boolean BitBlt(BufferedImage sourceImage, TestImage destinationImage, Graphics2D graphics2d) + { + // compute top-left corner coordinates + final int x = (destinationImage.getWidth() - DEFAULT_TEST_IMAGE_WIDTH) >> 1; + final int y = (destinationImage.getHeight() - DEFAULT_TEST_IMAGE_HEIGHT) >> 1; + return graphics2d.drawImage(sourceImage, x, y, null); + } + + /** + * Performs BitBlt operation. + * + * @param sourceImage + * source image for BitBlt + * @param destinationImage + * destination image for BitBlt graphics canvas + * @param graphics2d + * instance of class used during rendering + * @param width + * @param height + * @return if the image has completely loaded and its pixels are no longer + * being changed, then returns true. Otherwise, returns false + */ + private static boolean BitBlt(BufferedImage sourceImage, TestImage destinationImage, Graphics2D graphics2d, int width, int height) + { + // compute top-left corner coordinates + final int x = (destinationImage.getWidth() - width) >> 1; + final int y = (destinationImage.getHeight() - height) >> 1; + return graphics2d.drawImage(sourceImage, x, y, width, height, null); + } + + /** + * Create buffered bitmap with given type. + * + * @param type + * type of the created image + * @return new buffered bitmap + */ + private static BufferedImage createBufferedBitmap(int type) + { + return new BufferedImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, type); + } + + /** + * Create new buffered image and then do basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param type + * type of the created image + */ + public static TestResult doBitBltTestWithEmptyImage(TestImage image, Graphics2D graphics2d, int type) + { + BufferedImage bufferedImage = createBufferedBitmap(type); + if (bufferedImage == null) + { + return TestResult.FAILED; + } + return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing checker pattern and then do basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + */ + public static TestResult doBitBltTestWithCheckerImage(TestImage image, Graphics2D graphics2d, int imageType) + { + BufferedImage bufferedImage = ImageFactory.createCheckerImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + if (bufferedImage == null) + { + return TestResult.FAILED; + } + return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing checker pattern and then do basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + */ + public static TestResult doBitBltTestWithCheckerImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) + { + BufferedImage bufferedImage = ImageFactory.createCheckerImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + if (bufferedImage == null) + { + return TestResult.FAILED; + } + return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; + } + +} diff -r a92f5b0ae82b -r 70e12dbf96c3 src/org/gfxtest/framework/ImageFactory.java --- a/src/org/gfxtest/framework/ImageFactory.java Wed Jan 11 13:12:29 2012 +0100 +++ b/src/org/gfxtest/framework/ImageFactory.java Thu Jan 12 11:54:02 2012 +0100 @@ -71,7 +71,7 @@ boolean evenRow = (y % doubledGridSize) >= gridSize; // compute color for each pixel boolean whiteField = evenColumn ^ evenRow; - int color = whiteField ? 0x00ffffff: 0x00000000; + int color = whiteField ? 0xffffffff: 0xff000000; image.setRGB(x, y, color); } } diff -r a92f5b0ae82b -r 70e12dbf96c3 src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed Jan 11 13:12:29 2012 +0100 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Thu Jan 12 11:54:02 2012 +0100 @@ -45,8 +45,8 @@ +import org.gfxtest.framework.CommonBitmapOperations; import org.gfxtest.framework.GfxTest; -import org.gfxtest.framework.ImageFactory; import org.gfxtest.framework.TestImage; import org.gfxtest.framework.annotations.GraphicsPrimitive; import org.gfxtest.framework.annotations.GraphicsPrimitives; @@ -62,7 +62,7 @@ /** - * This test check the rendering of buffered images (so callet bit block + * This test check the rendering of buffered images (so called bit block * transfers or Bit Blt) created by various constructors. * * @author Pavel Tisnovsky @@ -75,91 +75,6 @@ public class BitBltBasicTests extends GfxTest { /** - * Grid size for images with checker pattern. - */ - private static final int GRID_SIZE = 20; - - /** - * Width of tested buffered image. - */ - private final static int DEFAULT_TEST_IMAGE_WIDTH = 256; - - /** - * Height of tested buffered image. - */ - private final static int DEFAULT_TEST_IMAGE_HEIGHT = 256; - - /** - * Performs BitBlt operation - * - * @param destinationImage - * destination image for BitBlt graphics canvas - * @param sourceImage - * source image for BitBlt - * @return if the image has completely loaded and its pixels are no longer - * being changed, then returns true. Otherwise, returns false - */ - private boolean BitBlt(TestImage destinationImage, Graphics2D graphics2d, BufferedImage sourceImage) - { - // compute top-left corner coordinates - final int x = (destinationImage.getWidth() - DEFAULT_TEST_IMAGE_WIDTH) >> 1; - final int y = (destinationImage.getHeight() - DEFAULT_TEST_IMAGE_HEIGHT) >> 1; - return graphics2d.drawImage(sourceImage, x, y, null); - } - - /** - * Create buffered bitmap with given type. - * - * @param type - * type of the created image - * @return new buffered bitmap - */ - private BufferedImage createBufferedBitmap(int type) - { - return new BufferedImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, type); - } - - /** - * Create new buffered image and then do basic BitBlt test. - * - * @param image - * image to which another image is to be drawn - * @param graphics2d - * graphics canvas - * @param type - * type of the created image - */ - private TestResult doBitBltTestWithEmptyImage(TestImage image, Graphics2D graphics2d, int type) - { - BufferedImage bufferedImage = createBufferedBitmap(type); - if (bufferedImage == null) - { - return TestResult.FAILED; - } - return BitBlt(image, graphics2d, bufferedImage) ? TestResult.PASSED : TestResult.FAILED; - } - - /** - * Create new buffered image containing checker pattern and then do basic BitBlt test. - * - * @param image - * image to which another image is to be drawn - * @param graphics2d - * graphics canvas - * @param imageType - * type of the created image - */ - private TestResult doBitBltTestWithCheckerImage(TestImage image, Graphics2D graphics2d, int imageType) - { - BufferedImage bufferedImage = ImageFactory.createCheckerImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); - if (bufferedImage == null) - { - return TestResult.FAILED; - } - return BitBlt(image, graphics2d, bufferedImage) ? TestResult.PASSED : TestResult.FAILED; - } - - /** * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. * * @param image @@ -170,7 +85,7 @@ */ public TestResult testBitBltEmptyBufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d) { - return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR); + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR); } /** @@ -184,7 +99,7 @@ */ public TestResult testBitBltEmptyBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d) { - return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR); + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR); } /** @@ -198,7 +113,7 @@ */ public TestResult testBitBltEmptyBufferedImageType4ByteABGR_Pre(TestImage image, Graphics2D graphics2d) { - return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); } /** @@ -212,7 +127,7 @@ */ public TestResult testBitBltEmptyBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) { - return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); } /** @@ -226,7 +141,7 @@ */ public TestResult testBitBltEmptyBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d) { - return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_INT_RGB); + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_INT_RGB); } /** @@ -240,7 +155,7 @@ */ public TestResult testBitBltEmptyBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d) { - return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB); + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB); } /** @@ -254,7 +169,7 @@ */ public TestResult testBitBltEmptyBufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d) { - return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE); + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE); } /** @@ -268,7 +183,7 @@ */ public TestResult testBitBltEmptyBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d) { - return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_INT_BGR); + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_INT_BGR); } /** @@ -282,7 +197,7 @@ */ public TestResult testBitBltEmptyBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d) { - return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB); + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB); } /** @@ -296,7 +211,7 @@ */ public TestResult testBitBltEmptyBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d) { - return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB); + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB); } /** @@ -310,7 +225,7 @@ */ public TestResult testBitBltEmptyBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d) { - return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); } /** @@ -324,7 +239,7 @@ */ public TestResult testBitBltEmptyBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d) { - return doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY); + return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY); } /** @@ -338,7 +253,7 @@ */ public TestResult testBitBltCheckerBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) { - return doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); } /** @@ -352,7 +267,147 @@ */ public TestResult testBitBltCheckerBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d) { - return doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_INT_RGB); + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_INT_RGB); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_BGR. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltCheckerBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_INT_BGR); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB. + * + * @param image + * image to which line is to be drawn + * @param graphics2d From ahughes at redhat.com Thu Jan 12 02:53:19 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 Jan 2012 10:53:19 +0000 Subject: IcedTea6 1.8.12, 1.9.12 and 1.10.5 Released! Message-ID: <20120112105319.GO31616@rivendell.middle-earth.co.uk> The IcedTea project provides a harness to build the source code from OpenJDK6 using Free Software build tools, along with additional features such as a PulseAudio sound driver and support for alternative virtual machines. A new set of releases for the IcedTea6 series is now available, which includes a number of bug fixes for issues reported since the last release. Full details are below. Please note that, with the imminent release of IcedTea6 1.11, this will be the last release in the 1.8 series. We also generally recommend that users start to investigate Java 1.7 and the 2.0 series of IcedTea releases, as support for the older 1.6 releases will begin to diminish. What?s New? ?????? New in release 1.10.5 (2012-01-11): * Backports - S7034464: Support transparent large pages on Linux - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used - S7102369: remove java.rmi.server.codebase property parsing from registyimpl - S7094468: rmiregistry clean up - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA - S6851973, PR830: ignore incoming channel binding if acceptor does not set one - S7091528: javadoc attempts to parse .class files New in release 1.9.12 (2012-01-11): * Backports - S7102369: remove java.rmi.server.codebase property parsing from registyimpl - S7094468: rmiregistry clean up - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA - S6851973, PR830: ignore incoming channel binding if acceptor does not set one New in release 1.8.12 (2012-01-11): * Backports - S7102369: remove java.rmi.server.codebase property parsing from registyimpl - S7094468: rmiregistry clean up - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA - S6851973, PR830: ignore incoming channel binding if acceptor does not set one The tarballs can be downloaded from: * http://icedtea.classpath.org/download/source/icedtea6-1.8.12.tar.gz * http://icedtea.classpath.org/download/source/icedtea6-1.9.12.tar.gz * http://icedtea.classpath.org/download/source/icedtea6-1.10.5.tar.gz SHA256 checksums: ddd3eceba02b5511c1c399e0067c6348d2215f49262e9456108dd2da66b937d7 icedtea6-1.8.12.tar.gz dfd8c88052aca10ef12ae78ddce883cf2ee308e77624e24127f4b97f19ed733c icedtea6-1.9.12.tar.gz 7d0f9e833a42b6af308a34d432431f0528a2efa52d7837aa446d1c4c27161a0c icedtea6-1.10.5.tar.gz Each tarball is accompanied by a digital signature (available at the above URL + '.sig'). This is produced using my public key. See details below in the signature. The following people helped with these releases: * Deepak Bhole (backport of 7037939, 7034464, 7043564) * Andrew John Hughes (release management and backports of 7091528, 6751973, 7103725) * Omair Majid (backport of 7102369) We would also like to thank the bug reporters and testers! To get started: $ tar xzf icedtea6-.tar.gz $ cd icedtea6- Full build requirements and instructions are in INSTALL: $ ./configure [--enable-zero --enable-pulse-java --enable-systemtap ...] $ make -- 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/20120112/02952da3/attachment.bin From tisnik at centrum.cz Thu Jan 12 05:03:57 2012 From: tisnik at centrum.cz (Pavel Tisnovsky) Date: Thu, 12 Jan 2012 14:03:57 +0100 Subject: Reviewer needed - IcedTea6 HEAD: fixed some compiler warnings caused by using deprecated methods in JTReg tool Message-ID: <4F0EDA3D.6020505@centrum.cz> Hi all, I've made simple fixes in JTReg tool sources (in IcedTea6 HEAD ATM) to get rid of compiler warnings due to use deprecated API methods. Output of hg diff is stored in an attachment and here is the change log entry: 2012-01-12 Pavel Tisnovsky * src/jtreg/com/sun/interview/wizard/Wizard.java: * src/jtreg/com/sun/javatest/EditJTI.java: * src/jtreg/com/sun/javatest/TestSuite.java: * src/jtreg/com/sun/javatest/agent/AgentFrame.java: * src/jtreg/com/sun/javatest/batch/ObserverCommand.java: * src/jtreg/com/sun/javatest/exec/BP_TestListSubpanel.java: * src/jtreg/com/sun/javatest/exec/ET_FilterHandler.java: * src/jtreg/com/sun/javatest/exec/LogViewerTools.java: * src/jtreg/com/sun/javatest/exec/NewReportDialog.java: * src/jtreg/com/sun/javatest/exec/QuestionLogBrowser.java: * src/jtreg/com/sun/javatest/exec/TU_ViewManager.java: * src/jtreg/com/sun/javatest/exec/TestTreePanel.java: * src/jtreg/com/sun/javatest/tool/ConfigManager.java: Fixed warnings caused by using deprecated methods. It's been tested by running JTreg tool - both command line and GUI variants. Can anybody review these changes, please? Thank you in advance, Pavel -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hg.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120112/c18775a2/hg.diff From andrew at icedtea.classpath.org Thu Jan 12 05:05:08 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:05:08 +0000 Subject: /hg/release/icedtea6-1.8: Prepare for 1.8.13 (which is very unli... Message-ID: changeset f096a6493463 in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=f096a6493463 author: Andrew John Hughes date: Thu Jan 12 13:04:39 2012 +0000 Prepare for 1.8.13 (which is very unlikely to happen, but we still need to separate 1.8.12 and hg) 2012-01-12 Andrew John Hughes * NEWS: Add 1.8.13. * configure.ac: Bump to 1.8.13pre. diffstat: ChangeLog | 5 +++++ NEWS | 2 ++ configure.ac | 2 +- 3 files changed, 8 insertions(+), 1 deletions(-) diffs (33 lines): diff -r 03a903854e20 -r f096a6493463 ChangeLog --- a/ChangeLog Thu Jan 12 00:03:33 2012 +0000 +++ b/ChangeLog Thu Jan 12 13:04:39 2012 +0000 @@ -1,3 +1,8 @@ +2012-01-12 Andrew John Hughes + + * NEWS: Add 1.8.13. + * configure.ac: Bump to 1.8.13pre. + 2012-01-11 Andrew John Hughes * NEWS: Set release date. diff -r 03a903854e20 -r f096a6493463 NEWS --- a/NEWS Thu Jan 12 00:03:33 2012 +0000 +++ b/NEWS Thu Jan 12 13:04:39 2012 +0000 @@ -8,6 +8,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 1.8.13 (XXXX-XX-XX): + New in release 1.8.12 (2012-01-11): * Backports diff -r 03a903854e20 -r f096a6493463 configure.ac --- a/configure.ac Thu Jan 12 00:03:33 2012 +0000 +++ b/configure.ac Thu Jan 12 13:04:39 2012 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.8.12],[distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6],[1.8.13pre],[distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From andrew at icedtea.classpath.org Thu Jan 12 05:07:03 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:07:03 +0000 Subject: /hg/release/icedtea6-1.9: Prepare for 1.9.13. Message-ID: changeset c4c107d8a737 in /hg/release/icedtea6-1.9 details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=c4c107d8a737 author: Andrew John Hughes date: Thu Jan 12 13:06:55 2012 +0000 Prepare for 1.9.13. 2012-01-12 Andrew John Hughes * NEWS: Add 1.9.13. * configure.ac: Bump to 1.9.13pre. diffstat: ChangeLog | 5 +++++ NEWS | 2 ++ configure.ac | 2 +- 3 files changed, 8 insertions(+), 1 deletions(-) diffs (33 lines): diff -r 72827fac9393 -r c4c107d8a737 ChangeLog --- a/ChangeLog Thu Jan 12 00:04:25 2012 +0000 +++ b/ChangeLog Thu Jan 12 13:06:55 2012 +0000 @@ -1,3 +1,8 @@ +2012-01-12 Andrew John Hughes + + * NEWS: Add 1.9.13. + * configure.ac: Bump to 1.9.13pre. + 2012-01-11 Andrew John Hughes * NEWS: Set release date. diff -r 72827fac9393 -r c4c107d8a737 NEWS --- a/NEWS Thu Jan 12 00:04:25 2012 +0000 +++ b/NEWS Thu Jan 12 13:06:55 2012 +0000 @@ -8,6 +8,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 1.9.13 (2012-02-XX): + New in release 1.9.12 (2012-01-11): * Backports diff -r 72827fac9393 -r c4c107d8a737 configure.ac --- a/configure.ac Thu Jan 12 00:04:25 2012 +0000 +++ b/configure.ac Thu Jan 12 13:06:55 2012 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.9.12],[distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6],[1.9.13pre],[distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From ahughes at redhat.com Thu Jan 12 05:13:16 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 Jan 2012 13:13:16 +0000 Subject: [OPEN FOR BUSINESS] 1.8, 1.9 and 1.10 now unfrozen Message-ID: <20120112131316.GU31616@rivendell.middle-earth.co.uk> The 1.9 and 1.10 branches are now open for commits, post-release. As usual, all commits to a branch require approval from at least one other committer. 1.8 is also open again, but it will shortly become obsolete when 1.11 is released. -- 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/20120112/c54ce935/attachment.bin From andrew at icedtea.classpath.org Thu Jan 12 05:14:47 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:14:47 +0000 Subject: /hg/release/icedtea6-1.10: Prepare for 1.10.6. Message-ID: changeset d6b24f481e6c in /hg/release/icedtea6-1.10 details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=d6b24f481e6c author: Andrew John Hughes date: Thu Jan 12 13:10:28 2012 +0000 Prepare for 1.10.6. 2012-01-12 Andrew John Hughes * NEWS: Add 1.10.6. * configure.ac: Bump to 1.10.6pre. diffstat: ChangeLog | 5 +++++ NEWS | 2 ++ configure.ac | 2 +- 3 files changed, 8 insertions(+), 1 deletions(-) diffs (33 lines): diff -r 04966a13f65a -r d6b24f481e6c ChangeLog --- a/ChangeLog Thu Jan 12 00:05:06 2012 +0000 +++ b/ChangeLog Thu Jan 12 13:10:28 2012 +0000 @@ -1,3 +1,8 @@ +2012-01-12 Andrew John Hughes + + * NEWS: Add 1.10.6. + * configure.ac: Bump to 1.10.6pre. + 2012-01-11 Andrew John Hughes * NEWS: Set release date. diff -r 04966a13f65a -r d6b24f481e6c NEWS --- a/NEWS Thu Jan 12 00:05:06 2012 +0000 +++ b/NEWS Thu Jan 12 13:10:28 2012 +0000 @@ -9,6 +9,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 1.10.6 (2012-02-XX): + New in release 1.10.5 (2012-01-11): * Backports diff -r 04966a13f65a -r d6b24f481e6c configure.ac --- a/configure.ac Thu Jan 12 00:05:06 2012 +0000 +++ b/configure.ac Thu Jan 12 13:10:28 2012 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.10.5],[distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6],[1.10.6pre],[distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:40:04 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:40:04 +0000 Subject: [Bug 830] icedtea6: Important Channel Binding Patch is missing In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=830 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED Target Milestone|6-1.8.11 |6-1.8.12 --- Comment #3 from Andrew John Hughes 2012-01-12 13:40:04 UTC --- Released in 1.8.12, 1.9.12 and 1.10.5: http://blog.fuseyism.com/index.php/2012/01/12/icedtea6-1-8-12-1-9-12-and-1-10-5-released/ Will also be in 1.11 when released. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:42:54 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:42:54 +0000 Subject: [Bug 805] os_linux_zero.cpp:236 Error: caught unhandled signal 11 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=805 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Target Milestone|--- |6-1.8.7 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:43:11 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:43:11 +0000 Subject: [Bug 805] os_linux_zero.cpp:236 Error: caught unhandled signal 11 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=805 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |6-1.8.7 Target Milestone|6-1.8.7 |--- -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:45:22 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:45:22 +0000 Subject: [Bug 594] OpenJDK crashes on debian sqeeze (64 bit) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=594 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Version|unspecified |6-1.8.2 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:46:52 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:46:52 +0000 Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented copyrights and licenses In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Version|unspecified |6-hg -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:47:08 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:47:08 +0000 Subject: [Bug 589] icedtea6/1.8.2-3 on Maemo5 PR1.3: TV-Browser app crashes In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=589 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Version|unspecified |6-1.8.2 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:47:57 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:47:57 +0000 Subject: [Bug 158] FrozenBubble just shows a grey window In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=158 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Version|unspecified |6-hg -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:48:30 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:48:30 +0000 Subject: [Bug 221] javac.in and javah.in eat up white space arguments In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=221 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Version|unspecified |6-hg -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:48:53 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:48:53 +0000 Subject: [Bug 334] allow specifying explicit target arch In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=334 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Version|unspecified |6-hg -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:50:34 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:50:34 +0000 Subject: [Bug 352] hotspot produces/executes incorrect code (works with cacao and zero) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=352 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |ahughes at redhat.com Version|unspecified |6-1.5 Resolution| |WONTFIX --- Comment #3 from Andrew John Hughes 2012-01-12 13:50:34 UTC --- Is this now fixed? The version referenced has been unsupported for a long time. Reopen if the bug still exists. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:51:31 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:51:31 +0000 Subject: [Bug 362] setPreferedSize without layout manager works on Sun. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=362 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |ahughes at redhat.com Resolution| |INVALID --- Comment #2 from Andrew John Hughes 2012-01-12 13:51:31 UTC --- Please reopen if this can be replicated on a current version of IcedTea. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:53:01 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:53:01 +0000 Subject: [Bug 368] Eclipse repeatedly crashes after changing C++ Project Properties In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=368 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |ahughes at redhat.com Resolution| |INVALID --- Comment #4 from Andrew John Hughes 2012-01-12 13:53:01 UTC --- This version is no longer supported. Please reopen if you can reproduce the issue on a supported version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:54:29 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:54:29 +0000 Subject: [Bug 413] Crash with ibus and JOSM In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=413 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com --- Comment #4 from Andrew John Hughes 2012-01-12 13:54:29 UTC --- Does this patch need backporting? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:54:54 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:54:54 +0000 Subject: [Bug 470] SIGSEGV memcpy In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=470 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |ahughes at redhat.com Resolution| |INVALID --- Comment #7 from Andrew John Hughes 2012-01-12 13:54:54 UTC --- This version is no longer supported. Please reopen if you can reproduce the issue on a supported version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:55:23 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:55:23 +0000 Subject: [Bug 490] OpenOffice crashes due to a JRE fatal error In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=490 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Version|unspecified |6-1.7.3 --- Comment #8 from Andrew John Hughes 2012-01-12 13:55:23 UTC --- This version is no longer supported. Please reopen if you can reproduce the issue on a supported version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:55:37 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:55:37 +0000 Subject: [Bug 490] OpenOffice crashes due to a JRE fatal error In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=490 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |INVALID -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:56:21 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:56:21 +0000 Subject: [Bug 413] Crash with ibus and JOSM In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=413 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |6-hg -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:56:33 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:56:33 +0000 Subject: [Bug 17] org.omg.CORBA tests fail due to ORB class not implemented In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=17 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |6-hg -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 05:56:44 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 13:56:44 +0000 Subject: [Bug 32] Double.toString(string) expands value In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=32 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |6-hg -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:00:01 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:00:01 +0000 Subject: [Bug 603] How to but icedtea? Already added a bug report, but no answer. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=603 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |unassigned at icedtea.classpat | |h.org Component|IcedTea6 |Plugin AssignedTo|unassigned at icedtea.classpat |dbhole at redhat.com |h.org | Product|IcedTea |IcedTea-Web -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:00:22 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:00:22 +0000 Subject: [Bug 611] Minecraft In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=611 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Version|unspecified |6-1.8.3 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:01:45 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:01:45 +0000 Subject: [Bug 617] Virtual Machine Crashes while using GMOTE In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=617 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Platform|64-bit |x86_64 Version|unspecified |6-1.8.3 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:02:00 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:02:00 +0000 Subject: [Bug 654] Problem using NetBeans 6.9.1 to do a Memory profile of Tomcat 6.0.18 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=654 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |ahughes at redhat.com Resolution| |INVALID --- Comment #1 from Andrew John Hughes 2012-01-12 14:02:00 UTC --- This version is no longer supported. Please reopen if you can reproduce the issue on a supported version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:02:55 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:02:55 +0000 Subject: [Bug 674] Can't find the header file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=674 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |ahughes at redhat.com Resolution| |LATER --- Comment #1 from Andrew John Hughes 2012-01-12 14:02:55 UTC --- What version is this? Please reopen if you can replicate this on a current release. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:04:05 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:04:05 +0000 Subject: [Bug 676] milliseconds bug in java.sql.Timestamp In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=676 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED --- Comment #8 from Andrew John Hughes 2012-01-12 14:04:05 UTC --- Marking resolved, given the javadoc update. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:05:58 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:05:58 +0000 Subject: [Bug 709] Crash in native code, problematic frame: libfreetype.so.6 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=709 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |6-1.9.7 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:07:15 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:07:15 +0000 Subject: [Bug 760] Fatal error when trying to start serviio-console.sh In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=760 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Version|unspecified |6-1.10.2 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:07:44 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:07:44 +0000 Subject: [Bug 776] incorrect font paths in fontconfig.Gentoo.properties.src In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=776 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED CC| |ahughes at redhat.com --- Comment #2 from Andrew John Hughes 2012-01-12 14:07:44 UTC --- I'll take this one. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:08:05 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:08:05 +0000 Subject: [Bug 776] incorrect font paths in fontconfig.Gentoo.properties.src In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=776 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |6-hg AssignedTo|unassigned at icedtea.classpat |ahughes at redhat.com |h.org | -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:08:14 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:08:14 +0000 Subject: [Bug 729] GTKLookAndFeel should be the system look&feel on all GNU/Linux desktops In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=729 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |unassigned at icedtea.classpat | |h.org Component|IcedTea6 |IcedTea7 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:09:11 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:09:11 +0000 Subject: [Bug 799] Set default JVM arguments via configuration files In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=799 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Version|unspecified |6-hg -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:10:06 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:10:06 +0000 Subject: [Bug 800] problem with omnet 4.1 on fedora 15 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=800 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Platform|32-bit |x86 Version|unspecified |6-1.10 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:10:46 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:10:46 +0000 Subject: [Bug 802] Undeterministic fatal error when clojure-contrib build using Maven3 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=802 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Version|unspecified |6-1.9.9 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:11:31 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:11:31 +0000 Subject: [Bug 810] Silab crashes just during start up. Bugbuddy leads to icedTea In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=810 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Version|unspecified |6-1.8 --- Comment #1 from Andrew John Hughes 2012-01-12 14:11:31 UTC --- Please attach the hs_err file. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:12:15 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:12:15 +0000 Subject: [Bug 824] problems with memory allocation with -Xms option In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=824 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |2.0 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:14:55 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:14:55 +0000 Subject: [Bug 824] problems with memory allocation with -Xms option In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=824 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |2.1 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 12 06:23:47 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 Jan 2012 14:23:47 +0000 Subject: [Bug 821] Deadlock in java.awt.EventQueue on OpenJDK7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=821 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |MOVED --- Comment #2 from Andrew John Hughes 2012-01-12 14:23:47 UTC --- I don't see how this is 'obviously an OpenJDK deadlock'. Unless you have a reproducer for this, there's not much we can do. I suggest taking this back to the NetBeans developers who will know the code concerned (specifically: at org.openide.explorer.view.VisualizerNode$QP.runSafe(VisualizerNode.java:646) - locked <0x5b42fdc8> (a org.openide.explorer.view.VisualizerNode$QP) at org.openide.explorer.view.VisualizerNode.propertyChange(VisualizerNode.java:423) OpenJDK is the reference implementation of 1.7 so they should support it. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ptisnovs at redhat.com Thu Jan 12 07:31:24 2012 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 12 Jan 2012 16:31:24 +0100 Subject: Reviewer needed: backport of "6761072: new krb5 tests fail on multiple platforms" into IcedTea6 HEAD Message-ID: <4F0EFCCC.4090309@redhat.com> Hi all, I'd like to add backport of "6761072: new krb5 tests fail on multiple platforms" into IcedTea6 HEAD. This backport fixes some JTreg tests which were added to IcedTea6 HEAD via: "6706974: Add krb5 test infrastructure" and "6851973: ignore incoming channel binding if acceptor does not set one" Change log entry: 2012-01-12 Pavel Tisnovsky * Makefile.am: Add new patch. * NEWS: Mention backport. * patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch: Backport of 6761072: new krb5 tests fail on multiple platforms Can anybody please review this backport? Thank you in advance, Pavel -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hg.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120112/112266e1/hg.diff From andrew at icedtea.classpath.org Thu Jan 12 07:32:38 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 12 Jan 2012 15:32:38 +0000 Subject: /hg/icedtea6: Update NEWS due to recent releases. Message-ID: changeset 3527894b6f35 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3527894b6f35 author: Andrew John Hughes date: Thu Jan 12 15:32:22 2012 +0000 Update NEWS due to recent releases. 2012-01-12 Andrew John Hughes * NEWS: Add 1.10.5, 1.9.12 and 1.8.12 release notes. Remove duplicates from 1.11. diffstat: ChangeLog | 5 +++++ NEWS | 34 +++++++++++++++++++++++++++------- 2 files changed, 32 insertions(+), 7 deletions(-) diffs (70 lines): diff -r 459e476245c6 -r 3527894b6f35 ChangeLog --- a/ChangeLog Thu Jan 12 11:46:17 2012 +0100 +++ b/ChangeLog Thu Jan 12 15:32:22 2012 +0000 @@ -1,3 +1,8 @@ +2012-01-12 Andrew John Hughes + + * NEWS: Add 1.10.5, 1.9.12 and 1.8.12 + release notes. Remove duplicates from 1.11. + 2012-01-12 Pavel Tisnovsky * Makefile.am: Add new patch. diff -r 459e476245c6 -r 3527894b6f35 NEWS --- a/NEWS Thu Jan 12 11:46:17 2012 +0100 +++ b/NEWS Thu Jan 12 15:32:22 2012 +0000 @@ -349,8 +349,6 @@ - S6748082: remove platform-specific code from SwingUtilities2.isDisplayLocal - S6708580: Java applications slow when EXA enabled - S6986968: Crash on XIM server restart - - S7034464: Support transparent large pages on Linux - - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used - S7018387: Xrender pipeline may leak GC's - S7036754: Stroked quads sometimes contain NaN - S7008106: com/sun/awt/Translucency/WindowOpacity.java test fails. @@ -386,11 +384,6 @@ - S5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" - S6296893: BMP Writer handles TopDown property incorrectly for some of the compression types - S7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc - - S7102369: remove java.rmi.server.codebase property parsing from registyimpl - - S7094468: rmiregistry clean up - - S6851973: ignore incoming channel binding if acceptor does not set one - - S7091528: javadoc attempts to parse .class files - - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA * ARM Port - Ported to the EABI hard-fp model - Locking for multi-core operation added. @@ -458,6 +451,33 @@ - PR690: Shark fails to JIT using hs20. - PR696: Zero fails to handle fast_aldc and fast_aldc_w in hs20. +New in release 1.10.5 (2012-01-11): + +* Backports + - S7034464: Support transparent large pages on Linux + - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used + - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468, RH751203: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one + - S7091528: javadoc attempts to parse .class files + +New in release 1.9.12 (2012-01-11): + +* Backports + - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468, RH751203: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one + +New in release 1.8.12 (2012-01-11): + +* Backports + - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468, RH751203: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one + New in release 1.9.11 (2011-11-08): * Security fixes From ddadacha at redhat.com Thu Jan 12 07:56:47 2012 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Thu, 12 Jan 2012 10:56:47 -0500 Subject: Reviewer needed - IcedTea6 HEAD: fixed some compiler warnings caused by using deprecated methods in JTReg tool In-Reply-To: <4F0EDA3D.6020505@centrum.cz> References: <4F0EDA3D.6020505@centrum.cz> Message-ID: <4F0F02BF.5080501@redhat.com> Hi Pavel, Not your usual email address? =) The patch looks good, just a minor comment about the ChangeLog below. On 12/01/12 08:03 AM, Pavel Tisnovsky wrote: > Hi all, > > I've made simple fixes in JTReg tool sources (in IcedTea6 HEAD ATM) to get rid of > compiler warnings due to use deprecated API methods. Output of hg diff is stored > in an attachment and here is the change log entry: > > 2012-01-12 Pavel Tisnovsky > * src/jtreg/com/sun/interview/wizard/Wizard.java: > * src/jtreg/com/sun/javatest/EditJTI.java: > * src/jtreg/com/sun/javatest/TestSuite.java: > * src/jtreg/com/sun/javatest/agent/AgentFrame.java: > * src/jtreg/com/sun/javatest/batch/ObserverCommand.java: > * src/jtreg/com/sun/javatest/exec/BP_TestListSubpanel.java: > * src/jtreg/com/sun/javatest/exec/ET_FilterHandler.java: > * src/jtreg/com/sun/javatest/exec/LogViewerTools.java: > * src/jtreg/com/sun/javatest/exec/NewReportDialog.java: > * src/jtreg/com/sun/javatest/exec/QuestionLogBrowser.java: > * src/jtreg/com/sun/javatest/exec/TU_ViewManager.java: > * src/jtreg/com/sun/javatest/exec/TestTreePanel.java: > * src/jtreg/com/sun/javatest/tool/ConfigManager.java: > Fixed warnings caused by using deprecated methods. > Could you s/java:/java,/ for all the files listed except the last one (ConfigManager.java), it looks like this is the convention for multiple files using the same description. Once that's fixed, the patch can be pushed to HEAD. Regards, Danesh From ptisnovs at redhat.com Thu Jan 12 08:41:27 2012 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 12 Jan 2012 17:41:27 +0100 Subject: Reviewer needed - IcedTea6 HEAD: fixed some compiler warnings caused by using deprecated methods in JTReg tool In-Reply-To: <4F0F02BF.5080501@redhat.com> References: <4F0EDA3D.6020505@centrum.cz> <4F0F02BF.5080501@redhat.com> Message-ID: <4F0F0D37.3040808@redhat.com> Danesh Dadachanji wrote: > Hi Pavel, > > Not your usual email address? =) yeah, today morning the corporate mail does not seem to work (mail were sent to /dev/null :-), so I used my personal mail instead. > > The patch looks good, just a minor comment about the ChangeLog below. > > On 12/01/12 08:03 AM, Pavel Tisnovsky wrote: >> Hi all, >> >> I've made simple fixes in JTReg tool sources (in IcedTea6 HEAD ATM) to >> get rid of >> compiler warnings due to use deprecated API methods. Output of hg diff >> is stored >> in an attachment and here is the change log entry: >> >> 2012-01-12 Pavel Tisnovsky >> * src/jtreg/com/sun/interview/wizard/Wizard.java: >> * src/jtreg/com/sun/javatest/EditJTI.java: >> * src/jtreg/com/sun/javatest/TestSuite.java: >> * src/jtreg/com/sun/javatest/agent/AgentFrame.java: >> * src/jtreg/com/sun/javatest/batch/ObserverCommand.java: >> * src/jtreg/com/sun/javatest/exec/BP_TestListSubpanel.java: >> * src/jtreg/com/sun/javatest/exec/ET_FilterHandler.java: >> * src/jtreg/com/sun/javatest/exec/LogViewerTools.java: >> * src/jtreg/com/sun/javatest/exec/NewReportDialog.java: >> * src/jtreg/com/sun/javatest/exec/QuestionLogBrowser.java: >> * src/jtreg/com/sun/javatest/exec/TU_ViewManager.java: >> * src/jtreg/com/sun/javatest/exec/TestTreePanel.java: >> * src/jtreg/com/sun/javatest/tool/ConfigManager.java: >> Fixed warnings caused by using deprecated methods. >> > > Could you s/java:/java,/ for all the files listed except the last one > (ConfigManager.java), it looks like this is the convention for multiple > files using the same description. > > Once that's fixed, the patch can be pushed to HEAD. Thank you, I'll correct change log & push it. Pavel > > Regards, > Danesh From ahughes at redhat.com Thu Jan 12 08:52:34 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 Jan 2012 16:52:34 +0000 Subject: Reviewer needed - IcedTea6 HEAD: fixed some compiler warnings caused by using deprecated methods in JTReg tool In-Reply-To: <4F0F02BF.5080501@redhat.com> References: <4F0EDA3D.6020505@centrum.cz> <4F0F02BF.5080501@redhat.com> Message-ID: <20120112165234.GA4179@rivendell.middle-earth.co.uk> On 10:56 Thu 12 Jan , Danesh Dadachanji wrote: > Hi Pavel, > > Not your usual email address? =) > > The patch looks good, just a minor comment about the ChangeLog below. > > On 12/01/12 08:03 AM, Pavel Tisnovsky wrote: > > Hi all, > > > > I've made simple fixes in JTReg tool sources (in IcedTea6 HEAD ATM) to get rid of > > compiler warnings due to use deprecated API methods. Output of hg diff is stored > > in an attachment and here is the change log entry: > > > > 2012-01-12 Pavel Tisnovsky > > * src/jtreg/com/sun/interview/wizard/Wizard.java: > > * src/jtreg/com/sun/javatest/EditJTI.java: > > * src/jtreg/com/sun/javatest/TestSuite.java: > > * src/jtreg/com/sun/javatest/agent/AgentFrame.java: > > * src/jtreg/com/sun/javatest/batch/ObserverCommand.java: > > * src/jtreg/com/sun/javatest/exec/BP_TestListSubpanel.java: > > * src/jtreg/com/sun/javatest/exec/ET_FilterHandler.java: > > * src/jtreg/com/sun/javatest/exec/LogViewerTools.java: > > * src/jtreg/com/sun/javatest/exec/NewReportDialog.java: > > * src/jtreg/com/sun/javatest/exec/QuestionLogBrowser.java: > > * src/jtreg/com/sun/javatest/exec/TU_ViewManager.java: > > * src/jtreg/com/sun/javatest/exec/TestTreePanel.java: > > * src/jtreg/com/sun/javatest/tool/ConfigManager.java: > > Fixed warnings caused by using deprecated methods. > > > > Could you s/java:/java,/ for all the files listed except the last one > (ConfigManager.java), it looks like this is the convention for multiple > files using the same description. > > Once that's fixed, the patch can be pushed to HEAD. > > Regards, > Danesh I'd rather we weren't making local changes to something that's maintained elsewhere, and especially not just for a few compiler warnings. -- 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/20120112/798ed3db/attachment.bin From ahughes at redhat.com Thu Jan 12 09:09:29 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 Jan 2012 17:09:29 +0000 Subject: Reviewer needed - IcedTea6 HEAD: fixed some compiler warnings caused by using deprecated methods in JTReg tool In-Reply-To: <4F0F0D37.3040808@redhat.com> References: <4F0EDA3D.6020505@centrum.cz> <4F0F02BF.5080501@redhat.com> <4F0F0D37.3040808@redhat.com> Message-ID: <20120112170929.GA5830@rivendell.middle-earth.co.uk> On 17:41 Thu 12 Jan , Pavel Tisnovsky wrote: > Danesh Dadachanji wrote: > > Hi Pavel, > > > > Not your usual email address? =) > > yeah, today morning the corporate mail does not seem to work (mail were sent to /dev/null :-), > so I used my personal mail instead. > > > > > > The patch looks good, just a minor comment about the ChangeLog below. > > > > On 12/01/12 08:03 AM, Pavel Tisnovsky wrote: > >> Hi all, > >> > >> I've made simple fixes in JTReg tool sources (in IcedTea6 HEAD ATM) to > >> get rid of > >> compiler warnings due to use deprecated API methods. Output of hg diff > >> is stored > >> in an attachment and here is the change log entry: > >> > >> 2012-01-12 Pavel Tisnovsky > >> * src/jtreg/com/sun/interview/wizard/Wizard.java: > >> * src/jtreg/com/sun/javatest/EditJTI.java: > >> * src/jtreg/com/sun/javatest/TestSuite.java: > >> * src/jtreg/com/sun/javatest/agent/AgentFrame.java: > >> * src/jtreg/com/sun/javatest/batch/ObserverCommand.java: > >> * src/jtreg/com/sun/javatest/exec/BP_TestListSubpanel.java: > >> * src/jtreg/com/sun/javatest/exec/ET_FilterHandler.java: > >> * src/jtreg/com/sun/javatest/exec/LogViewerTools.java: > >> * src/jtreg/com/sun/javatest/exec/NewReportDialog.java: > >> * src/jtreg/com/sun/javatest/exec/QuestionLogBrowser.java: > >> * src/jtreg/com/sun/javatest/exec/TU_ViewManager.java: > >> * src/jtreg/com/sun/javatest/exec/TestTreePanel.java: > >> * src/jtreg/com/sun/javatest/tool/ConfigManager.java: > >> Fixed warnings caused by using deprecated methods. > >> > > > > Could you s/java:/java,/ for all the files listed except the last one > > (ConfigManager.java), it looks like this is the convention for multiple > > files using the same description. > > > > Once that's fixed, the patch can be pushed to HEAD. > > Thank you, I'll correct change log & push it. > Pavel > Please don't; see my previous reply. > > > > Regards, > > Danesh > -- 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/20120112/5e50094b/attachment.bin From ahughes at redhat.com Thu Jan 12 09:15:05 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 Jan 2012 17:15:05 +0000 Subject: [1.11 BACKPORT] NEWS update Message-ID: <20120112171505.GB5830@rivendell.middle-earth.co.uk> Following the release of 1.8.12, 1.9.12 and 1.10.5, the NEWS file needs to be updated to include these releases and remove the fixes published in them from the list for 1.11. I've already done this on HEAD with the attached patch. Is this ok for 1.11? Update NEWS due to recent releases. 2012-01-12 Andrew John Hughes * NEWS: Add 1.10.5, 1.9.12 and 1.8.12 release notes. Remove duplicates from 1.11. -- 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 -------------- # HG changeset patch # User Andrew John Hughes # Date 1326382342 0 # Node ID 3527894b6f35cd377aa807d17fc9fd0a95acd426 # Parent 459e476245c6879eb22ca6d961365435b4a63eb4 Update NEWS due to recent releases. 2012-01-12 Andrew John Hughes * NEWS: Add 1.10.5, 1.9.12 and 1.8.12 release notes. Remove duplicates from 1.11. diff -r 459e476245c6 -r 3527894b6f35 ChangeLog --- a/ChangeLog Thu Jan 12 11:46:17 2012 +0100 +++ b/ChangeLog Thu Jan 12 15:32:22 2012 +0000 @@ -1,3 +1,8 @@ +2012-01-12 Andrew John Hughes + + * NEWS: Add 1.10.5, 1.9.12 and 1.8.12 + release notes. Remove duplicates from 1.11. + 2012-01-12 Pavel Tisnovsky * Makefile.am: Add new patch. diff -r 459e476245c6 -r 3527894b6f35 NEWS --- a/NEWS Thu Jan 12 11:46:17 2012 +0100 +++ b/NEWS Thu Jan 12 15:32:22 2012 +0000 @@ -349,8 +349,6 @@ - S6748082: remove platform-specific code from SwingUtilities2.isDisplayLocal - S6708580: Java applications slow when EXA enabled - S6986968: Crash on XIM server restart - - S7034464: Support transparent large pages on Linux - - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used - S7018387: Xrender pipeline may leak GC's - S7036754: Stroked quads sometimes contain NaN - S7008106: com/sun/awt/Translucency/WindowOpacity.java test fails. @@ -386,11 +384,6 @@ - S5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" - S6296893: BMP Writer handles TopDown property incorrectly for some of the compression types - S7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc - - S7102369: remove java.rmi.server.codebase property parsing from registyimpl - - S7094468: rmiregistry clean up - - S6851973: ignore incoming channel binding if acceptor does not set one - - S7091528: javadoc attempts to parse .class files - - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA * ARM Port - Ported to the EABI hard-fp model - Locking for multi-core operation added. @@ -458,6 +451,33 @@ - PR690: Shark fails to JIT using hs20. - PR696: Zero fails to handle fast_aldc and fast_aldc_w in hs20. +New in release 1.10.5 (2012-01-11): + +* Backports + - S7034464: Support transparent large pages on Linux + - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used + - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468, RH751203: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one + - S7091528: javadoc attempts to parse .class files + +New in release 1.9.12 (2012-01-11): + +* Backports + - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468, RH751203: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one + +New in release 1.8.12 (2012-01-11): + +* Backports + - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468, RH751203: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one + New in release 1.9.11 (2011-11-08): * Security fixes -------------- 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/20120112/d5170d8e/attachment.bin From ahughes at redhat.com Thu Jan 12 09:36:17 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 Jan 2012 17:36:17 +0000 Subject: Reviewer needed: backport of "6761072: new krb5 tests fail on multiple platforms" into IcedTea6 HEAD In-Reply-To: <4F0EFCCC.4090309@redhat.com> References: <4F0EFCCC.4090309@redhat.com> Message-ID: <20120112173617.GA6589@rivendell.middle-earth.co.uk> On 16:31 Thu 12 Jan , Pavel Tisnovsky wrote: > Hi all, > > I'd like to add backport of "6761072: new krb5 tests fail on multiple platforms" into IcedTea6 HEAD. > > This backport fixes some JTreg tests which were added to IcedTea6 HEAD via: > > "6706974: Add krb5 test infrastructure" > and > "6851973: ignore incoming channel binding if acceptor does not set one" > > > Change log entry: > > 2012-01-12 Pavel Tisnovsky > > * Makefile.am: Add new patch. > * NEWS: Mention backport. > * patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch: > Backport of 6761072: new krb5 tests fail on multiple platforms > > Can anybody please review this backport? > > Thank you in advance, > Pavel As it just affects tests, I don't see a problem. Do they now all pass? -- 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/20120112/99c64ef8/attachment.bin From ddadacha at redhat.com Thu Jan 12 11:06:33 2012 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Thu, 12 Jan 2012 14:06:33 -0500 Subject: [RFC][icedtea6, icedtea6-1.11] Fix backport of GNOME system tray patch Message-ID: <4F0F2F39.6060902@redhat.com> Hi, Attached are patches for fixes of the GNOME system tray patch I submitted a while back. They use the proper bug ID and fix the patch format to use 'hg export'. I've HEAD and 6-1.11 with ./configure, both built fine. I don't think I've missed anything this time, everything okay to push? Regards, Danesh -------------- next part -------------- A non-text attachment was scrubbed... Name: sys-tray-backport-6-01.patch Type: text/x-patch Size: 8953 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120112/15c5d3d6/sys-tray-backport-6-01.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: sys-tray-backport-6-1.11-01.patch Type: text/x-patch Size: 8983 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120112/15c5d3d6/sys-tray-backport-6-1.11-01.patch From omajid at redhat.com Thu Jan 12 11:09:02 2012 From: omajid at redhat.com (Omair Majid) Date: Thu, 12 Jan 2012 14:09:02 -0500 Subject: [1.11 BACKPORT] NEWS update In-Reply-To: <20120112171505.GB5830@rivendell.middle-earth.co.uk> References: <20120112171505.GB5830@rivendell.middle-earth.co.uk> Message-ID: <4F0F2FCE.7040607@redhat.com> On 01/12/2012 12:15 PM, Dr Andrew John Hughes wrote: > Following the release of 1.8.12, 1.9.12 and 1.10.5, the NEWS file > needs to be updated to include these releases and remove the > fixes published in them from the list for 1.11. > > I've already done this on HEAD with the attached patch. Is this > ok for 1.11? > Looks fine to me. Thanks for doing this! Cheers, Omair From omajid at redhat.com Thu Jan 12 13:41:35 2012 From: omajid at redhat.com (Omair Majid) Date: Thu, 12 Jan 2012 16:41:35 -0500 Subject: [RFC][icedtea6, icedtea6-1.11] Fix backport of GNOME system tray patch In-Reply-To: <4F0F2F39.6060902@redhat.com> References: <4F0F2F39.6060902@redhat.com> Message-ID: <4F0F538F.6060305@redhat.com> On 01/12/2012 02:06 PM, Danesh Dadachanji wrote: > Hi, > > Attached are patches for fixes of the GNOME system tray patch I > submitted a while back. They use the proper bug ID and fix the patch > format to use 'hg export'. > > I've HEAD and 6-1.11 with ./configure, both built fine. > > I don't think I've missed anything this time, everything okay to push? > Looks good to me. Okay for 1.11 Cheers, Omair From aph at redhat.com Fri Jan 13 07:23:08 2012 From: aph at redhat.com (Andrew Haley) Date: Fri, 13 Jan 2012 15:23:08 +0000 Subject: ARM: Fix strange crash while running JCK Message-ID: <4F104C5C.2010906@redhat.com> Pavel reported a strange crash when running the JCK: a segfault happens after the program has been running a long time. It turns out that there are two bytecode dispatch tables. One of these is used for normal dispatch, one of these when there is a safepoint. One of these is generated automagically, and one isn't. If you change bytecode numbering, you also have to change the manually-generated version of the bytecode table. I've added comments to this effect. The bytecodes were renumbered (at HS19, I think) but the manually-generated version of the bytecode table wasn't. The bytecode that was affected was return_register_finalizer, which is only used in the method java.lang.Object.(). So, this crash was very rare: only when moving to a safepoint and executing Object.(), and only in the interpreter: the JIT wasn't affected. I've also taken the opportunity to add bytecode numbers as comments to all the bytecode tables. Finally, I found another bug in the JIT: if we move to a safepoint we should process it before unlocking the monitor at the exit of a synchronized routine. Andrew. 2012-01-13 Andrew Haley * arm_port/hotspot/tools/mkbc.c (writeouttable): Add numbering comments to bytecode output. * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Return): Move safepoint before monitor is unlocked. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (safe_dispatch_table): Add comment. Correct order of do_return_register_finalizer. Add numbering comments. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (TRACE): New macro. diff -r 79014132e844 -r fc7a57de5179 arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def --- a/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Tue Jan 10 16:47:52 2012 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Fri Jan 13 10:07:43 2012 -0500 @@ -29,6 +29,10 @@ #define FAST_BYTECODES #endif +/* WARNING: If you change any of these bytecodes, you must also + change the safe_dispatch_table in cppInterpreter_arm.S to make it + match. */ + nop = 0x00, 1 aconst_null = 0x01, 1 iconst_m1 = 0x02, 1 diff -r 79014132e844 -r fc7a57de5179 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Tue Jan 10 16:47:52 2012 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Fri Jan 13 10:07:43 2012 -0500 @@ -483,6 +483,19 @@ .set dispatch_state, dispatch_state + 1 .endm + @ This macro calls a user-supplied my_trace routine. It + @ passes the current JPC as argument zero. It can be safely + @ inserted at any point in the interpreter. + .macro TRACE + stmfd sp!, {r0, r1, r2, r3, r4, lr} + mrs r4, cpsr + mov r0, jpc + ldr r2, =my_trace + blx r2 + msr cpsr, r4 + ldmfd sp!, {r0, r1, r2, r3, r4, lr} + .endm + .macro DISPATCH_FINISH .if dispatch_state == 0 .error "DISPATCH_FINISH without a DISPATCH_START or DISPATCH_STATE" @@ -4753,262 +4766,266 @@ #ifdef NOTICE_SAFEPOINTS safe_dispatch_table: - .word do_nop - .word do_u4const_0 - .word do_iconst_N - .word do_iconst_N - .word do_iconst_N - .word do_iconst_N - .word do_iconst_N - .word do_iconst_N - .word do_iconst_N - .word do_u8const_0 - .word do_lconst_1 - .word do_u4const_0 - .word do_fconst_1 - .word do_fconst_2 - .word do_u8const_0 - .word do_dconst_1 - .word do_bipush - .word do_sipush - .word do_ldc - .word do_ldc_w - .word do_ldc2_w - .word do_u4load - .word do_u8load - .word do_u4load - .word do_u8load - .word do_u4load - .word do_iload_0 - .word do_iload_0 - .word do_iload_0 - .word do_iload_0 - .word do_u8load_0 - .word do_u8load_1 - .word do_u8load_2 - .word do_u8load_3 - .word do_fload_0 - .word do_fload_0 - .word do_fload_0 - .word do_fload_0 - .word do_u8load_0 - .word do_u8load_1 - .word do_u8load_2 - .word do_u8load_3 - .word do_aload_0 - .word do_aload_0 - .word do_aload_0 - .word do_aload_0 - .word do_u4aload - .word do_u8aload - .word do_u4aload - .word do_u8aload - .word do_u4aload - .word do_baload - .word do_caload - .word do_saload - .word do_u4store - .word do_u8store - .word do_u4store - .word do_u8store - .word do_u4store - .word do_u4store_0 - .word do_u4store_1 - .word do_u4store_2 - .word do_u4store_3 - .word do_u8store_0 - .word do_u8store_1 - .word do_u8store_2 - .word do_u8store_3 - .word do_u4store_0 - .word do_u4store_1 - .word do_u4store_2 - .word do_u4store_3 - .word do_u8store_0 - .word do_u8store_1 - .word do_u8store_2 - .word do_u8store_3 - .word do_u4store_0 - .word do_u4store_1 - .word do_u4store_2 - .word do_u4store_3 - .word do_u4astore - .word do_u8astore - .word do_u4astore - .word do_u8astore - .word do_aastore - .word do_bastore - .word do_u2astore - .word do_u2astore - .word do_jpop - .word do_jpop2 - .word do_dup - .word do_dup_x1 - .word do_dup_x2 - .word do_dup2 - .word do_dup2_x1 - .word do_dup2_x2 - .word do_swap - .word do_iadd - .word do_ladd - .word do_fadd - .word do_dadd - .word do_isub - .word do_lsub - .word do_fsub - .word do_dsub - .word do_imul - .word do_lmul - .word do_fmul - .word do_dmul - .word do_idiv - .word do_ldiv - .word do_fdiv - .word do_ddiv - .word do_irem - .word do_lrem - .word do_frem - .word do_drem - .word do_ineg - .word do_lneg - .word do_fneg - .word do_dneg - .word do_ishl - .word do_lshl - .word do_ishr - .word do_lshr - .word do_iushr - .word do_lushr - .word do_iand - .word do_land - .word do_ior - .word do_lor - .word do_ixor - .word do_lxor - .word do_iinc - .word do_i2l - .word do_i2f - .word do_i2d - .word do_l2i - .word do_l2f - .word do_l2d - .word do_f2i - .word do_f2l - .word do_f2d - .word do_d2i - .word do_d2l - .word do_d2f - .word do_i2b - .word do_i2c - .word do_i2s - .word do_lcmp - .word do_fcmpl - .word do_fcmpg - .word do_dcmpl - .word do_dcmpg - .word do_ifeq - .word do_ifne - .word do_iflt - .word do_ifge - .word do_ifgt - .word do_ifle - .word do_if_icmpeq - .word do_if_icmpne - .word do_if_icmplt - .word do_if_icmpge - .word do_if_icmpgt - .word do_if_icmple - .word do_if_icmpeq - .word do_if_icmpne - .word do_goto - .word do_jsr - .word do_ret - .word do_tableswitch - .word do_lookupswitch - .word do_ireturn - .word do_lreturn - .word do_ireturn - .word do_lreturn - .word do_ireturn - .word do_return - .word do_getstatic - .word do_putstatic - .word do_getfield - .word do_putfield - .word do_invokevirtual - .word do_invokespecial - .word do_invokestatic - .word do_invokeinterface - .word do_undefined - .word do_new - .word do_newarray - .word do_anewarray - .word do_arraylength - .word do_athrow - .word do_checkcast - .word do_instanceof - .word do_monitorenter - .word do_monitorexit - .word do_wide - .word do_multianewarray - .word do_ifeq - .word do_ifne - .word do_goto_w - .word do_jsr_w - .word do_breakpoint - .word do_undefined - .word do_bgetfield - .word do_cgetfield - .word do_undefined - .word do_undefined - .word do_igetfield - .word do_lgetfield - .word do_sgetfield - .word do_aputfield - .word do_bputfield - .word do_cputfield - .word do_undefined - .word do_undefined - .word do_iputfield - .word do_lputfield - .word do_undefined - .word do_iaccess_0 - .word do_iaccess_0 - .word do_iaccess_0 - .word do_iaccess_0 - .word do_invokeresolved - .word do_invokespecialresolved - .word do_invokestaticresolved - .word do_invokevfinal - .word do_fast_iload_iload - .word do_fast_iload_iload_N - .word do_return_register_finalizer - .word do_undefined - .word do_iload_0_iconst_N - .word do_iload_0_iconst_N - .word do_iload_0_iconst_N - .word do_iload_0_iconst_N - .word do_iload_iconst_N - .word do_iadd_istore_N - .word do_isub_istore_N - .word do_iand_istore_N - .word do_ior_istore_N - .word do_ixor_istore_N - .word do_iadd_u4store - .word do_isub_u4store - .word do_iand_u4store - .word do_ior_u4store - .word do_ixor_u4store - .word do_fast_iload_N_iload - .word do_fast_iload_N_iload - .word do_fast_iload_N_iload - .word do_fast_iload_N_iload - .word do_fast_iload_N_iload_N - .word do_fast_iload_N_iload_N - .word do_fast_iload_N_iload_N - .word do_fast_iload_N_iload_N - .word do_undefined - .word do_undefined + +/* WARNING: If you change any of these bytecodes, you must also + change the table in bytecodes_arm.def to make it match. */ + + .word do_nop @ 0 0x00 + .word do_u4const_0 @ 1 0x01 + .word do_iconst_N @ 2 0x02 + .word do_iconst_N @ 3 0x03 + .word do_iconst_N @ 4 0x04 + .word do_iconst_N @ 5 0x05 + .word do_iconst_N @ 6 0x06 + .word do_iconst_N @ 7 0x07 + .word do_iconst_N @ 8 0x08 + .word do_u8const_0 @ 9 0x09 + .word do_lconst_1 @ 10 0x0a + .word do_u4const_0 @ 11 0x0b + .word do_fconst_1 @ 12 0x0c + .word do_fconst_2 @ 13 0x0d + .word do_u8const_0 @ 14 0x0e + .word do_dconst_1 @ 15 0x0f + .word do_bipush @ 16 0x10 + .word do_sipush @ 17 0x11 + .word do_ldc @ 18 0x12 + .word do_ldc_w @ 19 0x13 + .word do_ldc2_w @ 20 0x14 + .word do_u4load @ 21 0x15 + .word do_u8load @ 22 0x16 + .word do_u4load @ 23 0x17 + .word do_u8load @ 24 0x18 + .word do_u4load @ 25 0x19 + .word do_iload_0 @ 26 0x1a + .word do_iload_0 @ 27 0x1b + .word do_iload_0 @ 28 0x1c + .word do_iload_0 @ 29 0x1d + .word do_u8load_0 @ 30 0x1e + .word do_u8load_1 @ 31 0x1f + .word do_u8load_2 @ 32 0x20 + .word do_u8load_3 @ 33 0x21 + .word do_fload_0 @ 34 0x22 + .word do_fload_0 @ 35 0x23 + .word do_fload_0 @ 36 0x24 + .word do_fload_0 @ 37 0x25 + .word do_u8load_0 @ 38 0x26 + .word do_u8load_1 @ 39 0x27 + .word do_u8load_2 @ 40 0x28 + .word do_u8load_3 @ 41 0x29 + .word do_aload_0 @ 42 0x2a + .word do_aload_0 @ 43 0x2b + .word do_aload_0 @ 44 0x2c + .word do_aload_0 @ 45 0x2d + .word do_u4aload @ 46 0x2e + .word do_u8aload @ 47 0x2f + .word do_u4aload @ 48 0x30 + .word do_u8aload @ 49 0x31 + .word do_u4aload @ 50 0x32 + .word do_baload @ 51 0x33 + .word do_caload @ 52 0x34 + .word do_saload @ 53 0x35 + .word do_u4store @ 54 0x36 + .word do_u8store @ 55 0x37 + .word do_u4store @ 56 0x38 + .word do_u8store @ 57 0x39 + .word do_u4store @ 58 0x3a + .word do_u4store_0 @ 59 0x3b + .word do_u4store_1 @ 60 0x3c + .word do_u4store_2 @ 61 0x3d + .word do_u4store_3 @ 62 0x3e + .word do_u8store_0 @ 63 0x3f + .word do_u8store_1 @ 64 0x40 + .word do_u8store_2 @ 65 0x41 + .word do_u8store_3 @ 66 0x42 + .word do_u4store_0 @ 67 0x43 + .word do_u4store_1 @ 68 0x44 + .word do_u4store_2 @ 69 0x45 + .word do_u4store_3 @ 70 0x46 + .word do_u8store_0 @ 71 0x47 + .word do_u8store_1 @ 72 0x48 + .word do_u8store_2 @ 73 0x49 + .word do_u8store_3 @ 74 0x4a + .word do_u4store_0 @ 75 0x4b + .word do_u4store_1 @ 76 0x4c + .word do_u4store_2 @ 77 0x4d + .word do_u4store_3 @ 78 0x4e + .word do_u4astore @ 79 0x4f + .word do_u8astore @ 80 0x50 + .word do_u4astore @ 81 0x51 + .word do_u8astore @ 82 0x52 + .word do_aastore @ 83 0x53 + .word do_bastore @ 84 0x54 + .word do_u2astore @ 85 0x55 + .word do_u2astore @ 86 0x56 + .word do_jpop @ 87 0x57 + .word do_jpop2 @ 88 0x58 + .word do_dup @ 89 0x59 + .word do_dup_x1 @ 90 0x5a + .word do_dup_x2 @ 91 0x5b + .word do_dup2 @ 92 0x5c + .word do_dup2_x1 @ 93 0x5d + .word do_dup2_x2 @ 94 0x5e + .word do_swap @ 95 0x5f + .word do_iadd @ 96 0x60 + .word do_ladd @ 97 0x61 + .word do_fadd @ 98 0x62 + .word do_dadd @ 99 0x63 + .word do_isub @ 100 0x64 + .word do_lsub @ 101 0x65 + .word do_fsub @ 102 0x66 + .word do_dsub @ 103 0x67 + .word do_imul @ 104 0x68 + .word do_lmul @ 105 0x69 + .word do_fmul @ 106 0x6a + .word do_dmul @ 107 0x6b + .word do_idiv @ 108 0x6c + .word do_ldiv @ 109 0x6d + .word do_fdiv @ 110 0x6e + .word do_ddiv @ 111 0x6f + .word do_irem @ 112 0x70 + .word do_lrem @ 113 0x71 + .word do_frem @ 114 0x72 + .word do_drem @ 115 0x73 + .word do_ineg @ 116 0x74 + .word do_lneg @ 117 0x75 + .word do_fneg @ 118 0x76 + .word do_dneg @ 119 0x77 + .word do_ishl @ 120 0x78 + .word do_lshl @ 121 0x79 + .word do_ishr @ 122 0x7a + .word do_lshr @ 123 0x7b + .word do_iushr @ 124 0x7c + .word do_lushr @ 125 0x7d + .word do_iand @ 126 0x7e + .word do_land @ 127 0x7f + .word do_ior @ 128 0x80 + .word do_lor @ 129 0x81 + .word do_ixor @ 130 0x82 + .word do_lxor @ 131 0x83 + .word do_iinc @ 132 0x84 + .word do_i2l @ 133 0x85 + .word do_i2f @ 134 0x86 + .word do_i2d @ 135 0x87 + .word do_l2i @ 136 0x88 + .word do_l2f @ 137 0x89 + .word do_l2d @ 138 0x8a + .word do_f2i @ 139 0x8b + .word do_f2l @ 140 0x8c + .word do_f2d @ 141 0x8d + .word do_d2i @ 142 0x8e + .word do_d2l @ 143 0x8f + .word do_d2f @ 144 0x90 + .word do_i2b @ 145 0x91 + .word do_i2c @ 146 0x92 + .word do_i2s @ 147 0x93 + .word do_lcmp @ 148 0x94 + .word do_fcmpl @ 149 0x95 + .word do_fcmpg @ 150 0x96 + .word do_dcmpl @ 151 0x97 + .word do_dcmpg @ 152 0x98 + .word do_ifeq @ 153 0x99 + .word do_ifne @ 154 0x9a + .word do_iflt @ 155 0x9b + .word do_ifge @ 156 0x9c + .word do_ifgt @ 157 0x9d + .word do_ifle @ 158 0x9e + .word do_if_icmpeq @ 159 0x9f + .word do_if_icmpne @ 160 0xa0 + .word do_if_icmplt @ 161 0xa1 + .word do_if_icmpge @ 162 0xa2 + .word do_if_icmpgt @ 163 0xa3 + .word do_if_icmple @ 164 0xa4 + .word do_if_icmpeq @ 165 0xa5 + .word do_if_icmpne @ 166 0xa6 + .word do_goto @ 167 0xa7 + .word do_jsr @ 168 0xa8 + .word do_ret @ 169 0xa9 + .word do_tableswitch @ 170 0xaa + .word do_lookupswitch @ 171 0xab + .word do_ireturn @ 172 0xac + .word do_lreturn @ 173 0xad + .word do_ireturn @ 174 0xae + .word do_lreturn @ 175 0xaf + .word do_ireturn @ 176 0xb0 + .word do_return @ 177 0xb1 + .word do_getstatic @ 178 0xb2 + .word do_putstatic @ 179 0xb3 + .word do_getfield @ 180 0xb4 + .word do_putfield @ 181 0xb5 + .word do_invokevirtual @ 182 0xb6 + .word do_invokespecial @ 183 0xb7 + .word do_invokestatic @ 184 0xb8 + .word do_invokeinterface @ 185 0xb9 + .word do_undefined @ 186 0xba + .word do_new @ 187 0xbb + .word do_newarray @ 188 0xbc + .word do_anewarray @ 189 0xbd + .word do_arraylength @ 190 0xbe + .word do_athrow @ 191 0xbf + .word do_checkcast @ 192 0xc0 + .word do_instanceof @ 193 0xc1 + .word do_monitorenter @ 194 0xc2 + .word do_monitorexit @ 195 0xc3 + .word do_wide @ 196 0xc4 + .word do_multianewarray @ 197 0xc5 + .word do_ifeq @ 198 0xc6 + .word do_ifne @ 199 0xc7 + .word do_goto_w @ 200 0xc8 + .word do_jsr_w @ 201 0xc9 + .word do_breakpoint @ 202 0xca + .word do_undefined @ 203 0xcb + .word do_bgetfield @ 204 0xcc + .word do_cgetfield @ 205 0xcd + .word do_undefined @ 206 0xce + .word do_undefined @ 207 0xcf + .word do_igetfield @ 208 0xd0 + .word do_lgetfield @ 209 0xd1 + .word do_sgetfield @ 210 0xd2 + .word do_aputfield @ 211 0xd3 + .word do_bputfield @ 212 0xd4 + .word do_cputfield @ 213 0xd5 + .word do_undefined @ 214 0xd6 + .word do_undefined @ 215 0xd7 + .word do_iputfield @ 216 0xd8 + .word do_lputfield @ 217 0xd9 + .word do_undefined @ 218 0xda + .word do_iaccess_0 @ 219 0xdb + .word do_iaccess_0 @ 220 0xdc + .word do_iaccess_0 @ 221 0xdd + .word do_iaccess_0 @ 222 0xde + .word do_invokeresolved @ 223 0xdf + .word do_invokespecialresolved @ 224 0xe0 + .word do_invokestaticresolved @ 225 0xe1 + .word do_invokevfinal @ 226 0xe2 + .word do_fast_iload_iload @ 227 0xe3 + .word do_fast_iload_iload_N @ 228 0xe4 + .word do_undefined @ 229 0xe5 + .word do_undefined @ 230 0xe6 + .word do_return_register_finalizer @ 231 0xe7 + .word do_undefined @ 232 0xe8 + .word do_iload_0_iconst_N @ 233 0xe9 + .word do_iload_0_iconst_N @ 234 0xea + .word do_iload_0_iconst_N @ 235 0xeb + .word do_iload_0_iconst_N @ 236 0xec + .word do_iload_iconst_N @ 237 0xed + .word do_iadd_istore_N @ 238 0xee + .word do_isub_istore_N @ 239 0xef + .word do_iand_istore_N @ 240 0xf0 + .word do_ior_istore_N @ 241 0xf1 + .word do_ixor_istore_N @ 242 0xf2 + .word do_iadd_u4store @ 243 0xf3 + .word do_isub_u4store @ 244 0xf4 + .word do_iand_u4store @ 245 0xf5 + .word do_ior_u4store @ 246 0xf6 + .word do_ixor_u4store @ 247 0xf7 + .word do_fast_iload_N_iload @ 248 0xf8 + .word do_fast_iload_N_iload @ 249 0xf9 + .word do_fast_iload_N_iload @ 250 0xfa + .word do_fast_iload_N_iload @ 251 0xfb + .word do_fast_iload_N_iload_N @ 252 0xfc + .word do_fast_iload_N_iload_N @ 253 0xfd + .word do_fast_iload_N_iload_N @ 254 0xfe + .word do_fast_iload_N_iload_N @ 255 0xff #endif SUB_DISPATCH_TABLES diff -r 79014132e844 -r fc7a57de5179 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Tue Jan 10 16:47:52 2012 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Fri Jan 13 10:07:43 2012 -0500 @@ -4404,6 +4404,8 @@ void Thumb2_Return(Thumb2_Info *jinfo, unsigned opcode, int bci) { + Thumb2_Safepoint(jinfo, 0, bci); + Reg r_lo, r; Thumb2_Stack *jstack = jinfo->jstack; @@ -4470,8 +4472,6 @@ cbz_patch(jinfo->codebuf, ARM_R3, loc_success2); } - Thumb2_Safepoint(jinfo, 0, bci); - if (opcode != opc_return) { if (opcode == opc_lreturn || opcode == opc_dreturn) { Thumb2_Fill(jinfo, 2); diff -r 79014132e844 -r fc7a57de5179 arm_port/hotspot/tools/mkbc.c --- a/arm_port/hotspot/tools/mkbc.c Tue Jan 10 16:47:52 2012 +0000 +++ b/arm_port/hotspot/tools/mkbc.c Fri Jan 13 10:07:43 2012 -0500 @@ -399,9 +399,9 @@ fprintf(bci_f, "+%d\n", len); } else { if (table[i].impl_name) - fprintf(bci_f, "\t.word\t%s%s\n", prefix, table[i].impl_name); + fprintf(bci_f, "\t.word\t%s%s \t@ %d 0x%02x\n", prefix, table[i].impl_name, i, i); else - fprintf(bci_f, "\t.word\t%s%s\n", prefix, table[i].def_name); + fprintf(bci_f, "\t.word\t%s%s \t@ %d 0x%02x\n", prefix, table[i].def_name, i, i); } } if (depth == 0) { @@ -416,7 +416,7 @@ fputc('_', bci_f); fputs(bytecodes[table_indices[j]].name, bci_f); } - fputs(":\n", bci_f); + fprintf(bci_f, ":\t@ %d 0x%02x\n", i, i); remove_duplicates(table, i, table_indices, depth); writeouttable(table[i].subtable, table_indices, depth+1); } From ddadacha at icedtea.classpath.org Fri Jan 13 08:28:07 2012 From: ddadacha at icedtea.classpath.org (ddadacha at icedtea.classpath.org) Date: Fri, 13 Jan 2012 16:28:07 +0000 Subject: /hg/icedtea6: Fix backport of GNOME system tray patch. Message-ID: changeset 04b0c0d5dcad in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=04b0c0d5dcad author: Danesh Dadachanji date: Fri Jan 13 11:27:32 2012 -0500 Fix backport of GNOME system tray patch. diffstat: ChangeLog | 10 + Makefile.am | 2 +- NEWS | 2 +- patches/openjdk/683768-System-tray-icon.patch | 79 -------- patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch | 93 ++++++++++ 5 files changed, 105 insertions(+), 81 deletions(-) diffs (234 lines): diff -r 3527894b6f35 -r 04b0c0d5dcad ChangeLog --- a/ChangeLog Thu Jan 12 15:32:22 2012 +0000 +++ b/ChangeLog Fri Jan 13 11:27:32 2012 -0500 @@ -1,3 +1,13 @@ +2012-01-12 Danesh Dadachanji + + * Makefile.am: + (ICEDTEA_PATCHES): Replace patches/openjdk/683768-System-tray-icon.patch with + patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch + * NEWS: Moved RH683768 from Bug fixes to 1.11 Backports, added S7103610 to it. + * patches/openjdk/683768-System-tray-icon.patch: Removed. + * patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch: + New file. Sets XAtoms _NET_WM_PID and WM_CLIENT_MACHINE for X windows. + 2012-01-12 Andrew John Hughes * NEWS: Add 1.10.5, 1.9.12 and 1.8.12 diff -r 3527894b6f35 -r 04b0c0d5dcad Makefile.am --- a/Makefile.am Thu Jan 12 15:32:22 2012 +0000 +++ b/Makefile.am Fri Jan 13 11:27:32 2012 -0500 @@ -399,7 +399,7 @@ patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \ patches/openjdk/7103224-glibc_name_collision.patch \ patches/arm-debug.patch \ - patches/openjdk/683768-System-tray-icon.patch \ + patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \ patches/openjdk/7102369-7094468-rmiregistry.patch \ patches/openjdk/6851973-kerberos.patch \ patches/openjdk/7091528-javadoc_class_files.patch \ diff -r 3527894b6f35 -r 04b0c0d5dcad NEWS --- a/NEWS Thu Jan 12 15:32:22 2012 +0000 +++ b/NEWS Fri Jan 13 11:27:32 2012 -0500 @@ -28,7 +28,6 @@ - PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan - RH727195: Japanese font mappings are broken - LP862286: Fix exception on trying to start PulseAudio playback - - RH683768: Add a workaround for Java applications using tray icon for Gnome Shell - PR719: make distcheck should work in IcedTea6 * Import of OpenJDK6 b24 - S7099148: increment build number of hs20.0 to b12 @@ -384,6 +383,7 @@ - S5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" - S6296893: BMP Writer handles TopDown property incorrectly for some of the compression types - S7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc + - S7103610, RH683768: _NET_WM_PID and WM_CLIENT_MACHINE are not set * ARM Port - Ported to the EABI hard-fp model - Locking for multi-core operation added. diff -r 3527894b6f35 -r 04b0c0d5dcad patches/openjdk/683768-System-tray-icon.patch --- a/patches/openjdk/683768-System-tray-icon.patch Thu Jan 12 15:32:22 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,82 +0,0 @@ ---- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2011-11-10 14:24:02.954504503 -0500 -+++ openjdk/jdk/make/sun/xawt/mapfile-vers 2011-11-14 15:17:31.710505342 -0500 -@@ -304,6 +304,8 @@ - Java_sun_awt_X11_XlibWrapper_XSynchronize; - Java_java_awt_FileDialog_initIDs; - Java_sun_awt_X11_XWindow_initIDs; -+ Java_sun_awt_X11_XWindowPeer_getLocalHostname; -+ Java_sun_awt_X11_XWindowPeer_getJvmPID; - - Java_sun_java2d_opengl_OGLContext_getOGLIdString; - Java_sun_java2d_opengl_OGLMaskFill_maskFill; ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java 2011-11-10 14:24:02.702508353 -0500 -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java 2011-11-14 15:17:31.735504849 -0500 -@@ -199,11 +199,18 @@ - return name; - } - -+ private static native String getLocalHostname(); -+ private static native int getJvmPID(); -+ - void postInit(XCreateWindowParams params) { - super.postInit(params); - - // Init WM_PROTOCOLS atom - initWMProtocols(); -+ -+ // Set _NET_WM_PID and WM_CLIENT_MACHINE using this JVM -+ XAtom.get("WM_CLIENT_MACHINE").setProperty(getWindow(), getLocalHostname()); -+ XAtom.get("_NET_WM_PID").setCard32Property(getWindow(), getJvmPID()); - - // Set WM_TRANSIENT_FOR and group_leader - Window t_window = (Window)target; ---- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c 2011-07-05 14:36:12.000000000 -0400 -+++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2011-11-14 15:17:31.775504063 -0500 -@@ -46,6 +46,8 @@ - #include "java_awt_SystemColor.h" - #include "java_awt_TrayIcon.h" - -+#include -+ - uint32_t awt_NumLockMask = 0; - Boolean awt_ModLockIsShiftLock = False; - -@@ -914,3 +916,38 @@ - AWT_UNLOCK(); - } - } -+ -+/* -+ * Class: sun_awt_X11_XWindowPeer -+ * Method: getJvmPID -+ * Signature: ()I -+ */ -+JNIEXPORT jint JNICALL Java_sun_awt_X11_XWindowPeer_getJvmPID -+(JNIEnv *env, jclass cls) -+{ -+ /* Return the JVM's PID. */ -+ return getpid(); -+} -+ -+#ifndef HOST_NAME_MAX -+#define HOST_NAME_MAX 1024 /* Overestimated */ -+#endif -+ -+/* -+ * Class: sun_awt_X11_XWindowPeer -+ * Method: getLocalHostname -+ * Signature: ()Ljava/lang/String; -+ */ -+JNIEXPORT jstring JNICALL Java_sun_awt_X11_XWindowPeer_getLocalHostname -+(JNIEnv *env, jclass cls) -+{ -+ /* Return the machine's FQDN. */ -+ char hostname[HOST_NAME_MAX + 1]; -+ if (gethostname(hostname, HOST_NAME_MAX + 1) == 0) { -+ hostname[HOST_NAME_MAX] = '\0'; -+ jstring res = (*env)->NewStringUTF(env, hostname); -+ return res; -+ } -+ -+ return (jstring)NULL; -+} diff -r 3527894b6f35 -r 04b0c0d5dcad patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch Fri Jan 13 11:27:32 2012 -0500 @@ -0,0 +1,96 @@ +# HG changeset patch +# User anthony +# Date 1321013871 -10800 +# Node ID f614bcada2a992a2db8dfc7510cd8d82386ac1f0 +# Parent 16327765859cebadeadaad9a4b61469c510c7a6e +7103610: _NET_WM_PID and WM_CLIENT_MACHINE are not set +Summary: Set the properties to all top-level windows +Reviewed-by: anthony +Contributed-by: Danesh Dadachanji + +diff -r 16327765859c -r f614bcada2a9 make/sun/xawt/mapfile-vers +--- openjdk.orig/jdk/make/sun/xawt/mapfile-vers Thu Nov 10 17:37:29 2011 +0400 ++++ openjdk/jdk/make/sun/xawt/mapfile-vers Fri Nov 11 15:17:51 2011 +0300 +@@ -322,6 +322,8 @@ + Java_sun_awt_X11_XlibWrapper_XSynchronize; + Java_java_awt_FileDialog_initIDs; + Java_sun_awt_X11_XWindow_initIDs; ++ Java_sun_awt_X11_XWindowPeer_getLocalHostname; ++ Java_sun_awt_X11_XWindowPeer_getJvmPID; + + Java_sun_java2d_opengl_OGLContext_getOGLIdString; + Java_sun_java2d_opengl_OGLMaskFill_maskFill; +diff -r 16327765859c -r f614bcada2a9 src/solaris/classes/sun/awt/X11/XWindowPeer.java +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java Thu Nov 10 17:37:29 2011 +0400 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java Fri Nov 11 15:17:51 2011 +0300 +@@ -208,12 +208,19 @@ + return name; + } + ++ private static native String getLocalHostname(); ++ private static native int getJvmPID(); ++ + void postInit(XCreateWindowParams params) { + super.postInit(params); + + // Init WM_PROTOCOLS atom + initWMProtocols(); + ++ // Set _NET_WM_PID and WM_CLIENT_MACHINE using this JVM ++ XAtom.get("WM_CLIENT_MACHINE").setProperty(getWindow(), getLocalHostname()); ++ XAtom.get("_NET_WM_PID").setCard32Property(getWindow(), getJvmPID()); ++ + // Set WM_TRANSIENT_FOR and group_leader + Window t_window = (Window)target; + Window owner = t_window.getOwner(); +diff -r 16327765859c -r f614bcada2a9 src/solaris/native/sun/xawt/XToolkit.c +--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c Thu Nov 10 17:37:29 2011 +0400 ++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c Fri Nov 11 15:17:51 2011 +0300 +@@ -47,6 +47,8 @@ + #include "java_awt_TrayIcon.h" + #include + ++#include ++ + uint32_t awt_NumLockMask = 0; + Boolean awt_ModLockIsShiftLock = False; + +@@ -1087,3 +1089,38 @@ + + return local_num_buttons; + } ++ ++/* ++ * Class: sun_awt_X11_XWindowPeer ++ * Method: getJvmPID ++ * Signature: ()I ++ */ ++JNIEXPORT jint JNICALL Java_sun_awt_X11_XWindowPeer_getJvmPID ++(JNIEnv *env, jclass cls) ++{ ++ /* Return the JVM's PID. */ ++ return getpid(); ++} ++ ++#ifndef HOST_NAME_MAX ++#define HOST_NAME_MAX 1024 /* Overestimated */ ++#endif ++ ++/* ++ * Class: sun_awt_X11_XWindowPeer ++ * Method: getLocalHostname ++ * Signature: ()Ljava/lang/String; ++ */ ++JNIEXPORT jstring JNICALL Java_sun_awt_X11_XWindowPeer_getLocalHostname ++(JNIEnv *env, jclass cls) ++{ ++ /* Return the machine's FQDN. */ ++ char hostname[HOST_NAME_MAX + 1]; ++ if (gethostname(hostname, HOST_NAME_MAX + 1) == 0) { ++ hostname[HOST_NAME_MAX] = '\0'; ++ jstring res = (*env)->NewStringUTF(env, hostname); ++ return res; ++ } ++ ++ return (jstring)NULL; ++} From ddadacha at icedtea.classpath.org Fri Jan 13 08:33:12 2012 From: ddadacha at icedtea.classpath.org (ddadacha at icedtea.classpath.org) Date: Fri, 13 Jan 2012 16:33:12 +0000 Subject: /hg/release/icedtea6-1.11: Fix backport of GNOME system tray patch. Message-ID: changeset 0242cfaf15fa in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=0242cfaf15fa author: Danesh Dadachanji date: Fri Jan 13 11:30:31 2012 -0500 Fix backport of GNOME system tray patch. diffstat: ChangeLog | 10 + Makefile.am | 2 +- NEWS | 2 +- patches/openjdk/683768-System-tray-icon.patch | 79 -------- patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch | 93 ++++++++++ 5 files changed, 105 insertions(+), 81 deletions(-) diffs (234 lines): diff -r ad4d331b4cd0 -r 0242cfaf15fa ChangeLog --- a/ChangeLog Wed Jan 11 11:38:55 2012 -0500 +++ b/ChangeLog Fri Jan 13 11:30:31 2012 -0500 @@ -1,3 +1,13 @@ +2012-01-12 Danesh Dadachanji + + * Makefile.am: + (ICEDTEA_PATCHES): Replace patches/openjdk/683768-System-tray-icon.patch with + patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch + * NEWS: Moved RH683768 from Bug fixes to 1.11 Backports, added S7103610 to it. + * patches/openjdk/683768-System-tray-icon.patch: Removed. + * patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch: + New file. Sets XAtoms _NET_WM_PID and WM_CLIENT_MACHINE for X windows. + 2012-01-09 Omair Majid * acinclude.m4 (IT_SET_SHARK_BUILD): Error out if shark is enabled. diff -r ad4d331b4cd0 -r 0242cfaf15fa Makefile.am --- a/Makefile.am Wed Jan 11 11:38:55 2012 -0500 +++ b/Makefile.am Fri Jan 13 11:30:31 2012 -0500 @@ -399,7 +399,7 @@ patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \ patches/openjdk/7103224-glibc_name_collision.patch \ patches/arm-debug.patch \ - patches/openjdk/683768-System-tray-icon.patch \ + patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \ patches/openjdk/7102369-7094468-rmiregistry.patch \ patches/openjdk/6851973-kerberos.patch \ patches/openjdk/7091528-javadoc_class_files.patch \ diff -r ad4d331b4cd0 -r 0242cfaf15fa NEWS --- a/NEWS Wed Jan 11 11:38:55 2012 -0500 +++ b/NEWS Fri Jan 13 11:30:31 2012 -0500 @@ -23,7 +23,6 @@ - PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan - RH727195: Japanese font mappings are broken - LP862286: Fix exception on trying to start PulseAudio playback - - RH683768: Add a workaround for Java applications using tray icon for Gnome Shell - PR719: make distcheck should work in IcedTea6 * Import of OpenJDK6 b24 - S7099148: increment build number of hs20.0 to b12 @@ -386,6 +385,7 @@ - S6851973: ignore incoming channel binding if acceptor does not set one - S7091528: javadoc attempts to parse .class files - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S7103610, RH683768: _NET_WM_PID and WM_CLIENT_MACHINE are not set * ARM Port - Ported to the EABI hard-fp model - Locking for multi-core operation added. diff -r ad4d331b4cd0 -r 0242cfaf15fa patches/openjdk/683768-System-tray-icon.patch --- a/patches/openjdk/683768-System-tray-icon.patch Wed Jan 11 11:38:55 2012 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,82 +0,0 @@ ---- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2011-11-10 14:24:02.954504503 -0500 -+++ openjdk/jdk/make/sun/xawt/mapfile-vers 2011-11-14 15:17:31.710505342 -0500 -@@ -304,6 +304,8 @@ - Java_sun_awt_X11_XlibWrapper_XSynchronize; - Java_java_awt_FileDialog_initIDs; - Java_sun_awt_X11_XWindow_initIDs; -+ Java_sun_awt_X11_XWindowPeer_getLocalHostname; -+ Java_sun_awt_X11_XWindowPeer_getJvmPID; - - Java_sun_java2d_opengl_OGLContext_getOGLIdString; - Java_sun_java2d_opengl_OGLMaskFill_maskFill; ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java 2011-11-10 14:24:02.702508353 -0500 -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java 2011-11-14 15:17:31.735504849 -0500 -@@ -199,11 +199,18 @@ - return name; - } - -+ private static native String getLocalHostname(); -+ private static native int getJvmPID(); -+ - void postInit(XCreateWindowParams params) { - super.postInit(params); - - // Init WM_PROTOCOLS atom - initWMProtocols(); -+ -+ // Set _NET_WM_PID and WM_CLIENT_MACHINE using this JVM -+ XAtom.get("WM_CLIENT_MACHINE").setProperty(getWindow(), getLocalHostname()); -+ XAtom.get("_NET_WM_PID").setCard32Property(getWindow(), getJvmPID()); - - // Set WM_TRANSIENT_FOR and group_leader - Window t_window = (Window)target; ---- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c 2011-07-05 14:36:12.000000000 -0400 -+++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2011-11-14 15:17:31.775504063 -0500 -@@ -46,6 +46,8 @@ - #include "java_awt_SystemColor.h" - #include "java_awt_TrayIcon.h" - -+#include -+ - uint32_t awt_NumLockMask = 0; - Boolean awt_ModLockIsShiftLock = False; - -@@ -914,3 +916,38 @@ - AWT_UNLOCK(); - } - } -+ -+/* -+ * Class: sun_awt_X11_XWindowPeer -+ * Method: getJvmPID -+ * Signature: ()I -+ */ -+JNIEXPORT jint JNICALL Java_sun_awt_X11_XWindowPeer_getJvmPID -+(JNIEnv *env, jclass cls) -+{ -+ /* Return the JVM's PID. */ -+ return getpid(); -+} -+ -+#ifndef HOST_NAME_MAX -+#define HOST_NAME_MAX 1024 /* Overestimated */ -+#endif -+ -+/* -+ * Class: sun_awt_X11_XWindowPeer -+ * Method: getLocalHostname -+ * Signature: ()Ljava/lang/String; -+ */ -+JNIEXPORT jstring JNICALL Java_sun_awt_X11_XWindowPeer_getLocalHostname -+(JNIEnv *env, jclass cls) -+{ -+ /* Return the machine's FQDN. */ -+ char hostname[HOST_NAME_MAX + 1]; -+ if (gethostname(hostname, HOST_NAME_MAX + 1) == 0) { -+ hostname[HOST_NAME_MAX] = '\0'; -+ jstring res = (*env)->NewStringUTF(env, hostname); -+ return res; -+ } -+ -+ return (jstring)NULL; -+} diff -r ad4d331b4cd0 -r 0242cfaf15fa patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch Fri Jan 13 11:30:31 2012 -0500 @@ -0,0 +1,96 @@ +# HG changeset patch +# User anthony +# Date 1321013871 -10800 +# Node ID f614bcada2a992a2db8dfc7510cd8d82386ac1f0 +# Parent 16327765859cebadeadaad9a4b61469c510c7a6e +7103610: _NET_WM_PID and WM_CLIENT_MACHINE are not set +Summary: Set the properties to all top-level windows +Reviewed-by: anthony +Contributed-by: Danesh Dadachanji + +diff -r 16327765859c -r f614bcada2a9 make/sun/xawt/mapfile-vers +--- openjdk.orig/jdk/make/sun/xawt/mapfile-vers Thu Nov 10 17:37:29 2011 +0400 ++++ openjdk/jdk/make/sun/xawt/mapfile-vers Fri Nov 11 15:17:51 2011 +0300 +@@ -322,6 +322,8 @@ + Java_sun_awt_X11_XlibWrapper_XSynchronize; + Java_java_awt_FileDialog_initIDs; + Java_sun_awt_X11_XWindow_initIDs; ++ Java_sun_awt_X11_XWindowPeer_getLocalHostname; ++ Java_sun_awt_X11_XWindowPeer_getJvmPID; + + Java_sun_java2d_opengl_OGLContext_getOGLIdString; + Java_sun_java2d_opengl_OGLMaskFill_maskFill; +diff -r 16327765859c -r f614bcada2a9 src/solaris/classes/sun/awt/X11/XWindowPeer.java +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java Thu Nov 10 17:37:29 2011 +0400 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java Fri Nov 11 15:17:51 2011 +0300 +@@ -208,12 +208,19 @@ + return name; + } + ++ private static native String getLocalHostname(); ++ private static native int getJvmPID(); ++ + void postInit(XCreateWindowParams params) { + super.postInit(params); + + // Init WM_PROTOCOLS atom + initWMProtocols(); + ++ // Set _NET_WM_PID and WM_CLIENT_MACHINE using this JVM ++ XAtom.get("WM_CLIENT_MACHINE").setProperty(getWindow(), getLocalHostname()); ++ XAtom.get("_NET_WM_PID").setCard32Property(getWindow(), getJvmPID()); ++ + // Set WM_TRANSIENT_FOR and group_leader + Window t_window = (Window)target; + Window owner = t_window.getOwner(); +diff -r 16327765859c -r f614bcada2a9 src/solaris/native/sun/xawt/XToolkit.c +--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c Thu Nov 10 17:37:29 2011 +0400 ++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c Fri Nov 11 15:17:51 2011 +0300 +@@ -47,6 +47,8 @@ + #include "java_awt_TrayIcon.h" + #include + ++#include ++ + uint32_t awt_NumLockMask = 0; + Boolean awt_ModLockIsShiftLock = False; + +@@ -1087,3 +1089,38 @@ + + return local_num_buttons; + } ++ ++/* ++ * Class: sun_awt_X11_XWindowPeer ++ * Method: getJvmPID ++ * Signature: ()I ++ */ ++JNIEXPORT jint JNICALL Java_sun_awt_X11_XWindowPeer_getJvmPID ++(JNIEnv *env, jclass cls) ++{ ++ /* Return the JVM's PID. */ ++ return getpid(); ++} ++ ++#ifndef HOST_NAME_MAX ++#define HOST_NAME_MAX 1024 /* Overestimated */ ++#endif ++ ++/* ++ * Class: sun_awt_X11_XWindowPeer ++ * Method: getLocalHostname ++ * Signature: ()Ljava/lang/String; ++ */ ++JNIEXPORT jstring JNICALL Java_sun_awt_X11_XWindowPeer_getLocalHostname ++(JNIEnv *env, jclass cls) ++{ ++ /* Return the machine's FQDN. */ ++ char hostname[HOST_NAME_MAX + 1]; ++ if (gethostname(hostname, HOST_NAME_MAX + 1) == 0) { ++ hostname[HOST_NAME_MAX] = '\0'; ++ jstring res = (*env)->NewStringUTF(env, hostname); ++ return res; ++ } ++ ++ return (jstring)NULL; ++} From ddadacha at redhat.com Fri Jan 13 08:35:41 2012 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Fri, 13 Jan 2012 11:35:41 -0500 Subject: [RFC][icedtea6, icedtea6-1.11] Fix backport of GNOME system tray patch In-Reply-To: <4F0F538F.6060305@redhat.com> References: <4F0F2F39.6060902@redhat.com> <4F0F538F.6060305@redhat.com> Message-ID: <4F105D5D.7050700@redhat.com> On 12/01/12 04:41 PM, Omair Majid wrote: > On 01/12/2012 02:06 PM, Danesh Dadachanji wrote: >> Hi, >> >> Attached are patches for fixes of the GNOME system tray patch I >> submitted a while back. They use the proper bug ID and fix the patch >> format to use 'hg export'. >> >> I've HEAD and 6-1.11 with ./configure, both built fine. >> >> I don't think I've missed anything this time, everything okay to push? >> > > Looks good to me. Okay for 1.11 Thanks, pushed both, changesets below. Regards, Danesh http://icedtea.classpath.org/hg/icedtea6/rev/04b0c0d5dcad http://icedtea.classpath.org/hg/release/icedtea6-1.11/rev/0242cfaf15fa From aph at redhat.com Fri Jan 13 10:12:51 2012 From: aph at redhat.com (Andrew Haley) Date: Fri, 13 Jan 2012 18:12:51 +0000 Subject: Oops Message-ID: <4F107423.2070503@redhat.com> I think that I made a mistake when doing a merge, and deleted the --samevm in check-jdk line by mistake: diff -r e937f2726d70 -r 4d6b4215b78f Makefile.am --- a/Makefile.am Thu Dec 22 16:47:21 2011 +0000 +++ b/Makefile.am Thu Dec 22 11:54:40 2011 -0500 @@ -193,7 +193,7 @@ # Sources list REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java -JTREG_SRCS = $(abs_top_srcdir)/jtreg +JTREG_SRCS = $(top_srcdir)/src/jtreg # Patch list @@ -2172,7 +2172,7 @@ $${XVFB_RUN} \ $(BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \ -w:test/jdk/JTwork -r:test/jdk/JTreport \ - $${ICEDTEA_JTREG_OTHERVM:--samevm} \ + \ -jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \ -exclude:$(JTREG_SRCS)/excludelist.jdk.jtx \ $(ICEDTEA_JTREG_OPTIONS) \ The change to JTREG_SRCS is correct, but the --samevm isn't. I'll fix this when I commit the ARM fix. Andrew. From drazzib at drazzib.com Sun Jan 15 15:23:50 2012 From: drazzib at drazzib.com (Damien Raude-Morvan) Date: Mon, 16 Jan 2012 00:23:50 +0100 Subject: IcedTea7 forest & OpenJDK7 u2 In-Reply-To: <20120110133456.GL17107@rivendell.middle-earth.co.uk> References: <20120110133456.GL17107@rivendell.middle-earth.co.uk> Message-ID: <201201160023.50870.drazzib@drazzib.com> Hi Andrew, Le mardi 10 janvier 2012 14:34:57, Dr Andrew John Hughes a ?crit : > I've done a merge of the OpenJDK7 u2 changes into the IcedTea7 forest > and made them available at: > > http://icedtea.classpath.org/people/andrew/icedtea7-forest > > Please test this out over the next few days. If there are no issues > by the end of the week, I'll push the changes to the main tree. > > We should follow this with a 2.1 release shortly after. I've tried to build your icedtea7-forest with actual icedtea7 tip and managed to get hotspot building with small refresh / update to boot patches (see ecj-* attachements). I've also refreshed rhino.patch as one hunk failed. Maybe you can import my changes into icedtea7 tip ? Unfortunately, ZeroVM (as alternative vm) seems to fail to build. I've to re- run a new build to get actual error. Regards, -- Damien -------------- next part -------------- A non-text attachment was scrubbed... Name: ecj-diamond.patch Type: text/x-patch Size: 248411 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120116/e87ec8f4/ecj-diamond.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: ecj-multicatch.patch Type: text/x-patch Size: 6551 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120116/e87ec8f4/ecj-multicatch.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: ecj-trywithresources.patch Type: text/x-patch Size: 35218 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120116/e87ec8f4/ecj-trywithresources.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: rhino.patch Type: text/x-patch Size: 4710 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120116/e87ec8f4/rhino.patch From chphilli at redhat.com Sun Jan 15 17:50:04 2012 From: chphilli at redhat.com (Chris Phillips) Date: Sun, 15 Jan 2012 20:50:04 -0500 Subject: IcedTea7 forest & OpenJDK7 u2 In-Reply-To: <201201160023.50870.drazzib@drazzib.com> References: <20120110133456.GL17107@rivendell.middle-earth.co.uk> <201201160023.50870.drazzib@drazzib.com> Message-ID: <4F13824C.8090402@redhat.com> Hi Damien, Not certain what you are encountering (I'm building with hsx23 , so it may be different ) but attached are patches to get zero to build, [currently more needed for jsr 292, but basic cpp interp seems ok.] Chris PS This is completely w/o shark... which has a different set of issues. On 15/01/12 06:23 PM, Damien Raude-Morvan wrote: > Hi Andrew, > > Le mardi 10 janvier 2012 14:34:57, Dr Andrew John Hughes a ?crit : >> I've done a merge of the OpenJDK7 u2 changes into the IcedTea7 forest >> and made them available at: >> >> http://icedtea.classpath.org/people/andrew/icedtea7-forest >> >> Please test this out over the next few days. If there are no issues >> by the end of the week, I'll push the changes to the main tree. >> >> We should follow this with a 2.1 release shortly after. > I've tried to build your icedtea7-forest with actual icedtea7 tip and managed > to get hotspot building with small refresh / update to boot patches (see ecj-* > attachements). I've also refreshed rhino.patch as one hunk failed. Maybe you > can import my changes into icedtea7 tip ? > > Unfortunately, ZeroVM (as alternative vm) seems to fail to build. I've to re- > run a new build to get actual error. > > Regards, -- -- -- Woda: "Java: write once, debug anywhere" Hong Zhang http://thehenrys.ca | Chris Phillips @ T.O. Red Hat OpenJDK JVM Engineer, | | mailto:ChPhilli at RedHat.Com (416)483-3768 | | http://LGonQn.Org/www/Chris.Phillips cell: (416)505-3610 | "EPIC stands for Expects Perfectly Intuitive Compilers" P. Bannon http://www.hazmatmodine.com NOTICE: This email message is for the sole use of the intended recipient(s) and may contain confidential and privileged information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. "blah blah blah - Ginger!" -- -- -------------- next part -------------- A non-text attachment was scrubbed... Name: jdk7u-hs23.patch Type: text/x-patch Size: 6516 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120115/6481769b/jdk7u-hs23.patch From xerxes at zafena.se Mon Jan 16 05:27:55 2012 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Mon, 16 Jan 2012 14:27:55 +0100 Subject: ARM: Fix strange crash while running JCK In-Reply-To: <4F104C5C.2010906@redhat.com> References: <4F104C5C.2010906@redhat.com> Message-ID: <4F1425DB.7080601@zafena.se> OK comments inline. I am in favor for this to be pushed to icedtea6 HEAD and icedtea6-1.11 release branch. 2012-01-13 16:23, Andrew Haley skrev: > Pavel reported a strange crash when running the JCK: a segfault > happens after the program has been running a long time. > > It turns out that there are two bytecode dispatch tables. One of > these is used for normal dispatch, one of these when there is a > safepoint. One of these is generated automagically, and one isn't. > If you change bytecode numbering, you also have to change the > manually-generated version of the bytecode table. I've added comments > to this effect. > > The bytecodes were renumbered (at HS19, I think) but the > manually-generated version of the bytecode table wasn't. The bytecode > that was affected was return_register_finalizer, which is only used in > the method java.lang.Object.(). So, this crash was very rare: > only when moving to a safepoint and executing Object.(), and > only in the interpreter: the JIT wasn't affected. > > I've also taken the opportunity to add bytecode numbers as comments to > all the bytecode tables. > > Finally, I found another bug in the JIT: if we move to a safepoint we > should process it before unlocking the monitor at the exit of a > synchronized routine. > > Andrew. > > > > 2012-01-13 Andrew Haley > > * arm_port/hotspot/tools/mkbc.c (writeouttable): Add numbering > comments to bytecode output. > * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Return): > Move safepoint before monitor is unlocked. > * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S > (safe_dispatch_table): Add comment. > Correct order of do_return_register_finalizer. > Add numbering comments. > * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (TRACE): > New macro. > > diff -r 79014132e844 -r fc7a57de5179 arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def > --- a/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Tue Jan 10 16:47:52 2012 +0000 > +++ b/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Fri Jan 13 10:07:43 2012 -0500 > @@ -29,6 +29,10 @@ > #define FAST_BYTECODES > #endif > > +/* WARNING: If you change any of these bytecodes, you must also > + change the safe_dispatch_table in cppInterpreter_arm.S to make it > + match. */ > + > nop = 0x00, 1 > aconst_null = 0x01, 1 > iconst_m1 = 0x02, 1 ok > diff -r 79014132e844 -r fc7a57de5179 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S > --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Tue Jan 10 16:47:52 2012 +0000 > +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Fri Jan 13 10:07:43 2012 -0500 > @@ -483,6 +483,19 @@ > .set dispatch_state, dispatch_state + 1 > .endm > > + @ This macro calls a user-supplied my_trace routine. It > + @ passes the current JPC as argument zero. It can be safely > + @ inserted at any point in the interpreter. > + .macro TRACE > + stmfd sp!, {r0, r1, r2, r3, r4, lr} > + mrs r4, cpsr > + mov r0, jpc > + ldr r2, =my_trace > + blx r2 > + msr cpsr, r4 > + ldmfd sp!, {r0, r1, r2, r3, r4, lr} > + .endm > + > .macro DISPATCH_FINISH > .if dispatch_state == 0 > .error "DISPATCH_FINISH without a DISPATCH_START or DISPATCH_STATE" Nice debugging add-on. The only thing missing now are a "How to debug the ARM assembler interpreter and Thumb2 JIT hands on tutorial":) And possibly a my_trace function implementation example. > @@ -4753,262 +4766,266 @@ > > #ifdef NOTICE_SAFEPOINTS > safe_dispatch_table: > - .word do_nop ... > - .word do_fast_iload_iload_N > - .word do_return_register_finalizer > - .word do_undefined > - .word do_iload_0_iconst_N ... > - .word do_fast_iload_N_iload_N > - .word do_undefined > - .word do_undefined > + > +/* WARNING: If you change any of these bytecodes, you must also > + change the table in bytecodes_arm.def to make it match. */ > + > + .word do_nop @ 0 0x00 ... > + .word do_fast_iload_iload_N @ 228 0xe4 > + .word do_undefined @ 229 0xe5 > + .word do_undefined @ 230 0xe6 > + .word do_return_register_finalizer @ 231 0xe7 > + .word do_undefined @ 232 0xe8 > + .word do_iload_0_iconst_N @ 233 0xe9 > + .word do_iload_0_iconst_N @ 234 0xea ... > + .word do_fast_iload_N_iload_N @ 255 0xff > #endif Yes, this fix are correct, thank you. For reference, gbenson fixed the zero cpp interpreter similarly (PR696) for compatiblity with hs20 and later. Btw, If we decide to use shark in combination with the ARM assembler interpreter in the future then we need to re-enable the last block of this changeset. pr696: http://icedtea.classpath.org/hg/icedtea6/rev/f418ea6127b6 > > SUB_DISPATCH_TABLES > diff -r 79014132e844 -r fc7a57de5179 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp > --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Tue Jan 10 16:47:52 2012 +0000 > +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Fri Jan 13 10:07:43 2012 -0500 > @@ -4404,6 +4404,8 @@ > > void Thumb2_Return(Thumb2_Info *jinfo, unsigned opcode, int bci) > { > + Thumb2_Safepoint(jinfo, 0, bci); > + > Reg r_lo, r; > Thumb2_Stack *jstack = jinfo->jstack; > > @@ -4470,8 +4472,6 @@ > cbz_patch(jinfo->codebuf, ARM_R3, loc_success2); > } > > - Thumb2_Safepoint(jinfo, 0, bci); > - > if (opcode != opc_return) { > if (opcode == opc_lreturn || opcode == opc_dreturn) { > Thumb2_Fill(jinfo, 2); ok > diff -r 79014132e844 -r fc7a57de5179 arm_port/hotspot/tools/mkbc.c > --- a/arm_port/hotspot/tools/mkbc.c Tue Jan 10 16:47:52 2012 +0000 > +++ b/arm_port/hotspot/tools/mkbc.c Fri Jan 13 10:07:43 2012 -0500 > @@ -399,9 +399,9 @@ > fprintf(bci_f, "+%d\n", len); > } else { > if (table[i].impl_name) > - fprintf(bci_f, "\t.word\t%s%s\n", prefix, table[i].impl_name); > + fprintf(bci_f, "\t.word\t%s%s \t@ %d 0x%02x\n", prefix, table[i].impl_name, i, i); > else > - fprintf(bci_f, "\t.word\t%s%s\n", prefix, table[i].def_name); > + fprintf(bci_f, "\t.word\t%s%s \t@ %d 0x%02x\n", prefix, table[i].def_name, i, i); > } > } > if (depth == 0) { ok > @@ -416,7 +416,7 @@ > fputc('_', bci_f); > fputs(bytecodes[table_indices[j]].name, bci_f); > } > - fputs(":\n", bci_f); > + fprintf(bci_f, ":\t@ %d 0x%02x\n", i, i); > remove_duplicates(table, i, table_indices, depth); > writeouttable(table[i].subtable, table_indices, depth+1); > } ok Cheers Xerxes From bugzilla-daemon at icedtea.classpath.org Mon Jan 16 07:40:35 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 16 Jan 2012 15:40:35 +0000 Subject: [Bug 854] New: Resizing an applet several times causes 100% CPU load Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=854 Bug #: 854 Summary: Resizing an applet several times causes 100% CPU load Classification: Unclassified Product: IcedTea-Web Version: 1.1.3 Platform: x86_64 OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: Plugin AssignedTo: dbhole at redhat.com ReportedBy: peter at morch.com CC: unassigned at icedtea.classpath.org http://morch.com/download/openjdk-icedtea-hang/ demonstrates how resizing an applet from javascript cause 100% CPU usage indefinitely. I.e. the applet hangs. The reproducible steps I took to reproduce this: * Boot from xubuntu-11.10-desktop-i386.iso LiveDVD * sudo apt-get install icedtea-plugin * Start Firefox * Visit http://morch.com/download/openjdk-icedtea-hang/ * Open top in a terminal * See that java takes up 100% CPU See demo at http://morch.com/download/openjdk-icedtea-hang/ and https://gist.github.com/1621288 for index.html and the applet's source (55 lines in all) I'm not sure whether this should be reported against OpenJDK, but then I hope you'll let me know! :-) Peter -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ptisnovs at icedtea.classpath.org Mon Jan 16 08:48:59 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 16 Jan 2012 16:48:59 +0000 Subject: /hg/gfx-test: 2012-01-16 Pavel Tisnovsky Message-ID: changeset 9fc077318e00 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=9fc077318e00 author: Pavel Tisnovsky date: Mon Jan 16 17:51:18 2012 +0100 2012-01-16 Pavel Tisnovsky * src/org/gfxtest/framework/CommonBitmapOperations.java: * src/org/gfxtest/framework/ImageFactory.java: Added support for new pattern type. * src/org/gfxtest/testsuites/BitBltScaleImage.java: Added new tests. diffstat: ChangeLog | 8 + src/org/gfxtest/framework/CommonBitmapOperations.java | 39 +++++++++ src/org/gfxtest/framework/ImageFactory.java | 57 +++++++++++++- src/org/gfxtest/testsuites/BitBltScaleImage.java | 80 ++++++++++++++++++- 4 files changed, 179 insertions(+), 5 deletions(-) diffs (278 lines): diff -r 70e12dbf96c3 -r 9fc077318e00 ChangeLog --- a/ChangeLog Thu Jan 12 11:54:02 2012 +0100 +++ b/ChangeLog Mon Jan 16 17:51:18 2012 +0100 @@ -1,3 +1,11 @@ +2012-01-16 Pavel Tisnovsky + + * src/org/gfxtest/framework/CommonBitmapOperations.java: + * src/org/gfxtest/framework/ImageFactory.java: + Added support for new pattern type. + * src/org/gfxtest/testsuites/BitBltScaleImage.java: + Added new tests. + 2012-01-12 Pavel Tisnovsky * src/org/gfxtest/framework/CommonBitmapOperations.java: diff -r 70e12dbf96c3 -r 9fc077318e00 src/org/gfxtest/framework/CommonBitmapOperations.java --- a/src/org/gfxtest/framework/CommonBitmapOperations.java Thu Jan 12 11:54:02 2012 +0100 +++ b/src/org/gfxtest/framework/CommonBitmapOperations.java Mon Jan 16 17:51:18 2012 +0100 @@ -174,4 +174,43 @@ return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; } + /** + * Create new buffered image containing diagonal checker pattern and then do basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + */ + public static TestResult doBitBltTestWithDiagonalCheckerImage(TestImage image, Graphics2D graphics2d, int imageType) + { + BufferedImage bufferedImage = ImageFactory.createDiagonalCheckerImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + if (bufferedImage == null) + { + return TestResult.FAILED; + } + return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing diagonal checker pattern and then do basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + */ + public static TestResult doBitBltTestWithDiagonalCheckerImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) + { + BufferedImage bufferedImage = ImageFactory.createDiagonalCheckerImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + if (bufferedImage == null) + { + return TestResult.FAILED; + } + return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; + } } diff -r 70e12dbf96c3 -r 9fc077318e00 src/org/gfxtest/framework/ImageFactory.java --- a/src/org/gfxtest/framework/ImageFactory.java Thu Jan 12 11:54:02 2012 +0100 +++ b/src/org/gfxtest/framework/ImageFactory.java Mon Jan 16 17:51:18 2012 +0100 @@ -52,12 +52,25 @@ */ public class ImageFactory { + /** + * Create image containing checker pattern. + * + * @param gridSize + * size of a grid + * @param width + * width of a buffered image + * @param height + * height of a buffered image + * @param imageType + * buffered image type + * @return buffered image containing checker pattern + */ public static BufferedImage createCheckerImage(int gridSize, int width, int height, int imageType) { // used by test for a tile colors int doubledGridSize = gridSize << 1; - // create new texture instead + // create new image BufferedImage image = new BufferedImage(width, height, imageType); // for all lines in a raster image @@ -77,4 +90,46 @@ } return image; } + + /** + * Create image containing diagonal checker pattern. + * + * @param gridSize + * size of a grid + * @param width + * width of a buffered image + * @param height + * height of a buffered image + * @param imageType + * buffered image type + * @return buffered image containing checker pattern + */ + public static BufferedImage createDiagonalCheckerImage(int gridSize, int width, int height, int imageType) + { + // used for computing checker texture + int width2 = width << 1; + + // used by test for a tile colors + int doubledGridSize = gridSize << 1; + + // create new image + BufferedImage image = new BufferedImage(width, height, imageType); + + // for all lines in a raster image + for (int y = 0; y < height; y++) + { + // for all columns on a line + for (int x = 0; x < width; x++) + { + // compute color for each tile + boolean evenColumn = ((x + y) % doubledGridSize) >= gridSize; + boolean evenRow = ((width2 + x - y) % doubledGridSize) >= gridSize; + // compute color for each pixel + boolean whiteField = evenColumn ^ evenRow; + int color = whiteField ? 0xffffffff: 0xff000000; + image.setRGB(x, y, color); + } + } + return image; + } } diff -r 70e12dbf96c3 -r 9fc077318e00 src/org/gfxtest/testsuites/BitBltScaleImage.java --- a/src/org/gfxtest/testsuites/BitBltScaleImage.java Thu Jan 12 11:54:02 2012 +0100 +++ b/src/org/gfxtest/testsuites/BitBltScaleImage.java Mon Jan 16 17:51:18 2012 +0100 @@ -77,6 +77,7 @@ { /** * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY. + * The image is scaled to a double size in both dimensions. * * @param image * image to which line is to be drawn @@ -84,7 +85,75 @@ * graphics canvas * @return */ - public TestResult testBitBltCheckerBufferedImageTypeByteBinaryHscale1(TestImage image, Graphics2D graphics2d) + public TestResult testBitBltCheckerBufferedImageTypeByteBinaryScaleTwoTimes(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_WIDTH * 2, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_HEIGHT * 2); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY. + * The image is scaled to one half size in both dimensions. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltCheckerBufferedImageTypeByteBinaryScaleOneHalf(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_WIDTH / 2, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_HEIGHT / 2); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY. + * The image is scaled to one third size in both dimensions. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltCheckerBufferedImageTypeByteBinaryScaleOneThird(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_WIDTH / 3, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_HEIGHT / 3); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY. + * The image is scaled to two thirds size in both dimensions. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltCheckerBufferedImageTypeByteBinaryScaleTwoThirds(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_WIDTH * 2 / 3, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_HEIGHT * 2 / 3); + } + + /** + * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY. + * The image is scaled to one half size in horizontal dimension. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltCheckerBufferedImageTypeByteBinaryHscaleOneHalf(TestImage image, Graphics2D graphics2d) { return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, CommonBitmapOperations.DEFAULT_TEST_IMAGE_WIDTH / 2, @@ -93,6 +162,7 @@ /** * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY. + * The image is scaled to two times size in horizontal dimension. * * @param image * image to which line is to be drawn @@ -100,7 +170,7 @@ * graphics canvas * @return */ - public TestResult testBitBltCheckerBufferedImageTypeByteBinaryHscale2(TestImage image, Graphics2D graphics2d) + public TestResult testBitBltCheckerBufferedImageTypeByteBinaryHscaleTwoTimes(TestImage image, Graphics2D graphics2d) { return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, CommonBitmapOperations.DEFAULT_TEST_IMAGE_WIDTH * 2, @@ -109,6 +179,7 @@ /** * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY. + * The image is scaled to one half size in vertical dimension. * * @param image * image to which line is to be drawn @@ -116,7 +187,7 @@ * graphics canvas * @return */ - public TestResult testBitBltCheckerBufferedImageTypeByteBinaryVscale1(TestImage image, Graphics2D graphics2d) + public TestResult testBitBltCheckerBufferedImageTypeByteBinaryVscaleOneHalf(TestImage image, Graphics2D graphics2d) { return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, CommonBitmapOperations.DEFAULT_TEST_IMAGE_WIDTH, @@ -125,6 +196,7 @@ /** * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY. + * The image is scaled to two times size in vertical dimension. * * @param image * image to which line is to be drawn @@ -132,7 +204,7 @@ * graphics canvas * @return */ - public TestResult testBitBltCheckerBufferedImageTypeByteBinaryVscale2(TestImage image, Graphics2D graphics2d) + public TestResult testBitBltCheckerBufferedImageTypeByteBinaryVscaleTwoTimes(TestImage image, Graphics2D graphics2d) { return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, CommonBitmapOperations.DEFAULT_TEST_IMAGE_WIDTH, From aph at redhat.com Mon Jan 16 10:41:37 2012 From: aph at redhat.com (Andrew Haley) Date: Mon, 16 Jan 2012 18:41:37 +0000 Subject: ARM: fix java.lang.Math.log10 Message-ID: <4F146F61.4060807@redhat.com> In JCK testing we discovered that java.lang.Math.log10 causes a crash. In HotSpot there is a special table of method kinds, and it was updated to include java.dyn.MethodHandles::invoke. Unfortunately, this entry was added in the middle of the list, rather than at the end, so the java.lang.Math.* entries all move up by one. java.lang.Math.log10 was at the end of the table, and it fell off. :-) Fixed thusly. Andrew. 2012-01-16 Andrew Haley * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (asm_method_table): Add entry for java.dyn.MethodHandles::invoke. (asm_generate_method_entry): Replace constant 14 with calculation based on the size of asm_method_table. Add some comments. diff -r 2bbcc83417ae -r f57f03c70b52 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Jan 16 13:25:01 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Jan 16 13:28:17 2012 -0500 @@ -782,28 +782,33 @@ cmp r2, #0 bne 1f - cmp r3, #14 + cmp r3, #((3f-2f)/4) // i.e. sizeof asm_method_table adrcc ip, asm_method_table ldrcc r0, [ip, r3, lsl #2] #endif // PRODUCT 1: bx lr + +// This table must be kept in sync with AbstractInterpreter::MethodKind asm_method_table: - .word normal_entry - .word normal_entry_synchronized - .word native_entry - .word native_entry_synchronized - .word empty_entry - .word accessor_entry - .word normal_entry @ abstract entry - .word normal_entry @ java_lang_math_sin - .word normal_entry @ java_lang_math_cos - .word normal_entry @ java_lang_math_tan - .word normal_entry @ java_lang_math_abs - .word normal_entry @ java_lang_math_sqrt - .word normal_entry @ java_lang_math_log - .word normal_entry @ java_lang_math_log10 - +2: + .word normal_entry // method needs locals initialization + .word normal_entry_synchronized // method needs locals initialization & is synchronized + .word native_entry // native method + .word native_entry_synchronized // native method & is synchronized + .word empty_entry // empty method (code: _return) + .word accessor_entry // accessor method (code: _aload_0, _getfield, _(a|i)return) + .word normal_entry // abstract method (throws an AbstractMethodException) + .word vm_fatal_error // java.dyn.MethodHandles::invoke + .word normal_entry // implementation of java.lang.Math.sin (x) + .word normal_entry // implementation of java.lang.Math.cos (x) + .word normal_entry // implementation of java.lang.Math.tan (x) + .word normal_entry // implementation of java.lang.Math.abs (x) + .word normal_entry // implementation of java.lang.Math.sqrt (x) + .word normal_entry // implementation of java.lang.Math.log (x) + .word normal_entry // implementation of java.lang.Math.log10 (x) +3: + ALIGN_CODE native_entry_synchronized: b fast_native_entry_synchronized From drazzib at drazzib.com Mon Jan 16 14:15:37 2012 From: drazzib at drazzib.com (Damien Raude-Morvan) Date: Mon, 16 Jan 2012 23:15:37 +0100 Subject: IcedTea7 forest & OpenJDK7 u2 In-Reply-To: <4F13824C.8090402@redhat.com> References: <20120110133456.GL17107@rivendell.middle-earth.co.uk> <201201160023.50870.drazzib@drazzib.com> <4F13824C.8090402@redhat.com> Message-ID: <201201162315.37489.drazzib@drazzib.com> Le lundi 16 janvier 2012 02:50:04, Chris Phillips a ?crit : > Hi Damien, Hi Chris, > Not certain what you are encountering (I'm building with hsx23 , > so it may be different ) but attached are patches to get zero to build, > [currently more needed for jsr 292, but basic cpp interp seems ok.] My current FTBFS (without your patch) is : build/zerovm/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.hpp:35:0: error: "TARGET_ARCH_NYI_6939861" redefined [-Werror] build/zerovm/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.hpp:33:0: note: this is the location of the previous definition zerovm/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.hpp:32:1: error: expected unqualified-id before '<<' token So it seems that your patch, at least, fix this one :) Is there a separate patchset for Shark to build ? Is this tracked somewhere (bugtracker or mailinglist) ? Regards, -- Damien From ahughes at redhat.com Mon Jan 16 15:06:26 2012 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 16 Jan 2012 23:06:26 +0000 Subject: IcedTea7 forest & OpenJDK7 u2 In-Reply-To: <201201160023.50870.drazzib@drazzib.com> References: <20120110133456.GL17107@rivendell.middle-earth.co.uk> <201201160023.50870.drazzib@drazzib.com> Message-ID: <20120116230626.GB11609@rivendell.middle-earth.co.uk> On 00:23 Mon 16 Jan , Damien Raude-Morvan wrote: > Hi Andrew, > > Le mardi 10 janvier 2012 14:34:57, Dr Andrew John Hughes a ?crit : > > I've done a merge of the OpenJDK7 u2 changes into the IcedTea7 forest > > and made them available at: > > > > http://icedtea.classpath.org/people/andrew/icedtea7-forest > > > > Please test this out over the next few days. If there are no issues > > by the end of the week, I'll push the changes to the main tree. > > > > We should follow this with a 2.1 release shortly after. > > I've tried to build your icedtea7-forest with actual icedtea7 tip and managed > to get hotspot building with small refresh / update to boot patches (see ecj-* > attachements). I've also refreshed rhino.patch as one hunk failed. Maybe you > can import my changes into icedtea7 tip ? > Thanks. I hadn't looked at IcedTea support yet. Hopefully your patches will save me time in having to do this. > Unfortunately, ZeroVM (as alternative vm) seems to fail to build. I've to re- > run a new build to get actual error. > Ok. My main concern at this point is the 'normal' HotSpot build. There are already known issues with Zero/Shark and the older HotSpot in IcedTea6, never mind 7. > Regards, > -- > Damien > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java > @@ -103,9 +103,9 @@ > return this.def.compareTo(that.def); > } > > - private static final Map, List> canonLists = new HashMap<>(); > - private static final Map attributes = new HashMap<>(); > - private static final Map standardDefs = new HashMap<>(); > + private static final Map, List> canonLists = new HashMap, List>(); > + private static final Map attributes = new HashMap(); > + private static final Map standardDefs = new HashMap(); > > // Canonicalized lists of trivial attrs (Deprecated, etc.) > // are used by trimToSize, in order to reduce footprint > @@ -115,7 +115,7 @@ > synchronized (canonLists) { > List cl = canonLists.get(al); > if (cl == null) { > - cl = new ArrayList<>(al.size()); > + cl = new ArrayList(al.size()); > cl.addAll(al); > cl = Collections.unmodifiableList(cl); > canonLists.put(al, cl); > @@ -336,9 +336,9 @@ > > public void addAttribute(Attribute a) { > if (attributes == null) > - attributes = new ArrayList<>(3); > + attributes = new ArrayList(3); > else if (!(attributes instanceof ArrayList)) > - attributes = new ArrayList<>(attributes); // unfreeze it > + attributes = new ArrayList(attributes); // unfreeze it > attributes.add(a); > } > > @@ -346,7 +346,7 @@ > if (attributes == null) return null; > if (!attributes.contains(a)) return null; > if (!(attributes instanceof ArrayList)) > - attributes = new ArrayList<>(attributes); // unfreeze it > + attributes = new ArrayList(attributes); // unfreeze it > attributes.remove(a); > return a; > } > @@ -838,7 +838,7 @@ > */ > static //private > Layout.Element[] tokenizeLayout(Layout self, int curCble, String layout) { > - List col = new ArrayList<>(layout.length()); > + List col = new ArrayList(layout.length()); > tokenizeLayout(self, curCble, layout, col); > Layout.Element[] res = new Layout.Element[col.size()]; > col.toArray(res); > @@ -903,7 +903,7 @@ > case 'T': // union: 'T' any_int union_case* '(' ')' '[' body ']' > kind = EK_UN; > i = tokenizeSInt(e, layout, i); > - List cases = new ArrayList<>(); > + List cases = new ArrayList(); > for (;;) { > // Keep parsing cases until we hit the default case. > if (layout.charAt(i++) != '(') > @@ -1057,7 +1057,7 @@ > } > static //private > String[] splitBodies(String layout) { > - List bodies = new ArrayList<>(); > + List bodies = new ArrayList(); > // Parse several independent layout bodies: "[foo][bar]...[baz]" > for (int i = 0; i < layout.length(); i++) { > if (layout.charAt(i++) != '[') > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java > @@ -257,7 +257,7 @@ > assert(basicCodings[_meta_default] == null); > assert(basicCodings[_meta_canon_min] != null); > assert(basicCodings[_meta_canon_max] != null); > - Map map = new HashMap<>(); > + Map map = new HashMap(); > for (int i = 0; i < basicCodings.length; i++) { > Coding c = basicCodings[i]; > if (c == null) continue; > @@ -1068,8 +1068,8 @@ > > // Bootstrap support for CPRefBands. These are needed to record > // intended CP indexes, before the CP has been created. > - private final List allKQBands = new ArrayList<>(); > - private List needPredefIndex = new ArrayList<>(); > + private final List allKQBands = new ArrayList(); > + private List needPredefIndex = new ArrayList(); > > > int encodeRef(Entry e, Index ix) { > @@ -1704,7 +1704,7 @@ > protected int attrClassFileVersionMask; > > // Mapping from Attribute.Layout to Band[] (layout element bands). > - protected Map attrBandTable = new HashMap<>(); > + protected Map attrBandTable = new HashMap(); > > // Well-known attributes: > protected final Attribute.Layout attrCodeEmpty; > @@ -1713,16 +1713,16 @@ > protected final Attribute.Layout attrConstantValue; > > // Mapping from Attribute.Layout to Integer (inverse of attrDefs) > - Map attrIndexTable = new HashMap<>(); > + Map attrIndexTable = new HashMap(); > > // Mapping from attribute index (<32 are flag bits) to attributes. > protected List> attrDefs = > - new FixedList<>(ATTR_CONTEXT_LIMIT); > + new FixedList>(ATTR_CONTEXT_LIMIT); > { > for (int i = 0; i < ATTR_CONTEXT_LIMIT; i++) { > assert(attrIndexLimit[i] == 0); > attrIndexLimit[i] = 32; // just for the sake of predefs. > - attrDefs.set(i, new ArrayList<>(Collections.nCopies( > + attrDefs.set(i, new ArrayList(Collections.nCopies( > attrIndexLimit[i], (Attribute.Layout)null))); > > } > @@ -1912,7 +1912,7 @@ > > protected List getPredefinedAttrs(int ctype) { > assert(attrIndexLimit[ctype] != 0); > - List res = new ArrayList<>(attrIndexLimit[ctype]); > + List res = new ArrayList(attrIndexLimit[ctype]); > // Remove nulls and non-predefs. > for (int ai = 0; ai < attrIndexLimit[ctype]; ai++) { > if (testBit(attrDefSeen[ctype], 1L< @@ -2536,7 +2536,7 @@ > // DEBUG ONLY: Record something about the band order. > boolean notePrevForAssert(Band b, Band p) { > if (prevForAssertMap == null) > - prevForAssertMap = new HashMap<>(); > + prevForAssertMap = new HashMap(); > prevForAssertMap.put(b, p); > return true; > } > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java > @@ -466,7 +466,7 @@ > > void readInnerClasses(Class cls) throws IOException { > int nc = readUnsignedShort(); > - ArrayList ics = new ArrayList<>(nc); > + ArrayList ics = new ArrayList(nc); > for (int i = 0; i < nc; i++) { > InnerClass ic = > new InnerClass(readClassRef(), > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java > @@ -402,7 +402,7 @@ > private static Map codeMap; > > private static synchronized Coding of(int B, int H, int S, int del) { > - if (codeMap == null) codeMap = new HashMap<>(); > + if (codeMap == null) codeMap = new HashMap(); > Coding x0 = new Coding(B, H, S, del); > Coding x1 = codeMap.get(x0); > if (x1 == null) codeMap.put(x0, x1 = x0); > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java > @@ -743,9 +743,9 @@ > // Steps 1/2/3 are interdependent, and may be iterated. > // Steps 4 and 5 may be decided independently afterward. > int[] LValuesCoded = PopulationCoding.LValuesCoded; > - List bestFits = new ArrayList<>(); > - List fullFits = new ArrayList<>(); > - List longFits = new ArrayList<>(); > + List bestFits = new ArrayList(); > + List fullFits = new ArrayList(); > + List longFits = new ArrayList(); > final int PACK_TO_MAX_S = 1; > if (bestPopFVC <= 255) { > bestFits.add(BandStructure.BYTE1); > @@ -785,7 +785,7 @@ > } > } > } > - List allFits = new ArrayList<>(); > + List allFits = new ArrayList(); > for (Iterator i = bestFits.iterator(), > j = fullFits.iterator(), > k = longFits.iterator(); > @@ -1230,10 +1230,10 @@ > Histogram hist = getValueHistogram(); > int fVlen = stressLen(hist.getTotalLength()); > if (fVlen == 0) return coding; > - List popvals = new ArrayList<>(); > + List popvals = new ArrayList(); > if (stress.nextBoolean()) { > // Build the population from the value list. > - Set popset = new HashSet<>(); > + Set popset = new HashSet(); > for (int i = start; i < end; i++) { > if (popset.add(values[i])) popvals.add(values[i]); > } > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java > @@ -915,7 +915,7 @@ > public static > Index[] partition(Index ix, int[] keys) { > // %%% Should move this into class Index. > - List> parts = new ArrayList<>(); > + List> parts = new ArrayList>(); > Entry[] cpMap = ix.cpMap; > assert(keys.length == cpMap.length); > for (int i = 0; i < keys.length; i++) { > @@ -926,7 +926,7 @@ > } > List part = parts.get(key); > if (part == null) { > - parts.set(key, part = new ArrayList<>()); > + parts.set(key, part = new ArrayList()); > } > part.add(cpMap[i]); > } > @@ -1133,7 +1133,7 @@ > void completeReferencesIn(Set cpRefs, boolean flattenSigs) { > cpRefs.remove(null); > for (ListIterator work = > - new ArrayList<>(cpRefs).listIterator(cpRefs.size()); > + new ArrayList(cpRefs).listIterator(cpRefs.size()); > work.hasPrevious(); ) { > Entry e = work.previous(); > work.remove(); // pop stack > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java > @@ -59,7 +59,7 @@ > ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource"); > > public static void main(String[] ava) throws IOException { > - List av = new ArrayList<>(Arrays.asList(ava)); > + List av = new ArrayList(Arrays.asList(ava)); > > boolean doPack = true; > boolean doUnpack = false; > @@ -82,7 +82,7 @@ > } > > // Collect engine properties here: > - Map engProps = new HashMap<>(); > + Map engProps = new HashMap(); > engProps.put(verboseProp, System.getProperty(verboseProp)); > > String optionMap; > @@ -96,7 +96,7 @@ > } > > // Collect argument properties here: > - Map avProps = new HashMap<>(); > + Map avProps = new HashMap(); > try { > for (;;) { > String state = parseCommandOptions(av, optionMap, avProps); > @@ -530,7 +530,7 @@ > String resultString = null; > > // Convert options string into optLines dictionary. > - TreeMap optmap = new TreeMap<>(); > + TreeMap optmap = new TreeMap(); > loadOptmap: > for (String optline : options.split("\n")) { > String[] words = optline.split("\\p{Space}+"); > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java > @@ -45,7 +45,7 @@ > private final ArrayList flist; > > protected FixedList(int capacity) { > - flist = new ArrayList<>(capacity); > + flist = new ArrayList(capacity); > // initialize the list to null > for (int i = 0 ; i < capacity ; i++) { > flist.add(null); > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java > @@ -126,11 +126,11 @@ > public void setBytes(byte[] newBytes) { > if (bytes == newBytes) return; > ArrayList old = null; > - assert((old = new ArrayList<>(this)) != null); > + assert((old = new ArrayList(this)) != null); > if (bytes == null || newBytes == null) { > // One or the other representations is deficient. > // Construct a checkpoint. > - ArrayList save = new ArrayList<>(this); > + ArrayList save = new ArrayList(this); > clear(); > bytes = newBytes; > addAll(save); > @@ -138,7 +138,7 @@ > // assume newBytes is some sort of bitwise copy of the old bytes > bytes = newBytes; > } > - assert(old.equals(new ArrayList<>(this))); > + assert(old.equals(new ArrayList(this))); > } > > static final int LOC_SHIFT = 1; > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java > @@ -112,7 +112,7 @@ > public static final Attribute.Layout attrSourceFileSpecial; > public static final Map attrDefs; > static { > - Map ad = new HashMap<>(3); > + Map ad = new HashMap(3); > attrCodeEmpty = Attribute.define(ad, ATTR_CONTEXT_METHOD, > "Code", "").layout(); > attrInnerClassesEmpty = Attribute.define(ad, ATTR_CONTEXT_CLASS, > @@ -181,7 +181,7 @@ > } > } > > - ArrayList classes = new ArrayList<>(); > + ArrayList classes = new ArrayList(); > > public List getClasses() { > return classes; > @@ -263,7 +263,7 @@ > if (olda == null) > return; // no SourceFile attr. > String obvious = getObviousSourceFile(); > - List ref = new ArrayList<>(1); > + List ref = new ArrayList(1); > olda.visitRefs(this, VRM_PACKAGE, ref); > Utf8Entry sfName = (Utf8Entry) ref.get(0); > Attribute a = olda; > @@ -291,7 +291,7 @@ > if (a != olda) { > if (verbose > 2) > Utils.log.fine("recoding obvious SourceFile="+obvious); > - List newAttrs = new ArrayList<>(getAttributes()); > + List newAttrs = new ArrayList(getAttributes()); > int where = newAttrs.indexOf(olda); > newAttrs.set(where, a); > setAttributes(newAttrs); > @@ -321,7 +321,7 @@ > } > > public void setInnerClasses(Collection ics) { > - innerClasses = (ics == null) ? null : new ArrayList<>(ics); > + innerClasses = (ics == null) ? null : new ArrayList(ics); > // Edit the attribute list, if necessary. > Attribute a = getAttribute(attrInnerClassesEmpty); > if (innerClasses != null && a == null) > @@ -340,7 +340,7 @@ > * with that of Package.this.allInnerClasses. > */ > public List computeGloballyImpliedICs() { > - Set cpRefs = new HashSet<>(); > + Set cpRefs = new HashSet(); > { // This block temporarily displaces this.innerClasses. > ArrayList innerClassesSaved = innerClasses; > innerClasses = null; // ignore for the moment > @@ -349,7 +349,7 @@ > } > ConstantPool.completeReferencesIn(cpRefs, true); > > - Set icRefs = new HashSet<>(); > + Set icRefs = new HashSet(); > for (Entry e : cpRefs) { > // Restrict cpRefs to InnerClasses entries only. > if (!(e instanceof ClassEntry)) continue; > @@ -365,7 +365,7 @@ > // This loop is structured this way so as to accumulate > // entries into impliedICs in an order which reflects > // the order of allInnerClasses. > - ArrayList impliedICs = new ArrayList<>(); > + ArrayList impliedICs = new ArrayList(); > for (InnerClass ic : allInnerClasses) { > // This one is locally relevant if it describes > // a member of the current class, or if the current > @@ -408,8 +408,8 @@ > // Diff is A since I is empty. > } > // (I*A) is non-trivial > - Set center = new HashSet<>(actualICs); > - center.retainAll(new HashSet<>(impliedICs)); > + Set center = new HashSet(actualICs); > + center.retainAll(new HashSet(impliedICs)); > impliedICs.addAll(actualICs); > impliedICs.removeAll(center); > // Diff is now I^A = (I+A)-(I*A). > @@ -538,7 +538,7 @@ > super(flags, descriptor); > assert(!descriptor.isMethod()); > if (fields == null) > - fields = new ArrayList<>(); > + fields = new ArrayList(); > boolean added = fields.add(this); > assert(added); > order = fields.size(); > @@ -563,7 +563,7 @@ > super(flags, descriptor); > assert(descriptor.isMethod()); > if (methods == null) > - methods = new ArrayList<>(); > + methods = new ArrayList(); > boolean added = methods.add(this); > assert(added); > } > @@ -728,14 +728,14 @@ > } > > // What non-class files are in this unit? > - ArrayList files = new ArrayList<>(); > + ArrayList files = new ArrayList(); > > public List getFiles() { > return files; > } > > public List getClassStubs() { > - List classStubs = new ArrayList<>(classes.size()); > + List classStubs = new ArrayList(classes.size()); > for (Class cls : classes) { > assert(cls.file.isClassStub()); > classStubs.add(cls.file); > @@ -749,7 +749,7 @@ > int modtime = NO_MODTIME; > int options = 0; // random flag bits, such as deflate_hint > Class stubClass; // if this is a stub, here's the class > - ArrayList prepend = new ArrayList<>(); // list of byte[] > + ArrayList prepend = new ArrayList(); // list of byte[] > java.io.ByteArrayOutputStream append = new ByteArrayOutputStream(); > > File(Utf8Entry name) { > @@ -852,7 +852,7 @@ > public InputStream getInputStream() { > InputStream in = new ByteArrayInputStream(append.toByteArray()); > if (prepend.isEmpty()) return in; > - List isa = new ArrayList<>(prepend.size()+1); > + List isa = new ArrayList(prepend.size()+1); > for (byte[] bytes : prepend) { > isa.add(new ByteArrayInputStream(bytes)); > } > @@ -888,7 +888,7 @@ > } > > // Is there a globally declared table of inner classes? > - List allInnerClasses = new ArrayList<>(); > + List allInnerClasses = new ArrayList(); > Map allInnerClassesByThis; > > public > @@ -903,7 +903,7 @@ > allInnerClasses.addAll(ics); > > // Make an index: > - allInnerClassesByThis = new HashMap<>(allInnerClasses.size()); > + allInnerClassesByThis = new HashMap(allInnerClasses.size()); > for (InnerClass ic : allInnerClasses) { > Object pic = allInnerClassesByThis.put(ic.thisClass, ic); > assert(pic == null); // caller must ensure key uniqueness! > @@ -1290,7 +1290,7 @@ > > // Use this before writing the class files. > void ensureAllClassFiles() { > - Set fileSet = new HashSet<>(files); > + Set fileSet = new HashSet(files); > for (Class cls : classes) { > // Add to the end of ths list: > if (!fileSet.contains(cls.file)) > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java > @@ -686,7 +686,7 @@ > cp_Signature_classes.expectLength(getIntTotal(numSigClasses)); > cp_Signature_classes.readFrom(in); > cp_Signature_classes.setIndex(getCPIndex(CONSTANT_Class)); > - utf8Signatures = new HashMap<>(); > + utf8Signatures = new HashMap(); > for (int i = 0; i < cpMap.length; i++) { > Utf8Entry formRef = (Utf8Entry) cp_Signature_form.getRef(); > ClassEntry[] classRefs = new ClassEntry[numSigClasses[i]]; > @@ -892,7 +892,7 @@ > ic_name.expectLength(longICCount); > ic_name.readFrom(in); > ic_flags.resetForSecondPass(); > - List icList = new ArrayList<>(numInnerClasses); > + List icList = new ArrayList(numInnerClasses); > for (int i = 0; i < numInnerClasses; i++) { > int flags = ic_flags.getInt(); > boolean longForm = (flags & ACC_IC_LONG_FORM) != 0; > @@ -934,7 +934,7 @@ > > void readLocalInnerClasses(Class cls) throws IOException { > int nc = class_InnerClasses_N.getInt(); > - List localICs = new ArrayList<>(nc); > + List localICs = new ArrayList(nc); > for (int i = 0; i < nc; i++) { > ClassEntry thisClass = (ClassEntry) class_InnerClasses_RC.getRef(); > int flags = class_InnerClasses_F.getInt(); > @@ -1062,7 +1062,7 @@ > > Entry[] reconstructLocalCPMap(Class cls) { > Set ldcRefs = ldcRefMap.get(cls); > - Set cpRefs = new HashSet<>(); > + Set cpRefs = new HashSet(); > > // look for constant pool entries: > cls.visitRefs(VRM_CLASSIC, cpRefs); > @@ -1167,7 +1167,7 @@ > method_descr.expectLength(totalNM); > if (verbose > 1) Utils.log.fine("expecting #fields="+totalNF+" and #methods="+totalNM+" in #classes="+numClasses); > > - List fields = new ArrayList<>(totalNF); > + List fields = new ArrayList(totalNF); > field_descr.readFrom(in); > for (int i = 0; i < classes.length; i++) { > Class c = classes[i]; > @@ -1183,7 +1183,7 @@ > countAndReadAttrs(ATTR_CONTEXT_FIELD, fields); > fields = null; // release to GC > > - List methods = new ArrayList<>(totalNM); > + List methods = new ArrayList(totalNM); > method_descr.readFrom(in); > for (int i = 0; i < classes.length; i++) { > Class c = classes[i]; > @@ -1206,10 +1206,10 @@ > > Code[] allCodes; > List codesWithFlags; > - Map> ldcRefMap = new HashMap<>(); > + Map> ldcRefMap = new HashMap>(); > > Code[] buildCodeAttrs(List methods) { > - List codes = new ArrayList<>(methods.size()); > + List codes = new ArrayList(methods.size()); > for (Class.Method m : methods) { > if (m.getAttribute(attrCodeEmpty) != null) { > m.code = new Code(m); > @@ -1233,7 +1233,7 @@ > boolean attrsOK = testBit(archiveOptions, AO_HAVE_ALL_CODE_FLAGS); > code_headers.expectLength(allCodes.length); > code_headers.readFrom(in); > - List longCodes = new ArrayList<>(allCodes.length / 10); > + List longCodes = new ArrayList(allCodes.length / 10); > for (int i = 0; i < allCodes.length; i++) { > Code c = allCodes[i]; > int sc = code_headers.getByte(); > @@ -1472,7 +1472,7 @@ > bits -= (1L< nfa += 1; > } > - List ha = new ArrayList<>(nfa + noa); > + List ha = new ArrayList(nfa + noa); > h.attributes = ha; > bits = attrBits; // iterate again > for (int ai = 0; bits != 0; ai++) { > @@ -1596,7 +1596,7 @@ > void readAttrs(int ctype, Collection holders) > throws IOException { > // Decode band values into attributes. > - Set sawDefs = new HashSet<>(); > + Set sawDefs = new HashSet(); > ByteArrayOutputStream buf = new ByteArrayOutputStream(); > for (final Attribute.Holder h : holders) { > if (h.attributes == null) continue; > @@ -1799,7 +1799,7 @@ > // scratch buffer for collecting code:: > byte[] buf = new byte[1<<12]; > // record of all switch opcodes (these are variable-length) > - List allSwitchOps = new ArrayList<>(); > + List allSwitchOps = new ArrayList(); > for (int k = 0; k < allCodes.length; k++) { > Code c = allCodes[k]; > scanOneMethod: > @@ -1915,7 +1915,7 @@ > > Set ldcRefSet = ldcRefMap.get(curClass); > if (ldcRefSet == null) > - ldcRefMap.put(curClass, ldcRefSet = new HashSet<>()); > + ldcRefMap.put(curClass, ldcRefSet = new HashSet()); > > ClassEntry thisClass = curClass.thisClass; > ClassEntry superClass = curClass.superClass; > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java > @@ -116,7 +116,7 @@ > int[][] attrCounts; // count attr. occurences > > void setup() { > - requiredEntries = new HashSet<>(); > + requiredEntries = new HashSet(); > setArchiveOptions(); > trimClassAttributes(); > collectAttributeLayouts(); > @@ -176,7 +176,7 @@ > } > } > // Decide on default version number (majority rule). > - Map verCounts = new HashMap<>(); > + Map verCounts = new HashMap(); > int bestCount = 0; > int bestVersion = -1; > for (Class cls : pkg.classes) { > @@ -728,7 +728,7 @@ > > void collectAttributeLayouts() { > maxFlags = new int[ATTR_CONTEXT_LIMIT]; > - allLayouts = new FixedList<>(ATTR_CONTEXT_LIMIT); > + allLayouts = new FixedList>(ATTR_CONTEXT_LIMIT); > for (int i = 0; i < ATTR_CONTEXT_LIMIT; i++) { > allLayouts.set(i, new HashMap()); > } > @@ -773,7 +773,7 @@ > } > // Collect counts for both predefs. and custom defs. > // Decide on custom, local attribute definitions. > - backCountTable = new HashMap<>(); > + backCountTable = new HashMap(); > attrCounts = new int[ATTR_CONTEXT_LIMIT][]; > for (int i = 0; i < ATTR_CONTEXT_LIMIT; i++) { > // Now the remaining defs in allLayouts[i] need attr. indexes. > @@ -888,7 +888,7 @@ > Attribute.Layout[] attrDefsWritten; > > void writeAttrDefs() throws IOException { > - List defList = new ArrayList<>(); > + List defList = new ArrayList(); > for (int i = 0; i < ATTR_CONTEXT_LIMIT; i++) { > int limit = attrDefs.get(i).size(); > for (int j = 0; j < limit; j++) { > @@ -1005,7 +1005,7 @@ > void collectInnerClasses() { > // Capture inner classes, removing them from individual classes. > // Irregular inner classes must stay local, though. > - Map allICMap = new HashMap<>(); > + Map allICMap = new HashMap(); > // First, collect a consistent global set. > for (Class cls : pkg.classes) { > if (!cls.hasInnerClasses()) continue; > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java > @@ -181,8 +181,8 @@ > final Map attrDefs; > final Map attrCommands; > { > - Map lattrDefs = new HashMap<>(); > - Map lattrCommands = new HashMap<>(); > + Map lattrDefs = new HashMap(); > + Map lattrCommands = new HashMap(); > String[] keys = { > Pack200.Packer.CLASS_ATTRIBUTE_PFX, > Pack200.Packer.FIELD_ATTRIBUTE_PFX, > @@ -590,7 +590,7 @@ > assert(pkg.files.containsAll(pkg.getClassStubs())); > // Order of stubs in file list must agree with classes. > List res = pkg.files; > - assert((res = new ArrayList<>(pkg.files)) > + assert((res = new ArrayList(pkg.files)) > .retainAll(pkg.getClassStubs()) || true); > assert(res.equals(pkg.getClassStubs())); > } > @@ -623,7 +623,7 @@ > > List scanJar(JarFile jf) throws IOException { > // Collect jar entries, preserving order. > - List inFiles = new ArrayList<>(); > + List inFiles = new ArrayList(); > try { > for (JarEntry je : Collections.list(jf.entries())) { > InFile inFile = new InFile(jf, je); > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java > @@ -309,7 +309,7 @@ > // As each new value is added, we assert that the value > // was not already in the set. > Set uniqueValuesForDebug = null; > - assert((uniqueValuesForDebug = new HashSet<>()) != null); > + assert((uniqueValuesForDebug = new HashSet()) != null); > int fillp = 1; > maxForDebug += fillp; > int min = Integer.MIN_VALUE; // farthest from the center > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java > @@ -47,8 +47,8 @@ > */ > > final class PropMap implements SortedMap { > - private final TreeMap theMap = new TreeMap<>();; > - private final List listenerList = new ArrayList<>(1); > + private final TreeMap theMap = new TreeMap();; > + private final List listenerList = new ArrayList(1); > > void addListener(PropertyChangeListener listener) { > listenerList.add(listener); > @@ -187,7 +187,7 @@ > // Get sequence of props for "prefix", and "prefix.*". > List getProperties(String prefix) { > Collection values = prefixMap(prefix).values(); > - List res = new ArrayList<>(values.size()); > + List res = new ArrayList(values.size()); > res.addAll(values); > while (res.remove(null)); > return res; > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java > @@ -58,12 +58,12 @@ > private final Map memberEntries; > > TLGlobals() { > - utf8Entries = new HashMap<>(); > - classEntries = new HashMap<>(); > - literalEntries = new HashMap<>(); > - signatureEntries = new HashMap<>(); > - descriptorEntries = new HashMap<>(); > - memberEntries = new HashMap<>(); > + utf8Entries = new HashMap(); > + classEntries = new HashMap(); > + literalEntries = new HashMap(); > + signatureEntries = new HashMap(); > + descriptorEntries = new HashMap(); > + memberEntries = new HashMap(); > props = new PropMap(); > } > > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java > @@ -232,7 +232,7 @@ > props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50"); > pkg.ensureAllClassFiles(); > // Now write out the files. > - Set classesToWrite = new HashSet<>(pkg.getClasses()); > + Set classesToWrite = new HashSet(pkg.getClasses()); > for (Package.File file : pkg.getFiles()) { > String name = file.nameString; > JarEntry je = new JarEntry(Utils.getJarEntryName(name)); > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java > @@ -132,7 +132,7 @@ > // Keep a TLS point to the global data and environment. > // This makes it simpler to supply environmental options > // to the engine code, especially the native code. > - static final ThreadLocal currentInstance = new ThreadLocal<>(); > + static final ThreadLocal currentInstance = new ThreadLocal(); > > // convenience methods to access the TL globals > static TLGlobals getTLGlobals() { > --- openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java > @@ -1284,7 +1284,7 @@ > */ > public Collection toCollection() throws SQLException { > > - TreeMap tMap = new TreeMap<>(); > + TreeMap tMap = new TreeMap(); > > for (int i = 0; i tMap.put(Integer.valueOf(i), rvh.get(i)); > @@ -1314,7 +1314,7 @@ > public Collection toCollection(int column) throws SQLException { > > int nRows = numRows; > - Vector vec = new Vector<>(nRows); > + Vector vec = new Vector(nRows); > > // create a copy > CachedRowSetImpl crsTemp; > --- openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java > @@ -222,7 +222,7 @@ > // either of the setter methods have been set. > if(boolColId){ > // > - ArrayList indices = new ArrayList<>(); > + ArrayList indices = new ArrayList(); > for(int i=0;i if( (strMatchKey = (cRowset.getMatchColumnNames())[i]) != null) { > iMatchKey = cRowset.findColumn(strMatchKey); > --- openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java > @@ -1180,7 +1180,7 @@ > // Done > return certs; > > - ArrayList userCertList = new ArrayList<>(); > + ArrayList userCertList = new ArrayList(); > i = 0; > while (i < certs.length) { > userCertList.add(certs[i]); > --- openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java > @@ -99,10 +99,10 @@ > throws UnsupportedCallbackException > { > /* Collect messages to display in the dialog */ > - final List messages = new ArrayList<>(3); > + final List messages = new ArrayList(3); > > /* Collection actions to perform if the user clicks OK */ > - final List okActions = new ArrayList<>(2); > + final List okActions = new ArrayList(2); > > ConfirmationInfo confirmation = new ConfirmationInfo(); > > --- openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java > @@ -152,7 +152,7 @@ > > // new configuration > HashMap> newConfig = > - new HashMap<>(); > + new HashMap>(); > > if (url != null) { > > @@ -392,7 +392,7 @@ > String moduleClass; > String sflag; > AppConfigurationEntry.LoginModuleControlFlag controlFlag; > - LinkedList configEntries = new LinkedList<>(); > + LinkedList configEntries = new LinkedList(); > > // application name > appName = st.sval; > @@ -432,7 +432,7 @@ > } > > // get the args > - HashMap options = new HashMap<>(); > + HashMap options = new HashMap(); > String key; > String value; > while (peek(";") == false) { > --- openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java > @@ -184,7 +184,7 @@ > private UnixNumericUserPrincipal UIDPrincipal; > private UnixNumericGroupPrincipal GIDPrincipal; > private LinkedList supplementaryGroups = > - new LinkedList<>(); > + new LinkedList(); > > // initial state > private Subject subject; > --- openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java > @@ -658,7 +658,7 @@ > throw new FailedLoginException( > "Unable to find X.509 certificate chain in keystore"); > } else { > - LinkedList certList = new LinkedList<>(); > + LinkedList certList = new LinkedList(); > for (int i=0; i < fromKeyStore.length; i++) { > certList.add(fromKeyStore[i]); > } > --- openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java > @@ -76,7 +76,7 @@ > private SolarisNumericUserPrincipal UIDPrincipal; > private SolarisNumericGroupPrincipal GIDPrincipal; > private LinkedList supplementaryGroups = > - new LinkedList<>(); > + new LinkedList(); > > /** > * Initialize this LoginModule. > --- openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java > @@ -70,7 +70,7 @@ > private UnixNumericUserPrincipal UIDPrincipal; > private UnixNumericGroupPrincipal GIDPrincipal; > private LinkedList supplementaryGroups = > - new LinkedList<>(); > + new LinkedList(); > > /** > * Initialize this LoginModule. > --- openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java > @@ -59,7 +59,7 @@ > > // Maps ThreadReference to ThreadTrace instances > private Map traceMap = > - new HashMap<>(); > + new HashMap(); > > EventThread(VirtualMachine vm, String[] excludes, PrintWriter writer) { > super("event-handler"); > --- openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java > @@ -95,7 +95,7 @@ > public final static int IGNORE_ALL_BEANINFO = 3; > > // Static Caches to speed up introspection. > - private static final WeakCache, Method[]> declaredMethodCache = new WeakCache<>(); > + private static final WeakCache, Method[]> declaredMethodCache = new WeakCache(); > > private Class beanClass; > private BeanInfo explicitBeanInfo; > --- openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java > @@ -42,7 +42,7 @@ > */ > final class ThreadGroupContext { > > - private static final Map contexts = new WeakHashMap<>(); > + private static final Map contexts = new WeakHashMap(); > > /** > * Returns the appropriate {@code AppContext} for the caller, > @@ -99,7 +99,7 @@ > > BeanInfo putBeanInfo(Class type, BeanInfo info) { > if (this.beanInfoCache == null) { > - this.beanInfoCache = new WeakHashMap<>(); > + this.beanInfoCache = new WeakHashMap(); > } > return this.beanInfoCache.put(type, info); > } > --- openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java > @@ -34,7 +34,7 @@ > */ > > class DeleteOnExitHook { > - private static LinkedHashSet files = new LinkedHashSet<>(); > + private static LinkedHashSet files = new LinkedHashSet(); > static { > // DeleteOnExitHook must be the last shutdown hook to be invoked. > // Application shutdown hooks may add the first file to the > @@ -71,7 +71,7 @@ > files = null; > } > > - ArrayList toBeDeleted = new ArrayList<>(theFiles); > + ArrayList toBeDeleted = new ArrayList(theFiles); > > // reverse the list to maintain previous jdk deletion order. > // Last in first deleted. > --- openjdk-boot/jdk/src/share/classes/java/io/File.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/io/File.java > @@ -1082,7 +1082,7 @@ > if ((names == null) || (filter == null)) { > return names; > } > - List v = new ArrayList<>(); > + List v = new ArrayList(); > for (int i = 0 ; i < names.length ; i++) { > if (filter.accept(this, names[i])) { > v.add(names[i]); > @@ -1173,7 +1173,7 @@ > public File[] listFiles(FilenameFilter filter) { > String ss[] = list(); > if (ss == null) return null; > - ArrayList files = new ArrayList<>(); > + ArrayList files = new ArrayList(); > for (String s : ss) > if ((filter == null) || filter.accept(this, s)) > files.add(new File(s, this)); > @@ -1211,7 +1211,7 @@ > public File[] listFiles(FileFilter filter) { > String ss[] = list(); > if (ss == null) return null; > - ArrayList files = new ArrayList<>(); > + ArrayList files = new ArrayList(); > for (String s : ss) { > File f = new File(s, this); > if ((filter == null) || filter.accept(f)) > --- openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java > @@ -57,7 +57,7 @@ > private volatile boolean closed = false; > > private static final ThreadLocal runningFinalize = > - new ThreadLocal<>(); > + new ThreadLocal(); > > private static boolean isRunningFinalize() { > Boolean val; > --- openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java > @@ -70,7 +70,7 @@ > private final Object closeLock = new Object(); > private volatile boolean closed = false; > private static final ThreadLocal runningFinalize = > - new ThreadLocal<>(); > + new ThreadLocal(); > > private static boolean isRunningFinalize() { > Boolean val; > --- openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java > @@ -725,7 +725,7 @@ > */ > > public FilePermissionCollection() { > - perms = new ArrayList<>(); > + perms = new ArrayList(); > } > > /** > @@ -830,7 +830,7 @@ > // Don't call out.defaultWriteObject() > > // Write out Vector > - Vector permissions = new Vector<>(perms.size()); > + Vector permissions = new Vector(perms.size()); > synchronized (this) { > permissions.addAll(perms); > } > @@ -853,7 +853,7 @@ > > // Get the one we want > Vector permissions = (Vector)gfields.get("permissions", null); > - perms = new ArrayList<>(permissions.size()); > + perms = new ArrayList(permissions.size()); > perms.addAll(permissions); > } > } > --- openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java > @@ -213,7 +213,7 @@ > > /** table mapping primitive type names to corresponding class objects */ > private static final HashMap> primClasses > - = new HashMap<>(8, 1.0F); > + = new HashMap>(8, 1.0F); > static { > primClasses.put("boolean", boolean.class); > primClasses.put("byte", byte.class); > @@ -229,11 +229,11 @@ > private static class Caches { > /** cache of subclass security audit results */ > static final ConcurrentMap subclassAudits = > - new ConcurrentHashMap<>(); > + new ConcurrentHashMap(); > > /** queue for WeakReferences to audited subclasses */ > static final ReferenceQueue> subclassAuditsQueue = > - new ReferenceQueue<>(); > + new ReferenceQueue>(); > } > > /** filter stream for handling block data conversion */ > --- openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java > @@ -165,11 +165,11 @@ > private static class Caches { > /** cache of subclass security audit results */ > static final ConcurrentMap subclassAudits = > - new ConcurrentHashMap<>(); > + new ConcurrentHashMap(); > > /** queue for WeakReferences to audited subclasses */ > static final ReferenceQueue> subclassAuditsQueue = > - new ReferenceQueue<>(); > + new ReferenceQueue>(); > } > > /** filter stream for handling block data conversion */ > @@ -2413,7 +2413,7 @@ > private final List stack; > > DebugTraceInfoStack() { > - stack = new ArrayList<>(); > + stack = new ArrayList(); > } > > /** > --- openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java > @@ -84,18 +84,18 @@ > private static class Caches { > /** cache mapping local classes -> descriptors */ > static final ConcurrentMap> localDescs = > - new ConcurrentHashMap<>(); > + new ConcurrentHashMap>(); > > /** cache mapping field group/local desc pairs -> field reflectors */ > static final ConcurrentMap> reflectors = > - new ConcurrentHashMap<>(); > + new ConcurrentHashMap>(); > > /** queue for WeakReferences to local classes */ > private static final ReferenceQueue> localDescsQueue = > - new ReferenceQueue<>(); > + new ReferenceQueue>(); > /** queue for WeakReferences to field reflectors keys */ > private static final ReferenceQueue> reflectorsQueue = > - new ReferenceQueue<>(); > + new ReferenceQueue>(); > } > > /** class associated with this descriptor (if any) */ > @@ -290,7 +290,7 @@ > EntryFuture future = null; > if (entry == null) { > EntryFuture newEntry = new EntryFuture(); > - Reference newRef = new SoftReference<>(newEntry); > + Reference newRef = new SoftReference(newEntry); > do { > if (ref != null) { > Caches.localDescs.remove(key, ref); > @@ -1130,7 +1130,7 @@ > private ClassDataSlot[] getClassDataLayout0() > throws InvalidClassException > { > - ArrayList slots = new ArrayList<>(); > + ArrayList slots = new ArrayList(); > Class start = cl, end = cl; > > // locate closest non-serializable superclass > @@ -1566,7 +1566,7 @@ > > ObjectStreamField[] boundFields = > new ObjectStreamField[serialPersistentFields.length]; > - Set fieldNames = new HashSet<>(serialPersistentFields.length); > + Set fieldNames = new HashSet(serialPersistentFields.length); > > for (int i = 0; i < serialPersistentFields.length; i++) { > ObjectStreamField spf = serialPersistentFields[i]; > @@ -1604,7 +1604,7 @@ > */ > private static ObjectStreamField[] getDefaultSerialFields(Class cl) { > Field[] clFields = cl.getDeclaredFields(); > - ArrayList list = new ArrayList<>(); > + ArrayList list = new ArrayList(); > int mask = Modifier.STATIC | Modifier.TRANSIENT; > > for (int i = 0; i < clFields.length; i++) { > @@ -1855,8 +1855,8 @@ > writeKeys = new long[nfields]; > offsets = new int[nfields]; > typeCodes = new char[nfields]; > - ArrayList> typeList = new ArrayList<>(); > - Set usedKeys = new HashSet<>(); > + ArrayList> typeList = new ArrayList>(); > + Set usedKeys = new HashSet(); > > > for (int i = 0; i < nfields; i++) { > @@ -2092,7 +2092,7 @@ > EntryFuture future = null; > if (entry == null) { > EntryFuture newEntry = new EntryFuture(); > - Reference newRef = new SoftReference<>(newEntry); > + Reference newRef = new SoftReference(newEntry); > do { > if (ref != null) { > Caches.reflectors.remove(key, ref); > --- openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java > @@ -47,7 +47,7 @@ > } > } > ); > - hooks = new IdentityHashMap<>(); > + hooks = new IdentityHashMap(); > } catch (IllegalStateException e) { > // application shutdown hooks cannot be added if > // shutdown is in progress. > --- openjdk-boot/jdk/src/share/classes/java/lang/Character.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java > @@ -646,7 +646,8 @@ > */ > public static final class UnicodeBlock extends Subset { > > - private static Map map = new HashMap<>(256); > + private static Map map > + = new HashMap(256); > > /** > * Creates a UnicodeBlock with the given identifier name. > @@ -4175,7 +4176,7 @@ > > private static HashMap aliases; > static { > - aliases = new HashMap<>(128); > + aliases = new HashMap(128); > aliases.put("ARAB", ARABIC); > aliases.put("ARMI", IMPERIAL_ARAMAIC); > aliases.put("ARMN", ARMENIAN); > --- openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java > @@ -81,7 +81,7 @@ > } while (cpOff < cpEnd); > strPool = new byte[total - cpEnd]; > dis.readFully(strPool); > - refStrPool = new SoftReference<>(strPool); > + refStrPool = new SoftReference(strPool); > } catch (Exception x) { > throw new InternalError(x.getMessage()); > } finally { > --- openjdk-boot/jdk/src/share/classes/java/lang/Class.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java > @@ -1308,7 +1308,7 @@ > return java.security.AccessController.doPrivileged( > new java.security.PrivilegedAction[]>() { > public Class[] run() { > - List> list = new ArrayList<>(); > + List> list = new ArrayList>(); > Class currentClass = Class.this; > while (currentClass != null) { > Class[] members = currentClass.getDeclaredClasses(); > @@ -2308,9 +2308,9 @@ > res = Reflection.filterFields(this, getDeclaredFields0(publicOnly)); > if (useCaches) { > if (publicOnly) { > - declaredPublicFields = new SoftReference<>(res); > + declaredPublicFields = new SoftReference(res); > } else { > - declaredFields = new SoftReference<>(res); > + declaredFields = new SoftReference(res); > } > } > return res; > @@ -2332,9 +2332,9 @@ > > // No cached value available; compute value recursively. > // Traverse in correct order for getField(). > - List fields = new ArrayList<>(); > + List fields = new ArrayList(); > if (traversedInterfaces == null) { > - traversedInterfaces = new HashSet<>(); > + traversedInterfaces = new HashSet>(); > } > > // Local fields > @@ -2360,7 +2360,7 @@ > res = new Field[fields.size()]; > fields.toArray(res); > if (useCaches) { > - publicFields = new SoftReference<>(res); > + publicFields = new SoftReference(res); > } > return res; > } > @@ -2405,9 +2405,9 @@ > } > if (useCaches) { > if (publicOnly) { > - publicConstructors = new SoftReference<>(res); > + publicConstructors = new SoftReference[]>(res); > } else { > - declaredConstructors = new SoftReference<>(res); > + declaredConstructors = new SoftReference[]>(res); > } > } > return res; > @@ -2442,9 +2442,9 @@ > res = Reflection.filterMethods(this, getDeclaredMethods0(publicOnly)); > if (useCaches) { > if (publicOnly) { > - declaredPublicMethods = new SoftReference<>(res); > + declaredPublicMethods = new SoftReference(res); > } else { > - declaredMethods = new SoftReference<>(res); > + declaredMethods = new SoftReference(res); > } > } > return res; > @@ -2600,7 +2600,7 @@ > methods.compactAndTrim(); > res = methods.getArray(); > if (useCaches) { > - publicMethods = new SoftReference<>(res); > + publicMethods = new SoftReference(res); > } > return res; > } > @@ -2979,7 +2979,7 @@ > if (universe == null) > throw new IllegalArgumentException( > getName() + " is not an enum type"); > - Map m = new HashMap<>(2 * universe.length); > + Map m = new HashMap(2 * universe.length); > for (T constant : universe) > m.put(((Enum)constant).name(), constant); > enumConstantDirectory = m; > @@ -3092,7 +3092,7 @@ > if (superClass == null) { > annotations = declaredAnnotations; > } else { > - annotations = new HashMap<>(); > + annotations = new HashMap, Annotation>(); > superClass.initAnnotationsIfNecessary(); > for (Map.Entry, Annotation> e : superClass.annotations.entrySet()) { > Class annotationClass = e.getKey(); > --- openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java > @@ -246,7 +246,7 @@ > > // The classes loaded by this class loader. The only purpose of this table > // is to keep the classes from being GC'ed until the loader is GC'ed. > - private final Vector> classes = new Vector<>(); > + private final Vector> classes = new Vector>(); > > // The "default" domain. Set as the default ProtectionDomain on newly > // created classes. > @@ -265,7 +265,8 @@ > // The packages defined in this class loader. Each package name is mapped > // to its corresponding Package object. > // @GuardedBy("itself") > - private final HashMap packages = new HashMap<>(); > + private final HashMap packages = > + new HashMap(); > > private static Void checkCreateClassLoader() { > SecurityManager security = System.getSecurityManager(); > @@ -278,16 +279,16 @@ > private ClassLoader(Void unused, ClassLoader parent) { > this.parent = parent; > if (ParallelLoaders.isRegistered(this.getClass())) { > - parallelLockMap = new ConcurrentHashMap<>(); > - package2certs = new ConcurrentHashMap<>(); > + parallelLockMap = new ConcurrentHashMap(); > + package2certs = new ConcurrentHashMap(); > domains = > Collections.synchronizedSet(new HashSet()); > assertionLock = new Object(); > } else { > // no finer-grained lock; lock on the classloader instance > parallelLockMap = null; > - package2certs = new Hashtable<>(); > - domains = new HashSet<>(); > + package2certs = new Hashtable(); > + domains = new HashSet(); > assertionLock = this; > } > } > @@ -1175,7 +1176,7 @@ > } > tmp[1] = findResources(name); > > - return new CompoundEnumeration<>(tmp); > + return new CompoundEnumeration(tmp); > } > > /** > @@ -1657,7 +1658,7 @@ > protected Package[] getPackages() { > Map map; > synchronized (packages) { > - map = new HashMap<>(packages); > + map = new HashMap(packages); > } > Package[] pkgs; > if (parent != null) { > @@ -1764,17 +1765,20 @@ > } > > // All native library names we've loaded. > - private static Vector loadedLibraryNames = new Vector<>(); > + private static Vector loadedLibraryNames > + = new Vector(); > > // Native libraries belonging to system classes. > private static Vector systemNativeLibraries > - = new Vector<>(); > + = new Vector(); > > // Native libraries associated with the class loader. > - private Vector nativeLibraries = new Vector<>(); > + private Vector nativeLibraries > + = new Vector(); > > // native libraries being loaded/unloaded. > - private static Stack nativeLibraryContext = new Stack<>(); > + private static Stack nativeLibraryContext > + = new Stack(); > > // The paths searched for libraries > private static String usr_paths[]; > @@ -2097,8 +2101,8 @@ > * them to empty maps, effectively ignoring any present settings. > */ > synchronized (assertionLock) { > - classAssertionStatus = new HashMap<>(); > - packageAssertionStatus = new HashMap<>(); > + classAssertionStatus = new HashMap(); > + packageAssertionStatus = new HashMap(); > defaultAssertionStatus = false; > } > } > @@ -2160,8 +2164,8 @@ > private void initializeJavaAssertionMaps() { > // assert Thread.holdsLock(assertionLock); > > - classAssertionStatus = new HashMap<>(); > - packageAssertionStatus = new HashMap<>(); > + classAssertionStatus = new HashMap(); > + packageAssertionStatus = new HashMap(); > AssertionStatusDirectives directives = retrieveDirectives(); > > for(int i = 0; i < directives.classes.length; i++) > --- openjdk-boot/jdk/src/share/classes/java/lang/Package.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java > @@ -596,13 +596,16 @@ > } > > // The map of loaded system packages > - private static Map pkgs = new HashMap<>(31); > + private static Map pkgs > + = new HashMap(31); > > // Maps each directory or zip file name to its corresponding url > - private static Map urls = new HashMap<>(10); > + private static Map urls > + = new HashMap(10); > > // Maps each code source url for a jar file to its manifest > - private static Map mans = new HashMap<>(10); > + private static Map mans > + = new HashMap(10); > > private static native String getSystemPackage0(String name); > private static native String[] getSystemPackages0(); > --- openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java > @@ -214,7 +214,7 @@ > * @param command a string array containing the program and its arguments > */ > public ProcessBuilder(String... command) { > - this.command = new ArrayList<>(command.length); > + this.command = new ArrayList(command.length); > for (String arg : command) > this.command.add(arg); > } > @@ -251,7 +251,7 @@ > * @return this process builder > */ > public ProcessBuilder command(String... command) { > - this.command = new ArrayList<>(command.length); > + this.command = new ArrayList(command.length); > for (String arg : command) > this.command.add(arg); > return this; > --- openjdk-boot/jdk/src/share/classes/java/lang/String.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/String.java > @@ -2330,7 +2330,7 @@ > int off = 0; > int next = 0; > boolean limited = limit > 0; > - ArrayList list = new ArrayList<>(); > + ArrayList list = new ArrayList(); > while ((next = indexOf(ch, off)) != -1) { > if (!limited || list.size() < limit - 1) { > list.add(substring(off, next)); > --- openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java > @@ -53,9 +53,9 @@ > > /** The cached coders for each thread */ > private final static ThreadLocal> decoder = > - new ThreadLocal<>(); > + new ThreadLocal>(); > private final static ThreadLocal> encoder = > - new ThreadLocal<>(); > + new ThreadLocal>(); > > private static boolean warnUnsupportedCharset = true; > > --- openjdk-boot/jdk/src/share/classes/java/lang/Thread.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java > @@ -1616,7 +1616,8 @@ > // Get a snapshot of the list of all threads > Thread[] threads = getThreads(); > StackTraceElement[][] traces = dumpThreads(threads); > - Map m = new HashMap<>(threads.length); > + Map m > + = new HashMap(threads.length); > for (int i = 0; i < threads.length; i++) { > StackTraceElement[] stackTrace = traces[i]; > if (stackTrace != null) { > @@ -1637,11 +1638,11 @@ > private static class Caches { > /** cache of subclass security audit results */ > static final ConcurrentMap subclassAudits = > - new ConcurrentHashMap<>(); > + new ConcurrentHashMap(); > > /** queue for WeakReferences to audited subclasses */ > static final ReferenceQueue> subclassAuditsQueue = > - new ReferenceQueue<>(); > + new ReferenceQueue>(); > } > > /** > --- openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java > @@ -917,7 +917,7 @@ > // Use the sentinel for a zero-length list > suppressed = SUPPRESSED_SENTINEL; > } else { // Copy Throwables to new list > - suppressed = new ArrayList<>(1); > + suppressed = new ArrayList(1); > for (Throwable t : suppressedExceptions) { > // Enforce constraints on suppressed exceptions in > // case of corrupt or malicious stream. > @@ -1048,7 +1048,7 @@ > return; > > if (suppressedExceptions == SUPPRESSED_SENTINEL) > - suppressedExceptions = new ArrayList<>(1); > + suppressedExceptions = new ArrayList(1); > > suppressedExceptions.add(exception); > } > --- openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java > @@ -789,7 +789,7 @@ > getPlatformManagementInterfaces() > { > Set> result = > - new TreeSet<>(); > + new TreeSet>(); > for (PlatformComponent component: PlatformComponent.values()) { > result.add(component.getMXBeanInterface()); > } > --- openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java > @@ -287,7 +287,7 @@ > List getGcMXBeanList(Class gcMXBeanIntf) { > List list = > ManagementFactoryHelper.getGarbageCollectorMXBeans(); > - List result = new ArrayList<>(list.size()); > + List result = new ArrayList(list.size()); > for (GarbageCollectorMXBean m : list) { > if (gcMXBeanIntf.isInstance(m)) { > result.add(gcMXBeanIntf.cast(m)); > @@ -342,7 +342,7 @@ > } > > private static Set keyProperties(String... keyNames) { > - Set set = new HashSet<>(); > + Set set = new HashSet(); > set.add("type"); > for (String s : keyNames) { > set.add(s); > @@ -407,7 +407,7 @@ > List getMXBeans(MBeanServerConnection mbs, Class mxbeanInterface) > throws java.io.IOException > { > - List result = new ArrayList<>(); > + List result = new ArrayList(); > for (ObjectName on : getObjectNames(mbs)) { > result.add(ManagementFactory. > newPlatformMXBeanProxy(mbs, > @@ -438,7 +438,7 @@ > private static Map enumMap; > private static synchronized void ensureInitialized() { > if (enumMap == null) { > - enumMap = new HashMap<>(); > + enumMap = new HashMap(); > for (PlatformComponent pc: PlatformComponent.values()) { > // Use String as the key rather than Class to avoid > // causing unnecessary class loading of management interface > --- openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java > @@ -136,7 +136,7 @@ > // which implicitly requires that new java.lang.reflect > // objects be fabricated for each reflective call on Class > // objects.) > - Constructor res = new Constructor<>(clazz, > + Constructor res = new Constructor(clazz, > parameterTypes, > exceptionTypes, modifiers, slot, > signature, > --- openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java > @@ -232,7 +232,7 @@ > > /** maps a class loader to the proxy class cache for that loader */ > private static Map, Object>> loaderToCache > - = new WeakHashMap<>(); > + = new WeakHashMap, Object>>(); > > /** marks that a particular proxy class is currently being generated */ > private static Object pendingGenerationMarker = new Object(); > @@ -356,7 +356,7 @@ > String[] interfaceNames = new String[interfaces.length]; > > // for detecting duplicates > - Set> interfaceSet = new HashSet<>(); > + Set> interfaceSet = new HashSet>(); > > for (int i = 0; i < interfaces.length; i++) { > /* > @@ -413,7 +413,7 @@ > synchronized (loaderToCache) { > cache = loaderToCache.get(loader); > if (cache == null) { > - cache = new HashMap<>(); > + cache = new HashMap, Object>(); > loaderToCache.put(loader, cache); > } > /* > --- openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java > @@ -84,7 +84,7 @@ > byte[] annotations, > byte[] parameterAnnotations) > { > - return new Constructor<>(declaringClass, > + return new Constructor(declaringClass, > parameterTypes, > checkedExceptions, > modifiers, > --- openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java > @@ -677,7 +677,7 @@ > > static InetAddressImpl impl; > > - private static final HashMap lookupTable = new HashMap<>(); > + private static final HashMap lookupTable = new HashMap(); > > /** > * Represents a cache entry > @@ -736,7 +736,7 @@ > > // As we iterate in insertion order we can > // terminate when a non-expired entry is found. > - LinkedList expired = new LinkedList<>(); > + LinkedList expired = new LinkedList(); > long now = System.currentTimeMillis(); > for (String key : cache.keySet()) { > CacheEntry entry = cache.get(key); > --- openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java > @@ -205,7 +205,7 @@ > */ > > private WeakHashMap > - closeables = new WeakHashMap<>(); > + closeables = new WeakHashMap(); > > /** > * Returns an input stream for reading the specified resource. > --- openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java > @@ -1487,7 +1487,7 @@ > return AccessController > .doPrivileged(new PrivilegedAction>() { > @Override public List run() { > - List list = new ArrayList<>(); > + List list = new ArrayList(); > ServiceLoader loader = ServiceLoader > .load(FileTypeDetector.class, ClassLoader.getSystemClassLoader()); > for (FileTypeDetector detector: loader) { > @@ -3008,7 +3008,7 @@ > BufferedReader reader = null; > try { > reader = newBufferedReader(path, cs); > - List result = new ArrayList<>(); > + List result = new ArrayList(); > for (;;) { > String line = reader.readLine(); > if (line == null) > --- openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java > @@ -124,7 +124,7 @@ > this.context = null; > } > } else { > - List v = new ArrayList<>(context.length); > + List v = new ArrayList(context.length); > for (int i =0; i< context.length; i++) { > if ((context[i] != null) && (!v.contains(context[i]))) > v.add(context[i]); > --- openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java > @@ -515,7 +515,7 @@ > > // Copy perms into a Hashtable > Hashtable permissions = > - new Hashtable<>(perms.size()*2); > + new Hashtable(perms.size()*2); > > synchronized (this) { > permissions.putAll(perms); > --- openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java > @@ -188,7 +188,7 @@ > } else if (signers != null) { > // Convert the code signers to certs > ArrayList certChains = > - new ArrayList<>(); > + new ArrayList(); > for (int i = 0; i < signers.length; i++) { > certChains.addAll( > signers[i].getSignerCertPath().getCertificates()); > @@ -606,10 +606,10 @@ > > // Iterate through all the certificates > int i = 0; > - List signers = new ArrayList<>(); > + List signers = new ArrayList(); > while (i < certs.length) { > List certChain = > - new ArrayList<>(); > + new ArrayList(); > certChain.add(certs[i++]); // first cert is an end-entity cert > int j = i; > > --- openjdk-boot/jdk/src/share/classes/java/security/Permissions.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java > @@ -362,7 +362,7 @@ > > // Copy perms into a Hashtable > Hashtable, PermissionCollection> perms = > - new Hashtable<>(permsMap.size()*2); // no sync; estimate > + new Hashtable, PermissionCollection>(permsMap.size()*2); // no sync; estimate > synchronized (this) { > perms.putAll(permsMap); > } > @@ -567,7 +567,7 @@ > > // Copy perms into a Hashtable > Hashtable perms = > - new Hashtable<>(permsMap.size()*2); > + new Hashtable(permsMap.size()*2); > synchronized (this) { > perms.putAll(permsMap); > } > --- openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java > @@ -368,8 +368,8 @@ > int swag = 32; > int vcap = 8; > Enumeration e; > - List pdVector = new ArrayList<>(vcap); > - List plVector = new ArrayList<>(swag); > + List pdVector = new ArrayList(vcap); > + List plVector = new ArrayList(swag); > > // > // Build a vector of domain permissions for subsequent merge > --- openjdk-boot/jdk/src/share/classes/java/security/Provider.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java > @@ -437,7 +437,7 @@ > > private void readObject(ObjectInputStream in) > throws IOException, ClassNotFoundException { > - Map copy = new HashMap<>(); > + Map copy = new HashMap(); > for (Map.Entry entry : super.entrySet()) { > copy.put(entry.getKey(), entry.getValue()); > } > @@ -719,7 +719,7 @@ > } > if (serviceSet == null) { > ensureLegacyParsed(); > - Set set = new LinkedHashSet<>(); > + Set set = new LinkedHashSet(); > if (serviceMap != null) { > set.addAll(serviceMap.values()); > } > @@ -1395,7 +1395,7 @@ > if (s != null) { > String[] classNames = s.split("\\|"); > List classList = > - new ArrayList<>(classNames.length); > + new ArrayList(classNames.length); > for (String className : classNames) { > Class clazz = getKeyClass(className); > if (clazz != null) { > --- openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java > @@ -50,7 +50,7 @@ > // HashMap that maps CodeSource to ProtectionDomain > // @GuardedBy("pdcache") > private final HashMap pdcache = > - new HashMap<>(11); > + new HashMap(11); > > private static final Debug debug = Debug.getInstance("scl"); > > --- openjdk-boot/jdk/src/share/classes/java/security/Security.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/security/Security.java > @@ -546,7 +546,7 @@ > value = filter.substring(index + 1); > } > > - Hashtable hashtableFilter = new Hashtable<>(1); > + Hashtable hashtableFilter = new Hashtable(1); > hashtableFilter.put(key, value); > > return (getProviders(hashtableFilter)); > @@ -606,7 +606,7 @@ > // Then only return those providers who satisfy the selection criteria. > Provider[] allProviders = Security.getProviders(); > Set keySet = filter.keySet(); > - LinkedHashSet candidates = new LinkedHashSet<>(5); > + LinkedHashSet candidates = new LinkedHashSet(5); > > // Returns all installed providers > // if the selection criteria is null. > @@ -660,7 +660,7 @@ > } > > // Map containing cached Spi Class objects of the specified type > - private static final Map spiMap = new ConcurrentHashMap<>(); > + private static final Map spiMap = new ConcurrentHashMap(); > > /** > * Return the Class object for the given engine type > @@ -884,7 +884,7 @@ > String attrName, > String filterValue, > Provider[] allProviders) { > - LinkedHashSet candidates = new LinkedHashSet<>(5); > + LinkedHashSet candidates = new LinkedHashSet(5); > for (int i = 0; i < allProviders.length; i++) { > if (isCriterionSatisfied(allProviders[i], serviceName, > algName, > @@ -1081,7 +1081,7 @@ > return Collections.EMPTY_SET; > } > > - HashSet result = new HashSet<>(); > + HashSet result = new HashSet(); > Provider[] providers = Security.getProviders(); > > for (int i = 0; i < providers.length; i++) { > --- openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java > @@ -198,7 +198,7 @@ > if (this.certs == null) { > // extract the signer certs > ArrayList signerCerts = > - new ArrayList<>(); > + new ArrayList(); > i = 0; > while (i < certs.length) { > signerCerts.add(certs[i]); > --- openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java > @@ -119,7 +119,7 @@ > > public Enumeration elements() { > List results = > - new ArrayList<>(); // where results are stored > + new ArrayList(); // where results are stored > > // Get iterator of Map values (which are lists of permissions) > synchronized (this) { > @@ -161,7 +161,7 @@ > > // Copy perms into a Hashtable > Hashtable> permissions = > - new Hashtable<>(perms.size()*2); > + new Hashtable>(perms.size()*2); > > // Convert each entry (List) into a Vector > synchronized (this) { > @@ -169,7 +169,7 @@ > for (Map.Entry> e : set) { > // Convert list into Vector > List list = e.getValue(); > - Vector vec = new Vector<>(list.size()); > + Vector vec = new Vector(list.size()); > synchronized (list) { > vec.addAll(list); > } > @@ -206,7 +206,7 @@ > for (Map.Entry> e : set) { > // Convert Vector into ArrayList > Vector vec = e.getValue(); > - List list = new ArrayList<>(vec.size()); > + List list = new ArrayList(vec.size()); > list.addAll(vec); > > // Add to Hashtable being serialized > --- openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java > @@ -482,8 +482,8 @@ > */ > public List subList(int fromIndex, int toIndex) { > return (this instanceof RandomAccess ? > - new RandomAccessSubList<>(this, fromIndex, toIndex) : > - new SubList<>(this, fromIndex, toIndex)); > + new RandomAccessSubList(this, fromIndex, toIndex) : > + new SubList(this, fromIndex, toIndex)); > } > > // Comparison and hashing > @@ -747,7 +747,7 @@ > } > > public List subList(int fromIndex, int toIndex) { > - return new SubList<>(this, fromIndex, toIndex); > + return new SubList(this, fromIndex, toIndex); > } > > private void rangeCheck(int index) { > @@ -776,6 +776,6 @@ > } > > public List subList(int fromIndex, int toIndex) { > - return new RandomAccessSubList<>(this, fromIndex, toIndex); > + return new RandomAccessSubList(this, fromIndex, toIndex); > } > } > --- openjdk-boot/jdk/src/share/classes/java/util/Arrays.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java > @@ -2825,7 +2825,7 @@ > */ > @SafeVarargs > public static List asList(T... a) { > - return new ArrayList<>(a); > + return new ArrayList(a); > } > > /** > --- openjdk-boot/jdk/src/share/classes/java/util/Collections.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java > @@ -1035,7 +1035,7 @@ > * @return an unmodifiable view of the specified collection. > */ > public static Collection unmodifiableCollection(Collection c) { > - return new UnmodifiableCollection<>(c); > + return new UnmodifiableCollection(c); > } > > /** > @@ -1109,7 +1109,7 @@ > * @return an unmodifiable view of the specified set. > */ > public static Set unmodifiableSet(Set s) { > - return new UnmodifiableSet<>(s); > + return new UnmodifiableSet(s); > } > > /** > @@ -1141,7 +1141,7 @@ > * @return an unmodifiable view of the specified sorted set. > */ > public static SortedSet unmodifiableSortedSet(SortedSet s) { > - return new UnmodifiableSortedSet<>(s); > + return new UnmodifiableSortedSet(s); > } > > /** > @@ -1158,13 +1158,13 @@ > public Comparator comparator() {return ss.comparator();} > > public SortedSet subSet(E fromElement, E toElement) { > - return new UnmodifiableSortedSet<>(ss.subSet(fromElement,toElement)); > + return new UnmodifiableSortedSet(ss.subSet(fromElement,toElement)); > } > public SortedSet headSet(E toElement) { > - return new UnmodifiableSortedSet<>(ss.headSet(toElement)); > + return new UnmodifiableSortedSet(ss.headSet(toElement)); > } > public SortedSet tailSet(E fromElement) { > - return new UnmodifiableSortedSet<>(ss.tailSet(fromElement)); > + return new UnmodifiableSortedSet(ss.tailSet(fromElement)); > } > > public E first() {return ss.first();} > @@ -1188,8 +1188,8 @@ > */ > public static List unmodifiableList(List list) { > return (list instanceof RandomAccess ? > - new UnmodifiableRandomAccessList<>(list) : > - new UnmodifiableList<>(list)); > + new UnmodifiableRandomAccessList(list) : > + new UnmodifiableList(list)); > } > > /** > @@ -1250,7 +1250,7 @@ > } > > public List subList(int fromIndex, int toIndex) { > - return new UnmodifiableList<>(list.subList(fromIndex, toIndex)); > + return new UnmodifiableList(list.subList(fromIndex, toIndex)); > } > > /** > @@ -1267,7 +1267,7 @@ > */ > private Object readResolve() { > return (list instanceof RandomAccess > - ? new UnmodifiableRandomAccessList<>(list) > + ? new UnmodifiableRandomAccessList(list) > : this); > } > } > @@ -1283,7 +1283,7 @@ > } > > public List subList(int fromIndex, int toIndex) { > - return new UnmodifiableRandomAccessList<>( > + return new UnmodifiableRandomAccessList( > list.subList(fromIndex, toIndex)); > } > > @@ -1296,7 +1296,7 @@ > * deserialization. > */ > private Object writeReplace() { > - return new UnmodifiableList<>(list); > + return new UnmodifiableList(list); > } > } > > @@ -1315,7 +1315,7 @@ > * @return an unmodifiable view of the specified map. > */ > public static Map unmodifiableMap(Map m) { > - return new UnmodifiableMap<>(m); > + return new UnmodifiableMap(m); > } > > /** > @@ -1363,7 +1363,7 @@ > > public Set> entrySet() { > if (entrySet==null) > - entrySet = new UnmodifiableEntrySet<>(m.entrySet()); > + entrySet = new UnmodifiableEntrySet(m.entrySet()); > return entrySet; > } > > @@ -1400,7 +1400,7 @@ > return i.hasNext(); > } > public Map.Entry next() { > - return new UnmodifiableEntry<>(i.next()); > + return new UnmodifiableEntry(i.next()); > } > public void remove() { > throw new UnsupportedOperationException(); > @@ -1411,7 +1411,7 @@ > public Object[] toArray() { > Object[] a = c.toArray(); > for (int i=0; i - a[i] = new UnmodifiableEntry<>((Map.Entry)a[i]); > + a[i] = new UnmodifiableEntry((Map.Entry)a[i]); > return a; > } > > @@ -1422,7 +1422,7 @@ > Object[] arr = c.toArray(a.length==0 ? a : Arrays.copyOf(a, 0)); > > for (int i=0; i - arr[i] = new UnmodifiableEntry<>((Map.Entry)arr[i]); > + arr[i] = new UnmodifiableEntry((Map.Entry)arr[i]); > > if (arr.length > a.length) > return (T[])arr; > @@ -1443,7 +1443,7 @@ > if (!(o instanceof Map.Entry)) > return false; > return c.contains( > - new UnmodifiableEntry<>((Map.Entry) o)); > + new UnmodifiableEntry((Map.Entry) o)); > } > > /** > @@ -1517,7 +1517,7 @@ > * @return an unmodifiable view of the specified sorted map. > */ > public static SortedMap unmodifiableSortedMap(SortedMap m) { > - return new UnmodifiableSortedMap<>(m); > + return new UnmodifiableSortedMap(m); > } > > /** > @@ -1535,13 +1535,13 @@ > public Comparator comparator() {return sm.comparator();} > > public SortedMap subMap(K fromKey, K toKey) { > - return new UnmodifiableSortedMap<>(sm.subMap(fromKey, toKey)); > + return new UnmodifiableSortedMap(sm.subMap(fromKey, toKey)); > } > public SortedMap headMap(K toKey) { > - return new UnmodifiableSortedMap<>(sm.headMap(toKey)); > + return new UnmodifiableSortedMap(sm.headMap(toKey)); > } > public SortedMap tailMap(K fromKey) { > - return new UnmodifiableSortedMap<>(sm.tailMap(fromKey)); > + return new UnmodifiableSortedMap(sm.tailMap(fromKey)); > } > > public K firstKey() {return sm.firstKey();} > @@ -1583,11 +1583,11 @@ > * @return a synchronized view of the specified collection. > */ > public static Collection synchronizedCollection(Collection c) { > - return new SynchronizedCollection<>(c); > + return new SynchronizedCollection(c); > } > > static Collection synchronizedCollection(Collection c, Object mutex) { > - return new SynchronizedCollection<>(c, mutex); > + return new SynchronizedCollection(c, mutex); > } > > /** > @@ -1686,11 +1686,11 @@ > * @return a synchronized view of the specified set. > */ > public static Set synchronizedSet(Set s) { > - return new SynchronizedSet<>(s); > + return new SynchronizedSet(s); > } > > static Set synchronizedSet(Set s, Object mutex) { > - return new SynchronizedSet<>(s, mutex); > + return new SynchronizedSet(s, mutex); > } > > /** > @@ -1754,7 +1754,7 @@ > * @return a synchronized view of the specified sorted set. > */ > public static SortedSet synchronizedSortedSet(SortedSet s) { > - return new SynchronizedSortedSet<>(s); > + return new SynchronizedSortedSet(s); > } > > /** > @@ -1783,18 +1783,18 @@ > > public SortedSet subSet(E fromElement, E toElement) { > synchronized (mutex) { > - return new SynchronizedSortedSet<>( > + return new SynchronizedSortedSet( > ss.subSet(fromElement, toElement), mutex); > } > } > public SortedSet headSet(E toElement) { > synchronized (mutex) { > - return new SynchronizedSortedSet<>(ss.headSet(toElement), mutex); > + return new SynchronizedSortedSet(ss.headSet(toElement), mutex); > } > } > public SortedSet tailSet(E fromElement) { > synchronized (mutex) { > - return new SynchronizedSortedSet<>(ss.tailSet(fromElement),mutex); > + return new SynchronizedSortedSet(ss.tailSet(fromElement),mutex); > } > } > > @@ -1833,14 +1833,14 @@ > */ > public static List synchronizedList(List list) { > return (list instanceof RandomAccess ? > - new SynchronizedRandomAccessList<>(list) : > - new SynchronizedList<>(list)); > + new SynchronizedRandomAccessList(list) : > + new SynchronizedList(list)); > } > > static List synchronizedList(List list, Object mutex) { > return (list instanceof RandomAccess ? > - new SynchronizedRandomAccessList<>(list, mutex) : > - new SynchronizedList<>(list, mutex)); > + new SynchronizedRandomAccessList(list, mutex) : > + new SynchronizedList(list, mutex)); > } > > /** > @@ -1903,7 +1903,7 @@ > > public List subList(int fromIndex, int toIndex) { > synchronized (mutex) { > - return new SynchronizedList<>(list.subList(fromIndex, toIndex), > + return new SynchronizedList(list.subList(fromIndex, toIndex), > mutex); > } > } > @@ -1922,7 +1922,7 @@ > */ > private Object readResolve() { > return (list instanceof RandomAccess > - ? new SynchronizedRandomAccessList<>(list) > + ? new SynchronizedRandomAccessList(list) > : this); > } > } > @@ -1944,7 +1944,7 @@ > > public List subList(int fromIndex, int toIndex) { > synchronized (mutex) { > - return new SynchronizedRandomAccessList<>( > + return new SynchronizedRandomAccessList( > list.subList(fromIndex, toIndex), mutex); > } > } > @@ -1958,7 +1958,7 @@ > * deserialization. > */ > private Object writeReplace() { > - return new SynchronizedList<>(list); > + return new SynchronizedList(list); > } > } > > @@ -1990,7 +1990,7 @@ > * @return a synchronized view of the specified map. > */ > public static Map synchronizedMap(Map m) { > - return new SynchronizedMap<>(m); > + return new SynchronizedMap(m); > } > > /** > @@ -2051,7 +2051,7 @@ > public Set keySet() { > synchronized (mutex) { > if (keySet==null) > - keySet = new SynchronizedSet<>(m.keySet(), mutex); > + keySet = new SynchronizedSet(m.keySet(), mutex); > return keySet; > } > } > @@ -2059,7 +2059,7 @@ > public Set> entrySet() { > synchronized (mutex) { > if (entrySet==null) > - entrySet = new SynchronizedSet<>(m.entrySet(), mutex); > + entrySet = new SynchronizedSet>(m.entrySet(), mutex); > return entrySet; > } > } > @@ -2067,7 +2067,7 @@ > public Collection values() { > synchronized (mutex) { > if (values==null) > - values = new SynchronizedCollection<>(m.values(), mutex); > + values = new SynchronizedCollection(m.values(), mutex); > return values; > } > } > @@ -2129,7 +2129,7 @@ > * @return a synchronized view of the specified sorted map. > */ > public static SortedMap synchronizedSortedMap(SortedMap m) { > - return new SynchronizedSortedMap<>(m); > + return new SynchronizedSortedMap(m); > } > > > @@ -2159,18 +2159,18 @@ > > public SortedMap subMap(K fromKey, K toKey) { > synchronized (mutex) { > - return new SynchronizedSortedMap<>( > + return new SynchronizedSortedMap( > sm.subMap(fromKey, toKey), mutex); > } > } > public SortedMap headMap(K toKey) { > synchronized (mutex) { > - return new SynchronizedSortedMap<>(sm.headMap(toKey), mutex); > + return new SynchronizedSortedMap(sm.headMap(toKey), mutex); > } > } > public SortedMap tailMap(K fromKey) { > synchronized (mutex) { > - return new SynchronizedSortedMap<>(sm.tailMap(fromKey),mutex); > + return new SynchronizedSortedMap(sm.tailMap(fromKey),mutex); > } > } > > @@ -2246,7 +2246,7 @@ > */ > public static Collection checkedCollection(Collection c, > Class type) { > - return new CheckedCollection<>(c, type); > + return new CheckedCollection(c, type); > } > > @SuppressWarnings("unchecked") > @@ -2378,7 +2378,7 @@ > * @since 1.5 > */ > public static Set checkedSet(Set s, Class type) { > - return new CheckedSet<>(s, type); > + return new CheckedSet(s, type); > } > > /** > @@ -2424,7 +2424,7 @@ > */ > public static SortedSet checkedSortedSet(SortedSet s, > Class type) { > - return new CheckedSortedSet<>(s, type); > + return new CheckedSortedSet(s, type); > } > > /** > @@ -2484,8 +2484,8 @@ > */ > public static List checkedList(List list, Class type) { > return (list instanceof RandomAccess ? > - new CheckedRandomAccessList<>(list, type) : > - new CheckedList<>(list, type)); > + new CheckedRandomAccessList(list, type) : > + new CheckedList(list, type)); > } > > /** > @@ -2550,7 +2550,7 @@ > } > > public List subList(int fromIndex, int toIndex) { > - return new CheckedList<>(list.subList(fromIndex, toIndex), type); > + return new CheckedList(list.subList(fromIndex, toIndex), type); > } > } > > @@ -2567,7 +2567,7 @@ > } > > public List subList(int fromIndex, int toIndex) { > - return new CheckedRandomAccessList<>( > + return new CheckedRandomAccessList( > list.subList(fromIndex, toIndex), type); > } > } > @@ -2609,7 +2609,7 @@ > public static Map checkedMap(Map m, > Class keyType, > Class valueType) { > - return new CheckedMap<>(m, keyType, valueType); > + return new CheckedMap(m, keyType, valueType); > } > > > @@ -2677,14 +2677,15 @@ > // - protection from malicious t > // - correct behavior if t is a concurrent map > Object[] entries = t.entrySet().toArray(); > - List> checked = new ArrayList<>(entries.length); > + List> checked = > + new ArrayList>(entries.length); > for (Object o : entries) { > Map.Entry e = (Map.Entry) o; > Object k = e.getKey(); > Object v = e.getValue(); > typeCheck(k, v); > checked.add( > - new AbstractMap.SimpleImmutableEntry<>((K) k, (V) v)); > + new AbstractMap.SimpleImmutableEntry((K) k, (V) v)); > } > for (Map.Entry e : checked) > m.put(e.getKey(), e.getValue()); > @@ -2694,7 +2695,7 @@ > > public Set> entrySet() { > if (entrySet==null) > - entrySet = new CheckedEntrySet<>(m.entrySet(), valueType); > + entrySet = new CheckedEntrySet(m.entrySet(), valueType); > return entrySet; > } > > @@ -2809,7 +2810,7 @@ > if (!(o instanceof Map.Entry)) > return false; > return s.remove(new AbstractMap.SimpleImmutableEntry > - <>((Map.Entry)o)); > + ((Map.Entry)o)); > } > > public boolean removeAll(Collection c) { > @@ -2842,7 +2843,7 @@ > > static CheckedEntry checkedEntry(Map.Entry e, > Class valueType) { > - return new CheckedEntry<>(e, valueType); > + return new CheckedEntry(e, valueType); > } > > /** > @@ -2883,7 +2884,7 @@ > if (!(o instanceof Map.Entry)) > return false; > return e.equals(new AbstractMap.SimpleImmutableEntry > - <>((Map.Entry)o)); > + ((Map.Entry)o)); > } > } > } > @@ -2926,7 +2927,7 @@ > public static SortedMap checkedSortedMap(SortedMap m, > Class keyType, > Class valueType) { > - return new CheckedSortedMap<>(m, keyType, valueType); > + return new CheckedSortedMap(m, keyType, valueType); > } > > /** > @@ -2992,7 +2993,7 @@ > > private static class EmptyIterator implements Iterator { > static final EmptyIterator EMPTY_ITERATOR > - = new EmptyIterator<>(); > + = new EmptyIterator(); > > public boolean hasNext() { return false; } > public E next() { throw new NoSuchElementException(); } > @@ -3041,7 +3042,7 @@ > implements ListIterator > { > static final EmptyListIterator EMPTY_ITERATOR > - = new EmptyListIterator<>(); > + = new EmptyListIterator(); > > public boolean hasPrevious() { return false; } > public E previous() { throw new NoSuchElementException(); } > @@ -3077,7 +3078,7 @@ > > private static class EmptyEnumeration implements Enumeration { > static final EmptyEnumeration EMPTY_ENUMERATION > - = new EmptyEnumeration<>(); > + = new EmptyEnumeration(); > > public boolean hasMoreElements() { return false; } > public E nextElement() { throw new NoSuchElementException(); } > @@ -3089,7 +3090,7 @@ > * @see #emptySet() > */ > @SuppressWarnings("unchecked") > - public static final Set EMPTY_SET = new EmptySet<>(); > + public static final Set EMPTY_SET = new EmptySet(); > > /** > * Returns the empty set (immutable). This set is serializable. > @@ -3149,7 +3150,7 @@ > * @see #emptyList() > */ > @SuppressWarnings("unchecked") > - public static final List EMPTY_LIST = new EmptyList<>(); > + public static final List EMPTY_LIST = new EmptyList(); > > /** > * Returns the empty list (immutable). This list is serializable. > @@ -3223,7 +3224,7 @@ > * @since 1.3 > */ > @SuppressWarnings("unchecked") > - public static final Map EMPTY_MAP = new EmptyMap<>(); > + public static final Map EMPTY_MAP = new EmptyMap(); > > /** > * Returns the empty map (immutable). This map is serializable. > @@ -3285,7 +3286,7 @@ > * @return an immutable set containing only the specified object. > */ > public static Set singleton(T o) { > - return new SingletonSet<>(o); > + return new SingletonSet(o); > } > > static Iterator singletonIterator(final E e) { > @@ -3338,7 +3339,7 @@ > * @since 1.3 > */ > public static List singletonList(T o) { > - return new SingletonList<>(o); > + return new SingletonList(o); > } > > /** > @@ -3380,7 +3381,7 @@ > * @since 1.3 > */ > public static Map singletonMap(K key, V value) { > - return new SingletonMap<>(key, value); > + return new SingletonMap(key, value); > } > > /** > @@ -3422,7 +3423,7 @@ > public Set> entrySet() { > if (entrySet==null) > entrySet = Collections.>singleton( > - new SimpleImmutableEntry<>(k, v)); > + new SimpleImmutableEntry(k, v)); > return entrySet; > } > > @@ -3454,7 +3455,7 @@ > public static List nCopies(int n, T o) { > if (n < 0) > throw new IllegalArgumentException("List length = " + n); > - return new CopiesList<>(n, o); > + return new CopiesList(n, o); > } > > /** > @@ -3528,7 +3529,7 @@ > if (fromIndex > toIndex) > throw new IllegalArgumentException("fromIndex(" + fromIndex + > ") > toIndex(" + toIndex + ")"); > - return new CopiesList<>(toIndex - fromIndex, element); > + return new CopiesList(toIndex - fromIndex, element); > } > } > > @@ -3596,7 +3597,7 @@ > if (cmp instanceof ReverseComparator2) > return ((ReverseComparator2)cmp).cmp; > > - return new ReverseComparator2<>(cmp); > + return new ReverseComparator2(cmp); > } > > /** > @@ -3675,7 +3676,7 @@ > * @see ArrayList > */ > public static ArrayList list(Enumeration e) { > - ArrayList l = new ArrayList<>(); > + ArrayList l = new ArrayList(); > while (e.hasMoreElements()) > l.add(e.nextElement()); > return l; > @@ -3868,7 +3869,7 @@ > * @since 1.6 > */ > public static Set newSetFromMap(Map map) { > - return new SetFromMap<>(map); > + return new SetFromMap(map); > } > > /** > @@ -3932,7 +3933,7 @@ > * @since 1.6 > */ > public static Queue asLifoQueue(Deque deque) { > - return new AsLIFOQueue<>(deque); > + return new AsLIFOQueue(deque); > } > > /** > --- openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java > @@ -500,7 +500,7 @@ > int j = 0; > for (int i = 0; i < vals.length; i++) > if (vals[i] != null) > - a[j++] = new AbstractMap.SimpleEntry<>( > + a[j++] = new AbstractMap.SimpleEntry( > keyUniverse[i], unmaskNull(vals[i])); > return a; > } > --- openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java > @@ -110,9 +110,9 @@ > throw new ClassCastException(elementType + " not an enum"); > > if (universe.length <= 64) > - return new RegularEnumSet<>(elementType, universe); > + return new RegularEnumSet(elementType, universe); > else > - return new JumboEnumSet<>(elementType, universe); > + return new JumboEnumSet(elementType, universe); > } > > /** > @@ -431,7 +431,7 @@ > } > > Object writeReplace() { > - return new SerializationProxy<>(this); > + return new SerializationProxy(this); > } > > // readObject method for the serialization proxy pattern > --- openjdk-boot/jdk/src/share/classes/java/util/Formatter.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java > @@ -2514,7 +2514,7 @@ > * Finds format specifiers in the format string. > */ > private FormatString[] parse(String s) { > - ArrayList al = new ArrayList<>(); > + ArrayList al = new ArrayList(); > Matcher m = fsPattern.matcher(s); > for (int i = 0, len = s.length(); i < len; ) { > if (m.find(i)) { > --- openjdk-boot/jdk/src/share/classes/java/util/HashMap.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java > @@ -763,7 +763,7 @@ > */ > void addEntry(int hash, K key, V value, int bucketIndex) { > Entry e = table[bucketIndex]; > - table[bucketIndex] = new Entry<>(hash, key, value, e); > + table[bucketIndex] = new Entry(hash, key, value, e); > if (size++ >= threshold) > resize(2 * table.length); > } > @@ -778,7 +778,7 @@ > */ > void createEntry(int hash, K key, V value, int bucketIndex) { > Entry e = table[bucketIndex]; > - table[bucketIndex] = new Entry<>(hash, key, value, e); > + table[bucketIndex] = new Entry(hash, key, value, e); > size++; > } > > --- openjdk-boot/jdk/src/share/classes/java/util/HashSet.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java > @@ -100,7 +100,7 @@ > * default initial capacity (16) and load factor (0.75). > */ > public HashSet() { > - map = new HashMap<>(); > + map = new HashMap(); > } > > /** > @@ -113,7 +113,7 @@ > * @throws NullPointerException if the specified collection is null > */ > public HashSet(Collection c) { > - map = new HashMap<>(Math.max((int) (c.size()/.75f) + 1, 16)); > + map = new HashMap(Math.max((int) (c.size()/.75f) + 1, 16)); > addAll(c); > } > > @@ -127,7 +127,7 @@ > * than zero, or if the load factor is nonpositive > */ > public HashSet(int initialCapacity, float loadFactor) { > - map = new HashMap<>(initialCapacity, loadFactor); > + map = new HashMap(initialCapacity, loadFactor); > } > > /** > @@ -139,7 +139,7 @@ > * than zero > */ > public HashSet(int initialCapacity) { > - map = new HashMap<>(initialCapacity); > + map = new HashMap(initialCapacity); > } > > /** > @@ -156,7 +156,7 @@ > * than zero, or if the load factor is nonpositive > */ > HashSet(int initialCapacity, float loadFactor, boolean dummy) { > - map = new LinkedHashMap<>(initialCapacity, loadFactor); > + map = new LinkedHashMap(initialCapacity, loadFactor); > } > > /** > --- openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java > @@ -455,7 +455,7 @@ > > // Creates the new entry. > Entry e = tab[index]; > - tab[index] = new Entry<>(hash, key, value, e); > + tab[index] = new Entry(hash, key, value, e); > count++; > return null; > } > @@ -579,7 +579,7 @@ > if (count == 0) { > return Collections.emptyEnumeration(); > } else { > - return new Enumerator<>(type, false); > + return new Enumerator(type, false); > } > } > > @@ -587,7 +587,7 @@ > if (count == 0) { > return Collections.emptyIterator(); > } else { > - return new Enumerator<>(type, true); > + return new Enumerator(type, true); > } > } > > @@ -863,7 +863,7 @@ > > while (entry != null) { > entryStack = > - new Entry<>(0, entry.key, entry.value, entryStack); > + new Entry(0, entry.key, entry.value, entryStack); > entry = entry.next; > } > } > @@ -941,7 +941,7 @@ > } > // Creates the new entry. > Entry e = tab[index]; > - tab[index] = new Entry<>(hash, key, value, e); > + tab[index] = new Entry(hash, key, value, e); > count++; > } > > @@ -962,7 +962,7 @@ > } > > protected Object clone() { > - return new Entry<>(hash, key, value, > + return new Entry(hash, key, value, > (next==null ? null : (Entry) next.clone())); > } > > --- openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java > @@ -1145,7 +1145,7 @@ > Object[] result = new Object[size]; > Iterator> it = iterator(); > for (int i = 0; i < size; i++) > - result[i] = new AbstractMap.SimpleEntry<>(it.next()); > + result[i] = new AbstractMap.SimpleEntry(it.next()); > return result; > } > > @@ -1157,7 +1157,7 @@ > .newInstance(a.getClass().getComponentType(), size); > Iterator> it = iterator(); > for (int i = 0; i < size; i++) > - a[i] = (T) new AbstractMap.SimpleEntry<>(it.next()); > + a[i] = (T) new AbstractMap.SimpleEntry(it.next()); > if (a.length > size) > a[size] = null; > return a; > --- openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java > @@ -91,7 +91,7 @@ > * @return an iterator over the elements contained in this set > */ > public Iterator iterator() { > - return new EnumSetIterator<>(); > + return new EnumSetIterator(); > } > > private class EnumSetIterator> implements Iterator { > --- openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java > @@ -237,7 +237,7 @@ > * the chain. > */ > void init() { > - header = new Entry<>(-1, null, null, null); > + header = new Entry(-1, null, null, null); > header.before = header.after = header; > } > > @@ -438,7 +438,7 @@ > */ > void createEntry(int hash, K key, V value, int bucketIndex) { > HashMap.Entry old = table[bucketIndex]; > - Entry e = new Entry<>(hash, key, value, old); > + Entry e = new Entry(hash, key, value, old); > table[bucketIndex] = e; > e.addBefore(header); > size++; > --- openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java > @@ -122,7 +122,7 @@ > */ > private void linkFirst(E e) { > final Node f = first; > - final Node newNode = new Node<>(null, e, f); > + final Node newNode = new Node(null, e, f); > first = newNode; > if (f == null) > last = newNode; > @@ -137,7 +137,7 @@ > */ > void linkLast(E e) { > final Node l = last; > - final Node newNode = new Node<>(l, e, null); > + final Node newNode = new Node(l, e, null); > last = newNode; > if (l == null) > first = newNode; > @@ -153,7 +153,7 @@ > void linkBefore(E e, Node succ) { > // assert succ != null; > final Node pred = succ.prev; > - final Node newNode = new Node<>(pred, e, succ); > + final Node newNode = new Node(pred, e, succ); > succ.prev = newNode; > if (pred == null) > first = newNode; > @@ -419,7 +419,7 @@ > > for (Object o : a) { > @SuppressWarnings("unchecked") E e = (E) o; > - Node newNode = new Node<>(pred, e, null); > + Node newNode = new Node(pred, e, null); > if (pred == null) > first = newNode; > else > --- openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java > @@ -187,7 +187,7 @@ > return; > > Object[][] contents = getContents(); > - HashMap temp = new HashMap<>(contents.length); > + HashMap temp = new HashMap(contents.length); > for (int i = 0; i < contents.length; ++i) { > // key must be non-null String, value must be non-null > String key = (String) contents[i][0]; > --- openjdk-boot/jdk/src/share/classes/java/util/Locale.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java > @@ -1793,7 +1793,7 @@ > return formatList(variantNames, listPattern, listCompositionPattern); > } > } > - ArrayList names = new ArrayList<>(4); > + ArrayList names = new ArrayList(4); > if (languageName.length() != 0) { > names.add(languageName); > } > --- openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java > @@ -538,7 +538,7 @@ > cursor--; > else { > if (forgetMeNot == null) > - forgetMeNot = new ArrayDeque<>(); > + forgetMeNot = new ArrayDeque(); > forgetMeNot.add(moved); > } > } else if (lastRetElt != null) { > --- openjdk-boot/jdk/src/share/classes/java/util/Properties.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java > @@ -1010,7 +1010,7 @@ > * @since 1.6 > */ > public Set stringPropertyNames() { > - Hashtable h = new Hashtable<>(); > + Hashtable h = new Hashtable(); > enumerateStringProperties(h); > return h.keySet(); > } > --- openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java > @@ -72,7 +72,7 @@ > * @return an iterator over the elements contained in this set > */ > public Iterator iterator() { > - return new EnumSetIterator<>(); > + return new EnumSetIterator(); > } > > private class EnumSetIterator> implements Iterator { > --- openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java > @@ -289,7 +289,7 @@ > * name for compatibility with some workarounds for bug 4212439. > */ > private static final ConcurrentMap cacheList > - = new ConcurrentHashMap<>(INITIAL_CACHE_SIZE); > + = new ConcurrentHashMap(INITIAL_CACHE_SIZE); > > /** > * Queue for reference objects referring to class loaders or bundles. > @@ -1754,7 +1754,7 @@ > * @since 1.6 > */ > public Set keySet() { > - Set keys = new HashSet<>(); > + Set keys = new HashSet(); > for (ResourceBundle rb = this; rb != null; rb = rb.parent) { > keys.addAll(rb.handleKeySet()); > } > @@ -1782,7 +1782,7 @@ > if (keySet == null) { > synchronized (this) { > if (keySet == null) { > - Set keys = new HashSet<>(); > + Set keys = new HashSet(); > Enumeration enumKeys = getKeys(); > while (enumKeys.hasMoreElements()) { > String key = enumKeys.nextElement(); > @@ -2300,7 +2300,7 @@ > if (baseName == null) { > throw new NullPointerException(); > } > - return new ArrayList<>(CANDIDATES_CACHE.get(locale.getBaseLocale())); > + return new ArrayList(CANDIDATES_CACHE.get(locale.getBaseLocale())); > } > > private static final CandidateListCache CANDIDATES_CACHE = new CandidateListCache(); > @@ -2326,7 +2326,7 @@ > if (language.equals("nb") || isNorwegianBokmal) { > List tmpList = getDefaultList("nb", script, region, variant); > // Insert a locale replacing "nb" with "no" for every list entry > - List bokmalList = new LinkedList<>(); > + List bokmalList = new LinkedList(); > for (Locale l : tmpList) { > bokmalList.add(l); > if (l.getLanguage().length() == 0) { > @@ -2373,7 +2373,7 @@ > List variants = null; > > if (variant.length() > 0) { > - variants = new LinkedList<>(); > + variants = new LinkedList(); > int idx = variant.length(); > while (idx != -1) { > variants.add(variant.substring(0, idx)); > @@ -2381,7 +2381,7 @@ > } > } > > - List list = new LinkedList<>(); > + List list = new LinkedList(); > > if (variants != null) { > for (String v : variants) { > --- openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java > @@ -191,7 +191,7 @@ > private ClassLoader loader; > > // Cached providers, in instantiation order > - private LinkedHashMap providers = new LinkedHashMap<>(); > + private LinkedHashMap providers = new LinkedHashMap(); > > // The current lazy-lookup iterator > private LazyIterator lookupIterator; > @@ -291,7 +291,7 @@ > { > InputStream in = null; > BufferedReader r = null; > - ArrayList names = new ArrayList<>(); > + ArrayList names = new ArrayList(); > try { > in = u.openStream(); > r = new BufferedReader(new InputStreamReader(in, "utf-8")); > @@ -463,7 +463,7 @@ > public static ServiceLoader load(Class service, > ClassLoader loader) > { > - return new ServiceLoader<>(service, loader); > + return new ServiceLoader(service, loader); > } > > /** > --- openjdk-boot/jdk/src/share/classes/java/util/TimSort.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java > @@ -196,7 +196,7 @@ > * extending short natural runs to minRun elements, and merging runs > * to maintain stack invariant. > */ > - TimSort ts = new TimSort<>(a, c); > + TimSort ts = new TimSort(a, c); > int minRun = minRunLength(nRemaining); > do { > // Identify next run > --- openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java > @@ -530,7 +530,7 @@ > if (t == null) { > compare(key, key); // type (and possibly null) check > > - root = new Entry<>(key, value, null); > + root = new Entry(key, value, null); > size = 1; > modCount++; > return null; > @@ -566,7 +566,7 @@ > return t.setValue(value); > } while (t != null); > } > - Entry e = new Entry<>(key, value, parent); > + Entry e = new Entry(key, value, parent); > if (cmp < 0) > parent.left = e; > else > @@ -1066,14 +1066,14 @@ > } > public NavigableSet subSet(E fromElement, boolean fromInclusive, > E toElement, boolean toInclusive) { > - return new KeySet<>(m.subMap(fromElement, fromInclusive, > + return new KeySet(m.subMap(fromElement, fromInclusive, > toElement, toInclusive)); > } > public NavigableSet headSet(E toElement, boolean inclusive) { > - return new KeySet<>(m.headMap(toElement, inclusive)); > + return new KeySet(m.headMap(toElement, inclusive)); > } > public NavigableSet tailSet(E fromElement, boolean inclusive) { > - return new KeySet<>(m.tailMap(fromElement, inclusive)); > + return new KeySet(m.tailMap(fromElement, inclusive)); > } > public SortedSet subSet(E fromElement, E toElement) { > return subSet(fromElement, true, toElement, false); > @@ -1202,7 +1202,7 @@ > */ > static Map.Entry exportEntry(TreeMap.Entry e) { > return (e == null) ? null : > - new AbstractMap.SimpleImmutableEntry<>(e); > + new AbstractMap.SimpleImmutableEntry(e); > } > > /** > @@ -2403,7 +2403,7 @@ > value = (defaultVal != null ? defaultVal : (V) str.readObject()); > } > > - Entry middle = new Entry<>(key, value, null); > + Entry middle = new Entry(key, value, null); > > // color nodes in non-full bottommost level red > if (level == redLevel) > --- openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java > @@ -138,7 +138,7 @@ > * ordering} of the elements will be used. > */ > public TreeSet(Comparator comparator) { > - this(new TreeMap<>(comparator)); > + this(new TreeMap(comparator)); > } > > /** > @@ -195,7 +195,7 @@ > * @since 1.6 > */ > public NavigableSet descendingSet() { > - return new TreeSet<>(m.descendingMap()); > + return new TreeSet(m.descendingMap()); > } > > /** > @@ -322,7 +322,7 @@ > */ > public NavigableSet subSet(E fromElement, boolean fromInclusive, > E toElement, boolean toInclusive) { > - return new TreeSet<>(m.subMap(fromElement, fromInclusive, > + return new TreeSet(m.subMap(fromElement, fromInclusive, > toElement, toInclusive)); > } > > @@ -335,7 +335,7 @@ > * @since 1.6 > */ > public NavigableSet headSet(E toElement, boolean inclusive) { > - return new TreeSet<>(m.headMap(toElement, inclusive)); > + return new TreeSet(m.headMap(toElement, inclusive)); > } > > /** > @@ -347,7 +347,7 @@ > * @since 1.6 > */ > public NavigableSet tailSet(E fromElement, boolean inclusive) { > - return new TreeSet<>(m.tailMap(fromElement, inclusive)); > + return new TreeSet(m.tailMap(fromElement, inclusive)); > } > > /** > @@ -477,7 +477,7 @@ > throw new InternalError(); > } > > - clone.m = new TreeMap<>(m); > + clone.m = new TreeMap(m); > return clone; > } > > @@ -524,9 +524,9 @@ > // Create backing TreeMap > TreeMap tm; > if (c==null) > - tm = new TreeMap<>(); > + tm = new TreeMap(); > else > - tm = new TreeMap<>(c); > + tm = new TreeMap(c); > m = tm; > > // Read in size > --- openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java > @@ -171,7 +171,7 @@ > /** > * Reference queue for cleared WeakEntries > */ > - private final ReferenceQueue queue = new ReferenceQueue<>(); > + private final ReferenceQueue queue = new ReferenceQueue(); > > /** > * The number of times this WeakHashMap has been structurally modified. > @@ -439,7 +439,7 @@ > > modCount++; > Entry e = tab[i]; > - tab[i] = new Entry<>(k, value, queue, h, e); > + tab[i] = new Entry(k, value, queue, h, e); > if (++size >= threshold) > resize(tab.length * 2); > return null; > @@ -955,9 +955,10 @@ > } > > private List> deepCopy() { > - List> list = new ArrayList<>(size()); > + List> list = > + new ArrayList>(size()); > for (Map.Entry e : this) > - list.add(new AbstractMap.SimpleEntry<>(e)); > + list.add(new AbstractMap.SimpleEntry(e)); > return list; > } > > --- openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java > @@ -127,7 +127,7 @@ > private FileOutputStream lockStream; > private File files[]; > private static final int MAX_LOCKS = 100; > - private static java.util.HashMap locks = new java.util.HashMap<>(); > + private static java.util.HashMap locks = new java.util.HashMap(); > > // A metered stream is a subclass of OutputStream that > // (a) forwards all its output to a target stream > --- openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java > @@ -59,7 +59,7 @@ > */ > > public class Level implements java.io.Serializable { > - private static java.util.ArrayList known = new java.util.ArrayList<>(); > + private static java.util.ArrayList known = new java.util.ArrayList(); > private static String defaultBundle = "sun.util.logging.resources.logging"; > > /** > --- openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java > @@ -156,7 +156,8 @@ > private final static Level defaultLevel = Level.INFO; > > // Table of named Loggers that maps names to Loggers. > - private Hashtable namedLoggers = new Hashtable<>(); > + private Hashtable namedLoggers = > + new Hashtable(); > // Tree of named Loggers > private LogNode root = new LogNode(null); > private Logger rootLogger; > @@ -444,7 +445,7 @@ > // loggerRefQueue holds LoggerWeakRef objects for Logger objects > // that have been GC'ed. > private final ReferenceQueue loggerRefQueue > - = new ReferenceQueue<>(); > + = new ReferenceQueue(); > > // Package-level inner class. > // Helper class for managing WeakReferences to Logger objects. > @@ -694,7 +695,7 @@ > name = ""; > } > if (node.children == null) { > - node.children = new HashMap<>(); > + node.children = new HashMap(); > } > LogNode child = node.children.get(head); > if (child == null) { > @@ -878,7 +879,7 @@ > } > hands = hands.trim(); > int ix = 0; > - Vector result = new Vector<>(); > + Vector result = new Vector(); > while (ix < hands.length()) { > int end = ix; > while (end < hands.length()) { > --- openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java > @@ -85,7 +85,8 @@ > private static final AtomicInteger nextThreadId > = new AtomicInteger(MIN_SEQUENTIAL_THREAD_ID); > > - private static final ThreadLocal threadIds = new ThreadLocal<>(); > + private static final ThreadLocal threadIds > + = new ThreadLocal(); > > /** > * @serial Logging message level > --- openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java > @@ -170,7 +170,7 @@ > private LogManager manager; > private String name; > private final CopyOnWriteArrayList handlers = > - new CopyOnWriteArrayList<>(); > + new CopyOnWriteArrayList(); > private String resourceBundleName; > private volatile boolean useParentHandlers = true; > private volatile Filter filter; > @@ -1439,7 +1439,7 @@ > // Set our new parent. > parent = newParent; > if (parent.kids == null) { > - parent.kids = new ArrayList<>(2); > + parent.kids = new ArrayList(2); > } > if (ref == null) { > // we didn't have a previous parent > --- openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java > @@ -56,7 +56,7 @@ > > public List getLoggerNames() { > Enumeration loggers = logManager.getLoggerNames(); > - ArrayList array = new ArrayList<>(); > + ArrayList array = new ArrayList(); > > for (; loggers.hasMoreElements();) { > array.add((String) loggers.nextElement()); > --- openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java > @@ -155,7 +155,8 @@ > * All known unremoved children of this node. (This "cache" is consulted > * prior to calling childSpi() or getChild(). > */ > - private Map kidCache = new HashMap<>(); > + private Map kidCache > + = new HashMap(); > > /** > * This field is used to keep track of whether or not this node has > @@ -712,7 +713,7 @@ > if (removed) > throw new IllegalStateException("Node has been removed."); > > - Set s = new TreeSet<>(kidCache.keySet()); > + Set s = new TreeSet(kidCache.keySet()); > for (String kid : childrenNamesSpi()) > s.add(kid); > return s.toArray(EMPTY_STRING_ARRAY); > @@ -1441,7 +1442,8 @@ > * event delivery from preference activity, greatly simplifying > * locking and reducing opportunity for deadlock. > */ > - private static final List eventQueue = new LinkedList<>(); > + private static final List eventQueue > + = new LinkedList(); > > /** > * These two classes are used to distinguish NodeChangeEvents on > --- openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java > @@ -321,7 +321,7 @@ > * Nothing, but quotes all characters until \E > * \E > * Nothing, but ends quoting started by \Q > - * > + * > * > *   > * Special constructs (named-capturing and non-capturing) > @@ -1193,7 +1193,7 @@ > public String[] split(CharSequence input, int limit) { > int index = 0; > boolean matchLimited = limit > 0; > - ArrayList matchList = new ArrayList<>(); > + ArrayList matchList = new ArrayList(); > Matcher m = matcher(input); > > // Add segments before each match found > @@ -1695,7 +1695,7 @@ > > Map namedGroups() { > if (namedGroups == null) > - namedGroups = new HashMap<>(2); > + namedGroups = new HashMap(2); > return namedGroups; > } > > @@ -5495,7 +5495,7 @@ > } > > private static final HashMap map > - = new HashMap<>(); > + = new HashMap(); > > static { > // Unicode character property aliases, defined in > --- openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java > @@ -193,8 +193,8 @@ > } > }; > > - private final static HashMap posix = new HashMap<>(); > - private final static HashMap aliases = new HashMap<>(); > + private final static HashMap posix = new HashMap(); > + private final static HashMap aliases = new HashMap(); > static { > posix.put("ALPHA", "ALPHABETIC"); > posix.put("LOWER", "LOWERCASE"); > --- openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java > @@ -319,7 +319,7 @@ > > // the outstanding inputstreams that need to be closed, > // mapped to the inflater objects they use. > - private final Map streams = new WeakHashMap<>(); > + private final Map streams = new WeakHashMap(); > > /** > * Returns an input stream for reading the contents of the specified > @@ -461,7 +461,7 @@ > } > > // List of available Inflater objects for decompression > - private Deque inflaterCache = new ArrayDeque<>(); > + private Deque inflaterCache = new ArrayDeque(); > > /** > * Returns the path name of the ZIP file. > @@ -577,7 +577,7 @@ > // Close streams, release their inflaters > synchronized (streams) { > if (false == streams.isEmpty()) { > - Map copy = new HashMap<>(streams); > + Map copy = new HashMap(streams); > streams.clear(); > for (Map.Entry e : copy.entrySet()) { > e.getKey().close(); > --- openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java > @@ -53,8 +53,8 @@ > } > > private XEntry current; > - private Vector xentries = new Vector<>(); > - private HashSet names = new HashSet<>(); > + private Vector xentries = new Vector(); > + private HashSet names = new HashSet(); > private CRC32 crc = new CRC32(); > private long written = 0; > private long locoff = 0; > --- openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java.orig > +++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java > @@ -329,7 +329,7 @@ > throw new IllegalArgumentException("invalid empty name"); > } > > - ArrayList pList = new ArrayList<>(); > + ArrayList pList = new ArrayList(); > StringTokenizer tokenizer = new StringTokenizer(name, " ", true); > String principalClass = null; > String principalName = null; > --- openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java.orig > +++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java > @@ -48,7 +48,7 @@ > > private Subject subject; > private WeakKeyValueMap cachedPDs = > - new WeakKeyValueMap<>(); > + new WeakKeyValueMap(); > private Set principalSet; > private Principal[] principals; > > --- openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java.orig > +++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java > @@ -361,7 +361,7 @@ > // Don't call out.defaultWriteObject() > > // Write out Vector > - Vector permissions = new Vector<>(perms.size()); > + Vector permissions = new Vector(perms.size()); > > synchronized (this) { > permissions.addAll(perms); > --- openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java.orig > +++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java > @@ -569,7 +569,7 @@ > // Don't call out.defaultWriteObject() > > // Write out Vector > - Vector permissions = new Vector<>(perms.size()); > + Vector permissions = new Vector(perms.size()); > > synchronized (this) { > permissions.addAll(perms); > --- openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java > @@ -59,7 +59,7 @@ > EnumMap[] caches > = (EnumMap[]) new EnumMap[n]; // unchecked warning expected here > for (int i = 0; i < n; i++) > - caches[i] = new EnumMap<>(Wrapper.class); > + caches[i] = new EnumMap(Wrapper.class); > return caches; > } > > @@ -1013,7 +1013,7 @@ > Object a8, Object a9) > { return makeArray(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } > private static MethodHandle[] makeArrays() { > - ArrayList mhs = new ArrayList<>(); > + ArrayList mhs = new ArrayList(); > for (;;) { > MethodHandle mh = findCollector("array", mhs.size(), Object[].class); > if (mh == null) break; > @@ -1059,7 +1059,7 @@ > Object a8, Object a9) > { fillWithArguments(a, pos, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); return a; } > private static MethodHandle[] makeFillArrays() { > - ArrayList mhs = new ArrayList<>(); > + ArrayList mhs = new ArrayList(); > mhs.add(null); // there is no empty fill; at least a0 is required > for (;;) { > MethodHandle mh = findCollector("fillArray", mhs.size(), Object[].class, Object[].class, Integer.class); > @@ -1214,7 +1214,7 @@ > Object a8, Object a9) > { return makeList(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } > private static MethodHandle[] makeLists() { > - ArrayList mhs = new ArrayList<>(); > + ArrayList mhs = new ArrayList(); > for (;;) { > MethodHandle mh = findCollector("list", mhs.size(), List.class); > if (mh == null) break; > --- openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java > @@ -54,7 +54,7 @@ > private static volatile boolean installedAll; > > static { > - aliasTable = new HashMap<>(460, 1.0f); /* MDA */ > + aliasTable = new HashMap(460, 1.0f); /* MDA */ > > aliasTable.put("us-ascii", "ASCII"); > aliasTable.put("ascii", "ASCII"); > --- openjdk-boot/jdk/src/share/classes/sun/io/Converters.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java > @@ -120,7 +120,7 @@ > > private static Class cache(int type, Object encoding, Class c) { > SoftReference[] srs = classCache[type]; > - srs[CACHE_SIZE - 1] = new SoftReference<>(new Object[] { c, encoding }); > + srs[CACHE_SIZE - 1] = new SoftReference(new Object[] { c, encoding }); > moveToFront(srs, CACHE_SIZE - 1); > return c; > } > --- openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java > @@ -169,7 +169,7 @@ > private static void printProperties(PrintStream ostream) { > Properties p = System.getProperties(); > ostream.println(PROP_SETTINGS); > - List sortedPropertyKeys = new ArrayList<>(); > + List sortedPropertyKeys = new ArrayList(); > sortedPropertyKeys.addAll(p.stringPropertyNames()); > Collections.sort(sortedPropertyKeys); > for (String x : sortedPropertyKeys) { > @@ -244,7 +244,7 @@ > } > // Locale does not implement Comparable so we convert it to String > // and sort it for pretty printing. > - Set sortedSet = new TreeSet<>(); > + Set sortedSet = new TreeSet(); > for (Locale l : tlocales) { > sortedSet.add(l.toString()); > } > --- openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java > @@ -205,7 +205,7 @@ > private static List bufferPools = null; > public static synchronized List getBufferPoolMXBeans() { > if (bufferPools == null) { > - bufferPools = new ArrayList<>(2); > + bufferPools = new ArrayList(2); > bufferPools.add(createBufferPoolMXBean(sun.misc.SharedSecrets.getJavaNioAccess() > .getDirectBufferPool())); > bufferPools.add(createBufferPoolMXBean(sun.nio.ch.FileChannelImpl > --- openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java > @@ -52,7 +52,7 @@ > > // Per-thread soft cache of the last temporary context > private static ThreadLocal> contextRef = > - new ThreadLocal<>(); > + new ThreadLocal>(); > > // Simple class to encapsulate the temporary context > private static class ThreadContext { > @@ -99,7 +99,7 @@ > > // new thread context needs to be created > if (thrCtxt == null) { > - final Hashtable env = new Hashtable<>(); > + final Hashtable env = new Hashtable(); > env.put("java.naming.factory.initial", > "com.sun.jndi.dns.DnsContextFactory"); > > @@ -165,7 +165,7 @@ > final String[] ids, int depth) > throws UnknownHostException > { > - ArrayList results = new ArrayList<>(); > + ArrayList results = new ArrayList(); > Attributes attrs; > > // do the query > --- openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java > @@ -239,7 +239,7 @@ > url = null; > } > > - private static HashMap proxiedHosts = new HashMap<>(); > + private static HashMap proxiedHosts = new HashMap(); > > public synchronized static void setProxiedHost(String host) { > proxiedHosts.put(host.toLowerCase(), null); > --- openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java > @@ -111,7 +111,7 @@ > * at the same time, then all but the first will block until > * the first completes its authentication. > */ > - static private HashMap requests = new HashMap<>(); > + static private HashMap requests = new HashMap(); > > /* check if a request for this destination is in progress > * return false immediately if not. Otherwise block until > --- openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java > @@ -49,22 +49,22 @@ > /* Maps canonical names to class names > */ > private Map classMap > - = new TreeMap<>(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER); > + = new TreeMap(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER); > > /* Maps alias names to canonical names > */ > private Map aliasMap > - = new TreeMap<>(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER); > + = new TreeMap(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER); > > /* Maps canonical names to alias-name arrays > */ > private Map aliasNameMap > - = new TreeMap<>(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER); > + = new TreeMap(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER); > > /* Maps canonical names to soft references that hold cached instances > */ > private Map> cache > - = new TreeMap<>(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER); > + = new TreeMap>(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER); > > private String packagePrefix; > > @@ -167,7 +167,7 @@ > final ArrayList ks; > synchronized (this) { > init(); > - ks = new ArrayList<>(classMap.keySet()); > + ks = new ArrayList(classMap.keySet()); > } > > return new Iterator() { > --- openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java > @@ -84,7 +84,7 @@ > throw new IllegalArgumentException("'" + name() + ":" + > attribute + "' not recognized"); > } > - Map result = new HashMap<>(2); > + Map result = new HashMap(2); > if (acl) > result.put(ACL_NAME, getAcl()); > if (owner) > --- openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java > @@ -89,8 +89,8 @@ > * Used to build a map of attribute name/values. > */ > static class AttributesBuilder { > - private Set names = new HashSet<>(); > - private Map map = new HashMap<>(); > + private Set names = new HashSet(); > + private Map map = new HashMap(); > private boolean copyAll; > > private AttributesBuilder(Set allowed, String[] requested) { > --- openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java > @@ -102,7 +102,7 @@ > throw new NullPointerException(); > if (events.length == 0) > throw new IllegalArgumentException("No events to register"); > - Set> eventSet = new HashSet<>(events.length); > + Set> eventSet = new HashSet>(events.length); > for (WatchEvent.Kind event: events) { > // standard events > if (event == StandardWatchEventKinds.ENTRY_CREATE || > --- openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java > @@ -77,7 +77,7 @@ > throws IOException > { > // names of attributes to return > - List names = new ArrayList<>(); > + List names = new ArrayList(); > for (String name: attributes) { > if (name.equals("*")) { > names = list(); > @@ -90,7 +90,7 @@ > } > > // read each value and return in map > - Map result = new HashMap<>(); > + Map result = new HashMap(); > for (String name: names) { > int size = size(name); > byte[] buf = new byte[size]; > --- openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java > @@ -71,7 +71,7 @@ > > @Override > public Map readAttributes(String[] attributes) throws IOException { > - Map result = new HashMap<>(); > + Map result = new HashMap(); > for (String attribute: attributes) { > if (attribute.equals("*") || attribute.equals(OWNER_NAME)) { > result.put(OWNER_NAME, getOwner()); > --- openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java > @@ -63,7 +63,7 @@ > * Returns a Set containing the given elements. > */ > static Set newSet(E... elements) { > - HashSet set = new HashSet<>(); > + HashSet set = new HashSet(); > for (E e: elements) { > set.add(e); > } > @@ -75,7 +75,7 @@ > * the given elements. > */ > static Set newSet(Set other, E... elements) { > - HashSet set = new HashSet<>(other); > + HashSet set = new HashSet(other); > for (E e: elements) { > set.add(e); > } > --- openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java > @@ -229,7 +229,7 @@ > * "<" FormalTypeParameter+ ">" > */ > private FormalTypeParameter[] parseFormalTypeParameters(){ > - List ftps = new ArrayList<>(3); > + List ftps = new ArrayList(3); > assert(current() == '<'); // should not have been called at all > if (current() != '<') { throw error("expected '<'");} > advance(); > @@ -308,7 +308,7 @@ > assert(current() == 'L'); > if (current() != 'L') { throw error("expected a class type");} > advance(); > - List scts = new ArrayList<>(5); > + List scts = new ArrayList(5); > scts.add(parsePackageNameAndSimpleClassTypeSignature()); > > parseClassTypeSignatureSuffix(scts); > @@ -391,7 +391,7 @@ > * "<" TypeArgument+ ">" > */ > private TypeArgument[] parseTypeArguments() { > - List tas = new ArrayList<>(3); > + List tas = new ArrayList(3); > assert(current() == '<'); > if (current() != '<') { throw error("expected '<'");} > advance(); > @@ -529,7 +529,7 @@ > * ":" FieldTypeSignature > */ > private FieldTypeSignature[] parseBounds() { > - List fts = new ArrayList<>(3); > + List fts = new ArrayList(3); > > if (current() == ':') { > advance(); > @@ -557,7 +557,7 @@ > * ClassTypeSignature > */ > private ClassTypeSignature[] parseSuperInterfaces() { > - List cts = new ArrayList<>(5); > + List cts = new ArrayList(5); > while(current() == 'L') { > cts.add(parseClassTypeSignature()); > } > @@ -592,7 +592,7 @@ > > // TypeSignature* > private TypeSignature[] parseZeroOrMoreTypeSignatures() { > - List ts = new ArrayList<>(); > + List ts = new ArrayList(); > boolean stop = false; > while (!stop) { > switch(current()) { > @@ -631,7 +631,7 @@ > > // ThrowSignature* > private FieldTypeSignature[] parseZeroOrMoreThrowsSignatures(){ > - List ets = new ArrayList<>(3); > + List ets = new ArrayList(3); > while( current() == '^') { > ets.add(parseThrowsSignature()); > } > --- openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java > @@ -149,10 +149,10 @@ > > /** maps activation id to its respective group id */ > private Map idTable = > - new ConcurrentHashMap<>(); > + new ConcurrentHashMap(); > /** maps group id to its GroupEntry groups */ > private Map groupTable = > - new ConcurrentHashMap<>(); > + new ConcurrentHashMap(); > > private byte majorVersion = MAJOR_VERSION; > private byte minorVersion = MINOR_VERSION; > @@ -288,10 +288,10 @@ > { > ois.defaultReadObject(); > if (! (groupTable instanceof ConcurrentHashMap)) { > - groupTable = new ConcurrentHashMap<>(groupTable); > + groupTable = new ConcurrentHashMap(groupTable); > } > if (! (idTable instanceof ConcurrentHashMap)) { > - idTable = new ConcurrentHashMap<>(idTable); > + idTable = new ConcurrentHashMap(idTable); > } > } > > --- openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java > @@ -37,7 +37,7 @@ > */ > public class AclEntryImpl implements AclEntry { > private Principal user = null; > - private Vector permissionSet = new Vector<>(10, 10); > + private Vector permissionSet = new Vector(10, 10); > private boolean negative = false; > > /** > --- openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java > @@ -41,15 +41,15 @@ > // or principal. > // > private Hashtable allowedUsersTable = > - new Hashtable<>(23); > + new Hashtable(23); > private Hashtable allowedGroupsTable = > - new Hashtable<>(23); > + new Hashtable(23); > private Hashtable deniedUsersTable = > - new Hashtable<>(23); > + new Hashtable(23); > private Hashtable deniedGroupsTable = > - new Hashtable<>(23); > + new Hashtable(23); > private String aclName = null; > - private Vector zeroSet = new Vector<>(1,1); > + private Vector zeroSet = new Vector(1,1); > > > /** > @@ -294,7 +294,7 @@ > // > private static Enumeration union(Enumeration e1, > Enumeration e2) { > - Vector v = new Vector<>(20, 20); > + Vector v = new Vector(20, 20); > > while (e1.hasMoreElements()) > v.addElement(e1.nextElement()); > @@ -313,7 +313,7 @@ > // > private Enumeration subtract(Enumeration e1, > Enumeration e2) { > - Vector v = new Vector<>(20, 20); > + Vector v = new Vector(20, 20); > > while (e1.hasMoreElements()) > v.addElement(e1.nextElement()); > --- openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java > @@ -34,7 +34,7 @@ > * @author Satish Dharmaraj > */ > public class GroupImpl implements Group { > - private Vector groupMembers = new Vector<>(50, 100); > + private Vector groupMembers = new Vector(50, 100); > private String group; > > /** > @@ -131,7 +131,7 @@ > if (groupMembers.contains(member)) { > return true; > } else { > - Vector alreadySeen = new Vector<>(10); > + Vector alreadySeen = new Vector(10); > return isMemberRecurse(member, alreadySeen); > } > } > --- openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java > @@ -96,7 +96,7 @@ > if (providerList.getProvider(p.getName()) != null) { > return providerList; > } > - List list = new ArrayList<> > + List list = new ArrayList > (Arrays.asList(providerList.configs)); > int n = list.size(); > if ((position < 0) || (position > n)) { > @@ -160,7 +160,7 @@ > * Return a new ProviderList parsed from the java.security Properties. > */ > private ProviderList() { > - List configList = new ArrayList<>(); > + List configList = new ArrayList(); > for (int i = 1; true; i++) { > String entry = Security.getProperty("security.provider." + i); > if (entry == null) { > @@ -200,7 +200,7 @@ > * possible recursion and deadlock during verification. > */ > ProviderList getJarList(String[] jarClassNames) { > - List newConfigs = new ArrayList<>(); > + List newConfigs = new ArrayList(); > for (String className : jarClassNames) { > ProviderConfig newConfig = new ProviderConfig(className); > for (ProviderConfig config : configs) { > @@ -356,7 +356,7 @@ > */ > @Deprecated > public List getServices(String type, List algorithms) { > - List ids = new ArrayList<>(); > + List ids = new ArrayList(); > for (String alg : algorithms) { > ids.add(new ServiceId(type, alg)); > } > --- openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java > @@ -40,7 +40,7 @@ > public class Providers { > > private static final ThreadLocal threadLists = > - new InheritableThreadLocal<>(); > + new InheritableThreadLocal(); > > // number of threads currently using thread-local provider lists > // tracked to allow an optimization if == 0 > --- openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java > @@ -267,7 +267,7 @@ > if (ktabs.isEmpty()) { > return kk.toArray(new KerberosKey[kk.size()]); > } else { > - List keys = new ArrayList<>(); > + List keys = new ArrayList(); > for (KeyTab ktab: ktabs) { > for (KerberosKey k: ktab.getKeys(kp)) { > keys.add(k); > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java > @@ -527,7 +527,7 @@ > } > }))); > String Line; > - Vector v = new Vector<>(); > + Vector v = new Vector(); > String previous = null; > while ((Line = br.readLine()) != null) { > // ignore comments and blank line in the configuration file. > @@ -588,7 +588,7 @@ > throw new KrbException("I/O error while reading" + > " configuration file."); > } > - Hashtable table = new Hashtable<>(); > + Hashtable table = new Hashtable(); > for (int i = 0; i < v.size(); i++) { > String line = v.elementAt(i).trim(); > if (line.equalsIgnoreCase("[realms]")) { > @@ -597,7 +597,7 @@ > if ((count == v.size()) || > (v.elementAt(count).startsWith("["))) { > Hashtable>> temp = > - new Hashtable<>(); > + new Hashtable>>(); > temp = parseRealmField(v, i + 1, count); > table.put("realms", temp); > i = count - 1; > @@ -610,7 +610,7 @@ > if ((count == v.size()) || > (v.elementAt(count).startsWith("["))) { > Hashtable>> temp = > - new Hashtable<>(); > + new Hashtable>>(); > temp = parseRealmField(v, i + 1, count); > table.put("capaths", temp); > i = count - 1; > @@ -728,7 +728,7 @@ > * Parses key-value pairs under a stanza name. > */ > private Hashtable parseField(Vector v, int start, int end) { > - Hashtable table = new Hashtable<>(); > + Hashtable table = new Hashtable(); > String line; > for (int i = start; i < end; i++) { > line = v.elementAt(i); > @@ -750,7 +750,7 @@ > * information for the realm given within a pair of braces. > */ > private Hashtable>> parseRealmField(Vector v, int start, int end) { > - Hashtable>> table = new Hashtable<>(); > + Hashtable>> table = new Hashtable>>(); > String line; > for (int i = start; i < end; i++) { > line = v.elementAt(i).trim(); > @@ -790,9 +790,9 @@ > * Parses key-value pairs within each braces under [realms]. > */ > private Hashtable> parseRealmFieldEx(Vector v, int start, int end) { > - Hashtable> table = new Hashtable<>(); > - Vector keyVector = new Vector<>(); > - Vector nameVector = new Vector<>(); > + Hashtable> table = new Hashtable>(); > + Vector keyVector = new Vector(); > + Vector nameVector = new Vector(); > String line = ""; > String key; > for (int i = start; i < end; i++) { > @@ -897,7 +897,7 @@ > } > st = new StringTokenizer(default_enctypes, delim); > int len = st.countTokens(); > - ArrayList ls = new ArrayList<>(len); > + ArrayList ls = new ArrayList(len); > int type; > for (int i = 0; i < len; i++) { > type = getType(st.nextToken()); > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java > @@ -462,7 +462,7 @@ > */ > static class KdcAccessibility { > // Known bad KDCs > - private static Set bads = new HashSet<>(); > + private static Set bads = new HashSet(); > > private static synchronized void addBad(String kdc) { > if (DEBUG) { > @@ -492,9 +492,9 @@ > // Returns a preferred KDC list by putting the bad ones at the end > private static synchronized String[] list(String kdcList) { > StringTokenizer st = new StringTokenizer(kdcList); > - List list = new ArrayList<>(); > + List list = new ArrayList(); > if (badPolicy == BpType.TRY_LAST) { > - List badkdcs = new ArrayList<>(); > + List badkdcs = new ArrayList(); > while (st.hasMoreTokens()) { > String t = st.nextToken(); > if (bads.contains(t)) badkdcs.add(t); > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java > @@ -238,7 +238,7 @@ > if (subDer.getTag() != DerValue.tag_SequenceOf) { > throw new Asn1Exception(Krb5.ASN1_BAD_ID); > } > - Vector v = new Vector<>(); > + Vector v = new Vector(); > DerValue subSubDer; > while(subDer.getData().available() > 0) { > subSubDer = subDer.getData().getDerValue(); > @@ -293,7 +293,7 @@ > // Code repetition, realm parsed again by class Realm > protected static String[] parseName(String name) { > > - Vector tempStrings = new Vector<>(); > + Vector tempStrings = new Vector(); > String temp = name; > int i = 0; > int componentStart = 0; > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java > @@ -359,14 +359,14 @@ > } > > String tempTarget = null, tempRealm = null; > - Stack iStack = new Stack<>(); > + Stack iStack = new Stack(); > > /* > * The half-established reversed-path, starting from the final target > * (sRealm), each item can be connected to by the next one. > * Might contains wrong item, if found, a bad track is performed > */ > - Vector tempList = new Vector<>(8, 8); > + Vector tempList = new Vector(8, 8); > tempList.add(sRealm); > > int count = 0; // For debug only > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java > @@ -176,7 +176,7 @@ > * @exception IOException if an I/O error occurs while reading encoded data. > */ > public byte[] asn1Encode() throws Asn1Exception, IOException { > - Vector v = new Vector<>(); > + Vector v = new Vector(); > DerOutputStream temp = new DerOutputStream(); > temp.putInteger(BigInteger.valueOf(authenticator_vno)); > v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x00), temp.toByteArray())); > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java > @@ -99,7 +99,7 @@ > * @exception IOException if an I/O error occurs while reading encoded data. > */ > public AuthorizationData(DerValue der) throws Asn1Exception, IOException { > - Vector v = new Vector<>(); > + Vector v = new Vector(); > if (der.getTag() != DerValue.tag_Sequence) { > throw new Asn1Exception(Krb5.ASN1_BAD_ID); > } > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java > @@ -133,7 +133,7 @@ > * @exception IOException if an I/O error occurs while reading encoded data. > */ > public byte[] asn1Encode() throws Asn1Exception, IOException { > - Vector v = new Vector<>(); > + Vector v = new Vector(); > DerOutputStream temp = new DerOutputStream(); > v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, > true, (byte) 0x00), ctime.asn1Encode())); > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java > @@ -179,7 +179,7 @@ > */ > public HostAddresses(DerValue encoding) > throws Asn1Exception, IOException { > - Vector tempAddresses = new Vector<>(); > + Vector tempAddresses = new Vector(); > DerValue der = null; > while (encoding.getData().available() > 0) { > der = encoding.getData().getDerValue(); > @@ -265,7 +265,7 @@ > if (addresses == null || addresses.length == 0) > return null; > > - ArrayList ipAddrs = new ArrayList<>(addresses.length); > + ArrayList ipAddrs = new ArrayList(addresses.length); > > for (int i = 0; i < addresses.length; i++) { > try { > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java > @@ -150,7 +150,7 @@ > if (subsubDer.getTag() != DerValue.tag_SequenceOf) { > throw new Asn1Exception(Krb5.ASN1_BAD_ID); > } > - Vector v = new Vector<>(); > + Vector v = new Vector(); > while (subsubDer.getData().available() > 0) { > v.addElement(new PAData(subsubDer.getData().getDerValue())); > } > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java > @@ -158,7 +158,7 @@ > throw new Asn1Exception(Krb5.ASN1_BAD_ID); > } > der = encoding.getData().getDerValue(); > - Vector v = new Vector<>(); > + Vector v = new Vector(); > if ((der.getTag() & (byte)0x1F) == (byte)0x08) { > subDer = der.getData().getDerValue(); > > @@ -183,7 +183,7 @@ > encAuthorizationData = EncryptedData.parse(encoding.getData(), (byte)0x0A, true); > } > if (encoding.getData().available() > 0) { > - Vector tempTickets = new Vector<>(); > + Vector tempTickets = new Vector(); > der = encoding.getData().getDerValue(); > if ((der.getTag() & (byte)0x1F) == (byte)0x0B) { > subDer = der.getData().getDerValue(); > @@ -216,7 +216,7 @@ > * > */ > public byte[] asn1Encode(int msgType) throws Asn1Exception, IOException { > - Vector v = new Vector<>(); > + Vector v = new Vector(); > v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x00), kdcOptions.asn1Encode())); > if (msgType == Krb5.KRB_AS_REQ) { > if (cname != null) { > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java > @@ -134,7 +134,7 @@ > if (subsubDer.getTag() != DerValue.tag_SequenceOf) { > throw new Asn1Exception(Krb5.ASN1_BAD_ID); > } > - Vector v = new Vector<>(); > + Vector v = new Vector(); > while (subsubDer.getData().available() > 0) { > v.addElement(new Ticket(subsubDer.getData().getDerValue())); > } > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java > @@ -259,7 +259,7 @@ > private void parsePAData(byte[] data) > throws IOException, Asn1Exception { > DerValue derPA = new DerValue(data); > - List paList = new ArrayList<>(); > + List paList = new ArrayList(); > while (derPA.data.available() > 0) { > // read the PA-DATA > DerValue tmp = derPA.data.getDerValue(); > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java > @@ -157,7 +157,7 @@ > * @exception IOException if an I/O error occurs while reading encoded data. > */ > public byte[] asn1Encode() throws Asn1Exception, IOException { > - Vector v = new Vector<>(); > + Vector v = new Vector(); > v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x00), key.asn1Encode())); > if (prealm != null) > v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x01), prealm.asn1Encode())); > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java > @@ -77,7 +77,7 @@ > */ > > public LastReq(DerValue encoding) throws Asn1Exception, IOException { > - Vector v= new Vector<>(); > + Vector v= new Vector(); > if (encoding.getTag() != DerValue.tag_Sequence) { > throw new Asn1Exception(Krb5.ASN1_BAD_ID); > } > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java > @@ -490,7 +490,7 @@ > > private static String exec(String c) { > StringTokenizer st = new StringTokenizer(c); > - Vector v = new Vector<>(); > + Vector v = new Vector(); > while (st.hasMoreTokens()) { > v.addElement(st.nextToken()); > } > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java > @@ -257,7 +257,7 @@ > + configName); > } > > - List list = new ArrayList<>(answer.length); > + List list = new ArrayList(answer.length); > for (int i = 0; i < answer.length; i++) { > if (EncryptionKey.findKey(answer[i], keys) != null) { > list.add(answer[i]); > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java > @@ -67,7 +67,7 @@ > > // Attention: Currently there is no way to remove a keytab from this map, > // this might lead to a memory leak. > - private static Map map = new HashMap<>(); > + private static Map map = new HashMap(); > > // KeyTab file does not exist. Note: a missing keytab is still valid > private boolean isMissing = false; > @@ -79,7 +79,7 @@ > private long lastModified; > private int kt_vno; > > - private Vector entries = new Vector<>(); > + private Vector entries = new Vector(); > > /** > * Constructs a KeyTab object. > @@ -280,7 +280,7 @@ > KeyTabEntry entry; > EncryptionKey key; > int size = entries.size(); > - ArrayList keys = new ArrayList<>(size); > + ArrayList keys = new ArrayList(size); > for (int i = size-1; i >= 0; i--) { > entry = entries.elementAt(i); > if (entry.service.match(service)) { > @@ -482,7 +482,7 @@ > int count = 0; > > // Remember the highest KVNO for each etype. Used for kvno == -2 > - Map highest = new HashMap<>(); > + Map highest = new HashMap(); > > for (int i = entries.size()-1; i >= 0; i--) { > KeyTabEntry e = entries.get(i); > --- openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java > @@ -683,7 +683,7 @@ > // Read the certificate chain > int numOfCerts = dis.readInt(); > if (numOfCerts > 0) { > - List certs = new ArrayList<>( > + List certs = new ArrayList( > numOfCerts > 10 ? 10 : numOfCerts); > for (int j = 0; j < numOfCerts; j++) { > if (xVersion == 2) { > --- openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java > @@ -299,7 +299,7 @@ > private static final int DEFAULT_CACHE_SIZE = 1; > > // contains the policy grant entries, PD cache, and alias mapping > - private AtomicReference policyInfo = new AtomicReference<>(); > + private AtomicReference policyInfo = new AtomicReference(); > private boolean constructed = false; > > private boolean expandProperties = true; > @@ -1333,7 +1333,7 @@ > > List entryPs = entry.getPrincipals(); > if (debug != null) { > - ArrayList accPs = new ArrayList<>(); > + ArrayList accPs = new ArrayList(); > if (principals != null) { > for (int i = 0; i < principals.length; i++) { > accPs.add(new PolicyParser.PrincipalEntry > @@ -1414,7 +1414,7 @@ > // check if the PrincipalComparator > // implies the current thread's principals > > - Set pSet = new HashSet<>(principals.length); > + Set pSet = new HashSet(principals.length); > for (int j = 0; j < principals.length; j++) { > pSet.add(principals[j]); > } > @@ -1697,7 +1697,7 @@ > // build an info array for every principal > // in the current domain which has a principal class > // that is equal to policy entry principal class name > - List plist = new ArrayList<>(); > + List plist = new ArrayList(); > for (int i = 0; i < pdp.length; i++) { > if(pe.principalClass.equals(pdp[i].getClass().getName())) > plist.add(pdp[i]); > @@ -1767,7 +1767,7 @@ > // Done > return certs; > > - ArrayList userCertList = new ArrayList<>(); > + ArrayList userCertList = new ArrayList(); > i = 0; > while (i < certs.length) { > userCertList.add(certs[i]); > @@ -2246,7 +2246,7 @@ > if (this.certs == null) { > // extract the signer certs > ArrayList signerCerts = > - new ArrayList<>(); > + new ArrayList(); > i = 0; > while (i < certs.length) { > signerCerts.add(certs[i]); > --- openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java > @@ -55,7 +55,7 @@ > SunEntries.putEntries(this); > } else { > // use LinkedHashMap to preserve the order of the PRNGs > - Map map = new LinkedHashMap<>(); > + Map map = new LinkedHashMap(); > SunEntries.putEntries(map); > AccessController.doPrivileged(new PutAllAction(this, map)); > } > --- openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java > @@ -76,7 +76,7 @@ > SunRsaSignEntries.putEntries(this); > } else { > // use LinkedHashMap to preserve the order of the PRNGs > - Map map = new LinkedHashMap<>(); > + Map map = new LinkedHashMap(); > SunEntries.putEntries(map); > SunRsaSignEntries.putEntries(map); > AccessController.doPrivileged(new PutAllAction(this, map)); > --- openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java > @@ -409,10 +409,10 @@ > parseX509orPKCS7Cert(InputStream is) > throws CertificateException, IOException > { > - Collection coll = new ArrayList<>(); > + Collection coll = new ArrayList(); > byte[] data = readOneBlock(is); > if (data == null) { > - return new ArrayList<>(0); > + return new ArrayList(0); > } > try { > PKCS7 pkcs7 = new PKCS7(data); > @@ -422,7 +422,7 @@ > return Arrays.asList(certs); > } else { > // no crls provided > - return new ArrayList<>(0); > + return new ArrayList(0); > } > } catch (ParsingException e) { > while (data != null) { > @@ -442,10 +442,10 @@ > parseX509orPKCS7CRL(InputStream is) > throws CRLException, IOException > { > - Collection coll = new ArrayList<>(); > + Collection coll = new ArrayList(); > byte[] data = readOneBlock(is); > if (data == null) { > - return new ArrayList<>(0); > + return new ArrayList(0); > } > try { > PKCS7 pkcs7 = new PKCS7(data); > @@ -455,7 +455,7 @@ > return Arrays.asList(crls); > } else { > // no crls provided > - return new ArrayList<>(0); > + return new ArrayList(0); > } > } catch (ParsingException e) { > while (data != null) { > --- openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java > @@ -590,7 +590,7 @@ > // Except the performance improvement, another benefit is to break > // the dead loop while looking for the issuer back and forth > // between the delegated self-issued certificate and its issuer. > - Set newTrustAnchors = new HashSet<>(trustAnchors); > + Set newTrustAnchors = new HashSet(trustAnchors); > > if (prevKey != null) { > // Add the previous certificate as a trust anchor. > --- openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java > @@ -219,7 +219,7 @@ > // use a weak hashmap so that cached values are automatically cleared > // when the modulus is GC'ed > private final static Map blindingCache = > - new WeakHashMap<>(); > + new WeakHashMap(); > > /** > * Set of blinding parameters for a given RSA key. > --- openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java > @@ -52,7 +52,7 @@ > SunRsaSignEntries.putEntries(this); > } else { > // use LinkedHashMap to preserve the order of the PRNGs > - Map map = new HashMap<>(); > + Map map = new HashMap(); > SunRsaSignEntries.putEntries(map); > AccessController.doPrivileged(new PutAllAction(this, map)); > } > --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java > @@ -393,7 +393,7 @@ > > // Map BulkCipher -> Boolean(available) > private final static Map availableCache = > - new HashMap<>(8); > + new HashMap(8); > > // descriptive name including key size, e.g. AES/128 > final String description; > --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java > @@ -656,7 +656,7 @@ > if (certRequest != null) { > X509ExtendedKeyManager km = sslContext.getX509KeyManager(); > > - ArrayList keytypesTmp = new ArrayList<>(4); > + ArrayList keytypesTmp = new ArrayList(4); > > for (int i = 0; i < certRequest.types.length; i++) { > String typeName; > @@ -1175,7 +1175,7 @@ > "Can't reuse existing SSL client session"); > } > > - Collection cipherList = new ArrayList<>(2); > + Collection cipherList = new ArrayList(2); > cipherList.add(sessionSuite); > if (!secureRenegotiation && > cipherSuites.contains(CipherSuite.C_SCSV)) { > @@ -1193,7 +1193,7 @@ > // exclude SCSV for secure renegotiation > if (secureRenegotiation && cipherSuites.contains(CipherSuite.C_SCSV)) { > Collection cipherList = > - new ArrayList<>(cipherSuites.size() - 1); > + new ArrayList(cipherSuites.size() - 1); > for (CipherSuite suite : cipherSuites.collection()) { > if (suite != CipherSuite.C_SCSV) { > cipherList.add(suite); > --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java > @@ -258,7 +258,7 @@ > // add server_name extension > void addServerNameIndicationExtension(String hostname) { > // We would have checked that the hostname ia a FQDN. > - ArrayList hostnames = new ArrayList<>(1); > + ArrayList hostnames = new ArrayList(1); > hostnames.add(hostname); > > try { > @@ -434,7 +434,7 @@ > > CertificateMsg(HandshakeInStream input) throws IOException { > int chainLen = input.getInt24(); > - List v = new ArrayList<>(4); > + List v = new ArrayList(4); > > CertificateFactory cf = null; > while (chainLen > 0) { > @@ -1334,7 +1334,7 @@ > > // read the certificate_authorities > int len = input.getInt16(); > - ArrayList v = new ArrayList<>(); > + ArrayList v = new ArrayList(); > while (len >= 3) { > DistinguishedName dn = new DistinguishedName(input); > v.add(dn); > @@ -1725,7 +1725,7 @@ > // Note that this will prevent the Spi classes from being GC'd. We assume > // that is not a problem. > private final static Map methodCache = > - new ConcurrentHashMap<>(); > + new ConcurrentHashMap(); > > private static void digestKey(MessageDigest md, SecretKey key) { > try { > --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java > @@ -569,7 +569,7 @@ > activeProtocols = getActiveProtocols(); > } > > - ArrayList suites = new ArrayList<>(); > + ArrayList suites = new ArrayList(); > if (!(activeProtocols.collection().isEmpty()) && > activeProtocols.min.v != ProtocolVersion.NONE.v) { > for (CipherSuite suite : enabledCipherSuites.collection()) { > @@ -614,7 +614,7 @@ > */ > ProtocolList getActiveProtocols() { > if (activeProtocols == null) { > - ArrayList protocols = new ArrayList<>(4); > + ArrayList protocols = new ArrayList(4); > for (ProtocolVersion protocol : enabledProtocols.collection()) { > boolean found = false; > for (CipherSuite suite : enabledCipherSuites.collection()) { > --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java > @@ -169,7 +169,7 @@ > return name; > } > > - static List knownExtensions = new ArrayList<>(9); > + static List knownExtensions = new ArrayList(9); > > static ExtensionType get(int id) { > for (ExtensionType ext : knownExtensions) { > @@ -673,7 +673,7 @@ > } > > public String toString() { > - List list = new ArrayList<>(); > + List list = new ArrayList(); > for (byte format : formats) { > list.add(toString(format)); > } > --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java > @@ -79,7 +79,7 @@ > throw new IllegalArgumentException("Protocols may not be null"); > } > > - ArrayList versions = new ArrayList<>(3); > + ArrayList versions = new ArrayList(3); > for (int i = 0; i < names.length; i++ ) { > ProtocolVersion version = ProtocolVersion.valueOf(names[i]); > if (versions.contains(version) == false) { > --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java > @@ -261,7 +261,7 @@ > > protected Set decomposes(KeyExchange keyExchange, > boolean forCertPathOnly) { > - Set components = new HashSet<>(); > + Set components = new HashSet(); > switch (keyExchange) { > case K_NULL: > if (!forCertPathOnly) { > @@ -356,7 +356,7 @@ > } > > protected Set decomposes(BulkCipher bulkCipher) { > - Set components = new HashSet<>(); > + Set components = new HashSet(); > > if (bulkCipher.transformation != null) { > components.addAll(super.decomposes(bulkCipher.transformation)); > @@ -366,7 +366,7 @@ > } > > protected Set decomposes(MacAlg macAlg) { > - Set components = new HashSet<>(); > + Set components = new HashSet(); > > if (macAlg == CipherSuite.M_MD5) { > components.add("MD5"); > @@ -407,7 +407,7 @@ > } > > if (cipherSuite != null) { > - Set components = new HashSet<>(); > + Set components = new HashSet(); > > if(cipherSuite.keyExchange != null) { > components.addAll( > @@ -448,7 +448,7 @@ > } > > if (cipherSuite != null) { > - Set components = new HashSet<>(); > + Set components = new HashSet(); > > if(cipherSuite.keyExchange != null) { > components.addAll( > --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java > @@ -325,7 +325,7 @@ > Collection allowedCipherSuites = > CipherSuite.allowedCipherSuites(); > > - ArrayList suites = new ArrayList<>(); > + ArrayList suites = new ArrayList(); > if (!(protocols.collection().isEmpty()) && > protocols.min.v != ProtocolVersion.NONE.v) { > for (CipherSuite suite : allowedCipherSuites) { > @@ -532,7 +532,7 @@ > return defaultKeyManagers; > } > > - final Map props = new HashMap<>(); > + final Map props = new HashMap(); > AccessController.doPrivileged( > new PrivilegedExceptionAction() { > public Object run() throws Exception { > --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java > @@ -618,7 +618,7 @@ > * key and the calling security context. This is important since > * sessions can be shared across different protection domains. > */ > - private Hashtable table = new Hashtable<>(); > + private Hashtable table = new Hashtable(); > > /** > * Assigns a session value. Session change events are given if > @@ -686,7 +686,7 @@ > */ > public String[] getValueNames() { > Enumeration e; > - Vector v = new Vector<>(); > + Vector v = new Vector(); > SecureKey key; > Object securityCtx = SecureKey.getCurrentSecurityContext(); > > --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java > @@ -2478,7 +2478,7 @@ > entrySet, HandshakeCompletedEvent e) { > > super("HandshakeCompletedNotify-Thread"); > - targets = new HashSet<>(entrySet); // clone the entry set > + targets = new HashSet(entrySet); // clone the entry set > event = e; > } > > --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java > @@ -153,7 +153,7 @@ > static Collection > getSupportedAlgorithms(AlgorithmConstraints constraints) { > > - Collection supported = new ArrayList<>(); > + Collection supported = new ArrayList(); > synchronized (priorityMap) { > for (SignatureAndHashAlgorithm sigAlg : priorityMap.values()) { > if (sigAlg.priority <= SUPPORTED_ALG_PRIORITY_MAX_NUM && > @@ -170,7 +170,7 @@ > // Get supported algorithm collection from an untrusted collection > static Collection getSupportedAlgorithms( > Collection algorithms ) { > - Collection supported = new ArrayList<>(); > + Collection supported = new ArrayList(); > for (SignatureAndHashAlgorithm sigAlg : algorithms) { > if (sigAlg.priority <= SUPPORTED_ALG_PRIORITY_MAX_NUM) { > supported.add(sigAlg); > @@ -182,7 +182,7 @@ > > static String[] getAlgorithmNames( > Collection algorithms) { > - ArrayList algorithmNames = new ArrayList<>(); > + ArrayList algorithmNames = new ArrayList(); > if (algorithms != null) { > for (SignatureAndHashAlgorithm sigAlg : algorithms) { > algorithmNames.add(sigAlg.algorithm); > @@ -195,7 +195,7 @@ > > static Set getHashAlgorithmNames( > Collection algorithms) { > - Set algorithmNames = new HashSet<>(); > + Set algorithmNames = new HashSet(); > if (algorithms != null) { > for (SignatureAndHashAlgorithm sigAlg : algorithms) { > if (sigAlg.hash.value > 0) { > --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java > @@ -337,7 +337,7 @@ > > X500Principal[] x500Issuers = (X500Principal[])issuers; > // the algorithm below does not produce duplicates, so avoid Set > - List aliases = new ArrayList<>(); > + List aliases = new ArrayList(); > > for (Map.Entry entry : > credentialsMap.entrySet()) { > @@ -397,7 +397,7 @@ > * possible. Principals that cannot be converted are ignored. > */ > private static X500Principal[] convertPrincipals(Principal[] principals) { > - List list = new ArrayList<>(principals.length); > + List list = new ArrayList(principals.length); > for (int i = 0; i < principals.length; i++) { > Principal p = principals[i]; > if (p instanceof X500Principal) { > --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java > @@ -134,7 +134,7 @@ > FileInputStream fis = null; > String defaultTrustStoreType; > String defaultTrustStoreProvider; > - final HashMap props = new HashMap<>(); > + final HashMap props = new HashMap(); > final String sep = File.separator; > KeyStore ks = null; > > --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java > @@ -307,7 +307,7 @@ > (keyTypes.length == 0) || (keyTypes[0] == null)) { > return null; > } > - List list = new ArrayList<>(keyTypes.length); > + List list = new ArrayList(keyTypes.length); > for (String keyType : keyTypes) { > list.add(new KeyType(keyType)); > } > @@ -429,7 +429,7 @@ > // make a Set out of the array > private Set getIssuerSet(Principal[] issuers) { > if ((issuers != null) && (issuers.length != 0)) { > - return new HashSet<>(Arrays.asList(issuers)); > + return new HashSet(Arrays.asList(issuers)); > } else { > return null; > } > --- openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java > @@ -123,14 +123,14 @@ > boolean token = false; // token-based keystore > String jarfile; // jar files to sign or verify > String alias; // alias to sign jar with > - List ckaliases = new ArrayList<>(); // aliases in -verify > + List ckaliases = new ArrayList(); // aliases in -verify > char[] storepass; // keystore password > boolean protectedPath; // protected authentication path > String storetype; // keystore type > String providerName; // provider name > Vector providers = null; // list of providers > // arguments for provider constructors > - HashMap providerArgs = new HashMap<>(); > + HashMap providerArgs = new HashMap(); > char[] keypass; // private key password > String sigfile; // name of .SF file > String sigalg; // name of signature algorithm > @@ -567,7 +567,7 @@ > > try { > jf = new JarFile(jarName, true); > - Vector entriesVec = new Vector<>(); > + Vector entriesVec = new Vector(); > byte[] buffer = new byte[8192]; > > Enumeration entries = jf.entries(); > @@ -594,7 +594,7 @@ > // The map to record display info, only used when -verbose provided > // key: signer info string > // value: the list of files with common key > - Map> output = new LinkedHashMap<>(); > + Map> output = new LinkedHashMap>(); > > if (man != null) { > if (verbose != null) System.out.println(); > @@ -946,7 +946,7 @@ > .append(signTimeForm.format(source)).append("]").toString(); > } > > - private Map cacheForInKS = new IdentityHashMap<>(); > + private Map cacheForInKS = new IdentityHashMap(); > > private int inKeyStoreForOneSigner(CodeSigner signer) { > if (cacheForInKS.containsKey(signer)) { > @@ -989,7 +989,7 @@ > return result; > } > > - Hashtable storeHash = new Hashtable<>(); > + Hashtable storeHash = new Hashtable(); > > int inKeyStore(CodeSigner[] signers) { > > @@ -1119,7 +1119,7 @@ > * generated one. (This may invalidate existing signatures!) > */ > BASE64Encoder encoder = new JarBASE64Encoder(); > - Vector mfFiles = new Vector<>(); > + Vector mfFiles = new Vector(); > > boolean wasSigned = false; > > @@ -1476,7 +1476,7 @@ > return false; > } > > - Map cacheForSignerInfo = new IdentityHashMap<>(); > + Map cacheForSignerInfo = new IdentityHashMap(); > > /** > * Returns a string of singer info, with a newline at the end > @@ -1600,7 +1600,7 @@ > } > } > } > - Set tas = new HashSet<>(); > + Set tas = new HashSet(); > try { > KeyStore caks = KeyTool.getCacertsKeyStore(); > if (caks != null) { > --- openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java > @@ -152,11 +152,11 @@ > private KeyStore caks = null; // "cacerts" keystore > private char[] srcstorePass = null; > private String srcstoretype = null; > - private Set passwords = new HashSet<>(); > + private Set passwords = new HashSet(); > private String startDate = null; > > - private List ids = new ArrayList<>(); // used in GENCRL > - private List v3ext = new ArrayList<>(); > + private List ids = new ArrayList(); // used in GENCRL > + private List v3ext = new ArrayList(); > > enum Command { > CERTREQ("Generates.a.certificate.request", > @@ -2089,7 +2089,7 @@ > */ > public static List readCRLsFromCert(X509Certificate cert) > throws Exception { > - List crls = new ArrayList<>(); > + List crls = new ArrayList(); > CRLDistributionPointsExtension ext = > X509CertImpl.toImpl(cert).getCRLDistributionPointsExtension(); > if (ext == null) return crls; > @@ -2256,7 +2256,7 @@ > if (jarfile != null) { > JarFile jf = new JarFile(jarfile, true); > Enumeration entries = jf.entries(); > - Set ss = new HashSet<>(); > + Set ss = new HashSet(); > byte[] buffer = new byte[8192]; > int pos = 0; > while (entries.hasMoreElements()) { > @@ -3331,7 +3331,7 @@ > } > > // start building chain > - Vector chain = new Vector<>(2); > + Vector chain = new Vector(2); > if (buildChain((X509Certificate)certToVerify, chain, certs)) { > Certificate[] newChain = new Certificate[chain.size()]; > // buildChain() returns chain with self-signed root-cert first and > @@ -3857,7 +3857,7 @@ > break; > case 2: // EKU > if(value != null) { > - Vector v = new Vector<>(); > + Vector v = new Vector(); > for (String s: value.split(",")) { > int p = oneOf(s, > "anyExtendedKeyUsage", > @@ -3927,7 +3927,7 @@ > } > if(value != null) { > List accessDescriptions = > - new ArrayList<>(); > + new ArrayList(); > String[] ps = value.split(","); > for(String item: ps) { > colonpos = item.indexOf(':'); > @@ -4211,7 +4211,7 @@ > } > > public static Pair of(A a, B b) { > - return new Pair<>(a,b); > + return new Pair(a,b); > } > } > > --- openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java > @@ -643,7 +643,7 @@ > Class pc = Class.forName(type, true, > Thread.currentThread().getContextClassLoader()); > Constructor c = null; > - Vector objects = new Vector<>(2); > + Vector objects = new Vector(2); > if (name != null) objects.add(name); > if (actions != null) objects.add(actions); > switch (objects.size()) { > @@ -1722,7 +1722,7 @@ > new PolicyParser.GrantEntry(signedby, codebase); > > // get the new Principals > - LinkedList prins = new LinkedList<>(); > + LinkedList prins = new LinkedList(); > TaggedList prinList = (TaggedList)getComponent(PE_PRIN_LIST); > for (int i = 0; i < prinList.getItemCount(); i++) { > prins.add((PolicyParser.PrincipalEntry)prinList.getObject(i)); > @@ -1730,7 +1730,7 @@ > ge.principals = prins; > > // get the new Permissions > - Vector perms = new Vector<>(); > + Vector perms = new Vector(); > TaggedList permList = (TaggedList)getComponent(PE_PERM_LIST); > for (int i = 0; i < permList.getItemCount(); i++) { > perms.addElement((PolicyParser.PermissionEntry)permList.getObject(i)); > @@ -3647,7 +3647,7 @@ > * This is a java.awt.List that bind an Object to each String it holds. > */ > class TaggedList extends List { > - private java.util.List data = new LinkedList<>(); > + private java.util.List data = new LinkedList(); > public TaggedList(int i, boolean b) { > super(i, b); > } > --- openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java > @@ -94,7 +94,7 @@ > * Run the converter > */ > public synchronized boolean convert(String argv[]){ > - List v = new ArrayList<>(2); > + List v = new ArrayList(2); > File outputFile = null; > boolean createOutputFile = false; > > --- openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java > @@ -113,7 +113,7 @@ > } > // Use case insensitive string to prevent duplication > if (uattributes == null) { > - uattributes = new HashSet<>(4); > + uattributes = new HashSet(4); > } > uattributes.add(new CaseInsensitiveString(attribute)); > return this; > @@ -157,7 +157,7 @@ > } > } > if (ukeywords == null) { > - ukeywords = new HashMap<>(4); > + ukeywords = new HashMap(4); > } > ukeywords.put(cikey, type); > } > @@ -211,7 +211,7 @@ > setUnicodeLocaleExtension(val); > } else { > if (extensions == null) { > - extensions = new HashMap<>(4); > + extensions = new HashMap(4); > } > extensions.put(key, val); > } > @@ -262,7 +262,7 @@ > } > > if (extensions == null) { > - extensions = new ArrayList<>(4); > + extensions = new ArrayList(4); > } > extensions.add(sb.toString()); > } else { > @@ -313,7 +313,7 @@ > clearExtensions(); > > if (!LocaleUtils.isEmpty(bcpExtensions)) { > - Set done = new HashSet<>(bcpExtensions.size()); > + Set done = new HashSet(bcpExtensions.size()); > for (String bcpExt : bcpExtensions) { > CaseInsensitiveChar key = new CaseInsensitiveChar(bcpExt); > // ignore duplicates > @@ -323,7 +323,7 @@ > setUnicodeLocaleExtension(bcpExt.substring(2)); > } else { > if (extensions == null) { > - extensions = new HashMap<>(4); > + extensions = new HashMap(4); > } > extensions.put(key, bcpExt.substring(2)); > } > @@ -334,7 +334,7 @@ > if (privateuse != null && privateuse.length() > 0) { > // privateuse string contains prefix, e.g. "x-abc-def" > if (extensions == null) { > - extensions = new HashMap<>(1); > + extensions = new HashMap(1); > } > extensions.put(new CaseInsensitiveChar(privateuse), privateuse.substring(2)); > } > @@ -442,19 +442,19 @@ > UnicodeLocaleExtension ue = (UnicodeLocaleExtension)e; > for (String uatr : ue.getUnicodeLocaleAttributes()) { > if (uattributes == null) { > - uattributes = new HashSet<>(4); > + uattributes = new HashSet(4); > } > uattributes.add(new CaseInsensitiveString(uatr)); > } > for (String ukey : ue.getUnicodeLocaleKeys()) { > if (ukeywords == null) { > - ukeywords = new HashMap<>(4); > + ukeywords = new HashMap(4); > } > ukeywords.put(new CaseInsensitiveString(ukey), ue.getUnicodeLocaleType(ukey)); > } > } else { > if (extensions == null) { > - extensions = new HashMap<>(4); > + extensions = new HashMap(4); > } > extensions.put(new CaseInsensitiveChar(key), e.getValue()); > } > @@ -604,7 +604,7 @@ > break; > } > if (uattributes == null) { > - uattributes = new HashSet<>(4); > + uattributes = new HashSet(4); > } > uattributes.add(new CaseInsensitiveString(itr.current())); > itr.next(); > @@ -622,7 +622,7 @@ > assert(typeStart == -1 || typeEnd != -1); > type = (typeStart == -1) ? "" : subtags.substring(typeStart, typeEnd); > if (ukeywords == null) { > - ukeywords = new HashMap<>(4); > + ukeywords = new HashMap(4); > } > ukeywords.put(key, type); > > @@ -652,7 +652,7 @@ > assert(typeStart == -1 || typeEnd != -1); > type = (typeStart == -1) ? "" : subtags.substring(typeStart, typeEnd); > if (ukeywords == null) { > - ukeywords = new HashMap<>(4); > + ukeywords = new HashMap(4); > } > ukeywords.put(key, type); > } > --- openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java > @@ -62,7 +62,7 @@ > // Map contains grandfathered tags and its preferred mappings from > // http://www.ietf.org/rfc/rfc5646.txt > // Keys are lower-case strings. > - private static final Map GRANDFATHERED = new HashMap<>(); > + private static final Map GRANDFATHERED = new HashMap(); > > static { > // grandfathered = irregular ; non-redundant tags registered > @@ -257,7 +257,7 @@ > } > found = true; > if (extlangs.isEmpty()) { > - extlangs = new ArrayList<>(3); > + extlangs = new ArrayList(3); > } > extlangs.add(s); > sts.parseLength = itr.currentEnd(); > @@ -322,7 +322,7 @@ > } > found = true; > if (variants.isEmpty()) { > - variants = new ArrayList<>(3); > + variants = new ArrayList(3); > } > variants.add(s); > sts.parseLength = itr.currentEnd(); > @@ -365,7 +365,7 @@ > } > > if (extensions.isEmpty()) { > - extensions = new ArrayList<>(4); > + extensions = new ArrayList(4); > } > extensions.add(sb.toString()); > found = true; > @@ -462,7 +462,7 @@ > break; > } > if (variants == null) { > - variants = new ArrayList<>(); > + variants = new ArrayList(); > } > variants.add(var); // Do not canonicalize! > varitr.next(); > @@ -503,7 +503,7 @@ > privateuse = ext.getValue(); > } else { > if (extensions == null) { > - extensions = new ArrayList<>(); > + extensions = new ArrayList(); > } > extensions.add(locextKey.toString() + SEP + ext.getValue()); > } > --- openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java > @@ -81,7 +81,7 @@ > } > > // Build extension map > - SortedMap map = new TreeMap<>(); > + SortedMap map = new TreeMap(); > if (hasExtension) { > for (Entry ext : extensions.entrySet()) { > char key = LocaleUtils.toLower(ext.getKey().value()); > @@ -104,14 +104,14 @@ > SortedMap ukmap = null; > > if (hasUAttributes) { > - uaset = new TreeSet<>(); > + uaset = new TreeSet(); > for (CaseInsensitiveString cis : uattributes) { > uaset.add(LocaleUtils.toLowerString(cis.value())); > } > } > > if (hasUKeywords) { > - ukmap = new TreeMap<>(); > + ukmap = new TreeMap(); > for (Entry kwd : ukeywords.entrySet()) { > String key = LocaleUtils.toLowerString(kwd.getKey().value()); > String type = LocaleUtils.toLowerString(kwd.getValue()); > --- openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java > @@ -38,14 +38,14 @@ > > public abstract class LocaleObjectCache { > private ConcurrentMap> map; > - private ReferenceQueue queue = new ReferenceQueue<>(); > + private ReferenceQueue queue = new ReferenceQueue(); > > public LocaleObjectCache() { > this(16, 0.75f, 16); > } > > public LocaleObjectCache(int initialCapacity, float loadFactor, int concurrencyLevel) { > - map = new ConcurrentHashMap<>(initialCapacity, loadFactor, concurrencyLevel); > + map = new ConcurrentHashMap>(initialCapacity, loadFactor, concurrencyLevel); > } > > public V get(K key) { > @@ -64,7 +64,7 @@ > return null; > } > > - CacheEntry newEntry = new CacheEntry<>(key, newVal, queue); > + CacheEntry newEntry = new CacheEntry(key, newVal, queue); > > while (value == null) { > cleanStaleEntries(); > @@ -81,7 +81,7 @@ > } > > protected V put(K key, V value) { > - CacheEntry entry = new CacheEntry<>(key, value, queue); > + CacheEntry entry = new CacheEntry(key, value, queue); > CacheEntry oldEntry = map.put(key, entry); > return (oldEntry == null) ? null : oldEntry.get(); > } > --- openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java > @@ -113,7 +113,7 @@ > > // Table of known loggers. Maps names to PlatformLoggers. > private static Map> loggers = > - new HashMap<>(); > + new HashMap>(); > > /** > * Returns a PlatformLogger of a given name. > @@ -126,7 +126,7 @@ > } > if (log == null) { > log = new PlatformLogger(name); > - loggers.put(name, new WeakReference<>(log)); > + loggers.put(name, new WeakReference(log)); > } > return log; > } > @@ -469,7 +469,7 @@ > */ > static class JavaLogger extends LoggerProxy { > private static final Map levelObjects = > - new HashMap<>(); > + new HashMap(); > > static { > if (LoggingSupport.isAvailable()) { > --- openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java.orig > +++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java > @@ -160,7 +160,7 @@ > } > > Action action = Action.valueOf(args[0]); > - Map env = env = new HashMap<>(); > + Map env = env = new HashMap(); > if (action == Action.create) > env.put("create", "true"); > try (FileSystem fs = provider.newFileSystem(Paths.get(args[1]), env)) { > @@ -656,9 +656,9 @@ > > private static void fchCopy(Path src, Path dst) throws IOException > { > - Set read = new HashSet<>(); > + Set read = new HashSet(); > read.add(READ); > - Set openwrite = new HashSet<>(); > + Set openwrite = new HashSet(); > openwrite.add(CREATE_NEW); > openwrite.add(WRITE); > > @@ -676,9 +676,9 @@ > > private static void chCopy(Path src, Path dst) throws IOException > { > - Set read = new HashSet<>(); > + Set read = new HashSet(); > read.add(READ); > - Set openwrite = new HashSet<>(); > + Set openwrite = new HashSet(); > openwrite.add(CREATE_NEW); > openwrite.add(WRITE); > > --- openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java.orig > +++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java > @@ -142,8 +142,8 @@ > return new ZipCoder(Charset.defaultCharset()); > } > > - private final ThreadLocal decTL = new ThreadLocal<>(); > - private final ThreadLocal encTL = new ThreadLocal<>(); > + private final ThreadLocal decTL = new ThreadLocal(); > + private final ThreadLocal encTL = new ThreadLocal();r > > private CharsetDecoder decoder() { > CharsetDecoder dec = decTL.get(); > --- openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java.orig > +++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java > @@ -134,7 +134,7 @@ > throws IOException > { > ZipFileAttributes zfas = readAttributes(); > - LinkedHashMap map = new LinkedHashMap<>(); > + LinkedHashMap map = new LinkedHashMap(); > if ("*".equals(attributes)) { > for (AttrID id : AttrID.values()) { > try { > --- openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java.orig > +++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java > @@ -157,7 +157,7 @@ > > @Override > public Iterable getRootDirectories() { > - ArrayList pathArr = new ArrayList<>(); > + ArrayList pathArr = new ArrayList(); > pathArr.add(new ZipPath(this, new byte[]{'/'})); > return pathArr; > } > @@ -202,7 +202,7 @@ > > @Override > public Iterable getFileStores() { > - ArrayList list = new ArrayList<>(1); > + ArrayList list = new ArrayList(1); > list.add(new ZipFileStore(new ZipPath(this, new byte[]{'/'}))); > return list; > } > @@ -268,7 +268,7 @@ > endWrite(); > } > if (!streams.isEmpty()) { // unlock and close all remaining streams > - Set copy = new HashSet<>(streams); > + Set copy = new HashSet(streams); > for (InputStream is: copy) > is.close(); > } > @@ -396,7 +396,7 @@ > IndexNode inode = getInode(path); > if (inode == null) > throw new NotDirectoryException(getString(path)); > - List list = new ArrayList<>(); > + List list = new ArrayList(); > IndexNode child = inode.child; > while (child != null) { > ZipPath zp = toZipPath(child.name); > @@ -825,7 +825,7 @@ > > // the ex-channel and ex-path that need to close when their outstanding > // input streams are all closed by the obtainers. > - private Set exChClosers = new HashSet<>(); > + private Set exChClosers = new HashSet(); > > private Set tmppaths = Collections.synchronizedSet(new HashSet()); > private Path getTempPathForEntry(byte[] path) throws IOException { > @@ -1022,7 +1022,7 @@ > private byte[] initCEN() throws IOException { > end = findEND(); > if (end.endpos == 0) { > - inodes = new LinkedHashMap<>(10); > + inodes = new LinkedHashMap(10); > locpos = 0; > buildNodeTree(); > return null; // only END header present > @@ -1043,7 +1043,7 @@ > zerror("read CEN tables failed"); > } > // Iterate through the entries in the central directory > - inodes = new LinkedHashMap<>(end.centot + 1); > + inodes = new LinkedHashMap(end.centot + 1); > int pos = 0; > int limit = cen.length - ENDHDR; > while (pos < limit) { > @@ -1190,7 +1190,7 @@ > Path tmpFile = createTempFileInSameDirectoryAs(zfpath); > try (OutputStream os = new BufferedOutputStream(Files.newOutputStream(tmpFile, WRITE))) > { > - ArrayList elist = new ArrayList<>(inodes.size()); > + ArrayList elist = new ArrayList(inodes.size()); > long written = 0; > byte[] buf = new byte[8192]; > Entry e = null; > @@ -1601,7 +1601,7 @@ > // Maxmum number of de/inflater we cache > private final int MAX_FLATER = 20; > // List of available Inflater objects for decompression > - private final List inflaters = new ArrayList<>(); > + private final List inflaters = new ArrayList(); > > // Gets an inflater from the list of available inflaters or allocates > // a new one. > @@ -1630,7 +1630,7 @@ > } > > // List of available Deflater objects for compression > - private final List deflaters = new ArrayList<>(); > + private final List deflaters = new ArrayList(); > > // Gets an deflater from the list of available deflaters or allocates > // a new one. > @@ -2340,7 +2340,7 @@ > private void buildNodeTree() throws IOException { > beginWrite(); > try { > - HashSet dirs = new HashSet<>(); > + HashSet dirs = new HashSet(); > IndexNode root = new IndexNode(ROOTPATH, -1); > inodes.put(root, root); > dirs.add(root); > --- openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java.orig > +++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java > @@ -62,7 +62,7 @@ > public class ZipFileSystemProvider extends FileSystemProvider { > > > - private final Map filesystems = new HashMap<>(); > + private final Map filesystems = new HashMap(); > > public ZipFileSystemProvider() {} > > --- openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java.orig > +++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java > @@ -68,7 +68,7 @@ > // We cache the C environment. This means that subsequent calls > // to putenv/setenv from C will not be visible from Java code. > byte[][] environ = environ(); > - theEnvironment = new HashMap<>(environ.length/2 + 3); > + theEnvironment = new HashMap(environ.length/2 + 3); > // Read environment variables back to front, > // so that earlier variables override later ones. > for (int i = environ.length-1; i > 0; i-=2) > --- openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java.orig > +++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java > @@ -354,7 +354,7 @@ > * log against that map. The resulting map is then written back > * to the disk. > */ > - final List changeLog = new ArrayList<>(); > + final List changeLog = new ArrayList(); > > /** > * Represents a change to a preference. > @@ -507,7 +507,7 @@ > }); > if (newNode) { > // These 2 things guarantee node will get wrtten at next flush/sync > - prefsCache = new TreeMap<>(); > + prefsCache = new TreeMap(); > nodeCreate = new NodeCreate(); > changeLog.add(nodeCreate); > } > @@ -550,7 +550,7 @@ > loadCache(); > } catch(Exception e) { > // assert lastSyncTime == 0; > - prefsCache = new TreeMap<>(); > + prefsCache = new TreeMap(); > } > } > > @@ -567,7 +567,7 @@ > AccessController.doPrivileged( > new PrivilegedExceptionAction() { > public Void run() throws BackingStoreException { > - Map m = new TreeMap<>(); > + Map m = new TreeMap(); > long newLastSyncTime = 0; > FileInputStream fis = null; > try { > @@ -581,7 +581,7 @@ > prefsFile.renameTo( new File( > prefsFile.getParentFile(), > "IncorrectFormatPrefs.xml")); > - m = new TreeMap<>(); > + m = new TreeMap(); > } else if (e instanceof FileNotFoundException) { > getLogger().warning("Prefs file removed in background " > + prefsFile.getPath()); > @@ -662,7 +662,7 @@ > return AccessController.doPrivileged( > new PrivilegedAction() { > public String[] run() { > - List result = new ArrayList<>(); > + List result = new ArrayList(); > File[] dirContents = dir.listFiles(); > if (dirContents != null) { > for (int i = 0; i < dirContents.length; i++) > @@ -810,7 +810,7 @@ > } else if (lastSyncTime != 0 && !dir.exists()) { > // This node was removed in the background. Playback any changes > // against a virgin (empty) Map. > - prefsCache = new TreeMap<>(); > + prefsCache = new TreeMap(); > replayChanges(); > } > if (!changeLog.isEmpty()) { > --- openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java.orig > +++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java > @@ -60,7 +60,7 @@ > int maxperkeyword, > int maxkeywords) > { > - LinkedList ll = new LinkedList<>(); > + LinkedList ll = new LinkedList(); > > try { > BufferedReader in = > @@ -200,7 +200,7 @@ > // no local domain so try fallback (RPC) domain or > // hostname > > - sl = new LinkedList<>(); > + sl = new LinkedList(); > String domain = fallbackDomain0(); > if (domain != null && domain.length() > 0) { > sl.add(domain); > --- openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java.orig > +++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java > @@ -153,12 +153,12 @@ > > static { > HashMap tSequenceToEncodingMap = > - new HashMap<>(33, 1.0f); > + new HashMap(33, 1.0f); > HashMap tHighBitsMap = > - new HashMap<>(31, 1.0f); > + new HashMap(31, 1.0f); > HashMap tEncodingToSequenceMap = > - new HashMap<>(21, 1.0f); > - ArrayList tEncodings = new ArrayList<>(21); > + new HashMap(21, 1.0f); > + ArrayList tEncodings = new ArrayList(21); > > if (!(isEncodingSupported("US-ASCII") && > isEncodingSupported("ISO-8859-1"))) > --- openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java.orig > +++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java > @@ -53,7 +53,7 @@ > static final Set supportedFileAttributeViews = > supportedFileAttributeViews(); > private static Set supportedFileAttributeViews() { > - Set result = new HashSet<>(); > + Set result = new HashSet(); > result.addAll(standardFileAttributeViews()); > // additional Linux-specific views > result.add("dos"); > @@ -76,7 +76,7 @@ > * Returns object to iterate over the mount entries in the given fstab file. > */ > Iterable getMountEntries(String fstab) { > - ArrayList entries = new ArrayList<>(); > + ArrayList entries = new ArrayList(); > try { > long fp = setmntent(fstab.getBytes(), "r".getBytes()); > try { > --- openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java.orig > +++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java > @@ -63,7 +63,7 @@ > > // Parses buffer as array of NULL-terminated C strings. > private List asList(long address, int size) { > - List list = new ArrayList<>(); > + List list = new ArrayList(); > int start = 0; > int pos = 0; > while (pos < size) { > --- openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java.orig > +++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java > @@ -198,7 +198,7 @@ > * Decode the buffer, returning an ACL > */ > private static List decode(long address, int n) { > - ArrayList acl = new ArrayList<>(n); > + ArrayList acl = new ArrayList(n); > for (int i=0; i long offset = address + i*SIZEOF_ACE_T; > > --- openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java.orig > +++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java > @@ -76,7 +76,7 @@ > static final Set supportedFileAttributeViews = > supportedFileAttributeViews(); > private static Set supportedFileAttributeViews() { > - Set result = new HashSet<>(); > + Set result = new HashSet(); > result.addAll(standardFileAttributeViews()); > // additional Solaris-specific views > result.add("acl"); > @@ -101,7 +101,7 @@ > */ > @Override > Iterable getMountEntries() { > - ArrayList entries = new ArrayList<>(); > + ArrayList entries = new ArrayList(); > try { > UnixPath mnttab = new UnixPath(this, "/etc/mnttab"); > long fp = fopen(mnttab, "r"); > --- openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java.orig > +++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java > @@ -83,7 +83,7 @@ > } > > // read list of extended attributes > - List list = new ArrayList<>(); > + List list = new ArrayList(); > try { > byte[] name; > while ((name = readdir(dp)) != null) { > --- openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java.orig > +++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java > @@ -194,7 +194,7 @@ > @Override > public Set permissions() { > int bits = (st_mode & UnixConstants.S_IAMB); > - HashSet perms = new HashSet<>(); > + HashSet perms = new HashSet(); > > if ((bits & UnixConstants.S_IRUSR) > 0) > perms.add(PosixFilePermission.OWNER_READ); > --- openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java.orig > +++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java > @@ -250,7 +250,8 @@ > envblock.substring(eql+1,end)); > } > > - theCaseInsensitiveEnvironment = new TreeMap<>(nameComparator); > + theCaseInsensitiveEnvironment > + = new TreeMap(nameComparator); > theCaseInsensitiveEnvironment.putAll(theEnvironment); > } > > @@ -295,7 +296,8 @@ > // Only for use by ProcessImpl.start() > String toEnvironmentBlock() { > // Sort Unicode-case-insensitively by name > - List> list = new ArrayList<>(entrySet()); > + List> list > + = new ArrayList>(entrySet()); > Collections.sort(list, entryComparator); > > StringBuilder sb = new StringBuilder(size()*30); > --- openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java.orig > +++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java > @@ -63,7 +63,7 @@ > // Parse string that consists of token delimited by space or commas > // and return LinkedHashMap > private LinkedList stringToList(String str) { > - LinkedList ll = new LinkedList<>(); > + LinkedList ll = new LinkedList(); > > // comma and space are valid delimites > StringTokenizer st = new StringTokenizer(str, ", "); > --- openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java.orig > +++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java > @@ -128,7 +128,7 @@ > } > > // iterate over roots, ignoring those that the security manager denies > - ArrayList result = new ArrayList<>(); > + ArrayList result = new ArrayList(); > SecurityManager sm = System.getSecurityManager(); > for (int i = 0; i <= 25; i++) { // 0->A, 1->B, 2->C... > if ((drives & (1 << i)) != 0) { > --- openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java.orig > +++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java > @@ -575,7 +575,7 @@ > // generate offset array > private void initOffsets() { > if (offsets == null) { > - ArrayList list = new ArrayList<>(); > + ArrayList list = new ArrayList(); > if (isEmpty()) { > // empty path considered to have one name element > list.add(0); > --- openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java.orig > +++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java > @@ -378,7 +378,7 @@ > AclInformation aclInfo = GetAclInformation(aclAddress); > aceCount = aclInfo.aceCount(); > } > - ArrayList result = new ArrayList<>(aceCount); > + ArrayList result = new ArrayList(aceCount); > > // decode each of the ACEs to AclEntry objects > for (int i=0; i --- openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java.orig > +++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java > @@ -65,7 +65,7 @@ > > // enumerates the file streams using FindFirstStream/FindNextStream APIs. > private List listUsingStreamEnumeration() throws IOException { > - List list = new ArrayList<>(); > + List list = new ArrayList(); > try { > FirstStream first = FindFirstStream(file.getPathForWin32Calls()); > if (first != null) { > @@ -114,7 +114,7 @@ > NativeBuffer buffer = null; > > // result with names of alternative data streams > - final List list = new ArrayList<>(); > + final List list = new ArrayList(); > > try { > buffer = NativeBuffers.getNativeBuffer(BUFFER_SIZE); > @@ -216,7 +216,7 @@ > // wrap with channel > FileChannel fc = null; > try { > - Set opts = new HashSet<>(); > + Set opts = new HashSet(); > opts.add(READ); > if (!followLinks) > opts.add(WindowsChannelFactory.OPEN_REPARSE_POINT); > @@ -243,7 +243,7 @@ > // wrap with channel > FileChannel fc = null; > try { > - Set opts = new HashSet<>(); > + Set opts = new HashSet(); > opts.add(READ); > if (!followLinks) > opts.add(WindowsChannelFactory.OPEN_REPARSE_POINT); > @@ -298,7 +298,7 @@ > x.rethrowAsIOException(file); > } > try { > - Set opts = new HashSet<>(); > + Set opts = new HashSet(); > if (!followLinks) > opts.add(WindowsChannelFactory.OPEN_REPARSE_POINT); > opts.add(CREATE); > --- openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java.orig > +++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java > @@ -56,7 +56,7 @@ > public static void main(String[] args) { > System.err.println("\n Regression test for bug 6541870\n"); > try { > - ArrayList list = new ArrayList<>(); > + ArrayList list = new ArrayList(); > list.add(new NPEProvoker()); > ByteArrayOutputStream baos = new ByteArrayOutputStream(); > ObjectOutputStream oos = new ObjectOutputStream(baos); > --- openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java.orig > +++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java > @@ -107,7 +107,7 @@ > class IndexedInjector implements TrackerInjector { > int counter = 0; > int tracker; > - List infoList = new ArrayList<>(); > + List infoList = new ArrayList(); > > public int stackSize(int currentSize) { > return currentSize + 1; > --- openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java.orig > +++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java > @@ -50,7 +50,7 @@ > private final Injector[] after = new Injector[256]; > private final String className; > private final String methodName; > - private final Map snippets = new HashMap<>(); > + private final Map snippets = new HashMap(); > > private int pos; > private int newPos; > --- openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java.orig > +++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java > @@ -103,7 +103,7 @@ > } > } > > - private static final Set checking = new HashSet<>(); > + private static final Set checking = new HashSet(); > > private static void check(Type t, String what) { > if (t == null || !checking.add(t)) > --- openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java.orig > +++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java > @@ -59,7 +59,7 @@ > } > } > final int threadCount = 2; > - List collectors = new ArrayList<>(); > + List collectors = new ArrayList(); > List threads = new ArrayList(); > for (int i = 0; i < threadCount; i++) { > RandomCollector r = new RandomCollector(); > --- openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java.orig > +++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java > @@ -89,7 +89,7 @@ > > MyClassLoader appClassLoader = new MyClassLoader(urls, "test0"); > WeakReference ref = > - new WeakReference<>(appClassLoader); > + new WeakReference(appClassLoader); > > > Thread appThread = new Thread(appsThreadGroup, launcher, "AppThread-0"); > --- openjdk-boot/jdk/src/share/classes/java/io/PrintStream.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/io/PrintStream.java > @@ -91,7 +91,10 @@ > requireNonNull(csn, "charsetName"); > try { > return Charset.forName(csn); > - } catch (IllegalCharsetNameException|UnsupportedCharsetException unused) { > + } catch (IllegalCharsetNameException unused) { > + // UnsupportedEncodingException should be thrown > + throw new UnsupportedEncodingException(csn); > + } catch (UnsupportedCharsetException unused) { > // UnsupportedEncodingException should be thrown > throw new UnsupportedEncodingException(csn); > } > --- openjdk-boot/jdk/src/share/classes/java/io/PrintWriter.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/io/PrintWriter.java > @@ -85,7 +85,10 @@ > Objects.requireNonNull(csn, "charsetName"); > try { > return Charset.forName(csn); > - } catch (IllegalCharsetNameException|UnsupportedCharsetException unused) { > + } catch (IllegalCharsetNameException unused) { > + // UnsupportedEncodingException should be thrown > + throw new UnsupportedEncodingException(csn); > + } catch (UnsupportedCharsetException unused) { > // UnsupportedEncodingException should be thrown > throw new UnsupportedEncodingException(csn); > } > --- openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java > @@ -606,7 +606,9 @@ > // create an MXBean proxy > return JMX.newMXBeanProxy(connection, objName, mxbeanInterface, > emitter); > - } catch (InstanceNotFoundException|MalformedObjectNameException e) { > + } catch (InstanceNotFoundException e) { > + throw new IllegalArgumentException(e); > + } catch (MalformedObjectNameException e) { > throw new IllegalArgumentException(e); > } > } > --- openjdk-boot/jdk/src/share/classes/java/util/Formatter.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java > @@ -1857,7 +1857,10 @@ > Objects.requireNonNull(csn, "charsetName"); > try { > return Charset.forName(csn); > - } catch (IllegalCharsetNameException|UnsupportedCharsetException unused) { > + } catch (IllegalCharsetNameException unused) { > + // UnsupportedEncodingException should be thrown > + throw new UnsupportedEncodingException(csn); > + } catch (UnsupportedCharsetException unused) { > // UnsupportedEncodingException should be thrown > throw new UnsupportedEncodingException(csn); > } > --- openjdk-boot/jdk/src/share/classes/java/util/Scanner.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/Scanner.java > @@ -633,7 +633,10 @@ > Objects.requireNonNull(csn, "charsetName"); > try { > return Charset.forName(csn); > - } catch (IllegalCharsetNameException|UnsupportedCharsetException e) { > + } catch (IllegalCharsetNameException e) { > + // IllegalArgumentException should be thrown > + throw new IllegalArgumentException(e); > + } catch (UnsupportedCharsetException e) { > // IllegalArgumentException should be thrown > throw new IllegalArgumentException(e); > } > @@ -684,7 +687,9 @@ > Objects.requireNonNull(charsetName, "charsetName"); > try { > return Charset.forName(charsetName).newDecoder(); > - } catch (IllegalCharsetNameException|UnsupportedCharsetException unused) { > + } catch (IllegalCharsetNameException unused) { > + throw new IllegalArgumentException(charsetName); > + } catch (UnsupportedCharsetException unused) { > throw new IllegalArgumentException(charsetName); > } > } > --- openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java > @@ -676,7 +676,11 @@ > IGNORE = IMPL_LOOKUP.findStatic(THIS_CLASS, "ignore", ignoreType); > EMPTY = IMPL_LOOKUP.findStatic(THIS_CLASS, "empty", ignoreType.dropParameterTypes(0, 1)); > NEW_ARRAY = IMPL_LOOKUP.findStatic(THIS_CLASS, "newArray", MethodType.methodType(Object[].class, int.class)); > - } catch (NoSuchMethodException | IllegalAccessException ex) { > + } catch (NoSuchMethodException ex) { > + Error err = new InternalError("uncaught exception"); > + err.initCause(ex); > + throw err; > + } catch (IllegalAccessException ex) { > Error err = new InternalError("uncaught exception"); > err.initCause(ex); > throw err; > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/PAData.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/PAData.java > @@ -280,7 +280,9 @@ > .append(info.getSalt()) > .append('\n'); > } > - } catch (IOException|Asn1Exception e) { > + } catch (Asn1Exception e) { > + sb.append("\t \n"); > + } catch (IOException e) { > sb.append("\t \n"); > } > } > @@ -307,7 +309,9 @@ > .encodeBuffer(s2kparams)); > } > } > - } catch (IOException|Asn1Exception e) { > + } catch (IOException e) { > + sb.append("\t \n"); > + } catch (Asn1Exception e) { > sb.append("\t \n"); > } > } > --- openjdk-boot/jdk/src/share/classes/sun/text/bidi/BidiBase.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/text/bidi/BidiBase.java > @@ -3477,7 +3477,9 @@ > try { > Field f = clazz.getField(name); > return f.get(null); > - } catch (NoSuchFieldException | IllegalAccessException x) { > + } catch (NoSuchFieldException x) { > + throw new AssertionError(x); > + } catch (IllegalAccessException x) { > throw new AssertionError(x); > } > } > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java > @@ -743,7 +743,9 @@ > > private void dumpBand() throws IOException { > assert(optDumpBands); > - try (PrintStream ps = new PrintStream(getDumpStream(this, ".txt"))) { > + PrintStream ps = null; > + try { > + ps = new PrintStream(getDumpStream(this, ".txt")); > String irr = (bandCoding == regularCoding) ? "" : " irregular"; > ps.print("# length="+length+ > " size="+outputSize()+ > @@ -758,9 +760,19 @@ > } > printArrayTo(ps, values, 0, length); > } > - try (OutputStream ds = getDumpStream(this, ".bnd")) { > + finally { > + if (ps != null) > + ps.close(); > + } > + OutputStream ds = null; > + try { > + ds = getDumpStream(this, ".bnd"); > bandCoding.writeArrayTo(ds, values, 0, length); > } > + finally { > + if (ds != null) > + ds.close(); > + } > } > > /** Disburse one value. */ > @@ -829,12 +841,18 @@ > > private void dumpBand() throws IOException { > assert(optDumpBands); > - try (OutputStream ds = getDumpStream(this, ".bnd")) { > + OutputStream ds = null; > + try { > + ds = getDumpStream(this, ".bnd"); > if (bytesForDump != null) > bytesForDump.writeTo(ds); > else > bytes.writeTo(ds); > } > + finally { > + if (ds != null) > + ds.close(); > + } > } > > public void readDataFrom(InputStream in) throws IOException { > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java > @@ -149,8 +149,13 @@ > if ("--config-file=".equals(state)) { > String propFile = av.remove(0); > Properties fileProps = new Properties(); > - try (InputStream propIn = new FileInputStream(propFile)) { > + InputStream propIn = null; > + try { > + propIn = new FileInputStream(propFile); > fileProps.load(propIn); > + } finally { > + if (propIn != null) > + propIn.close(); > } > if (engProps.get(verboseProp) != null) > fileProps.list(System.out); > @@ -341,9 +346,14 @@ > else > fileOut = new FileOutputStream(outfile); > fileOut = new BufferedOutputStream(fileOut); > - try (JarOutputStream out = new JarOutputStream(fileOut)) { > + JarOutputStream out = null; > + try { > + out = new JarOutputStream(fileOut); > junpack.unpack(in, out); > // p200 closes in but not out > + } finally { > + if (out != null) > + out.close(); > } > // At this point, we have a good jarfile (or newfile, if -r) > } > @@ -404,7 +414,9 @@ > long filelen = new File(jarfile).length(); > if (filelen <= 0) return ""; > long skiplen = Math.max(0, filelen - tail.length); > - try (InputStream in = new FileInputStream(new File(jarfile))) { > + InputStream in = null; > + try { > + in = new FileInputStream(new File(jarfile)); > in.skip(skiplen); > in.read(tail); > for (int i = tail.length-4; i >= 0; i--) { > @@ -418,6 +430,9 @@ > } > } > return ""; > + } finally { > + if (in != null) > + in.close(); > } > } > > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java > @@ -241,9 +241,15 @@ > void run(File inFile, JarOutputStream jstream) throws IOException { > // %%% maybe memory-map the file, and pass it straight into unpacker > ByteBuffer mappedFile = null; > - try (FileInputStream fis = new FileInputStream(inFile)) { > + FileInputStream fis = null; > + try { > + fis = new FileInputStream(inFile); > run(fis, jstream, mappedFile); > } > + finally { > + if (fis != null) > + fis.close(); > + } > // Note: caller is responsible to finish with jstream. > } > > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java > @@ -540,9 +540,15 @@ > Index index = initCPIndex(tag, cpMap); > > if (optDumpBands) { > - try (PrintStream ps = new PrintStream(getDumpStream(index, ".idx"))) { > + PrintStream ps = null; > + try { > + ps = new PrintStream(getDumpStream(index, ".idx")); > printArrayTo(ps, index.cpMap, 0, index.cpMap.length); > } > + finally { > + if (ps != null) > + ps.close(); > + } > } > } > > @@ -828,9 +834,10 @@ > attr_definition_headers.readFrom(in); > attr_definition_name.readFrom(in); > attr_definition_layout.readFrom(in); > - try (PrintStream dump = !optDumpBands ? null > - : new PrintStream(getDumpStream(attr_definition_headers, ".def"))) > - { > + PrintStream dump = null; > + try { > + dump = !optDumpBands ? null > + : new PrintStream(getDumpStream(attr_definition_headers, ".def")); > for (int i = 0; i < numAttrDefs; i++) { > int header = attr_definition_headers.getByte(); > Utf8Entry name = (Utf8Entry) attr_definition_name.getRef(); > @@ -849,6 +856,10 @@ > if (dump != null) dump.println(index+" "+def); > } > } > + finally { > + if (dump != null) > + dump.close(); > + } > attr_definition_headers.doneDisbursing(); > attr_definition_name.doneDisbursing(); > attr_definition_layout.doneDisbursing(); > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java > @@ -458,9 +458,15 @@ > Utils.log.info("Writing "+cpMap.length+" "+ConstantPool.tagName(tag)+" entries..."); > > if (optDumpBands) { > - try (PrintStream ps = new PrintStream(getDumpStream(index, ".idx"))) { > + PrintStream ps = null; > + try { > + ps = new PrintStream(getDumpStream(index, ".idx")); > printArrayTo(ps, cpMap, 0, cpMap.length); > } > + finally { > + if (ps != null) > + ps.close(); > + } > } > > switch (tag) { > @@ -921,9 +927,10 @@ > } > }); > attrDefsWritten = new Attribute.Layout[numAttrDefs]; > - try (PrintStream dump = !optDumpBands ? null > - : new PrintStream(getDumpStream(attr_definition_headers, ".def"))) > - { > + PrintStream dump = null; > + try { > + dump = !optDumpBands ? null > + : new PrintStream(getDumpStream(attr_definition_headers, ".def")); > int[] indexForDebug = Arrays.copyOf(attrIndexLimit, ATTR_CONTEXT_LIMIT); > for (int i = 0; i < defs.length; i++) { > int header = ((Integer)defs[i][0]).intValue(); > @@ -949,6 +956,10 @@ > } > } > } > + finally { > + if (dump != null) > + dump.close(); > + } > } > > void writeAttrCounts() throws IOException { > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java > @@ -122,8 +122,9 @@ > // Do this after the previous props are put in place, > // to allow override if necessary. > String propFile = "intrinsic.properties"; > - > - try (InputStream propStr = PackerImpl.class.getResourceAsStream(propFile)) { > + InputStream propStr = null; > + try { > + propStr = PackerImpl.class.getResourceAsStream(propFile); > if (propStr == null) { > throw new RuntimeException(propFile + " cannot be loaded"); > } > @@ -131,6 +132,14 @@ > } catch (IOException ee) { > throw new RuntimeException(ee); > } > + finally { > + try { > + if (propStr != null) > + propStr.close(); > + } catch (IOException ee) { > + throw new RuntimeException(ee); > + } > + } > > for (Map.Entry e : props.entrySet()) { > String key = (String) e.getKey(); > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java > @@ -160,9 +160,15 @@ > } > // Use the stream-based implementation. > // %%% Reconsider if native unpacker learns to memory-map the file. > - try (FileInputStream instr = new FileInputStream(in)) { > + FileInputStream instr = null; > + try { > + instr = new FileInputStream(in); > unpack(instr, out); > } > + finally { > + if (instr != null) > + instr.close(); > + } > if (props.getBoolean(Utils.UNPACK_REMOVE_PACKFILE)) { > in.delete(); > } > --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java.orig > +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java > @@ -268,18 +268,30 @@ > // 4947205 : Peformance is slow when using pack-effort=0 > out = new BufferedOutputStream(out); > out = new NonCloser(out); // protect from JarOutputStream.close() > - try (JarOutputStream jout = new JarOutputStream(out)) { > + JarOutputStream jout = null; > + try { > + jout = new JarOutputStream(out); > copyJarFile(in, jout); > } > + finally { > + if (jout != null) > + jout.close(); > + } > } > static void copyJarFile(JarFile in, OutputStream out) throws IOException { > > // 4947205 : Peformance is slow when using pack-effort=0 > out = new BufferedOutputStream(out); > out = new NonCloser(out); // protect from JarOutputStream.close() > - try (JarOutputStream jout = new JarOutputStream(out)) { > + JarOutputStream jout = null; > + try { > + jout = new JarOutputStream(out); > copyJarFile(in, jout); > } > + finally { > + if (jout != null) > + jout.close(); > + } > } > // Wrapper to prevent closing of client-supplied stream. > static private > --- openjdk-boot/jdk/src/share/classes/java/lang/Package.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java > @@ -575,12 +575,23 @@ > * Returns the Manifest for the specified JAR file name. > */ > private static Manifest loadManifest(String fn) { > - try (FileInputStream fis = new FileInputStream(fn); > - JarInputStream jis = new JarInputStream(fis, false)) > - { > + FileInputStream fis = null; > + JarInputStream jis = null; > + try { > + fis = new FileInputStream(fn); > + jis = new JarInputStream(fis, false); > return jis.getManifest(); > } catch (IOException e) { > return null; > + } finally { > + try { > + if (jis != null) > + jis.close(); > + if (fis != null) > + fis.close(); > + } catch (IOException e) { > + return null; > + } > } > } > > --- openjdk-boot/jdk/src/share/classes/java/nio/channels/SocketChannel.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/nio/channels/SocketChannel.java > @@ -188,7 +188,7 @@ > } catch (Throwable suppressed) { > x.addSuppressed(suppressed); > } > - throw x; > + throw (IOException) x; > } > assert sc.isConnected(); > return sc; > --- openjdk-boot/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java > @@ -122,9 +122,15 @@ > if (attrs.isDirectory()) { > Files.createDirectory(target); > } else { > - try (InputStream in = Files.newInputStream(source)) { > + InputStream in = null; > + try { > + in = Files.newInputStream(source); > Files.copy(in, target); > } > + finally { > + if (in != null) > + in.close(); > + } > } > > // copy basic attributes to target > @@ -142,7 +148,7 @@ > } catch (Throwable suppressed) { > x.addSuppressed(suppressed); > } > - throw x; > + throw (IOException) x; > } > } > } > --- openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java > @@ -2833,8 +2833,11 @@ > } > > // do the copy > - try (OutputStream out = ostream) { > - return copy(in, out); > + try { > + return copy(in, ostream); > + } > + finally { > + ostream.close(); > } > } > > @@ -2875,9 +2878,15 @@ > // ensure not null before opening file > Objects.requireNonNull(out); > > - try (InputStream in = newInputStream(source)) { > + InputStream in = null; > + try { > + in = newInputStream(source); > return copy(in, out); > } > + finally { > + if (in != null) > + in.close(); > + } > } > > /** > @@ -2943,8 +2952,14 @@ > if (size > (long)Integer.MAX_VALUE) > throw new OutOfMemoryError("Required array size too large"); > > - try (InputStream in = newInputStream(path)) { > - return read(in, (int)size); > + InputStream in = null; > + try { > + in = newInputStream(path); > + return read(in, (int)size); > + } > + finally { > + if (in != null) > + in.close(); > } > } > > @@ -2990,7 +3005,9 @@ > public static List readAllLines(Path path, Charset cs) > throws IOException > { > - try (BufferedReader reader = newBufferedReader(path, cs)) { > + BufferedReader reader = null; > + try { > + reader = newBufferedReader(path, cs); > List result = new ArrayList<>(); > for (;;) { > String line = reader.readLine(); > @@ -3000,6 +3017,10 @@ > } > return result; > } > + finally { > + if (reader != null) > + reader.close(); > + } > } > > /** > @@ -3049,7 +3070,9 @@ > // ensure bytes is not null before opening file > Objects.requireNonNull(bytes); > > - try (OutputStream out = Files.newOutputStream(path, options)) { > + OutputStream out = null; > + try { > + out = Files.newOutputStream(path, options); > int len = bytes.length; > int rem = len; > while (rem > 0) { > @@ -3058,6 +3081,10 @@ > rem -= n; > } > } > + finally { > + if (out != null) > + out.close(); > + } > return path; > } > > @@ -3109,12 +3136,18 @@ > Objects.requireNonNull(lines); > CharsetEncoder encoder = cs.newEncoder(); > OutputStream out = newOutputStream(path, options); > - try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out, encoder))) { > + BufferedWriter writer = null; > + try { > + writer = new BufferedWriter(new OutputStreamWriter(out, encoder)); > for (CharSequence line: lines) { > writer.append(line); > writer.newLine(); > } > } > + finally { > + if (writer != null) > + writer.close(); > + } > return path; > } > } > --- openjdk-boot/jdk/src/share/classes/java/util/Currency.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java > @@ -233,9 +233,14 @@ > "currency.properties"); > if (propFile.exists()) { > Properties props = new Properties(); > - try (FileReader fr = new FileReader(propFile)) { > + FileReader fr = null; > + try { > + fr = new FileReader(propFile); > props.load(fr); > } > + finally { > + fr.close(); > + } > Set keys = props.stringPropertyNames(); > Pattern propertiesPattern = > Pattern.compile("([A-Z]{3})\\s*,\\s*(\\d{3})\\s*,\\s*([0-3])"); > --- openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java.orig > +++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java > @@ -376,9 +376,15 @@ > */ > private byte[] getBytes(ZipEntry ze) throws IOException { > byte[] b = new byte[(int)ze.getSize()]; > - try (DataInputStream is = new DataInputStream(super.getInputStream(ze))) { > + DataInputStream is = null; > + try { > + is = new DataInputStream(super.getInputStream(ze)); > is.readFully(b, 0, b.length); > } > + finally { > + if (is != null) > + is.close(); > + } > return b; > } > > @@ -480,11 +486,15 @@ > JarEntry manEntry = getManEntry(); > if (manEntry != null) { > byte[] b = new byte[(int)manEntry.getSize()]; > - try (DataInputStream dis = new DataInputStream( > - super.getInputStream(manEntry))) { > + DataInputStream dis = null; > + try { > + dis = new DataInputStream(super.getInputStream(manEntry)); > dis.readFully(b, 0, b.length); > } > - > + finally { > + if (dis != null) > + dis.close(); > + } > int last = b.length - src.length; > int i = 0; > next: > --- openjdk-boot/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java.orig > +++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java > @@ -144,8 +144,9 @@ > buf = new char[(int)len]; > int read = 0; > int offset = 0; > - > - try (Reader charStream = clob.getCharacterStream()) { > + Reader charStream = null; > + try { > + charStream = clob.getCharacterStream(); > if (charStream == null) { > throw new SQLException("Invalid Clob object. The call to getCharacterStream " + > "returned null which cannot be serialized."); > @@ -153,23 +154,41 @@ > > // Note: get an ASCII stream in order to null-check it, > // even though we don't do anything with it. > - try (InputStream asciiStream = clob.getAsciiStream()) { > + InputStream asciiStream = null; > + try { > + asciiStream = clob.getAsciiStream(); > if (asciiStream == null) { > throw new SQLException("Invalid Clob object. The call to getAsciiStream " + > "returned null which cannot be serialized."); > } > } > - > - try (Reader reader = new BufferedReader(charStream)) { > + finally { > + if (asciiStream != null) > + asciiStream.close(); > + } > + Reader reader = null; > + try { > + reader = new BufferedReader(charStream); > do { > read = reader.read(buf, offset, (int)(len - offset)); > offset += read; > } while (read > 0); > } > + finally { > + if (reader != null) > + reader.close(); > + } > } catch (java.io.IOException ex) { > throw new SerialException("SerialClob: " + ex.getMessage()); > } > - > + finally { > + try { > + if (charStream != null) > + charStream.close(); > + } catch (java.io.IOException ex) { > + throw new SerialException("SerialClob: " + ex.getMessage()); > + } > + } > origLen = len; > } > > --- openjdk-boot/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java.orig > +++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java > @@ -367,9 +367,15 @@ > // Load user's implementation of SyncProvider > // here. -Drowset.properties=/abc/def/pqr.txt > ROWSET_PROPERTIES = strRowsetProperties; > - try (FileInputStream fis = new FileInputStream(ROWSET_PROPERTIES)) { > + FileInputStream fis = null; > + try { > + fis = new FileInputStream(ROWSET_PROPERTIES); > properties.load(fis); > } > + finally { > + if (fis != null) > + fis.close(); > + } > parseProperties(properties); > } > > @@ -381,15 +387,19 @@ > "rowset.properties"; > > ClassLoader cl = Thread.currentThread().getContextClassLoader(); > - > - try (InputStream stream = > - (cl == null) ? ClassLoader.getSystemResourceAsStream(ROWSET_PROPERTIES) > - : cl.getResourceAsStream(ROWSET_PROPERTIES)) { > + InputStream stream = null; > + try { > + stream = > + (cl == null) ? ClassLoader.getSystemResourceAsStream(ROWSET_PROPERTIES) > + : cl.getResourceAsStream(ROWSET_PROPERTIES); > if (stream == null) { > throw new SyncFactoryException( > "Resource " + ROWSET_PROPERTIES + " not found"); > } > properties.load(stream); > + } finally { > + if (stream != null) > + stream.close(); > } > > parseProperties(properties); > --- openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java > @@ -194,7 +194,8 @@ > * Given a URL, retrieves a JAR file, caches it to disk, and creates a > * cached JAR file object. > */ > - private static JarFile retrieve(final URL url, final URLJarFileCloseController closeController) throws IOException { > + private static JarFile retrieve(final URL url, final URLJarFileCloseController closeController) > + throws IOException { > /* > * See if interface is set, then call retrieve function of the class > * that implements URLJarFileCallBack interface (sun.plugin - to > @@ -211,7 +212,8 @@ > JarFile result = null; > > /* get the stream before asserting privileges */ > - try (final InputStream in = url.openConnection().getInputStream()) { > + try { > + final InputStream in = url.openConnection().getInputStream(); > result = AccessController.doPrivileged( > new PrivilegedExceptionAction() { > public JarFile run() throws IOException { > @@ -227,7 +229,10 @@ > } catch (IOException ioe) { > thr.addSuppressed(ioe); > } > - throw thr; > + throw (IOException) thr; > + } finally { > + if (in != null) > + in.close(); > } > } > }); > --- openjdk-boot/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java > @@ -255,7 +255,9 @@ > this.entries = new HashMap(); > > // get the initial entries in the directory > - try (DirectoryStream stream = Files.newDirectoryStream(dir)) { > + DirectoryStream stream = null; > + try { > + stream = Files.newDirectoryStream(dir); > for (Path entry: stream) { > // don't follow links > long lastModified = > @@ -264,6 +266,10 @@ > } > } catch (DirectoryIteratorException e) { > throw e.getCause(); > + } finally { > + if (stream != null) { > + stream.close(); > + } > } > } > > --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java > @@ -92,9 +92,13 @@ > tabName = filename; > try { > lastModified = new File(tabName).lastModified(); > - try (KeyTabInputStream kis = > - new KeyTabInputStream(new FileInputStream(filename))) { > + KeyTabInputStream kis = null; > + try { > + kis = new KeyTabInputStream(new FileInputStream(filename)); > load(kis); > + } finally { > + if (kis != null) > + kis.close(); > } > } catch (FileNotFoundException e) { > entries.clear(); > @@ -439,9 +443,13 @@ > public synchronized static KeyTab create(String name) > throws IOException, RealmException { > > - try (KeyTabOutputStream kos = > - new KeyTabOutputStream(new FileOutputStream(name))) { > + KeyTabOutputStream kos = null; > + try { > + kos = new KeyTabOutputStream(new FileOutputStream(name)); > kos.writeVersion(KRB5_KT_VNO); > + } finally { > + if (kos != null) > + kos.close(); > } > return new KeyTab(name); > } > @@ -450,12 +458,16 @@ > * Saves the file at the directory. > */ > public synchronized void save() throws IOException { > - try (KeyTabOutputStream kos = > - new KeyTabOutputStream(new FileOutputStream(tabName))) { > + KeyTabOutputStream kos = null; > + try { > + kos = new KeyTabOutputStream(new FileOutputStream(tabName)); > kos.writeVersion(kt_vno); > for (int i = 0; i < entries.size(); i++) { > kos.writeEntry(entries.elementAt(i)); > } > + } finally { > + if (kos != null) > + kos.close(); > } > } > > @@ -519,9 +531,13 @@ > * @exception IOException. > */ > public synchronized void createVersion(File file) throws IOException { > - try (KeyTabOutputStream kos = > - new KeyTabOutputStream(new FileOutputStream(file))) { > + KeyTabOutputStream kos = null; > + try { > + kos = new KeyTabOutputStream(new FileOutputStream(file)); > kos.write16(KRB5_KT_VNO); > + } finally { > + if (kos != null) > + kos.close(); > } > } > } > --- openjdk-boot/jdk/src/share/classes/sun/security/provider/SeedGenerator.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/security/provider/SeedGenerator.java > @@ -179,7 +179,9 @@ > // The temporary dir > File f = new File(p.getProperty("java.io.tmpdir")); > int count = 0; > - try (DirectoryStream stream = Files.newDirectoryStream(f.toPath())) { > + DirectoryStream stream = null; > + try { > + stream = Files.newDirectoryStream(f.toPath()); > // We use a Random object to choose what file names > // should be used. Otherwise on a machine with too > // many files, the same first 1024 files always get > @@ -194,6 +196,10 @@ > break; > } > } > + } finally { > + if (stream != null) { > + stream.close(); > + } > } > } catch (Exception ex) { > md.update((byte)ex.hashCode()); > --- openjdk-boot/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java.orig > +++ openjdk-boot/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java > @@ -127,9 +127,15 @@ > calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() { > public Object run() throws IOException { > Properties props = new Properties(); > - try (FileInputStream fis = new FileInputStream(fname)) { > + FileInputStream fis = null; > + try { > + fis = new FileInputStream(fname); > props.load(fis); > } > + finally { > + if (fis != null) > + fis.close(); > + } > return props; > } > }); > --- openjdk-boot/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java.orig > +++ openjdk-boot/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java > @@ -200,7 +200,7 @@ > } > > private static int[][] getUnicodeRanges() { > - List ranges = new ArrayList<>(); > + List ranges = new ArrayList(); > ranges.add(0); > Character.UnicodeBlock currentBlock = Character.UnicodeBlock.of(0); > for (int cp = 0x000001; cp < 0x110000; cp++ ) { > --- openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java.orig > +++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java > @@ -569,11 +569,11 @@ > public Void run() throws BackingStoreException { > Map m = new TreeMap<>(); > long newLastSyncTime = 0; > + FileInputStream fis = null; > try { > newLastSyncTime = prefsFile.lastModified(); > - try (FileInputStream fis = new FileInputStream(prefsFile)) { > - XmlSupport.importMap(fis, m); > - } > + fis = new FileInputStream(prefsFile); > + XmlSupport.importMap(fis, m); > } catch(Exception e) { > if (e instanceof InvalidPreferencesFormatException) { > getLogger().warning("Invalid preferences format in " > @@ -588,6 +588,13 @@ > } else { > throw new BackingStoreException(e); > } > + } finally { > + try { > + if (fis != null) > + fis.close(); > + } catch (IOException e) { > + throw new BackingStoreException(e); > + } > } > // Attempt succeeded; update state > prefsCache = m; > @@ -614,13 +621,14 @@ > AccessController.doPrivileged( > new PrivilegedExceptionAction() { > public Void run() throws BackingStoreException { > + FileOutputStream fos = null; > try { > if (!dir.exists() && !dir.mkdirs()) > throw new BackingStoreException(dir + > " create failed."); > - try (FileOutputStream fos = new FileOutputStream(tmpFile)) { > - XmlSupport.exportMap(fos, prefsCache); > - } > + > + fos = new FileOutputStream(tmpFile); > + XmlSupport.exportMap(fos, prefsCache); > if (!tmpFile.renameTo(prefsFile)) > throw new BackingStoreException("Can't rename " + > tmpFile + " to " + prefsFile); > @@ -629,6 +637,14 @@ > throw (BackingStoreException)e; > throw new BackingStoreException(e); > } > + finally { > + try { > + if (fos != null) > + fos.close(); > + } catch (IOException e) { > + throw new BackingStoreException(e); > + } > + } > return null; > } > }); > --- openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java.orig > +++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java > @@ -255,9 +255,16 @@ > String fstypes = System.getProperty("java.home") + "/lib/fstypes.properties"; > Path file = Paths.get(fstypes); > try { > - try (ReadableByteChannel rbc = Files.newByteChannel(file)) { > + ReadableByteChannel rbc = null; > + try { > + rbc = Files.newByteChannel(file); > result.load(Channels.newReader(rbc, "UTF-8")); > } > + finally { > + if (rbc != null) { > + rbc.close(); > + } > + } > } catch (IOException x) { > } > return result; > --- openjdk/jdk/make/com/sun/Makefile.orig > +++ openjdk/jdk/make/com/sun/Makefile > @@ -31,13 +31,6 @@ > PRODUCT = sun > include $(BUILDDIR)/common/Defs.gmk > > -ifndef OPENJDK > - ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,) > - ifneq ("$(ORG_EXISTS)", "") > - SCRIPT_SUBDIR = script > - endif > -endif > - > # jarsigner is part of JRE > SUBDIRS = java security net/ssl jarsigner > > --- openjdk/jdk/make/com/sun/script/Makefile.orig > +++ openjdk/jdk/make/com/sun/script/Makefile > @@ -31,6 +31,8 @@ > > AUTO_FILES_JAVA_DIRS = com/sun/script > > +OTHER_JAVACFLAGS = -classpath $(RHINO_JAR) > + > # > # Files that need to be copied > # > --- openjdk/jdk/make/common/Release.gmk.orig > +++ openjdk/jdk/make/common/Release.gmk > @@ -766,6 +766,7 @@ > $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar > $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar > $(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar > + $(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar > @# Generate meta-index to make boot and extension class loaders lazier > $(CD) $(JRE_IMAGE_DIR)/lib && \ > $(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \ > --- openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java.orig > +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java > @@ -24,7 +24,7 @@ > */ > > package com.sun.script.javascript; > -import sun.org.mozilla.javascript.internal.*; > +import sun.org.mozilla.javascript.*; > import javax.script.*; > import java.util.*; > > --- openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java.orig > +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java > @@ -25,7 +25,7 @@ > > package com.sun.script.javascript; > > -import sun.org.mozilla.javascript.internal.*; > +import sun.org.mozilla.javascript.*; > import java.util.*; > > /** > --- openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java.orig > +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java > @@ -26,7 +26,7 @@ > package com.sun.script.javascript; > > import javax.script.Invocable; > -import sun.org.mozilla.javascript.internal.*; > +import sun.org.mozilla.javascript.*; > > /** > * This class implements Rhino-like JavaAdapter to help implement a Java > --- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java.orig > +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java > @@ -26,7 +26,7 @@ > package com.sun.script.javascript; > > import java.util.*; > -import sun.org.mozilla.javascript.internal.*; > +import sun.org.mozilla.javascript.*; > > /** > * This class prevents script access to certain sensitive classes. > --- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java.orig > +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java > @@ -25,7 +25,7 @@ > > package com.sun.script.javascript; > import javax.script.*; > -import sun.org.mozilla.javascript.internal.*; > +import sun.org.mozilla.javascript.*; > > /** > * Represents compiled JavaScript code. > --- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java.orig > +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java > @@ -26,7 +26,7 @@ > package com.sun.script.javascript; > import com.sun.script.util.*; > import javax.script.*; > -import sun.org.mozilla.javascript.internal.*; > +import sun.org.mozilla.javascript.*; > import java.lang.reflect.Method; > import java.io.*; > import java.security.*; > --- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java.orig > +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java > @@ -26,7 +26,7 @@ > package com.sun.script.javascript; > import javax.script.*; > import java.util.*; > -import sun.org.mozilla.javascript.internal.*; > +import sun.org.mozilla.javascript.*; > import com.sun.script.util.*; > > /** > --- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java.orig > +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java > @@ -25,7 +25,7 @@ > > package com.sun.script.javascript; > > -import sun.org.mozilla.javascript.internal.*; > +import sun.org.mozilla.javascript.*; > import java.security.AccessControlContext; > import javax.script.*; > import java.security.AccessControlContext; > --- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java.orig > +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java > @@ -27,7 +27,7 @@ > > import java.lang.reflect.*; > import static sun.security.util.SecurityConstants.*; > -import sun.org.mozilla.javascript.internal.*; > +import sun.org.mozilla.javascript.*; > > /** > * This wrap factory is used for security reasons. JSR 223 script -- 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/20120116/67d94274/attachment.bin From xerxes at zafena.se Tue Jan 17 04:28:55 2012 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Tue, 17 Jan 2012 13:28:55 +0100 Subject: ARM: fix java.lang.Math.log10 In-Reply-To: <4F146F61.4060807@redhat.com> References: <4F146F61.4060807@redhat.com> Message-ID: <4F156987.8040604@zafena.se> 2012-01-16 19:41, Andrew Haley skrev: > In JCK testing we discovered that java.lang.Math.log10 causes a crash. > > In HotSpot there is a special table of method kinds, and it was > updated to include java.dyn.MethodHandles::invoke. Unfortunately, > this entry was added in the middle of the list, rather than at the > end, so the java.lang.Math.* entries all move up by one. > java.lang.Math.log10 was at the end of the table, and it fell off. > :-) I have verified that your patch do make java.lang.Math.log10 work for the ARM asm interpreter. This patch are OK for icedtea6 HEAD and icedtea6-1.11. Some observations that need attention: (oddity no 1) Interesting... The crash itself are still not explained. When java.lang.Math.log10 "entry no 15" fall of the end of the list then it make the whole function return 0. The Zero cpp interpreter will notice this and installs its own non-asm version of java.lang.Math.log10 as fall-back. See: openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp AbstractInterpreterGenerator::generate_method_entry . The crash triggers after the Zero c++ fall-back entry for java.lang.Math.log10 have both executed and returned. To me this indicate that something in the inter-working between the c++ Zero interpreter and the asm Zero interpreter are still broken. (oddity no 2) When installing vm_fatal_error as entry to handle the "java.dyn.MethodHandles::invoke" causes a signal 11 I would have expected it to call report_should_not_reach_here and exit cleanly. # A fatal error has been detected by the Java Runtime Environment: # # Internal Error (os_linux_zero.cpp:270), pid=11232, tid=1090544752 # fatal error: caught unhandled signal 11 Cheers Xerxes > > Fixed thusly. > > Andrew. > > > 2012-01-16 Andrew Haley > > * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (asm_method_table): > Add entry for java.dyn.MethodHandles::invoke. > (asm_generate_method_entry): Replace constant 14 with calculation > based on the size of asm_method_table. > Add some comments. > > diff -r 2bbcc83417ae -r f57f03c70b52 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S > --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Jan 16 13:25:01 2012 -0500 > +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Jan 16 13:28:17 2012 -0500 > @@ -782,28 +782,33 @@ > cmp r2, #0 > bne 1f > > - cmp r3, #14 > + cmp r3, #((3f-2f)/4) // i.e. sizeof asm_method_table > adrcc ip, asm_method_table > ldrcc r0, [ip, r3, lsl #2] > #endif // PRODUCT > 1: > bx lr > + > +// This table must be kept in sync with AbstractInterpreter::MethodKind > asm_method_table: > - .word normal_entry > - .word normal_entry_synchronized > - .word native_entry > - .word native_entry_synchronized > - .word empty_entry > - .word accessor_entry > - .word normal_entry @ abstract entry > - .word normal_entry @ java_lang_math_sin > - .word normal_entry @ java_lang_math_cos > - .word normal_entry @ java_lang_math_tan > - .word normal_entry @ java_lang_math_abs > - .word normal_entry @ java_lang_math_sqrt > - .word normal_entry @ java_lang_math_log > - .word normal_entry @ java_lang_math_log10 > - > +2: > + .word normal_entry // method needs locals initialization > + .word normal_entry_synchronized // method needs locals initialization & is synchronized > + .word native_entry // native method > + .word native_entry_synchronized // native method & is synchronized > + .word empty_entry // empty method (code: _return) > + .word accessor_entry // accessor method (code: _aload_0, _getfield, _(a|i)return) > + .word normal_entry // abstract method (throws an AbstractMethodException) > + .word vm_fatal_error // java.dyn.MethodHandles::invoke > + .word normal_entry // implementation of java.lang.Math.sin (x) > + .word normal_entry // implementation of java.lang.Math.cos (x) > + .word normal_entry // implementation of java.lang.Math.tan (x) > + .word normal_entry // implementation of java.lang.Math.abs (x) > + .word normal_entry // implementation of java.lang.Math.sqrt (x) > + .word normal_entry // implementation of java.lang.Math.log (x) > + .word normal_entry // implementation of java.lang.Math.log10 (x) > +3: > + > ALIGN_CODE > native_entry_synchronized: > b fast_native_entry_synchronized > From ptisnovs at icedtea.classpath.org Tue Jan 17 04:59:43 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 17 Jan 2012 12:59:43 +0000 Subject: /hg/MauveTestCoverage: 2012-01-17 Pavel Tisnovsky changeset 5ef74c026b81 in /hg/MauveTestCoverage details: http://icedtea.classpath.org/hg/MauveTestCoverage?cmd=changeset;node=5ef74c026b81 author: Pavel Tisnovsky date: Tue Jan 17 14:02:07 2012 +0100 2012-01-17 Pavel Tisnovsky * src/FileUtils.java: Added new static methods used by other classes. * src/PrintTestCoverage.java: Added check if the .class file is really Mauve test. More refactoring and Javadoc. diffstat: ChangeLog | 8 + src/FileUtils.java | 64 +++++++ src/PrintTestCoverage.java | 369 ++++++++++++++++++++++++++++++++++++-------- 3 files changed, 375 insertions(+), 66 deletions(-) diffs (truncated from 689 to 500 lines): diff -r 730c5549c0f9 -r 5ef74c026b81 ChangeLog --- a/ChangeLog Tue Jan 10 14:08:47 2012 +0100 +++ b/ChangeLog Tue Jan 17 14:02:07 2012 +0100 @@ -1,3 +1,11 @@ +2012-01-17 Pavel Tisnovsky + + * src/FileUtils.java: + Added new static methods used by other classes. + * src/PrintTestCoverage.java: + Added check if the .class file is really Mauve test. + More refactoring and Javadoc. + 2012-01-10 Pavel Tisnovsky * src/FileUtils.java: diff -r 730c5549c0f9 -r 5ef74c026b81 src/FileUtils.java --- a/src/FileUtils.java Tue Jan 10 14:08:47 2012 +0100 +++ b/src/FileUtils.java Tue Jan 17 14:02:07 2012 +0100 @@ -38,7 +38,9 @@ import java.io.BufferedReader; import java.io.BufferedWriter; +import java.io.EOFException; import java.io.File; +import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; @@ -54,6 +56,11 @@ class FileUtils { /** + * EOF constant used as special return value in some methods. + */ + private static final int EOF = -1; + + /** * Read content of given text file and return it as list of strings. No * exception is thrown during reading. * @@ -222,6 +229,7 @@ */ private static void writeAllLinesToTextFile(BufferedWriter bufferedWriter, List lines) throws IOException { + // for all lines for (String line : lines) { bufferedWriter.write(line); @@ -230,4 +238,60 @@ } } + /** + * Read one byte from given file input stream with check if EOF is + * reached. + * + * @param fileInputStream instance of already opened FileInputStream + * @return + * @throws IOException + * thrown if an I/O error occurs + */ + static int readOneByte(FileInputStream fileInputStream) throws IOException + { + int i = fileInputStream.read(); + // -1 means that EOF is reached + if (i == EOF) + { + throw new EOFException("End of file reached!"); + } + return i; + } + + /** + * Read two bytes from given file input stream with check if EOF is + * reached. + * + * @param fileInputStream instance of already opened FileInputStream + * @return + * @throws IOException + * thrown if an I/O error occurs + */ + static int readTwoBytes(FileInputStream fileInputStream) throws IOException + { + int i1 = readOneByte(fileInputStream); + int i2 = readOneByte(fileInputStream); + // combine all two read bytes into a word + return (i1 << 8) | (i2); + } + + /** + * Read four bytes from given file input stream with check if EOF is + * reached. + * + * @param fileInputStream instance of already opened FileInputStream + * @return + * @throws IOException + * thrown if an I/O error occurs + */ + static int readFourBytes(FileInputStream fileInputStream) throws IOException + { + int i1 = readOneByte(fileInputStream); + int i2 = readOneByte(fileInputStream); + int i3 = readOneByte(fileInputStream); + int i4 = readOneByte(fileInputStream); + // combine all four read bytes into a word + return (i1 << 24) | (i2 << 16) | (i3 << 8) | (i4); + } + } diff -r 730c5549c0f9 -r 5ef74c026b81 src/PrintTestCoverage.java --- a/src/PrintTestCoverage.java Tue Jan 10 14:08:47 2012 +0100 +++ b/src/PrintTestCoverage.java Tue Jan 17 14:02:07 2012 +0100 @@ -47,6 +47,14 @@ import java.util.Set; import java.util.TreeSet; + + +/** + * This enumeration represents all record types which could be stored in a + * constant pool. + * + * @author Pavel Tisnovsky + */ enum ConstantPoolTag { CONSTANT_Class(7), @@ -61,18 +69,38 @@ CONSTANT_NameAndType(12), CONSTANT_Utf8(1); + /** + * Value represented one enumeration item. + */ private int value; + /** + * Constructor + * + * @param value + * enumeration value + */ private ConstantPoolTag(int value) { this.value = value; } + /** + * Getter for a field value. + * + * @return value of a field named value + */ public int getValue() { return this.value; } + /** + * Converts integer value to a enumeration item. + * + * @param value integer value + * @return selected enumeration item or null + */ public static ConstantPoolTag intToConstantPoolTag(int value) { for (ConstantPoolTag val : values()) @@ -86,27 +114,65 @@ } } +/** + * Abstract class which represents any constant pool record. + * + * @author Pavel Tisnovsky + */ abstract class ConstantPoolRecord { + /** + * Tag associated with each constant pool record. + */ private ConstantPoolTag tag; + /** + * Constructor common for all subclasses. + * + * @param tag + * tag associated with each constant pool record. + */ public ConstantPoolRecord(ConstantPoolTag tag) { this.tag = tag; } + /** + * Get tag associated with each constant pool record. + * + * @return value of the field 'tag' + */ public ConstantPoolTag getTag() { return this.tag; } + /** + * Set tag associated with each constant pool record. + * + * @param tag + * new value of the field 'tag' + */ public void setTag(ConstantPoolTag tag) { this.tag = tag; } + /** + * Returns true if this record occupies two constant pool entries. Only such + * entries storing long and double values need to return true. + * + * @return true if this record occupies two constant pool entries + */ abstract boolean isRecordOccupyingTwoPoolEntries(); + /** + * Converts constant pool entry into a printable string. + * + * @param poolEntries + * whole constant pool + * @return constant pool entry represented as a printable string + */ abstract public String toString(ConstantPoolRecord[] poolEntries); } @@ -599,42 +665,26 @@ } } + + /** - * + * This class is used to find out, which API methods are called from given + * tests. Bytecode is investigated: this means this tool is based on static + * coverage checking. + * * @author Pavel Tisnovsky */ public class PrintTestCoverage { /** - * Name of file containing directory to tests. + * Default name of file containing directory to tests. */ private static final String TEST_DIRECTORY = "test_directory.txt"; - private static int readByte(FileInputStream fin) throws IOException - { - return fin.read(); - } - - private static int readTwoBytes(FileInputStream fin) throws IOException - { - int i1 = readByte(fin); - int i2 = readByte(fin); - return (i1 << 8) | (i2); - } - - private static int readFourBytes(FileInputStream fin) throws IOException - { - int i1 = readByte(fin); - int i2 = readByte(fin); - int i3 = readByte(fin); - int i4 = readByte(fin); - return (i1 << 24) | (i2 << 16) | (i3 << 8) | (i4); - } - @SuppressWarnings("boxing") private static void processMagicNumber(FileInputStream fin) throws Exception { - int magic = readFourBytes(fin); + int magic = FileUtils.readFourBytes(fin); System.err.format("Magic constant: 0x%x\n", magic); if (magic != 0xcafebabe) { @@ -645,80 +695,80 @@ @SuppressWarnings("boxing") private static void processClassVersion(FileInputStream fin) throws IOException { - int minorVersion = readTwoBytes(fin); - int majorVersion = readTwoBytes(fin); + int minorVersion = FileUtils.readTwoBytes(fin); + int majorVersion = FileUtils.readTwoBytes(fin); System.err.format("Major version: %d\n", majorVersion); System.err.format("Minor version: %d\n", minorVersion); } private static ConstantPoolRecord readConstantPoolEntry(FileInputStream fin) throws IOException { - ConstantPoolTag tag = ConstantPoolTag.intToConstantPoolTag(readByte(fin)); + ConstantPoolTag tag = ConstantPoolTag.intToConstantPoolTag(FileUtils.readOneByte(fin)); switch (tag) { case CONSTANT_Class: { - int classNameIndex = readTwoBytes(fin); + int classNameIndex = FileUtils.readTwoBytes(fin); return new ClassRecord(tag, classNameIndex); } case CONSTANT_Fieldref: { - int classIndex = readTwoBytes(fin); - int nameTypeIndex = readTwoBytes(fin); + int classIndex = FileUtils.readTwoBytes(fin); + int nameTypeIndex = FileUtils.readTwoBytes(fin); return new FieldReferenceRecord(tag, classIndex, nameTypeIndex); } case CONSTANT_InterfaceMethodref: { - int classIndex = readTwoBytes(fin); - int nameTypeIndex = readTwoBytes(fin); + int classIndex = FileUtils.readTwoBytes(fin); + int nameTypeIndex = FileUtils.readTwoBytes(fin); return new InterfaceReferenceRecord(tag, classIndex, nameTypeIndex); } case CONSTANT_Methodref: { - int classIndex = readTwoBytes(fin); - int nameTypeIndex = readTwoBytes(fin); + int classIndex = FileUtils.readTwoBytes(fin); + int nameTypeIndex = FileUtils.readTwoBytes(fin); return new MethodReferenceRecord(tag, classIndex, nameTypeIndex); } case CONSTANT_NameAndType: { - int nameIndex = readTwoBytes(fin); - int descriptorIndex = readTwoBytes(fin); + int nameIndex = FileUtils.readTwoBytes(fin); + int descriptorIndex = FileUtils.readTwoBytes(fin); return new NameAndTypeRecord(tag, nameIndex, descriptorIndex); } case CONSTANT_String: { - int stringIndex = readTwoBytes(fin); + int stringIndex = FileUtils.readTwoBytes(fin); return new StringRecord(tag, stringIndex); } case CONSTANT_Integer: { - int constant = readFourBytes(fin); + int constant = FileUtils.readFourBytes(fin); return new IntegerRecord(tag, constant); } case CONSTANT_Long: { - int high = readFourBytes(fin); - int low = readFourBytes(fin); + int high = FileUtils.readFourBytes(fin); + int low = FileUtils.readFourBytes(fin); return new LongRecord(tag, high, low); } case CONSTANT_Float: { - int bits = readFourBytes(fin); + int bits = FileUtils.readFourBytes(fin); return new FloatRecord(tag, bits); } case CONSTANT_Double: { - int highbits = readFourBytes(fin); - int lowbits = readFourBytes(fin); + int highbits = FileUtils.readFourBytes(fin); + int lowbits = FileUtils.readFourBytes(fin); return new DoubleRecord(tag, highbits, lowbits); } case CONSTANT_Utf8: { - int length = readTwoBytes(fin); + int length = FileUtils.readTwoBytes(fin); StringBuffer buf = new StringBuffer(length); for (int i = 0; i < length; i++) { - buf.append((char)readByte(fin)); + buf.append((char)FileUtils.readOneByte(fin)); } return new Utf8Record(tag, buf.toString()); } @@ -733,7 +783,7 @@ { ConstantPoolRecord[] poolEntries = null; - int constantPoolCount = readTwoBytes(fin) - 1; + int constantPoolCount = FileUtils.readTwoBytes(fin) - 1; System.err.format("\nConstant pool size: %d\n", constantPoolCount); poolEntries = new ConstantPoolRecord[constantPoolCount]; @@ -750,6 +800,65 @@ return poolEntries; } + /** + * Read and returns flags set for the class + * + * @param fin + * input stream for the bytecode + * @param poolEntries + * constant pool entries + * @return flags set for the class + * @throws IOException + */ + private static int processClassFlags(FileInputStream fin, ConstantPoolRecord[] poolEntries) throws IOException + { + // read flags set for the class + int flags = FileUtils.readTwoBytes(fin); + return flags; + } + + /** + * @param fin + * @param poolEntries + * @return + * @throws IOException + */ + private static String readClassOrSuperclassOrInterfaceName(FileInputStream fin, ConstantPoolRecord[] poolEntries) + throws IOException + { + // read index into constant pool + int index = FileUtils.readTwoBytes(fin); + // constant pool array is indexed from zero, but in bytecode, one-based indexing is used + index--; + ConstantPoolRecord poolRecord = poolEntries[index]; + if (poolRecord instanceof ClassRecord) + { + return ((ClassRecord)poolRecord).getClassName(poolEntries); + } + return null; + } + + private static String processClassName(FileInputStream fin, ConstantPoolRecord[] poolEntries) throws IOException + { + return readClassOrSuperclassOrInterfaceName(fin, poolEntries); + } + + private static String processSuperclassName(FileInputStream fin, ConstantPoolRecord[] poolEntries) throws IOException + { + return readClassOrSuperclassOrInterfaceName(fin, poolEntries); + } + + private static Set processAllImplementedInterfaces(FileInputStream fin, ConstantPoolRecord[] poolEntries) throws IOException + { + int interfacesCount = FileUtils.readTwoBytes(fin); + Set interfaceNames = new TreeSet(); + for (int i = 0; i < interfacesCount; i++) + { + interfaceNames.add(readClassOrSuperclassOrInterfaceName(fin, poolEntries)); + } + return interfaceNames; + } + @SuppressWarnings("unused") private static void printConstantPool(ConstantPoolRecord[] poolEntries) { @@ -762,7 +871,7 @@ } } - private static void printMethodList(String testedClassName, ConstantPoolRecord[] poolEntries, Set methodSet) + private static void determineAllCalledAPIMethods(String testedClassName, ConstantPoolRecord[] poolEntries, Set methodSet) { for (ConstantPoolRecord record : poolEntries) { @@ -777,7 +886,7 @@ } } - private static void printTestCoverageForOneTestClass(String testedClassName, File directory, String fileName, Set methodSet) + private static void determineTestCoverageForOneTestClass(String testedClassName, File directory, String fileName, Set methodSet) { FileInputStream fin = null; try @@ -785,11 +894,7 @@ fin = new FileInputStream(new File(directory, fileName)); try { - processMagicNumber(fin); - processClassVersion(fin); - ConstantPoolRecord[] poolEntries = processContantPool(fin); - //printConstantPool(poolEntries); - printMethodList(testedClassName, poolEntries, methodSet); + processAllRelevantBytecodeParts(testedClassName, methodSet, fin); } catch (Exception e) { @@ -813,45 +918,176 @@ } } + /** + * Read all relevant parts of bytecode from a .class file. + * + * @param testedClassName + * tested class name. From ptisnovs at icedtea.classpath.org Tue Jan 17 05:47:51 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 17 Jan 2012 13:47:51 +0000 Subject: /hg/icedtea6: 2012-01-17 Pavel Tisnovsky Message-ID: changeset 47cb80f13a3f in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=47cb80f13a3f author: ptisnovs date: Tue Jan 17 15:47:40 2012 +0100 2012-01-17 Pavel Tisnovsky * Makefile.am: Add new patch. * NEWS: Mention backport. * patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.pa tch: Backport of 6761072: new krb5 tests fail on multiple platforms diffstat: ChangeLog | 7 + Makefile.am | 3 +- NEWS | 1 + patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch | 91 ++++++++++ 4 files changed, 101 insertions(+), 1 deletions(-) diffs (136 lines): diff -r 04b0c0d5dcad -r 47cb80f13a3f ChangeLog --- a/ChangeLog Fri Jan 13 11:27:32 2012 -0500 +++ b/ChangeLog Tue Jan 17 15:47:40 2012 +0100 @@ -1,3 +1,10 @@ +2012-01-17 Pavel Tisnovsky + + * Makefile.am: Add new patch. + * NEWS: Mention backport. + * patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch: + Backport of 6761072: new krb5 tests fail on multiple platforms + 2012-01-12 Danesh Dadachanji * Makefile.am: diff -r 04b0c0d5dcad -r 47cb80f13a3f Makefile.am --- a/Makefile.am Fri Jan 13 11:27:32 2012 -0500 +++ b/Makefile.am Tue Jan 17 15:47:40 2012 +0100 @@ -405,7 +405,8 @@ patches/openjdk/7091528-javadoc_class_files.patch \ patches/openjdk/7103725-ssl_beast_regression.patch \ patches/openjdk/6706974-krb5_test_infrastructure.patch \ - patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch + patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \ + patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r 04b0c0d5dcad -r 47cb80f13a3f NEWS --- a/NEWS Fri Jan 13 11:27:32 2012 -0500 +++ b/NEWS Tue Jan 17 15:47:40 2012 +0100 @@ -15,6 +15,7 @@ * Backports - 6706974: Add krb5 test infrastructure - 6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe + - 6761072: new krb5 tests fail on multiple platforms New in release 1.11 (2012-XX-XX): diff -r 04b0c0d5dcad -r 47cb80f13a3f patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch Tue Jan 17 15:47:40 2012 +0100 @@ -0,0 +1,94 @@ +# HG changeset patch +# User weijun +# Date 1224469953 -28800 +# Node ID 0bf6c9c6fdc55ec5867a9c892b6a9408b8253198 +# Parent 064e6a087f775f1850e68c569e7adf092bcb1c30 +6761072: new krb5 tests fail on multiple platforms +Reviewed-by: xuelei + +diff -r 064e6a087f77 -r 0bf6c9c6fdc5 test/sun/security/krb5/auto/BasicKrb5Test.java +--- openjdk.orig/jdk/test/sun/security/krb5/auto/BasicKrb5Test.java Fri Oct 17 00:51:59 2008 -0700 ++++ openjdk/jdk/test/sun/security/krb5/auto/BasicKrb5Test.java Mon Oct 20 10:32:33 2008 +0800 +@@ -49,14 +49,17 @@ + if (args.length > 0) { + etype = args[0]; + } ++ ++ // Creates and starts the KDC. This line must be put ahead of etype check ++ // since the check needs a krb5.conf. ++ new OneKDC(etype).writeJAASConf(); ++ + System.out.println("Testing etype " + etype); + if (etype != null && !EType.isSupported(Config.getInstance().getType(etype))) { + System.out.println("Not supported."); + System.exit(0); + } + +- // Creates and starts the KDC +- new OneKDC(etype).writeJAASConf(); + new BasicKrb5Test().go(OneKDC.SERVER, OneKDC.BACKEND); + } + +diff -r 064e6a087f77 -r 0bf6c9c6fdc5 test/sun/security/krb5/auto/KDC.java +--- openjdk.orig/jdk/test/sun/security/krb5/auto/KDC.java Fri Oct 17 00:51:59 2008 -0700 ++++ openjdk/jdk/test/sun/security/krb5/auto/KDC.java Mon Oct 20 10:32:33 2008 +0800 +@@ -152,12 +152,19 @@ + return; + } + } ++ String localhost = "localhost"; ++ try { ++ localhost = InetAddress.getByName(localhost) ++ .getCanonicalHostName(); ++ } catch (UnknownHostException uhe) { ++ ; // Ignore, localhost is still "localhost" ++ } + KDC kdc = create("RABBIT.HOLE", 8888, false); + kdc.addPrincipal("dummy", "bogus".toCharArray()); + kdc.addPrincipal("foo", "bar".toCharArray()); + kdc.addPrincipalRandKey("krbtgt/" + kdc.realm); +- kdc.addPrincipalRandKey("server/localhost"); +- kdc.addPrincipalRandKey("backend/localhost"); ++ kdc.addPrincipalRandKey("server/" + localhost); ++ kdc.addPrincipalRandKey("backend/" + localhost); + } + + /** +diff -r 064e6a087f77 -r 0bf6c9c6fdc5 test/sun/security/krb5/auto/OneKDC.java +--- openjdk.orig/jdk/test/sun/security/krb5/auto/OneKDC.java Fri Oct 17 00:51:59 2008 -0700 ++++ openjdk/jdk/test/sun/security/krb5/auto/OneKDC.java Mon Oct 20 10:32:33 2008 +0800 +@@ -24,6 +24,8 @@ + import java.io.File; + import java.io.FileOutputStream; + import java.io.IOException; ++import java.net.InetAddress; ++import java.net.UnknownHostException; + import java.security.Security; + import javax.security.auth.callback.Callback; + import javax.security.auth.callback.CallbackHandler; +@@ -44,10 +46,23 @@ + */ + public class OneKDC extends KDC { + ++ // The krb5 codes would try to canonicalize hostnames before creating ++ // a service principal name, so let's find out the canonicalized form ++ // of localhost first. The following codes mimic the process inside ++ // PrincipalName.java. ++ static String localhost = "localhost"; ++ static { ++ try { ++ localhost = InetAddress.getByName(localhost) ++ .getCanonicalHostName(); ++ } catch (UnknownHostException uhe) { ++ ; // Ignore, localhost is still "localhost" ++ } ++ } + public static final String USER = "dummy"; + public static final char[] PASS = "bogus".toCharArray(); +- public static final String SERVER = "server/localhost"; +- public static final String BACKEND = "backend/localhost"; ++ public static String SERVER = "server/" + localhost; ++ public static String BACKEND = "backend/" + localhost; + public static final String KRB5_CONF = "localkdc-krb5.conf"; + public static final String KTAB = "localkdc.ktab"; + public static final String JAAS_CONF = "localkdc-jaas.conf"; From aph at redhat.com Tue Jan 17 06:53:17 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 17 Jan 2012 14:53:17 +0000 Subject: ARM: fix java.lang.Math.log10 In-Reply-To: <4F156987.8040604@zafena.se> References: <4F146F61.4060807@redhat.com> <4F156987.8040604@zafena.se> Message-ID: <4F158B5D.3020502@redhat.com> On 01/17/2012 12:28 PM, Xerxes R?nby wrote: > 2012-01-16 19:41, Andrew Haley skrev: >> In JCK testing we discovered that java.lang.Math.log10 causes a crash. >> >> In HotSpot there is a special table of method kinds, and it was >> updated to include java.dyn.MethodHandles::invoke. Unfortunately, >> this entry was added in the middle of the list, rather than at the >> end, so the java.lang.Math.* entries all move up by one. >> java.lang.Math.log10 was at the end of the table, and it fell off. >> :-) > > I have verified that your patch do make java.lang.Math.log10 work for the ARM asm interpreter. > This patch are OK for icedtea6 HEAD and icedtea6-1.11. > > Some observations that need attention: > > (oddity no 1) > Interesting... The crash itself are still not explained. > When java.lang.Math.log10 "entry no 15" fall of the end of the list then it make the whole function return 0. > The Zero cpp interpreter will notice this and installs its own non-asm version of java.lang.Math.log10 as fall-back. > See: openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp AbstractInterpreterGenerator::generate_method_entry . > > The crash triggers after the Zero c++ fall-back entry for java.lang.Math.log10 > have both executed and returned. > To me this indicate that something in the inter-working between the c++ Zero interpreter > and the asm Zero interpreter are still broken. It's not broken, it just does not work. The reason it doesn't work is this code that's ifndef SHARK: normal_dispatch_and_return: mov r0, tmp2 mov r1, ip #ifndef SHARK add r3, r3, #CODE_ALIGN_SIZE #endif mov r2, tmp1 blx r3 In other words, CODE_ALIGN_SIZE (64) is added to the program counter, and we enter CppInterpreter::normal_entry + 64. So, because of this offset of 64 there are no circumstances in which it's ever correct to call CppInterpreter::normal_entry from the ARM asm interpreter. Maybe we should abort in that case. > (oddity no 2) > When installing vm_fatal_error as entry to handle the "java.dyn.MethodHandles::invoke" causes a signal 11 > I would have expected it to call report_should_not_reach_here and exit cleanly. > > # A fatal error has been detected by the Java Runtime Environment: > # > # Internal Error (os_linux_zero.cpp:270), pid=11232, tid=1090544752 > # fatal error: caught unhandled signal 11 I'll fix that if you can provide a test case. Andrew. From aph at redhat.com Tue Jan 17 07:33:51 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 17 Jan 2012 15:33:51 +0000 Subject: ARM: fix java.lang.Math.log10 In-Reply-To: <4F158B5D.3020502@redhat.com> References: <4F146F61.4060807@redhat.com> <4F156987.8040604@zafena.se> <4F158B5D.3020502@redhat.com> Message-ID: <4F1594DF.5040706@redhat.com> On 01/17/2012 02:53 PM, Andrew Haley wrote: >> (oddity no 2) >> > When installing vm_fatal_error as entry to handle the "java.dyn.MethodHandles::invoke" causes a signal 11 >> > I would have expected it to call report_should_not_reach_here and exit cleanly. >> > >> > # A fatal error has been detected by the Java Runtime Environment: >> > # >> > # Internal Error (os_linux_zero.cpp:270), pid=11232, tid=1090544752 >> > # fatal error: caught unhandled signal 11 > I'll fix that if you can provide a test case. > Fixed thusly. Andrew. 2012-01-17 Andrew Haley * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (vm_fatal_error): Add an extra entry point at vm_fatal_error + CODE_ALIGN_SIZE to allow vm_fatal_error to be used as an entry point in asm_method_table. diff -r f57f03c70b52 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Jan 16 13:28:17 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Tue Jan 17 10:32:52 2012 -0500 @@ -789,7 +789,9 @@ 1: bx lr -// This table must be kept in sync with AbstractInterpreter::MethodKind +// This table must be kept in sync with +// AbstractInterpreter::MethodKind. Note that every entry must have a +// corresponding fast entry point at addr + CODE_ALIGN_SIZE. asm_method_table: 2: .word normal_entry // method needs locals initialization @@ -2519,6 +2521,7 @@ CACHE_CP DISPATCH 1 + ALIGN_CODE vm_fatal_error: adr r0, .fatal_filename mov r1, #99 @@ -2526,6 +2529,13 @@ b breakpoint .fatal_filename: .ascii "[Optimsed Assembler Interpreter Loop]\000" + +// This extra entry point for vm_fatal_error (at vm_fatal_error + +// CODE_ALIGN_SIZE) allows vm_fatal_error to be used as an entry point +// in the asm_method_table. + ALIGN_CODE + b vm_fatal_error + ALIGN_WORD Opcode aastore From aph at redhat.com Tue Jan 17 07:41:00 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 17 Jan 2012 15:41:00 +0000 Subject: ARM: fix java.lang.Math.log10 In-Reply-To: <4F158B5D.3020502@redhat.com> References: <4F146F61.4060807@redhat.com> <4F156987.8040604@zafena.se> <4F158B5D.3020502@redhat.com> Message-ID: <4F15968C.4050006@redhat.com> On 01/17/2012 02:53 PM, Andrew Haley wrote: > On 01/17/2012 12:28 PM, Xerxes R?nby wrote: > >> (oddity no 2) >> When installing vm_fatal_error as entry to handle the "java.dyn.MethodHandles::invoke" causes a signal 11 >> I would have expected it to call report_should_not_reach_here and exit cleanly. >> >> # A fatal error has been detected by the Java Runtime Environment: >> # >> # Internal Error (os_linux_zero.cpp:270), pid=11232, tid=1090544752 >> # fatal error: caught unhandled signal 11 > > I'll fix that if you can provide a test case. Fixed thusly. Andrew. 2012-01-17 Andrew Haley * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (vm_fatal_error): Add an extra entry point at vm_fatal_error + CODE_ALIGN_SIZE to allow vm_fatal_error to be used as an entry point in asm_method_table. (putstatic_volatile_dw): Re-order register operands to silence warning. diff -r f57f03c70b52 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Jan 16 13:28:17 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Tue Jan 17 10:39:22 2012 -0500 @@ -789,7 +789,9 @@ 1: bx lr -// This table must be kept in sync with AbstractInterpreter::MethodKind +// This table must be kept in sync with +// AbstractInterpreter::MethodKind. Note that every entry must have a +// corresponding fast entry point at addr + CODE_ALIGN_SIZE. asm_method_table: 2: .word normal_entry // method needs locals initialization @@ -2155,7 +2157,7 @@ putstatic_volatile_dw: DISPATCH_START 3 add ip, r2, r3 - POP tmp1, tmp2 + POP tmp2, tmp1 DISPATCH_NEXT StoreStoreBarrier #ifndef __ARM_ARCH_7A__ @@ -2519,6 +2521,7 @@ CACHE_CP DISPATCH 1 + ALIGN_CODE vm_fatal_error: adr r0, .fatal_filename mov r1, #99 @@ -2526,6 +2529,13 @@ b breakpoint .fatal_filename: .ascii "[Optimsed Assembler Interpreter Loop]\000" + +// This extra entry point for vm_fatal_error (at vm_fatal_error + +// CODE_ALIGN_SIZE) allows vm_fatal_error to be used as an entry point +// in the asm_method_table. + ALIGN_CODE + b vm_fatal_error + ALIGN_WORD Opcode aastore From ptisnovs at icedtea.classpath.org Tue Jan 17 08:04:08 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 17 Jan 2012 16:04:08 +0000 Subject: /hg/gfx-test: 2012-01-17 Pavel Tisnovsky Message-ID: changeset f01a066ab3b3 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=f01a066ab3b3 author: Pavel Tisnovsky date: Tue Jan 17 17:06:27 2012 +0100 2012-01-17 Pavel Tisnovsky * src/org/gfxtest/framework/annotations/Transformation.java: Added two new transformation types: rotate and mirror. * src/org/gfxtest/testsuites/BitBltScaleImage.java: Updated transformation type. * src/org/gfxtest/testsuites/BitBltCropImage.java: * src/org/gfxtest/testsuites/BitBltMirrorImage.java: * src/org/gfxtest/testsuites/BitBltRotateImage.java: * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: Added new test stubs. * Makefile: updated diffstat: ChangeLog | 13 ++ Makefile | 8 + src/org/gfxtest/framework/annotations/Transformations.java | 13 ++- src/org/gfxtest/testsuites/BitBltCropImage.java | 79 +++++++++++++ src/org/gfxtest/testsuites/BitBltMirrorImage.java | 79 +++++++++++++ src/org/gfxtest/testsuites/BitBltRotateImage.java | 79 +++++++++++++ src/org/gfxtest/testsuites/BitBltScaleImage.java | 2 +- src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 80 ++++++++++++++ 8 files changed, 351 insertions(+), 2 deletions(-) diffs (416 lines): diff -r 9fc077318e00 -r f01a066ab3b3 ChangeLog --- a/ChangeLog Mon Jan 16 17:51:18 2012 +0100 +++ b/ChangeLog Tue Jan 17 17:06:27 2012 +0100 @@ -1,3 +1,16 @@ +2012-01-17 Pavel Tisnovsky + + * src/org/gfxtest/framework/annotations/Transformation.java: + Added two new transformation types: rotate and mirror. + * src/org/gfxtest/testsuites/BitBltScaleImage.java: + Updated transformation type. + * src/org/gfxtest/testsuites/BitBltCropImage.java: + * src/org/gfxtest/testsuites/BitBltMirrorImage.java: + * src/org/gfxtest/testsuites/BitBltRotateImage.java: + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Added new test stubs. + * Makefile: updated + 2012-01-16 Pavel Tisnovsky * src/org/gfxtest/framework/CommonBitmapOperations.java: diff -r 9fc077318e00 -r f01a066ab3b3 Makefile --- a/Makefile Mon Jan 16 17:51:18 2012 +0100 +++ b/Makefile Tue Jan 17 17:06:27 2012 +0100 @@ -109,7 +109,11 @@ $(CLASSES)/$(TESTSUITE_DIR)/AlphaComposite.class \ $(CLASSES)/$(TESTSUITE_DIR)/BlankImage.class \ $(CLASSES)/$(TESTSUITE_DIR)/BitBltBasicTests.class \ + $(CLASSES)/$(TESTSUITE_DIR)/BitBltCropImage.class \ + $(CLASSES)/$(TESTSUITE_DIR)/BitBltMirrorImage.class \ + $(CLASSES)/$(TESTSUITE_DIR)/BitBltRotateImage.class \ $(CLASSES)/$(TESTSUITE_DIR)/BitBltScaleImage.class \ + $(CLASSES)/$(TESTSUITE_DIR)/BitBltUsingBgColor.class \ $(CLASSES)/$(TESTSUITE_DIR)/ColorPaint.class \ $(CLASSES)/$(TESTSUITE_DIR)/NormalArcs.class \ $(CLASSES)/$(TESTSUITE_DIR)/NormalLines.class \ @@ -172,7 +176,11 @@ $(RESULTS)/AlphaComposite \ $(RESULTS)/BlankImage \ $(RESULTS)/BitBltBasicTests \ + $(RESULTS)/BitBltCropImage \ + $(RESULTS)/BitBltMirrorImage \ + $(RESULTS)/BitBltRotateImage \ $(RESULTS)/BitBltScaleImage \ + $(RESULTS)/BitBltUsingBgColor \ $(RESULTS)/ColorPaint \ $(RESULTS)/NormalArcs \ $(RESULTS)/NormalLines \ diff -r 9fc077318e00 -r f01a066ab3b3 src/org/gfxtest/framework/annotations/Transformations.java --- a/src/org/gfxtest/framework/annotations/Transformations.java Mon Jan 16 17:51:18 2012 +0100 +++ b/src/org/gfxtest/framework/annotations/Transformations.java Tue Jan 17 17:06:27 2012 +0100 @@ -53,8 +53,19 @@ * None transformation is used (ie transformation is set to identify) */ NONE, + /** - * Scale is used. + * Scale linear transformation is used. */ SCALE, + + /** + * Rotation linear transformation is used. + */ + ROTATION, + + /** + * Mirror linear transformation is used. + */ + MIRROR, } diff -r 9fc077318e00 -r f01a066ab3b3 src/org/gfxtest/testsuites/BitBltCropImage.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/BitBltCropImage.java Tue Jan 17 17:06:27 2012 +0100 @@ -0,0 +1,79 @@ +/* + Java gfx-test framework + + Copyright (C) 2010, 2011, 2012 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 check the rendering of buffered images (so called bit block + * transfers or Bit Blt) created by various constructors. Such images are + * rendered cropped - only partial image is used for the BitBlt operation. + * + * @author Pavel Tisnovsky + */ + at TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.COMMON_BITMAP) + at RenderStyle(RenderStyles.NORMAL_AA) + at Transformation(Transformations.NONE) + at Zoom(1) +public class BitBltCropImage extends GfxTest +{ + /** + * Entry point to the test suite. + * + * @param args not used in this case + */ + public static void main(String[] args) + { + new BitBltCropImage().runTestSuite(args); + } +} diff -r 9fc077318e00 -r f01a066ab3b3 src/org/gfxtest/testsuites/BitBltMirrorImage.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/BitBltMirrorImage.java Tue Jan 17 17:06:27 2012 +0100 @@ -0,0 +1,79 @@ +/* + Java gfx-test framework + + Copyright (C) 2010, 2011, 2012 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 check the rendering of buffered images (so called bit block + * transfers or Bit Blt) created by various constructors. Such images are + * rendered using flip (mirror) linear transformation. + * + * @author Pavel Tisnovsky + */ + at TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.COMMON_BITMAP) + at RenderStyle(RenderStyles.NORMAL_AA) + at Transformation(Transformations.MIRROR) + at Zoom(1) +public class BitBltMirrorImage extends GfxTest +{ + /** + * Entry point to the test suite. + * + * @param args not used in this case + */ + public static void main(String[] args) + { + new BitBltMirrorImage().runTestSuite(args); + } +} diff -r 9fc077318e00 -r f01a066ab3b3 src/org/gfxtest/testsuites/BitBltRotateImage.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/BitBltRotateImage.java Tue Jan 17 17:06:27 2012 +0100 @@ -0,0 +1,79 @@ +/* + Java gfx-test framework + + Copyright (C) 2010, 2011, 2012 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 check the rendering of buffered images (so called bit block + * transfers or Bit Blt) created by various constructors. Such images are + * rendered using rotation linear transformation. + * + * @author Pavel Tisnovsky + */ + at TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.COMMON_BITMAP) + at RenderStyle(RenderStyles.NORMAL_AA) + at Transformation(Transformations.ROTATION) + at Zoom(1) +public class BitBltRotateImage extends GfxTest +{ + /** + * Entry point to the test suite. + * + * @param args not used in this case + */ + public static void main(String[] args) + { + new BitBltRotateImage().runTestSuite(args); + } +} diff -r 9fc077318e00 -r f01a066ab3b3 src/org/gfxtest/testsuites/BitBltScaleImage.java --- a/src/org/gfxtest/testsuites/BitBltScaleImage.java Mon Jan 16 17:51:18 2012 +0100 +++ b/src/org/gfxtest/testsuites/BitBltScaleImage.java Tue Jan 17 17:06:27 2012 +0100 @@ -71,7 +71,7 @@ @TestType(TestTypes.RENDER_TEST) @GraphicsPrimitive(GraphicsPrimitives.COMMON_BITMAP) @RenderStyle(RenderStyles.NORMAL_AA) - at Transformation(Transformations.NONE) + at Transformation(Transformations.SCALE) @Zoom(1) public class BitBltScaleImage extends GfxTest { diff -r 9fc077318e00 -r f01a066ab3b3 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Tue Jan 17 17:06:27 2012 +0100 @@ -0,0 +1,80 @@ +/* + Java gfx-test framework + + Copyright (C) 2010, 2011, 2012 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 check the rendering of buffered images (so called bit block + * transfers or Bit Blt) created by various constructors. Such images are + * rendered with explicitly set background color which should affect + * transparent or semi-transparent images. + * + * @author Pavel Tisnovsky + */ + at TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.COMMON_BITMAP) + at RenderStyle(RenderStyles.NORMAL_AA) + at Transformation(Transformations.NONE) + at Zoom(1) +public class BitBltUsingBgColor extends GfxTest +{ + /** + * Entry point to the test suite. + * + * @param args not used in this case + */ + public static void main(String[] args) + { + new BitBltUsingBgColor().runTestSuite(args); + } +} From bugzilla-daemon at icedtea.classpath.org Tue Jan 17 16:49:10 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 18 Jan 2012 00:49:10 +0000 Subject: [Bug 855] New: AppletStub getDocumentBase() doesn't return full URL Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=855 Bug #: 855 Summary: AppletStub getDocumentBase() doesn't return full URL Classification: Unclassified Product: IcedTea-Web Version: unspecified Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: Plugin AssignedTo: dbhole at redhat.com ReportedBy: alex at jurkiewi.cz CC: unassigned at icedtea.classpath.org http://docs.oracle.com/javase/6/docs/api/java/applet/AppletStub.html#getDocumentBase%28%29 Code: http://alex.jurkiewi.cz/AppletStubTest/test.html Applet: http://alex.jurkiewi.cz/AppletStubTest/test.html On Windows, the applet shows the URL "http://alex.jurkiewi.cz/AppletStubTest/test.html" On Ubuntu, I only get "http://alex.jurkiewi.cz/AppletStubTest/", which is incorrect. Ubuntu Java: $ java -version java version "1.6.0_23" OpenJDK Runtime Environment (IcedTea6 1.11pre) (6b23~pre11-0ubuntu1.11.10) OpenJDK 64-Bit Server VM (build 20.0-b11, mixed mode) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue Jan 17 16:50:20 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 18 Jan 2012 00:50:20 +0000 Subject: [Bug 855] AppletStub getDocumentBase() doesn't return full URL In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=855 --- Comment #1 from AJ 2012-01-18 00:50:20 UTC --- Sorry, sample code URL is http://alex.jurkiewi.cz/AppletStubTest/AppletStubTest.java -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue Jan 17 16:55:51 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 18 Jan 2012 00:55:51 +0000 Subject: [Bug 855] AppletStub getDocumentBase() doesn't return full URL In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=855 --- Comment #2 from AJ 2012-01-18 00:55:51 UTC --- Icetea plugin version: IcedTea-Web 1.1.3 (1.1.3-1ubuntu1.1) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue Jan 17 16:56:28 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 18 Jan 2012 00:56:28 +0000 Subject: [Bug 855] AppletStub getDocumentBase() doesn't return full URL In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=855 AJ changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |1.1.3 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue Jan 17 17:31:49 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 18 Jan 2012 01:31:49 +0000 Subject: [Bug 835] javaws findBestUrl leaks TCP connections In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=835 Brian De Wolf changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|javaws findBestUrl collects |javaws findBestUrl leaks |open connections |TCP connections --- Comment #1 from Brian De Wolf 2012-01-18 01:31:49 UTC --- Update summary to more accurately describe the problem. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ptisnovs at icedtea.classpath.org Wed Jan 18 01:57:07 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 18 Jan 2012 09:57:07 +0000 Subject: /hg/gfx-test: 2012-01-18 Pavel Tisnovsky Message-ID: changeset 0f154450543f in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=0f154450543f author: Pavel Tisnovsky date: Wed Jan 18 10:59:30 2012 +0100 2012-01-18 Pavel Tisnovsky * src/org/gfxtest/framework/CommonBitmapOperations.java: * src/org/gfxtest/framework/ImageFactory.java: Added support for new pattern types. * src/org/gfxtest/testsuites/BitBltBasicTests.java: Added new tests which use new pattern types. diffstat: ChangeLog | 8 + src/org/gfxtest/framework/CommonBitmapOperations.java | 89 +++++++++++++++ src/org/gfxtest/framework/ImageFactory.java | 103 +++++++++++++++++- src/org/gfxtest/testsuites/BitBltBasicTests.java | 28 ++++ 4 files changed, 224 insertions(+), 4 deletions(-) diffs (317 lines): diff -r f01a066ab3b3 -r 0f154450543f ChangeLog --- a/ChangeLog Tue Jan 17 17:06:27 2012 +0100 +++ b/ChangeLog Wed Jan 18 10:59:30 2012 +0100 @@ -1,3 +1,11 @@ +2012-01-18 Pavel Tisnovsky + + * src/org/gfxtest/framework/CommonBitmapOperations.java: + * src/org/gfxtest/framework/ImageFactory.java: + Added support for new pattern types. + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Added new tests which use new pattern types. + 2012-01-17 Pavel Tisnovsky * src/org/gfxtest/framework/annotations/Transformation.java: diff -r f01a066ab3b3 -r 0f154450543f src/org/gfxtest/framework/CommonBitmapOperations.java --- a/src/org/gfxtest/framework/CommonBitmapOperations.java Tue Jan 17 17:06:27 2012 +0100 +++ b/src/org/gfxtest/framework/CommonBitmapOperations.java Wed Jan 18 10:59:30 2012 +0100 @@ -127,6 +127,7 @@ public static TestResult doBitBltTestWithEmptyImage(TestImage image, Graphics2D graphics2d, int type) { BufferedImage bufferedImage = createBufferedBitmap(type); + // basic check if buffered image was created if (bufferedImage == null) { return TestResult.FAILED; @@ -147,6 +148,7 @@ public static TestResult doBitBltTestWithCheckerImage(TestImage image, Graphics2D graphics2d, int imageType) { BufferedImage bufferedImage = ImageFactory.createCheckerImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created if (bufferedImage == null) { return TestResult.FAILED; @@ -167,6 +169,7 @@ public static TestResult doBitBltTestWithCheckerImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) { BufferedImage bufferedImage = ImageFactory.createCheckerImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created if (bufferedImage == null) { return TestResult.FAILED; @@ -187,6 +190,7 @@ public static TestResult doBitBltTestWithDiagonalCheckerImage(TestImage image, Graphics2D graphics2d, int imageType) { BufferedImage bufferedImage = ImageFactory.createDiagonalCheckerImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created if (bufferedImage == null) { return TestResult.FAILED; @@ -207,6 +211,91 @@ public static TestResult doBitBltTestWithDiagonalCheckerImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) { BufferedImage bufferedImage = ImageFactory.createDiagonalCheckerImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing grid pattern and then do basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + */ + public static TestResult doBitBltTestWithGridImage(TestImage image, Graphics2D graphics2d, int imageType) + { + BufferedImage bufferedImage = ImageFactory.createGridImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing grid pattern and then do basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + */ + public static TestResult doBitBltTestWithGridImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) + { + BufferedImage bufferedImage = ImageFactory.createGridImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing diagonal grid pattern and then do basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + */ + public static TestResult doBitBltTestWithDiagonalGridImage(TestImage image, Graphics2D graphics2d, int imageType) + { + BufferedImage bufferedImage = ImageFactory.createDiagonalGridImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + /** + * Create new buffered image containing diagonal grid pattern and then do basic BitBlt test. + * + * @param image + * image to which another image is to be drawn + * @param graphics2d + * graphics canvas + * @param imageType + * type of the created image + */ + public static TestResult doBitBltTestWithDiagonalGridImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) + { + BufferedImage bufferedImage = ImageFactory.createDiagonalGridImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created if (bufferedImage == null) { return TestResult.FAILED; diff -r f01a066ab3b3 -r 0f154450543f src/org/gfxtest/framework/ImageFactory.java --- a/src/org/gfxtest/framework/ImageFactory.java Tue Jan 17 17:06:27 2012 +0100 +++ b/src/org/gfxtest/framework/ImageFactory.java Wed Jan 18 10:59:30 2012 +0100 @@ -53,7 +53,19 @@ public class ImageFactory { /** - * Create image containing checker pattern. + * Converts boolean value into an integer representing black or white color. + * + * @param whiteColorFlag + * true if white color is required, false otherwise + * @return integer representing black or white color + */ + private static int booleanToBlackOrWhiteColor(boolean whiteColorFlag) + { + return whiteColorFlag ? 0xffffffff: 0xff000000; + } + + /** + * Create image containing checker black and white pattern. * * @param gridSize * size of a grid @@ -84,7 +96,8 @@ boolean evenRow = (y % doubledGridSize) >= gridSize; // compute color for each pixel boolean whiteField = evenColumn ^ evenRow; - int color = whiteField ? 0xffffffff: 0xff000000; + // convert boolean into color code + int color = booleanToBlackOrWhiteColor(whiteField); image.setRGB(x, y, color); } } @@ -92,7 +105,7 @@ } /** - * Create image containing diagonal checker pattern. + * Create image containing diagonal checker black and white pattern. * * @param gridSize * size of a grid @@ -126,10 +139,92 @@ boolean evenRow = ((width2 + x - y) % doubledGridSize) >= gridSize; // compute color for each pixel boolean whiteField = evenColumn ^ evenRow; - int color = whiteField ? 0xffffffff: 0xff000000; + // convert boolean into color code + int color = booleanToBlackOrWhiteColor(whiteField); image.setRGB(x, y, color); } } return image; } + + /** + * Create image containing simple grid black and white pattern. + * + * @param gridSize + * size of a grid + * @param width + * width of a buffered image + * @param height + * height of a buffered image + * @param imageType + * buffered image type + * @return buffered image containing checker pattern + */ + public static BufferedImage createGridImage(int gridSize, int width, int height, int imageType) + { + // used by test for a tile colors + int doubledGridSize = gridSize << 1; + + // create new image + BufferedImage image = new BufferedImage(width, height, imageType); + + // for all lines in a raster image + for (int y = 0; y < height; y++) + { + // for all columns on a line + for (int x = 0; x < width; x++) + { + // compute color for each tile + boolean evenColumn = (x % doubledGridSize) == 0; + boolean evenRow = (y % doubledGridSize) == 0; + // compute color for each pixel + boolean blackField = evenColumn || evenRow; + // convert boolean into color code + int color = booleanToBlackOrWhiteColor(!blackField); + image.setRGB(x, y, color); + } + } + return image; + } + + /** + * Create image containing simple diagonal grid black and white pattern. + * + * @param gridSize + * size of a grid + * @param width + * width of a buffered image + * @param height + * height of a buffered image + * @param imageType + * buffered image type + * @return buffered image containing checker pattern + */ + public static BufferedImage createDiagonalGridImage(int gridSize, int width, int height, int imageType) + { + // used by test for a tile colors + int doubledGridSize = gridSize << 1; + + // create new image + BufferedImage image = new BufferedImage(width, height, imageType); + + // for all lines in a raster image + for (int y = 0; y < height; y++) + { + // for all columns on a line + for (int x = 0; x < width; x++) + { + // compute color for each tile + boolean evenColumn = ((x+y) % doubledGridSize) == 0; + boolean evenRow = ((x-y) % doubledGridSize) == 0; + // compute color for each pixel + boolean blackField = evenColumn || evenRow; + // convert boolean into color code + int color = booleanToBlackOrWhiteColor(!blackField); + image.setRGB(x, y, color); + } + } + return image; + } + } diff -r f01a066ab3b3 -r 0f154450543f src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Tue Jan 17 17:06:27 2012 +0100 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed Jan 18 10:59:30 2012 +0100 @@ -411,6 +411,34 @@ } /** + * Test basic BitBlt operation for grid buffered image with type TYPE_BYTE_BINARY. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltGridBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** + * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_BYTE_BINARY. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltDiagonalGridBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** * Entry point to the test suite. * * @param args not used in this case From xerxes at zafena.se Wed Jan 18 02:54:05 2012 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Wed, 18 Jan 2012 11:54:05 +0100 Subject: ARM: fix java.lang.Math.log10 In-Reply-To: <4F15968C.4050006@redhat.com> References: <4F146F61.4060807@redhat.com> <4F156987.8040604@zafena.se> <4F158B5D.3020502@redhat.com> <4F15968C.4050006@redhat.com> Message-ID: <4F16A4CD.1000106@zafena.se> 2012-01-17 16:41, Andrew Haley skrev: > On 01/17/2012 02:53 PM, Andrew Haley wrote: >> On 01/17/2012 12:28 PM, Xerxes R?nby wrote: > >> >>> (oddity no 2) >>> When installing vm_fatal_error as entry to handle the "java.dyn.MethodHandles::invoke" causes a signal 11 >>> I would have expected it to call report_should_not_reach_here and exit cleanly. >>> >>> # A fatal error has been detected by the Java Runtime Environment: >>> # >>> # Internal Error (os_linux_zero.cpp:270), pid=11232, tid=1090544752 >>> # fatal error: caught unhandled signal 11 >> >> I'll fix that if you can provide a test case. > > Fixed thusly. Thanks! > > Andrew. > This patch are OK for icedtea6 head and icedtea6 1.11 release branch. I have included a follow up patch to re-order some more register operands to silence warning for armv5 as well, see below. > > > 2012-01-17 Andrew Haley > > * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S > (vm_fatal_error): Add an extra entry point at vm_fatal_error + > CODE_ALIGN_SIZE to allow vm_fatal_error to be used as an entry > point in asm_method_table. > > (putstatic_volatile_dw): Re-order register operands to silence warning. > > diff -r f57f03c70b52 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S > --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Jan 16 13:28:17 2012 -0500 > +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Tue Jan 17 10:39:22 2012 -0500 > @@ -789,7 +789,9 @@ > 1: > bx lr > > -// This table must be kept in sync with AbstractInterpreter::MethodKind > +// This table must be kept in sync with > +// AbstractInterpreter::MethodKind. Note that every entry must have a > +// corresponding fast entry point at addr + CODE_ALIGN_SIZE. > asm_method_table: > 2: > .word normal_entry // method needs locals initialization ok > @@ -2155,7 +2157,7 @@ > putstatic_volatile_dw: > DISPATCH_START 3 > add ip, r2, r3 > - POP tmp1, tmp2 > + POP tmp2, tmp1 > DISPATCH_NEXT > StoreStoreBarrier > #ifndef __ARM_ARCH_7A__ I had to swap order for the stm instruction in the #ifndef __ARM_ARCH_7A__ as well to match this change, it fix and silence one more warning on non armv7 hosts. Index: build/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S =================================================================== --- build.orig/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S 2012-01-18 10:41:58.000000000 +0100 +++ build/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S 2012-01-18 10:42:45.000000000 +0100 @@ -2161,7 +2161,7 @@ DISPATCH_NEXT StoreStoreBarrier #ifndef __ARM_ARCH_7A__ - stm ip, {tmp1, tmp2} + stm ip, {tmp2, tmp1} #else // Data in tmp1 & tmp2, address in ip, r2 & r3 scratch 0: ldrexd r2, r3, [ip] I have tried to verify if Volatile long operate correctly by running the Volatile tests from: http://www.cs.umd.edu/~pugh/java/memoryModel/ on armv5 and armv7. Testcase: cd into icedtea build dir and execute wget http://www.cs.umd.edu/~pugh/java/memoryModel/Volatiles.tar tar xvf Volatiles.tar ./openjdk.build/j2sdk-image/bin/javac volatile/AtomicLong.java ./openjdk.build/j2sdk-image/bin/javac volatile/CoherenceVolatile.java ./openjdk.build/j2sdk-image/bin/javac volatile/ReadAfterWrite.java ./openjdk.build/j2sdk-image/bin/java -cp volatile AtomicLong ./openjdk.build/j2sdk-image/bin/java -cp volatile CoherenceVolatile ./openjdk.build/j2sdk-image/bin/java -cp volatile ReadAfterWrite These tests pass, good, but a pass of these tests are still no guarantee that volatile longs work under all situations. I really have no idea on how to reliably test volatile long operation. > @@ -2519,6 +2521,7 @@ > CACHE_CP > DISPATCH 1 > > + ALIGN_CODE > vm_fatal_error: > adr r0, .fatal_filename > mov r1, #99 > @@ -2526,6 +2529,13 @@ > b breakpoint > .fatal_filename: > .ascii "[Optimsed Assembler Interpreter Loop]\000" > + > +// This extra entry point for vm_fatal_error (at vm_fatal_error + > +// CODE_ALIGN_SIZE) allows vm_fatal_error to be used as an entry point > +// in the asm_method_table. > + ALIGN_CODE > + b vm_fatal_error > + > ALIGN_WORD > > Opcode aastore ok Cheers Xerxes From aph at redhat.com Wed Jan 18 03:53:41 2012 From: aph at redhat.com (Andrew Haley) Date: Wed, 18 Jan 2012 11:53:41 +0000 Subject: ARM: fix java.lang.Math.log10 In-Reply-To: <4F16A4CD.1000106@zafena.se> References: <4F146F61.4060807@redhat.com> <4F156987.8040604@zafena.se> <4F158B5D.3020502@redhat.com> <4F15968C.4050006@redhat.com> <4F16A4CD.1000106@zafena.se> Message-ID: <4F16B2C5.4070201@redhat.com> On 01/18/2012 10:54 AM, Xerxes R?nby wrote: > I really have no idea on how to reliably test volatile long operation. It's impossible. Even when volatile longs were broken, all of the tests that were supposed to detect incorrect handling still passed. There really is very little chance of detecting it. Andrew. From aph at icedtea.classpath.org Wed Jan 18 04:04:10 2012 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Wed, 18 Jan 2012 12:04:10 +0000 Subject: /hg/icedtea6: 7 new changesets Message-ID: changeset fc7a57de5179 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fc7a57de5179 author: aph date: Fri Jan 13 10:07:43 2012 -0500 Fix bytecode numbering of return_register_finalizer in safe_dispatch_table. 2012-01-13 Andrew Haley * arm_port/hotspot/tools/mkbc.c (writeouttable): Add numbering comments to bytecode output. * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Return): Move safepoint before monitor is unlocked. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (safe_dispatch_table): Add comment. Correct order of do_return_register_finalizer. Add numbering comments. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (TRACE): New macro. changeset 291293b66f4e in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=291293b66f4e author: aph date: Fri Jan 13 15:14:21 2012 +0000 merge changeset 2bbcc83417ae in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2bbcc83417ae author: aph date: Mon Jan 16 13:25:01 2012 -0500 2012-01-16 Andrew Haley * Makefile.am (check-jdk): Restore the --samevm line that was deleted by mistake in an earlier merge. changeset f57f03c70b52 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f57f03c70b52 author: aph date: Mon Jan 16 13:28:17 2012 -0500 2012-01-16 Andrew Haley * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (asm_method_table): Add entry for java.dyn.MethodHandles::invoke. (asm_generate_method_entry): Replace constant 14 with calculation based on the size of asm_method_table. Add some comments. changeset 8d8dc4529419 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8d8dc4529419 author: aph date: Tue Jan 17 10:41:44 2012 -0500 allow vm_fatal_error to be used as an entry point in asm_method_table. 2012-01-17 Andrew Haley * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (vm_fatal_error): Add an extra entry point at vm_fatal_error + CODE_ALIGN_SIZE to allow vm_fatal_error to be used as an entry point in asm_method_table. (putstatic_volatile_dw): Re-order register operands to silence warning. changeset 6c3ccf66f01b in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6c3ccf66f01b author: aph date: Wed Jan 18 11:57:33 2012 +0000 Re-order register operands to silence warning. 2012-01-18 Xerxes Ranby * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (putstatic_volatile_dw): Re-order register operands to silence warning. changeset 876219858298 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=876219858298 author: aph date: Wed Jan 18 12:03:17 2012 +0000 merge diffstat: ChangeLog | 72 + Makefile.am | 8 +- NEWS | 38 +- arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 4 + arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 580 +++++---- arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 4 +- arm_port/hotspot/tools/mkbc.c | 6 +- patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch | 91 + patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch | 40 + patches/openjdk/683768-System-tray-icon.patch | 79 - patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch | 93 + 11 files changed, 646 insertions(+), 369 deletions(-) diffs (truncated from 1206 to 500 lines): diff -r 79014132e844 -r 876219858298 ChangeLog --- a/ChangeLog Tue Jan 10 16:47:52 2012 +0000 +++ b/ChangeLog Wed Jan 18 12:03:17 2012 +0000 @@ -1,3 +1,75 @@ +2012-01-18 Xerxes R??nby + + * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (putstatic_volatile_dw): Re-order register operands to silence + warning. + +2012-01-17 Andrew Haley + + * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (vm_fatal_error): Add an extra entry point at vm_fatal_error + + CODE_ALIGN_SIZE to allow vm_fatal_error to be used as an entry + point in asm_method_table. + + (putstatic_volatile_dw): Re-order register operands to silence warning. + +2012-01-16 Andrew Haley + + * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (asm_method_table): + Add entry for java.dyn.MethodHandles::invoke. + (asm_generate_method_entry): Replace constant 14 with calculation + based on the size of asm_method_table. + Add some comments. + +2012-01-16 Andrew Haley + + * Makefile.am (check-jdk): Restore the --samevm line that was + deleted by mistake in an earlier merge. + +2012-01-13 Andrew Haley + + * arm_port/hotspot/tools/mkbc.c (writeouttable): Add numbering + comments to bytecode output. + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Return): + Move safepoint before monitor is unlocked. + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (safe_dispatch_table): Add comment. + Correct order of do_return_register_finalizer. + Add numbering comments. + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (TRACE): + New macro. + +2012-01-17 Pavel Tisnovsky + + * Makefile.am: Add new patch. + * NEWS: Mention backport. + * patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch: + Backport of 6761072: new krb5 tests fail on multiple platforms + +2012-01-12 Danesh Dadachanji + + * Makefile.am: + (ICEDTEA_PATCHES): Replace patches/openjdk/683768-System-tray-icon.patch with + patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch + * NEWS: Moved RH683768 from Bug fixes to 1.11 Backports, added S7103610 to it. + * patches/openjdk/683768-System-tray-icon.patch: Removed. + * patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch: + New file. Sets XAtoms _NET_WM_PID and WM_CLIENT_MACHINE for X windows. + +2012-01-12 Andrew John Hughes + + * NEWS: Add 1.10.5, 1.9.12 and 1.8.12 + release notes. Remove duplicates from 1.11. + +2012-01-12 Pavel Tisnovsky + + * Makefile.am: Add new patch. + * NEWS: Mention backport. + * patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch: + Backport of 6764553: + com.sun.org.apache.xml.internal.security.utils.IdResolver is not + thread safe. + 2012-01-10 Andrew John Hughes * Makefile.am: Add new patch. diff -r 79014132e844 -r 876219858298 Makefile.am --- a/Makefile.am Tue Jan 10 16:47:52 2012 +0000 +++ b/Makefile.am Wed Jan 18 12:03:17 2012 +0000 @@ -399,12 +399,14 @@ patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \ patches/openjdk/7103224-glibc_name_collision.patch \ patches/arm-debug.patch \ - patches/openjdk/683768-System-tray-icon.patch \ + patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \ patches/openjdk/7102369-7094468-rmiregistry.patch \ patches/openjdk/6851973-kerberos.patch \ patches/openjdk/7091528-javadoc_class_files.patch \ patches/openjdk/7103725-ssl_beast_regression.patch \ - patches/openjdk/6706974-krb5_test_infrastructure.patch + patches/openjdk/6706974-krb5_test_infrastructure.patch \ + patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \ + patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch if WITH_RHINO ICEDTEA_PATCHES += \ @@ -2171,7 +2173,7 @@ $${XVFB_RUN} \ $(BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \ -w:test/jdk/JTwork -r:test/jdk/JTreport \ - \ + $${ICEDTEA_JTREG_OTHERVM:--samevm} \ -jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \ -exclude:$(abs_top_srcdir)/$(JTREG_DIR)/excludelist.jdk.jtx \ $(ICEDTEA_JTREG_OPTIONS) \ diff -r 79014132e844 -r 876219858298 NEWS --- a/NEWS Tue Jan 10 16:47:52 2012 +0000 +++ b/NEWS Wed Jan 18 12:03:17 2012 +0000 @@ -14,6 +14,8 @@ * Backports - 6706974: Add krb5 test infrastructure + - 6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe + - 6761072: new krb5 tests fail on multiple platforms New in release 1.11 (2012-XX-XX): @@ -27,7 +29,6 @@ - PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan - RH727195: Japanese font mappings are broken - LP862286: Fix exception on trying to start PulseAudio playback - - RH683768: Add a workaround for Java applications using tray icon for Gnome Shell - PR719: make distcheck should work in IcedTea6 * Import of OpenJDK6 b24 - S7099148: increment build number of hs20.0 to b12 @@ -348,8 +349,6 @@ - S6748082: remove platform-specific code from SwingUtilities2.isDisplayLocal - S6708580: Java applications slow when EXA enabled - S6986968: Crash on XIM server restart - - S7034464: Support transparent large pages on Linux - - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used - S7018387: Xrender pipeline may leak GC's - S7036754: Stroked quads sometimes contain NaN - S7008106: com/sun/awt/Translucency/WindowOpacity.java test fails. @@ -385,11 +384,7 @@ - S5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" - S6296893: BMP Writer handles TopDown property incorrectly for some of the compression types - S7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc - - S7102369: remove java.rmi.server.codebase property parsing from registyimpl - - S7094468: rmiregistry clean up - - S6851973: ignore incoming channel binding if acceptor does not set one - - S7091528: javadoc attempts to parse .class files - - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S7103610, RH683768: _NET_WM_PID and WM_CLIENT_MACHINE are not set * ARM Port - Ported to the EABI hard-fp model - Locking for multi-core operation added. @@ -457,6 +452,33 @@ - PR690: Shark fails to JIT using hs20. - PR696: Zero fails to handle fast_aldc and fast_aldc_w in hs20. +New in release 1.10.5 (2012-01-11): + +* Backports + - S7034464: Support transparent large pages on Linux + - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used + - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468, RH751203: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one + - S7091528: javadoc attempts to parse .class files + +New in release 1.9.12 (2012-01-11): + +* Backports + - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468, RH751203: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one + +New in release 1.8.12 (2012-01-11): + +* Backports + - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468, RH751203: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one + New in release 1.9.11 (2011-11-08): * Security fixes diff -r 79014132e844 -r 876219858298 arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def --- a/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Tue Jan 10 16:47:52 2012 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Wed Jan 18 12:03:17 2012 +0000 @@ -29,6 +29,10 @@ #define FAST_BYTECODES #endif +/* WARNING: If you change any of these bytecodes, you must also + change the safe_dispatch_table in cppInterpreter_arm.S to make it + match. */ + nop = 0x00, 1 aconst_null = 0x01, 1 iconst_m1 = 0x02, 1 diff -r 79014132e844 -r 876219858298 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Tue Jan 10 16:47:52 2012 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Wed Jan 18 12:03:17 2012 +0000 @@ -483,6 +483,19 @@ .set dispatch_state, dispatch_state + 1 .endm + @ This macro calls a user-supplied my_trace routine. It + @ passes the current JPC as argument zero. It can be safely + @ inserted at any point in the interpreter. + .macro TRACE + stmfd sp!, {r0, r1, r2, r3, r4, lr} + mrs r4, cpsr + mov r0, jpc + ldr r2, =my_trace + blx r2 + msr cpsr, r4 + ldmfd sp!, {r0, r1, r2, r3, r4, lr} + .endm + .macro DISPATCH_FINISH .if dispatch_state == 0 .error "DISPATCH_FINISH without a DISPATCH_START or DISPATCH_STATE" @@ -769,28 +782,35 @@ cmp r2, #0 bne 1f - cmp r3, #14 + cmp r3, #((3f-2f)/4) // i.e. sizeof asm_method_table adrcc ip, asm_method_table ldrcc r0, [ip, r3, lsl #2] #endif // PRODUCT 1: bx lr + +// This table must be kept in sync with +// AbstractInterpreter::MethodKind. Note that every entry must have a +// corresponding fast entry point at addr + CODE_ALIGN_SIZE. asm_method_table: - .word normal_entry - .word normal_entry_synchronized - .word native_entry - .word native_entry_synchronized - .word empty_entry - .word accessor_entry - .word normal_entry @ abstract entry - .word normal_entry @ java_lang_math_sin - .word normal_entry @ java_lang_math_cos - .word normal_entry @ java_lang_math_tan - .word normal_entry @ java_lang_math_abs - .word normal_entry @ java_lang_math_sqrt - .word normal_entry @ java_lang_math_log - .word normal_entry @ java_lang_math_log10 - +2: + .word normal_entry // method needs locals initialization + .word normal_entry_synchronized // method needs locals initialization & is synchronized + .word native_entry // native method + .word native_entry_synchronized // native method & is synchronized + .word empty_entry // empty method (code: _return) + .word accessor_entry // accessor method (code: _aload_0, _getfield, _(a|i)return) + .word normal_entry // abstract method (throws an AbstractMethodException) + .word vm_fatal_error // java.dyn.MethodHandles::invoke + .word normal_entry // implementation of java.lang.Math.sin (x) + .word normal_entry // implementation of java.lang.Math.cos (x) + .word normal_entry // implementation of java.lang.Math.tan (x) + .word normal_entry // implementation of java.lang.Math.abs (x) + .word normal_entry // implementation of java.lang.Math.sqrt (x) + .word normal_entry // implementation of java.lang.Math.log (x) + .word normal_entry // implementation of java.lang.Math.log10 (x) +3: + ALIGN_CODE native_entry_synchronized: b fast_native_entry_synchronized @@ -2137,11 +2157,11 @@ putstatic_volatile_dw: DISPATCH_START 3 add ip, r2, r3 - POP tmp1, tmp2 + POP tmp2, tmp1 DISPATCH_NEXT StoreStoreBarrier #ifndef __ARM_ARCH_7A__ - stm ip, {tmp1, tmp2} + stm ip, {tmp2, tmp1} #else // Data in tmp1 & tmp2, address in ip, r2 & r3 scratch 0: ldrexd r2, r3, [ip] @@ -2501,6 +2521,7 @@ CACHE_CP DISPATCH 1 + ALIGN_CODE vm_fatal_error: adr r0, .fatal_filename mov r1, #99 @@ -2508,6 +2529,13 @@ b breakpoint .fatal_filename: .ascii "[Optimsed Assembler Interpreter Loop]\000" + +// This extra entry point for vm_fatal_error (at vm_fatal_error + +// CODE_ALIGN_SIZE) allows vm_fatal_error to be used as an entry point +// in the asm_method_table. + ALIGN_CODE + b vm_fatal_error + ALIGN_WORD Opcode aastore @@ -4753,262 +4781,266 @@ #ifdef NOTICE_SAFEPOINTS safe_dispatch_table: - .word do_nop - .word do_u4const_0 - .word do_iconst_N - .word do_iconst_N - .word do_iconst_N - .word do_iconst_N - .word do_iconst_N - .word do_iconst_N - .word do_iconst_N - .word do_u8const_0 - .word do_lconst_1 - .word do_u4const_0 - .word do_fconst_1 - .word do_fconst_2 - .word do_u8const_0 - .word do_dconst_1 - .word do_bipush - .word do_sipush - .word do_ldc - .word do_ldc_w - .word do_ldc2_w - .word do_u4load - .word do_u8load - .word do_u4load - .word do_u8load - .word do_u4load - .word do_iload_0 - .word do_iload_0 - .word do_iload_0 - .word do_iload_0 - .word do_u8load_0 - .word do_u8load_1 - .word do_u8load_2 - .word do_u8load_3 - .word do_fload_0 - .word do_fload_0 - .word do_fload_0 - .word do_fload_0 - .word do_u8load_0 - .word do_u8load_1 - .word do_u8load_2 - .word do_u8load_3 - .word do_aload_0 - .word do_aload_0 - .word do_aload_0 - .word do_aload_0 - .word do_u4aload - .word do_u8aload - .word do_u4aload - .word do_u8aload - .word do_u4aload - .word do_baload - .word do_caload - .word do_saload - .word do_u4store - .word do_u8store - .word do_u4store - .word do_u8store - .word do_u4store - .word do_u4store_0 - .word do_u4store_1 - .word do_u4store_2 - .word do_u4store_3 - .word do_u8store_0 - .word do_u8store_1 - .word do_u8store_2 - .word do_u8store_3 - .word do_u4store_0 - .word do_u4store_1 - .word do_u4store_2 - .word do_u4store_3 - .word do_u8store_0 - .word do_u8store_1 - .word do_u8store_2 - .word do_u8store_3 - .word do_u4store_0 - .word do_u4store_1 - .word do_u4store_2 - .word do_u4store_3 - .word do_u4astore - .word do_u8astore - .word do_u4astore - .word do_u8astore - .word do_aastore - .word do_bastore - .word do_u2astore - .word do_u2astore - .word do_jpop - .word do_jpop2 - .word do_dup - .word do_dup_x1 - .word do_dup_x2 - .word do_dup2 - .word do_dup2_x1 - .word do_dup2_x2 - .word do_swap - .word do_iadd - .word do_ladd - .word do_fadd - .word do_dadd - .word do_isub - .word do_lsub - .word do_fsub - .word do_dsub - .word do_imul - .word do_lmul - .word do_fmul - .word do_dmul - .word do_idiv - .word do_ldiv - .word do_fdiv - .word do_ddiv - .word do_irem - .word do_lrem - .word do_frem - .word do_drem - .word do_ineg - .word do_lneg - .word do_fneg - .word do_dneg - .word do_ishl - .word do_lshl - .word do_ishr - .word do_lshr - .word do_iushr - .word do_lushr - .word do_iand - .word do_land - .word do_ior - .word do_lor - .word do_ixor - .word do_lxor - .word do_iinc - .word do_i2l - .word do_i2f - .word do_i2d - .word do_l2i - .word do_l2f - .word do_l2d - .word do_f2i - .word do_f2l - .word do_f2d - .word do_d2i - .word do_d2l - .word do_d2f - .word do_i2b - .word do_i2c - .word do_i2s - .word do_lcmp - .word do_fcmpl - .word do_fcmpg - .word do_dcmpl - .word do_dcmpg - .word do_ifeq - .word do_ifne - .word do_iflt - .word do_ifge - .word do_ifgt - .word do_ifle - .word do_if_icmpeq - .word do_if_icmpne - .word do_if_icmplt - .word do_if_icmpge - .word do_if_icmpgt - .word do_if_icmple - .word do_if_icmpeq - .word do_if_icmpne - .word do_goto - .word do_jsr - .word do_ret - .word do_tableswitch - .word do_lookupswitch - .word do_ireturn - .word do_lreturn - .word do_ireturn - .word do_lreturn - .word do_ireturn - .word do_return - .word do_getstatic - .word do_putstatic - .word do_getfield - .word do_putfield - .word do_invokevirtual - .word do_invokespecial - .word do_invokestatic - .word do_invokeinterface - .word do_undefined From andrew at icedtea.classpath.org Wed Jan 18 07:01:55 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 18 Jan 2012 15:01:55 +0000 Subject: /hg/release/icedtea6-1.11: Add 1.10.5, 1.9.12 and 1.8.12 release... Message-ID: changeset 831566480650 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=831566480650 author: Andrew John Hughes date: Wed Jan 18 15:01:49 2012 +0000 Add 1.10.5, 1.9.12 and 1.8.12 release notes. Remove duplicates in 1.11 release notes. 2012-01-12 Andrew John Hughes * NEWS: Add 1.10.5, 1.9.12 and 1.8.12 release notes. Remove duplicates from 1.11. diffstat: ChangeLog | 5 +++++ NEWS | 34 +++++++++++++++++++++++++++------- 2 files changed, 32 insertions(+), 7 deletions(-) diffs (70 lines): diff -r 0242cfaf15fa -r 831566480650 ChangeLog --- a/ChangeLog Fri Jan 13 11:30:31 2012 -0500 +++ b/ChangeLog Wed Jan 18 15:01:49 2012 +0000 @@ -1,3 +1,8 @@ +2012-01-12 Andrew John Hughes + + * NEWS: Add 1.10.5, 1.9.12 and 1.8.12 + release notes. Remove duplicates from 1.11. + 2012-01-12 Danesh Dadachanji * Makefile.am: diff -r 0242cfaf15fa -r 831566480650 NEWS --- a/NEWS Fri Jan 13 11:30:31 2012 -0500 +++ b/NEWS Wed Jan 18 15:01:49 2012 +0000 @@ -343,8 +343,6 @@ - S6748082: remove platform-specific code from SwingUtilities2.isDisplayLocal - S6708580: Java applications slow when EXA enabled - S6986968: Crash on XIM server restart - - S7034464: Support transparent large pages on Linux - - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used - S7018387: Xrender pipeline may leak GC's - S7036754: Stroked quads sometimes contain NaN - S7008106: com/sun/awt/Translucency/WindowOpacity.java test fails. @@ -380,11 +378,6 @@ - S5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" - S6296893: BMP Writer handles TopDown property incorrectly for some of the compression types - S7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc - - S7102369: remove java.rmi.server.codebase property parsing from registyimpl - - S7094468: rmiregistry clean up - - S6851973: ignore incoming channel binding if acceptor does not set one - - S7091528: javadoc attempts to parse .class files - - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA - S7103610, RH683768: _NET_WM_PID and WM_CLIENT_MACHINE are not set * ARM Port - Ported to the EABI hard-fp model @@ -453,6 +446,33 @@ - PR690: Shark fails to JIT using hs20. - PR696: Zero fails to handle fast_aldc and fast_aldc_w in hs20. +New in release 1.10.5 (2012-01-11): + +* Backports + - S7034464: Support transparent large pages on Linux + - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used + - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468, RH751203: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one + - S7091528: javadoc attempts to parse .class files + +New in release 1.9.12 (2012-01-11): + +* Backports + - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468, RH751203: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one + +New in release 1.8.12 (2012-01-11): + +* Backports + - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468, RH751203: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one + New in release 1.9.11 (2011-11-08): * Security fixes From omajid at redhat.com Wed Jan 18 07:12:51 2012 From: omajid at redhat.com (Omair Majid) Date: Wed, 18 Jan 2012 10:12:51 -0500 Subject: /hg/icedtea6: 7 new changesets In-Reply-To: References: Message-ID: <4F16E173.50107@redhat.com> On 01/18/2012 07:04 AM, aph at icedtea.classpath.org wrote: > changeset fc7a57de5179 in /hg/icedtea6 > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fc7a57de5179 > author: aph > date: Fri Jan 13 10:07:43 2012 -0500 > > Fix bytecode numbering of return_register_finalizer in > safe_dispatch_table. 2012-01-13 Andrew Haley > > * arm_port/hotspot/tools/mkbc.c (writeouttable): Add > numbering comments to bytecode output. > * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Return): > Move safepoint before monitor is unlocked. > * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S > (safe_dispatch_table): Add comment. Correct order of > do_return_register_finalizer. Add numbering comments. > * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (TRACE): > New macro. > Are you planning to push these fixes to the icedtea6 1.11 branch? I am all for it, btw. Thanks, Omair From aph at icedtea.classpath.org Wed Jan 18 07:38:15 2012 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Wed, 18 Jan 2012 15:38:15 +0000 Subject: /hg/release/icedtea6-1.11: 6 new changesets Message-ID: changeset 9543e5c4da78 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=9543e5c4da78 author: aph date: Wed Jan 18 12:14:02 2012 +0000 2012-01-13 Andrew Haley * arm_port/hotspot/tools/mkbc.c (writeouttable): Add numbering comments to bytecode output. * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Return): Move safepoint before monitor is unlocked. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (safe_dispatch_table): Add comment. Correct order of do_return_register_finalizer. Add numbering comments. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (TRACE): New macro. changeset 9b1d99fd39d2 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=9b1d99fd39d2 author: aph date: Mon Jan 16 13:25:01 2012 -0500 2012-01-16 Andrew Haley * Makefile.am (check-jdk): Restore the --samevm line that was deleted by mistake in an earlier merge. changeset 8b5748cb2a50 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=8b5748cb2a50 author: aph date: Mon Jan 16 13:28:17 2012 -0500 2012-01-16 Andrew Haley * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (asm_method_table): Add entry for java.dyn.MethodHandles::invoke. (asm_generate_method_entry): Replace constant 14 with calculation based on the size of asm_method_table. Add some comments. changeset a2c4e40c9014 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=a2c4e40c9014 author: aph date: Tue Jan 17 10:41:44 2012 -0500 allow vm_fatal_error to be used as an entry point in asm_method_table. 2012-01-17 Andrew Haley * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (vm_fatal_error): Add an extra entry point at vm_fatal_error + CODE_ALIGN_SIZE to allow vm_fatal_error to be used as an entry point in asm_method_table. (putstatic_volatile_dw): Re-order register operands to silence warning. changeset 261bad4f7bcf in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=261bad4f7bcf author: aph date: Wed Jan 18 11:57:33 2012 +0000 Re-order register operands to silence warning. 2012-01-18 Xerxes Ranby * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (putstatic_volatile_dw): Re-order register operands to silence warning. changeset 5104f8a08015 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=5104f8a08015 author: aph date: Wed Jan 18 15:38:07 2012 +0000 merge diffstat: ChangeLog | 61 + Makefile.am | 4 +- NEWS | 37 +- acinclude.m4 | 7 +- arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 4 + arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 580 +++++---- arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 4 +- arm_port/hotspot/tools/mkbc.c | 6 +- patches/openjdk/683768-System-tray-icon.patch | 79 - patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch | 93 + 10 files changed, 506 insertions(+), 369 deletions(-) diffs (truncated from 1066 to 500 lines): diff -r ec36b4069f06 -r 5104f8a08015 ChangeLog --- a/ChangeLog Mon Jan 09 13:34:27 2012 -0500 +++ b/ChangeLog Wed Jan 18 15:38:07 2012 +0000 @@ -1,3 +1,64 @@ +2012-01-18 Xerxes R??nby + + * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (putstatic_volatile_dw): Re-order register operands to silence + warning. + +2012-01-17 Andrew Haley + + * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (vm_fatal_error): Add an extra entry point at vm_fatal_error + + CODE_ALIGN_SIZE to allow vm_fatal_error to be used as an entry + point in asm_method_table. + + (putstatic_volatile_dw): Re-order register operands to silence warning. + +2012-01-16 Andrew Haley + + * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (asm_method_table): + Add entry for java.dyn.MethodHandles::invoke. + (asm_generate_method_entry): Replace constant 14 with calculation + based on the size of asm_method_table. + Add some comments. + +2012-01-16 Andrew Haley + + * Makefile.am (check-jdk): Restore the --samevm line that was + deleted by mistake in an earlier merge. + +2012-01-13 Andrew Haley + + * arm_port/hotspot/tools/mkbc.c (writeouttable): Add numbering + comments to bytecode output. + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Return): + Move safepoint before monitor is unlocked. + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (safe_dispatch_table): Add comment. + Correct order of do_return_register_finalizer. + Add numbering comments. + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (TRACE): + New macro. + +2012-01-12 Andrew John Hughes + + * NEWS: Add 1.10.5, 1.9.12 and 1.8.12 + release notes. Remove duplicates from 1.11. + +2012-01-12 Danesh Dadachanji + + * Makefile.am: + (ICEDTEA_PATCHES): Replace patches/openjdk/683768-System-tray-icon.patch with + patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch + * NEWS: Moved RH683768 from Bug fixes to 1.11 Backports, added S7103610 to it. + * patches/openjdk/683768-System-tray-icon.patch: Removed. + * patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch: + New file. Sets XAtoms _NET_WM_PID and WM_CLIENT_MACHINE for X windows. + +2012-01-09 Omair Majid + + * acinclude.m4 (IT_SET_SHARK_BUILD): Error out if shark is enabled. + * NEWS: Update with note describing shark has been disabled. + 2012-01-06 Jiri Vanek fixes rhbz#580478 diff -r ec36b4069f06 -r 5104f8a08015 Makefile.am --- a/Makefile.am Mon Jan 09 13:34:27 2012 -0500 +++ b/Makefile.am Wed Jan 18 15:38:07 2012 +0000 @@ -399,7 +399,7 @@ patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \ patches/openjdk/7103224-glibc_name_collision.patch \ patches/arm-debug.patch \ - patches/openjdk/683768-System-tray-icon.patch \ + patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \ patches/openjdk/7102369-7094468-rmiregistry.patch \ patches/openjdk/6851973-kerberos.patch \ patches/openjdk/7091528-javadoc_class_files.patch \ @@ -2170,7 +2170,7 @@ $${XVFB_RUN} \ $(BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \ -w:test/jdk/JTwork -r:test/jdk/JTreport \ - \ + $${ICEDTEA_JTREG_OTHERVM:--samevm} \ -jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \ -exclude:$(abs_top_srcdir)/$(JTREG_DIR)/excludelist.jdk.jtx \ $(ICEDTEA_JTREG_OPTIONS) \ diff -r ec36b4069f06 -r 5104f8a08015 NEWS --- a/NEWS Mon Jan 09 13:34:27 2012 -0500 +++ b/NEWS Wed Jan 18 15:38:07 2012 +0000 @@ -16,13 +16,13 @@ * ARM assembly language port reinstated and updated; details below. * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools" * Drop the outdated NIO2 backport. Users who want NIO2 should use IcedTea 2.x. +* Shark has been disabled * Bug fixes - PR637: make check should exit with an error code if any regression test failed. - PR752: ImageFormatException extends Exception not RuntimeException - PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan - RH727195: Japanese font mappings are broken - LP862286: Fix exception on trying to start PulseAudio playback - - RH683768: Add a workaround for Java applications using tray icon for Gnome Shell - PR719: make distcheck should work in IcedTea6 * Import of OpenJDK6 b24 - S7099148: increment build number of hs20.0 to b12 @@ -343,8 +343,6 @@ - S6748082: remove platform-specific code from SwingUtilities2.isDisplayLocal - S6708580: Java applications slow when EXA enabled - S6986968: Crash on XIM server restart - - S7034464: Support transparent large pages on Linux - - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used - S7018387: Xrender pipeline may leak GC's - S7036754: Stroked quads sometimes contain NaN - S7008106: com/sun/awt/Translucency/WindowOpacity.java test fails. @@ -380,11 +378,7 @@ - S5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" - S6296893: BMP Writer handles TopDown property incorrectly for some of the compression types - S7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc - - S7102369: remove java.rmi.server.codebase property parsing from registyimpl - - S7094468: rmiregistry clean up - - S6851973: ignore incoming channel binding if acceptor does not set one - - S7091528: javadoc attempts to parse .class files - - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S7103610, RH683768: _NET_WM_PID and WM_CLIENT_MACHINE are not set * ARM Port - Ported to the EABI hard-fp model - Locking for multi-core operation added. @@ -452,6 +446,33 @@ - PR690: Shark fails to JIT using hs20. - PR696: Zero fails to handle fast_aldc and fast_aldc_w in hs20. +New in release 1.10.5 (2012-01-11): + +* Backports + - S7034464: Support transparent large pages on Linux + - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used + - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468, RH751203: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one + - S7091528: javadoc attempts to parse .class files + +New in release 1.9.12 (2012-01-11): + +* Backports + - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468, RH751203: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one + +New in release 1.8.12 (2012-01-11): + +* Backports + - S7102369, RH751203: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468, RH751203: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one + New in release 1.9.11 (2011-11-08): * Security fixes diff -r ec36b4069f06 -r 5104f8a08015 acinclude.m4 --- a/acinclude.m4 Mon Jan 09 13:34:27 2012 -0500 +++ b/acinclude.m4 Wed Jan 18 15:38:07 2012 +0000 @@ -786,6 +786,8 @@ AC_CONFIG_FILES([ergo.c]) ]) +# shark has been very unstable (and/or broken) recently due to various +# changes in hotspot and llvm. It is not supported in this release. AC_DEFUN([IT_SET_SHARK_BUILD], [ AC_MSG_CHECKING(whether to use the Shark JIT) @@ -806,7 +808,10 @@ use_shark=yes fi AC_MSG_RESULT($use_shark) - +# remove the following check to enable shark + if test "x${shark_selected}" = "xyes"; then + AC_MSG_ERROR([shark is unsupported in this release]) + fi AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes) ]) diff -r ec36b4069f06 -r 5104f8a08015 arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def --- a/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Mon Jan 09 13:34:27 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Wed Jan 18 15:38:07 2012 +0000 @@ -29,6 +29,10 @@ #define FAST_BYTECODES #endif +/* WARNING: If you change any of these bytecodes, you must also + change the safe_dispatch_table in cppInterpreter_arm.S to make it + match. */ + nop = 0x00, 1 aconst_null = 0x01, 1 iconst_m1 = 0x02, 1 diff -r ec36b4069f06 -r 5104f8a08015 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Jan 09 13:34:27 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Wed Jan 18 15:38:07 2012 +0000 @@ -483,6 +483,19 @@ .set dispatch_state, dispatch_state + 1 .endm + @ This macro calls a user-supplied my_trace routine. It + @ passes the current JPC as argument zero. It can be safely + @ inserted at any point in the interpreter. + .macro TRACE + stmfd sp!, {r0, r1, r2, r3, r4, lr} + mrs r4, cpsr + mov r0, jpc + ldr r2, =my_trace + blx r2 + msr cpsr, r4 + ldmfd sp!, {r0, r1, r2, r3, r4, lr} + .endm + .macro DISPATCH_FINISH .if dispatch_state == 0 .error "DISPATCH_FINISH without a DISPATCH_START or DISPATCH_STATE" @@ -769,28 +782,35 @@ cmp r2, #0 bne 1f - cmp r3, #14 + cmp r3, #((3f-2f)/4) // i.e. sizeof asm_method_table adrcc ip, asm_method_table ldrcc r0, [ip, r3, lsl #2] #endif // PRODUCT 1: bx lr + +// This table must be kept in sync with +// AbstractInterpreter::MethodKind. Note that every entry must have a +// corresponding fast entry point at addr + CODE_ALIGN_SIZE. asm_method_table: - .word normal_entry - .word normal_entry_synchronized - .word native_entry - .word native_entry_synchronized - .word empty_entry - .word accessor_entry - .word normal_entry @ abstract entry - .word normal_entry @ java_lang_math_sin - .word normal_entry @ java_lang_math_cos - .word normal_entry @ java_lang_math_tan - .word normal_entry @ java_lang_math_abs - .word normal_entry @ java_lang_math_sqrt - .word normal_entry @ java_lang_math_log - .word normal_entry @ java_lang_math_log10 - +2: + .word normal_entry // method needs locals initialization + .word normal_entry_synchronized // method needs locals initialization & is synchronized + .word native_entry // native method + .word native_entry_synchronized // native method & is synchronized + .word empty_entry // empty method (code: _return) + .word accessor_entry // accessor method (code: _aload_0, _getfield, _(a|i)return) + .word normal_entry // abstract method (throws an AbstractMethodException) + .word vm_fatal_error // java.dyn.MethodHandles::invoke + .word normal_entry // implementation of java.lang.Math.sin (x) + .word normal_entry // implementation of java.lang.Math.cos (x) + .word normal_entry // implementation of java.lang.Math.tan (x) + .word normal_entry // implementation of java.lang.Math.abs (x) + .word normal_entry // implementation of java.lang.Math.sqrt (x) + .word normal_entry // implementation of java.lang.Math.log (x) + .word normal_entry // implementation of java.lang.Math.log10 (x) +3: + ALIGN_CODE native_entry_synchronized: b fast_native_entry_synchronized @@ -2137,11 +2157,11 @@ putstatic_volatile_dw: DISPATCH_START 3 add ip, r2, r3 - POP tmp1, tmp2 + POP tmp2, tmp1 DISPATCH_NEXT StoreStoreBarrier #ifndef __ARM_ARCH_7A__ - stm ip, {tmp1, tmp2} + stm ip, {tmp2, tmp1} #else // Data in tmp1 & tmp2, address in ip, r2 & r3 scratch 0: ldrexd r2, r3, [ip] @@ -2501,6 +2521,7 @@ CACHE_CP DISPATCH 1 + ALIGN_CODE vm_fatal_error: adr r0, .fatal_filename mov r1, #99 @@ -2508,6 +2529,13 @@ b breakpoint .fatal_filename: .ascii "[Optimsed Assembler Interpreter Loop]\000" + +// This extra entry point for vm_fatal_error (at vm_fatal_error + +// CODE_ALIGN_SIZE) allows vm_fatal_error to be used as an entry point +// in the asm_method_table. + ALIGN_CODE + b vm_fatal_error + ALIGN_WORD Opcode aastore @@ -4753,262 +4781,266 @@ #ifdef NOTICE_SAFEPOINTS safe_dispatch_table: - .word do_nop - .word do_u4const_0 - .word do_iconst_N - .word do_iconst_N - .word do_iconst_N - .word do_iconst_N - .word do_iconst_N - .word do_iconst_N - .word do_iconst_N - .word do_u8const_0 - .word do_lconst_1 - .word do_u4const_0 - .word do_fconst_1 - .word do_fconst_2 - .word do_u8const_0 - .word do_dconst_1 - .word do_bipush - .word do_sipush - .word do_ldc - .word do_ldc_w - .word do_ldc2_w - .word do_u4load - .word do_u8load - .word do_u4load - .word do_u8load - .word do_u4load - .word do_iload_0 - .word do_iload_0 - .word do_iload_0 - .word do_iload_0 - .word do_u8load_0 - .word do_u8load_1 - .word do_u8load_2 - .word do_u8load_3 - .word do_fload_0 - .word do_fload_0 - .word do_fload_0 - .word do_fload_0 - .word do_u8load_0 - .word do_u8load_1 - .word do_u8load_2 - .word do_u8load_3 - .word do_aload_0 - .word do_aload_0 - .word do_aload_0 - .word do_aload_0 - .word do_u4aload - .word do_u8aload - .word do_u4aload - .word do_u8aload - .word do_u4aload - .word do_baload - .word do_caload - .word do_saload - .word do_u4store - .word do_u8store - .word do_u4store - .word do_u8store - .word do_u4store - .word do_u4store_0 - .word do_u4store_1 - .word do_u4store_2 - .word do_u4store_3 - .word do_u8store_0 - .word do_u8store_1 - .word do_u8store_2 - .word do_u8store_3 - .word do_u4store_0 - .word do_u4store_1 - .word do_u4store_2 - .word do_u4store_3 - .word do_u8store_0 - .word do_u8store_1 - .word do_u8store_2 - .word do_u8store_3 - .word do_u4store_0 - .word do_u4store_1 - .word do_u4store_2 - .word do_u4store_3 - .word do_u4astore - .word do_u8astore - .word do_u4astore - .word do_u8astore - .word do_aastore - .word do_bastore - .word do_u2astore - .word do_u2astore - .word do_jpop - .word do_jpop2 - .word do_dup - .word do_dup_x1 - .word do_dup_x2 - .word do_dup2 - .word do_dup2_x1 - .word do_dup2_x2 - .word do_swap - .word do_iadd - .word do_ladd - .word do_fadd - .word do_dadd - .word do_isub - .word do_lsub - .word do_fsub - .word do_dsub - .word do_imul - .word do_lmul - .word do_fmul - .word do_dmul - .word do_idiv - .word do_ldiv - .word do_fdiv - .word do_ddiv - .word do_irem - .word do_lrem - .word do_frem - .word do_drem - .word do_ineg - .word do_lneg - .word do_fneg - .word do_dneg - .word do_ishl - .word do_lshl - .word do_ishr - .word do_lshr - .word do_iushr - .word do_lushr - .word do_iand - .word do_land - .word do_ior - .word do_lor - .word do_ixor - .word do_lxor - .word do_iinc - .word do_i2l - .word do_i2f - .word do_i2d - .word do_l2i - .word do_l2f - .word do_l2d - .word do_f2i - .word do_f2l - .word do_f2d - .word do_d2i - .word do_d2l - .word do_d2f - .word do_i2b - .word do_i2c - .word do_i2s - .word do_lcmp - .word do_fcmpl - .word do_fcmpg - .word do_dcmpl - .word do_dcmpg - .word do_ifeq - .word do_ifne - .word do_iflt - .word do_ifge - .word do_ifgt - .word do_ifle - .word do_if_icmpeq - .word do_if_icmpne - .word do_if_icmplt - .word do_if_icmpge - .word do_if_icmpgt - .word do_if_icmple - .word do_if_icmpeq - .word do_if_icmpne - .word do_goto - .word do_jsr - .word do_ret - .word do_tableswitch - .word do_lookupswitch - .word do_ireturn - .word do_lreturn - .word do_ireturn - .word do_lreturn - .word do_ireturn - .word do_return - .word do_getstatic - .word do_putstatic - .word do_getfield - .word do_putfield - .word do_invokevirtual - .word do_invokespecial From ptisnovs at icedtea.classpath.org Wed Jan 18 07:50:26 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 18 Jan 2012 15:50:26 +0000 Subject: /hg/MauveTestCoverage: 2012-01-18 Pavel Tisnovsky changeset 5849d5bfbee0 in /hg/MauveTestCoverage details: http://icedtea.classpath.org/hg/MauveTestCoverage?cmd=changeset;node=5849d5bfbee0 author: Pavel Tisnovsky date: Wed Jan 18 16:52:43 2012 +0100 2012-01-18 Pavel Tisnovsky * templates/class_template.html: * templates/summary.html: New templates used for a summary and a report generated for each tested class. * src/ReportGenerator.java: Support for templates updated, added the functionality to generate summary. diffstat: ChangeLog | 10 ++ src/ReportGenerator.java | 204 +++++++++++++++++++++++++++++++++-------- templates/class_template.html | 24 ++++ templates/summary.html | 45 +++++++++ 4 files changed, 242 insertions(+), 41 deletions(-) diffs (447 lines): diff -r 5ef74c026b81 -r 5849d5bfbee0 ChangeLog --- a/ChangeLog Tue Jan 17 14:02:07 2012 +0100 +++ b/ChangeLog Wed Jan 18 16:52:43 2012 +0100 @@ -1,3 +1,13 @@ +2012-01-18 Pavel Tisnovsky + + * templates/class_template.html: + * templates/summary.html: + New templates used for a summary and a report + generated for each tested class. + * src/ReportGenerator.java: + Support for templates updated, added the functionality + to generate summary. + 2012-01-17 Pavel Tisnovsky * src/FileUtils.java: diff -r 5ef74c026b81 -r 5849d5bfbee0 src/ReportGenerator.java --- a/src/ReportGenerator.java Tue Jan 17 14:02:07 2012 +0100 +++ b/src/ReportGenerator.java Wed Jan 18 16:52:43 2012 +0100 @@ -37,11 +37,9 @@ */ import java.io.BufferedReader; -import java.io.BufferedWriter; import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; -import java.io.FileWriter; import java.io.IOException; import java.util.LinkedList; import java.util.List; @@ -70,6 +68,7 @@ List fileContent = FileUtils.readTextFile(allClassListFileName); // set of classes should be sorted Set allClasses = new TreeSet(); + // add all lines read from a file to a set (and sort them) allClasses.addAll(fileContent); return allClasses; } @@ -90,6 +89,7 @@ { List template = FileUtils.readTextFile("templates/all_packages_template.html"); List out = new LinkedList(); + // iterate through whole template for (String templateLine : template) { // replace text in template where needed @@ -97,11 +97,13 @@ { addPackageList(packageNames, out); } + // normal line else { out.add(templateLine); } } + // write list of string to a file with given name FileUtils.writeTextFile(reportDirectory, "all_packages.html", out); } @@ -121,6 +123,7 @@ { List template = FileUtils.readTextFile("templates/package_template.html"); List out = new LinkedList(); + // iterate through whole template for (String templateLine : template) { // replace text in template where needed @@ -128,11 +131,13 @@ { addClassList(packageName, testedClasses, out); } + // normal line else { out.add(templateLine); } } + // write list of string to a file with given name FileUtils.writeTextFile(reportDirectory, packageName + ".html", out); } @@ -153,6 +158,7 @@ { List template = FileUtils.readTextFile("templates/all_classes_template.html"); List out = new LinkedList(); + // iterate through whole template for (String templateLine : template) { // replace text in template where needed @@ -160,11 +166,13 @@ { addPackageAndClassList(usedPackageNames, testedClasses, out); } + // normal line else { out.add(templateLine); } } + // write list of string to a file with given name FileUtils.writeTextFile(reportDirectory, "all_classes.html", out); } @@ -198,6 +206,7 @@ */ private static void addClassList(String packageName, Set testedClasses, List out) { + // iterate through all class names for (String className : testedClasses) { // list only classes from given package @@ -221,6 +230,7 @@ */ private static void addPackageAndClassList(Set usedPackageNames, Set testedClasses, List out) { + // iterate through all class names for (String packageName : usedPackageNames) { out.add("

Package " + packageName + "

"); @@ -235,56 +245,87 @@ } } + /** + * Create new HTML file containing report for one tested class. + * + * @param reportDirectory + * directory where report is generated + * @param testClass + * name of tested class + * @param allMethods + * superset of apiMethods and testedMethods + * @param apiMethods + * methods presented in API + * @param testedMethods + * methods called from tests + */ private static void createFileForClass(String reportDirectory, String testClass, Set allMethods, Set apiMethods, Set testedMethods) { - BufferedWriter fout = null; - try + List template = FileUtils.readTextFile("templates/class_template.html"); + List out = new LinkedList(); + // iterate through whole template + for (String templateLine : template) { - fout = new BufferedWriter(new FileWriter(new File(reportDirectory, testClass + ".html"))); - fout.write("\n"); - fout.write("\n"); - fout.write("" + testClass + "\n"); - fout.write("\n"); - fout.write("\n"); - fout.write("

Class " + testClass + "

\n"); - fout.write("\n"); - fout.write("\n"); - for (String methodName : allMethods) + // replace text in template where needed + if (templateLine.contains("${CLASS_NAME}")) { - fout.write(""); - fout.write(printMethodCoverage(methodName, apiMethods)); - fout.write(printMethodCoverage(methodName, testedMethods)); - fout.write("\n"); + out.add(templateLine.replace("${CLASS_NAME}", testClass)); } - fout.write("
MethodAPITested
" + constructPrintedMethodName(methodName) + "
\n"); - fout.write("\n"); - fout.write("\n"); + // replace text in template where needed + else if (templateLine.contains("${METHOD_LIST}")) + { + printReportForAllMethods(allMethods, apiMethods, testedMethods, out); + } + // normal line + else + { + out.add(templateLine); + } } - catch (IOException e) + // write list of string to a file with given name + FileUtils.writeTextFile(reportDirectory, testClass + ".html", out); + } + + /** + * Print report for all methods in given class. + * + * @param allMethods + * superset of apiMethods and testedMethods + * @param apiMethods + * methods presented in API + * @param testedMethods + * methods called from tests + * @param out + * list of string which represents generated report + */ + private static void printReportForAllMethods(Set allMethods, Set apiMethods, + Set testedMethods, List out) + { + // iterate through all methods + for (String methodName : allMethods) { - e.printStackTrace(); - } - finally - { - try - { - if (fout != null) - { - fout.close(); - } - } - catch (IOException e) - { - e.printStackTrace(); - } + out.add("" + constructPrintedMethodName(methodName) + ""); + out.add(printMethodCoverage(methodName, apiMethods)); + out.add(printMethodCoverage(methodName, testedMethods)); + out.add("\n"); } } + /** + * Construct set filled with public API classes. + * + * @param allClasses + * set of all API classes (including classes from proprietary + * packages) + * @return set filled with public API classes + */ private static Set preparePackageNames(Set allClasses) { Set packages = new TreeSet(); + // iterate through all class names for (String className : allClasses) { + // filter only public API classes String packageName = className.substring(0, className.lastIndexOf('.')); if (!packageName.startsWith("com.") && !packageName.startsWith("sun")) { @@ -407,6 +448,76 @@ return allMethods; } + private static void printSummaryPage(String reportDirectory, Set allPackageNames, Set allClasses, + Set testedClasses, Set usedPackageNames) + { + final int numberOfAllPackages = allPackageNames.size(); + final int numberOfAllClasses = allClasses.size(); + final int numberOfUsedPackages = usedPackageNames.size(); + final int numberOfTestedClasses = testedClasses.size(); + + List template = FileUtils.readTextFile("templates/summary.html"); + List out = new LinkedList(); + for (String templateLine : template) + { + // replace text in template where needed + if (templateLine.contains("${API_PACKAGES}")) + { + out.add(templateLine.replace("${API_PACKAGES}", "" + numberOfAllPackages)); + } + // replace text in template where needed + else if (templateLine.contains("${API_CLASSES}")) + { + out.add(templateLine.replace("${API_CLASSES}", "" + numberOfAllClasses)); + } + else + { + if (templateLine.contains("${TESTED_PACKAGES}")) + { + out.add(templateLine.replace("${TESTED_PACKAGES}", "" + numberOfUsedPackages)); + } + // replace text in template where needed + else if (templateLine.contains("${TESTED_CLASSES}")) + { + out.add(templateLine.replace("${TESTED_CLASSES}", "" + numberOfTestedClasses)); + } + // replace text in template where needed + else if (templateLine.contains("${TESTED_PACKAGES_RATIO}")) + { + out.add(templateLine.replace("${TESTED_PACKAGES_RATIO}", "" + calcRatio(numberOfUsedPackages, numberOfAllPackages))); + } + // replace text in template where needed + else if (templateLine.contains("${TESTED_CLASSES_RATIO}")) + { + out.add(templateLine.replace("${TESTED_CLASSES_RATIO}", "" + calcRatio(numberOfTestedClasses, numberOfAllClasses))); + } + // normal output + else + { + out.add(templateLine); + } + } + } + FileUtils.writeTextFile(reportDirectory, "all_results.html", out); + } + + /** + * Calculate ratio of two items (usually tested classes vs. all classes) and + * return textual representation of the calculated ratio (percentage) + * + * @param numberOfTestedItems + * number of tested items + * @param numberOfAllItems + * number of all items + * @return textual representation of the calculated ratio (percentage) + */ + @SuppressWarnings("boxing") + private static String calcRatio(int numberOfTestedItems, int numberOfAllItems) + { + float ratio = 100.0f * numberOfTestedItems / numberOfAllItems; + return String.format("%.2f%%", ratio); + } + private static void prepareReport(String allClassListFileName, String testedClassListFileName, String reportDirectory) { @@ -416,13 +527,13 @@ Set usedPackageNames = prepareUsedPackageNames(allPackageNames, testedClasses); System.out.println("All class list: " + allClassListFileName); - System.out.println("Read " + allClasses.size() + " class names"); + System.out.println("Read " + (allClasses.size()) + " class names"); System.out.println("Tested class list: " + testedClassListFileName); - System.out.println("Read " + testedClasses.size() + " class names"); + System.out.println("Read " + (testedClasses.size()) + " class names"); - System.out.println("Setting list of " + allPackageNames.size() + " all package names"); - System.out.println("Setting list of " + usedPackageNames.size() + " used package names"); + System.out.println("Setting list of " + (allPackageNames.size()) + " all package names"); + System.out.println("Setting list of " + (usedPackageNames.size()) + " used package names"); System.out.println("Report directory: " + reportDirectory); @@ -430,18 +541,29 @@ printReportForAllClassesInOneFile(reportDirectory, usedPackageNames, testedClasses); printReportForAllPackages(reportDirectory, usedPackageNames, testedClasses); printReportForAllClasses(reportDirectory, testedClasses); + printSummaryPage(reportDirectory, allPackageNames, allClasses, testedClasses, usedPackageNames); } + /** + * Entry point to the report generator. + * + * @param args + * should contain name of file containing all class list, name of + * file containing tested class list and the report directory + */ public static void main(String[] args) { + // check if all parameters are specified on command line if (args.length != 3) { System.err.println("Usage allClassListFileName classListFileName reportDirectory"); System.exit(1); } + // resolve all three parameters String allClassListFileName = args[0]; String testedClassListFileName = args[1]; String reportDirectory = args[2]; + // and do the report prepareReport(allClassListFileName, testedClassListFileName, reportDirectory); } } diff -r 5ef74c026b81 -r 5849d5bfbee0 templates/class_template.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/class_template.html Wed Jan 18 16:52:43 2012 +0100 @@ -0,0 +1,24 @@ + + + + Report for class: ${CLASS_NAME} + + + + + +

Report for class: ${CLASS_NAME}   summary

+ + + + + + + +${METHOD_LIST} +
MethodAPITested
+ + + + diff -r 5ef74c026b81 -r 5849d5bfbee0 templates/summary.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/summary.html Wed Jan 18 16:52:43 2012 +0100 @@ -0,0 +1,45 @@ + + + + Summary + + + + + +

Summary

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Public API packages:${API_PACKAGES} 
Public API classes:${API_CLASSES} 
 
Checked packages:${TESTED_PACKAGES}${TESTED_PACKAGES_RATIO}
Checked classes:${TESTED_CLASSES}${TESTED_CLASSES_RATIO}
 
All classes 
+ + + From omajid at redhat.com Wed Jan 18 08:23:10 2012 From: omajid at redhat.com (Omair Majid) Date: Wed, 18 Jan 2012 11:23:10 -0500 Subject: Pushing back the IcedTea6 1.11 release (was: Re: IcedTea6 1.11 has been branched. Release on 2011-01-18) In-Reply-To: <4F0771B8.4080106@redhat.com> References: <4F0771B8.4080106@redhat.com> Message-ID: <4F16F1EE.4000506@redhat.com> On 01/06/2012 05:12 PM, Omair Majid wrote: > Hi, > > IcedTea6 has now branched for the 1.11 release. > > I am planning to release IcedTea6 1.11 on *2012-01-18*. Feel free to > subject this branch to as much testing as you need. > It looks like there are still a bunch of stability issues with the arm port. I think it would be worth the time if we held off a bit and waited until it is stable before we do a release. How does 1 week (2012-01-25) sound? Does anyone have any thoughts or concerns? Thanks, Omair From ptisnovs at icedtea.classpath.org Thu Jan 19 03:50:11 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 19 Jan 2012 11:50:11 +0000 Subject: /hg/gfx-test: 2012-01-19 Pavel Tisnovsky Message-ID: changeset 2ca9bcc1fb0c in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=2ca9bcc1fb0c author: Pavel Tisnovsky date: Thu Jan 19 12:52:36 2012 +0100 2012-01-19 Pavel Tisnovsky * src/org/gfxtest/framework/ColorPalette.java: * src/org/gfxtest/framework/ImageFactory.java: Added support for new pattern types. diffstat: ChangeLog | 6 + src/org/gfxtest/framework/ColorPalette.java | 12 + src/org/gfxtest/framework/ImageFactory.java | 177 ++++++++++++++++++++++++++++ 3 files changed, 195 insertions(+), 0 deletions(-) diffs (255 lines): diff -r 0f154450543f -r 2ca9bcc1fb0c ChangeLog --- a/ChangeLog Wed Jan 18 10:59:30 2012 +0100 +++ b/ChangeLog Thu Jan 19 12:52:36 2012 +0100 @@ -1,3 +1,9 @@ +2012-01-19 Pavel Tisnovsky + + * src/org/gfxtest/framework/ColorPalette.java: + * src/org/gfxtest/framework/ImageFactory.java: + Added support for new pattern types. + 2012-01-18 Pavel Tisnovsky * src/org/gfxtest/framework/CommonBitmapOperations.java: diff -r 0f154450543f -r 2ca9bcc1fb0c src/org/gfxtest/framework/ColorPalette.java --- a/src/org/gfxtest/framework/ColorPalette.java Wed Jan 18 10:59:30 2012 +0100 +++ b/src/org/gfxtest/framework/ColorPalette.java Thu Jan 19 12:52:36 2012 +0100 @@ -81,6 +81,18 @@ } /** + * Return color for the specified position in a color palette. + * + * @param color + * color index + * @return selected color + */ + public static int getColorAsInt(int color) + { + return ColorPalette.colors[color % colors.length].getRGB(); + } + + /** * Returns 12-color palette. * * @return test 12-color palette diff -r 0f154450543f -r 2ca9bcc1fb0c src/org/gfxtest/framework/ImageFactory.java --- a/src/org/gfxtest/framework/ImageFactory.java Wed Jan 18 10:59:30 2012 +0100 +++ b/src/org/gfxtest/framework/ImageFactory.java Thu Jan 19 12:52:36 2012 +0100 @@ -98,9 +98,11 @@ boolean whiteField = evenColumn ^ evenRow; // convert boolean into color code int color = booleanToBlackOrWhiteColor(whiteField); + // set color for given pixel image.setRGB(x, y, color); } } + // return buffered image containing computed color pattern return image; } @@ -141,9 +143,11 @@ boolean whiteField = evenColumn ^ evenRow; // convert boolean into color code int color = booleanToBlackOrWhiteColor(whiteField); + // set color for given pixel image.setRGB(x, y, color); } } + // return buffered image containing computed color pattern return image; } @@ -181,9 +185,11 @@ boolean blackField = evenColumn || evenRow; // convert boolean into color code int color = booleanToBlackOrWhiteColor(!blackField); + // set color for given pixel image.setRGB(x, y, color); } } + // return buffered image containing computed color pattern return image; } @@ -221,9 +227,180 @@ boolean blackField = evenColumn || evenRow; // convert boolean into color code int color = booleanToBlackOrWhiteColor(!blackField); + // set color for given pixel image.setRGB(x, y, color); } } + // return buffered image containing computed color pattern + return image; + } + + /** + * Create image containing horizontal black and white stripes. + * + * @param width + * width of a buffered image + * @param height + * height of a buffered image + * @param imageType + * buffered image type + * @return buffered image containing checker pattern + */ + public static BufferedImage createHorizontalStripesImage(int width, int height, int imageType) + { + // create new image + BufferedImage image = new BufferedImage(width, height, imageType); + + // for all lines in a raster image + for (int y = 0; y < height; y++) + { + // for all columns on a line + for (int x = 0; x < width; x++) + { + // compute color for each pixel + boolean colorFlag = (y % 2) == 0; + // convert boolean into color code + int color = booleanToBlackOrWhiteColor(colorFlag); + // set color for given pixel + image.setRGB(x, y, color); + } + } + // return buffered image containing computed color pattern + return image; + } + + /** + * Create image containing vertical black and white stripes. + * + * @param width + * width of a buffered image + * @param height + * height of a buffered image + * @param imageType + * buffered image type + * @return buffered image containing checker pattern + */ + public static BufferedImage createVerticalStripesImage(int width, int height, int imageType) + { + // create new image + BufferedImage image = new BufferedImage(width, height, imageType); + + // for all lines in a raster image + for (int y = 0; y < height; y++) + { + // for all columns on a line + for (int x = 0; x < width; x++) + { + // compute color for each pixel + boolean colorFlag = (x % 2) == 0; + // convert boolean into color code + int color = booleanToBlackOrWhiteColor(colorFlag); + // set color for given pixel + image.setRGB(x, y, color); + } + } + + // return buffered image containing computed color pattern + return image; + } + + /** + * Create image containing horizontal color stripes. + * + * @param width + * width of a buffered image + * @param height + * height of a buffered image + * @param imageType + * buffered image type + * @return buffered image containing checker pattern + */ + public static BufferedImage createHorizontalColorStripesImage(int width, int height, int imageType) + { + // create new image + BufferedImage image = new BufferedImage(width, height, imageType); + + // for all lines in a raster image + for (int y = 0; y < height; y++) + { + // compute color for each pixel + int color = ColorPalette.getColorAsInt(y); + // for all columns on a line + for (int x = 0; x < width; x++) + { + // set color for given pixel + image.setRGB(x, y, color); + } + } + + // return buffered image containing computed color pattern + return image; + } + + /** + * Create image containing vertical color stripes. + * + * @param width + * width of a buffered image + * @param height + * height of a buffered image + * @param imageType + * buffered image type + * @return buffered image containing checker pattern + */ + public static BufferedImage createVerticalColorStripesImage(int width, int height, int imageType) + { + // create new image + BufferedImage image = new BufferedImage(width, height, imageType); + + // for all lines in a raster image + for (int y = 0; y < height; y++) + { + // for all columns on a line + for (int x = 0; x < width; x++) + { + // compute color for each pixel + int color = ColorPalette.getColorAsInt(x); + // set color for given pixel + image.setRGB(x, y, color); + } + } + + // return buffered image containing computed color pattern + return image; + } + + /** + * Create image containing diagonal black and white stripes. + * + * @param width + * width of a buffered image + * @param height + * height of a buffered image + * @param imageType + * buffered image type + * @return buffered image containing checker pattern + */ + public static BufferedImage createDiagonalStripesImage(int width, int height, int imageType) + { + // create new image + BufferedImage image = new BufferedImage(width, height, imageType); + + // for all lines in a raster image + for (int y = 0; y < height; y++) + { + // for all columns on a line + for (int x = 0; x < width; x++) + { + // compute color for each pixel + boolean colorFlag = (x+y) % 2 == 0; + int color = booleanToBlackOrWhiteColor(colorFlag); + // set color for given pixel + image.setRGB(x, y, color); + } + } + + // return buffered image containing computed color pattern return image; } From andrew at icedtea.classpath.org Thu Jan 19 04:04:53 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 19 Jan 2012 12:04:53 +0000 Subject: /hg/icedtea6-hg: 57 new changesets Message-ID: changeset cc68ed67e963 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=cc68ed67e963 author: Xerxes Ranby date: Tue Dec 06 14:01:50 2011 +0100 CACAO CA162: Make class init protection aware of multiple threads; CA163: descriptor_params_from_paramtypes is protected by a mutex now. 2011-12-06 Xerxes Ranby CACAO: - CA162: Make class init protection aware of multiple threads. - CA163: descriptor_params_from_paramtypes is protected by a mutex now. - Removed return value from descriptor_params_from_paramtypes. - Removed fields from classinfo and related functions from descriptor pool. - src/vm/jit/jit.cpp: Eliminate one instance of useless cache flushing. * NEWS: Updated. * Makefile.am: (CACAO_VERSION): Updated CACAO to 2011-12-01 revision. (CACAO_SHA256SUM): Updated. changeset b792105e5b1a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b792105e5b1a author: aph date: Fri Dec 02 13:28:02 2011 -0500 The big volatile patch. changeset c3830a06fd60 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c3830a06fd60 author: aph date: Mon Dec 05 10:32:03 2011 -0500 More volatile fixups. changeset 7818ff550f62 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=7818ff550f62 author: aph date: Mon Dec 05 10:48:00 2011 -0500 More volatile tidying-up. changeset 3ca12f50fff3 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3ca12f50fff3 author: aph date: Tue Dec 06 06:17:49 2011 -0500 Volatile rewrite. 011-12-05 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_disass): Use class Opcodes to do the disassembly. (Thumb2_Enter): Update ISTATE_SELF_LINK. (T_DMB): New. (fullBarrier): New. (storeBarrier): New. (Thumb2_Accessor): Add volatile barriers. (Thumb2_codegen): Likewise. (Thumb2_Initialize): Check UseCompiler. (class Opcodes): New. Load libopcodes.so lazily. * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def: For every {get,put}field handler, add a test for volatility and duplicate the code path into two parts, volatile and non-volatile. Add barriers to the volatile path. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (dmb) (dmb_st): New macros. (abort_table): Add entries for volatile versions of all the field handlers. ({put,get}field_volatile_*): Add volatile versions of all handlers. (Thumb2_{put,get}field_*_stub): Likewise. * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp (print_vm_offsets): Add CP_CACHE_VOLATILE_FIELD_FLAG_BIT and CP_CACHE_FLAGS. changeset 357ee1a7d452 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=357ee1a7d452 author: aph date: Wed Dec 07 18:14:25 2011 +0000 xranby's suggested improvements. changeset 6a04d4888cc0 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6a04d4888cc0 author: aph date: Thu Dec 08 10:09:28 2011 +0000 merge changeset 0d15daf94aed in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0d15daf94aed author: Xerxes Ranby date: Thu Dec 08 15:07:53 2011 +0100 CACAO CA164: Get rid of mysterious 10 trailing bytes in literal strings. 2011-12-08 Xerxes Ranby CACAO: - CA164: Get rid of mysterious 10 trailing bytes in literal strings. * NEWS: Updated. * Makefile.am: (CACAO_VERSION): Updated CACAO to 2011-12-08 revision. (CACAO_SHA256SUM): Updated. changeset db64ac99a1ee in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=db64ac99a1ee author: aph date: Thu Dec 08 13:51:11 2011 +0000 Add a couple of missing barriers. 2011-12-08 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def (aload_N_getfield, [iaf]load_igetfield): Add a couple of missing barriers. changeset 96ea1d0f5dc4 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=96ea1d0f5dc4 author: doko at ubuntu.com date: Thu Dec 08 15:39:55 2011 +0100 Fix running jamvm jdk tests when configured with a separate relative build dir 2011-12-08 Matthias Klose * Makefile.am (JTREG_SRCS): Use abs_top_srcdir. changeset c8c66c3cd97a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c8c66c3cd97a author: Xerxes Ranby date: Mon Dec 12 12:45:24 2011 +0100 cppInterpreter_arm.S: Add .ltorg at end of the DISPATCH_FINISH macro to unbreak armv5 build-bots; .eabi_attribute Tag_ABI_* replaced by numerical values to stay compatible with GCC 4.3.3. 2011-12-12 Xerxes Ranby * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (DISPATCH_FINISH): Add .ltorg at end of the macro to unbreak armv5 build-bots. (.eabi_attribute Tag_ABI_*): Replaced by numerical values to stay compatible with GCC 4.3.3. changeset e07f3143b2ca in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e07f3143b2ca author: aph date: Mon Dec 12 12:42:26 2011 -0500 Use !UseCompiler instead of DisableCompiler. 2011-12-12 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (DisableCompiler): Delete. (Thumb2_Compile): Use !UseCompiler instead of DisableCompiler. (Thumb2_Initialize): Likewise. changeset d6cf8b242032 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d6cf8b242032 author: aph date: Mon Dec 12 12:46:59 2011 -0500 merge changeset 67df573b0734 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=67df573b0734 author: Omair Majid date: Mon Dec 12 18:01:38 2011 -0500 S7102369, S7094468: remove java.rmi.server.codebase property parsing from rmiregistry Backport of: S7102369: remove java.rmi.server.codebase property parsing from registyimpl S7094468: rmiregistry clean up Upstream changeset: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/6b46f3c7c97c Fixes RH751203 2011-12-12 Omair Majid S7102369, S7094468: remove java.rmi.server.codebase property parsing from rmiregistry * patches/openjdk/7102369-7094468-rmiregistry.patch: New file. Backport from OpenJDK6. * Makefile.am (ICEDTEA_PATCHES): Apply the patch. changeset f10d5790993d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f10d5790993d author: Xerxes Ranby date: Fri Dec 16 16:25:26 2011 +0100 cppInterpreter_arm.S (.fast_native_return_dw): Add a missing PR484 return 0. 2011-12-16 Xerxes Ranby * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (.fast_native_return_dw): Add a missing PR484 return 0. changeset 967b9b186931 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=967b9b186931 author: doko at ubuntu.com date: Fri Dec 16 16:44:20 2011 +0100 Fix make dist, not using any prefixes in EXTRA_DIST 2011-12-16 Matthias Klose * Makefile.am (JTREG_SRCS, REWRITER_SRCS, EXTRA_DIST): Don't use any prefixes. (stamps/jtreg.stamp, check-jdk): Use JTREG_SRCS with srcdir prefix. (stamps/rewriter.stamp): Use REWRITER_SRCS with srcdir prefix. changeset f9a68529d109 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f9a68529d109 author: Andrew John Hughes date: Mon Dec 19 21:39:40 2011 +0000 Backed out changeset 967b9b186931 Reverting as this breaks make distcheck and make dist where builddir != srcdir. Reintroduces confusion between 'jtreg' (the alias to the stamp) and jtreg, the directory. changeset 8fa75d2623a2 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8fa75d2623a2 author: aph date: Mon Dec 19 10:56:30 2011 -0500 Safepoints for ARM JIT-compiled code. 2011-12-16 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (H_SAFEPOINT): New. (Thumb2_Safepoint): New. (Thumb2_Branch): Call Thumb2_Safepoint. (Thumb2_Goto): Likewise. (Thumb2_Return): Likewise. (Thumb2_Initialize): Add handler for H_SAFEPOINT. changeset 0c874e429552 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0c874e429552 author: aph date: Mon Dec 19 16:04:36 2011 +0000 merge changeset fd44d23e1368 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fd44d23e1368 author: aph date: Mon Dec 19 13:05:45 2011 -0500 Add atomic sequences using ldrexd/strexd. 2011-12-19 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def (lgetfield, lputfield): Add atomic sequences using ldrexd/strexd. * openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (getstatic_volatile_dw, putstatic_volatile_dw): Likewise. changeset 293b2d68ce5f in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=293b2d68ce5f author: aph date: Tue Dec 20 10:12:28 2011 -0500 PR837: Fix copying to srcdir on a different physical device. 2011-12-20 Andrew Haley PR837: * Makefile.am (stamps/ports.stamp): Replace "cp -l" with "cp $(SRC_DIR_LINK)". changeset c4c8d17de1e2 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c4c8d17de1e2 author: aph date: Tue Dec 20 15:36:52 2011 +0000 Generate atomic sequences for volatile long field accesses. 2011-12-20 Andrew Haley * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (T_LDREXD, T_STREXD): New instructions. (ldrexd, strexd): Likewise. (Thumb2_load_long, Thumb2_store_long): New functions. (Thumb2_codegen): Use Thumb2_load_long and Thumb2_store_long for all long field accesses. changeset cf80d2049346 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=cf80d2049346 author: aph date: Tue Dec 20 13:49:11 2011 -0500 merge changeset 0ced484988f8 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0ced484988f8 author: Andrew John Hughes date: Thu Dec 22 13:01:16 2011 +0000 Move jtreg sources to src/jtreg to avoid conflicts with 'jtreg' alias. Use $(top_srcdir) instead of $(abs_top_srcdir) so 'make dist' works with relative paths. 2011-12-20 Andrew John Hughes * jtreg/JavaTest.cmdMgrs.lst, * jtreg/JavaTest.toolMgrs.lst, * jtreg/META-INF/MANIFEST.MF, * jtreg/README, * jtreg/com/sun/interview/AllFilesFileFilter.java, * jtreg/com/sun/interview/Checklist.java, * jtreg/com/sun/interview/ChoiceArrayQuestion.java, * jtreg/com/sun/interview/ChoiceQuestion.java, * jtreg/com/sun/interview/CompositeQuestion.java, * jtreg/com/sun/interview/DirectoryFileFilter.java, * jtreg/com/sun/interview/ErrorQuestion.java, * jtreg/com/sun/interview/ExtensionFileFilter.java, * jtreg/com/sun/interview/FileFilter.java, * jtreg/com/sun/interview/FileListQuestion.java, * jtreg/com/sun/interview/FileQuestion.java, * jtreg/com/sun/interview/FilesAndDirectoriesFileFilter.java, * jtreg/com/sun/interview/FinalQuestion.java, * jtreg/com/sun/interview/FloatQuestion.java, * jtreg/com/sun/interview/InetAddressQuestion.java, * jtreg/com/sun/interview/IntQuestion.java, * jtreg/com/sun/interview/Interview.java, * jtreg/com/sun/interview/InterviewQuestion.java, * jtreg/com/sun/interview/InterviewSet.java, * jtreg/com/sun/interview/ListQuestion.java, * jtreg/com/sun/interview/NullQuestion.java, * jtreg/com/sun/interview/Properties2.java, * jtreg/com/sun/interview/PropertiesQuestion.java, * jtreg/com/sun/interview/Question.java, * jtreg/com/sun/interview/StringListQuestion.java, * jtreg/com/sun/interview/StringQuestion.java, * jtreg/com/sun/interview/TreeQuestion.java, * jtreg/com/sun/interview/WizEdit.java, * jtreg/com/sun/interview/WizPrint.java, * jtreg/com/sun/interview/YesNoQuestion.java, * jtreg/com/sun/interview/i18n.properties, * jtreg/com/sun/interview/package.html, * jtreg/com/sun/interview/wizard/ActionDocListener.java, * jtreg/com/sun/interview/wizard/ActionListDataListener.java, * jtreg/com/sun/interview/wizard/ChoiceArrayQuestionRenderer.java, * jtreg/com/sun/interview/wizard/ChoiceQuestionRenderer.java, * jtreg/com/sun/interview/wizard/EditableList.java, * jtreg/com/sun/interview/wizard/Exporter.java, * jtreg/com/sun/interview/wizard/FileList.java, * jtreg/com/sun/interview/wizard/FileListQuestionRenderer.java, * jtreg/com/sun/interview/wizard/FileQuestionRenderer.java, * jtreg/com/sun/interview/wizard/FloatQuestionRenderer.java, * jtreg/com/sun/interview/wizard/I18NResourceBundle.java, * jtreg/com/sun/interview/wizard/InetAddressQuestionRenderer.java, * jtreg/com/sun/interview/wizard/InfoPanel.java, * jtreg/com/sun/interview/wizard/IntQuestionRenderer.java, * jtreg/com/sun/interview/wizard/ListQuestionRenderer.java, * jtreg/com/sun/interview/wizard/NullQuestionRenderer.java, * jtreg/com/sun/interview/wizard/PathPanel.java, * jtreg/com/sun/interview/wizard/PropertiesQuestionRenderer.java, * jtreg/com/sun/interview/wizard/QuestionPanel.java, * jtreg/com/sun/interview/wizard/QuestionRenderer.java, * jtreg/com/sun/interview/wizard/RenderingUtilities.java, * jtreg/com/sun/interview/wizard/SearchDialog.java, * jtreg/com/sun/interview/wizard/StringListQuestionRenderer.java, * jtreg/com/sun/interview/wizard/StringQuestionRenderer.java, * jtreg/com/sun/interview/wizard/SwingFileFilter.java, * jtreg/com/sun/interview/wizard/TreeQuestionRenderer.java, * jtreg/com/sun/interview/wizard/TypeInPanel.java, * jtreg/com/sun/interview/wizard/WizPane.java, * jtreg/com/sun/interview/wizard/Wizard.java, * jtreg/com/sun/interview/wizard/YesNoQuestionRenderer.java, * jtreg/com/sun/interview/wizard/i18n.properties, * jtreg/com/sun/interview/wizard/package.html, * jtreg/com/sun/javatest/AllTestsFilter.java, * jtreg/com/sun/javatest/BasicParameters.java, * jtreg/com/sun/javatest/Command.java, * jtreg/com/sun/javatest/CompositeFilter.java, * jtreg/com/sun/javatest/DefaultTestRunner.java, * jtreg/com/sun/javatest/Deprecated.java, * jtreg/com/sun/javatest/EditJTI.java, * jtreg/com/sun/javatest/EditLinks.java, * jtreg/com/sun/javatest/ExcludeList.java, * jtreg/com/sun/javatest/ExcludeListFilter.java, * jtreg/com/sun/javatest/ExcludeListUpdateHandler.java, * jtreg/com/sun/javatest/FileParameters.java, * jtreg/com/sun/javatest/Harness.java, * jtreg/com/sun/javatest/HarnessHttpHandler.java, * jtreg/com/sun/javatest/InitialUrlFilter.java, * jtreg/com/sun/javatest/InterviewParameters.java, * jtreg/com/sun/javatest/InterviewPropagator.java, * jtreg/com/sun/javatest/JavaTestError.java, * jtreg/com/sun/javatest/JavaTestSecurityManager.java, * jtreg/com/sun/javatest/Keywords.java, * jtreg/com/sun/javatest/KeywordsFilter.java, * jtreg/com/sun/javatest/LastRunFilter.java, * jtreg/com/sun/javatest/LastRunInfo.java, * jtreg/com/sun/javatest/ObservableTestFilter.java, * jtreg/com/sun/javatest/Parameters.java, * jtreg/com/sun/javatest/ProductInfo.java, * jtreg/com/sun/javatest/ResourceTable.java, * jtreg/com/sun/javatest/Script.java, * jtreg/com/sun/javatest/Status.java, * jtreg/com/sun/javatest/StatusFilter.java, * jtreg/com/sun/javatest/TRT_HttpHandler.java, * jtreg/com/sun/javatest/TRT_Iterator.java, * jtreg/com/sun/javatest/TRT_TreeNode.java, * jtreg/com/sun/javatest/TemplateUtilities.java, * jtreg/com/sun/javatest/Test.java, * jtreg/com/sun/javatest/TestDescription.java, * jtreg/com/sun/javatest/TestEnvContext.java, * jtreg/com/sun/javatest/TestEnvironment.java, * jtreg/com/sun/javatest/TestFilter.java, * jtreg/com/sun/javatest/TestFinder.java, * jtreg/com/sun/javatest/TestFinderQueue.java, * jtreg/com/sun/javatest/TestResult.java, * jtreg/com/sun/javatest/TestResultCache.java, * jtreg/com/sun/javatest/TestResultTable.java, * jtreg/com/sun/javatest/TestRunner.java, * jtreg/com/sun/javatest/TestSuite.java, * jtreg/com/sun/javatest/Trace.java, * jtreg/com/sun/javatest/WorkDirectory.java, * jtreg/com/sun/javatest/agent/ActiveAgentCommand.java, * jtreg/com/sun/javatest/agent/ActiveAgentPool.java, * jtreg/com/sun/javatest/agent/ActiveConnectionFactory.java, * jtreg/com/sun/javatest/agent/ActiveModeOptions.java, * jtreg/com/sun/javatest/agent/Agent.java, * jtreg/com/sun/javatest/agent/AgentApplet.java, * jtreg/com/sun/javatest/agent/AgentClassLoader.java, * jtreg/com/sun/javatest/agent/AgentClassLoader2.java, * jtreg/com/sun/javatest/agent/AgentFrame.java, * jtreg/com/sun/javatest/agent/AgentMain.java, * jtreg/com/sun/javatest/agent/AgentManager.java, * jtreg/com/sun/javatest/agent/AgentMonitorCommandManager.java, * jtreg/com/sun/javatest/agent/AgentMonitorTool.java, * jtreg/com/sun/javatest/agent/AgentMonitorToolManager.java, * jtreg/com/sun/javatest/agent/AgentPanel.java, * jtreg/com/sun/javatest/agent/BadValue.java, * jtreg/com/sun/javatest/agent/Connection.java, * jtreg/com/sun/javatest/agent/ConnectionFactory.java, * jtreg/com/sun/javatest/agent/Deck.java, * jtreg/com/sun/javatest/agent/Deprecated.java, * jtreg/com/sun/javatest/agent/Folder.java, * jtreg/com/sun/javatest/agent/Icon.java, * jtreg/com/sun/javatest/agent/InterruptableSocketConnection.java, * jtreg/com/sun/javatest/agent/Map.java, * jtreg/com/sun/javatest/agent/ModeOptions.java, * jtreg/com/sun/javatest/agent/PassiveAgentCommand.java, * jtreg/com/sun/javatest/agent/PassiveConnectionFactory.java, * jtreg/com/sun/javatest/agent/PassiveModeOptions.java, * jtreg/com/sun/javatest/agent/SocketConnection.java, * jtreg/com/sun/javatest/agent/i18n.properties, * jtreg/com/sun/javatest/agent/package.html, * jtreg/com/sun/javatest/audit/Audit.java, * jtreg/com/sun/javatest/audit/AuditCommandManager.java, * jtreg/com/sun/javatest/audit/AuditPane.java, * jtreg/com/sun/javatest/audit/AuditTool.java, * jtreg/com/sun/javatest/audit/AuditToolManager.java, * jtreg/com/sun/javatest/audit/BadChecksumPane.java, * jtreg/com/sun/javatest/audit/BadTestCaseTestsPane.java, * jtreg/com/sun/javatest/audit/BadTestDescriptionPane.java, * jtreg/com/sun/javatest/audit/BadTestsPane.java, * jtreg/com/sun/javatest/audit/ListPane.java, * jtreg/com/sun/javatest/audit/OptionsDialog.java, * jtreg/com/sun/javatest/audit/SummaryPane.java, * jtreg/com/sun/javatest/audit/i18n.properties, * jtreg/com/sun/javatest/audit/package.html, * jtreg/com/sun/javatest/batch/BatchManager.java, * jtreg/com/sun/javatest/batch/ObserverCommand.java, * jtreg/com/sun/javatest/batch/RunTestsCommand.java, * jtreg/com/sun/javatest/batch/i18n.properties, * jtreg/com/sun/javatest/batch/package.html, * jtreg/com/sun/javatest/cof/COF1_0.xsd, * jtreg/com/sun/javatest/cof/COF2_0_2.xsd, * jtreg/com/sun/javatest/cof/COFApplication.java, * jtreg/com/sun/javatest/cof/COFApplications.java, * jtreg/com/sun/javatest/cof/COFData.java, * jtreg/com/sun/javatest/cof/COFEnvironment.java, * jtreg/com/sun/javatest/cof/COFEnvironments.java, * jtreg/com/sun/javatest/cof/COFItem.java, * jtreg/com/sun/javatest/cof/COFOS.java, * jtreg/com/sun/javatest/cof/COFReportAnnotation.java, * jtreg/com/sun/javatest/cof/COFReportAnnotations.java, * jtreg/com/sun/javatest/cof/COFSWEntities.java, * jtreg/com/sun/javatest/cof/COFSWEntity.java, * jtreg/com/sun/javatest/cof/COFStatus.java, * jtreg/com/sun/javatest/cof/COFTest.java, * jtreg/com/sun/javatest/cof/COFTestAttribute.java, * jtreg/com/sun/javatest/cof/COFTestAttributes.java, * jtreg/com/sun/javatest/cof/COFTestCase.java, * jtreg/com/sun/javatest/cof/COFTestCases.java, * jtreg/com/sun/javatest/cof/COFTestSuite.java, * jtreg/com/sun/javatest/cof/COFTestSuites.java, * jtreg/com/sun/javatest/cof/ID.java, * jtreg/com/sun/javatest/cof/Main.java, * jtreg/com/sun/javatest/cof/Report.java, * jtreg/com/sun/javatest/cof/i18n.properties, * jtreg/com/sun/javatest/diff/Diff.java, * jtreg/com/sun/javatest/diff/DiffReader.java, * jtreg/com/sun/javatest/diff/Fault.java, * jtreg/com/sun/javatest/diff/HTMLReporter.java, * jtreg/com/sun/javatest/diff/HTMLWriter.java, * jtreg/com/sun/javatest/diff/Help.java, * jtreg/com/sun/javatest/diff/Main.java, * jtreg/com/sun/javatest/diff/MultiMap.java, * jtreg/com/sun/javatest/diff/ReportReader.java, * jtreg/com/sun/javatest/diff/Reporter.java, * jtreg/com/sun/javatest/diff/SimpleReporter.java, * jtreg/com/sun/javatest/diff/StandardDiff.java, * jtreg/com/sun/javatest/diff/StatusComparator.java, * jtreg/com/sun/javatest/diff/SuperDiff.java, * jtreg/com/sun/javatest/diff/WorkDirectoryReader.java, * jtreg/com/sun/javatest/diff/i18n.properties, * jtreg/com/sun/javatest/exec/AbstractCellEditor.java, * jtreg/com/sun/javatest/exec/AccessWrapper.java, * jtreg/com/sun/javatest/exec/BP_BranchSubpanel.java, * jtreg/com/sun/javatest/exec/BP_DocumentationSubpanel.java, * jtreg/com/sun/javatest/exec/BP_FilteredOutSubpanel.java, * jtreg/com/sun/javatest/exec/BP_Model.java, * jtreg/com/sun/javatest/exec/BP_SummarySubpanel.java, * jtreg/com/sun/javatest/exec/BP_TestListSubpanel.java, * jtreg/com/sun/javatest/exec/BasicCustomTestFilter.java, * jtreg/com/sun/javatest/exec/BranchPanel.java, * jtreg/com/sun/javatest/exec/CE_EnvironmentPane.java, * jtreg/com/sun/javatest/exec/CE_ExcludeListPane.java, * jtreg/com/sun/javatest/exec/CE_ExecutionPane.java, * jtreg/com/sun/javatest/exec/CE_FullView.java, * jtreg/com/sun/javatest/exec/CE_KeywordsPane.java, * jtreg/com/sun/javatest/exec/CE_PriorStatusPane.java, * jtreg/com/sun/javatest/exec/CE_StdPane.java, * jtreg/com/sun/javatest/exec/CE_StdView.java, * jtreg/com/sun/javatest/exec/CE_TemplateDialog.java, * jtreg/com/sun/javatest/exec/CE_TestsPane.java, * jtreg/com/sun/javatest/exec/CE_View.java, * jtreg/com/sun/javatest/exec/ChecklistBrowser.java, * jtreg/com/sun/javatest/exec/ConfigEditor.java, * jtreg/com/sun/javatest/exec/ConfigHandler.java, * jtreg/com/sun/javatest/exec/ConfigurableTestFilter.java, * jtreg/com/sun/javatest/exec/ContextManager.java, * jtreg/com/sun/javatest/exec/CustomTestResultViewer.java, * jtreg/com/sun/javatest/exec/DetailsBrowser.java, * jtreg/com/sun/javatest/exec/ET_FilterHandler.java, * jtreg/com/sun/javatest/exec/ElapsedTimeMonitor.java, * jtreg/com/sun/javatest/exec/EnvironmentBrowser.java, * jtreg/com/sun/javatest/exec/ExcludeListBrowser.java, * jtreg/com/sun/javatest/exec/ExecModel.java, * jtreg/com/sun/javatest/exec/ExecTool.java, * jtreg/com/sun/javatest/exec/ExecToolManager.java, * jtreg/com/sun/javatest/exec/FeatureManager.java, * jtreg/com/sun/javatest/exec/FileSystemTableModel.java, * jtreg/com/sun/javatest/exec/FileTable.java, * jtreg/com/sun/javatest/exec/FileType.java, * jtreg/com/sun/javatest/exec/FilesPane.java, * jtreg/com/sun/javatest/exec/FilterConfig.java, * jtreg/com/sun/javatest/exec/FilterSelectionHandler.java, * jtreg/com/sun/javatest/exec/JavaTestContextMenu.java, * jtreg/com/sun/javatest/exec/JavaTestMenuManager.java, * jtreg/com/sun/javatest/exec/JavaTestToolBar.java, * jtreg/com/sun/javatest/exec/LogViewer.java, * jtreg/com/sun/javatest/exec/LogViewerTools.java, * jtreg/com/sun/javatest/exec/MessageStrip.java, * jtreg/com/sun/javatest/exec/Monitor.java, * jtreg/com/sun/javatest/exec/MonitorState.java, * jtreg/com/sun/javatest/exec/MultiFormatPane.java, * jtreg/com/sun/javatest/exec/MultiSelectPanel.java, * jtreg/com/sun/javatest/exec/NavigationPane.java, * jtreg/com/sun/javatest/exec/NewReportDialog.java, * jtreg/com/sun/javatest/exec/ParameterFilter.java, * jtreg/com/sun/javatest/exec/PrefsPane.java, * jtreg/com/sun/javatest/exec/ProgressMeter.java, * jtreg/com/sun/javatest/exec/ProgressMonitor.java, * jtreg/com/sun/javatest/exec/PropertiesBrowser.java, * jtreg/com/sun/javatest/exec/QuestionLogBrowser.java, * jtreg/com/sun/javatest/exec/QuickStartWizard.java, * jtreg/com/sun/javatest/exec/RenderingUtilities.java, * jtreg/com/sun/javatest/exec/ReportBrowser.java, * jtreg/com/sun/javatest/exec/ReportHandler.java, * jtreg/com/sun/javatest/exec/RunProgressMonitor.java, * jtreg/com/sun/javatest/exec/RunTestsHandler.java, * jtreg/com/sun/javatest/exec/TP_CustomSubpanel.java, * jtreg/com/sun/javatest/exec/TP_DescSubpanel.java, * jtreg/com/sun/javatest/exec/TP_DocumentationSubpanel.java, * jtreg/com/sun/javatest/exec/TP_EnvSubpanel.java, * jtreg/com/sun/javatest/exec/TP_FilesSubpanel.java, * jtreg/com/sun/javatest/exec/TP_OutputSubpanel.java, * jtreg/com/sun/javatest/exec/TP_PropertySubpanel.java, * jtreg/com/sun/javatest/exec/TP_ResultsSubpanel.java, * jtreg/com/sun/javatest/exec/TP_Subpanel.java, * jtreg/com/sun/javatest/exec/TT_NodeCache.java, * jtreg/com/sun/javatest/exec/TT_Renderer.java, * jtreg/com/sun/javatest/exec/TU_ViewManager.java, * jtreg/com/sun/javatest/exec/TemplateParameterFilter.java, * jtreg/com/sun/javatest/exec/TestPanel.java, * jtreg/com/sun/javatest/exec/TestSuiteErrorsDialog.java, * jtreg/com/sun/javatest/exec/TestTree.java, * jtreg/com/sun/javatest/exec/TestTreeModel.java, * jtreg/com/sun/javatest/exec/TestTreePanel.java, * jtreg/com/sun/javatest/exec/ToolBarManager.java, * jtreg/com/sun/javatest/exec/ToolBarPanel.java, * jtreg/com/sun/javatest/exec/TreePanelModel.java, * jtreg/com/sun/javatest/exec/WorkDirChooseTool.java, * jtreg/com/sun/javatest/exec/i18n.properties, * jtreg/com/sun/javatest/exec/package.html, * jtreg/com/sun/javatest/finder/BinaryTestFinder.java, * jtreg/com/sun/javatest/finder/BinaryTestWriter.java, * jtreg/com/sun/javatest/finder/ChameleonTestFinder.java, * jtreg/com/sun/javatest/finder/CommentStream.java, * jtreg/com/sun/javatest/finder/ExpandTestFinder.java, * jtreg/com/sun/javatest/finder/HTMLCommentStream.java, * jtreg/com/sun/javatest/finder/HTMLTestFinder.java, * jtreg/com/sun/javatest/finder/JavaCommentStream.java, * jtreg/com/sun/javatest/finder/ReverseTestFinder.java, * jtreg/com/sun/javatest/finder/ShScriptCommentStream.java, * jtreg/com/sun/javatest/finder/ShowTests.java, * jtreg/com/sun/javatest/finder/TagTestFinder.java, * jtreg/com/sun/javatest/finder/i18n.properties, * jtreg/com/sun/javatest/finder/package.html, * jtreg/com/sun/javatest/httpd/HttpdServer.java, * jtreg/com/sun/javatest/httpd/JThttpProvider.java, * jtreg/com/sun/javatest/httpd/PageGenerator.java, * jtreg/com/sun/javatest/httpd/ProviderRegistry.java, * jtreg/com/sun/javatest/httpd/RequestHandler.java, * jtreg/com/sun/javatest/httpd/RootRegistry.java, * jtreg/com/sun/javatest/httpd/httpURL.java, * jtreg/com/sun/javatest/httpd/i18n.properties, * jtreg/com/sun/javatest/i18n.properties, * jtreg/com/sun/javatest/interview/BasicInterviewParameters.java, * jtreg/com/sun/javatest/interview/ConcurrencyInterview.java, * jtreg/com/sun/javatest/interview/DefaultInterviewParameters.java, * jtreg/com/sun/javatest/interview/EnvironmentInterview.java, * jtreg/com/sun/javatest/interview/ExcludeListInterview.java, * jtreg/com/sun/javatest/interview/KeywordsInterview.java, * jtreg/com/sun/javatest/interview/LegacyParameters.java, * jtreg/com/sun/javatest/interview/PriorStatusInterview.java, * jtreg/com/sun/javatest/interview/SimpleInterviewParameters.java, * jtreg/com/sun/javatest/interview/TestsInterview.java, * jtreg/com/sun/javatest/interview/TimeoutFactorInterview.java, * jtreg/com/sun/javatest/interview/i18n.properties, * jtreg/com/sun/javatest/interview/package.html, * jtreg/com/sun/javatest/lib/APIScript.java, * jtreg/com/sun/javatest/lib/Deprecated.java, * jtreg/com/sun/javatest/lib/ExecStdTestOtherJVMCmd.java, * jtreg/com/sun/javatest/lib/ExecStdTestSameJVMCmd.java, * jtreg/com/sun/javatest/lib/JavaCompileCommand.java, * jtreg/com/sun/javatest/lib/KeywordScript.java, * jtreg/com/sun/javatest/lib/MultiStatus.java, * jtreg/com/sun/javatest/lib/MultiTest.java, * jtreg/com/sun/javatest/lib/ProcessCommand.java, * jtreg/com/sun/javatest/lib/ReportScript.java, * jtreg/com/sun/javatest/lib/StdTestScript.java, * jtreg/com/sun/javatest/lib/TestCases.java, * jtreg/com/sun/javatest/logging/ErrorDialogHandler.java, * jtreg/com/sun/javatest/logging/FileEvent.java, * jtreg/com/sun/javatest/logging/FileListener.java, * jtreg/com/sun/javatest/logging/FilteredLogModel.java, * jtreg/com/sun/javatest/logging/JTFormatter.java, * jtreg/com/sun/javatest/logging/LogModel.java, * jtreg/com/sun/javatest/logging/LoggerFactory.java, * jtreg/com/sun/javatest/logging/ObservedFile.java, * jtreg/com/sun/javatest/logging/WorkDirLogHandler.java, * jtreg/com/sun/javatest/logging/i18n.properties, * jtreg/com/sun/javatest/mrep/BrowserPane.java, * jtreg/com/sun/javatest/mrep/ConflictResolutionDialog.java, * jtreg/com/sun/javatest/mrep/ConflictResolver.java, * jtreg/com/sun/javatest/mrep/FilesPane.java, * jtreg/com/sun/javatest/mrep/Merger.java, * jtreg/com/sun/javatest/mrep/OptionsDialog.java, * jtreg/com/sun/javatest/mrep/OptionsPane.java, * jtreg/com/sun/javatest/mrep/ReportDirChooser.java, * jtreg/com/sun/javatest/mrep/ReportTool.java, * jtreg/com/sun/javatest/mrep/ReportToolManager.java, * jtreg/com/sun/javatest/mrep/Scheme.java, * jtreg/com/sun/javatest/mrep/TestResultDescr.java, * jtreg/com/sun/javatest/mrep/XMLReportReader.java, * jtreg/com/sun/javatest/mrep/XMLReportWriter.java, * jtreg/com/sun/javatest/mrep/i18n.properties, * jtreg/com/sun/javatest/package.html, * jtreg/com/sun/javatest/regtest/Action.java, * jtreg/com/sun/javatest/regtest/AntOptionDecoder.java, * jtreg/com/sun/javatest/regtest/AppletAction.java, * jtreg/com/sun/javatest/regtest/AppletWrapper.java, * jtreg/com/sun/javatest/regtest/BadArgs.java, * jtreg/com/sun/javatest/regtest/BuildAction.java, * jtreg/com/sun/javatest/regtest/CheckFiles.java, * jtreg/com/sun/javatest/regtest/CleanAction.java, * jtreg/com/sun/javatest/regtest/CompileAction.java, * jtreg/com/sun/javatest/regtest/GetSystemProperty.java, * jtreg/com/sun/javatest/regtest/Help.java, * jtreg/com/sun/javatest/regtest/IgnoreAction.java, * jtreg/com/sun/javatest/regtest/IgnoreKind.java, * jtreg/com/sun/javatest/regtest/JDK.java, * jtreg/com/sun/javatest/regtest/Main.java, * jtreg/com/sun/javatest/regtest/MainAction.java, * jtreg/com/sun/javatest/regtest/MainWrapper.java, * jtreg/com/sun/javatest/regtest/Option.java, * jtreg/com/sun/javatest/regtest/OptionDecoder.java, * jtreg/com/sun/javatest/regtest/ParseException.java, * jtreg/com/sun/javatest/regtest/Path.java, * jtreg/com/sun/javatest/regtest/RegressionEnvironment.java, * jtreg/com/sun/javatest/regtest/RegressionObserver.java, * jtreg/com/sun/javatest/regtest/RegressionParameters.java, * jtreg/com/sun/javatest/regtest/RegressionScript.java, * jtreg/com/sun/javatest/regtest/RegressionSecurityManager.java, * jtreg/com/sun/javatest/regtest/RegressionTestFinder.java, * jtreg/com/sun/javatest/regtest/RegressionTestSuite.java, * jtreg/com/sun/javatest/regtest/ShellAction.java, * jtreg/com/sun/javatest/regtest/StringArray.java, * jtreg/com/sun/javatest/regtest/StringUtils.java, * jtreg/com/sun/javatest/regtest/TestRunException.java, * jtreg/com/sun/javatest/regtest/Verbose.java, * jtreg/com/sun/javatest/regtest/i18n.properties, * jtreg/com/sun/javatest/report/ConfigSection.java, * jtreg/com/sun/javatest/report/CustomReport.java, * jtreg/com/sun/javatest/report/HTMLReport.java, * jtreg/com/sun/javatest/report/HTMLSection.java, * jtreg/com/sun/javatest/report/PlainTextReport.java, * jtreg/com/sun/javatest/report/Report.java, * jtreg/com/sun/javatest/report/ReportDirChooser.java, * jtreg/com/sun/javatest/report/ReportFormat.java, * jtreg/com/sun/javatest/report/ReportManager.java, * jtreg/com/sun/javatest/report/ReportModel.java, * jtreg/com/sun/javatest/report/ReportWriter.java, * jtreg/com/sun/javatest/report/ResultSection.java, * jtreg/com/sun/javatest/report/StatisticsSection.java, * jtreg/com/sun/javatest/report/StringArrayComparator.java, * jtreg/com/sun/javatest/report/TestResultsByFileComparator.java, * jtreg/com/sun/javatest/report/TestResultsByStatusAndTitleComparator. java, * jtreg/com/sun/javatest/report/TestResultsByTitleComparator.java, * jtreg/com/sun/javatest/report/XMLReport.java, * jtreg/com/sun/javatest/report/XMLReportMaker.java, * jtreg/com/sun/javatest/report/i18n.properties, * jtreg/com/sun/javatest/report/package.html, * jtreg/com/sun/javatest/stylesheet.css, * jtreg/com/sun/javatest/tool/Command.java, * jtreg/com/sun/javatest/tool/CommandContext.java, * jtreg/com/sun/javatest/tool/CommandManager.java, * jtreg/com/sun/javatest/tool/CommandParser.java, * jtreg/com/sun/javatest/tool/ConfigManager.java, * jtreg/com/sun/javatest/tool/CustomPropagationController.java, * jtreg/com/sun/javatest/tool/Deck.java, * jtreg/com/sun/javatest/tool/DeskView.java, * jtreg/com/sun/javatest/tool/Desktop.java, * jtreg/com/sun/javatest/tool/DesktopManager.java, * jtreg/com/sun/javatest/tool/DesktopPrefsPane.java, * jtreg/com/sun/javatest/tool/EditableFileList.java, * jtreg/com/sun/javatest/tool/EditableList.java, * jtreg/com/sun/javatest/tool/EnvironmentManager.java, * jtreg/com/sun/javatest/tool/FileChooser.java, * jtreg/com/sun/javatest/tool/FileHistory.java, * jtreg/com/sun/javatest/tool/FileOpener.java, * jtreg/com/sun/javatest/tool/FocusMonitor.java, * jtreg/com/sun/javatest/tool/HelpLink.java, * jtreg/com/sun/javatest/tool/HelpLinkBeanInfo.java, * jtreg/com/sun/javatest/tool/HelpManager.java, * jtreg/com/sun/javatest/tool/HelpMenu.java, * jtreg/com/sun/javatest/tool/HttpManager.java, * jtreg/com/sun/javatest/tool/I18NUtils.java, * jtreg/com/sun/javatest/tool/IconFactory.java, * jtreg/com/sun/javatest/tool/IconLabel.java, * jtreg/com/sun/javatest/tool/IconLabelBeanInfo.java, * jtreg/com/sun/javatest/tool/LogManager.java, * jtreg/com/sun/javatest/tool/MDIDeskView.java, * jtreg/com/sun/javatest/tool/Main.java, * jtreg/com/sun/javatest/tool/ManagerLoader.java, * jtreg/com/sun/javatest/tool/PieChart.java, * jtreg/com/sun/javatest/tool/Preferences.java, * jtreg/com/sun/javatest/tool/SDIDeskView.java, * jtreg/com/sun/javatest/tool/SelectedWorkDirApprover.java, * jtreg/com/sun/javatest/tool/Startup.java, * jtreg/com/sun/javatest/tool/TabDeskView.java, * jtreg/com/sun/javatest/tool/TestSuiteChooser.java, * jtreg/com/sun/javatest/tool/TestTreeSelectionPane.java, * jtreg/com/sun/javatest/tool/Tool.java, * jtreg/com/sun/javatest/tool/ToolAction.java, * jtreg/com/sun/javatest/tool/ToolDialog.java, * jtreg/com/sun/javatest/tool/ToolManager.java, * jtreg/com/sun/javatest/tool/TreeSelectionPane.java, * jtreg/com/sun/javatest/tool/UIFactory.java, * jtreg/com/sun/javatest/tool/VerboseCommand.java, * jtreg/com/sun/javatest/tool/WDC_FileFilter.java, * jtreg/com/sun/javatest/tool/WDC_FileView.java, * jtreg/com/sun/javatest/tool/WorkDirChooser.java, * jtreg/com/sun/javatest/tool/i18n.properties, * jtreg/com/sun/javatest/tool/package.html, * jtreg/com/sun/javatest/util/BackupPolicy.java, * jtreg/com/sun/javatest/util/BackupUtil.java, * jtreg/com/sun/javatest/util/Debug.java, * jtreg/com/sun/javatest/util/DirectoryClassLoader.java, * jtreg/com/sun/javatest/util/DynamicArray.java, * jtreg/com/sun/javatest/util/ExitCount.java, * jtreg/com/sun/javatest/util/Fifo.java, * jtreg/com/sun/javatest/util/FileFilter.java, * jtreg/com/sun/javatest/util/FileInfoCache.java, * jtreg/com/sun/javatest/util/HTMLWriter.java, * jtreg/com/sun/javatest/util/HelpTree.java, * jtreg/com/sun/javatest/util/I18NResourceBundle.java, * jtreg/com/sun/javatest/util/LineParser.java, * jtreg/com/sun/javatest/util/LogFile.java, * jtreg/com/sun/javatest/util/MainAppletContext.java, * jtreg/com/sun/javatest/util/MainFrame.java, * jtreg/com/sun/javatest/util/OrderedTwoWayTable.java, * jtreg/com/sun/javatest/util/PathClassLoader.java, * jtreg/com/sun/javatest/util/PrefixMap.java, * jtreg/com/sun/javatest/util/Properties.java, * jtreg/com/sun/javatest/util/PropertyArray.java, * jtreg/com/sun/javatest/util/ReadAheadIterator.java, * jtreg/com/sun/javatest/util/SortedProperties.java, * jtreg/com/sun/javatest/util/StringArray.java, * jtreg/com/sun/javatest/util/SysEnv.java, * jtreg/com/sun/javatest/util/TextStream.java, * jtreg/com/sun/javatest/util/TextWriter.java, * jtreg/com/sun/javatest/util/Timer.java, * jtreg/com/sun/javatest/util/WrapWriter.java, * jtreg/com/sun/javatest/util/WriterStream.java, * jtreg/com/sun/javatest/util/XMLWriter.java, * jtreg/com/sun/javatest/util/i18n.properties, * jtreg/com/sun/javatest/util/package.html, * jtreg/excludelist.jdk.jtx, * jtreg/legal/copyright.txt, * jtreg/legal/license.txt: Moved to src/jtreg to avoid name collision. * Makefile.am: Use new path to JTREG_SRCS and make it relative. * src/jtreg/JavaTest.cmdMgrs.lst, * src/jtreg/JavaTest.toolMgrs.lst, * src/jtreg/META-INF/MANIFEST.MF, * src/jtreg/README, * src/jtreg/com/sun/interview/AllFilesFileFilter.java, * src/jtreg/com/sun/interview/Checklist.java, * src/jtreg/com/sun/interview/ChoiceArrayQuestion.java, * src/jtreg/com/sun/interview/ChoiceQuestion.java, * src/jtreg/com/sun/interview/CompositeQuestion.java, * src/jtreg/com/sun/interview/DirectoryFileFilter.java, * src/jtreg/com/sun/interview/ErrorQuestion.java, * src/jtreg/com/sun/interview/ExtensionFileFilter.java, * src/jtreg/com/sun/interview/FileFilter.java, * src/jtreg/com/sun/interview/FileListQuestion.java, * src/jtreg/com/sun/interview/FileQuestion.java, * src/jtreg/com/sun/interview/FilesAndDirectoriesFileFilter.java, * src/jtreg/com/sun/interview/FinalQuestion.java, * src/jtreg/com/sun/interview/FloatQuestion.java, * src/jtreg/com/sun/interview/InetAddressQuestion.java, * src/jtreg/com/sun/interview/IntQuestion.java, * src/jtreg/com/sun/interview/Interview.java, * src/jtreg/com/sun/interview/InterviewQuestion.java, * src/jtreg/com/sun/interview/InterviewSet.java, * src/jtreg/com/sun/interview/ListQuestion.java, * src/jtreg/com/sun/interview/NullQuestion.java, * src/jtreg/com/sun/interview/Properties2.java, * src/jtreg/com/sun/interview/PropertiesQuestion.java, * src/jtreg/com/sun/interview/Question.java, * src/jtreg/com/sun/interview/StringListQuestion.java, * src/jtreg/com/sun/interview/StringQuestion.java, * src/jtreg/com/sun/interview/TreeQuestion.java, * src/jtreg/com/sun/interview/WizEdit.java, * src/jtreg/com/sun/interview/WizPrint.java, * src/jtreg/com/sun/interview/YesNoQuestion.java, * src/jtreg/com/sun/interview/i18n.properties, * src/jtreg/com/sun/interview/package.html, * src/jtreg/com/sun/interview/wizard/ActionDocListener.java, * src/jtreg/com/sun/interview/wizard/ActionListDataListener.java, * src/jtreg/com/sun/interview/wizard/ChoiceArrayQuestionRenderer.java, * src/jtreg/com/sun/interview/wizard/ChoiceQuestionRenderer.java, * src/jtreg/com/sun/interview/wizard/EditableList.java, * src/jtreg/com/sun/interview/wizard/Exporter.java, * src/jtreg/com/sun/interview/wizard/FileList.java, * src/jtreg/com/sun/interview/wizard/FileListQuestionRenderer.java, * src/jtreg/com/sun/interview/wizard/FileQuestionRenderer.java, * src/jtreg/com/sun/interview/wizard/FloatQuestionRenderer.java, * src/jtreg/com/sun/interview/wizard/I18NResourceBundle.java, * src/jtreg/com/sun/interview/wizard/InetAddressQuestionRenderer.java, * src/jtreg/com/sun/interview/wizard/InfoPanel.java, * src/jtreg/com/sun/interview/wizard/IntQuestionRenderer.java, * src/jtreg/com/sun/interview/wizard/ListQuestionRenderer.java, * src/jtreg/com/sun/interview/wizard/NullQuestionRenderer.java, * src/jtreg/com/sun/interview/wizard/PathPanel.java, * src/jtreg/com/sun/interview/wizard/PropertiesQuestionRenderer.java, * src/jtreg/com/sun/interview/wizard/QuestionPanel.java, * src/jtreg/com/sun/interview/wizard/QuestionRenderer.java, * src/jtreg/com/sun/interview/wizard/RenderingUtilities.java, * src/jtreg/com/sun/interview/wizard/SearchDialog.java, * src/jtreg/com/sun/interview/wizard/StringListQuestionRenderer.java, * src/jtreg/com/sun/interview/wizard/StringQuestionRenderer.java, * src/jtreg/com/sun/interview/wizard/SwingFileFilter.java, * src/jtreg/com/sun/interview/wizard/TreeQuestionRenderer.java, * src/jtreg/com/sun/interview/wizard/TypeInPanel.java, * src/jtreg/com/sun/interview/wizard/WizPane.java, * src/jtreg/com/sun/interview/wizard/Wizard.java, * src/jtreg/com/sun/interview/wizard/YesNoQuestionRenderer.java, * src/jtreg/com/sun/interview/wizard/i18n.properties, * src/jtreg/com/sun/interview/wizard/package.html, * src/jtreg/com/sun/javatest/AllTestsFilter.java, * src/jtreg/com/sun/javatest/BasicParameters.java, * src/jtreg/com/sun/javatest/Command.java, * src/jtreg/com/sun/javatest/CompositeFilter.java, * src/jtreg/com/sun/javatest/DefaultTestRunner.java, * src/jtreg/com/sun/javatest/Deprecated.java, * src/jtreg/com/sun/javatest/EditJTI.java, * src/jtreg/com/sun/javatest/EditLinks.java, * src/jtreg/com/sun/javatest/ExcludeList.java, * src/jtreg/com/sun/javatest/ExcludeListFilter.java, * src/jtreg/com/sun/javatest/ExcludeListUpdateHandler.java, * src/jtreg/com/sun/javatest/FileParameters.java, * src/jtreg/com/sun/javatest/Harness.java, * src/jtreg/com/sun/javatest/HarnessHttpHandler.java, * src/jtreg/com/sun/javatest/InitialUrlFilter.java, * src/jtreg/com/sun/javatest/InterviewParameters.java, * src/jtreg/com/sun/javatest/InterviewPropagator.java, * src/jtreg/com/sun/javatest/JavaTestError.java, * src/jtreg/com/sun/javatest/JavaTestSecurityManager.java, * src/jtreg/com/sun/javatest/Keywords.java, * src/jtreg/com/sun/javatest/KeywordsFilter.java, * src/jtreg/com/sun/javatest/LastRunFilter.java, * src/jtreg/com/sun/javatest/LastRunInfo.java, * src/jtreg/com/sun/javatest/ObservableTestFilter.java, * src/jtreg/com/sun/javatest/Parameters.java, * src/jtreg/com/sun/javatest/ProductInfo.java, * src/jtreg/com/sun/javatest/ResourceTable.java, * src/jtreg/com/sun/javatest/Script.java, * src/jtreg/com/sun/javatest/Status.java, * src/jtreg/com/sun/javatest/StatusFilter.java, * src/jtreg/com/sun/javatest/TRT_HttpHandler.java, * src/jtreg/com/sun/javatest/TRT_Iterator.java, * src/jtreg/com/sun/javatest/TRT_TreeNode.java, * src/jtreg/com/sun/javatest/TemplateUtilities.java, * src/jtreg/com/sun/javatest/Test.java, * src/jtreg/com/sun/javatest/TestDescription.java, * src/jtreg/com/sun/javatest/TestEnvContext.java, * src/jtreg/com/sun/javatest/TestEnvironment.java, * src/jtreg/com/sun/javatest/TestFilter.java, * src/jtreg/com/sun/javatest/TestFinder.java, * src/jtreg/com/sun/javatest/TestFinderQueue.java, * src/jtreg/com/sun/javatest/TestResult.java, * src/jtreg/com/sun/javatest/TestResultCache.java, * src/jtreg/com/sun/javatest/TestResultTable.java, * src/jtreg/com/sun/javatest/TestRunner.java, * src/jtreg/com/sun/javatest/TestSuite.java, * src/jtreg/com/sun/javatest/Trace.java, * src/jtreg/com/sun/javatest/WorkDirectory.java, * src/jtreg/com/sun/javatest/agent/ActiveAgentCommand.java, * src/jtreg/com/sun/javatest/agent/ActiveAgentPool.java, * src/jtreg/com/sun/javatest/agent/ActiveConnectionFactory.java, * src/jtreg/com/sun/javatest/agent/ActiveModeOptions.java, * src/jtreg/com/sun/javatest/agent/Agent.java, * src/jtreg/com/sun/javatest/agent/AgentApplet.java, * src/jtreg/com/sun/javatest/agent/AgentClassLoader.java, * src/jtreg/com/sun/javatest/agent/AgentClassLoader2.java, * src/jtreg/com/sun/javatest/agent/AgentFrame.java, * src/jtreg/com/sun/javatest/agent/AgentMain.java, * src/jtreg/com/sun/javatest/agent/AgentManager.java, * src/jtreg/com/sun/javatest/agent/AgentMonitorCommandManager.java, * src/jtreg/com/sun/javatest/agent/AgentMonitorTool.java, * src/jtreg/com/sun/javatest/agent/AgentMonitorToolManager.java, * src/jtreg/com/sun/javatest/agent/AgentPanel.java, * src/jtreg/com/sun/javatest/agent/BadValue.java, * src/jtreg/com/sun/javatest/agent/Connection.java, * src/jtreg/com/sun/javatest/agent/ConnectionFactory.java, * src/jtreg/com/sun/javatest/agent/Deck.java, * src/jtreg/com/sun/javatest/agent/Deprecated.java, * src/jtreg/com/sun/javatest/agent/Folder.java, * src/jtreg/com/sun/javatest/agent/Icon.java, * src/jtreg/com/sun/javatest/agent/InterruptableSocketConnection.java, * src/jtreg/com/sun/javatest/agent/Map.java, * src/jtreg/com/sun/javatest/agent/ModeOptions.java, * src/jtreg/com/sun/javatest/agent/PassiveAgentCommand.java, * src/jtreg/com/sun/javatest/agent/PassiveConnectionFactory.java, * src/jtreg/com/sun/javatest/agent/PassiveModeOptions.java, * src/jtreg/com/sun/javatest/agent/SocketConnection.java, * src/jtreg/com/sun/javatest/agent/i18n.properties, * src/jtreg/com/sun/javatest/agent/package.html, * src/jtreg/com/sun/javatest/audit/Audit.java, * src/jtreg/com/sun/javatest/audit/AuditCommandManager.java, * src/jtreg/com/sun/javatest/audit/AuditPane.java, * src/jtreg/com/sun/javatest/audit/AuditTool.java, * src/jtreg/com/sun/javatest/audit/AuditToolManager.java, * src/jtreg/com/sun/javatest/audit/BadChecksumPane.java, * src/jtreg/com/sun/javatest/audit/BadTestCaseTestsPane.java, * src/jtreg/com/sun/javatest/audit/BadTestDescriptionPane.java, * src/jtreg/com/sun/javatest/audit/BadTestsPane.java, * src/jtreg/com/sun/javatest/audit/ListPane.java, * src/jtreg/com/sun/javatest/audit/OptionsDialog.java, * src/jtreg/com/sun/javatest/audit/SummaryPane.java, * src/jtreg/com/sun/javatest/audit/i18n.properties, * src/jtreg/com/sun/javatest/audit/package.html, * src/jtreg/com/sun/javatest/batch/BatchManager.java, * src/jtreg/com/sun/javatest/batch/ObserverCommand.java, * src/jtreg/com/sun/javatest/batch/RunTestsCommand.java, * src/jtreg/com/sun/javatest/batch/i18n.properties, * src/jtreg/com/sun/javatest/batch/package.html, * src/jtreg/com/sun/javatest/cof/COF1_0.xsd, * src/jtreg/com/sun/javatest/cof/COF2_0_2.xsd, * src/jtreg/com/sun/javatest/cof/COFApplication.java, * src/jtreg/com/sun/javatest/cof/COFApplications.java, * src/jtreg/com/sun/javatest/cof/COFData.java, * src/jtreg/com/sun/javatest/cof/COFEnvironment.java, * src/jtreg/com/sun/javatest/cof/COFEnvironments.java, * src/jtreg/com/sun/javatest/cof/COFItem.java, * src/jtreg/com/sun/javatest/cof/COFOS.java, * src/jtreg/com/sun/javatest/cof/COFReportAnnotation.java, * src/jtreg/com/sun/javatest/cof/COFReportAnnotations.java, * src/jtreg/com/sun/javatest/cof/COFSWEntities.java, * src/jtreg/com/sun/javatest/cof/COFSWEntity.java, * src/jtreg/com/sun/javatest/cof/COFStatus.java, * src/jtreg/com/sun/javatest/cof/COFTest.java, * src/jtreg/com/sun/javatest/cof/COFTestAttribute.java, * src/jtreg/com/sun/javatest/cof/COFTestAttributes.java, * src/jtreg/com/sun/javatest/cof/COFTestCase.java, * src/jtreg/com/sun/javatest/cof/COFTestCases.java, * src/jtreg/com/sun/javatest/cof/COFTestSuite.java, * src/jtreg/com/sun/javatest/cof/COFTestSuites.java, * src/jtreg/com/sun/javatest/cof/ID.java, * src/jtreg/com/sun/javatest/cof/Main.java, * src/jtreg/com/sun/javatest/cof/Report.java, * src/jtreg/com/sun/javatest/cof/i18n.properties, * src/jtreg/com/sun/javatest/diff/Diff.java, * src/jtreg/com/sun/javatest/diff/DiffReader.java, * src/jtreg/com/sun/javatest/diff/Fault.java, * src/jtreg/com/sun/javatest/diff/HTMLReporter.java, * src/jtreg/com/sun/javatest/diff/HTMLWriter.java, * src/jtreg/com/sun/javatest/diff/Help.java, * src/jtreg/com/sun/javatest/diff/Main.java, * src/jtreg/com/sun/javatest/diff/MultiMap.java, * src/jtreg/com/sun/javatest/diff/ReportReader.java, * src/jtreg/com/sun/javatest/diff/Reporter.java, * src/jtreg/com/sun/javatest/diff/SimpleReporter.java, * src/jtreg/com/sun/javatest/diff/StandardDiff.java, * src/jtreg/com/sun/javatest/diff/StatusComparator.java, * src/jtreg/com/sun/javatest/diff/SuperDiff.java, * src/jtreg/com/sun/javatest/diff/WorkDirectoryReader.java, * src/jtreg/com/sun/javatest/diff/i18n.properties, * src/jtreg/com/sun/javatest/exec/AbstractCellEditor.java, * src/jtreg/com/sun/javatest/exec/AccessWrapper.java, * src/jtreg/com/sun/javatest/exec/BP_BranchSubpanel.java, * src/jtreg/com/sun/javatest/exec/BP_DocumentationSubpanel.java, * src/jtreg/com/sun/javatest/exec/BP_FilteredOutSubpanel.java, * src/jtreg/com/sun/javatest/exec/BP_Model.java, * src/jtreg/com/sun/javatest/exec/BP_SummarySubpanel.java, * src/jtreg/com/sun/javatest/exec/BP_TestListSubpanel.java, * src/jtreg/com/sun/javatest/exec/BasicCustomTestFilter.java, * src/jtreg/com/sun/javatest/exec/BranchPanel.java, * src/jtreg/com/sun/javatest/exec/CE_EnvironmentPane.java, * src/jtreg/com/sun/javatest/exec/CE_ExcludeListPane.java, * src/jtreg/com/sun/javatest/exec/CE_ExecutionPane.java, * src/jtreg/com/sun/javatest/exec/CE_FullView.java, * src/jtreg/com/sun/javatest/exec/CE_KeywordsPane.java, * src/jtreg/com/sun/javatest/exec/CE_PriorStatusPane.java, * src/jtreg/com/sun/javatest/exec/CE_StdPane.java, * src/jtreg/com/sun/javatest/exec/CE_StdView.java, * src/jtreg/com/sun/javatest/exec/CE_TemplateDialog.java, * src/jtreg/com/sun/javatest/exec/CE_TestsPane.java, * src/jtreg/com/sun/javatest/exec/CE_View.java, * src/jtreg/com/sun/javatest/exec/ChecklistBrowser.java, * src/jtreg/com/sun/javatest/exec/ConfigEditor.java, * src/jtreg/com/sun/javatest/exec/ConfigHandler.java, * src/jtreg/com/sun/javatest/exec/ConfigurableTestFilter.java, * src/jtreg/com/sun/javatest/exec/ContextManager.java, * src/jtreg/com/sun/javatest/exec/CustomTestResultViewer.java, * src/jtreg/com/sun/javatest/exec/DetailsBrowser.java, * src/jtreg/com/sun/javatest/exec/ET_FilterHandler.java, * src/jtreg/com/sun/javatest/exec/ElapsedTimeMonitor.java, * src/jtreg/com/sun/javatest/exec/EnvironmentBrowser.java, * src/jtreg/com/sun/javatest/exec/ExcludeListBrowser.java, * src/jtreg/com/sun/javatest/exec/ExecModel.java, * src/jtreg/com/sun/javatest/exec/ExecTool.java, * src/jtreg/com/sun/javatest/exec/ExecToolManager.java, * src/jtreg/com/sun/javatest/exec/FeatureManager.java, * src/jtreg/com/sun/javatest/exec/FileSystemTableModel.java, * src/jtreg/com/sun/javatest/exec/FileTable.java, * src/jtreg/com/sun/javatest/exec/FileType.java, * src/jtreg/com/sun/javatest/exec/FilesPane.java, * src/jtreg/com/sun/javatest/exec/FilterConfig.java, * src/jtreg/com/sun/javatest/exec/FilterSelectionHandler.java, * src/jtreg/com/sun/javatest/exec/JavaTestContextMenu.java, * src/jtreg/com/sun/javatest/exec/JavaTestMenuManager.java, * src/jtreg/com/sun/javatest/exec/JavaTestToolBar.java, * src/jtreg/com/sun/javatest/exec/LogViewer.java, * src/jtreg/com/sun/javatest/exec/LogViewerTools.java, * src/jtreg/com/sun/javatest/exec/MessageStrip.java, * src/jtreg/com/sun/javatest/exec/Monitor.java, * src/jtreg/com/sun/javatest/exec/MonitorState.java, * src/jtreg/com/sun/javatest/exec/MultiFormatPane.java, * src/jtreg/com/sun/javatest/exec/MultiSelectPanel.java, * src/jtreg/com/sun/javatest/exec/NavigationPane.java, * src/jtreg/com/sun/javatest/exec/NewReportDialog.java, * src/jtreg/com/sun/javatest/exec/ParameterFilter.java, * src/jtreg/com/sun/javatest/exec/PrefsPane.java, * src/jtreg/com/sun/javatest/exec/ProgressMeter.java, * src/jtreg/com/sun/javatest/exec/ProgressMonitor.java, * src/jtreg/com/sun/javatest/exec/PropertiesBrowser.java, * src/jtreg/com/sun/javatest/exec/QuestionLogBrowser.java, * src/jtreg/com/sun/javatest/exec/QuickStartWizard.java, * src/jtreg/com/sun/javatest/exec/RenderingUtilities.java, * src/jtreg/com/sun/javatest/exec/ReportBrowser.java, * src/jtreg/com/sun/javatest/exec/ReportHandler.java, * src/jtreg/com/sun/javatest/exec/RunProgressMonitor.java, * src/jtreg/com/sun/javatest/exec/RunTestsHandler.java, * src/jtreg/com/sun/javatest/exec/TP_CustomSubpanel.java, * src/jtreg/com/sun/javatest/exec/TP_DescSubpanel.java, * src/jtreg/com/sun/javatest/exec/TP_DocumentationSubpanel.java, * src/jtreg/com/sun/javatest/exec/TP_EnvSubpanel.java, * src/jtreg/com/sun/javatest/exec/TP_FilesSubpanel.java, * src/jtreg/com/sun/javatest/exec/TP_OutputSubpanel.java, * src/jtreg/com/sun/javatest/exec/TP_PropertySubpanel.java, * src/jtreg/com/sun/javatest/exec/TP_ResultsSubpanel.java, * src/jtreg/com/sun/javatest/exec/TP_Subpanel.java, * src/jtreg/com/sun/javatest/exec/TT_NodeCache.java, * src/jtreg/com/sun/javatest/exec/TT_Renderer.java, * src/jtreg/com/sun/javatest/exec/TU_ViewManager.java, * src/jtreg/com/sun/javatest/exec/TemplateParameterFilter.java, * src/jtreg/com/sun/javatest/exec/TestPanel.java, * src/jtreg/com/sun/javatest/exec/TestSuiteErrorsDialog.java, * src/jtreg/com/sun/javatest/exec/TestTree.java, * src/jtreg/com/sun/javatest/exec/TestTreeModel.java, * src/jtreg/com/sun/javatest/exec/TestTreePanel.java, * src/jtreg/com/sun/javatest/exec/ToolBarManager.java, * src/jtreg/com/sun/javatest/exec/ToolBarPanel.java, * src/jtreg/com/sun/javatest/exec/TreePanelModel.java, * src/jtreg/com/sun/javatest/exec/WorkDirChooseTool.java, * src/jtreg/com/sun/javatest/exec/i18n.properties, * src/jtreg/com/sun/javatest/exec/package.html, * src/jtreg/com/sun/javatest/finder/BinaryTestFinder.java, * src/jtreg/com/sun/javatest/finder/BinaryTestWriter.java, * src/jtreg/com/sun/javatest/finder/ChameleonTestFinder.java, * src/jtreg/com/sun/javatest/finder/CommentStream.java, * src/jtreg/com/sun/javatest/finder/ExpandTestFinder.java, * src/jtreg/com/sun/javatest/finder/HTMLCommentStream.java, * src/jtreg/com/sun/javatest/finder/HTMLTestFinder.java, * src/jtreg/com/sun/javatest/finder/JavaCommentStream.java, * src/jtreg/com/sun/javatest/finder/ReverseTestFinder.java, * src/jtreg/com/sun/javatest/finder/ShScriptCommentStream.java, * src/jtreg/com/sun/javatest/finder/ShowTests.java, * src/jtreg/com/sun/javatest/finder/TagTestFinder.java, * src/jtreg/com/sun/javatest/finder/i18n.properties, * src/jtreg/com/sun/javatest/finder/package.html, * src/jtreg/com/sun/javatest/httpd/HttpdServer.java, * src/jtreg/com/sun/javatest/httpd/JThttpProvider.java, * src/jtreg/com/sun/javatest/httpd/PageGenerator.java, * src/jtreg/com/sun/javatest/httpd/ProviderRegistry.java, * src/jtreg/com/sun/javatest/httpd/RequestHandler.java, * src/jtreg/com/sun/javatest/httpd/RootRegistry.java, * src/jtreg/com/sun/javatest/httpd/httpURL.java, * src/jtreg/com/sun/javatest/httpd/i18n.properties, * src/jtreg/com/sun/javatest/i18n.properties, * src/jtreg/com/sun/javatest/interview/BasicInterviewParameters.java, * src/jtreg/com/sun/javatest/interview/ConcurrencyInterview.java, * src/jtreg/com/sun/javatest/interview/DefaultInterviewParameters.java , * src/jtreg/com/sun/javatest/interview/EnvironmentInterview.java, * src/jtreg/com/sun/javatest/interview/ExcludeListInterview.java, * src/jtreg/com/sun/javatest/interview/KeywordsInterview.java, * src/jtreg/com/sun/javatest/interview/LegacyParameters.java, * src/jtreg/com/sun/javatest/interview/PriorStatusInterview.java, * src/jtreg/com/sun/javatest/interview/SimpleInterviewParameters.java, * src/jtreg/com/sun/javatest/interview/TestsInterview.java, * src/jtreg/com/sun/javatest/interview/TimeoutFactorInterview.java, * src/jtreg/com/sun/javatest/interview/i18n.properties, * src/jtreg/com/sun/javatest/interview/package.html, * src/jtreg/com/sun/javatest/lib/APIScript.java, * src/jtreg/com/sun/javatest/lib/Deprecated.java, * src/jtreg/com/sun/javatest/lib/ExecStdTestOtherJVMCmd.java, * src/jtreg/com/sun/javatest/lib/ExecStdTestSameJVMCmd.java, * src/jtreg/com/sun/javatest/lib/JavaCompileCommand.java, * src/jtreg/com/sun/javatest/lib/KeywordScript.java, * src/jtreg/com/sun/javatest/lib/MultiStatus.java, * src/jtreg/com/sun/javatest/lib/MultiTest.java, * src/jtreg/com/sun/javatest/lib/ProcessCommand.java, * src/jtreg/com/sun/javatest/lib/ReportScript.java, * src/jtreg/com/sun/javatest/lib/StdTestScript.java, * src/jtreg/com/sun/javatest/lib/TestCases.java, * src/jtreg/com/sun/javatest/logging/ErrorDialogHandler.java, * src/jtreg/com/sun/javatest/logging/FileEvent.java, * src/jtreg/com/sun/javatest/logging/FileListener.java, * src/jtreg/com/sun/javatest/logging/FilteredLogModel.java, * src/jtreg/com/sun/javatest/logging/JTFormatter.java, * src/jtreg/com/sun/javatest/logging/LogModel.java, * src/jtreg/com/sun/javatest/logging/LoggerFactory.java, * src/jtreg/com/sun/javatest/logging/ObservedFile.java, * src/jtreg/com/sun/javatest/logging/WorkDirLogHandler.java, * src/jtreg/com/sun/javatest/logging/i18n.properties, * src/jtreg/com/sun/javatest/mrep/BrowserPane.java, * src/jtreg/com/sun/javatest/mrep/ConflictResolutionDialog.java, * src/jtreg/com/sun/javatest/mrep/ConflictResolver.java, * src/jtreg/com/sun/javatest/mrep/FilesPane.java, * src/jtreg/com/sun/javatest/mrep/Merger.java, * src/jtreg/com/sun/javatest/mrep/OptionsDialog.java, * src/jtreg/com/sun/javatest/mrep/OptionsPane.java, * src/jtreg/com/sun/javatest/mrep/ReportDirChooser.java, * src/jtreg/com/sun/javatest/mrep/ReportTool.java, * src/jtreg/com/sun/javatest/mrep/ReportToolManager.java, * src/jtreg/com/sun/javatest/mrep/Scheme.java, * src/jtreg/com/sun/javatest/mrep/TestResultDescr.java, * src/jtreg/com/sun/javatest/mrep/XMLReportReader.java, * src/jtreg/com/sun/javatest/mrep/XMLReportWriter.java, * src/jtreg/com/sun/javatest/mrep/i18n.properties, * src/jtreg/com/sun/javatest/package.html, * src/jtreg/com/sun/javatest/regtest/Action.java, * src/jtreg/com/sun/javatest/regtest/AntOptionDecoder.java, * src/jtreg/com/sun/javatest/regtest/AppletAction.java, * src/jtreg/com/sun/javatest/regtest/AppletWrapper.java, * src/jtreg/com/sun/javatest/regtest/BadArgs.java, * src/jtreg/com/sun/javatest/regtest/BuildAction.java, * src/jtreg/com/sun/javatest/regtest/CheckFiles.java, * src/jtreg/com/sun/javatest/regtest/CleanAction.java, * src/jtreg/com/sun/javatest/regtest/CompileAction.java, * src/jtreg/com/sun/javatest/regtest/GetSystemProperty.java, * src/jtreg/com/sun/javatest/regtest/Help.java, * src/jtreg/com/sun/javatest/regtest/IgnoreAction.java, * src/jtreg/com/sun/javatest/regtest/IgnoreKind.java, * src/jtreg/com/sun/javatest/regtest/JDK.java, * src/jtreg/com/sun/javatest/regtest/Main.java, * src/jtreg/com/sun/javatest/regtest/MainAction.java, * src/jtreg/com/sun/javatest/regtest/MainWrapper.java, * src/jtreg/com/sun/javatest/regtest/Option.java, * src/jtreg/com/sun/javatest/regtest/OptionDecoder.java, * src/jtreg/com/sun/javatest/regtest/ParseException.java, * src/jtreg/com/sun/javatest/regtest/Path.java, * src/jtreg/com/sun/javatest/regtest/RegressionEnvironment.java, * src/jtreg/com/sun/javatest/regtest/RegressionObserver.java, * src/jtreg/com/sun/javatest/regtest/RegressionParameters.java, * src/jtreg/com/sun/javatest/regtest/RegressionScript.java, * src/jtreg/com/sun/javatest/regtest/RegressionSecurityManager.java, * src/jtreg/com/sun/javatest/regtest/RegressionTestFinder.java, * src/jtreg/com/sun/javatest/regtest/RegressionTestSuite.java, * src/jtreg/com/sun/javatest/regtest/ShellAction.java, * src/jtreg/com/sun/javatest/regtest/StringArray.java, * src/jtreg/com/sun/javatest/regtest/StringUtils.java, * src/jtreg/com/sun/javatest/regtest/TestRunException.java, * src/jtreg/com/sun/javatest/regtest/Verbose.java, * src/jtreg/com/sun/javatest/regtest/i18n.properties, * src/jtreg/com/sun/javatest/report/ConfigSection.java, * src/jtreg/com/sun/javatest/report/CustomReport.java, * src/jtreg/com/sun/javatest/report/HTMLReport.java, * src/jtreg/com/sun/javatest/report/HTMLSection.java, * src/jtreg/com/sun/javatest/report/PlainTextReport.java, * src/jtreg/com/sun/javatest/report/Report.java, * src/jtreg/com/sun/javatest/report/ReportDirChooser.java, * src/jtreg/com/sun/javatest/report/ReportFormat.java, * src/jtreg/com/sun/javatest/report/ReportManager.java, * src/jtreg/com/sun/javatest/report/ReportModel.java, * src/jtreg/com/sun/javatest/report/ReportWriter.java, * src/jtreg/com/sun/javatest/report/ResultSection.java, * src/jtreg/com/sun/javatest/report/StatisticsSection.java, * src/jtreg/com/sun/javatest/report/StringArrayComparator.java, * src/jtreg/com/sun/javatest/report/TestResultsByFileComparator.java, * src/jtreg/com/sun/javatest/report/TestResultsByStatusAndTitleCompara tor.java, * src/jtreg/com/sun/javatest/report/TestResultsByTitleComparator.java, * src/jtreg/com/sun/javatest/report/XMLReport.java, * src/jtreg/com/sun/javatest/report/XMLReportMaker.java, * src/jtreg/com/sun/javatest/report/i18n.properties, * src/jtreg/com/sun/javatest/report/package.html, * src/jtreg/com/sun/javatest/stylesheet.css, * src/jtreg/com/sun/javatest/tool/Command.java, * src/jtreg/com/sun/javatest/tool/CommandContext.java, * src/jtreg/com/sun/javatest/tool/CommandManager.java, * src/jtreg/com/sun/javatest/tool/CommandParser.java, * src/jtreg/com/sun/javatest/tool/ConfigManager.java, * src/jtreg/com/sun/javatest/tool/CustomPropagationController.java, * src/jtreg/com/sun/javatest/tool/Deck.java, * src/jtreg/com/sun/javatest/tool/DeskView.java, * src/jtreg/com/sun/javatest/tool/Desktop.java, * src/jtreg/com/sun/javatest/tool/DesktopManager.java, * src/jtreg/com/sun/javatest/tool/DesktopPrefsPane.java, * src/jtreg/com/sun/javatest/tool/EditableFileList.java, * src/jtreg/com/sun/javatest/tool/EditableList.java, * src/jtreg/com/sun/javatest/tool/EnvironmentManager.java, * src/jtreg/com/sun/javatest/tool/FileChooser.java, * src/jtreg/com/sun/javatest/tool/FileHistory.java, * src/jtreg/com/sun/javatest/tool/FileOpener.java, * src/jtreg/com/sun/javatest/tool/FocusMonitor.java, * src/jtreg/com/sun/javatest/tool/HelpLink.java, * src/jtreg/com/sun/javatest/tool/HelpLinkBeanInfo.java, * src/jtreg/com/sun/javatest/tool/HelpManager.java, * src/jtreg/com/sun/javatest/tool/HelpMenu.java, * src/jtreg/com/sun/javatest/tool/HttpManager.java, * src/jtreg/com/sun/javatest/tool/I18NUtils.java, * src/jtreg/com/sun/javatest/tool/IconFactory.java, * src/jtreg/com/sun/javatest/tool/IconLabel.java, * src/jtreg/com/sun/javatest/tool/IconLabelBeanInfo.java, * src/jtreg/com/sun/javatest/tool/LogManager.java, * src/jtreg/com/sun/javatest/tool/MDIDeskView.java, * src/jtreg/com/sun/javatest/tool/Main.java, * src/jtreg/com/sun/javatest/tool/ManagerLoader.java, * src/jtreg/com/sun/javatest/tool/PieChart.java, * src/jtreg/com/sun/javatest/tool/Preferences.java, * src/jtreg/com/sun/javatest/tool/SDIDeskView.java, * src/jtreg/com/sun/javatest/tool/SelectedWorkDirApprover.java, * src/jtreg/com/sun/javatest/tool/Startup.java, * src/jtreg/com/sun/javatest/tool/TabDeskView.java, * src/jtreg/com/sun/javatest/tool/TestSuiteChooser.java, * src/jtreg/com/sun/javatest/tool/TestTreeSelectionPane.java, * src/jtreg/com/sun/javatest/tool/Tool.java, * src/jtreg/com/sun/javatest/tool/ToolAction.java, * src/jtreg/com/sun/javatest/tool/ToolDialog.java, * src/jtreg/com/sun/javatest/tool/ToolManager.java, * src/jtreg/com/sun/javatest/tool/TreeSelectionPane.java, * src/jtreg/com/sun/javatest/tool/UIFactory.java, * src/jtreg/com/sun/javatest/tool/VerboseCommand.java, * src/jtreg/com/sun/javatest/tool/WDC_FileFilter.java, * src/jtreg/com/sun/javatest/tool/WDC_FileView.java, * src/jtreg/com/sun/javatest/tool/WorkDirChooser.java, * src/jtreg/com/sun/javatest/tool/i18n.properties, * src/jtreg/com/sun/javatest/tool/package.html, * src/jtreg/com/sun/javatest/util/BackupPolicy.java, * src/jtreg/com/sun/javatest/util/BackupUtil.java, * src/jtreg/com/sun/javatest/util/Debug.java, * src/jtreg/com/sun/javatest/util/DirectoryClassLoader.java, * src/jtreg/com/sun/javatest/util/DynamicArray.java, * src/jtreg/com/sun/javatest/util/ExitCount.java, * src/jtreg/com/sun/javatest/util/Fifo.java, * src/jtreg/com/sun/javatest/util/FileFilter.java, * src/jtreg/com/sun/javatest/util/FileInfoCache.java, * src/jtreg/com/sun/javatest/util/HTMLWriter.java, * src/jtreg/com/sun/javatest/util/HelpTree.java, * src/jtreg/com/sun/javatest/util/I18NResourceBundle.java, * src/jtreg/com/sun/javatest/util/LineParser.java, * src/jtreg/com/sun/javatest/util/LogFile.java, * src/jtreg/com/sun/javatest/util/MainAppletContext.java, * src/jtreg/com/sun/javatest/util/MainFrame.java, * src/jtreg/com/sun/javatest/util/OrderedTwoWayTable.java, * src/jtreg/com/sun/javatest/util/PathClassLoader.java, * src/jtreg/com/sun/javatest/util/PrefixMap.java, * src/jtreg/com/sun/javatest/util/Properties.java, * src/jtreg/com/sun/javatest/util/PropertyArray.java, * src/jtreg/com/sun/javatest/util/ReadAheadIterator.java, * src/jtreg/com/sun/javatest/util/SortedProperties.java, * src/jtreg/com/sun/javatest/util/StringArray.java, * src/jtreg/com/sun/javatest/util/SysEnv.java, * src/jtreg/com/sun/javatest/util/TextStream.java, * src/jtreg/com/sun/javatest/util/TextWriter.java, * src/jtreg/com/sun/javatest/util/Timer.java, * src/jtreg/com/sun/javatest/util/WrapWriter.java, * src/jtreg/com/sun/javatest/util/WriterStream.java, * src/jtreg/com/sun/javatest/util/XMLWriter.java, * src/jtreg/com/sun/javatest/util/i18n.properties, * src/jtreg/com/sun/javatest/util/package.html, * src/jtreg/excludelist.jdk.jtx, * src/jtreg/legal/copyright.txt, * src/jtreg/legal/license.txt: New home of JTreg source. changeset e937f2726d70 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e937f2726d70 author: aph date: Thu Dec 22 16:47:21 2011 +0000 Disable safepoints in JIT code. 2011-12-22 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Safepoint): Disable. changeset 4d6b4215b78f in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=4d6b4215b78f author: aph date: Thu Dec 22 11:54:40 2011 -0500 merge changeset 8a24f86753c6 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8a24f86753c6 author: Andrew John Hughes date: Fri Dec 23 00:59:34 2011 +0000 Add backports from OpenJDK. S6851973: ignore incoming channel binding if acceptor does not set one S7091528: javadoc attempts to parse .class files S7103725: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA 2011-12-20 Andrew John Hughes * Makefile.am: Add new patches. * patches/openjdk/6851973-kerberos.patch, * patches/openjdk/7091528-javadoc_class_files.patch, * patches/openjdk/7103725-ssl_beast_regression.patch: Add OpenJDK backports. * NEWS: Updated. changeset 8021c50df762 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8021c50df762 author: Andrew John Hughes date: Fri Dec 23 01:09:04 2011 +0000 Add RH bug number to fix for 7103725. 2011-12-23 Andrew John Hughes * NEWS: Add RH bug number which alerted us to the problem to the 7103725 backport. changeset 5f30a4f16734 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5f30a4f16734 author: ptisnovs date: Fri Dec 23 14:31:49 2011 +0100 2011-12-23 Pavel Tisnovsky * Makefile.am: Fixed path to excludelist.jdk.jtx file containing black list of JDK JTreg tests. changeset 95c9b736240d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=95c9b736240d author: Andrew John Hughes date: Fri Dec 23 14:55:03 2011 +0000 Backed out changeset 5f30a4f16734 Breaks make dist when path to configure is relative (again). changeset 91e9227e579a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=91e9227e579a author: ptisnovs date: Tue Jan 03 13:54:53 2012 +0100 2012-01-03 Pavel Tisnovsky * Makefile.am: Fixed path to excludelist.jdk.jtx file containing black list of JDK JTreg tests. changeset 72b7e37e64a5 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=72b7e37e64a5 author: Andrew John Hughes date: Fri Jan 06 09:30:37 2012 +0000 Update NEWS with missing releases 1.9.11, 1.8.11, 1.10.3, 1.9.9 and 1.8.9. 2012-01-06 Andrew John Hughes * NEWS: Add missing entries for 1.9.11, 1.8.11, 1.10.3, 1.9.9 and 1.8.9. Remove duplicates in 1.11 listing. changeset e1a19f0d4c1f in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e1a19f0d4c1f author: Andrew John Hughes date: Fri Jan 06 09:43:52 2012 +0000 Fix NEWS formatting. 2012-01-06 Andrew John Hughes * NEWS: Fix formatting. changeset 9e2ccd629e7b in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9e2ccd629e7b author: Andrew John Hughes date: Fri Jan 06 14:17:21 2012 +0000 Remove outdated NIO2 backport. NIO2 users should use the 2.x series. 2012-01-06 Andrew John Hughes Remove outdated NIO2 backport. * overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile, * overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile, * overlays/nio2/openjdk/jdk/make/mksample/nio/aio/Makefile, * overlays/nio2/openjdk/jdk/make/mksample/nio/file/Makefile, * overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/Extende dCopyOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/Extende dOpenOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/Extende dWatchEventModifier.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/io/File.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/io/FilePermission.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/io/Inputs.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/io/Outputs.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/net/ProtocolFamily.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/net/SocketOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/net/StandardProtocolFamily.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/net/StandardSocketOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/AsynchronousByteChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/AsynchronousChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/AsynchronousChannelGroup.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/AsynchronousDatagramChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/AsynchronousFileChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/AsynchronousServerSocketChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/AsynchronousSocketChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/Channels.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/CompletionHandler.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/DatagramChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/FileChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/FileLock.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/MembershipKey.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/MulticastChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/NetworkChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/SeekableByteChannel.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/exceptions, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/package-info.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/spi/AsynchronousChannelProvider.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/spi/SelectorProvider.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/channels/spi/package.html, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/AccessDeniedException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/AccessMode.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/AtomicMoveNotSupportedException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/ClosedDirectoryStreamException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/ClosedFileSystemException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/ClosedWatchServiceException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/CopyOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/DirectoryNotEmptyException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/DirectoryStream.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/DirectoryStreamFilters.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileAction.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileAlreadyExistsException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileRef.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileStore.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileSystem.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileSystemAlreadyExistsException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileSystemException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileSystemNotFoundException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileSystems.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileTreeWalker.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileVisitOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileVisitResult.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/FileVisitor.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/Files.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/InvalidPathException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/LinkOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/LinkPermission.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/NoSuchFileException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/NotDirectoryException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/NotLinkException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/OpenOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/Path.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/PathMatcher.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/Paths.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/ProviderMismatchException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/ProviderNotFoundException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/ReadOnlyFileSystemException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/SecureDirectoryStream.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/SimpleFileVisitor.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/StandardCopyOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/StandardOpenOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/StandardWatchEventKind.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/WatchEvent.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/WatchKey.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/WatchService.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/Watchable.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/AclEntry.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/AclEntryFlag.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/AclEntryPermission.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/AclEntryType.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/AclFileAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/AttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/Attributes.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/BasicFileAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/BasicFileAttributes.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/DosFileAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/DosFileAttributes.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/FileAttribute.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/FileAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/FileOwnerAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/FileStoreAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/FileStoreSpaceAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/FileStoreSpaceAttributes.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/GroupPrincipal.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/NamedAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/PosixFileAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/PosixFileAttributes.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/PosixFilePermission.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/PosixFilePermissions.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/UserPrincipal.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/UserPrincipalLookupService.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/UserPrincipalNotFoundException.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/attribute/package-info.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/package-info.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/spi/AbstractPath.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/spi/FileSystemProvider.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/spi/FileTypeDetector.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/nio/file/spi/package-info.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/util/Scanner.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja va/util/concurrent/ScheduledThreadPoolExecutor.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/mi sc/JavaIODeleteOnExitAccess.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/mi sc/JavaNetGetIndexAccess.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/mi sc/JavaUtilConcurrentThreadPoolExecutorAccess.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/mi sc/SharedSecrets.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AbstractFutur e.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousC hannelGroupImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousF ileChannelImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousF ileLockImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousS erverSocketChannelImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousS ocketChannelImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Cancellable.j ava, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/CompletedFutu re.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ExtendedSocke tOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/FileLockTable .java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Groupable.jav a, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Invoker.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipKey Impl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipReg istry.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/OptionKey.jav a, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/PendingFuture .java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchr onousDatagramChannelImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchr onousFileChannelImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ThreadPool.ja va, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractAclFi leAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractBasic FileAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileS toreSpaceAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileT ypeDetector.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractNamed AttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractPolle r.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatch Key.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatch Service.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Cancellable.j ava, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/FileOwnerAttr ibuteViewImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Globs.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/MimeType.java , * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffer. java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffers .java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchS ervice.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Reflect.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/META- INF/services/java.nio.file.spi.FileSystemProvider, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/README.tx t, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/JarEntryInfo.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/JarFileAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/JarFileAttributes.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipEntryInfo.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFileAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFileAttributes.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFileBasicAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFileBasicAttributes.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFilePath.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFileStore.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFileStream.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFileSystem.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipFileSystemProvider.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipHeaderConstants.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipPathParser.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n io/zipfs/ZipUtils.java, * overlays/nio2/openjdk/jdk/src/share/native/sun/nio/ch/genSocketOptio nRegistry.c, * overlays/nio2/openjdk/jdk/src/share/sample/nio/aio/EchoServer.java, * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/AclEdit.java, * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Chmod.java, * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Copy.java, * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/DiskUsage.java, * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/FileType.java, * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/WatchDir.java, * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Xdd.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultAsyn chronousChannelProvider.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/EPollPort.j ava, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/LinuxAsynch ronousChannelProvider.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/Port.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisAsyn chronousChannelProvider.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisEven tPort.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchr onousServerSocketChannelImpl.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchr onousSocketChannelImpl.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFile SystemProvider.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFile TypeDetector.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/GnomeFileTy peDetector.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFil eAttributeView.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSt ore.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSy stem.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSy stemProvider.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedA ttributeView.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNative Dispatcher.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchS ervice.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisAclF ileAttributeView.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFile Store.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFile System.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFile SystemProvider.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisName dAttributeView.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNati veDispatcher.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisWatc hService.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixChannel Factory.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixCopyFil e.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixDirecto ryStream.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixExcepti on.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAtt ributeViews.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAtt ributes.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileKey .java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileMod eAttribute.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSto re.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSto reAttributes.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSys tem.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSys temProvider.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixMountEn try.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixNativeD ispatcher.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixPath.ja va, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixSecureD irectoryStream.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUriUtil s.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUserPri ncipals.java, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/EPollPort.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/SolarisEvent Port.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchro nousServerSocketChannelImpl.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchro nousSocketChannelImpl.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/GnomeFileTyp eDetector.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeD ispatcher.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxWatchSe rvice.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisNativ eDispatcher.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisWatch Service.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixCopyFile .c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDi spatcher.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genSolarisCo nstants.c, * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genUnixConst ants.c, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultAsyn chronousChannelProvider.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/Iocp.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/PendingIoCa che.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsyn chronousChannelProvider.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsyn chronousFileChannelImpl.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsyn chronousServerSocketChannelImpl.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsyn chronousSocketChannelImpl.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFile SystemProvider.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFile TypeDetector.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/RegistryFil eTypeDetector.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsAclF ileAttributeView.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsChan nelFactory.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsCons tants.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsDire ctoryStream.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsExce ption.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile AttributeViews.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile Attributes.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile Copy.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile Store.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile System.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile SystemProvider.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsLink Support.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsName dAttributeView.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNati veDispatcher.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPath .java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPath Parser.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPath Type.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecu rity.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecu rityDescriptor.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUriS upport.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUser Principals.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsWatc hService.java, * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/Iocp.c, * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsync hronousFileChannelImpl.c, * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsync hronousServerSocketChannelImpl.c, * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsync hronousSocketChannelImpl.c, * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/RegistryFile TypeDetector.c, * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/WindowsNativ eDispatcher.c, * overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/Sanity.java, * overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/sanity.sh, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/io/Inputs/ Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/AsExecutor.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/Attack.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/GroupOfOne.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/Identity.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/PrivilegedThreadFactory.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/Restart.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/Unbounded.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousChannelGroup/run_any_task.sh, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousDatagramChannel/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousFileChannel/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousFileChannel/CustomThreadPool.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousFileChannel/Lock.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousFileChannel/MyThreadFactory.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousServerSocketChannel/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousServerSocketChannel/WithSecurityManager.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousServerSocketChannel/java.policy.allow, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousServerSocketChannel/java.policy.deny, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousSocketChannel/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/AsynchronousSocketChannel/Leaky.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/Channels/Basic2.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/spi/AsynchronousChannelProvider/CheckProvider.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/spi/AsynchronousChannelProvider/META- INF/services/java.nio.channels.spi.AsynchronousChannelProvider, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/spi/AsynchronousChannelProvider/Provider1.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/spi/AsynchronousChannelProvider/Provider2.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe ls/spi/AsynchronousChannelProvider/custom_provider.sh, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/D irectoryStream/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/D irectoryStream/Filters.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/D irectoryStream/SecureDS.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F ileStore/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F ileSystem/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/ContentType.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/CreateFileTree.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/ForceLoad.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/META-INF/services/java.nio.file.spi.FileTypeDetector, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/Misc.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/PrintFileTree.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/SimpleFileTypeDetector.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/SkipSiblings.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/TerminateWalk.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/content_type.sh, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F iles/walk_file_tree.sh, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/CopyAndMove.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/DeleteOnClose.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/InterruptCopy.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/Links.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/Misc.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/PathOps.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/SBC.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/TemporaryFiles.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/UriImportExport.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/delete_on_close.sh, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P ath/temporary_files.sh, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P athMatcher/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/T estUtil.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W atchService/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W atchService/FileTreeModifier.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W atchService/WithSecurityManager.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W atchService/denyAll.policy, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W atchService/grantDirAndOneLevel.policy, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W atchService/grantDirAndTree.policy, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W atchService/grantDirOnly.policy, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a ttribute/AclFileAttributeView/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a ttribute/Attributes/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a ttribute/BasicFileAttributeView/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a ttribute/DosFileAttributeView/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a ttribute/FileStoreAttributeView/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a ttribute/NamedAttributeView/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a ttribute/PosixFileAttributeView/Basic.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/s pi/SetDefaultProvider.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/s pi/TestProvider.java: Removed. * patches/nio2.patch: Dropped. * Makefile.am: Remove ENABLE_NIO2 conditional blocks from overlays, patch and rt. * configure.ac: Remove --enable-nio2 option. * NEWS: Mention removal. changeset 4d842f482132 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=4d842f482132 author: aph date: Fri Jan 06 16:12:57 2012 +0000 NEWS: ARM assembly langguage port. 2012-01-06 Andrew Haley * NEWS: ARM assembly langguage port. changeset e02f88881494 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e02f88881494 author: aph date: Fri Jan 06 16:15:13 2012 +0000 Typo in ChangeLog. changeset 2c7d274c2a07 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2c7d274c2a07 author: Andrew John Hughes date: Fri Jan 06 16:28:25 2012 +0000 Add ARM assembly language port changes to NEWS. 2012-01-06 Andrew Haley * NEWS: ARM assembly language port. changeset b6a6575c1788 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b6a6575c1788 author: Andrew John Hughes date: Fri Jan 06 16:32:35 2012 +0000 Cleanup ARM entry, separating details into their own section. 2012-01-06 Andrew John Hughes * NEWS: Cleanup ARM entry, separating details into their own section. changeset 24c5bd2e7d57 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=24c5bd2e7d57 author: Jiri Vanek date: Fri Jan 06 17:48:27 2012 +0100 resolves rhbz#580478, is adding full paths to desktop files changeset 2607221d6f5e in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2607221d6f5e author: Omair Majid date: Fri Jan 06 16:32:56 2012 -0500 Added tag icedtea6-1.11-branchpoint for changeset 24c5bd2e7d57 changeset 283c180aa38a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=283c180aa38a author: Omair Majid date: Fri Jan 06 16:40:02 2012 -0500 Prepare for 1.12. 2012-01-06 Omair Majid * NEWS: Add 1.12 section * configure.ac: Bump to 1.12pre. changeset f3e9a1730116 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f3e9a1730116 author: Andrew John Hughes date: Tue Jan 10 10:38:33 2012 +0000 6706974: Add krb5 test infrastructure 2012-01-10 Andrew John Hughes * Makefile.am: Add new patch. * NEWS: Mention backport. * patches/openjdk/6706974-krb5_test_infrastructure.patch: Add Kerberos 5 test infrastructure so the test in the 6851973 backport works. changeset 57ae0e361acf in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=57ae0e361acf author: aph date: Mon Jan 09 13:34:27 2012 -0500 ARM: Enable safepoints for JIT-compiled code. 2012-01-09 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_disass): Flush the output streams. (Thumb2_Safepoint): Add the bci as a new argument. Pass it to the safepoint handler. (Thumb2_Branch): Pass the bci to Thumb2_Safepoint(). (Thumb2_Goto): Likewise. (Thumb2_Return): Add the bci as a new argument. Pass it to Thumb2_Safepoint(). Add braces for clarity. move call to Thumb2_Safepoint() to point before retval is popped. (Thumb2_codegen): Pass the bci to Thumb2_Return(). (Thumb2_Initialize): Disassemble the codebuf we just created. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (method_entry_freq_count_overflow): Make sure self_link is set when re-entering JIT-compiled code. changeset 79014132e844 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=79014132e844 author: aph date: Tue Jan 10 16:47:52 2012 +0000 merge changeset 459e476245c6 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=459e476245c6 author: ptisnovs date: Thu Jan 12 11:46:17 2012 +0100 2012-01-12 Pavel Tisnovsky * Makefile.am: Add new patch. * NEWS: Mention backport. * patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch: Backport of 6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe. changeset 3527894b6f35 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3527894b6f35 author: Andrew John Hughes date: Thu Jan 12 15:32:22 2012 +0000 Update NEWS due to recent releases. 2012-01-12 Andrew John Hughes * NEWS: Add 1.10.5, 1.9.12 and 1.8.12 release notes. Remove duplicates from 1.11. changeset 04b0c0d5dcad in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=04b0c0d5dcad author: Danesh Dadachanji date: Fri Jan 13 11:27:32 2012 -0500 Fix backport of GNOME system tray patch. changeset 47cb80f13a3f in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=47cb80f13a3f author: ptisnovs date: Tue Jan 17 15:47:40 2012 +0100 2012-01-17 Pavel Tisnovsky * Makefile.am: Add new patch. * NEWS: Mention backport. * patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.pa tch: Backport of 6761072: new krb5 tests fail on multiple platforms changeset fc7a57de5179 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fc7a57de5179 author: aph date: Fri Jan 13 10:07:43 2012 -0500 Fix bytecode numbering of return_register_finalizer in safe_dispatch_table. 2012-01-13 Andrew Haley * arm_port/hotspot/tools/mkbc.c (writeouttable): Add numbering comments to bytecode output. * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Return): Move safepoint before monitor is unlocked. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (safe_dispatch_table): Add comment. Correct order of do_return_register_finalizer. Add numbering comments. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (TRACE): New macro. changeset 291293b66f4e in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=291293b66f4e author: aph date: Fri Jan 13 15:14:21 2012 +0000 merge changeset 2bbcc83417ae in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2bbcc83417ae author: aph date: Mon Jan 16 13:25:01 2012 -0500 2012-01-16 Andrew Haley * Makefile.am (check-jdk): Restore the --samevm line that was deleted by mistake in an earlier merge. changeset f57f03c70b52 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f57f03c70b52 author: aph date: Mon Jan 16 13:28:17 2012 -0500 2012-01-16 Andrew Haley * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (asm_method_table): Add entry for java.dyn.MethodHandles::invoke. (asm_generate_method_entry): Replace constant 14 with calculation based on the size of asm_method_table. Add some comments. changeset 8d8dc4529419 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8d8dc4529419 author: aph date: Tue Jan 17 10:41:44 2012 -0500 allow vm_fatal_error to be used as an entry point in asm_method_table. 2012-01-17 Andrew Haley * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (vm_fatal_error): Add an extra entry point at vm_fatal_error + CODE_ALIGN_SIZE to allow vm_fatal_error to be used as an entry point in asm_method_table. (putstatic_volatile_dw): Re-order register operands to silence warning. changeset 6c3ccf66f01b in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6c3ccf66f01b author: aph date: Wed Jan 18 11:57:33 2012 +0000 Re-order register operands to silence warning. 2012-01-18 Xerxes Ranby * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (putstatic_volatile_dw): Re-order register operands to silence warning. changeset 876219858298 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=876219858298 author: aph date: Wed Jan 18 12:03:17 2012 +0000 merge changeset e666624417d8 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e666624417d8 author: Andrew John Hughes date: Wed Jan 18 14:42:49 2012 +0000 Merge changeset cab711386049 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=cab711386049 author: Andrew John Hughes date: Thu Jan 19 12:04:08 2012 +0000 Fix build to work with current hg. 2012-01-18 Andrew John Hughes * patches/openjdk/6851973-kerberos.patch, * patches/openjdk/7091528-javadoc_class_files.patch, * patches/openjdk/7102369-7094468-rmiregistry.patch, * patches/openjdk/7103725-ssl_beast_regression.patch: Dropped; upstream. * Makefile.am: Remove dropped patches. * patches/ecj/icedtea.patch: Updated due to 6790292. * patches/openjdk/6633275-shaped_translucent_windows.patch, * patches/openjdk/6725214-direct3d-01.patch: Remove copyright notice changes broken as a result of the annoying 7128474 change. diffstat: .hgtags | 1 + ChangeLog | 1701 +++++ Makefile.am | 33 +- NEWS | 106 +- arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp | 2 + arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 192 + arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 955 ++- arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 313 +- arm_port/hotspot/tools/mkbc.c | 6 +- configure.ac | 36 +- jconsole.desktop | 10 - jconsole.desktop.in | 10 + jtreg/JavaTest.cmdMgrs.lst | 34 - jtreg/JavaTest.toolMgrs.lst | 30 - jtreg/META-INF/MANIFEST.MF | 3 - jtreg/README | 32 - jtreg/com/sun/interview/AllFilesFileFilter.java | 60 - jtreg/com/sun/interview/Checklist.java | 124 - jtreg/com/sun/interview/ChoiceArrayQuestion.java | 385 - jtreg/com/sun/interview/ChoiceQuestion.java | 380 - jtreg/com/sun/interview/CompositeQuestion.java | 63 - jtreg/com/sun/interview/DirectoryFileFilter.java | 61 - jtreg/com/sun/interview/ErrorQuestion.java | 56 - jtreg/com/sun/interview/ExtensionFileFilter.java | 162 - jtreg/com/sun/interview/FileFilter.java | 53 - jtreg/com/sun/interview/FileListQuestion.java | 376 - jtreg/com/sun/interview/FileQuestion.java | 299 - jtreg/com/sun/interview/FilesAndDirectoriesFileFilter.java | 61 - jtreg/com/sun/interview/FinalQuestion.java | 63 - jtreg/com/sun/interview/FloatQuestion.java | 399 - jtreg/com/sun/interview/InetAddressQuestion.java | 408 - jtreg/com/sun/interview/IntQuestion.java | 376 - jtreg/com/sun/interview/Interview.java | 2397 -------- jtreg/com/sun/interview/InterviewQuestion.java | 126 - jtreg/com/sun/interview/InterviewSet.java | 262 - jtreg/com/sun/interview/ListQuestion.java | 637 -- jtreg/com/sun/interview/NullQuestion.java | 174 - jtreg/com/sun/interview/Properties2.java | 346 - jtreg/com/sun/interview/PropertiesQuestion.java | 1420 ---- jtreg/com/sun/interview/Question.java | 513 - jtreg/com/sun/interview/StringListQuestion.java | 284 - jtreg/com/sun/interview/StringQuestion.java | 230 - jtreg/com/sun/interview/TreeQuestion.java | 388 - jtreg/com/sun/interview/WizEdit.java | 346 - jtreg/com/sun/interview/WizPrint.java | 1091 --- jtreg/com/sun/interview/YesNoQuestion.java | 94 - jtreg/com/sun/interview/i18n.properties | 86 - jtreg/com/sun/interview/package.html | 141 - jtreg/com/sun/interview/wizard/ActionDocListener.java | 59 - jtreg/com/sun/interview/wizard/ActionListDataListener.java | 59 - jtreg/com/sun/interview/wizard/ChoiceArrayQuestionRenderer.java | 214 - jtreg/com/sun/interview/wizard/ChoiceQuestionRenderer.java | 246 - jtreg/com/sun/interview/wizard/EditableList.java | 368 - jtreg/com/sun/interview/wizard/Exporter.java | 74 - jtreg/com/sun/interview/wizard/FileList.java | 134 - jtreg/com/sun/interview/wizard/FileListQuestionRenderer.java | 113 - jtreg/com/sun/interview/wizard/FileQuestionRenderer.java | 163 - jtreg/com/sun/interview/wizard/FloatQuestionRenderer.java | 196 - jtreg/com/sun/interview/wizard/I18NResourceBundle.java | 185 - jtreg/com/sun/interview/wizard/InetAddressQuestionRenderer.java | 392 - jtreg/com/sun/interview/wizard/InfoPanel.java | 89 - jtreg/com/sun/interview/wizard/IntQuestionRenderer.java | 165 - jtreg/com/sun/interview/wizard/ListQuestionRenderer.java | 244 - jtreg/com/sun/interview/wizard/NullQuestionRenderer.java | 43 - jtreg/com/sun/interview/wizard/PathPanel.java | 1192 ---- jtreg/com/sun/interview/wizard/PropertiesQuestionRenderer.java | 341 - jtreg/com/sun/interview/wizard/QuestionPanel.java | 668 -- jtreg/com/sun/interview/wizard/QuestionRenderer.java | 70 - jtreg/com/sun/interview/wizard/RenderingUtilities.java | 460 - jtreg/com/sun/interview/wizard/SearchDialog.java | 330 - jtreg/com/sun/interview/wizard/StringListQuestionRenderer.java | 78 - jtreg/com/sun/interview/wizard/StringQuestionRenderer.java | 104 - jtreg/com/sun/interview/wizard/SwingFileFilter.java | 61 - jtreg/com/sun/interview/wizard/TreeQuestionRenderer.java | 701 -- jtreg/com/sun/interview/wizard/TypeInPanel.java | 159 - jtreg/com/sun/interview/wizard/WizPane.java | 517 - jtreg/com/sun/interview/wizard/Wizard.java | 1095 --- jtreg/com/sun/interview/wizard/YesNoQuestionRenderer.java | 126 - jtreg/com/sun/interview/wizard/arrow.gif | 0 jtreg/com/sun/interview/wizard/back.gif | 0 jtreg/com/sun/interview/wizard/blank.gif | 0 jtreg/com/sun/interview/wizard/cancel.gif | 0 jtreg/com/sun/interview/wizard/check.gif | 0 jtreg/com/sun/interview/wizard/done.gif | 0 jtreg/com/sun/interview/wizard/find.gif | 0 jtreg/com/sun/interview/wizard/history.gif | 0 jtreg/com/sun/interview/wizard/i18n.properties | 294 - jtreg/com/sun/interview/wizard/info.gif | 0 jtreg/com/sun/interview/wizard/next.gif | 0 jtreg/com/sun/interview/wizard/package.html | 56 - jtreg/com/sun/javatest/AllTestsFilter.java | 52 - jtreg/com/sun/javatest/BasicParameters.java | 817 -- jtreg/com/sun/javatest/Command.java | 72 - jtreg/com/sun/javatest/CompositeFilter.java | 234 - jtreg/com/sun/javatest/DefaultTestRunner.java | 254 - jtreg/com/sun/javatest/Deprecated.java | 45 - jtreg/com/sun/javatest/EditJTI.java | 713 -- jtreg/com/sun/javatest/EditLinks.java | 564 - jtreg/com/sun/javatest/ExcludeList.java | 1212 ---- jtreg/com/sun/javatest/ExcludeListFilter.java | 81 - jtreg/com/sun/javatest/ExcludeListUpdateHandler.java | 167 - jtreg/com/sun/javatest/FileParameters.java | 571 - jtreg/com/sun/javatest/Harness.java | 964 --- jtreg/com/sun/javatest/HarnessHttpHandler.java | 590 - jtreg/com/sun/javatest/InitialUrlFilter.java | 170 - jtreg/com/sun/javatest/InterviewParameters.java | 1676 ----- jtreg/com/sun/javatest/InterviewPropagator.java | 821 -- jtreg/com/sun/javatest/JavaTestError.java | 224 - jtreg/com/sun/javatest/JavaTestSecurityManager.java | 204 - jtreg/com/sun/javatest/Keywords.java | 595 -- jtreg/com/sun/javatest/KeywordsFilter.java | 80 - jtreg/com/sun/javatest/LastRunFilter.java | 145 - jtreg/com/sun/javatest/LastRunInfo.java | 176 - jtreg/com/sun/javatest/ObservableTestFilter.java | 82 - jtreg/com/sun/javatest/Parameters.java | 948 --- jtreg/com/sun/javatest/ProductInfo.java | 200 - jtreg/com/sun/javatest/ResourceTable.java | 118 - jtreg/com/sun/javatest/Script.java | 1350 ---- jtreg/com/sun/javatest/Status.java | 361 - jtreg/com/sun/javatest/StatusFilter.java | 124 - jtreg/com/sun/javatest/TRT_HttpHandler.java | 210 - jtreg/com/sun/javatest/TRT_Iterator.java | 954 --- jtreg/com/sun/javatest/TRT_TreeNode.java | 1749 ----- jtreg/com/sun/javatest/TemplateUtilities.java | 218 - jtreg/com/sun/javatest/Test.java | 64 - jtreg/com/sun/javatest/TestDescription.java | 576 - jtreg/com/sun/javatest/TestEnvContext.java | 356 - jtreg/com/sun/javatest/TestEnvironment.java | 692 -- jtreg/com/sun/javatest/TestFilter.java | 139 - jtreg/com/sun/javatest/TestFinder.java | 738 -- jtreg/com/sun/javatest/TestFinderQueue.java | 714 -- jtreg/com/sun/javatest/TestResult.java | 2685 --------- jtreg/com/sun/javatest/TestResultCache.java | 815 -- jtreg/com/sun/javatest/TestResultTable.java | 2938 --------- jtreg/com/sun/javatest/TestRunner.java | 227 - jtreg/com/sun/javatest/TestSuite.java | 1344 ---- jtreg/com/sun/javatest/Trace.java | 175 - jtreg/com/sun/javatest/WorkDirectory.java | 942 --- jtreg/com/sun/javatest/agent/ActiveAgentCommand.java | 117 - jtreg/com/sun/javatest/agent/ActiveAgentPool.java | 647 -- jtreg/com/sun/javatest/agent/ActiveConnectionFactory.java | 88 - jtreg/com/sun/javatest/agent/ActiveModeOptions.java | 79 - jtreg/com/sun/javatest/agent/Agent.java | 1162 --- jtreg/com/sun/javatest/agent/AgentApplet.java | 304 - jtreg/com/sun/javatest/agent/AgentClassLoader.java | 88 - jtreg/com/sun/javatest/agent/AgentClassLoader2.java | 63 - jtreg/com/sun/javatest/agent/AgentFrame.java | 337 - jtreg/com/sun/javatest/agent/AgentMain.java | 556 - jtreg/com/sun/javatest/agent/AgentManager.java | 646 -- jtreg/com/sun/javatest/agent/AgentMonitorCommandManager.java | 231 - jtreg/com/sun/javatest/agent/AgentMonitorTool.java | 516 - jtreg/com/sun/javatest/agent/AgentMonitorToolManager.java | 111 - jtreg/com/sun/javatest/agent/AgentPanel.java | 1048 --- jtreg/com/sun/javatest/agent/BadValue.java | 65 - jtreg/com/sun/javatest/agent/Connection.java | 83 - jtreg/com/sun/javatest/agent/ConnectionFactory.java | 88 - jtreg/com/sun/javatest/agent/Deck.java | 96 - jtreg/com/sun/javatest/agent/Deprecated.java | 52 - jtreg/com/sun/javatest/agent/Folder.java | 343 - jtreg/com/sun/javatest/agent/Icon.java | 114 - jtreg/com/sun/javatest/agent/InterruptableSocketConnection.java | 134 - jtreg/com/sun/javatest/agent/Map.java | 197 - jtreg/com/sun/javatest/agent/ModeOptions.java | 56 - jtreg/com/sun/javatest/agent/PassiveAgentCommand.java | 135 - jtreg/com/sun/javatest/agent/PassiveConnectionFactory.java | 91 - jtreg/com/sun/javatest/agent/PassiveModeOptions.java | 73 - jtreg/com/sun/javatest/agent/SocketConnection.java | 169 - jtreg/com/sun/javatest/agent/i18n.properties | 95 - jtreg/com/sun/javatest/agent/jticon.gif | 0 jtreg/com/sun/javatest/agent/package.html | 59 - jtreg/com/sun/javatest/audit/Audit.java | 739 -- jtreg/com/sun/javatest/audit/AuditCommandManager.java | 140 - jtreg/com/sun/javatest/audit/AuditPane.java | 82 - jtreg/com/sun/javatest/audit/AuditTool.java | 373 - jtreg/com/sun/javatest/audit/AuditToolManager.java | 105 - jtreg/com/sun/javatest/audit/BadChecksumPane.java | 47 - jtreg/com/sun/javatest/audit/BadTestCaseTestsPane.java | 48 - jtreg/com/sun/javatest/audit/BadTestDescriptionPane.java | 47 - jtreg/com/sun/javatest/audit/BadTestsPane.java | 47 - jtreg/com/sun/javatest/audit/ListPane.java | 100 - jtreg/com/sun/javatest/audit/OptionsDialog.java | 371 - jtreg/com/sun/javatest/audit/SummaryPane.java | 287 - jtreg/com/sun/javatest/audit/i18n.properties | 189 - jtreg/com/sun/javatest/audit/images/dotdotdot.gif | 0 jtreg/com/sun/javatest/audit/package.html | 43 - jtreg/com/sun/javatest/batch/BatchManager.java | 119 - jtreg/com/sun/javatest/batch/ObserverCommand.java | 182 - jtreg/com/sun/javatest/batch/RunTestsCommand.java | 416 - jtreg/com/sun/javatest/batch/i18n.properties | 75 - jtreg/com/sun/javatest/batch/package.html | 43 - jtreg/com/sun/javatest/cof/COF1_0.xsd | 548 - jtreg/com/sun/javatest/cof/COF2_0_2.xsd | 779 -- jtreg/com/sun/javatest/cof/COFApplication.java | 102 - jtreg/com/sun/javatest/cof/COFApplications.java | 69 - jtreg/com/sun/javatest/cof/COFData.java | 94 - jtreg/com/sun/javatest/cof/COFEnvironment.java | 584 - jtreg/com/sun/javatest/cof/COFEnvironments.java | 124 - jtreg/com/sun/javatest/cof/COFItem.java | 170 - jtreg/com/sun/javatest/cof/COFOS.java | 178 - jtreg/com/sun/javatest/cof/COFReportAnnotation.java | 160 - jtreg/com/sun/javatest/cof/COFReportAnnotations.java | 114 - jtreg/com/sun/javatest/cof/COFSWEntities.java | 114 - jtreg/com/sun/javatest/cof/COFSWEntity.java | 248 - jtreg/com/sun/javatest/cof/COFStatus.java | 193 - jtreg/com/sun/javatest/cof/COFTest.java | 594 - jtreg/com/sun/javatest/cof/COFTestAttribute.java | 181 - jtreg/com/sun/javatest/cof/COFTestAttributes.java | 116 - jtreg/com/sun/javatest/cof/COFTestCase.java | 346 - jtreg/com/sun/javatest/cof/COFTestCases.java | 133 - jtreg/com/sun/javatest/cof/COFTestSuite.java | 143 - jtreg/com/sun/javatest/cof/COFTestSuites.java | 126 - jtreg/com/sun/javatest/cof/ID.java | 56 - jtreg/com/sun/javatest/cof/Main.java | 377 - jtreg/com/sun/javatest/cof/Report.java | 424 - jtreg/com/sun/javatest/cof/i18n.properties | 54 - jtreg/com/sun/javatest/diff/Diff.java | 161 - jtreg/com/sun/javatest/diff/DiffReader.java | 40 - jtreg/com/sun/javatest/diff/Fault.java | 40 - jtreg/com/sun/javatest/diff/HTMLReporter.java | 351 - jtreg/com/sun/javatest/diff/HTMLWriter.java | 558 - jtreg/com/sun/javatest/diff/Help.java | 445 - jtreg/com/sun/javatest/diff/Main.java | 219 - jtreg/com/sun/javatest/diff/MultiMap.java | 173 - jtreg/com/sun/javatest/diff/ReportReader.java | 126 - jtreg/com/sun/javatest/diff/Reporter.java | 76 - jtreg/com/sun/javatest/diff/SimpleReporter.java | 163 - jtreg/com/sun/javatest/diff/StandardDiff.java | 42 - jtreg/com/sun/javatest/diff/StatusComparator.java | 79 - jtreg/com/sun/javatest/diff/SuperDiff.java | 342 - jtreg/com/sun/javatest/diff/WorkDirectoryReader.java | 113 - jtreg/com/sun/javatest/diff/i18n.properties | 153 - jtreg/com/sun/javatest/exec/AbstractCellEditor.java | 87 - jtreg/com/sun/javatest/exec/AccessWrapper.java | 73 - jtreg/com/sun/javatest/exec/BP_BranchSubpanel.java | 96 - jtreg/com/sun/javatest/exec/BP_DocumentationSubpanel.java | 107 - jtreg/com/sun/javatest/exec/BP_FilteredOutSubpanel.java | 926 --- jtreg/com/sun/javatest/exec/BP_Model.java | 78 - jtreg/com/sun/javatest/exec/BP_SummarySubpanel.java | 980 --- jtreg/com/sun/javatest/exec/BP_TestListSubpanel.java | 1353 ---- jtreg/com/sun/javatest/exec/BasicCustomTestFilter.java | 1077 --- jtreg/com/sun/javatest/exec/BranchPanel.java | 579 - jtreg/com/sun/javatest/exec/CE_EnvironmentPane.java | 276 - jtreg/com/sun/javatest/exec/CE_ExcludeListPane.java | 612 -- jtreg/com/sun/javatest/exec/CE_ExecutionPane.java | 253 - jtreg/com/sun/javatest/exec/CE_FullView.java | 265 - jtreg/com/sun/javatest/exec/CE_KeywordsPane.java | 527 - jtreg/com/sun/javatest/exec/CE_PriorStatusPane.java | 203 - jtreg/com/sun/javatest/exec/CE_StdPane.java | 82 - jtreg/com/sun/javatest/exec/CE_StdView.java | 274 - jtreg/com/sun/javatest/exec/CE_TemplateDialog.java | 320 - jtreg/com/sun/javatest/exec/CE_TestsPane.java | 255 - jtreg/com/sun/javatest/exec/CE_View.java | 72 - jtreg/com/sun/javatest/exec/ChecklistBrowser.java | 296 - jtreg/com/sun/javatest/exec/ConfigEditor.java | 1401 ---- jtreg/com/sun/javatest/exec/ConfigHandler.java | 1198 ---- jtreg/com/sun/javatest/exec/ConfigurableTestFilter.java | 209 - jtreg/com/sun/javatest/exec/ContextManager.java | 583 - jtreg/com/sun/javatest/exec/CustomTestResultViewer.java | 104 - jtreg/com/sun/javatest/exec/DetailsBrowser.java | 154 - jtreg/com/sun/javatest/exec/ET_FilterHandler.java | 591 - jtreg/com/sun/javatest/exec/ElapsedTimeMonitor.java | 221 - jtreg/com/sun/javatest/exec/EnvironmentBrowser.java | 351 - jtreg/com/sun/javatest/exec/ExcludeListBrowser.java | 371 - jtreg/com/sun/javatest/exec/ExecModel.java | 93 - jtreg/com/sun/javatest/exec/ExecTool.java | 1471 ---- jtreg/com/sun/javatest/exec/ExecToolManager.java | 815 -- jtreg/com/sun/javatest/exec/FeatureManager.java | 89 - jtreg/com/sun/javatest/exec/FileSystemTableModel.java | 245 - jtreg/com/sun/javatest/exec/FileTable.java | 99 - jtreg/com/sun/javatest/exec/FileType.java | 85 - jtreg/com/sun/javatest/exec/FilesPane.java | 134 - jtreg/com/sun/javatest/exec/FilterConfig.java | 858 -- jtreg/com/sun/javatest/exec/FilterSelectionHandler.java | 425 - jtreg/com/sun/javatest/exec/JavaTestContextMenu.java | 134 - jtreg/com/sun/javatest/exec/JavaTestMenuManager.java | 133 - jtreg/com/sun/javatest/exec/JavaTestToolBar.java | 236 - jtreg/com/sun/javatest/exec/LogViewer.java | 1349 ---- jtreg/com/sun/javatest/exec/LogViewerTools.java | 191 - jtreg/com/sun/javatest/exec/MessageStrip.java | 383 - jtreg/com/sun/javatest/exec/Monitor.java | 60 - jtreg/com/sun/javatest/exec/MonitorState.java | 334 - jtreg/com/sun/javatest/exec/MultiFormatPane.java | 971 --- jtreg/com/sun/javatest/exec/MultiSelectPanel.java | 177 - jtreg/com/sun/javatest/exec/NavigationPane.java | 365 - jtreg/com/sun/javatest/exec/NewReportDialog.java | 1428 ---- jtreg/com/sun/javatest/exec/ParameterFilter.java | 238 - jtreg/com/sun/javatest/exec/PrefsPane.java | 195 - jtreg/com/sun/javatest/exec/ProgressMeter.java | 343 - jtreg/com/sun/javatest/exec/ProgressMonitor.java | 632 -- jtreg/com/sun/javatest/exec/PropertiesBrowser.java | 310 - jtreg/com/sun/javatest/exec/QuestionLogBrowser.java | 280 - jtreg/com/sun/javatest/exec/QuickStartWizard.java | 1263 ---- jtreg/com/sun/javatest/exec/RenderingUtilities.java | 185 - jtreg/com/sun/javatest/exec/ReportBrowser.java | 164 - jtreg/com/sun/javatest/exec/ReportHandler.java | 311 - jtreg/com/sun/javatest/exec/RunProgressMonitor.java | 160 - jtreg/com/sun/javatest/exec/RunTestsHandler.java | 527 - jtreg/com/sun/javatest/exec/TP_CustomSubpanel.java | 53 - jtreg/com/sun/javatest/exec/TP_DescSubpanel.java | 62 - jtreg/com/sun/javatest/exec/TP_DocumentationSubpanel.java | 86 - jtreg/com/sun/javatest/exec/TP_EnvSubpanel.java | 124 - jtreg/com/sun/javatest/exec/TP_FilesSubpanel.java | 84 - jtreg/com/sun/javatest/exec/TP_OutputSubpanel.java | 806 -- jtreg/com/sun/javatest/exec/TP_PropertySubpanel.java | 415 - jtreg/com/sun/javatest/exec/TP_ResultsSubpanel.java | 138 - jtreg/com/sun/javatest/exec/TP_Subpanel.java | 78 - jtreg/com/sun/javatest/exec/TT_NodeCache.java | 871 -- jtreg/com/sun/javatest/exec/TT_Renderer.java | 329 - jtreg/com/sun/javatest/exec/TU_ViewManager.java | 395 - jtreg/com/sun/javatest/exec/TemplateParameterFilter.java | 119 - jtreg/com/sun/javatest/exec/TestPanel.java | 423 - jtreg/com/sun/javatest/exec/TestSuiteErrorsDialog.java | 124 - jtreg/com/sun/javatest/exec/TestTree.java | 252 - jtreg/com/sun/javatest/exec/TestTreeModel.java | 1243 ---- jtreg/com/sun/javatest/exec/TestTreePanel.java | 1832 ------ jtreg/com/sun/javatest/exec/ToolBarManager.java | 259 - jtreg/com/sun/javatest/exec/ToolBarPanel.java | 162 - jtreg/com/sun/javatest/exec/TreePanelModel.java | 97 - jtreg/com/sun/javatest/exec/WorkDirChooseTool.java | 1088 --- jtreg/com/sun/javatest/exec/i18n.properties | 1837 ------ jtreg/com/sun/javatest/exec/images/Back16.gif | 0 jtreg/com/sun/javatest/exec/images/Back24.gif | 0 jtreg/com/sun/javatest/exec/images/Dir.gif | 0 jtreg/com/sun/javatest/exec/images/Down16.gif | 0 jtreg/com/sun/javatest/exec/images/Down24.gif | 0 jtreg/com/sun/javatest/exec/images/Edit16.gif | 0 jtreg/com/sun/javatest/exec/images/Edit24.gif | 0 jtreg/com/sun/javatest/exec/images/FastForward16.gif | 0 jtreg/com/sun/javatest/exec/images/Find16.gif | 0 jtreg/com/sun/javatest/exec/images/Find24.gif | 0 jtreg/com/sun/javatest/exec/images/FindAgain16.gif | 0 jtreg/com/sun/javatest/exec/images/FindAgain24.gif | 0 jtreg/com/sun/javatest/exec/images/Forward16.gif | 0 jtreg/com/sun/javatest/exec/images/Forward24.gif | 0 jtreg/com/sun/javatest/exec/images/Help16.gif | 0 jtreg/com/sun/javatest/exec/images/Help24.gif | 0 jtreg/com/sun/javatest/exec/images/Home16.gif | 0 jtreg/com/sun/javatest/exec/images/Home24.gif | 0 jtreg/com/sun/javatest/exec/images/Last16.gif | 0 jtreg/com/sun/javatest/exec/images/Pause16.gif | 0 jtreg/com/sun/javatest/exec/images/Pause24.gif | 0 jtreg/com/sun/javatest/exec/images/Play16.gif | 0 jtreg/com/sun/javatest/exec/images/Play24.gif | 0 jtreg/com/sun/javatest/exec/images/Preferences16.gif | 0 jtreg/com/sun/javatest/exec/images/Preferences24.gif | 0 jtreg/com/sun/javatest/exec/images/Print16.gif | 0 jtreg/com/sun/javatest/exec/images/Print24.gif | 0 jtreg/com/sun/javatest/exec/images/Save16.gif | 0 jtreg/com/sun/javatest/exec/images/Save24.gif | 0 jtreg/com/sun/javatest/exec/images/SaveAs16.gif | 0 jtreg/com/sun/javatest/exec/images/SaveAs24.gif | 0 jtreg/com/sun/javatest/exec/images/Stop16.gif | 0 jtreg/com/sun/javatest/exec/images/Stop24.gif | 0 jtreg/com/sun/javatest/exec/images/Up16.gif | 0 jtreg/com/sun/javatest/exec/images/Up24.gif | 0 jtreg/com/sun/javatest/exec/images/UpDir.gif | 0 jtreg/com/sun/javatest/exec/images/drop-down.gif | 0 jtreg/com/sun/javatest/exec/images/fullView.gif | 0 jtreg/com/sun/javatest/exec/images/magnify.gif | 0 jtreg/com/sun/javatest/exec/images/question.gif | 0 jtreg/com/sun/javatest/exec/images/snooze.sm.gif | 0 jtreg/com/sun/javatest/exec/images/stdView.gif | 0 jtreg/com/sun/javatest/exec/images/stream.gif | 0 jtreg/com/sun/javatest/exec/package.html | 42 - jtreg/com/sun/javatest/finder/BinaryTestFinder.java | 547 - jtreg/com/sun/javatest/finder/BinaryTestWriter.java | 860 -- jtreg/com/sun/javatest/finder/ChameleonTestFinder.java | 450 - jtreg/com/sun/javatest/finder/CommentStream.java | 85 - jtreg/com/sun/javatest/finder/ExpandTestFinder.java | 348 - jtreg/com/sun/javatest/finder/HTMLCommentStream.java | 84 - jtreg/com/sun/javatest/finder/HTMLTestFinder.java | 627 -- jtreg/com/sun/javatest/finder/JavaCommentStream.java | 161 - jtreg/com/sun/javatest/finder/ReverseTestFinder.java | 121 - jtreg/com/sun/javatest/finder/ShScriptCommentStream.java | 83 - jtreg/com/sun/javatest/finder/ShowTests.java | 291 - jtreg/com/sun/javatest/finder/TagTestFinder.java | 388 - jtreg/com/sun/javatest/finder/i18n.properties | 69 - jtreg/com/sun/javatest/finder/package.html | 44 - jtreg/com/sun/javatest/httpd/HttpdServer.java | 194 - jtreg/com/sun/javatest/httpd/JThttpProvider.java | 148 - jtreg/com/sun/javatest/httpd/PageGenerator.java | 252 - jtreg/com/sun/javatest/httpd/ProviderRegistry.java | 494 - jtreg/com/sun/javatest/httpd/RequestHandler.java | 178 - jtreg/com/sun/javatest/httpd/RootRegistry.java | 136 - jtreg/com/sun/javatest/httpd/httpURL.java | 318 - jtreg/com/sun/javatest/httpd/i18n.properties | 45 - jtreg/com/sun/javatest/i18n.properties | 460 - jtreg/com/sun/javatest/interview/BasicInterviewParameters.java | 433 - jtreg/com/sun/javatest/interview/ConcurrencyInterview.java | 104 - jtreg/com/sun/javatest/interview/DefaultInterviewParameters.java | 63 - jtreg/com/sun/javatest/interview/EnvironmentInterview.java | 385 - jtreg/com/sun/javatest/interview/ExcludeListInterview.java | 605 -- jtreg/com/sun/javatest/interview/KeywordsInterview.java | 304 - jtreg/com/sun/javatest/interview/LegacyParameters.java | 88 - jtreg/com/sun/javatest/interview/PriorStatusInterview.java | 225 - jtreg/com/sun/javatest/interview/SimpleInterviewParameters.java | 270 - jtreg/com/sun/javatest/interview/TestsInterview.java | 434 - jtreg/com/sun/javatest/interview/TimeoutFactorInterview.java | 106 - jtreg/com/sun/javatest/interview/i18n.properties | 176 - jtreg/com/sun/javatest/interview/package.html | 45 - jtreg/com/sun/javatest/lib/APIScript.java | 114 - jtreg/com/sun/javatest/lib/Deprecated.java | 52 - jtreg/com/sun/javatest/lib/ExecStdTestOtherJVMCmd.java | 77 - jtreg/com/sun/javatest/lib/ExecStdTestSameJVMCmd.java | 155 - jtreg/com/sun/javatest/lib/JavaCompileCommand.java | 317 - jtreg/com/sun/javatest/lib/KeywordScript.java | 235 - jtreg/com/sun/javatest/lib/MultiStatus.java | 246 - jtreg/com/sun/javatest/lib/MultiTest.java | 314 - jtreg/com/sun/javatest/lib/ProcessCommand.java | 462 - jtreg/com/sun/javatest/lib/ReportScript.java | 59 - jtreg/com/sun/javatest/lib/StdTestScript.java | 223 - jtreg/com/sun/javatest/lib/TestCases.java | 275 - jtreg/com/sun/javatest/logging/ErrorDialogHandler.java | 217 - jtreg/com/sun/javatest/logging/FileEvent.java | 51 - jtreg/com/sun/javatest/logging/FileListener.java | 34 - jtreg/com/sun/javatest/logging/FilteredLogModel.java | 392 - jtreg/com/sun/javatest/logging/JTFormatter.java | 104 - jtreg/com/sun/javatest/logging/LogModel.java | 502 - jtreg/com/sun/javatest/logging/LoggerFactory.java | 58 - jtreg/com/sun/javatest/logging/ObservedFile.java | 194 - jtreg/com/sun/javatest/logging/WorkDirLogHandler.java | 148 - jtreg/com/sun/javatest/logging/i18n.properties | 51 - jtreg/com/sun/javatest/mrep/BrowserPane.java | 585 - jtreg/com/sun/javatest/mrep/ConflictResolutionDialog.java | 263 - jtreg/com/sun/javatest/mrep/ConflictResolver.java | 38 - jtreg/com/sun/javatest/mrep/FilesPane.java | 472 - jtreg/com/sun/javatest/mrep/Merger.java | 127 - jtreg/com/sun/javatest/mrep/OptionsDialog.java | 204 - jtreg/com/sun/javatest/mrep/OptionsPane.java | 504 - jtreg/com/sun/javatest/mrep/ReportDirChooser.java | 298 - jtreg/com/sun/javatest/mrep/ReportTool.java | 697 -- jtreg/com/sun/javatest/mrep/ReportToolManager.java | 91 - jtreg/com/sun/javatest/mrep/Scheme.java | 100 - jtreg/com/sun/javatest/mrep/TestResultDescr.java | 78 - jtreg/com/sun/javatest/mrep/XMLReportReader.java | 95 - jtreg/com/sun/javatest/mrep/XMLReportWriter.java | 279 - jtreg/com/sun/javatest/mrep/i18n.properties | 200 - jtreg/com/sun/javatest/mrep/images/Back16.gif | 0 jtreg/com/sun/javatest/mrep/images/Forward16.gif | 0 jtreg/com/sun/javatest/mrep/images/Home16.gif | 0 jtreg/com/sun/javatest/mrep/images/dotdotdot.gif | 0 jtreg/com/sun/javatest/package.html | 60 - jtreg/com/sun/javatest/regtest/Action.java | 550 - jtreg/com/sun/javatest/regtest/AntOptionDecoder.java | 93 - jtreg/com/sun/javatest/regtest/AppletAction.java | 631 -- jtreg/com/sun/javatest/regtest/AppletWrapper.java | 650 -- jtreg/com/sun/javatest/regtest/BadArgs.java | 38 - jtreg/com/sun/javatest/regtest/BuildAction.java | 226 - jtreg/com/sun/javatest/regtest/CheckFiles.java | 150 - jtreg/com/sun/javatest/regtest/CleanAction.java | 146 - jtreg/com/sun/javatest/regtest/CompileAction.java | 701 -- jtreg/com/sun/javatest/regtest/GetSystemProperty.java | 40 - jtreg/com/sun/javatest/regtest/Help.java | 490 - jtreg/com/sun/javatest/regtest/IgnoreAction.java | 111 - jtreg/com/sun/javatest/regtest/IgnoreKind.java | 35 - jtreg/com/sun/javatest/regtest/JDK.java | 88 - jtreg/com/sun/javatest/regtest/Main.java | 1842 ------ jtreg/com/sun/javatest/regtest/MainAction.java | 730 -- jtreg/com/sun/javatest/regtest/MainWrapper.java | 186 - jtreg/com/sun/javatest/regtest/Option.java | 97 - jtreg/com/sun/javatest/regtest/OptionDecoder.java | 184 - jtreg/com/sun/javatest/regtest/ParseException.java | 51 - jtreg/com/sun/javatest/regtest/Path.java | 164 - jtreg/com/sun/javatest/regtest/RegressionEnvironment.java | 49 - jtreg/com/sun/javatest/regtest/RegressionObserver.java | 327 - jtreg/com/sun/javatest/regtest/RegressionParameters.java | 619 -- jtreg/com/sun/javatest/regtest/RegressionScript.java | 964 --- jtreg/com/sun/javatest/regtest/RegressionSecurityManager.java | 149 - jtreg/com/sun/javatest/regtest/RegressionTestFinder.java | 569 - jtreg/com/sun/javatest/regtest/RegressionTestSuite.java | 180 - jtreg/com/sun/javatest/regtest/ShellAction.java | 282 - jtreg/com/sun/javatest/regtest/StringArray.java | 182 - jtreg/com/sun/javatest/regtest/StringUtils.java | 45 - jtreg/com/sun/javatest/regtest/TestRunException.java | 52 - jtreg/com/sun/javatest/regtest/Verbose.java | 130 - jtreg/com/sun/javatest/regtest/i18n.properties | 327 - jtreg/com/sun/javatest/report/ConfigSection.java | 510 - jtreg/com/sun/javatest/report/CustomReport.java | 390 - jtreg/com/sun/javatest/report/HTMLReport.java | 292 - jtreg/com/sun/javatest/report/HTMLSection.java | 92 - jtreg/com/sun/javatest/report/PlainTextReport.java | 112 - jtreg/com/sun/javatest/report/Report.java | 1096 --- jtreg/com/sun/javatest/report/ReportDirChooser.java | 289 - jtreg/com/sun/javatest/report/ReportFormat.java | 45 - jtreg/com/sun/javatest/report/ReportManager.java | 265 - jtreg/com/sun/javatest/report/ReportModel.java | 34 - jtreg/com/sun/javatest/report/ReportWriter.java | 191 - jtreg/com/sun/javatest/report/ResultSection.java | 263 - jtreg/com/sun/javatest/report/StatisticsSection.java | 228 - jtreg/com/sun/javatest/report/StringArrayComparator.java | 55 - jtreg/com/sun/javatest/report/TestResultsByFileComparator.java | 73 - jtreg/com/sun/javatest/report/TestResultsByStatusAndTitleComparator.java | 58 - jtreg/com/sun/javatest/report/TestResultsByTitleComparator.java | 53 - jtreg/com/sun/javatest/report/XMLReport.java | 471 - jtreg/com/sun/javatest/report/XMLReportMaker.java | 609 -- jtreg/com/sun/javatest/report/i18n.properties | 135 - jtreg/com/sun/javatest/report/package.html | 38 - jtreg/com/sun/javatest/stylesheet.css | 32 - jtreg/com/sun/javatest/tool/Command.java | 280 - jtreg/com/sun/javatest/tool/CommandContext.java | 1028 --- jtreg/com/sun/javatest/tool/CommandManager.java | 107 - jtreg/com/sun/javatest/tool/CommandParser.java | 343 - jtreg/com/sun/javatest/tool/ConfigManager.java | 1435 ---- jtreg/com/sun/javatest/tool/CustomPropagationController.java | 113 - jtreg/com/sun/javatest/tool/Deck.java | 127 - jtreg/com/sun/javatest/tool/DeskView.java | 833 -- jtreg/com/sun/javatest/tool/Desktop.java | 1507 ----- jtreg/com/sun/javatest/tool/DesktopManager.java | 88 - jtreg/com/sun/javatest/tool/DesktopPrefsPane.java | 404 - jtreg/com/sun/javatest/tool/EditableFileList.java | 146 - jtreg/com/sun/javatest/tool/EditableList.java | 466 - jtreg/com/sun/javatest/tool/EnvironmentManager.java | 145 - jtreg/com/sun/javatest/tool/FileChooser.java | 129 - jtreg/com/sun/javatest/tool/FileHistory.java | 398 - jtreg/com/sun/javatest/tool/FileOpener.java | 90 - jtreg/com/sun/javatest/tool/FocusMonitor.java | 711 -- jtreg/com/sun/javatest/tool/HelpLink.java | 195 - jtreg/com/sun/javatest/tool/HelpLinkBeanInfo.java | 59 - jtreg/com/sun/javatest/tool/HelpManager.java | 278 - jtreg/com/sun/javatest/tool/HelpMenu.java | 306 - jtreg/com/sun/javatest/tool/HttpManager.java | 99 - jtreg/com/sun/javatest/tool/I18NUtils.java | 265 - jtreg/com/sun/javatest/tool/IconFactory.java | 770 -- jtreg/com/sun/javatest/tool/IconLabel.java | 131 - jtreg/com/sun/javatest/tool/IconLabelBeanInfo.java | 57 - jtreg/com/sun/javatest/tool/LogManager.java | 112 - jtreg/com/sun/javatest/tool/MDIDeskView.java | 587 - jtreg/com/sun/javatest/tool/Main.java | 506 - jtreg/com/sun/javatest/tool/ManagerLoader.java | 148 - jtreg/com/sun/javatest/tool/PieChart.java | 231 - jtreg/com/sun/javatest/tool/Preferences.java | 770 -- jtreg/com/sun/javatest/tool/SDIDeskView.java | 494 - jtreg/com/sun/javatest/tool/SelectedWorkDirApprover.java | 298 - jtreg/com/sun/javatest/tool/Startup.java | 207 - jtreg/com/sun/javatest/tool/TabDeskView.java | 528 - jtreg/com/sun/javatest/tool/TestSuiteChooser.java | 261 - jtreg/com/sun/javatest/tool/TestTreeSelectionPane.java | 125 - jtreg/com/sun/javatest/tool/Tool.java | 361 - jtreg/com/sun/javatest/tool/ToolAction.java | 243 - jtreg/com/sun/javatest/tool/ToolDialog.java | 719 -- jtreg/com/sun/javatest/tool/ToolManager.java | 232 - jtreg/com/sun/javatest/tool/TreeSelectionPane.java | 995 --- jtreg/com/sun/javatest/tool/UIFactory.java | 2972 ---------- jtreg/com/sun/javatest/tool/VerboseCommand.java | 159 - jtreg/com/sun/javatest/tool/WDC_FileFilter.java | 48 - jtreg/com/sun/javatest/tool/WDC_FileView.java | 66 - jtreg/com/sun/javatest/tool/WorkDirChooser.java | 352 - jtreg/com/sun/javatest/tool/i18n.properties | 538 - jtreg/com/sun/javatest/tool/images/jticon.gif | 0 jtreg/com/sun/javatest/tool/images/jtlogo.gif | 0 jtreg/com/sun/javatest/tool/images/splash.gif | 0 jtreg/com/sun/javatest/tool/package.html | 48 - jtreg/com/sun/javatest/util/BackupPolicy.java | 262 - jtreg/com/sun/javatest/util/BackupUtil.java | 340 - jtreg/com/sun/javatest/util/Debug.java | 492 - jtreg/com/sun/javatest/util/DirectoryClassLoader.java | 226 - jtreg/com/sun/javatest/util/DynamicArray.java | 273 - jtreg/com/sun/javatest/util/ExitCount.java | 77 - jtreg/com/sun/javatest/util/Fifo.java | 144 - jtreg/com/sun/javatest/util/FileFilter.java | 43 - jtreg/com/sun/javatest/util/FileInfoCache.java | 134 - jtreg/com/sun/javatest/util/HTMLWriter.java | 558 - jtreg/com/sun/javatest/util/HelpTree.java | 510 - jtreg/com/sun/javatest/util/I18NResourceBundle.java | 171 - jtreg/com/sun/javatest/util/LineParser.java | 288 - jtreg/com/sun/javatest/util/LogFile.java | 172 - jtreg/com/sun/javatest/util/MainAppletContext.java | 133 - jtreg/com/sun/javatest/util/MainFrame.java | 251 - jtreg/com/sun/javatest/util/OrderedTwoWayTable.java | 135 - jtreg/com/sun/javatest/util/PathClassLoader.java | 208 - jtreg/com/sun/javatest/util/PrefixMap.java | 169 - jtreg/com/sun/javatest/util/Properties.java | 395 - jtreg/com/sun/javatest/util/PropertyArray.java | 723 -- jtreg/com/sun/javatest/util/ReadAheadIterator.java | 350 - jtreg/com/sun/javatest/util/SortedProperties.java | 58 - jtreg/com/sun/javatest/util/StringArray.java | 203 - jtreg/com/sun/javatest/util/SysEnv.java | 176 - jtreg/com/sun/javatest/util/TextStream.java | 97 - jtreg/com/sun/javatest/util/TextWriter.java | 281 - jtreg/com/sun/javatest/util/Timer.java | 219 - jtreg/com/sun/javatest/util/WrapWriter.java | 191 - jtreg/com/sun/javatest/util/WriterStream.java | 159 - jtreg/com/sun/javatest/util/XMLWriter.java | 358 - jtreg/com/sun/javatest/util/i18n.properties | 32 - jtreg/com/sun/javatest/util/package.html | 38 - jtreg/excludelist.jdk.jtx | 29 - jtreg/legal/copyright.txt | 22 - jtreg/legal/license.txt | 347 - overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile | 37 - overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile | 40 - overlays/nio2/openjdk/jdk/make/mksample/nio/aio/Makefile | 50 - overlays/nio2/openjdk/jdk/make/mksample/nio/file/Makefile | 56 - overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedCopyOption.java | 43 - overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedOpenOption.java | 50 - overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java | 43 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/File.java | 450 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/FilePermission.java | 852 -- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/Inputs.java | 391 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/Outputs.java | 362 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/ProtocolFamily.java | 40 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/SocketOption.java | 56 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardProtocolFamily.java | 46 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardSocketOption.java | 370 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousByteChannel.java | 206 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousChannel.java | 118 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup.java | 317 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel.java | 707 -- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel.java | 777 -- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel.java | 305 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel.java | 672 -- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/Channels.java | 214 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/CompletionHandler.java | 78 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/DatagramChannel.java | 223 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java | 404 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileLock.java | 321 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/MembershipKey.java | 183 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/MulticastChannel.java | 216 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/NetworkChannel.java | 165 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/SeekableByteChannel.java | 170 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/exceptions | 68 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/package-info.java | 293 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider.java | 284 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/SelectorProvider.java | 199 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/package.html | 45 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AccessDeniedException.java | 69 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AccessMode.java | 50 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AtomicMoveNotSupportedException.java | 57 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedDirectoryStreamException.java | 46 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedFileSystemException.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedWatchServiceException.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/CopyOption.java | 42 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryNotEmptyException.java | 50 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryStream.java | 139 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryStreamFilters.java | 211 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileAction.java | 65 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileAlreadyExistsException.java | 64 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileRef.java | 425 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileStore.java | 173 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystem.java | 426 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemAlreadyExistsException.java | 54 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemException.java | 126 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemNotFoundException.java | 53 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystems.java | 415 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileTreeWalker.java | 247 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitOption.java | 46 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitResult.java | 63 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitor.java | 177 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Files.java | 405 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/InvalidPathException.java | 131 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/LinkOption.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/LinkPermission.java | 108 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NoSuchFileException.java | 64 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NotDirectoryException.java | 50 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NotLinkException.java | 64 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/OpenOption.java | 46 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Path.java | 1575 ----- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/PathMatcher.java | 50 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Paths.java | 126 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ProviderMismatchException.java | 54 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ProviderNotFoundException.java | 53 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ReadOnlyFileSystemException.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/SecureDirectoryStream.java | 327 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/SimpleFileVisitor.java | 123 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardCopyOption.java | 48 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardOpenOption.java | 126 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardWatchEventKind.java | 95 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchEvent.java | 117 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchKey.java | 138 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchService.java | 179 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Watchable.java | 128 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntry.java | 395 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryFlag.java | 66 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryPermission.java | 131 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryType.java | 57 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView.java | 211 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AttributeView.java | 119 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/Attributes.java | 714 -- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView.java | 185 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributes.java | 164 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView.java | 180 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributes.java | 85 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileAttribute.java | 51 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileAttributeView.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileOwnerAttributeView.java | 102 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView.java | 39 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreSpaceAttributeView.java | 94 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreSpaceAttributes.java | 67 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/GroupPrincipal.java | 43 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView.java | 231 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributeView.java | 196 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributes.java | 78 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFilePermission.java | 87 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFilePermissions.java | 190 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipal.java | 55 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipalLookupService.java | 105 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipalNotFoundException.java | 65 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/package-info.java | 120 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/package-info.java | 116 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/AbstractPath.java | 542 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/FileSystemProvider.java | 441 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/FileTypeDetector.java | 102 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/package-info.java | 39 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/util/Scanner.java | 2657 -------- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/util/concurrent/ScheduledThreadPoolExecutor.java | 1371 ---- overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaIODeleteOnExitAccess.java | 43 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaNetGetIndexAccess.java | 46 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaUtilConcurrentThreadPoolExecutorAccess.java | 58 - overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/SharedSecrets.java | 102 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AbstractFuture.java | 64 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java | 359 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java | 169 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java | 68 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java | 222 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java | 546 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Cancellable.java | 39 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/CompletedFuture.java | 114 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ExtendedSocketOption.java | 44 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/FileLockTable.java | 287 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Groupable.java | 35 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Invoker.java | 274 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipKeyImpl.java | 224 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipRegistry.java | 132 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/OptionKey.java | 48 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/PendingFuture.java | 259 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java | 425 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java | 437 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ThreadPool.java | 168 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java | 113 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java | 210 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileStoreSpaceAttributeView.java | 121 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java | 70 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractNamedAttributeView.java | 125 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java | 296 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatchKey.java | 179 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatchService.java | 166 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Cancellable.java | 137 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java | 116 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Globs.java | 155 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/MimeType.java | 73 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffer.java | 87 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffers.java | 140 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java | 454 - overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Reflect.java | 63 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/META-INF/services/java.nio.file.spi.FileSystemProvider | 1 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/README.txt | 29 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarEntryInfo.java | 44 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributeView.java | 76 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributes.java | 57 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipEntryInfo.java | 76 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributeView.java | 154 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributes.java | 93 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributeView.java | 187 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributes.java | 125 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFilePath.java | 1027 --- overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStore.java | 230 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStream.java | 166 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystem.java | 319 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystemProvider.java | 243 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipHeaderConstants.java | 75 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipPathParser.java | 308 - overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipUtils.java | 481 - overlays/nio2/openjdk/jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c | 129 - overlays/nio2/openjdk/jdk/src/share/sample/nio/aio/EchoServer.java | 165 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/AclEdit.java | 301 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Chmod.java | 363 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Copy.java | 227 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/DiskUsage.java | 78 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/FileType.java | 62 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/WatchDir.java | 204 - overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Xdd.java | 119 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java | 57 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/EPollPort.java | 362 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java | 100 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/Port.java | 170 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java | 103 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java | 243 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java | 320 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java | 685 -- overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java | 74 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileTypeDetector.java | 36 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java | 99 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java | 300 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java | 102 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java | 186 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java | 41 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedAttributeView.java | 344 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java | 126 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java | 469 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java | 408 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileStore.java | 102 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java | 178 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java | 41 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNamedAttributeView.java | 293 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java | 56 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisWatchService.java | 771 -- overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixChannelFactory.java | 289 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixCopyFile.java | 615 -- overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java | 270 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixException.java | 117 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java | 401 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java | 312 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileKey.java | 60 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileModeAttribute.java | 86 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java | 289 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileStoreAttributes.java | 59 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystem.java | 375 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java | 151 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixMountEntry.java | 82 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java | 556 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java | 1201 ---- overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java | 664 -- overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUriUtils.java | 216 - overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java | 179 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/EPollPort.c | 173 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/SolarisEventPort.c | 155 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.c | 47 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c | 53 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c | 205 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c | 160 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c | 156 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisNativeDispatcher.c | 70 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisWatchService.c | 141 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixCopyFile.c | 85 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c | 1059 --- overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genSolarisConstants.c | 104 - overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c | 129 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java | 43 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/Iocp.java | 435 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/PendingIoCache.java | 161 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java | 96 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java | 736 -- overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java | 367 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java | 911 --- overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java | 38 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java | 36 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java | 82 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java | 226 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsChannelFactory.java | 348 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java | 191 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java | 225 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsException.java | 109 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java | 296 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributes.java | 296 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileCopy.java | 527 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileStore.java | 324 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java | 318 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java | 148 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsLinkSupport.java | 466 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNamedAttributeView.java | 342 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java | 1131 --- overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java | 1312 ---- overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPathParser.java | 225 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPathType.java | 38 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecurity.java | 123 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java | 392 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUriSupport.java | 167 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUserPrincipals.java | 169 - overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsWatchService.java | 581 - overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/Iocp.c | 144 - overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousFileChannelImpl.c | 132 - overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.c | 142 - overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c | 222 - overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/RegistryFileTypeDetector.c | 62 - overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c | 1328 ---- overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/Sanity.java | 168 - overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/sanity.sh | 71 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/io/Inputs/Basic.java | 218 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java | 84 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Attack.java | 63 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Basic.java | 261 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java | 137 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Identity.java | 167 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/PrivilegedThreadFactory.java | 50 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Restart.java | 134 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Unbounded.java | 120 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh | 52 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel/Basic.java | 377 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Basic.java | 585 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java | 67 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Lock.java | 340 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/MyThreadFactory.java | 49 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/Basic.java | 136 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java | 76 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow | 3 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny | 3 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Basic.java | 805 -- overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Leaky.java | 104 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/Channels/Basic2.java | 172 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/CheckProvider.java | 38 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/META-INF/services/java.nio.channels.spi.AsynchronousChannelProvider | 1 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java | 62 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java | 62 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh | 71 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/Basic.java | 153 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/Filters.java | 241 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/SecureDS.java | 370 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/FileStore/Basic.java | 79 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/FileSystem/Basic.java | 82 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/ContentType.java | 91 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/CreateFileTree.java | 96 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/ForceLoad.java | 38 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector | 1 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/Misc.java | 126 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/PrintFileTree.java | 78 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/SimpleFileTypeDetector.java | 47 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/SkipSiblings.java | 85 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/TerminateWalk.java | 70 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/content_type.sh | 70 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/walk_file_tree.sh | 86 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/CopyAndMove.java | 983 --- overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/DeleteOnClose.java | 77 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/InterruptCopy.java | 119 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/Links.java | 143 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/Misc.java | 349 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/PathOps.java | 646 -- overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/SBC.java | 468 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/TemporaryFiles.java | 76 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/UriImportExport.java | 80 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/delete_on_close.sh | 61 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/temporary_files.sh | 65 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/PathMatcher/Basic.java | 163 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/TestUtil.java | 117 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/Basic.java | 493 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/FileTreeModifier.java | 148 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/WithSecurityManager.java | 83 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/denyAll.policy | 3 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirAndOneLevel.policy | 5 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirAndTree.policy | 5 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirOnly.policy | 4 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView/Basic.java | 166 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/Attributes/Basic.java | 254 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView/Basic.java | 150 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView/Basic.java | 155 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView/Basic.java | 170 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView/Basic.java | 273 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributeView/Basic.java | 398 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/spi/SetDefaultProvider.java | 44 - overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/spi/TestProvider.java | 128 - patches/ecj/icedtea.patch | 87 +- patches/nio2.patch | 2792 --------- patches/openjdk/6633275-shaped_translucent_windows.patch | 7 - patches/openjdk/6706974-krb5_test_infrastructure.patch | 2081 +++++++ patches/openjdk/6725214-direct3d-01.patch | 7 - patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch | 91 + patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch | 40 + patches/openjdk/683768-System-tray-icon.patch | 79 - patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch | 93 + policytool.desktop | 10 - policytool.desktop.in | 10 + src/jtreg/JavaTest.cmdMgrs.lst | 34 + src/jtreg/JavaTest.toolMgrs.lst | 30 + src/jtreg/META-INF/MANIFEST.MF | 3 + src/jtreg/README | 33 + src/jtreg/com/sun/interview/AllFilesFileFilter.java | 60 + src/jtreg/com/sun/interview/Checklist.java | 124 + src/jtreg/com/sun/interview/ChoiceArrayQuestion.java | 385 + src/jtreg/com/sun/interview/ChoiceQuestion.java | 380 + src/jtreg/com/sun/interview/CompositeQuestion.java | 63 + src/jtreg/com/sun/interview/DirectoryFileFilter.java | 61 + src/jtreg/com/sun/interview/ErrorQuestion.java | 56 + src/jtreg/com/sun/interview/ExtensionFileFilter.java | 162 + src/jtreg/com/sun/interview/FileFilter.java | 53 + src/jtreg/com/sun/interview/FileListQuestion.java | 376 + src/jtreg/com/sun/interview/FileQuestion.java | 299 + src/jtreg/com/sun/interview/FilesAndDirectoriesFileFilter.java | 61 + src/jtreg/com/sun/interview/FinalQuestion.java | 63 + src/jtreg/com/sun/interview/FloatQuestion.java | 399 + src/jtreg/com/sun/interview/InetAddressQuestion.java | 408 + src/jtreg/com/sun/interview/IntQuestion.java | 376 + src/jtreg/com/sun/interview/Interview.java | 2397 ++++++++ src/jtreg/com/sun/interview/InterviewQuestion.java | 126 + src/jtreg/com/sun/interview/InterviewSet.java | 262 + src/jtreg/com/sun/interview/ListQuestion.java | 637 ++ src/jtreg/com/sun/interview/NullQuestion.java | 174 + src/jtreg/com/sun/interview/Properties2.java | 346 + src/jtreg/com/sun/interview/PropertiesQuestion.java | 1420 ++++ src/jtreg/com/sun/interview/Question.java | 513 + src/jtreg/com/sun/interview/StringListQuestion.java | 284 + src/jtreg/com/sun/interview/StringQuestion.java | 230 + src/jtreg/com/sun/interview/TreeQuestion.java | 388 + src/jtreg/com/sun/interview/WizEdit.java | 346 + src/jtreg/com/sun/interview/WizPrint.java | 1091 +++ src/jtreg/com/sun/interview/YesNoQuestion.java | 94 + src/jtreg/com/sun/interview/i18n.properties | 86 + src/jtreg/com/sun/interview/package.html | 142 + src/jtreg/com/sun/interview/wizard/ActionDocListener.java | 59 + src/jtreg/com/sun/interview/wizard/ActionListDataListener.java | 59 + src/jtreg/com/sun/interview/wizard/ChoiceArrayQuestionRenderer.java | 214 + src/jtreg/com/sun/interview/wizard/ChoiceQuestionRenderer.java | 246 + src/jtreg/com/sun/interview/wizard/EditableList.java | 368 + src/jtreg/com/sun/interview/wizard/Exporter.java | 74 + src/jtreg/com/sun/interview/wizard/FileList.java | 134 + src/jtreg/com/sun/interview/wizard/FileListQuestionRenderer.java | 113 + src/jtreg/com/sun/interview/wizard/FileQuestionRenderer.java | 163 + src/jtreg/com/sun/interview/wizard/FloatQuestionRenderer.java | 196 + src/jtreg/com/sun/interview/wizard/I18NResourceBundle.java | 185 + src/jtreg/com/sun/interview/wizard/InetAddressQuestionRenderer.java | 392 + src/jtreg/com/sun/interview/wizard/InfoPanel.java | 89 + src/jtreg/com/sun/interview/wizard/IntQuestionRenderer.java | 165 + src/jtreg/com/sun/interview/wizard/ListQuestionRenderer.java | 244 + src/jtreg/com/sun/interview/wizard/NullQuestionRenderer.java | 43 + src/jtreg/com/sun/interview/wizard/PathPanel.java | 1192 ++++ src/jtreg/com/sun/interview/wizard/PropertiesQuestionRenderer.java | 341 + src/jtreg/com/sun/interview/wizard/QuestionPanel.java | 668 ++ src/jtreg/com/sun/interview/wizard/QuestionRenderer.java | 70 + src/jtreg/com/sun/interview/wizard/RenderingUtilities.java | 460 + src/jtreg/com/sun/interview/wizard/SearchDialog.java | 330 + src/jtreg/com/sun/interview/wizard/StringListQuestionRenderer.java | 78 + src/jtreg/com/sun/interview/wizard/StringQuestionRenderer.java | 104 + src/jtreg/com/sun/interview/wizard/SwingFileFilter.java | 61 + src/jtreg/com/sun/interview/wizard/TreeQuestionRenderer.java | 701 ++ src/jtreg/com/sun/interview/wizard/TypeInPanel.java | 159 + src/jtreg/com/sun/interview/wizard/WizPane.java | 517 + src/jtreg/com/sun/interview/wizard/Wizard.java | 1095 +++ src/jtreg/com/sun/interview/wizard/YesNoQuestionRenderer.java | 126 + src/jtreg/com/sun/interview/wizard/arrow.gif | 0 src/jtreg/com/sun/interview/wizard/back.gif | 0 src/jtreg/com/sun/interview/wizard/blank.gif | 0 src/jtreg/com/sun/interview/wizard/cancel.gif | 0 src/jtreg/com/sun/interview/wizard/check.gif | 0 src/jtreg/com/sun/interview/wizard/done.gif | 0 src/jtreg/com/sun/interview/wizard/find.gif | 0 src/jtreg/com/sun/interview/wizard/history.gif | 0 src/jtreg/com/sun/interview/wizard/i18n.properties | 294 + src/jtreg/com/sun/interview/wizard/info.gif | 0 src/jtreg/com/sun/interview/wizard/next.gif | 0 src/jtreg/com/sun/interview/wizard/package.html | 57 + src/jtreg/com/sun/javatest/AllTestsFilter.java | 52 + src/jtreg/com/sun/javatest/BasicParameters.java | 817 ++ src/jtreg/com/sun/javatest/Command.java | 72 + src/jtreg/com/sun/javatest/CompositeFilter.java | 234 + src/jtreg/com/sun/javatest/DefaultTestRunner.java | 254 + src/jtreg/com/sun/javatest/Deprecated.java | 45 + src/jtreg/com/sun/javatest/EditJTI.java | 713 ++ src/jtreg/com/sun/javatest/EditLinks.java | 564 + src/jtreg/com/sun/javatest/ExcludeList.java | 1212 ++++ src/jtreg/com/sun/javatest/ExcludeListFilter.java | 81 + src/jtreg/com/sun/javatest/ExcludeListUpdateHandler.java | 167 + src/jtreg/com/sun/javatest/FileParameters.java | 571 + src/jtreg/com/sun/javatest/Harness.java | 964 +++ src/jtreg/com/sun/javatest/HarnessHttpHandler.java | 590 + src/jtreg/com/sun/javatest/InitialUrlFilter.java | 170 + src/jtreg/com/sun/javatest/InterviewParameters.java | 1676 +++++ src/jtreg/com/sun/javatest/InterviewPropagator.java | 821 ++ src/jtreg/com/sun/javatest/JavaTestError.java | 224 + src/jtreg/com/sun/javatest/JavaTestSecurityManager.java | 204 + src/jtreg/com/sun/javatest/Keywords.java | 595 ++ src/jtreg/com/sun/javatest/KeywordsFilter.java | 80 + src/jtreg/com/sun/javatest/LastRunFilter.java | 145 + src/jtreg/com/sun/javatest/LastRunInfo.java | 176 + src/jtreg/com/sun/javatest/ObservableTestFilter.java | 82 + src/jtreg/com/sun/javatest/Parameters.java | 948 +++ src/jtreg/com/sun/javatest/ProductInfo.java | 200 + src/jtreg/com/sun/javatest/ResourceTable.java | 118 + src/jtreg/com/sun/javatest/Script.java | 1350 ++++ src/jtreg/com/sun/javatest/Status.java | 361 + src/jtreg/com/sun/javatest/StatusFilter.java | 124 + src/jtreg/com/sun/javatest/TRT_HttpHandler.java | 210 + src/jtreg/com/sun/javatest/TRT_Iterator.java | 954 +++ src/jtreg/com/sun/javatest/TRT_TreeNode.java | 1749 +++++ src/jtreg/com/sun/javatest/TemplateUtilities.java | 218 + src/jtreg/com/sun/javatest/Test.java | 64 + src/jtreg/com/sun/javatest/TestDescription.java | 576 + src/jtreg/com/sun/javatest/TestEnvContext.java | 356 + src/jtreg/com/sun/javatest/TestEnvironment.java | 692 ++ src/jtreg/com/sun/javatest/TestFilter.java | 139 + src/jtreg/com/sun/javatest/TestFinder.java | 738 ++ src/jtreg/com/sun/javatest/TestFinderQueue.java | 714 ++ src/jtreg/com/sun/javatest/TestResult.java | 2685 +++++++++ src/jtreg/com/sun/javatest/TestResultCache.java | 815 ++ src/jtreg/com/sun/javatest/TestResultTable.java | 2938 +++++++++ src/jtreg/com/sun/javatest/TestRunner.java | 227 + src/jtreg/com/sun/javatest/TestSuite.java | 1344 ++++ src/jtreg/com/sun/javatest/Trace.java | 175 + src/jtreg/com/sun/javatest/WorkDirectory.java | 942 +++ src/jtreg/com/sun/javatest/agent/ActiveAgentCommand.java | 117 + src/jtreg/com/sun/javatest/agent/ActiveAgentPool.java | 647 ++ src/jtreg/com/sun/javatest/agent/ActiveConnectionFactory.java | 88 + src/jtreg/com/sun/javatest/agent/ActiveModeOptions.java | 79 + src/jtreg/com/sun/javatest/agent/Agent.java | 1162 +++ src/jtreg/com/sun/javatest/agent/AgentApplet.java | 304 + src/jtreg/com/sun/javatest/agent/AgentClassLoader.java | 88 + src/jtreg/com/sun/javatest/agent/AgentClassLoader2.java | 63 + src/jtreg/com/sun/javatest/agent/AgentFrame.java | 337 + src/jtreg/com/sun/javatest/agent/AgentMain.java | 556 + src/jtreg/com/sun/javatest/agent/AgentManager.java | 646 ++ src/jtreg/com/sun/javatest/agent/AgentMonitorCommandManager.java | 231 + src/jtreg/com/sun/javatest/agent/AgentMonitorTool.java | 516 + src/jtreg/com/sun/javatest/agent/AgentMonitorToolManager.java | 111 + src/jtreg/com/sun/javatest/agent/AgentPanel.java | 1048 +++ src/jtreg/com/sun/javatest/agent/BadValue.java | 65 + src/jtreg/com/sun/javatest/agent/Connection.java | 83 + src/jtreg/com/sun/javatest/agent/ConnectionFactory.java | 88 + src/jtreg/com/sun/javatest/agent/Deck.java | 96 + src/jtreg/com/sun/javatest/agent/Deprecated.java | 52 + src/jtreg/com/sun/javatest/agent/Folder.java | 343 + src/jtreg/com/sun/javatest/agent/Icon.java | 114 + src/jtreg/com/sun/javatest/agent/InterruptableSocketConnection.java | 134 + src/jtreg/com/sun/javatest/agent/Map.java | 197 + src/jtreg/com/sun/javatest/agent/ModeOptions.java | 56 + src/jtreg/com/sun/javatest/agent/PassiveAgentCommand.java | 135 + src/jtreg/com/sun/javatest/agent/PassiveConnectionFactory.java | 91 + src/jtreg/com/sun/javatest/agent/PassiveModeOptions.java | 73 + src/jtreg/com/sun/javatest/agent/SocketConnection.java | 169 + src/jtreg/com/sun/javatest/agent/i18n.properties | 95 + src/jtreg/com/sun/javatest/agent/jticon.gif | 0 src/jtreg/com/sun/javatest/agent/package.html | 60 + src/jtreg/com/sun/javatest/audit/Audit.java | 739 ++ src/jtreg/com/sun/javatest/audit/AuditCommandManager.java | 140 + src/jtreg/com/sun/javatest/audit/AuditPane.java | 82 + src/jtreg/com/sun/javatest/audit/AuditTool.java | 373 + src/jtreg/com/sun/javatest/audit/AuditToolManager.java | 105 + src/jtreg/com/sun/javatest/audit/BadChecksumPane.java | 47 + src/jtreg/com/sun/javatest/audit/BadTestCaseTestsPane.java | 48 + src/jtreg/com/sun/javatest/audit/BadTestDescriptionPane.java | 47 + src/jtreg/com/sun/javatest/audit/BadTestsPane.java | 47 + src/jtreg/com/sun/javatest/audit/ListPane.java | 100 + src/jtreg/com/sun/javatest/audit/OptionsDialog.java | 371 + src/jtreg/com/sun/javatest/audit/SummaryPane.java | 287 + src/jtreg/com/sun/javatest/audit/i18n.properties | 189 + src/jtreg/com/sun/javatest/audit/images/dotdotdot.gif | 0 src/jtreg/com/sun/javatest/audit/package.html | 44 + src/jtreg/com/sun/javatest/batch/BatchManager.java | 119 + src/jtreg/com/sun/javatest/batch/ObserverCommand.java | 182 + src/jtreg/com/sun/javatest/batch/RunTestsCommand.java | 416 + src/jtreg/com/sun/javatest/batch/i18n.properties | 75 + src/jtreg/com/sun/javatest/batch/package.html | 44 + src/jtreg/com/sun/javatest/cof/COF1_0.xsd | 548 + src/jtreg/com/sun/javatest/cof/COF2_0_2.xsd | 779 ++ src/jtreg/com/sun/javatest/cof/COFApplication.java | 102 + src/jtreg/com/sun/javatest/cof/COFApplications.java | 69 + src/jtreg/com/sun/javatest/cof/COFData.java | 94 + src/jtreg/com/sun/javatest/cof/COFEnvironment.java | 584 + src/jtreg/com/sun/javatest/cof/COFEnvironments.java | 124 + src/jtreg/com/sun/javatest/cof/COFItem.java | 170 + src/jtreg/com/sun/javatest/cof/COFOS.java | 178 + src/jtreg/com/sun/javatest/cof/COFReportAnnotation.java | 160 + src/jtreg/com/sun/javatest/cof/COFReportAnnotations.java | 114 + src/jtreg/com/sun/javatest/cof/COFSWEntities.java | 114 + src/jtreg/com/sun/javatest/cof/COFSWEntity.java | 248 + src/jtreg/com/sun/javatest/cof/COFStatus.java | 193 + src/jtreg/com/sun/javatest/cof/COFTest.java | 594 + src/jtreg/com/sun/javatest/cof/COFTestAttribute.java | 181 + src/jtreg/com/sun/javatest/cof/COFTestAttributes.java | 116 + src/jtreg/com/sun/javatest/cof/COFTestCase.java | 346 + src/jtreg/com/sun/javatest/cof/COFTestCases.java | 133 + src/jtreg/com/sun/javatest/cof/COFTestSuite.java | 143 + src/jtreg/com/sun/javatest/cof/COFTestSuites.java | 126 + src/jtreg/com/sun/javatest/cof/ID.java | 56 + src/jtreg/com/sun/javatest/cof/Main.java | 377 + src/jtreg/com/sun/javatest/cof/Report.java | 424 + src/jtreg/com/sun/javatest/cof/i18n.properties | 54 + src/jtreg/com/sun/javatest/diff/Diff.java | 161 + src/jtreg/com/sun/javatest/diff/DiffReader.java | 40 + src/jtreg/com/sun/javatest/diff/Fault.java | 40 + src/jtreg/com/sun/javatest/diff/HTMLReporter.java | 351 + src/jtreg/com/sun/javatest/diff/HTMLWriter.java | 558 + src/jtreg/com/sun/javatest/diff/Help.java | 445 + src/jtreg/com/sun/javatest/diff/Main.java | 219 + src/jtreg/com/sun/javatest/diff/MultiMap.java | 173 + src/jtreg/com/sun/javatest/diff/ReportReader.java | 126 + src/jtreg/com/sun/javatest/diff/Reporter.java | 76 + src/jtreg/com/sun/javatest/diff/SimpleReporter.java | 163 + src/jtreg/com/sun/javatest/diff/StandardDiff.java | 42 + src/jtreg/com/sun/javatest/diff/StatusComparator.java | 79 + src/jtreg/com/sun/javatest/diff/SuperDiff.java | 342 + src/jtreg/com/sun/javatest/diff/WorkDirectoryReader.java | 113 + src/jtreg/com/sun/javatest/diff/i18n.properties | 153 + src/jtreg/com/sun/javatest/exec/AbstractCellEditor.java | 87 + src/jtreg/com/sun/javatest/exec/AccessWrapper.java | 73 + src/jtreg/com/sun/javatest/exec/BP_BranchSubpanel.java | 96 + src/jtreg/com/sun/javatest/exec/BP_DocumentationSubpanel.java | 107 + src/jtreg/com/sun/javatest/exec/BP_FilteredOutSubpanel.java | 926 +++ src/jtreg/com/sun/javatest/exec/BP_Model.java | 78 + src/jtreg/com/sun/javatest/exec/BP_SummarySubpanel.java | 980 +++ src/jtreg/com/sun/javatest/exec/BP_TestListSubpanel.java | 1353 ++++ src/jtreg/com/sun/javatest/exec/BasicCustomTestFilter.java | 1077 +++ src/jtreg/com/sun/javatest/exec/BranchPanel.java | 579 + src/jtreg/com/sun/javatest/exec/CE_EnvironmentPane.java | 276 + src/jtreg/com/sun/javatest/exec/CE_ExcludeListPane.java | 612 ++ src/jtreg/com/sun/javatest/exec/CE_ExecutionPane.java | 253 + src/jtreg/com/sun/javatest/exec/CE_FullView.java | 265 + src/jtreg/com/sun/javatest/exec/CE_KeywordsPane.java | 527 + src/jtreg/com/sun/javatest/exec/CE_PriorStatusPane.java | 203 + src/jtreg/com/sun/javatest/exec/CE_StdPane.java | 82 + src/jtreg/com/sun/javatest/exec/CE_StdView.java | 274 + src/jtreg/com/sun/javatest/exec/CE_TemplateDialog.java | 320 + src/jtreg/com/sun/javatest/exec/CE_TestsPane.java | 255 + src/jtreg/com/sun/javatest/exec/CE_View.java | 72 + src/jtreg/com/sun/javatest/exec/ChecklistBrowser.java | 296 + src/jtreg/com/sun/javatest/exec/ConfigEditor.java | 1401 ++++ src/jtreg/com/sun/javatest/exec/ConfigHandler.java | 1198 ++++ src/jtreg/com/sun/javatest/exec/ConfigurableTestFilter.java | 209 + src/jtreg/com/sun/javatest/exec/ContextManager.java | 583 + src/jtreg/com/sun/javatest/exec/CustomTestResultViewer.java | 104 + src/jtreg/com/sun/javatest/exec/DetailsBrowser.java | 154 + src/jtreg/com/sun/javatest/exec/ET_FilterHandler.java | 591 + src/jtreg/com/sun/javatest/exec/ElapsedTimeMonitor.java | 221 + src/jtreg/com/sun/javatest/exec/EnvironmentBrowser.java | 351 + src/jtreg/com/sun/javatest/exec/ExcludeListBrowser.java | 371 + src/jtreg/com/sun/javatest/exec/ExecModel.java | 93 + src/jtreg/com/sun/javatest/exec/ExecTool.java | 1471 ++++ src/jtreg/com/sun/javatest/exec/ExecToolManager.java | 815 ++ src/jtreg/com/sun/javatest/exec/FeatureManager.java | 89 + src/jtreg/com/sun/javatest/exec/FileSystemTableModel.java | 245 + src/jtreg/com/sun/javatest/exec/FileTable.java | 99 + src/jtreg/com/sun/javatest/exec/FileType.java | 85 + src/jtreg/com/sun/javatest/exec/FilesPane.java | 134 + src/jtreg/com/sun/javatest/exec/FilterConfig.java | 858 ++ src/jtreg/com/sun/javatest/exec/FilterSelectionHandler.java | 425 + src/jtreg/com/sun/javatest/exec/JavaTestContextMenu.java | 134 + src/jtreg/com/sun/javatest/exec/JavaTestMenuManager.java | 133 + src/jtreg/com/sun/javatest/exec/JavaTestToolBar.java | 236 + src/jtreg/com/sun/javatest/exec/LogViewer.java | 1349 ++++ src/jtreg/com/sun/javatest/exec/LogViewerTools.java | 191 + src/jtreg/com/sun/javatest/exec/MessageStrip.java | 383 + src/jtreg/com/sun/javatest/exec/Monitor.java | 60 + src/jtreg/com/sun/javatest/exec/MonitorState.java | 334 + src/jtreg/com/sun/javatest/exec/MultiFormatPane.java | 971 +++ src/jtreg/com/sun/javatest/exec/MultiSelectPanel.java | 177 + src/jtreg/com/sun/javatest/exec/NavigationPane.java | 365 + src/jtreg/com/sun/javatest/exec/NewReportDialog.java | 1428 ++++ src/jtreg/com/sun/javatest/exec/ParameterFilter.java | 238 + src/jtreg/com/sun/javatest/exec/PrefsPane.java | 195 + src/jtreg/com/sun/javatest/exec/ProgressMeter.java | 343 + src/jtreg/com/sun/javatest/exec/ProgressMonitor.java | 632 ++ src/jtreg/com/sun/javatest/exec/PropertiesBrowser.java | 310 + src/jtreg/com/sun/javatest/exec/QuestionLogBrowser.java | 280 + src/jtreg/com/sun/javatest/exec/QuickStartWizard.java | 1263 ++++ src/jtreg/com/sun/javatest/exec/RenderingUtilities.java | 185 + src/jtreg/com/sun/javatest/exec/ReportBrowser.java | 164 + src/jtreg/com/sun/javatest/exec/ReportHandler.java | 311 + src/jtreg/com/sun/javatest/exec/RunProgressMonitor.java | 160 + src/jtreg/com/sun/javatest/exec/RunTestsHandler.java | 527 + src/jtreg/com/sun/javatest/exec/TP_CustomSubpanel.java | 53 + src/jtreg/com/sun/javatest/exec/TP_DescSubpanel.java | 62 + src/jtreg/com/sun/javatest/exec/TP_DocumentationSubpanel.java | 86 + src/jtreg/com/sun/javatest/exec/TP_EnvSubpanel.java | 124 + src/jtreg/com/sun/javatest/exec/TP_FilesSubpanel.java | 84 + src/jtreg/com/sun/javatest/exec/TP_OutputSubpanel.java | 806 ++ src/jtreg/com/sun/javatest/exec/TP_PropertySubpanel.java | 415 + src/jtreg/com/sun/javatest/exec/TP_ResultsSubpanel.java | 138 + src/jtreg/com/sun/javatest/exec/TP_Subpanel.java | 78 + src/jtreg/com/sun/javatest/exec/TT_NodeCache.java | 871 ++ src/jtreg/com/sun/javatest/exec/TT_Renderer.java | 329 + src/jtreg/com/sun/javatest/exec/TU_ViewManager.java | 395 + src/jtreg/com/sun/javatest/exec/TemplateParameterFilter.java | 119 + src/jtreg/com/sun/javatest/exec/TestPanel.java | 423 + src/jtreg/com/sun/javatest/exec/TestSuiteErrorsDialog.java | 124 + src/jtreg/com/sun/javatest/exec/TestTree.java | 252 + src/jtreg/com/sun/javatest/exec/TestTreeModel.java | 1243 ++++ src/jtreg/com/sun/javatest/exec/TestTreePanel.java | 1832 ++++++ src/jtreg/com/sun/javatest/exec/ToolBarManager.java | 259 + src/jtreg/com/sun/javatest/exec/ToolBarPanel.java | 162 + src/jtreg/com/sun/javatest/exec/TreePanelModel.java | 97 + src/jtreg/com/sun/javatest/exec/WorkDirChooseTool.java | 1088 +++ src/jtreg/com/sun/javatest/exec/i18n.properties | 1837 ++++++ src/jtreg/com/sun/javatest/exec/images/Back16.gif | 0 src/jtreg/com/sun/javatest/exec/images/Back24.gif | 0 src/jtreg/com/sun/javatest/exec/images/Dir.gif | 0 src/jtreg/com/sun/javatest/exec/images/Down16.gif | 0 src/jtreg/com/sun/javatest/exec/images/Down24.gif | 0 src/jtreg/com/sun/javatest/exec/images/Edit16.gif | 0 src/jtreg/com/sun/javatest/exec/images/Edit24.gif | 0 src/jtreg/com/sun/javatest/exec/images/FastForward16.gif | 0 src/jtreg/com/sun/javatest/exec/images/Find16.gif | 0 src/jtreg/com/sun/javatest/exec/images/Find24.gif | 0 src/jtreg/com/sun/javatest/exec/images/FindAgain16.gif | 0 src/jtreg/com/sun/javatest/exec/images/FindAgain24.gif | 0 src/jtreg/com/sun/javatest/exec/images/Forward16.gif | 0 src/jtreg/com/sun/javatest/exec/images/Forward24.gif | 0 src/jtreg/com/sun/javatest/exec/images/Help16.gif | 0 src/jtreg/com/sun/javatest/exec/images/Help24.gif | 0 src/jtreg/com/sun/javatest/exec/images/Home16.gif | 0 src/jtreg/com/sun/javatest/exec/images/Home24.gif | 0 src/jtreg/com/sun/javatest/exec/images/Last16.gif | 0 src/jtreg/com/sun/javatest/exec/images/Pause16.gif | 0 src/jtreg/com/sun/javatest/exec/images/Pause24.gif | 0 src/jtreg/com/sun/javatest/exec/images/Play16.gif | 0 src/jtreg/com/sun/javatest/exec/images/Play24.gif | 0 src/jtreg/com/sun/javatest/exec/images/Preferences16.gif | 0 src/jtreg/com/sun/javatest/exec/images/Preferences24.gif | 0 src/jtreg/com/sun/javatest/exec/images/Print16.gif | 0 src/jtreg/com/sun/javatest/exec/images/Print24.gif | 0 src/jtreg/com/sun/javatest/exec/images/Save16.gif | 0 src/jtreg/com/sun/javatest/exec/images/Save24.gif | 0 src/jtreg/com/sun/javatest/exec/images/SaveAs16.gif | 0 src/jtreg/com/sun/javatest/exec/images/SaveAs24.gif | 0 src/jtreg/com/sun/javatest/exec/images/Stop16.gif | 0 src/jtreg/com/sun/javatest/exec/images/Stop24.gif | 0 src/jtreg/com/sun/javatest/exec/images/Up16.gif | 0 src/jtreg/com/sun/javatest/exec/images/Up24.gif | 0 src/jtreg/com/sun/javatest/exec/images/UpDir.gif | 0 src/jtreg/com/sun/javatest/exec/images/drop-down.gif | 0 src/jtreg/com/sun/javatest/exec/images/fullView.gif | 0 src/jtreg/com/sun/javatest/exec/images/magnify.gif | 0 src/jtreg/com/sun/javatest/exec/images/question.gif | 0 src/jtreg/com/sun/javatest/exec/images/snooze.sm.gif | 0 src/jtreg/com/sun/javatest/exec/images/stdView.gif | 0 src/jtreg/com/sun/javatest/exec/images/stream.gif | 0 src/jtreg/com/sun/javatest/exec/package.html | 43 + src/jtreg/com/sun/javatest/finder/BinaryTestFinder.java | 547 + src/jtreg/com/sun/javatest/finder/BinaryTestWriter.java | 860 ++ src/jtreg/com/sun/javatest/finder/ChameleonTestFinder.java | 450 + src/jtreg/com/sun/javatest/finder/CommentStream.java | 85 + src/jtreg/com/sun/javatest/finder/ExpandTestFinder.java | 348 + src/jtreg/com/sun/javatest/finder/HTMLCommentStream.java | 84 + src/jtreg/com/sun/javatest/finder/HTMLTestFinder.java | 627 ++ src/jtreg/com/sun/javatest/finder/JavaCommentStream.java | 161 + src/jtreg/com/sun/javatest/finder/ReverseTestFinder.java | 121 + src/jtreg/com/sun/javatest/finder/ShScriptCommentStream.java | 83 + src/jtreg/com/sun/javatest/finder/ShowTests.java | 291 + src/jtreg/com/sun/javatest/finder/TagTestFinder.java | 388 + src/jtreg/com/sun/javatest/finder/i18n.properties | 69 + src/jtreg/com/sun/javatest/finder/package.html | 45 + src/jtreg/com/sun/javatest/httpd/HttpdServer.java | 194 + src/jtreg/com/sun/javatest/httpd/JThttpProvider.java | 148 + src/jtreg/com/sun/javatest/httpd/PageGenerator.java | 252 + src/jtreg/com/sun/javatest/httpd/ProviderRegistry.java | 494 + src/jtreg/com/sun/javatest/httpd/RequestHandler.java | 178 + src/jtreg/com/sun/javatest/httpd/RootRegistry.java | 136 + src/jtreg/com/sun/javatest/httpd/httpURL.java | 318 + src/jtreg/com/sun/javatest/httpd/i18n.properties | 45 + src/jtreg/com/sun/javatest/i18n.properties | 460 + src/jtreg/com/sun/javatest/interview/BasicInterviewParameters.java | 433 + src/jtreg/com/sun/javatest/interview/ConcurrencyInterview.java | 104 + src/jtreg/com/sun/javatest/interview/DefaultInterviewParameters.java | 63 + src/jtreg/com/sun/javatest/interview/EnvironmentInterview.java | 385 + src/jtreg/com/sun/javatest/interview/ExcludeListInterview.java | 605 ++ src/jtreg/com/sun/javatest/interview/KeywordsInterview.java | 304 + src/jtreg/com/sun/javatest/interview/LegacyParameters.java | 88 + src/jtreg/com/sun/javatest/interview/PriorStatusInterview.java | 225 + src/jtreg/com/sun/javatest/interview/SimpleInterviewParameters.java | 270 + src/jtreg/com/sun/javatest/interview/TestsInterview.java | 434 + src/jtreg/com/sun/javatest/interview/TimeoutFactorInterview.java | 106 + src/jtreg/com/sun/javatest/interview/i18n.properties | 176 + src/jtreg/com/sun/javatest/interview/package.html | 46 + src/jtreg/com/sun/javatest/lib/APIScript.java | 114 + src/jtreg/com/sun/javatest/lib/Deprecated.java | 52 + src/jtreg/com/sun/javatest/lib/ExecStdTestOtherJVMCmd.java | 77 + src/jtreg/com/sun/javatest/lib/ExecStdTestSameJVMCmd.java | 155 + src/jtreg/com/sun/javatest/lib/JavaCompileCommand.java | 317 + src/jtreg/com/sun/javatest/lib/KeywordScript.java | 235 + src/jtreg/com/sun/javatest/lib/MultiStatus.java | 246 + src/jtreg/com/sun/javatest/lib/MultiTest.java | 314 + src/jtreg/com/sun/javatest/lib/ProcessCommand.java | 462 + src/jtreg/com/sun/javatest/lib/ReportScript.java | 59 + src/jtreg/com/sun/javatest/lib/StdTestScript.java | 223 + src/jtreg/com/sun/javatest/lib/TestCases.java | 275 + src/jtreg/com/sun/javatest/logging/ErrorDialogHandler.java | 217 + src/jtreg/com/sun/javatest/logging/FileEvent.java | 51 + src/jtreg/com/sun/javatest/logging/FileListener.java | 34 + src/jtreg/com/sun/javatest/logging/FilteredLogModel.java | 392 + src/jtreg/com/sun/javatest/logging/JTFormatter.java | 104 + src/jtreg/com/sun/javatest/logging/LogModel.java | 502 + src/jtreg/com/sun/javatest/logging/LoggerFactory.java | 58 + src/jtreg/com/sun/javatest/logging/ObservedFile.java | 194 + src/jtreg/com/sun/javatest/logging/WorkDirLogHandler.java | 148 + src/jtreg/com/sun/javatest/logging/i18n.properties | 51 + src/jtreg/com/sun/javatest/mrep/BrowserPane.java | 585 + src/jtreg/com/sun/javatest/mrep/ConflictResolutionDialog.java | 263 + src/jtreg/com/sun/javatest/mrep/ConflictResolver.java | 38 + src/jtreg/com/sun/javatest/mrep/FilesPane.java | 472 + src/jtreg/com/sun/javatest/mrep/Merger.java | 127 + src/jtreg/com/sun/javatest/mrep/OptionsDialog.java | 204 + src/jtreg/com/sun/javatest/mrep/OptionsPane.java | 504 + src/jtreg/com/sun/javatest/mrep/ReportDirChooser.java | 298 + src/jtreg/com/sun/javatest/mrep/ReportTool.java | 697 ++ src/jtreg/com/sun/javatest/mrep/ReportToolManager.java | 91 + src/jtreg/com/sun/javatest/mrep/Scheme.java | 100 + src/jtreg/com/sun/javatest/mrep/TestResultDescr.java | 78 + src/jtreg/com/sun/javatest/mrep/XMLReportReader.java | 95 + src/jtreg/com/sun/javatest/mrep/XMLReportWriter.java | 279 + src/jtreg/com/sun/javatest/mrep/i18n.properties | 200 + src/jtreg/com/sun/javatest/mrep/images/Back16.gif | 0 src/jtreg/com/sun/javatest/mrep/images/Forward16.gif | 0 src/jtreg/com/sun/javatest/mrep/images/Home16.gif | 0 src/jtreg/com/sun/javatest/mrep/images/dotdotdot.gif | 0 src/jtreg/com/sun/javatest/package.html | 61 + src/jtreg/com/sun/javatest/regtest/Action.java | 550 + src/jtreg/com/sun/javatest/regtest/AntOptionDecoder.java | 93 + src/jtreg/com/sun/javatest/regtest/AppletAction.java | 631 ++ src/jtreg/com/sun/javatest/regtest/AppletWrapper.java | 650 ++ src/jtreg/com/sun/javatest/regtest/BadArgs.java | 38 + src/jtreg/com/sun/javatest/regtest/BuildAction.java | 226 + src/jtreg/com/sun/javatest/regtest/CheckFiles.java | 150 + src/jtreg/com/sun/javatest/regtest/CleanAction.java | 146 + src/jtreg/com/sun/javatest/regtest/CompileAction.java | 701 ++ src/jtreg/com/sun/javatest/regtest/GetSystemProperty.java | 40 + src/jtreg/com/sun/javatest/regtest/Help.java | 490 + src/jtreg/com/sun/javatest/regtest/IgnoreAction.java | 111 + src/jtreg/com/sun/javatest/regtest/IgnoreKind.java | 35 + src/jtreg/com/sun/javatest/regtest/JDK.java | 88 + src/jtreg/com/sun/javatest/regtest/Main.java | 1842 ++++++ src/jtreg/com/sun/javatest/regtest/MainAction.java | 730 ++ src/jtreg/com/sun/javatest/regtest/MainWrapper.java | 186 + src/jtreg/com/sun/javatest/regtest/Option.java | 97 + src/jtreg/com/sun/javatest/regtest/OptionDecoder.java | 184 + src/jtreg/com/sun/javatest/regtest/ParseException.java | 51 + src/jtreg/com/sun/javatest/regtest/Path.java | 164 + src/jtreg/com/sun/javatest/regtest/RegressionEnvironment.java | 49 + src/jtreg/com/sun/javatest/regtest/RegressionObserver.java | 327 + src/jtreg/com/sun/javatest/regtest/RegressionParameters.java | 619 ++ src/jtreg/com/sun/javatest/regtest/RegressionScript.java | 964 +++ src/jtreg/com/sun/javatest/regtest/RegressionSecurityManager.java | 149 + src/jtreg/com/sun/javatest/regtest/RegressionTestFinder.java | 569 + src/jtreg/com/sun/javatest/regtest/RegressionTestSuite.java | 180 + src/jtreg/com/sun/javatest/regtest/ShellAction.java | 282 + src/jtreg/com/sun/javatest/regtest/StringArray.java | 182 + src/jtreg/com/sun/javatest/regtest/StringUtils.java | 45 + src/jtreg/com/sun/javatest/regtest/TestRunException.java | 52 + src/jtreg/com/sun/javatest/regtest/Verbose.java | 130 + src/jtreg/com/sun/javatest/regtest/i18n.properties | 327 + src/jtreg/com/sun/javatest/report/ConfigSection.java | 510 + src/jtreg/com/sun/javatest/report/CustomReport.java | 390 + src/jtreg/com/sun/javatest/report/HTMLReport.java | 292 + src/jtreg/com/sun/javatest/report/HTMLSection.java | 92 + src/jtreg/com/sun/javatest/report/PlainTextReport.java | 112 + src/jtreg/com/sun/javatest/report/Report.java | 1096 +++ src/jtreg/com/sun/javatest/report/ReportDirChooser.java | 289 + src/jtreg/com/sun/javatest/report/ReportFormat.java | 45 + src/jtreg/com/sun/javatest/report/ReportManager.java | 265 + src/jtreg/com/sun/javatest/report/ReportModel.java | 34 + src/jtreg/com/sun/javatest/report/ReportWriter.java | 191 + src/jtreg/com/sun/javatest/report/ResultSection.java | 263 + src/jtreg/com/sun/javatest/report/StatisticsSection.java | 228 + src/jtreg/com/sun/javatest/report/StringArrayComparator.java | 55 + src/jtreg/com/sun/javatest/report/TestResultsByFileComparator.java | 73 + src/jtreg/com/sun/javatest/report/TestResultsByStatusAndTitleComparator.java | 58 + src/jtreg/com/sun/javatest/report/TestResultsByTitleComparator.java | 53 + src/jtreg/com/sun/javatest/report/XMLReport.java | 471 + src/jtreg/com/sun/javatest/report/XMLReportMaker.java | 609 ++ src/jtreg/com/sun/javatest/report/i18n.properties | 135 + src/jtreg/com/sun/javatest/report/package.html | 39 + src/jtreg/com/sun/javatest/stylesheet.css | 33 + src/jtreg/com/sun/javatest/tool/Command.java | 280 + src/jtreg/com/sun/javatest/tool/CommandContext.java | 1028 +++ src/jtreg/com/sun/javatest/tool/CommandManager.java | 107 + src/jtreg/com/sun/javatest/tool/CommandParser.java | 343 + src/jtreg/com/sun/javatest/tool/ConfigManager.java | 1435 ++++ src/jtreg/com/sun/javatest/tool/CustomPropagationController.java | 113 + src/jtreg/com/sun/javatest/tool/Deck.java | 127 + src/jtreg/com/sun/javatest/tool/DeskView.java | 833 ++ src/jtreg/com/sun/javatest/tool/Desktop.java | 1507 +++++ src/jtreg/com/sun/javatest/tool/DesktopManager.java | 88 + src/jtreg/com/sun/javatest/tool/DesktopPrefsPane.java | 404 + src/jtreg/com/sun/javatest/tool/EditableFileList.java | 146 + src/jtreg/com/sun/javatest/tool/EditableList.java | 466 + src/jtreg/com/sun/javatest/tool/EnvironmentManager.java | 145 + src/jtreg/com/sun/javatest/tool/FileChooser.java | 129 + src/jtreg/com/sun/javatest/tool/FileHistory.java | 398 + src/jtreg/com/sun/javatest/tool/FileOpener.java | 90 + src/jtreg/com/sun/javatest/tool/FocusMonitor.java | 711 ++ src/jtreg/com/sun/javatest/tool/HelpLink.java | 195 + src/jtreg/com/sun/javatest/tool/HelpLinkBeanInfo.java | 59 + src/jtreg/com/sun/javatest/tool/HelpManager.java | 278 + src/jtreg/com/sun/javatest/tool/HelpMenu.java | 306 + src/jtreg/com/sun/javatest/tool/HttpManager.java | 99 + src/jtreg/com/sun/javatest/tool/I18NUtils.java | 265 + src/jtreg/com/sun/javatest/tool/IconFactory.java | 770 ++ src/jtreg/com/sun/javatest/tool/IconLabel.java | 131 + src/jtreg/com/sun/javatest/tool/IconLabelBeanInfo.java | 57 + src/jtreg/com/sun/javatest/tool/LogManager.java | 112 + src/jtreg/com/sun/javatest/tool/MDIDeskView.java | 587 + src/jtreg/com/sun/javatest/tool/Main.java | 506 + src/jtreg/com/sun/javatest/tool/ManagerLoader.java | 148 + src/jtreg/com/sun/javatest/tool/PieChart.java | 231 + src/jtreg/com/sun/javatest/tool/Preferences.java | 770 ++ src/jtreg/com/sun/javatest/tool/SDIDeskView.java | 494 + src/jtreg/com/sun/javatest/tool/SelectedWorkDirApprover.java | 298 + src/jtreg/com/sun/javatest/tool/Startup.java | 207 + src/jtreg/com/sun/javatest/tool/TabDeskView.java | 528 + src/jtreg/com/sun/javatest/tool/TestSuiteChooser.java | 261 + src/jtreg/com/sun/javatest/tool/TestTreeSelectionPane.java | 125 + src/jtreg/com/sun/javatest/tool/Tool.java | 361 + src/jtreg/com/sun/javatest/tool/ToolAction.java | 243 + src/jtreg/com/sun/javatest/tool/ToolDialog.java | 719 ++ src/jtreg/com/sun/javatest/tool/ToolManager.java | 232 + src/jtreg/com/sun/javatest/tool/TreeSelectionPane.java | 995 +++ src/jtreg/com/sun/javatest/tool/UIFactory.java | 2972 ++++++++++ src/jtreg/com/sun/javatest/tool/VerboseCommand.java | 159 + src/jtreg/com/sun/javatest/tool/WDC_FileFilter.java | 48 + src/jtreg/com/sun/javatest/tool/WDC_FileView.java | 66 + src/jtreg/com/sun/javatest/tool/WorkDirChooser.java | 352 + src/jtreg/com/sun/javatest/tool/i18n.properties | 538 + src/jtreg/com/sun/javatest/tool/images/jticon.gif | 0 src/jtreg/com/sun/javatest/tool/images/jtlogo.gif | 0 src/jtreg/com/sun/javatest/tool/images/splash.gif | 0 src/jtreg/com/sun/javatest/tool/package.html | 49 + src/jtreg/com/sun/javatest/util/BackupPolicy.java | 262 + src/jtreg/com/sun/javatest/util/BackupUtil.java | 340 + src/jtreg/com/sun/javatest/util/Debug.java | 492 + src/jtreg/com/sun/javatest/util/DirectoryClassLoader.java | 226 + src/jtreg/com/sun/javatest/util/DynamicArray.java | 273 + src/jtreg/com/sun/javatest/util/ExitCount.java | 77 + src/jtreg/com/sun/javatest/util/Fifo.java | 144 + src/jtreg/com/sun/javatest/util/FileFilter.java | 43 + src/jtreg/com/sun/javatest/util/FileInfoCache.java | 134 + src/jtreg/com/sun/javatest/util/HTMLWriter.java | 558 + src/jtreg/com/sun/javatest/util/HelpTree.java | 510 + src/jtreg/com/sun/javatest/util/I18NResourceBundle.java | 171 + src/jtreg/com/sun/javatest/util/LineParser.java | 288 + src/jtreg/com/sun/javatest/util/LogFile.java | 172 + src/jtreg/com/sun/javatest/util/MainAppletContext.java | 133 + src/jtreg/com/sun/javatest/util/MainFrame.java | 251 + src/jtreg/com/sun/javatest/util/OrderedTwoWayTable.java | 135 + src/jtreg/com/sun/javatest/util/PathClassLoader.java | 208 + src/jtreg/com/sun/javatest/util/PrefixMap.java | 169 + src/jtreg/com/sun/javatest/util/Properties.java | 395 + src/jtreg/com/sun/javatest/util/PropertyArray.java | 723 ++ src/jtreg/com/sun/javatest/util/ReadAheadIterator.java | 350 + src/jtreg/com/sun/javatest/util/SortedProperties.java | 58 + src/jtreg/com/sun/javatest/util/StringArray.java | 203 + src/jtreg/com/sun/javatest/util/SysEnv.java | 176 + src/jtreg/com/sun/javatest/util/TextStream.java | 97 + src/jtreg/com/sun/javatest/util/TextWriter.java | 281 + src/jtreg/com/sun/javatest/util/Timer.java | 219 + src/jtreg/com/sun/javatest/util/WrapWriter.java | 191 + src/jtreg/com/sun/javatest/util/WriterStream.java | 159 + src/jtreg/com/sun/javatest/util/XMLWriter.java | 358 + src/jtreg/com/sun/javatest/util/i18n.properties | 32 + src/jtreg/com/sun/javatest/util/package.html | 39 + src/jtreg/excludelist.jdk.jtx | 29 + src/jtreg/legal/copyright.txt | 22 + src/jtreg/legal/license.txt | 347 + 1525 files changed, 179608 insertions(+), 253792 deletions(-) diffs (truncated from 440664 to 500 lines): diff -r 0a0072170876 -r cab711386049 .hgtags --- a/.hgtags Mon Nov 28 20:06:41 2011 +0000 +++ b/.hgtags Thu Jan 19 12:04:08 2012 +0000 @@ -20,3 +20,4 @@ 1188b1a313b9e968d57ff44eb879d70f543b20fd icedtea6-1.8-branchpoint cb463b94b82da269ea089c481ed5e39700525a8a icedtea6-1.9-branchpoint 21f2a8d158545a161ba0d997c13bdba1e6166394 icedtea6-1.10-branchpoint +24c5bd2e7d574441813bfb8f9e4636e50c5d7c28 icedtea6-1.11-branchpoint diff -r 0a0072170876 -r cab711386049 ChangeLog --- a/ChangeLog Mon Nov 28 20:06:41 2011 +0000 +++ b/ChangeLog Thu Jan 19 12:04:08 2012 +0000 @@ -1,3 +1,1704 @@ +2012-01-18 Andrew John Hughes + + * patches/openjdk/6851973-kerberos.patch, + * patches/openjdk/7091528-javadoc_class_files.patch, + * patches/openjdk/7102369-7094468-rmiregistry.patch, + * patches/openjdk/7103725-ssl_beast_regression.patch: + Dropped; upstream. + * Makefile.am: Remove dropped patches. + * patches/ecj/icedtea.patch: Updated due to 6790292. + * patches/openjdk/6633275-shaped_translucent_windows.patch, + * patches/openjdk/6725214-direct3d-01.patch: + Remove copyright notice changes broken as a result of the annoying + 7128474 change. + +2012-01-18 Xerxes R??nby + + * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (putstatic_volatile_dw): Re-order register operands to silence + warning. + +2012-01-17 Andrew Haley + + * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (vm_fatal_error): Add an extra entry point at vm_fatal_error + + CODE_ALIGN_SIZE to allow vm_fatal_error to be used as an entry + point in asm_method_table. + + (putstatic_volatile_dw): Re-order register operands to silence warning. + +2012-01-16 Andrew Haley + + * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (asm_method_table): + Add entry for java.dyn.MethodHandles::invoke. + (asm_generate_method_entry): Replace constant 14 with calculation + based on the size of asm_method_table. + Add some comments. + +2012-01-16 Andrew Haley + + * Makefile.am (check-jdk): Restore the --samevm line that was + deleted by mistake in an earlier merge. + +2012-01-13 Andrew Haley + + * arm_port/hotspot/tools/mkbc.c (writeouttable): Add numbering + comments to bytecode output. + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Return): + Move safepoint before monitor is unlocked. + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (safe_dispatch_table): Add comment. + Correct order of do_return_register_finalizer. + Add numbering comments. + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (TRACE): + New macro. + +2012-01-17 Pavel Tisnovsky + + * Makefile.am: Add new patch. + * NEWS: Mention backport. + * patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch: + Backport of 6761072: new krb5 tests fail on multiple platforms + +2012-01-12 Danesh Dadachanji + + * Makefile.am: + (ICEDTEA_PATCHES): Replace patches/openjdk/683768-System-tray-icon.patch with + patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch + * NEWS: Moved RH683768 from Bug fixes to 1.11 Backports, added S7103610 to it. + * patches/openjdk/683768-System-tray-icon.patch: Removed. + * patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch: + New file. Sets XAtoms _NET_WM_PID and WM_CLIENT_MACHINE for X windows. + +2012-01-12 Andrew John Hughes + + * NEWS: Add 1.10.5, 1.9.12 and 1.8.12 + release notes. Remove duplicates from 1.11. + +2012-01-12 Pavel Tisnovsky + + * Makefile.am: Add new patch. + * NEWS: Mention backport. + * patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch: + Backport of 6764553: + com.sun.org.apache.xml.internal.security.utils.IdResolver is not + thread safe. + +2012-01-10 Andrew John Hughes + + * Makefile.am: Add new patch. + * NEWS: Mention backport. + * patches/openjdk/6706974-krb5_test_infrastructure.patch: + Add Kerberos 5 test infrastructure so the test in + the 6851973 backport works. + +2012-01-09 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_disass): + Flush the output streams. + (Thumb2_Safepoint): Add the bci as a new argument. Pass it to + the safepoint handler. + (Thumb2_Branch): Pass the bci to Thumb2_Safepoint(). + (Thumb2_Goto): Likewise. + (Thumb2_Return): Add the bci as a new argument. Pass it to + Thumb2_Safepoint(). + Add braces for clarity. + move call to Thumb2_Safepoint() to point before retval is popped. + (Thumb2_codegen): Pass the bci to Thumb2_Return(). + (Thumb2_Initialize): Disassemble the codebuf we just created. + + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (method_entry_freq_count_overflow): Make sure self_link is set + when re-entering JIT-compiled code. + +2012-01-06 Omair Majid + + * NEWS: Add 1.12 section + * configure.ac: Bump to 1.12pre. + +2012-01-06 Jiri Vanek + + fixes rhbz#580478 + * configure.ac: abs-install-dir block moved outside conditional ENABLE_SYSTEMTAP block + Added policytool.desktop and jconsole.desktop as AC_CONFIG_FILES + * jconsole.desktop: removed, replaced by jconsole.desktop.in + * jconsole.desktop.in: new file, stub for desktop file, have variable + to be substitued during configure + * policytool.desktop: removed, replaced by policytool.desktop.in + * policytool.desktop.in: new file, stub for desktop file, have variable + to be substituted during configure + +2012-01-06 Andrew John Hughes + + * NEWS: Cleanup ARM entry, separating + details into their own section. + +2012-01-06 Andrew Haley + + * NEWS: ARM assembly language port. + +2012-01-06 Andrew John Hughes + + Remove outdated NIO2 backport. + * overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile, + * overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile, + * overlays/nio2/openjdk/jdk/make/mksample/nio/aio/Makefile, + * overlays/nio2/openjdk/jdk/make/mksample/nio/file/Makefile, + * overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedCopyOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedOpenOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/File.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/FilePermission.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/Inputs.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/Outputs.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/ProtocolFamily.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/SocketOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardProtocolFamily.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardSocketOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousByteChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/Channels.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/CompletionHandler.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/DatagramChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileLock.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/MembershipKey.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/MulticastChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/NetworkChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/SeekableByteChannel.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/exceptions, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/package-info.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/SelectorProvider.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/package.html, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AccessDeniedException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AccessMode.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AtomicMoveNotSupportedException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedDirectoryStreamException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedFileSystemException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedWatchServiceException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/CopyOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryNotEmptyException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryStream.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryStreamFilters.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileAction.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileAlreadyExistsException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileRef.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileStore.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystem.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemAlreadyExistsException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemNotFoundException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystems.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileTreeWalker.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitResult.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitor.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Files.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/InvalidPathException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/LinkOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/LinkPermission.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NoSuchFileException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NotDirectoryException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NotLinkException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/OpenOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Path.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/PathMatcher.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Paths.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ProviderMismatchException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ProviderNotFoundException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ReadOnlyFileSystemException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/SecureDirectoryStream.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/SimpleFileVisitor.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardCopyOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardOpenOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardWatchEventKind.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchEvent.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchKey.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchService.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Watchable.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntry.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryFlag.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryPermission.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryType.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/Attributes.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileAttribute.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileOwnerAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreSpaceAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreSpaceAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/GroupPrincipal.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFilePermission.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFilePermissions.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipal.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipalLookupService.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipalNotFoundException.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/package-info.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/package-info.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/AbstractPath.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/FileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/FileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/package-info.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/util/Scanner.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/util/concurrent/ScheduledThreadPoolExecutor.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaIODeleteOnExitAccess.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaNetGetIndexAccess.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaUtilConcurrentThreadPoolExecutorAccess.java, + * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/SharedSecrets.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AbstractFuture.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Cancellable.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/CompletedFuture.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ExtendedSocketOption.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/FileLockTable.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Groupable.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Invoker.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipKeyImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipRegistry.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/OptionKey.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/PendingFuture.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ThreadPool.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileStoreSpaceAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractNamedAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatchKey.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatchService.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Cancellable.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Globs.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/MimeType.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffer.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffers.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java, + * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Reflect.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/META-INF/services/java.nio.file.spi.FileSystemProvider, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/README.txt, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarEntryInfo.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipEntryInfo.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributeView.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributes.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFilePath.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStore.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStream.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystem.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipHeaderConstants.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipPathParser.java, + * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipUtils.java, + * overlays/nio2/openjdk/jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/aio/EchoServer.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/AclEdit.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Chmod.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Copy.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/DiskUsage.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/FileType.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/WatchDir.java, + * overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Xdd.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/EPollPort.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/Port.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedAttributeView.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileStore.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNamedAttributeView.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisWatchService.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixChannelFactory.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixCopyFile.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixException.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileKey.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileModeAttribute.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileStoreAttributes.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystem.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixMountEntry.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUriUtils.java, + * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/EPollPort.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/SolarisEventPort.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisNativeDispatcher.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisWatchService.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixCopyFile.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genSolarisConstants.c, + * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/Iocp.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/PendingIoCache.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsChannelFactory.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsException.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributes.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileCopy.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileStore.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsLinkSupport.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNamedAttributeView.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPathParser.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPathType.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecurity.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUriSupport.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUserPrincipals.java, + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsWatchService.java, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/Iocp.c, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousFileChannelImpl.c, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.c, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/RegistryFileTypeDetector.c, + * overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c, + * overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/Sanity.java, + * overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/sanity.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/io/Inputs/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Attack.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Identity.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/PrivilegedThreadFactory.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Restart.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Unbounded.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Lock.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/MyThreadFactory.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Leaky.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/Channels/Basic2.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/CheckProvider.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/META-INF/services/java.nio.channels.spi.AsynchronousChannelProvider, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/Filters.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/SecureDS.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/FileStore/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/FileSystem/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/ContentType.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/CreateFileTree.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/ForceLoad.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/Misc.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/PrintFileTree.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/SimpleFileTypeDetector.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/SkipSiblings.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/TerminateWalk.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/content_type.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/walk_file_tree.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/CopyAndMove.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/DeleteOnClose.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/InterruptCopy.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/Links.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/Misc.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/PathOps.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/SBC.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/TemporaryFiles.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/UriImportExport.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/delete_on_close.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/temporary_files.sh, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/PathMatcher/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/TestUtil.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/FileTreeModifier.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/WithSecurityManager.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/denyAll.policy, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirAndOneLevel.policy, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirAndTree.policy, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirOnly.policy, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/Attributes/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView/Basic.java, + * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView/Basic.java, From aph at redhat.com Thu Jan 19 04:19:14 2012 From: aph at redhat.com (Andrew Haley) Date: Thu, 19 Jan 2012 12:19:14 +0000 Subject: ARM: Adjust stack pointer at return Message-ID: <4F180A42.3010700@redhat.com> I moved the safepoint code so that it executes before popping the stack at a return instruction. However, I didn't allow for the fact that this requires a stack pointer adjustment in the safepoint code. Andrew. 2012-01-19 Andrew Haley * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Safepoint): Add comment. (Thumb2_Return): Pass stackdepth to Thumb2_Safepoint. (Thumb2_codegen): Pass stackdepth to Thumb2_Return. diff -r 876219858298 -r 7783ee7c13b2 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Wed Jan 18 12:03:17 2012 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 19 07:16:03 2012 -0500 @@ -4354,6 +4354,10 @@ ldr_imm(jinfo->codebuf, r_tmp, r_tmp, 0, 0, 0); cmp_imm(jinfo->codebuf, r_tmp, SafepointSynchronize::_synchronizing); { + // FIXME: If we are at a return instruction there is no point + // saving and restoring locals: no-one cares about them any more + // and we could safely ignore them. However, this generic + // safepoint code also handles branches within a method. unsigned loc = forward_16(jinfo->codebuf); Thumb2_save_locals(jinfo, stackdepth); mov_imm(jinfo->codebuf, ARM_R1, bci+CONSTMETHOD_CODEOFFSET); @@ -4402,9 +4406,9 @@ return -1; } -void Thumb2_Return(Thumb2_Info *jinfo, unsigned opcode, int bci) -{ - Thumb2_Safepoint(jinfo, 0, bci); +void Thumb2_Return(Thumb2_Info *jinfo, unsigned opcode, int bci, int stackdepth) +{ + Thumb2_Safepoint(jinfo, stackdepth, bci); Reg r_lo, r; Thumb2_Stack *jstack = jinfo->jstack; @@ -6358,7 +6362,7 @@ case opc_ireturn: case opc_freturn: case opc_areturn: - Thumb2_Return(jinfo, opcode, bci); + Thumb2_Return(jinfo, opcode, bci, stackdepth); if (!jinfo->compiled_return) jinfo->compiled_return = bci; break; @@ -6393,7 +6397,7 @@ it(jinfo->codebuf, COND_NE, IT_MASK_T); bl(jinfo->codebuf, handlers[H_HANDLE_EXCEPTION]); bcc_patch(jinfo->codebuf, COND_EQ, loc_eq); - Thumb2_Return(jinfo, opc_return, bci); + Thumb2_Return(jinfo, opc_return, bci, stackdepth); break; } From xerxes at zafena.se Thu Jan 19 06:29:07 2012 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Thu, 19 Jan 2012 15:29:07 +0100 Subject: ARM: Adjust stack pointer at return In-Reply-To: <4F180A42.3010700@redhat.com> References: <4F180A42.3010700@redhat.com> Message-ID: <4F1828B3.1090206@zafena.se> 2012-01-19 13:19, Andrew Haley skrev: > I moved the safepoint code so that it executes before popping > the stack at a return instruction. However, I didn't allow for > the fact that this requires a stack pointer adjustment in the > safepoint code. > > Andrew. OK! This fixed the safepoint/gc unreachable, stack corruption, bug seen on the armv7 armel buildbot. # Internal Error (frame_zero.inline.hpp:64), pid=18861, tid=1677345904 # Error: ShouldNotReachHere() When re-testing with this fix applied then "make check-langtools" pass on armv7 armel Test results: passed: 1,417 I am in favour for this fix to go into icedtea6 HEAD and icedtea6-1.11 release branch. Xerxes > > > 2012-01-19 Andrew Haley > > * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp > (Thumb2_Safepoint): Add comment. > (Thumb2_Return): Pass stackdepth to Thumb2_Safepoint. > (Thumb2_codegen): Pass stackdepth to Thumb2_Return. > > diff -r 876219858298 -r 7783ee7c13b2 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp > --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Wed Jan 18 12:03:17 2012 +0000 > +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 19 07:16:03 2012 -0500 > @@ -4354,6 +4354,10 @@ > ldr_imm(jinfo->codebuf, r_tmp, r_tmp, 0, 0, 0); > cmp_imm(jinfo->codebuf, r_tmp, SafepointSynchronize::_synchronizing); > { > + // FIXME: If we are at a return instruction there is no point > + // saving and restoring locals: no-one cares about them any more > + // and we could safely ignore them. However, this generic > + // safepoint code also handles branches within a method. > unsigned loc = forward_16(jinfo->codebuf); > Thumb2_save_locals(jinfo, stackdepth); > mov_imm(jinfo->codebuf, ARM_R1, bci+CONSTMETHOD_CODEOFFSET); > @@ -4402,9 +4406,9 @@ > return -1; > } > > -void Thumb2_Return(Thumb2_Info *jinfo, unsigned opcode, int bci) > -{ > - Thumb2_Safepoint(jinfo, 0, bci); > +void Thumb2_Return(Thumb2_Info *jinfo, unsigned opcode, int bci, int stackdepth) > +{ > + Thumb2_Safepoint(jinfo, stackdepth, bci); > > Reg r_lo, r; > Thumb2_Stack *jstack = jinfo->jstack; > @@ -6358,7 +6362,7 @@ > case opc_ireturn: > case opc_freturn: > case opc_areturn: > - Thumb2_Return(jinfo, opcode, bci); > + Thumb2_Return(jinfo, opcode, bci, stackdepth); > if (!jinfo->compiled_return) jinfo->compiled_return = bci; > break; > > @@ -6393,7 +6397,7 @@ > it(jinfo->codebuf, COND_NE, IT_MASK_T); > bl(jinfo->codebuf, handlers[H_HANDLE_EXCEPTION]); > bcc_patch(jinfo->codebuf, COND_EQ, loc_eq); > - Thumb2_Return(jinfo, opc_return, bci); > + Thumb2_Return(jinfo, opc_return, bci, stackdepth); > break; > } > > From bugzilla-daemon at icedtea.classpath.org Thu Jan 19 07:16:36 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 19 Jan 2012 15:16:36 +0000 Subject: [Bug 856] New: Applet with Resource Library Fails to Load Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=856 Bug #: 856 Summary: Applet with Resource Library Fails to Load Classification: Unclassified Product: IcedTea Version: unspecified Platform: x86_64 OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: NPPlugin AssignedTo: dbhole at redhat.com ReportedBy: dale at rhinosoft.com CC: unassigned at icedtea.classpath.org --- Problem --- The problem I'm experiencing is IcedTea fails to load an applet that has multiple JAR files where other classes and resources are stored (a base class library). --- Description --- I'm using a Virtual PC image of Linux-Fedora 13 with the stock OpenJDK/IcedTea runtime to launch a simple applet within the Firefox web browser. There's multiple scenarios where the web page fails to load the applet. Note: All scenarios use the HTML "EMBED" parameter to embed the applet within the web page. Scenario 1 and 2: Launching an applet which uses classes from another JAR file (a base class library) fails to load. This fails with or without the use of a JNLP file specified within the HTML "EMBED" tag. Scenario 3 and 4: Launching an applet where the base classes are all packaged into 1 "main" JAR file. Launching the applet with the JNLP file fails; whereas launching the applet without the JNLP file successfully loads it into the web page. --- Examples and Source Code --- I've created an example web page that demonstrates this error (source code is also provided) located here: http://dale.dns4me.com:8003/Bug_Reports/7_IcedTea_Libs/index.htm -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From xerxes at zafena.se Thu Jan 19 07:44:25 2012 From: xerxes at zafena.se (=?windows-1252?Q?Xerxes_R=E5nby?=) Date: Thu, 19 Jan 2012 16:44:25 +0100 Subject: FYI: armv5 tried to use the thumb2 JIT when passed -Xcomp Message-ID: <4F183A59.6010202@zafena.se> armv5 tried to use the thumb2 JIT when passed -Xcomp This causes a lot of failures on the armv5 armel buildbot for all jtreg tests using the -Xcomp flag. this patch fix: I will push this patch to icedtea6 head and icedtea6-1.11 release branch. Reviewed by aph on IRC. (16.23.37) aph: xranby: OK, that?s obvious/trivial, good for trunk & branch 2012-01-19 Xerxes R?nby Andrew Haley * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Compile): Disable T2-JIT on unsupported targets like armv5. Index: icedtea6-1.11/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp =================================================================== --- icedtea6-1.11.orig/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp 2012-01-18 15:34:56.000000000 +0100 +++ icedtea6-1.11/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp 2012-01-19 16:05:52.000000000 +0100 @@ -7055,6 +7055,9 @@ Thumb2_Entrypoint thumb_entry; int compiled_accessor; + if (!(CPUInfo & ARCH_THUMBEE)) + UseCompiler = false; + if (!UseCompiler || method->is_not_compilable()) { ic->set(ic->state(), 1); bc->set(ic->state(), 1); From aph at icedtea.classpath.org Thu Jan 19 07:32:11 2012 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Thu, 19 Jan 2012 15:32:11 +0000 Subject: /hg/icedtea6: Pass stackdepth to Thumb2_Safepoint. Message-ID: changeset 7783ee7c13b2 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7783ee7c13b2 author: aph date: Thu Jan 19 07:16:03 2012 -0500 Pass stackdepth to Thumb2_Safepoint. 2012-01-19 Andrew Haley * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Safepoint): Add comment. (Thumb2_Return): Pass stackdepth to Thumb2_Safepoint. (Thumb2_codegen): Pass stackdepth to Thumb2_Return. diffstat: ChangeLog | 7 +++++++ arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 14 +++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diffs (59 lines): diff -r 876219858298 -r 7783ee7c13b2 ChangeLog --- a/ChangeLog Wed Jan 18 12:03:17 2012 +0000 +++ b/ChangeLog Thu Jan 19 07:16:03 2012 -0500 @@ -1,3 +1,10 @@ +2012-01-19 Andrew Haley + + * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp + (Thumb2_Safepoint): Add comment. + (Thumb2_Return): Pass stackdepth to Thumb2_Safepoint. + (Thumb2_codegen): Pass stackdepth to Thumb2_Return. + 2012-01-18 Xerxes R??nby * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S diff -r 876219858298 -r 7783ee7c13b2 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Wed Jan 18 12:03:17 2012 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 19 07:16:03 2012 -0500 @@ -4354,6 +4354,10 @@ ldr_imm(jinfo->codebuf, r_tmp, r_tmp, 0, 0, 0); cmp_imm(jinfo->codebuf, r_tmp, SafepointSynchronize::_synchronizing); { + // FIXME: If we are at a return instruction there is no point + // saving and restoring locals: no-one cares about them any more + // and we could safely ignore them. However, this generic + // safepoint code also handles branches within a method. unsigned loc = forward_16(jinfo->codebuf); Thumb2_save_locals(jinfo, stackdepth); mov_imm(jinfo->codebuf, ARM_R1, bci+CONSTMETHOD_CODEOFFSET); @@ -4402,9 +4406,9 @@ return -1; } -void Thumb2_Return(Thumb2_Info *jinfo, unsigned opcode, int bci) -{ - Thumb2_Safepoint(jinfo, 0, bci); +void Thumb2_Return(Thumb2_Info *jinfo, unsigned opcode, int bci, int stackdepth) +{ + Thumb2_Safepoint(jinfo, stackdepth, bci); Reg r_lo, r; Thumb2_Stack *jstack = jinfo->jstack; @@ -6358,7 +6362,7 @@ case opc_ireturn: case opc_freturn: case opc_areturn: - Thumb2_Return(jinfo, opcode, bci); + Thumb2_Return(jinfo, opcode, bci, stackdepth); if (!jinfo->compiled_return) jinfo->compiled_return = bci; break; @@ -6393,7 +6397,7 @@ it(jinfo->codebuf, COND_NE, IT_MASK_T); bl(jinfo->codebuf, handlers[H_HANDLE_EXCEPTION]); bcc_patch(jinfo->codebuf, COND_EQ, loc_eq); - Thumb2_Return(jinfo, opc_return, bci); + Thumb2_Return(jinfo, opc_return, bci, stackdepth); break; } From bugzilla-daemon at icedtea.classpath.org Thu Jan 19 07:59:24 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 19 Jan 2012 15:59:24 +0000 Subject: [Bug 857] New: gtk look and feel setting causes javaws to hang if accessibility used Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=857 Bug #: 857 Summary: gtk look and feel setting causes javaws to hang if accessibility used Classification: Unclassified Product: IcedTea-Web Version: unspecified Platform: unspecified OS/Version: Linux Status: NEW Severity: major Priority: P3 Component: General AssignedTo: unassigned at icedtea.classpath.org ReportedBy: webczat_200 at poczta.onet.pl CC: unassigned at icedtea.classpath.org I am a blind linux user, using java atk wrapper for java swing applications to be able to access them. I am unable to use javaws, and maybe other parts of icedtea-web, but I am not sure, because it hangs when starting up, no matter on what I'm doing with it. I discovered that when I remove accessibility.properties from the jre's lib directory, the problem is solved, but then java-atk-wrapper does not work and provide me with any accessible windows. Later, I've discovered what the issue is and how to fix it, although I do not have a patch, because I don't know the code enough: Throughout the code, icedtea has calls to setLookAndFeel, that resets the current plaf to the system's plaf, that's gtk on unix. The problem lies in placement of those calls: Java documentation says that it's recommended to use setLookAndFeel as the first thing ever done with swing, before any other swing classes could be loaded, because failure to do so can have unexpected results. Icedtea code doesn't follow this, I saw something, not sure what part of the code is it, that before setting look and feel, it creates a security manager, the line that does that has the comment saying that it's side effect is to create a JWindow. That means that the component is created before setting look and feel, that's a violation of the rule stated above. I've made a simple test case that created a frame, then set a plaf to the native one, then creates and shows another frame. When I ran it with accessibility enabled, I saw that it hangs as javaws does. For comparison, removing the frame created before setLookAndFeel made it work. I think some things need to be reordered, and plaf reset should be done as early as possible before any swing class would get loaded, that would solve all problems. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From aph at icedtea.classpath.org Thu Jan 19 07:32:35 2012 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Thu, 19 Jan 2012 15:32:35 +0000 Subject: /hg/release/icedtea6-1.11: Pass stackdepth to Thumb2_Safepoint. Message-ID: changeset 8c63d311e066 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=8c63d311e066 author: aph date: Thu Jan 19 07:16:03 2012 -0500 Pass stackdepth to Thumb2_Safepoint. 2012-01-19 Andrew Haley * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Safepoint): Add comment. (Thumb2_Return): Pass stackdepth to Thumb2_Safepoint. (Thumb2_codegen): Pass stackdepth to Thumb2_Return. diffstat: ChangeLog | 7 +++++++ arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 14 +++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diffs (59 lines): diff -r 5104f8a08015 -r 8c63d311e066 ChangeLog --- a/ChangeLog Wed Jan 18 15:38:07 2012 +0000 +++ b/ChangeLog Thu Jan 19 07:16:03 2012 -0500 @@ -1,3 +1,10 @@ +2012-01-19 Andrew Haley + + * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp + (Thumb2_Safepoint): Add comment. + (Thumb2_Return): Pass stackdepth to Thumb2_Safepoint. + (Thumb2_codegen): Pass stackdepth to Thumb2_Return. + 2012-01-18 Xerxes R??nby * openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S diff -r 5104f8a08015 -r 8c63d311e066 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Wed Jan 18 15:38:07 2012 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 19 07:16:03 2012 -0500 @@ -4354,6 +4354,10 @@ ldr_imm(jinfo->codebuf, r_tmp, r_tmp, 0, 0, 0); cmp_imm(jinfo->codebuf, r_tmp, SafepointSynchronize::_synchronizing); { + // FIXME: If we are at a return instruction there is no point + // saving and restoring locals: no-one cares about them any more + // and we could safely ignore them. However, this generic + // safepoint code also handles branches within a method. unsigned loc = forward_16(jinfo->codebuf); Thumb2_save_locals(jinfo, stackdepth); mov_imm(jinfo->codebuf, ARM_R1, bci+CONSTMETHOD_CODEOFFSET); @@ -4402,9 +4406,9 @@ return -1; } -void Thumb2_Return(Thumb2_Info *jinfo, unsigned opcode, int bci) -{ - Thumb2_Safepoint(jinfo, 0, bci); +void Thumb2_Return(Thumb2_Info *jinfo, unsigned opcode, int bci, int stackdepth) +{ + Thumb2_Safepoint(jinfo, stackdepth, bci); Reg r_lo, r; Thumb2_Stack *jstack = jinfo->jstack; @@ -6358,7 +6362,7 @@ case opc_ireturn: case opc_freturn: case opc_areturn: - Thumb2_Return(jinfo, opcode, bci); + Thumb2_Return(jinfo, opcode, bci, stackdepth); if (!jinfo->compiled_return) jinfo->compiled_return = bci; break; @@ -6393,7 +6397,7 @@ it(jinfo->codebuf, COND_NE, IT_MASK_T); bl(jinfo->codebuf, handlers[H_HANDLE_EXCEPTION]); bcc_patch(jinfo->codebuf, COND_EQ, loc_eq); - Thumb2_Return(jinfo, opc_return, bci); + Thumb2_Return(jinfo, opc_return, bci, stackdepth); break; } From xranby at icedtea.classpath.org Thu Jan 19 07:49:45 2012 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Thu, 19 Jan 2012 15:49:45 +0000 Subject: /hg/icedtea6: Disable T2-JIT on unsupported targets like armv5. Message-ID: changeset abd30eaff5fc in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=abd30eaff5fc author: Xerxes Ranby date: Thu Jan 19 17:33:20 2012 +0100 Disable T2-JIT on unsupported targets like armv5. 2012-01-19 Xerxes R?nby Andrew Haley * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Compile): Disable T2-JIT on unsupported targets like armv5. diffstat: ChangeLog | 6 ++++++ arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 3 +++ 2 files changed, 9 insertions(+), 0 deletions(-) diffs (26 lines): diff -r 7783ee7c13b2 -r abd30eaff5fc ChangeLog --- a/ChangeLog Thu Jan 19 07:16:03 2012 -0500 +++ b/ChangeLog Thu Jan 19 17:33:20 2012 +0100 @@ -1,3 +1,9 @@ +2012-01-19 Xerxes R??nby + Andrew Haley + + * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp + (Thumb2_Compile): Disable T2-JIT on unsupported targets like armv5. + 2012-01-19 Andrew Haley * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp diff -r 7783ee7c13b2 -r abd30eaff5fc arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 19 07:16:03 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 19 17:33:20 2012 +0100 @@ -7059,6 +7059,9 @@ Thumb2_Entrypoint thumb_entry; int compiled_accessor; + if (!(CPUInfo & ARCH_THUMBEE)) + UseCompiler = false; + if (!UseCompiler || method->is_not_compilable()) { ic->set(ic->state(), 1); bc->set(ic->state(), 1); From xranby at icedtea.classpath.org Thu Jan 19 07:57:30 2012 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Thu, 19 Jan 2012 15:57:30 +0000 Subject: /hg/release/icedtea6-1.11: Disable T2-JIT on unsupported targets... Message-ID: changeset aa81d0648c82 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=aa81d0648c82 author: Xerxes Ranby date: Thu Jan 19 17:41:09 2012 +0100 Disable T2-JIT on unsupported targets like armv5. 2012-01-19 Xerxes Ranby Andrew Haley * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Compile): Disable T2-JIT on unsupported targets like armv5. diffstat: ChangeLog | 6 ++++++ arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 3 +++ 2 files changed, 9 insertions(+), 0 deletions(-) diffs (26 lines): diff -r 8c63d311e066 -r aa81d0648c82 ChangeLog --- a/ChangeLog Thu Jan 19 07:16:03 2012 -0500 +++ b/ChangeLog Thu Jan 19 17:41:09 2012 +0100 @@ -1,3 +1,9 @@ +2012-01-19 Xerxes R??nby + Andrew Haley + + * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp + (Thumb2_Compile): Disable T2-JIT on unsupported targets like armv5. + 2012-01-19 Andrew Haley * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp diff -r 8c63d311e066 -r aa81d0648c82 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 19 07:16:03 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 19 17:41:09 2012 +0100 @@ -7059,6 +7059,9 @@ Thumb2_Entrypoint thumb_entry; int compiled_accessor; + if (!(CPUInfo & ARCH_THUMBEE)) + UseCompiler = false; + if (!UseCompiler || method->is_not_compilable()) { ic->set(ic->state(), 1); bc->set(ic->state(), 1); From bugzilla-daemon at icedtea.classpath.org Thu Jan 19 10:59:39 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 19 Jan 2012 18:59:39 +0000 Subject: [Bug 857] gtk look and feel setting causes javaws to hang if accessibility used In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=857 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ahughes at redhat.com Component|General |NetX AssignedTo|unassigned at icedtea.classpat |omajid at redhat.com |h.org | -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 19 22:58:14 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 20 Jan 2012 06:58:14 +0000 Subject: [Bug 857] gtk look and feel setting causes javaws to hang if accessibility used In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=857 --- Comment #1 from Micha? Zegan 2012-01-20 06:58:14 UTC --- I think it may also affect the plugin. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ptisnovs at icedtea.classpath.org Fri Jan 20 01:17:27 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 20 Jan 2012 09:17:27 +0000 Subject: /hg/gfx-test: 2012-01-20 Pavel Tisnovsky Message-ID: changeset d20f41c8e71d in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=d20f41c8e71d author: Pavel Tisnovsky date: Fri Jan 20 10:19:51 2012 +0100 2012-01-20 Pavel Tisnovsky * src/org/gfxtest/framework/CommonBitmapOperations.java: * src/org/gfxtest/testsuites/BitBltBasicTests.java: Added new tests which use new pattern types provided by class ImageFactory. diffstat: ChangeLog | 7 + src/org/gfxtest/framework/CommonBitmapOperations.java | 147 ++++++++++++++++++ src/org/gfxtest/testsuites/BitBltBasicTests.java | 80 +++++++++- 3 files changed, 232 insertions(+), 2 deletions(-) diffs (372 lines): diff -r 2ca9bcc1fb0c -r d20f41c8e71d ChangeLog --- a/ChangeLog Thu Jan 19 12:52:36 2012 +0100 +++ b/ChangeLog Fri Jan 20 10:19:51 2012 +0100 @@ -1,3 +1,10 @@ +2012-01-20 Pavel Tisnovsky + + * src/org/gfxtest/framework/CommonBitmapOperations.java: + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Added new tests which use new pattern types provided by + class ImageFactory. + 2012-01-19 Pavel Tisnovsky * src/org/gfxtest/framework/ColorPalette.java: diff -r 2ca9bcc1fb0c -r d20f41c8e71d src/org/gfxtest/framework/CommonBitmapOperations.java --- a/src/org/gfxtest/framework/CommonBitmapOperations.java Thu Jan 19 12:52:36 2012 +0100 +++ b/src/org/gfxtest/framework/CommonBitmapOperations.java Fri Jan 20 10:19:51 2012 +0100 @@ -132,6 +132,7 @@ { return TestResult.FAILED; } + // BitBlt with 1:1 scaling return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; } @@ -147,12 +148,14 @@ */ public static TestResult doBitBltTestWithCheckerImage(TestImage image, Graphics2D graphics2d, int imageType) { + // create image with given pattern BufferedImage bufferedImage = ImageFactory.createCheckerImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); // basic check if buffered image was created if (bufferedImage == null) { return TestResult.FAILED; } + // BitBlt with 1:1 scaling return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; } @@ -168,12 +171,14 @@ */ public static TestResult doBitBltTestWithCheckerImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) { + // create image with given pattern BufferedImage bufferedImage = ImageFactory.createCheckerImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); // basic check if buffered image was created if (bufferedImage == null) { return TestResult.FAILED; } + // BitBlt with custom scaling return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; } @@ -189,12 +194,14 @@ */ public static TestResult doBitBltTestWithDiagonalCheckerImage(TestImage image, Graphics2D graphics2d, int imageType) { + // create image with given pattern BufferedImage bufferedImage = ImageFactory.createDiagonalCheckerImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); // basic check if buffered image was created if (bufferedImage == null) { return TestResult.FAILED; } + // BitBlt with 1:1 scaling return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; } @@ -210,12 +217,14 @@ */ public static TestResult doBitBltTestWithDiagonalCheckerImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) { + // create image with given pattern BufferedImage bufferedImage = ImageFactory.createDiagonalCheckerImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); // basic check if buffered image was created if (bufferedImage == null) { return TestResult.FAILED; } + // BitBlt with custom scaling return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; } @@ -231,12 +240,14 @@ */ public static TestResult doBitBltTestWithGridImage(TestImage image, Graphics2D graphics2d, int imageType) { + // create image with given pattern BufferedImage bufferedImage = ImageFactory.createGridImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); // basic check if buffered image was created if (bufferedImage == null) { return TestResult.FAILED; } + // BitBlt with 1:1 scaling return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; } @@ -252,12 +263,14 @@ */ public static TestResult doBitBltTestWithGridImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) { + // create image with given pattern BufferedImage bufferedImage = ImageFactory.createGridImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); // basic check if buffered image was created if (bufferedImage == null) { return TestResult.FAILED; } + // BitBlt with custom scaling return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; } @@ -273,12 +286,14 @@ */ public static TestResult doBitBltTestWithDiagonalGridImage(TestImage image, Graphics2D graphics2d, int imageType) { + // create image with given pattern BufferedImage bufferedImage = ImageFactory.createDiagonalGridImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); // basic check if buffered image was created if (bufferedImage == null) { return TestResult.FAILED; } + // BitBlt with 1:1 scaling return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; } @@ -294,12 +309,144 @@ */ public static TestResult doBitBltTestWithDiagonalGridImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) { + // create image with given pattern BufferedImage bufferedImage = ImageFactory.createDiagonalGridImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); // basic check if buffered image was created if (bufferedImage == null) { return TestResult.FAILED; } + // BitBlt with custom scaling + return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; + } + + public static TestResult doBitBltTestWithHorizontalStripesImage(TestImage image, Graphics2D graphics2d, int imageType) + { + // create image with given pattern + BufferedImage bufferedImage = ImageFactory.createHorizontalStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling + return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + public static TestResult doBitBltTestWithHorizontalStripesImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) + { + // create image with given pattern + BufferedImage bufferedImage = ImageFactory.createHorizontalStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling + return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; + } + + public static TestResult doBitBltTestWithVerticalStripesImage(TestImage image, Graphics2D graphics2d, int imageType) + { + // create image with given pattern + BufferedImage bufferedImage = ImageFactory.createVerticalStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling + return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + public static TestResult doBitBltTestWithVerticalStripesImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) + { + // create image with given pattern + BufferedImage bufferedImage = ImageFactory.createVerticalStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling + return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; + } + + public static TestResult doBitBltTestWithDiagonalStripesImage(TestImage image, Graphics2D graphics2d, int imageType) + { + // create image with given pattern + BufferedImage bufferedImage = ImageFactory.createDiagonalStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling + return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + public static TestResult doBitBltTestWithDiagonalStripesImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) + { + // create image with given pattern + BufferedImage bufferedImage = ImageFactory.createDiagonalStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling + return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; + } + + public static TestResult doBitBltTestWithHorizontalColorStripesImage(TestImage image, Graphics2D graphics2d, int imageType) + { + // create image with given pattern + BufferedImage bufferedImage = ImageFactory.createHorizontalColorStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling + return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + public static TestResult doBitBltTestWithHorizontalColorStripesImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) + { + // create image with given pattern + BufferedImage bufferedImage = ImageFactory.createHorizontalColorStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling + return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; + } + + public static TestResult doBitBltTestWithVerticalColorStripesImage(TestImage image, Graphics2D graphics2d, int imageType) + { + // create image with given pattern + BufferedImage bufferedImage = ImageFactory.createVerticalColorStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling + return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + public static TestResult doBitBltTestWithVerticalColorStripesImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) + { + // create image with given pattern + BufferedImage bufferedImage = ImageFactory.createVerticalColorStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; } } diff -r 2ca9bcc1fb0c -r d20f41c8e71d src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Thu Jan 19 12:52:36 2012 +0100 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Fri Jan 20 10:19:51 2012 +0100 @@ -425,8 +425,9 @@ } /** - * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_BYTE_BINARY. - * + * Test basic BitBlt operation for diagonal grid buffered image with type + * TYPE_BYTE_BINARY. + * * @param image * image to which line is to be drawn * @param graphics2d @@ -439,6 +440,81 @@ } /** + * Test basic BitBlt operation for horizontal stripes buffered image with + * type TYPE_BYTE_BINARY. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltHorizontalStripesBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithHorizontalStripesImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** + * Test basic BitBlt operation for vertical stripes buffered image with type + * TYPE_BYTE_BINARY. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltVerticalStripesBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithVerticalStripesImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** + * Test basic BitBlt operation for diagonal stripes buffered image with type + * TYPE_BYTE_BINARY. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltDiagonalStripesBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalStripesImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** + * Test basic BitBlt operation for horizontal color stripes buffered image + * with type TYPE_BYTE_BINARY. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltHorizontalColorStripesBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithHorizontalColorStripesImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** + * Test basic BitBlt operation for vertical color stripes buffered image + * with type TYPE_BYTE_BINARY. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltVerticalColorStripesBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithVerticalColorStripesImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** * Entry point to the test suite. * * @param args not used in this case From dalibor.topic at oracle.com Fri Jan 20 04:48:33 2012 From: dalibor.topic at oracle.com (Dalibor Topic) Date: Fri, 20 Jan 2012 13:48:33 +0100 Subject: Fwd: OpenJDK 7u4 End game In-Reply-To: <901E624F-72D1-4CA0-A263-98A9B2A24712@oracle.com> References: <901E624F-72D1-4CA0-A263-98A9B2A24712@oracle.com> Message-ID: <4F1962A1.6020407@oracle.com> -------- Original Message -------- Subject: OpenJDK 7u4 End game Date: Thu, 19 Jan 2012 22:56:57 +0100 From: Edvard Wendelin To: jdk7u-dev at openjdk.java.net Hi, We are now at a point in the 7u4 project where we have a reasonably good understanding on what the end game will look like. I'd therefore like to outline the activities in the coming months. I would also like to remind you that these plans could and probably will change before the release is out the door. We expect that feature development will be completed by the end of January. After that the focus will turn to bug fixing. During this period of time, SQE will report bugs to development. We expect that the vast majority of bugs have been reported by early March. During the remainder of the month we will work on the bugs still targeted to the release. By the end of March there shouldn't be any bugs targeted to 7u4. We will continuously go through the open bugs and focus our efforts on the most important ones. Some bugs will end up being deferred to JDK 7u6. Sometime in February, JDK 7u4 will move to a new forest called jdk7u/jdk7u4. This is where we will stabilize the release and all subsequent builds of 7u4 will be built from this forrest. This means that jdk7u/jdk7u-dev remains open for changes. Anything integrated after we create jdk7u/jdk7u4 will be included in JDK 7u6. By the time we are through feature complete and have a better idea on the amount of bugs open against 7u4, I will update you on what the last month will look like. Cheers, Edvard -- Oracle Dalibor Topic | Java F/OSS Ambassador Phone: +494023646738 | Mobile: +491772664192 Oracle Java Platform Group ORACLE Deutschland B.V. & Co. KG | Nagelsweg 55 | 20097 Hamburg ORACLE Deutschland B.V. & Co. KG Hauptverwaltung: Riesstr. 25, D-80992 M?nchen Registergericht: Amtsgericht M?nchen, HRA 95603 Gesch?ftsf?hrer: J?rgen Kunz Komplement?rin: ORACLE Deutschland Verwaltung B.V. Hertogswetering 163/167, 3543 AS Utrecht, Niederlande Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697 Gesch?ftsf?hrer: Alexander van der Ven, Astrid Kepper, Val Maher Green Oracle Oracle is committed to developing practices and products that help protect the environment From aph at redhat.com Fri Jan 20 07:50:45 2012 From: aph at redhat.com (Andrew Haley) Date: Fri, 20 Jan 2012 15:50:45 +0000 Subject: ARM: Rewrite disassembler to use hsdis Message-ID: <4F198D55.9050202@redhat.com> This patch rewrites the ARM disassembler to use HSDIS rather than call binutils directly. This removes the build dependency on binutils-devel. We have to do this because binutils is GPLv3+ and HotSpot is GPLv2 only. I had to patch HSDIS itself to make it work on ARM; I'll send that patch upstream as well as to IcedTea. I also took the opportunity to use the global PrintAssembly setting, but the old T2EE_PRINT_DISASS environment variable stil works if you want to use that. This is for trunk and branch. Andrew. diff -r 8c63d311e066 Makefile.am --- a/Makefile.am Thu Jan 19 07:16:03 2012 -0500 +++ b/Makefile.am Fri Jan 20 10:43:58 2012 -0500 @@ -399,6 +399,7 @@ patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \ patches/openjdk/7103224-glibc_name_collision.patch \ patches/arm-debug.patch \ + patches/arm-hsdis.patch \ patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \ patches/openjdk/7102369-7094468-rmiregistry.patch \ patches/openjdk/6851973-kerberos.patch \ diff -r 8c63d311e066 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 19 07:16:03 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Fri Jan 20 10:43:58 2012 -0500 @@ -38,10 +38,6 @@ static char *t2ee_print_statistics; #endif -#ifdef T2EE_PRINT_DISASS -static char *t2ee_print_disass; -#endif - #ifdef T2EE_PRINT_REGUSAGE static char *t2ee_print_regusage; #endif @@ -56,11 +52,6 @@ #include "precompiled.hpp" #include "interpreter/bytecodes.hpp" -#ifdef T2EE_PRINT_DISASS -#include "dis-asm.h" -#include "bfd.h" -#endif - #define opc_nop 0x00 #define opc_aconst_null 0x01 #define opc_iconst_m1 0x02 @@ -725,41 +716,44 @@ #ifdef T2EE_PRINT_DISASS -class Opcodes { +class Hsdis { public: - typeof (::print_insn_little_arm) *print_insn_little_arm; - typeof (::init_disassemble_info) *init_disassemble_info; - typeof (::disassemble_init_for_target) *disassemble_init_for_target; - - // Load libopcodes.so lazily. - Opcodes() + + typedef void* (*decode_instructions_event_callback_ftype) (void*, const char*, void*); + + typedef void* (*decode_instructions_ftype) + (void* start, void* end, + decode_instructions_event_callback_ftype event_callback, + void* event_stream, + void* printf_callback, + void* printf_stream, + const char* options); + + decode_instructions_ftype decode_instructions; + + void *lib; + + // Load hsdis-arm.so lazily. + Hsdis() { - void *lib; - if (t2ee_print_disass) { - if (lib = dlopen("libopcodes.so", RTLD_NOW)) { - print_insn_little_arm - = (typeof print_insn_little_arm)dlsym(lib, "print_insn_little_arm"); - init_disassemble_info - = (typeof init_disassemble_info)dlsym(lib, "init_disassemble_info"); - disassemble_init_for_target - = (typeof disassemble_init_for_target)dlsym(lib, "disassemble_init_for_target"); + if (PrintAssembly) { + if (lib = dlopen("hsdis-arm.so", RTLD_NOW)) { + decode_instructions + = (typeof decode_instructions)dlsym(lib, "decode_instructions"); } - if (! (print_insn_little_arm - && init_disassemble_info - && disassemble_init_for_target)) - { - fprintf (stderr, "The environment variable T2EE_PRINT_DISASS is set, but\n" - "libopcodes.so has not been found or is invalid. If you want to\n" - "see a disassembly, please ensure that a valid copy of\n" - "libopcodes.so is present somewhere in your library load path.\n"); - abort(); - } + if (! (decode_instructions)) { + fprintf (stderr, "PrintAssembly (or T2EE_PRINT_DISASS) is set, but\n" + "hsdis-arm.so has not been found or is invalid. If you want to\n" + "see a disassembly, please ensure that a valid copy of\n" + "hsdis-arm.so is present somewhere in your library load path.\n"); + abort(); + } } } }; -static Opcodes opcodes; +static void *print_address(void *stream, const char *tag, void *data); void Thumb2_disass(Thumb2_Info *jinfo) { @@ -773,10 +767,11 @@ int start_b, end_b; unsigned nodisass; - struct disassemble_info info; unsigned short *codebuf = jinfo->codebuf->codebuf; unsigned idx, compiled_len; + static Hsdis hsdis; + #if 0 printf("Local Variable Usage\n"); printf("====================\n"); @@ -794,16 +789,6 @@ fflush(stdout); fflush(stderr); - opcodes.init_disassemble_info(&info, stdout, (fprintf_ftype)fprintf); - info.arch = bfd_arch_arm; - opcodes.disassemble_init_for_target(&info); - info.endian = BFD_ENDIAN_LITTLE; - info.endian_code = BFD_ENDIAN_LITTLE; - info.buffer = (bfd_byte *)codebuf; - info.buffer_vma = (bfd_vma)codebuf; - info.buffer_length = jinfo->codebuf->idx * sizeof(short); - info.disassembler_options = (char *)"force-thumb"; - compiled_len = jinfo->codebuf->idx * 2; for (idx = 0; idx < compiled_len; ) { nodisass = 0; @@ -867,13 +852,14 @@ low++; } bci += len; - for (i = 0; i < 4; i++) { + { printf("0x%08x:\t", (int)codebuf+idx); { - int len = opcodes.print_insn_little_arm((bfd_vma)codebuf+idx, &info); - if (len == -1) len = 2; - idx += len; - putchar('\n'); + unsigned short *p = codebuf + idx/2; + hsdis.decode_instructions((char*)p, (char *)p + 14, + print_address, NULL, NULL, stdout, + "force-thumb"); + idx += 14; } } for (i = 0; i < n; i++) { @@ -929,7 +915,6 @@ } } if (!nodisass) { - printf("0x%08x:\t", (int)codebuf+idx); { int len; unsigned s1, s2; @@ -945,16 +930,26 @@ len = 4; } } else { - len = opcodes.print_insn_little_arm((bfd_vma)codebuf+idx, &info); - if (len == -1) len = 2; - idx += len; + char *p = (char*)codebuf + idx; + len = 2; + while (len + idx < compiled_len + && start_bci[(len + idx)/2] == -1) + len += 2; + hsdis.decode_instructions((char*)p, (char*)p + len, + print_address, NULL, NULL, stdout, + "force-thumb"); } - putchar('\n'); + idx += len; } } } fflush(stdout); } +// where +static void *print_address(void *, const char *tag, void *data) { + if (strcmp(tag, "insn") == 0) + printf("0x%08x:\t", data); +} #endif #define BCI(len, pop, push, special, islocal, islocal_n, isstore, local_n, local_type) \ @@ -7128,7 +7123,7 @@ #endif #ifdef T2EE_PRINT_COMPILATION - if (t2ee_print_compilation) { + if (t2ee_print_compilation || PrintAssembly) { fprintf(stderr, "Compiling %d %c%c %s\n", compiled_methods, method->is_synchronized() ? 'S' : ' ', @@ -7205,7 +7200,7 @@ #ifdef T2EE_PRINT_DISASS if (DISASS_AFTER == 0 || compiled_methods >= DISASS_AFTER) - if (t2ee_print_disass) + if (PrintAssembly) Thumb2_disass(&jinfo_str); #endif @@ -7380,7 +7375,7 @@ t2ee_print_statistics = getenv("T2EE_PRINT_STATISTICS"); #endif #ifdef T2EE_PRINT_DISASS - t2ee_print_disass = getenv("T2EE_PRINT_DISASS"); + PrintAssembly |= getenv("T2EE_PRINT_DISASS") != NULL; #endif #ifdef T2EE_PRINT_REGUSAGE t2ee_print_regusage = getenv("T2EE_PRINT_REGUSAGE"); @@ -7772,33 +7767,19 @@ mov_imm(&codebuf, ARM_R3, (u32)Thumb2_Handle_Exception_NoRegs); mov_reg(&codebuf, ARM_PC, ARM_R3); + // Disassemble the codebuf we just created. For debugging + if (PrintAssembly) { + Hsdis hsdis; + hsdis.decode_instructions(cb->hp, cb->hp + codebuf.idx * 2, + print_address, NULL, NULL, stdout, + "force-thumb"); + putchar('\n'); + } + Thumb2_Clear_Cache(cb->hp, cb->hp + codebuf.idx * 2); cb->hp += codebuf.idx * 2; thumb2_codebuf = cb; - -#if 0 // Disassemble the codebuf we just created. For debugging - Opcodes opcodes; - if (t2ee_print_disass) { - struct disassemble_info info; - info.arch = bfd_arch_arm; - opcodes.disassemble_init_for_target(&info); - opcodes.init_disassemble_info(&info, stdout, (fprintf_ftype)fprintf); - info.endian = BFD_ENDIAN_LITTLE; - info.endian_code = BFD_ENDIAN_LITTLE; - info.buffer = (bfd_byte *)codebuf.codebuf; - info.buffer_vma = (bfd_vma)codebuf.codebuf; - info.buffer_length = codebuf.idx * sizeof(short); - info.disassembler_options = (char *)"force-thumb"; - int len; - for (unsigned int i = 0; i < codebuf.idx * sizeof(short); i += len) { - printf("0x%08x:\t", ((int)codebuf.codebuf)+i); - len = opcodes.print_insn_little_arm(((bfd_vma)codebuf.codebuf)+i, &info); - if (len == -1) len = 2; - putchar('\n'); - } - } -#endif } #endif // THUMB2EE diff -r 8c63d311e066 patches/arm-hsdis.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/arm-hsdis.patch Fri Jan 20 10:43:58 2012 -0500 @@ -0,0 +1,90 @@ +2012-01-20 Andrew Haley + + * Makefile (ARCH): Add entry for armv7l. + (CFLAGS): Enable debugging. + ($(LIBRARIES)): Pass CFLAGS to sub-make. + * hsdis.c: Include string.h. + (parse_caller_options): Fix strncmp bug. + (native_arch_name): Add entry for ARM. + +diff -u openjdk/hotspot/src/share/tools/hsdis/hsdis.c ../icedtea6/openjdk/hotspot/src/share/tools/hsdis/hsdis.c +--- openjdk/hotspot/src/share/tools/hsdis/hsdis.c 2011-11-14 17:07:33.000000000 -0500 ++++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c 2012-01-20 10:21:28.000000000 -0500 +@@ -22,8 +22,6 @@ + * + */ + +-#include "precompiled.hpp" +- + /* hsdis.c -- dump a range of addresses as native instructions + This implements the plugin protocol required by the + HotSpot PrintAssembly option. +@@ -37,6 +35,8 @@ + #include + #include + ++#include ++ + #ifndef bool + #define bool int + #define true 1 +@@ -358,7 +358,7 @@ + if (plen > mach_size) plen = mach_size; + strncpy(mach_option, p, plen); + mach_option[plen] = '\0'; +- } else if (plen > 6 && strncmp(p, "hsdis-", 6)) { ++ } else if (plen > 6 && !strncmp(p, "hsdis-", 6)) { + // do not pass these to the next level + } else { + /* just copy it; {i386,sparc}-dis.c might like to see it */ +@@ -420,6 +420,9 @@ + #ifdef LIBARCH_sparcv9 + res = "sparc:v9b"; + #endif ++#ifdef LIBARCH_arm ++ res = "arm"; ++#endif + if (res == NULL) + res = "architecture not set in Makefile!"; + return res; +diff -u openjdk/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile +--- openjdk/hotspot/src/share/tools/hsdis/Makefile 2011-11-14 17:07:33.000000000 -0500 ++++ openjdk/hotspot/src/share/tools/hsdis/Makefile 2012-01-20 10:20:32.000000000 -0500 +@@ -68,14 +68,18 @@ + CONFIGURE_ARGS= --host=$(MINGW) --target=$(MINGW) + else + CPU = $(shell uname -m) ++ifeq ($(CPU),armv7l) ++ARCH=arm ++else + ARCH1=$(CPU:x86_64=amd64) + ARCH=$(ARCH1:i686=i386) + CFLAGS/i386 += -m32 + CFLAGS/sparc += -m32 + CFLAGS/sparcv9 += -m64 + CFLAGS/amd64 += -m64 ++endif + CFLAGS += $(CFLAGS/$(ARCH)) +-CFLAGS += -fPIC ++CFLAGS += -fPIC -g + OS = linux + LIB_EXT = .so + CC = gcc +@@ -118,7 +122,7 @@ + BINUTILSDIR = $(shell cd $(BINUTILS);pwd) + endif + +-CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILS)/bfd -I$(TARGET_DIR)/bfd ++CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILSDIR)/bfd -I$(TARGET_DIR)/bfd + CPPFLAGS += -DLIBARCH_$(LIBARCH) -DLIBARCH=\"$(LIBARCH)\" -DLIB_EXT=\"$(LIB_EXT)\" + + TARGET_DIR = build/$(OS)-$(JDKARCH) +@@ -145,7 +149,7 @@ + demo: $(TARGET) $(DEMO_TARGET) + + $(LIBRARIES): $(TARGET_DIR) $(TARGET_DIR)/Makefile +- if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi ++ if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes "CFLAGS=$(CFLAGS)"; fi + + $(TARGET_DIR)/Makefile: + (cd $(TARGET_DIR); CC=$(CC) CFLAGS="$(CFLAGS)" $(BINUTILSDIR)/configure --disable-nls $(CONFIGURE_ARGS)) From bugzilla-daemon at icedtea.classpath.org Sat Jan 21 12:34:45 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 21 Jan 2012 20:34:45 +0000 Subject: [Bug 857] gtk look and feel setting causes javaws to hang if accessibility used In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=857 Xerxes R?nby changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |xerxes at zafena.se --- Comment #2 from Xerxes R?nby 2012-01-21 20:34:45 UTC --- Thank you Micha? for submitting this accessibility bug-report. I am currently struggling to get swing/awk applications connected to the Ocra screen reader. I have updated my jre/lib/accessibility.properties to include assistive_technologies=org.GNOME.Accessibility.AtkWrapper and also made sure that the jre/lib/ext directory contains the java-atk-wrapper.jar and jni files, despite this I get no indication that the AtkWrapper gets initialized/used when I start swing or awt applications. This setup/configure issue delay me from starting to work on a fix for this bug. I will try recompile my java-atk-wrapper from upstream source and see if that help. Two quick questions: 1) Are the java-atk-wrapper known to work in combination with openjdk-6? 2) Are the java-atk-wrapper known to work in combination with gnome 3.0? Cheers, and have a great day Xerxes R?nby -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Sun Jan 22 01:49:34 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 22 Jan 2012 09:49:34 +0000 Subject: [Bug 857] gtk look and feel setting causes javaws to hang if accessibility used In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=857 --- Comment #3 from Micha? Zegan 2012-01-22 09:49:34 UTC --- It's actually a general bug not only related to accessibility. It shows up when java-atk-wrapper is enabled, but it is a general bug, that may be probably triggered by other things. The fact that look and feel modification cannot be done after any swing class has been loaded or component created is not necessarily related to accessibility, it's possible it could cause problems in other unspecified situations. You could look into sources and see that javaws, for example, does that. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From thomas at m3y3r.de Sun Jan 22 03:00:58 2012 From: thomas at m3y3r.de (Thomas Meyer) Date: Sun, 22 Jan 2012 12:00:58 +0100 Subject: [RFC] PAV: add missing panel timeout check Message-ID: <1327230058.1434.23.camel@localhost.localdomain> # HG changeset patch # User thomas # Date 1327229831 -3600 # Node ID ddb05011ff2f86ccdd2d0bad1fa659941fda66f1 # Parent 7d090bfa381924100c0f8446dda2a615a75637d9 The wait loop for the panel to instantiate will result in a really *long* wait loop, e.g. when the JAR for the panel class is not found for some reason, as each loop step will wait 180s. while waiting for the loop to finish, at least the firefox browser becomes unresponsive for all open tabs. i'm not sure why this happens, but I guess the c++ side waits for a response it never gets and this will stall the whole browser. maybe we should decrease the maximum wait timeout to something more appropriate?! diff -r 7d090bfa3819 -r ddb05011ff2f plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue Dec 13 12:45:36 2011 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Sun Jan 22 11:57:11 2012 +0100 @@ -745,9 +745,17 @@ long maxTimeToSleep = APPLET_TIMEOUT; panelLock.lock(); try { - while (panel == null || !panel.isAlive()) + while (panel == null || !panel.isAlive()) { maxTimeToSleep -= waitTillTimeout(panelLock, panelLive, maxTimeToSleep); + + // we already waited till timeout, give up here directly, instead of waiting 180s again in below waitForAppletInit() + if(maxTimeToSleep < 0) { + panelLock.unlock(); + streamhandler.write("instance " + identifier + " reference " + -1 + " fatalError: " + "Initialization timed out"); + return; + } + } } finally { panelLock.unlock(); From bugzilla-daemon at icedtea.classpath.org Sun Jan 22 05:57:34 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 22 Jan 2012 13:57:34 +0000 Subject: [Bug 858] New: MarvinSketch and several other Applets not working Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=858 Bug #: 858 Summary: MarvinSketch and several other Applets not working Classification: Unclassified Product: IcedTea-Web Version: 1.1.3 Platform: x86_64 OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: Plugin AssignedTo: dbhole at redhat.com ReportedBy: hendrik.knackstedt at t-online.de CC: unassigned at icedtea.classpath.org I'm using the current Firefox 9.0.1 on an 64bit Ubuntu 11.10 system and a bunch of applets don't work, including MarvinSketch, which I have to use for my university studies. For MarvinSketch, Firefox show ?Applet loaded?, while the applet itself says ?Applet is loading ? Please wait?. When running Firefox from the command line the Terminal says: java version "1.6.0_23" OpenJDK Runtime Environment (IcedTea6 1.11pre) (6b23~pre11-0ubuntu1.11.10) OpenJDK 64-Bit Server VM (build 20.0-b11, mixed mode) Unable to use Firefox's proxy settings. Using "DIRECT" as proxy type. Problem while loading applet. JMSketch initalization has failed. java.lang.NullPointerException at net.sourceforge.jnlp.runtime.JNLPClassLoader.getPermissions(JNLPClassLoader.java:603) at java.security.SecureClassLoader.getProtectionDomain(SecureClassLoader.java:210) at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) at java.net.URLClassLoader.defineClass(URLClassLoader.java:277) at java.net.URLClassLoader.access$000(URLClassLoader.java:73) at java.net.URLClassLoader$1.run(URLClassLoader.java:212) at java.security.AccessController.doPrivileged(Native Method) at java.net.URLClassLoader.findClass(URLClassLoader.java:205) at net.sourceforge.jnlp.runtime.JNLPClassLoader.findClass(JNLPClassLoader.java:1187) at net.sourceforge.jnlp.runtime.JNLPClassLoader.loadClassExt(JNLPClassLoader.java:1214) at net.sourceforge.jnlp.runtime.JNLPClassLoader.loadClass(JNLPClassLoader.java:1029) at java.lang.Class.forName0(Native Method) at java.lang.Class.forName(Class.java:186) at chemaxon.marvin.applet.AppletLaunch.run(Unknown Source) at java.lang.Thread.run(Thread.java:679) Another applet with a similiar problem can be found here: http://www.eventim.de/das-phantom-der-oper-tickets-hildesheim.html?affiliate=EVE&doc=artistPages/tickets&fun=artist&action=tickets&key=304763$1515613 When clicking on ?Saalplanbuchung? the applet should load, but it also just says ?Please wait. Data are loading.? but nothing happens. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From doko at ubuntu.com Sun Jan 22 06:34:33 2012 From: doko at ubuntu.com (Matthias Klose) Date: Sun, 22 Jan 2012 15:34:33 +0100 Subject: IcedTea-Web branched for 1.2 release In-Reply-To: <20120111200710.GD32482@redhat.com> References: <20120111200710.GD32482@redhat.com> Message-ID: <4F1C1E79.3090205@ubuntu.com> On 11.01.2012 21:07, Deepak Bhole wrote: > IcedTea-Web has been branched for a 1.2 release: > http://icedtea.classpath.org/hg/release/icedtea-web-1.2/ > > The release is tentatively scheduled for Jan 30th, 2012. The late date > is to accommodate a pending patch from Jiri Vanek who is away until the > 23rd. > > If there are any issues with the above date, please let me know. building with OpenJDK 7 doesn't define "application/x-java-applet;version=1.7:class,jar:IcedTea;" \ "application/x-java-bean;version=1.7:class,jar:IcedTea;" \ is this intended or are these not defined at all for the Oracle proprietary plugin? Matthias From doko at ubuntu.com Sun Jan 22 06:59:49 2012 From: doko at ubuntu.com (Matthias Klose) Date: Sun, 22 Jan 2012 15:59:49 +0100 Subject: copyright dates for -web Message-ID: <4F1C2465.5010207@ubuntu.com> Hi again, some files are not updated, last date is 2010, which doesn't sound right, at least the IcedTeaNPPlugin.cpp file. Matthias From bugzilla-daemon at icedtea.classpath.org Sun Jan 22 08:34:11 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 22 Jan 2012 16:34:11 +0000 Subject: [Bug 858] MarvinSketch and several other Applets not working In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=858 --- Comment #1 from thomas at m3y3r.de 2012-01-22 16:34:11 UTC --- Created attachment 638 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=638 prevent npe, use sandbox priviliges for all additional jars -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ptisnovs at icedtea.classpath.org Mon Jan 23 01:15:43 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 23 Jan 2012 09:15:43 +0000 Subject: /hg/gfx-test: 2012-01-23 Pavel Tisnovsky Message-ID: changeset 95c3b4a9eaaf in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=95c3b4a9eaaf author: Pavel Tisnovsky date: Mon Jan 23 10:18:01 2012 +0100 2012-01-23 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: Added new test. * src/org/gfxtest/testsuites/BitBltScaleImage.java: Added new tests. diffstat: ChangeLog | 7 + src/org/gfxtest/testsuites/BitBltBasicTests.java | 14 ++ src/org/gfxtest/testsuites/BitBltScaleImage.java | 136 +++++++++++++++++++++++ 3 files changed, 157 insertions(+), 0 deletions(-) diffs (184 lines): diff -r d20f41c8e71d -r 95c3b4a9eaaf ChangeLog --- a/ChangeLog Fri Jan 20 10:19:51 2012 +0100 +++ b/ChangeLog Mon Jan 23 10:18:01 2012 +0100 @@ -1,3 +1,10 @@ +2012-01-23 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Added new test. + * src/org/gfxtest/testsuites/BitBltScaleImage.java: + Added new tests. + 2012-01-20 Pavel Tisnovsky * src/org/gfxtest/framework/CommonBitmapOperations.java: diff -r d20f41c8e71d -r 95c3b4a9eaaf src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Fri Jan 20 10:19:51 2012 +0100 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Mon Jan 23 10:18:01 2012 +0100 @@ -411,6 +411,20 @@ } /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_BINARY. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltDiagonalCheckerBufferedImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** * Test basic BitBlt operation for grid buffered image with type TYPE_BYTE_BINARY. * * @param image diff -r d20f41c8e71d -r 95c3b4a9eaaf src/org/gfxtest/testsuites/BitBltScaleImage.java --- a/src/org/gfxtest/testsuites/BitBltScaleImage.java Fri Jan 20 10:19:51 2012 +0100 +++ b/src/org/gfxtest/testsuites/BitBltScaleImage.java Mon Jan 23 10:18:01 2012 +0100 @@ -212,6 +212,142 @@ } /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_BINARY. + * The image is scaled to a double size in both dimensions. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltDiagonalCheckerBufferedImageTypeByteBinaryScaleTwoTimes(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_WIDTH * 2, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_HEIGHT * 2); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_BINARY. + * The image is scaled to one half size in both dimensions. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltDiagonalCheckerBufferedImageTypeByteBinaryScaleOneHalf(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_WIDTH / 2, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_HEIGHT / 2); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_BINARY. + * The image is scaled to one third size in both dimensions. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltDiagonalCheckerBufferedImageTypeByteBinaryScaleOneThird(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_WIDTH / 3, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_HEIGHT / 3); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_BINARY. + * The image is scaled to two thirds size in both dimensions. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltDiagonalCheckerBufferedImageTypeByteBinaryScaleTwoThirds(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_WIDTH * 2 / 3, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_HEIGHT * 2 / 3); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_BINARY. + * The image is scaled to one half size in horizontal dimension. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltDiagonalCheckerBufferedImageTypeByteBinaryHscaleOneHalf(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_WIDTH / 2, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_HEIGHT); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_BINARY. + * The image is scaled to two times size in horizontal dimension. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltDiagonalCheckerBufferedImageTypeByteBinaryHscaleTwoTimes(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_WIDTH * 2, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_HEIGHT); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_BINARY. + * The image is scaled to one half size in vertical dimension. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltDiagonalCheckerBufferedImageTypeByteBinaryVscaleOneHalf(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_WIDTH, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_HEIGHT / 2); + } + + /** + * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_BINARY. + * The image is scaled to two times size in vertical dimension. + * + * @param image + * image to which line is to be drawn + * @param graphics2d + * graphics canvas + * @return + */ + public TestResult testBitBltDiagonalCheckerBufferedImageTypeByteBinaryVscaleTwoTimes(TestImage image, Graphics2D graphics2d) + { + return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, + BufferedImage.TYPE_BYTE_BINARY, CommonBitmapOperations.DEFAULT_TEST_IMAGE_WIDTH, + CommonBitmapOperations.DEFAULT_TEST_IMAGE_HEIGHT * 2); + } + + /** * Entry point to the test suite. * * @param args not used in this case From aph at redhat.com Mon Jan 23 02:31:51 2012 From: aph at redhat.com (Andrew Haley) Date: Mon, 23 Jan 2012 10:31:51 +0000 Subject: Thinko in disassembler patch Message-ID: <4F1D3717.20007@redhat.com> FYI. changeset: 2795:09346b173848 tag: tip user: aph date: Fri Jan 20 14:04:34 2012 -0500 summary: Return NULL to fix disassembler. diff -r 9d8f2bd49124 -r 09346b173848 ChangeLog --- a/ChangeLog Fri Jan 20 10:51:50 2012 -0500 +++ b/ChangeLog Fri Jan 20 14:04:34 2012 -0500 @@ -1,3 +1,8 @@ +2012-01-20 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (print_address): + Return NULL; + 2012-01-20 Andrew Haley * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp diff -r 9d8f2bd49124 -r 09346b173848 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Fri Jan 20 10:51:50 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Fri Jan 20 14:04:34 2012 -0500 @@ -949,6 +949,7 @@ static void *print_address(void *, const char *tag, void *data) { if (strcmp(tag, "insn") == 0) printf("0x%08x:\t", data); + return NULL; } #endif From xerxes at zafena.se Mon Jan 23 05:00:34 2012 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Mon, 23 Jan 2012 14:00:34 +0100 Subject: ARM: Rewrite disassembler to use hsdis In-Reply-To: <4F198D55.9050202@redhat.com> References: <4F198D55.9050202@redhat.com> Message-ID: <4F1D59F2.7060909@zafena.se> 2012-01-20 16:50, Andrew Haley skrev: > This patch rewrites the ARM disassembler to use HSDIS rather than call > binutils directly. This removes the build dependency on > binutils-devel. We have to do this because binutils is GPLv3+ and > HotSpot is GPLv2 only. I had to patch HSDIS itself to make it work on > ARM; I'll send that patch upstream as well as to IcedTea. minor note: doko pointed out that you may compile and link the code as is using an old gplv2 licensed binutils-dev. > > I also took the opportunity to use the global PrintAssembly setting, > but the old T2EE_PRINT_DISASS environment variable stil works if you > want to use that. > > This is for trunk and branch. > > Andrew. > > Thank you for bringing the asm port closer to regular hotspot implementation. I like this patch in large, some minor changes needed, comments inline. When those are fixed, ok for inclusion into icedtea6 head and 1.11 release branch. > > diff -r 8c63d311e066 Makefile.am > --- a/Makefile.am Thu Jan 19 07:16:03 2012 -0500 > +++ b/Makefile.am Fri Jan 20 10:43:58 2012 -0500 > @@ -399,6 +399,7 @@ > patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \ > patches/openjdk/7103224-glibc_name_collision.patch \ > patches/arm-debug.patch \ > + patches/arm-hsdis.patch \ > patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \ > patches/openjdk/7102369-7094468-rmiregistry.patch \ > patches/openjdk/6851973-kerberos.patch \ > diff -r 8c63d311e066 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp > --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 19 07:16:03 2012 -0500 > +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Fri Jan 20 10:43:58 2012 -0500 > @@ -38,10 +38,6 @@ > static char *t2ee_print_statistics; > #endif > > -#ifdef T2EE_PRINT_DISASS > -static char *t2ee_print_disass; > -#endif > - > #ifdef T2EE_PRINT_REGUSAGE > static char *t2ee_print_regusage; > #endif > @@ -56,11 +52,6 @@ > #include "precompiled.hpp" > #include "interpreter/bytecodes.hpp" > > -#ifdef T2EE_PRINT_DISASS > -#include "dis-asm.h" > -#include "bfd.h" > -#endif > - > #define opc_nop 0x00 > #define opc_aconst_null 0x01 > #define opc_iconst_m1 0x02 > @@ -725,41 +716,44 @@ > > #ifdef T2EE_PRINT_DISASS > > -class Opcodes { > +class Hsdis { > public: > - typeof (::print_insn_little_arm) *print_insn_little_arm; > - typeof (::init_disassemble_info) *init_disassemble_info; > - typeof (::disassemble_init_for_target) *disassemble_init_for_target; > - > - // Load libopcodes.so lazily. > - Opcodes() > + > + typedef void* (*decode_instructions_event_callback_ftype) (void*, const char*, void*); > + > + typedef void* (*decode_instructions_ftype) > + (void* start, void* end, > + decode_instructions_event_callback_ftype event_callback, > + void* event_stream, > + void* printf_callback, > + void* printf_stream, > + const char* options); > + > + decode_instructions_ftype decode_instructions; > + > + void *lib; > + > + // Load hsdis-arm.so lazily. > + Hsdis() > { > - void *lib; > - if (t2ee_print_disass) { > - if (lib = dlopen("libopcodes.so", RTLD_NOW)) { > - print_insn_little_arm > - = (typeof print_insn_little_arm)dlsym(lib, "print_insn_little_arm"); > - init_disassemble_info > - = (typeof init_disassemble_info)dlsym(lib, "init_disassemble_info"); > - disassemble_init_for_target > - = (typeof disassemble_init_for_target)dlsym(lib, "disassemble_init_for_target"); > + if (PrintAssembly) { > + if (lib = dlopen("hsdis-arm.so", RTLD_NOW)) { > + decode_instructions > + = (typeof decode_instructions)dlsym(lib, "decode_instructions"); > } > > - if (! (print_insn_little_arm > - && init_disassemble_info > - && disassemble_init_for_target)) > - { > - fprintf (stderr, "The environment variable T2EE_PRINT_DISASS is set, but\n" > - "libopcodes.so has not been found or is invalid. If you want to\n" > - "see a disassembly, please ensure that a valid copy of\n" > - "libopcodes.so is present somewhere in your library load path.\n"); > - abort(); > - } > + if (! (decode_instructions)) { > + fprintf (stderr, "PrintAssembly (or T2EE_PRINT_DISASS) is set, but\n" > + "hsdis-arm.so has not been found or is invalid. If you want to\n" > + "see a disassembly, please ensure that a valid copy of\n" > + "hsdis-arm.so is present somewhere in your library load path.\n"); > + abort(); > + } > } > } > }; > > -static Opcodes opcodes; > +static void *print_address(void *stream, const char *tag, void *data); > > void Thumb2_disass(Thumb2_Info *jinfo) > { > @@ -773,10 +767,11 @@ > int start_b, end_b; > unsigned nodisass; > > - struct disassemble_info info; > unsigned short *codebuf = jinfo->codebuf->codebuf; > unsigned idx, compiled_len; > > + static Hsdis hsdis; > + > #if 0 > printf("Local Variable Usage\n"); > printf("====================\n"); > @@ -794,16 +789,6 @@ > fflush(stdout); > fflush(stderr); > > - opcodes.init_disassemble_info(&info, stdout, (fprintf_ftype)fprintf); > - info.arch = bfd_arch_arm; > - opcodes.disassemble_init_for_target(&info); > - info.endian = BFD_ENDIAN_LITTLE; > - info.endian_code = BFD_ENDIAN_LITTLE; > - info.buffer = (bfd_byte *)codebuf; > - info.buffer_vma = (bfd_vma)codebuf; > - info.buffer_length = jinfo->codebuf->idx * sizeof(short); > - info.disassembler_options = (char *)"force-thumb"; > - > compiled_len = jinfo->codebuf->idx * 2; > for (idx = 0; idx < compiled_len; ) { > nodisass = 0; ok > @@ -867,13 +852,14 @@ > low++; > } > bci += len; > - for (i = 0; i < 4; i++) { > + { > printf("0x%08x:\t", (int)codebuf+idx); > { > - int len = opcodes.print_insn_little_arm((bfd_vma)codebuf+idx, &info); > - if (len == -1) len = 2; > - idx += len; > - putchar('\n'); > + unsigned short *p = codebuf + idx/2; > + hsdis.decode_instructions((char*)p, (char *)p + 14, > + print_address, NULL, NULL, stdout, > + "force-thumb"); > + idx += 14; > } > } > for (i = 0; i < n; i++) { Please add a comment that reflect the magic number 14. (11.33.07) xranby: aph: why the magic number 14 ? (11.39.20) aph: xranby: cos that's how long the instruction sequence is. I haven't changed that. Also one level of {} can get removed in this block. (11.22.30) xranby: a quick question.. of this block http://paste.ubuntu.com/814137/ why are the { } still needed? (11.23.00) xranby: line 6 and line 19 (11.23.17) aph: xranby: there's a declaration in there (11.23.50) xranby: ok then line 8 and line 18 are still needed (11.23.53) aph: xranby: OH, ISWYM (11.24.18) aph: sorry, I guess there's no need any more. I try to keep diffs to a minimum. (11.24.45) aph: at least one pair of those "{" can go > @@ -929,7 +915,6 @@ > } > } > if (!nodisass) { > - printf("0x%08x:\t", (int)codebuf+idx); > { > int len; > unsigned s1, s2; > @@ -945,16 +930,26 @@ > len = 4; > } > } else { > - len = opcodes.print_insn_little_arm((bfd_vma)codebuf+idx, &info); > - if (len == -1) len = 2; > - idx += len; > + char *p = (char*)codebuf + idx; > + len = 2; > + while (len + idx < compiled_len > + && start_bci[(len + idx)/2] == -1) > + len += 2; > + hsdis.decode_instructions((char*)p, (char*)p + len, > + print_address, NULL, NULL, stdout, > + "force-thumb"); > } > - putchar('\n'); > + idx += len; > } > } > } > fflush(stdout); > } > +// where > +static void *print_address(void *, const char *tag, void *data) { > + if (strcmp(tag, "insn") == 0) > + printf("0x%08x:\t", data); > +} ok, I have seen your updated patch for this block on the list that return NULL. > #endif > > #define BCI(len, pop, push, special, islocal, islocal_n, isstore, local_n, local_type) \ > @@ -7128,7 +7123,7 @@ > #endif > > #ifdef T2EE_PRINT_COMPILATION > - if (t2ee_print_compilation) { > + if (t2ee_print_compilation || PrintAssembly) { > fprintf(stderr, "Compiling %d %c%c %s\n", > compiled_methods, > method->is_synchronized() ? 'S' : ' ', > @@ -7205,7 +7200,7 @@ > > #ifdef T2EE_PRINT_DISASS > if (DISASS_AFTER == 0 || compiled_methods >= DISASS_AFTER) > - if (t2ee_print_disass) > + if (PrintAssembly) > Thumb2_disass(&jinfo_str); > #endif > > @@ -7380,7 +7375,7 @@ > t2ee_print_statistics = getenv("T2EE_PRINT_STATISTICS"); > #endif > #ifdef T2EE_PRINT_DISASS > - t2ee_print_disass = getenv("T2EE_PRINT_DISASS"); > + PrintAssembly |= getenv("T2EE_PRINT_DISASS") != NULL; > #endif > #ifdef T2EE_PRINT_REGUSAGE > t2ee_print_regusage = getenv("T2EE_PRINT_REGUSAGE"); > @@ -7772,33 +7767,19 @@ > mov_imm(&codebuf, ARM_R3, (u32)Thumb2_Handle_Exception_NoRegs); > mov_reg(&codebuf, ARM_PC, ARM_R3); > > + // Disassemble the codebuf we just created. For debugging > + if (PrintAssembly) { > + Hsdis hsdis; > + hsdis.decode_instructions(cb->hp, cb->hp + codebuf.idx * 2, > + print_address, NULL, NULL, stdout, > + "force-thumb"); > + putchar('\n'); > + } > + > Thumb2_Clear_Cache(cb->hp, cb->hp + codebuf.idx * 2); > cb->hp += codebuf.idx * 2; > > thumb2_codebuf = cb; > - > -#if 0 // Disassemble the codebuf we just created. For debugging > - Opcodes opcodes; > - if (t2ee_print_disass) { > - struct disassemble_info info; > - info.arch = bfd_arch_arm; > - opcodes.disassemble_init_for_target(&info); > - opcodes.init_disassemble_info(&info, stdout, (fprintf_ftype)fprintf); > - info.endian = BFD_ENDIAN_LITTLE; > - info.endian_code = BFD_ENDIAN_LITTLE; > - info.buffer = (bfd_byte *)codebuf.codebuf; > - info.buffer_vma = (bfd_vma)codebuf.codebuf; > - info.buffer_length = codebuf.idx * sizeof(short); > - info.disassembler_options = (char *)"force-thumb"; > - int len; > - for (unsigned int i = 0; i < codebuf.idx * sizeof(short); i += len) { > - printf("0x%08x:\t", ((int)codebuf.codebuf)+i); > - len = opcodes.print_insn_little_arm(((bfd_vma)codebuf.codebuf)+i, &info); > - if (len == -1) len = 2; > - putchar('\n'); > - } > - } > -#endif > } > > #endif // THUMB2EE ok > diff -r 8c63d311e066 patches/arm-hsdis.patch > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/patches/arm-hsdis.patch Fri Jan 20 10:43:58 2012 -0500 > @@ -0,0 +1,90 @@ > +2012-01-20 Andrew Haley > + > + * Makefile (ARCH): Add entry for armv7l. > + (CFLAGS): Enable debugging. > + ($(LIBRARIES)): Pass CFLAGS to sub-make. > + * hsdis.c: Include string.h. > + (parse_caller_options): Fix strncmp bug. > + (native_arch_name): Add entry for ARM. The makefile check for arm can get improved , apart from that this new patch looks ok see below: > + > +diff -u openjdk/hotspot/src/share/tools/hsdis/hsdis.c ../icedtea6/openjdk/hotspot/src/share/tools/hsdis/hsdis.c > +--- openjdk/hotspot/src/share/tools/hsdis/hsdis.c 2011-11-14 17:07:33.000000000 -0500 > ++++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c 2012-01-20 10:21:28.000000000 -0500 > +@@ -22,8 +22,6 @@ > + * > + */ > + > +-#include "precompiled.hpp" > +- > + /* hsdis.c -- dump a range of addresses as native instructions > + This implements the plugin protocol required by the > + HotSpot PrintAssembly option. > +@@ -37,6 +35,8 @@ > + #include > + #include > + > ++#include > ++ > + #ifndef bool > + #define bool int > + #define true 1 > +@@ -358,7 +358,7 @@ > + if (plen > mach_size) plen = mach_size; > + strncpy(mach_option, p, plen); > + mach_option[plen] = '\0'; > +- } else if (plen > 6 && strncmp(p, "hsdis-", 6)) { > ++ } else if (plen > 6 && !strncmp(p, "hsdis-", 6)) { > + // do not pass these to the next level > + } else { > + /* just copy it; {i386,sparc}-dis.c might like to see it */ > +@@ -420,6 +420,9 @@ > + #ifdef LIBARCH_sparcv9 > + res = "sparc:v9b"; > + #endif > ++#ifdef LIBARCH_arm > ++ res = "arm"; > ++#endif > + if (res == NULL) > + res = "architecture not set in Makefile!"; > + return res; > +diff -u openjdk/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile ok > +--- openjdk/hotspot/src/share/tools/hsdis/Makefile 2011-11-14 17:07:33.000000000 -0500 > ++++ openjdk/hotspot/src/share/tools/hsdis/Makefile 2012-01-20 10:20:32.000000000 -0500 > +@@ -68,14 +68,18 @@ > + CONFIGURE_ARGS= --host=$(MINGW) --target=$(MINGW) > + else > + CPU = $(shell uname -m) > ++ifeq ($(CPU),armv7l) What about other arm CPUs? How about ifneq ($(findstring arm,$(CPU)),) > ++ARCH=arm > ++else > + ARCH1=$(CPU:x86_64=amd64) > + ARCH=$(ARCH1:i686=i386) > + CFLAGS/i386 += -m32 > + CFLAGS/sparc += -m32 > + CFLAGS/sparcv9 += -m64 > + CFLAGS/amd64 += -m64 > ++endif > + CFLAGS += $(CFLAGS/$(ARCH)) > +-CFLAGS += -fPIC > ++CFLAGS += -fPIC -g > + OS = linux > + LIB_EXT = .so > + CC = gcc > +@@ -118,7 +122,7 @@ > + BINUTILSDIR = $(shell cd $(BINUTILS);pwd) > + endif > + > +-CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILS)/bfd -I$(TARGET_DIR)/bfd > ++CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILSDIR)/bfd -I$(TARGET_DIR)/bfd > + CPPFLAGS += -DLIBARCH_$(LIBARCH) -DLIBARCH=\"$(LIBARCH)\" -DLIB_EXT=\"$(LIB_EXT)\" > + > + TARGET_DIR = build/$(OS)-$(JDKARCH) > +@@ -145,7 +149,7 @@ > + demo: $(TARGET) $(DEMO_TARGET) > + > + $(LIBRARIES): $(TARGET_DIR) $(TARGET_DIR)/Makefile > +- if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi > ++ if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes "CFLAGS=$(CFLAGS)"; fi > + > + $(TARGET_DIR)/Makefile: > + (cd $(TARGET_DIR); CC=$(CC) CFLAGS="$(CFLAGS)" $(BINUTILSDIR)/configure --disable-nls $(CONFIGURE_ARGS)) ok From xerxes at zafena.se Mon Jan 23 05:04:10 2012 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Mon, 23 Jan 2012 14:04:10 +0100 Subject: Thinko in disassembler patch In-Reply-To: <4F1D3717.20007@redhat.com> References: <4F1D3717.20007@redhat.com> Message-ID: <4F1D5ACA.60008@zafena.se> 2012-01-23 11:31, Andrew Haley skrev: > FYI. > > changeset: 2795:09346b173848 > tag: tip > user: aph > date: Fri Jan 20 14:04:34 2012 -0500 > summary: Return NULL to fix disassembler. > > diff -r 9d8f2bd49124 -r 09346b173848 ChangeLog > --- a/ChangeLog Fri Jan 20 10:51:50 2012 -0500 > +++ b/ChangeLog Fri Jan 20 14:04:34 2012 -0500 > @@ -1,3 +1,8 @@ > +2012-01-20 Andrew Haley > + > + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (print_address): > + Return NULL; > + > 2012-01-20 Andrew Haley > > * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp > diff -r 9d8f2bd49124 -r 09346b173848 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp > --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Fri Jan 20 10:51:50 2012 -0500 > +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Fri Jan 20 14:04:34 2012 -0500 > @@ -949,6 +949,7 @@ > static void *print_address(void *, const char *tag, void *data) { > if (strcmp(tag, "insn") == 0) > printf("0x%08x:\t", data); > + return NULL; > } > #endif > > ok good for head and 1.11 release branch when the rest of the hsdis patch are in. Cheers Xerxes From bugzilla-daemon at icedtea.classpath.org Mon Jan 23 05:55:33 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 23 Jan 2012 13:55:33 +0000 Subject: [Bug 822] https://bcee.snet.lu/ssogate/xlogin not functional In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=822 --- Comment #3 from pcfe 2012-01-23 13:55:33 UTC --- Deepak, have you found time to look at this in the last 2 months? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ahughes at redhat.com Mon Jan 23 06:37:16 2012 From: ahughes at redhat.com (Andrew Hughes) Date: Mon, 23 Jan 2012 09:37:16 -0500 (EST) Subject: ARM: Rewrite disassembler to use hsdis In-Reply-To: <4F1D59F2.7060909@zafena.se> Message-ID: ----- Original Message ----- > 2012-01-20 16:50, Andrew Haley skrev: > > This patch rewrites the ARM disassembler to use HSDIS rather than > > call > > binutils directly. This removes the build dependency on > > binutils-devel. We have to do this because binutils is GPLv3+ and > > HotSpot is GPLv2 only. I had to patch HSDIS itself to make it work > > on > > ARM; I'll send that patch upstream as well as to IcedTea. > minor note: doko pointed out that you may compile and link the code > as is using an old gplv2 licensed binutils-dev. > > > > > I also took the opportunity to use the global PrintAssembly > > setting, > > but the old T2EE_PRINT_DISASS environment variable stil works if > > you > > want to use that. > > > > This is for trunk and branch. > > > > Andrew. > > > > > > Thank you for bringing the asm port closer to regular hotspot > implementation. > I like this patch in large, some minor changes needed, comments > inline. > When those are fixed, ok for inclusion into icedtea6 head and 1.11 > release branch. > I'm very wary about introducing Makefile changes into a release branch at such a late stage. How does these changes affect other architectures? Is hsdis part of a regular build? I see $(CFLAGS) being added, which has the potential to cause new build breakage if the user can override it. -- 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 aph at redhat.com Mon Jan 23 06:54:01 2012 From: aph at redhat.com (Andrew Haley) Date: Mon, 23 Jan 2012 14:54:01 +0000 Subject: ARM: Rewrite disassembler to use hsdis In-Reply-To: References: Message-ID: <4F1D7489.8050508@redhat.com> On 01/23/2012 02:37 PM, Andrew Hughes wrote: > > I'm very wary about introducing Makefile changes into a release branch > at such a late stage. How does these changes affect other architectures? Not at all. > Is hsdis part of a regular build? No, hsdis is never built in any OpenJDK release. Andrew. From aph at redhat.com Mon Jan 23 06:56:30 2012 From: aph at redhat.com (Andrew Haley) Date: Mon, 23 Jan 2012 14:56:30 +0000 Subject: ARM: Rewrite disassembler to use hsdis In-Reply-To: <4F1D59F2.7060909@zafena.se> References: <4F198D55.9050202@redhat.com> <4F1D59F2.7060909@zafena.se> Message-ID: <4F1D751E.6020809@redhat.com> On 01/23/2012 01:00 PM, Xerxes R?nby wrote: > 2012-01-20 16:50, Andrew Haley skrev: >> This patch rewrites the ARM disassembler to use HSDIS rather than call >> binutils directly. This removes the build dependency on >> binutils-devel. We have to do this because binutils is GPLv3+ and >> HotSpot is GPLv2 only. I had to patch HSDIS itself to make it work on >> ARM; I'll send that patch upstream as well as to IcedTea. > minor note: doko pointed out that you may compile and link the code as is using an old gplv2 licensed binutils-dev. > > Please add a comment that reflect the magic number 14. > (11.33.07) xranby: aph: why the magic number 14 ? > (11.39.20) aph: xranby: cos that's how long the instruction sequence is. I haven't changed that. OK. > Also one level of {} can get removed in this block. OK. >> +--- openjdk/hotspot/src/share/tools/hsdis/Makefile 2011-11-14 17:07:33.000000000 -0500 >> ++++ openjdk/hotspot/src/share/tools/hsdis/Makefile 2012-01-20 10:20:32.000000000 -0500 >> +@@ -68,14 +68,18 @@ >> + CONFIGURE_ARGS= --host=$(MINGW) --target=$(MINGW) >> + else >> + CPU = $(shell uname -m) >> ++ifeq ($(CPU),armv7l) > > What about other arm CPUs? > How about ifneq ($(findstring arm,$(CPU)),) OK. Andrew. From aph at icedtea.classpath.org Mon Jan 23 07:10:47 2012 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Mon, 23 Jan 2012 15:10:47 +0000 Subject: /hg/icedtea6: 3 new changesets Message-ID: changeset fee509c4b992 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fee509c4b992 author: aph date: Fri Jan 20 10:51:50 2012 -0500 Rewrite disassembler to use the OpenJDK hsdis framework. 2012-01-20 Andrew Haley * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (Whole file): use PrintAssembly rather than t2ee_print_disass. (t2ee_print_disass): Delete. (class Hsdis):Rename. (Was class Opcodes.) Rewrite to use the OpenJDK hsdis framework. (Thumb2_disass): move Hsdis here from global scope. Rewrite to use the OpenJDK hsdis framework. * patches/arm-hsdis.patch: New file. * Makefile.am (ICEDTEA_PATCHES): Add patches/arm-hsdis.patch. changeset 1471221c3104 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1471221c3104 author: aph date: Fri Jan 20 14:04:34 2012 -0500 Return NULL to fix disassembler. 2012-01-20 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (print_address): Return NULL; changeset 825402ba63cb in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=825402ba63cb author: aph date: Mon Jan 23 09:49:12 2012 -0500 Minor tweaks to ARM hsdis patch. 2012-01-23 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_disass): Minor tidying. * patches/arm-hsdis.patch: Make test for ARM more generic. diffstat: ChangeLog | 23 ++++ Makefile.am | 1 + arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 154 ++++++++++++--------------- patches/arm-hsdis.patch | 88 ++++++++++++++++ 4 files changed, 181 insertions(+), 85 deletions(-) diffs (401 lines): diff -r abd30eaff5fc -r 825402ba63cb ChangeLog --- a/ChangeLog Thu Jan 19 17:33:20 2012 +0100 +++ b/ChangeLog Mon Jan 23 09:49:12 2012 -0500 @@ -4,6 +4,29 @@ * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Compile): Disable T2-JIT on unsupported targets like armv5. +2012-01-23 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_disass): + Minor tidying. + * patches/arm-hsdis.patch: Make test for ARM more generic. + +2012-01-20 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (print_address): + Return NULL; + +2012-01-20 Andrew Haley + + * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp + (Whole file): use PrintAssembly rather than t2ee_print_disass. + (t2ee_print_disass): Delete. + (class Hsdis):Rename. (Was class Opcodes.) + Rewrite to use the OpenJDK hsdis framework. + (Thumb2_disass): move Hsdis here from global scope. + Rewrite to use the OpenJDK hsdis framework. + * patches/arm-hsdis.patch: New file. + * Makefile.am (ICEDTEA_PATCHES): Add patches/arm-hsdis.patch. + 2012-01-19 Andrew Haley * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp diff -r abd30eaff5fc -r 825402ba63cb Makefile.am --- a/Makefile.am Thu Jan 19 17:33:20 2012 +0100 +++ b/Makefile.am Mon Jan 23 09:49:12 2012 -0500 @@ -399,6 +399,7 @@ patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \ patches/openjdk/7103224-glibc_name_collision.patch \ patches/arm-debug.patch \ + patches/arm-hsdis.patch \ patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \ patches/openjdk/7102369-7094468-rmiregistry.patch \ patches/openjdk/6851973-kerberos.patch \ diff -r abd30eaff5fc -r 825402ba63cb arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 19 17:33:20 2012 +0100 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Jan 23 09:49:12 2012 -0500 @@ -38,10 +38,6 @@ static char *t2ee_print_statistics; #endif -#ifdef T2EE_PRINT_DISASS -static char *t2ee_print_disass; -#endif - #ifdef T2EE_PRINT_REGUSAGE static char *t2ee_print_regusage; #endif @@ -56,11 +52,6 @@ #include "precompiled.hpp" #include "interpreter/bytecodes.hpp" -#ifdef T2EE_PRINT_DISASS -#include "dis-asm.h" -#include "bfd.h" -#endif - #define opc_nop 0x00 #define opc_aconst_null 0x01 #define opc_iconst_m1 0x02 @@ -725,41 +716,44 @@ #ifdef T2EE_PRINT_DISASS -class Opcodes { +class Hsdis { public: - typeof (::print_insn_little_arm) *print_insn_little_arm; - typeof (::init_disassemble_info) *init_disassemble_info; - typeof (::disassemble_init_for_target) *disassemble_init_for_target; - - // Load libopcodes.so lazily. - Opcodes() + + typedef void* (*decode_instructions_event_callback_ftype) (void*, const char*, void*); + + typedef void* (*decode_instructions_ftype) + (void* start, void* end, + decode_instructions_event_callback_ftype event_callback, + void* event_stream, + void* printf_callback, + void* printf_stream, + const char* options); + + decode_instructions_ftype decode_instructions; + + void *lib; + + // Load hsdis-arm.so lazily. + Hsdis() { - void *lib; - if (t2ee_print_disass) { - if (lib = dlopen("libopcodes.so", RTLD_NOW)) { - print_insn_little_arm - = (typeof print_insn_little_arm)dlsym(lib, "print_insn_little_arm"); - init_disassemble_info - = (typeof init_disassemble_info)dlsym(lib, "init_disassemble_info"); - disassemble_init_for_target - = (typeof disassemble_init_for_target)dlsym(lib, "disassemble_init_for_target"); + if (PrintAssembly) { + if (lib = dlopen("hsdis-arm.so", RTLD_NOW)) { + decode_instructions + = (typeof decode_instructions)dlsym(lib, "decode_instructions"); } - if (! (print_insn_little_arm - && init_disassemble_info - && disassemble_init_for_target)) - { - fprintf (stderr, "The environment variable T2EE_PRINT_DISASS is set, but\n" - "libopcodes.so has not been found or is invalid. If you want to\n" - "see a disassembly, please ensure that a valid copy of\n" - "libopcodes.so is present somewhere in your library load path.\n"); - abort(); - } + if (! (decode_instructions)) { + fprintf (stderr, "PrintAssembly (or T2EE_PRINT_DISASS) is set, but\n" + "hsdis-arm.so has not been found or is invalid. If you want to\n" + "see a disassembly, please ensure that a valid copy of\n" + "hsdis-arm.so is present somewhere in your library load path.\n"); + abort(); + } } } }; -static Opcodes opcodes; +static void *print_address(void *stream, const char *tag, void *data); void Thumb2_disass(Thumb2_Info *jinfo) { @@ -773,10 +767,11 @@ int start_b, end_b; unsigned nodisass; - struct disassemble_info info; unsigned short *codebuf = jinfo->codebuf->codebuf; unsigned idx, compiled_len; + static Hsdis hsdis; + #if 0 printf("Local Variable Usage\n"); printf("====================\n"); @@ -794,16 +789,6 @@ fflush(stdout); fflush(stderr); - opcodes.init_disassemble_info(&info, stdout, (fprintf_ftype)fprintf); - info.arch = bfd_arch_arm; - opcodes.disassemble_init_for_target(&info); - info.endian = BFD_ENDIAN_LITTLE; - info.endian_code = BFD_ENDIAN_LITTLE; - info.buffer = (bfd_byte *)codebuf; - info.buffer_vma = (bfd_vma)codebuf; - info.buffer_length = jinfo->codebuf->idx * sizeof(short); - info.disassembler_options = (char *)"force-thumb"; - compiled_len = jinfo->codebuf->idx * 2; for (idx = 0; idx < compiled_len; ) { nodisass = 0; @@ -867,14 +852,17 @@ low++; } bci += len; - for (i = 0; i < 4; i++) { + { + // The insn sequence generated by tableswitch is 14 + // bytes long. + const int tableswitch_code_len = 14; printf("0x%08x:\t", (int)codebuf+idx); - { - int len = opcodes.print_insn_little_arm((bfd_vma)codebuf+idx, &info); - if (len == -1) len = 2; - idx += len; - putchar('\n'); - } + unsigned short *p = codebuf + idx/2; + hsdis.decode_instructions((char*)p, + (char *)p + tableswitch_code_len, + print_address, NULL, NULL, stdout, + "force-thumb"); + idx += tableswitch_code_len; } for (i = 0; i < n; i++) { printf("0x%08x:\t.short\t0x%04x\n", (int)codebuf+idx, *(short *)((int)codebuf + idx)); @@ -929,7 +917,6 @@ } } if (!nodisass) { - printf("0x%08x:\t", (int)codebuf+idx); { int len; unsigned s1, s2; @@ -945,16 +932,27 @@ len = 4; } } else { - len = opcodes.print_insn_little_arm((bfd_vma)codebuf+idx, &info); - if (len == -1) len = 2; - idx += len; + char *p = (char*)codebuf + idx; + len = 2; + while (len + idx < compiled_len + && start_bci[(len + idx)/2] == -1) + len += 2; + hsdis.decode_instructions((char*)p, (char*)p + len, + print_address, NULL, NULL, stdout, + "force-thumb"); } - putchar('\n'); + idx += len; } } } fflush(stdout); } +// where +static void *print_address(void *, const char *tag, void *data) { + if (strcmp(tag, "insn") == 0) + printf("0x%08x:\t", data); + return NULL; +} #endif #define BCI(len, pop, push, special, islocal, islocal_n, isstore, local_n, local_type) \ @@ -7131,7 +7129,7 @@ #endif #ifdef T2EE_PRINT_COMPILATION - if (t2ee_print_compilation) { + if (t2ee_print_compilation || PrintAssembly) { fprintf(stderr, "Compiling %d %c%c %s\n", compiled_methods, method->is_synchronized() ? 'S' : ' ', @@ -7208,7 +7206,7 @@ #ifdef T2EE_PRINT_DISASS if (DISASS_AFTER == 0 || compiled_methods >= DISASS_AFTER) - if (t2ee_print_disass) + if (PrintAssembly) Thumb2_disass(&jinfo_str); #endif @@ -7383,7 +7381,7 @@ t2ee_print_statistics = getenv("T2EE_PRINT_STATISTICS"); #endif #ifdef T2EE_PRINT_DISASS - t2ee_print_disass = getenv("T2EE_PRINT_DISASS"); + PrintAssembly |= getenv("T2EE_PRINT_DISASS") != NULL; #endif #ifdef T2EE_PRINT_REGUSAGE t2ee_print_regusage = getenv("T2EE_PRINT_REGUSAGE"); @@ -7775,33 +7773,19 @@ mov_imm(&codebuf, ARM_R3, (u32)Thumb2_Handle_Exception_NoRegs); mov_reg(&codebuf, ARM_PC, ARM_R3); + // Disassemble the codebuf we just created. For debugging + if (PrintAssembly) { + Hsdis hsdis; + hsdis.decode_instructions(cb->hp, cb->hp + codebuf.idx * 2, + print_address, NULL, NULL, stdout, + "force-thumb"); + putchar('\n'); + } + Thumb2_Clear_Cache(cb->hp, cb->hp + codebuf.idx * 2); cb->hp += codebuf.idx * 2; thumb2_codebuf = cb; - -#if 0 // Disassemble the codebuf we just created. For debugging - Opcodes opcodes; - if (t2ee_print_disass) { - struct disassemble_info info; - info.arch = bfd_arch_arm; - opcodes.disassemble_init_for_target(&info); - opcodes.init_disassemble_info(&info, stdout, (fprintf_ftype)fprintf); - info.endian = BFD_ENDIAN_LITTLE; - info.endian_code = BFD_ENDIAN_LITTLE; - info.buffer = (bfd_byte *)codebuf.codebuf; - info.buffer_vma = (bfd_vma)codebuf.codebuf; - info.buffer_length = codebuf.idx * sizeof(short); - info.disassembler_options = (char *)"force-thumb"; - int len; - for (unsigned int i = 0; i < codebuf.idx * sizeof(short); i += len) { - printf("0x%08x:\t", ((int)codebuf.codebuf)+i); - len = opcodes.print_insn_little_arm(((bfd_vma)codebuf.codebuf)+i, &info); - if (len == -1) len = 2; - putchar('\n'); - } - } -#endif } #endif // THUMB2EE diff -r abd30eaff5fc -r 825402ba63cb patches/arm-hsdis.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/arm-hsdis.patch Mon Jan 23 09:49:12 2012 -0500 @@ -0,0 +1,90 @@ +2012-01-20 Andrew Haley + + * Makefile (ARCH): Add entry for armv7l. + (CFLAGS): Enable debugging. + ($(LIBRARIES)): Pass CFLAGS to sub-make. + * hsdis.c: Include string.h. + (parse_caller_options): Fix strncmp bug. + (native_arch_name): Add entry for ARM. + +diff -u openjdk/hotspot/src/share/tools/hsdis/hsdis.c ../icedtea6/openjdk/hotspot/src/share/tools/hsdis/hsdis.c +--- openjdk/hotspot/src/share/tools/hsdis/hsdis.c 2011-11-14 17:07:33.000000000 -0500 ++++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c 2012-01-20 10:21:28.000000000 -0500 +@@ -22,8 +22,6 @@ + * + */ + +-#include "precompiled.hpp" +- + /* hsdis.c -- dump a range of addresses as native instructions + This implements the plugin protocol required by the + HotSpot PrintAssembly option. +@@ -37,6 +35,8 @@ + #include + #include + ++#include ++ + #ifndef bool + #define bool int + #define true 1 +@@ -358,7 +358,7 @@ + if (plen > mach_size) plen = mach_size; + strncpy(mach_option, p, plen); + mach_option[plen] = '\0'; +- } else if (plen > 6 && strncmp(p, "hsdis-", 6)) { ++ } else if (plen > 6 && !strncmp(p, "hsdis-", 6)) { + // do not pass these to the next level + } else { + /* just copy it; {i386,sparc}-dis.c might like to see it */ +@@ -420,6 +420,9 @@ + #ifdef LIBARCH_sparcv9 + res = "sparc:v9b"; + #endif ++#ifdef LIBARCH_arm ++ res = "arm"; ++#endif + if (res == NULL) + res = "architecture not set in Makefile!"; + return res; +diff -u openjdk/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile +--- openjdk/hotspot/src/share/tools/hsdis/Makefile 2011-11-14 17:07:33.000000000 -0500 ++++ openjdk/hotspot/src/share/tools/hsdis/Makefile 2012-01-20 10:20:32.000000000 -0500 +@@ -68,14 +68,18 @@ + CONFIGURE_ARGS= --host=$(MINGW) --target=$(MINGW) + else + CPU = $(shell uname -m) ++ifneq ($(findstring arm,$(CPU)),) ++ARCH=arm ++else + ARCH1=$(CPU:x86_64=amd64) + ARCH=$(ARCH1:i686=i386) + CFLAGS/i386 += -m32 + CFLAGS/sparc += -m32 + CFLAGS/sparcv9 += -m64 + CFLAGS/amd64 += -m64 ++endif + CFLAGS += $(CFLAGS/$(ARCH)) +-CFLAGS += -fPIC ++CFLAGS += -fPIC -g + OS = linux + LIB_EXT = .so + CC = gcc +@@ -118,7 +122,7 @@ + BINUTILSDIR = $(shell cd $(BINUTILS);pwd) + endif + +-CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILS)/bfd -I$(TARGET_DIR)/bfd ++CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILSDIR)/bfd -I$(TARGET_DIR)/bfd + CPPFLAGS += -DLIBARCH_$(LIBARCH) -DLIBARCH=\"$(LIBARCH)\" -DLIB_EXT=\"$(LIB_EXT)\" + + TARGET_DIR = build/$(OS)-$(JDKARCH) +@@ -145,7 +149,7 @@ + demo: $(TARGET) $(DEMO_TARGET) + + $(LIBRARIES): $(TARGET_DIR) $(TARGET_DIR)/Makefile +- if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi ++ if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes "CFLAGS=$(CFLAGS)"; fi + + $(TARGET_DIR)/Makefile: + (cd $(TARGET_DIR); CC=$(CC) CFLAGS="$(CFLAGS)" $(BINUTILSDIR)/configure --disable-nls $(CONFIGURE_ARGS)) From aph at redhat.com Mon Jan 23 08:53:18 2012 From: aph at redhat.com (Andrew Haley) Date: Mon, 23 Jan 2012 16:53:18 +0000 Subject: ARM: Fix warning Message-ID: <4F1D907E.5060501@redhat.com> The Debian builder failed with a warning that I haven't seen. I think this must be because they're using a different version of gcc. /media/dh0/buildbot/icedtea/icedtea6-natty-armv7l-quick/build/openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp: In function 'void* print_address(void*, const char*, void*)': /media/dh0/buildbot/icedtea/icedtea6-natty-armv7l-quick/build/openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp:953:29: error: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'void*' [-Werror=format] cc1plus: all warnings being treated as errors Fixed thusly: obvious/trivial. Andrew. changeset: 2803:6179ebaffe6b tag: tip user: aph date: Mon Jan 23 16:43:01 2012 +0000 summary: Add cast to silence warning. diff -r 825402ba63cb -r 6179ebaffe6b ChangeLog --- a/ChangeLog Mon Jan 23 09:49:12 2012 -0500 +++ b/ChangeLog Mon Jan 23 16:43:01 2012 +0000 @@ -1,3 +1,8 @@ +2012-01-23 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (print_address): Add + cast to silence warning. + 2012-01-19 Xerxes R??nby Andrew Haley diff -r 825402ba63cb -r 6179ebaffe6b arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Jan 23 09:49:12 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Jan 23 16:43:01 2012 +0000 @@ -950,7 +950,7 @@ // where static void *print_address(void *, const char *tag, void *data) { if (strcmp(tag, "insn") == 0) - printf("0x%08x:\t", data); + printf("0x%08x:\t", (unsigned int)data); return NULL; } #endif From aph at icedtea.classpath.org Mon Jan 23 08:53:35 2012 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Mon, 23 Jan 2012 16:53:35 +0000 Subject: /hg/icedtea6: Add cast to silence warning. Message-ID: changeset 6179ebaffe6b in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6179ebaffe6b author: aph date: Mon Jan 23 16:43:01 2012 +0000 Add cast to silence warning. 2012-01-23 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (print_address): Add cast to silence warning. diffstat: ChangeLog | 5 +++++ arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diffs (24 lines): diff -r 825402ba63cb -r 6179ebaffe6b ChangeLog --- a/ChangeLog Mon Jan 23 09:49:12 2012 -0500 +++ b/ChangeLog Mon Jan 23 16:43:01 2012 +0000 @@ -1,3 +1,8 @@ +2012-01-23 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (print_address): Add + cast to silence warning. + 2012-01-19 Xerxes R??nby Andrew Haley diff -r 825402ba63cb -r 6179ebaffe6b arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Jan 23 09:49:12 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Jan 23 16:43:01 2012 +0000 @@ -950,7 +950,7 @@ // where static void *print_address(void *, const char *tag, void *data) { if (strcmp(tag, "insn") == 0) - printf("0x%08x:\t", data); + printf("0x%08x:\t", (unsigned int)data); return NULL; } #endif From aph at icedtea.classpath.org Mon Jan 23 08:58:01 2012 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Mon, 23 Jan 2012 16:58:01 +0000 Subject: /hg/release/icedtea6-1.11: 4 new changesets Message-ID: changeset 17a45cdfc108 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=17a45cdfc108 author: aph date: Fri Jan 20 10:51:50 2012 -0500 Rewrite disassembler to use the OpenJDK hsdis framework. 2012-01-20 Andrew Haley * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (Whole file): use PrintAssembly rather than t2ee_print_disass. (t2ee_print_disass): Delete. (class Hsdis):Rename. (Was class Opcodes.) Rewrite to use the OpenJDK hsdis framework. (Thumb2_disass): move Hsdis here from global scope. Rewrite to use the OpenJDK hsdis framework. * patches/arm-hsdis.patch: New file. * Makefile.am (ICEDTEA_PATCHES): Add patches/arm-hsdis.patch. changeset 68bfc595c849 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=68bfc595c849 author: aph date: Fri Jan 20 14:04:34 2012 -0500 Return NULL to fix disassembler. 2012-01-20 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (print_address): Return NULL; changeset c13852361818 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=c13852361818 author: aph date: Mon Jan 23 09:49:12 2012 -0500 Minor tweaks to ARM hsdis patch. 2012-01-23 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_disass): Minor tidying. * patches/arm-hsdis.patch: Make test for ARM more generic. changeset 6aa2b2fc20ba in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=6aa2b2fc20ba author: aph date: Mon Jan 23 16:43:01 2012 +0000 Add cast to silence warning. 2012-01-23 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (print_address): Add cast to silence warning. diffstat: ChangeLog | 28 +++++ Makefile.am | 1 + arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 154 ++++++++++++--------------- patches/arm-hsdis.patch | 88 ++++++++++++++++ 4 files changed, 186 insertions(+), 85 deletions(-) diffs (409 lines): diff -r aa81d0648c82 -r 6aa2b2fc20ba ChangeLog --- a/ChangeLog Thu Jan 19 17:41:09 2012 +0100 +++ b/ChangeLog Mon Jan 23 16:43:01 2012 +0000 @@ -1,9 +1,37 @@ +2012-01-23 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (print_address): Add + cast to silence warning. + 2012-01-19 Xerxes R??nby Andrew Haley * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Compile): Disable T2-JIT on unsupported targets like armv5. +2012-01-23 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_disass): + Minor tidying. + * patches/arm-hsdis.patch: Make test for ARM more generic. + +2012-01-20 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (print_address): + Return NULL; + +2012-01-20 Andrew Haley + + * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp + (Whole file): use PrintAssembly rather than t2ee_print_disass. + (t2ee_print_disass): Delete. + (class Hsdis):Rename. (Was class Opcodes.) + Rewrite to use the OpenJDK hsdis framework. + (Thumb2_disass): move Hsdis here from global scope. + Rewrite to use the OpenJDK hsdis framework. + * patches/arm-hsdis.patch: New file. + * Makefile.am (ICEDTEA_PATCHES): Add patches/arm-hsdis.patch. + 2012-01-19 Andrew Haley * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp diff -r aa81d0648c82 -r 6aa2b2fc20ba Makefile.am --- a/Makefile.am Thu Jan 19 17:41:09 2012 +0100 +++ b/Makefile.am Mon Jan 23 16:43:01 2012 +0000 @@ -399,6 +399,7 @@ patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \ patches/openjdk/7103224-glibc_name_collision.patch \ patches/arm-debug.patch \ + patches/arm-hsdis.patch \ patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \ patches/openjdk/7102369-7094468-rmiregistry.patch \ patches/openjdk/6851973-kerberos.patch \ diff -r aa81d0648c82 -r 6aa2b2fc20ba arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 19 17:41:09 2012 +0100 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Jan 23 16:43:01 2012 +0000 @@ -38,10 +38,6 @@ static char *t2ee_print_statistics; #endif -#ifdef T2EE_PRINT_DISASS -static char *t2ee_print_disass; -#endif - #ifdef T2EE_PRINT_REGUSAGE static char *t2ee_print_regusage; #endif @@ -56,11 +52,6 @@ #include "precompiled.hpp" #include "interpreter/bytecodes.hpp" -#ifdef T2EE_PRINT_DISASS -#include "dis-asm.h" -#include "bfd.h" -#endif - #define opc_nop 0x00 #define opc_aconst_null 0x01 #define opc_iconst_m1 0x02 @@ -725,41 +716,44 @@ #ifdef T2EE_PRINT_DISASS -class Opcodes { +class Hsdis { public: - typeof (::print_insn_little_arm) *print_insn_little_arm; - typeof (::init_disassemble_info) *init_disassemble_info; - typeof (::disassemble_init_for_target) *disassemble_init_for_target; - - // Load libopcodes.so lazily. - Opcodes() + + typedef void* (*decode_instructions_event_callback_ftype) (void*, const char*, void*); + + typedef void* (*decode_instructions_ftype) + (void* start, void* end, + decode_instructions_event_callback_ftype event_callback, + void* event_stream, + void* printf_callback, + void* printf_stream, + const char* options); + + decode_instructions_ftype decode_instructions; + + void *lib; + + // Load hsdis-arm.so lazily. + Hsdis() { - void *lib; - if (t2ee_print_disass) { - if (lib = dlopen("libopcodes.so", RTLD_NOW)) { - print_insn_little_arm - = (typeof print_insn_little_arm)dlsym(lib, "print_insn_little_arm"); - init_disassemble_info - = (typeof init_disassemble_info)dlsym(lib, "init_disassemble_info"); - disassemble_init_for_target - = (typeof disassemble_init_for_target)dlsym(lib, "disassemble_init_for_target"); + if (PrintAssembly) { + if (lib = dlopen("hsdis-arm.so", RTLD_NOW)) { + decode_instructions + = (typeof decode_instructions)dlsym(lib, "decode_instructions"); } - if (! (print_insn_little_arm - && init_disassemble_info - && disassemble_init_for_target)) - { - fprintf (stderr, "The environment variable T2EE_PRINT_DISASS is set, but\n" - "libopcodes.so has not been found or is invalid. If you want to\n" - "see a disassembly, please ensure that a valid copy of\n" - "libopcodes.so is present somewhere in your library load path.\n"); - abort(); - } + if (! (decode_instructions)) { + fprintf (stderr, "PrintAssembly (or T2EE_PRINT_DISASS) is set, but\n" + "hsdis-arm.so has not been found or is invalid. If you want to\n" + "see a disassembly, please ensure that a valid copy of\n" + "hsdis-arm.so is present somewhere in your library load path.\n"); + abort(); + } } } }; -static Opcodes opcodes; +static void *print_address(void *stream, const char *tag, void *data); void Thumb2_disass(Thumb2_Info *jinfo) { @@ -773,10 +767,11 @@ int start_b, end_b; unsigned nodisass; - struct disassemble_info info; unsigned short *codebuf = jinfo->codebuf->codebuf; unsigned idx, compiled_len; + static Hsdis hsdis; + #if 0 printf("Local Variable Usage\n"); printf("====================\n"); @@ -794,16 +789,6 @@ fflush(stdout); fflush(stderr); - opcodes.init_disassemble_info(&info, stdout, (fprintf_ftype)fprintf); - info.arch = bfd_arch_arm; - opcodes.disassemble_init_for_target(&info); - info.endian = BFD_ENDIAN_LITTLE; - info.endian_code = BFD_ENDIAN_LITTLE; - info.buffer = (bfd_byte *)codebuf; - info.buffer_vma = (bfd_vma)codebuf; - info.buffer_length = jinfo->codebuf->idx * sizeof(short); - info.disassembler_options = (char *)"force-thumb"; - compiled_len = jinfo->codebuf->idx * 2; for (idx = 0; idx < compiled_len; ) { nodisass = 0; @@ -867,14 +852,17 @@ low++; } bci += len; - for (i = 0; i < 4; i++) { + { + // The insn sequence generated by tableswitch is 14 + // bytes long. + const int tableswitch_code_len = 14; printf("0x%08x:\t", (int)codebuf+idx); - { - int len = opcodes.print_insn_little_arm((bfd_vma)codebuf+idx, &info); - if (len == -1) len = 2; - idx += len; - putchar('\n'); - } + unsigned short *p = codebuf + idx/2; + hsdis.decode_instructions((char*)p, + (char *)p + tableswitch_code_len, + print_address, NULL, NULL, stdout, + "force-thumb"); + idx += tableswitch_code_len; } for (i = 0; i < n; i++) { printf("0x%08x:\t.short\t0x%04x\n", (int)codebuf+idx, *(short *)((int)codebuf + idx)); @@ -929,7 +917,6 @@ } } if (!nodisass) { - printf("0x%08x:\t", (int)codebuf+idx); { int len; unsigned s1, s2; @@ -945,16 +932,27 @@ len = 4; } } else { - len = opcodes.print_insn_little_arm((bfd_vma)codebuf+idx, &info); - if (len == -1) len = 2; - idx += len; + char *p = (char*)codebuf + idx; + len = 2; + while (len + idx < compiled_len + && start_bci[(len + idx)/2] == -1) + len += 2; + hsdis.decode_instructions((char*)p, (char*)p + len, + print_address, NULL, NULL, stdout, + "force-thumb"); } - putchar('\n'); + idx += len; } } } fflush(stdout); } +// where +static void *print_address(void *, const char *tag, void *data) { + if (strcmp(tag, "insn") == 0) + printf("0x%08x:\t", (unsigned int)data); + return NULL; +} #endif #define BCI(len, pop, push, special, islocal, islocal_n, isstore, local_n, local_type) \ @@ -7131,7 +7129,7 @@ #endif #ifdef T2EE_PRINT_COMPILATION - if (t2ee_print_compilation) { + if (t2ee_print_compilation || PrintAssembly) { fprintf(stderr, "Compiling %d %c%c %s\n", compiled_methods, method->is_synchronized() ? 'S' : ' ', @@ -7208,7 +7206,7 @@ #ifdef T2EE_PRINT_DISASS if (DISASS_AFTER == 0 || compiled_methods >= DISASS_AFTER) - if (t2ee_print_disass) + if (PrintAssembly) Thumb2_disass(&jinfo_str); #endif @@ -7383,7 +7381,7 @@ t2ee_print_statistics = getenv("T2EE_PRINT_STATISTICS"); #endif #ifdef T2EE_PRINT_DISASS - t2ee_print_disass = getenv("T2EE_PRINT_DISASS"); + PrintAssembly |= getenv("T2EE_PRINT_DISASS") != NULL; #endif #ifdef T2EE_PRINT_REGUSAGE t2ee_print_regusage = getenv("T2EE_PRINT_REGUSAGE"); @@ -7775,33 +7773,19 @@ mov_imm(&codebuf, ARM_R3, (u32)Thumb2_Handle_Exception_NoRegs); mov_reg(&codebuf, ARM_PC, ARM_R3); + // Disassemble the codebuf we just created. For debugging + if (PrintAssembly) { + Hsdis hsdis; + hsdis.decode_instructions(cb->hp, cb->hp + codebuf.idx * 2, + print_address, NULL, NULL, stdout, + "force-thumb"); + putchar('\n'); + } + Thumb2_Clear_Cache(cb->hp, cb->hp + codebuf.idx * 2); cb->hp += codebuf.idx * 2; thumb2_codebuf = cb; - -#if 0 // Disassemble the codebuf we just created. For debugging - Opcodes opcodes; - if (t2ee_print_disass) { - struct disassemble_info info; - info.arch = bfd_arch_arm; - opcodes.disassemble_init_for_target(&info); - opcodes.init_disassemble_info(&info, stdout, (fprintf_ftype)fprintf); - info.endian = BFD_ENDIAN_LITTLE; - info.endian_code = BFD_ENDIAN_LITTLE; - info.buffer = (bfd_byte *)codebuf.codebuf; - info.buffer_vma = (bfd_vma)codebuf.codebuf; - info.buffer_length = codebuf.idx * sizeof(short); - info.disassembler_options = (char *)"force-thumb"; - int len; - for (unsigned int i = 0; i < codebuf.idx * sizeof(short); i += len) { - printf("0x%08x:\t", ((int)codebuf.codebuf)+i); - len = opcodes.print_insn_little_arm(((bfd_vma)codebuf.codebuf)+i, &info); - if (len == -1) len = 2; - putchar('\n'); - } - } -#endif } #endif // THUMB2EE diff -r aa81d0648c82 -r 6aa2b2fc20ba patches/arm-hsdis.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/arm-hsdis.patch Mon Jan 23 16:43:01 2012 +0000 @@ -0,0 +1,90 @@ +2012-01-20 Andrew Haley + + * Makefile (ARCH): Add entry for armv7l. + (CFLAGS): Enable debugging. + ($(LIBRARIES)): Pass CFLAGS to sub-make. + * hsdis.c: Include string.h. + (parse_caller_options): Fix strncmp bug. + (native_arch_name): Add entry for ARM. + +diff -u openjdk/hotspot/src/share/tools/hsdis/hsdis.c ../icedtea6/openjdk/hotspot/src/share/tools/hsdis/hsdis.c +--- openjdk/hotspot/src/share/tools/hsdis/hsdis.c 2011-11-14 17:07:33.000000000 -0500 ++++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c 2012-01-20 10:21:28.000000000 -0500 +@@ -22,8 +22,6 @@ + * + */ + +-#include "precompiled.hpp" +- + /* hsdis.c -- dump a range of addresses as native instructions + This implements the plugin protocol required by the + HotSpot PrintAssembly option. +@@ -37,6 +35,8 @@ + #include + #include + ++#include ++ + #ifndef bool + #define bool int + #define true 1 +@@ -358,7 +358,7 @@ + if (plen > mach_size) plen = mach_size; + strncpy(mach_option, p, plen); + mach_option[plen] = '\0'; +- } else if (plen > 6 && strncmp(p, "hsdis-", 6)) { ++ } else if (plen > 6 && !strncmp(p, "hsdis-", 6)) { + // do not pass these to the next level + } else { + /* just copy it; {i386,sparc}-dis.c might like to see it */ +@@ -420,6 +420,9 @@ + #ifdef LIBARCH_sparcv9 + res = "sparc:v9b"; + #endif ++#ifdef LIBARCH_arm ++ res = "arm"; ++#endif + if (res == NULL) + res = "architecture not set in Makefile!"; + return res; +diff -u openjdk/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile +--- openjdk/hotspot/src/share/tools/hsdis/Makefile 2011-11-14 17:07:33.000000000 -0500 ++++ openjdk/hotspot/src/share/tools/hsdis/Makefile 2012-01-20 10:20:32.000000000 -0500 +@@ -68,14 +68,18 @@ + CONFIGURE_ARGS= --host=$(MINGW) --target=$(MINGW) + else + CPU = $(shell uname -m) ++ifneq ($(findstring arm,$(CPU)),) ++ARCH=arm ++else + ARCH1=$(CPU:x86_64=amd64) + ARCH=$(ARCH1:i686=i386) + CFLAGS/i386 += -m32 + CFLAGS/sparc += -m32 + CFLAGS/sparcv9 += -m64 + CFLAGS/amd64 += -m64 ++endif + CFLAGS += $(CFLAGS/$(ARCH)) +-CFLAGS += -fPIC ++CFLAGS += -fPIC -g + OS = linux + LIB_EXT = .so + CC = gcc +@@ -118,7 +122,7 @@ + BINUTILSDIR = $(shell cd $(BINUTILS);pwd) + endif + +-CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILS)/bfd -I$(TARGET_DIR)/bfd ++CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILSDIR)/bfd -I$(TARGET_DIR)/bfd + CPPFLAGS += -DLIBARCH_$(LIBARCH) -DLIBARCH=\"$(LIBARCH)\" -DLIB_EXT=\"$(LIB_EXT)\" + + TARGET_DIR = build/$(OS)-$(JDKARCH) +@@ -145,7 +149,7 @@ + demo: $(TARGET) $(DEMO_TARGET) + + $(LIBRARIES): $(TARGET_DIR) $(TARGET_DIR)/Makefile +- if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi ++ if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes "CFLAGS=$(CFLAGS)"; fi + + $(TARGET_DIR)/Makefile: + (cd $(TARGET_DIR); CC=$(CC) CFLAGS="$(CFLAGS)" $(BINUTILSDIR)/configure --disable-nls $(CONFIGURE_ARGS)) From omajid at redhat.com Mon Jan 23 09:02:28 2012 From: omajid at redhat.com (Omair Majid) Date: Mon, 23 Jan 2012 12:02:28 -0500 Subject: Pushing back the IcedTea6 1.11 release: 2012-01-25 In-Reply-To: <4F16F1EE.4000506@redhat.com> References: <4F0771B8.4080106@redhat.com> <4F16F1EE.4000506@redhat.com> Message-ID: <4F1D92A4.9090708@redhat.com> On 01/18/2012 11:23 AM, Omair Majid wrote: > How does 1 week (2012-01-25) sound? > Things are looking much better with the arm stuff now. It looks like IcedTea6 1.11 on 2012-01-25 will be doable. Cheers, Omair From ahughes at redhat.com Mon Jan 23 13:12:25 2012 From: ahughes at redhat.com (Andrew Hughes) Date: Mon, 23 Jan 2012 16:12:25 -0500 (EST) Subject: ARM: Rewrite disassembler to use hsdis In-Reply-To: <4F1D7489.8050508@redhat.com> Message-ID: <61bbcd86-b9d4-4c4c-88fa-6a336c753dab@zmail16.collab.prod.int.phx2.redhat.com> ----- Original Message ----- > On 01/23/2012 02:37 PM, Andrew Hughes wrote: > > > > I'm very wary about introducing Makefile changes into a release > > branch > > at such a late stage. How does these changes affect other > > architectures? > > Not at all. > These chunks would certainly seem to: +-CFLAGS += -fPIC ++CFLAGS += -fPIC -g +-CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILS)/bfd -I$(TARGET_DIR)/bfd ++CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILSDIR)/bfd -I$(TARGET_DIR)/bfd +- if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi ++ if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes "CFLAGS=$(CFLAGS)"; fi As far as I can tell from the hard-to-read patch-within-a-patch, this part isn't within an ARM #ifdef. Have you posted this upstream yet? I'd be interested to hear Kelly's thoughts. > > Is hsdis part of a regular build? > > No, hsdis is never built in any OpenJDK release. > Ok, so how it is built? Just via icedtea-debug? > 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 ahughes at redhat.com Mon Jan 23 13:21:03 2012 From: ahughes at redhat.com (Andrew Hughes) Date: Mon, 23 Jan 2012 16:21:03 -0500 (EST) Subject: Pushing back the IcedTea6 1.11 release: 2012-01-25 In-Reply-To: <4F1D92A4.9090708@redhat.com> Message-ID: ----- Original Message ----- > On 01/18/2012 11:23 AM, Omair Majid wrote: > > How does 1 week (2012-01-25) sound? > > > > Things are looking much better with the arm stuff now. It looks like > IcedTea6 1.11 on 2012-01-25 will be doable. > I don't think this is a good idea. There's an upcoming security release that will make such a release obsolete just three weeks after: http://www.oracle.com/technetwork/topics/security/alerts-086861.html Would it not be better to just wait and release 1.11 with these security fixes? I also still see a large number of ARM patches coming in from Andrew which suggests the branch isn't as stable as you say. It especially worries me that this last hsdis patch was pushed to the release branch when it was still under discussion. I don't see any benefit in rushing this release. Let's take time and make a worthwhile release. > Cheers, > Omair > -- 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 redhat.com Mon Jan 23 13:41:43 2012 From: omajid at redhat.com (Omair Majid) Date: Mon, 23 Jan 2012 16:41:43 -0500 Subject: Pushing back the IcedTea6 1.11 release: 2012-01-25 In-Reply-To: References: Message-ID: <4F1DD417.9090705@redhat.com> On 01/23/2012 04:21 PM, Andrew Hughes wrote: > ----- Original Message ----- >> On 01/18/2012 11:23 AM, Omair Majid wrote: >>> How does 1 week (2012-01-25) sound? >>> >> >> Things are looking much better with the arm stuff now. It looks like >> IcedTea6 1.11 on 2012-01-25 will be doable. >> > > I don't think this is a good idea. There's an upcoming security release > that will make such a release obsolete just three weeks after: > > http://www.oracle.com/technetwork/topics/security/alerts-086861.html > > Would it not be better to just wait and release 1.11 with these security > fixes? FWIW, I think three weeks of users being able to benefit from the release is still worth it. > I also still see a large number of ARM patches coming in from > Andrew which suggests the branch isn't as stable as you say. Yes, I am a little concerned about stability too. I believe that both Andrew Haley and Xerxes are happy with the arm stuff after the latest patch (which was pushed a few hours ago). > I don't see any benefit in rushing this release. Let's take time and make > a worthwhile release. I agree. However, I would rather not push this back all the way to the security release date. Cheers, Omair From omajid at redhat.com Mon Jan 23 14:48:34 2012 From: omajid at redhat.com (Omair Majid) Date: Mon, 23 Jan 2012 17:48:34 -0500 Subject: ARM: Rewrite disassembler to use hsdis In-Reply-To: <61bbcd86-b9d4-4c4c-88fa-6a336c753dab@zmail16.collab.prod.int.phx2.redhat.com> References: <61bbcd86-b9d4-4c4c-88fa-6a336c753dab@zmail16.collab.prod.int.phx2.redhat.com> Message-ID: <4F1DE3C2.7000705@redhat.com> On 01/23/2012 04:12 PM, Andrew Hughes wrote: > ----- Original Message ----- >> On 01/23/2012 02:37 PM, Andrew Hughes wrote: >>> >>> I'm very wary about introducing Makefile changes into a release >>> branch >>> at such a late stage. How does these changes affect other >>> architectures? >> >> Not at all. >> > > These chunks would certainly seem to: > > +-CFLAGS += -fPIC > ++CFLAGS += -fPIC -g > > +-CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILS)/bfd -I$(TARGET_DIR)/bfd > ++CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILSDIR)/bfd -I$(TARGET_DIR)/bfd > > +- if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi > ++ if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes "CFLAGS=$(CFLAGS)"; fi > > As far as I can tell from the hard-to-read patch-within-a-patch, this part isn't within > an ARM #ifdef. > > Have you posted this upstream yet? I'd be interested to hear Kelly's thoughts. > +1. This looks like something that should be upstream. FWIW, the impact of the flags/changes is limited to the hsdis stuff though. >>> Is hsdis part of a regular build? >> >> No, hsdis is never built in any OpenJDK release. >> > > Ok, so how it is built? Just via icedtea-debug? > I did a debug-build and no *hsdis* file anywhere. Though (on x86_64) I do see assembly printing after applying this patch. $ openjdk.build-debug/j2sdk-image/bin/java -XX:+UnlockDiagnosticVMOptions -XX:+PrintAssembly -XX:+PrintCompilation -Xcomp -version OpenJDK 64-Bit Server VM warning: PrintAssembly is enabled; turning on DebugNonSafepoints to gain additional output Could not load hsdis-amd64.so; library not loadable; PrintAssembly is disabled PrintAssembly request changed to PrintOptoAssembly [ ... lots of assembler output removed ... ] Cheers, Omair From peter at morch.com Mon Jan 23 23:42:14 2012 From: peter at morch.com (=?ISO-8859-1?Q?Peter_Valdemar_M=F8rch?=) Date: Tue, 24 Jan 2012 08:42:14 +0100 Subject: [Bug 854] New: Resizing an applet several times causes 100% CPU load Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=854 I've had no comments on this at all, and I was mostly wondering: Is this an appropriate bug against icedtea, or is there another of the http://mail.openjdk.java.net/mailman/listinfo mailing lists that are more appropriate? Peter -- Peter Valdemar M?rch http://www.morch.com From aph at redhat.com Tue Jan 24 01:36:52 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 24 Jan 2012 09:36:52 +0000 Subject: ARM: Rewrite disassembler to use hsdis In-Reply-To: <61bbcd86-b9d4-4c4c-88fa-6a336c753dab@zmail16.collab.prod.int.phx2.redhat.com> References: <61bbcd86-b9d4-4c4c-88fa-6a336c753dab@zmail16.collab.prod.int.phx2.redhat.com> Message-ID: <4F1E7BB4.1030003@redhat.com> On 01/23/2012 09:12 PM, Andrew Hughes wrote: > ----- Original Message ----- >> On 01/23/2012 02:37 PM, Andrew Hughes wrote: >>> >>> I'm very wary about introducing Makefile changes into a release >>> branch >>> at such a late stage. How does these changes affect other >>> architectures? >> >> Not at all. > > These chunks would certainly seem to: > > +-CFLAGS += -fPIC > ++CFLAGS += -fPIC -g > > +-CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILS)/bfd -I$(TARGET_DIR)/bfd > ++CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILSDIR)/bfd -I$(TARGET_DIR)/bfd > > +- if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi > ++ if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes "CFLAGS=$(CFLAGS)"; fi > > As far as I can tell from the hard-to-read patch-within-a-patch, this part isn't within > an ARM #ifdef. Sure, but hsdis didn't build at all on any arch, so I'm pretty sure that other arches aren't affected, unless you count "now builds" as an affect. > Have you posted this upstream yet? I'd be interested to hear Kelly's thoughts. > >>> Is hsdis part of a regular build? >> >> No, hsdis is never built in any OpenJDK release. > > Ok, so how it is built? Just via icedtea-debug? It's built by the user, if they want disassembly. It's not part of any OpenJDK build. It's not built for some time on IcedTea, as far as I can tell. Andrew. From aph at redhat.com Tue Jan 24 01:38:06 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 24 Jan 2012 09:38:06 +0000 Subject: Pushing back the IcedTea6 1.11 release: 2012-01-25 In-Reply-To: References: Message-ID: <4F1E7BFE.90506@redhat.com> On 01/23/2012 09:21 PM, Andrew Hughes wrote: > Would it not be better to just wait and release 1.11 with these security > fixes? I also still see a large number of ARM patches coming in from > Andrew which suggests the branch isn't as stable as you say. There were a couple outstanding, but as far as I can see it's done now. > It especially worries me that this last hsdis patch was pushed to > the release branch when it was still under discussion. The patch was reviewed and checked. What more was there to discuss? I replied to the last question, and no more was forthcoming. I've seen a reply now, and replied to it. Andrew. From aph at redhat.com Tue Jan 24 01:43:32 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 24 Jan 2012 09:43:32 +0000 Subject: ARM: Rewrite disassembler to use hsdis In-Reply-To: <4F1DE3C2.7000705@redhat.com> References: <61bbcd86-b9d4-4c4c-88fa-6a336c753dab@zmail16.collab.prod.int.phx2.redhat.com> <4F1DE3C2.7000705@redhat.com> Message-ID: <4F1E7D44.3050008@redhat.com> On 01/23/2012 10:48 PM, Omair Majid wrote: > On 01/23/2012 04:12 PM, Andrew Hughes wrote: >> ----- Original Message ----- >>> On 01/23/2012 02:37 PM, Andrew Hughes wrote: >>>> >>>> I'm very wary about introducing Makefile changes into a release >>>> branch >>>> at such a late stage. How does these changes affect other >>>> architectures? >>> >>> Not at all. >>> >> >> These chunks would certainly seem to: >> >> +-CFLAGS += -fPIC >> ++CFLAGS += -fPIC -g >> >> +-CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILS)/bfd -I$(TARGET_DIR)/bfd >> ++CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILSDIR)/bfd -I$(TARGET_DIR)/bfd >> >> +- if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi >> ++ if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes "CFLAGS=$(CFLAGS)"; fi >> >> As far as I can tell from the hard-to-read patch-within-a-patch, this part isn't within >> an ARM #ifdef. >> >> Have you posted this upstream yet? I'd be interested to hear Kelly's thoughts. Some of the patch adds ARM support, and this is done in the most minimal way possible. Some of it is a backport from upstream, and some of it is a bug that I'm discussing with John Rose who wrote hsdis. This hunk simply makes sure that hsdis itself is built withe debugging enabled. None of this can possibly affect any IcedTea release, because hsdis is never built as part of an IcedTea build on any architecture. It's purely provided as a utility for people debugging IcedTea. Andrew. From aph at redhat.com Tue Jan 24 03:02:24 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 24 Jan 2012 11:02:24 +0000 Subject: Pushing back the IcedTea6 1.11 release: 2012-01-25 In-Reply-To: References: Message-ID: <4F1E8FC0.1010002@redhat.com> On 01/23/2012 09:21 PM, Andrew Hughes wrote: > ----- Original Message ----- >> On 01/18/2012 11:23 AM, Omair Majid wrote: >>> How does 1 week (2012-01-25) sound? >>> >> >> Things are looking much better with the arm stuff now. It looks like >> IcedTea6 1.11 on 2012-01-25 will be doable. >> > > I don't think this is a good idea. There's an upcoming security release > that will make such a release obsolete just three weeks after: > > http://www.oracle.com/technetwork/topics/security/alerts-086861.html > > Would it not be better to just wait and release 1.11 with these security > fixes? I'm not sure what the advantage of waiting is. It'd reduce the work needed, certainly, but it'd also mean that the Fedora distro would have to wait an extra three weeks. Andrew. From ahughes at redhat.com Tue Jan 24 04:43:04 2012 From: ahughes at redhat.com (Andrew Hughes) Date: Tue, 24 Jan 2012 07:43:04 -0500 (EST) Subject: ARM: Rewrite disassembler to use hsdis In-Reply-To: <4F1E7BB4.1030003@redhat.com> Message-ID: <142ccdb0-cd1f-4e4c-b24c-c3914a292503@zmail16.collab.prod.int.phx2.redhat.com> ----- Original Message ----- > On 01/23/2012 09:12 PM, Andrew Hughes wrote: > > ----- Original Message ----- > >> On 01/23/2012 02:37 PM, Andrew Hughes wrote: > >>> > >>> I'm very wary about introducing Makefile changes into a release > >>> branch > >>> at such a late stage. How does these changes affect other > >>> architectures? > >> > >> Not at all. > > > > These chunks would certainly seem to: > > > > +-CFLAGS += -fPIC > > ++CFLAGS += -fPIC -g > > > > +-CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILS)/bfd > > -I$(TARGET_DIR)/bfd > > ++CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILSDIR)/bfd > > -I$(TARGET_DIR)/bfd > > > > +- if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi > > ++ if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes > > "CFLAGS=$(CFLAGS)"; fi > > > > As far as I can tell from the hard-to-read patch-within-a-patch, > > this part isn't within > > an ARM #ifdef. > > Sure, but hsdis didn't build at all on any arch, so I'm pretty sure > that other arches aren't affected, unless you count "now builds" as > an > affect. > > > Have you posted this upstream yet? I'd be interested to hear > > Kelly's thoughts. > > > >>> Is hsdis part of a regular build? > >> > >> No, hsdis is never built in any OpenJDK release. > > > > Ok, so how it is built? Just via icedtea-debug? > > It's built by the user, if they want disassembly. It's not part > of any OpenJDK build. It's not built for some time on IcedTea, as > far as I can tell. > So what I gather from this is that if you want to build hsdis, you have to manually run make on the directory containing the hsdis Makefile. Is that correct? If so, I can see that this may break building it in some cases where it worked before, but, from what you imply, the likelihood of this makes the risk negligible. I do still think the Makefile changes need to go upstream. > 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 ahughes at redhat.com Tue Jan 24 04:45:18 2012 From: ahughes at redhat.com (Andrew Hughes) Date: Tue, 24 Jan 2012 07:45:18 -0500 (EST) Subject: Pushing back the IcedTea6 1.11 release: 2012-01-25 In-Reply-To: <4F1DD417.9090705@redhat.com> Message-ID: <485ed187-01c8-4615-80a0-20a87cffbe93@zmail16.collab.prod.int.phx2.redhat.com> ----- Original Message ----- > On 01/23/2012 04:21 PM, Andrew Hughes wrote: > > ----- Original Message ----- > >> On 01/18/2012 11:23 AM, Omair Majid wrote: > >>> How does 1 week (2012-01-25) sound? > >>> > >> > >> Things are looking much better with the arm stuff now. It looks > >> like > >> IcedTea6 1.11 on 2012-01-25 will be doable. > >> > > > > I don't think this is a good idea. There's an upcoming security > > release > > that will make such a release obsolete just three weeks after: > > > > http://www.oracle.com/technetwork/topics/security/alerts-086861.html > > > > Would it not be better to just wait and release 1.11 with these > > security > > fixes? > > FWIW, I think three weeks of users being able to benefit from the > release is still worth it. > Well, you're the one doing the work twice over in a short space of time, so it's up to you. My worry is that this obsoletes 1.8 and then provides a security update just three weeks later. Under the circumstances, I think a further 1.8 release with the security updates is in order before obsoleting that branch. > > Cheers, > Omair > -- 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 jvanek at redhat.com Tue Jan 24 05:40:59 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 24 Jan 2012 14:40:59 +0100 Subject: [RFC][icedtea-web] PR833 - icedtea-web is failing when cache is corupted. In-Reply-To: <20120110033146.GT2930@redhat.com> References: <4EE77F01.8060803@redhat.com> <20111219154104.GB31743@redhat.com> <4EF0B4DA.5060902@redhat.com> <20120110033146.GT2930@redhat.com> Message-ID: <4F1EB4EB.4060307@redhat.com> On 01/10/2012 04:31 AM, Deepak Bhole wrote: > Hi Jiri, > > Sorry for the lateness on this. Haven't been able to get to it till now. > > Overall, I think the patch is fine. I do have a few minor nitpicks below > though: > > * Jiri Vanek [2011-12-20 11:15]: >> On 12/19/2011 04:41 PM, Deepak Bhole wrote: >>> * Jiri Vanek [2011-12-13 11:36]: >>>> 2011-12-13 Jiri Vanek >>>> >>>> Fix for PR844 >>>> * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: (getLRUSortedEntries) >>>> instead of error throwing own LRU exception. Also catches more then NumberFormatException >>>> (clearLRUSortedEntries) new method - making soft clearing of cache public >>>> (clearCache) now return true if cache was cleared, false otherwise (or exception) >>>> * netx/net/sourceforge/jnlp/cache/CacheUtil.java: (getCacheFileIfExist) does three tires to load cache. >>>> If ifrst fails, then recently_used file is emptied both in memory and on disc. >>>> When second attemmpt fails, then LRU cache is forcibly cleared. if clearing fails, then error is thrown. >>>> If it pass, then one more try to load entries is allowed. When third attempt fails, then error is thrown. >>>> * /netx/net/sourceforge/jnlp/cache/LruCacheException.java: >>>> new file, for purpose of catching this particular exception >>>> * netx/net/sourceforge/jnlp/util/PropertiesFile.java: (store) tries to mkdirs to its path. >>>> It is better then to fail when no cache directory exists. >>>> * tests/jnlp_tests/signed/CacheReproducer: new reproducr trying severals way of corupted cache >>>> on several types of jnlp files. Is signed because of reflection used. >>>> * tests/jnlp_tests/signed/SimpletestSigned1: signed hello world to be used in CacheReproducer tests. >>>> * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java: timeout for processes doubled, >>>> as clear cache methods sometimes took more then original allowed. >>>> > > The lines above seem to be longer than 80 chars. wrapped > > > >> /** >> @@ -322,7 +323,37 @@ >> private static File getCacheFileIfExist(File urlPath) { >> synchronized (lruHandler) { >> File cacheFile = null; >> - List> entries = lruHandler.getLRUSortedEntries(); >> + int tries=0; >> + List> entries=null; >> + do{ >> + try{ >> + tries++; >> + entries = lruHandler.getLRUSortedEntries(); >> + }catch(LruCacheException ex){ >> + if (tries==1){ >> + ex.printStackTrace(); >> + System.out.println("Cache is corupted, will be faked now"); >> + lruHandler.clearLRUSortedEntries(); >> + lruHandler.store(); >> + System.out.println("Faked, continuing. It is strongly recomanded to run javaws -Xclearcache and rerun your application as soon as possible."); >> + }else if (tries==2){ >> + ex.printStackTrace(); >> + System.out.println("Cache is still corupted, will be cleared now"); >> + boolean clearingresult=CacheUtil.clearCache(); >> + if (!clearingresult){ >> + throw new InternalError("Clearing was not sucessfull, probably due to another javaws instance runnin.. Try to shut down all instances of javaws, run javaws -Xclearcache and rerun yout jnlp file"); >> + } >> + System.out.println("Cleared, reloading"); >> + lruHandler.clearLRUSortedEntries(); >> + lruHandler.store(); >> + System.out.println("Reload, restarting, it is strongly recomanded to run javaws -Xclearcache and rerun your application as soon as possible."); >> + >> + }else{ >> + throw new InternalError("LRU cache was corrupted. Was cleared, but still is corrupted. Try to shut down all instances of javaws, run javaws -Xclearcache and rerun yout jnlp file"); >> + } >> + >> + } >> + }while(entries==null); > > There are spacing issues in the above code e.g. no space between "do" > and "{" .. please follow the convention here: > http://icedtea.classpath.org/wiki/IcedTea-Web#Code_style > > Also, the test in the above messages should use the R function, not the > direct text itself. Please also check for spelling and grammar errors > e.g. "and rerun yout jnlp" is incorrect. ufff... a lot of work done here. Hope that it as it should be now! > > Logic wise, the code seems fine to me. > >> // Start searching from the most recent to least recent. >> for (Entry e : entries) { >> final String key = e.getKey(); >> diff -r 71f338e881d2 netx/net/sourceforge/jnlp/cache/LruCacheException.java >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/netx/net/sourceforge/jnlp/cache/LruCacheException.java Tue Dec 20 17:35:08 2011 +0100 >> @@ -0,0 +1,23 @@ >> +/* >> + * To change this template, choose Tools | Templates >> + * and open the template in the editor. >> + */ >> + >> +package net.sourceforge.jnlp.cache; >> + >> +/** >> + * >> + * @author jvanek > > Just a minor nitpick, please remove the above :) I know the IDE adds > them but we don't use it in most files, and most of the files are > modified by many people over time anyway. > > Also, please add the license header. > Done, thanx for catch. > > >> diff -r 71f338e881d2 tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer1_1.jnlp >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer1_1.jnlp Tue Dec 20 17:35:08 2011 +0100 >> @@ -0,0 +1,16 @@ >> + >> +> + codebase="./" >> + href="CacheReproducer1_1.jnlp"> >> + >> +read properties using System.getenv() > > Few things: > > 1. The title in all of the jnlp's appear to be incorrect -- they should be > fixed to be more correct. Done. Thanx for catch! > 2. Can we change the file naming to more accurately reflect what is > being tested? I think no - because the test applications themselves in this case really do nearly nothing - or better, they do as they are Named - (Signed)SimpleTest1 is just (signed) hello world, and CacheReproducer is used in CacheTests. He itself do ..nothing. > > > >> + @Test >> + public void cacheIsWorkingTestSigned() throws Exception { >> + clearAndEvaluateCache(); >> + evaluateSimpleTest1OkCache(runSimpleTest1Signed()); >> + assertCacheIsNotEmpty(); >> + >> + } >> + private class ParalelSimpleTestRunner extends Thread { > > Parallel is spelt incorrectly here and in the function below it. Also, > There also seems to be a missing newline before the function, an extra > new-line in the function above it, extra space between "extends" and > "Thread" etc. > Done > > >> + } >> + >> + @Test >> + public void assertBreakersAreWorking() { >> + String s = "#netx file\n" >> + + "#Mon Dec 12 16:20:46 CET 2011\n" >> + + "1323703236508,0=/home/jvanek/.icedtea/cache/0/http/localhost/ReadPropertiesBySignedHack.jnlp\n" >> + + "1323703243086,2=/home/jvanek/.icedtea/cache/2/http/localhost/ReadProperties.jar\n" >> + + "1323703243082,1=/home/jvanek/.icedtea/cache/1/http/localhost/ReadPropertiesBySignedHack.jar"; > > If the hardcoded username on purpose? There is no need to have any path. The string 1234567890000,10=/jedna/dve/tri/ctyry/ will do the same job, but I wanted to use as close paths as are normally in cache file. I have replaced my name by some random string. It is testing just breaking reg-ex and logic around it. > > Lastly, please check code styling overall. I have pointed it out wherever I > saw it, but just in case I missed it somewhere.. > > Everything else looks good! > > Thanks, > Deepak TYVM for review! J. -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: LRUcachePatch.diff4 Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120124/70579c6c/LRUcachePatch.diff4 From aph at redhat.com Tue Jan 24 05:53:01 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 24 Jan 2012 13:53:01 +0000 Subject: ARM: Rewrite disassembler to use hsdis In-Reply-To: <142ccdb0-cd1f-4e4c-b24c-c3914a292503@zmail16.collab.prod.int.phx2.redhat.com> References: <142ccdb0-cd1f-4e4c-b24c-c3914a292503@zmail16.collab.prod.int.phx2.redhat.com> Message-ID: <4F1EB7BD.3060309@redhat.com> On 01/24/2012 12:43 PM, Andrew Hughes wrote: > ----- Original Message ----- >> On 01/23/2012 09:12 PM, Andrew Hughes wrote: >>> ----- Original Message ----- >>>> On 01/23/2012 02:37 PM, Andrew Hughes wrote: >>>>> >>>>> I'm very wary about introducing Makefile changes into a release >>>>> branch >>>>> at such a late stage. How does these changes affect other >>>>> architectures? >>>> >>>> Not at all. >>> >>> These chunks would certainly seem to: >>> >>> +-CFLAGS += -fPIC >>> ++CFLAGS += -fPIC -g >>> >>> +-CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILS)/bfd >>> -I$(TARGET_DIR)/bfd >>> ++CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILSDIR)/bfd >>> -I$(TARGET_DIR)/bfd >>> >>> +- if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi >>> ++ if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes >>> "CFLAGS=$(CFLAGS)"; fi >>> >>> As far as I can tell from the hard-to-read patch-within-a-patch, >>> this part isn't within >>> an ARM #ifdef. >> >> Sure, but hsdis didn't build at all on any arch, so I'm pretty sure >> that other arches aren't affected, unless you count "now builds" as >> an affect. >> >>> Have you posted this upstream yet? I'd be interested to hear >>> Kelly's thoughts. >>> >>>>> Is hsdis part of a regular build? >>>> >>>> No, hsdis is never built in any OpenJDK release. >>> >>> Ok, so how it is built? Just via icedtea-debug? >> >> It's built by the user, if they want disassembly. It's not part >> of any OpenJDK build. It's not built for some time on IcedTea, as >> far as I can tell. > > So what I gather from this is that if you want to build hsdis, you have > to manually run make on the directory containing the hsdis Makefile. Is > that correct? Yes. Also, HSDIS has often needed a bit of local makefile tweaking. > If so, I can see that this may break building it in some cases where it > worked before, but, from what you imply, the likelihood of this makes the > risk negligible. > > I do still think the Makefile changes need to go upstream. I see that, but HSDIS is quite different in the upstream HotSpot trunk, so can't go in directly. Really, the only reason for these changes in IcedTea is for the convenience of IcedTea developers. It's on my list to check out that upstream HotSpot trunk, see what is needed for ARM, and submit those changes upstream. Andrew. From aph at redhat.com Tue Jan 24 05:59:12 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 24 Jan 2012 13:59:12 +0000 Subject: Pushing back the IcedTea6 1.11 release: 2012-01-25 In-Reply-To: <485ed187-01c8-4615-80a0-20a87cffbe93@zmail16.collab.prod.int.phx2.redhat.com> References: <485ed187-01c8-4615-80a0-20a87cffbe93@zmail16.collab.prod.int.phx2.redhat.com> Message-ID: <4F1EB930.8040803@redhat.com> On 01/24/2012 12:45 PM, Andrew Hughes wrote: > My worry is that this obsoletes 1.8 and then provides a security update > just three weeks later. Under the circumstances, I think a further 1.8 > release with the security updates is in order before obsoleting that branch. Sure, why not? 1.11 only has to obsolete 1.8 if people want it to. It may well turn out that there are problems in testing, and we have to delay anyway. But that isn't a good reason not to start the release now, even if no-one ships 11.0 and instead everyone goes straight to 11.1 with the security updates. Andrew. From ptisnovs at redhat.com Tue Jan 24 05:53:53 2012 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Tue, 24 Jan 2012 14:53:53 +0100 Subject: two more tests for icedtea web In-Reply-To: <4EEF41D0.5030001@redhat.com> References: <4EEF41D0.5030001@redhat.com> Message-ID: <4F1EB7F1.5050906@redhat.com> Hi Jiri, I'm ok with this update, but I think it would be better to refactor following "magic" numeric constants 1000000l and 30000 into class's final (named) constants (so the change of timeout will be much easier). Pavel Jiri Vanek wrote: > 2011-12-19 Jiri Vanek > > * tests/jnlp_tests/simple/AppletTest/ : test for loading applets by > jnlp file > > 2011-12-19 Jiri Vanek > > Added test for -Xnofork option > * > tests/jnlp_tests/simple/deadlocktest/resources/deadlocktest_1.jnlp: new > file > By specifying new max heap size, should invoke jvm to fork when > launched > * tests/jnlp_tests/simple/deadlocktest/srcs/DeadlockTest.java: > improved indentation, added debug output that main method was lunched > * tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java: > small refactoring, add lunching of deadlocktest_1.jnlp with and > without -Xnofork, and counting java instances during runtime > * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java > (ThreadedProcess.run) fixed situation, when process ended, but not all > the output was read by its stdout/stderr readers > (ContentReader.run) enabled exception printing to stderr. > > Regards J. > From aph at redhat.com Tue Jan 24 06:32:17 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 24 Jan 2012 14:32:17 +0000 Subject: ARM: Math inlines Message-ID: <4F1EC0F1.5060403@redhat.com> This is a bit of "low-hanging fruit". Modern ARMs have instructions for things like sqrt, so it doesn't make any sense to call native methods for such things. This patch handles all of the java.lang.Math special method types, calling the StrictMath JNI functions for everything we can't inline. For trunk only. Andrew. 2012-01-24 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp () (handle_special_method, jstack_to_vfp, vfp_to_jstack): New functions. (Thumb2_codegen): Call handle_special_method. (t_vop_ops): Add VSQRT. (T_VMOVD_VFP_TOVFP): New macro. (vmov_reg_d_VFP_to_VFP): New function. diff -r 8dd5206f92f1 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Jan 23 16:43:01 2012 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Tue Jan 24 14:26:48 2012 +0000 @@ -1555,7 +1555,7 @@ } while (!(bc_stackinfo[bci] & BC_BRANCH_TARGET)); return 0; } -#endif // ZOMBIT_DETECTION +#endif // ZOMBIE_DETECTION void Thumb2_RegAlloc(Thumb2_Info *jinfo) { @@ -1989,12 +1989,14 @@ #define VP_SUB 1 #define VP_MUL 2 #define VP_DIV 3 +#define VP_SQRT 4 static const unsigned t_vop_ops[] = { 0xee300a00, // VADD 0xee300a40, // VSUB 0xee200a00, // VMUL 0xee800a00, // VDIV + 0xeeb10bc0 // VSQRT }; #define VP_REG(op) t_vop_ops[op] @@ -2160,6 +2162,9 @@ #define T_VMOVD_TOVFP(dst, src_lo, src_hi) \ (0xec400b10 | ((src_lo) << 12) | ((src_hi) << 16) | (((dst) & 0x10)<<(5-4)) | ((dst) & 0x0f)) +// VFP reg to VFP re move. +#define T_VMOVD_VFP_TOVFP(dst, src) (0xeeb00b40 | (((dst) & 0x0f) << 12) | ((src) & 0x0f)) + #define T_VOP_REG_S(op, dst, lho, rho) ((op) | \ (((dst) & 1) << 22) | (((dst) & 0x1e) << (12-1)) | \ (((lho) & 1) << 7) | (((lho) & 0x1e) << (16-1)) | \ @@ -2728,6 +2733,11 @@ return out_16x2(codebuf, T_VMOVD_TOVFP(dst, src_lo, src_hi)); } +int vmov_reg_d_VFP_to_VFP(CodeBuf *codebuf, u32 dst, u32 src) +{ + return out_16x2(codebuf, T_VMOVD_VFP_TOVFP(dst, src)); +} + int vmov_reg_d_toARM(CodeBuf *codebuf, u32 dst_lo, u32 dst_hi, u32 src) { return out_16x2(codebuf, T_VMOVD_TOARM(dst_lo, dst_hi, src)); @@ -4967,6 +4977,128 @@ extern "C" void _ZN18InterpreterRuntime18register_finalizerEP10JavaThreadP7oopDesc(void); +// Push VFP_REG to the java stack. +static void vfp_to_jstack(Thumb2_Info *jinfo, int vfp_reg) { + Thumb2_Stack *jstack = jinfo->jstack; + unsigned r_lo, r_hi; + r_hi = PUSH(jstack, JSTACK_REG(jstack)); + r_lo = PUSH(jstack, JSTACK_REG(jstack)); + vmov_reg_d_toARM(jinfo->codebuf, r_lo, r_hi, vfp_reg); +} + +// Pop the java stack to VFP_REG . +static void jstack_to_vfp(Thumb2_Info *jinfo, int vfp_reg) { + Thumb2_Stack *jstack = jinfo->jstack; + unsigned r_lo, r_hi; + Thumb2_Fill(jinfo, 2); + r_lo = POP(jstack); + r_hi = POP(jstack); + vmov_reg_d_toVFP(jinfo->codebuf, vfp_reg, r_lo, r_hi); + Thumb2_Flush(jinfo); +} + +// Expand a call to a "special" method. These are usually inlines of +// java.lang.Math methods. Return true if the inlining succeeded. +static bool handle_special_method(methodOop callee, Thumb2_Info *jinfo) { +#ifdef __ARM_PCS_VFP + Thumb2_Stack *jstack = jinfo->jstack; + + const char *entry_name; + + unsigned loc1 = 0; + + switch (Interpreter::method_kind(callee)) { + case Interpreter::java_lang_math_abs: + { + unsigned r_lo, r_hi; + + Thumb2_Fill(jinfo, 2); + r_lo = POP(jstack); + r_hi = POP(jstack); + dop_imm_s(jinfo->codebuf, DP_BIC, r_hi, r_hi, 0x80000000, 0); + PUSH(jstack, r_hi); + PUSH(jstack, r_lo); + + return true; + } + + case Interpreter::java_lang_math_sin: + entry_name = "Java_java_lang_StrictMath_sin"; + break; + + case Interpreter::java_lang_math_cos: + entry_name = "Java_java_lang_StrictMath_cos"; + break; + + case Interpreter::java_lang_math_tan: + entry_name = "Java_java_lang_StrictMath_tan"; + break; + + case Interpreter::java_lang_math_sqrt: + { + void *entry_point = dlsym(NULL, "Java_java_lang_StrictMath_sqrt"); + if (! entry_point) + return false; + + unsigned r_lo, r_hi, r_res_lo, r_res_hi; + + // Make sure that canonical NaNs are returned, as per the spec. + // + // Generate: + // vsqrt.f64 d0, d1 + // vcmp.f64 d0, d0 + // vmrs APSR_nzcv, fpscr + // beq.n 0f + // vmov.f64 d0, d1 + // blx Java_java_lang_StrictMath_sqrt + // 0: + jstack_to_vfp(jinfo, VFP_D1); + vop_reg_d(jinfo->codebuf, VP_SQRT, VFP_D0, 0, VFP_D1); + vcmp_reg_d(jinfo->codebuf, VFP_D0, VFP_D0, 0); + vmrs(jinfo->codebuf, ARM_PC); + int loc = forward_16(jinfo->codebuf); + vmov_reg_d_VFP_to_VFP(jinfo->codebuf, VFP_D0, VFP_D1); + // FIXME: The JNI StrictMath routines don't use the JNIEnv *env + // parameter, so it's arguably pointless to pass it here. + add_imm(jinfo->codebuf, ARM_R0, Rthread, THREAD_JNI_ENVIRONMENT); + blx(jinfo->codebuf, (unsigned)entry_point); + bcc_patch(jinfo->codebuf, COND_EQ, loc); + vfp_to_jstack(jinfo, VFP_D0); + + return true; + } + + case Interpreter::java_lang_math_log: + entry_name = "Java_java_lang_StrictMath_log"; + break; + + case Interpreter::java_lang_math_log10: + entry_name = "Java_java_lang_StrictMath_log10"; + break; + + default: + return false; + } + + void *entry_point = dlsym(NULL, entry_name); + if (! entry_point) + return false; + + unsigned r_lo, r_hi, r_res_lo, r_res_hi; + + jstack_to_vfp(jinfo, VFP_D0); + // FIXME: The JNI StrictMath routines don't use the JNIEnv *env + // parameter, so it's arguably pointless to pass it here. + add_imm(jinfo->codebuf, ARM_R0, Rthread, THREAD_JNI_ENVIRONMENT); + blx(jinfo->codebuf, (unsigned)entry_point); + vfp_to_jstack(jinfo, VFP_D0); + + return true; +#else + return false; +#endif // __ARM_PCS_VFP +} + void Thumb2_codegen(Thumb2_Info *jinfo, unsigned start) { unsigned code_size = jinfo->code_size; @@ -6035,6 +6167,10 @@ } callee = (methodOop)cache->f1(); + + if (handle_special_method(callee, jinfo)) + break; + if (callee->is_accessor()) { u1 *code = callee->code_base(); int index = GET_NATIVE_U2(&code[2]); From ahughes at redhat.com Tue Jan 24 09:33:43 2012 From: ahughes at redhat.com (Andrew Hughes) Date: Tue, 24 Jan 2012 12:33:43 -0500 (EST) Subject: ARM: Rewrite disassembler to use hsdis In-Reply-To: <4F1EB7BD.3060309@redhat.com> Message-ID: <3e5d5bcd-fcb3-40fb-bf66-5715cb287309@zmail16.collab.prod.int.phx2.redhat.com> ----- Original Message ----- > On 01/24/2012 12:43 PM, Andrew Hughes wrote: > > ----- Original Message ----- > >> On 01/23/2012 09:12 PM, Andrew Hughes wrote: > >>> ----- Original Message ----- > >>>> On 01/23/2012 02:37 PM, Andrew Hughes wrote: > >>>>> > >>>>> I'm very wary about introducing Makefile changes into a release > >>>>> branch > >>>>> at such a late stage. How does these changes affect other > >>>>> architectures? > >>>> > >>>> Not at all. > >>> > >>> These chunks would certainly seem to: > >>> > >>> +-CFLAGS += -fPIC > >>> ++CFLAGS += -fPIC -g > >>> > >>> +-CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILS)/bfd > >>> -I$(TARGET_DIR)/bfd > >>> ++CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILSDIR)/bfd > >>> -I$(TARGET_DIR)/bfd > >>> > >>> +- if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi > >>> ++ if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes > >>> "CFLAGS=$(CFLAGS)"; fi > >>> > >>> As far as I can tell from the hard-to-read patch-within-a-patch, > >>> this part isn't within > >>> an ARM #ifdef. > >> > >> Sure, but hsdis didn't build at all on any arch, so I'm pretty > >> sure > >> that other arches aren't affected, unless you count "now builds" > >> as > >> an affect. > >> > >>> Have you posted this upstream yet? I'd be interested to hear > >>> Kelly's thoughts. > >>> > >>>>> Is hsdis part of a regular build? > >>>> > >>>> No, hsdis is never built in any OpenJDK release. > >>> > >>> Ok, so how it is built? Just via icedtea-debug? > >> > >> It's built by the user, if they want disassembly. It's not part > >> of any OpenJDK build. It's not built for some time on IcedTea, as > >> far as I can tell. > > > > So what I gather from this is that if you want to build hsdis, you > > have > > to manually run make on the directory containing the hsdis > > Makefile. Is > > that correct? > > Yes. Also, HSDIS has often needed a bit of local makefile tweaking. Right. This is the first I've heard of this tool. > > > If so, I can see that this may break building it in some cases > > where it > > worked before, but, from what you imply, the likelihood of this > > makes the > > risk negligible. > > > > I do still think the Makefile changes need to go upstream. > > I see that, but HSDIS is quite different in the upstream HotSpot > trunk, > so can't go in directly. Really, the only reason for these changes > in > IcedTea is for the convenience of IcedTea developers. > > It's on my list to check out that upstream HotSpot trunk, see what is > needed for ARM, and submit those changes upstream. > On that subject, what's the plan for getting the ARM port into IcedTea7? Doing further work in IcedTea6 post-1.11 would seem like a dead end with distros like Fedora planning to go 1.7 only. For reference, IcedTea6 is currently using hs20b11, while jdk7u1/IcedTea7 2.0 uses hs21b17 and jdk7u2/IcedTea7 2.1 will use hs22b10. So further porting work may be required. > 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 bugzilla-daemon at icedtea.classpath.org Tue Jan 24 09:34:17 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 24 Jan 2012 17:34:17 +0000 Subject: [Bug 857] gtk look and feel setting causes javaws to hang if accessibility used In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=857 --- Comment #4 from Xerxes R?nby 2012-01-24 17:34:17 UTC --- Created attachment 639 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=639 remove-all-setLookAndFeel.patch Ok I have reproduced this bug as described. I have also verified that javaws -viewer can start and work in combination with the java-atk-wrapper, and ocra, if I simply removed the setLookAndFeel lines inside the javaws and plugin source-code. I will start examine how to fix this bug and still have setLookAndFeel enabled. Cheers, Xerxes -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From aph at redhat.com Tue Jan 24 09:35:59 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 24 Jan 2012 17:35:59 +0000 Subject: ARM: Rewrite disassembler to use hsdis In-Reply-To: <3e5d5bcd-fcb3-40fb-bf66-5715cb287309@zmail16.collab.prod.int.phx2.redhat.com> References: <3e5d5bcd-fcb3-40fb-bf66-5715cb287309@zmail16.collab.prod.int.phx2.redhat.com> Message-ID: <4F1EEBFF.8010804@redhat.com> On 01/24/2012 05:33 PM, Andrew Hughes wrote: > On that subject, what's the plan for getting the ARM port into IcedTea7? > Doing further work in IcedTea6 post-1.11 would seem like a dead end with > distros like Fedora planning to go 1.7 only. Indeed. > For reference, IcedTea6 is currently using hs20b11, while jdk7u1/IcedTea7 2.0 uses > hs21b17 and jdk7u2/IcedTea7 2.1 will use hs22b10. So further porting work > may be required. Sure. The biggest item of work is invokedynamic. Once that's dome the rest should be pretty easy. Andrew. From ahughes at redhat.com Tue Jan 24 09:36:59 2012 From: ahughes at redhat.com (Andrew Hughes) Date: Tue, 24 Jan 2012 12:36:59 -0500 (EST) Subject: Pushing back the IcedTea6 1.11 release: 2012-01-25 In-Reply-To: <4F1EB930.8040803@redhat.com> Message-ID: <0210078c-dae5-48e6-8a4c-733090f00e5d@zmail16.collab.prod.int.phx2.redhat.com> ----- Original Message ----- > On 01/24/2012 12:45 PM, Andrew Hughes wrote: > > My worry is that this obsoletes 1.8 and then provides a security > > update > > just three weeks later. Under the circumstances, I think a further > > 1.8 > > release with the security updates is in order before obsoleting > > that branch. > > Sure, why not? 1.11 only has to obsolete 1.8 if people want it to. > > It may well turn out that there are problems in testing, and we have > to delay anyway. But that isn't a good reason not to start the > release now, even if no-one ships 11.0 and instead everyone goes > straight to 11.1 with the security updates. > Well the plan is still to obsolete 1.8, only it will happen after either the 1.11 release or the security release, whichever is later. Others are welcome to continue maintaining 1.8 after this, of course, but I don't intend to. We'll have five other branches as it is (1.9, 1.10, 1.11, 2.0, 2.1)! > 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 bugzilla-daemon at icedtea.classpath.org Tue Jan 24 10:24:32 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 24 Jan 2012 18:24:32 +0000 Subject: [Bug 857] gtk look and feel setting causes javaws to hang if accessibility used In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=857 --- Comment #5 from Micha? Zegan 2012-01-24 18:24:32 UTC --- My comment on that is: You can use gtk look and feel with JAW. You just need to make sure the call is made before any swing component has been created, so reordering would suffice. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ddadacha at redhat.com Tue Jan 24 11:48:00 2012 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Tue, 24 Jan 2012 14:48:00 -0500 Subject: [RFC][icedtea-web] Plugin does not make JNLP's available when using jnlp_href In-Reply-To: <4F0750F9.5050906@redhat.com> References: <4F074F81.20900@redhat.com> <4F0750F9.5050906@redhat.com> Message-ID: <4F1F0AF0.3000105@redhat.com> Updating patch, realized there were some tabs throwing off indentation. Any comments on this? Cheers, Danesh On 06/01/12 02:52 PM, Danesh Dadachanji wrote: > Aaand here's the patch. > > > On 06/01/12 02:46 PM, Danesh Dadachanji wrote: >> Hi, >> >> The JNLP file's information elements are not available for use when >> using the plugin through the browser and jnlp_href. For example when >> access dialogs pop up, they try to use PluginBridge.getInformation(). >> This is set to return a new (and so, empty) ArrayList rather than the >> contents of the information tag. To test this, use this applet[1] and >> click Open. >> >> I've setup the info instance var in the PluginBridge constructor to >> either be the JNLP file's info or to be a new ArrayList if jnlp_href is >> not being used. >> >> PluginBridge.getInformation() is no longer needed because the >> superclass's method does what we want so I've removed it. There was the >> following comment in the method: >> >> "Should we populate this list with applet attribute tags?" >> >> I left this as is for now because JNLPFile.getInformation's javadoc >> states it only returns the tag's elements. It might cause >> some confusion/inconsistency with the javadoc if we were to store the >> applet's attribute here. If we were to add a >> PluginBridge.getInformation, it would be identical in implementation. >> Apart from this, I don't see the harm in adding the attributes to the >> info - they are visible to the public anyway through ^U! The "name" >> attribute could also be used if there is no so it might be >> useful to do so. >> >> I've also added "(unverified)" to the ends of the Publisher label of >> access dialogs because this can easily be spoofed. >> >> ChangeLog >> +2012-01-06 Danesh Dadachanji <ddadacha at redhat.com> >> + >> + Use the JNLP file's information section for the Name and >> + Publisher labels of access dialogs, if available. >> + * netx/net/sourceforge/jnlp/PluginBridge.java: >> + (PluginBridge): Assigned info variable to JNLP file's information >> + section (if one is used), otherwise to a new, empty ArrayList. >> + (getInformation): Removed method, superclass method >> + should be used instead. >> + * netx/net/sourceforge/jnlp/resources/Messages.properties: >> + Adding SUnverified. >> + * a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java: >> + (addComponents): Append unverified note to the publisher label. >> + >> >> Thoughts/comments? If this is alright, I'd like to push it to HEAD. >> >> Regards, >> Danesh >> >> [1] >> http://docs.oracle.com/javase/tutorial/deployment/doingMoreWithRIA/examples/dist/applet_JNLP_API/AppletPage.html >> >> -------------- next part -------------- A non-text attachment was scrubbed... Name: plugin-bridge-info-02.patch Type: text/x-patch Size: 3417 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120124/1772a7eb/plugin-bridge-info-02.patch From dbhole at redhat.com Tue Jan 24 12:13:48 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 24 Jan 2012 15:13:48 -0500 Subject: [RFC][icedtea-web] Plugin does not make JNLP's <information> available when using jnlp_href In-Reply-To: <4F1F0AF0.3000105@redhat.com> References: <4F074F81.20900@redhat.com> <4F0750F9.5050906@redhat.com> <4F1F0AF0.3000105@redhat.com> Message-ID: <20120124201348.GB19687@redhat.com> * Danesh Dadachanji <ddadacha at redhat.com> [2012-01-24 14:49]: > Updating patch, realized there were some tabs throwing off indentation. > > Any comments on this? > Assuming you have tested it, OK for 1.2 and HEAD. Deepak > Cheers, > Danesh > > On 06/01/12 02:52 PM, Danesh Dadachanji wrote: > >Aaand here's the patch. > > > > > >On 06/01/12 02:46 PM, Danesh Dadachanji wrote: > >>Hi, > >> > >>The JNLP file's information elements are not available for use when > >>using the plugin through the browser and jnlp_href. For example when > >>access dialogs pop up, they try to use PluginBridge.getInformation(). > >>This is set to return a new (and so, empty) ArrayList rather than the > >>contents of the information tag. To test this, use this applet[1] and > >>click Open. > >> > >>I've setup the info instance var in the PluginBridge constructor to > >>either be the JNLP file's info or to be a new ArrayList if jnlp_href is > >>not being used. > >> > >>PluginBridge.getInformation() is no longer needed because the > >>superclass's method does what we want so I've removed it. There was the > >>following comment in the method: > >> > >>"Should we populate this list with applet attribute tags?" > >> > >>I left this as is for now because JNLPFile.getInformation's javadoc > >>states it only returns the <information> tag's elements. It might cause > >>some confusion/inconsistency with the javadoc if we were to store the > >>applet's attribute here. If we were to add a > >>PluginBridge.getInformation, it would be identical in implementation. > >>Apart from this, I don't see the harm in adding the attributes to the > >>info - they are visible to the public anyway through ^U! The "name" > >>attribute could also be used if there is no <title> so it might be > >>useful to do so. > >> > >>I've also added "(unverified)" to the ends of the Publisher label of > >>access dialogs because this can easily be spoofed. > >> > >>ChangeLog > >>+2012-01-06 Danesh Dadachanji <ddadacha at redhat.com> > >>+ > >>+ Use the JNLP file's information section for the Name and > >>+ Publisher labels of access dialogs, if available. > >>+ * netx/net/sourceforge/jnlp/PluginBridge.java: > >>+ (PluginBridge): Assigned info variable to JNLP file's information > >>+ section (if one is used), otherwise to a new, empty ArrayList. > >>+ (getInformation): Removed method, superclass method > >>+ should be used instead. > >>+ * netx/net/sourceforge/jnlp/resources/Messages.properties: > >>+ Adding SUnverified. > >>+ * a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java: > >>+ (addComponents): Append unverified note to the publisher label. > >>+ > >> > >>Thoughts/comments? If this is alright, I'd like to push it to HEAD. > >> > >>Regards, > >>Danesh > >> > >>[1] > >>http://docs.oracle.com/javase/tutorial/deployment/doingMoreWithRIA/examples/dist/applet_JNLP_API/AppletPage.html > >> > >> > diff --git a/netx/net/sourceforge/jnlp/PluginBridge.java b/netx/net/sourceforge/jnlp/PluginBridge.java > --- a/netx/net/sourceforge/jnlp/PluginBridge.java > +++ b/netx/net/sourceforge/jnlp/PluginBridge.java > @@ -60,6 +60,7 @@ public class PluginBridge extends JNLPFi > URL jnlp = new URL(codeBase.toExternalForm() + atts.get("jnlp_href")); > JNLPFile jnlpFile = new JNLPFile(jnlp, null, false, JNLPRuntime.getDefaultUpdatePolicy(), this.codeBase); > Map<String, String> jnlpParams = jnlpFile.getApplet().getParameters(); > + info = jnlpFile.info; > > // Change the parameter name to lowercase to follow conventions. > for (Map.Entry<String, String> entry : jnlpParams.entrySet()) { > @@ -76,6 +77,9 @@ public class PluginBridge extends JNLPFi > System.err.println("Unable to get JNLP file at: " + codeBase.toExternalForm() > + atts.get("jnlp_href")); > } > + } else { > + // Should we populate this list with applet attribute tags? > + info = new ArrayList<InformationDesc>(); > } > > // also, see if cache_archive is specified > @@ -180,15 +184,6 @@ public class PluginBridge extends JNLPFi > return name; > } > > - public InformationDesc getInformation(final Locale locale) { > - return new InformationDesc(this, new Locale[] { locale }) { > - protected List<Object> getItems(Object key) { > - // Should we populate this list with applet attribute tags? > - return new ArrayList<Object>(); > - } > - }; > - } > - > public ResourcesDesc getResources(final Locale locale, final String os, > final String arch) { > return new ResourcesDesc(this, new Locale[] { locale }, new String[] { os }, > diff --git a/netx/net/sourceforge/jnlp/resources/Messages.properties b/netx/net/sourceforge/jnlp/resources/Messages.properties > --- a/netx/net/sourceforge/jnlp/resources/Messages.properties > +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties > @@ -205,6 +205,7 @@ SClipboardWriteAccess=The application ha > SPrinterAccess=The application has requested printer access. Do you want to allow this action? > SNetworkAccess=The application has requested permission to establish connections to {0}. Do you want to allow this action? > SNoAssociatedCertificate=<no associated certificate> > +SUnverified=(unverified) > SAlwaysTrustPublisher=Always trust content from this publisher > SHttpsUnverified=The website's certificate cannot be verified. > SNotAllSignedSummary=Only parts of this application code are signed. > diff --git a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java b/netx/net/sourceforge/jnlp/security/AccessWarningPane.java > --- a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java > +++ b/netx/net/sourceforge/jnlp/security/AccessWarningPane.java > @@ -104,7 +104,9 @@ public class AccessWarningPane extends S > } > > try { > - publisher = file.getInformation().getVendor() != null ? file.getInformation().getVendor() : R("SNoAssociatedCertificate"); > + publisher = file.getInformation().getVendor() != null ? > + file.getInformation().getVendor() + " " + R("SUnverified") : > + R("SNoAssociatedCertificate"); > } catch (Exception e) { > } > From ddadacha at icedtea.classpath.org Tue Jan 24 12:36:31 2012 From: ddadacha at icedtea.classpath.org (ddadacha at icedtea.classpath.org) Date: Tue, 24 Jan 2012 20:36:31 +0000 Subject: /hg/icedtea-web: Plugin does not make JNLP's <information> avail... Message-ID: <hg.21183f821dd4.1327437391.8643924302249223276@icedtea.classpath.org> changeset 21183f821dd4 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=21183f821dd4 author: Danesh Dadachanji <ddadacha at redhat.com> date: Tue Jan 24 15:33:51 2012 -0500 Plugin does not make JNLP's <information> available when using jnlp_href. diffstat: ChangeLog | 14 ++++++++++++++ netx/net/sourceforge/jnlp/PluginBridge.java | 13 ++++--------- netx/net/sourceforge/jnlp/resources/Messages.properties | 1 + netx/net/sourceforge/jnlp/security/AccessWarningPane.java | 4 +++- 4 files changed, 22 insertions(+), 10 deletions(-) diffs (83 lines): diff -r 41f03d932cdf -r 21183f821dd4 ChangeLog --- a/ChangeLog Mon Jan 09 18:45:31 2012 -0500 +++ b/ChangeLog Tue Jan 24 15:33:51 2012 -0500 @@ -1,3 +1,17 @@ +2012-01-06 Danesh Dadachanji <ddadacha at redhat.com> + + Use the JNLP file's information section for the Name and + Publisher labels of access dialogs, if available. + * netx/net/sourceforge/jnlp/PluginBridge.java: + (PluginBridge): Assigned info variable to JNLP file's information + section (if one is used), otherwise to a new, empty ArrayList. + (getInformation): Removed method, superclass method + should be used instead. + * netx/net/sourceforge/jnlp/resources/Messages.properties: + Adding SUnverified. + * a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java: + (addComponents): Append unverified note to the publisher label. + 2012-01-09 Deepak Bhole <dbhole at redhat.com> PR838: IcedTea plugin crashes with chrome browser when javascript is executed diff -r 41f03d932cdf -r 21183f821dd4 netx/net/sourceforge/jnlp/PluginBridge.java --- a/netx/net/sourceforge/jnlp/PluginBridge.java Mon Jan 09 18:45:31 2012 -0500 +++ b/netx/net/sourceforge/jnlp/PluginBridge.java Tue Jan 24 15:33:51 2012 -0500 @@ -60,6 +60,7 @@ URL jnlp = new URL(codeBase.toExternalForm() + atts.get("jnlp_href")); JNLPFile jnlpFile = new JNLPFile(jnlp, null, false, JNLPRuntime.getDefaultUpdatePolicy(), this.codeBase); Map<String, String> jnlpParams = jnlpFile.getApplet().getParameters(); + info = jnlpFile.info; // Change the parameter name to lowercase to follow conventions. for (Map.Entry<String, String> entry : jnlpParams.entrySet()) { @@ -76,6 +77,9 @@ System.err.println("Unable to get JNLP file at: " + codeBase.toExternalForm() + atts.get("jnlp_href")); } + } else { + // Should we populate this list with applet attribute tags? + info = new ArrayList<InformationDesc>(); } // also, see if cache_archive is specified @@ -180,15 +184,6 @@ return name; } - public InformationDesc getInformation(final Locale locale) { - return new InformationDesc(this, new Locale[] { locale }) { - protected List<Object> getItems(Object key) { - // Should we populate this list with applet attribute tags? - return new ArrayList<Object>(); - } - }; - } - public ResourcesDesc getResources(final Locale locale, final String os, final String arch) { return new ResourcesDesc(this, new Locale[] { locale }, new String[] { os }, diff -r 41f03d932cdf -r 21183f821dd4 netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Mon Jan 09 18:45:31 2012 -0500 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Jan 24 15:33:51 2012 -0500 @@ -205,6 +205,7 @@ SPrinterAccess=The application has requested printer access. Do you want to allow this action? SNetworkAccess=The application has requested permission to establish connections to {0}. Do you want to allow this action? SNoAssociatedCertificate=<no associated certificate> +SUnverified=(unverified) SAlwaysTrustPublisher=Always trust content from this publisher SHttpsUnverified=The website's certificate cannot be verified. SNotAllSignedSummary=Only parts of this application code are signed. diff -r 41f03d932cdf -r 21183f821dd4 netx/net/sourceforge/jnlp/security/AccessWarningPane.java --- a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java Mon Jan 09 18:45:31 2012 -0500 +++ b/netx/net/sourceforge/jnlp/security/AccessWarningPane.java Tue Jan 24 15:33:51 2012 -0500 @@ -104,7 +104,9 @@ } try { - publisher = file.getInformation().getVendor() != null ? file.getInformation().getVendor() : R("SNoAssociatedCertificate"); + publisher = file.getInformation().getVendor() != null ? + file.getInformation().getVendor() + " " + R("SUnverified") : + R("SNoAssociatedCertificate"); } catch (Exception e) { } From ddadacha at icedtea.classpath.org Tue Jan 24 12:55:16 2012 From: ddadacha at icedtea.classpath.org (ddadacha at icedtea.classpath.org) Date: Tue, 24 Jan 2012 20:55:16 +0000 Subject: /hg/release/icedtea-web-1.2: Plugin does not make JNLP's <inform... Message-ID: <hg.21183f821dd4.1327438516.-5934593987637005768@icedtea.classpath.org> changeset 21183f821dd4 in /hg/release/icedtea-web-1.2 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.2?cmd=changeset;node=21183f821dd4 author: Danesh Dadachanji <ddadacha at redhat.com> date: Tue Jan 24 15:33:51 2012 -0500 Plugin does not make JNLP's <information> available when using jnlp_href. diffstat: ChangeLog | 14 ++++++++++++++ netx/net/sourceforge/jnlp/PluginBridge.java | 13 ++++--------- netx/net/sourceforge/jnlp/resources/Messages.properties | 1 + netx/net/sourceforge/jnlp/security/AccessWarningPane.java | 4 +++- 4 files changed, 22 insertions(+), 10 deletions(-) diffs (83 lines): diff -r 41f03d932cdf -r 21183f821dd4 ChangeLog --- a/ChangeLog Mon Jan 09 18:45:31 2012 -0500 +++ b/ChangeLog Tue Jan 24 15:33:51 2012 -0500 @@ -1,3 +1,17 @@ +2012-01-06 Danesh Dadachanji <ddadacha at redhat.com> + + Use the JNLP file's information section for the Name and + Publisher labels of access dialogs, if available. + * netx/net/sourceforge/jnlp/PluginBridge.java: + (PluginBridge): Assigned info variable to JNLP file's information + section (if one is used), otherwise to a new, empty ArrayList. + (getInformation): Removed method, superclass method + should be used instead. + * netx/net/sourceforge/jnlp/resources/Messages.properties: + Adding SUnverified. + * a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java: + (addComponents): Append unverified note to the publisher label. + 2012-01-09 Deepak Bhole <dbhole at redhat.com> PR838: IcedTea plugin crashes with chrome browser when javascript is executed diff -r 41f03d932cdf -r 21183f821dd4 netx/net/sourceforge/jnlp/PluginBridge.java --- a/netx/net/sourceforge/jnlp/PluginBridge.java Mon Jan 09 18:45:31 2012 -0500 +++ b/netx/net/sourceforge/jnlp/PluginBridge.java Tue Jan 24 15:33:51 2012 -0500 @@ -60,6 +60,7 @@ URL jnlp = new URL(codeBase.toExternalForm() + atts.get("jnlp_href")); JNLPFile jnlpFile = new JNLPFile(jnlp, null, false, JNLPRuntime.getDefaultUpdatePolicy(), this.codeBase); Map<String, String> jnlpParams = jnlpFile.getApplet().getParameters(); + info = jnlpFile.info; // Change the parameter name to lowercase to follow conventions. for (Map.Entry<String, String> entry : jnlpParams.entrySet()) { @@ -76,6 +77,9 @@ System.err.println("Unable to get JNLP file at: " + codeBase.toExternalForm() + atts.get("jnlp_href")); } + } else { + // Should we populate this list with applet attribute tags? + info = new ArrayList<InformationDesc>(); } // also, see if cache_archive is specified @@ -180,15 +184,6 @@ return name; } - public InformationDesc getInformation(final Locale locale) { - return new InformationDesc(this, new Locale[] { locale }) { - protected List<Object> getItems(Object key) { - // Should we populate this list with applet attribute tags? - return new ArrayList<Object>(); - } - }; - } - public ResourcesDesc getResources(final Locale locale, final String os, final String arch) { return new ResourcesDesc(this, new Locale[] { locale }, new String[] { os }, diff -r 41f03d932cdf -r 21183f821dd4 netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Mon Jan 09 18:45:31 2012 -0500 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Jan 24 15:33:51 2012 -0500 @@ -205,6 +205,7 @@ SPrinterAccess=The application has requested printer access. Do you want to allow this action? SNetworkAccess=The application has requested permission to establish connections to {0}. Do you want to allow this action? SNoAssociatedCertificate=<no associated certificate> +SUnverified=(unverified) SAlwaysTrustPublisher=Always trust content from this publisher SHttpsUnverified=The website's certificate cannot be verified. SNotAllSignedSummary=Only parts of this application code are signed. diff -r 41f03d932cdf -r 21183f821dd4 netx/net/sourceforge/jnlp/security/AccessWarningPane.java --- a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java Mon Jan 09 18:45:31 2012 -0500 +++ b/netx/net/sourceforge/jnlp/security/AccessWarningPane.java Tue Jan 24 15:33:51 2012 -0500 @@ -104,7 +104,9 @@ } try { - publisher = file.getInformation().getVendor() != null ? file.getInformation().getVendor() : R("SNoAssociatedCertificate"); + publisher = file.getInformation().getVendor() != null ? + file.getInformation().getVendor() + " " + R("SUnverified") : + R("SNoAssociatedCertificate"); } catch (Exception e) { } From ddadacha at redhat.com Tue Jan 24 12:56:39 2012 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Tue, 24 Jan 2012 15:56:39 -0500 Subject: [RFC][icedtea-web] Plugin does not make JNLP's <information> available when using jnlp_href In-Reply-To: <20120124201348.GB19687@redhat.com> References: <4F074F81.20900@redhat.com> <4F0750F9.5050906@redhat.com> <4F1F0AF0.3000105@redhat.com> <20120124201348.GB19687@redhat.com> Message-ID: <4F1F1B07.8090104@redhat.com> On 24/01/12 03:13 PM, Deepak Bhole wrote: > * Danesh Dadachanji<ddadacha at redhat.com> [2012-01-24 14:49]: >> Updating patch, realized there were some tabs throwing off indentation. >> >> Any comments on this? >> > > Assuming you have tested it, OK for 1.2 and HEAD. > Yep, just tested 1.2, tested HEAD before posting review. Here are the changesets: http://icedtea.classpath.org/hg/icedtea-web/rev/21183f821dd4 http://icedtea.classpath.org/hg/release/icedtea-web-1.2/rev/21183f821dd4 Thanks for reviewing! Danesh > Deepak > >> Cheers, >> Danesh >> >> On 06/01/12 02:52 PM, Danesh Dadachanji wrote: >>> Aaand here's the patch. >>> >>> >>> On 06/01/12 02:46 PM, Danesh Dadachanji wrote: >>>> Hi, >>>> >>>> The JNLP file's information elements are not available for use when >>>> using the plugin through the browser and jnlp_href. For example when >>>> access dialogs pop up, they try to use PluginBridge.getInformation(). >>>> This is set to return a new (and so, empty) ArrayList rather than the >>>> contents of the information tag. To test this, use this applet[1] and >>>> click Open. >>>> >>>> I've setup the info instance var in the PluginBridge constructor to >>>> either be the JNLP file's info or to be a new ArrayList if jnlp_href is >>>> not being used. >>>> >>>> PluginBridge.getInformation() is no longer needed because the >>>> superclass's method does what we want so I've removed it. There was the >>>> following comment in the method: >>>> >>>> "Should we populate this list with applet attribute tags?" >>>> >>>> I left this as is for now because JNLPFile.getInformation's javadoc >>>> states it only returns the<information> tag's elements. It might cause >>>> some confusion/inconsistency with the javadoc if we were to store the >>>> applet's attribute here. If we were to add a >>>> PluginBridge.getInformation, it would be identical in implementation. >>>> Apart from this, I don't see the harm in adding the attributes to the >>>> info - they are visible to the public anyway through ^U! The "name" >>>> attribute could also be used if there is no<title> so it might be >>>> useful to do so. >>>> >>>> I've also added "(unverified)" to the ends of the Publisher label of >>>> access dialogs because this can easily be spoofed. >>>> >>>> ChangeLog >>>> +2012-01-06 Danesh Dadachanji<ddadacha at redhat.com> >>>> + >>>> + Use the JNLP file's information section for the Name and >>>> + Publisher labels of access dialogs, if available. >>>> + * netx/net/sourceforge/jnlp/PluginBridge.java: >>>> + (PluginBridge): Assigned info variable to JNLP file's information >>>> + section (if one is used), otherwise to a new, empty ArrayList. >>>> + (getInformation): Removed method, superclass method >>>> + should be used instead. >>>> + * netx/net/sourceforge/jnlp/resources/Messages.properties: >>>> + Adding SUnverified. >>>> + * a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java: >>>> + (addComponents): Append unverified note to the publisher label. >>>> + >>>> >>>> Thoughts/comments? If this is alright, I'd like to push it to HEAD. >>>> >>>> Regards, >>>> Danesh >>>> >>>> [1] >>>> http://docs.oracle.com/javase/tutorial/deployment/doingMoreWithRIA/examples/dist/applet_JNLP_API/AppletPage.html >>>> >>>> > >> diff --git a/netx/net/sourceforge/jnlp/PluginBridge.java b/netx/net/sourceforge/jnlp/PluginBridge.java >> --- a/netx/net/sourceforge/jnlp/PluginBridge.java >> +++ b/netx/net/sourceforge/jnlp/PluginBridge.java >> @@ -60,6 +60,7 @@ public class PluginBridge extends JNLPFi >> URL jnlp = new URL(codeBase.toExternalForm() + atts.get("jnlp_href")); >> JNLPFile jnlpFile = new JNLPFile(jnlp, null, false, JNLPRuntime.getDefaultUpdatePolicy(), this.codeBase); >> Map<String, String> jnlpParams = jnlpFile.getApplet().getParameters(); >> + info = jnlpFile.info; >> >> // Change the parameter name to lowercase to follow conventions. >> for (Map.Entry<String, String> entry : jnlpParams.entrySet()) { >> @@ -76,6 +77,9 @@ public class PluginBridge extends JNLPFi >> System.err.println("Unable to get JNLP file at: " + codeBase.toExternalForm() >> + atts.get("jnlp_href")); >> } >> + } else { >> + // Should we populate this list with applet attribute tags? >> + info = new ArrayList<InformationDesc>(); >> } >> >> // also, see if cache_archive is specified >> @@ -180,15 +184,6 @@ public class PluginBridge extends JNLPFi >> return name; >> } >> >> - public InformationDesc getInformation(final Locale locale) { >> - return new InformationDesc(this, new Locale[] { locale }) { >> - protected List<Object> getItems(Object key) { >> - // Should we populate this list with applet attribute tags? >> - return new ArrayList<Object>(); >> - } >> - }; >> - } >> - >> public ResourcesDesc getResources(final Locale locale, final String os, >> final String arch) { >> return new ResourcesDesc(this, new Locale[] { locale }, new String[] { os }, >> diff --git a/netx/net/sourceforge/jnlp/resources/Messages.properties b/netx/net/sourceforge/jnlp/resources/Messages.properties >> --- a/netx/net/sourceforge/jnlp/resources/Messages.properties >> +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties >> @@ -205,6 +205,7 @@ SClipboardWriteAccess=The application ha >> SPrinterAccess=The application has requested printer access. Do you want to allow this action? >> SNetworkAccess=The application has requested permission to establish connections to {0}. Do you want to allow this action? >> SNoAssociatedCertificate=<no associated certificate> >> +SUnverified=(unverified) >> SAlwaysTrustPublisher=Always trust content from this publisher >> SHttpsUnverified=The website's certificate cannot be verified. >> SNotAllSignedSummary=Only parts of this application code are signed. >> diff --git a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java b/netx/net/sourceforge/jnlp/security/AccessWarningPane.java >> --- a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java >> +++ b/netx/net/sourceforge/jnlp/security/AccessWarningPane.java >> @@ -104,7 +104,9 @@ public class AccessWarningPane extends S >> } >> >> try { >> - publisher = file.getInformation().getVendor() != null ? file.getInformation().getVendor() : R("SNoAssociatedCertificate"); >> + publisher = file.getInformation().getVendor() != null ? >> + file.getInformation().getVendor() + " " + R("SUnverified") : >> + R("SNoAssociatedCertificate"); >> } catch (Exception e) { >> } >> > From bugzilla-daemon at icedtea.classpath.org Tue Jan 24 16:52:17 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 Jan 2012 00:52:17 +0000 Subject: [Bug 857] gtk look and feel setting causes javaws to hang if accessibility used In-Reply-To: <bug-857-30@http.icedtea.classpath.org/bugzilla/> References: <bug-857-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-857-30-X1HbVvqQgb@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=857 --- Comment #6 from Omair Majid <omajid at redhat.com> 2012-01-25 00:52:17 UTC --- Created attachment 640 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=640 only set the look and feel once in the main javaws/plugin process The attached patch removes all calls to UIManager.setLookAndFeel() after it is set once. I have not verified this, but the UI elements used by icedtea-web should still have the system look and feel since all icedtea-web UI should be associated with the main AppContext. If they dont, then that sounds like another bug to me (I suspect the UI associated with download progress bars might run into this). The target application/applet should be running in a separate AppContext and should get it's own look and feel (the default is metal). Note that extra/net/sourceforge/javaws/about/Main.java and netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java are separate applications and should not encounter the same problem. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue Jan 24 22:11:27 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 Jan 2012 06:11:27 +0000 Subject: [Bug 857] gtk look and feel setting causes javaws to hang if accessibility used In-Reply-To: <bug-857-30@http.icedtea.classpath.org/bugzilla/> References: <bug-857-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-857-30-WIif85Y9N7@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=857 --- Comment #7 from Micha? Zegan <webczat_200 at poczta.onet.pl> 2012-01-25 06:11:27 UTC --- yeah, I think javaws has this bug because it sets l&f after creating a security manager that implicitly creates JWindow, unless I read it wrong, so reordering would make it work as expected. What about setting l&f in a security dialog? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed Jan 25 02:28:50 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 Jan 2012 10:28:50 +0000 Subject: [Bug 859] New: javac to strict when checking cast Message-ID: <bug-859-30@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=859 Bug #: 859 Summary: javac to strict when checking cast Classification: Unclassified Product: IcedTea Version: unspecified Platform: x86_64 OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea7 AssignedTo: ahughes at redhat.com ReportedBy: kdaniel at redhat.com CC: unassigned at icedtea.classpath.org I have a field declaration private ArrayList<HashSet<EventRequest>> fRequests; which is then utilized by a method that calls new ArrayList<StepRequest>((Collection<? extends StepRequest>) fRequests.get(STEP_INDEX)) StepRequest extends EventRequest. A cast from HashSet<EventRequest> to Collection<? extends StepRequest> is a valid one, but javac complains about it. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed Jan 25 02:31:45 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 Jan 2012 10:31:45 +0000 Subject: [Bug 857] gtk look and feel setting causes javaws to hang if accessibility used In-Reply-To: <bug-857-30@http.icedtea.classpath.org/bugzilla/> References: <bug-857-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-857-30-65WuRhm6T7@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=857 --- Comment #8 from Micha? Zegan <webczat_200 at poczta.onet.pl> 2012-01-25 10:31:45 UTC --- I've read this patch to some extend... Are you sure plugin will work as expected and won't need to set l&f many times? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed Jan 25 02:48:58 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 Jan 2012 10:48:58 +0000 Subject: [Bug 857] gtk look and feel setting causes javaws to hang if accessibility used In-Reply-To: <bug-857-30@http.icedtea.classpath.org/bugzilla/> References: <bug-857-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-857-30-0AbbJxuzj1@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=857 --- Comment #9 from Micha? Zegan <webczat_200 at poczta.onet.pl> 2012-01-25 10:48:58 UTC --- I do not confirm that the bug has been fixed. Javaws still does not start, because before setting look and feel, you still create swing objects/ui elements and load swingclasses, for example the window icon, and something else. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed Jan 25 03:16:49 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 Jan 2012 11:16:49 +0000 Subject: [Bug 859] javac to strict when checking cast In-Reply-To: <bug-859-30@http.icedtea.classpath.org/bugzilla/> References: <bug-859-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-859-30-i43Ckj2VsP@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=859 Andrew John Hughes <ahughes at redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |INVALID --- Comment #1 from Andrew John Hughes <ahughes at redhat.com> 2012-01-25 11:16:49 UTC --- Why do you think this is valid? You're saying it should allow a set of objects containing a superclass EventRequest to be used as a set of objects of a subclass. The compiler is rightly stopping this because you could then retrieve an object from the new collection thinking it's a StepRequest when it's only an EventRequest. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed Jan 25 03:22:51 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 Jan 2012 11:22:51 +0000 Subject: [Bug 860] New: problem with some orca features not working in javaws Message-ID: <bug-860-30@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=860 Bug #: 860 Summary: problem with some orca features not working in javaws Classification: Unclassified Product: IcedTea-Web Version: unspecified Platform: x86 OS/Version: Linux Status: NEW Severity: major Priority: P3 Component: NetX (javaws) AssignedTo: omajid at redhat.com ReportedBy: webczat_200 at poczta.onet.pl CC: unassigned at icedtea.classpath.org Hello, I would like to report another serious accessibility bug where I'm not sure about it's origins. When javaws starts, and displays the about window or any other application, or some error messages like the application is unlaunchable, orca keys don't work. Some things are spoken when tabbing around, but I must wait for orca to end speaking to be able to hear another control, if I'll tab through two controls quickly I will hear their name spoken in order, In other words: It's impossible to silence a screenreader, to use any of it's keys like checking a date, to navigate read only text fields that sometimes show up when I press the details button, the contents of any lines are not spoken when I arrow through it... I am not sure what is this, because sun's javaws does the same, just not after application is started, this may also be an atk wrapper bug. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed Jan 25 04:23:45 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 Jan 2012 12:23:45 +0000 Subject: [Bug 859] javac to strict when checking cast In-Reply-To: <bug-859-30@http.icedtea.classpath.org/bugzilla/> References: <bug-859-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-859-30-YArjjSO1kG@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=859 Krzysztof Daniel <kdaniel at redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED Resolution|INVALID | --- Comment #2 from Krzysztof Daniel <kdaniel at redhat.com> 2012-01-25 12:23:45 UTC --- Java Language Specification (http://java.sun.com/docs/books/jls/third_edition/html/conversions.html#5.5) says: "The detailed rules for compile-time legality of a casting conversion of a value of compile-time reference type S to a compile-time reference type T are as follows: If S is a class type: If T is a class type, then either |S| <: |T|, or |T| <: |S|; otherwise a compile-time error occurs. Furthermore, if there exists a supertype X of T, and a supertype Y of S, such that both X and Y are provably distinct parameterized types (?4.5), and that the erasures of X and Y are the same, a compile-time error occurs." I should get runtime error, not compile type error. Java generally allows for moving up and down in an inheritance hierarchy during casting. Look for example at the following code: Number n = new AtomicLong(); BigDecimal bd = (BigDecimal) n; //2 The second line is also compiled correctly, although it will generate ClassCastException. The code being subject of this bug is just a little bit more advanced version - it uses two hierarchies (Collection and HashSet, EventRequest and StepRequest), and in general it should compile. I think that compile errors are allowed only when classes are provably distinct. In this case they are not, as there is a chance that the code will work as expected. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From aph at redhat.com Wed Jan 25 05:16:19 2012 From: aph at redhat.com (Andrew Haley) Date: Wed, 25 Jan 2012 13:16:19 +0000 Subject: ARM: Fix broken safepoint code Message-ID: <4F2000A3.5050907@redhat.com> We've been seeing mysterious crashes in Eclipse. It turns out that ecj generates different code from javac for things like while (tmp != null) tmp = tmp.poo; javac generates: 8: aload_1 9: ifnull 20 12: aload_1 13: getfield <Field t$Poo.poo t$Poo> 16: astore_1 17: goto 8 ecj generates: 11: aload_1 12: getfield <Field t$Poo.poo t$Poo> 15: astore_1 16: aload_1 17: ifnonnull 11 And this reveals a bug in safepoint handling: conditional backwards jumps were popping arguments from the stack before calling the safepoint handler. This is wrong because the garbage collector may expect to find an object reference on the stack. Fixed thusly. Andrew. 2012-01-25 Andrew Haley <aph at redhat.com> * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Branch): Remove safepoint code. (Thumb2_Cond_Safepoint): New function. (Thumb2_codegen): Call Thumb2_Cond_Safepoint() from two places. diff -r 6179ebaffe6b arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Jan 23 16:43:01 2012 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Wed Jan 25 07:59:48 2012 -0500 @@ -4365,7 +4365,17 @@ } } -int Thumb2_Branch(Thumb2_Info *jinfo, unsigned bci, unsigned cond, int stackdepth) +// If this is a backward branch, compile a safepoint check +void Thumb2_Cond_Safepoint(Thumb2_Info *jinfo, int stackdepth, int bci) { + int offset = GET_JAVA_S2(jinfo->code_base + bci + 1); + unsigned dest_taken = bci + offset; + + if (jinfo->bc_stackinfo[dest_taken] & BC_COMPILED) { + Thumb2_Safepoint(jinfo, stackdepth, bci); + } +} + +int Thumb2_Branch(Thumb2_Info *jinfo, unsigned bci, unsigned cond) { int offset = GET_JAVA_S2(jinfo->code_base + bci + 1); unsigned dest_taken = bci + offset; @@ -4373,10 +4383,7 @@ unsigned loc; if (jinfo->bc_stackinfo[dest_taken] & BC_COMPILED) { - loc = forward_16(jinfo->codebuf); - Thumb2_Safepoint(jinfo, stackdepth, bci); - branch_uncond(jinfo->codebuf, jinfo->bc_stackinfo[dest_taken] & ~BC_FLAGS_MASK); - bcc_patch(jinfo->codebuf, NEG_COND(cond), loc); + branch(jinfo->codebuf, cond, jinfo->bc_stackinfo[dest_taken] & ~BC_FLAGS_MASK); return dest_not_taken; } loc = forward_32(jinfo->codebuf); @@ -6323,12 +6330,13 @@ case opc_ifnonnull: { Reg r; unsigned cond = opcode - opc_ifeq; + Thumb2_Cond_Safepoint(jinfo, stackdepth, bci); if (opcode >= opc_ifnull) cond = opcode - opc_ifnull; Thumb2_Fill(jinfo, 1); r = POP(jstack); Thumb2_Flush(jinfo); cmp_imm(jinfo->codebuf, r, 0); - bci = Thumb2_Branch(jinfo, bci, cond, stackdepth-1); + bci = Thumb2_Branch(jinfo, bci, cond); len = 0; break; } @@ -6343,13 +6351,14 @@ case opc_if_acmpne: { Reg r_lho, r_rho; unsigned cond = opcode - opc_if_icmpeq; + Thumb2_Cond_Safepoint(jinfo, stackdepth, bci); if (opcode >= opc_if_acmpeq) cond = opcode - opc_if_acmpeq; Thumb2_Fill(jinfo, 2); r_rho = POP(jstack); r_lho = POP(jstack); Thumb2_Flush(jinfo); cmp_reg(jinfo->codebuf, r_lho, r_rho); - bci = Thumb2_Branch(jinfo, bci, cond, stackdepth-2); + bci = Thumb2_Branch(jinfo, bci, cond); len = 0; break; } From jvanek at redhat.com Wed Jan 25 05:27:05 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 25 Jan 2012 14:27:05 +0100 Subject: two more tests for icedtea web In-Reply-To: <4F1EB7F1.5050906@redhat.com> References: <4EEF41D0.5030001@redhat.com> <4F1EB7F1.5050906@redhat.com> Message-ID: <4F200329.40903@redhat.com> On 01/24/2012 02:53 PM, Pavel Tisnovsky wrote: > Hi Jiri, > > I'm ok with this update, but I think it would be better to refactor following > "magic" numeric constants 1000000l and 30000 into class's final (named) constants > (so the change of timeout will be much easier). > > Pavel > > Jiri Vanek wrote: >> 2011-12-19 Jiri Vanek<jvanek at redhat.com> >> >> * tests/jnlp_tests/simple/AppletTest/ : test for loading applets by >> jnlp file >> >> 2011-12-19 Jiri Vanek<jvanek at redhat.com> >> >> Added test for -Xnofork option >> * >> tests/jnlp_tests/simple/deadlocktest/resources/deadlocktest_1.jnlp: new >> file >> By specifying new max heap size, should invoke jvm to fork when >> launched >> * tests/jnlp_tests/simple/deadlocktest/srcs/DeadlockTest.java: >> improved indentation, added debug output that main method was lunched >> * tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java: >> small refactoring, add lunching of deadlocktest_1.jnlp with and >> without -Xnofork, and counting java instances during runtime >> * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java >> (ThreadedProcess.run) fixed situation, when process ended, but not all >> the output was read by its stdout/stderr readers >> (ContentReader.run) enabled exception printing to stderr. >> >> Regards J. >> > Tyvm for review! I have isolated the constants. Ok for head? J. 2012-01-25 Jiri Vanek <jvanek at redhat.com> Added test for -Xnofork option * tests/jnlp_tests/simple/deadlocktest/resources/deadlocktest_1.jnlp: new file By specifying new max heap size, should invoke jvm to fork when launched * tests/jnlp_tests/simple/deadlocktest/srcs/DeadlockTest.java: improved indentation, added debug output that main method was lunched * tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java: small refactoring, add lunching of deadlocktest_1.jnlp with and without -Xnofork, and counting java instances during runtime * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java (ThreadedProcess.run) fixed situation, when process ended, but not all the output was read by its stdout/stderr readers (ContentReader.run) enabled exception printing to stderr. * tests/jnlp_tests/simple/AppletTest/ : test for loading applets by jnlp file -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: XforkAndAapplet.diff2 Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120125/a6dab117/XforkAndAapplet.diff2 From bugzilla-daemon at icedtea.classpath.org Wed Jan 25 05:43:35 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 Jan 2012 13:43:35 +0000 Subject: [Bug 857] gtk look and feel setting causes javaws to hang if accessibility used In-Reply-To: <bug-857-30@http.icedtea.classpath.org/bugzilla/> References: <bug-857-30@http.icedtea.classpath.org/bugzilla/> Message-ID: <bug-857-30-TR3lsXhMU7@http.icedtea.classpath.org/bugzilla/> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=857 --- Comment #10 from Micha? Zegan <webczat_200 at poczta.onet.pl> 2012-01-25 13:43:35 UTC --- update: it was a failure of the build system not rebuilding all cllasses, the patch actually works properly. thanks -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From jvanek at icedtea.classpath.org Wed Jan 25 05:59:42 2012 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 25 Jan 2012 13:59:42 +0000 Subject: /hg/release/icedtea6-1.10: backported "resolves rhbz#580478, is ... Message-ID: <hg.fec5c1edeb55.1327499982.-53431993501496596@icedtea.classpath.org> changeset fec5c1edeb55 in /hg/release/icedtea6-1.10 details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=fec5c1edeb55 author: Jiri Vanek <jvanek at redhat.com> date: Wed Jan 25 14:57:48 2012 +0100 backported "resolves rhbz#580478, is adding full paths to desktop files" diffstat: ChangeLog | 12 ++++++++++++ configure.ac | 26 +++++++++++++++----------- jconsole.desktop | 10 ---------- jconsole.desktop.in | 10 ++++++++++ policytool.desktop | 10 ---------- policytool.desktop.in | 10 ++++++++++ 6 files changed, 47 insertions(+), 31 deletions(-) diffs (120 lines): diff -r d6b24f481e6c -r fec5c1edeb55 ChangeLog --- a/ChangeLog Thu Jan 12 13:10:28 2012 +0000 +++ b/ChangeLog Wed Jan 25 14:57:48 2012 +0100 @@ -1,3 +1,15 @@ +2012-01-25 Jiri Vanek <jvanek at redhat.com> + + fixes rhbz#580478 + * configure.ac: abs-install-dir block moved outside conditional ENABLE_SYSTEMTAP block + Added policytool.desktop and jconsole.desktop as AC_CONFIG_FILES + * jconsole.desktop: removed, replaced by jconsole.desktop.in + * jconsole.desktop.in: new file, stub for desktop file, have variable + to be substituted during configure + * policytool.desktop: removed, replaced by policytool.desktop.in + * policytool.desktop.in: new file, stub for desktop file, have variable + to be substituted during configure + 2012-01-12 Andrew John Hughes <ahughes at redhat.com> * NEWS: Add 1.10.6. diff -r d6b24f481e6c -r fec5c1edeb55 configure.ac --- a/configure.ac Thu Jan 12 13:10:28 2012 +0000 +++ b/configure.ac Wed Jan 25 14:57:48 2012 +0100 @@ -264,6 +264,21 @@ fi fi +AC_MSG_CHECKING([for absolute java home install dir]) +AC_ARG_WITH([abs-install-dir], + [AS_HELP_STRING([--with-abs-install-dir], + [The absolute path where the j2sdk-image dir will be installed])], + [if test "x${withval}" = x; then + ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image" + else + ABS_JAVA_HOME_DIR="${withval}" + fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"]) +AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}]) +AC_SUBST(ABS_JAVA_HOME_DIR) + +AC_CONFIG_FILES([jconsole.desktop]) +AC_CONFIG_FILES([policytool.desktop]) + if test "x${ENABLE_SYSTEMTAP}" = xyes; then AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], [SDT_H_FOUND='no'; @@ -305,19 +320,8 @@ ]])], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([systemtap sdt.h or g++ too old])]) AC_LANG_POP([C++]) - AC_MSG_CHECKING([for absolute java home install dir]) - AC_ARG_WITH([abs-install-dir], - [AS_HELP_STRING([--with-abs-install-dir], - [The absolute path where the j2sdk-image dir will be installed])], - [if test "x${withval}" = x; then - ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image" - else - ABS_JAVA_HOME_DIR="${withval}" - fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"]) - AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}]) ABS_CLIENT_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so" ABS_SERVER_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so" - AC_SUBST(ABS_JAVA_HOME_DIR) AC_SUBST(ABS_CLIENT_LIBJVM_SO) AC_SUBST(ABS_SERVER_LIBJVM_SO) AC_CONFIG_FILES([tapset/hotspot.stp]) diff -r d6b24f481e6c -r fec5c1edeb55 jconsole.desktop --- a/jconsole.desktop Thu Jan 12 13:10:28 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=OpenJDK Monitoring & Management Console -Comment=Monitor and manage OpenJDK applications -Exec=/usr/bin/jconsole -Icon=java -Terminal=false -Type=Application -StartupWMClass=sun-tools-jconsole-JConsole -Categories=Development;Monitor;Java; -Version=1.0 diff -r d6b24f481e6c -r fec5c1edeb55 jconsole.desktop.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jconsole.desktop.in Wed Jan 25 14:57:48 2012 +0100 @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=OpenJDK Monitoring & Management Console +Comment=Monitor and manage OpenJDK applications +Exec=@ABS_JAVA_HOME_DIR@/bin/jconsole +Icon=java +Terminal=false +Type=Application +StartupWMClass=sun-tools-jconsole-JConsole +Categories=Development;Monitor;Java; +Version=1.0 diff -r d6b24f481e6c -r fec5c1edeb55 policytool.desktop --- a/policytool.desktop Thu Jan 12 13:10:28 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=OpenJDK Policy Tool -Comment=Manage OpenJDK policy files -Exec=/usr/bin/policytool -Icon=java -Terminal=false -Type=Application -StartupWMClass=sun-security-tools-PolicyTool -Categories=Development;Java; -Version=1.0 diff -r d6b24f481e6c -r fec5c1edeb55 policytool.desktop.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policytool.desktop.in Wed Jan 25 14:57:48 2012 +0100 @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=OpenJDK Policy Tool +Comment=Manage OpenJDK policy files +Exec=@ABS_JAVA_HOME_DIR@/bin/policytool +Icon=java +Terminal=false +Type=Application +StartupWMClass=sun-security-tools-PolicyTool +Categories=Development;Java; +Version=1.0 From jvanek at icedtea.classpath.org Wed Jan 25 06:10:31 2012 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 25 Jan 2012 14:10:31 +0000 Subject: /hg/release/icedtea6-1.9: backported "resolves rhbz#580478, is a... Message-ID: <hg.c3ebe411bee3.1327500631.1785565629229908551@icedtea.classpath.org> changeset c3ebe411bee3 in /hg/release/icedtea6-1.9 details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=c3ebe411bee3 author: Jiri Vanek <jvanek at redhat.com> date: Wed Jan 25 15:10:20 2012 +0100 backported "resolves rhbz#580478, is adding full paths to desktop files" diffstat: ChangeLog | 12 ++++++++++++ configure.ac | 26 +++++++++++++++----------- jconsole.desktop | 10 ---------- jconsole.desktop.in | 10 ++++++++++ policytool.desktop | 10 ---------- policytool.desktop.in | 10 ++++++++++ 6 files changed, 47 insertions(+), 31 deletions(-) diffs (120 lines): diff -r c4c107d8a737 -r c3ebe411bee3 ChangeLog --- a/ChangeLog Thu Jan 12 13:06:55 2012 +0000 +++ b/ChangeLog Wed Jan 25 15:10:20 2012 +0100 @@ -1,3 +1,15 @@ +2012-01-25 Jiri Vanek <jvanek at redhat.com> + + fixes rhbz#580478 + * configure.ac: abs-install-dir block moved outside conditional ENABLE_SYSTEMTAP block + Added policytool.desktop and jconsole.desktop as AC_CONFIG_FILES + * jconsole.desktop: removed, replaced by jconsole.desktop.in + * jconsole.desktop.in: new file, stub for desktop file, have variable + to be substituted during configure + * policytool.desktop: removed, replaced by policytool.desktop.in + * policytool.desktop.in: new file, stub for desktop file, have variable + to be substituted during configure + 2012-01-12 Andrew John Hughes <ahughes at redhat.com> * NEWS: Add 1.9.13. diff -r c4c107d8a737 -r c3ebe411bee3 configure.ac --- a/configure.ac Thu Jan 12 13:06:55 2012 +0000 +++ b/configure.ac Wed Jan 25 15:10:20 2012 +0100 @@ -269,6 +269,21 @@ fi fi +AC_MSG_CHECKING([for absolute java home install dir]) +AC_ARG_WITH([abs-install-dir], + [AS_HELP_STRING([--with-abs-install-dir], + [The absolute path where the j2sdk-image dir will be installed])], + [if test "x${withval}" = x; then + ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image" + else + ABS_JAVA_HOME_DIR="${withval}" + fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"]) +AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}]) +AC_SUBST(ABS_JAVA_HOME_DIR) + +AC_CONFIG_FILES([jconsole.desktop]) +AC_CONFIG_FILES([policytool.desktop]) + if test "x${ENABLE_SYSTEMTAP}" = xyes; then AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], [SDT_H_FOUND='no'; @@ -310,19 +325,8 @@ ]])], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([systemtap sdt.h or g++ too old])]) AC_LANG_POP([C++]) - AC_MSG_CHECKING([for absolute java home install dir]) - AC_ARG_WITH([abs-install-dir], - [AS_HELP_STRING([--with-abs-install-dir], - [The absolute path where the j2sdk-image dir will be installed])], - [if test "x${withval}" = x; then - ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image" - else - ABS_JAVA_HOME_DIR="${withval}" - fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"]) - AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}]) ABS_CLIENT_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so" ABS_SERVER_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so" - AC_SUBST(ABS_JAVA_HOME_DIR) AC_SUBST(ABS_CLIENT_LIBJVM_SO) AC_SUBST(ABS_SERVER_LIBJVM_SO) AC_CONFIG_FILES([tapset/hotspot.stp]) diff -r c4c107d8a737 -r c3ebe411bee3 jconsole.desktop --- a/jconsole.desktop Thu Jan 12 13:06:55 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=OpenJDK Monitoring & Management Console -Comment=Monitor and manage OpenJDK applications -Exec=/usr/bin/jconsole -Icon=java -Terminal=false -Type=Application -StartupWMClass=sun-tools-jconsole-JConsole -Categories=Development;Monitor;Java; -Version=1.0 diff -r c4c107d8a737 -r c3ebe411bee3 jconsole.desktop.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jconsole.desktop.in Wed Jan 25 15:10:20 2012 +0100 @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=OpenJDK Monitoring & Management Console +Comment=Monitor and manage OpenJDK applications +Exec=@ABS_JAVA_HOME_DIR@/bin/jconsole +Icon=java +Terminal=false +Type=Application +StartupWMClass=sun-tools-jconsole-JConsole +Categories=Development;Monitor;Java; +Version=1.0 diff -r c4c107d8a737 -r c3ebe411bee3 policytool.desktop --- a/policytool.desktop Thu Jan 12 13:06:55 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=OpenJDK Policy Tool -Comment=Manage OpenJDK policy files -Exec=/usr/bin/policytool -Icon=java -Terminal=false -Type=Application -StartupWMClass=sun-security-tools-PolicyTool -Categories=Development;Java; -Version=1.0 diff -r c4c107d8a737 -r c3ebe411bee3 policytool.desktop.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policytool.desktop.in Wed Jan 25 15:10:20 2012 +0100 @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=OpenJDK Policy Tool +Comment=Manage OpenJDK policy files +Exec=@ABS_JAVA_HOME_DIR@/bin/policytool +Icon=java +Terminal=false +Type=Application +StartupWMClass=sun-security-tools-PolicyTool +Categories=Development;Java; +Version=1.0 From ptisnovs at redhat.com Wed Jan 25 07:14:21 2012 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Wed, 25 Jan 2012 16:14:21 +0100 Subject: two more tests for icedtea web In-Reply-To: <4F200329.40903@redhat.com> References: <4EEF41D0.5030001@redhat.com> <4F1EB7F1.5050906@redhat.com> <4F200329.40903@redhat.com> Message-ID: <4F201C4D.9010306@redhat.com> Jiri Vanek wrote: > On 01/24/2012 02:53 PM, Pavel Tisnovsky wrote: >> Hi Jiri, >> >> I'm ok with this update, but I think it would be better to refactor >> following >> "magic" numeric constants 1000000l and 30000 into class's final >> (named) constants >> (so the change of timeout will be much easier). >> >> Pavel >> >> Jiri Vanek wrote: >>> 2011-12-19 Jiri Vanek<jvanek at redhat.com> >>> >>> * tests/jnlp_tests/simple/AppletTest/ : test for loading applets by >>> jnlp file >>> >>> 2011-12-19 Jiri Vanek<jvanek at redhat.com> >>> >>> Added test for -Xnofork option >>> * >>> tests/jnlp_tests/simple/deadlocktest/resources/deadlocktest_1.jnlp: new >>> file >>> By specifying new max heap size, should invoke jvm to fork when >>> launched >>> * tests/jnlp_tests/simple/deadlocktest/srcs/DeadlockTest.java: >>> improved indentation, added debug output that main method was >>> lunched >>> * >>> tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java: >>> small refactoring, add lunching of deadlocktest_1.jnlp with and >>> without -Xnofork, and counting java instances during runtime >>> * >>> tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java >>> (ThreadedProcess.run) fixed situation, when process ended, but >>> not all >>> the output was read by its stdout/stderr readers >>> (ContentReader.run) enabled exception printing to stderr. >>> >>> Regards J. >>> >> > > Tyvm for review! I have isolated the constants. Ok for head? > > J. I'm ok with this change. Thank you. > > > > 2012-01-25 Jiri Vanek <jvanek at redhat.com> > > Added test for -Xnofork option > * > tests/jnlp_tests/simple/deadlocktest/resources/deadlocktest_1.jnlp: new > file > By specifying new max heap size, should invoke jvm to fork when > launched > * tests/jnlp_tests/simple/deadlocktest/srcs/DeadlockTest.java: > improved indentation, added debug output that main method was lunched > * tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java: > small refactoring, add lunching of deadlocktest_1.jnlp with and > without -Xnofork, and counting java instances during runtime > * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java > (ThreadedProcess.run) fixed situation, when process ended, but not all > the output was read by its stdout/stderr readers > (ContentReader.run) enabled exception printing to stderr. > * tests/jnlp_tests/simple/AppletTest/ : test for loading applets by > jnlp file > From jvanek at icedtea.classpath.org Wed Jan 25 07:42:24 2012 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 25 Jan 2012 15:42:24 +0000 Subject: /hg/icedtea-web: added xnofork tests and applet tests Message-ID: <hg.b901442e9ba4.1327506144.8643924302249223276@icedtea.classpath.org> changeset b901442e9ba4 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=b901442e9ba4 author: Jiri Vanek <jvanek at redhat.com> date: Wed Jan 25 16:42:27 2012 +0100 added xnofork tests and applet tests diffstat: ChangeLog | 16 + tests/jnlp_tests/simple/AppletTest/resources/AppletTest.jnlp | 63 ++++ tests/jnlp_tests/simple/AppletTest/srcs/AppletTest.java | 82 +++++ tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.java | 73 ++++ tests/jnlp_tests/simple/deadlocktest/resources/deadlocktest_1.jnlp | 53 +++ tests/jnlp_tests/simple/deadlocktest/srcs/DeadlockTest.java | 25 +- tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java | 151 +++++++++- tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java | 8 +- 8 files changed, 449 insertions(+), 22 deletions(-) diffs (truncated from 564 to 500 lines): diff -r 21183f821dd4 -r b901442e9ba4 ChangeLog --- a/ChangeLog Tue Jan 24 15:33:51 2012 -0500 +++ b/ChangeLog Wed Jan 25 16:42:27 2012 +0100 @@ -1,3 +1,19 @@ +2012-01-25 Jiri Vanek <jvanek at redhat.com> + + Added test for -Xnofork option and for applet launching by jnlp + * tests/jnlp_tests/simple/deadlocktest/resources/deadlocktest_1.jnlp: new file + By specifying new max heap size, should invoke jvm to fork when launched + * tests/jnlp_tests/simple/deadlocktest/srcs/DeadlockTest.java: + improved indentation, added debug output that main method was lunched + * tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java: + small refactoring, add lunching of deadlocktest_1.jnlp with and + without -Xnofork, and counting java instances during runtime + * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java + (ThreadedProcess.run) fixed situation, when process ended, but not all + the output was read by its stdout/stderr readers + (ContentReader.run) enabled exception printing to stderr. + * tests/jnlp_tests/simple/AppletTest/ : test for loading applets by jnlp file + 2012-01-06 Danesh Dadachanji <ddadacha at redhat.com> Use the JNLP file's information section for the Name and diff -r 21183f821dd4 -r b901442e9ba4 tests/jnlp_tests/simple/AppletTest/resources/AppletTest.jnlp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/jnlp_tests/simple/AppletTest/resources/AppletTest.jnlp Wed Jan 25 16:42:27 2012 +0100 @@ -0,0 +1,63 @@ +<!-- + +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. + + --> +<?xml version="1.0" encoding="utf-8"?> +<jnlp spec="1.0" href="AppletTest.jnlp" codebase="."> + <information> + <title>AppletTest + NetX + + AppletTest + + + + + + + + + + + + + + diff -r 21183f821dd4 -r b901442e9ba4 tests/jnlp_tests/simple/AppletTest/srcs/AppletTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/jnlp_tests/simple/AppletTest/srcs/AppletTest.java Wed Jan 25 16:42:27 2012 +0100 @@ -0,0 +1,82 @@ + +import java.applet.Applet; + +/* AppletTest.java +Copyright (C) 2011 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. + */ +public class AppletTest extends Applet { + + private class Killer extends Thread { + + public int n = 2000; + + @Override + public void run() { + try { + Thread.sleep(n); + System.out.println("Aplet killing himself after " + n + " ms of life"); + System.exit(0); + } catch (Exception ex) { + } + } + } + private Killer killer; + + @Override + public void init() { + System.out.println("applet was initialised"); + killer = new Killer(); + } + + @Override + public void start() { + System.out.println("applet was started"); + System.out.println(getParameter("key1")); + System.out.println(getParameter("key2")); + killer.start(); + System.out.println("killer was started"); + } + + @Override + public void stop() { + System.out.println("applet was stopped"); + } + + @Override + public void destroy() { + System.out.println("applet will be destroyed"); + } +} diff -r 21183f821dd4 -r b901442e9ba4 tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.java Wed Jan 25 16:42:27 2012 +0100 @@ -0,0 +1,73 @@ +/* AppletTestTests.java +Copyright (C) 2011 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.ServerAccess; +import org.junit.Assert; + +import org.junit.Test; + +public class AppletTestTests { + + private static ServerAccess server = new ServerAccess(); + + @Test + public void AppletTest() throws Exception { + System.out.println("connecting AppletTest request"); + System.err.println("connecting AppletTest request"); + ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/AppletTest.jnlp"); + System.out.println(pr.stdout); + System.err.println(pr.stderr); + String s3 = "applet was initialised"; + Assert.assertTrue("AppletTest stdout should contains " + s3 + " bud didn't", pr.stdout.contains(s3)); + String s0 = "applet was started"; + Assert.assertTrue("AppletTest stdout should contains " + s0 + " bud didn't", pr.stdout.contains(s0)); + String s1 = "value1"; + Assert.assertTrue("AppletTest stdout should contains " + s1 + " bud didn't", pr.stdout.contains(s1)); + String s2 = "value2"; + Assert.assertTrue("AppletTest stdout should contains " + s2 + " bud didn't", pr.stdout.contains(s2)); + String s4 = "applet was stopped"; + Assert.assertFalse("AppletTest stdout shouldn't contains " + s4 + " bud did", pr.stdout.contains(s4)); + String s5 = "applet will be destroyed"; + Assert.assertFalse("AppletTest stdout shouldn't contains " + s5 + " bud did", pr.stdout.contains(s5)); + String ss = "xception"; + Assert.assertFalse("AppletTest stderr should not contains " + ss + " but did", pr.stderr.contains(ss)); + String s7 = "Aplet killing himself after 2000 ms of life"; + Assert.assertTrue("AppletTest stdout should contains " + s7 + " bud didn't", pr.stdout.contains(s7)); + Assert.assertFalse(pr.wasTerminated); + Assert.assertEquals((Integer) 0, pr.returnValue); + } +} diff -r 21183f821dd4 -r b901442e9ba4 tests/jnlp_tests/simple/deadlocktest/resources/deadlocktest_1.jnlp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/jnlp_tests/simple/deadlocktest/resources/deadlocktest_1.jnlp Wed Jan 25 16:42:27 2012 +0100 @@ -0,0 +1,53 @@ + + + + + simpletest1 + NetX + + simpletest1 + + + + + + + + + diff -r 21183f821dd4 -r b901442e9ba4 tests/jnlp_tests/simple/deadlocktest/srcs/DeadlockTest.java --- a/tests/jnlp_tests/simple/deadlocktest/srcs/DeadlockTest.java Tue Jan 24 15:33:51 2012 -0500 +++ b/tests/jnlp_tests/simple/deadlocktest/srcs/DeadlockTest.java Wed Jan 25 16:42:27 2012 +0100 @@ -35,17 +35,20 @@ exception statement from your version. */ -public class DeadlockTest{ +public class DeadlockTest { - public static void main(String[] args) throws Exception{ - long startTime=System.nanoTime()/1000000l; -while(true){ -long now=System.nanoTime()/1000000l; -Thread.sleep(10); -if (now-startTime>30000){ - System.out.println("This process is hanging more then 30s. Should be killed"); - System.exit(5); -} -} + private static final int DEADLOCK_TEST_TIME_OF_LIFE=30000; + + public static void main(String[] args) throws Exception { + long startTime = System.nanoTime() / 1000000l; + System.out.println("Deadlock test started"); + while (true) { + long now = System.nanoTime() / 1000000l; + Thread.sleep(10); + if (now - startTime > DEADLOCK_TEST_TIME_OF_LIFE) { + System.out.println("This process is hanging more then "+DEADLOCK_TEST_TIME_OF_LIFE/1000+"s. Should be killed"); + System.exit(5); + } + } } } diff -r 21183f821dd4 -r b901442e9ba4 tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java --- a/tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java Tue Jan 24 15:33:51 2012 -0500 +++ b/tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java Wed Jan 25 16:42:27 2012 +0100 @@ -36,30 +36,165 @@ */ import net.sourceforge.jnlp.ServerAccess; +import net.sourceforge.jnlp.ServerAccess.ProcessResult; import org.junit.Assert; +import java.util.Arrays; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.junit.BeforeClass; import org.junit.Test; public class DeadLockTestTest { private static ServerAccess server = new ServerAccess(); + private static String deadlocktest_1 = "/deadlocktest_1.jnlp"; + private static String deadlocktest = "/deadlocktest.jnlp"; - + @BeforeClass + public static void printJavas() throws Exception { + System.out.println("Currently runnng javas1 " + countJavaInstances()); - @Test + } + + @Test public void testDeadLockTestTerminated() throws Exception { - System.out.println("connecting deadlocktest request"); - System.err.println("connecting deadlocktest request"); - ServerAccess.ProcessResult pr=server.executeJavawsHeadless(null,"/deadlocktest.jnlp"); + testDeadLockTestTerminatedBody(deadlocktest); + System.out.println("Currently runnng javas2 " + countJavaInstances()); + } + + @Test + public void testDeadLockTestTerminated2() throws Exception { + testDeadLockTestTerminatedBody(deadlocktest_1); + System.out.println("Currently runnng javas3 " + countJavaInstances()); + } + + public void testDeadLockTestTerminatedBody(String jnlp) throws Exception { + System.out.println("connecting " + jnlp + " request"); + System.err.println("connecting " + jnlp + " request"); + ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, jnlp); System.out.println(pr.stdout); System.err.println(pr.stderr); + assertDeadlockTestLaunched(pr); Assert.assertFalse(pr.stdout.contains("This process is hanging more then 30s. Should be killed")); // Assert.assertTrue(pr.stderr.contains("xception"));, exception is thrown by engine,not by application - Assert.assertTrue("testDeadLockTestTerminated should be terminated, but wasn't",pr.wasTerminated); + Assert.assertTrue("testDeadLockTestTerminated should be terminated, but wasn't", pr.wasTerminated); Assert.assertEquals(null, pr.returnValue);//killed process have no value } - - + @Test + public void ensureAtLeasOneJavaIsRunning() throws Exception { + Assert.assertTrue("at least one java should be running, but isnt! Javas are probably counted badly", countJavaInstances() > 0); + ; } + + @Test + public void testSimpletest1lunchFork() throws Exception { + System.out.println("connecting " + deadlocktest_1 + " request"); + System.err.println("connecting " + deadlocktest_1 + " request"); + int before = countJavaInstances(); + System.out.println("java4: " + before); + BackgroundDeadlock bd = new BackgroundDeadlock(deadlocktest_1, null); + bd.start(); + Thread.sleep(ServerAccess.PROCESS_TIMEOUT * 2 / 3); + int during = +countJavaInstances(); + System.out.println("java5: " + during); + waitForBackgroundDeadlock(bd); + Thread.sleep(500); + int after = countJavaInstances(); + System.out.println("java6: " + after); + Assert.assertNotNull("proces inside background deadlock cant be null. Was.", bd.getPr()); + System.out.println(bd.getPr().stdout); + System.err.println(bd.getPr().stderr); + assertDeadlockTestLaunched(bd.getPr()); + Assert.assertEquals("lunched JVMs must be exactly 2, was " + (during - before), 2, during - before); + } + + @Test + public void testSimpletest1lunchNoFork() throws Exception { + System.out.println("connecting " + deadlocktest_1 + " Xnofork request"); + System.err.println("connecting " + deadlocktest_1 + " Xnofork request"); + int before = countJavaInstances(); + System.out.println("java7: " + before); + BackgroundDeadlock bd = new BackgroundDeadlock(deadlocktest_1, Arrays.asList(new String[]{"-Xnofork"})); + bd.start(); + Thread.sleep(ServerAccess.PROCESS_TIMEOUT * 2 / 3); + int during = +countJavaInstances(); + System.out.println("java8: " + during); + waitForBackgroundDeadlock(bd); + Thread.sleep(500); + int after = countJavaInstances(); + System.out.println("java9: " + after); + Assert.assertNotNull("proces inside background deadlock cant be null. Was.", bd.getPr()); + System.out.println(bd.getPr().stdout); + System.err.println(bd.getPr().stderr); + assertDeadlockTestLaunched(bd.getPr()); + Assert.assertEquals("lunched JVMs must be exactly 1, was " + (during - before), 1, during - before); + ; + } + + private static int countJavaInstances() throws Exception { + String os = System.getProperty("os.name").toLowerCase(); + if (!(os.contains("linux") || os.contains("unix"))) { + throw new IllegalStateException("This test can be procesed only on linux like machines"); + } + ServerAccess.ProcessResult pr = ServerAccess.executeProcess(Arrays.asList(new String[]{"ps", "-A"})); + Matcher m = Pattern.compile("\\s+java\\s+").matcher(pr.stdout); + //System.out.println(pr.stdout); + int i = 0; + while (m.find()) { + i++; + } + return i; + + } + + private void assertDeadlockTestLaunched(ProcessResult pr) { + String s = "Deadlock test started"; + Assert.assertTrue("Deadlock test should print out " + s + ", but did not", pr.stdout.contains(s)); + String ss = "xception"; + Assert.assertFalse("Deadlock test should not stderr " + ss + " but did", pr.stderr.contains(ss)); + } + + private void waitForBackgroundDeadlock(final BackgroundDeadlock bd) throws InterruptedException { + while (!bd.isFinished()) { + Thread.sleep(500); + + } + } + + private static class BackgroundDeadlock extends Thread { + + private boolean finished = false; + private ProcessResult pr = null; + String jnlp; + List args; + + public BackgroundDeadlock(String jnlp, List args) { + this.jnlp = jnlp; + this.args = args; + } From dflamme at complang.tuwien.ac.at Wed Jan 25 08:03:39 2012 From: dflamme at complang.tuwien.ac.at (David Flamme) Date: Wed, 25 Jan 2012 17:03:39 +0100 Subject: Cacao support for OpenJDK7 Message-ID: <4F2027DB.5070804@complang.tuwien.ac.at> Hello, I managed to compile and run cacao against OpenJDK7 on x86_64 at least on a "Hello World" level. Now I have some questions and want to point out what needs to be done in icedtea to compile the whole thing out of the box with cacao. First of all, the cacao branch of what I did so far can be found here: http://mips.complang.tuwien.ac.at/hg/cacao/rev/30edcde287d9 The biggest problem on the side of icedtea7 is, that you check not only the existence of libjsig.so, you also check if its not fake by using nm. What I do is copying a working version from my openjdk installation to the expected location, so the build won't complain but actually I have no clue whats going on there. JamVM probably has the same problem, so I mostly hope for a good suggestion from your side, what should be done here. Then while replacing the hpi functionality I stumbled upon NO_INTERRUPTIBLE_IO, which would save me implementing a lot of multithreading support, if i can just expect its true. Can you tell me a bit about that issue? It would be great if somebody could test the changeset or at least give me some hints. best regards david From omajid at redhat.com Wed Jan 25 08:18:44 2012 From: omajid at redhat.com (Omair Majid) Date: Wed, 25 Jan 2012 11:18:44 -0500 Subject: Pushing back the IcedTea6 1.11 release: 2012-01-25 In-Reply-To: <485ed187-01c8-4615-80a0-20a87cffbe93@zmail16.collab.prod.int.phx2.redhat.com> References: <485ed187-01c8-4615-80a0-20a87cffbe93@zmail16.collab.prod.int.phx2.redhat.com> Message-ID: <4F202B64.1080302@redhat.com> On 01/24/2012 07:45 AM, Andrew Hughes wrote: > ----- Original Message ----- >> On 01/23/2012 04:21 PM, Andrew Hughes wrote: >>> ----- Original Message ----- >>>> On 01/18/2012 11:23 AM, Omair Majid wrote: >>>>> How does 1 week (2012-01-25) sound? >>>>> >>>> >>>> Things are looking much better with the arm stuff now. It looks >>>> like >>>> IcedTea6 1.11 on 2012-01-25 will be doable. >>>> >>> >>> I don't think this is a good idea. There's an upcoming security >>> release >>> that will make such a release obsolete just three weeks after: >>> >>> http://www.oracle.com/technetwork/topics/security/alerts-086861.html >>> >>> Would it not be better to just wait and release 1.11 with these >>> security >>> fixes? >> >> FWIW, I think three weeks of users being able to benefit from the >> release is still worth it. >> > > Well, you're the one doing the work twice over in a short space of time, > so it's up to you. > Yeah. I am fine with the extra work, btw. > My worry is that this obsoletes 1.8 and then provides a security update > just three weeks later. Under the circumstances, I think a further 1.8 > release with the security updates is in order before obsoleting that branch. If I understand correctly, you will have to do this either way (if we were to release today or in a month), right? Cheers, Omair From omajid at redhat.com Wed Jan 25 08:23:39 2012 From: omajid at redhat.com (Omair Majid) Date: Wed, 25 Jan 2012 11:23:39 -0500 Subject: Pushing back the IcedTea6 1.11 release: 2012-01-25 In-Reply-To: <4F1D92A4.9090708@redhat.com> References: <4F0771B8.4080106@redhat.com> <4F16F1EE.4000506@redhat.com> <4F1D92A4.9090708@redhat.com> Message-ID: <4F202C8B.9020407@redhat.com> On 01/23/2012 12:02 PM, Omair Majid wrote: > On 01/18/2012 11:23 AM, Omair Majid wrote: >> How does 1 week (2012-01-25) sound? >> > > Things are looking much better with the arm stuff now. It looks like > IcedTea6 1.11 on 2012-01-25 will be doable. > Scratch that. Andrew Haley found at least one crasher bug. I am not going to be releasing IcedTeat6 1.11 until all such showstoppers have been worked out. I don't have any target date in mind right now. Let's see how things play out. Cheers, Omair From bugzilla-daemon at icedtea.classpath.org Wed Jan 25 12:46:41 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 Jan 2012 20:46:41 +0000 Subject: [Bug 858] MarvinSketch and several other Applets not working In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=858 --- Comment #2 from Hendrik Knackstedt 2012-01-25 20:46:41 UTC --- How can I apply this patch to OpenJDK? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed Jan 25 13:03:54 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 Jan 2012 21:03:54 +0000 Subject: [Bug 858] MarvinSketch and several other Applets not working In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=858 thomas at m3y3r.de changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |thomas at m3y3r.de --- Comment #3 from thomas at m3y3r.de 2012-01-25 21:03:54 UTC --- Hi, to be clear: the appended patch doesn't fix your problem. with the patch applied the second jar fails with a security exception. I'm not an expert for the applet security design. i'm not sure what access rights the second jar file for the same domain should get. something seems to be wrong here in the java side of the icedtea-web plugin. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed Jan 25 13:07:32 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 Jan 2012 21:07:32 +0000 Subject: [Bug 822] https://bcee.snet.lu/ssogate/xlogin not functional In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=822 thomas at m3y3r.de changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |thomas at m3y3r.de --- Comment #4 from thomas at m3y3r.de 2012-01-25 21:07:32 UTC --- it's seems as the "setIO" is not granted to the applet: Breakdown -- type: context identifier: 0 reference: -694 src: null privileges: null rest: "GetClassID 90" Sending to PASC: 0/-694 and GetClassID 90 0 -- null -- -694 -- GetClassID 90 CONTEXT= sun.applet.PluginAppletSecurityContext at 1af7a03 appletviewer writing GetClassID 91 PIPE: appletviewer wrote: context 0 reference -694 GetClassID 91 Consumption (priority=false) completed by consumer thread 0 WRITING 2: instance 28 status Ausnahme: java.security.AccessControlException: access denied (java.lang.RuntimePermission setIO) PIPE: appletviewer wrote: instance 28 status Ausnahme: java.security.AccessControlException: access denied (java.lang.RuntimePermission setIO) WRITING 2 DONE java.security.AccessControlException: access denied (java.lang.RuntimePermission setIO) at java.security.AccessControlContext.checkPermission(AccessControlContext.java:393) at java.security.AccessController.checkPermission(AccessController.java:553) at java.lang.SecurityManager.checkPermission(SecurityManager.java:549) at net.sourceforge.jnlp.runtime.JNLPSecurityManager.checkPermission(JNLPSecurityManager.java:284) at java.lang.System.checkIO(System.java:243) at java.lang.System.setOut(System.java:165) at snet.a.(Unknown Source) at snet.f.j(Unknown Source) at snet.f.(Unknown Source) at LoginApplet.start(Unknown Source) at sun.applet.AppletPanel.run(AppletPanel.java:476) at java.lang.Thread.run(Thread.java:679) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed Jan 25 13:10:56 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 Jan 2012 21:10:56 +0000 Subject: [Bug 852] Classloader not being flushed after last applet from a site is closed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=852 thomas at m3y3r.de changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |thomas at m3y3r.de --- Comment #2 from thomas at m3y3r.de 2012-01-25 21:10:56 UTC --- Hi, any news on this? can I help to resolve this? you wrote that you have a patch available? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed Jan 25 13:53:47 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 Jan 2012 21:53:47 +0000 Subject: [Bug 822] https://bcee.snet.lu/ssogate/xlogin not functional In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=822 --- Comment #5 from thomas at m3y3r.de 2012-01-25 21:53:47 UTC --- Created attachment 641 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=641 policy file for granting setIO But this file into your home directoy as ".java.policy". you can edit this file via the tool "policytool". the attached file will grant the setIO permission to the applet found at the .lu url -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed Jan 25 14:23:33 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 Jan 2012 22:23:33 +0000 Subject: [Bug 822] https://bcee.snet.lu/ssogate/xlogin not functional In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=822 --- Comment #6 from Deepak Bhole 2012-01-25 22:23:33 UTC --- (In reply to comment #3) > Deepak, > have you found time to look at this in the last 2 months? Yes and no. I fixed it about 80% and then got side tracked :/ Looking at it again now. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From xerxes at zafena.se Thu Jan 26 01:12:44 2012 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Thu, 26 Jan 2012 10:12:44 +0100 Subject: Cacao support for OpenJDK7 In-Reply-To: <4F2027DB.5070804@complang.tuwien.ac.at> References: <4F2027DB.5070804@complang.tuwien.ac.at> Message-ID: <4F21190C.3060206@zafena.se> 2012-01-25 17:03, David Flamme skrev: > Hello, > > I managed to compile and run cacao against OpenJDK7 on x86_64 at least on a "Hello World" level. Now I have some questions and want to point out what needs to be done in icedtea to compile the whole thing out of the box with cacao. > > First of all, the cacao branch of what I did so far can be found here: http://mips.complang.tuwien.ac.at/hg/cacao/rev/30edcde287d9 Ok, thanks! > > The biggest problem on the side of icedtea7 is, that you check not only the existence of libjsig.so, you also check if its not fake by using nm. What I do is copying a working version from my openjdk installation to the expected location, so the build won't complain but actually I have no clue whats going on there. JamVM probably has the same problem, so I mostly hope for a good suggestion from your side, what should be done here. I managed to work around this issue by creating a symbolic-link from libjsig.so to the jamvm libjvm.so As can be seen in this changeset: http://icedtea.classpath.org/hg/icedtea7/rev/61e88e07618c I will try do the same for cacao. > > Then while replacing the hpi functionality I stumbled upon NO_INTERRUPTIBLE_IO, which would save me implementing a lot of multithreading support, if i can just expect its true. Can you tell me a bit about that issue? > > It would be great if somebody could test the changeset or at least give me some hints. Sure, I will test it and send in a patch to update icedtea7. > > best regards david Cheers Xerxes From xranby at icedtea.classpath.org Thu Jan 26 02:58:16 2012 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Thu, 26 Jan 2012 10:58:16 +0000 Subject: /hg/buildbot: 2012-01-26 Xerxes Ranby Message-ID: changeset 1e60d0136e99 in /hg/buildbot details: http://icedtea.classpath.org/hg/buildbot?cmd=changeset;node=1e60d0136e99 author: Xerxes Ranby date: Thu Jan 26 12:43:56 2012 +0100 2012-01-26 Xerxes Ranby * icedtea/master.cfg (icedtea7-squeeze-x86_64-quick f3s7, icedtea7-squeeze-armv5tel-quick f3a5 and icedtea7-squeeze-x86_64-full f4): Use --disable-system-gtk diffstat: icedtea/master.cfg | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (27 lines): diff -r ec7d0609cbed -r 1e60d0136e99 icedtea/master.cfg --- a/icedtea/master.cfg Thu Nov 10 21:38:42 2011 +0100 +++ b/icedtea/master.cfg Thu Jan 26 12:43:56 2012 +0100 @@ -326,6 +326,7 @@ "--with-parallel-jobs=4", "--with-llvm-config=llvm-config-2.7", "--disable-system-gio", + "--disable-system-gtk", "--disable-system-lcms"], workdir="build")) f3s7.addStep(Compile(workdir="build")) @@ -728,6 +729,7 @@ "--with-parallel-jobs=1", "--disable-docs", "--disable-system-gio", + "--disable-system-gtk", "--disable-system-lcms"], workdir="build")) f3a5.addStep(Compile(workdir="build")) @@ -971,6 +973,7 @@ "--with-parallel-jobs=4", "--with-llvm-config=llvm-config-2.7", "--disable-system-gio", + "--disable-system-gtk", "--disable-system-lcms"], workdir="build")) f4.addStep(Compile(workdir="build")) From ptisnovs at icedtea.classpath.org Thu Jan 26 03:00:02 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 26 Jan 2012 11:00:02 +0000 Subject: /hg/gfx-test: 2012-01-26 Pavel Tisnovsky Message-ID: changeset af5edcbd88f4 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=af5edcbd88f4 author: Pavel Tisnovsky date: Thu Jan 26 12:02:27 2012 +0100 2012-01-26 Pavel Tisnovsky * src/org/gfxtest/framework/CommonBitmapOperations.java: Added support for new raster patterns. diffstat: ChangeLog | 5 + src/org/gfxtest/framework/CommonBitmapOperations.java | 78 +++++++++++++++++++ 2 files changed, 83 insertions(+), 0 deletions(-) diffs (98 lines): diff -r 95c3b4a9eaaf -r af5edcbd88f4 ChangeLog --- a/ChangeLog Mon Jan 23 10:18:01 2012 +0100 +++ b/ChangeLog Thu Jan 26 12:02:27 2012 +0100 @@ -1,3 +1,8 @@ +2012-01-26 Pavel Tisnovsky + + * src/org/gfxtest/framework/CommonBitmapOperations.java: + Added support for new raster patterns. + 2012-01-23 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r 95c3b4a9eaaf -r af5edcbd88f4 src/org/gfxtest/framework/CommonBitmapOperations.java --- a/src/org/gfxtest/framework/CommonBitmapOperations.java Mon Jan 23 10:18:01 2012 +0100 +++ b/src/org/gfxtest/framework/CommonBitmapOperations.java Thu Jan 26 12:02:27 2012 +0100 @@ -449,4 +449,82 @@ // BitBlt with custom scaling return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; } + + public static TestResult doBitBltTestWithDiagonalColorStripesImage(TestImage image, Graphics2D graphics2d, int imageType) + { + // create image with given pattern + BufferedImage bufferedImage = ImageFactory.createDiagonalColorStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling + return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + public static TestResult doBitBltTestWithDiagonalColorStripesImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) + { + // create image with given pattern + BufferedImage bufferedImage = ImageFactory.createDiagonalColorStripesImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling + return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; + } + + public static TestResult doBitBltTestWithBWDotsImage(TestImage image, Graphics2D graphics2d, int imageType) + { + // create image with given pattern + BufferedImage bufferedImage = ImageFactory.createBWDotsPatternImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling + return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + public static TestResult doBitBltTestWithBWDotsImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) + { + // create image with given pattern + BufferedImage bufferedImage = ImageFactory.createBWDotsPatternImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling + return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; + } + + public static TestResult doBitBltTestWithColorDotsImage(TestImage image, Graphics2D graphics2d, int imageType) + { + // create image with given pattern + BufferedImage bufferedImage = ImageFactory.createColorDotsPatternImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with 1:1 scaling + return BitBlt(bufferedImage, image, graphics2d) ? TestResult.PASSED : TestResult.FAILED; + } + + public static TestResult doBitBltTestWithColorDotsImage(TestImage image, Graphics2D graphics2d, int imageType, int width, int height) + { + // create image with given pattern + BufferedImage bufferedImage = ImageFactory.createColorDotsPatternImage(DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType); + // basic check if buffered image was created + if (bufferedImage == null) + { + return TestResult.FAILED; + } + // BitBlt with custom scaling + return BitBlt(bufferedImage, image, graphics2d, width, height) ? TestResult.PASSED : TestResult.FAILED; + } } From xerxes at zafena.se Thu Jan 26 07:10:05 2012 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Thu, 26 Jan 2012 16:10:05 +0100 Subject: ARM: Fix broken safepoint code In-Reply-To: <4F2000A3.5050907@redhat.com> References: <4F2000A3.5050907@redhat.com> Message-ID: <4F216CCD.7010205@zafena.se> 2012-01-25 14:16, Andrew Haley skrev: > > We've been seeing mysterious crashes in Eclipse. It turns out that > ecj generates different code from javac for things like > > while (tmp != null) > tmp = tmp.poo; > > javac generates: > > 8: aload_1 > 9: ifnull 20 > 12: aload_1 > 13: getfield > 16: astore_1 > 17: goto 8 > > ecj generates: > > 11: aload_1 > 12: getfield > 15: astore_1 > 16: aload_1 > 17: ifnonnull 11 > > And this reveals a bug in safepoint handling: conditional backwards > jumps were popping arguments from the stack before calling the > safepoint handler. This is wrong because the garbage collector > may expect to find an object reference on the stack. > > Fixed thusly. > > Andrew. I have done some testing with this patch applied. make check-hotspot and check-langtools pass nicely. I have not seen any crash during todays testing of the thumb2 jit and so I think its safe to say that this patch are OK for inclusion into icedtea6 hg head and 1.11 release branch. Cheers Xerxes > > > 2012-01-25 Andrew Haley > > * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Branch): > Remove safepoint code. > (Thumb2_Cond_Safepoint): New function. > (Thumb2_codegen): Call Thumb2_Cond_Safepoint() from two places. > > diff -r 6179ebaffe6b arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp > --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Jan 23 16:43:01 2012 +0000 > +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Wed Jan 25 07:59:48 2012 -0500 > @@ -4365,7 +4365,17 @@ > } > } > > -int Thumb2_Branch(Thumb2_Info *jinfo, unsigned bci, unsigned cond, int stackdepth) > +// If this is a backward branch, compile a safepoint check > +void Thumb2_Cond_Safepoint(Thumb2_Info *jinfo, int stackdepth, int bci) { > + int offset = GET_JAVA_S2(jinfo->code_base + bci + 1); > + unsigned dest_taken = bci + offset; > + > + if (jinfo->bc_stackinfo[dest_taken] & BC_COMPILED) { > + Thumb2_Safepoint(jinfo, stackdepth, bci); > + } > +} > + > +int Thumb2_Branch(Thumb2_Info *jinfo, unsigned bci, unsigned cond) > { > int offset = GET_JAVA_S2(jinfo->code_base + bci + 1); > unsigned dest_taken = bci + offset; > @@ -4373,10 +4383,7 @@ > unsigned loc; > > if (jinfo->bc_stackinfo[dest_taken] & BC_COMPILED) { > - loc = forward_16(jinfo->codebuf); > - Thumb2_Safepoint(jinfo, stackdepth, bci); > - branch_uncond(jinfo->codebuf, jinfo->bc_stackinfo[dest_taken] & ~BC_FLAGS_MASK); > - bcc_patch(jinfo->codebuf, NEG_COND(cond), loc); > + branch(jinfo->codebuf, cond, jinfo->bc_stackinfo[dest_taken] & ~BC_FLAGS_MASK); > return dest_not_taken; > } > loc = forward_32(jinfo->codebuf); > @@ -6323,12 +6330,13 @@ > case opc_ifnonnull: { > Reg r; > unsigned cond = opcode - opc_ifeq; > + Thumb2_Cond_Safepoint(jinfo, stackdepth, bci); > if (opcode >= opc_ifnull) cond = opcode - opc_ifnull; > Thumb2_Fill(jinfo, 1); > r = POP(jstack); > Thumb2_Flush(jinfo); > cmp_imm(jinfo->codebuf, r, 0); > - bci = Thumb2_Branch(jinfo, bci, cond, stackdepth-1); > + bci = Thumb2_Branch(jinfo, bci, cond); > len = 0; > break; > } > @@ -6343,13 +6351,14 @@ > case opc_if_acmpne: { > Reg r_lho, r_rho; > unsigned cond = opcode - opc_if_icmpeq; > + Thumb2_Cond_Safepoint(jinfo, stackdepth, bci); > if (opcode >= opc_if_acmpeq) cond = opcode - opc_if_acmpeq; > Thumb2_Fill(jinfo, 2); > r_rho = POP(jstack); > r_lho = POP(jstack); > Thumb2_Flush(jinfo); > cmp_reg(jinfo->codebuf, r_lho, r_rho); > - bci = Thumb2_Branch(jinfo, bci, cond, stackdepth-2); > + bci = Thumb2_Branch(jinfo, bci, cond); > len = 0; > break; > } From aph at icedtea.classpath.org Thu Jan 26 07:20:33 2012 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Thu, 26 Jan 2012 15:20:33 +0000 Subject: /hg/icedtea6: ARM: Fix safepoints in backward branches. Message-ID: changeset 80c34531aba3 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=80c34531aba3 author: aph date: Thu Jan 26 07:27:15 2012 -0500 ARM: Fix safepoints in backward branches. 2012-01-25 Andrew Haley * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Branch): Remove safepoint code. (Thumb2_Cond_Safepoint): New function. (Thumb2_codegen): Call Thumb2_Cond_Safepoint() from two places. diffstat: ChangeLog | 7 +++++++ arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 23 ++++++++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diffs (79 lines): diff -r 6179ebaffe6b -r 80c34531aba3 ChangeLog --- a/ChangeLog Mon Jan 23 16:43:01 2012 +0000 +++ b/ChangeLog Thu Jan 26 07:27:15 2012 -0500 @@ -1,3 +1,10 @@ +2012-01-25 Andrew Haley + + * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Branch): + Remove safepoint code. + (Thumb2_Cond_Safepoint): New function. + (Thumb2_codegen): Call Thumb2_Cond_Safepoint() from two places. + 2012-01-23 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (print_address): Add diff -r 6179ebaffe6b -r 80c34531aba3 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Jan 23 16:43:01 2012 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 26 07:27:15 2012 -0500 @@ -4365,7 +4365,17 @@ } } -int Thumb2_Branch(Thumb2_Info *jinfo, unsigned bci, unsigned cond, int stackdepth) +// If this is a backward branch, compile a safepoint check +void Thumb2_Cond_Safepoint(Thumb2_Info *jinfo, int stackdepth, int bci) { + int offset = GET_JAVA_S2(jinfo->code_base + bci + 1); + unsigned dest_taken = bci + offset; + + if (jinfo->bc_stackinfo[dest_taken] & BC_COMPILED) { + Thumb2_Safepoint(jinfo, stackdepth, bci); + } +} + +int Thumb2_Branch(Thumb2_Info *jinfo, unsigned bci, unsigned cond) { int offset = GET_JAVA_S2(jinfo->code_base + bci + 1); unsigned dest_taken = bci + offset; @@ -4373,10 +4383,7 @@ unsigned loc; if (jinfo->bc_stackinfo[dest_taken] & BC_COMPILED) { - loc = forward_16(jinfo->codebuf); - Thumb2_Safepoint(jinfo, stackdepth, bci); - branch_uncond(jinfo->codebuf, jinfo->bc_stackinfo[dest_taken] & ~BC_FLAGS_MASK); - bcc_patch(jinfo->codebuf, NEG_COND(cond), loc); + branch(jinfo->codebuf, cond, jinfo->bc_stackinfo[dest_taken] & ~BC_FLAGS_MASK); return dest_not_taken; } loc = forward_32(jinfo->codebuf); @@ -6323,12 +6330,13 @@ case opc_ifnonnull: { Reg r; unsigned cond = opcode - opc_ifeq; + Thumb2_Cond_Safepoint(jinfo, stackdepth, bci); if (opcode >= opc_ifnull) cond = opcode - opc_ifnull; Thumb2_Fill(jinfo, 1); r = POP(jstack); Thumb2_Flush(jinfo); cmp_imm(jinfo->codebuf, r, 0); - bci = Thumb2_Branch(jinfo, bci, cond, stackdepth-1); + bci = Thumb2_Branch(jinfo, bci, cond); len = 0; break; } @@ -6343,13 +6351,14 @@ case opc_if_acmpne: { Reg r_lho, r_rho; unsigned cond = opcode - opc_if_icmpeq; + Thumb2_Cond_Safepoint(jinfo, stackdepth, bci); if (opcode >= opc_if_acmpeq) cond = opcode - opc_if_acmpeq; Thumb2_Fill(jinfo, 2); r_rho = POP(jstack); r_lho = POP(jstack); Thumb2_Flush(jinfo); cmp_reg(jinfo->codebuf, r_lho, r_rho); - bci = Thumb2_Branch(jinfo, bci, cond, stackdepth-2); + bci = Thumb2_Branch(jinfo, bci, cond); len = 0; break; } From aph at icedtea.classpath.org Thu Jan 26 07:22:30 2012 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Thu, 26 Jan 2012 15:22:30 +0000 Subject: /hg/release/icedtea6-1.11: ARM: Fix safepoints in backward branc... Message-ID: changeset 933c143b22a0 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=933c143b22a0 author: aph date: Thu Jan 26 07:27:15 2012 -0500 ARM: Fix safepoints in backward branches. 2012-01-25 Andrew Haley * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Branch): Remove safepoint code. (Thumb2_Cond_Safepoint): New function. (Thumb2_codegen): Call Thumb2_Cond_Safepoint() from two places. diffstat: ChangeLog | 7 +++++++ arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 23 ++++++++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diffs (79 lines): diff -r 6aa2b2fc20ba -r 933c143b22a0 ChangeLog --- a/ChangeLog Mon Jan 23 16:43:01 2012 +0000 +++ b/ChangeLog Thu Jan 26 07:27:15 2012 -0500 @@ -1,3 +1,10 @@ +2012-01-25 Andrew Haley + + * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Branch): + Remove safepoint code. + (Thumb2_Cond_Safepoint): New function. + (Thumb2_codegen): Call Thumb2_Cond_Safepoint() from two places. + 2012-01-23 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (print_address): Add diff -r 6aa2b2fc20ba -r 933c143b22a0 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Jan 23 16:43:01 2012 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 26 07:27:15 2012 -0500 @@ -4365,7 +4365,17 @@ } } -int Thumb2_Branch(Thumb2_Info *jinfo, unsigned bci, unsigned cond, int stackdepth) +// If this is a backward branch, compile a safepoint check +void Thumb2_Cond_Safepoint(Thumb2_Info *jinfo, int stackdepth, int bci) { + int offset = GET_JAVA_S2(jinfo->code_base + bci + 1); + unsigned dest_taken = bci + offset; + + if (jinfo->bc_stackinfo[dest_taken] & BC_COMPILED) { + Thumb2_Safepoint(jinfo, stackdepth, bci); + } +} + +int Thumb2_Branch(Thumb2_Info *jinfo, unsigned bci, unsigned cond) { int offset = GET_JAVA_S2(jinfo->code_base + bci + 1); unsigned dest_taken = bci + offset; @@ -4373,10 +4383,7 @@ unsigned loc; if (jinfo->bc_stackinfo[dest_taken] & BC_COMPILED) { - loc = forward_16(jinfo->codebuf); - Thumb2_Safepoint(jinfo, stackdepth, bci); - branch_uncond(jinfo->codebuf, jinfo->bc_stackinfo[dest_taken] & ~BC_FLAGS_MASK); - bcc_patch(jinfo->codebuf, NEG_COND(cond), loc); + branch(jinfo->codebuf, cond, jinfo->bc_stackinfo[dest_taken] & ~BC_FLAGS_MASK); return dest_not_taken; } loc = forward_32(jinfo->codebuf); @@ -6323,12 +6330,13 @@ case opc_ifnonnull: { Reg r; unsigned cond = opcode - opc_ifeq; + Thumb2_Cond_Safepoint(jinfo, stackdepth, bci); if (opcode >= opc_ifnull) cond = opcode - opc_ifnull; Thumb2_Fill(jinfo, 1); r = POP(jstack); Thumb2_Flush(jinfo); cmp_imm(jinfo->codebuf, r, 0); - bci = Thumb2_Branch(jinfo, bci, cond, stackdepth-1); + bci = Thumb2_Branch(jinfo, bci, cond); len = 0; break; } @@ -6343,13 +6351,14 @@ case opc_if_acmpne: { Reg r_lho, r_rho; unsigned cond = opcode - opc_if_icmpeq; + Thumb2_Cond_Safepoint(jinfo, stackdepth, bci); if (opcode >= opc_if_acmpeq) cond = opcode - opc_if_acmpeq; Thumb2_Fill(jinfo, 2); r_rho = POP(jstack); r_lho = POP(jstack); Thumb2_Flush(jinfo); cmp_reg(jinfo->codebuf, r_lho, r_rho); - bci = Thumb2_Branch(jinfo, bci, cond, stackdepth-2); + bci = Thumb2_Branch(jinfo, bci, cond); len = 0; break; } From bugzilla-daemon at icedtea.classpath.org Thu Jan 26 08:41:01 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Jan 2012 16:41:01 +0000 Subject: [Bug 822] https://bcee.snet.lu/ssogate/xlogin not functional In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=822 --- Comment #7 from pcfe 2012-01-26 16:41:01 UTC --- (In reply to comment #5) > Created attachment 641 [details] > policy file for granting setIO This works. Kind of expected from the file content. Do I presume correctly that this is a work around and not the pro[per fix? (sorry, I have very weak Java-fu) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 26 08:42:05 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Jan 2012 16:42:05 +0000 Subject: [Bug 822] https://bcee.snet.lu/ssogate/xlogin not functional In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=822 --- Comment #8 from pcfe 2012-01-26 16:42:05 UTC --- (In reply to comment #6) > Yes and no. I fixed it about 80% and then got side tracked :/ Happens to me too, that's why I pinged :) > Looking at it again now. Thanks, appreciated. Hopefully this can be fixed in a way that it works out of the box. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ahughes at redhat.com Thu Jan 26 09:26:00 2012 From: ahughes at redhat.com (Andrew Hughes) Date: Thu, 26 Jan 2012 12:26:00 -0500 (EST) Subject: Pushing back the IcedTea6 1.11 release: 2012-01-25 In-Reply-To: <4F202B64.1080302@redhat.com> Message-ID: ----- Original Message ----- > On 01/24/2012 07:45 AM, Andrew Hughes wrote: > > My worry is that this obsoletes 1.8 and then provides a security > > update > > just three weeks later. Under the circumstances, I think a further > > 1.8 > > release with the security updates is in order before obsoleting > > that branch. > > If I understand correctly, you will have to do this either way (if we > were to release today or in a month), right? > Yes, it's already too close to the security update either way. > Cheers, > Omair > -- 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 Thu Jan 26 10:20:37 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Jan 2012 18:20:37 +0000 Subject: [Bug 852] Classloader not being flushed after last applet from a site is closed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=852 --- Comment #3 from Deepak Bhole 2012-01-26 18:20:37 UTC --- (In reply to comment #2) > Hi, any news on this? can I help to resolve this? you wrote that you have a > patch available? Hi Tomas. I just posted the patch for review. I would like to try and get it fixed before IcedTea-Web 1.2 is released. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From omajid at redhat.com Thu Jan 26 11:07:14 2012 From: omajid at redhat.com (Omair Majid) Date: Thu, 26 Jan 2012 14:07:14 -0500 Subject: Icedtea6 1.11 prerelease tarball available In-Reply-To: <4F202C8B.9020407@redhat.com> References: <4F0771B8.4080106@redhat.com> <4F16F1EE.4000506@redhat.com> <4F1D92A4.9090708@redhat.com> <4F202C8B.9020407@redhat.com> Message-ID: <4F21A462.2010903@redhat.com> On 01/25/2012 11:23 AM, Omair Majid wrote: > On 01/23/2012 12:02 PM, Omair Majid wrote: >> On 01/18/2012 11:23 AM, Omair Majid wrote: >>> How does 1 week (2012-01-25) sound? >>> >> >> Things are looking much better with the arm stuff now. It looks like >> IcedTea6 1.11 on 2012-01-25 will be doable. >> > > Scratch that. Andrew Haley found at least one crasher bug. I am not > going to be releasing IcedTeat6 1.11 until all such showstoppers have > been worked out. I don't have any target date in mind right now. Let's > see how things play out. > I have posted a pre-release tarball made against the 1.11 branch: Url: http://icedtea.classpath.org/download/source/icedtea6-1.11pre.tar.gz Sha256: efce0ee99efebd801084f828ecad9be3e1a3b3f1595e1081986f8a58f2033bbb Signature: http://icedtea.classpath.org/download/source/icedtea6-1.11pre.tar.gz.sig The signature is using my new gpg key: pub 4096R/66484681 2012-01-18 [expires: 2017-01-16] Key fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 uid Omair Majid sub 4096R/7CC8AAC6 2012-01-18 [expires: 2017-01-16] Cheers, Omair From dbhole at redhat.com Thu Jan 26 10:18:42 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Thu, 26 Jan 2012 13:18:42 -0500 Subject: [icedtea-web] RFC: Fix for PR852: Classloader not being flushed after close Message-ID: <20120126181842.GE21952@redhat.com> Hi, This patch fixes PR852. I would like to put it in 1.2 in addition to HEAD. ChangeLog: 2012-01-26 Deepak Bhole PR852: Classloader not being flushed after last applet from a site is closed * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Added variable to count usage for a given ClassLoader instance. (getInstance): Decrement use count for a loader after it is merged with another. Increment loader use count before returning. (incrementLoaderCount): New method. Increments loader use count. (decrementLoaderCount): New method. Decrements loader use count. * java/sun/applet/PluginAppletViewer.java (appletClose): Decrement loader use count when applet is closed. Okay for both? Cheers, Deepak -------------- next part -------------- diff -r 41f03d932cdf NEWS --- a/NEWS Mon Jan 09 18:45:31 2012 -0500 +++ b/NEWS Thu Jan 26 13:15:59 2012 -0500 @@ -22,6 +22,7 @@ - PR749: sun.applet.PluginStreamHandler#handleMessage(String) really slow - PR782: Support building against npapi-sdk as well - PR838: IcedTea plugin crashes with chrome browser when javascript is executed + - PR852: Classloader not being flushed after last applet from a site is closed - RH586194: Unable to connect to connect with Juniper VPN client - RH718693: MindTerm SSH Applet doesn't work Common diff -r 41f03d932cdf netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Mon Jan 09 18:45:31 2012 -0500 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Jan 26 13:15:59 2012 -0500 @@ -173,6 +173,11 @@ private boolean foundMainJar= false; /** + * Variable to track how many times this loader is in use + */ + private Integer useCount = 0; + + /** * Create a new JNLPClassLoader from the specified file. * * @param file the JNLP file @@ -321,6 +326,7 @@ throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo")); loader.merge(extLoader); + decrementLoaderCount(extLoader); // loader urls have been merged, ext loader is no longer used } // loader is now current + ext. But we also need to think of @@ -347,7 +353,11 @@ // loaders are mapped to a unique key. Only extensions and parent // share a key, so it is safe to always share based on it - urlToLoader.put(uniqueKey, loader); + + incrementLoaderCount(loader); + synchronized(urlToLoader) { + urlToLoader.put(uniqueKey, loader); + } return loader; } @@ -1762,6 +1772,46 @@ } return result; } + + /** + * Increments loader use count by 1 + * + * @throws SecurityException if caller is not trusted + */ + public static void incrementLoaderCount(JNLPClassLoader loader) { + + // For use by trusted code only + if (System.getSecurityManager() != null) + System.getSecurityManager().checkPermission(new AllPermission()); + + synchronized(loader.useCount) { + loader.useCount++; + } + } + + /** + * Decrements loader use count by 1 + * + * If count reaches 0, loader is removed from list of available loaders + * + * @throws SecurityException if caller is not trusted + */ + public static void decrementLoaderCount(JNLPClassLoader loader) { + + // For use by trusted code only + if (System.getSecurityManager() != null) + System.getSecurityManager().checkPermission(new AllPermission()); + + synchronized(loader.useCount) { + loader.useCount--; + + if (loader.useCount <= 0) { + synchronized(urlToLoader) { + urlToLoader.remove(loader.file.getUniqueKey()); + } + } + } + } /* * Helper class to expose protected URLClassLoader methods. diff -r 41f03d932cdf plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Jan 09 18:45:31 2012 -0500 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu Jan 26 13:15:59 2012 -0500 @@ -1625,6 +1625,9 @@ appletShutdown(p); appletPanels.removeElement(p); + + // Mark classloader unusable + JNLPClassLoader.decrementLoaderCount((JNLPClassLoader) cl); try { SwingUtilities.invokeAndWait(new Runnable() { From bugzilla-daemon at icedtea.classpath.org Thu Jan 26 11:47:35 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Jan 2012 19:47:35 +0000 Subject: [Bug 843] www.mojebanka.cz hangs with icedtea-web In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=843 --- Comment #1 from mysystemp at gmail.com 2012-01-26 19:47:35 UTC --- Created attachment 642 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=642 logs i can confirm this behavior. archlinux Linux 3.2.1-2 icedtea-web-java7 1.1.4-2 firefox 9.0.1 I also attached logs genarated by java plugin -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 26 11:50:33 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Jan 2012 19:50:33 +0000 Subject: [Bug 822] Applets fail to load if jars have different signers In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=822 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|https://bcee.snet.lu/ssogat |Applets fail to load if |e/xlogin not functional |jars have different signers -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From dbhole at redhat.com Thu Jan 26 11:55:34 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Thu, 26 Jan 2012 14:55:34 -0500 Subject: [icedtea-web] RFC: PR822: Applets fail to load if jars have different signers Message-ID: <20120126195534.GF21952@redhat.com> Hi, This patch fixes PR822: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=822 It makes it so that applets do not require all jars to have a single signer (which is not mandated by the spec). After the patch, sites like the one mentioned in the bug (https://bcee.snet.lu/) now work. ChangeLog: 2012-01-26 Deepak Bhole PR822: Applets fail to load if jars have different signers * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (initializeResources): Ensure that there is a single signer only for Web Start applications and not for applets. * netx/net/sourceforge/jnlp/tools/JarSigner.java (verifyJar): Ensure that a given jar is signed throughout by at least one common certificate. Okay for 1.2 and HEAD? Cheers, Deepak -------------- next part -------------- diff -r b901442e9ba4 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Jan 25 16:42:27 2012 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Jan 26 14:44:54 2012 -0500 @@ -470,8 +470,15 @@ R("LCInit"), R("LFatalVerification"), R("LFatalVerificationInfo")); } - //Case when at least one jar has some signing - if (js.anyJarsSigned() && js.isFullySignedByASingleCert()) { + // Case when at least one jar has some signing + // For permissions to be given, we need: + // 1. Something is signed + // 2. This is an applet + // 3. OR, if this is NOT an applet, all jars have the same signer + if (js.anyJarsSigned() // signed + && (getJNLPFile().isApplet() // and an applet + || (!getJNLPFile().isApplet() // OR, NOT an applet + && js.isFullySignedByASingleCert()))) { // AND fully signed by a single cert signing = true; if (!js.allJarsSigned() && diff -r b901442e9ba4 netx/net/sourceforge/jnlp/tools/JarSigner.java --- a/netx/net/sourceforge/jnlp/tools/JarSigner.java Wed Jan 25 16:42:27 2012 +0100 +++ b/netx/net/sourceforge/jnlp/tools/JarSigner.java Thu Jan 26 14:44:54 2012 -0500 @@ -241,6 +241,8 @@ jarFile = new JarFile(jarName, true); Vector entriesVec = new Vector(); byte[] buffer = new byte[8192]; + int signableEntriesInJar = 0; + Hashtable jarSignCount = new Hashtable(); JarEntry je; Enumeration entries = jarFile.entries(); @@ -281,8 +283,10 @@ hasUnsignedEntry |= shouldHaveSignature && !isSigned; - if (shouldHaveSignature) + if (shouldHaveSignature) { + signableEntriesInJar++; totalSignableEntries++; + } if (shouldHaveSignature && isSigned) { for (int i = 0; i < signers.length; i++) { @@ -307,6 +311,11 @@ } } } + + if (!jarSignCount.containsKey(cert)) + jarSignCount.put(cert, 1); + else + jarSignCount.put(cert, jarSignCount.get(cert) + 1); } } } //while e has more elements @@ -314,6 +323,7 @@ // Else increment totalEntries by 1 so that unsigned jars with // no manifests can't sneak in + signableEntriesInJar++; totalSignableEntries++; } @@ -321,6 +331,20 @@ if (!anySigned) { return verifyResult.UNSIGNED; } else { + + boolean signedBySingleCert = false; + Enumeration e = jarSignCount.elements(); + while (e.hasMoreElements()) { + int count = e.nextElement(); + if (count == signableEntriesInJar) { + signedBySingleCert = true; + break; + } + } + + if (!signedBySingleCert) + return verifyResult.UNSIGNED; + anyJarsSigned = true; //warnings From bugzilla-daemon at icedtea.classpath.org Thu Jan 26 11:57:03 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Jan 2012 19:57:03 +0000 Subject: [Bug 822] Applets fail to load if jars have different signers In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=822 --- Comment #9 from Deepak Bhole 2012-01-26 19:57:03 UTC --- (In reply to comment #8) > (In reply to comment #6) > > Yes and no. I fixed it about 80% and then got side tracked :/ > > Happens to me too, that's why I pinged :) > > > Looking at it again now. > > Thanks, appreciated. Hopefully this can be fixed in a way that it works out of > the box. Hi, I have posted a patch here: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-January/016987.html I will commit it as soon as it is approved. In the mean time, if you'd like, please feel free to try it out and let me know if there are any issues. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 26 12:26:06 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Jan 2012 20:26:06 +0000 Subject: [Bug 843] www.mojebanka.cz hangs with icedtea-web In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=843 --- Comment #2 from Deepak Bhole 2012-01-26 20:26:06 UTC --- I cannot reproduce this issue. Looking at the logs, I see: JAR https://www.mojebanka.cz/jars/ibapp.jar not found. Continuing. A few times. So chances are that it is a bug on server side. Can you try from a different network/machine? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From thomas at m3y3r.de Thu Jan 26 12:38:25 2012 From: thomas at m3y3r.de (Thomas Meyer) Date: Thu, 26 Jan 2012 21:38:25 +0100 Subject: [icedtea-web] RFC: Fix for PR852: Classloader not being flushed after close In-Reply-To: <20120126181842.GE21952@redhat.com> References: <20120126181842.GE21952@redhat.com> Message-ID: <1327610305.1486.3.camel@localhost.localdomain> Am Donnerstag, den 26.01.2012, 13:18 -0500 schrieb Deepak Bhole: > Hi, > > This patch fixes PR852. I would like to put it in 1.2 in addition to > HEAD. > > ChangeLog: > 2012-01-26 Deepak Bhole > > PR852: Classloader not being flushed after last applet from a site is closed > * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Added variable > to count usage for a given ClassLoader instance. > (getInstance): Decrement use count for a loader after it is merged with > another. Increment loader use count before returning. > (incrementLoaderCount): New method. Increments loader use count. > (decrementLoaderCount): New method. Decrements loader use count. > * java/sun/applet/PluginAppletViewer.java (appletClose): Decrement loader > use count when applet is closed. > Hi Deepak, many thanks for this patch. I did test the patch and it works for me. I can now login several times using the same java process (i.e. I don't need to kill the PluginMain process every time I want to login). kind regards thomas From ddadacha at redhat.com Thu Jan 26 13:08:27 2012 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Thu, 26 Jan 2012 16:08:27 -0500 Subject: [RFC][icedtea7-forest, icedtea7-forest-2.0] Backport of GNOME system tray patch Message-ID: <4F21C0CB.7060503@redhat.com> Hi, Attached are 2 hg exports of the GNOME system tray changeset[1] ported to icedtea7-forest{,-2.0}. The original changeset imported to both repos cleanly. I ran the same tests I used for jdk8/awt/jdk, they ran as expected. Icon does not appear before but does once built with the changeset. Okay to push to both? Regards, Danesh [1] http://hg.openjdk.java.net/jdk8/awt/jdk/rev/f614bcada2a9 -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea7-forest-2.0-sys-tray-export-01.patch Type: text/x-patch Size: 3027 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120126/99012dbe/icedtea7-forest-2.0-sys-tray-export-01.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea7-forest-sys-tray-export-01.patch Type: text/x-patch Size: 3027 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120126/99012dbe/icedtea7-forest-sys-tray-export-01.patch From bugzilla-daemon at icedtea.classpath.org Thu Jan 26 13:12:55 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Jan 2012 21:12:55 +0000 Subject: [Bug 843] www.mojebanka.cz hangs with icedtea-web In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=843 --- Comment #3 from timothyhobbs at seznam.cz 2012-01-26 21:12:55 UTC --- I reproduced this bug across many networks here in Prague(Though all on the same machine). The page loads fine under Java Plug-in 10.0.0.13 Using JRE version 1.7.0_02-b13 Java HotSpot(TM) Server VM on the same machine. Do you see a password box on the right under the title "Certificate in file", or the text "Downloading and initializing the applet.."? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From dbhole at redhat.com Thu Jan 26 13:14:14 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Thu, 26 Jan 2012 16:14:14 -0500 Subject: [RFC] Always answer a message with a reference In-Reply-To: <1326179792.1352.7.camel@localhost.localdomain> References: <201201092339.q09NdYVW010885@bzweb01.app.bz.hst.phx2.redhat.com> <1326179792.1352.7.camel@localhost.localdomain> Message-ID: <20120126211413.GA2279@redhat.com> * Thomas Meyer [2012-01-10 02:16]: > Am Montag, den 09.01.2012, 18:39 -0500 schrieb bugzilla at redhat.com: > > Hi Thomas, > > Hi, > > > As for the issue about having consume_message return null, that is a separate > > issue IMO whereby the Java side is not notified about the C++ side having > > discarded the message. The idea of consume message returning null is not a bad > > one, but will need some testing to cover the various requests Java makes to > > C++. > > I tried this patch to achieve an always answer a message with a > reference, but I think it incomplete. comments are welcome. > Hi Thomas, This patch is always returning JavaScriptGetWindow back to the Java side. I am not sure if this currently causes issues or not, but even if it doesn't, it may down the road if someone changes the Java side without realizing that C++ is going to return "JavaScriptGetWindow" if it discards the message. I think it would therefore be better to return a new tag, something like "PluginMessageDiscarded" Cheers, Deepak > diff -r 7d090bfa3819 plugin/icedteanp/IcedTeaNPPlugin.cc > --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Tue Dec 13 12:45:36 2011 +0100 > +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Tue Jan 10 08:03:52 2012 +0100 > @@ -1202,6 +1202,15 @@ > if (instance_id > 0 && !instance) > { > PLUGIN_DEBUG("Instance %d is not active. Refusing to consume message \"%s\"\n", instance_id, message); > + // if the message has a reference send back a NULL to make java side unwait > + if(g_str_has_prefix(parts[2], "reference")) > + { > + // type + identifier + reference + ref_id + validFinishCallRequest + NULL > + gchar* null_resp = g_strconcat ("context 0 reference ", parts[3], " JavaScriptGetWindow 0", NULL); > + plugin_send_message_to_appletviewer(null_resp); > + g_free(null_resp); > + null_resp = NULL; > + } > return; > } > else if (instance) > diff -r 7d090bfa3819 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue Dec 13 12:45:36 2011 +0100 > +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue Jan 10 08:03:52 2012 +0100 > @@ -985,7 +985,7 @@ > PluginDebug.debug("wait request 1"); > synchronized (request) { > PluginDebug.debug("wait request 2"); > - while ((Long) request.getObject() == 0) > + while (request.isDone() == false) > request.wait(); > PluginDebug.debug("wait request 3"); > } > > From dbhole at redhat.com Thu Jan 26 13:18:34 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Thu, 26 Jan 2012 16:18:34 -0500 Subject: [RFC] Introduce PAV.isStatusActive() for static JSObject.getWindow() In-Reply-To: <1326184075.1352.12.camel@localhost.localdomain> References: <1326184075.1352.12.camel@localhost.localdomain> Message-ID: <20120126211834.GB2279@redhat.com> * Thomas Meyer [2012-01-10 03:29]: > Check in static JSObject.getWindow() if the PAV containing the applet is > usable by the user. > Hi Thomas, Rather than relying on PluginAppletViewer.status, what about using applet.isActive()? Or did you turn into issues with that approach? Cheers, Deepak > diff -r 7d090bfa3819 plugin/icedteanp/java/netscape/javascript/JSObject.java > --- a/plugin/icedteanp/java/netscape/javascript/JSObject.java Tue Dec 13 12:45:36 2011 +0100 > +++ b/plugin/icedteanp/java/netscape/javascript/JSObject.java Tue Jan 10 09:20:54 2012 +0100 > @@ -242,10 +242,14 @@ > */ > public static JSObject getWindow(Applet applet) { > PluginDebug.debug("JSObject.getWindow"); > + PluginAppletViewer pav = (PluginAppletViewer) applet.getAppletContext(); > + > + if(!pav.isStatusActive()) > + throw new IllegalArgumentException("PAV is not usable/inactive"); > + > // FIXME: handle long case as well. > long internal = 0; > - internal = ((PluginAppletViewer) > - applet.getAppletContext()).getWindow(); > + internal = pav.getWindow(); > PluginDebug.debug("GOT IT: ", internal); > return new JSObject(internal); > } > diff -r 7d090bfa3819 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue Dec 13 12:45:36 2011 +0100 > +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue Jan 10 09:20:54 2012 +0100 > @@ -675,6 +675,16 @@ > PluginDebug.debug("Applet panel ", panel, " initialized"); > } > > + /** > + * Is this PAV usable by the user > + * > + * @return true, when usable by the user > + */ > + public boolean isStatusActive() { > + > + return status.get(identifier).equals(PAV_INIT_STATUS.REFRAME_COMPLETE); > + } > + > public void handleMessage(int reference, String message) { > if (message.startsWith("width")) { > > From bugzilla-daemon at icedtea.classpath.org Thu Jan 26 13:36:00 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Jan 2012 21:36:00 +0000 Subject: [Bug 843] www.mojebanka.cz hangs with icedtea-web In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=843 --- Comment #4 from Deepak Bhole 2012-01-26 21:36:00 UTC --- Hi Timothy. Using Firefox 9.0.1 and: IcedTea-Web Plugin (using IcedTea-Web 1.1.4 (fedora-4.fc16-x86_64)) I see this: http://people.redhat.com/dbhole/public/PR843.jpg -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 26 13:38:58 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Jan 2012 21:38:58 +0000 Subject: [Bug 822] Applets fail to load if jars have different signers In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=822 --- Comment #10 from pcfe 2012-01-26 21:38:58 UTC --- (In reply to comment #9) > I have posted a patch here: > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-January/016987.html > > I will commit it as soon as it is approved. In the mean time, if you'd like, > please feel free to try it out and let me know if there are any issues. Sure, if you make a scratch build for f16 x86_64 in koji I can test tomorrow. Otherwise I'll try to find time one of the coming week-ends to generate a patched package myself. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 26 13:53:43 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Jan 2012 21:53:43 +0000 Subject: [Bug 843] www.mojebanka.cz hangs with icedtea-web In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=843 --- Comment #5 from timothyhobbs at seznam.cz 2012-01-26 21:53:43 UTC --- Yes, it appears that the problem has been fixed. I just reinstalled icedtea-web and tried it and experienced no freeze. I'm happy that I can again use my computer free of closed source software :) However, I'm a bit curious as to what mysystemp experienced, as he appears to have a very similar set up to mine and yet reported today that on his system the page was STILL not working. Thank you for your time, Timothy -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 26 14:01:50 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Jan 2012 22:01:50 +0000 Subject: [Bug 822] Applets fail to load if jars have different signers In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=822 --- Comment #11 from pcfe 2012-01-26 22:01:50 UTC --- (In reply to comment #10) > Sure, if you make a scratch build for f16 x86_64 in koji I can test tomorrow. > Otherwise I'll try to find time one of the coming week-ends to generate a > patched package myself. NVM, that was quicker then anticipated. http://www.pcfe.net/temporary/icedtea-web.spec http://www.pcfe.net/temporary/icedtea-web-1.1.4-PR822.patch but now I get exception: java.lang.ArrayIndexOutOfBoundsException: Array index out of range: 0. on a box where the work around from Comment 5 is NOT in place. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 26 14:10:39 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Jan 2012 22:10:39 +0000 Subject: [Bug 843] www.mojebanka.cz hangs with icedtea-web In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=843 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |WORKSFORME --- Comment #6 from Deepak Bhole 2012-01-26 22:10:39 UTC --- No problem. I am glad it works now :) I am going to close this. If you encounter it again, please feel free to re-open. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 26 14:24:56 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Jan 2012 22:24:56 +0000 Subject: [Bug 822] Applets fail to load if jars have different signers In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=822 --- Comment #12 from pcfe 2012-01-26 22:24:56 UTC --- (In reply to comment #11) > but now I get > exception: java.lang.ArrayIndexOutOfBoundsException: Array index out of range: > 0. > > on a box where the work around from Comment 5 is NOT in place. going back to Fedora's icedtea-web-1.1.4-4.fc16.x86_64 and adding the .java.policy as per Comment 5 gives the same error on this box. I'll try my patched icedtea-web-1.1.4-5.fc16.x86_64 on the box where the .java.policy workaround worked next week. Or is there something else to do, besides upgrading the package to the patched version and restarting the browser, when testing the patch? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu Jan 26 14:29:57 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Jan 2012 22:29:57 +0000 Subject: [Bug 822] Applets fail to load if jars have different signers In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=822 --- Comment #13 from Deepak Bhole 2012-01-26 22:29:57 UTC --- Thanks for trying it! Can you please post the full trace? The plugin.log and java.std* files as listed here are needed: http://icedtea.classpath.org/wiki/IcedTea-Web#Filing_bugs -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From omajid at redhat.com Thu Jan 26 18:55:09 2012 From: omajid at redhat.com (Omair Majid) Date: Thu, 26 Jan 2012 21:55:09 -0500 Subject: [icedtea-web] RFC: Fix for PR852: Classloader not being flushed after close In-Reply-To: <20120126181842.GE21952@redhat.com> References: <20120126181842.GE21952@redhat.com> Message-ID: <4F22120D.6070705@redhat.com> Hi Deepak, On 01/26/2012 01:18 PM, Deepak Bhole wrote: > This patch fixes PR852. I would like to put it in 1.2 in addition to > HEAD. I have a few on the patch comments below. > diff -r 41f03d932cdf netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Mon Jan 09 18:45:31 2012 -0500 > +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Jan 26 13:15:59 2012 -0500 > + public static void incrementLoaderCount(JNLPClassLoader loader) { > + public static void decrementLoaderCount(JNLPClassLoader loader) { Just a thought, but it might be cleaner to make these instance methods, since they always operate on a loader object. With that changes, this becomes: public void incrementLoaderCount() public void decrementLoaderCount() In fact, incrementLoaderCount does not even have to be public. If we do go down that route, perhaps we can also go ahead and rename decrementLoaderCount to dispose() or release()? (I am also thinking close() but that would clash with the URLClassLoader's close() method in OpenJDK7.) I think it makes the purpose clearer in that this method releases resources associated with the classloader. It also hides the fact that we are caching something from the users of the JNLPClassLaoder api. > + synchronized(loader.useCount) { > + loader.useCount--; > + > + if (loader.useCount<= 0) { > + synchronized(urlToLoader) { > + urlToLoader.remove(loader.file.getUniqueKey()); > + } > + } > + } > + } > Synchronizing over Integer (or Long) has always looked scary to me. I am not sure if this is a problem in this case, but as soon as you do the post increment, the object (useCount) has changed. If another thread comes along at this point, it can now synchronize over the new object and it would be possible to have two threads enter the same synchronized block. I am attaching a program that shows that the Integer has indeed changed. > diff -r 41f03d932cdf plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Jan 09 18:45:31 2012 -0500 > +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu Jan 26 13:15:59 2012 -0500 > @@ -1625,6 +1625,9 @@ > > appletShutdown(p); > appletPanels.removeElement(p); > + > + // Mark classloader unusable > + JNLPClassLoader.decrementLoaderCount((JNLPClassLoader) cl); > > try { > SwingUtilities.invokeAndWait(new Runnable() { > Not being an expert, I am not sure about the details of how this fixes the problem. If the _only_ problem was that we are maintaining a reference to the classloader, perhaps making urlToLoader a Map> might be more appropriate? Or is there something I am missing? Sorry if this is not very helpful - I took a look at bugzilla but I could not find the actual issue described there. Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: IntegerSynchronization.java Type: text/x-java Size: 423 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120126/43ace04d/IntegerSynchronization.java From xerxes at zafena.se Fri Jan 27 02:14:35 2012 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Fri, 27 Jan 2012 11:14:35 +0100 Subject: run jdk tests after langtools tests In-Reply-To: <4EF496C9.5020408@ubuntu.com> References: <4EF496C9.5020408@ubuntu.com> Message-ID: <4F22790B.8020103@zafena.se> 2011-12-23 15:57, Matthias Klose skrev: > changeset cbceaa3d9fdf did change the order how the tests are run. This > changeset was not discussed, and the change was not mentioned in the changelog. > In an ideal world the order would not matter, but both the hotspot and langtools > tests run reliable with most VMs, while the jdk tests may get stuck and leave > processes hanging around. Running the jdk tests last you get at least the > langtools test results for automated builds. > > Matthias > 2011-12-23 Matthias Klose * Makefile.am (TEST_SUITES): Add jdk after langtools tests. diff -r 5f30a4f16734 Makefile.am --- a/Makefile.am Fri Dec 23 14:31:49 2011 +0100 +++ b/Makefile.am Fri Dec 23 15:46:02 2011 +0100 @@ -173,12 +173,12 @@ if !DISABLE_HOTSPOT_TESTS TEST_SUITES = hotspot endif +if !DISABLE_LANGTOOLS_TESTS +TEST_SUITES := $(TEST_SUITES) langtools +endif if !DISABLE_JDK_TESTS TEST_SUITES := $(TEST_SUITES) jdk endif -if !DISABLE_LANGTOOLS_TESTS -TEST_SUITES := $(TEST_SUITES) langtools -endif endif # Target to ensure a patched OpenJDK tree containing Zero & Shark Ok, agree the test order hotspot, langtools and then jdk is preferred. This patch are good for icedtea6 head. Cheers Xerxes From aph at redhat.com Fri Jan 27 05:23:34 2012 From: aph at redhat.com (Andrew Haley) Date: Fri, 27 Jan 2012 13:23:34 +0000 Subject: Stress test for ThreadLocal Message-ID: <4F22A556.7050100@redhat.com> May be useful for debugging JIT problems... Andrew. -------------- next part -------------- A non-text attachment was scrubbed... Name: ThreadLocalTest.java Type: text/x-java Size: 1766 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120127/768d341f/ThreadLocalTest.java From bugzilla-daemon at icedtea.classpath.org Fri Jan 27 05:24:18 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Jan 2012 13:24:18 +0000 Subject: [Bug 861] New: Glasnost: Test if your ISP is shaping your traffic - fatal internal error. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=861 Bug #: 861 Summary: Glasnost: Test if your ISP is shaping your traffic - fatal internal error. Classification: Unclassified Product: IcedTea-Web Version: hg Platform: x86 OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: Plugin AssignedTo: dbhole at redhat.com ReportedBy: xerxes at zafena.se CC: unassigned at icedtea.classpath.org testcase: http://broadband.mpi-sws.org/transparency/glasnost.php select HTTP transfer radio button and press the "start testing" button. The test terminate unexpected with "fatal internal error". BSD licensed sourcecode available here: http://broadband.mpi-sws.org/transparency/glasnost-latest.tgz -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From aph at redhat.com Fri Jan 27 05:27:15 2012 From: aph at redhat.com (Andrew Haley) Date: Fri, 27 Jan 2012 13:27:15 +0000 Subject: Stress test for ThreadLocal In-Reply-To: <4F22A556.7050100@redhat.com> References: <4F22A556.7050100@redhat.com> Message-ID: <4F22A633.6090500@redhat.com> On 01/27/2012 01:23 PM, Andrew Haley wrote: > May be useful for debugging JIT problems... This may be better: it tests put() too. Andrew. -------------- next part -------------- A non-text attachment was scrubbed... Name: ThreadLocalTest.java Type: text/x-java Size: 1927 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120127/356bd34e/ThreadLocalTest.java From aph at redhat.com Fri Jan 27 05:34:14 2012 From: aph at redhat.com (Andrew Haley) Date: Fri, 27 Jan 2012 13:34:14 +0000 Subject: ARM: thinko in disassembly Message-ID: <4F22A7D6.8090508@redhat.com> If you set T2EE_PRINT_DISASS in the environment and run java you may get a segfault if hsdis-arm.so isn't found. The fix is obvious/trivial, not release critical, but I'll commit it to the branch too because it's very low risk. Andrew. 2012-01-27 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (class Hsdis): Set decode_instructions = NULL. diff -r 80c34531aba3 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 26 07:27:15 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Fri Jan 27 13:30:16 2012 +0000 @@ -736,6 +736,8 @@ // Load hsdis-arm.so lazily. Hsdis() { + decode_instructions = NULL; + if (PrintAssembly) { if (lib = dlopen("hsdis-arm.so", RTLD_NOW)) { decode_instructions From ptisnovs at icedtea.classpath.org Fri Jan 27 05:45:24 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 27 Jan 2012 13:45:24 +0000 Subject: /hg/gfx-test: 2012-01-27 Pavel Tisnovsky Message-ID: changeset 5d9eed71daa9 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=5d9eed71daa9 author: Pavel Tisnovsky date: Fri Jan 27 14:47:46 2012 +0100 2012-01-27 Pavel Tisnovsky * src/org/gfxtest/framework/ImageFactory.java: Added new raster pattern generators. diffstat: ChangeLog | 5 + src/org/gfxtest/framework/ImageFactory.java | 139 ++++++++++++++++++++++++++- 2 files changed, 136 insertions(+), 8 deletions(-) diffs (256 lines): diff -r af5edcbd88f4 -r 5d9eed71daa9 ChangeLog --- a/ChangeLog Thu Jan 26 12:02:27 2012 +0100 +++ b/ChangeLog Fri Jan 27 14:47:46 2012 +0100 @@ -1,3 +1,8 @@ +2012-01-27 Pavel Tisnovsky + + * src/org/gfxtest/framework/ImageFactory.java: + Added new raster pattern generators. + 2012-01-26 Pavel Tisnovsky * src/org/gfxtest/framework/CommonBitmapOperations.java: diff -r af5edcbd88f4 -r 5d9eed71daa9 src/org/gfxtest/framework/ImageFactory.java --- a/src/org/gfxtest/framework/ImageFactory.java Thu Jan 26 12:02:27 2012 +0100 +++ b/src/org/gfxtest/framework/ImageFactory.java Fri Jan 27 14:47:46 2012 +0100 @@ -45,8 +45,8 @@ /** - * This class contains static method used for creating various procedural images - * which is used by (for example) BitBlt tests. + * This class contains static methods suitable for creating various procedural + * images which is used by (for example) all BitBlt tests. * * @author Pavel Tisnovsky */ @@ -54,6 +54,7 @@ { /** * Converts boolean value into an integer representing black or white color. + * Alpha channel is also computed correctly. * * @param whiteColorFlag * true if white color is required, false otherwise @@ -65,7 +66,7 @@ } /** - * Create image containing checker black and white pattern. + * Create image containing basic checker black and white pattern. * * @param gridSize * size of a grid @@ -102,12 +103,14 @@ image.setRGB(x, y, color); } } + // return buffered image containing computed color pattern return image; } /** - * Create image containing diagonal checker black and white pattern. + * Create image containing basic diagonal checker black and white pattern. + * Angle of diagonal checker pattern is set to 45 degrees. * * @param gridSize * size of a grid @@ -147,6 +150,7 @@ image.setRGB(x, y, color); } } + // return buffered image containing computed color pattern return image; } @@ -189,12 +193,14 @@ image.setRGB(x, y, color); } } + // return buffered image containing computed color pattern return image; } /** * Create image containing simple diagonal grid black and white pattern. + * Angle of diagonal grid pattern is set to 45 degrees. * * @param gridSize * size of a grid @@ -231,6 +237,7 @@ image.setRGB(x, y, color); } } + // return buffered image containing computed color pattern return image; } @@ -265,6 +272,7 @@ image.setRGB(x, y, color); } } + // return buffered image containing computed color pattern return image; } @@ -305,6 +313,42 @@ } /** + * Create image containing diagonal black and white stripes. + * Angle of diagonal strip pattern is set to 45 degrees. + * + * @param width + * width of a buffered image + * @param height + * height of a buffered image + * @param imageType + * buffered image type + * @return buffered image containing checker pattern + */ + public static BufferedImage createDiagonalStripesImage(int width, int height, int imageType) + { + // create new image + BufferedImage image = new BufferedImage(width, height, imageType); + + // for all lines in a raster image + for (int y = 0; y < height; y++) + { + // for all columns on a line + for (int x = 0; x < width; x++) + { + // compute color for each pixel + boolean colorFlag = (x+y) % 2 == 0; + // convert boolean into color code + int color = booleanToBlackOrWhiteColor(colorFlag); + // set color for given pixel + image.setRGB(x, y, color); + } + } + + // return buffered image containing computed color pattern + return image; + } + + /** * Create image containing horizontal color stripes. * * @param width @@ -371,7 +415,8 @@ } /** - * Create image containing diagonal black and white stripes. + * Create image containing diagonal color stripes. + * Angle of diagonal strip pattern is set to 45 degrees. * * @param width * width of a buffered image @@ -381,7 +426,7 @@ * buffered image type * @return buffered image containing checker pattern */ - public static BufferedImage createDiagonalStripesImage(int width, int height, int imageType) + public static BufferedImage createDiagonalColorStripesImage(int width, int height, int imageType) { // create new image BufferedImage image = new BufferedImage(width, height, imageType); @@ -393,10 +438,10 @@ for (int x = 0; x < width; x++) { // compute color for each pixel - boolean colorFlag = (x+y) % 2 == 0; - int color = booleanToBlackOrWhiteColor(colorFlag); + int color = ColorPalette.getColorAsInt(x + y); // set color for given pixel image.setRGB(x, y, color); + // compute color for each pixel } } @@ -404,4 +449,82 @@ return image; } + /** + * Create image containing black and white dots pattern. + * + * @param width + * width of a buffered image + * @param height + * height of a buffered image + * @param imageType + * buffered image type + * @return buffered image containing checker pattern + */ + public static BufferedImage createBWDotsPatternImage(int width, int height, int imageType) + { + // create new image + BufferedImage image = new BufferedImage(width, height, imageType); + + // for all lines in a raster image + for (int y = 0; y < height; y++) + { + // for all columns on a line + for (int x = 0; x < width; x++) + { + boolean colorFlag = (x % 2) == 0 || (y % 2) == 0; + // convert boolean into color code + int color = booleanToBlackOrWhiteColor(colorFlag); + // set color for given pixel + image.setRGB(x, y, color); + // compute color for each pixel + } + } + + // return buffered image containing computed color pattern + return image; + } + + /** + * Create image containing color dots pattern. + * + * @param width + * width of a buffered image + * @param height + * height of a buffered image + * @param imageType + * buffered image type + * @return buffered image containing checker pattern + */ + public static BufferedImage createColorDotsPatternImage(int width, int height, int imageType) + { + // create new image + BufferedImage image = new BufferedImage(width, height, imageType); + + // for all lines in a raster image + for (int y = 0; y < height; y++) + { + // for all columns on a line + for (int x = 0; x < width; x++) + { + int color; + // set color to white on even row and column + if (x % 2 == 0 || y % 2 == 0) + { + color = -1; + } + else + { + int red = x % 4 == 1 ? 0x00 : 0xff; + int green = y % 4 == 1 ? 0x00 : 0xff; + int blue = 0; + color = (0xff << 24) | (red << 16) | (green << 8) | blue; + } + image.setRGB(x, y, color); + // compute color for each pixel + } + } + + // return buffered image containing computed color pattern + return image; + } } From xerxes at zafena.se Fri Jan 27 06:03:05 2012 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Fri, 27 Jan 2012 15:03:05 +0100 Subject: Stress test for ThreadLocal In-Reply-To: <4F22A633.6090500@redhat.com> References: <4F22A556.7050100@redhat.com> <4F22A633.6090500@redhat.com> Message-ID: <4F22AE99.3010403@zafena.se> 2012-01-27 14:27, Andrew Haley skrev: > On 01/27/2012 01:23 PM, Andrew Haley wrote: >> May be useful for debugging JIT problems... > > This may be better: it tests put() too. > > Andrew. > Indeed interesting, seen after about 10min of testing on my pandaboard: xranby at panda-oneiric:~$ java ThreadLocalTest 3 Exception in thread "Thread-0" java.lang.ArrayIndexOutOfBoundsException: at ThreadLocalTest$Worker.get(ThreadLocalTest.java:21) at ThreadLocalTest$Worker.run(ThreadLocalTest.java:48) Exception in thread "Thread-2" java.lang.NullPointerException: at ThreadLocalTest$Worker.get(ThreadLocalTest.java:21) at ThreadLocalTest$Worker.run(ThreadLocalTest.java:48) java -version java version "1.6.0_24" OpenJDK Runtime Environment (IcedTea6 1.12pre+r80c34531aba3) (Ubuntu build 1.6.0_24-b24) OpenJDK Zero VM (build 20.0-b12, mixed mode) From ptisnovs at icedtea.classpath.org Fri Jan 27 07:33:07 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 27 Jan 2012 15:33:07 +0000 Subject: /hg/MauveTestCoverage: 2012-01-27 Pavel Tisnovsky changeset 342d366654ce in /hg/MauveTestCoverage details: http://icedtea.classpath.org/hg/MauveTestCoverage?cmd=changeset;node=342d366654ce author: Pavel Tisnovsky date: Fri Jan 27 16:35:26 2012 +0100 2012-01-27 Pavel Tisnovsky * templates/style.css: New styles added which is used in generated test report. * src/FileUtils.java: * src/PrintClassList.java: * src/PrintPublicMethods.java: * src/PrintTestCoverage.java: Minor changes - JavaDoc * templates/all_classes_template.html: * templates/all_packages_template.html: * templates/class_template.html: * templates/package_template.html: * templates/summary.html: Removed useless character ^M in the XML declarations. diffstat: ChangeLog | 16 ++++++++++ src/FileUtils.java | 5 +++ src/PrintClassList.java | 1 + src/PrintPublicMethods.java | 7 ++++ src/PrintTestCoverage.java | 55 ++++++++++++++++++++++++++++++++++++ templates/all_classes_template.html | 2 +- templates/all_packages_template.html | 2 +- templates/class_template.html | 2 +- templates/package_template.html | 2 +- templates/style.css | 25 ++++++++++++++++ templates/summary.html | 2 +- 11 files changed, 114 insertions(+), 5 deletions(-) diffs (331 lines): diff -r 5849d5bfbee0 -r 342d366654ce ChangeLog --- a/ChangeLog Wed Jan 18 16:52:43 2012 +0100 +++ b/ChangeLog Fri Jan 27 16:35:26 2012 +0100 @@ -1,3 +1,19 @@ +2012-01-27 Pavel Tisnovsky + + * templates/style.css: + New styles added which is used in generated test report. + * src/FileUtils.java: + * src/PrintClassList.java: + * src/PrintPublicMethods.java: + * src/PrintTestCoverage.java: + Minor changes - JavaDoc + * templates/all_classes_template.html: + * templates/all_packages_template.html: + * templates/class_template.html: + * templates/package_template.html: + * templates/summary.html: + Removed useless character ^M in the XML declarations. + 2012-01-18 Pavel Tisnovsky * templates/class_template.html: diff -r 5849d5bfbee0 -r 342d366654ce src/FileUtils.java --- a/src/FileUtils.java Wed Jan 18 16:52:43 2012 +0100 +++ b/src/FileUtils.java Fri Jan 27 16:35:26 2012 +0100 @@ -164,6 +164,7 @@ // try to close the buffered reader try { + // for the easier use, it is possible to call this method with null parameter if (bufferedReader != null) { bufferedReader.close(); @@ -186,6 +187,7 @@ // try to close the buffered writer try { + // for the easier use, it is possible to call this method with null parameter if (bufferedWriter != null) { bufferedWriter.close(); @@ -249,6 +251,7 @@ */ static int readOneByte(FileInputStream fileInputStream) throws IOException { + // try to read one byte from the input stream int i = fileInputStream.read(); // -1 means that EOF is reached if (i == EOF) @@ -269,6 +272,7 @@ */ static int readTwoBytes(FileInputStream fileInputStream) throws IOException { + // try to read two bytes from the input stream int i1 = readOneByte(fileInputStream); int i2 = readOneByte(fileInputStream); // combine all two read bytes into a word @@ -286,6 +290,7 @@ */ static int readFourBytes(FileInputStream fileInputStream) throws IOException { + // try to read four bytes from the input stream int i1 = readOneByte(fileInputStream); int i2 = readOneByte(fileInputStream); int i3 = readOneByte(fileInputStream); diff -r 5849d5bfbee0 -r 342d366654ce src/PrintClassList.java --- a/src/PrintClassList.java Wed Jan 18 16:52:43 2012 +0100 +++ b/src/PrintClassList.java Fri Jan 27 16:35:26 2012 +0100 @@ -117,6 +117,7 @@ jarFile.close(); } catch (IOException e) { + // oops, something wrong happens e.printStackTrace(); } } diff -r 5849d5bfbee0 -r 342d366654ce src/PrintPublicMethods.java --- a/src/PrintPublicMethods.java Wed Jan 18 16:52:43 2012 +0100 +++ b/src/PrintPublicMethods.java Fri Jan 27 16:35:26 2012 +0100 @@ -72,17 +72,22 @@ } // some exceptions could be thrown by Class.forName() catch (ClassNotFoundException e) { + // it might happen return null; } catch (UnsatisfiedLinkError e) { + // it might happen return null; } catch (ExceptionInInitializerError e) { + // it might happen return null; } catch (NoClassDefFoundError e) { + // it might happen return null; } + // it is not a class at all or the class is not public return null; } @@ -221,6 +226,7 @@ */ private static void printAllConstructors(String className) { + // iterate over all constructors for (String methodSignature : getAllConstructors(className)) { System.out.println(methodSignature); @@ -235,6 +241,7 @@ */ private static void printAllPublicMethods(String className) { + // iterate over all public methods for (String methodSignature : getAllPublicMethodsForClass(className)) { System.out.println(methodSignature); diff -r 5849d5bfbee0 -r 342d366654ce src/PrintTestCoverage.java --- a/src/PrintTestCoverage.java Wed Jan 18 16:52:43 2012 +0100 +++ b/src/PrintTestCoverage.java Fri Jan 27 16:35:26 2012 +0100 @@ -176,6 +176,11 @@ abstract public String toString(ConstantPoolRecord[] poolEntries); } +/** + * Class representing class record stored in constant pool. + * + * @author Pavel Tisnovsky + */ class ClassRecord extends ConstantPoolRecord { private int classNameIndex; @@ -217,6 +222,11 @@ } } +/** + * Class representing field reference record stored in constant pool. + * + * @author Pavel Tisnovsky + */ class FieldReferenceRecord extends ConstantPoolRecord { private int classIndex; @@ -269,6 +279,11 @@ } } +/** + * Class representing method reference record stored in constant pool. + * + * @author Pavel Tisnovsky + */ @SuppressWarnings("boxing") class MethodReferenceRecord extends ConstantPoolRecord { @@ -426,6 +441,11 @@ } } +/** + * Class representing interface record stored in constant pool. + * + * @author Pavel Tisnovsky + */ class InterfaceReferenceRecord extends ConstantPoolRecord { public int classIndex; @@ -468,6 +488,11 @@ } } +/** + * Class representing name and type record stored in constant pool. + * + * @author Pavel Tisnovsky + */ class NameAndTypeRecord extends ConstantPoolRecord { public int nameIndex; @@ -508,6 +533,11 @@ } } +/** + * Class representing string record stored in constant pool. + * + * @author Pavel Tisnovsky + */ class StringRecord extends ConstantPoolRecord { public int stringIndex; @@ -539,6 +569,11 @@ } } +/** + * Class representing integer constant record stored in constant pool. + * + * @author Pavel Tisnovsky + */ class IntegerRecord extends ConstantPoolRecord { public int integerConstant; @@ -563,6 +598,11 @@ } } +/** + * Class representing long constant record stored in constant pool. + * + * @author Pavel Tisnovsky + */ class LongRecord extends ConstantPoolRecord { public long longConstant; @@ -587,6 +627,11 @@ } } +/** + * Class representing float constant record stored in constant pool. + * + * @author Pavel Tisnovsky + */ class FloatRecord extends ConstantPoolRecord { public float floatConstant; @@ -611,6 +656,11 @@ } } +/** + * Class representing double constant record stored in constant pool. + * + * @author Pavel Tisnovsky + */ class DoubleRecord extends ConstantPoolRecord { public double doubleConstant; @@ -636,6 +686,11 @@ } } +/** + * Class representing UTF-8 string record stored in constant pool. + * + * @author Pavel Tisnovsky + */ class Utf8Record extends ConstantPoolRecord { public String string; diff -r 5849d5bfbee0 -r 342d366654ce templates/all_classes_template.html --- a/templates/all_classes_template.html Wed Jan 18 16:52:43 2012 +0100 +++ b/templates/all_classes_template.html Fri Jan 27 16:35:26 2012 +0100 @@ -1,4 +1,4 @@ - diff -r 5849d5bfbee0 -r 342d366654ce templates/all_packages_template.html --- a/templates/all_packages_template.html Wed Jan 18 16:52:43 2012 +0100 +++ b/templates/all_packages_template.html Fri Jan 27 16:35:26 2012 +0100 @@ -1,4 +1,4 @@ - diff -r 5849d5bfbee0 -r 342d366654ce templates/class_template.html --- a/templates/class_template.html Wed Jan 18 16:52:43 2012 +0100 +++ b/templates/class_template.html Fri Jan 27 16:35:26 2012 +0100 @@ -1,4 +1,4 @@ - diff -r 5849d5bfbee0 -r 342d366654ce templates/package_template.html --- a/templates/package_template.html Wed Jan 18 16:52:43 2012 +0100 +++ b/templates/package_template.html Fri Jan 27 16:35:26 2012 +0100 @@ -1,4 +1,4 @@ - diff -r 5849d5bfbee0 -r 342d366654ce templates/style.css --- a/templates/style.css Wed Jan 18 16:52:43 2012 +0100 +++ b/templates/style.css Fri Jan 27 16:35:26 2012 +0100 @@ -25,3 +25,28 @@ .method-name {} .method-params {} +table.package_list { + border-width: 0px; + border-spacing: 0px; + border-style: dashed; + border-color: black; + border-collapse: collapse; + background-color: white; + width: 100%; +} +table.package_list th { + border-width: 1px; + padding: 1px; + border-style: inset; + border-color: gray; + background-color: #c0c0ff; + -moz-border-radius: ; +} +table.package_list td { + border-width: 1px; + padding: 1px; + border-style: inset; + border-color: gray; + -moz-border-radius: ; +} + diff -r 5849d5bfbee0 -r 342d366654ce templates/summary.html --- a/templates/summary.html Wed Jan 18 16:52:43 2012 +0100 +++ b/templates/summary.html Fri Jan 27 16:35:26 2012 +0100 @@ -1,4 +1,4 @@ - From omajid at icedtea.classpath.org Fri Jan 27 08:09:44 2012 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Fri, 27 Jan 2012 16:09:44 +0000 Subject: /hg/release/icedtea6-1.11: Added tag icedtea6-1.11pre for change... Message-ID: changeset 308265f39f56 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=308265f39f56 author: Omair Majid date: Fri Jan 27 11:09:28 2012 -0500 Added tag icedtea6-1.11pre for changeset 933c143b22a0 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 933c143b22a0 -r 308265f39f56 .hgtags --- a/.hgtags Thu Jan 26 07:27:15 2012 -0500 +++ b/.hgtags Fri Jan 27 11:09:28 2012 -0500 @@ -21,3 +21,4 @@ cb463b94b82da269ea089c481ed5e39700525a8a icedtea6-1.9-branchpoint 21f2a8d158545a161ba0d997c13bdba1e6166394 icedtea6-1.10-branchpoint 24c5bd2e7d574441813bfb8f9e4636e50c5d7c28 icedtea6-1.11-branch +933c143b22a0acb6e5c72ac1315fd90a135275a8 icedtea6-1.11pre From bugzilla-daemon at icedtea.classpath.org Fri Jan 27 08:21:13 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Jan 2012 16:21:13 +0000 Subject: [Bug 862] New: JVM Fault when running Oracle's Glassfish server Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=862 Bug #: 862 Summary: JVM Fault when running Oracle's Glassfish server Classification: Unclassified Product: IcedTea Version: unspecified Platform: x86_64 OS/Version: Linux Status: NEW Severity: major Priority: P3 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: rotatomel at gmail.com Created attachment 643 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=643 JVM Error I'm running Oracle GlassFish server 3.1.1 on OpenJDK with CentOS 6 64bit and a few minutes after starting a domain JVM stop working. I've attached the file that is generated. I hope this is a config issue and not a JVM one :S -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ptisnovs at icedtea.classpath.org Fri Jan 27 08:25:59 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 27 Jan 2012 16:25:59 +0000 Subject: /hg/MauveTestCoverage: 2012-01-27 Pavel Tisnovsky changeset a929d697c161 in /hg/MauveTestCoverage details: http://icedtea.classpath.org/hg/MauveTestCoverage?cmd=changeset;node=a929d697c161 author: Pavel Tisnovsky date: Fri Jan 27 17:28:22 2012 +0100 2012-01-27 Pavel Tisnovsky * src/ReportGenerator.java: * templates/all_packages_template.html: Added new functionality: table with number of all classes and classes coveraged by the test are used in the page with all packages list. diffstat: ChangeLog | 8 +++ src/ReportGenerator.java | 95 ++++++++++++++++++++++++++++++----- templates/all_packages_template.html | 3 + 3 files changed, 91 insertions(+), 15 deletions(-) diffs (203 lines): diff -r 342d366654ce -r a929d697c161 ChangeLog --- a/ChangeLog Fri Jan 27 16:35:26 2012 +0100 +++ b/ChangeLog Fri Jan 27 17:28:22 2012 +0100 @@ -1,3 +1,11 @@ +2012-01-27 Pavel Tisnovsky + + * src/ReportGenerator.java: + * templates/all_packages_template.html: + Added new functionality: table with number of all classes + and classes coveraged by the test are used in the + page with all packages list. + 2012-01-27 Pavel Tisnovsky * templates/style.css: diff -r 342d366654ce -r a929d697c161 src/ReportGenerator.java --- a/src/ReportGenerator.java Fri Jan 27 16:35:26 2012 +0100 +++ b/src/ReportGenerator.java Fri Jan 27 17:28:22 2012 +0100 @@ -82,10 +82,13 @@ * directory where report is generated * @param allClasses * set of all classes + * @param testedClasses + * set of tested classes * @param packageNames * set of package names */ - private static void printPackageListToFile(String reportDirectory, Set allClasses, Set packageNames) + private static void printPackageListToFile(String reportDirectory, Set allClasses, + Set testedClasses, Set packageNames) { List template = FileUtils.readTextFile("templates/all_packages_template.html"); List out = new LinkedList(); @@ -95,7 +98,7 @@ // replace text in template where needed if ("${PACKAGE_LIST}".equals(templateLine)) { - addPackageList(packageNames, out); + addPackageList(allClasses, testedClasses, packageNames, out); } // normal line else @@ -119,7 +122,8 @@ * @param testedClasses * set of tested classes */ - private static void printReportForPackageToFile(String reportDirectory, String packageName, Set testedClasses) + private static void printReportForPackageToFile(String reportDirectory, String packageName, + Set testedClasses) { List template = FileUtils.readTextFile("templates/package_template.html"); List out = new LinkedList(); @@ -178,22 +182,82 @@ /** * Add list of all packages to a list of string which represents generated - * report. + * report. Number of all classes and classes covered by tests are also + * calculated and printed. Background of table rows are changed according + * to test coverage ratio. * + * @param allClasses + * set of all classes + * @param testedClasses + * set of tested classes * @param packageNames * set of package names * @param out * list of string which represents generated report */ - private static void addPackageList(Set packageNames, List out) + @SuppressWarnings("boxing") + private static void addPackageList(Set allClasses, Set testedClasses, Set packageNames, + List out) { + // iterate through all package names for (String packageName : packageNames) { - out.add("" + packageName + "
"); + // compute number of all classes in a package + final int allClassesCnt = numberOfClassesInPackage(packageName, allClasses); + // compute number of classes coveraged by tests + final int testedClassesCnt = numberOfClassesInPackage(packageName, testedClasses); + // -> in percent + final float percentage = 100.0f*testedClassesCnt / allClassesCnt; + // table row background color is based on percentual test coverage ration + String backgroundColor = generateTableRowBackground(percentage); + String str = String.format("%s%d%d%5.1f %%", + backgroundColor, packageName, packageName, allClassesCnt, testedClassesCnt, percentage); + out.add(str); } } /** + * Generate table row background according to test coverage percentual + * ratio. + * + * @param percentage + * test coverage percentual ratio + * @return string representing HTML color + */ + private static String generateTableRowBackground(final float percentage) + { + String backgroundColor = percentage < 10.0f ? "#ffc0c0" : + percentage == 100.0f ? "#c0ffc0" : + percentage >= 50.0f ? "#ffffc0" : + "#ffffff"; + return backgroundColor; + } + + /** + * Calculate number of classes in given package. + * + * @param packageName + * name of package + * @param classes + * set of class names + * @return number of classes in given package + */ + private static int numberOfClassesInPackage(String packageName, Set classes) + { + int cnt = 0; + // iterate through all class names + for (String className : classes) + { + // count only classes in given package + if (className.startsWith(packageName)) + { + cnt++; + } + } + return cnt; + } + + /** * Add list of all classes to a list of string which represents generated * report. * @@ -259,7 +323,8 @@ * @param testedMethods * methods called from tests */ - private static void createFileForClass(String reportDirectory, String testClass, Set allMethods, Set apiMethods, Set testedMethods) + private static void createFileForClass(String reportDirectory, String testClass, Set allMethods, + Set apiMethods, Set testedMethods) { List template = FileUtils.readTextFile("templates/class_template.html"); List out = new LinkedList(); @@ -343,11 +408,9 @@ String returnType = printedMethodName.substring(0, printedMethodName.indexOf(' ')); String name = printedMethodName.substring(returnTypeEnds, parametersBegin); String params = printedMethodName.substring(parametersBegin); - - return String.format( - "%s" + - "%s" + - "%s", returnType, name, params); + + return String.format("%s" + "%s" + + "%s", returnType, name, params); } private static String printMethodCoverage(String methodName, Set methodSet) @@ -484,12 +547,14 @@ // replace text in template where needed else if (templateLine.contains("${TESTED_PACKAGES_RATIO}")) { - out.add(templateLine.replace("${TESTED_PACKAGES_RATIO}", "" + calcRatio(numberOfUsedPackages, numberOfAllPackages))); + out.add(templateLine.replace("${TESTED_PACKAGES_RATIO}", "" + + calcRatio(numberOfUsedPackages, numberOfAllPackages))); } // replace text in template where needed else if (templateLine.contains("${TESTED_CLASSES_RATIO}")) { - out.add(templateLine.replace("${TESTED_CLASSES_RATIO}", "" + calcRatio(numberOfTestedClasses, numberOfAllClasses))); + out.add(templateLine.replace("${TESTED_CLASSES_RATIO}", "" + + calcRatio(numberOfTestedClasses, numberOfAllClasses))); } // normal output else @@ -537,7 +602,7 @@ System.out.println("Report directory: " + reportDirectory); - printPackageListToFile(reportDirectory, allClasses, usedPackageNames); + printPackageListToFile(reportDirectory, allClasses, testedClasses, usedPackageNames); printReportForAllClassesInOneFile(reportDirectory, usedPackageNames, testedClasses); printReportForAllPackages(reportDirectory, usedPackageNames, testedClasses); printReportForAllClasses(reportDirectory, testedClasses); diff -r 342d366654ce -r a929d697c161 templates/all_packages_template.html --- a/templates/all_packages_template.html Fri Jan 27 16:35:26 2012 +0100 +++ b/templates/all_packages_template.html Fri Jan 27 17:28:22 2012 +0100 @@ -10,7 +10,10 @@

Package list

all classes

+ + ${PACKAGE_LIST} +
PackageClassesCoveredRatio
From bugzilla-daemon at icedtea.classpath.org Fri Jan 27 08:31:00 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Jan 2012 16:31:00 +0000 Subject: [Bug 739] javaws just hangs while downloading jars In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=739 Rodrigo Tato changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |rotatomel at gmail.com --- Comment #2 from Rodrigo Tato 2012-01-27 16:31:00 UTC --- Maybe is a problem with your internet connection... some kind of failure in communication. You can try download some large file by FTP or something like that to see if it works. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 27 10:49:34 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Jan 2012 18:49:34 +0000 Subject: [Bug 843] www.mojebanka.cz hangs with icedtea-web In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=843 mysystemp at gmail.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED CC| |mysystemp at gmail.com Resolution|WORKSFORME | --- Comment #7 from mysystemp at gmail.com 2012-01-27 18:49:34 UTC --- Also reinstalled plugin, but still no luck :( Here's output by icedtea: java version "1.7.0_147-icedtea" OpenJDK Runtime Environment (IcedTea7 2.0) (ArchLinux build 7.b147_2.0-5-x86_64) OpenJDK 64-Bit Server VM (build 21.0-b17, mixed mode) AWT blocker activation interrupted: java.lang.InterruptedException at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:503) at sun.awt.AWTAutoShutdown.activateBlockerThread(AWTAutoShutdown.java:337) at sun.awt.AWTAutoShutdown.notifyPeerMapUpdated(AWTAutoShutdown.java:215) at sun.awt.AWTAutoShutdown.registerPeer(AWTAutoShutdown.java:348) at sun.awt.SunToolkit.targetCreatedPeer(SunToolkit.java:375) at sun.awt.X11.XToolkit.createEmbeddedFrame(XToolkit.java:1118) at sun.awt.X11.XEmbeddedFrame.addNotify(XEmbeddedFrame.java:67) at sun.awt.X11.XEmbeddedFrame.(XEmbeddedFrame.java:56) at sun.awt.X11.XEmbeddedFrame.(XEmbeddedFrame.java:73) at sun.applet.PluginAppletViewer.(PluginAppletViewer.java:345) at sun.applet.PluginAppletViewer.framePanel(PluginAppletViewer.java:323) at sun.applet.PluginAppletPanelFactory.createPanel(PluginAppletViewer.java:140) at sun.applet.PluginAppletViewer.parse(PluginAppletViewer.java:1886) at sun.applet.PluginAppletViewer$6.run(PluginAppletViewer.java:1810) at sun.applet.PluginAppletViewer$6.run(PluginAppletViewer.java:1808) at java.security.AccessController.doPrivileged(Native Method) at sun.applet.PluginAppletViewer.parse(PluginAppletViewer.java:1808) at sun.applet.PluginAppletViewer.handleMessage(PluginAppletViewer.java:475) at sun.applet.PluginStreamHandler.handleMessage(PluginStreamHandler.java:232) at sun.applet.PluginMessageHandlerWorker.run(PluginMessageHandlerWorker.java:78) JAR https://www.mojebanka.cz/jars/ktpsp.jar not found. Continuing. JAR https://www.mojebanka.cz/jars/shapp.jar not found. Continuing. JAR https://www.mojebanka.cz/jars/ibapp.jar not found. Continuing. net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: Could not initialize applet. at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:728) at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:672) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:884) Caused by: java.lang.ClassNotFoundException: kbib.security.signer.IBSignerApplet at net.sourceforge.jnlp.runtime.JNLPClassLoader.loadClass(JNLPClassLoader.java:1089) at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:712) ... 2 more Caused by: java.lang.ClassNotFoundException: kbib.security.signer.IBSignerApplet at net.sourceforge.jnlp.runtime.JNLPClassLoader.loadClass(JNLPClassLoader.java:1089) at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:712) at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:672) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:884) java.lang.NullPointerException at net.sourceforge.jnlp.NetxPanel.runLoader(NetxPanel.java:109) at sun.applet.AppletPanel.run(AppletPanel.java:379) at net.sourceforge.jnlp.NetxPanel.run(NetxPanel.java:69) at java.lang.Thread.run(Thread.java:722) java.lang.NullPointerException at sun.applet.AppletPanel.run(AppletPanel.java:429) at net.sourceforge.jnlp.NetxPanel.run(NetxPanel.java:69) at java.lang.Thread.run(Thread.java:722) I've tried these files https://www.mojebanka.cz/jars/ktpsp.jar https://www.mojebanka.cz/jars/shapp.jar https://www.mojebanka.cz/jars/ibapp.jar and they are accessible in browser. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 27 10:53:25 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Jan 2012 18:53:25 +0000 Subject: [Bug 843] www.mojebanka.cz hangs with icedtea-web In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=843 --- Comment #8 from Deepak Bhole 2012-01-27 18:53:25 UTC --- (In reply to comment #7) > Also reinstalled plugin, but still no luck :( > Here's output by icedtea: > Can you please attach the pluging.log file generated as mentioned here? http://icedtea.classpath.org/wiki/IcedTea-Web#Filing_bugs It just occurred to me that this might also be a mis-configured proxy issue.. the logs mentioned above would be able to confirm that. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 27 11:09:45 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Jan 2012 19:09:45 +0000 Subject: [Bug 843] www.mojebanka.cz hangs with icedtea-web In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=843 --- Comment #9 from mysystemp at gmail.com 2012-01-27 19:09:45 UTC --- Created attachment 644 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=644 logs2 You're probably right :) I am behind the proxy, but i am redirecting all traffic through the VPN. I also turn off proxy settings in the browser and check the option in icedtea-web settings that it should pass proxy setting from browser. It should not use proxy server, it seems it does :) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 27 11:11:48 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Jan 2012 19:11:48 +0000 Subject: [Bug 862] JVM Fault when running Oracle's Glassfish server In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=862 Rodrigo Tato changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |INVALID --- Comment #1 from Rodrigo Tato 2012-01-27 19:11:48 UTC --- Well, the problem appears when I configure a Password in glassfish, so it's not a JVM bug :) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 27 11:13:32 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Jan 2012 19:13:32 +0000 Subject: [Bug 843] www.mojebanka.cz hangs with icedtea-web In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=843 --- Comment #10 from Deepak Bhole 2012-01-27 19:13:32 UTC --- (In reply to comment #9) > Created attachment 644 [details] > logs2 > > You're probably right :) > I am behind the proxy, but i am redirecting all traffic through the VPN. I also > turn off proxy settings in the browser and check the option in icedtea-web > settings that it should pass proxy setting from browser. > > It should not use proxy server, it seems it does :) Ah, that should be simple enough to fix. Please try running 'itweb-settings' and configure the proxy there. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 27 11:14:36 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Jan 2012 19:14:36 +0000 Subject: [Bug 843] www.mojebanka.cz hangs with icedtea-web In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=843 --- Comment #11 from Deepak Bhole 2012-01-27 19:14:36 UTC --- (In reply to comment #10) > (In reply to comment #9) > > Created attachment 644 [details] > > logs2 > > > > You're probably right :) > > I am behind the proxy, but i am redirecting all traffic through the VPN. I also > > turn off proxy settings in the browser and check the option in icedtea-web > > settings that it should pass proxy setting from browser. > > > > It should not use proxy server, it seems it does :) > > Ah, that should be simple enough to fix. Please try running 'itweb-settings' > and configure the proxy there. Oops, sorry it seems you already tried that. So does it work now? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 27 11:16:14 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Jan 2012 19:16:14 +0000 Subject: [Bug 842] LWJGL applets do not work on ubuntu/firefox/icedtea In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=842 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|dbhole at redhat.com |omajid at redhat.com -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 27 11:19:55 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Jan 2012 19:19:55 +0000 Subject: [Bug 855] AppletStub getDocumentBase() doesn't return full URL In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=855 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|dbhole at redhat.com |jvanek at redhat.com -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 27 11:26:10 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Jan 2012 19:26:10 +0000 Subject: [Bug 843] www.mojebanka.cz hangs with icedtea-web In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=843 --- Comment #12 from mysystemp at gmail.com 2012-01-27 19:26:10 UTC --- Unfortunately not. With or without. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 27 11:31:31 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Jan 2012 19:31:31 +0000 Subject: [Bug 843] www.mojebanka.cz hangs with icedtea-web In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=843 --- Comment #13 from Deepak Bhole 2012-01-27 19:31:31 UTC --- I think I may be misunderstanding your setup... so your machine machine is behind a firewall that does not allow outside connections, and you have a VPN tunnel through which you connect to the internet, is that right? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 27 11:53:39 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Jan 2012 19:53:39 +0000 Subject: [Bug 843] www.mojebanka.cz hangs with icedtea-web In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=843 --- Comment #14 from mysystemp at gmail.com 2012-01-27 19:53:39 UTC --- here, on my network, firewall and proxy are on the same machine. It passes all connection binds to ports 80 or 443, others are dropped. Yes, i have tunneled conection outside the network through port 443 and redirected all trafic into it. I've tried to disable my VPN and configure my browser and icedtea plugin to use the proxy, but still i have same result. >From my laptop (fedora), same network (proxy settings on, no VPN ) it works without any problems. icedtea-web.x86_64 1.0.6-3.fc15 firefox.x86_64 9.0.1-1.fc15 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Fri Jan 27 12:00:07 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Jan 2012 20:00:07 +0000 Subject: [Bug 843] www.mojebanka.cz hangs with icedtea-web In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=843 --- Comment #15 from Deepak Bhole 2012-01-27 20:00:07 UTC --- Can you post the logs after configuring it to use proxy? Thanks. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From dbhole at redhat.com Fri Jan 27 12:29:36 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 27 Jan 2012 15:29:36 -0500 Subject: [icedtea-web] RFC: Fix for PR852: Classloader not being flushed after close In-Reply-To: <4F22120D.6070705@redhat.com> References: <20120126181842.GE21952@redhat.com> <4F22120D.6070705@redhat.com> Message-ID: <20120127202935.GK3418@redhat.com> * Omair Majid [2012-01-26 21:55]: > Hi Deepak, > > On 01/26/2012 01:18 PM, Deepak Bhole wrote: > >This patch fixes PR852. I would like to put it in 1.2 in addition to > >HEAD. > > I have a few on the patch comments below. > > >diff -r 41f03d932cdf netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > >--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Mon Jan 09 18:45:31 2012 -0500 > >+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Jan 26 13:15:59 2012 -0500 > > >+ public static void incrementLoaderCount(JNLPClassLoader loader) { > > >+ public static void decrementLoaderCount(JNLPClassLoader loader) { > > Just a thought, but it might be cleaner to make these instance > methods, since they always operate on a loader object. With that > changes, this becomes: > > public void incrementLoaderCount() > public void decrementLoaderCount() > > In fact, incrementLoaderCount does not even have to be public. If we > do go down that route, perhaps we can also go ahead and rename > decrementLoaderCount to dispose() or release()? (I am also thinking > close() but that would clash with the URLClassLoader's close() > method in OpenJDK7.) I think it makes the purpose clearer in that > this method releases resources associated with the classloader. It > also hides the fact that we are caching something from the users of > the JNLPClassLaoder api. > Sure. I think making it non-static should be perfectly fine. As for renaming decrement... to dispose, the loader is no always disposed after the call. If multiple applets are opened, we only want the count to be reduced, not the loader disposed, so I think the existing name is more appropriate. > >+ synchronized(loader.useCount) { > >+ loader.useCount--; > >+ > >+ if (loader.useCount<= 0) { > >+ synchronized(urlToLoader) { > >+ urlToLoader.remove(loader.file.getUniqueKey()); > >+ } > >+ } > >+ } > >+ } > > > > Synchronizing over Integer (or Long) has always looked scary to me. > I am not sure if this is a problem in this case, but as soon as you > do the post increment, the object (useCount) has changed. If another > thread comes along at this point, it can now synchronize over the > new object and it would be possible to have two threads enter the > same synchronized block. I am attaching a program that shows that > the Integer has indeed changed. > Doh! I hadn't even thought of that. You're right, it is unsafe to use that. I will fix it to synchronize around the loader itself. It looks like it should be safe, but please let me know if you prefer a lock specific for the counter. > >diff -r 41f03d932cdf plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > >--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Jan 09 18:45:31 2012 -0500 > >+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu Jan 26 13:15:59 2012 -0500 > >@@ -1625,6 +1625,9 @@ > > > > appletShutdown(p); > > appletPanels.removeElement(p); > >+ > >+ // Mark classloader unusable > >+ JNLPClassLoader.decrementLoaderCount((JNLPClassLoader) cl); > > > > try { > > SwingUtilities.invokeAndWait(new Runnable() { > > > > Not being an expert, I am not sure about the details of how this > fixes the problem. If the _only_ problem was that we are maintaining > a reference to the classloader, perhaps making urlToLoader a > Map> might be more > appropriate? Or is there something I am missing? > > Sorry if this is not very helpful - I took a look at bugzilla but I > could not find the actual issue described there. > Please see attached test case I created for the issue. New patch with changes attached. Thanks for reviewing this! Cheers, Deepak -------------- next part -------------- diff -r b901442e9ba4 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Jan 25 16:42:27 2012 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Jan 27 15:26:47 2012 -0500 @@ -173,6 +173,11 @@ private boolean foundMainJar= false; /** + * Variable to track how many times this loader is in use + */ + private int useCount = 0; + + /** * Create a new JNLPClassLoader from the specified file. * * @param file the JNLP file @@ -321,6 +326,7 @@ throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo")); loader.merge(extLoader); + extLoader.decrementLoaderCount(); // loader urls have been merged, ext loader is no longer used } // loader is now current + ext. But we also need to think of @@ -347,7 +353,11 @@ // loaders are mapped to a unique key. Only extensions and parent // share a key, so it is safe to always share based on it - urlToLoader.put(uniqueKey, loader); + + loader.incrementLoaderCount(); + synchronized(urlToLoader) { + urlToLoader.put(uniqueKey, loader); + } return loader; } @@ -1762,6 +1772,42 @@ } return result; } + + /** + * Increments loader use count by 1 + * + * @throws SecurityException if caller is not trusted + */ + public synchronized void incrementLoaderCount() { + + // For use by trusted code only + if (System.getSecurityManager() != null) + System.getSecurityManager().checkPermission(new AllPermission()); + + useCount++; + } + + /** + * Decrements loader use count by 1 + * + * If count reaches 0, loader is removed from list of available loaders + * + * @throws SecurityException if caller is not trusted + */ + public synchronized void decrementLoaderCount() { + + // For use by trusted code only + if (System.getSecurityManager() != null) + System.getSecurityManager().checkPermission(new AllPermission()); + + useCount--; + + if (useCount <= 0) { + synchronized(urlToLoader) { + urlToLoader.remove(file.getUniqueKey()); + } + } + } /* * Helper class to expose protected URLClassLoader methods. diff -r b901442e9ba4 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed Jan 25 16:42:27 2012 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri Jan 27 15:26:47 2012 -0500 @@ -1625,6 +1625,9 @@ appletShutdown(p); appletPanels.removeElement(p); + + // Mark classloader unusable + ((JNLPClassLoader) cl).decrementLoaderCount(); try { SwingUtilities.invokeAndWait(new Runnable() { -------------- next part -------------- A non-text attachment was scrubbed... Name: PR852-test.zip Type: application/zip Size: 1438 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120127/0be253e6/PR852-test.zip From omajid at redhat.com Fri Jan 27 12:56:47 2012 From: omajid at redhat.com (Omair Majid) Date: Fri, 27 Jan 2012 15:56:47 -0500 Subject: [icedtea-web] RFC: Fix for PR852: Classloader not being flushed after close In-Reply-To: <20120127202935.GK3418@redhat.com> References: <20120126181842.GE21952@redhat.com> <4F22120D.6070705@redhat.com> <20120127202935.GK3418@redhat.com> Message-ID: <4F230F8F.6030506@redhat.com> On 01/27/2012 03:29 PM, Deepak Bhole wrote: > * Omair Majid [2012-01-26 21:55]: >> Hi Deepak, >> >> On 01/26/2012 01:18 PM, Deepak Bhole wrote: >>> This patch fixes PR852. I would like to put it in 1.2 in addition to >>> HEAD. >> >> I have a few on the patch comments below. >> >>> diff -r 41f03d932cdf netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java >>> --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Mon Jan 09 18:45:31 2012 -0500 >>> +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Jan 26 13:15:59 2012 -0500 >> >>> + public static void incrementLoaderCount(JNLPClassLoader loader) { >> >>> + public static void decrementLoaderCount(JNLPClassLoader loader) { >> >> Just a thought, but it might be cleaner to make these instance >> methods, since they always operate on a loader object. With that >> changes, this becomes: >> >> public void incrementLoaderCount() >> public void decrementLoaderCount() >> >> In fact, incrementLoaderCount does not even have to be public. If we >> do go down that route, perhaps we can also go ahead and rename >> decrementLoaderCount to dispose() or release()? (I am also thinking >> close() but that would clash with the URLClassLoader's close() >> method in OpenJDK7.) I think it makes the purpose clearer in that >> this method releases resources associated with the classloader. It >> also hides the fact that we are caching something from the users of >> the JNLPClassLaoder api. >> > > Sure. I think making it non-static should be perfectly fine. > What about private? ;) > As for renaming decrement... to dispose, the loader is no always > disposed after the call. If multiple applets are opened, we only want > the count to be reduced, not the loader disposed, so I think the > existing name is more appropriate. > I was thinking in terms of how reference counting works - when you are done with an object, you unref()/release() it and the object may or may not be actually disposed at that point. But looking at how shared objects like FileDescriptor in java are used, your naming makes more sense. >>> + synchronized(loader.useCount) { >>> + loader.useCount--; >>> + >>> + if (loader.useCount<= 0) { >>> + synchronized(urlToLoader) { >>> + urlToLoader.remove(loader.file.getUniqueKey()); >>> + } >>> + } >>> + } >>> + } >>> >> >> Synchronizing over Integer (or Long) has always looked scary to me. >> I am not sure if this is a problem in this case, but as soon as you >> do the post increment, the object (useCount) has changed. If another >> thread comes along at this point, it can now synchronize over the >> new object and it would be possible to have two threads enter the >> same synchronized block. I am attaching a program that shows that >> the Integer has indeed changed. >> > > Doh! I hadn't even thought of that. You're right, it is unsafe to use > that. I will fix it to synchronize around the loader itself. It looks > like it should be safe, but please let me know if you prefer a lock > specific for the counter. > I am fine with synchronized methods. >>> diff -r 41f03d932cdf plugin/icedteanp/java/sun/applet/PluginAppletViewer.java >>> --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Jan 09 18:45:31 2012 -0500 >>> +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu Jan 26 13:15:59 2012 -0500 >>> @@ -1625,6 +1625,9 @@ >>> >>> appletShutdown(p); >>> appletPanels.removeElement(p); >>> + >>> + // Mark classloader unusable >>> + JNLPClassLoader.decrementLoaderCount((JNLPClassLoader) cl); >>> >>> try { >>> SwingUtilities.invokeAndWait(new Runnable() { >>> >> >> Not being an expert, I am not sure about the details of how this >> fixes the problem. If the _only_ problem was that we are maintaining >> a reference to the classloader, perhaps making urlToLoader a >> Map> might be more >> appropriate? Or is there something I am missing? >> >> Sorry if this is not very helpful - I took a look at bugzilla but I >> could not find the actual issue described there. >> > > Please see attached test case I created for the issue. > Ah. Okay, so we need to use a new classlaoder for a new instance of an applet once all the older instances are gone. Makes much more sense now. > New patch with changes attached. > > Thanks for reviewing this! Looks good to me. Cheers, Omair From omajid at redhat.com Fri Jan 27 13:01:48 2012 From: omajid at redhat.com (Omair Majid) Date: Fri, 27 Jan 2012 16:01:48 -0500 Subject: [icedtea-web] RFC: PR822: Applets fail to load if jars have different signers In-Reply-To: <20120126195534.GF21952@redhat.com> References: <20120126195534.GF21952@redhat.com> Message-ID: <4F2310BC.40601@redhat.com> On 01/26/2012 02:55 PM, Deepak Bhole wrote: > Hi, > > This patch fixes PR822: > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=822 > > It makes it so that applets do not require all jars to have a single > signer (which is not mandated by the spec). After the patch, sites like > the one mentioned in the bug (https://bcee.snet.lu/) now work. > > ChangeLog: > 2012-01-26 Deepak Bhole > > PR822: Applets fail to load if jars have different signers > * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > (initializeResources): Ensure that there is a single signer only for Web > Start applications and not for applets. > * netx/net/sourceforge/jnlp/tools/JarSigner.java (verifyJar): Ensure that > a given jar is signed throughout by at least one common certificate. > > Okay for 1.2 and HEAD? > A minor comment below. > diff -r b901442e9ba4 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Jan 25 16:42:27 2012 +0100 > +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Jan 26 14:44:54 2012 -0500 > @@ -470,8 +470,15 @@ > R("LCInit"), R("LFatalVerification"), R("LFatalVerificationInfo")); > } > > - //Case when at least one jar has some signing > - if (js.anyJarsSigned()&& js.isFullySignedByASingleCert()) { > + // Case when at least one jar has some signing > + // For permissions to be given, we need: > + // 1. Something is signed > + // 2. This is an applet > + // 3. OR, if this is NOT an applet, all jars have the same signer Something I am not sure about: are we supposed to run applets that consist of unsigned + signed jars? This if statement might have to be tweaked a bit. Other than that, this looks fine to me. Cheers, Omair From dbhole at redhat.com Fri Jan 27 13:15:15 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 27 Jan 2012 16:15:15 -0500 Subject: [icedtea-web] RFC: Fix for PR852: Classloader not being flushed after close In-Reply-To: <4F230F8F.6030506@redhat.com> References: <20120126181842.GE21952@redhat.com> <4F22120D.6070705@redhat.com> <20120127202935.GK3418@redhat.com> <4F230F8F.6030506@redhat.com> Message-ID: <20120127211514.GM3418@redhat.com> * Omair Majid [2012-01-27 15:56]: > On 01/27/2012 03:29 PM, Deepak Bhole wrote: > >* Omair Majid [2012-01-26 21:55]: > >>Hi Deepak, > >> > >>On 01/26/2012 01:18 PM, Deepak Bhole wrote: > >>>This patch fixes PR852. I would like to put it in 1.2 in addition to > >>>HEAD. > >> > >>I have a few on the patch comments below. > >> > >>>diff -r 41f03d932cdf netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > >>>--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Mon Jan 09 18:45:31 2012 -0500 > >>>+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Jan 26 13:15:59 2012 -0500 > >> > >>>+ public static void incrementLoaderCount(JNLPClassLoader loader) { > >> > >>>+ public static void decrementLoaderCount(JNLPClassLoader loader) { > >> > >>Just a thought, but it might be cleaner to make these instance > >>methods, since they always operate on a loader object. With that > >>changes, this becomes: > >> > >>public void incrementLoaderCount() > >>public void decrementLoaderCount() > >> > >>In fact, incrementLoaderCount does not even have to be public. If we > >>do go down that route, perhaps we can also go ahead and rename > >>decrementLoaderCount to dispose() or release()? (I am also thinking > >>close() but that would clash with the URLClassLoader's close() > >>method in OpenJDK7.) I think it makes the purpose clearer in that > >>this method releases resources associated with the classloader. It > >>also hides the fact that we are caching something from the users of > >>the JNLPClassLaoder api. > >> > > > >Sure. I think making it non-static should be perfectly fine. > > > > What about private? ;) > Oops. New patch attached. I also renamed the methods to make them more clearer ([increment|decrement]LoaderCount -> [increment|decrement]LoaderUseCount) Okay for 1.2 and HEAD? Cheers, Deepak From dbhole at redhat.com Fri Jan 27 13:15:55 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 27 Jan 2012 16:15:55 -0500 Subject: [icedtea-web] RFC: Fix for PR852: Classloader not being flushed after close In-Reply-To: <20120127211514.GM3418@redhat.com> References: <20120126181842.GE21952@redhat.com> <4F22120D.6070705@redhat.com> <20120127202935.GK3418@redhat.com> <4F230F8F.6030506@redhat.com> <20120127211514.GM3418@redhat.com> Message-ID: <20120127211555.GN3418@redhat.com> * Deepak Bhole [2012-01-27 16:15]: > * Omair Majid [2012-01-27 15:56]: > > On 01/27/2012 03:29 PM, Deepak Bhole wrote: > > >* Omair Majid [2012-01-26 21:55]: > > >>Hi Deepak, > > >> > > >>On 01/26/2012 01:18 PM, Deepak Bhole wrote: > > >>>This patch fixes PR852. I would like to put it in 1.2 in addition to > > >>>HEAD. > > >> > > >>I have a few on the patch comments below. > > >> > > >>>diff -r 41f03d932cdf netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > > >>>--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Mon Jan 09 18:45:31 2012 -0500 > > >>>+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Jan 26 13:15:59 2012 -0500 > > >> > > >>>+ public static void incrementLoaderCount(JNLPClassLoader loader) { > > >> > > >>>+ public static void decrementLoaderCount(JNLPClassLoader loader) { > > >> > > >>Just a thought, but it might be cleaner to make these instance > > >>methods, since they always operate on a loader object. With that > > >>changes, this becomes: > > >> > > >>public void incrementLoaderCount() > > >>public void decrementLoaderCount() > > >> > > >>In fact, incrementLoaderCount does not even have to be public. If we > > >>do go down that route, perhaps we can also go ahead and rename > > >>decrementLoaderCount to dispose() or release()? (I am also thinking > > >>close() but that would clash with the URLClassLoader's close() > > >>method in OpenJDK7.) I think it makes the purpose clearer in that > > >>this method releases resources associated with the classloader. It > > >>also hides the fact that we are caching something from the users of > > >>the JNLPClassLaoder api. > > >> > > > > > >Sure. I think making it non-static should be perfectly fine. > > > > > > > What about private? ;) > > > > Oops. New patch attached. I also renamed the methods to make them more > clearer ([increment|decrement]LoaderCount -> > [increment|decrement]LoaderUseCount) > Gah. Sent too early. Patch attached this time. > Okay for 1.2 and HEAD? > > Cheers, > Deepak -------------- next part -------------- diff -r b901442e9ba4 NEWS --- a/NEWS Wed Jan 25 16:42:27 2012 +0100 +++ b/NEWS Fri Jan 27 16:13:45 2012 -0500 @@ -22,6 +22,7 @@ - PR749: sun.applet.PluginStreamHandler#handleMessage(String) really slow - PR782: Support building against npapi-sdk as well - PR838: IcedTea plugin crashes with chrome browser when javascript is executed + - PR852: Classloader not being flushed after last applet from a site is closed - RH586194: Unable to connect to connect with Juniper VPN client - RH718693: MindTerm SSH Applet doesn't work Common diff -r b901442e9ba4 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Jan 25 16:42:27 2012 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Jan 27 16:13:45 2012 -0500 @@ -173,6 +173,11 @@ private boolean foundMainJar= false; /** + * Variable to track how many times this loader is in use + */ + private int useCount = 0; + + /** * Create a new JNLPClassLoader from the specified file. * * @param file the JNLP file @@ -321,6 +326,7 @@ throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo")); loader.merge(extLoader); + extLoader.decrementLoaderUseCount(); // loader urls have been merged, ext loader is no longer used } // loader is now current + ext. But we also need to think of @@ -347,7 +353,11 @@ // loaders are mapped to a unique key. Only extensions and parent // share a key, so it is safe to always share based on it - urlToLoader.put(uniqueKey, loader); + + loader.incrementLoaderUseCount(); + synchronized(urlToLoader) { + urlToLoader.put(uniqueKey, loader); + } return loader; } @@ -1762,6 +1772,42 @@ } return result; } + + /** + * Increments loader use count by 1 + * + * @throws SecurityException if caller is not trusted + */ + private synchronized void incrementLoaderUseCount() { + + // For use by trusted code only + if (System.getSecurityManager() != null) + System.getSecurityManager().checkPermission(new AllPermission()); + + useCount++; + } + + /** + * Decrements loader use count by 1 + * + * If count reaches 0, loader is removed from list of available loaders + * + * @throws SecurityException if caller is not trusted + */ + public synchronized void decrementLoaderUseCount() { + + // For use by trusted code only + if (System.getSecurityManager() != null) + System.getSecurityManager().checkPermission(new AllPermission()); + + useCount--; + + if (useCount <= 0) { + synchronized(urlToLoader) { + urlToLoader.remove(file.getUniqueKey()); + } + } + } /* * Helper class to expose protected URLClassLoader methods. diff -r b901442e9ba4 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed Jan 25 16:42:27 2012 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri Jan 27 16:13:45 2012 -0500 @@ -1625,6 +1625,9 @@ appletShutdown(p); appletPanels.removeElement(p); + + // Mark classloader unusable + ((JNLPClassLoader) cl).decrementLoaderUseCount(); try { SwingUtilities.invokeAndWait(new Runnable() { From omajid at redhat.com Fri Jan 27 13:17:01 2012 From: omajid at redhat.com (Omair Majid) Date: Fri, 27 Jan 2012 16:17:01 -0500 Subject: [icedtea-web] RFC: Fix for PR852: Classloader not being flushed after close In-Reply-To: <20120127211555.GN3418@redhat.com> References: <20120126181842.GE21952@redhat.com> <4F22120D.6070705@redhat.com> <20120127202935.GK3418@redhat.com> <4F230F8F.6030506@redhat.com> <20120127211514.GM3418@redhat.com> <20120127211555.GN3418@redhat.com> Message-ID: <4F23144D.70401@redhat.com> On 01/27/2012 04:15 PM, Deepak Bhole wrote: >> Okay for 1.2 and HEAD? Looks good to me. Cheers, Omair From dbhole at icedtea.classpath.org Fri Jan 27 13:22:57 2012 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Fri, 27 Jan 2012 21:22:57 +0000 Subject: /hg/icedtea-web: PR852: Classloader not being flushed after last... Message-ID: changeset 9a9dc770ba1a in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=9a9dc770ba1a author: Deepak Bhole date: Fri Jan 27 16:20:22 2012 -0500 PR852: Classloader not being flushed after last applet from a site is closed diffstat: ChangeLog | 12 ++++ NEWS | 1 + netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 48 +++++++++++++++- plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 3 + 4 files changed, 63 insertions(+), 1 deletions(-) diffs (122 lines): diff -r b901442e9ba4 -r 9a9dc770ba1a ChangeLog --- a/ChangeLog Wed Jan 25 16:42:27 2012 +0100 +++ b/ChangeLog Fri Jan 27 16:20:22 2012 -0500 @@ -1,3 +1,15 @@ +2012-01-27 Deepak Bhole + + PR852: Classloader not being flushed after last applet from a site is closed + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Added variable + to count usage for a given ClassLoader instance. + (getInstance): Decrement use count for a loader after it is merged with + another. Increment loader use count before returning. + (incrementLoaderUseCount): New method. Increments loader use count. + (decrementLoaderUseCount): New method. Decrements loader use count. + * java/sun/applet/PluginAppletViewer.java (appletClose): Decrement loader + use count when applet is closed. + 2012-01-25 Jiri Vanek Added test for -Xnofork option and for applet launching by jnlp diff -r b901442e9ba4 -r 9a9dc770ba1a NEWS --- a/NEWS Wed Jan 25 16:42:27 2012 +0100 +++ b/NEWS Fri Jan 27 16:20:22 2012 -0500 @@ -22,6 +22,7 @@ - PR749: sun.applet.PluginStreamHandler#handleMessage(String) really slow - PR782: Support building against npapi-sdk as well - PR838: IcedTea plugin crashes with chrome browser when javascript is executed + - PR852: Classloader not being flushed after last applet from a site is closed - RH586194: Unable to connect to connect with Juniper VPN client - RH718693: MindTerm SSH Applet doesn't work Common diff -r b901442e9ba4 -r 9a9dc770ba1a netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Jan 25 16:42:27 2012 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Jan 27 16:20:22 2012 -0500 @@ -173,6 +173,11 @@ private boolean foundMainJar= false; /** + * Variable to track how many times this loader is in use + */ + private int useCount = 0; + + /** * Create a new JNLPClassLoader from the specified file. * * @param file the JNLP file @@ -321,6 +326,7 @@ throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo")); loader.merge(extLoader); + extLoader.decrementLoaderUseCount(); // loader urls have been merged, ext loader is no longer used } // loader is now current + ext. But we also need to think of @@ -347,7 +353,11 @@ // loaders are mapped to a unique key. Only extensions and parent // share a key, so it is safe to always share based on it - urlToLoader.put(uniqueKey, loader); + + loader.incrementLoaderUseCount(); + synchronized(urlToLoader) { + urlToLoader.put(uniqueKey, loader); + } return loader; } @@ -1762,6 +1772,42 @@ } return result; } + + /** + * Increments loader use count by 1 + * + * @throws SecurityException if caller is not trusted + */ + private synchronized void incrementLoaderUseCount() { + + // For use by trusted code only + if (System.getSecurityManager() != null) + System.getSecurityManager().checkPermission(new AllPermission()); + + useCount++; + } + + /** + * Decrements loader use count by 1 + * + * If count reaches 0, loader is removed from list of available loaders + * + * @throws SecurityException if caller is not trusted + */ + public synchronized void decrementLoaderUseCount() { + + // For use by trusted code only + if (System.getSecurityManager() != null) + System.getSecurityManager().checkPermission(new AllPermission()); + + useCount--; + + if (useCount <= 0) { + synchronized(urlToLoader) { + urlToLoader.remove(file.getUniqueKey()); + } + } + } /* * Helper class to expose protected URLClassLoader methods. diff -r b901442e9ba4 -r 9a9dc770ba1a plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed Jan 25 16:42:27 2012 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri Jan 27 16:20:22 2012 -0500 @@ -1625,6 +1625,9 @@ appletShutdown(p); appletPanels.removeElement(p); + + // Mark classloader unusable + ((JNLPClassLoader) cl).decrementLoaderUseCount(); try { SwingUtilities.invokeAndWait(new Runnable() { From dbhole at icedtea.classpath.org Fri Jan 27 13:23:05 2012 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Fri, 27 Jan 2012 21:23:05 +0000 Subject: /hg/release/icedtea-web-1.2: PR852: Classloader not being flushe... Message-ID: changeset 847e4e6d0e06 in /hg/release/icedtea-web-1.2 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.2?cmd=changeset;node=847e4e6d0e06 author: Deepak Bhole date: Fri Jan 27 16:20:22 2012 -0500 PR852: Classloader not being flushed after last applet from a site is closed diffstat: ChangeLog | 12 ++++ NEWS | 1 + netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 48 +++++++++++++++- plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 3 + 4 files changed, 63 insertions(+), 1 deletions(-) diffs (122 lines): diff -r 21183f821dd4 -r 847e4e6d0e06 ChangeLog --- a/ChangeLog Tue Jan 24 15:33:51 2012 -0500 +++ b/ChangeLog Fri Jan 27 16:20:22 2012 -0500 @@ -1,3 +1,15 @@ +2012-01-27 Deepak Bhole + + PR852: Classloader not being flushed after last applet from a site is closed + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Added variable + to count usage for a given ClassLoader instance. + (getInstance): Decrement use count for a loader after it is merged with + another. Increment loader use count before returning. + (incrementLoaderUseCount): New method. Increments loader use count. + (decrementLoaderUseCount): New method. Decrements loader use count. + * java/sun/applet/PluginAppletViewer.java (appletClose): Decrement loader + use count when applet is closed. + 2012-01-06 Danesh Dadachanji Use the JNLP file's information section for the Name and diff -r 21183f821dd4 -r 847e4e6d0e06 NEWS --- a/NEWS Tue Jan 24 15:33:51 2012 -0500 +++ b/NEWS Fri Jan 27 16:20:22 2012 -0500 @@ -22,6 +22,7 @@ - PR749: sun.applet.PluginStreamHandler#handleMessage(String) really slow - PR782: Support building against npapi-sdk as well - PR838: IcedTea plugin crashes with chrome browser when javascript is executed + - PR852: Classloader not being flushed after last applet from a site is closed - RH586194: Unable to connect to connect with Juniper VPN client - RH718693: MindTerm SSH Applet doesn't work Common diff -r 21183f821dd4 -r 847e4e6d0e06 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue Jan 24 15:33:51 2012 -0500 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Jan 27 16:20:22 2012 -0500 @@ -173,6 +173,11 @@ private boolean foundMainJar= false; /** + * Variable to track how many times this loader is in use + */ + private int useCount = 0; + + /** * Create a new JNLPClassLoader from the specified file. * * @param file the JNLP file @@ -321,6 +326,7 @@ throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo")); loader.merge(extLoader); + extLoader.decrementLoaderUseCount(); // loader urls have been merged, ext loader is no longer used } // loader is now current + ext. But we also need to think of @@ -347,7 +353,11 @@ // loaders are mapped to a unique key. Only extensions and parent // share a key, so it is safe to always share based on it - urlToLoader.put(uniqueKey, loader); + + loader.incrementLoaderUseCount(); + synchronized(urlToLoader) { + urlToLoader.put(uniqueKey, loader); + } return loader; } @@ -1762,6 +1772,42 @@ } return result; } + + /** + * Increments loader use count by 1 + * + * @throws SecurityException if caller is not trusted + */ + private synchronized void incrementLoaderUseCount() { + + // For use by trusted code only + if (System.getSecurityManager() != null) + System.getSecurityManager().checkPermission(new AllPermission()); + + useCount++; + } + + /** + * Decrements loader use count by 1 + * + * If count reaches 0, loader is removed from list of available loaders + * + * @throws SecurityException if caller is not trusted + */ + public synchronized void decrementLoaderUseCount() { + + // For use by trusted code only + if (System.getSecurityManager() != null) + System.getSecurityManager().checkPermission(new AllPermission()); + + useCount--; + + if (useCount <= 0) { + synchronized(urlToLoader) { + urlToLoader.remove(file.getUniqueKey()); + } + } + } /* * Helper class to expose protected URLClassLoader methods. diff -r 21183f821dd4 -r 847e4e6d0e06 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue Jan 24 15:33:51 2012 -0500 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri Jan 27 16:20:22 2012 -0500 @@ -1625,6 +1625,9 @@ appletShutdown(p); appletPanels.removeElement(p); + + // Mark classloader unusable + ((JNLPClassLoader) cl).decrementLoaderUseCount(); try { SwingUtilities.invokeAndWait(new Runnable() { From dbhole at redhat.com Fri Jan 27 13:23:17 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 27 Jan 2012 16:23:17 -0500 Subject: [icedtea-web] RFC: Fix for PR852: Classloader not being flushed after close In-Reply-To: <4F23144D.70401@redhat.com> References: <20120126181842.GE21952@redhat.com> <4F22120D.6070705@redhat.com> <20120127202935.GK3418@redhat.com> <4F230F8F.6030506@redhat.com> <20120127211514.GM3418@redhat.com> <20120127211555.GN3418@redhat.com> <4F23144D.70401@redhat.com> Message-ID: <20120127212316.GO3418@redhat.com> * Omair Majid [2012-01-27 16:17]: > On 01/27/2012 04:15 PM, Deepak Bhole wrote: > >>Okay for 1.2 and HEAD? > > Looks good to me. > Thanks, pushed. Cheers, Deepak > Cheers, > Omair From bugzilla-daemon at icedtea.classpath.org Fri Jan 27 13:23:46 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Jan 2012 21:23:46 +0000 Subject: [Bug 852] Classloader not being flushed after last applet from a site is closed In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=852 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED --- Comment #4 from Deepak Bhole 2012-01-27 21:23:46 UTC --- Fixed in 1.2 branch and HEAD. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From dbhole at redhat.com Fri Jan 27 13:24:01 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 27 Jan 2012 16:24:01 -0500 Subject: [icedtea-web] RFC: Fix for PR852: Classloader not being flushed after close In-Reply-To: <1327610305.1486.3.camel@localhost.localdomain> References: <20120126181842.GE21952@redhat.com> <1327610305.1486.3.camel@localhost.localdomain> Message-ID: <20120127212401.GP3418@redhat.com> * Thomas Meyer [2012-01-26 15:38]: > Am Donnerstag, den 26.01.2012, 13:18 -0500 schrieb Deepak Bhole: > > Hi, > > > > This patch fixes PR852. I would like to put it in 1.2 in addition to > > HEAD. > > > > ChangeLog: > > 2012-01-26 Deepak Bhole > > > > PR852: Classloader not being flushed after last applet from a site is closed > > * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Added variable > > to count usage for a given ClassLoader instance. > > (getInstance): Decrement use count for a loader after it is merged with > > another. Increment loader use count before returning. > > (incrementLoaderCount): New method. Increments loader use count. > > (decrementLoaderCount): New method. Decrements loader use count. > > * java/sun/applet/PluginAppletViewer.java (appletClose): Decrement loader > > use count when applet is closed. > > > > Hi Deepak, > > many thanks for this patch. I did test the patch and it works for me. I > can now login several times using the same java process (i.e. I don't > need to kill the PluginMain process every time I want to login). > Thanks for trying it out Thomas! Cheers, Deepak > kind regards > thomas > > From bugzilla-daemon at icedtea.classpath.org Fri Jan 27 13:24:18 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Jan 2012 21:24:18 +0000 Subject: [Bug 843] www.mojebanka.cz hangs with icedtea-web In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=843 --- Comment #16 from mysystemp at gmail.com 2012-01-27 21:24:18 UTC --- will update tomorrow. Big thanks for your help :) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From aph at redhat.com Sat Jan 28 10:36:48 2012 From: aph at redhat.com (Andrew Haley) Date: Sat, 28 Jan 2012 18:36:48 +0000 Subject: Stress test for ThreadLocal In-Reply-To: <4F22AE99.3010403@zafena.se> References: <4F22A556.7050100@redhat.com> <4F22A633.6090500@redhat.com> <4F22AE99.3010403@zafena.se> Message-ID: <4F244040.50200@redhat.com> On 01/27/2012 02:03 PM, Xerxes R?nby wrote: > Indeed interesting, seen after about 10min of testing on my pandaboard: Duh, sorry. Andrew. -------------- next part -------------- A non-text attachment was scrubbed... Name: ThreadLocalTest.java Type: text/x-java Size: 1937 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120128/a28cfa5e/ThreadLocalTest.java From bugzilla-daemon at icedtea.classpath.org Sun Jan 29 22:03:12 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 Jan 2012 06:03:12 +0000 Subject: [Bug 863] New: Error passing strings to applet methods in Chromium Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=863 Bug #: 863 Summary: Error passing strings to applet methods in Chromium Classification: Unclassified Product: IcedTea-Web Version: 1.1.3 Platform: x86_64 OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: Plugin AssignedTo: dbhole at redhat.com ReportedBy: edmccard at hotmail.com CC: unassigned at icedtea.classpath.org Short strings passed to applet methods have trailing garbage. Using the following applet and html code: \\ BadString.java public class BadString extends java.applet.Applet { public void badString(String param) { System.out.println("length: " + param.length()); System.out.println("value: " + param); } } ...the reported length of the strings varies from 4 to 6 (it is always at least one greater than the actual length) and the "extra" characters are garbage. Strings of length 6 or greater don't seem to have the problem. Tested in Arch Linux 64-bit, icedtea-web-1.1.4, Chromium 16.0.912.77. It works as expected with Chromium/Oracle JRE, and with Firefox/IcedTea. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Mon Jan 30 05:49:28 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 Jan 2012 13:49:28 +0000 Subject: [Bug 822] Applets fail to load if jars have different signers In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=822 --- Comment #14 from pcfe 2012-01-30 13:49:28 UTC --- Deepak, (In reply to comment #13) > Thanks for trying it! Can you please post the full trace? The plugin.log and > java.std* files as listed here are needed: > > http://icedtea.classpath.org/wiki/IcedTea-Web#Filing_bugs Yes I can do that. Now, as I have 2 machines A) used for initial description and to test in comments 1 and 7 additionally, the patch from comment 9 used in the packages linked in comment 11, but the workaround from comment 5 removed again => works just fine. B) this box was used in Comment 11 and 12 So, as far as machine A is concerned, this bug is fixed with your patch. Shall I continue (with an answer to your question in comment 12) about the problems on machine B in this bug or open a separate one? (I'd lean towards the latter) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From omajid at redhat.com Mon Jan 30 06:40:45 2012 From: omajid at redhat.com (Omair Majid) Date: Mon, 30 Jan 2012 09:40:45 -0500 Subject: Icedtea6 1.11 release later today In-Reply-To: <4F21A462.2010903@redhat.com> References: <4F0771B8.4080106@redhat.com> <4F16F1EE.4000506@redhat.com> <4F1D92A4.9090708@redhat.com> <4F202C8B.9020407@redhat.com> <4F21A462.2010903@redhat.com> Message-ID: <4F26ABED.3030401@redhat.com> Hi, I plan to release IcedTea6 1.11 later today (possibly tomorrow if I run into snags). Cheers, Omair From jvanek at redhat.com Mon Jan 30 06:45:45 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 30 Jan 2012 15:45:45 +0100 Subject: Icedtea6 1.11 release later today In-Reply-To: <4F26ABED.3030401@redhat.com> References: <4F0771B8.4080106@redhat.com> <4F16F1EE.4000506@redhat.com> <4F1D92A4.9090708@redhat.com> <4F202C8B.9020407@redhat.com> <4F21A462.2010903@redhat.com> <4F26ABED.3030401@redhat.com> Message-ID: <4F26AD19.2060407@redhat.com> On 01/30/2012 03:40 PM, Omair Majid wrote: > Hi, > > I plan to release IcedTea6 1.11 later today (possibly tomorrow if I run into snags). > > Cheers, > Omair Will there be any changes against pre-release? I'm building 1.11pre under f17, and there were some problems (I will post report lately). btw, !TYVM! for posting pre-tarball. It gave me time to fix rpms. Regards, J. From omajid at redhat.com Mon Jan 30 06:52:01 2012 From: omajid at redhat.com (Omair Majid) Date: Mon, 30 Jan 2012 09:52:01 -0500 Subject: Icedtea6 1.11 release later today In-Reply-To: <4F26AD19.2060407@redhat.com> References: <4F0771B8.4080106@redhat.com> <4F16F1EE.4000506@redhat.com> <4F1D92A4.9090708@redhat.com> <4F202C8B.9020407@redhat.com> <4F21A462.2010903@redhat.com> <4F26ABED.3030401@redhat.com> <4F26AD19.2060407@redhat.com> Message-ID: <4F26AE91.8020108@redhat.com> On 01/30/2012 09:45 AM, Jiri Vanek wrote: > On 01/30/2012 03:40 PM, Omair Majid wrote: >> Hi, >> >> I plan to release IcedTea6 1.11 later today (possibly tomorrow if I >> run into snags). >> > > Will there be any changes against pre-release? As far as I can see, no. More below. > I'm building 1.11pre under f17, and there were some problems (I will > post report lately). Please do tell us more. Not sure if this may or may not be worth delaying the release, but it would be good to at least be aware of them. Thanks, Omair From dbhole at redhat.com Mon Jan 30 07:47:28 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 30 Jan 2012 10:47:28 -0500 Subject: Icedtea6 1.11 release later today In-Reply-To: <4F26ABED.3030401@redhat.com> References: <4F0771B8.4080106@redhat.com> <4F16F1EE.4000506@redhat.com> <4F1D92A4.9090708@redhat.com> <4F202C8B.9020407@redhat.com> <4F21A462.2010903@redhat.com> <4F26ABED.3030401@redhat.com> Message-ID: <20120130154727.GJ3179@redhat.com> * Omair Majid [2012-01-30 09:42]: > Hi, > > I plan to release IcedTea6 1.11 later today (possibly tomorrow if I > run into snags). > There are build failures with GCC 4.7. I'd like to backport the following to changesets before release: http://cr.openjdk.java.net/~dbhole/GCC-4.7-HS23.00/ http://cr.openjdk.java.net/~dbhole/GCC-4.7-JDK8.00/ Okay for push to HEAD and 1.11? Cheers, Deepak From aph at redhat.com Mon Jan 30 07:55:52 2012 From: aph at redhat.com (Andrew Haley) Date: Mon, 30 Jan 2012 15:55:52 +0000 Subject: Icedtea6 1.11 release later today In-Reply-To: <20120130154727.GJ3179@redhat.com> References: <4F0771B8.4080106@redhat.com> <4F16F1EE.4000506@redhat.com> <4F1D92A4.9090708@redhat.com> <4F202C8B.9020407@redhat.com> <4F21A462.2010903@redhat.com> <4F26ABED.3030401@redhat.com> <20120130154727.GJ3179@redhat.com> Message-ID: <4F26BD88.9030205@redhat.com> On 01/30/2012 03:47 PM, Deepak Bhole wrote: > There are build failures with GCC 4.7. I'd like to backport the > following to changesets before release: > http://cr.openjdk.java.net/~dbhole/GCC-4.7-HS23.00/ > http://cr.openjdk.java.net/~dbhole/GCC-4.7-JDK8.00/ > > Okay for push to HEAD and 1.11? OK. Andrew. From omajid at redhat.com Mon Jan 30 07:58:37 2012 From: omajid at redhat.com (Omair Majid) Date: Mon, 30 Jan 2012 10:58:37 -0500 Subject: Icedtea6 1.11 release later today In-Reply-To: <20120130154727.GJ3179@redhat.com> References: <4F0771B8.4080106@redhat.com> <4F16F1EE.4000506@redhat.com> <4F1D92A4.9090708@redhat.com> <4F202C8B.9020407@redhat.com> <4F21A462.2010903@redhat.com> <4F26ABED.3030401@redhat.com> <20120130154727.GJ3179@redhat.com> Message-ID: <4F26BE2D.4020104@redhat.com> On 01/30/2012 10:47 AM, Deepak Bhole wrote: > * Omair Majid [2012-01-30 09:42]: >> Hi, >> >> I plan to release IcedTea6 1.11 later today (possibly tomorrow if I >> run into snags). >> > > There are build failures with GCC 4.7. I'd like to backport the > following to changesets before release: > http://cr.openjdk.java.net/~dbhole/GCC-4.7-HS23.00/ Since this has been accepted upstream, please add this as patches/openjdk/-.patch, even if it does not have an upstream changeset just yet. > http://cr.openjdk.java.net/~dbhole/GCC-4.7-JDK8.00/ > Looks good to me. Okay for 1.11 and HEAD. Cheers, Omair From bugzilla-daemon at icedtea.classpath.org Mon Jan 30 08:36:11 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 Jan 2012 16:36:11 +0000 Subject: [Bug 855] AppletStub getDocumentBase() doesn't return full URL In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=855 Danesh Dadachanji changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ddadacha at redhat.com AssignedTo|jvanek at redhat.com |ddadacha at redhat.com --- Comment #3 from Danesh Dadachanji 2012-01-30 16:36:11 UTC --- Thanks for reporting this. It looks like this happens when setting up AppletViewerPanel from within NetxPanel. Reassigning this to myself. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From dbhole at redhat.com Mon Jan 30 09:19:54 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 30 Jan 2012 12:19:54 -0500 Subject: [RFC][icedtea-web] PR833 - icedtea-web is failing when cache is corupted. In-Reply-To: <4F1EB4EB.4060307@redhat.com> References: <4EE77F01.8060803@redhat.com> <20111219154104.GB31743@redhat.com> <4EF0B4DA.5060902@redhat.com> <20120110033146.GT2930@redhat.com> <4F1EB4EB.4060307@redhat.com> Message-ID: <20120130171952.GE16474@redhat.com> Hi Jiri, Please see comments below. It is minor stuff: > diff -r 41f03d932cdf ChangeLog > --- a/ChangeLog Mon Jan 09 18:45:31 2012 -0500 > +++ b/ChangeLog Tue Jan 24 14:22:58 2012 +0100 > @@ -1,3 +1,31 @@ > +2012-01-24 Jiri Vanek > + > + Fix for PR844 > + * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: (getLRUSortedEntries) > + instead of error throwing own LRU exception. Also catches more then > + NumberFormatException [ ... ] The wrapping for ChangeLog is still wrong. I applied the patch and it shows a mix of spaces and tabs at the start of the lines. Please use an editor to highlight spaces and tabs and you will see them. Also, some lines go beyond 80, they should be wrapped. [ ... ] > diff -r 41f03d932cdf netx/net/sourceforge/jnlp/cache/LruCacheException.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/netx/net/sourceforge/jnlp/cache/LruCacheException.java Tue Jan 24 14:22:58 2012 +0100 > @@ -0,0 +1,52 @@ > +/* LruCacheException.java -- Thrown when cache is corrupted. > +Copyright (C) 2010 Red Hat, Inc. 2012 :) [ ...] The strings still have some grammatical and spelling errors. Also, strings don't mention the word "cache" in many cases, so it is hard to tell what it is referring to ... e.g. "Cleared, reloading.". I have recommended corrections: > +CFakeCache=Cache is corrupted, will be faked now. "Cache is corrupt. Disabling it." > +CFakedCache=Faked, continuing. It is strongly remanded to run javaws -Xclearcache and rerun your application as soon as possible. "Cache is corrupt and has been disabled. It is strongly recommended that you run 'javaws -Xclearcache' and rerun your application as soon as possible" > +CStillCorupted=Cache is still corrupted, will be cleared now. "Cache is still corrupt. Clearing it." > +CCleaningUnsuccessful="Clearing was not successful, probably due to another javaws instance running.. Try to shut down all instances of javaws, run javaws -Xclearcache and rerun your jnlp file. "Unable to clear cache due to running javaws instance. Please try to shut down all instances of javaws, run 'javaws -Xclearcache', and rerun your jnlp file" > +CClearedReloading=Cleared, reloading. "Cache cleared. Re-loading." > +CReloadRestarting=Reload, restarting, it is strongly commanded to run javaws -Xclearcache and rerun your application as soon as possible. "Cache re-loaded and application re-starting. It is strongly recommended that you run 'javaws -Xclearcache' and re-run your application as soon as possible." > +CStillBroken=LRU cache was corrupted. Was cleared, but still is corrupted. Try to shut down all instances of javaws, run javaws -Xclearcache and rerun your jnlp file. > "Unable to fix corrupt cache. Please shutdown all javaws instances, run 'javaws -Xclearcache', and re-start your application. " > # Security > SFileReadAccess=The application has requested read access to {0}. Do you want to allow this action? > diff -r 41f03d932cdf netx/net/sourceforge/jnlp/util/PropertiesFile.java > --- a/netx/net/sourceforge/jnlp/util/PropertiesFile.java Mon Jan 09 18:45:31 2012 -0500 > +++ b/netx/net/sourceforge/jnlp/util/PropertiesFile.java Tue Jan 24 14:22:58 2012 +0100 > @@ -134,6 +134,7 @@ > OutputStream s = null; > try { > try { > + file.getParentFile().mkdirs(); > s = new FileOutputStream(file); > store(s, header); > } finally { > diff -r 41f03d932cdf tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer1.jnlp > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer1.jnlp Tue Jan 24 14:22:58 2012 +0100 > @@ -0,0 +1,16 @@ > + > + + codebase="./" > + href="CacheReproducer1.jnlp"> > + > + just prints out Good simple javaws exapmle using reflection call from CacheReproducer.jar SimpletestSigned1.jar J should be capitalized, the 'g' in good should not be capital, and example is spelt incorrectly. Same for other title fields below. [ ...] > diff -r 41f03d932cdf tests/jnlp_tests/signed/CacheReproducer/srcs/CacheReproducer.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/jnlp_tests/signed/CacheReproducer/srcs/CacheReproducer.java Tue Jan 24 14:22:58 2012 +0100 > @@ -0,0 +1,47 @@ > +/* CacheReproducer.java > +Copyright (C) 2011 Red Hat, Inc. > + I know it was written in 2011.. but should be 2012 now :) Same with files below. [ ... ] > + > + private void assertCacheIsNotEmpty() { > + Assert.assertTrue("icedtea cache " + icedteaCache.getAbsolutePath() + " should exists some any run", icedteaCache.exists()); > + Assert.assertTrue("icedtea cache file " + icedteaCacheFile.getAbsolutePath() + " should exists some any run", icedteaCacheFile.exists()); "exists" => "exist" for both lines above. [ ... ] > + > + private void assertLruExceptionNOTappeared(ProcessResult pr2) { > + Assert.assertFalse("serr should NOT contains " + lre, pr2.stderr.contains(lre)); > + } > + > + private void assertLruExceptionAppeared(ProcessResult pr) { > + Assert.assertTrue("serr should contains " + lre, pr.stderr.contains(lre)); > + } > + "contains" => "contain" in both lines above. > + Assert.assertTrue("Stderr should contains " + q + ", but did not.", pr.stderr.contains(q)); "contains" => "contain" [ ... ] > + } > + tryToClearcache(); > + Assert.assertFalse("icedtea cache " + icedteaCache.getAbsolutePath() + " should not exists after clearing", icedteaCache.exists()); "exists" => "exist" [ ... ] > + String s = "Good simple javaws exapmle"; > + Assert.assertTrue("test stdout should contains " + s + " bud didn't", pr2.stdout.contains(s)); "bud" => "but" [ ... ] > + > + public static void main(String[] args){ > + System.out.println("Good simple javaws exapmle"); "example" is spelt wrong. Please re-post with above fixes and I will approve. Thanks! Deepak From brianvfernandes at gmail.com Mon Jan 30 11:45:10 2012 From: brianvfernandes at gmail.com (Brian Fernandes) Date: Tue, 31 Jan 2012 01:15:10 +0530 Subject: Cannot set the right permissions for Firefox extension Message-ID: I have a Firefox extension, FireBible, which uses LiveConnect to access a Java library, JSword. I use JSword to access biblical material (both text and images) stored in the SWORD module form. My extension can be found here: http://thegoan.com/firebible JSword is here: www.crosswire.org/*jsword*/ My extension works fine with both Java 6 and Java 7 on Windows and Linux (testing with Ubuntu 11.10), but only if I use the Oracle JVM. I'm having issues using OpenJDK and the IcedTea web browser plugin, I hope someone is able to help. I'm currently testing using Firefox 9, though this extension works with Firefox 3 and above. I'm not sure exactly what IcedTea version I'm using (it was installed this week) but an apt-cache "show" says Source: icedtea-web (1.1.3-1ubuntu1) Version: 6b21.1.3-1ubuntu1 My extension works by creating a URLClassloader with a few directories containing .class files and a few JAR files which make up the JSword distribution. From that loader, it loads and sets a policy which grants *all permissions* to the classes loaded by my loader *only*, that is pretty much the only way in which I can get my extension to work. AFAIK, this technique was pioneered by the SIMILE extension, discussed here: https://developer.mozilla.org/en/Java_in_Firefox_Extensions With IcedTea, the first problem I encountered was a) LiveConnectPermissionNeeded access denied (java.lang.RuntimePermission createClassLoader) when trying to create the URLClassLoader instance. I got around this by adding the createClassLoader permission to the file like so. permission java.lang.RuntimePermission "createClassLoader"; b) It now moved further, but failed because it could not load any of my loose .class files I fixed this by simply putting these files in a JAR instead (signing the JAR was not required) c) Even though I set the getPolicy, setPolicy and setSecurityManager/createSecurityManager runtime permissions, I was *not* being allowed to set the policy - it would fail with the following message. Changing the SecurityManager is not allowed. In fact, even using java.security.AllPermission (which I tried as a debugging technique) would not fix it, I still am prevented from setting the policy. As a result, the Java in Firefox technique described above falls flat as my code does not run with required permissions. So I have to skip the part where I set the policy entirely. I tried adding a few more permissions but that just kept pushing the point of failure further, bit by bit, until I hit a wall where some key class would not get initialized. The exception with IcedTea is a single message instead of a stack trace, simply stating the name of the class that could not be initialized - unlike the Oracle plugin which I believe provides the entire trace; I haven't yet tried to debug this, but it is just another permission issue for sure. d) Now, if I simply use AllPermission and do *not* set the policy, the extension works completely. Obviously, I don't need to set any of the other permissions now. My problem is that I am setting the permission globally, in a simple grant {} block, without any codeBase setting; obviously dangerous for the system. Options: 1) Find a way in which I can set the security manager. This will give my code the right permissions; however, it is still not clean as the user must still set some initial permissions like createClassLoader in the policy file. Is there a reason why this is prevented even when the permissions are set? Note: With the Oracle plugin, changing the policy file is not required at all. 2) Grant AllPermissions to my code, but use codeBase to restrict it only to my extension only. Here too, the user needs to modify the policy file but needs to set only a single permission. I prefer this solution, but I'm afraid I cannot find the right codeBase string. The URLClassLoader is first created by *JavaScript* code running in my extension; and this in turn will load the JARs. However, the code simply breaks at this point because the createClassLoader permission is not being set - because I do not seem to be using the right codeBase. Setting the codeBase to the extension location does not seem to do it; probably because codeBase is used to grant permissions to JAR files or .class files, but not JavaScript files. I tried several other locations like the JRE lib folder for instance, but nothing worked. Can someone suggest the right codeBase string to be used here? 3) A technique is mentioned here: https://bugzilla.redhat.com/show_bug.cgi?id=484387#c18 "We load this class manually out of our JAR file from JavaScript, using the protected defineClass method of a URLClassLoader object (so that we can load it as privileged)." The links in this comment are unfortunately broken and I have been unable to find the files anywhere online (even in the current version of their OO integration extension). Also, the defineClass method is private and with all the security already in place, I doubt I'd be able to change access. 4) A variation of the above where I set the createClassLoader permission (again, because I don't know the right codeBase, I'll have to do this globally - undesirable). Then load a special classloader which overrides getPermissions(CodeSource) to grant all permissions to my JARs, which I will load using this loader. There are a significant number of users of this extension (~ 20K) but users on Linux are having a hard time because of the JVM / browser plugin - the problem is further exacerbated by the fact that the Oracle JVMs can no longer be easily installed in Linux. If this is the wrong forum for support of this kind, please let me know where I should direct this message. Any assistance will be greatly appreciated. Best, Brian. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120131/88d8ddf0/attachment.html From ahughes at redhat.com Mon Jan 30 14:32:44 2012 From: ahughes at redhat.com (Andrew Hughes) Date: Mon, 30 Jan 2012 17:32:44 -0500 (EST) Subject: Icedtea6 1.11 release later today In-Reply-To: <20120130154727.GJ3179@redhat.com> Message-ID: ----- Original Message ----- > * Omair Majid [2012-01-30 09:42]: > > Hi, > > > > I plan to release IcedTea6 1.11 later today (possibly tomorrow if I > > run into snags). > > > > There are build failures with GCC 4.7. I'd like to backport the > following to changesets before release: > http://cr.openjdk.java.net/~dbhole/GCC-4.7-HS23.00/ > http://cr.openjdk.java.net/~dbhole/GCC-4.7-JDK8.00/ > > Okay for push to HEAD and 1.11? > Also approved here. I was going to mention these too. Please add under patches/openjdk as Omair suggests. Are you going to get them into 7 too? I'll approve them for HEAD & 2.0. > Cheers, > Deepak > -- 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 dbhole at icedtea.classpath.org Mon Jan 30 15:30:50 2012 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Mon, 30 Jan 2012 23:30:50 +0000 Subject: /hg/icedtea6: Fixed build with GCC 4.7 Message-ID: changeset ddca483b3ed9 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ddca483b3ed9 author: Deepak Bhole date: Mon Jan 30 18:26:56 2012 -0500 Fixed build with GCC 4.7 diffstat: ChangeLog | 9 + Makefile.am | 4 +- NEWS | 1 + patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch | 11 + patches/openjdk/remove-mimpure-option-to-gcc.patch | 150 ++++++++++ 5 files changed, 174 insertions(+), 1 deletions(-) diffs (223 lines): diff -r 80c34531aba3 -r ddca483b3ed9 ChangeLog --- a/ChangeLog Thu Jan 26 07:27:15 2012 -0500 +++ b/ChangeLog Mon Jan 30 18:26:56 2012 -0500 @@ -1,3 +1,12 @@ +2012-01-30 Deepak Bhole + + Added patches to fix building with GCC 4.7 + * patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch: + New patch. Makes methods return NULL instead of boolean when they return a + pointer. + * patches/openjdk/remove-mimpure-option-to-gcc.patch: New patch. Removes + the invalid -mimpure-text option to GCC. + 2012-01-25 Andrew Haley * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Branch): diff -r 80c34531aba3 -r ddca483b3ed9 Makefile.am --- a/Makefile.am Thu Jan 26 07:27:15 2012 -0500 +++ b/Makefile.am Mon Jan 30 18:26:56 2012 -0500 @@ -407,7 +407,9 @@ patches/openjdk/7103725-ssl_beast_regression.patch \ patches/openjdk/6706974-krb5_test_infrastructure.patch \ patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \ - patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch + patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \ + patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \ + patches/openjdk/remove-mimpure-option-to-gcc.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r 80c34531aba3 -r ddca483b3ed9 NEWS --- a/NEWS Thu Jan 26 07:27:15 2012 -0500 +++ b/NEWS Mon Jan 30 18:26:56 2012 -0500 @@ -23,6 +23,7 @@ * ARM assembly language port reinstated and updated; details below. * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools" * Drop the outdated NIO2 backport. Users who want NIO2 should use IcedTea 2.x. +* Fixed build with GCC 4.7 * Bug fixes - PR637: make check should exit with an error code if any regression test failed. - PR752: ImageFormatException extends Exception not RuntimeException diff -r 80c34531aba3 -r ddca483b3ed9 patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch Mon Jan 30 18:26:56 2012 -0500 @@ -0,0 +1,12 @@ +diff -ur openjdk.orig/hotspot/src/share/vm/opto/loopnode.cpp openjdk/hotspot/src/share/vm/opto/loopnode.cpp +--- openjdk.orig/hotspot/src/share/vm/opto/loopnode.cpp 2011-11-14 17:07:36.000000000 -0500 ++++ openjdk/hotspot/src/share/vm/opto/loopnode.cpp 2012-01-30 11:25:10.648080484 -0500 +@@ -546,7 +546,7 @@ + Node* CountedLoopNode::match_incr_with_optional_truncation( + Node* expr, Node** trunc1, Node** trunc2, const TypeInt** trunc_type) { + // Quick cutouts: +- if (expr == NULL || expr->req() != 3) return false; ++ if (expr == NULL || expr->req() != 3) return NULL; + + Node *t1 = NULL; + Node *t2 = NULL; diff -r 80c34531aba3 -r ddca483b3ed9 patches/openjdk/remove-mimpure-option-to-gcc.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/remove-mimpure-option-to-gcc.patch Mon Jan 30 18:26:56 2012 -0500 @@ -0,0 +1,162 @@ +diff -ur openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk +--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2011-11-14 17:11:39.000000000 -0500 ++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2012-01-30 11:27:47.181487274 -0500 +@@ -94,7 +94,7 @@ + endif + endif + # Option used to create a shared library +- SHARED_LIBRARY_FLAG = -shared -mimpure-text ++ SHARED_LIBRARY_FLAG = -shared + SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 ) + + endif +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2012-01-30 11:27:47.186487189 -0500 +@@ -90,7 +90,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt 2012-01-30 11:27:47.187487172 -0500 +@@ -90,7 +90,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt 2012-01-30 11:27:47.186487189 -0500 +@@ -94,7 +94,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt 2012-01-30 11:27:47.184487223 -0500 +@@ -90,7 +90,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt 2012-01-30 11:27:47.189487139 -0500 +@@ -130,7 +130,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES= -lnsl -ldl -lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/index.html openjdk/jdk/src/share/demo/jvmti/index.html +--- openjdk.orig/jdk/src/share/demo/jvmti/index.html 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/index.html 2012-01-30 11:27:47.183487240 -0500 +@@ -308,7 +308,7 @@ +
    + gcc -O2 -fPIC -pthread -DLINUX -c *.c +
    +-gcc -z defs -static-libgcc -shared -mimpure-text -o libXXX.so *.o -lc ++gcc -z defs -static-libgcc -shared -o libXXX.so *.o -lc +
+
+ For AMD64: +@@ -316,7 +316,7 @@ +
    + gcc -O2 -fPIC -pthread -DLINUX -D_LP64=1 -c *.c +
    +-gcc -z defs -static-libgcc -shared -mimpure-text -o libXXX.so *.o -lc ++gcc -z defs -static-libgcc -shared -o libXXX.so *.o -lc +
+
+ +@@ -339,7 +339,7 @@ + + +
  • +-Library: Use -static-libgcc -mimpure-text. ++Library: Use -static-libgcc. +
    + When building the shared library (-shared option), this option + allows for maximum portability of the library between different +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt 2012-01-30 11:27:47.187487172 -0500 +@@ -90,7 +90,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/minst/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/minst/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/minst/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/minst/sample.makefile.txt 2012-01-30 11:27:47.187487172 -0500 +@@ -94,7 +94,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt 2012-01-30 11:27:47.188487155 -0500 +@@ -94,7 +94,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt 2012-01-30 11:27:47.185487206 -0500 +@@ -90,7 +90,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt 2012-01-30 11:27:47.188487155 -0500 +@@ -91,7 +91,7 @@ + OBJECTS=$(SOURCES:%.cpp=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES= + # Building a shared library From dbhole at redhat.com Mon Jan 30 15:31:51 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 30 Jan 2012 18:31:51 -0500 Subject: Icedtea6 1.11 release later today In-Reply-To: References: <20120130154727.GJ3179@redhat.com> Message-ID: <20120130233151.GK16474@redhat.com> * Andrew Hughes [2012-01-30 17:32]: > > > ----- Original Message ----- > > * Omair Majid [2012-01-30 09:42]: > > > Hi, > > > > > > I plan to release IcedTea6 1.11 later today (possibly tomorrow if I > > > run into snags). > > > > > > > There are build failures with GCC 4.7. I'd like to backport the > > following to changesets before release: > > http://cr.openjdk.java.net/~dbhole/GCC-4.7-HS23.00/ > > http://cr.openjdk.java.net/~dbhole/GCC-4.7-JDK8.00/ > > > > Okay for push to HEAD and 1.11? > > > > Also approved here. I was going to mention these too. > > Please add under patches/openjdk as Omair suggests. > > Are you going to get them into 7 too? I'll approve them for HEAD & 2.0. > Hi Andrew, Yes. Waiting for them to go upstream first.. for 6 I decided to post rfc because 1.11 is on the horizon. Cheers, Deepak > > Cheers, > > Deepak > > > > -- > 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 dbhole at icedtea.classpath.org Mon Jan 30 15:32:08 2012 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Mon, 30 Jan 2012 23:32:08 +0000 Subject: /hg/release/icedtea6-1.11: Fixed build with GCC 4.7 Message-ID: changeset 01cc2ea64fbd in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=01cc2ea64fbd author: Deepak Bhole date: Mon Jan 30 18:26:19 2012 -0500 Fixed build with GCC 4.7 diffstat: ChangeLog | 9 + Makefile.am | 5 +- NEWS | 1 + patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch | 11 + patches/openjdk/remove-mimpure-option-to-gcc.patch | 150 ++++++++++ 5 files changed, 175 insertions(+), 1 deletions(-) diffs (224 lines): diff -r 308265f39f56 -r 01cc2ea64fbd ChangeLog --- a/ChangeLog Fri Jan 27 11:09:28 2012 -0500 +++ b/ChangeLog Mon Jan 30 18:26:19 2012 -0500 @@ -1,3 +1,12 @@ +2012-01-30 Deepak Bhole + + Added patches to fix building with GCC 4.7 + * patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch: + New patch. Makes methods return NULL instead of boolean when they return a + pointer. + * patches/openjdk/remove-mimpure-option-to-gcc.patch: New patch. Removes + the invalid -mimpure-text option to GCC. + 2012-01-25 Andrew Haley * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Branch): diff -r 308265f39f56 -r 01cc2ea64fbd Makefile.am --- a/Makefile.am Fri Jan 27 11:09:28 2012 -0500 +++ b/Makefile.am Mon Jan 30 18:26:19 2012 -0500 @@ -404,7 +404,10 @@ patches/openjdk/7102369-7094468-rmiregistry.patch \ patches/openjdk/6851973-kerberos.patch \ patches/openjdk/7091528-javadoc_class_files.patch \ - patches/openjdk/7103725-ssl_beast_regression.patch + patches/openjdk/7103725-ssl_beast_regression.patch \ + patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \ + patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \ + patches/openjdk/remove-mimpure-option-to-gcc.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r 308265f39f56 -r 01cc2ea64fbd NEWS --- a/NEWS Fri Jan 27 11:09:28 2012 -0500 +++ b/NEWS Mon Jan 30 18:26:19 2012 -0500 @@ -17,6 +17,7 @@ * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools" * Drop the outdated NIO2 backport. Users who want NIO2 should use IcedTea 2.x. * Shark has been disabled +* Fixed build with GCC 4.7 * Bug fixes - PR637: make check should exit with an error code if any regression test failed. - PR752: ImageFormatException extends Exception not RuntimeException diff -r 308265f39f56 -r 01cc2ea64fbd patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch Mon Jan 30 18:26:19 2012 -0500 @@ -0,0 +1,12 @@ +diff -ur openjdk.orig/hotspot/src/share/vm/opto/loopnode.cpp openjdk/hotspot/src/share/vm/opto/loopnode.cpp +--- openjdk.orig/hotspot/src/share/vm/opto/loopnode.cpp 2011-11-14 17:07:36.000000000 -0500 ++++ openjdk/hotspot/src/share/vm/opto/loopnode.cpp 2012-01-30 11:25:10.648080484 -0500 +@@ -546,7 +546,7 @@ + Node* CountedLoopNode::match_incr_with_optional_truncation( + Node* expr, Node** trunc1, Node** trunc2, const TypeInt** trunc_type) { + // Quick cutouts: +- if (expr == NULL || expr->req() != 3) return false; ++ if (expr == NULL || expr->req() != 3) return NULL; + + Node *t1 = NULL; + Node *t2 = NULL; diff -r 308265f39f56 -r 01cc2ea64fbd patches/openjdk/remove-mimpure-option-to-gcc.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/remove-mimpure-option-to-gcc.patch Mon Jan 30 18:26:19 2012 -0500 @@ -0,0 +1,162 @@ +diff -ur openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk +--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2011-11-14 17:11:39.000000000 -0500 ++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2012-01-30 11:27:47.181487274 -0500 +@@ -94,7 +94,7 @@ + endif + endif + # Option used to create a shared library +- SHARED_LIBRARY_FLAG = -shared -mimpure-text ++ SHARED_LIBRARY_FLAG = -shared + SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 ) + + endif +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2012-01-30 11:27:47.186487189 -0500 +@@ -90,7 +90,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt 2012-01-30 11:27:47.187487172 -0500 +@@ -90,7 +90,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt 2012-01-30 11:27:47.186487189 -0500 +@@ -94,7 +94,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt 2012-01-30 11:27:47.184487223 -0500 +@@ -90,7 +90,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt 2012-01-30 11:27:47.189487139 -0500 +@@ -130,7 +130,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES= -lnsl -ldl -lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/index.html openjdk/jdk/src/share/demo/jvmti/index.html +--- openjdk.orig/jdk/src/share/demo/jvmti/index.html 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/index.html 2012-01-30 11:27:47.183487240 -0500 +@@ -308,7 +308,7 @@ +
      + gcc -O2 -fPIC -pthread -DLINUX -c *.c +
      +-gcc -z defs -static-libgcc -shared -mimpure-text -o libXXX.so *.o -lc ++gcc -z defs -static-libgcc -shared -o libXXX.so *.o -lc +
    +
    + For AMD64: +@@ -316,7 +316,7 @@ +
      + gcc -O2 -fPIC -pthread -DLINUX -D_LP64=1 -c *.c +
      +-gcc -z defs -static-libgcc -shared -mimpure-text -o libXXX.so *.o -lc ++gcc -z defs -static-libgcc -shared -o libXXX.so *.o -lc +
    +
    +
    • +@@ -339,7 +339,7 @@ + + +
  • +-Library: Use -static-libgcc -mimpure-text. ++Library: Use -static-libgcc. +
    + When building the shared library (-shared option), this option + allows for maximum portability of the library between different +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt 2012-01-30 11:27:47.187487172 -0500 +@@ -90,7 +90,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/minst/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/minst/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/minst/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/minst/sample.makefile.txt 2012-01-30 11:27:47.187487172 -0500 +@@ -94,7 +94,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt 2012-01-30 11:27:47.188487155 -0500 +@@ -94,7 +94,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt 2012-01-30 11:27:47.185487206 -0500 +@@ -90,7 +90,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt 2012-01-30 11:27:47.188487155 -0500 +@@ -91,7 +91,7 @@ + OBJECTS=$(SOURCES:%.cpp=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES= + # Building a shared library From dbhole at redhat.com Mon Jan 30 15:32:26 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 30 Jan 2012 18:32:26 -0500 Subject: Icedtea6 1.11 release later today In-Reply-To: <4F26BE2D.4020104@redhat.com> References: <4F0771B8.4080106@redhat.com> <4F16F1EE.4000506@redhat.com> <4F1D92A4.9090708@redhat.com> <4F202C8B.9020407@redhat.com> <4F21A462.2010903@redhat.com> <4F26ABED.3030401@redhat.com> <20120130154727.GJ3179@redhat.com> <4F26BE2D.4020104@redhat.com> Message-ID: <20120130233226.GL16474@redhat.com> * Omair Majid [2012-01-30 10:58]: > On 01/30/2012 10:47 AM, Deepak Bhole wrote: > >* Omair Majid [2012-01-30 09:42]: > >>Hi, > >> > >>I plan to release IcedTea6 1.11 later today (possibly tomorrow if I > >>run into snags). > >> > > > >There are build failures with GCC 4.7. I'd like to backport the > >following to changesets before release: > >http://cr.openjdk.java.net/~dbhole/GCC-4.7-HS23.00/ > > Since this has been accepted upstream, please add this as > patches/openjdk/-.patch, even if it does not > have an upstream changeset just yet. > > >http://cr.openjdk.java.net/~dbhole/GCC-4.7-JDK8.00/ > > > > Looks good to me. > > Okay for 1.11 and HEAD. > Thanks Andrew and Omair. Pushed. Cheers, Deepak > Cheers, > Omair From omajid at redhat.com Mon Jan 30 17:27:04 2012 From: omajid at redhat.com (Omair Majid) Date: Mon, 30 Jan 2012 20:27:04 -0500 Subject: BRANCH FREEZE: IcedTea6 1.11 Message-ID: <4F274368.50400@redhat.com> Hi, Please consider the IcedTea6 1.11 branch frozen as I prepare the release. Cheers, Omair From omajid at redhat.com Mon Jan 30 19:02:51 2012 From: omajid at redhat.com (Omair Majid) Date: Mon, 30 Jan 2012 22:02:51 -0500 Subject: /hg/release/icedtea6-1.11: Fixed build with GCC 4.7 In-Reply-To: References: Message-ID: <4F2759DB.8040706@redhat.com> On 01/30/2012 06:32 PM, dbhole at icedtea.classpath.org wrote: > diff -r 308265f39f56 -r 01cc2ea64fbd Makefile.am > --- a/Makefile.am Fri Jan 27 11:09:28 2012 -0500 > +++ b/Makefile.am Mon Jan 30 18:26:19 2012 -0500 > @@ -404,7 +404,10 @@ > patches/openjdk/7102369-7094468-rmiregistry.patch \ > patches/openjdk/6851973-kerberos.patch \ > patches/openjdk/7091528-javadoc_class_files.patch \ > - patches/openjdk/7103725-ssl_beast_regression.patch > + patches/openjdk/7103725-ssl_beast_regression.patch \ > + patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \ > + patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \ > + patches/openjdk/remove-mimpure-option-to-gcc.patch The patch: patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch is not present in 1.11 (the patch is present in HEAD) and was not added in this changeset. It also breaks the build :( I will remove it before I release. Cheers, Omair From dbhole at redhat.com Mon Jan 30 19:08:51 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 30 Jan 2012 22:08:51 -0500 Subject: /hg/release/icedtea6-1.11: Fixed build with GCC 4.7 In-Reply-To: <4F2759DB.8040706@redhat.com> References: <4F2759DB.8040706@redhat.com> Message-ID: <20120131030851.GP16474@redhat.com> * Omair Majid [2012-01-30 22:05]: > On 01/30/2012 06:32 PM, dbhole at icedtea.classpath.org wrote: > >diff -r 308265f39f56 -r 01cc2ea64fbd Makefile.am > >--- a/Makefile.am Fri Jan 27 11:09:28 2012 -0500 > >+++ b/Makefile.am Mon Jan 30 18:26:19 2012 -0500 > >@@ -404,7 +404,10 @@ > > patches/openjdk/7102369-7094468-rmiregistry.patch \ > > patches/openjdk/6851973-kerberos.patch \ > > patches/openjdk/7091528-javadoc_class_files.patch \ > >- patches/openjdk/7103725-ssl_beast_regression.patch > >+ patches/openjdk/7103725-ssl_beast_regression.patch \ > >+ patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \ > >+ patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \ > >+ patches/openjdk/remove-mimpure-option-to-gcc.patch > > The patch: > patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch > is not present in 1.11 (the patch is present in HEAD) and was not > added in this changeset. It also breaks the build :( > > I will remove it before I release. > Gah. Sorry, I only built/tested HEAD and exported/imported to 1.11. I must have accidentally copied an extra line. Sorry about that Omair :( Deepak From omajid at icedtea.classpath.org Mon Jan 30 19:13:10 2012 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Tue, 31 Jan 2012 03:13:10 +0000 Subject: /hg/release/icedtea6-1.11: Do not apply a missing patch Message-ID: changeset a5a1fd171138 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=a5a1fd171138 author: Omair Majid date: Mon Jan 30 22:13:05 2012 -0500 Do not apply a missing patch diffstat: ChangeLog | 7 +++++++ Makefile.am | 1 - 2 files changed, 7 insertions(+), 1 deletions(-) diffs (32 lines): diff -r 01cc2ea64fbd -r a5a1fd171138 ChangeLog --- a/ChangeLog Mon Jan 30 18:26:19 2012 -0500 +++ b/ChangeLog Mon Jan 30 22:13:05 2012 -0500 @@ -1,3 +1,9 @@ +2012-01-30 Omair Majid + + * Makefile.am (ICEDTEA_PATCHES): Remove + 6761072-new_krb5_tests_fail_on_multiple_platforms.patch. It was breaking + the build. + 2012-01-30 Deepak Bhole Added patches to fix building with GCC 4.7 @@ -6,6 +12,7 @@ pointer. * patches/openjdk/remove-mimpure-option-to-gcc.patch: New patch. Removes the invalid -mimpure-text option to GCC. + * Makefile.am (ICEDTEA_PATCHES): Add the above. 2012-01-25 Andrew Haley diff -r 01cc2ea64fbd -r a5a1fd171138 Makefile.am --- a/Makefile.am Mon Jan 30 18:26:19 2012 -0500 +++ b/Makefile.am Mon Jan 30 22:13:05 2012 -0500 @@ -405,7 +405,6 @@ patches/openjdk/6851973-kerberos.patch \ patches/openjdk/7091528-javadoc_class_files.patch \ patches/openjdk/7103725-ssl_beast_regression.patch \ - patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \ patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \ patches/openjdk/remove-mimpure-option-to-gcc.patch From omajid at redhat.com Mon Jan 30 21:16:18 2012 From: omajid at redhat.com (Omair Majid) Date: Tue, 31 Jan 2012 00:16:18 -0500 Subject: IcedTea6 1.11 Released! Message-ID: <4F277922.8010609@redhat.com> We are pleased to announce a new major release of IcedTea6, 1.11! The IcedTea project provides a harness to build the source code from OpenJDK6 using Free Software build tools. It includes an arm assembly port as well as support for alternate virtual machines such as CACAO and JamVM. What's New? * Use HotSpot 20 as the default virtual machine. * ARM assembly language port reinstated and updated; details below. * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools" * Drop the outdated NIO2 backport. Users who want NIO2 should use IcedTea 2.x. * Shark has been disabled * Fixed build with GCC 4.7 * Bug fixes - PR637: make check should exit with an error code if any regression test failed. - PR752: ImageFormatException extends Exception not RuntimeException - PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan - RH727195: Japanese font mappings are broken - LP862286: Fix exception on trying to start PulseAudio playback - PR719: make distcheck should work in IcedTea6 * Import of OpenJDK6 b24 - S7099148: increment build number of hs20.0 to b12 - S7108221: Backport to jdk6 Hotspot defaults for AMD Bulldozer processor - S7080038: (ann) Serializable types in sun.reflect.annotation do not declare serialVersionUIDs - S6815182: GSSAPI/SPNEGO does not work with server using MIT Kerberos library - S6979329: CCacheInputStream fails to read ticket cache files from Kerberos 1.8.1 - S7092186: adjust package access in rmiregistry - S7110373: krb5 test in openjdk6 without test infrastructure * Import of OpenJDK6 b23 including upgrade to HotSpot 20 - S7023111: Add webrev script to make/scripts - S6909331: Add vsvars.sh to the jdk repository (handy cygwin way to get vcvars32.bat run) - S6896934: README: Document how the drop source bundles work for jaxp/jaxws - S6896978: README: Updates to openjdk README-builds.html - S6903517: README: OpenJDK additions needed - cygwin issues - S6903631: README: Build information on Redhat 3.0 builds - S7003845: README-builds document proper location of forest extension, provide alternatives - S7032311: Correct top level 'make test' target and add known failures to problem list - S7033660: Update copyright year to 2011 on any files changed in 2011 - S7046448: Correct webrev.ksh to tidy up html output - S7060927: Add jdkreport.pl to make/scripts, used to generate changes between tags - S7060888: Document OpenJDK6 release procedure - S6885308: The incorrect -XX:StackRedPages, -XX:StackShadowPages, -XX:StackYellowPages could cause VM crash - S6912064: type profiles need to be exploited more for dynamic language support - S6896381: CTW fails share/vm/ci/bcEscapeAnalyzer.cpp:99, assert(_stack_height < _max_stack,"stack overflow") - S6978355: renaming for 6961697 - S6978641: Fix for 6929067 introduces additional overhead in thread creation/termination paths - S6980262: Memory leak when exception is thrown in static initializer - S6910183: CMS: assert(_index < capacity(),"_index out of bounds") - S6941275: G1: The MemoryPools are incorrectly supported for G1 - S6978300: G1: debug builds crash if ParallelGCThreads==0 - S6980392: TEST_BUG: gc/6581734/Test6581734.java has typo - S6980206: G1: assert(has_undefined_max_size, "Undefined max size"); - S6976400: "Meet Not Symmetric" - S6961697: move nmethod constants section before instruction section - S4809552: Optimize Arrays.fill(...) - S6980978: assert(mt == t->xmeet(this)) failed: meet not commutative - S6969586: OptimizeStringConcat: SIGSEGV in LoadNode::Value() - S6979444: add command line option to print command line flags descriptions - S6870851: Bad frame_chop in StackMapTable crashes JVM - S6982851: Add b107 machine classifications to jprt.properties file. - S6983320: Fork HS19 to HS20 - renumber Major and build numbers of JVM - S6561870: 3/3 Long javac compile lines fail due to command line length issues (agent compiles?) - S6765718: Indicate which thread throwing OOME when generating the heap dump at OOME - S6983930: CMS: Various small cleanups ca September 2010 - S6981746: G1: SEGV with -XX:+TraceGen0Time - S6985022: update make/jprt.properties for new jdk7 tools - S6981773: incorrect fill value with OptimizeFill - S6953144: Tiered compilation - S6982921: assert(_entry_bci != InvocationEntryBci) failed: wrong kind of nmethod - S6982533: Crash in ~StubRoutines::jbyte_fill with AggressiveOpts enabled - S6965815: OptimizeStringConcat: assert(!q->is_MergeMem()) failed with specjbb2000 - S6983073: fix compiler error with GCC 4.4 or newer on SPARC - S6934483: GCC 4.5 errors "suggest parentheses around something..." when compiling with -Werror and -Wall - S6984056: C1: incorrect code for integer constant addition on x64 - S6919069: client compiler needs to capture more profile information for tiered work - S6984346: Remove development code in type.hpp - S6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions - S6982370: SIGBUS in jbyte_fill - S6984368: Large default heap size does not allow to use zero based compressed oops - S6942092: Loader-constraint test is failing - S6974813: JVM needs to use demand loading for its DTrace probes - S6981753: Rebrand vm vendor property settings - S6975210: java.lang.VerifyError in some of JCK tests - S6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time - S6987149: Fix incorrect Oracle copyright header in make/templates files - S6988779: c1_LIRAssembler_x86.cpp crashes VS2010 compiler - S6984979: OptimizeFill misses some cases with an odd memory graph - S6986270: guarantee(*bcp != Bytecodes::_monitorenter || exec_mode != Deoptimization::Unpack_exception) fails - S6982537: Crash in Node*step_through_mergemem - S6972540: sun/nio/ch/SocketChannelImpl compilation crashed when executing CompileTheWorld - S6986028: assert(_base == Int) failed: Not an Int in CmpINode::sub - S6986944: JSR 292 assert(caller_nm->is_method_handle_return(caller_frame.pc())) failed: must be MH call site - S6986046: C1 valuestack cleanup - S6987115: Non-tiered compilation policy creates unnecessary C1 threads - S6987763: assert(kind() == EmptyExceptionState) failed: only EmptyExceptionStates can be modified - S6987634: JSR 292 assert(start_bci() >= 0 && start_bci() < code_size()) failed: correct osr_bci argument - S6988303: 6986046 breaks build with recent gcc - S6988346: 6986046 breaks tiered - S6916062: assert(_inserts <= _insert_limit,"hash table overflow") in NodeHash::hash_insert - S6968348: Byteswapped memory access can point to wrong location after JIT - S6989368: Regression in scimark2.MonteCarlo in jdk7_b112 on Linux - S6979458: VM crashes when -XX:ObjectAlignmentInBytes is too big - S6988018: dtrace/hotspot/MethodInvocation/MethodInvocation002 crashes with client compiler - S6989736: fix mapfile warnings on solaris - S6984287: Regularize how GC parallel workers are specified. - S6983296: build sanity checks for jdk7 should require SS12u1 - S6941395: G1: Use only lock-free versions of region stack push() and pop() - S6423256: GC stacks should use a better data structure - S6942771: SEGV in ParScanThreadState::take_from_overflow_stack - S6692906: CMS: parallel concurrent marking may be prone to hanging or stalling mutators for periods of time - S6988678: fatal error deadlock handling was unintentionally disabled - S6794422: Perm gen expansion policy for concurrent collectors - S6983311: G1: LoopTest hangs when run with -XX:+ExplicitInvokesConcurrent - S6980838: G1: guarantee(false) failed: thread has an unexpected active value in its SATB queue - S6980792: Crash "exception happened outside interpreter, nmethods and vtable stubs (1)" - S6990549: Zero and Shark fixes after 6978355 and 6953144 - S6829194: JSR 292 needs to support compressed oops - S6991065: missed a review comment in 6829194 - S6991512: G1 barriers fail with 64bit C1 - S6987555: JSR 292 unboxing to a boolean value fails on big-endian SPARC - S6991211: assert failure on sparc: "can not have caller-save register operands at calls" - S6971296: G1: simplify G1RemSet class hierarchy - S6989448: G1: refactor and simplify G1ParScanThreadState - S6988363: Rebrand vm vendor property settings (jdk7 only) - S6763959: java.util.concurrent.locks.LockSupport.parkUntil(0) blocks forever - S6983240: guarantee((Solaris::min_stack_allowed >= (StackYellowPages+StackRedPages...) wrong - S6989297: Integrate additional portability improvements - S6392697: Additional flag needed to supress Hotspot warning messages - S6992477: fix for 6991512 broke sparc barriers - S6989669: Coops: -Xshare:dump causes crash - S6992267: Bump the HS20 build number to 02 - S6991315: RedefineClasses fails with java.lang.VerifyError - S6988353: refactor contended sync subsystem - S6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name - S6990359: G1: don't push a stolen entry on the taskqueue, deal with it directly - S6992189: G1: inconsistent base used in sparse rem set iterator - S6988458: G1: assert(mr.end() <= _cm->finger()) failed: otherwise the region shouldn't be on the stack - S6991377: G1: race between concurrent refinement and humongous object allocation - S6992998: CMSWaitDuration=0 causes hangs with +ExplicitGCInvokesConcurrent - S6896603: CMS/GCH: collection_attempt_is_safe() ergo should use more recent data - S6995045: assert(!gch->incremental_collection_failed()) failed: Error, defNewGeneration.cpp:827 - S6996136: VM crash in src/share/vm/runtime/virtualspace.cpp:424 - S6997495: correction of regression test compiler/6857159/Test6857159 - S6991577: add IfOp optimization to C1 - S6991596: JSR 292 unimplemented adapter_opt_i2i and adapter_opt_l2i on SPARC - S6990192: VM crashes in ciTypeFlow::get_block_for() - S6968367: can_post_on_exceptions is still using VM_DeoptimizeFrame in some places - S6970683: improvements to hs_err output - S6994130: Zero PowerPC fix - S6994630: java/lang/instrument/IsModifiableClassAgent.java fails with -XX:+EnableInvokeDynamic - S6981788: GC map generator sometimes picks up the wrong kind of instruction operand - S6994093: MethodHandle.invokeGeneric needs porting to SPARC - S6981777: implement JSR 292 EG adjustments from summer 2010 - S6984311: JSR 292 needs optional bootstrap method parameters - S6987135: Performance regression on Intel platform with 32-bits edition between 6u13 and 6u14. - S6996240: The BitSet.length method sometimes returns an index+1 value less than that of the highest bit set. - S6997459: JSR 292 after 6994093 getting: on return to interpreted call, restored SP is corrupted - S6996563: 6984311 changes forgot to update vmStructs.cpp for new field _operands - S6997456: Not possible to build just compiler2 - S6997311: SIGFPE in new long division asm code - S6991188: C2 Crashes while compiling method - S6998737: JSR 292: Remove the plug guarding the use of compressed oops - S6839891: Array overrun in vm ci - S6997698: Bump the HS20 build number to 03 - S6997298: fatal error: must own lock CMS_markBitMap_lock during heap dump - S6996613: CompactibleFreeListSpace::print should call CompactibleFreeListSpace::print_on, not Space::print_on - S6998802: ScavengeALot: assert(!gch->incremental_collection_failed()) failed: Twice in a row - S6865028: Illegal instructions passing verification prior to 'invokespecial Object.' - S6981737: The java.vm.specification.version property is 1.0, seems like it should be 2.0 - S7000578: CMS: assert(SafepointSynchronize::is_at_safepoint()) failed: Else races are possible - S6978187: G1: assert(ParallelGCThreads> 1 || n_yielded() == _hrrs->occupied()) strikes again - S6999491: non-zero COOPs are used when they should not - S7000349: Tiered reacts incorrectly to C1 compilation failures - S7000491: assert(false) failed: should be optimized out in SharedRuntime::g1_wb_pre - S6751923: JNDI wake up when clock_settime() is called - S6837842: JNI_CreateJavaVM crashes under impersonation - S7002129: Zero and Shark fixes, 3rd - S6989984: Use standard include model for Hospot - S6974966: G1: unnecessary direct-to-old allocations - S6983204: G1: Nightly test nsk/regression/b4958615 failing with +ExplicitGCInvokesConcurrent - S7003860: G1: assert(_cur_alloc_region == NULL || !expect_null_cur_alloc_region) fails - S6780143: hs203t003 hits SIGSEGV/EXCEPTION_ACCESS_VIOLATION with -XX:+UseCompressedOops - S6987107: Add variable to add to but not modify non-fcs version string - S7003456: ADLC files not correctly generated on Windows - S6348631: remove the use of the HPI library from Hotspot - S7004217: Remove IA64 workaround re-introduced with CR6953477 - S7003125: precompiled.hpp is included when precompiled headers are not used - S7003786: sort Obj_Files before compiling - S6981484: Update development launcher - S6704010: Internal Error (src/share/vm/interpreter/interpreterRuntime.cpp:1106) - S7003782: Update JVMTI version to 1.2 for jdk7 - S6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars - S7003789: PTRACE_GETREGS problems with SA on Linux. - S6994056: G1: when GC locker is active, extend the Eden instead of allocating into the old gen - S6994628: G1: Test gc/gctests/FinalizeTest05 fails (one live object is finalized) - S7001033: assert(gch->gc_cause() == GCCause::_scavenge_alot || !gch->incremental_collection_failed()) - S7002546: regression on SpecJbb2005 on 7b118 comparing to 7b117 on small heaps - S7005259: CMS: BubbleUpRef asserts referent(obj)->is_oop() failed: Enqueued a bad referent - S7006221: Bump the HS20 build number to 04 - S7007229: Fix warnings with VS2010 in compressedStream.cpp - S7001363: java/dyn/InvokeDynamic should not be a well-known class in the JVM - S6985015: C1 needs to support compressed oops - S7002666: eclipse CDT projects crash with compressed oops - S6875026: CTW failure jdk6_18/hotspot/src/share/vm/c1/c1_LinearScan.cpp:5486 - S6998985: faulty generic arraycopy on windows x86_64: 4th arg overwritten with oop - S7003554: (tiered) assert(is_null_object() || handle() != NULL) failed: cannot embed null pointer - S6961690: load oops from constant table on SPARC - S7003798: test/compiler/6991596 fails with true != false - S7004530: casx used for 32 bit cas after 7003554 - S7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute - S7004925: CTW: assert(nbits == 32 || -(1 << nbits-1) <= x && x < ( 1 << nbits-1)) failed: value out of range - S7005241: C1: SEGV in java.util.concurrent.LinkedTransferQueue.xfer() with compressed oops - S6993125: runThese crashes with assert(Thread::current()->on_local_stack((address)this)) - S7004940: CTW: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG - S6989076: JVM crashes in klassItable::initialize_itable_for_interface - S7004582: Add GetThisObject() function to JVMTI 1.2 - S7005007: Refine use of ALT_COMPILER_PATH to avoid conflict with JPRT usage - S6988439: Parallel Class Loading test deadlock involving MethodData_lock and Pending List Lock - S7003748: Decode C stack frames when symbols are presented (PhoneHome project) - S7006471: fix for 6988439 crashes when pending list lock is null - S7006659: temporary adlc files are added to the build variables - S7006354: Updates to Visual Studio project creation and development launcher - S7000559: G1: assertion failure !outer || (full_collections_started == _full_collections_completed + 1) - S7003707: need to remove (some) system include files from the HotSpot header files - S7006113: G1: Initialize ReferenceProcessor::_is_alive_non_header field - S6807801: CMS: could save/restore fewer header words during scavenge - S6896624: G1: hotspot:::gc and hotspot:::mem-pool-gc probes are not fired - S7008759: Bump the HS20 build number to 05 - S7003487: clhsdbproc stacktrace fails on x64 - S7007769: VM crashes with SIGBUS writing PerfData if tmp space is full - S7008444: Remove unnecessary include of stdint.h in java_md.c - S6961186: Better VM handling of unexpected exceptions from application native code - S6987812: 2/3 SAJDI: "gHotSpotVMTypes was not initialized properly in the remote process" - S6975480: VS2010 says _STATIC_CPPLIB is deprecated, may need to change this usage - S7006044: materialize cheap non-oop pointers on 64-bit SPARC - S6765546: Wrong sscanf used to parse CompilerOracle command >= 32 characters could lead to crash - S6839888: Array overrun in vm adlc - S7006505: Use kstat info to identify SPARC processor - S6579789: Internal error "c1_LinearScan.cpp:1429 Error: assert(false,"")" in debuggee with fastdebug VM - S6990933: assert(sender_cb) failed: sanity in frame::sender_for_interpreter_frame - S7008165: Garbage in ClassFormatError message - S7003130: assert(iterations start) failed: need enough space to divide up - S7003271: Hotspot should track cumulative Java heap bytes allocated on a per-thread basis - S7010068: Update all 2010 Oracle-changed OpenJDK files to have the proper copyright dates - first pass - S7011125: Bump the HS20 build number to 06 - S7010618: C1: array length should be treated at int on 64bit during array allocation - S7009756: volatile variables could be broken throw reflection API - S6876037: CTW fails jdk7/hotspot/src/share/vm/opto/type.cpp:2055. assert(bits,"Use TypePtr for NULL") - S7010180: JSR 292 InvokeDynamicPrintArgs fails with: assert(_adapter == NULL) failed: init'd to NULL - S7010913: JSR 292 ciMethodHandle does not handle MethodHandleCompiler exceptions properly - S4930919: race condition in MDO creation at back branch locations - S7011386: race in objArrayKlass::array_klass_impl - S7011627: C1: call_RT must support targets that don't fit in wdisp30 - S7010665: Misplaced membar in C1 implementation of Unsafe.get/putXXX - S6458402: 3 jvmti tests fail with CMS and +ExplicitGCInvokesConcurrent - S6814943: getcpool001 catches more than one JvmtiThreadState problem - S7011463: Sparc MacroAssembler::incr_allocated_bytes() needs a RegisterOrConstant argument - S6994753: Implement optional hook to a Java method at VM startup. - S7009828: Fix for 6938627 breaks visualvm monitoring when -Djava.io.tmpdir is defined - S7008136: CMS: assert((HeapWord*)nextChunk <= _limit) failed: sweep invariant - S7007068: G1: refine the BOT during evac failure handling - S6994297: G1: do first-level slow-path allocations with a CAS - S6941122: G1: UseLargePages does not work with G1 garbage collector - S7011940: iCMS: SIGSEGV in SweepClosure::do_already_free_chunk(FreeChunk*)+0x360 - S7012348: Bump the HS20 build number to 07 - S6966589: hs16-b08 causes java.lang.StackOverflowError - S7012965: Fix failed on sparc for 7009756: volatile variables could be broken throw reflection API - S7012766: assert(false) failed: DEBUG MESSAGE in MacroAssembler::debug32 - S4926272: methodOopDesc::method_from_bcp is unsafe - S6811367: Fix code in HeapDumper::dump_heap() to avoid buffer overrun - S7012493: 2/2 6849574/Test.java fails with Internal Error (src/share/vm/prims/jvmtiTagMap.cpp:3294) - S7013008: 2/3 assert(method == NULL || check_method(method, bcp)) failed: bcp must point into method - S7012505: BreakpointWithFullGC.sh fails with Internal Error (src/share/vm/oops/methodOop.cpp:220) - S7011379: G1: overly long concurrent marking cycles - S7012642: G1: JumbleGC002 test aborts with segmentation violation due to uncaught stack overflow - S6977804: G1: remove the zero-filling thread - S7013812: C1: deopt blob too far from patching stub - S7014247: CTW fails when compile sun/misc/AtomicLongCSImpl (REMOVED from JDK7) - S7014998: assert(is_T_family(features) == is_niagara(features)) failed: Niagara should be T series - S7013718: G1: small fixes for two assert/guarantee failures - S7014261: G1: RSet-related failures - S7014679: G1: deadlock during concurrent cleanup - S7016474: string compare intrinsic improvements - S7018101: os::dll_address_to_function_name returning wrong answers in 64 bit - S6999988: CMS: Increased fragmentation leading to promotion failure after CR#6631166 got implemented - S7017746: Regression : C2 compiler crash due to SIGSEGV in PhaseCFG::schedule_early() - S7020550: Bump the HS20 build number to 10 - S7020042: G1: Partially remove fix for 6994628 - S7020846: Update Hotspot 20 to use jdk6 as JPRT release target - S7018056: large pages not always enabled by default - S7026619: Bump the HS20 build number to 11 - S7020373: JSR rewriting can overflow memory address size variables - S6989150: JCK7: 3 deserialization tests for javax.xml classes fail since JDK7-b112 - S7013970: Code.toString can exit VM - S7013971: Problem with saaj/soap1.2 - S7016340: Problem with saaj/soap1.2 - S7052870: Update bundle name and download location for jaxws bundle - S6998583: NativeSeedGenerator is making 8192 byte read requests from entropy pool - S6768387, PR670: REGRESSION: JTable no longer serializable - S7032311: Correct top level 'make test' target and add known failures to problem list - S7029905: demo applets missing some html files - S7033660: Update copyright year to 2011 on any files changed in 2011 - S7000693: java.sql.Timestamp compareTo() issues using low values - S6599601: Permissions/AWTWindowTest and Permissions/DFLoadTest failed in PIT 7.0 B20 on Windows Vista - S7042040: Remove disk space sanity check - S7041635: GSSContextSpi.java copyright notice error - S6618658: Deserialization allows creation of mutable SignedObject - S7013969: NetworkInterface.toString can reveal bindings - S7016495: Crash in Java 2D transforming an image with scale close to zero - S7016985: (launcher) implement safe secure dll loading - S6213702: (so) non-blocking sockets with TCP urgent disabled get still selected for read ops (win) - S7013519: [parfait] Integer overflows in 2D code - S7012520: Heap overflow vulnerability in FileDialog.show() - S7032593: DLL_LOADING: Upgrade solution to 7016985 to reflect JDK7 solution - S7020198: ImageIcon creates Component with null acc - S7060890: Update openjdk6 problemList file on jdk regression tests - S7031238: Problem with fix for 6981922 - S6507024: casting an array to a generic type results in a 'capture#69 of ?' type error - S6502392: Invalid relative names for Filer.createResource and Filer.getResource - S7003006: add option to list directory in deterministic order - S6999460: Glassfish build with JDK 6 / 7 is 5x-10x slower on Windows than on Linux - S6999891: DefaultFileManager incorrect - S7033660: Update copyright year to 2011 on any files changed in 2011 * Backports - S7019861: Last scanline skipped when doing AA. - S6748082: remove platform-specific code from SwingUtilities2.isDisplayLocal - S6708580: Java applications slow when EXA enabled - S6986968: Crash on XIM server restart - S7018387: Xrender pipeline may leak GC's - S7036754: Stroked quads sometimes contain NaN - S7008106: com/sun/awt/Translucency/WindowOpacity.java test fails. - S6956668: misbehavior of XOR operator (^) with int - S6699843: IllegalArgumentException when using Graphics.drawString( "", 0, 0 ) - S6918065: Crash in Java2D blit loop (IntArgbToIntArgbPreSrcOverMaskBlit) in 64bit mode - S6623219: Font.canDisplayUpTo does not work with supplementary characters - S6783910: java.awt.Color.brighter()/darker() methods make color opaque - S6785424: SecurityException locating physical fonts on Windows Terminal Server - S7047069: Array can dynamically change size when assigned to an object field - S6796786: invalid FP identity transform - (a - b) -> b - a - S7042070: Typo in Test6796786.java - S7029152: Ideal nodes for String intrinsics miss memory edge optimization - S6679308: Poor text rendering on translucent image - S6842838: 64-bit failure in handling invalid manifest in launcher. - S6882768: Test for 6842838 is broken - S6711682: JCheckBox in JTable: checkbox doesn't always respond to the first mouse click - S7016856: fix dashing performance regression. Improve other rendering performance. - S6934977: MappedByteBuffer.load crashes with SIGBUS. - S6758179: D3D: AlphaComposite is applied incorrectly for uncached opaque BufferedImage - S7049339: Image copy operations with a custom composite and a complex clip fail. - S6613904: javax.swing.GroupLayout.createParallelGroup(..) doesn't throw IllegalArgumentException for null arg - S4917091: javac rejects array over 128 in length - S6390045: Unexpected error "cannot access java.lang.Void" with '-target cldc1.0' with -source >=1.5 - S6752638: java.awt.GraphicsEnvironment.preferLocaleFonts() throws NPE on Linux - S5047314: [Col] Collator.compare() runs indefinitely for a certain set of Thai strings - S6669869: Beans.isDesignTime() and other queries should be per-AppContext - S6934356: Vector.writeObject() serialization may deadlock - S7036582: Improve test coverage of java.math.BigDecimal - S6806261: BigDecimal.longValueExact() method throws NullPointerException - S6371401: java.math.BigInteger.shift(Integer.MIN_VALUE) throws StackOverflowError - S6826104, RH730015: Getting a NullPointer exception when clicked on Application & Toolkit Modal dialog - S5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" - S6296893: BMP Writer handles TopDown property incorrectly for some of the compression types - S7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc - S7103610, RH683768: _NET_WM_PID and WM_CLIENT_MACHINE are not set - S7140882: Don't return booleans from methods returning pointers * ARM Port - Ported to the EABI hard-fp model - Locking for multi-core operation added. - Many minor bugs fixed. * CACAO - CA149: Used wrong class loader. - CA159: Exception handler blocks / register mixup. - CA162: Make class init protection aware of multiple threads. - CA163: descriptor_params_from_paramtypes is protected by a mutex now. - CA164: Get rid of mysterious 10 trailing bytes in literal strings. - ARM: Remove broken support for float argument passing in registers. - ARM: Remove hack for return value in float registers. - ARM: Fixed use of uninitialized variable. - ARM: removed unused ICMD_GETSTATIC branch. - ARM: Designate function labels as such; required for thumb interworking. - src/vm/javaobjects.cpp (java_lang_reflect_Method::invoke): stack index of caller was off by one, causing apt failures. - Set thread to RUNNABLE during Thread.start. - Removed state-setting function call that would be done by the thread itself, creating a nasty race. - Threadlist & threadobject improvements. * JamVM - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit. - LP827463: Fix OpenJDK enclosingMethodInfo(). - Add support for armhf. - Skip Java-reflection-related DelegatingClassLoaders, enables JamVM to run NetBeans. - Generic JNI stubs for common JNI method signatures. - Implement classlibCheckIfOnLoad(). - Make thread states JVMTI compatible. - Add OpenBSD/sparc to list of recognised hosts. - Handle 'g' when specifying memory + extra checks. - armhf: ensure stack is 8 byte aligned. - "Fix" handling of CLI bootclasspath options. - Fix for StackTraceElement checkin. - Ignore assertions and verify options. - Fix typo in definition of ACC_MIRANDA. - Intern strings when creating a StackTraceElement. - Remove empty clobber. - Use dots instead of slashes in classname for exception. - Correct thrown exception by bootstrap loader. - Put parsing of -cp and -classpath options back in. - Fix threading of references list during compaction. - Further fix to freeClassData for native methods. - Fix class GC with classes containing Miranda methods. - Propogate initialisation errors to top-level. - Make classlib init functions consistent + warnings. - Correctly implement sun.misc.Unsafe freeMemory(). - Move lazy-loading to init function. - Fix various warnings with -Wall. - PrintThreadsDump needs "self" as argument. - CopyMemory, etc. handle negative or truncation in length. - Extra sun.misc.Unsafe functions. - Ignore options for jtreg tests. - Enable shutdownVM to be called with OpenJDK classlib. - Initial implementation of JVM_FindClassFromBootLoader. - Fix callJNIMethod on i386 with -fomit-frame-pointer. - Fix backwards cache conflict resolution code. - Unify command line options parsing. - Remove debug printf. - Fix leak of native thread structure. - Consistent naming for classlib functions. - Add extra includes to get rid off compiler warning. - Rework OpenJDK storage of native thread structure. - Implement remaining OpenJDK Array reflection interface. - Added LDFLAGS for JamVM to fix the SELinux executable flag issue. * Zero/Shark - PR690: Shark fails to JIT using hs20. - PR696: Zero fails to handle fast_aldc and fast_aldc_w in hs20. The tarball can be downloaded from: http://icedtea.classpath.org/download/source/icedtea6-1.11.tar.gz sha256sum: e7d2bc08008de918ca54f8dcd1f8d75c7829948da6b1a9c06761c74a563c3eba The following people helped with this release: * Andrew Haley * Andrew John Hughes * Andrew Su * Danesh Dadachanji * Deepak Bhole * Denis Lila * Matthias Klose * Jiri Vanek * Mark Wielaard * Omair Majid * Pavel Tisnovsky * Xerxes R?nby A huge thanks to everyone who helped us test and reported bugs! To get started: $ tar xf icedtea6-1.11.tar.gz $ cd icedtea6-1.11 $ ./configure $ make Full build requirements and instructions are available in the INSTALL file. Cheers, Omair From omajid at icedtea.classpath.org Mon Jan 30 21:16:29 2012 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Tue, 31 Jan 2012 05:16:29 +0000 Subject: /hg/release/icedtea6-1.11: 3 new changesets Message-ID: changeset 7b118bddf755 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=7b118bddf755 author: Omair Majid date: Mon Jan 30 22:17:04 2012 -0500 Add missing NEWS entry changeset 746c78997ad9 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=746c78997ad9 author: Omair Majid date: Mon Jan 30 23:53:36 2012 -0500 Prepare for 1.11 release changeset 9392b2e91395 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=9392b2e91395 author: Omair Majid date: Mon Jan 30 23:54:04 2012 -0500 Added tag icedtea6-1.11 for changeset 746c78997ad9 diffstat: .hgtags | 1 + ChangeLog | 5 +++++ NEWS | 3 ++- configure.ac | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diffs (49 lines): diff -r a5a1fd171138 -r 9392b2e91395 .hgtags --- a/.hgtags Mon Jan 30 22:13:05 2012 -0500 +++ b/.hgtags Mon Jan 30 23:54:04 2012 -0500 @@ -22,3 +22,4 @@ 21f2a8d158545a161ba0d997c13bdba1e6166394 icedtea6-1.10-branchpoint 24c5bd2e7d574441813bfb8f9e4636e50c5d7c28 icedtea6-1.11-branch 933c143b22a0acb6e5c72ac1315fd90a135275a8 icedtea6-1.11pre +746c78997ad9baaac7601686031f507936cebb88 icedtea6-1.11 diff -r a5a1fd171138 -r 9392b2e91395 ChangeLog --- a/ChangeLog Mon Jan 30 22:13:05 2012 -0500 +++ b/ChangeLog Mon Jan 30 23:54:04 2012 -0500 @@ -1,3 +1,8 @@ +2012-01-30 Omair Majid + + * NEWS: Set release date. + * configure.ac: Bump to 1.11. + 2012-01-30 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Remove diff -r a5a1fd171138 -r 9392b2e91395 NEWS --- a/NEWS Mon Jan 30 22:13:05 2012 -0500 +++ b/NEWS Mon Jan 30 23:54:04 2012 -0500 @@ -10,7 +10,7 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 1.11 (2011-XX-XX): +New in release 1.11 (2012-01-30): * Use HotSpot 20 as the default virtual machine. * ARM assembly language port reinstated and updated; details below. @@ -380,6 +380,7 @@ - S6296893: BMP Writer handles TopDown property incorrectly for some of the compression types - S7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc - S7103610, RH683768: _NET_WM_PID and WM_CLIENT_MACHINE are not set + - S7140882: Don't return booleans from methods returning pointers * ARM Port - Ported to the EABI hard-fp model - Locking for multi-core operation added. diff -r a5a1fd171138 -r 9392b2e91395 configure.ac --- a/configure.ac Mon Jan 30 22:13:05 2012 -0500 +++ b/configure.ac Mon Jan 30 23:54:04 2012 -0500 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.11pre],[distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6],[1.11],[distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From omajid at icedtea.classpath.org Mon Jan 30 21:19:06 2012 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Tue, 31 Jan 2012 05:19:06 +0000 Subject: /hg/release/icedtea6-1.11: Bump to 1.11.1pre Message-ID: changeset 2f6cd79ca154 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=2f6cd79ca154 author: Omair Majid date: Tue Jan 31 00:18:57 2012 -0500 Bump to 1.11.1pre diffstat: ChangeLog | 5 +++++ NEWS | 2 ++ configure.ac | 2 +- 3 files changed, 8 insertions(+), 1 deletions(-) diffs (33 lines): diff -r 9392b2e91395 -r 2f6cd79ca154 ChangeLog --- a/ChangeLog Mon Jan 30 23:54:04 2012 -0500 +++ b/ChangeLog Tue Jan 31 00:18:57 2012 -0500 @@ -1,3 +1,8 @@ +2012-01-31 Omair Majid + + * NEWS: Add a section for 1.11.1. + * configure.ac: Bump to 1.11.1pre. + 2012-01-30 Omair Majid * NEWS: Set release date. diff -r 9392b2e91395 -r 2f6cd79ca154 NEWS --- a/NEWS Mon Jan 30 23:54:04 2012 -0500 +++ b/NEWS Tue Jan 31 00:18:57 2012 -0500 @@ -10,6 +10,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 1.11.1 (2012-XX-XX): + New in release 1.11 (2012-01-30): * Use HotSpot 20 as the default virtual machine. diff -r 9392b2e91395 -r 2f6cd79ca154 configure.ac --- a/configure.ac Mon Jan 30 23:54:04 2012 -0500 +++ b/configure.ac Tue Jan 31 00:18:57 2012 -0500 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.11],[distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6],[1.11.1pre],[distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From omajid at redhat.com Mon Jan 30 21:44:02 2012 From: omajid at redhat.com (Omair Majid) Date: Tue, 31 Jan 2012 00:44:02 -0500 Subject: BRANCH _UN_FREEZE: IcedTea6 1.11 In-Reply-To: <4F274368.50400@redhat.com> References: <4F274368.50400@redhat.com> Message-ID: <4F277FA2.2020500@redhat.com> On 01/30/2012 08:27 PM, Omair Majid wrote: > Please consider the IcedTea6 1.11 branch frozen as I prepare the release. IcedTea6 1.11 has been released. The branch is no longer frozen. Cheers, Omair From omajid at redhat.com Mon Jan 30 21:44:26 2012 From: omajid at redhat.com (Omair Majid) Date: Tue, 31 Jan 2012 00:44:26 -0500 Subject: /hg/release/icedtea6-1.11: Fixed build with GCC 4.7 In-Reply-To: <20120131030851.GP16474@redhat.com> References: <4F2759DB.8040706@redhat.com> <20120131030851.GP16474@redhat.com> Message-ID: <4F277FBA.9000005@redhat.com> On 01/30/2012 10:08 PM, Deepak Bhole wrote: > * Omair Majid [2012-01-30 22:05]: >> On 01/30/2012 06:32 PM, dbhole at icedtea.classpath.org wrote: >>> diff -r 308265f39f56 -r 01cc2ea64fbd Makefile.am >>> --- a/Makefile.am Fri Jan 27 11:09:28 2012 -0500 >>> +++ b/Makefile.am Mon Jan 30 18:26:19 2012 -0500 >>> @@ -404,7 +404,10 @@ >>> patches/openjdk/7102369-7094468-rmiregistry.patch \ >>> patches/openjdk/6851973-kerberos.patch \ >>> patches/openjdk/7091528-javadoc_class_files.patch \ >>> - patches/openjdk/7103725-ssl_beast_regression.patch >>> + patches/openjdk/7103725-ssl_beast_regression.patch \ >>> + patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \ >>> + patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \ >>> + patches/openjdk/remove-mimpure-option-to-gcc.patch >> >> The patch: >> patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch >> is not present in 1.11 (the patch is present in HEAD) and was not >> added in this changeset. It also breaks the build :( >> >> I will remove it before I release. >> > > Gah. Sorry, I only built/tested HEAD and exported/imported to 1.11. I > must have accidentally copied an extra line. Sorry about that Omair :( Not a big deal. I was rather surprised that this wasn't caught by the buildbots, though. As it turns out, however, none of the buildbots are testing any release branches. They all seem to be testing just HEAD/trunk :( Cheers, Omair From aph at redhat.com Tue Jan 31 04:28:45 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 31 Jan 2012 12:28:45 +0000 Subject: ARM: Fix crash in assembler interpreter Message-ID: <4F27DE7D.5090406@redhat.com> Xerxes R?nby reported that he'd found a very rare crash in the GC when running the ARM assembler interpreter in an interpreter-only environment. The problem was tracked down to an incorrect saved bytecode pointer in the interpreter state. The fix is very simple: write the pointer back to the interpreter state when returning from a method. We've tested this pretty extensively, so I'm committing this to trunk, but I think it should go in the 1.11 branch too. OK? Andrew. 2012-01-31 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (return_check_monitors): DECACHE_JPC so that the saved bytecode pointer is correct for the GC. --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Tue Jan 31 07:17:17 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Tue Jan 31 07:19:24 2012 -0500 @@ -3576,6 +3576,7 @@ return_check_monitors: stmdb arm_sp!, {r4, lr} + DECACHE_JPC ldr r2, [istate, #ISTATE_METHOD] ldr r4, [r2, #METHOD_ACCESSFLAGS] tst r4, #1<<5 From aph at icedtea.classpath.org Tue Jan 31 04:29:11 2012 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Tue, 31 Jan 2012 12:29:11 +0000 Subject: /hg/icedtea6: 3 new changesets Message-ID: changeset 845a28acf5c9 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=845a28acf5c9 author: aph date: Tue Jan 31 07:17:17 2012 -0500 2012-01-27 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (class Hsdis): Set decode_instructions = NULL. changeset e9550af57b57 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e9550af57b57 author: aph date: Tue Jan 31 07:19:24 2012 -0500 DECACHE_JPC in return_check_monitors 2012-01-31 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (return_check_monitors): DECACHE_JPC so that the saved bytecode pointer is correct for the GC. changeset efaffd693af8 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=efaffd693af8 author: aph date: Tue Jan 31 12:21:44 2012 +0000 merge diffstat: ChangeLog | 20 + Makefile.am | 4 +- NEWS | 1 + arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 1 + arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 2 + patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch | 11 + patches/openjdk/remove-mimpure-option-to-gcc.patch | 150 ++++++++++ 7 files changed, 188 insertions(+), 1 deletions(-) diffs (257 lines): diff -r 80c34531aba3 -r efaffd693af8 ChangeLog --- a/ChangeLog Thu Jan 26 07:27:15 2012 -0500 +++ b/ChangeLog Tue Jan 31 12:21:44 2012 +0000 @@ -1,3 +1,23 @@ +2012-01-31 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (return_check_monitors): DECACHE_JPC so that the saved bytecode + pointer is correct for the GC. + +2012-01-30 Deepak Bhole + + Added patches to fix building with GCC 4.7 + * patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch: + New patch. Makes methods return NULL instead of boolean when they return a + pointer. + * patches/openjdk/remove-mimpure-option-to-gcc.patch: New patch. Removes + the invalid -mimpure-text option to GCC. + +2012-01-27 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (class Hsdis): Set + decode_instructions = NULL. + 2012-01-25 Andrew Haley * openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Branch): diff -r 80c34531aba3 -r efaffd693af8 Makefile.am --- a/Makefile.am Thu Jan 26 07:27:15 2012 -0500 +++ b/Makefile.am Tue Jan 31 12:21:44 2012 +0000 @@ -407,7 +407,9 @@ patches/openjdk/7103725-ssl_beast_regression.patch \ patches/openjdk/6706974-krb5_test_infrastructure.patch \ patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \ - patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch + patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \ + patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \ + patches/openjdk/remove-mimpure-option-to-gcc.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r 80c34531aba3 -r efaffd693af8 NEWS --- a/NEWS Thu Jan 26 07:27:15 2012 -0500 +++ b/NEWS Tue Jan 31 12:21:44 2012 +0000 @@ -23,6 +23,7 @@ * ARM assembly language port reinstated and updated; details below. * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools" * Drop the outdated NIO2 backport. Users who want NIO2 should use IcedTea 2.x. +* Fixed build with GCC 4.7 * Bug fixes - PR637: make check should exit with an error code if any regression test failed. - PR752: ImageFormatException extends Exception not RuntimeException diff -r 80c34531aba3 -r efaffd693af8 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Thu Jan 26 07:27:15 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Tue Jan 31 12:21:44 2012 +0000 @@ -3576,6 +3576,7 @@ return_check_monitors: stmdb arm_sp!, {r4, lr} + DECACHE_JPC ldr r2, [istate, #ISTATE_METHOD] ldr r4, [r2, #METHOD_ACCESSFLAGS] tst r4, #1<<5 diff -r 80c34531aba3 -r efaffd693af8 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 26 07:27:15 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Tue Jan 31 12:21:44 2012 +0000 @@ -736,6 +736,8 @@ // Load hsdis-arm.so lazily. Hsdis() { + decode_instructions = NULL; + if (PrintAssembly) { if (lib = dlopen("hsdis-arm.so", RTLD_NOW)) { decode_instructions diff -r 80c34531aba3 -r efaffd693af8 patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch Tue Jan 31 12:21:44 2012 +0000 @@ -0,0 +1,12 @@ +diff -ur openjdk.orig/hotspot/src/share/vm/opto/loopnode.cpp openjdk/hotspot/src/share/vm/opto/loopnode.cpp +--- openjdk.orig/hotspot/src/share/vm/opto/loopnode.cpp 2011-11-14 17:07:36.000000000 -0500 ++++ openjdk/hotspot/src/share/vm/opto/loopnode.cpp 2012-01-30 11:25:10.648080484 -0500 +@@ -546,7 +546,7 @@ + Node* CountedLoopNode::match_incr_with_optional_truncation( + Node* expr, Node** trunc1, Node** trunc2, const TypeInt** trunc_type) { + // Quick cutouts: +- if (expr == NULL || expr->req() != 3) return false; ++ if (expr == NULL || expr->req() != 3) return NULL; + + Node *t1 = NULL; + Node *t2 = NULL; diff -r 80c34531aba3 -r efaffd693af8 patches/openjdk/remove-mimpure-option-to-gcc.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/remove-mimpure-option-to-gcc.patch Tue Jan 31 12:21:44 2012 +0000 @@ -0,0 +1,162 @@ +diff -ur openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk +--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2011-11-14 17:11:39.000000000 -0500 ++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2012-01-30 11:27:47.181487274 -0500 +@@ -94,7 +94,7 @@ + endif + endif + # Option used to create a shared library +- SHARED_LIBRARY_FLAG = -shared -mimpure-text ++ SHARED_LIBRARY_FLAG = -shared + SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 ) + + endif +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2012-01-30 11:27:47.186487189 -0500 +@@ -90,7 +90,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt 2012-01-30 11:27:47.187487172 -0500 +@@ -90,7 +90,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt 2012-01-30 11:27:47.186487189 -0500 +@@ -94,7 +94,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt 2012-01-30 11:27:47.184487223 -0500 +@@ -90,7 +90,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt 2012-01-30 11:27:47.189487139 -0500 +@@ -130,7 +130,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES= -lnsl -ldl -lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/index.html openjdk/jdk/src/share/demo/jvmti/index.html +--- openjdk.orig/jdk/src/share/demo/jvmti/index.html 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/index.html 2012-01-30 11:27:47.183487240 -0500 +@@ -308,7 +308,7 @@ +
      + gcc -O2 -fPIC -pthread -DLINUX -c *.c +
      +-gcc -z defs -static-libgcc -shared -mimpure-text -o libXXX.so *.o -lc ++gcc -z defs -static-libgcc -shared -o libXXX.so *.o -lc +
    +
    + For AMD64: +@@ -316,7 +316,7 @@ +
      + gcc -O2 -fPIC -pthread -DLINUX -D_LP64=1 -c *.c +
      +-gcc -z defs -static-libgcc -shared -mimpure-text -o libXXX.so *.o -lc ++gcc -z defs -static-libgcc -shared -o libXXX.so *.o -lc +
    +
    +
    • +@@ -339,7 +339,7 @@ + + +
  • +-Library: Use -static-libgcc -mimpure-text. ++Library: Use -static-libgcc. +
    + When building the shared library (-shared option), this option + allows for maximum portability of the library between different +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt 2012-01-30 11:27:47.187487172 -0500 +@@ -90,7 +90,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/minst/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/minst/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/minst/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/minst/sample.makefile.txt 2012-01-30 11:27:47.187487172 -0500 +@@ -94,7 +94,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt 2012-01-30 11:27:47.188487155 -0500 +@@ -94,7 +94,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt 2012-01-30 11:27:47.185487206 -0500 +@@ -90,7 +90,7 @@ + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES=-lc + # Building a shared library +diff -ur openjdk.orig/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt +--- openjdk.orig/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500 ++++ openjdk/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt 2012-01-30 11:27:47.188487155 -0500 +@@ -91,7 +91,7 @@ + OBJECTS=$(SOURCES:%.cpp=%.o) + # Library name and options needed to build it + LIBRARY=lib$(LIBNAME).so +- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text ++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc + # Libraries we are dependent on + LIBRARIES= + # Building a shared library From ahughes at redhat.com Tue Jan 31 04:56:41 2012 From: ahughes at redhat.com (Andrew Hughes) Date: Tue, 31 Jan 2012 07:56:41 -0500 (EST) Subject: Icedtea6 1.11 release later today In-Reply-To: <20120130233151.GK16474@redhat.com> Message-ID: ----- Original Message ----- > * Andrew Hughes [2012-01-30 17:32]: > > > > > > ----- Original Message ----- > > > * Omair Majid [2012-01-30 09:42]: > > > > Hi, > > > > > > > > I plan to release IcedTea6 1.11 later today (possibly tomorrow > > > > if I > > > > run into snags). > > > > > > > > > > There are build failures with GCC 4.7. I'd like to backport the > > > following to changesets before release: > > > http://cr.openjdk.java.net/~dbhole/GCC-4.7-HS23.00/ > > > http://cr.openjdk.java.net/~dbhole/GCC-4.7-JDK8.00/ > > > > > > Okay for push to HEAD and 1.11? > > > > > > > Also approved here. I was going to mention these too. > > > > Please add under patches/openjdk as Omair suggests. > > > > Are you going to get them into 7 too? I'll approve them for HEAD & > > 2.0. > > > > Hi Andrew, > > Yes. Waiting for them to go upstream first.. for 6 I decided to post > rfc > because 1.11 is on the horizon. > Well, don't leave it too long as there'll be new 7 releases with the security update. The patch has been approved upstream, so I don't see a reason for any further delay. > Cheers, > Deepak > > > > Cheers, > > > Deepak > > > > > > > -- > > 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 > > > -- 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 ahughes at redhat.com Tue Jan 31 04:58:54 2012 From: ahughes at redhat.com (Andrew Hughes) Date: Tue, 31 Jan 2012 07:58:54 -0500 (EST) Subject: /hg/release/icedtea6-1.11: Do not apply a missing patch In-Reply-To: Message-ID: ----- Original Message ----- > changeset a5a1fd171138 in /hg/release/icedtea6-1.11 > details: > http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=a5a1fd171138 > author: Omair Majid > date: Mon Jan 30 22:13:05 2012 -0500 > > Do not apply a missing patch > > > diffstat: > > ChangeLog | 7 +++++++ > Makefile.am | 1 - > 2 files changed, 7 insertions(+), 1 deletions(-) > > diffs (32 lines): > > diff -r 01cc2ea64fbd -r a5a1fd171138 ChangeLog > --- a/ChangeLog Mon Jan 30 18:26:19 2012 -0500 > +++ b/ChangeLog Mon Jan 30 22:13:05 2012 -0500 > @@ -1,3 +1,9 @@ > +2012-01-30 Omair Majid > + > + * Makefile.am (ICEDTEA_PATCHES): Remove > + 6761072-new_krb5_tests_fail_on_multiple_platforms.patch. It was > breaking > + the build. > + > 2012-01-30 Deepak Bhole > > Added patches to fix building with GCC 4.7 > @@ -6,6 +12,7 @@ > pointer. > * patches/openjdk/remove-mimpure-option-to-gcc.patch: New patch. > Removes > the invalid -mimpure-text option to GCC. > + * Makefile.am (ICEDTEA_PATCHES): Add the above. > > 2012-01-25 Andrew Haley > > diff -r 01cc2ea64fbd -r a5a1fd171138 Makefile.am > --- a/Makefile.am Mon Jan 30 18:26:19 2012 -0500 > +++ b/Makefile.am Mon Jan 30 22:13:05 2012 -0500 > @@ -405,7 +405,6 @@ > patches/openjdk/6851973-kerberos.patch \ > patches/openjdk/7091528-javadoc_class_files.patch \ > patches/openjdk/7103725-ssl_beast_regression.patch \ > - > patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch > \ > patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch > \ > patches/openjdk/remove-mimpure-option-to-gcc.patch > > How the hell did this get added in the first place? -- 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 ahughes at redhat.com Tue Jan 31 05:00:38 2012 From: ahughes at redhat.com (Andrew Hughes) Date: Tue, 31 Jan 2012 08:00:38 -0500 (EST) Subject: /hg/release/icedtea6-1.11: Fixed build with GCC 4.7 In-Reply-To: <4F277FBA.9000005@redhat.com> Message-ID: <43670629-13cb-46e5-9a4c-cb94958efc4b@zmail16.collab.prod.int.phx2.redhat.com> ----- Original Message ----- > On 01/30/2012 10:08 PM, Deepak Bhole wrote: > > * Omair Majid [2012-01-30 22:05]: > >> On 01/30/2012 06:32 PM, dbhole at icedtea.classpath.org wrote: > >>> diff -r 308265f39f56 -r 01cc2ea64fbd Makefile.am > >>> --- a/Makefile.am Fri Jan 27 11:09:28 2012 -0500 > >>> +++ b/Makefile.am Mon Jan 30 18:26:19 2012 -0500 > >>> @@ -404,7 +404,10 @@ > >>> patches/openjdk/7102369-7094468-rmiregistry.patch \ > >>> patches/openjdk/6851973-kerberos.patch \ > >>> patches/openjdk/7091528-javadoc_class_files.patch \ > >>> - patches/openjdk/7103725-ssl_beast_regression.patch > >>> + patches/openjdk/7103725-ssl_beast_regression.patch \ > >>> + > >>> patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch > >>> \ > >>> + > >>> patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch > >>> \ > >>> + patches/openjdk/remove-mimpure-option-to-gcc.patch > >> > >> The patch: > >> patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch > >> is not present in 1.11 (the patch is present in HEAD) and was not > >> added in this changeset. It also breaks the build :( > >> > >> I will remove it before I release. > >> > > > > Gah. Sorry, I only built/tested HEAD and exported/imported to 1.11. > > I > > must have accidentally copied an extra line. Sorry about that Omair > > :( > > Not a big deal. I was rather surprised that this wasn't caught by the > buildbots, though. As it turns out, however, none of the buildbots > are > testing any release branches. They all seem to be testing just > HEAD/trunk :( > More worrying to me is this implies that the branch wasn't built with the patch prior to commit. > Cheers, > Omair > -- 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 ahughes at redhat.com Tue Jan 31 05:09:34 2012 From: ahughes at redhat.com (Andrew Hughes) Date: Tue, 31 Jan 2012 08:09:34 -0500 (EST) Subject: Wiki & Bugzilla Updates In-Reply-To: Message-ID: With the release of 1.11, I've updated the wiki and Bugzilla accordingly. It is now possible to file bugs against 1.11 and target them for 1.11.1. I also added 8-hg which I noticed was missing. I've updated http://icedtea.classpath.org/wiki/ReleasePolicy to note the dropping of 1.8 after the next security release and to add 1.11 and 2.0. I've also added a mention of 1.11 on the front page. -- 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 Jan 31 05:34:19 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 Jan 2012 13:34:19 +0000 Subject: [Bug 744] icedtea6-1.10.2 : patching error, patches/ecj/jaxws-getdtdtype.patch In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=744 Stefan Ring changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |stefan at complang.tuwien.ac.a | |t --- Comment #8 from Stefan Ring 2012-01-31 13:34:19 UTC --- I get the exact same error when building on my old Fedora 10 i386 box after forgetting to specify --with-jdk-home=/usr/lib/jvm/java-1.6.0-openjdk. This is icedtea6-1.11. Applying patches/ecj/xsltproc.patch patching file openjdk-ecj/hotspot/make/linux/makefiles/jvmti.make Checking patches/ecj/jaxws-getdtdtype.patch 1 out of 1 hunk FAILED -- saving rejects to file openjdk-ecj/jaxws/build.properties.rej ERROR patch patches/ecj/jaxws-getdtdtype.patch FAILED! WARNING make clean-patch before retrying a fix make: *** [stamps/patch-ecj.stamp] Error 2 I tried to build like this: ./configure --with-parallel-jobs=1 --disable-plugin --disable-docs --enable-cacao --with-cacao-src-dir=../cacao && make The build works when I specify --with-jdk-home. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue Jan 31 05:38:06 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 Jan 2012 13:38:06 +0000 Subject: [Bug 744] icedtea6-1.10.2 : patching error, patches/ecj/jaxws-getdtdtype.patch In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=744 --- Comment #9 from Stefan Ring 2012-01-31 13:38:06 UTC --- configure log excerpt: checking build identification... Built on Fedora release 10 (Cambridge) (Tue Jan 31 14:27:51 CET 2012) checking whether to build a bootstrap version first... yes checking for a JDK home directory... /usr/lib/jvm/java-gcj checking if a java binary was specified... no checking if /usr/lib/jvm/java-gcj/bin/java is a valid executable file... yes checking for javac... /usr/bin/javac checking if a javah binary was specified... no checking if /usr/lib/jvm/java-gcj/bin/javah is a valid executable file... yes checking if a jar binary was specified... no checking if /usr/lib/jvm/java-gcj/bin/jar is a valid executable file... yes checking whether jar supports @ argument... no checking whether jar supports stdin file arguments... yes checking whether jar supports -J options at the end... no checking if a rmic binary was specified... no checking if /usr/lib/jvm/java-gcj/bin/rmic is a valid executable file... yes checking if a native2ascii binary was specified... no checking if /usr/lib/jvm/java-gcj/bin/native2ascii is a valid executable file... no checking for native2ascii... /usr/bin/native2ascii checking for an ecj JAR file... /usr/share/java/eclipse-ecj.jar checking for xsltproc... /usr/bin/xsltproc -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue Jan 31 06:43:28 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 Jan 2012 14:43:28 +0000 Subject: [Bug 744] icedtea6-1.10.2 : patching error, patches/ecj/jaxws-getdtdtype.patch In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=744 --- Comment #10 from Andrew John Hughes 2012-01-31 14:43:28 UTC --- Please file a new bug for this. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From dbhole at redhat.com Tue Jan 31 06:48:05 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 31 Jan 2012 09:48:05 -0500 Subject: /hg/release/icedtea6-1.11: Fixed build with GCC 4.7 In-Reply-To: <43670629-13cb-46e5-9a4c-cb94958efc4b@zmail16.collab.prod.int.phx2.redhat.com> References: <4F277FBA.9000005@redhat.com> <43670629-13cb-46e5-9a4c-cb94958efc4b@zmail16.collab.prod.int.phx2.redhat.com> Message-ID: <20120131144804.GA6669@redhat.com> * Andrew Hughes [2012-01-31 08:32]: > ----- Original Message ----- > > On 01/30/2012 10:08 PM, Deepak Bhole wrote: > > > * Omair Majid [2012-01-30 22:05]: > > >> On 01/30/2012 06:32 PM, dbhole at icedtea.classpath.org wrote: > > >>> diff -r 308265f39f56 -r 01cc2ea64fbd Makefile.am > > >>> --- a/Makefile.am Fri Jan 27 11:09:28 2012 -0500 > > >>> +++ b/Makefile.am Mon Jan 30 18:26:19 2012 -0500 > > >>> @@ -404,7 +404,10 @@ > > >>> patches/openjdk/7102369-7094468-rmiregistry.patch \ > > >>> patches/openjdk/6851973-kerberos.patch \ > > >>> patches/openjdk/7091528-javadoc_class_files.patch \ > > >>> - patches/openjdk/7103725-ssl_beast_regression.patch > > >>> + patches/openjdk/7103725-ssl_beast_regression.patch \ > > >>> + > > >>> patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch > > >>> \ > > >>> + > > >>> patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch > > >>> \ > > >>> + patches/openjdk/remove-mimpure-option-to-gcc.patch > > >> > > >> The patch: > > >> patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch > > >> is not present in 1.11 (the patch is present in HEAD) and was not > > >> added in this changeset. It also breaks the build :( > > >> > > >> I will remove it before I release. > > >> > > > > > > Gah. Sorry, I only built/tested HEAD and exported/imported to 1.11. > > > I > > > must have accidentally copied an extra line. Sorry about that Omair > > > :( > > > > Not a big deal. I was rather surprised that this wasn't caught by the > > buildbots, though. As it turns out, however, none of the buildbots > > are > > testing any release branches. They all seem to be testing just > > HEAD/trunk :( > > > > More worrying to me is this implies that the branch wasn't built with the > patch prior to commit. > I did build 1.11 with manual changes actually. The issue was that I had conflicts when committing so I did a clean checkout rather than merge and exported the HEAD patch, edited and imported into 1.11. I left in one more line than I should have. Not saying that it means I shouldn't have built it -- just saying thats what happened. In the future that will not be the case. Cheers, Deepak > > Cheers, > > Omair > > > > -- > 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 dbhole at redhat.com Tue Jan 31 06:50:06 2012 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 31 Jan 2012 09:50:06 -0500 Subject: /hg/release/icedtea6-1.11: Do not apply a missing patch In-Reply-To: References: Message-ID: <20120131145005.GB6669@redhat.com> * Andrew Hughes [2012-01-31 08:00]: > ----- Original Message ----- > > changeset a5a1fd171138 in /hg/release/icedtea6-1.11 > > details: > > http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=a5a1fd171138 > > author: Omair Majid > > date: Mon Jan 30 22:13:05 2012 -0500 > > > > Do not apply a missing patch > > > > > > diffstat: > > > > ChangeLog | 7 +++++++ > > Makefile.am | 1 - > > 2 files changed, 7 insertions(+), 1 deletions(-) > > > > diffs (32 lines): > > > > diff -r 01cc2ea64fbd -r a5a1fd171138 ChangeLog > > --- a/ChangeLog Mon Jan 30 18:26:19 2012 -0500 > > +++ b/ChangeLog Mon Jan 30 22:13:05 2012 -0500 > > @@ -1,3 +1,9 @@ > > +2012-01-30 Omair Majid > > + > > + * Makefile.am (ICEDTEA_PATCHES): Remove > > + 6761072-new_krb5_tests_fail_on_multiple_platforms.patch. It was > > breaking > > + the build. > > + > > 2012-01-30 Deepak Bhole > > > > Added patches to fix building with GCC 4.7 > > @@ -6,6 +12,7 @@ > > pointer. > > * patches/openjdk/remove-mimpure-option-to-gcc.patch: New patch. > > Removes > > the invalid -mimpure-text option to GCC. > > + * Makefile.am (ICEDTEA_PATCHES): Add the above. > > > > 2012-01-25 Andrew Haley > > > > diff -r 01cc2ea64fbd -r a5a1fd171138 Makefile.am > > --- a/Makefile.am Mon Jan 30 18:26:19 2012 -0500 > > +++ b/Makefile.am Mon Jan 30 22:13:05 2012 -0500 > > @@ -405,7 +405,6 @@ > > patches/openjdk/6851973-kerberos.patch \ > > patches/openjdk/7091528-javadoc_class_files.patch \ > > patches/openjdk/7103725-ssl_beast_regression.patch \ > > - > > patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch > > \ > > patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch > > \ > > patches/openjdk/remove-mimpure-option-to-gcc.patch > > > > > > How the hell did this get added in the first place? http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-January/017074.html Deepak > -- > 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 ahughes at redhat.com Tue Jan 31 07:15:26 2012 From: ahughes at redhat.com (Andrew Hughes) Date: Tue, 31 Jan 2012 10:15:26 -0500 (EST) Subject: /hg/release/icedtea6-1.11: Do not apply a missing patch In-Reply-To: <20120131145005.GB6669@redhat.com> Message-ID: <606fdabc-bb1e-4218-910d-03b7b3034fd2@zmail16.collab.prod.int.phx2.redhat.com> ----- Original Message ----- > * Andrew Hughes [2012-01-31 08:00]: > > ----- Original Message ----- > > > changeset a5a1fd171138 in /hg/release/icedtea6-1.11 > > > details: > > > http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=a5a1fd171138 > > > author: Omair Majid > > > date: Mon Jan 30 22:13:05 2012 -0500 > > > > > > Do not apply a missing patch > > > > > > > > > diffstat: > > > > > > ChangeLog | 7 +++++++ > > > Makefile.am | 1 - > > > 2 files changed, 7 insertions(+), 1 deletions(-) > > > > > > diffs (32 lines): > > > > > > diff -r 01cc2ea64fbd -r a5a1fd171138 ChangeLog > > > --- a/ChangeLog Mon Jan 30 18:26:19 2012 -0500 > > > +++ b/ChangeLog Mon Jan 30 22:13:05 2012 -0500 > > > @@ -1,3 +1,9 @@ > > > +2012-01-30 Omair Majid > > > + > > > + * Makefile.am (ICEDTEA_PATCHES): Remove > > > + 6761072-new_krb5_tests_fail_on_multiple_platforms.patch. It was > > > breaking > > > + the build. > > > + > > > 2012-01-30 Deepak Bhole > > > > > > Added patches to fix building with GCC 4.7 > > > @@ -6,6 +12,7 @@ > > > pointer. > > > * patches/openjdk/remove-mimpure-option-to-gcc.patch: New > > > patch. > > > Removes > > > the invalid -mimpure-text option to GCC. > > > + * Makefile.am (ICEDTEA_PATCHES): Add the above. > > > > > > 2012-01-25 Andrew Haley > > > > > > diff -r 01cc2ea64fbd -r a5a1fd171138 Makefile.am > > > --- a/Makefile.am Mon Jan 30 18:26:19 2012 -0500 > > > +++ b/Makefile.am Mon Jan 30 22:13:05 2012 -0500 > > > @@ -405,7 +405,6 @@ > > > patches/openjdk/6851973-kerberos.patch \ > > > patches/openjdk/7091528-javadoc_class_files.patch \ > > > patches/openjdk/7103725-ssl_beast_regression.patch \ > > > - > > > patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch > > > \ > > > patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch > > > \ > > > patches/openjdk/remove-mimpure-option-to-gcc.patch > > > > > > > > > > How the hell did this get added in the first place? > > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-January/017074.html > Yeah, I saw that mail after this one (as you may have guessed). > Deepak > > > -- > > 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 > > > -- 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 redhat.com Tue Jan 31 08:00:08 2012 From: omajid at redhat.com (Omair Majid) Date: Tue, 31 Jan 2012 11:00:08 -0500 Subject: Wiki & Bugzilla Updates In-Reply-To: References: Message-ID: <4F281008.9010401@redhat.com> On 01/31/2012 08:09 AM, Andrew Hughes wrote: > With the release of 1.11, I've updated the wiki and Bugzilla accordingly. > > It is now possible to file bugs against 1.11 and target them for 1.11.1. > I also added 8-hg which I noticed was missing. > Thanks! I noticed this last night but I did not have the permissions to add these myself. I was going to ping you today about this :) Cheers, Omair From omajid at redhat.com Tue Jan 31 08:11:12 2012 From: omajid at redhat.com (Omair Majid) Date: Tue, 31 Jan 2012 11:11:12 -0500 Subject: ARM: Fix crash in assembler interpreter In-Reply-To: <4F27DE7D.5090406@redhat.com> References: <4F27DE7D.5090406@redhat.com> Message-ID: <4F2812A0.6030701@redhat.com> On 01/31/2012 07:28 AM, Andrew Haley wrote: > Xerxes R?nby reported that he'd found a very rare crash in the GC when > running the ARM assembler interpreter in an interpreter-only > environment. The problem was tracked down to an incorrect saved > bytecode pointer in the interpreter state. The fix is very simple: > write the pointer back to the interpreter state when returning from > a method. > > We've tested this pretty extensively, so I'm committing this to trunk, > but I think it should go in the 1.11 branch too. OK? > Okay for 1.11. Cheers, Omair From aph at icedtea.classpath.org Tue Jan 31 08:12:06 2012 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Tue, 31 Jan 2012 16:12:06 +0000 Subject: /hg/release/icedtea6-1.11: 3 new changesets Message-ID: changeset 291ada80cdd9 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=291ada80cdd9 author: aph date: Tue Jan 31 07:17:17 2012 -0500 2012-01-27 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (class Hsdis): Set decode_instructions = NULL. changeset 6dea1be8ccc3 in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=6dea1be8ccc3 author: aph date: Tue Jan 31 07:19:24 2012 -0500 DECACHE_JPC in return_check_monitors 2012-01-31 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (return_check_monitors): DECACHE_JPC so that the saved bytecode pointer is correct for the GC. changeset a5c946d5f4bc in /hg/release/icedtea6-1.11 details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=a5c946d5f4bc author: aph date: Tue Jan 31 12:36:36 2012 +0000 Fix order of patches in ChangeLog so that it's clear when the release happened. diffstat: ChangeLog | 11 +++++++++++ arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 1 + arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 2 ++ 3 files changed, 14 insertions(+), 0 deletions(-) diffs (41 lines): diff -r 2f6cd79ca154 -r a5c946d5f4bc ChangeLog --- a/ChangeLog Tue Jan 31 00:18:57 2012 -0500 +++ b/ChangeLog Tue Jan 31 12:36:36 2012 +0000 @@ -1,3 +1,14 @@ +2012-01-31 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (return_check_monitors): DECACHE_JPC so that the saved bytecode + pointer is correct for the GC. + +2012-01-31 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (class Hsdis): Set + decode_instructions = NULL. + 2012-01-31 Omair Majid * NEWS: Add a section for 1.11.1. diff -r 2f6cd79ca154 -r a5c946d5f4bc arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Tue Jan 31 00:18:57 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Tue Jan 31 12:36:36 2012 +0000 @@ -3576,6 +3576,7 @@ return_check_monitors: stmdb arm_sp!, {r4, lr} + DECACHE_JPC ldr r2, [istate, #ISTATE_METHOD] ldr r4, [r2, #METHOD_ACCESSFLAGS] tst r4, #1<<5 diff -r 2f6cd79ca154 -r a5c946d5f4bc arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Tue Jan 31 00:18:57 2012 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Tue Jan 31 12:36:36 2012 +0000 @@ -736,6 +736,8 @@ // Load hsdis-arm.so lazily. Hsdis() { + decode_instructions = NULL; + if (PrintAssembly) { if (lib = dlopen("hsdis-arm.so", RTLD_NOW)) { decode_instructions From jvanek at redhat.com Tue Jan 31 08:55:42 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 31 Jan 2012 17:55:42 +0100 Subject: Wiki & Bugzilla Updates In-Reply-To: <4F281008.9010401@redhat.com> References: <4F281008.9010401@redhat.com> Message-ID: <4F281D0E.5030103@redhat.com> On 01/31/2012 05:00 PM, Omair Majid wrote: > On 01/31/2012 08:09 AM, Andrew Hughes wrote: >> With the release of 1.11, I've updated the wiki and Bugzilla accordingly. >> >> It is now possible to file bugs against 1.11 and target them for 1.11.1. >> I also added 8-hg which I noticed was missing. >> > > Thanks! I noticed this last night but I did not have the permissions to add these myself. I was going to ping you today about this :) > > Cheers, > Omair > I think that also http://icedtea.classpath.org/wiki/BuildRequirements should be upgraded. As dependence on Xerxes and Xalan is no longer valid, and was repalced by xsltproc (In Fedora hidden under libxslt). In rpm I have removed build requires xalan-j2 and xerces-j2 and added build requires libxslt, and build passed. Am I correct? In case that yes, then Danesh should do the change, as he s the guilty one for this change O:) This should be valid for head and 1.11 branch. J. From thomas at m3y3r.de Tue Jan 31 09:46:49 2012 From: thomas at m3y3r.de (Thomas Meyer) Date: Tue, 31 Jan 2012 18:46:49 +0100 Subject: [RFC] Always answer a message with a reference In-Reply-To: <20120126211413.GA2279@redhat.com> References: <201201092339.q09NdYVW010885@bzweb01.app.bz.hst.phx2.redhat.com> <1326179792.1352.7.camel@localhost.localdomain> <20120126211413.GA2279@redhat.com> Message-ID: <1328032009.1486.18.camel@localhost.localdomain> Am Donnerstag, den 26.01.2012, 16:14 -0500 schrieb Deepak Bhole: > Hi Thomas, Hi Deepak, > This patch is always returning JavaScriptGetWindow back to the Java > side. I am not sure if this currently causes issues or not, but even if > it doesn't, it may down the road if someone changes the Java side > without realizing that C++ is going to return "JavaScriptGetWindow" if > it discards the message. > > I think it would therefore be better to return a new tag, something like > "PluginMessageDiscarded" Hi, I think we should drop this idea (to always reply to a send message), as I have the impression that it doesn't bring any value. better fix the real problem instead of papering over the problem. kind regards thomas From thomas at m3y3r.de Tue Jan 31 09:52:14 2012 From: thomas at m3y3r.de (Thomas Meyer) Date: Tue, 31 Jan 2012 18:52:14 +0100 Subject: [RFC] Introduce PAV.isStatusActive() for static JSObject.getWindow() In-Reply-To: <20120126211834.GB2279@redhat.com> References: <1326184075.1352.12.camel@localhost.localdomain> <20120126211834.GB2279@redhat.com> Message-ID: <1328032334.1486.24.camel@localhost.localdomain> Am Donnerstag, den 26.01.2012, 16:18 -0500 schrieb Deepak Bhole: > * Thomas Meyer [2012-01-10 03:29]: > > Check in static JSObject.getWindow() if the PAV containing the applet is > > usable by the user. > > > > Hi Thomas, Hi Deepak, > > Rather than relying on PluginAppletViewer.status, what about using > applet.isActive()? Or did you turn into issues with that approach? I wasn't aware of, that this method could be used here! I added below extra check, because of PR852. I did run into the situation that the instance was not active any more, but the called to getWindow() still happened with an reference this inactive instance. I think by fixing PR852, this extra check is not needed any more. mfg thomas > > Cheers, > Deepak > > > diff -r 7d090bfa3819 plugin/icedteanp/java/netscape/javascript/JSObject.java > > --- a/plugin/icedteanp/java/netscape/javascript/JSObject.java Tue Dec 13 12:45:36 2011 +0100 > > +++ b/plugin/icedteanp/java/netscape/javascript/JSObject.java Tue Jan 10 09:20:54 2012 +0100 > > @@ -242,10 +242,14 @@ > > */ > > public static JSObject getWindow(Applet applet) { > > PluginDebug.debug("JSObject.getWindow"); > > + PluginAppletViewer pav = (PluginAppletViewer) applet.getAppletContext(); > > + > > + if(!pav.isStatusActive()) > > + throw new IllegalArgumentException("PAV is not usable/inactive"); > > + > > // FIXME: handle long case as well. > > long internal = 0; > > - internal = ((PluginAppletViewer) > > - applet.getAppletContext()).getWindow(); > > + internal = pav.getWindow(); > > PluginDebug.debug("GOT IT: ", internal); > > return new JSObject(internal); > > } > > diff -r 7d090bfa3819 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > > --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue Dec 13 12:45:36 2011 +0100 > > +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue Jan 10 09:20:54 2012 +0100 > > @@ -675,6 +675,16 @@ > > PluginDebug.debug("Applet panel ", panel, " initialized"); > > } > > > > + /** > > + * Is this PAV usable by the user > > + * > > + * @return true, when usable by the user > > + */ > > + public boolean isStatusActive() { > > + > > + return status.get(identifier).equals(PAV_INIT_STATUS.REFRAME_COMPLETE); > > + } > > + > > public void handleMessage(int reference, String message) { > > if (message.startsWith("width")) { > > > > > > From bugzilla-daemon at icedtea.classpath.org Tue Jan 31 10:05:53 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 Jan 2012 18:05:53 +0000 Subject: [Bug 858] MarvinSketch and several other Applets not working In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=858 --- Comment #4 from thomas at m3y3r.de 2012-01-31 18:05:53 UTC --- Test URL for MarvinSketch http://www.chemaxon.com/marvin-archive/5.8.0/marvin/examples/applets/sketch.html - Same as PR822? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue Jan 31 11:17:40 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 Jan 2012 19:17:40 +0000 Subject: [Bug 858] MarvinSketch and several other Applets not working In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=858 --- Comment #5 from thomas at m3y3r.de 2012-01-31 19:17:40 UTC --- - Same as PR822? No. Appling the proposed patch doesn't solve the problem. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue Jan 31 11:21:19 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 Jan 2012 19:21:19 +0000 Subject: [Bug 864] New: icedtea-web is confused by dual monitor setup Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=864 Bug #: 864 Summary: icedtea-web is confused by dual monitor setup Classification: Unclassified Product: IcedTea-Web Version: hg Platform: x86_64 OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: Plugin AssignedTo: dbhole at redhat.com ReportedBy: thomas at m3y3r.de CC: unassigned at icedtea.classpath.org The dialog window for allowing additional permissions to signed applets is misplaced, when the browser window is maximised in one window. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ddadacha at redhat.com Tue Jan 31 09:52:54 2012 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Tue, 31 Jan 2012 12:52:54 -0500 Subject: Wiki & Bugzilla Updates In-Reply-To: <4F281D0E.5030103@redhat.com> References: <4F281008.9010401@redhat.com> <4F281D0E.5030103@redhat.com> Message-ID: <4F282A76.9030200@redhat.com> On 31/01/12 11:55 AM, Jiri Vanek wrote: > On 01/31/2012 05:00 PM, Omair Majid wrote: >> On 01/31/2012 08:09 AM, Andrew Hughes wrote: >>> With the release of 1.11, I've updated the wiki and Bugzilla >>> accordingly. >>> >>> It is now possible to file bugs against 1.11 and target them for 1.11.1. >>> I also added 8-hg which I noticed was missing. >>> >> >> Thanks! I noticed this last night but I did not have the permissions >> to add these myself. I was going to ping you today about this :) >> >> Cheers, >> Omair >> > > > I think that also http://icedtea.classpath.org/wiki/BuildRequirements > should be upgraded. > > As dependence on Xerxes and Xalan is no longer valid, and was repalced > by xsltproc (In Fedora hidden under libxslt). > > In rpm I have removed build requires xalan-j2 and xerces-j2 and added > build requires libxslt, and build passed. > > Am I correct? In case that yes, then Danesh should do the change, as he > s the guilty one for this change O:) Nope, Andrew Hughes was the one who wrote the original patch for icedtea7 and backported to icedtea6. (I've got backports of icedtea6's changeset in review for 6-1.10 and 6-1.9 so that's probably where the confusion came in =) ) Cheers, Danesh From ddadacha at redhat.com Tue Jan 31 12:07:15 2012 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Tue, 31 Jan 2012 15:07:15 -0500 Subject: [RFC][icedtea-web] Fix for single instance service with applets using jnlp_href Message-ID: <4F2849F3.2030003@redhat.com> Hi, Attached is a patch to fix SingleInstanceService to work when applets use jnlp_href. If a single instance exists, it'll throw a fatal exception for the second applet and stop running it. The applet passes the args along while checking. However, proprietary documentation is unclear about which args are passed so for now I have left it as a FIXME until that's cleared up. ChangeLog: +2012-01-31 Danesh Dadachanji + + Fixed SingleInstanceService to work with jnlp_href. + * netx/net/sourceforge/jnlp/Launcher.java + (launchApplication): Print existing single instance in debug mode. + (launchApplet): Added check for single instance, throws launchError if + single instance already exists. + (getApplet): Same as above. + (launchInstaller): Added TODO reminder for when it is implemented. + * netx/net/sourceforge/jnlp/resources/Messages.properties: + Added LSingleInstanceExists. + * netx/net/sourceforge/jnlp/services/XSingleInstanceService.java + (initializeSingleInstance): Modified to always initialize if the applet is + being run by the plugin. + (checkSingleInstanceRunning): Modified args passed to SingleInstanceListener. + Marked applets' args as FIXME, for now it passes an empty args array. + Okay for HEAD? Cheers, Danesh -------------- next part -------------- A non-text attachment was scrubbed... Name: single-instance-service-01.patch Type: text/x-patch Size: 6545 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120131/4717866c/single-instance-service-01.patch From ddadacha at redhat.com Tue Jan 31 12:59:40 2012 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Tue, 31 Jan 2012 15:59:40 -0500 Subject: [RFC][icedtea-web] Use description param when creating a LaunchException Message-ID: <4F28563C.70109@redhat.com> Hi, I stumbled onto this while throwing an exception in my patch for single instance with jnlp_href. We never output the description parameter passed into the constructor of LaunchException. The message passed into the super call doesn't include it so the user will never see it. I see no harm in adding the details to the message outputted when an exception is thrown. Currently, all the values passed as description are either direct empty strings or localized keys that have no text. Can we put it to some use? The patch mentioned above does so and perhaps this will encourage others to do so! =) ChangeLog: +2012-01-31 Danesh Dadachanji + + * netx/net/sourceforge/jnlp/LaunchException.java: Add description + parameter to the message the exception stores. + Thoughts? Okay for HEAD? Cheers, Danesh -------------- next part -------------- A non-text attachment was scrubbed... Name: launch-exception-01.patch Type: text/x-patch Size: 679 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120131/99fa78dc/launch-exception-01.patch