From joe.darcy at oracle.com Tue Jun 1 10:15:15 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Tue, 01 Jun 2010 10:15:15 -0700 Subject: Openjdk6 testing In-Reply-To: <0C73A5FE-A601-4DF4-ABEF-1E267EA71027@oracle.com> References: <0C73A5FE-A601-4DF4-ABEF-1E267EA71027@oracle.com> Message-ID: <4C054023.2080900@oracle.com> Thanks Kelly, -Joe Kelly O'Hair wrote: > FYI... > > I'm getting 3 jdk nio test failures with openjdk6. The middle one is > mine, bug 6933622 an older bug. > The first one looks like 6920545, so I added a 6-open version for that > bug. > > The last one I'm filing a new bug on. 6957098 > > -kto > > > FAILED: java/nio/charset/Charset/NIOCharsetAvailabilityTest.java > FAILED: sun/nio/cs/Test4200310.sh > FAILED: sun/nio/cs/TestSJIS0213.java > > -------------------------------------------------- > TEST: java/nio/charset/Charset/NIOCharsetAvailabilityTest.java > JDK under test: > (/tmp/jprt/P1/T/182806.ohair/testproduct/solaris_sparc_5.8-product) > openjdk version "1.6.0-201005281828.ohair.jdk" > OpenJDK Runtime Environment (build > 1.6.0-201005281828.ohair.jdk-jprtadm_29_May_2010_00_34-b00) > Java HotSpot(TM) Server VM (build 17.0-b14, mixed mode) > > ACTION: build -- Passed. Build successful > REASON: Named class compiled on demand > TIME: 1.917 seconds > messages: > command: build NIOCharsetAvailabilityTest > reason: Named class compiled on demand > elapsed time (seconds): 1.917 > > ACTION: compile -- Passed. Compilation successful > REASON: .class file out of date or does not exist > TIME: 1.917 seconds > messages: > command: compile > /tmp/jprt/P1/T/182806.ohair/source/test/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java > > reason: .class file out of date or does not exist > elapsed time (seconds): 1.917 > STDOUT: > STDERR: > /tmp/jprt/P1/T/182806.ohair/source/test/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java:46: > warning: sun.misc.Launcher is Sun proprietary API and may be removed > in a future release > import sun.misc.Launcher; > ^ > /tmp/jprt/P1/T/182806.ohair/source/test/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java:91: > warning: sun.security.action.GetPropertyAction is Sun proprietary API > and may be removed in a future release > new > sun.security.action.GetPropertyAction("sun.boot.class.path")); > ^ > /tmp/jprt/P1/T/182806.ohair/source/test/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java:94: > warning: sun.security.action.GetPropertyAction is Sun proprietary API > and may be removed in a future release > new > sun.security.action.GetPropertyAction("java.class.path")); > ^ > /tmp/jprt/P1/T/182806.ohair/source/test/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java:112: > warning: sun.misc.Launcher is Sun proprietary API and may be removed > in a future release > ClassLoader appLoader = Launcher.getLauncher().getClassLoader(); > ^ > Note: > /tmp/jprt/P1/T/182806.ohair/source/test/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java > uses unchecked or unsafe operations. > Note: Recompile with -Xlint:unchecked for details. > 4 warnings > > ACTION: main -- Failed. Execution failed: `main' threw exception: > java.lang.RuntimeException > REASON: Assumed action based on file name: run main > NIOCharsetAvailabilityTest > TIME: 7.506 seconds > messages: > command: main NIOCharsetAvailabilityTest > reason: Assumed action based on file name: run main > NIOCharsetAvailabilityTest > elapsed time (seconds): 7.506 > STDOUT: > Unused Charset subclass: sun.nio.cs.ext.MS932DB > STDERR: > java.lang.RuntimeException > at > NIOCharsetAvailabilityTest.main(NIOCharsetAvailabilityTest.java:80) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at > sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) > > at > sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) > > at java.lang.reflect.Method.invoke(Method.java:616) > at > com.sun.javatest.regtest.MainWrapper$MainThread.run(MainWrapper.java:94) > at java.lang.Thread.run(Thread.java:636) > > JavaTest Message: Test threw exception: java.lang.RuntimeException > JavaTest Message: shutting down test > > STATUS:Failed.`main' threw exception: java.lang.RuntimeException > > TEST RESULT: Failed. Execution failed: `main' threw exception: > java.lang.RuntimeException > -------------------------------------------------- > > -------------------------------------------------- > TEST: sun/nio/cs/Test4200310.sh > JDK under test: > (/tmp/jprt/P1/T/182806.ohair/testproduct/solaris_sparc_5.8-product) > openjdk version "1.6.0-201005281828.ohair.jdk" > OpenJDK Runtime Environment (build > 1.6.0-201005281828.ohair.jdk-jprtadm_29_May_2010_00_34-b00) > Java HotSpot(TM) Server VM (build 17.0-b14, mixed mode) > > ACTION: shell -- Failed. Execution failed: exit code 1 > REASON: User specified action: run shell Test4200310.sh > TIME: 1.348 seconds > messages: > command: shell Test4200310.sh [] > reason: User specified action: run shell Test4200310.sh > elapsed time (seconds): 1.348 > STDOUT: > FAILED: sun/nio/cs/ext/DoubleByteDecoder.class > sun/nio/cs/ext/DoubleByteEncoder.class > sun/nio/cs/ext/EUC_CN$Decoder.class > sun/nio/cs/ext/EUC_CN$Encoder.class sun/nio/cs/ext/EUC_CN.class > sun/nio/cs/ext/EUC_KR$Decoder.class > sun/nio/cs/ext/EUC_KR$Encoder.class sun/nio/cs/ext/EUC_KR.class > sun/nio/cs/ext/EUC_TW$Decoder.class > sun/nio/cs/ext/EUC_TW$Encoder.class sun/nio/cs/ext/EUC_TW.class > sun/nio/cs/ext/ExtendedCharsets.class sun/nio/cs/ext/GBK$Decoder.class > sun/nio/cs/ext/GBK$Encoder.class sun/nio/cs/ext/GBK.class > sun/nio/cs/ext/HKSCS$Decoder.class sun/nio/cs/ext/HKSCS$Encoder.class > sun/nio/cs/ext/HKSCS.class sun/nio/cs/ext/JIS_X_0201$Decoder.class > sun/nio/cs/ext/JIS_X_0201$Encoder.class > sun/nio/cs/ext/JIS_X_0201.class > sun/nio/cs/ext/JIS_X_0208_Decoder.class > sun/nio/cs/ext/JIS_X_0208_Encoder.class > sun/nio/cs/ext/JIS_X_0212_Decoder.class > sun/nio/cs/ext/JIS_X_0212_Encoder.class are duplicated between rt.jar, > charsets.jar, and localedata.jar > STDERR: > > TEST RESULT: Failed. Execution failed: exit code 1 > -------------------------------------------------- > > > -------------------------------------------------- > TEST: sun/nio/cs/TestSJIS0213.java > JDK under test: > (/tmp/jprt/P1/T/182806.ohair/testproduct/solaris_sparc_5.8-product) > openjdk version "1.6.0-201005281828.ohair.jdk" > OpenJDK Runtime Environment (build > 1.6.0-201005281828.ohair.jdk-jprtadm_29_May_2010_00_34-b00) > Java HotSpot(TM) Server VM (build 17.0-b14, mixed mode) > > ACTION: build -- Passed. Build successful > REASON: Named class compiled on demand > TIME: 1.682 seconds > messages: > command: build TestSJIS0213 > reason: Named class compiled on demand > elapsed time (seconds): 1.682 > > ACTION: compile -- Passed. Compilation successful > REASON: .class file out of date or does not exist > TIME: 1.681 seconds > messages: > command: compile > /tmp/jprt/P1/T/182806.ohair/source/test/sun/nio/cs/TestSJIS0213.java > reason: .class file out of date or does not exist > elapsed time (seconds): 1.681 > STDOUT: > STDERR: > > ACTION: main -- Failed. Execution failed: `main' threw exception: > java.io.UnsupportedEncodingException: MS932_0213 > REASON: Assumed action based on file name: run main TestSJIS0213 > TIME: 0.262 seconds > messages: > command: main TestSJIS0213 > reason: Assumed action based on file name: run main TestSJIS0213 > elapsed time (seconds): 0.262 > STDOUT: > STDERR: > java.io.UnsupportedEncodingException: MS932_0213 > at java.lang.StringCoding.decode(StringCoding.java:188) > at java.lang.String.(String.java:451) > at java.lang.String.(String.java:523) > at TestSJIS0213.main(TestSJIS0213.java:86) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at > sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) > > at > sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) > > at java.lang.reflect.Method.invoke(Method.java:616) > at > com.sun.javatest.regtest.MainWrapper$MainThread.run(MainWrapper.java:94) > at java.lang.Thread.run(Thread.java:636) > > JavaTest Message: Test threw exception: > java.io.UnsupportedEncodingException: MS932_0213 > JavaTest Message: shutting down test > > STATUS:Failed.`main' threw exception: > java.io.UnsupportedEncodingException: MS932_0213 > > TEST RESULT: Failed. Execution failed: `main' threw exception: > java.io.UnsupportedEncodingException: MS932_0213 > -------------------------------------------------- > > > From chris.hegarty at oracle.com Wed Jun 2 06:41:06 2010 From: chris.hegarty at oracle.com (Chris Hegarty) Date: Wed, 02 Jun 2010 14:41:06 +0100 Subject: CR 6884837 - jdk6 Message-ID: <4C065F72.2020801@oracle.com> Hi Joe, Alan, Michael, Can I please ask for review(Alan/Michael)/permission(Joe) to integrate this simple testcase change into 6 Open. This change has been in JDK7 since b74. CR 6884837: test/java/net/MulticastSocket/SetOutgoingIf.java should check if interfaces are up/support multicast Webrev: http://cr.openjdk.java.net/~chegar/6884837/webrev.6Open/webrev/ Thanks, -Chris. From michael.x.mcmahon at oracle.com Wed Jun 2 07:42:16 2010 From: michael.x.mcmahon at oracle.com (Michael McMahon) Date: Wed, 02 Jun 2010 15:42:16 +0100 Subject: CR 6884837 - jdk6 In-Reply-To: <4C065F72.2020801@oracle.com> References: <4C065F72.2020801@oracle.com> Message-ID: <4C066DC8.1000705@oracle.com> Chris Hegarty wrote: > Hi Joe, Alan, Michael, > > Can I please ask for review(Alan/Michael)/permission(Joe) to integrate > this simple testcase change into 6 Open. This change has been in JDK7 > since b74. > > CR 6884837: test/java/net/MulticastSocket/SetOutgoingIf.java should > check if interfaces are up/support multicast > > Webrev: > http://cr.openjdk.java.net/~chegar/6884837/webrev.6Open/webrev/ > > Thanks, > -Chris. looks fine. - Michael From joe.darcy at oracle.com Wed Jun 2 11:27:29 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Wed, 02 Jun 2010 11:27:29 -0700 Subject: CR 6884837 - jdk6 In-Reply-To: <4C066DC8.1000705@oracle.com> References: <4C065F72.2020801@oracle.com> <4C066DC8.1000705@oracle.com> Message-ID: <4C06A291.4010704@oracle.com> Michael McMahon wrote: > Chris Hegarty wrote: >> Hi Joe, Alan, Michael, >> >> Can I please ask for review(Alan/Michael)/permission(Joe) to >> integrate this simple testcase change into 6 Open. This change has >> been in JDK7 since b74. >> >> CR 6884837: test/java/net/MulticastSocket/SetOutgoingIf.java should >> check if interfaces are up/support multicast >> >> Webrev: >> http://cr.openjdk.java.net/~chegar/6884837/webrev.6Open/webrev/ >> >> Thanks, >> -Chris. > looks fine. > - Michael Approved to be pushed into OpenJDK 6. Thanks, -Joe From ahughes at redhat.com Wed Jun 2 11:39:06 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 2 Jun 2010 19:39:06 +0100 Subject: CR 6884837 - jdk6 In-Reply-To: <4C06A291.4010704@oracle.com> References: <4C065F72.2020801@oracle.com> <4C066DC8.1000705@oracle.com> <4C06A291.4010704@oracle.com> Message-ID: On 2 June 2010 19:27, Joe Darcy wrote: > Michael McMahon wrote: >> >> Chris Hegarty wrote: >>> >>> Hi Joe, Alan, Michael, >>> >>> Can I please ask for review(Alan/Michael)/permission(Joe) to integrate >>> this simple testcase change into 6 Open. This change has been in JDK7 since >>> b74. >>> >>> CR 6884837: test/java/net/MulticastSocket/SetOutgoingIf.java should check >>> if interfaces are up/support multicast >>> >>> Webrev: >>> ?http://cr.openjdk.java.net/~chegar/6884837/webrev.6Open/webrev/ >>> >>> Thanks, >>> -Chris. >> >> looks fine. >> - Michael > > Approved to be pushed into OpenJDK 6. > > Thanks, > > -Joe > Joe, what are we still waiting on for b20? The HotSpot fixes we discussed are in and I saw that the JDK repository was updated. Thanks, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From joe.darcy at oracle.com Wed Jun 2 11:41:58 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Wed, 02 Jun 2010 11:41:58 -0700 Subject: CR 6884837 - jdk6 In-Reply-To: References: <4C065F72.2020801@oracle.com> <4C066DC8.1000705@oracle.com> <4C06A291.4010704@oracle.com> Message-ID: <4C06A5F6.8030909@oracle.com> Andrew John Hughes wrote: > On 2 June 2010 19:27, Joe Darcy wrote: > >> Michael McMahon wrote: >> >>> Chris Hegarty wrote: >>> >>>> Hi Joe, Alan, Michael, >>>> >>>> Can I please ask for review(Alan/Michael)/permission(Joe) to integrate >>>> this simple testcase change into 6 Open. This change has been in JDK7 since >>>> b74. >>>> >>>> CR 6884837: test/java/net/MulticastSocket/SetOutgoingIf.java should check >>>> if interfaces are up/support multicast >>>> >>>> Webrev: >>>> http://cr.openjdk.java.net/~chegar/6884837/webrev.6Open/webrev/ >>>> >>>> Thanks, >>>> -Chris. >>>> >>> looks fine. >>> - Michael >>> >> Approved to be pushed into OpenJDK 6. >> >> Thanks, >> >> -Joe >> >> > > Joe, what are we still waiting on for b20? The HotSpot fixes we > discussed are in and I saw that the JDK repository was updated. > > Thanks, > Hello. We are waiting for the notices under http://openjdk.java.net/legal/ to be updated. Once they are, the copies of the files in the repos can be updated and the legal notices in the jaxp and jax-ws source bundles can be updated, allowing fully rebranded source bundles to be created. -Joe From kelly.ohair at oracle.com Wed Jun 2 12:52:55 2010 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Wed, 2 Jun 2010 12:52:55 -0700 Subject: CR 6884837 - jdk6 In-Reply-To: <4C065F72.2020801@oracle.com> References: <4C065F72.2020801@oracle.com> Message-ID: <48034AE8-9A86-4A45-BC46-D017298A47C7@oracle.com> Looks ok to me. -kto On Jun 2, 2010, at 6:41 AM, Chris Hegarty wrote: > Hi Joe, Alan, Michael, > > Can I please ask for review(Alan/Michael)/permission(Joe) to > integrate this simple testcase change into 6 Open. This change has > been in JDK7 since b74. > > CR 6884837: test/java/net/MulticastSocket/SetOutgoingIf.java should > check if interfaces are up/support multicast > > Webrev: > http://cr.openjdk.java.net/~chegar/6884837/webrev.6Open/webrev/ > > Thanks, > -Chris. From chris.hegarty at oracle.com Thu Jun 3 01:53:45 2010 From: chris.hegarty at oracle.com (chris.hegarty at oracle.com) Date: Thu, 03 Jun 2010 08:53:45 +0000 Subject: hg: jdk6/jdk6/jdk: 6884837: test/java/net/MulticastSocket/SetOutgoingIf.java should check if interfaces are up/support multicast Message-ID: <20100603085353.6117D46F0D@hg.openjdk.java.net> Changeset: a25f15bfd04b Author: chegar Date: 2010-06-03 09:52 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/a25f15bfd04b 6884837: test/java/net/MulticastSocket/SetOutgoingIf.java should check if interfaces are up/support multicast Reviewed: michaelm, ohair ! test/java/net/MulticastSocket/SetOutgoingIf.java From ahughes at redhat.com Thu Jun 3 10:18:12 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 3 Jun 2010 18:18:12 +0100 Subject: bugs.openjdk.java.net is offline In-Reply-To: <4BF43864.3030709@oracle.com> References: <4BEAEF5B.8050203@oracle.com> <1274265738.2583.44.camel@hermans.wildebeest.org> <4BF3C3F0.6030000@oracle.com> <4BF43864.3030709@oracle.com> Message-ID: On 19 May 2010 20:13, Brad Wetmore wrote: > > On 5/19/2010 3:56 AM, Daniel D. Daugherty wrote: >> >> On 5/19/2010 4:42 AM, Mark Wielaard wrote: >>> >>> On Wed, 2010-05-12 at 11:11 -0700, Brad Wetmore wrote: >>>> >>>> We're aware of the problem and are working on it. >>> >>> Thanks. It is still (again?) down for me. >>> Also hg.openjdk.java.net is giving: >>> 500 - Internal Server Error >> >> That would be "again" as opposed to "still". > > No, "still" is correct. ?We're waiting on some system administration help. > > Brad > > Any news on when bugs.openjdk.java.net will be back online? -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Fri Jun 4 02:43:31 2010 From: ahughes at redhat.com (ahughes at redhat.com) Date: Fri, 04 Jun 2010 09:43:31 +0000 Subject: hg: jdk6/jdk6/corba: 2 new changesets Message-ID: <20100604094335.5405A46F4D@hg.openjdk.java.net> Changeset: 686e973a3cda Author: alanb Date: 2010-06-04 10:29 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/corba/rev/686e973a3cda 6939646: Remove obsolete com.sun.corba.se.internal.io package Reviewed-by: ohair ! make/sun/corba/Makefile - make/sun/corba/core/Makefile - make/sun/corba/core/mapfile-vers - src/share/classes/com/sun/corba/se/internal/io/IIOPInputStream.java - src/share/classes/com/sun/corba/se/internal/io/IIOPOutputStream.java - src/share/classes/com/sun/corba/se/internal/io/LibraryManager.java - src/share/classes/com/sun/corba/se/internal/io/ObjectStreamClass.java - src/share/native/com/sun/corba/se/internal/io/ioser.c Changeset: 4024a4ef3a46 Author: alanb Date: 2010-06-01 15:16 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/corba/rev/4024a4ef3a46 6955873: CORBA resources bundles and javax.activity missing from b94 Reviewed-by: ohair - make/com/sun/corba/minclude/ioser_io.jmk ! make/sun/corba/Makefile + make/sun/corba/core/Makefile ! make/sun/rmi/rmic/FILES.gmk From joe.darcy at oracle.com Fri Jun 4 15:20:16 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 04 Jun 2010 15:20:16 -0700 Subject: CR 6884837 - jdk6 In-Reply-To: <4C06A5F6.8030909@oracle.com> References: <4C065F72.2020801@oracle.com> <4C066DC8.1000705@oracle.com> <4C06A291.4010704@oracle.com> <4C06A5F6.8030909@oracle.com> Message-ID: <4C097C20.4030005@oracle.com> Joe Darcy wrote: > Andrew John Hughes wrote: >> On 2 June 2010 19:27, Joe Darcy wrote: >> >>> Michael McMahon wrote: >>> >>>> Chris Hegarty wrote: >>>> >>>>> Hi Joe, Alan, Michael, >>>>> >>>>> Can I please ask for review(Alan/Michael)/permission(Joe) to >>>>> integrate >>>>> this simple testcase change into 6 Open. This change has been in >>>>> JDK7 since >>>>> b74. >>>>> >>>>> CR 6884837: test/java/net/MulticastSocket/SetOutgoingIf.java >>>>> should check >>>>> if interfaces are up/support multicast >>>>> >>>>> Webrev: >>>>> http://cr.openjdk.java.net/~chegar/6884837/webrev.6Open/webrev/ >>>>> >>>>> Thanks, >>>>> -Chris. >>>>> >>>> looks fine. >>>> - Michael >>>> >>> Approved to be pushed into OpenJDK 6. >>> >>> Thanks, >>> >>> -Joe >>> >>> >> >> Joe, what are we still waiting on for b20? The HotSpot fixes we >> discussed are in and I saw that the JDK repository was updated. >> >> Thanks, >> > > Hello. > > We are waiting for the notices under http://openjdk.java.net/legal/ to > be updated. Once they are, the copies of the files in the repos can > be updated and the legal notices in the jaxp and jax-ws source bundles > can be updated, allowing fully rebranded source bundles to be created. > Upon further review, waiting for the notices to be updated should not block wrapping up build 20. Toward that goal, a rebranded jaxp bundle is available from: https://jaxp.dev.java.net/files/documents/913/150648/jdk6-jaxp-b20.zip (Besides rebranding, this new jaxp bundle removes independent copies of some of the legal notices; the jaxp repository retains copies of those notices.) A webrev of build changes to the jaxp repo will follow as will bundles for jax-ws and jaf. -Joe From ahughes at redhat.com Fri Jun 4 17:59:40 2010 From: ahughes at redhat.com (ahughes at redhat.com) Date: Sat, 05 Jun 2010 00:59:40 +0000 Subject: hg: jdk6/jdk6/jdk: 6958257: Add support for alpha Message-ID: <20100605010001.9EDBC46F95@hg.openjdk.java.net> Changeset: 5066974a1f7d Author: andrew Date: 2010-06-03 18:49 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/5066974a1f7d 6958257: Add support for alpha Summary: Allow the Zero port to be built on alpha architectures Reviewed-by: ohair ! make/common/Defs-linux.gmk From kelly.ohair at oracle.com Fri Jun 4 18:40:24 2010 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Fri, 4 Jun 2010 18:40:24 -0700 Subject: Need reviewer: jaxp source drop update, a few fixes Message-ID: Need reviewer, 3 fixes here: 6955301: Update names and references to rebranded drop bundles (jaxp, jaxws, jaf) 6940241: Change jaxp/jaxws so that the http downloads are not done by default 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts http://cr.openjdk.java.net/~ohair/openjdk6/jaxp-b20-drop/webrev/ The new jaxp drop file will be: https://jaxp.dev.java.net/files/documents/913/150648/jaxp_src.bundle.name=jdk6-jaxp-b20.zip On 6940241, by default, the source drop bundle will NOT be downloaded unless the ant property allow.downloads=true is defined, so you have to explicitly allow this. The env var ALT_DROPS_DIR or ant property drops.dir should refer to the directory holding the downloaded jaxp/jaxws source drop bundles. -kto -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/jdk6-dev/attachments/20100604/a3670a3c/attachment.html From jonathan.gibbons at oracle.com Fri Jun 4 18:55:32 2010 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Fri, 04 Jun 2010 18:55:32 -0700 Subject: Need reviewer: jaxp source drop update, a few fixes In-Reply-To: References: Message-ID: <4C09AE94.5060403@oracle.com> On 06/04/2010 06:40 PM, Kelly O'Hair wrote: > > Need reviewer, 3 fixes here: > > 6955301: Update names and references to rebranded drop bundles (jaxp, > jaxws, jaf) > 6940241: Change jaxp/jaxws so that the http downloads are not done by > default > 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts > > http://cr.openjdk.java.net/~ohair/openjdk6/jaxp-b20-drop/webrev/ > > > The new jaxp drop file will be: > https://jaxp.dev.java.net/files/documents/913/150648/jaxp_src.bundle.name=jdk6-jaxp-b20.zip > > On 6940241, by default, the source drop bundle will NOT be downloaded > unless the ant property > allow.downloads=true > is defined, so you have to explicitly allow this. > > The env var ALT_DROPS_DIR or ant property drops.dir should refer to > the directory holding the > downloaded jaxp/jaxws source drop bundles. > > -kto Kelly, (why) does the package-info fix work? why do you need a second compilation of everything? -- Jon -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/jdk6-dev/attachments/20100604/e7a8ed31/attachment.html From martinrb at google.com Fri Jun 4 19:02:27 2010 From: martinrb at google.com (Martin Buchholz) Date: Fri, 4 Jun 2010 19:02:27 -0700 Subject: Need reviewer: jaxp source drop update, a few fixes In-Reply-To: References: Message-ID: On Fri, Jun 4, 2010 at 18:40, Kelly O'Hair wrote: > ???https://jaxp.dev.java.net/files/documents/913/150648/jaxp_src.bundle.name=jdk6-jaxp-b20.zip Is there a reason why trying to access https://jaxp.dev.java.net/files/documents/913/150648/ gives You don't have permission to access /files/nidaba/documents/913/150648/ on this server. Martin From kelly.ohair at oracle.com Fri Jun 4 19:23:07 2010 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Fri, 4 Jun 2010 19:23:07 -0700 Subject: Need reviewer: jaxp source drop update, a few fixes In-Reply-To: References: Message-ID: On Jun 4, 2010, at 7:02 PM, Martin Buchholz wrote: > On Fri, Jun 4, 2010 at 18:40, Kelly O'Hair > wrote: >> https://jaxp.dev.java.net/files/documents/913/150648/jaxp_src.bundle.name=jdk6-jaxp-b20.zip > I meant: https://jaxp.dev.java.net/files/documents/913/150648/jdk6-jaxp-b20.zip sorry. > Is there a reason why trying to access > https://jaxp.dev.java.net/files/documents/913/150648/ > gives > > You don't have permission to access > /files/nidaba/documents/913/150648/ on this server. I've never understood that, you can access a file but not the directory contents. -kto > > Martin From joe.darcy at oracle.com Mon Jun 7 09:06:39 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Mon, 07 Jun 2010 09:06:39 -0700 Subject: Need reviewer: jaxp source drop update, a few fixes In-Reply-To: References: Message-ID: <4C0D190F.7000800@oracle.com> Hi Kelly. Kelly O'Hair wrote: > > Need reviewer, 3 fixes here: > > 6955301: Update names and references to rebranded drop bundles (jaxp, > jaxws, jaf) > 6940241: Change jaxp/jaxws so that the http downloads are not done by > default > 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts > > http://cr.openjdk.java.net/~ohair/openjdk6/jaxp-b20-drop/webrev/ > > > The new jaxp drop file will be: > https://jaxp.dev.java.net/files/documents/913/150648/jaxp_src.bundle.name=jdk6-jaxp-b20.zip > > On 6940241, by default, the source drop bundle will NOT be downloaded > unless the ant property > allow.downloads=true > is defined, so you have to explicitly allow this. > > The env var ALT_DROPS_DIR or ant property drops.dir should refer to > the directory holding the > downloaded jaxp/jaxws source drop bundles. Before approving this, I want to understand the impact on the build logistics with 6940241. In particular, what happens if: * A fresh hg fclone is done and a "make" command is issued from the root directory? * If allow.downloads is made true, do subsequent builds always download or do they first check for a matching file in the build directory? -Joe From kelly.ohair at oracle.com Mon Jun 7 09:33:39 2010 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Mon, 7 Jun 2010 09:33:39 -0700 Subject: Need reviewer: jaxp source drop update, a few fixes In-Reply-To: <4C0D190F.7000800@oracle.com> References: <4C0D190F.7000800@oracle.com> Message-ID: <82733369-DC79-4AC2-B433-2468B1261ED1@oracle.com> On Jun 7, 2010, at 9:06 AM, Joe Darcy wrote: > Hi Kelly. > > Kelly O'Hair wrote: >> >> Need reviewer, 3 fixes here: >> >> 6955301: Update names and references to rebranded drop bundles >> (jaxp, jaxws, jaf) >> 6940241: Change jaxp/jaxws so that the http downloads are not done >> by default >> 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts >> >> http://cr.openjdk.java.net/~ohair/openjdk6/jaxp-b20-drop/webrev/ > > >> >> The new jaxp drop file will be: >> https://jaxp.dev.java.net/files/documents/913/150648/jaxp_src.bundle.name=jdk6-jaxp-b20.zip >> >> On 6940241, by default, the source drop bundle will NOT be >> downloaded unless the ant property >> allow.downloads=true >> is defined, so you have to explicitly allow this. >> >> The env var ALT_DROPS_DIR or ant property drops.dir should refer to >> the directory holding the >> downloaded jaxp/jaxws source drop bundles. > > Before approving this, I want to understand the impact on the build > logistics with 6940241. In particular, what happens if: > > * A fresh hg fclone is done and a "make" command is issued from the > root directory? Same as before, but unless you somehow set allow.downloads=true it will never reach out via the website for a download. > * If allow.downloads is made true, do subsequent builds always > download or do they first check for a matching file in the build > directory? Regardless of the setting, priority is always given to the drops.dir or ALT_DROPS_DIR setting, which defaults to /java/devtools/share/jdk6-drops. If it can find a copy on a file system, that is always preferred. Only if the file system copy does not exist does it try to download from the website. -kto > > -Joe From jonathan.gibbons at oracle.com Mon Jun 7 09:42:11 2010 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Mon, 07 Jun 2010 09:42:11 -0700 Subject: Need reviewer: jaxp source drop update, a few fixes In-Reply-To: <82733369-DC79-4AC2-B433-2468B1261ED1@oracle.com> References: <4C0D190F.7000800@oracle.com> <82733369-DC79-4AC2-B433-2468B1261ED1@oracle.com> Message-ID: <4C0D2163.9000402@oracle.com> On 06/07/2010 09:33 AM, Kelly O'Hair wrote: > > On Jun 7, 2010, at 9:06 AM, Joe Darcy wrote: > >> Hi Kelly. >> >> Kelly O'Hair wrote: >>> >>> Need reviewer, 3 fixes here: >>> >>> 6955301: Update names and references to rebranded drop bundles >>> (jaxp, jaxws, jaf) >>> 6940241: Change jaxp/jaxws so that the http downloads are not done >>> by default >>> 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts >>> >>> http://cr.openjdk.java.net/~ohair/openjdk6/jaxp-b20-drop/webrev/ >>> >>> >>> The new jaxp drop file will be: >>> >>> https://jaxp.dev.java.net/files/documents/913/150648/jaxp_src.bundle.name=jdk6-jaxp-b20.zip >>> >>> >>> On 6940241, by default, the source drop bundle will NOT be >>> downloaded unless the ant property >>> allow.downloads=true >>> is defined, so you have to explicitly allow this. >>> >>> The env var ALT_DROPS_DIR or ant property drops.dir should refer to >>> the directory holding the >>> downloaded jaxp/jaxws source drop bundles. >> >> Before approving this, I want to understand the impact on the build >> logistics with 6940241. In particular, what happens if: >> >> * A fresh hg fclone is done and a "make" command is issued from the >> root directory? > > Same as before, but unless you somehow set allow.downloads=true it > will never reach out via the website for a download. > >> * If allow.downloads is made true, do subsequent builds always >> download or do they first check for a matching file in the build >> directory? > > Regardless of the setting, priority is always given to the drops.dir > or ALT_DROPS_DIR setting, which defaults to > /java/devtools/share/jdk6-drops. If it can find a copy on a file > system, that is always preferred. > Only if the file system copy does not exist does it try to download > from the website. This would be a good warning to give up front in "make sanity" if that is practical -- i.e. that a web download will be required. -- Jon > > -kto > >> >> -Joe > From joe.darcy at oracle.com Mon Jun 7 09:45:46 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Mon, 07 Jun 2010 09:45:46 -0700 Subject: Need reviewer: jaxp source drop update, a few fixes In-Reply-To: <82733369-DC79-4AC2-B433-2468B1261ED1@oracle.com> References: <4C0D190F.7000800@oracle.com> <82733369-DC79-4AC2-B433-2468B1261ED1@oracle.com> Message-ID: <4C0D223A.50102@oracle.com> Kelly O'Hair wrote: > > On Jun 7, 2010, at 9:06 AM, Joe Darcy wrote: > >> Hi Kelly. >> >> Kelly O'Hair wrote: >>> >>> Need reviewer, 3 fixes here: >>> >>> 6955301: Update names and references to rebranded drop bundles >>> (jaxp, jaxws, jaf) >>> 6940241: Change jaxp/jaxws so that the http downloads are not done >>> by default >>> 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts >>> >>> http://cr.openjdk.java.net/~ohair/openjdk6/jaxp-b20-drop/webrev/ >>> >>> >>> The new jaxp drop file will be: >>> >>> https://jaxp.dev.java.net/files/documents/913/150648/jaxp_src.bundle.name=jdk6-jaxp-b20.zip >>> >>> >>> On 6940241, by default, the source drop bundle will NOT be >>> downloaded unless the ant property >>> allow.downloads=true >>> is defined, so you have to explicitly allow this. >>> >>> The env var ALT_DROPS_DIR or ant property drops.dir should refer to >>> the directory holding the >>> downloaded jaxp/jaxws source drop bundles. >> >> Before approving this, I want to understand the impact on the build >> logistics with 6940241. In particular, what happens if: >> >> * A fresh hg fclone is done and a "make" command is issued from the >> root directory? > > Same as before, but unless you somehow set allow.downloads=true it > will never reach out via the website for a download. So does the build then fail if the bundles aren't present? > >> * If allow.downloads is made true, do subsequent builds always >> download or do they first check for a matching file in the build >> directory? > > Regardless of the setting, priority is always given to the drops.dir > or ALT_DROPS_DIR setting, which defaults to > /java/devtools/share/jdk6-drops. If it can find a copy on a file > system, that is always preferred. > Only if the file system copy does not exist does it try to download > from the website. > Okay. From the top level, how does one override all the relevant settings? Basically, I want to know how to do a successful OpenJDK 6 build from scratch on my laptop when it is disconnected from the company network :-) -Joe From jonathan.gibbons at oracle.com Mon Jun 7 10:00:19 2010 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Mon, 07 Jun 2010 10:00:19 -0700 Subject: Need reviewer: jaxp source drop update, a few fixes In-Reply-To: <4C0D223A.50102@oracle.com> References: <4C0D190F.7000800@oracle.com> <82733369-DC79-4AC2-B433-2468B1261ED1@oracle.com> <4C0D223A.50102@oracle.com> Message-ID: <4C0D25A3.6040905@oracle.com> On 06/07/2010 09:45 AM, Joe Darcy wrote: > Kelly O'Hair wrote: >> >> On Jun 7, 2010, at 9:06 AM, Joe Darcy wrote: >> >>> Hi Kelly. >>> >>> Kelly O'Hair wrote: >>>> >>>> Need reviewer, 3 fixes here: >>>> >>>> 6955301: Update names and references to rebranded drop bundles >>>> (jaxp, jaxws, jaf) >>>> 6940241: Change jaxp/jaxws so that the http downloads are not done >>>> by default >>>> 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts >>>> >>>> http://cr.openjdk.java.net/~ohair/openjdk6/jaxp-b20-drop/webrev/ >>>> >>>> >>>> The new jaxp drop file will be: >>>> >>>> https://jaxp.dev.java.net/files/documents/913/150648/jaxp_src.bundle.name=jdk6-jaxp-b20.zip >>>> >>>> >>>> On 6940241, by default, the source drop bundle will NOT be >>>> downloaded unless the ant property >>>> allow.downloads=true >>>> is defined, so you have to explicitly allow this. >>>> >>>> The env var ALT_DROPS_DIR or ant property drops.dir should refer to >>>> the directory holding the >>>> downloaded jaxp/jaxws source drop bundles. >>> >>> Before approving this, I want to understand the impact on the build >>> logistics with 6940241. In particular, what happens if: >>> >>> * A fresh hg fclone is done and a "make" command is issued from the >>> root directory? >> >> Same as before, but unless you somehow set allow.downloads=true it >> will never reach out via the website for a download. > > So does the build then fail if the bundles aren't present? > >> >>> * If allow.downloads is made true, do subsequent builds always >>> download or do they first check for a matching file in the build >>> directory? >> >> Regardless of the setting, priority is always given to the drops.dir >> or ALT_DROPS_DIR setting, which defaults to >> /java/devtools/share/jdk6-drops. If it can find a copy on a file >> system, that is always preferred. >> Only if the file system copy does not exist does it try to download >> from the website. >> > > Okay. From the top level, how does one override all the relevant > settings? Basically, I want to know how to do a successful OpenJDK 6 > build from scratch on my laptop when it is disconnected from the > company network :-) > > -Joe Before you disconnect from the company network, go to kenai.com and pull down the necessary bundles. Put them in a directory somewhere. Then you can disconnect from the company network and point ALT_DROPS_DIR at the directory containing the bundles. -- Jon From kelly.ohair at oracle.com Mon Jun 7 12:37:22 2010 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Mon, 7 Jun 2010 12:37:22 -0700 Subject: Need reviewer: jaxp source drop update, a few fixes In-Reply-To: <4C0D223A.50102@oracle.com> References: <4C0D190F.7000800@oracle.com> <82733369-DC79-4AC2-B433-2468B1261ED1@oracle.com> <4C0D223A.50102@oracle.com> Message-ID: On Jun 7, 2010, at 9:45 AM, Joe Darcy wrote: > Kelly O'Hair wrote: >> >> On Jun 7, 2010, at 9:06 AM, Joe Darcy wrote: >> >>> Hi Kelly. >>> >>> Kelly O'Hair wrote: >>>> >>>> Need reviewer, 3 fixes here: >>>> >>>> 6955301: Update names and references to rebranded drop bundles >>>> (jaxp, jaxws, jaf) >>>> 6940241: Change jaxp/jaxws so that the http downloads are not >>>> done by default >>>> 6955292: Workaround ant 1.7.1 package-info.java issue in ant >>>> scripts >>>> >>>> http://cr.openjdk.java.net/~ohair/openjdk6/jaxp-b20-drop/webrev/ >>> > >>>> >>>> The new jaxp drop file will be: >>>> https://jaxp.dev.java.net/files/documents/913/150648/jaxp_src.bundle.name=jdk6-jaxp-b20.zip >>>> >>>> On 6940241, by default, the source drop bundle will NOT be >>>> downloaded unless the ant property >>>> allow.downloads=true >>>> is defined, so you have to explicitly allow this. >>>> >>>> The env var ALT_DROPS_DIR or ant property drops.dir should refer >>>> to the directory holding the >>>> downloaded jaxp/jaxws source drop bundles. >>> >>> Before approving this, I want to understand the impact on the >>> build logistics with 6940241. In particular, what happens if: >>> >>> * A fresh hg fclone is done and a "make" command is issued from >>> the root directory? >> >> Same as before, but unless you somehow set allow.downloads=true it >> will never reach out via the website for a download. > > So does the build then fail if the bundles aren't present? If this was a fresh cloned forest, yes. If you had built it once before, the bundles persists in the jaxp//jaxws repo areas until someone purges it with a 'make clobber' or 'ant clobber' or 'hg purge'. The 'clean' rules will not purge these files or bundles. > >> >>> * If allow.downloads is made true, do subsequent builds always >>> download or do they first check for a matching file in the build >>> directory? >> >> Regardless of the setting, priority is always given to the >> drops.dir or ALT_DROPS_DIR setting, which defaults to >> /java/devtools/share/jdk6-drops. If it can find a copy on a file >> system, that is always preferred. >> Only if the file system copy does not exist does it try to download >> from the website. >> > > Okay. From the top level, how does one override all the relevant > settings? Basically, I want to know how to do a successful OpenJDK > 6 build from scratch on my laptop when it is disconnected from the > company network :-) make ANT_OPTIONS="-Dallow.downloads=true" Or as Jon suggested, download and save the jaxp/jaxws bundles in some dir, and use: make ALT_DROPS_DIR=somepath And ANT_OPTIONS and ALT_DROPS_DIR can be set in your environment too. Jon is correct, I need a sanity or better error message to explain that when the download is not done or fails. I will look into that. Is the above acceptable? -kto > > -Joe From jonathan.gibbons at oracle.com Mon Jun 7 12:44:29 2010 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Mon, 07 Jun 2010 12:44:29 -0700 Subject: Need reviewer: jaxp source drop update, a few fixes In-Reply-To: References: <4C0D190F.7000800@oracle.com> <82733369-DC79-4AC2-B433-2468B1261ED1@oracle.com> <4C0D223A.50102@oracle.com> Message-ID: <4C0D4C1D.1030504@oracle.com> On 06/07/2010 12:37 PM, Kelly O'Hair wrote: > > On Jun 7, 2010, at 9:45 AM, Joe Darcy wrote: > >> Kelly O'Hair wrote: >>> >>> On Jun 7, 2010, at 9:06 AM, Joe Darcy wrote: >>> >>>> Hi Kelly. >>>> >>>> Kelly O'Hair wrote: >>>>> >>>>> Need reviewer, 3 fixes here: >>>>> >>>>> 6955301: Update names and references to rebranded drop bundles >>>>> (jaxp, jaxws, jaf) >>>>> 6940241: Change jaxp/jaxws so that the http downloads are not done >>>>> by default >>>>> 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts >>>>> >>>>> http://cr.openjdk.java.net/~ohair/openjdk6/jaxp-b20-drop/webrev/ >>>>> >>>>> >>>>> The new jaxp drop file will be: >>>>> https://jaxp.dev.java.net/files/documents/913/150648/jaxp_src.bundle.name=jdk6-jaxp-b20.zip >>>>> >>>>> >>>>> On 6940241, by default, the source drop bundle will NOT be >>>>> downloaded unless the ant property >>>>> allow.downloads=true >>>>> is defined, so you have to explicitly allow this. >>>>> >>>>> The env var ALT_DROPS_DIR or ant property drops.dir should refer >>>>> to the directory holding the >>>>> downloaded jaxp/jaxws source drop bundles. >>>> >>>> Before approving this, I want to understand the impact on the build >>>> logistics with 6940241. In particular, what happens if: >>>> >>>> * A fresh hg fclone is done and a "make" command is issued from the >>>> root directory? >>> >>> Same as before, but unless you somehow set allow.downloads=true it >>> will never reach out via the website for a download. >> >> So does the build then fail if the bundles aren't present? > > If this was a fresh cloned forest, yes. If you had built it once > before, the bundles persists in the jaxp//jaxws repo areas > until someone purges it with a 'make clobber' or 'ant clobber' or 'hg > purge'. > The 'clean' rules will not purge these files or bundles. That's neat, but for my part, I prefer the simplicity of "rm -rf build", so for those of you that do the same, ALT_DROPS_DIR is highly recommended ;-) > >> >>> >>>> * If allow.downloads is made true, do subsequent builds always >>>> download or do they first check for a matching file in the build >>>> directory? >>> >>> Regardless of the setting, priority is always given to the drops.dir >>> or ALT_DROPS_DIR setting, which defaults to >>> /java/devtools/share/jdk6-drops. If it can find a copy on a file >>> system, that is always preferred. >>> Only if the file system copy does not exist does it try to download >>> from the website. >>> >> >> Okay. From the top level, how does one override all the relevant >> settings? Basically, I want to know how to do a successful OpenJDK 6 >> build from scratch on my laptop when it is disconnected from the >> company network :-) > > make ANT_OPTIONS="-Dallow.downloads=true" > > Or as Jon suggested, download and save the jaxp/jaxws bundles in some > dir, and use: > > make ALT_DROPS_DIR=somepath > > And ANT_OPTIONS and ALT_DROPS_DIR can be set in your environment too. > > Jon is correct, I need a sanity or better error message to explain > that when the download is not done or fails. > I will look into that. > > Is the above acceptable? > > -kto > >> >> -Joe > From kelly.ohair at oracle.com Mon Jun 7 14:25:23 2010 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Mon, 7 Jun 2010 14:25:23 -0700 Subject: Need reviewer: jaxp source drop update, a few fixes In-Reply-To: <4C0D4C1D.1030504@oracle.com> References: <4C0D190F.7000800@oracle.com> <82733369-DC79-4AC2-B433-2468B1261ED1@oracle.com> <4C0D223A.50102@oracle.com> <4C0D4C1D.1030504@oracle.com> Message-ID: <500F3223-B170-493E-8A6E-5531FDA39FE3@oracle.com> On Jun 7, 2010, at 12:44 PM, Jonathan Gibbons wrote: > On 06/07/2010 12:37 PM, Kelly O'Hair wrote: >> >> On Jun 7, 2010, at 9:45 AM, Joe Darcy wrote: >> >>> Kelly O'Hair wrote: >>>> >>>> On Jun 7, 2010, at 9:06 AM, Joe Darcy wrote: >>>> >>>>> Hi Kelly. >>>>> >>>>> Kelly O'Hair wrote: >>>>>> >>>>>> Need reviewer, 3 fixes here: >>>>>> >>>>>> 6955301: Update names and references to rebranded drop bundles >>>>>> (jaxp, jaxws, jaf) >>>>>> 6940241: Change jaxp/jaxws so that the http downloads are not >>>>>> done by default >>>>>> 6955292: Workaround ant 1.7.1 package-info.java issue in ant >>>>>> scripts >>>>>> >>>>>> http://cr.openjdk.java.net/~ohair/openjdk6/jaxp-b20-drop/ >>>>>> webrev/ >>>>> > >>>>>> >>>>>> The new jaxp drop file will be: >>>>>> https://jaxp.dev.java.net/files/documents/913/150648/jaxp_src.bundle.name=jdk6-jaxp-b20.zip >>>>>> >>>>>> On 6940241, by default, the source drop bundle will NOT be >>>>>> downloaded unless the ant property >>>>>> allow.downloads=true >>>>>> is defined, so you have to explicitly allow this. >>>>>> >>>>>> The env var ALT_DROPS_DIR or ant property drops.dir should >>>>>> refer to the directory holding the >>>>>> downloaded jaxp/jaxws source drop bundles. >>>>> >>>>> Before approving this, I want to understand the impact on the >>>>> build logistics with 6940241. In particular, what happens if: >>>>> >>>>> * A fresh hg fclone is done and a "make" command is issued from >>>>> the root directory? >>>> >>>> Same as before, but unless you somehow set allow.downloads=true >>>> it will never reach out via the website for a download. >>> >>> So does the build then fail if the bundles aren't present? >> >> If this was a fresh cloned forest, yes. If you had built it once >> before, the bundles persists in the jaxp//jaxws repo areas >> until someone purges it with a 'make clobber' or 'ant clobber' or >> 'hg purge'. >> The 'clean' rules will not purge these files or bundles. > > That's neat, but for my part, I prefer the simplicity of "rm -rf > build", so for those of you that do the same, ALT_DROPS_DIR is > highly recommended ;-) The drop bundles and sources land in the "./drop" directory, not "./ build/drop" For better or worse, that was done on purpose to prevent a 'rm -fr build' or 'ant clean' from blowing it away. -kto > > >> >>> >>>> >>>>> * If allow.downloads is made true, do subsequent builds always >>>>> download or do they first check for a matching file in the build >>>>> directory? >>>> >>>> Regardless of the setting, priority is always given to the >>>> drops.dir or ALT_DROPS_DIR setting, which defaults to >>>> /java/devtools/share/jdk6-drops. If it can find a copy on a file >>>> system, that is always preferred. >>>> Only if the file system copy does not exist does it try to >>>> download from the website. >>>> >>> >>> Okay. From the top level, how does one override all the relevant >>> settings? Basically, I want to know how to do a successful >>> OpenJDK 6 build from scratch on my laptop when it is disconnected >>> from the company network :-) >> >> make ANT_OPTIONS="-Dallow.downloads=true" >> >> Or as Jon suggested, download and save the jaxp/jaxws bundles in >> some dir, and use: >> >> make ALT_DROPS_DIR=somepath >> >> And ANT_OPTIONS and ALT_DROPS_DIR can be set in your environment too. >> >> Jon is correct, I need a sanity or better error message to explain >> that when the download is not done or fails. >> I will look into that. >> >> Is the above acceptable? >> >> -kto >> >>> >>> -Joe >> > From joe.darcy at oracle.com Mon Jun 7 20:21:43 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Mon, 07 Jun 2010 20:21:43 -0700 Subject: Need reviewer: jaxp source drop update, a few fixes In-Reply-To: <4C0D4C1D.1030504@oracle.com> References: <4C0D190F.7000800@oracle.com> <82733369-DC79-4AC2-B433-2468B1261ED1@oracle.com> <4C0D223A.50102@oracle.com> <4C0D4C1D.1030504@oracle.com> Message-ID: <4C0DB747.9020801@oracle.com> Kelly, Jonathan Gibbons wrote: > On 06/07/2010 12:37 PM, Kelly O'Hair wrote: >> >> On Jun 7, 2010, at 9:45 AM, Joe Darcy wrote: >> >>> Kelly O'Hair wrote: >>>> >>>> On Jun 7, 2010, at 9:06 AM, Joe Darcy wrote: >>>> >>>>> Hi Kelly. >>>>> >>>>> Kelly O'Hair wrote: >>>>>> >>>>>> [snip] >>> >>> So does the build then fail if the bundles aren't present? >> >> If this was a fresh cloned forest, yes. If you had built it once >> before, the bundles persists in the jaxp//jaxws repo areas >> until someone purges it with a 'make clobber' or 'ant clobber' or 'hg >> purge'. >> The 'clean' rules will not purge these files or bundles. > > That's neat, but for my part, I prefer the simplicity of "rm -rf > build", so for those of you that do the same, ALT_DROPS_DIR is highly > recommended ;-) > > Can managing the source bundling downloading / configuration be discussed in the build readme? -Joe From joe.darcy at oracle.com Mon Jun 7 20:24:06 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Mon, 07 Jun 2010 20:24:06 -0700 Subject: Need reviewer: jaxp source drop update, a few fixes In-Reply-To: References: <4C0D190F.7000800@oracle.com> <82733369-DC79-4AC2-B433-2468B1261ED1@oracle.com> <4C0D223A.50102@oracle.com> Message-ID: <4C0DB7D6.6090400@oracle.com> Kelly O'Hair wrote: > > On Jun 7, 2010, at 9:45 AM, Joe Darcy wrote: > >> Kelly O'Hair wrote: >>> >>> On Jun 7, 2010, at 9:06 AM, Joe Darcy wrote: >>> >>>> Hi Kelly. >>>> >>>> Kelly O'Hair wrote: >>>>> >>>>> Need reviewer, 3 fixes here: >>>>> >>>>> 6955301: Update names and references to rebranded drop bundles >>>>> (jaxp, jaxws, jaf) >>>>> 6940241: Change jaxp/jaxws so that the http downloads are not done >>>>> by default >>>>> 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts >>>>> >>>>> http://cr.openjdk.java.net/~ohair/openjdk6/jaxp-b20-drop/webrev/ >>>>> >>>>> >>>>> The new jaxp drop file will be: >>>>> https://jaxp.dev.java.net/files/documents/913/150648/jaxp_src.bundle.name=jdk6-jaxp-b20.zip >>>>> >>>>> >>>>> On 6940241, by default, the source drop bundle will NOT be >>>>> downloaded unless the ant property >>>>> allow.downloads=true >>>>> is defined, so you have to explicitly allow this. >>>>> >>>>> The env var ALT_DROPS_DIR or ant property drops.dir should refer >>>>> to the directory holding the >>>>> downloaded jaxp/jaxws source drop bundles. >>>> >>>> Before approving this, I want to understand the impact on the build >>>> logistics with 6940241. In particular, what happens if: >>>> >>>> * A fresh hg fclone is done and a "make" command is issued from the >>>> root directory? >>> >>> Same as before, but unless you somehow set allow.downloads=true it >>> will never reach out via the website for a download. >> >> So does the build then fail if the bundles aren't present? > > If this was a fresh cloned forest, yes. If you had built it once > before, the bundles persists in the jaxp//jaxws repo areas > until someone purges it with a 'make clobber' or 'ant clobber' or 'hg > purge'. > The 'clean' rules will not purge these files or bundles. > >> >>> >>>> * If allow.downloads is made true, do subsequent builds always >>>> download or do they first check for a matching file in the build >>>> directory? >>> >>> Regardless of the setting, priority is always given to the drops.dir >>> or ALT_DROPS_DIR setting, which defaults to >>> /java/devtools/share/jdk6-drops. If it can find a copy on a file >>> system, that is always preferred. >>> Only if the file system copy does not exist does it try to download >>> from the website. >>> >> >> Okay. From the top level, how does one override all the relevant >> settings? Basically, I want to know how to do a successful OpenJDK 6 >> build from scratch on my laptop when it is disconnected from the >> company network :-) > > make ANT_OPTIONS="-Dallow.downloads=true" > > Or as Jon suggested, download and save the jaxp/jaxws bundles in some > dir, and use: > > make ALT_DROPS_DIR=somepath > > And ANT_OPTIONS and ALT_DROPS_DIR can be set in your environment too. > > Jon is correct, I need a sanity or better error message to explain > that when the download is not done or fails. > I will look into that. > > Is the above acceptable? > > -kto > >> >> -Joe > Some tweaks to the change are in progress and will be sent around for review when ready. -Joe From joe.darcy at oracle.com Mon Jun 7 20:27:31 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Mon, 07 Jun 2010 20:27:31 -0700 Subject: CR 6884837 - jdk6 In-Reply-To: <4C097C20.4030005@oracle.com> References: <4C065F72.2020801@oracle.com> <4C066DC8.1000705@oracle.com> <4C06A291.4010704@oracle.com> <4C06A5F6.8030909@oracle.com> <4C097C20.4030005@oracle.com> Message-ID: <4C0DB8A3.8060205@oracle.com> Joe Darcy wrote: > Joe Darcy wrote: >> Andrew John Hughes wrote: >>> On 2 June 2010 19:27, Joe Darcy wrote: >>> >>>> Michael McMahon wrote: >>>> >>>>> Chris Hegarty wrote: >>>>> >>>>>> Hi Joe, Alan, Michael, >>>>>> >>>>>> Can I please ask for review(Alan/Michael)/permission(Joe) to >>>>>> integrate >>>>>> this simple testcase change into 6 Open. This change has been in >>>>>> JDK7 since >>>>>> b74. >>>>>> >>>>>> CR 6884837: test/java/net/MulticastSocket/SetOutgoingIf.java >>>>>> should check >>>>>> if interfaces are up/support multicast >>>>>> >>>>>> Webrev: >>>>>> http://cr.openjdk.java.net/~chegar/6884837/webrev.6Open/webrev/ >>>>>> >>>>>> Thanks, >>>>>> -Chris. >>>>>> >>>>> looks fine. >>>>> - Michael >>>>> >>>> Approved to be pushed into OpenJDK 6. >>>> >>>> Thanks, >>>> >>>> -Joe >>>> >>>> >>> >>> Joe, what are we still waiting on for b20? The HotSpot fixes we >>> discussed are in and I saw that the JDK repository was updated. >>> >>> Thanks, >>> >> >> Hello. >> >> We are waiting for the notices under http://openjdk.java.net/legal/ >> to be updated. Once they are, the copies of the files in the repos >> can be updated and the legal notices in the jaxp and jax-ws source >> bundles can be updated, allowing fully rebranded source bundles to be >> created. >> > > Upon further review, waiting for the notices to be updated should not > block wrapping up build 20. > > Toward that goal, a rebranded jaxp bundle is available from: > > https://jaxp.dev.java.net/files/documents/913/150648/jdk6-jaxp-b20.zip > > (Besides rebranding, this new jaxp bundle removes independent copies > of some of the legal notices; the jaxp repository retains copies of > those notices.) > > A webrev of build changes to the jaxp repo will follow as will bundles > for jax-ws and jaf. > > -Joe > Rebranded jaxws bundle for review: https://jax-ws.dev.java.net/files/documents/4202/150699/jdk6-jaxws-b20.zip -Joe From joe.darcy at oracle.com Tue Jun 8 08:44:22 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Tue, 08 Jun 2010 08:44:22 -0700 Subject: hg: jdk7/tl/jdk: 6957375: java/net/ResponseCache getResponseCode and ResponseCacheTest fail after rebranding In-Reply-To: <20100608094730.416AA47040@hg.openjdk.java.net> References: <20100608094730.416AA47040@hg.openjdk.java.net> Message-ID: <4C0E6556.2000401@oracle.com> chris.hegarty at oracle.com wrote: > Changeset: 489c1720757b > Author: chegar > Date: 2010-06-08 10:46 +0100 > URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/489c1720757b > > 6957375: java/net/ResponseCache getResponseCode and ResponseCacheTest fail after rebranding > Reviewed-by: ohair, wetmore, alanb > > ! test/java/net/ResponseCache/file1.cache > > Hello. I believe this issue is affecting OpenJDK 6, which has also been rebranded. Please apply the fix to OpenJDK 6 too. Thanks, -Joe From chris.hegarty at oracle.com Tue Jun 8 09:08:45 2010 From: chris.hegarty at oracle.com (Chris Hegarty) Date: Tue, 08 Jun 2010 17:08:45 +0100 Subject: hg: jdk7/tl/jdk: 6957375: java/net/ResponseCache getResponseCode and ResponseCacheTest fail after rebranding In-Reply-To: <4C0E6556.2000401@oracle.com> References: <20100608094730.416AA47040@hg.openjdk.java.net> <4C0E6556.2000401@oracle.com> Message-ID: <4C0E6B0D.9040301@oracle.com> Joe Darcy wrote: > chris.hegarty at oracle.com wrote: >> Changeset: 489c1720757b >> Author: chegar >> Date: 2010-06-08 10:46 +0100 >> URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/489c1720757b >> >> 6957375: java/net/ResponseCache getResponseCode and ResponseCacheTest >> fail after rebranding >> Reviewed-by: ohair, wetmore, alanb >> >> ! test/java/net/ResponseCache/file1.cache >> >> > > Hello. > > I believe this issue is affecting OpenJDK 6, which has also been > rebranded. Please apply the fix to OpenJDK 6 too. No problem, will do. -Chris. > > Thanks, > > -Joe From kelly.ohair at oracle.com Tue Jun 8 11:52:59 2010 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Tue, 8 Jun 2010 11:52:59 -0700 Subject: hg: jdk7/tl/jdk: 6957375: java/net/ResponseCache getResponseCode and ResponseCacheTest fail after rebranding In-Reply-To: <4C0E6B0D.9040301@oracle.com> References: <20100608094730.416AA47040@hg.openjdk.java.net> <4C0E6556.2000401@oracle.com> <4C0E6B0D.9040301@oracle.com> Message-ID: <4DC1B49D-B991-4CB8-9D84-679D87886C33@oracle.com> On Jun 8, 2010, at 9:08 AM, Chris Hegarty wrote: > Joe Darcy wrote: >> chris.hegarty at oracle.com wrote: >>> Changeset: 489c1720757b >>> Author: chegar >>> Date: 2010-06-08 10:46 +0100 >>> URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/489c1720757b >>> >>> 6957375: java/net/ResponseCache getResponseCode and >>> ResponseCacheTest fail after rebranding >>> Reviewed-by: ohair, wetmore, alanb >>> >>> ! test/java/net/ResponseCache/file1.cache >>> >>> >> Hello. >> I believe this issue is affecting OpenJDK 6, which has also been >> rebranded. Please apply the fix to OpenJDK 6 too. > > No problem, will do. Thanks Chris, and once again, sorry about the regression, this file was very unusual :^(. -kto > > -Chris. > >> Thanks, >> -Joe From ahughes at redhat.com Wed Jun 9 06:42:20 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 9 Jun 2010 14:42:20 +0100 Subject: [Fwd: Request for change in JDK6 - proper ISO-8859-15 charset handling] In-Reply-To: <4BE19445.7090009@oracle.com> References: <4BDAD6FE.7020600@oracle.com> <4BDAF8B9.3040204@oracle.com> <4BDB0609.3080101@redhat.com> <4BDB0E24.5050106@oracle.com> <4BE19445.7090009@oracle.com> Message-ID: On 5 May 2010 16:52, Joe Darcy wrote: > Andrew John Hughes wrote: >> >> On 30 April 2010 18:06, Joe Darcy wrote: >> >>> >>> Pavel Tisnovsky wrote: >>> >>>> >>>> Hi Xueming, >>>> >>>> may I use bug #6798572 to push changes to OpenJDK6? Only JDK7 is >>>> mentioned >>>> in this bug... >>>> >>> >>> Per the OpenJDK 6 processes (http://openjdk.java.net/projects/jdk6/), the >>> approval of the release manager (currently me) is also needed for all >>> changes before they go back. >>> >>> Given that Sherman has reviewed the technical contents of the change, I >>> also >>> approve it going back as long as the now-failing regression test >>> ?java/nio/charset/Charset/Contains.java >>> is updated to include 6798572 in its @bug line. >>> >>> >> >> It seems this change went back but without this addition. ?Do we still >> want to add it? >> > > The bug id was actually there all along! > > -Joe > If I look at the current jdk7 tree, I can't find this bug ID: $ hg -R ../upstream/jdk7/jdk log -k 6798572 $ But then there's no ISO-8859-15 file any more. Any ideas? -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From asu at redhat.com Wed Jun 9 08:44:10 2010 From: asu at redhat.com (Andrew Su) Date: Wed, 9 Jun 2010 11:44:10 -0400 (EDT) Subject: Backporting changeset from 7 to 6 for bugfix Message-ID: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Hello, This is the link[1] to the changeset which fixes the bug which renders a circle that has a side clipped. Requesting permission to backport this fix. [1] http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/fb03586d68b6 -Andrew From xueming.shen at oracle.com Wed Jun 9 09:44:52 2010 From: xueming.shen at oracle.com (Xueming Shen) Date: Wed, 09 Jun 2010 09:44:52 -0700 Subject: [Fwd: Request for change in JDK6 - proper ISO-8859-15 charset handling] In-Reply-To: References: <4BDAD6FE.7020600@oracle.com> <4BDAF8B9.3040204@oracle.com> <4BDB0609.3080101@redhat.com> <4BDB0E24.5050106@oracle.com> <4BE19445.7090009@oracle.com> Message-ID: <4C0FC504.4030501@oracle.com> The ISO-8859-1 is now being generated from make/tools/CharsetMapping/ISO_8859_15.map during build time, as part of the charset re-write "project". The new implementation of ISO-8859-15 does not take ISO-8859-1 as its subset, we then had 6798572 filed and then realized the old implementation is wrong. sherman Andrew John Hughes wrote: > On 5 May 2010 16:52, Joe Darcy wrote: > >> Andrew John Hughes wrote: >> >>> On 30 April 2010 18:06, Joe Darcy wrote: >>> >>> >>>> Pavel Tisnovsky wrote: >>>> >>>> >>>>> Hi Xueming, >>>>> >>>>> may I use bug #6798572 to push changes to OpenJDK6? Only JDK7 is >>>>> mentioned >>>>> in this bug... >>>>> >>>>> >>>> Per the OpenJDK 6 processes (http://openjdk.java.net/projects/jdk6/), the >>>> approval of the release manager (currently me) is also needed for all >>>> changes before they go back. >>>> >>>> Given that Sherman has reviewed the technical contents of the change, I >>>> also >>>> approve it going back as long as the now-failing regression test >>>> java/nio/charset/Charset/Contains.java >>>> is updated to include 6798572 in its @bug line. >>>> >>>> >>>> >>> It seems this change went back but without this addition. Do we still >>> want to add it? >>> >>> >> The bug id was actually there all along! >> >> -Joe >> >> > > If I look at the current jdk7 tree, I can't find this bug ID: > > $ hg -R ../upstream/jdk7/jdk log -k 6798572 > $ > > But then there's no ISO-8859-15 file any more. Any ideas? > From kelly.ohair at oracle.com Wed Jun 9 09:57:16 2010 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Wed, 9 Jun 2010 09:57:16 -0700 Subject: Need reviewers, multiple fixes: fastdebug builds, testing, rebranding, jaxp/jaxws updates Message-ID: <3AC7AA81-7E0C-4553-A0C9-7D182790CA56@oracle.com> Need reviewers: root repo: 6959596: Windows fastdebug build broken 6928700: Configure top repo for JPRT testing http://cr.openjdk.java.net/~ohair/openjdk6/fastdebug-testing/webrev/ jdk repo: 6928700: Configure top repo for JPRT testing 6931871: Rebranding of javadoc generation in makefiles 6951293: control docs target does not work on windows http://cr.openjdk.java.net/~ohair/openjdk6/javadoc-testing/webrev/ jaxp repo: 6940241: Change jaxp/jaxws so that the http downloads are not done by default 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts 6955301: Update names and references to rebranded drop bundles (jaxp, jaxws, jaf) http://cr.openjdk.java.net/~ohair/openjdk6/jaxp-b20/webrev/ jaxws repo: 6940241: Change jaxp/jaxws so that the http downloads are not done by default 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts 6955300: Missing files in the jaf source bundle (Thanks to Rama) 6955301: Update names and references to rebranded drop bundles (jaxp, jaxws, jaf) http://cr.openjdk.java.net/~ohair/openjdk6/jaxws-b20/webrev/ New jaxws and jaxp source drops: https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaxws-b20.zip https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaf-b20.zip https://jaxp.dev.java.net/files/documents/913/150648/jdk6-jaxp-b20.zip -kto From ahughes at redhat.com Wed Jun 9 13:54:48 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 9 Jun 2010 21:54:48 +0100 Subject: [Fwd: Request for change in JDK6 - proper ISO-8859-15 charset handling] In-Reply-To: <4C0FC504.4030501@oracle.com> References: <4BDAD6FE.7020600@oracle.com> <4BDAF8B9.3040204@oracle.com> <4BDB0609.3080101@redhat.com> <4BDB0E24.5050106@oracle.com> <4BE19445.7090009@oracle.com> <4C0FC504.4030501@oracle.com> Message-ID: On 9 June 2010 17:44, Xueming Shen wrote: > > The ISO-8859-1 is now being generated from > > make/tools/CharsetMapping/ISO_8859_15.map > > during build time, as part of the charset re-write "project". > > The new implementation of ISO-8859-15 does not take ISO-8859-1 as > its subset, we then had 6798572 filed and then realized ?the old > implementation > is wrong. > Ah, so 6798572 was created for a JDK7 bug but never used until Pavel's fix in OpenJDK6. Got it. Just wanted to make sure I wasn't missing a fix. > sherman > > Andrew John Hughes wrote: >> >> On 5 May 2010 16:52, Joe Darcy wrote: >> >>> >>> Andrew John Hughes wrote: >>> >>>> >>>> On 30 April 2010 18:06, Joe Darcy wrote: >>>> >>>> >>>>> >>>>> Pavel Tisnovsky wrote: >>>>> >>>>> >>>>>> >>>>>> Hi Xueming, >>>>>> >>>>>> may I use bug #6798572 to push changes to OpenJDK6? Only JDK7 is >>>>>> mentioned >>>>>> in this bug... >>>>>> >>>>>> >>>>> >>>>> Per the OpenJDK 6 processes (http://openjdk.java.net/projects/jdk6/), >>>>> the >>>>> approval of the release manager (currently me) is also needed for all >>>>> changes before they go back. >>>>> >>>>> Given that Sherman has reviewed the technical contents of the change, I >>>>> also >>>>> approve it going back as long as the now-failing regression test >>>>> ?java/nio/charset/Charset/Contains.java >>>>> is updated to include 6798572 in its @bug line. >>>>> >>>>> >>>>> >>>> >>>> It seems this change went back but without this addition. ?Do we still >>>> want to add it? >>>> >>>> >>> >>> The bug id was actually there all along! >>> >>> -Joe >>> >>> >> >> If I look at the current jdk7 tree, I can't find this bug ID: >> >> $ hg -R ../upstream/jdk7/jdk log -k 6798572 >> $ >> >> But then there's no ISO-8859-15 file any more. ?Any ideas? >> > > Thanks, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From kelly.ohair at oracle.com Wed Jun 9 15:27:10 2010 From: kelly.ohair at oracle.com (kelly.ohair at oracle.com) Date: Wed, 09 Jun 2010 22:27:10 +0000 Subject: hg: jdk6/jdk6: 2 new changesets Message-ID: <20100609222710.D02D5470AB@hg.openjdk.java.net> Changeset: e85cf6be367a Author: ohair Date: 2010-06-09 15:22 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/rev/e85cf6be367a 6959596: Windows fastdebug build broken Reviewed-by: jjg ! Makefile Changeset: eeb832793cd6 Author: ohair Date: 2010-06-09 15:23 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/rev/eeb832793cd6 6928700: Configure top repo for JPRT testing Reviewed-by: jjg ! make/jprt.properties + test/Makefile From kelly.ohair at oracle.com Wed Jun 9 15:27:18 2010 From: kelly.ohair at oracle.com (kelly.ohair at oracle.com) Date: Wed, 09 Jun 2010 22:27:18 +0000 Subject: hg: jdk6/jdk6/jaxp: 2 new changesets Message-ID: <20100609222718.585D6470AD@hg.openjdk.java.net> Changeset: 36022220fcc5 Author: ohair Date: 2010-06-09 15:18 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxp/rev/36022220fcc5 6955301: Update names and references to rebranded drop bundles (jaxp, jaxws, jaf) Reviewed-by: jjg ! jaxp.properties Changeset: abcb3bcd7353 Author: ohair Date: 2010-06-09 15:19 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxp/rev/abcb3bcd7353 6940241: Change jaxp/jaxws so that the http downloads are not done by default 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts Reviewed-by: jjg ! build-defs.xml ! build-drop-template.xml ! build.properties ! build.xml ! make/Makefile From kelly.ohair at oracle.com Wed Jun 9 15:27:22 2010 From: kelly.ohair at oracle.com (kelly.ohair at oracle.com) Date: Wed, 09 Jun 2010 22:27:22 +0000 Subject: hg: jdk6/jdk6/jaxws: 2 new changesets Message-ID: <20100609222722.CB7CF470AF@hg.openjdk.java.net> Changeset: 2fa7435e0108 Author: ohair Date: 2010-06-09 15:21 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxws/rev/2fa7435e0108 6955301: Update names and references to rebranded drop bundles (jaxp, jaxws, jaf) Reviewed-by: jjg ! jaxws.properties Changeset: 9089ab6753d9 Author: ohair Date: 2010-06-09 15:21 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxws/rev/9089ab6753d9 6940241: Change jaxp/jaxws so that the http downloads are not done by default 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts 6955300: Missing files in the jaf source bundle Reviewed-by: jjg ! build-defs.xml ! build-drop-template.xml ! build.properties ! build.xml ! make/Makefile From kelly.ohair at oracle.com Wed Jun 9 15:27:28 2010 From: kelly.ohair at oracle.com (kelly.ohair at oracle.com) Date: Wed, 09 Jun 2010 22:27:28 +0000 Subject: hg: jdk6/jdk6/jdk: 2 new changesets Message-ID: <20100609222744.7DF75470B1@hg.openjdk.java.net> Changeset: d56d88dc50b0 Author: ohair Date: 2010-06-09 15:24 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/d56d88dc50b0 6928700: Configure top repo for JPRT testing Reviewed-by: jjg ! test/ProblemList.txt Changeset: efe003ef994e Author: ohair Date: 2010-06-09 15:25 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/efe003ef994e 6931871: Rebranding of javadoc generation in makefiles 6951293: control docs target does not work on windows Reviewed-by: jjg + make/common/shared/Defs-javadoc.gmk ! make/docs/Makefile From joe.darcy at oracle.com Wed Jun 9 15:58:46 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Wed, 09 Jun 2010 15:58:46 -0700 Subject: Need reviewers, multiple fixes: fastdebug builds, testing, rebranding, jaxp/jaxws updates In-Reply-To: <3AC7AA81-7E0C-4553-A0C9-7D182790CA56@oracle.com> References: <3AC7AA81-7E0C-4553-A0C9-7D182790CA56@oracle.com> Message-ID: <4C101CA6.1050205@oracle.com> Looks good; thanks Kelly! -Joe Kelly O'Hair wrote: > Need reviewers: > > root repo: > > 6959596: Windows fastdebug build broken > 6928700: Configure top repo for JPRT testing > http://cr.openjdk.java.net/~ohair/openjdk6/fastdebug-testing/webrev/ > > jdk repo: > > 6928700: Configure top repo for JPRT testing > 6931871: Rebranding of javadoc generation in makefiles > 6951293: control docs target does not work on windows > http://cr.openjdk.java.net/~ohair/openjdk6/javadoc-testing/webrev/ > > jaxp repo: > > 6940241: Change jaxp/jaxws so that the http downloads are not done by > default > 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts > 6955301: Update names and references to rebranded drop bundles (jaxp, > jaxws, jaf) > http://cr.openjdk.java.net/~ohair/openjdk6/jaxp-b20/webrev/ > > jaxws repo: > > 6940241: Change jaxp/jaxws so that the http downloads are not done by > default > 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts > 6955300: Missing files in the jaf source bundle (Thanks to Rama) > 6955301: Update names and references to rebranded drop bundles (jaxp, > jaxws, jaf) > http://cr.openjdk.java.net/~ohair/openjdk6/jaxws-b20/webrev/ > > > New jaxws and jaxp source drops: > https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaxws-b20.zip > > https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaf-b20.zip > https://jaxp.dev.java.net/files/documents/913/150648/jdk6-jaxp-b20.zip > > -kto From joe.darcy at oracle.com Wed Jun 9 18:02:27 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Wed, 09 Jun 2010 18:02:27 -0700 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <4C1039A3.6020600@oracle.com> Andrew Su wrote: > Hello, > > This is the link[1] to the changeset which fixes the bug which renders a circle that has a side clipped. > Requesting permission to backport this fix. > > [1] http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/fb03586d68b6 > > -Andrew > Hello Andrew. I approve this fix being applied to OpenJDK 6 b20 *as long as* the file test/sun/pisces/ScaleTest.java is added initially with an Oracle copyright rather than a Sun one; in other words, use this version of the test file: http://hg.openjdk.java.net/jdk7/jdk7/jdk/file/00cd9dc3c2b5/test/sun/pisces/ScaleTest.java FYI, here are some other fixes from JDK 7 that might be applicable and worthwhile to include in OpenJDK 6: 6697721 OpenJDK: rotated text baseline different between TextLayout and drawString 6587560 OpenJDK problem handling bitmaps returned when LCD text is requested. (may want to pull over any other subsequent fixes involving src/share/native/sun/font/freetypeScaler.c too, but the changeset for 6307603: "[X11] Use RENDER extension for complex operations done in software" should be considered separately.) 6829678 StrokeShapeTest: createStrokedShape() behaves differently 6829673 ThinLineTest: A line < 1 pixel disappears. 6793344 BasicStroke's first element dash pattern is not a dash -Joe From joe.darcy at oracle.com Wed Jun 9 18:04:40 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Wed, 09 Jun 2010 18:04:40 -0700 Subject: Need reviewers, multiple fixes: fastdebug builds, testing, rebranding, jaxp/jaxws updates In-Reply-To: <4C101CA6.1050205@oracle.com> References: <3AC7AA81-7E0C-4553-A0C9-7D182790CA56@oracle.com> <4C101CA6.1050205@oracle.com> Message-ID: <4C103A28.2020905@oracle.com> With the push of Kelly's fixes, I think we're *almost* done with the rebranding work for OpenJDK 6 b20. There may be another small adjustment needed to langtools before the build is concluded. -Joe Joe Darcy wrote: > Looks good; thanks Kelly! > > -Joe > > Kelly O'Hair wrote: >> Need reviewers: >> >> root repo: >> >> 6959596: Windows fastdebug build broken >> 6928700: Configure top repo for JPRT testing >> http://cr.openjdk.java.net/~ohair/openjdk6/fastdebug-testing/webrev/ >> >> jdk repo: >> >> 6928700: Configure top repo for JPRT testing >> 6931871: Rebranding of javadoc generation in makefiles >> 6951293: control docs target does not work on windows >> http://cr.openjdk.java.net/~ohair/openjdk6/javadoc-testing/webrev/ >> >> jaxp repo: >> >> 6940241: Change jaxp/jaxws so that the http downloads are not done by >> default >> 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts >> 6955301: Update names and references to rebranded drop bundles (jaxp, >> jaxws, jaf) >> http://cr.openjdk.java.net/~ohair/openjdk6/jaxp-b20/webrev/ >> >> jaxws repo: >> >> 6940241: Change jaxp/jaxws so that the http downloads are not done by >> default >> 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts >> 6955300: Missing files in the jaf source bundle (Thanks to Rama) >> 6955301: Update names and references to rebranded drop bundles (jaxp, >> jaxws, jaf) >> http://cr.openjdk.java.net/~ohair/openjdk6/jaxws-b20/webrev/ >> >> >> New jaxws and jaxp source drops: >> https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaxws-b20.zip >> >> https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaf-b20.zip >> https://jaxp.dev.java.net/files/documents/913/150648/jdk6-jaxp-b20.zip >> >> -kto > From ahughes at redhat.com Thu Jun 10 05:05:28 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 10 Jun 2010 13:05:28 +0100 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <4C1039A3.6020600@oracle.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> Message-ID: On 10 June 2010 02:02, Joe Darcy wrote: > Andrew Su wrote: >> >> Hello, >> >> This is the link[1] to the changeset which fixes the bug which renders a >> circle that has a side clipped. >> Requesting permission to backport this fix. >> >> [1] http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/fb03586d68b6 >> >> -Andrew >> > > Hello Andrew. > > I approve this fix being applied to OpenJDK 6 b20 *as long as* the file > test/sun/pisces/ScaleTest.java is added initially with an Oracle copyright > rather than a Sun one; in other words, use this version of the test file: > http://hg.openjdk.java.net/jdk7/jdk7/jdk/file/00cd9dc3c2b5/test/sun/pisces/ScaleTest.java > Done. > FYI, here are some other fixes from JDK 7 that might be applicable and > worthwhile to include in OpenJDK 6: > > 6697721 OpenJDK: rotated text baseline different between TextLayout and > drawString This patch updates a testcase introduced in: 6683472: Incorrect handling of translation component of font transform. and further updated by: 6687298: Reg testcase java/awt/Graphics2D/DrawString/RotTransText.java fails on windows Ok to backport these as well? > 6587560 OpenJDK problem handling bitmaps returned when LCD text is > requested. > ? (may want to pull over any other subsequent fixes involving > src/share/native/sun/font/freetypeScaler.c too, I've brought over: 6703377: freetype: glyph vector outline is not translated correctly 6587560: OpenJDK problem handling bitmaps returned when LCD text is requested 6887292: memory leak in freetypeScaler.c The others have already been backported. > ? ?but the changeset for 6307603: "[X11] Use RENDER extension for complex > operations done in software" > ? should be considered separately.) I was going to ask about this. I think it should wait until b21. It's not even in the jdk7 forest yet, and needs time to soak there first. An older version has been in IcedTea for years, so we'll update that and get some testing there before including it in OpenJDK6 upstream. > 6829678 StrokeShapeTest: createStrokedShape() behaves differently Backported. > 6829673 ThinLineTest: A line < 1 pixel disappears. Backported. > 6793344 BasicStroke's first element dash pattern is not a dash Backported. There are some Nimbus bugfixes we should bring over: changeset: 2337:042eb92f89ad user: peterz date: Thu May 06 12:57:30 2010 +0400 summary: 6919629: Nimbus L&F Nimbus.Overrides option leaks significant amounts of memory changeset: 2214:325823a26aac user: peterz date: Thu Mar 18 12:02:12 2010 +0300 summary: 6932524: NIMBUS: 3 constructors of JSplitPane creates new jsp with continuous layout - they should not. changeset: 2212:1224c1388e86 user: rupashka date: Wed Mar 17 12:48:21 2010 +0300 summary: 6933784: NIMBUS: ImageView getNoImageIcon and getLoadingImageIcon returns nulls instead of an icon changeset: 2140:fffd21bc5657 user: peterz date: Fri Dec 25 17:47:08 2009 +0300 summary: 6860438: [Nimbus] Code to globally set slider's thumb background doesn't work as specified changeset: 2139:e2f7e92c30f1 user: peterz date: Mon Dec 21 19:26:58 2009 +0300 summary: 6860433: [Nimbus] Code to set a single slider's thumb background doesn't work as specified and some timezone data updates: changeset: 2296:2571720800a6 user: peytoia date: Tue Apr 20 15:01:31 2010 +0900 summary: 6945238: (tz) Support tzdata2010i changeset: 2216:f799c62ad4f8 user: peytoia date: Tue Mar 30 18:35:47 2010 +0900 summary: 6939021: (tz) Support tzdata2010g changeset: 2209:0e0ce1aa1bba user: peytoia date: Thu Mar 11 11:54:17 2010 +0900 summary: 6933032: (tz) Support tzdata2010e changeset: 2208:0137b5857c63 parent: 2183:90248595ec35 user: okutsu date: Wed Mar 10 14:32:47 2010 +0900 summary: 6932473: (tz) javazic produces incorrect SimpleTimeZone parameters with Sun<=7 Do these look ok? > > -Joe > -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Thu Jun 10 05:08:32 2010 From: ahughes at redhat.com (ahughes at redhat.com) Date: Thu, 10 Jun 2010 12:08:32 +0000 Subject: hg: jdk6/jdk6/jdk: 7 new changesets Message-ID: <20100610121003.000D2470DF@hg.openjdk.java.net> Changeset: 1faf81af6e20 Author: jgodinez Date: 2010-06-10 11:59 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/1faf81af6e20 6829659: Circle is rendered in C shape Reviewed-by: campbell, flar Contributed-by: Google ! src/share/classes/sun/java2d/pisces/PiscesCache.java + test/sun/pisces/ScaleTest.java Changeset: 0f7f92c49605 Author: igor Date: 2008-05-21 10:59 +0400 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/0f7f92c49605 6703377: freetype: glyph vector outline is not translated correctly Reviewed-by: bae, prr ! src/share/native/sun/font/freetypeScaler.c + test/java/awt/font/Rotate/TranslatedOutlineTest.java Changeset: 87d59586325c Author: igor Date: 2008-05-28 20:06 +0400 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/87d59586325c 6587560: OpenJDK problem handling bitmaps returned when LCD text is requested Reviewed-by: bae, prr ! src/share/native/sun/font/freetypeScaler.c Changeset: baa28f160337 Author: igor Date: 2009-10-02 10:15 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/baa28f160337 6887292: memory leak in freetypeScaler.c Reviewed-by: bae, prr ! src/share/native/sun/font/freetypeScaler.c Changeset: 22532d2b3378 Author: jgodinez Date: 2009-04-21 09:43 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/22532d2b3378 6829678: StrokeShapeTest: createStrokedShape() behaves differently Reviewed-by: igor, flar Contributed-by: rkennke ! src/share/classes/sun/java2d/pisces/Stroker.java + test/sun/pisces/StrokeShapeTest.java Changeset: 2f390d5812c3 Author: jgodinez Date: 2009-08-04 17:25 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/2f390d5812c3 6829673: ThinLineTest: A line < 1 pixel disappears. Reviewed-by: igor, prr Contributed-by: rkennke ! src/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java + test/sun/pisces/ThinLineTest.java Changeset: 96f9b3877ff5 Author: jgodinez Date: 2009-01-28 09:38 -0800 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/96f9b3877ff5 6793344: BasicStroke's first element dash pattern is not a dash Reviewed-by: igor, flar Contributed-by: Red Hat ! src/share/classes/sun/java2d/pisces/Dasher.java + test/sun/pisces/DashStrokeTest.java From martinrb at google.com Thu Jun 10 11:21:31 2010 From: martinrb at google.com (Martin Buchholz) Date: Thu, 10 Jun 2010 11:21:31 -0700 Subject: Need reviewers, multiple fixes: fastdebug builds, testing, rebranding, jaxp/jaxws updates In-Reply-To: <3AC7AA81-7E0C-4553-A0C9-7D182790CA56@oracle.com> References: <3AC7AA81-7E0C-4553-A0C9-7D182790CA56@oracle.com> Message-ID: On Wed, Jun 9, 2010 at 09:57, Kelly O'Hair wrote: > New jaxws and jaxp source drops: > https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaxws-b20.zip > https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaf-b20.zip > https://jaxp.dev.java.net/files/documents/913/150648/jdk6-jaxp-b20.zip I'm failing to be able to download the jaf and jaxws bundles Martin From kelly.ohair at oracle.com Thu Jun 10 11:56:52 2010 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Thu, 10 Jun 2010 11:56:52 -0700 Subject: Need reviewers, multiple fixes: fastdebug builds, testing, rebranding, jaxp/jaxws updates In-Reply-To: References: <3AC7AA81-7E0C-4553-A0C9-7D182790CA56@oracle.com> Message-ID: <44FC8FC7-2C5C-40A4-8979-F6B82DCA7271@oracle.com> Dang... I think I got two of these mixed up: https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaxws-b20.zip https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip Try those. -kto On Jun 10, 2010, at 11:21 AM, Martin Buchholz wrote: > On Wed, Jun 9, 2010 at 09:57, Kelly O'Hair > wrote: > >> New jaxws and jaxp source drops: >> https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaxws-b20.zip >> https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaf-b20.zip >> https://jaxp.dev.java.net/files/documents/913/150648/jdk6-jaxp- >> b20.zip > > I'm failing to be able to download the jaf and jaxws bundles > > Martin From martinrb at google.com Thu Jun 10 12:07:17 2010 From: martinrb at google.com (Martin Buchholz) Date: Thu, 10 Jun 2010 12:07:17 -0700 Subject: Need reviewers, multiple fixes: fastdebug builds, testing, rebranding, jaxp/jaxws updates In-Reply-To: <44FC8FC7-2C5C-40A4-8979-F6B82DCA7271@oracle.com> References: <3AC7AA81-7E0C-4553-A0C9-7D182790CA56@oracle.com> <44FC8FC7-2C5C-40A4-8979-F6B82DCA7271@oracle.com> Message-ID: Thanks - much better... Martin On Thu, Jun 10, 2010 at 11:56, Kelly O'Hair wrote: > > Dang... I think I got two of these mixed up: > > https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaxws-b20.zip > https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip > > Try those. > > -kto > > On Jun 10, 2010, at 11:21 AM, Martin Buchholz wrote: > >> On Wed, Jun 9, 2010 at 09:57, Kelly O'Hair wrote: >> >>> New jaxws and jaxp source drops: >>> >>> https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaxws-b20.zip >>> https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaf-b20.zip >>> https://jaxp.dev.java.net/files/documents/913/150648/jdk6-jaxp-b20.zip >> >> I'm failing to be able to download the jaf and jaxws bundles >> >> Martin > > From joe.darcy at oracle.com Thu Jun 10 14:17:40 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Thu, 10 Jun 2010 14:17:40 -0700 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> Message-ID: <4C115674.50303@oracle.com> Andrew John Hughes wrote: > On 10 June 2010 02:02, Joe Darcy wrote: > >> Andrew Su wrote: >> >>> Hello, >>> >>> This is the link[1] to the changeset which fixes the bug which renders a >>> circle that has a side clipped. >>> Requesting permission to backport this fix. >>> >>> [1] http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/fb03586d68b6 >>> >>> -Andrew >>> >>> >> Hello Andrew. >> >> I approve this fix being applied to OpenJDK 6 b20 *as long as* the file >> test/sun/pisces/ScaleTest.java is added initially with an Oracle copyright >> rather than a Sun one; in other words, use this version of the test file: >> http://hg.openjdk.java.net/jdk7/jdk7/jdk/file/00cd9dc3c2b5/test/sun/pisces/ScaleTest.java >> >> > > Done. > > >> FYI, here are some other fixes from JDK 7 that might be applicable and >> worthwhile to include in OpenJDK 6: >> >> 6697721 OpenJDK: rotated text baseline different between TextLayout and >> drawString >> > > This patch updates a testcase introduced in: > > 6683472: Incorrect handling of translation component of font transform. > > and further updated by: > > 6687298: Reg testcase java/awt/Graphics2D/DrawString/RotTransText.java > fails on windows > > Ok to backport these as well? > Yes. > >> 6587560 OpenJDK problem handling bitmaps returned when LCD text is >> requested. >> (may want to pull over any other subsequent fixes involving >> src/share/native/sun/font/freetypeScaler.c too, >> > > I've brought over: > > 6703377: freetype: glyph vector outline is not translated correctly > 6587560: OpenJDK problem handling bitmaps returned when LCD text is requested > 6887292: memory leak in freetypeScaler.c > > The others have already been backported. > Good. > >> but the changeset for 6307603: "[X11] Use RENDER extension for complex >> operations done in software" >> should be considered separately.) >> > > I was going to ask about this. I think it should wait until b21 > > It's not even in the jdk7 forest yet, and needs time to soak there > first. > Agreed on both counts. > An older version has been in IcedTea for years, so we'll update that > and get some testing there before including it in OpenJDK6 upstream. > > >> 6829678 StrokeShapeTest: createStrokedShape() behaves differently >> > > Backported. > > >> 6829673 ThinLineTest: A line < 1 pixel disappears. >> > > Backported. > > >> 6793344 BasicStroke's first element dash pattern is not a dash >> > > Backported. > > There are some Nimbus bugfixes we should bring over: > > changeset: 2337:042eb92f89ad > user: peterz > date: Thu May 06 12:57:30 2010 +0400 > summary: 6919629: Nimbus L&F Nimbus.Overrides option leaks > significant amounts of memory > > changeset: 2214:325823a26aac > user: peterz > date: Thu Mar 18 12:02:12 2010 +0300 > summary: 6932524: NIMBUS: 3 constructors of JSplitPane creates new > jsp with continuous layout - they should not. > > changeset: 2212:1224c1388e86 > user: rupashka > date: Wed Mar 17 12:48:21 2010 +0300 > summary: 6933784: NIMBUS: ImageView getNoImageIcon and > getLoadingImageIcon returns nulls instead of an icon > > changeset: 2140:fffd21bc5657 > user: peterz > date: Fri Dec 25 17:47:08 2009 +0300 > summary: 6860438: [Nimbus] Code to globally set slider's thumb > background doesn't work as specified > > changeset: 2139:e2f7e92c30f1 > user: peterz > date: Mon Dec 21 19:26:58 2009 +0300 > summary: 6860433: [Nimbus] Code to set a single slider's thumb > background doesn't work as specified > Approved. > and some timezone data updates: > > changeset: 2296:2571720800a6 > user: peytoia > date: Tue Apr 20 15:01:31 2010 +0900 > summary: 6945238: (tz) Support tzdata2010i > > changeset: 2216:f799c62ad4f8 > user: peytoia > date: Tue Mar 30 18:35:47 2010 +0900 > summary: 6939021: (tz) Support tzdata2010g > > changeset: 2209:0e0ce1aa1bba > user: peytoia > date: Thu Mar 11 11:54:17 2010 +0900 > summary: 6933032: (tz) Support tzdata2010e > > changeset: 2208:0137b5857c63 > parent: 2183:90248595ec35 > user: okutsu > date: Wed Mar 10 14:32:47 2010 +0900 > summary: 6932473: (tz) javazic produces incorrect SimpleTimeZone > parameters with Sun<=7 > > Do these look ok? > > Yes; also approved to go back. Since some Sun copyrighted files have leaked back in, we'll done another pass to clean up any such files before b20 goes final. Thanks, -Joe From kelly.ohair at oracle.com Thu Jun 10 14:59:51 2010 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Thu, 10 Jun 2010 14:59:51 -0700 Subject: Minor adjustments to jax Makefiles and added a test target to top makefile Message-ID: <5267FA68-088E-48E8-9BEB-E3D283AF4E18@oracle.com> Changes on their way... doing full builds to try them out. 6960333: Add make level ALLOW_DOWNLOADS=true option 6960335: Add top level 'make test' rule that uses test/Makefile, runs all test batches http://cr.openjdk.java.net/~ohair/openjdk6/jax-make-test-allow/webrev/ Minor jaxp/jaxws makefile adjustment, and a new top level Makefile "test" target. Next time you build the entire openjdk6 forest, try doing it with: make && make test Or if you have a N (N>1) cpu machine, try: make && make -j N test e.g. make && make -j 4 test If tests fail, let me know. The -j option runs the test batches in parallel and they can sometimes cause strange failures if tests use the same port. Not using -j is more predictable but might take 2 hours. My last -j 4 results took 15mins on Solaris 20 x86, and the failures I saw were: ERROR: Test failure count: 14 FAILED: java/beans/XMLEncoder/java_u FAILED: javax/management/MBeanServer/NewMBeanListenerTest.java FAILED: com/sun/crypto/provider/Cipher/RSA/TestOAEP.java FAILED: java/net/ResponseCache/getResponseCode.java <- will be fixed soon FAILED: sun/net/www/protocol/http/RelativeRedirect.java <- will be fixed soon FAILED: sun/net/www/protocol/http/StackTraceTest.java <- will be fixed soon FAILED: sun/tools/jconsole/ImmutableResourceTest.sh FAILED: tools/pack200/Pack200Simple.sh FAILED: sun/security/pkcs11/ec/ReadCertificates.java FAILED: sun/security/pkcs11/ec/ReadPKCS12.java FAILED: sun/security/pkcs11/ec/TestCurves.java FAILED: sun/security/pkcs11/ec/TestECDSA.java FAILED: sun/security/pkcs11/ec/TestECGenSpec.java FAILED: sun/security/pkcs11/ec/TestKeyFactory.java I will investigate the rest, but without -j 4 I only saw the 3 known / net/ failures. Eventually these changes will make it into jdk7. -kto From joe.darcy at oracle.com Thu Jun 10 15:05:45 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Thu, 10 Jun 2010 15:05:45 -0700 Subject: Minor adjustments to jax Makefiles and added a test target to top makefile In-Reply-To: <5267FA68-088E-48E8-9BEB-E3D283AF4E18@oracle.com> References: <5267FA68-088E-48E8-9BEB-E3D283AF4E18@oracle.com> Message-ID: <4C1161B9.6090205@oracle.com> Kelly O'Hair wrote: > > Changes on their way... doing full builds to try them out. > > 6960333: Add make level ALLOW_DOWNLOADS=true option > 6960335: Add top level 'make test' rule that uses test/Makefile, runs > all test batches > > http://cr.openjdk.java.net/~ohair/openjdk6/jax-make-test-allow/webrev/ > > Minor jaxp/jaxws makefile adjustment, and a new top level Makefile > "test" target. Hi Kelly. Approved to go back contingent on successful builds. Thanks, -Joe From jonathan.gibbons at oracle.com Thu Jun 10 15:48:35 2010 From: jonathan.gibbons at oracle.com (jonathan.gibbons at oracle.com) Date: Thu, 10 Jun 2010 22:48:35 +0000 Subject: hg: jdk6/jdk6/langtools: 6944312: Potential rebranding issues in openjdk/langtools repository sources Message-ID: <20100610224837.2B901470F9@hg.openjdk.java.net> Changeset: 2a66a69ffe48 Author: jjg Date: 2010-06-10 15:48 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/2a66a69ffe48 6944312: Potential rebranding issues in openjdk/langtools repository sources Reviewed-by: darcy ! src/share/classes/com/sun/tools/apt/comp/Apt.java ! src/share/classes/com/sun/tools/apt/main/CommandLine.java ! src/share/classes/com/sun/tools/apt/main/JavaCompiler.java ! src/share/classes/com/sun/tools/apt/main/Main.java ! src/share/classes/com/sun/tools/apt/util/Bark.java ! src/share/classes/com/sun/tools/javac/Launcher.java ! src/share/classes/com/sun/tools/javac/Server.java ! src/share/classes/com/sun/tools/javac/api/JavacScope.java ! src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java ! src/share/classes/com/sun/tools/javac/api/JavacTool.java ! src/share/classes/com/sun/tools/javac/api/JavacTrees.java ! src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java ! src/share/classes/com/sun/tools/javac/code/Attribute.java ! src/share/classes/com/sun/tools/javac/code/Flags.java ! src/share/classes/com/sun/tools/javac/code/Kinds.java ! src/share/classes/com/sun/tools/javac/code/Lint.java ! src/share/classes/com/sun/tools/javac/code/Scope.java ! src/share/classes/com/sun/tools/javac/code/Source.java ! src/share/classes/com/sun/tools/javac/code/Symbol.java ! src/share/classes/com/sun/tools/javac/code/Symtab.java ! src/share/classes/com/sun/tools/javac/code/Type.java ! src/share/classes/com/sun/tools/javac/code/TypeTags.java ! src/share/classes/com/sun/tools/javac/code/Types.java ! src/share/classes/com/sun/tools/javac/comp/Annotate.java ! src/share/classes/com/sun/tools/javac/comp/Attr.java ! src/share/classes/com/sun/tools/javac/comp/AttrContext.java ! src/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java ! src/share/classes/com/sun/tools/javac/comp/Check.java ! src/share/classes/com/sun/tools/javac/comp/ConstFold.java ! src/share/classes/com/sun/tools/javac/comp/Enter.java ! src/share/classes/com/sun/tools/javac/comp/Env.java ! src/share/classes/com/sun/tools/javac/comp/Flow.java ! src/share/classes/com/sun/tools/javac/comp/Infer.java ! src/share/classes/com/sun/tools/javac/comp/Lower.java ! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java ! src/share/classes/com/sun/tools/javac/comp/Resolve.java ! src/share/classes/com/sun/tools/javac/comp/Todo.java ! src/share/classes/com/sun/tools/javac/comp/TransTypes.java ! src/share/classes/com/sun/tools/javac/jvm/ByteCodes.java ! src/share/classes/com/sun/tools/javac/jvm/CRTFlags.java ! src/share/classes/com/sun/tools/javac/jvm/CRTable.java ! src/share/classes/com/sun/tools/javac/jvm/ClassFile.java ! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java ! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java ! src/share/classes/com/sun/tools/javac/jvm/Code.java ! src/share/classes/com/sun/tools/javac/jvm/Gen.java ! src/share/classes/com/sun/tools/javac/jvm/Items.java ! src/share/classes/com/sun/tools/javac/jvm/Pool.java ! src/share/classes/com/sun/tools/javac/jvm/Target.java ! src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java ! src/share/classes/com/sun/tools/javac/main/CommandLine.java ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java ! src/share/classes/com/sun/tools/javac/main/JavacOption.java ! src/share/classes/com/sun/tools/javac/main/Main.java ! src/share/classes/com/sun/tools/javac/main/OptionName.java ! src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java ! src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java ! src/share/classes/com/sun/tools/javac/model/FilteredMemberList.java ! src/share/classes/com/sun/tools/javac/model/JavacElements.java ! src/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java ! src/share/classes/com/sun/tools/javac/model/JavacTypes.java ! src/share/classes/com/sun/tools/javac/parser/DocCommentScanner.java ! src/share/classes/com/sun/tools/javac/parser/EndPosParser.java ! src/share/classes/com/sun/tools/javac/parser/Keywords.java ! src/share/classes/com/sun/tools/javac/parser/Lexer.java ! src/share/classes/com/sun/tools/javac/parser/Parser.java ! src/share/classes/com/sun/tools/javac/parser/Scanner.java ! src/share/classes/com/sun/tools/javac/parser/Token.java ! src/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java ! src/share/classes/com/sun/tools/javac/processing/JavacFiler.java ! src/share/classes/com/sun/tools/javac/processing/JavacMessager.java ! src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java ! src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java ! src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java ! src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java ! src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java ! src/share/classes/com/sun/tools/javac/tree/JCTree.java ! src/share/classes/com/sun/tools/javac/tree/Pretty.java ! src/share/classes/com/sun/tools/javac/tree/TreeCopier.java ! src/share/classes/com/sun/tools/javac/tree/TreeInfo.java ! src/share/classes/com/sun/tools/javac/tree/TreeMaker.java ! src/share/classes/com/sun/tools/javac/tree/TreeScanner.java ! src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java ! src/share/classes/com/sun/tools/javac/util/Abort.java ! src/share/classes/com/sun/tools/javac/util/Bits.java ! src/share/classes/com/sun/tools/javac/util/ByteBuffer.java ! src/share/classes/com/sun/tools/javac/util/ClientCodeException.java ! src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java ! src/share/classes/com/sun/tools/javac/util/Constants.java ! src/share/classes/com/sun/tools/javac/util/Context.java ! src/share/classes/com/sun/tools/javac/util/Convert.java ! src/share/classes/com/sun/tools/javac/util/FatalError.java ! src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java ! src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java ! src/share/classes/com/sun/tools/javac/util/List.java ! src/share/classes/com/sun/tools/javac/util/ListBuffer.java ! src/share/classes/com/sun/tools/javac/util/Log.java ! src/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java ! src/share/classes/com/sun/tools/javac/util/Messages.java ! src/share/classes/com/sun/tools/javac/util/Name.java ! src/share/classes/com/sun/tools/javac/util/Old199.java ! src/share/classes/com/sun/tools/javac/util/Options.java ! src/share/classes/com/sun/tools/javac/util/Pair.java ! src/share/classes/com/sun/tools/javac/util/Paths.java ! src/share/classes/com/sun/tools/javac/util/Position.java ! src/share/classes/com/sun/tools/javac/util/PropagatedException.java ! test/tools/javac/api/evalexpr/ByteArrayClassLoader.java ! test/tools/javac/api/evalexpr/CompileFromString.java ! test/tools/javac/api/evalexpr/MemoryFileManager.java ! test/tools/javac/cast/6548436/T6548436d.java ! test/tools/javac/enum/T6724345.java From jonathan.gibbons at oracle.com Thu Jun 10 17:11:22 2010 From: jonathan.gibbons at oracle.com (jonathan.gibbons at oracle.com) Date: Fri, 11 Jun 2010 00:11:22 +0000 Subject: hg: jdk6/jdk6/langtools: 6960407: Potential rebranding issues in openjdk/langtools repository sources Message-ID: <20100611001124.07D4C47107@hg.openjdk.java.net> Changeset: e568336564b8 Author: jjg Date: 2010-06-10 17:11 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/e568336564b8 6960407: Potential rebranding issues in openjdk/langtools repository sources Reviewed-by: darcy ! make/Makefile ! make/Makefile-classic ! src/share/classes/com/sun/source/tree/Tree.java ! src/share/classes/com/sun/source/util/JavacTask.java ! src/share/classes/com/sun/source/util/TaskEvent.java ! src/share/classes/com/sun/source/util/TaskListener.java ! src/share/classes/com/sun/tools/doclets/formats/html/package.html ! src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java ! src/share/classes/com/sun/tools/javac/code/Flags.java ! src/share/classes/com/sun/tools/javac/code/Symtab.java ! src/share/classes/com/sun/tools/javac/resources/compiler.properties ! src/share/classes/com/sun/tools/javadoc/resources/javadoc.properties ! src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties ! src/share/classes/javax/tools/JavaFileManager.java From kelly.ohair at oracle.com Thu Jun 10 17:33:33 2010 From: kelly.ohair at oracle.com (kelly.ohair at oracle.com) Date: Fri, 11 Jun 2010 00:33:33 +0000 Subject: hg: jdk6/jdk6: 6960335: Add top level 'make test' rule that uses test/Makefile, runs all test batches Message-ID: <20100611003334.0A8234710B@hg.openjdk.java.net> Changeset: d6d46e2d0fc8 Author: ohair Date: 2010-06-10 14:31 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/rev/d6d46e2d0fc8 6960335: Add top level 'make test' rule that uses test/Makefile, runs all test batches Reviewed-by: darcy, jjg ! Makefile ! test/Makefile From kelly.ohair at oracle.com Thu Jun 10 17:33:46 2010 From: kelly.ohair at oracle.com (kelly.ohair at oracle.com) Date: Fri, 11 Jun 2010 00:33:46 +0000 Subject: hg: jdk6/jdk6/jaxp: 6960333: Add make level ALLOW_DOWNLOADS=true option Message-ID: <20100611003346.6EA384710D@hg.openjdk.java.net> Changeset: d3984577cb78 Author: ohair Date: 2010-06-10 14:32 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxp/rev/d3984577cb78 6960333: Add make level ALLOW_DOWNLOADS=true option Reviewed-by: darcy, jjg ! make/Makefile From kelly.ohair at oracle.com Thu Jun 10 17:33:59 2010 From: kelly.ohair at oracle.com (kelly.ohair at oracle.com) Date: Fri, 11 Jun 2010 00:33:59 +0000 Subject: hg: jdk6/jdk6/jdk: 6960335: Add top level 'make test' rule that uses test/Makefile, runs all test batches Message-ID: <20100611003408.A93664710F@hg.openjdk.java.net> Changeset: 7488f648939d Author: ohair Date: 2010-06-10 14:32 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/7488f648939d 6960335: Add top level 'make test' rule that uses test/Makefile, runs all test batches Reviewed-by: darcy, jjg ! test/Makefile From kelly.ohair at oracle.com Thu Jun 10 17:34:19 2010 From: kelly.ohair at oracle.com (kelly.ohair at oracle.com) Date: Fri, 11 Jun 2010 00:34:19 +0000 Subject: hg: jdk6/jdk6: 6960335: Add top level 'make test' rule that uses test/Makefile, runs all test batches Message-ID: <20100611003419.737EF47110@hg.openjdk.java.net> Changeset: e79c0d2e6512 Author: ohair Date: 2010-06-10 16:50 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/rev/e79c0d2e6512 6960335: Add top level 'make test' rule that uses test/Makefile, runs all test batches Summary: Some test targets could be run twice. Reviewed-by: darcy ! test/Makefile From kelly.ohair at oracle.com Thu Jun 10 17:34:57 2010 From: kelly.ohair at oracle.com (kelly.ohair at oracle.com) Date: Fri, 11 Jun 2010 00:34:57 +0000 Subject: hg: jdk6/jdk6/jaxws: 6960333: Add make level ALLOW_DOWNLOADS=true option Message-ID: <20100611003457.6F10647113@hg.openjdk.java.net> Changeset: 49efd83dd6b5 Author: ohair Date: 2010-06-10 14:32 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxws/rev/49efd83dd6b5 6960333: Add make level ALLOW_DOWNLOADS=true option Reviewed-by: darcy, jjg ! make/Makefile From bradford.wetmore at oracle.com Thu Jun 10 17:43:52 2010 From: bradford.wetmore at oracle.com (Brad Wetmore) Date: Thu, 10 Jun 2010 17:43:52 -0700 Subject: bugs.openjdk.java.net is offline In-Reply-To: References: <4BEAEF5B.8050203@oracle.com> <1274265738.2583.44.camel@hermans.wildebeest.org> <4BF3C3F0.6030000@oracle.com> <4BF43864.3030709@oracle.com> Message-ID: <4C1186C8.20000@oracle.com> Hi Andrew, On 6/3/2010 10:18 AM, Andrew John Hughes wrote: > On 19 May 2010 20:13, Brad Wetmore wrote: >> >> On 5/19/2010 3:56 AM, Daniel D. Daugherty wrote: >>> >>> On 5/19/2010 4:42 AM, Mark Wielaard wrote: >>>> >>>> On Wed, 2010-05-12 at 11:11 -0700, Brad Wetmore wrote: >>>>> >>>>> We're aware of the problem and are working on it. >>>> >>>> Thanks. It is still (again?) down for me. >>>> Also hg.openjdk.java.net is giving: >>>> 500 - Internal Server Error >>> >>> That would be "again" as opposed to "still". >> >> No, "still" is correct. We're waiting on some system administration help. The system admin part has been resolved, now I just need some cycles to check the integrity of the bugzilla database. > Any news on when bugs.openjdk.java.net will be back online? I'm almost back up to the surface. Should get some time tomorrow to make a start on this. Brad From Weijun.Wang at Sun.COM Thu Jun 10 21:04:24 2010 From: Weijun.Wang at Sun.COM (Weijun Wang) Date: Fri, 11 Jun 2010 12:04:24 +0800 Subject: Fwd: CR 6958869/6u21 Updated, P2 java/classes_secu regression: PKIXValidator fails when multiple trust anchors have same dn References: <2158878.1276123864654.JavaMail.sbladm@swsblss3-new> Message-ID: <3E3DD0D6-65E9-4A4B-9944-E743A014E966@Sun.COM> Hi Joe This is a last minute fix to 6948803. You've already approved 6948803 to be included in openjdk-6. Now I request 6958869 to be included as well. I've been busy recently so have no time to really push 6948803, I plan to push a combined changeset with both bug IDs in the description. The webrev is here (the changeset for 6u21, I'll add copyright info to test): http://cr.openjdk.java.net/~weijun/6958869/6/webrev.00/ Basically the Map is changed to Map> so that no one is missing even if there are duplicated subject names. The Certificate->PublicKey change makes coding easy, since we only compares public keys, and a keyList.contains(key) is simpler than for (c in certList) if (c.getPublicKey().equals(key)) return true; else continue; return false Thanks Max Begin forwarded message: > === Field ============ === New Value ============= === Old Value ============= > Keyword 6u21-yes-b06 > ====================== =========================== =========================== > > *Change Request ID*: 6958869/6u21 > *Synopsis*: regression: PKIXValidator fails when multiple trust anchors have same dn From joe.darcy at oracle.com Thu Jun 10 21:31:53 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Thu, 10 Jun 2010 21:31:53 -0700 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <4C115674.50303@oracle.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> Message-ID: <4C11BC39.9020602@oracle.com> Joe Darcy wrote: > Andrew John Hughes wrote: >> On 10 June 2010 02:02, Joe Darcy wrote: >> >>> Andrew Su wrote: >>> [snip] >> >> >> changeset: 2208:0137b5857c63 >> parent: 2183:90248595ec35 >> user: okutsu >> date: Wed Mar 10 14:32:47 2010 +0900 >> summary: 6932473: (tz) javazic produces incorrect SimpleTimeZone >> parameters with Sun<=7 >> >> Do these look ok? >> >> > > Yes; also approved to go back. > > Since some Sun copyrighted files have leaked back in, we'll done > another pass to clean up any such files before b20 goes final. > > Thanks, > > -Joe > > I think only a few more changes are needed to wrap up b20: * The various backports identified in the earlier message in this thread * Backport of 6957375 "java/net/ResponseCache getResponseCode and ResponseCacheTest fail after rebranding" * One more pass of the Sun -> Oracle copyright script -Joe From mark at klomp.org Fri Jun 11 01:06:25 2010 From: mark at klomp.org (Mark Wielaard) Date: Fri, 11 Jun 2010 10:06:25 +0200 Subject: bugs.openjdk.java.net is offline In-Reply-To: <4C1186C8.20000@oracle.com> References: <4BEAEF5B.8050203@oracle.com> <1274265738.2583.44.camel@hermans.wildebeest.org> <4BF3C3F0.6030000@oracle.com> <4BF43864.3030709@oracle.com> <4C1186C8.20000@oracle.com> Message-ID: <1276243585.2427.19.camel@hermans.wildebeest.org> Hi Brad, On Thu, 2010-06-10 at 17:43 -0700, Brad Wetmore wrote: The system admin part has been resolved, now I just need some cycles to > check the integrity of the bugzilla database. > > > Any news on when bugs.openjdk.java.net will be back online? > > I'm almost back up to the surface. Should get some time tomorrow to > make a start on this. Thanks for working on this. Could you try to make it so that the bugzilla database can be backed up publicly (maybe just through rsync)? Then we can setup a (read-only) mirror just in case it goes down again. We also do that for some of the key openjdk hg forests. I don't have this yet for icedtea, but that also really should have a public readable backup just in case the hardware fails. https://wiki.mozilla.org/Bugzilla:FAQ#Are_there_any_backup_features_provided.3F Cheers, Mark From chris.hegarty at oracle.com Fri Jun 11 01:59:01 2010 From: chris.hegarty at oracle.com (chris.hegarty at oracle.com) Date: Fri, 11 Jun 2010 08:59:01 +0000 Subject: hg: jdk6/jdk6/jdk: 6957375: java/net/ResponseCache getResponseCode and ResponseCacheTest fail after rebranding Message-ID: <20100611085909.654DF47144@hg.openjdk.java.net> Changeset: dad811d04bde Author: chegar Date: 2010-06-11 09:58 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/dad811d04bde 6957375: java/net/ResponseCache getResponseCode and ResponseCacheTest fail after rebranding Reviewed-by: alanb, ohair ! test/java/net/ResponseCache/file1.cache From research.malware at gmail.com Fri Jun 11 02:15:43 2010 From: research.malware at gmail.com (Dinesh Venkatesan) Date: Fri, 11 Jun 2010 14:45:43 +0530 Subject: Source code of javap.exe - reg. Message-ID: Hi Friends, Where can i get the source code of javap.exe. If i download it open-jdk package will it be available? Thanks in Advance!!! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/jdk6-dev/attachments/20100611/08ce0545/attachment.html From jonathan.gibbons at oracle.com Fri Jun 11 10:15:38 2010 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Fri, 11 Jun 2010 10:15:38 -0700 Subject: 6-open putback request: 6877961: langtools build should allow more options when running jtre Message-ID: <4C126F3A.5040205@oracle.com> Joe, This is a low risk update to the task within langtools build.xml. It allows more external control of jtreg options without any additional changes to the build.xml file. The patch from 7 applies without error. I would like to push the fix to 6-open as well. -- Jon See: Changeset: 224533455888 Author: jjg Date: 2010-06-11 07:12 -0700 URL:http://hg.openjdk.java.net/jdk7/tl/langtools/rev/224533455888 6877961: langtools build should allow more options when running jtreg Reviewed-by: mcimadamore ! make/build.xml From joe.darcy at oracle.com Fri Jun 11 10:21:45 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 11 Jun 2010 10:21:45 -0700 Subject: 6-open putback request: 6877961: langtools build should allow more options when running jtre In-Reply-To: <4C126F3A.5040205@oracle.com> References: <4C126F3A.5040205@oracle.com> Message-ID: <4C1270A9.8020508@oracle.com> Approved to go back. Thanks, -Joe Jonathan Gibbons wrote: > Joe, > > This is a low risk update to the task within langtools > build.xml. It allows more external control of jtreg options without > any additional changes to the build.xml file. The patch from 7 > applies without error. I would like to push the fix to 6-open as well. > > -- Jon > > > See: > > Changeset: 224533455888 > Author: jjg > Date: 2010-06-11 07:12 -0700 > URL:http://hg.openjdk.java.net/jdk7/tl/langtools/rev/224533455888 > > 6877961: langtools build should allow more options when running jtreg > Reviewed-by: mcimadamore > > ! make/build.xml > > > From jonathan.gibbons at oracle.com Fri Jun 11 10:24:42 2010 From: jonathan.gibbons at oracle.com (jonathan.gibbons at oracle.com) Date: Fri, 11 Jun 2010 17:24:42 +0000 Subject: hg: jdk6/jdk6/langtools: 6877961: langtools build should allow more options when running jtreg Message-ID: <20100611172444.06C8C47169@hg.openjdk.java.net> Changeset: 51b6d8d173cd Author: jjg Date: 2010-06-11 10:23 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/51b6d8d173cd 6877961: langtools build should allow more options when running jtreg Reviewed-by: mcimadamore ! make/build.xml From ahughes at redhat.com Fri Jun 11 11:59:03 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 11 Jun 2010 19:59:03 +0100 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <4C115674.50303@oracle.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> Message-ID: On 10 June 2010 22:17, Joe Darcy wrote: > Andrew John Hughes wrote: >> >> On 10 June 2010 02:02, Joe Darcy wrote: >> >>> >>> Andrew Su wrote: >>> >>>> >>>> Hello, >>>> >>>> This is the link[1] to the changeset which fixes the bug which renders a >>>> circle that has a side clipped. >>>> Requesting permission to backport this fix. >>>> >>>> [1] http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/fb03586d68b6 >>>> >>>> -Andrew >>>> >>>> >>> >>> Hello Andrew. >>> >>> I approve this fix being applied to OpenJDK 6 b20 *as long as* the file >>> test/sun/pisces/ScaleTest.java is added initially with an Oracle >>> copyright >>> rather than a Sun one; in other words, use this version of the test file: >>> >>> http://hg.openjdk.java.net/jdk7/jdk7/jdk/file/00cd9dc3c2b5/test/sun/pisces/ScaleTest.java >>> >>> >> >> Done. >> >> >>> >>> FYI, here are some other fixes from JDK 7 that might be applicable and >>> worthwhile to include in OpenJDK 6: >>> >>> 6697721 OpenJDK: rotated text baseline different between TextLayout and >>> drawString >>> >> >> This patch updates a testcase introduced in: >> >> 6683472: Incorrect handling of translation component of font transform. >> >> and further updated by: >> >> 6687298: Reg testcase java/awt/Graphics2D/DrawString/RotTransText.java >> fails on windows >> >> Ok to backport these as well? >> > > Yes. > Done. >> >>> >>> 6587560 OpenJDK problem handling bitmaps returned when LCD text is >>> requested. >>> ?(may want to pull over any other subsequent fixes involving >>> src/share/native/sun/font/freetypeScaler.c too, >>> >> >> I've brought over: >> >> 6703377: freetype: glyph vector outline is not translated correctly >> 6587560: OpenJDK problem handling bitmaps returned when LCD text is >> requested >> 6887292: memory leak in freetypeScaler.c >> >> The others have already been backported. >> > > Good. >> >> >>> >>> ? but the changeset for 6307603: "[X11] Use RENDER extension for complex >>> operations done in software" >>> ?should be considered separately.) >>> >> >> I was going to ask about this. ?I think it should wait until b21 >> > >> It's not even in the jdk7 forest yet, and needs time to soak there >> first. >> > > Agreed on both counts. > >> An older version has been in IcedTea for years, so we'll update that >> and get some testing there before including it in OpenJDK6 upstream. >> >> >>> >>> 6829678 StrokeShapeTest: createStrokedShape() behaves differently >>> >> >> Backported. >> >> >>> >>> 6829673 ThinLineTest: A line < 1 pixel disappears. >>> >> >> Backported. >> >> >>> >>> 6793344 BasicStroke's first element dash pattern is not a dash >>> >> >> Backported. >> >> There are some Nimbus bugfixes we should bring over: >> >> changeset: ? 2337:042eb92f89ad >> user: ? ? ? ?peterz >> date: ? ? ? ?Thu May 06 12:57:30 2010 +0400 >> summary: ? ? 6919629: Nimbus L&F Nimbus.Overrides option leaks >> significant amounts of memory >> Done. >> changeset: ? 2214:325823a26aac >> user: ? ? ? ?peterz >> date: ? ? ? ?Thu Mar 18 12:02:12 2010 +0300 >> summary: ? ? 6932524: NIMBUS: 3 constructors of JSplitPane creates new >> jsp with continuous layout - they should not. >> Done. >> changeset: ? 2212:1224c1388e86 >> user: ? ? ? ?rupashka >> date: ? ? ? ?Wed Mar 17 12:48:21 2010 +0300 >> summary: ? ? 6933784: NIMBUS: ImageView getNoImageIcon and >> getLoadingImageIcon returns nulls instead of an icon >> Done. >> changeset: ? 2140:fffd21bc5657 >> user: ? ? ? ?peterz >> date: ? ? ? ?Fri Dec 25 17:47:08 2009 +0300 >> summary: ? ? 6860438: [Nimbus] Code to globally set slider's thumb >> background doesn't work as specified >> Done. >> changeset: ? 2139:e2f7e92c30f1 >> user: ? ? ? ?peterz >> date: ? ? ? ?Mon Dec 21 19:26:58 2009 +0300 >> summary: ? ? 6860433: [Nimbus] Code to set a single slider's thumb >> background doesn't work as specified >> > Done. This one relies on a new method being added to SynthLookAndFeel in: changeset: 1999:f012e2c094ff user: peterz date: Thu Dec 10 12:08:58 2009 +0300 summary: 6827653: Make Synth UI classes public which we can't do in OpenJDK6. I've worked round this so that SynthLookAndFeel instead calls down to NimbusLookAndFeel directly (rather than via the new protected method) when it detects an instance of it. This has the same effect as the OpenJDK7 fix without introducing a protected method in SynthLookAndFeel and passes the test (pre-patched, OpenJDK6 doesn't). > Approved. > > >> and some timezone data updates: >> >> changeset: ? 2296:2571720800a6 >> user: ? ? ? ?peytoia >> date: ? ? ? ?Tue Apr 20 15:01:31 2010 +0900 >> summary: ? ? 6945238: (tz) Support tzdata2010i >> Done. >> changeset: ? 2216:f799c62ad4f8 >> user: ? ? ? ?peytoia >> date: ? ? ? ?Tue Mar 30 18:35:47 2010 +0900 >> summary: ? ? 6939021: (tz) Support tzdata2010g >> Done. >> changeset: ? 2209:0e0ce1aa1bba >> user: ? ? ? ?peytoia >> date: ? ? ? ?Thu Mar 11 11:54:17 2010 +0900 >> summary: ? ? 6933032: (tz) Support tzdata2010e >> Done. >> changeset: ? 2208:0137b5857c63 >> parent: ? ? ?2183:90248595ec35 >> user: ? ? ? ?okutsu >> date: ? ? ? ?Wed Mar 10 14:32:47 2010 +0900 >> summary: ? ? 6932473: (tz) javazic produces incorrect SimpleTimeZone >> parameters with Sun<=7 >> Done. >> Do these look ok? >> >> > > Yes; also approved to go back. > > Since some Sun copyrighted files have leaked back in, we'll done another > pass to clean up any such files before b20 goes final. > Ok. I used the Oracle copyright on those files introduced in the patches above, rather than the original. > Thanks, > > -Joe > > > -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Fri Jun 11 12:21:07 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 11 Jun 2010 20:21:07 +0100 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <4C11BC39.9020602@oracle.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> Message-ID: On 11 June 2010 05:31, Joe Darcy wrote: > Joe Darcy wrote: >> >> Andrew John Hughes wrote: >>> >>> On 10 June 2010 02:02, Joe Darcy wrote: >>> >>>> >>>> Andrew Su wrote: >>>> > > [snip] >>> >>> >>> changeset: ? 2208:0137b5857c63 >>> parent: ? ? ?2183:90248595ec35 >>> user: ? ? ? ?okutsu >>> date: ? ? ? ?Wed Mar 10 14:32:47 2010 +0900 >>> summary: ? ? 6932473: (tz) javazic produces incorrect SimpleTimeZone >>> parameters with Sun<=7 >>> >>> Do these look ok? >>> >>> >> >> Yes; also approved to go back. >> >> Since some Sun copyrighted files have leaked back in, we'll done another >> pass to clean up any such files before b20 goes final. >> >> Thanks, >> >> -Joe >> >> > > I think only a few more changes are needed to wrap up b20: > > * The various backports identified in the earlier message in this thread Done now. > * Backport of 6957375 "java/net/ResponseCache getResponseCode and > ResponseCacheTest fail after rebranding" I see this come in while I was backporting; had to merge. > * One more pass of the Sun -> Oracle copyright script > There are some new Zero bugfixes that could be backported for b20 (and would allow us to drop the local copy in IcedTea6). I've CCed Gary Benson who should be able to provide a list of bug IDs for backport. Other than that, we should be good to go with b20. > -Joe > -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Fri Jun 11 12:24:13 2010 From: ahughes at redhat.com (ahughes at redhat.com) Date: Fri, 11 Jun 2010 19:24:13 +0000 Subject: hg: jdk6/jdk6/jdk: 13 new changesets Message-ID: <20100611192607.8924047179@hg.openjdk.java.net> Changeset: ceef4397eb36 Author: prr Date: 2010-06-11 12:32 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/ceef4397eb36 6683472: Incorrect handling of translation component of font transform. Reviewed-by: igor, campbell ! src/share/classes/sun/font/AttributeValues.java + test/java/awt/Graphics2D/DrawString/RotTransText.java Changeset: bf7ac0c8a576 Author: prr Date: 2008-04-25 10:37 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/bf7ac0c8a576 6687298: Reg testcase java/awt/Graphics2D/DrawString/RotTransText.java fails on windows Reviewed-by: igor, tdv ! test/java/awt/Graphics2D/DrawString/RotTransText.java Changeset: 0296d90f52bc Author: prr Date: 2008-05-13 16:56 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/0296d90f52bc 6697721: OpenJDK: rotated text baseline different between TextLayout and drawString Reviewed-by: prr, igor Contributed-by: dougfelt at yahoo.com ! src/share/native/sun/font/freetypeScaler.c ! test/java/awt/Graphics2D/DrawString/RotTransText.java Changeset: c166019e1ee0 Author: peterz Date: 2010-06-11 18:54 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/c166019e1ee0 6860433: [Nimbus] Code to set a single slider's thumb background doesn't work as specified Reviewed-by: rupashka ! src/share/classes/com/sun/java/swing/plaf/nimbus/Defaults.template ! src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java ! src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java + test/com/sun/java/swing/plaf/nimbus/ColorCustomizationTest.java Changeset: 89cabff3d834 Author: peterz Date: 2010-06-11 19:09 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/89cabff3d834 6860438: [Nimbus] Code to globally set slider's thumb background doesn't work as specified Reviewed-by: rupashka ! src/share/classes/javax/swing/MultiUIDefaults.java + test/javax/swing/MultiUIDefaults/4300666/bug4300666.html + test/javax/swing/MultiUIDefaults/4300666/bug4300666.java + test/javax/swing/MultiUIDefaults/4331767/bug4331767.java + test/javax/swing/MultiUIDefaults/Test6860438.java Changeset: 464b2f754fc2 Author: rupashka Date: 2010-06-11 19:12 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/464b2f754fc2 6933784: NIMBUS: ImageView getNoImageIcon and getLoadingImageIcon returns nulls instead of an icon Reviewed-by: peterz ! src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java + test/javax/swing/plaf/synth/Test6933784.java Changeset: f4aead419975 Author: peterz Date: 2010-03-18 12:02 +0300 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/f4aead419975 6932524: NIMBUS: 3 constructors of JSplitPane creates new jsp with continuous layout - they should not. Reviewed-by: alexp ! src/share/classes/com/sun/java/swing/plaf/nimbus/skin.laf ! src/share/classes/javax/swing/JSplitPane.java Changeset: 4edbcf36f4d4 Author: peterz Date: 2010-06-11 19:53 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/4edbcf36f4d4 6919629: Nimbus L&F Nimbus.Overrides option leaks significant amounts of memory Reviewed-by: rupashka ! src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusStyle.java + test/com/sun/java/swing/plaf/nimbus/Test6919629.java Changeset: c9c36b05f86e Author: okutsu Date: 2010-03-10 14:32 +0900 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/c9c36b05f86e 6932473: (tz) javazic produces incorrect SimpleTimeZone parameters with Sun<=7 Reviewed-by: peytoia ! make/tools/src/build/tools/javazic/RuleDay.java Changeset: 9de5557eb5ce Author: peytoia Date: 2010-03-11 11:54 +0900 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/9de5557eb5ce 6933032: (tz) Support tzdata2010e Reviewed-by: okutsu ! make/sun/javazic/tzdata/VERSION ! make/sun/javazic/tzdata/asia ! make/sun/javazic/tzdata/australasia ! make/sun/javazic/tzdata/southamerica Changeset: 1841041e6272 Author: peytoia Date: 2010-03-30 18:35 +0900 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/1841041e6272 6939021: (tz) Support tzdata2010g Reviewed-by: okutsu ! make/sun/javazic/tzdata/VERSION ! make/sun/javazic/tzdata/antarctica ! make/sun/javazic/tzdata/asia ! make/sun/javazic/tzdata/australasia ! make/sun/javazic/tzdata/europe ! make/sun/javazic/tzdata/zone.tab ! src/share/classes/sun/util/resources/TimeZoneNames.java Changeset: 607c7c03c397 Author: peytoia Date: 2010-04-20 15:01 +0900 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/607c7c03c397 6945238: (tz) Support tzdata2010i Reviewed-by: okutsu ! make/sun/javazic/tzdata/VERSION ! make/sun/javazic/tzdata/africa ! make/sun/javazic/tzdata/asia ! make/sun/javazic/tzdata/southamerica Changeset: 0af0c751be33 Author: andrew Date: 2010-06-11 20:23 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/0af0c751be33 Merge From joe.darcy at oracle.com Fri Jun 11 12:25:17 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 11 Jun 2010 12:25:17 -0700 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> Message-ID: <4C128D9D.9020400@oracle.com> Andrew John Hughes wrote: > On 10 June 2010 22:17, Joe Darcy wrote: > >> Andrew John Hughes wrote: >> >>> On 10 June 2010 02:02, Joe Darcy wrote: >>> >>> >>>> Andrew Su wrote: >>>> >>>> >>>>> Hello, >>>>> >>>>> This is the link[1] to the changeset which fixes the bug which renders a >>>>> circle that has a side clipped. >>>>> Requesting permission to backport this fix. >>>>> >>>>> [1] http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/fb03586d68b6 >>>>> >>>>> -Andrew >>>>> >>>>> >>>>> >>>> Hello Andrew. >>>> >>>> I approve this fix being applied to OpenJDK 6 b20 *as long as* the file >>>> test/sun/pisces/ScaleTest.java is added initially with an Oracle >>>> copyright >>>> rather than a Sun one; in other words, use this version of the test file: >>>> >>>> http://hg.openjdk.java.net/jdk7/jdk7/jdk/file/00cd9dc3c2b5/test/sun/pisces/ScaleTest.java >>>> >>>> >>>> >>> Done. >>> >>> >>> >>>> FYI, here are some other fixes from JDK 7 that might be applicable and >>>> worthwhile to include in OpenJDK 6: >>>> >>>> 6697721 OpenJDK: rotated text baseline different between TextLayout and >>>> drawString >>>> >>>> >>> This patch updates a testcase introduced in: >>> >>> 6683472: Incorrect handling of translation component of font transform. >>> >>> and further updated by: >>> >>> 6687298: Reg testcase java/awt/Graphics2D/DrawString/RotTransText.java >>> fails on windows >>> >>> Ok to backport these as well? >>> >>> >> Yes. >> >> > > Done. > > >>>> 6587560 OpenJDK problem handling bitmaps returned when LCD text is >>>> requested. >>>> (may want to pull over any other subsequent fixes involving >>>> src/share/native/sun/font/freetypeScaler.c too, >>>> >>>> >>> I've brought over: >>> >>> 6703377: freetype: glyph vector outline is not translated correctly >>> 6587560: OpenJDK problem handling bitmaps returned when LCD text is >>> requested >>> 6887292: memory leak in freetypeScaler.c >>> >>> The others have already been backported. >>> >>> >> Good. >> >>> >>>> but the changeset for 6307603: "[X11] Use RENDER extension for complex >>>> operations done in software" >>>> should be considered separately.) >>>> >>>> >>> I was going to ask about this. I think it should wait until b21 >>> >>> >>> It's not even in the jdk7 forest yet, and needs time to soak there >>> first. >>> >>> >> Agreed on both counts. >> >> >>> An older version has been in IcedTea for years, so we'll update that >>> and get some testing there before including it in OpenJDK6 upstream. >>> >>> >>> >>>> 6829678 StrokeShapeTest: createStrokedShape() behaves differently >>>> >>>> >>> Backported. >>> >>> >>> >>>> 6829673 ThinLineTest: A line < 1 pixel disappears. >>>> >>>> >>> Backported. >>> >>> >>> >>>> 6793344 BasicStroke's first element dash pattern is not a dash >>>> >>>> >>> Backported. >>> >>> There are some Nimbus bugfixes we should bring over: >>> >>> changeset: 2337:042eb92f89ad >>> user: peterz >>> date: Thu May 06 12:57:30 2010 +0400 >>> summary: 6919629: Nimbus L&F Nimbus.Overrides option leaks >>> significant amounts of memory >>> >>> > > Done. > > >>> changeset: 2214:325823a26aac >>> user: peterz >>> date: Thu Mar 18 12:02:12 2010 +0300 >>> summary: 6932524: NIMBUS: 3 constructors of JSplitPane creates new >>> jsp with continuous layout - they should not. >>> >>> > > Done. > > >>> changeset: 2212:1224c1388e86 >>> user: rupashka >>> date: Wed Mar 17 12:48:21 2010 +0300 >>> summary: 6933784: NIMBUS: ImageView getNoImageIcon and >>> getLoadingImageIcon returns nulls instead of an icon >>> >>> > > Done. > > >>> changeset: 2140:fffd21bc5657 >>> user: peterz >>> date: Fri Dec 25 17:47:08 2009 +0300 >>> summary: 6860438: [Nimbus] Code to globally set slider's thumb >>> background doesn't work as specified >>> >>> > > Done. > > >>> changeset: 2139:e2f7e92c30f1 >>> user: peterz >>> date: Mon Dec 21 19:26:58 2009 +0300 >>> summary: 6860433: [Nimbus] Code to set a single slider's thumb >>> background doesn't work as specified >>> >>> > > Done. > This one relies on a new method being added to SynthLookAndFeel in: > > changeset: 1999:f012e2c094ff > user: peterz > date: Thu Dec 10 12:08:58 2009 +0300 > summary: 6827653: Make Synth UI classes public > > which we can't do in OpenJDK6. > I've worked round this so that SynthLookAndFeel instead calls down to > NimbusLookAndFeel directly (rather than via the new protected method) > when it detects > an instance of it. This has the same effect as the OpenJDK7 fix > without introducing a protected method in SynthLookAndFeel and passes > the test (pre-patched, OpenJDK6 doesn't). > Good; that sounds like the right approach here. > >> Approved. >> >> >> >>> and some timezone data updates: >>> >>> changeset: 2296:2571720800a6 >>> user: peytoia >>> date: Tue Apr 20 15:01:31 2010 +0900 >>> summary: 6945238: (tz) Support tzdata2010i >>> >>> > > Done. > > >>> changeset: 2216:f799c62ad4f8 >>> user: peytoia >>> date: Tue Mar 30 18:35:47 2010 +0900 >>> summary: 6939021: (tz) Support tzdata2010g >>> >>> > > Done. > > >>> changeset: 2209:0e0ce1aa1bba >>> user: peytoia >>> date: Thu Mar 11 11:54:17 2010 +0900 >>> summary: 6933032: (tz) Support tzdata2010e >>> >>> > > Done. > > >>> changeset: 2208:0137b5857c63 >>> parent: 2183:90248595ec35 >>> user: okutsu >>> date: Wed Mar 10 14:32:47 2010 +0900 >>> summary: 6932473: (tz) javazic produces incorrect SimpleTimeZone >>> parameters with Sun<=7 >>> >>> > > Done. > > >>> Do these look ok? >>> >>> >>> >> Yes; also approved to go back. >> >> Since some Sun copyrighted files have leaked back in, we'll done another >> pass to clean up any such files before b20 goes final. >> >> > > Ok. I used the Oracle copyright on those files introduced in the > patches above, rather than the original. > > Sounds good. However, I'm unforunately not seeing these changes in the repository yet; was there an issue with your push? -Joe From dmdabbs at gmail.com Fri Jun 11 12:30:44 2010 From: dmdabbs at gmail.com (David Dabbs) Date: Fri, 11 Jun 2010 14:30:44 -0500 Subject: Rebranding issue in installer In-Reply-To: References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> Message-ID: <000601cb099c$99894750$cc9bd5f0$@com> Rebranding FYI: On JDK6 (6u21) even though the installer graphics were rebranded, the cert used to sign the install exe remains Sun Micro. Same cert issue on JDK7, though the installer screen grafx are the old Sun ones. Best, David From joe.darcy at oracle.com Fri Jun 11 12:41:25 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 11 Jun 2010 12:41:25 -0700 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <4C128D9D.9020400@oracle.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C128D9D.9020400@oracle.com> Message-ID: <4C129165.2010303@oracle.com> Joe Darcy wrote: > Andrew John Hughes wrote: >> On 10 June 2010 22:17, Joe Darcy wrote: >> [...] >> >> Ok. I used the Oracle copyright on those files introduced in the >> patches above, rather than the original. >> >> > > Sounds good. > > However, I'm unforunately not seeing these changes in the repository > yet; was there an issue with your push? > > -Joe > Okay; the changes have come through now. -Joe From joe.darcy at oracle.com Fri Jun 11 12:54:26 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 11 Jun 2010 12:54:26 -0700 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> Message-ID: <4C129472.8060302@oracle.com> Andrew John Hughes wrote: > On 11 June 2010 05:31, Joe Darcy wrote: > >> Joe Darcy wrote: >> >>> Andrew John Hughes wrote: >>> >>>> On 10 June 2010 02:02, Joe Darcy wrote: >>>> >>>> >>>>> Andrew Su wrote: >>>>> >>>>> >> [snip] >> >>>> changeset: 2208:0137b5857c63 >>>> parent: 2183:90248595ec35 >>>> user: okutsu >>>> date: Wed Mar 10 14:32:47 2010 +0900 >>>> summary: 6932473: (tz) javazic produces incorrect SimpleTimeZone >>>> parameters with Sun<=7 >>>> >>>> Do these look ok? >>>> >>>> >>>> >>> Yes; also approved to go back. >>> >>> Since some Sun copyrighted files have leaked back in, we'll done another >>> pass to clean up any such files before b20 goes final. >>> >>> Thanks, >>> >>> -Joe >>> >>> >>> >> I think only a few more changes are needed to wrap up b20: >> >> * The various backports identified in the earlier message in this thread >> > > Done now. > > >> * Backport of 6957375 "java/net/ResponseCache getResponseCode and >> ResponseCacheTest fail after rebranding" >> > > I see this come in while I was backporting; had to merge. > > >> * One more pass of the Sun -> Oracle copyright script >> >> > > There are some new Zero bugfixes that could be backported for b20 (and > would allow us to drop the local copy in IcedTea6). > I've CCed Gary Benson who should be able to provide a list of bug IDs > for backport. > > Other than that, we should be good to go with b20. > > Being able to drop the copy of Zero in IcedTea sounds worthwhile. After looking over the bugids and a webrev, I'd expect to approve those fixes going back. The Zero fixes are the last currently planned fixes for b20. -Joe From joe.darcy at oracle.com Fri Jun 11 13:04:49 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 11 Jun 2010 13:04:49 -0700 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <4C129165.2010303@oracle.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C128D9D.9020400@oracle.com> <4C129165.2010303@oracle.com> Message-ID: <4C1296E1.8090406@oracle.com> Joe Darcy wrote: > Joe Darcy wrote: >> Andrew John Hughes wrote: >>> On 10 June 2010 22:17, Joe Darcy wrote: >>> > > [...] >>> >>> Ok. I used the Oracle copyright on those files introduced in the >>> patches above, rather than the original. >>> >>> >> >> Sounds good. >> >> However, I'm unforunately not seeing these changes in the repository >> yet; was there an issue with your push? >> >> -Joe >> > > Okay; the changes have come through now. > > -Joe Hmm, I'm getting a build error in Nimbus when doing a fresh build from tip; was there a merge issue? ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:86: cannot find symbol symbol : class NimbusDefaults location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel private NimbusDefaults defaults; ^ ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:100: cannot find symbol symbol : class NimbusDefaults location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel defaults = new NimbusDefaults(); ^ ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:154: package NimbusDefaults does not exist new NimbusDefaults.DerivedFont("defaultFont", ^ Note: Some input files use or override a deprecated API. Note: Recompile with -Xlint:deprecation for details. Note: Some input files use unchecked or unsafe operations. Note: Recompile with -Xlint:unchecked for details. 3 errors make[3]: *** [.compile.classlist] Error 1 make[3]: Leaving directory `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax/swing' make[2]: *** [build] Error 1 make[2]: Leaving directory `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax' make[1]: *** [all] Error 1 make[1]: Leaving directory `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make' make: *** [jdk-build] Error 2 -Joe From joe.darcy at oracle.com Fri Jun 11 13:22:27 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 11 Jun 2010 13:22:27 -0700 Subject: Fwd: CR 6958869/6u21 Updated, P2 java/classes_secu regression: PKIXValidator fails when multiple trust anchors have same dn In-Reply-To: <3E3DD0D6-65E9-4A4B-9944-E743A014E966@Sun.COM> References: <2158878.1276123864654.JavaMail.sbladm@swsblss3-new> <3E3DD0D6-65E9-4A4B-9944-E743A014E966@Sun.COM> Message-ID: <4C129B03.3050909@oracle.com> Hello Max. Weijun Wang wrote: > Hi Joe > > This is a last minute fix to 6948803. You've already approved 6948803 to be included in openjdk-6. Now I request 6958869 to be included as well. I've been busy recently so have no time to really push 6948803, I plan to push a combined changeset with both bug IDs in the description. > > The webrev is here (the changeset for 6u21, I'll add copyright info to test): > > http://cr.openjdk.java.net/~weijun/6958869/6/webrev.00/ > > Basically the Map is changed to Map> so that no one is missing even if there are duplicated subject names. The Certificate->PublicKey change makes coding easy, since we only compares public keys, and a keyList.contains(key) is simpler than > > for (c in certList) > if (c.getPublicKey().equals(key)) return true; > else continue; > return false > > Thanks > Max > > On 90 } else { 91 keys = new ArrayList(); 92 trustedSubjects.put(dn, keys); If you need an unmodifiable empty list, you could use Collections.emptyList(). Your two bugs are approved for OpenJDK 6 with the following caveats, make sure the license on PKIXValidator.java in OpenJDK 6 is the GPL + CP rather than the TLDA and that, as you're already noted, the test file has a proper Oracle GPL copyright. Please get this back by COB Monday June 13. Cheers, -Joe From kelly.ohair at oracle.com Fri Jun 11 14:37:03 2010 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Fri, 11 Jun 2010 14:37:03 -0700 Subject: Rebranding issue in installer In-Reply-To: <000601cb099c$99894750$cc9bd5f0$@com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> <000601cb099c$99894750$cc9bd5f0$@com> Message-ID: Certs may not be rebranded for a while, it's a complicated situation. jdk7 installers have not been rebranded yet. -kto On Jun 11, 2010, at 12:30 PM, David Dabbs wrote: > Rebranding FYI: > > On JDK6 (6u21) even though the installer graphics were rebranded, > the cert used to sign the install exe remains Sun Micro. > Same cert issue on JDK7, though the installer screen grafx are the > old Sun ones. > > Best, > > David > > > From ahughes at redhat.com Fri Jun 11 15:07:02 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 11 Jun 2010 23:07:02 +0100 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <4C1296E1.8090406@oracle.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C128D9D.9020400@oracle.com> <4C129165.2010303@oracle.com> <4C1296E1.8090406@oracle.com> Message-ID: On 11 June 2010 21:04, Joe Darcy wrote: > Joe Darcy wrote: >> >> Joe Darcy wrote: >>> >>> Andrew John Hughes wrote: >>>> >>>> On 10 June 2010 22:17, Joe Darcy wrote: >>>> >> >> [...] >>>> >>>> Ok. ?I used the Oracle copyright on those files introduced in the >>>> patches above, rather than the original. >>>> >>>> >>> >>> Sounds good. >>> >>> However, I'm unforunately not seeing these changes in the repository yet; >>> was there an issue with your push? >>> >>> -Joe >>> >> >> Okay; the changes have come through now. >> >> -Joe > > Hmm, I'm getting a build error in Nimbus when doing a fresh build from tip; > was there a merge issue? > > ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:86: > cannot find symbol > symbol ?: class NimbusDefaults > location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel > ? private NimbusDefaults defaults; > ? ? ? ? ? ^ > ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:100: > cannot find symbol > symbol ?: class NimbusDefaults > location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel > ? ? ? defaults = new NimbusDefaults(); > ? ? ? ? ? ? ? ? ? ? ?^ > ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:154: > package NimbusDefaults does not exist > ? ? ? ? ? ? ? ? ? new NimbusDefaults.DerivedFont("defaultFont", > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ^ > Note: Some input files use or override a deprecated API. > Note: Recompile with -Xlint:deprecation for details. > Note: Some input files use unchecked or unsafe operations. > Note: Recompile with -Xlint:unchecked for details. > 3 errors > make[3]: *** [.compile.classlist] Error 1 > make[3]: Leaving directory > `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax/swing' > make[2]: *** [build] Error 1 > make[2]: Leaving directory > `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax' > make[1]: *** [all] Error 1 > make[1]: Leaving directory `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make' > make: *** [jdk-build] Error 2 > > -Joe > I'm seeing this error now too, after deleting the previous build (fresh from the first Nimbus patch). NimbusDefaults is a generated file, as I see it in the tl build: /mnt/builder/tl/gensrc/javax/swing/plaf/nimbus/NimbusDefaults.java but not jdk6. None of the patches seem to add a reference to it though, so this may be something latent that has been activated by these updates. I'll keep looking. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Fri Jun 11 15:27:24 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 11 Jun 2010 23:27:24 +0100 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C128D9D.9020400@oracle.com> <4C129165.2010303@oracle.com> <4C1296E1.8090406@oracle.com> Message-ID: On 11 June 2010 23:07, Andrew John Hughes wrote: > On 11 June 2010 21:04, Joe Darcy wrote: >> Joe Darcy wrote: >>> >>> Joe Darcy wrote: >>>> >>>> Andrew John Hughes wrote: >>>>> >>>>> On 10 June 2010 22:17, Joe Darcy wrote: >>>>> >>> >>> [...] >>>>> >>>>> Ok. ?I used the Oracle copyright on those files introduced in the >>>>> patches above, rather than the original. >>>>> >>>>> >>>> >>>> Sounds good. >>>> >>>> However, I'm unforunately not seeing these changes in the repository yet; >>>> was there an issue with your push? >>>> >>>> -Joe >>>> >>> >>> Okay; the changes have come through now. >>> >>> -Joe >> >> Hmm, I'm getting a build error in Nimbus when doing a fresh build from tip; >> was there a merge issue? >> >> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:86: >> cannot find symbol >> symbol ?: class NimbusDefaults >> location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel >> ? private NimbusDefaults defaults; >> ? ? ? ? ? ^ >> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:100: >> cannot find symbol >> symbol ?: class NimbusDefaults >> location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel >> ? ? ? defaults = new NimbusDefaults(); >> ? ? ? ? ? ? ? ? ? ? ?^ >> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:154: >> package NimbusDefaults does not exist >> ? ? ? ? ? ? ? ? ? new NimbusDefaults.DerivedFont("defaultFont", >> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ^ >> Note: Some input files use or override a deprecated API. >> Note: Recompile with -Xlint:deprecation for details. >> Note: Some input files use unchecked or unsafe operations. >> Note: Recompile with -Xlint:unchecked for details. >> 3 errors >> make[3]: *** [.compile.classlist] Error 1 >> make[3]: Leaving directory >> `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax/swing' >> make[2]: *** [build] Error 1 >> make[2]: Leaving directory >> `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax' >> make[1]: *** [all] Error 1 >> make[1]: Leaving directory `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make' >> make: *** [jdk-build] Error 2 >> >> -Joe >> > > I'm seeing this error now too, after deleting the previous build > (fresh from the first Nimbus patch). ?NimbusDefaults is a generated > file, as I see it in the tl build: > > /mnt/builder/tl/gensrc/javax/swing/plaf/nimbus/NimbusDefaults.java > > but not jdk6. ?None of the patches seem to add a reference to it > though, so this may be something latent that has been activated by > these updates. ?I'll keep looking. > -- > Andrew :-) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 > It's an ordering issue. javax.swing is being built first, but needs NimbusLookAndFeel due to the workaround for 6827653. Looking into a fix. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From joe.darcy at oracle.com Fri Jun 11 15:38:17 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 11 Jun 2010 15:38:17 -0700 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C128D9D.9020400@oracle.com> <4C129165.2010303@oracle.com> <4C1296E1.8090406@oracle.com> Message-ID: <4C12BAD9.1030706@oracle.com> Andrew John Hughes wrote: > On 11 June 2010 23:07, Andrew John Hughes wrote: > >> On 11 June 2010 21:04, Joe Darcy wrote: >> >>> Joe Darcy wrote: >>> >>>> Joe Darcy wrote: >>>> >>>>> Andrew John Hughes wrote: >>>>> >>>>>> On 10 June 2010 22:17, Joe Darcy wrote: >>>>>> >>>>>> >>>> [...] >>>> >>>>>> Ok. I used the Oracle copyright on those files introduced in the >>>>>> patches above, rather than the original. >>>>>> >>>>>> >>>>>> >>>>> Sounds good. >>>>> >>>>> However, I'm unforunately not seeing these changes in the repository yet; >>>>> was there an issue with your push? >>>>> >>>>> -Joe >>>>> >>>>> >>>> Okay; the changes have come through now. >>>> >>>> -Joe >>>> >>> Hmm, I'm getting a build error in Nimbus when doing a fresh build from tip; >>> was there a merge issue? >>> >>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:86: >>> cannot find symbol >>> symbol : class NimbusDefaults >>> location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel >>> private NimbusDefaults defaults; >>> ^ >>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:100: >>> cannot find symbol >>> symbol : class NimbusDefaults >>> location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel >>> defaults = new NimbusDefaults(); >>> ^ >>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:154: >>> package NimbusDefaults does not exist >>> new NimbusDefaults.DerivedFont("defaultFont", >>> ^ >>> Note: Some input files use or override a deprecated API. >>> Note: Recompile with -Xlint:deprecation for details. >>> Note: Some input files use unchecked or unsafe operations. >>> Note: Recompile with -Xlint:unchecked for details. >>> 3 errors >>> make[3]: *** [.compile.classlist] Error 1 >>> make[3]: Leaving directory >>> `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax/swing' >>> make[2]: *** [build] Error 1 >>> make[2]: Leaving directory >>> `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax' >>> make[1]: *** [all] Error 1 >>> make[1]: Leaving directory `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make' >>> make: *** [jdk-build] Error 2 >>> >>> -Joe >>> >>> >> I'm seeing this error now too, after deleting the previous build >> (fresh from the first Nimbus patch). NimbusDefaults is a generated >> file, as I see it in the tl build: >> >> /mnt/builder/tl/gensrc/javax/swing/plaf/nimbus/NimbusDefaults.java >> >> but not jdk6. None of the patches seem to add a reference to it >> though, so this may be something latent that has been activated by >> these updates. I'll keep looking. >> -- >> Andrew :-) >> >> Free Java Software Engineer >> Red Hat, Inc. (http://www.redhat.com) >> >> Support Free Java! >> Contribute to GNU Classpath and the OpenJDK >> http://www.gnu.org/software/classpath >> http://openjdk.java.net >> >> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >> >> > > It's an ordering issue. javax.swing is being built first, but needs > NimbusLookAndFeel due to the workaround for 6827653. Looking into a > fix. > Sounds good; I've filed 6960808 "OpenJDK 6 Nimbus build failure" for the eventual fix. -Joe From ahughes at redhat.com Fri Jun 11 15:54:57 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 11 Jun 2010 23:54:57 +0100 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <4C12BAD9.1030706@oracle.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C128D9D.9020400@oracle.com> <4C129165.2010303@oracle.com> <4C1296E1.8090406@oracle.com> <4C12BAD9.1030706@oracle.com> Message-ID: On 11 June 2010 23:38, Joe Darcy wrote: > Andrew John Hughes wrote: >> >> On 11 June 2010 23:07, Andrew John Hughes wrote: >> >>> >>> On 11 June 2010 21:04, Joe Darcy wrote: >>> >>>> >>>> Joe Darcy wrote: >>>> >>>>> >>>>> Joe Darcy wrote: >>>>> >>>>>> >>>>>> Andrew John Hughes wrote: >>>>>> >>>>>>> >>>>>>> On 10 June 2010 22:17, Joe Darcy wrote: >>>>>>> >>>>>>> >>>>> >>>>> [...] >>>>> >>>>>>> >>>>>>> Ok. ?I used the Oracle copyright on those files introduced in the >>>>>>> patches above, rather than the original. >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> Sounds good. >>>>>> >>>>>> However, I'm unforunately not seeing these changes in the repository >>>>>> yet; >>>>>> was there an issue with your push? >>>>>> >>>>>> -Joe >>>>>> >>>>>> >>>>> >>>>> Okay; the changes have come through now. >>>>> >>>>> -Joe >>>>> >>>> >>>> Hmm, I'm getting a build error in Nimbus when doing a fresh build from >>>> tip; >>>> was there a merge issue? >>>> >>>> >>>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:86: >>>> cannot find symbol >>>> symbol ?: class NimbusDefaults >>>> location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel >>>> ?private NimbusDefaults defaults; >>>> ? ? ? ? ?^ >>>> >>>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:100: >>>> cannot find symbol >>>> symbol ?: class NimbusDefaults >>>> location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel >>>> ? ? ?defaults = new NimbusDefaults(); >>>> ? ? ? ? ? ? ? ? ? ? ^ >>>> >>>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:154: >>>> package NimbusDefaults does not exist >>>> ? ? ? ? ? ? ? ? ?new NimbusDefaults.DerivedFont("defaultFont", >>>> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?^ >>>> Note: Some input files use or override a deprecated API. >>>> Note: Recompile with -Xlint:deprecation for details. >>>> Note: Some input files use unchecked or unsafe operations. >>>> Note: Recompile with -Xlint:unchecked for details. >>>> 3 errors >>>> make[3]: *** [.compile.classlist] Error 1 >>>> make[3]: Leaving directory >>>> `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax/swing' >>>> make[2]: *** [build] Error 1 >>>> make[2]: Leaving directory >>>> `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax' >>>> make[1]: *** [all] Error 1 >>>> make[1]: Leaving directory `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make' >>>> make: *** [jdk-build] Error 2 >>>> >>>> -Joe >>>> >>>> >>> >>> I'm seeing this error now too, after deleting the previous build >>> (fresh from the first Nimbus patch). ?NimbusDefaults is a generated >>> file, as I see it in the tl build: >>> >>> /mnt/builder/tl/gensrc/javax/swing/plaf/nimbus/NimbusDefaults.java >>> >>> but not jdk6. ?None of the patches seem to add a reference to it >>> though, so this may be something latent that has been activated by >>> these updates. ?I'll keep looking. >>> -- >>> Andrew :-) >>> >>> Free Java Software Engineer >>> Red Hat, Inc. (http://www.redhat.com) >>> >>> Support Free Java! >>> Contribute to GNU Classpath and the OpenJDK >>> http://www.gnu.org/software/classpath >>> http://openjdk.java.net >>> >>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>> >>> >> >> It's an ordering issue. ?javax.swing is being built first, but needs >> NimbusLookAndFeel due to the workaround for 6827653. ?Looking into a >> fix. >> > > Sounds good; I've filed 6960808 "OpenJDK 6 Nimbus build failure" for the > eventual fix. > > -Joe > Here's a webrev for the fix: http://cr.openjdk.java.net/~andrew/6960808/ Running the Nimbus generator is moving up a level from make/javax/swing/plaf to make/javax/swing, so that it occurs before building any javax.swing classes. Ok to push? -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From joe.darcy at oracle.com Fri Jun 11 16:04:35 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 11 Jun 2010 16:04:35 -0700 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C128D9D.9020400@oracle.com> <4C129165.2010303@oracle.com> <4C1296E1.8090406@oracle.com> <4C12BAD9.1030706@oracle.com> Message-ID: <4C12C103.5080706@oracle.com> Andrew John Hughes wrote: > On 11 June 2010 23:38, Joe Darcy wrote: > >> Andrew John Hughes wrote: >> >>> On 11 June 2010 23:07, Andrew John Hughes wrote: >>> >>> >>>> On 11 June 2010 21:04, Joe Darcy wrote: >>>> >>>> >>>>> Joe Darcy wrote: >>>>> >>>>> >>>>>> Joe Darcy wrote: >>>>>> >>>>>> >>>>>>> Andrew John Hughes wrote: >>>>>>> >>>>>>> >>>>>>>> On 10 June 2010 22:17, Joe Darcy wrote: >>>>>>>> >>>>>>>> >>>>>>>> >>>>>> [...] >>>>>> >>>>>> >>>>>>>> Ok. I used the Oracle copyright on those files introduced in the >>>>>>>> patches above, rather than the original. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> Sounds good. >>>>>>> >>>>>>> However, I'm unforunately not seeing these changes in the repository >>>>>>> yet; >>>>>>> was there an issue with your push? >>>>>>> >>>>>>> -Joe >>>>>>> >>>>>>> >>>>>>> >>>>>> Okay; the changes have come through now. >>>>>> >>>>>> -Joe >>>>>> >>>>>> >>>>> Hmm, I'm getting a build error in Nimbus when doing a fresh build from >>>>> tip; >>>>> was there a merge issue? >>>>> >>>>> >>>>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:86: >>>>> cannot find symbol >>>>> symbol : class NimbusDefaults >>>>> location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel >>>>> private NimbusDefaults defaults; >>>>> ^ >>>>> >>>>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:100: >>>>> cannot find symbol >>>>> symbol : class NimbusDefaults >>>>> location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel >>>>> defaults = new NimbusDefaults(); >>>>> ^ >>>>> >>>>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:154: >>>>> package NimbusDefaults does not exist >>>>> new NimbusDefaults.DerivedFont("defaultFont", >>>>> ^ >>>>> Note: Some input files use or override a deprecated API. >>>>> Note: Recompile with -Xlint:deprecation for details. >>>>> Note: Some input files use unchecked or unsafe operations. >>>>> Note: Recompile with -Xlint:unchecked for details. >>>>> 3 errors >>>>> make[3]: *** [.compile.classlist] Error 1 >>>>> make[3]: Leaving directory >>>>> `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax/swing' >>>>> make[2]: *** [build] Error 1 >>>>> make[2]: Leaving directory >>>>> `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax' >>>>> make[1]: *** [all] Error 1 >>>>> make[1]: Leaving directory `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make' >>>>> make: *** [jdk-build] Error 2 >>>>> >>>>> -Joe >>>>> >>>>> >>>>> >>>> I'm seeing this error now too, after deleting the previous build >>>> (fresh from the first Nimbus patch). NimbusDefaults is a generated >>>> file, as I see it in the tl build: >>>> >>>> /mnt/builder/tl/gensrc/javax/swing/plaf/nimbus/NimbusDefaults.java >>>> >>>> but not jdk6. None of the patches seem to add a reference to it >>>> though, so this may be something latent that has been activated by >>>> these updates. I'll keep looking. >>>> -- >>>> Andrew :-) >>>> >>>> Free Java Software Engineer >>>> Red Hat, Inc. (http://www.redhat.com) >>>> >>>> Support Free Java! >>>> Contribute to GNU Classpath and the OpenJDK >>>> http://www.gnu.org/software/classpath >>>> http://openjdk.java.net >>>> >>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>> >>>> >>>> >>> It's an ordering issue. javax.swing is being built first, but needs >>> NimbusLookAndFeel due to the workaround for 6827653. Looking into a >>> fix. >>> >>> >> Sounds good; I've filed 6960808 "OpenJDK 6 Nimbus build failure" for the >> eventual fix. >> >> -Joe >> >> > > Here's a webrev for the fix: > > http://cr.openjdk.java.net/~andrew/6960808/ > > Running the Nimbus generator is moving up a level from > make/javax/swing/plaf to make/javax/swing, so that it occurs before > building any javax.swing classes. > > Ok to push? > Approved to be pushed. -Joe From ahughes at redhat.com Fri Jun 11 16:15:46 2010 From: ahughes at redhat.com (ahughes at redhat.com) Date: Fri, 11 Jun 2010 23:15:46 +0000 Subject: hg: jdk6/jdk6/jdk: 6960808: OpenJDK 6 Nimbus build failure Message-ID: <20100611231554.5D17B47187@hg.openjdk.java.net> Changeset: b6701047e287 Author: andrew Date: 2010-06-12 00:15 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/b6701047e287 6960808: OpenJDK 6 Nimbus build failure Summary: Move Nimbus generation up a level so NimbusDefaults is available for SynthUI build Reviewed-by: darcy ! make/javax/swing/Makefile ! make/javax/swing/plaf/Makefile From ahughes at redhat.com Fri Jun 11 16:16:21 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Sat, 12 Jun 2010 00:16:21 +0100 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <4C12C103.5080706@oracle.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C128D9D.9020400@oracle.com> <4C129165.2010303@oracle.com> <4C1296E1.8090406@oracle.com> <4C12BAD9.1030706@oracle.com> <4C12C103.5080706@oracle.com> Message-ID: On 12 June 2010 00:04, Joe Darcy wrote: > Andrew John Hughes wrote: >> >> On 11 June 2010 23:38, Joe Darcy wrote: >> >>> >>> Andrew John Hughes wrote: >>> >>>> >>>> On 11 June 2010 23:07, Andrew John Hughes wrote: >>>> >>>> >>>>> >>>>> On 11 June 2010 21:04, Joe Darcy wrote: >>>>> >>>>> >>>>>> >>>>>> Joe Darcy wrote: >>>>>> >>>>>> >>>>>>> >>>>>>> Joe Darcy wrote: >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> Andrew John Hughes wrote: >>>>>>>> >>>>>>>> >>>>>>>>> >>>>>>>>> On 10 June 2010 22:17, Joe Darcy wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>> >>>>>>> [...] >>>>>>> >>>>>>> >>>>>>>>> >>>>>>>>> Ok. ?I used the Oracle copyright on those files introduced in the >>>>>>>>> patches above, rather than the original. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> Sounds good. >>>>>>>> >>>>>>>> However, I'm unforunately not seeing these changes in the repository >>>>>>>> yet; >>>>>>>> was there an issue with your push? >>>>>>>> >>>>>>>> -Joe >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> Okay; the changes have come through now. >>>>>>> >>>>>>> -Joe >>>>>>> >>>>>>> >>>>>> >>>>>> Hmm, I'm getting a build error in Nimbus when doing a fresh build from >>>>>> tip; >>>>>> was there a merge issue? >>>>>> >>>>>> >>>>>> >>>>>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:86: >>>>>> cannot find symbol >>>>>> symbol ?: class NimbusDefaults >>>>>> location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel >>>>>> ?private NimbusDefaults defaults; >>>>>> ? ? ? ? ^ >>>>>> >>>>>> >>>>>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:100: >>>>>> cannot find symbol >>>>>> symbol ?: class NimbusDefaults >>>>>> location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel >>>>>> ? ? defaults = new NimbusDefaults(); >>>>>> ? ? ? ? ? ? ? ? ? ?^ >>>>>> >>>>>> >>>>>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:154: >>>>>> package NimbusDefaults does not exist >>>>>> ? ? ? ? ? ? ? ? new NimbusDefaults.DerivedFont("defaultFont", >>>>>> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ^ >>>>>> Note: Some input files use or override a deprecated API. >>>>>> Note: Recompile with -Xlint:deprecation for details. >>>>>> Note: Some input files use unchecked or unsafe operations. >>>>>> Note: Recompile with -Xlint:unchecked for details. >>>>>> 3 errors >>>>>> make[3]: *** [.compile.classlist] Error 1 >>>>>> make[3]: Leaving directory >>>>>> `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax/swing' >>>>>> make[2]: *** [build] Error 1 >>>>>> make[2]: Leaving directory >>>>>> `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax' >>>>>> make[1]: *** [all] Error 1 >>>>>> make[1]: Leaving directory >>>>>> `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make' >>>>>> make: *** [jdk-build] Error 2 >>>>>> >>>>>> -Joe >>>>>> >>>>>> >>>>>> >>>>> >>>>> I'm seeing this error now too, after deleting the previous build >>>>> (fresh from the first Nimbus patch). ?NimbusDefaults is a generated >>>>> file, as I see it in the tl build: >>>>> >>>>> /mnt/builder/tl/gensrc/javax/swing/plaf/nimbus/NimbusDefaults.java >>>>> >>>>> but not jdk6. ?None of the patches seem to add a reference to it >>>>> though, so this may be something latent that has been activated by >>>>> these updates. ?I'll keep looking. >>>>> -- >>>>> Andrew :-) >>>>> >>>>> Free Java Software Engineer >>>>> Red Hat, Inc. (http://www.redhat.com) >>>>> >>>>> Support Free Java! >>>>> Contribute to GNU Classpath and the OpenJDK >>>>> http://www.gnu.org/software/classpath >>>>> http://openjdk.java.net >>>>> >>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>> >>>>> >>>>> >>>> >>>> It's an ordering issue. ?javax.swing is being built first, but needs >>>> NimbusLookAndFeel due to the workaround for 6827653. ?Looking into a >>>> fix. >>>> >>>> >>> >>> Sounds good; I've filed 6960808 "OpenJDK 6 Nimbus build failure" for the >>> eventual fix. >>> >>> -Joe >>> >>> >> >> Here's a webrev for the fix: >> >> http://cr.openjdk.java.net/~andrew/6960808/ >> >> Running the Nimbus generator is moving up a level from >> make/javax/swing/plaf to make/javax/swing, so that it occurs before >> building any javax.swing classes. >> >> Ok to push? >> > > Approved to be pushed. > > -Joe > Done. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From Weijun.Wang at Sun.COM Fri Jun 11 17:00:55 2010 From: Weijun.Wang at Sun.COM (Weijun Wang) Date: Sat, 12 Jun 2010 08:00:55 +0800 Subject: CR 6958869/6u21 Updated, P2 java/classes_secu regression: PKIXValidator fails when multiple trust anchors have same dn In-Reply-To: <4C129B03.3050909@oracle.com> References: <2158878.1276123864654.JavaMail.sbladm@swsblss3-new> <3E3DD0D6-65E9-4A4B-9944-E743A014E966@Sun.COM> <4C129B03.3050909@oracle.com> Message-ID: On Jun 12, 2010, at 4:22 AM, Joe Darcy wrote: > Hello Max. > > Weijun Wang wrote: >> Hi Joe >> >> This is a last minute fix to 6948803. You've already approved 6948803 to be included in openjdk-6. Now I request 6958869 to be included as well. I've been busy recently so have no time to really push 6948803, I plan to push a combined changeset with both bug IDs in the description. >> >> The webrev is here (the changeset for 6u21, I'll add copyright info to test): >> >> http://cr.openjdk.java.net/~weijun/6958869/6/webrev.00/ >> >> Basically the Map is changed to Map> so that no one is missing even if there are duplicated subject names. The Certificate->PublicKey change makes coding easy, since we only compares public keys, and a keyList.contains(key) is simpler than >> >> for (c in certList) >> if (c.getPublicKey().equals(key)) return true; >> else continue; >> return false >> Thanks >> Max >> >> > > On > > 90 } else { > 91 keys = new ArrayList(); > 92 trustedSubjects.put(dn, keys); > > If you need an unmodifiable empty list, you could use Collections.emptyList(). It cannot be unmodifiable. On line 94, an element is added into it. Line 91 just makes sure the value for key dn in the map is not null. 88 if (trustedSubjects.containsKey(dn)) { 89 keys = trustedSubjects.get(dn); 90 } else { 91 keys = new ArrayList(); 92 trustedSubjects.put(dn, keys); 93 } 94 keys.add(cert.getPublicKey()); > > Your two bugs are approved for OpenJDK 6 with the following caveats, make sure the license on PKIXValidator.java in OpenJDK 6 is the GPL + CP rather than the TLDA and that, as you're already noted, the test file has a proper Oracle GPL copyright. > > Please get this back by COB Monday June 13. OK. Thanks Max > > Cheers, > > -Joe > > > From joe.darcy at oracle.com Fri Jun 11 17:24:22 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 11 Jun 2010 17:24:22 -0700 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C128D9D.9020400@oracle.com> <4C129165.2010303@oracle.com> <4C1296E1.8090406@oracle.com> <4C12BAD9.1030706@oracle.com> <4C12C103.5080706@oracle.com> Message-ID: <4C12D3B6.3070705@oracle.com> Andrew John Hughes wrote: > On 12 June 2010 00:04, Joe Darcy wrote: > >> Andrew John Hughes wrote: >> >>> On 11 June 2010 23:38, Joe Darcy wrote: >>> >>> >>>> Andrew John Hughes wrote: >>>> >>>> >>>>> On 11 June 2010 23:07, Andrew John Hughes wrote: >>>>> >>>>> >>>>> >>>>>> On 11 June 2010 21:04, Joe Darcy wrote: >>>>>> >>>>>> >>>>>> >>>>>>> Joe Darcy wrote: >>>>>>> >>>>>>> >>>>>>> >>>>>>>> Joe Darcy wrote: >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> Andrew John Hughes wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> On 10 June 2010 22:17, Joe Darcy wrote: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>> [...] >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>>> Ok. I used the Oracle copyright on those files introduced in the >>>>>>>>>> patches above, rather than the original. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> Sounds good. >>>>>>>>> >>>>>>>>> However, I'm unforunately not seeing these changes in the repository >>>>>>>>> yet; >>>>>>>>> was there an issue with your push? >>>>>>>>> >>>>>>>>> -Joe >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> Okay; the changes have come through now. >>>>>>>> >>>>>>>> -Joe >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> Hmm, I'm getting a build error in Nimbus when doing a fresh build from >>>>>>> tip; >>>>>>> was there a merge issue? >>>>>>> >>>>>>> >>>>>>> >>>>>>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:86: >>>>>>> cannot find symbol >>>>>>> symbol : class NimbusDefaults >>>>>>> location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel >>>>>>> private NimbusDefaults defaults; >>>>>>> ^ >>>>>>> >>>>>>> >>>>>>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:100: >>>>>>> cannot find symbol >>>>>>> symbol : class NimbusDefaults >>>>>>> location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel >>>>>>> defaults = new NimbusDefaults(); >>>>>>> ^ >>>>>>> >>>>>>> >>>>>>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:154: >>>>>>> package NimbusDefaults does not exist >>>>>>> new NimbusDefaults.DerivedFont("defaultFont", >>>>>>> ^ >>>>>>> Note: Some input files use or override a deprecated API. >>>>>>> Note: Recompile with -Xlint:deprecation for details. >>>>>>> Note: Some input files use unchecked or unsafe operations. >>>>>>> Note: Recompile with -Xlint:unchecked for details. >>>>>>> 3 errors >>>>>>> make[3]: *** [.compile.classlist] Error 1 >>>>>>> make[3]: Leaving directory >>>>>>> `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax/swing' >>>>>>> make[2]: *** [build] Error 1 >>>>>>> make[2]: Leaving directory >>>>>>> `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax' >>>>>>> make[1]: *** [all] Error 1 >>>>>>> make[1]: Leaving directory >>>>>>> `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make' >>>>>>> make: *** [jdk-build] Error 2 >>>>>>> >>>>>>> -Joe >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>> I'm seeing this error now too, after deleting the previous build >>>>>> (fresh from the first Nimbus patch). NimbusDefaults is a generated >>>>>> file, as I see it in the tl build: >>>>>> >>>>>> /mnt/builder/tl/gensrc/javax/swing/plaf/nimbus/NimbusDefaults.java >>>>>> >>>>>> but not jdk6. None of the patches seem to add a reference to it >>>>>> though, so this may be something latent that has been activated by >>>>>> these updates. I'll keep looking. >>>>>> -- >>>>>> Andrew :-) >>>>>> >>>>>> Free Java Software Engineer >>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>> >>>>>> Support Free Java! >>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>> http://www.gnu.org/software/classpath >>>>>> http://openjdk.java.net >>>>>> >>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>>>> >>>>>> >>>>>> >>>>>> >>>>> It's an ordering issue. javax.swing is being built first, but needs >>>>> NimbusLookAndFeel due to the workaround for 6827653. Looking into a >>>>> fix. >>>>> >>>>> >>>>> >>>> Sounds good; I've filed 6960808 "OpenJDK 6 Nimbus build failure" for the >>>> eventual fix. >>>> >>>> -Joe >>>> >>>> >>>> >>> Here's a webrev for the fix: >>> >>> http://cr.openjdk.java.net/~andrew/6960808/ >>> >>> Running the Nimbus generator is moving up a level from >>> make/javax/swing/plaf to make/javax/swing, so that it occurs before >>> building any javax.swing classes. >>> >>> Ok to push? >>> >>> >> Approved to be pushed. >> >> -Joe >> >> > > Done. > Build completes fine now :-) Thanks, -Joe From kelly.ohair at oracle.com Fri Jun 11 19:46:19 2010 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Fri, 11 Jun 2010 19:46:19 -0700 Subject: openjdk6 makefile changes Message-ID: <9C78F801-563C-4A8C-B216-9EEB9723351C@oracle.com> Joe, Let me know if you want these changes in b20 or later in b21: 6931763: sanity checks broken with latest cygwin, newer egrep -i option problems 6728161: Add SKIP_BOOT_CYCLE feature to create boot jdk and use it during build 6960853: Cleanup makefiles, remove unused vars etc. http://javaweb.sfbay.sun.com/~ohair/webrevs/openjdk6/make-changes/webrev/ Tried to bring in everything from jdk7 that was missing from ./ Makefile, ./test/Makefile, ./jdk/test/Makefile, etc. Also lots of cleanup and deleting of stuff not needed in the openjdk6 forest. gmake SKIP_BOOT_CYCLE=false seems to work now. -kto From ahughes at redhat.com Sat Jun 12 16:53:28 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Sun, 13 Jun 2010 00:53:28 +0100 Subject: openjdk6 makefile changes In-Reply-To: <9C78F801-563C-4A8C-B216-9EEB9723351C@oracle.com> References: <9C78F801-563C-4A8C-B216-9EEB9723351C@oracle.com> Message-ID: On 12 June 2010 03:46, Kelly O'Hair wrote: > Joe, > > Let me know if you want these changes in b20 or later in b21: > > 6931763: sanity checks broken with latest cygwin, newer egrep -i option > problems > 6728161: Add SKIP_BOOT_CYCLE feature to create boot jdk and use it during > build > 6960853: Cleanup makefiles, remove unused vars etc. > > http://javaweb.sfbay.sun.com/~ohair/webrevs/openjdk6/make-changes/webrev/ > > Tried to bring in everything from jdk7 that was missing from ./Makefile, > ./test/Makefile, > ./jdk/test/Makefile, etc. > Also lots of cleanup and deleting of stuff not needed in the openjdk6 > forest. > > gmake SKIP_BOOT_CYCLE=false seems to work now. > > -kto > > A public webrev would be appreciated :-) Thanks, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From kelly.ohair at oracle.com Sat Jun 12 17:16:14 2010 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Sat, 12 Jun 2010 17:16:14 -0700 Subject: openjdk6 makefile changes In-Reply-To: References: <9C78F801-563C-4A8C-B216-9EEB9723351C@oracle.com> Message-ID: On Jun 12, 2010, at 4:53 PM, Andrew John Hughes wrote: > On 12 June 2010 03:46, Kelly O'Hair wrote: >> Joe, >> >> Let me know if you want these changes in b20 or later in b21: >> >> 6931763: sanity checks broken with latest cygwin, newer egrep -i >> option >> problems >> 6728161: Add SKIP_BOOT_CYCLE feature to create boot jdk and use it >> during >> build >> 6960853: Cleanup makefiles, remove unused vars etc. >> >> http://javaweb.sfbay.sun.com/~ohair/webrevs/openjdk6/make-changes/webrev/ >> >> Tried to bring in everything from jdk7 that was missing from ./ >> Makefile, >> ./test/Makefile, >> ./jdk/test/Makefile, etc. >> Also lots of cleanup and deleting of stuff not needed in the openjdk6 >> forest. >> >> gmake SKIP_BOOT_CYCLE=false seems to work now. >> >> -kto >> >> > > A public webrev would be appreciated :-) My apologies. http://cr.openjdk.java.net/~ohair/openjdk6/make-changes/webrev/ -kto > > Thanks, > -- > Andrew :-) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Sun Jun 13 15:20:28 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Sun, 13 Jun 2010 23:20:28 +0100 Subject: openjdk6 makefile changes In-Reply-To: References: <9C78F801-563C-4A8C-B216-9EEB9723351C@oracle.com> Message-ID: On 13 June 2010 01:16, Kelly O'Hair wrote: > > On Jun 12, 2010, at 4:53 PM, Andrew John Hughes wrote: > >> On 12 June 2010 03:46, Kelly O'Hair wrote: >>> >>> Joe, >>> >>> Let me know if you want these changes in b20 or later in b21: >>> >>> 6931763: sanity checks broken with latest cygwin, newer egrep -i option >>> problems >>> 6728161: Add SKIP_BOOT_CYCLE feature to create boot jdk and use it during >>> build >>> 6960853: Cleanup makefiles, remove unused vars etc. >>> >>> http://javaweb.sfbay.sun.com/~ohair/webrevs/openjdk6/make-changes/webrev/ >>> >>> Tried to bring in everything from jdk7 that was missing from ./Makefile, >>> ./test/Makefile, >>> ./jdk/test/Makefile, etc. >>> Also lots of cleanup and deleting of stuff not needed in the openjdk6 >>> forest. >>> >>> gmake SKIP_BOOT_CYCLE=false seems to work now. >>> >>> -kto >>> >>> >> >> A public webrev would be appreciated :-) > > My apologies. > > http://cr.openjdk.java.net/~ohair/openjdk6/make-changes/webrev/ > > -kto > >> >> Thanks, >> -- >> Andrew :-) >> >> Free Java Software Engineer >> Red Hat, Inc. (http://www.redhat.com) >> >> Support Free Java! >> Contribute to GNU Classpath and the OpenJDK >> http://www.gnu.org/software/classpath >> http://openjdk.java.net >> >> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 > > Thanks. Builds fine here. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Sun Jun 13 15:26:48 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Sun, 13 Jun 2010 23:26:48 +0100 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <4C12D3B6.3070705@oracle.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C128D9D.9020400@oracle.com> <4C129165.2010303@oracle.com> <4C1296E1.8090406@oracle.com> <4C12BAD9.1030706@oracle.com> <4C12C103.5080706@oracle.com> <4C12D3B6.3070705@oracle.com> Message-ID: On 12 June 2010 01:24, Joe Darcy wrote: > Andrew John Hughes wrote: >> >> On 12 June 2010 00:04, Joe Darcy wrote: >> >>> >>> Andrew John Hughes wrote: >>> >>>> >>>> On 11 June 2010 23:38, Joe Darcy wrote: >>>> >>>> >>>>> >>>>> Andrew John Hughes wrote: >>>>> >>>>> >>>>>> >>>>>> On 11 June 2010 23:07, Andrew John Hughes wrote: >>>>>> >>>>>> >>>>>> >>>>>>> >>>>>>> On 11 June 2010 21:04, Joe Darcy wrote: >>>>>>> >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> Joe Darcy wrote: >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> >>>>>>>>> Joe Darcy wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> >>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> On 10 June 2010 22:17, Joe Darcy wrote: >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>> >>>>>>>>> [...] >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> Ok. ?I used the Oracle copyright on those files introduced in the >>>>>>>>>>> patches above, rather than the original. >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>> >>>>>>>>>> Sounds good. >>>>>>>>>> >>>>>>>>>> However, I'm unforunately not seeing these changes in the >>>>>>>>>> repository >>>>>>>>>> yet; >>>>>>>>>> was there an issue with your push? >>>>>>>>>> >>>>>>>>>> -Joe >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>>> Okay; the changes have come through now. >>>>>>>>> >>>>>>>>> -Joe >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> Hmm, I'm getting a build error in Nimbus when doing a fresh build >>>>>>>> from >>>>>>>> tip; >>>>>>>> was there a merge issue? >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:86: >>>>>>>> cannot find symbol >>>>>>>> symbol ?: class NimbusDefaults >>>>>>>> location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel >>>>>>>> ?private NimbusDefaults defaults; >>>>>>>> ? ? ? ?^ >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:100: >>>>>>>> cannot find symbol >>>>>>>> symbol ?: class NimbusDefaults >>>>>>>> location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel >>>>>>>> ? ?defaults = new NimbusDefaults(); >>>>>>>> ? ? ? ? ? ? ? ? ? ^ >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> ../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:154: >>>>>>>> package NimbusDefaults does not exist >>>>>>>> ? ? ? ? ? ? ? ?new NimbusDefaults.DerivedFont("defaultFont", >>>>>>>> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?^ >>>>>>>> Note: Some input files use or override a deprecated API. >>>>>>>> Note: Recompile with -Xlint:deprecation for details. >>>>>>>> Note: Some input files use unchecked or unsafe operations. >>>>>>>> Note: Recompile with -Xlint:unchecked for details. >>>>>>>> 3 errors >>>>>>>> make[3]: *** [.compile.classlist] Error 1 >>>>>>>> make[3]: Leaving directory >>>>>>>> `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax/swing' >>>>>>>> make[2]: *** [build] Error 1 >>>>>>>> make[2]: Leaving directory >>>>>>>> `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax' >>>>>>>> make[1]: *** [all] Error 1 >>>>>>>> make[1]: Leaving directory >>>>>>>> `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make' >>>>>>>> make: *** [jdk-build] Error 2 >>>>>>>> >>>>>>>> -Joe >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> I'm seeing this error now too, after deleting the previous build >>>>>>> (fresh from the first Nimbus patch). ?NimbusDefaults is a generated >>>>>>> file, as I see it in the tl build: >>>>>>> >>>>>>> /mnt/builder/tl/gensrc/javax/swing/plaf/nimbus/NimbusDefaults.java >>>>>>> >>>>>>> but not jdk6. ?None of the patches seem to add a reference to it >>>>>>> though, so this may be something latent that has been activated by >>>>>>> these updates. ?I'll keep looking. >>>>>>> -- >>>>>>> Andrew :-) >>>>>>> >>>>>>> Free Java Software Engineer >>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>> >>>>>>> Support Free Java! >>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>> http://www.gnu.org/software/classpath >>>>>>> http://openjdk.java.net >>>>>>> >>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> It's an ordering issue. ?javax.swing is being built first, but needs >>>>>> NimbusLookAndFeel due to the workaround for 6827653. ?Looking into a >>>>>> fix. >>>>>> >>>>>> >>>>>> >>>>> >>>>> Sounds good; I've filed 6960808 "OpenJDK 6 Nimbus build failure" for >>>>> the >>>>> eventual fix. >>>>> >>>>> -Joe >>>>> >>>>> >>>>> >>>> >>>> Here's a webrev for the fix: >>>> >>>> http://cr.openjdk.java.net/~andrew/6960808/ >>>> >>>> Running the Nimbus generator is moving up a level from >>>> make/javax/swing/plaf to make/javax/swing, so that it occurs before >>>> building any javax.swing classes. >>>> >>>> Ok to push? >>>> >>>> >>> >>> Approved to be pushed. >>> >>> -Joe >>> >>> >> >> Done. >> > > Build completes fine now :-) > > Thanks, > > -Joe > I found another issue; the Nimbus code uses the @Override annotation on interfaces but the code is compiled with source & target 5, not 6. javac lets this through for source & target 5 (which seems wrong for a feature introduced in 1.6), but ecj doesn't. http://cr.openjdk.java.net/~andrew/nimbus/webrev.07/ raises the source & target to 6 for javax.swing and javax.swing.plaf, and is now necessary to build (the previous backport broke DISABLE_NIMBUS due to SynthLookAndFeel depending on NimbusLookAndFeel). I made the change locally so as not to disrupt the build too much, but we could change the jdk-wide setting instead (this is done in two places for some reason; common/shared/Defs-java.gmk and Defs-control.gmk). Thoughts? -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From jonathan.gibbons at oracle.com Mon Jun 14 11:47:58 2010 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Mon, 14 Jun 2010 11:47:58 -0700 Subject: Fwd: hg: jdk7/tl/corba: 6960831: fix CORBA build warnings Message-ID: <4C16795E.6060806@oracle.com> Joe, OK to backport these fixes to eliminate warnings while building the corba/ repo? In addition to these fixes, the following minor change is also required, to suppress the proprietary warnings API. This change is already present, exactly as given, in the 7 corba repo. -- Jon > $ hg diff make > diff -r 4024a4ef3a46 make/common/shared/Defs-java.gmk > --- a/make/common/shared/Defs-java.gmk Tue Jun 01 15:16:36 2010 +0100 > +++ b/make/common/shared/Defs-java.gmk Mon Jun 14 11:46:24 2010 -0700 > @@ -104,6 +104,9 @@ > JAVACFLAGS += -Werror > endif > > +NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true > +JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS) > + > # Add the source level (currently all source is 1.5, should this be 1.6?) > LANGUAGE_VERSION = -source 1.5 > JAVACFLAGS += $(LANGUAGE_VERSION) -------- Original Message -------- Subject: hg: jdk7/tl/corba: 6960831: fix CORBA build warnings Date: Mon, 14 Jun 2010 18:29:31 +0000 From: jonathan.gibbons at oracle.com To: jdk7-changes at openjdk.java.net, compiler-dev at openjdk.java.net, core-libs-dev at openjdk.java.net, serviceability-dev at openjdk.java.net, security-dev at openjdk.java.net, net-dev at openjdk.java.net Changeset: 032585ad970d Author: jjg Date: 2010-06-14 11:28 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/corba/rev/032585ad970d 6960831: fix CORBA build warnings Reviewed-by: darcy ! src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java ! src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java ! src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java ! src/share/classes/org/omg/CORBA/ORB.java ! src/share/classes/sun/corba/Bridge.java -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/jdk6-dev/attachments/20100614/6c6d0d99/attachment.html From joe.darcy at oracle.com Mon Jun 14 12:06:34 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Mon, 14 Jun 2010 12:06:34 -0700 Subject: Fwd: hg: jdk7/tl/corba: 6960831: fix CORBA build warnings In-Reply-To: <4C16795E.6060806@oracle.com> References: <4C16795E.6060806@oracle.com> Message-ID: <4C167DBA.7010702@oracle.com> Jonathan Gibbons wrote: > Joe, > > OK to backport these fixes to eliminate warnings while building the > corba/ repo? > > In addition to these fixes, the following minor change is also > required, to suppress the proprietary warnings API. This change is > already present, exactly as given, in the 7 corba repo. Yes; both are fine changes for OpenJDK 6 -- approved to go back. Thanks, -Joe > > -- Jon > >> $ hg diff make >> diff -r 4024a4ef3a46 make/common/shared/Defs-java.gmk >> --- a/make/common/shared/Defs-java.gmk Tue Jun 01 15:16:36 2010 +0100 >> +++ b/make/common/shared/Defs-java.gmk Mon Jun 14 11:46:24 2010 -0700 >> @@ -104,6 +104,9 @@ >> JAVACFLAGS += -Werror >> endif >> >> +NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true >> +JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS) >> + >> # Add the source level (currently all source is 1.5, should this be >> 1.6?) >> LANGUAGE_VERSION = -source 1.5 >> JAVACFLAGS += $(LANGUAGE_VERSION) > > > > > > > -------- Original Message -------- > Subject: hg: jdk7/tl/corba: 6960831: fix CORBA build warnings > Date: Mon, 14 Jun 2010 18:29:31 +0000 > From: jonathan.gibbons at oracle.com > To: jdk7-changes at openjdk.java.net, compiler-dev at openjdk.java.net, > core-libs-dev at openjdk.java.net, serviceability-dev at openjdk.java.net, > security-dev at openjdk.java.net, net-dev at openjdk.java.net > > > > Changeset: 032585ad970d > Author: jjg > Date: 2010-06-14 11:28 -0700 > URL: http://hg.openjdk.java.net/jdk7/tl/corba/rev/032585ad970d > > 6960831: fix CORBA build warnings > Reviewed-by: darcy > > ! src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java > ! src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java > ! src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java > ! src/share/classes/org/omg/CORBA/ORB.java > ! src/share/classes/sun/corba/Bridge.java > > From jonathan.gibbons at oracle.com Mon Jun 14 12:26:25 2010 From: jonathan.gibbons at oracle.com (jonathan.gibbons at oracle.com) Date: Mon, 14 Jun 2010 19:26:25 +0000 Subject: hg: jdk6/jdk6/corba: 6960831: fix CORBA build warnings Message-ID: <20100614192625.B984247222@hg.openjdk.java.net> Changeset: e4fa089433a7 Author: jjg Date: 2010-06-14 12:25 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/corba/rev/e4fa089433a7 6960831: fix CORBA build warnings Reviewed-by: darcy ! make/common/shared/Defs-java.gmk ! src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java ! src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java ! src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java ! src/share/classes/org/omg/CORBA/ORB.java ! src/share/classes/sun/corba/Bridge.java From ahughes at redhat.com Mon Jun 14 14:04:54 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Mon, 14 Jun 2010 22:04:54 +0100 Subject: hg: jdk6/jdk6/corba: 6960831: fix CORBA build warnings In-Reply-To: <20100614192625.B984247222@hg.openjdk.java.net> References: <20100614192625.B984247222@hg.openjdk.java.net> Message-ID: On 14 June 2010 20:26, wrote: > Changeset: e4fa089433a7 > Author: ? ?jjg > Date: ? ? ?2010-06-14 12:25 -0700 > URL: ? ? ? http://hg.openjdk.java.net/jdk6/jdk6/corba/rev/e4fa089433a7 > > 6960831: fix CORBA build warnings > Reviewed-by: darcy > > ! make/common/shared/Defs-java.gmk > ! src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java > ! src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java > ! src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java > ! src/share/classes/org/omg/CORBA/ORB.java > ! src/share/classes/sun/corba/Bridge.java > > While we're fixing the CORBA build, can: ../common/shared/Defs-linux.gmk:138: "WARNING: Value of JDK_IMPORT_PATH cannot be empty, check or set ALT_JDK_IMPORT_PATH" be removed? It's just wrong. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From kelly.ohair at oracle.com Mon Jun 14 17:00:31 2010 From: kelly.ohair at oracle.com (kelly.ohair at oracle.com) Date: Tue, 15 Jun 2010 00:00:31 +0000 Subject: hg: jdk6/jdk6: 6728161: Add SKIP_BOOT_CYCLE feature to create boot jdk and use it during build; ... Message-ID: <20100615000031.D3F9C4722D@hg.openjdk.java.net> Changeset: 91a8202c16cb Author: ohair Date: 2010-06-14 16:52 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/rev/91a8202c16cb 6728161: Add SKIP_BOOT_CYCLE feature to create boot jdk and use it during build 6960853: Cleanup makefiles, remove unused vars etc. Reviewed-by: darcy ! Makefile ! make/Defs-internal.gmk ! make/jprt.gmk ! make/sanity-rules.gmk ! test/Makefile From joe.darcy at oracle.com Mon Jun 14 17:07:41 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Mon, 14 Jun 2010 17:07:41 -0700 Subject: openjdk6 makefile changes In-Reply-To: References: <9C78F801-563C-4A8C-B216-9EEB9723351C@oracle.com> Message-ID: <4C16C44D.9020309@oracle.com> Andrew John Hughes wrote: > On 13 June 2010 01:16, Kelly O'Hair wrote: > >> On Jun 12, 2010, at 4:53 PM, Andrew John Hughes wrote: >> >> >>> On 12 June 2010 03:46, Kelly O'Hair wrote: >>> >>>> Joe, >>>> >>>> Let me know if you want these changes in b20 or later in b21: >>>> >>>> 6931763: sanity checks broken with latest cygwin, newer egrep -i option >>>> problems >>>> 6728161: Add SKIP_BOOT_CYCLE feature to create boot jdk and use it during >>>> build >>>> 6960853: Cleanup makefiles, remove unused vars etc. >>>> >>>> http://javaweb.sfbay.sun.com/~ohair/webrevs/openjdk6/make-changes/webrev/ >>>> >>>> Tried to bring in everything from jdk7 that was missing from ./Makefile, >>>> ./test/Makefile, >>>> ./jdk/test/Makefile, etc. >>>> Also lots of cleanup and deleting of stuff not needed in the openjdk6 >>>> forest. >>>> >>>> gmake SKIP_BOOT_CYCLE=false seems to work now. >>>> >>>> -kto >>>> >>>> >>>> >>> A public webrev would be appreciated :-) >>> >> My apologies. >> >> http://cr.openjdk.java.net/~ohair/openjdk6/make-changes/webrev/ >> >> -kto >> >> >>> Thanks, >>> -- >>> Andrew :-) >>> >>> Free Java Software Engineer >>> Red Hat, Inc. (http://www.redhat.com) >>> >>> Support Free Java! >>> Contribute to GNU Classpath and the OpenJDK >>> http://www.gnu.org/software/classpath >>> http://openjdk.java.net >>> >>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>> >> > > Thanks. Builds fine here. > Approved to go back. Thanks Kelly, -Joe From joe.darcy at oracle.com Mon Jun 14 17:10:10 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Mon, 14 Jun 2010 17:10:10 -0700 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <4C129472.8060302@oracle.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> <4C129472.8060302@oracle.com> Message-ID: <4C16C4E2.8050202@oracle.com> Joe Darcy wrote: > Andrew John Hughes wrote: >> On 11 June 2010 05:31, Joe Darcy wrote: >> >>> Joe Darcy wrote: >>> >>>> Andrew John Hughes wrote: >>>> >>>>> On 10 June 2010 02:02, Joe Darcy wrote: >>>>> >>>>> >>>>>> Andrew Su wrote: >>>>>> >>>>>> >>> [snip] >>> >>>>> changeset: 2208:0137b5857c63 >>>>> parent: 2183:90248595ec35 >>>>> user: okutsu >>>>> date: Wed Mar 10 14:32:47 2010 +0900 >>>>> summary: 6932473: (tz) javazic produces incorrect SimpleTimeZone >>>>> parameters with Sun<=7 >>>>> >>>>> Do these look ok? >>>>> >>>>> >>>>> >>>> Yes; also approved to go back. >>>> >>>> Since some Sun copyrighted files have leaked back in, we'll done >>>> another >>>> pass to clean up any such files before b20 goes final. >>>> >>>> Thanks, >>>> >>>> -Joe >>>> >>>> >>>> >>> I think only a few more changes are needed to wrap up b20: >>> >>> * The various backports identified in the earlier message in this >>> thread >>> >> >> Done now. >> >> >>> * Backport of 6957375 "java/net/ResponseCache getResponseCode and >>> ResponseCacheTest fail after rebranding" >>> >> >> I see this come in while I was backporting; had to merge. >> >> >>> * One more pass of the Sun -> Oracle copyright script >>> >>> >> >> There are some new Zero bugfixes that could be backported for b20 (and >> would allow us to drop the local copy in IcedTea6). >> I've CCed Gary Benson who should be able to provide a list of bug IDs >> for backport. >> >> Other than that, we should be good to go with b20. >> >> > > Being able to drop the copy of Zero in IcedTea sounds worthwhile. > After looking over the bugids and a webrev, I'd expect to approve > those fixes going back. > > The Zero fixes are the last currently planned fixes for b20. > > -Joe Hello. I'd like to get b20 wrapped up in the next day or two; please provide a list of the Zeros bug and I webrev so I can look them over. Thanks, -Joe From kelly.ohair at oracle.com Mon Jun 14 20:21:46 2010 From: kelly.ohair at oracle.com (kelly.ohair at oracle.com) Date: Tue, 15 Jun 2010 03:21:46 +0000 Subject: hg: jdk6/jdk6/corba: 2 new changesets Message-ID: <20100615032148.302BB47235@hg.openjdk.java.net> Changeset: ad444d14e3d5 Author: ohair Date: 2010-06-14 16:53 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/corba/rev/ad444d14e3d5 6960853: Cleanup makefiles, remove unused vars etc. Reviewed-by: darcy ! make/common/shared/Platform.gmk Changeset: 836643e8a67d Author: ohair Date: 2010-06-14 16:59 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/corba/rev/836643e8a67d Merge From kelly.ohair at oracle.com Mon Jun 14 21:36:06 2010 From: kelly.ohair at oracle.com (kelly.ohair at oracle.com) Date: Tue, 15 Jun 2010 04:36:06 +0000 Subject: hg: jdk6/jdk6/jdk: 2 new changesets Message-ID: <20100615043622.112944723A@hg.openjdk.java.net> Changeset: 99af8bf29c24 Author: ohair Date: 2010-06-14 16:55 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/99af8bf29c24 6931763: sanity checks broken with latest cygwin, newer egrep -i option problems 6960853: Cleanup makefiles, remove unused vars etc. Reviewed-by: darcy ! make/common/shared/Defs-control.gmk ! make/common/shared/Defs-windows.gmk ! make/common/shared/Platform.gmk ! make/common/shared/Sanity-Settings.gmk ! make/common/shared/Sanity.gmk ! make/jdk_generic_profile.sh ! make/netbeans/README ! make/netbeans/world/README ! make/netbeans/world/build.xml ! test/Makefile Changeset: 8dee7db9a7ef Author: ohair Date: 2010-06-14 16:58 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/8dee7db9a7ef Merge From weijun.wang at sun.com Tue Jun 15 01:43:17 2010 From: weijun.wang at sun.com (weijun.wang at sun.com) Date: Tue, 15 Jun 2010 08:43:17 +0000 Subject: hg: jdk6/jdk6/jdk: 6948803: CertPath validation regression caused by SHA1 replacement root and MD2 disable feature; ... Message-ID: <20100615084325.A7FA547244@hg.openjdk.java.net> Changeset: 38d41e1f1493 Author: weijun Date: 2010-06-15 16:42 +0800 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/38d41e1f1493 6948803: CertPath validation regression caused by SHA1 replacement root and MD2 disable feature 6958869: regression: PKIXValidator fails when multiple trust anchors have same dn Reviewed-by: xuelei, mullan ! src/share/classes/sun/security/validator/PKIXValidator.java + test/sun/security/validator/CertReplace.java + test/sun/security/validator/SameDN.java From ahughes at redhat.com Tue Jun 15 05:21:09 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 15 Jun 2010 13:21:09 +0100 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <4C16C4E2.8050202@oracle.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> <4C129472.8060302@oracle.com> <4C16C4E2.8050202@oracle.com> Message-ID: On 15 June 2010 01:10, Joe Darcy wrote: > Joe Darcy wrote: >> >> Andrew John Hughes wrote: >>> >>> On 11 June 2010 05:31, Joe Darcy wrote: >>> >>>> >>>> Joe Darcy wrote: >>>> >>>>> >>>>> Andrew John Hughes wrote: >>>>> >>>>>> >>>>>> On 10 June 2010 02:02, Joe Darcy wrote: >>>>>> >>>>>> >>>>>>> >>>>>>> Andrew Su wrote: >>>>>>> >>>>>>> >>>> >>>> [snip] >>>> >>>>>> >>>>>> changeset: ? 2208:0137b5857c63 >>>>>> parent: ? ? ?2183:90248595ec35 >>>>>> user: ? ? ? ?okutsu >>>>>> date: ? ? ? ?Wed Mar 10 14:32:47 2010 +0900 >>>>>> summary: ? ? 6932473: (tz) javazic produces incorrect SimpleTimeZone >>>>>> parameters with Sun<=7 >>>>>> >>>>>> Do these look ok? >>>>>> >>>>>> >>>>>> >>>>> >>>>> Yes; also approved to go back. >>>>> >>>>> Since some Sun copyrighted files have leaked back in, we'll done >>>>> another >>>>> pass to clean up any such files before b20 goes final. >>>>> >>>>> Thanks, >>>>> >>>>> -Joe >>>>> >>>>> >>>>> >>>> >>>> I think only a few more changes are needed to wrap up b20: >>>> >>>> * The various backports identified in the earlier message in this thread >>>> >>> >>> Done now. >>> >>> >>>> >>>> * Backport of 6957375 "java/net/ResponseCache getResponseCode and >>>> ResponseCacheTest fail after rebranding" >>>> >>> >>> I see this come in while I was backporting; had to merge. >>> >>> >>>> >>>> * One more pass of the Sun -> Oracle copyright script >>>> >>>> >>> >>> There are some new Zero bugfixes that could be backported for b20 (and >>> would allow us to drop the local copy in IcedTea6). >>> I've CCed Gary Benson who should be able to provide a list of bug IDs >>> for backport. >>> >>> Other than that, we should be good to go with b20. >>> >>> >> >> Being able to drop the copy of Zero in IcedTea sounds worthwhile. ?After >> looking over the bugids and a webrev, I'd expect to approve those fixes >> going back. >> >> The Zero fixes are the last currently planned fixes for b20. >> >> -Joe > > Hello. > > I'd like to get b20 wrapped up in the next day or two; please provide a list > of the Zeros bug and I webrev so I can look them over. > > Thanks, > > -Joe > I was waiting for a response from Gary with the bug IDs, but looks like one isn't forthcoming. I'll compile a list from recent OpenJDK7 build drops and post that shortly. There's also http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001750.html which causes build breakage with IcedTea. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Tue Jun 15 08:30:15 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 15 Jun 2010 16:30:15 +0100 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> <4C129472.8060302@oracle.com> <4C16C4E2.8050202@oracle.com> Message-ID: On 15 June 2010 13:21, Andrew John Hughes wrote: > On 15 June 2010 01:10, Joe Darcy wrote: >> Joe Darcy wrote: >>> >>> Andrew John Hughes wrote: >>>> >>>> On 11 June 2010 05:31, Joe Darcy wrote: >>>> >>>>> >>>>> Joe Darcy wrote: >>>>> >>>>>> >>>>>> Andrew John Hughes wrote: >>>>>> >>>>>>> >>>>>>> On 10 June 2010 02:02, Joe Darcy wrote: >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> Andrew Su wrote: >>>>>>>> >>>>>>>> >>>>> >>>>> [snip] >>>>> >>>>>>> >>>>>>> changeset: ? 2208:0137b5857c63 >>>>>>> parent: ? ? ?2183:90248595ec35 >>>>>>> user: ? ? ? ?okutsu >>>>>>> date: ? ? ? ?Wed Mar 10 14:32:47 2010 +0900 >>>>>>> summary: ? ? 6932473: (tz) javazic produces incorrect SimpleTimeZone >>>>>>> parameters with Sun<=7 >>>>>>> >>>>>>> Do these look ok? >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> Yes; also approved to go back. >>>>>> >>>>>> Since some Sun copyrighted files have leaked back in, we'll done >>>>>> another >>>>>> pass to clean up any such files before b20 goes final. >>>>>> >>>>>> Thanks, >>>>>> >>>>>> -Joe >>>>>> >>>>>> >>>>>> >>>>> >>>>> I think only a few more changes are needed to wrap up b20: >>>>> >>>>> * The various backports identified in the earlier message in this thread >>>>> >>>> >>>> Done now. >>>> >>>> >>>>> >>>>> * Backport of 6957375 "java/net/ResponseCache getResponseCode and >>>>> ResponseCacheTest fail after rebranding" >>>>> >>>> >>>> I see this come in while I was backporting; had to merge. >>>> >>>> >>>>> >>>>> * One more pass of the Sun -> Oracle copyright script >>>>> >>>>> >>>> >>>> There are some new Zero bugfixes that could be backported for b20 (and >>>> would allow us to drop the local copy in IcedTea6). >>>> I've CCed Gary Benson who should be able to provide a list of bug IDs >>>> for backport. >>>> >>>> Other than that, we should be good to go with b20. >>>> >>>> >>> >>> Being able to drop the copy of Zero in IcedTea sounds worthwhile. ?After >>> looking over the bugids and a webrev, I'd expect to approve those fixes >>> going back. >>> >>> The Zero fixes are the last currently planned fixes for b20. >>> >>> -Joe >> >> Hello. >> >> I'd like to get b20 wrapped up in the next day or two; please provide a list >> of the Zeros bug and I webrev so I can look them over. >> >> Thanks, >> >> -Joe >> > > I was waiting for a response from Gary with the bug IDs, but looks > like one isn't forthcoming. ?I'll compile a list from recent OpenJDK7 > build drops and post that shortly. > > There's also http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001750.html > which causes build breakage with IcedTea. > -- > Andrew :-) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 > b87 == 6934089 Zero 32-bit/64kb page fix http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/da06d1795d84 b90 === 6939180 Zero locking fix http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/747d26efc5fa b92 === 6941224: Improved stack overflow handling for Zero http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/f9271ff9d324 6944503: Improved Zero crash dump http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/c544d979f886 6944473: 6941224 misses new files http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/aa9c266de52a b94 === 6939182: Zero JNI handles fix http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/0c5b3cf3c1f5 6950178: Zero stack improvements http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/348346af6676 6950617: Zero/Shark interface updates http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/6cfbdb113e52 6951784: Zero deoptimizer changes http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/22af4ce8dba1 b96 === 6951686: Using large pages on Linux prevents zero based compressed oops http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/79bf863697eb Here's the webrev for those: http://cr.openjdk.java.net/~andrew/zero/webrev.05/ and the previous Nimbus one: http://cr.openjdk.java.net/~andrew/nimbus/webrev.07/ The following were skipped due to the referenced changesets not being in OpenJDK6: 6939731: JSR 292 Zero build fix after 6934494 6944028: 6940701 broke Zero 6949830: 6939134 broke Zero 6949423: remove tagged stack interpreter for Zero http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/68d6683eaef7 Depends on: changeset: 1426:2338d41fbd81 user: twisti date: Fri Apr 30 08:37:24 2010 -0700 summary: 6943304: remove tagged stack interpreter -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Tue Jun 15 11:11:41 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 15 Jun 2010 19:11:41 +0100 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> <4C129472.8060302@oracle.com> <4C16C4E2.8050202@oracle.com> Message-ID: On 15 June 2010 16:30, Andrew John Hughes wrote: > On 15 June 2010 13:21, Andrew John Hughes wrote: >> On 15 June 2010 01:10, Joe Darcy wrote: >>> Joe Darcy wrote: >>>> >>>> Andrew John Hughes wrote: >>>>> >>>>> On 11 June 2010 05:31, Joe Darcy wrote: >>>>> >>>>>> >>>>>> Joe Darcy wrote: >>>>>> >>>>>>> >>>>>>> Andrew John Hughes wrote: >>>>>>> >>>>>>>> >>>>>>>> On 10 June 2010 02:02, Joe Darcy wrote: >>>>>>>> >>>>>>>> >>>>>>>>> >>>>>>>>> Andrew Su wrote: >>>>>>>>> >>>>>>>>> >>>>>> >>>>>> [snip] >>>>>> >>>>>>>> >>>>>>>> changeset: ? 2208:0137b5857c63 >>>>>>>> parent: ? ? ?2183:90248595ec35 >>>>>>>> user: ? ? ? ?okutsu >>>>>>>> date: ? ? ? ?Wed Mar 10 14:32:47 2010 +0900 >>>>>>>> summary: ? ? 6932473: (tz) javazic produces incorrect SimpleTimeZone >>>>>>>> parameters with Sun<=7 >>>>>>>> >>>>>>>> Do these look ok? >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> Yes; also approved to go back. >>>>>>> >>>>>>> Since some Sun copyrighted files have leaked back in, we'll done >>>>>>> another >>>>>>> pass to clean up any such files before b20 goes final. >>>>>>> >>>>>>> Thanks, >>>>>>> >>>>>>> -Joe >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> I think only a few more changes are needed to wrap up b20: >>>>>> >>>>>> * The various backports identified in the earlier message in this thread >>>>>> >>>>> >>>>> Done now. >>>>> >>>>> >>>>>> >>>>>> * Backport of 6957375 "java/net/ResponseCache getResponseCode and >>>>>> ResponseCacheTest fail after rebranding" >>>>>> >>>>> >>>>> I see this come in while I was backporting; had to merge. >>>>> >>>>> >>>>>> >>>>>> * One more pass of the Sun -> Oracle copyright script >>>>>> >>>>>> >>>>> >>>>> There are some new Zero bugfixes that could be backported for b20 (and >>>>> would allow us to drop the local copy in IcedTea6). >>>>> I've CCed Gary Benson who should be able to provide a list of bug IDs >>>>> for backport. >>>>> >>>>> Other than that, we should be good to go with b20. >>>>> >>>>> >>>> >>>> Being able to drop the copy of Zero in IcedTea sounds worthwhile. ?After >>>> looking over the bugids and a webrev, I'd expect to approve those fixes >>>> going back. >>>> >>>> The Zero fixes are the last currently planned fixes for b20. >>>> >>>> -Joe >>> >>> Hello. >>> >>> I'd like to get b20 wrapped up in the next day or two; please provide a list >>> of the Zeros bug and I webrev so I can look them over. >>> >>> Thanks, >>> >>> -Joe >>> >> >> I was waiting for a response from Gary with the bug IDs, but looks >> like one isn't forthcoming. ?I'll compile a list from recent OpenJDK7 >> build drops and post that shortly. >> >> There's also http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001750.html >> which causes build breakage with IcedTea. >> -- >> Andrew :-) >> >> Free Java Software Engineer >> Red Hat, Inc. (http://www.redhat.com) >> >> Support Free Java! >> Contribute to GNU Classpath and the OpenJDK >> http://www.gnu.org/software/classpath >> http://openjdk.java.net >> >> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >> > > b87 > == > > 6934089 ?Zero 32-bit/64kb page fix > http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/da06d1795d84 > > b90 > === > > 6939180 ?Zero locking fix > http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/747d26efc5fa > > b92 > === > > 6941224: Improved stack overflow handling for Zero > http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/f9271ff9d324 > > 6944503: Improved Zero crash dump > http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/c544d979f886 > > 6944473: 6941224 misses new files > http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/aa9c266de52a > > b94 > === > > 6939182: Zero JNI handles fix > http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/0c5b3cf3c1f5 > > 6950178: Zero stack improvements > http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/348346af6676 > > 6950617: Zero/Shark interface updates > http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/6cfbdb113e52 > > 6951784: Zero deoptimizer changes > http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/22af4ce8dba1 > > b96 > === > > 6951686: Using large pages on Linux prevents zero based compressed oops > http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/79bf863697eb > > Here's the webrev for those: > http://cr.openjdk.java.net/~andrew/zero/webrev.05/ and the previous > Nimbus one: http://cr.openjdk.java.net/~andrew/nimbus/webrev.07/ > > The following were skipped due to the referenced changesets not being > in OpenJDK6: > > 6939731: JSR 292 Zero build fix after 6934494 > 6944028: ? ? ? ? 6940701 broke Zero > 6949830: 6939134 broke Zero > > 6949423: remove tagged stack interpreter for Zero > http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/68d6683eaef7 > Depends on: > changeset: ? 1426:2338d41fbd81 > user: ? ? ? ?twisti > date: ? ? ? ?Fri Apr 30 08:37:24 2010 -0700 > summary: ? ? 6943304: remove tagged stack interpreter > > -- > Andrew :-) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 > Scratch 6951686; the mention of 'zero' mislead me. It's not a Zero fix. Let me know when I can push the rest, Cheers, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From joe.darcy at oracle.com Tue Jun 15 17:54:26 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Tue, 15 Jun 2010 17:54:26 -0700 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> <4C129472.8060302@oracle.com> <4C16C4E2.8050202@oracle.com> Message-ID: <4C1820C2.90607@oracle.com> Hello. Andrew John Hughes wrote: > On 15 June 2010 16:30, Andrew John Hughes wrote: > >> On 15 June 2010 13:21, Andrew John Hughes wrote: >> >>> On 15 June 2010 01:10, Joe Darcy wrote: >>> >>>> Joe Darcy wrote: >>>> >>>>> Andrew John Hughes wrote: >>>>> >>>>>> On 11 June 2010 05:31, Joe Darcy wrote: >>>>>> >>>>>> >>>>>>> Joe Darcy wrote: >>>>>>> >>>>>>> >>>>>>>> Andrew John Hughes wrote: >>>>>>>> >>>>>>>> >>>>>>>>> On 10 June 2010 02:02, Joe Darcy wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> Andrew Su wrote: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>> [snip] >>>>>>> >>>>>>> >>>>>>>>> changeset: 2208:0137b5857c63 >>>>>>>>> parent: 2183:90248595ec35 >>>>>>>>> user: okutsu >>>>>>>>> date: Wed Mar 10 14:32:47 2010 +0900 >>>>>>>>> summary: 6932473: (tz) javazic produces incorrect SimpleTimeZone >>>>>>>>> parameters with Sun<=7 >>>>>>>>> >>>>>>>>> Do these look ok? >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> Yes; also approved to go back. >>>>>>>> >>>>>>>> Since some Sun copyrighted files have leaked back in, we'll done >>>>>>>> another >>>>>>>> pass to clean up any such files before b20 goes final. >>>>>>>> >>>>>>>> Thanks, >>>>>>>> >>>>>>>> -Joe >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> I think only a few more changes are needed to wrap up b20: >>>>>>> >>>>>>> * The various backports identified in the earlier message in this thread >>>>>>> >>>>>>> >>>>>> Done now. >>>>>> >>>>>> >>>>>> >>>>>>> * Backport of 6957375 "java/net/ResponseCache getResponseCode and >>>>>>> ResponseCacheTest fail after rebranding" >>>>>>> >>>>>>> >>>>>> I see this come in while I was backporting; had to merge. >>>>>> >>>>>> >>>>>> >>>>>>> * One more pass of the Sun -> Oracle copyright script >>>>>>> >>>>>>> >>>>>>> >>>>>> There are some new Zero bugfixes that could be backported for b20 (and >>>>>> would allow us to drop the local copy in IcedTea6). >>>>>> I've CCed Gary Benson who should be able to provide a list of bug IDs >>>>>> for backport. >>>>>> >>>>>> Other than that, we should be good to go with b20. >>>>>> >>>>>> >>>>>> >>>>> Being able to drop the copy of Zero in IcedTea sounds worthwhile. After >>>>> looking over the bugids and a webrev, I'd expect to approve those fixes >>>>> going back. >>>>> >>>>> The Zero fixes are the last currently planned fixes for b20. >>>>> >>>>> -Joe >>>>> >>>> Hello. >>>> >>>> I'd like to get b20 wrapped up in the next day or two; please provide a list >>>> of the Zeros bug and I webrev so I can look them over. >>>> >>>> Thanks, >>>> >>>> -Joe >>>> >>>> >>> I was waiting for a response from Gary with the bug IDs, but looks >>> like one isn't forthcoming. I'll compile a list from recent OpenJDK7 >>> build drops and post that shortly. >>> >>> There's also http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001750.html >>> which causes build breakage with IcedTea. >>> -- >>> Andrew :-) >>> >>> Free Java Software Engineer >>> Red Hat, Inc. (http://www.redhat.com) >>> >>> Support Free Java! >>> Contribute to GNU Classpath and the OpenJDK >>> http://www.gnu.org/software/classpath >>> http://openjdk.java.net >>> >>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>> >>> >> b87 >> == >> >> 6934089 Zero 32-bit/64kb page fix >> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/da06d1795d84 >> >> b90 >> === >> >> 6939180 Zero locking fix >> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/747d26efc5fa >> >> b92 >> === >> >> 6941224: Improved stack overflow handling for Zero >> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/f9271ff9d324 >> >> 6944503: Improved Zero crash dump >> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/c544d979f886 >> >> 6944473: 6941224 misses new files >> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/aa9c266de52a >> These are hs18 Zero fixes. hs18 also includes 6944028 "6940701 broke Zero," but that fix is not needed in OpenJDK 6 yet since we don't have the fix for 6940701 from hs18, as you note below. Approved to go back. >> b94 >> === >> >> 6939182: Zero JNI handles fix >> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/0c5b3cf3c1f5 >> >> 6950178: Zero stack improvements >> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/348346af6676 >> >> 6950617: Zero/Shark interface updates >> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/6cfbdb113e52 >> >> 6951784: Zero deoptimizer changes >> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/22af4ce8dba1 >> All of these are in hs19 and are approved to go back. The bug 6960550 Missing semicolon in Zero is "fixed" in hs19, but not yet integrated. At your option, you may apply this fix to OpenJDK 6 now too. >> b96 >> === >> >> 6951686: Using large pages on Linux prevents zero based compressed oops >> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/79bf863697eb >> >> Here's the webrev for those: >> http://cr.openjdk.java.net/~andrew/zero/webrev.05/ and the previous >> Nimbus one: http://cr.openjdk.java.net/~andrew/nimbus/webrev.07/ >> I approve the -source 6/-target 6 changes for Nimbus; I don't think a wholesale change to -source 6/-target 6 is necessary. Please use 6961536 "Nimbus code using @Override break OpenJDK/IcedBuild on ecj" for the push. >> The following were skipped due to the referenced changesets not being >> in OpenJDK6: >> >> 6939731: JSR 292 Zero build fix after 6934494 >> 6944028: 6940701 broke Zero >> 6949830: 6939134 broke Zero >> >> 6949423: remove tagged stack interpreter for Zero >> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/68d6683eaef7 >> Depends on: >> changeset: 1426:2338d41fbd81 >> user: twisti >> date: Fri Apr 30 08:37:24 2010 -0700 >> summary: 6943304: remove tagged stack interpreter >> I've checked the bug database and all the Zero fixes in hs18 and hs19 are somehow addressed in this email thread. >> -- >> Andrew :-) >> >> Free Java Software Engineer >> Red Hat, Inc. (http://www.redhat.com) >> >> Support Free Java! >> Contribute to GNU Classpath and the OpenJDK >> http://www.gnu.org/software/classpath >> http://openjdk.java.net >> >> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >> >> > > > Scratch 6951686; the mention of 'zero' mislead me. It's not a Zero fix. > > Let me know when I can push the rest, > > Cheers, > Good to push! Thanks, -Joe From ahughes at redhat.com Wed Jun 16 06:15:34 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 16 Jun 2010 14:15:34 +0100 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <4C1820C2.90607@oracle.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> <4C129472.8060302@oracle.com> <4C16C4E2.8050202@oracle.com> <4C1820C2.90607@oracle.com> Message-ID: On 16 June 2010 01:54, Joe Darcy wrote: > Hello. > > Andrew John Hughes wrote: >> >> On 15 June 2010 16:30, Andrew John Hughes wrote: >> >>> >>> On 15 June 2010 13:21, Andrew John Hughes wrote: >>> >>>> >>>> On 15 June 2010 01:10, Joe Darcy wrote: >>>> >>>>> >>>>> Joe Darcy wrote: >>>>> >>>>>> >>>>>> Andrew John Hughes wrote: >>>>>> >>>>>>> >>>>>>> On 11 June 2010 05:31, Joe Darcy wrote: >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> Joe Darcy wrote: >>>>>>>> >>>>>>>> >>>>>>>>> >>>>>>>>> Andrew John Hughes wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>>> >>>>>>>>>> On 10 June 2010 02:02, Joe Darcy wrote: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> Andrew Su wrote: >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>> >>>>>>>> [snip] >>>>>>>> >>>>>>>> >>>>>>>>>> >>>>>>>>>> changeset: ? 2208:0137b5857c63 >>>>>>>>>> parent: ? ? ?2183:90248595ec35 >>>>>>>>>> user: ? ? ? ?okutsu >>>>>>>>>> date: ? ? ? ?Wed Mar 10 14:32:47 2010 +0900 >>>>>>>>>> summary: ? ? 6932473: (tz) javazic produces incorrect >>>>>>>>>> SimpleTimeZone >>>>>>>>>> parameters with Sun<=7 >>>>>>>>>> >>>>>>>>>> Do these look ok? >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>>> Yes; also approved to go back. >>>>>>>>> >>>>>>>>> Since some Sun copyrighted files have leaked back in, we'll done >>>>>>>>> another >>>>>>>>> pass to clean up any such files before b20 goes final. >>>>>>>>> >>>>>>>>> Thanks, >>>>>>>>> >>>>>>>>> -Joe >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> I think only a few more changes are needed to wrap up b20: >>>>>>>> >>>>>>>> * The various backports identified in the earlier message in this >>>>>>>> thread >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> Done now. >>>>>>> >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> * Backport of 6957375 "java/net/ResponseCache getResponseCode and >>>>>>>> ResponseCacheTest fail after rebranding" >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> I see this come in while I was backporting; had to merge. >>>>>>> >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> * One more pass of the Sun -> Oracle copyright script >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> There are some new Zero bugfixes that could be backported for b20 >>>>>>> (and >>>>>>> would allow us to drop the local copy in IcedTea6). >>>>>>> I've CCed Gary Benson who should be able to provide a list of bug IDs >>>>>>> for backport. >>>>>>> >>>>>>> Other than that, we should be good to go with b20. >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> Being able to drop the copy of Zero in IcedTea sounds worthwhile. >>>>>> ?After >>>>>> looking over the bugids and a webrev, I'd expect to approve those >>>>>> fixes >>>>>> going back. >>>>>> >>>>>> The Zero fixes are the last currently planned fixes for b20. >>>>>> >>>>>> -Joe >>>>>> >>>>> >>>>> Hello. >>>>> >>>>> I'd like to get b20 wrapped up in the next day or two; please provide a >>>>> list >>>>> of the Zeros bug and I webrev so I can look them over. >>>>> >>>>> Thanks, >>>>> >>>>> -Joe >>>>> >>>>> >>>> >>>> I was waiting for a response from Gary with the bug IDs, but looks >>>> like one isn't forthcoming. ?I'll compile a list from recent OpenJDK7 >>>> build drops and post that shortly. >>>> >>>> There's also >>>> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001750.html >>>> which causes build breakage with IcedTea. >>>> -- >>>> Andrew :-) >>>> >>>> Free Java Software Engineer >>>> Red Hat, Inc. (http://www.redhat.com) >>>> >>>> Support Free Java! >>>> Contribute to GNU Classpath and the OpenJDK >>>> http://www.gnu.org/software/classpath >>>> http://openjdk.java.net >>>> >>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>> >>>> >>> >>> b87 >>> == >>> >>> 6934089 ?Zero 32-bit/64kb page fix >>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/da06d1795d84 >>> >>> b90 >>> === >>> >>> 6939180 ?Zero locking fix >>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/747d26efc5fa >>> >>> b92 >>> === >>> >>> 6941224: Improved stack overflow handling for Zero >>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/f9271ff9d324 >>> >>> 6944503: Improved Zero crash dump >>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/c544d979f886 >>> >>> 6944473: 6941224 misses new files >>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/aa9c266de52a >>> > > These are hs18 Zero fixes. ?hs18 also includes 6944028 "6940701 broke Zero," > but that fix is not needed in OpenJDK 6 yet since we don't have the fix for > 6940701 from hs18, as you note below. > > Approved to go back. > > >>> b94 >>> === >>> >>> 6939182: Zero JNI handles fix >>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/0c5b3cf3c1f5 >>> >>> 6950178: Zero stack improvements >>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/348346af6676 >>> >>> 6950617: Zero/Shark interface updates >>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/6cfbdb113e52 >>> >>> 6951784: Zero deoptimizer changes >>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/22af4ce8dba1 >>> > > All of these are in hs19 and are approved to go back. ?The bug > > 6960550 Missing semicolon in Zero > > is "fixed" in hs19, but not yet integrated. ?At your option, you may apply > this fix to OpenJDK 6 now too. > Ok, I only looked at integrated fixes. But this fix looks simple enough and as you approve, I've backported it too :-) I'm surprised it even builds without the semi-colon but I guess that's C++ for you ;-) > >>> b96 >>> === >>> >>> 6951686: Using large pages on Linux prevents zero based compressed oops >>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/79bf863697eb >>> >>> Here's the webrev for those: >>> http://cr.openjdk.java.net/~andrew/zero/webrev.05/ and the previous >>> Nimbus one: http://cr.openjdk.java.net/~andrew/nimbus/webrev.07/ >>> > > I approve the -source 6/-target 6 changes for Nimbus; I don't think a > wholesale change to -source 6/-target 6 is necessary. > > Please use 6961536 "Nimbus code using @Override break OpenJDK/IcedBuild on > ecj" for the push. > >>> The following were skipped due to the referenced changesets not being >>> in OpenJDK6: >>> >>> 6939731: JSR 292 Zero build fix after 6934494 >>> 6944028: ? ? ? ? 6940701 broke Zero >>> 6949830: 6939134 broke Zero >>> >>> 6949423: remove tagged stack interpreter for Zero >>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/68d6683eaef7 >>> Depends on: >>> changeset: ? 1426:2338d41fbd81 >>> user: ? ? ? ?twisti >>> date: ? ? ? ?Fri Apr 30 08:37:24 2010 -0700 >>> summary: ? ? 6943304: remove tagged stack interpreter >>> > > I've checked the bug database and all the Zero fixes in hs18 and hs19 are > somehow addressed in this email thread. > >>> -- >>> Andrew :-) >>> >>> Free Java Software Engineer >>> Red Hat, Inc. (http://www.redhat.com) >>> >>> Support Free Java! >>> Contribute to GNU Classpath and the OpenJDK >>> http://www.gnu.org/software/classpath >>> http://openjdk.java.net >>> >>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>> >>> >> >> >> Scratch 6951686; the mention of 'zero' mislead me. ?It's not a Zero fix. >> >> Let me know when I can push the rest, >> >> Cheers, >> > > Good to push! > All pushed! > Thanks, > > -Joe > Thanks, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Wed Jun 16 06:15:26 2010 From: ahughes at redhat.com (ahughes at redhat.com) Date: Wed, 16 Jun 2010 13:15:26 +0000 Subject: hg: jdk6/jdk6/hotspot: 10 new changesets Message-ID: <20100616131548.CB273472B0@hg.openjdk.java.net> Changeset: 1a6f257ed3a5 Author: twisti Date: 2010-06-15 13:57 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/1a6f257ed3a5 6934089: Zero 32-bit/64kb page fix Summary: The fix for 6927165 increased the number of shadow pages for 32-bit platforms and this causes a problem on systems with 64kb pages. Reviewed-by: twisti Contributed-by: Gary Benson ! src/os_cpu/linux_zero/vm/globals_linux_zero.hpp Changeset: 358039f7f52a Author: twisti Date: 2010-03-30 00:57 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/358039f7f52a 6939180: Zero locking fix Summary: When Zero is running with Shark enabled threads can be left with their _do_not_unlock_if_synchronized flag incorrectly set. Reviewed-by: twisti Contributed-by: Gary Benson ! src/cpu/zero/vm/cppInterpreter_zero.cpp Changeset: 49c9f3323bda Author: twisti Date: 2010-06-15 14:02 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/49c9f3323bda 6941224: Improved stack overflow handling for Zero Summary: Adding stack overflow checking to Shark brought to light a bunch of deficiencies in Zero's stack overflow code. Reviewed-by: twisti Contributed-by: Gary Benson ! src/cpu/zero/vm/cppInterpreter_zero.cpp ! src/cpu/zero/vm/cppInterpreter_zero.hpp ! src/cpu/zero/vm/entryFrame_zero.hpp ! src/cpu/zero/vm/fakeStubFrame_zero.hpp ! src/cpu/zero/vm/interpreterFrame_zero.hpp ! src/cpu/zero/vm/interpreterRT_zero.cpp ! src/cpu/zero/vm/stack_zero.hpp ! src/cpu/zero/vm/stubGenerator_zero.cpp ! src/os_cpu/linux_zero/vm/thread_linux_zero.hpp ! src/share/vm/includeDB_zero Changeset: a83cd6083994 Author: twisti Date: 2010-06-15 14:05 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/a83cd6083994 6944503: Improved Zero crash dump Summary: With Zero on a GC crash the stack was dumped differently to other crashes. Reviewed-by: twisti Contributed-by: Gary Benson ! src/share/vm/utilities/vmError.cpp ! src/share/vm/utilities/vmError.hpp Changeset: 8e8cc2c99631 Author: twisti Date: 2010-04-16 05:05 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/8e8cc2c99631 6944473: 6941224 misses new files Summary: Two new files are missing in the push for 6941224. Reviewed-by: twisti Contributed-by: Gary Benson + src/cpu/zero/vm/stack_zero.cpp + src/cpu/zero/vm/stack_zero.inline.hpp Changeset: 8c59bd91900d Author: twisti Date: 2010-04-30 04:27 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/8c59bd91900d 6939182: Zero JNI handles fix Summary: Zero will exit with an error when invoked with -Xcheck:jni. Reviewed-by: twisti, kamg Contributed-by: Gary Benson ! src/cpu/zero/vm/cppInterpreter_zero.cpp ! src/cpu/zero/vm/frame_zero.cpp ! src/cpu/zero/vm/frame_zero.hpp ! src/cpu/zero/vm/frame_zero.inline.hpp ! src/cpu/zero/vm/javaFrameAnchor_zero.hpp ! src/cpu/zero/vm/stack_zero.cpp ! src/cpu/zero/vm/stack_zero.hpp ! src/os_cpu/linux_zero/vm/thread_linux_zero.hpp Changeset: 787569ebe75a Author: twisti Date: 2010-05-06 02:09 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/787569ebe75a 6950178: Zero stack improvements Summary: Moves the logic for determining the size of the Zero stack into the ZeroStack class. Reviewed-by: twisti Contributed-by: Gary Benson ! src/cpu/zero/vm/stack_zero.cpp ! src/cpu/zero/vm/stack_zero.hpp ! src/cpu/zero/vm/stack_zero.inline.hpp ! src/cpu/zero/vm/stubGenerator_zero.cpp ! src/share/vm/includeDB_zero Changeset: ea8a6501bd43 Author: twisti Date: 2010-05-07 04:20 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/ea8a6501bd43 6950617: Zero/Shark interface updates Summary: Zero needs a couple of new methods to allow Shark to access the new frame anchor field. Reviewed-by: twisti Contributed-by: Gary Benson ! src/cpu/zero/vm/frame_zero.cpp ! src/cpu/zero/vm/frame_zero.hpp ! src/cpu/zero/vm/javaFrameAnchor_zero.hpp ! src/os_cpu/linux_zero/vm/thread_linux_zero.hpp Changeset: a582ceddc287 Author: twisti Date: 2010-06-15 14:24 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/a582ceddc287 6951784: Zero deoptimizer changes Summary: The way Zero currently handles deoptimization can lead to methods being freed while they are still being executed. Reviewed-by: twisti Contributed-by: Gary Benson ! src/cpu/zero/vm/cppInterpreter_zero.cpp ! src/cpu/zero/vm/cppInterpreter_zero.hpp ! src/cpu/zero/vm/entry_zero.hpp Changeset: 00378d6ad46d Author: twisti Date: 2010-06-14 00:52 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/00378d6ad46d 6960550: Missing semicolon in Zero Summary: There is a missing semicolon in cppInterpreter_zero.cpp. Reviewed-by: twisti Contributed-by: Gary Benson ! src/cpu/zero/vm/cppInterpreter_zero.cpp From ahughes at redhat.com Wed Jun 16 06:13:58 2010 From: ahughes at redhat.com (ahughes at redhat.com) Date: Wed, 16 Jun 2010 13:13:58 +0000 Subject: hg: jdk6/jdk6/jdk: 6961536: Nimbus code using @Override breaks build with source/target 1.5 Message-ID: <20100616131437.42506472AD@hg.openjdk.java.net> Changeset: 6ef1ef04bf30 Author: andrew Date: 2010-06-16 14:13 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/6ef1ef04bf30 6961536: Nimbus code using @Override breaks build with source/target 1.5 Summary: @Override on annotations is only allowed with source 1.6 Reviewed-by: darcy ! make/javax/swing/Makefile ! make/javax/swing/plaf/Makefile From kelly.ohair at oracle.com Wed Jun 16 10:27:27 2010 From: kelly.ohair at oracle.com (kelly.ohair at oracle.com) Date: Wed, 16 Jun 2010 17:27:27 +0000 Subject: hg: jdk6/jdk6: 6943119: Rebrand source copyright notices Message-ID: <20100616172727.95998472C4@hg.openjdk.java.net> Changeset: 4176517f6798 Author: ohair Date: 2010-06-16 10:25 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/rev/4176517f6798 6943119: Rebrand source copyright notices Reviewed-by: darcy ! make/templates/gpl-cp-header ! make/templates/gpl-header From kelly.ohair at oracle.com Wed Jun 16 10:27:58 2010 From: kelly.ohair at oracle.com (kelly.ohair at oracle.com) Date: Wed, 16 Jun 2010 17:27:58 +0000 Subject: hg: jdk6/jdk6/jdk: 6943119: Rebrand source copyright notices Message-ID: <20100616172836.0BFC2472C6@hg.openjdk.java.net> Changeset: e5709bb1f712 Author: ohair Date: 2010-06-16 10:26 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/e5709bb1f712 6943119: Rebrand source copyright notices Reviewed-by: darcy ! make/templates/gpl-cp-header ! make/templates/gpl-header ! test/java/awt/font/Rotate/TranslatedOutlineTest.java ! test/sun/pisces/DashStrokeTest.java ! test/sun/pisces/StrokeShapeTest.java ! test/sun/pisces/ThinLineTest.java From neugens at limasoftware.net Wed Jun 16 12:31:36 2010 From: neugens at limasoftware.net (Mario Torre) Date: Wed, 16 Jun 2010 21:31:36 +0200 Subject: Backport for bug 6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds. Message-ID: <1276716696.30565.12.camel@galactica> Hi all, Is it possible to integrate this fix http://hg.openjdk.java.net/jdk7/2d/jdk/rev/8b55669c7b7a To jdk6 as well? Thanks, Mario -- pgp key: http://subkeys.pgp.net/ PGP Key ID: 80F240CF Fingerprint: BA39 9666 94EC 8B73 27FA FC7C 4086 63E3 80F2 40CF Proud GNU Classpath developer: http://www.classpath.org/ Read About us at: http://planet.classpath.org OpenJDK: http://openjdk.java.net/projects/caciocavallo/ Please, support open standards: http://endsoftpatents.org/ -- pgp key: http://subkeys.pgp.net/ PGP Key ID: 80F240CF Fingerprint: BA39 9666 94EC 8B73 27FA FC7C 4086 63E3 80F2 40CF Proud GNU Classpath developer: http://www.classpath.org/ Read About us at: http://planet.classpath.org OpenJDK: http://openjdk.java.net/projects/caciocavallo/ Please, support open standards: http://endsoftpatents.org/ From joe.darcy at oracle.com Wed Jun 16 12:41:41 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Wed, 16 Jun 2010 12:41:41 -0700 Subject: Backport for bug 6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds. In-Reply-To: <1276716696.30565.12.camel@galactica> References: <1276716696.30565.12.camel@galactica> Message-ID: <4C1928F5.9020308@oracle.com> Mario Torre wrote: > Hi all, > > Is it possible to integrate this fix > > http://hg.openjdk.java.net/jdk7/2d/jdk/rev/8b55669c7b7a > > To jdk6 as well? > > Thanks, > Mario > Hello. We're just about to wrap up OpenJDK 6 b20 so I think 6961732 "FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds" would be a fine fix for b21 after the fix has had a chance to soak in JDK 7. -Joe From neugens at limasoftware.net Wed Jun 16 13:07:10 2010 From: neugens at limasoftware.net (Mario Torre) Date: Wed, 16 Jun 2010 22:07:10 +0200 Subject: Backport for bug 6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds. In-Reply-To: <4C1928F5.9020308@oracle.com> References: <1276716696.30565.12.camel@galactica> <4C1928F5.9020308@oracle.com> Message-ID: <1276718830.30565.20.camel@galactica> Il giorno mer, 16/06/2010 alle 12.41 -0700, Joe Darcy ha scritto: > Hello. > > We're just about to wrap up OpenJDK 6 b20 so I think 6961732 > "FontMetrics.getLeading() may be negative in freetype-based OpenJDK > builds" would be a fine fix for b21 after the fix has had a chance to > soak in JDK 7. > > -Joe Hi Joe! Thanks for the quick reply. As much as I would love to see this fix in as soon as possible (I can't see my _ in NetBeans!!), I understand this and I think that now is in good hands and will not be forgotten :) Cheers, Mario -- pgp key: http://subkeys.pgp.net/ PGP Key ID: 80F240CF Fingerprint: BA39 9666 94EC 8B73 27FA FC7C 4086 63E3 80F2 40CF Proud GNU Classpath developer: http://www.classpath.org/ Read About us at: http://planet.classpath.org OpenJDK: http://openjdk.java.net/projects/caciocavallo/ Please, support open standards: http://endsoftpatents.org/ From ahughes at redhat.com Wed Jun 16 14:10:43 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 16 Jun 2010 22:10:43 +0100 Subject: Backport for bug 6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds. In-Reply-To: <1276718830.30565.20.camel@galactica> References: <1276716696.30565.12.camel@galactica> <4C1928F5.9020308@oracle.com> <1276718830.30565.20.camel@galactica> Message-ID: On 16 June 2010 21:07, Mario Torre wrote: > Il giorno mer, 16/06/2010 alle 12.41 -0700, Joe Darcy ha scritto: > >> Hello. >> >> We're just about to wrap up OpenJDK 6 b20 so I think 6961732 >> "FontMetrics.getLeading() may be negative in freetype-based OpenJDK >> builds" would be a fine fix for b21 after the fix has had a chance to >> soak in JDK 7. >> >> -Joe > > Hi Joe! > > Thanks for the quick reply. > > As much as I would love to see this fix in as soon as possible (I can't > see my _ in NetBeans!!), I understand this and I think that now is in > good hands and will not be forgotten :) > > Cheers, > Mario > > -- > pgp key: http://subkeys.pgp.net/ PGP Key ID: 80F240CF > Fingerprint: BA39 9666 94EC 8B73 27FA ?FC7C 4086 63E3 80F2 40CF > > Proud GNU Classpath developer: http://www.classpath.org/ > Read About us at: http://planet.classpath.org > OpenJDK: http://openjdk.java.net/projects/caciocavallo/ > > Please, support open standards: > http://endsoftpatents.org/ > > We'll give it a test run in IcedTea6 1.9 too before we upstream it for b21. So you should see it in distros in the next couple of months at a guess. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From jonathan.gibbons at oracle.com Wed Jun 16 16:43:19 2010 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Wed, 16 Jun 2010 16:43:19 -0700 Subject: request to backport: 6724327: eliminate use of shell tests for simple golden file tests Message-ID: <4C196197.1080908@oracle.com> Joe, I would like to backport the following fix from 7 to 6-open, build 21 changeset: 67:82c7aa6fe50a user: jjg date: Thu Jul 10 11:25:23 2008 -0700 description: 6724327: eliminate use of shell tests for simple golden file tests Reviewed-by: darcy From joe.darcy at oracle.com Wed Jun 16 16:48:20 2010 From: joe.darcy at oracle.com (joe.darcy at oracle.com) Date: Wed, 16 Jun 2010 23:48:20 +0000 Subject: hg: jdk6/jdk6: 6961870: More rebranding fixes for templates/gpl-*-header files Message-ID: <20100616234820.6DFFD472ED@hg.openjdk.java.net> Changeset: 35b68789bf53 Author: darcy Date: 2010-06-16 16:53 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/rev/35b68789bf53 6961870: More rebranding fixes for templates/gpl-*-header files Reviewed-by: jjg ! make/templates/gpl-cp-header ! make/templates/gpl-header From joe.darcy at oracle.com Wed Jun 16 16:48:33 2010 From: joe.darcy at oracle.com (joe.darcy at oracle.com) Date: Wed, 16 Jun 2010 23:48:33 +0000 Subject: hg: jdk6/jdk6/jdk: 6961870: More rebranding fixes for templates/gpl-*-header files Message-ID: <20100616234850.C4455472EF@hg.openjdk.java.net> Changeset: d71a28dc28d1 Author: darcy Date: 2010-06-16 16:53 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/d71a28dc28d1 6961870: More rebranding fixes for templates/gpl-*-header files Reviewed-by: jjg ! make/templates/gpl-cp-header ! make/templates/gpl-header From joe.darcy at oracle.com Wed Jun 16 16:59:27 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Wed, 16 Jun 2010 16:59:27 -0700 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> <4C129472.8060302@oracle.com> <4C16C4E2.8050202@oracle.com> <4C1820C2.90607@oracle.com> Message-ID: <4C19655F.3070604@oracle.com> Andrew John Hughes wrote: > On 16 June 2010 01:54, Joe Darcy wrote: > >> Hello. >> >> Andrew John Hughes wrote: >> >>> On 15 June 2010 16:30, Andrew John Hughes wrote: >>> >>> >>>> On 15 June 2010 13:21, Andrew John Hughes wrote: >>>> >>>> >>>>> On 15 June 2010 01:10, Joe Darcy wrote: >>>>> >>>>> >>>>>> Joe Darcy wrote: >>>>>> >>>>>> >>>>>>> Andrew John Hughes wrote: >>>>>>> >>>>>>> >>>>>>>> On 11 June 2010 05:31, Joe Darcy wrote: >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> Joe Darcy wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>> On 10 June 2010 02:02, Joe Darcy wrote: >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>>> Andrew Su wrote: >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>> [snip] >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>>> changeset: 2208:0137b5857c63 >>>>>>>>>>> parent: 2183:90248595ec35 >>>>>>>>>>> user: okutsu >>>>>>>>>>> date: Wed Mar 10 14:32:47 2010 +0900 >>>>>>>>>>> summary: 6932473: (tz) javazic produces incorrect >>>>>>>>>>> SimpleTimeZone >>>>>>>>>>> parameters with Sun<=7 >>>>>>>>>>> >>>>>>>>>>> Do these look ok? >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>> Yes; also approved to go back. >>>>>>>>>> >>>>>>>>>> Since some Sun copyrighted files have leaked back in, we'll done >>>>>>>>>> another >>>>>>>>>> pass to clean up any such files before b20 goes final. >>>>>>>>>> >>>>>>>>>> Thanks, >>>>>>>>>> >>>>>>>>>> -Joe >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> I think only a few more changes are needed to wrap up b20: >>>>>>>>> >>>>>>>>> * The various backports identified in the earlier message in this >>>>>>>>> thread >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> Done now. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> * Backport of 6957375 "java/net/ResponseCache getResponseCode and >>>>>>>>> ResponseCacheTest fail after rebranding" >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> I see this come in while I was backporting; had to merge. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> * One more pass of the Sun -> Oracle copyright script >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> There are some new Zero bugfixes that could be backported for b20 >>>>>>>> (and >>>>>>>> would allow us to drop the local copy in IcedTea6). >>>>>>>> I've CCed Gary Benson who should be able to provide a list of bug IDs >>>>>>>> for backport. >>>>>>>> >>>>>>>> Other than that, we should be good to go with b20. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> Being able to drop the copy of Zero in IcedTea sounds worthwhile. >>>>>>> After >>>>>>> looking over the bugids and a webrev, I'd expect to approve those >>>>>>> fixes >>>>>>> going back. >>>>>>> >>>>>>> The Zero fixes are the last currently planned fixes for b20. >>>>>>> >>>>>>> -Joe >>>>>>> >>>>>>> >>>>>> Hello. >>>>>> >>>>>> I'd like to get b20 wrapped up in the next day or two; please provide a >>>>>> list >>>>>> of the Zeros bug and I webrev so I can look them over. >>>>>> >>>>>> Thanks, >>>>>> >>>>>> -Joe >>>>>> >>>>>> >>>>>> >>>>> I was waiting for a response from Gary with the bug IDs, but looks >>>>> like one isn't forthcoming. I'll compile a list from recent OpenJDK7 >>>>> build drops and post that shortly. >>>>> >>>>> There's also >>>>> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001750.html >>>>> which causes build breakage with IcedTea. >>>>> -- >>>>> Andrew :-) >>>>> >>>>> Free Java Software Engineer >>>>> Red Hat, Inc. (http://www.redhat.com) >>>>> >>>>> Support Free Java! >>>>> Contribute to GNU Classpath and the OpenJDK >>>>> http://www.gnu.org/software/classpath >>>>> http://openjdk.java.net >>>>> >>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>>> >>>>> >>>>> >>>> b87 >>>> == >>>> >>>> 6934089 Zero 32-bit/64kb page fix >>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/da06d1795d84 >>>> >>>> b90 >>>> === >>>> >>>> 6939180 Zero locking fix >>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/747d26efc5fa >>>> >>>> b92 >>>> === >>>> >>>> 6941224: Improved stack overflow handling for Zero >>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/f9271ff9d324 >>>> >>>> 6944503: Improved Zero crash dump >>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/c544d979f886 >>>> >>>> 6944473: 6941224 misses new files >>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/aa9c266de52a >>>> >>>> >> These are hs18 Zero fixes. hs18 also includes 6944028 "6940701 broke Zero," >> but that fix is not needed in OpenJDK 6 yet since we don't have the fix for >> 6940701 from hs18, as you note below. >> >> Approved to go back. >> >> >> >>>> b94 >>>> === >>>> >>>> 6939182: Zero JNI handles fix >>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/0c5b3cf3c1f5 >>>> >>>> 6950178: Zero stack improvements >>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/348346af6676 >>>> >>>> 6950617: Zero/Shark interface updates >>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/6cfbdb113e52 >>>> >>>> 6951784: Zero deoptimizer changes >>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/22af4ce8dba1 >>>> >>>> >> All of these are in hs19 and are approved to go back. The bug >> >> 6960550 Missing semicolon in Zero >> >> is "fixed" in hs19, but not yet integrated. At your option, you may apply >> this fix to OpenJDK 6 now too. >> >> > > Ok, I only looked at integrated fixes. But this fix looks simple > enough and as you approve, I've backported it too :-) > > I'm surprised it even builds without the semi-colon but I guess that's > C++ for you ;-) > > >>>> b96 >>>> === >>>> >>>> 6951686: Using large pages on Linux prevents zero based compressed oops >>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/79bf863697eb >>>> >>>> Here's the webrev for those: >>>> http://cr.openjdk.java.net/~andrew/zero/webrev.05/ and the previous >>>> Nimbus one: http://cr.openjdk.java.net/~andrew/nimbus/webrev.07/ >>>> >>>> >> I approve the -source 6/-target 6 changes for Nimbus; I don't think a >> wholesale change to -source 6/-target 6 is necessary. >> >> Please use 6961536 "Nimbus code using @Override break OpenJDK/IcedBuild on >> ecj" for the push. >> >> >>>> The following were skipped due to the referenced changesets not being >>>> in OpenJDK6: >>>> >>>> 6939731: JSR 292 Zero build fix after 6934494 >>>> 6944028: 6940701 broke Zero >>>> 6949830: 6939134 broke Zero >>>> >>>> 6949423: remove tagged stack interpreter for Zero >>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/68d6683eaef7 >>>> Depends on: >>>> changeset: 1426:2338d41fbd81 >>>> user: twisti >>>> date: Fri Apr 30 08:37:24 2010 -0700 >>>> summary: 6943304: remove tagged stack interpreter >>>> >>>> >> I've checked the bug database and all the Zero fixes in hs18 and hs19 are >> somehow addressed in this email thread. >> >> >>>> -- >>>> Andrew :-) >>>> >>>> Free Java Software Engineer >>>> Red Hat, Inc. (http://www.redhat.com) >>>> >>>> Support Free Java! >>>> Contribute to GNU Classpath and the OpenJDK >>>> http://www.gnu.org/software/classpath >>>> http://openjdk.java.net >>>> >>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>> >>>> >>>> >>> Scratch 6951686; the mention of 'zero' mislead me. It's not a Zero fix. >>> >>> Let me know when I can push the rest, >>> >>> Cheers, >>> >>> >> Good to push! >> >> > > All pushed! > > >> Thanks, >> >> -Joe >> >> > > Thanks, > Thanks for the pushes! With the integration of 6961870 "More rebranding fixes for templates/gpl-*-header files," which I just pushed, I believe that is the last change for b20. I will tag the repos accordingly pending successful results from a round of sanity building and testing. -Joe From jonathan.gibbons at oracle.com Wed Jun 16 16:55:58 2010 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Wed, 16 Jun 2010 16:55:58 -0700 Subject: Request to backport 4 changesets Message-ID: <4C19648E.1060504@oracle.com> Joe, I would like to backport the following block of langtools changesets from 7 to 6-open, b21 -- Jon changeset: 91:748b44c7c40c user: jjg date: Thu Jul 10 16:50:38 2008 -0700 summary: 6724551: Use Queues instead of Lists to link compiler phases changeset: 92:7ef9dea67bb9 user: jjg date: Wed Jul 23 19:55:30 2008 -0700 summary: 6726015: JavaCompiler: replace desugarLater by compileStates changeset: 93:410697a6c8ef user: mcimadamore date: Fri Aug 08 17:48:04 2008 +0100 summary: 6734819: Javac performs flows analysis on already translated classes changeset: 94:daa4b9c734fb tag: tip user: jjg date: Wed Jun 16 16:23:27 2010 -0700 summary: 6956638: JavacTask.generate does not generate all required files From joe.darcy at oracle.com Wed Jun 16 17:05:12 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Wed, 16 Jun 2010 17:05:12 -0700 Subject: request to backport: 6724327: eliminate use of shell tests for simple golden file tests In-Reply-To: <4C196197.1080908@oracle.com> References: <4C196197.1080908@oracle.com> Message-ID: <4C1966B8.7020604@oracle.com> Jonathan Gibbons wrote: > Joe, > > I would like to backport the following fix from 7 to 6-open, build 21 > > changeset: 67:82c7aa6fe50a > user: jjg > date: Thu Jul 10 11:25:23 2008 -0700 > description: > 6724327: eliminate use of shell tests for simple golden file tests > Reviewed-by: darcy > Jon, That would be a fine fix for b21 :-) -Joe From joe.darcy at oracle.com Wed Jun 16 17:07:40 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Wed, 16 Jun 2010 17:07:40 -0700 Subject: Request to backport 4 changesets In-Reply-To: <4C19648E.1060504@oracle.com> References: <4C19648E.1060504@oracle.com> Message-ID: <4C19674C.7070209@oracle.com> Jonathan Gibbons wrote: > Joe, > > I would like to backport the following block of langtools changesets > from 7 to 6-open, b21 > > -- Jon Jon, those would be fine additions to b21; approved! -Joe > > > changeset: 91:748b44c7c40c > user: jjg > date: Thu Jul 10 16:50:38 2008 -0700 > summary: 6724551: Use Queues instead of Lists to link compiler phases > > changeset: 92:7ef9dea67bb9 > user: jjg > date: Wed Jul 23 19:55:30 2008 -0700 > summary: 6726015: JavaCompiler: replace desugarLater by compileStates > > changeset: 93:410697a6c8ef > user: mcimadamore > date: Fri Aug 08 17:48:04 2008 +0100 > summary: 6734819: Javac performs flows analysis on already > translated classes > > changeset: 94:daa4b9c734fb > tag: tip > user: jjg > date: Wed Jun 16 16:23:27 2010 -0700 > summary: 6956638: JavacTask.generate does not generate all > required files > From erik.trimble at oracle.com Wed Jun 16 18:30:46 2010 From: erik.trimble at oracle.com (Erik Trimble) Date: Wed, 16 Jun 2010 18:30:46 -0700 Subject: Hotspot 17 Build 16 is complete... Message-ID: <1276738246.15756.14.camel@ghostbox.sfbay.sun.com> I've completed testing on Build 16 of Hotspot 17. This build is intended for the Oracle 6u21 build 06 train. The tip of the build is here: http://hg.openjdk.java.net/hsx/hsx17/master/rev/47d78593b370 -- Erik Trimble Java System Support Mailstop: usca22-123 Phone: x17195 Santa Clara, CA Timezone: US/Pacific (GMT-0800) -------------- next part -------------- Date: Tue, 15 Jun 2010 08:48:13 -0700 (PDT) From: WebServer Reserved UID Subject: PIT results: VM, 1.6.0_21-b06: Go for Integration To: David.Cox at sun.com, Ekaterina.Pavlova at sun.com, erik.trimble at sun.com, hotspot-gk at sun.com, hotspot-test at sun.com, pit_sqe at sun.com Message-id: <201006151548.o5FFmDaU029039 at csgweb.SFBay.Sun.COM> Component : VM Status : 0 major failures, 0 minor failures Date : 06/15/2010 at 08:47 Tested By : VM SQE & Leonid.Mesnik at sun.com Cost(total man-days): 1 Workspace : /java/jdk/ws/hotspot/ws/master Bundles : /net/jprt-web/jprt/archive/2010/06/2010-06-10-231527.et151817.hs17b16 Platforms : Solaris Sparc 11(32), -client Solaris Sparc 11(32), -server Solaris Sparc 10(32), -client Solaris Sparc 10(32), -server Solaris x86 11(32), -client Solaris x86 11(32), -server Solaris x86 10(32), -client Solaris x86 10(32), -server WinXP Prof(32), -client WinXP Prof(32), -server WinXP Home(32), -client WinXP Home(32), -server Win Server 2003(32), -client Win Server 2003(32), -server Windows Vista 32 bit, -client Windows Vista 32 bit, -server Windows Vista 64 bit, -client Windows Vista 64 bit, -server RH AS4.0 (32), -client RH AS4.0 (32), -server SuSE SLES 8(32), -client SuSE SLES 8(32), -server Tests : /net/sqenfs-1.sfbay/export1/comp/vm/testbase Browsers : NA Patches : NA Logs : http://sqeweb.sfbay.sun.com/nfs/results/vm/gtee/HSX/PIT/VM/17/b16/jdk6u21b06/product_02 Number of Tests Executed : 311477 product tests, 0 unit tests, 0 tck tests Bug verification status: ====================================== Tested, Pass: 6953058: G1: A bigapp crashes with SIGSEGV in compiled code Tested, Pass (partial fixes): Tested, Fail: Untested bug fixes: Setup is not available: Build change only: 6960390: Bump the HS17 build number to 16 6960393: Fix misplaced b15 hg tag for hs17 New bugs filed: Bugs in PIT build: Bugs in earlier promoted build: Number of PIT requested: 1 Integration target J2SE build number: 1.6.0_21-b06 Issues and Notes: This is HS 17 b16 PIT for JDK 6u21 b06 ------------------------------- >From VM SQE & Leonid.Mesnik at sun.com From weijun.wang at sun.com Wed Jun 16 23:05:51 2010 From: weijun.wang at sun.com (weijun.wang at sun.com) Date: Thu, 17 Jun 2010 06:05:51 +0000 Subject: hg: jdk6/jdk6/jdk: 6948909: Jarsigner removes MANIFEST.MF info for badly packages jar's; ... Message-ID: <20100617060609.7BC9947301@hg.openjdk.java.net> Changeset: dfca90a1c8e3 Author: weijun Date: 2010-06-17 14:05 +0800 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/dfca90a1c8e3 6948909: Jarsigner removes MANIFEST.MF info for badly packages jar's 6954621: small error in 6948909 fix Reviewed-by: mullan, xuelei ! src/share/classes/sun/security/tools/JarSigner.java + test/sun/security/tools/jarsigner/diffend.sh From ahughes at redhat.com Thu Jun 17 00:52:28 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 17 Jun 2010 08:52:28 +0100 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <4C19655F.3070604@oracle.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> <4C129472.8060302@oracle.com> <4C16C4E2.8050202@oracle.com> <4C1820C2.90607@oracle.com> <4C19655F.3070604@oracle.com> Message-ID: On 17 June 2010 00:59, Joe Darcy wrote: > Andrew John Hughes wrote: >> >> On 16 June 2010 01:54, Joe Darcy wrote: >> >>> >>> Hello. >>> >>> Andrew John Hughes wrote: >>> >>>> >>>> On 15 June 2010 16:30, Andrew John Hughes wrote: >>>> >>>> >>>>> >>>>> On 15 June 2010 13:21, Andrew John Hughes wrote: >>>>> >>>>> >>>>>> >>>>>> On 15 June 2010 01:10, Joe Darcy wrote: >>>>>> >>>>>> >>>>>>> >>>>>>> Joe Darcy wrote: >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> Andrew John Hughes wrote: >>>>>>>> >>>>>>>> >>>>>>>>> >>>>>>>>> On 11 June 2010 05:31, Joe Darcy wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> >>>>>>>>>> Joe Darcy wrote: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> On 10 June 2010 02:02, Joe Darcy wrote: >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> Andrew Su wrote: >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>> >>>>>>>>>> [snip] >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> changeset: ? 2208:0137b5857c63 >>>>>>>>>>>> parent: ? ? ?2183:90248595ec35 >>>>>>>>>>>> user: ? ? ? ?okutsu >>>>>>>>>>>> date: ? ? ? ?Wed Mar 10 14:32:47 2010 +0900 >>>>>>>>>>>> summary: ? ? 6932473: (tz) javazic produces incorrect >>>>>>>>>>>> SimpleTimeZone >>>>>>>>>>>> parameters with Sun<=7 >>>>>>>>>>>> >>>>>>>>>>>> Do these look ok? >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> Yes; also approved to go back. >>>>>>>>>>> >>>>>>>>>>> Since some Sun copyrighted files have leaked back in, we'll done >>>>>>>>>>> another >>>>>>>>>>> pass to clean up any such files before b20 goes final. >>>>>>>>>>> >>>>>>>>>>> Thanks, >>>>>>>>>>> >>>>>>>>>>> -Joe >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>> >>>>>>>>>> I think only a few more changes are needed to wrap up b20: >>>>>>>>>> >>>>>>>>>> * The various backports identified in the earlier message in this >>>>>>>>>> thread >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>>> Done now. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> >>>>>>>>>> * Backport of 6957375 "java/net/ResponseCache getResponseCode and >>>>>>>>>> ResponseCacheTest fail after rebranding" >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>>> I see this come in while I was backporting; had to merge. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> >>>>>>>>>> * One more pass of the Sun -> Oracle copyright script >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>>> There are some new Zero bugfixes that could be backported for b20 >>>>>>>>> (and >>>>>>>>> would allow us to drop the local copy in IcedTea6). >>>>>>>>> I've CCed Gary Benson who should be able to provide a list of bug >>>>>>>>> IDs >>>>>>>>> for backport. >>>>>>>>> >>>>>>>>> Other than that, we should be good to go with b20. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> Being able to drop the copy of Zero in IcedTea sounds worthwhile. >>>>>>>> ?After >>>>>>>> looking over the bugids and a webrev, I'd expect to approve those >>>>>>>> fixes >>>>>>>> going back. >>>>>>>> >>>>>>>> The Zero fixes are the last currently planned fixes for b20. >>>>>>>> >>>>>>>> -Joe >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> Hello. >>>>>>> >>>>>>> I'd like to get b20 wrapped up in the next day or two; please provide >>>>>>> a >>>>>>> list >>>>>>> of the Zeros bug and I webrev so I can look them over. >>>>>>> >>>>>>> Thanks, >>>>>>> >>>>>>> -Joe >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> I was waiting for a response from Gary with the bug IDs, but looks >>>>>> like one isn't forthcoming. ?I'll compile a list from recent OpenJDK7 >>>>>> build drops and post that shortly. >>>>>> >>>>>> There's also >>>>>> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001750.html >>>>>> which causes build breakage with IcedTea. >>>>>> -- >>>>>> Andrew :-) >>>>>> >>>>>> Free Java Software Engineer >>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>> >>>>>> Support Free Java! >>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>> http://www.gnu.org/software/classpath >>>>>> http://openjdk.java.net >>>>>> >>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>>> >>>>>> >>>>>> >>>>> >>>>> b87 >>>>> == >>>>> >>>>> 6934089 ?Zero 32-bit/64kb page fix >>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/da06d1795d84 >>>>> >>>>> b90 >>>>> === >>>>> >>>>> 6939180 ?Zero locking fix >>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/747d26efc5fa >>>>> >>>>> b92 >>>>> === >>>>> >>>>> 6941224: Improved stack overflow handling for Zero >>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/f9271ff9d324 >>>>> >>>>> 6944503: Improved Zero crash dump >>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/c544d979f886 >>>>> >>>>> 6944473: 6941224 misses new files >>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/aa9c266de52a >>>>> >>>>> >>> >>> These are hs18 Zero fixes. ?hs18 also includes 6944028 "6940701 broke >>> Zero," >>> but that fix is not needed in OpenJDK 6 yet since we don't have the fix >>> for >>> 6940701 from hs18, as you note below. >>> >>> Approved to go back. >>> >>> >>> >>>>> >>>>> b94 >>>>> === >>>>> >>>>> 6939182: Zero JNI handles fix >>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/0c5b3cf3c1f5 >>>>> >>>>> 6950178: Zero stack improvements >>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/348346af6676 >>>>> >>>>> 6950617: Zero/Shark interface updates >>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/6cfbdb113e52 >>>>> >>>>> 6951784: Zero deoptimizer changes >>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/22af4ce8dba1 >>>>> >>>>> >>> >>> All of these are in hs19 and are approved to go back. ?The bug >>> >>> 6960550 Missing semicolon in Zero >>> >>> is "fixed" in hs19, but not yet integrated. ?At your option, you may >>> apply >>> this fix to OpenJDK 6 now too. >>> >>> >> >> Ok, I only looked at integrated fixes. ?But this fix looks simple >> enough and as you approve, I've backported it too :-) >> >> I'm surprised it even builds without the semi-colon but I guess that's >> C++ for you ;-) >> >> >>>>> >>>>> b96 >>>>> === >>>>> >>>>> 6951686: Using large pages on Linux prevents zero based compressed oops >>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/79bf863697eb >>>>> >>>>> Here's the webrev for those: >>>>> http://cr.openjdk.java.net/~andrew/zero/webrev.05/ and the previous >>>>> Nimbus one: http://cr.openjdk.java.net/~andrew/nimbus/webrev.07/ >>>>> >>>>> >>> >>> I approve the -source 6/-target 6 changes for Nimbus; I don't think a >>> wholesale change to -source 6/-target 6 is necessary. >>> >>> Please use 6961536 "Nimbus code using @Override break OpenJDK/IcedBuild >>> on >>> ecj" for the push. >>> >>> >>>>> >>>>> The following were skipped due to the referenced changesets not being >>>>> in OpenJDK6: >>>>> >>>>> 6939731: JSR 292 Zero build fix after 6934494 >>>>> 6944028: ? ? ? ? 6940701 broke Zero >>>>> 6949830: 6939134 broke Zero >>>>> >>>>> 6949423: remove tagged stack interpreter for Zero >>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/68d6683eaef7 >>>>> Depends on: >>>>> changeset: ? 1426:2338d41fbd81 >>>>> user: ? ? ? ?twisti >>>>> date: ? ? ? ?Fri Apr 30 08:37:24 2010 -0700 >>>>> summary: ? ? 6943304: remove tagged stack interpreter >>>>> >>>>> >>> >>> I've checked the bug database and all the Zero fixes in hs18 and hs19 are >>> somehow addressed in this email thread. >>> >>> >>>>> >>>>> -- >>>>> Andrew :-) >>>>> >>>>> Free Java Software Engineer >>>>> Red Hat, Inc. (http://www.redhat.com) >>>>> >>>>> Support Free Java! >>>>> Contribute to GNU Classpath and the OpenJDK >>>>> http://www.gnu.org/software/classpath >>>>> http://openjdk.java.net >>>>> >>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>> >>>>> >>>>> >>>> >>>> Scratch 6951686; the mention of 'zero' mislead me. ?It's not a Zero fix. >>>> >>>> Let me know when I can push the rest, >>>> >>>> Cheers, >>>> >>>> >>> >>> Good to push! >>> >>> >> >> All pushed! >> >> >>> >>> Thanks, >>> >>> -Joe >>> >>> >> >> Thanks, >> > > Thanks for the pushes! > > With the integration of 6961870 "More rebranding fixes for > templates/gpl-*-header files," which I just pushed, I believe that is the > last change for b20. ?I will tag the repos accordingly pending successful > results from a round of sanity building and testing. > > -Joe > > I don't want to drag b20 out any longer either, but I think it's probably worth doing a final sync of HotSpot to hs17b16, which was just announced: http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001781.html If you recall, we brought in 6955813: Fix incorrect Oracle rebranding headers from 6941466 already so we now have hs17b15 + that fix. I think it would be better to have OpenJDK6 builds use a known HotSpot tag, which syncing with hs17b16 would give us. It actually only means bringing in one more real fix: 6953058: G1: A bigapp crashes with SIGSEGV in compiled code http://hg.openjdk.java.net/hsx/hsx17/master/rev/d53d91cb378c which sounds important. What do you think? -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From joe.darcy at oracle.com Thu Jun 17 01:02:57 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Thu, 17 Jun 2010 01:02:57 -0700 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> <4C129472.8060302@oracle.com> <4C16C4E2.8050202@oracle.com> <4C1820C2.90607@oracle.com> <4C19655F.3070604@oracle.com> Message-ID: <4C19D6B1.7070203@oracle.com> Andrew John Hughes wrote: > On 17 June 2010 00:59, Joe Darcy wrote: > >> Andrew John Hughes wrote: >> >>> On 16 June 2010 01:54, Joe Darcy wrote: >>> >>> >>>> Hello. >>>> >>>> Andrew John Hughes wrote: >>>> >>>> >>>>> On 15 June 2010 16:30, Andrew John Hughes wrote: >>>>> >>>>> >>>>> >>>>>> On 15 June 2010 13:21, Andrew John Hughes wrote: >>>>>> >>>>>> >>>>>> >>>>>>> On 15 June 2010 01:10, Joe Darcy wrote: >>>>>>> >>>>>>> >>>>>>> >>>>>>>> Joe Darcy wrote: >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> Andrew John Hughes wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> On 11 June 2010 05:31, Joe Darcy wrote: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>> Joe Darcy wrote: >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>>> On 10 June 2010 02:02, Joe Darcy wrote: >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>>> Andrew Su wrote: >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>> [snip] >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>>>> changeset: 2208:0137b5857c63 >>>>>>>>>>>>> parent: 2183:90248595ec35 >>>>>>>>>>>>> user: okutsu >>>>>>>>>>>>> date: Wed Mar 10 14:32:47 2010 +0900 >>>>>>>>>>>>> summary: 6932473: (tz) javazic produces incorrect >>>>>>>>>>>>> SimpleTimeZone >>>>>>>>>>>>> parameters with Sun<=7 >>>>>>>>>>>>> >>>>>>>>>>>>> Do these look ok? >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>> Yes; also approved to go back. >>>>>>>>>>>> >>>>>>>>>>>> Since some Sun copyrighted files have leaked back in, we'll done >>>>>>>>>>>> another >>>>>>>>>>>> pass to clean up any such files before b20 goes final. >>>>>>>>>>>> >>>>>>>>>>>> Thanks, >>>>>>>>>>>> >>>>>>>>>>>> -Joe >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>> I think only a few more changes are needed to wrap up b20: >>>>>>>>>>> >>>>>>>>>>> * The various backports identified in the earlier message in this >>>>>>>>>>> thread >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>> Done now. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>> * Backport of 6957375 "java/net/ResponseCache getResponseCode and >>>>>>>>>>> ResponseCacheTest fail after rebranding" >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>> I see this come in while I was backporting; had to merge. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>> * One more pass of the Sun -> Oracle copyright script >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>> There are some new Zero bugfixes that could be backported for b20 >>>>>>>>>> (and >>>>>>>>>> would allow us to drop the local copy in IcedTea6). >>>>>>>>>> I've CCed Gary Benson who should be able to provide a list of bug >>>>>>>>>> IDs >>>>>>>>>> for backport. >>>>>>>>>> >>>>>>>>>> Other than that, we should be good to go with b20. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> Being able to drop the copy of Zero in IcedTea sounds worthwhile. >>>>>>>>> After >>>>>>>>> looking over the bugids and a webrev, I'd expect to approve those >>>>>>>>> fixes >>>>>>>>> going back. >>>>>>>>> >>>>>>>>> The Zero fixes are the last currently planned fixes for b20. >>>>>>>>> >>>>>>>>> -Joe >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> Hello. >>>>>>>> >>>>>>>> I'd like to get b20 wrapped up in the next day or two; please provide >>>>>>>> a >>>>>>>> list >>>>>>>> of the Zeros bug and I webrev so I can look them over. >>>>>>>> >>>>>>>> Thanks, >>>>>>>> >>>>>>>> -Joe >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> I was waiting for a response from Gary with the bug IDs, but looks >>>>>>> like one isn't forthcoming. I'll compile a list from recent OpenJDK7 >>>>>>> build drops and post that shortly. >>>>>>> >>>>>>> There's also >>>>>>> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001750.html >>>>>>> which causes build breakage with IcedTea. >>>>>>> -- >>>>>>> Andrew :-) >>>>>>> >>>>>>> Free Java Software Engineer >>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>> >>>>>>> Support Free Java! >>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>> http://www.gnu.org/software/classpath >>>>>>> http://openjdk.java.net >>>>>>> >>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>> b87 >>>>>> == >>>>>> >>>>>> 6934089 Zero 32-bit/64kb page fix >>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/da06d1795d84 >>>>>> >>>>>> b90 >>>>>> === >>>>>> >>>>>> 6939180 Zero locking fix >>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/747d26efc5fa >>>>>> >>>>>> b92 >>>>>> === >>>>>> >>>>>> 6941224: Improved stack overflow handling for Zero >>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/f9271ff9d324 >>>>>> >>>>>> 6944503: Improved Zero crash dump >>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/c544d979f886 >>>>>> >>>>>> 6944473: 6941224 misses new files >>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/aa9c266de52a >>>>>> >>>>>> >>>>>> >>>> These are hs18 Zero fixes. hs18 also includes 6944028 "6940701 broke >>>> Zero," >>>> but that fix is not needed in OpenJDK 6 yet since we don't have the fix >>>> for >>>> 6940701 from hs18, as you note below. >>>> >>>> Approved to go back. >>>> >>>> >>>> >>>> >>>>>> b94 >>>>>> === >>>>>> >>>>>> 6939182: Zero JNI handles fix >>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/0c5b3cf3c1f5 >>>>>> >>>>>> 6950178: Zero stack improvements >>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/348346af6676 >>>>>> >>>>>> 6950617: Zero/Shark interface updates >>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/6cfbdb113e52 >>>>>> >>>>>> 6951784: Zero deoptimizer changes >>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/22af4ce8dba1 >>>>>> >>>>>> >>>>>> >>>> All of these are in hs19 and are approved to go back. The bug >>>> >>>> 6960550 Missing semicolon in Zero >>>> >>>> is "fixed" in hs19, but not yet integrated. At your option, you may >>>> apply >>>> this fix to OpenJDK 6 now too. >>>> >>>> >>>> >>> Ok, I only looked at integrated fixes. But this fix looks simple >>> enough and as you approve, I've backported it too :-) >>> >>> I'm surprised it even builds without the semi-colon but I guess that's >>> C++ for you ;-) >>> >>> >>> >>>>>> b96 >>>>>> === >>>>>> >>>>>> 6951686: Using large pages on Linux prevents zero based compressed oops >>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/79bf863697eb >>>>>> >>>>>> Here's the webrev for those: >>>>>> http://cr.openjdk.java.net/~andrew/zero/webrev.05/ and the previous >>>>>> Nimbus one: http://cr.openjdk.java.net/~andrew/nimbus/webrev.07/ >>>>>> >>>>>> >>>>>> >>>> I approve the -source 6/-target 6 changes for Nimbus; I don't think a >>>> wholesale change to -source 6/-target 6 is necessary. >>>> >>>> Please use 6961536 "Nimbus code using @Override break OpenJDK/IcedBuild >>>> on >>>> ecj" for the push. >>>> >>>> >>>> >>>>>> The following were skipped due to the referenced changesets not being >>>>>> in OpenJDK6: >>>>>> >>>>>> 6939731: JSR 292 Zero build fix after 6934494 >>>>>> 6944028: 6940701 broke Zero >>>>>> 6949830: 6939134 broke Zero >>>>>> >>>>>> 6949423: remove tagged stack interpreter for Zero >>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/68d6683eaef7 >>>>>> Depends on: >>>>>> changeset: 1426:2338d41fbd81 >>>>>> user: twisti >>>>>> date: Fri Apr 30 08:37:24 2010 -0700 >>>>>> summary: 6943304: remove tagged stack interpreter >>>>>> >>>>>> >>>>>> >>>> I've checked the bug database and all the Zero fixes in hs18 and hs19 are >>>> somehow addressed in this email thread. >>>> >>>> >>>> >>>>>> -- >>>>>> Andrew :-) >>>>>> >>>>>> Free Java Software Engineer >>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>> >>>>>> Support Free Java! >>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>> http://www.gnu.org/software/classpath >>>>>> http://openjdk.java.net >>>>>> >>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>>>> >>>>>> >>>>>> >>>>>> >>>>> Scratch 6951686; the mention of 'zero' mislead me. It's not a Zero fix. >>>>> >>>>> Let me know when I can push the rest, >>>>> >>>>> Cheers, >>>>> >>>>> >>>>> >>>> Good to push! >>>> >>>> >>>> >>> All pushed! >>> >>> >>> >>>> Thanks, >>>> >>>> -Joe >>>> >>>> >>>> >>> Thanks, >>> >>> >> Thanks for the pushes! >> >> With the integration of 6961870 "More rebranding fixes for >> templates/gpl-*-header files," which I just pushed, I believe that is the >> last change for b20. I will tag the repos accordingly pending successful >> results from a round of sanity building and testing. >> >> -Joe >> >> >> > > I don't want to drag b20 out any longer either, but I think it's > probably worth doing a final sync of HotSpot to hs17b16, which was > just announced: > http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001781.html > > If you recall, we brought in 6955813: Fix incorrect Oracle rebranding > headers from 6941466 already so we now have hs17b15 + that fix. I > think it would be better to have OpenJDK6 builds use a known HotSpot > tag, which syncing with hs17b16 would give us. It actually only means > bringing in one more real fix: 6953058: G1: A bigapp crashes with > SIGSEGV in compiled code > http://hg.openjdk.java.net/hsx/hsx17/master/rev/d53d91cb378c which > sounds important. > > What do you think? > Well, I suppose we can have *one* more sync with HotSpot for b20; you're approved to sync hs17b15 into OpenJDK 6. Thanks, -Joe From ahughes at redhat.com Thu Jun 17 01:41:49 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 17 Jun 2010 09:41:49 +0100 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <4C19D6B1.7070203@oracle.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> <4C129472.8060302@oracle.com> <4C16C4E2.8050202@oracle.com> <4C1820C2.90607@oracle.com> <4C19655F.3070604@oracle.com> <4C19D6B1.7070203@oracle.com> Message-ID: On 17 June 2010 09:02, Joe Darcy wrote: > Andrew John Hughes wrote: >> >> On 17 June 2010 00:59, Joe Darcy wrote: >> >>> >>> Andrew John Hughes wrote: >>> >>>> >>>> On 16 June 2010 01:54, Joe Darcy wrote: >>>> >>>> >>>>> >>>>> Hello. >>>>> >>>>> Andrew John Hughes wrote: >>>>> >>>>> >>>>>> >>>>>> On 15 June 2010 16:30, Andrew John Hughes wrote: >>>>>> >>>>>> >>>>>> >>>>>>> >>>>>>> On 15 June 2010 13:21, Andrew John Hughes wrote: >>>>>>> >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> On 15 June 2010 01:10, Joe Darcy wrote: >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> >>>>>>>>> Joe Darcy wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> >>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> On 11 June 2010 05:31, Joe Darcy wrote: >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> Joe Darcy wrote: >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> On 10 June 2010 02:02, Joe Darcy wrote: >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> Andrew Su wrote: >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> [snip] >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> changeset: ? 2208:0137b5857c63 >>>>>>>>>>>>>> parent: ? ? ?2183:90248595ec35 >>>>>>>>>>>>>> user: ? ? ? ?okutsu >>>>>>>>>>>>>> date: ? ? ? ?Wed Mar 10 14:32:47 2010 +0900 >>>>>>>>>>>>>> summary: ? ? 6932473: (tz) javazic produces incorrect >>>>>>>>>>>>>> SimpleTimeZone >>>>>>>>>>>>>> parameters with Sun<=7 >>>>>>>>>>>>>> >>>>>>>>>>>>>> Do these look ok? >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> Yes; also approved to go back. >>>>>>>>>>>>> >>>>>>>>>>>>> Since some Sun copyrighted files have leaked back in, we'll >>>>>>>>>>>>> done >>>>>>>>>>>>> another >>>>>>>>>>>>> pass to clean up any such files before b20 goes final. >>>>>>>>>>>>> >>>>>>>>>>>>> Thanks, >>>>>>>>>>>>> >>>>>>>>>>>>> -Joe >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> I think only a few more changes are needed to wrap up b20: >>>>>>>>>>>> >>>>>>>>>>>> * The various backports identified in the earlier message in >>>>>>>>>>>> this >>>>>>>>>>>> thread >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> Done now. >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> * Backport of 6957375 "java/net/ResponseCache getResponseCode >>>>>>>>>>>> and >>>>>>>>>>>> ResponseCacheTest fail after rebranding" >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> I see this come in while I was backporting; had to merge. >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> * One more pass of the Sun -> Oracle copyright script >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> There are some new Zero bugfixes that could be backported for b20 >>>>>>>>>>> (and >>>>>>>>>>> would allow us to drop the local copy in IcedTea6). >>>>>>>>>>> I've CCed Gary Benson who should be able to provide a list of bug >>>>>>>>>>> IDs >>>>>>>>>>> for backport. >>>>>>>>>>> >>>>>>>>>>> Other than that, we should be good to go with b20. >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>> >>>>>>>>>> Being able to drop the copy of Zero in IcedTea sounds worthwhile. >>>>>>>>>> ?After >>>>>>>>>> looking over the bugids and a webrev, I'd expect to approve those >>>>>>>>>> fixes >>>>>>>>>> going back. >>>>>>>>>> >>>>>>>>>> The Zero fixes are the last currently planned fixes for b20. >>>>>>>>>> >>>>>>>>>> -Joe >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>>> Hello. >>>>>>>>> >>>>>>>>> I'd like to get b20 wrapped up in the next day or two; please >>>>>>>>> provide >>>>>>>>> a >>>>>>>>> list >>>>>>>>> of the Zeros bug and I webrev so I can look them over. >>>>>>>>> >>>>>>>>> Thanks, >>>>>>>>> >>>>>>>>> -Joe >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> I was waiting for a response from Gary with the bug IDs, but looks >>>>>>>> like one isn't forthcoming. ?I'll compile a list from recent >>>>>>>> OpenJDK7 >>>>>>>> build drops and post that shortly. >>>>>>>> >>>>>>>> There's also >>>>>>>> >>>>>>>> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001750.html >>>>>>>> which causes build breakage with IcedTea. >>>>>>>> -- >>>>>>>> Andrew :-) >>>>>>>> >>>>>>>> Free Java Software Engineer >>>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>>> >>>>>>>> Support Free Java! >>>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>>> http://www.gnu.org/software/classpath >>>>>>>> http://openjdk.java.net >>>>>>>> >>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> b87 >>>>>>> == >>>>>>> >>>>>>> 6934089 ?Zero 32-bit/64kb page fix >>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/da06d1795d84 >>>>>>> >>>>>>> b90 >>>>>>> === >>>>>>> >>>>>>> 6939180 ?Zero locking fix >>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/747d26efc5fa >>>>>>> >>>>>>> b92 >>>>>>> === >>>>>>> >>>>>>> 6941224: Improved stack overflow handling for Zero >>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/f9271ff9d324 >>>>>>> >>>>>>> 6944503: Improved Zero crash dump >>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/c544d979f886 >>>>>>> >>>>>>> 6944473: 6941224 misses new files >>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/aa9c266de52a >>>>>>> >>>>>>> >>>>>>> >>>>> >>>>> These are hs18 Zero fixes. ?hs18 also includes 6944028 "6940701 broke >>>>> Zero," >>>>> but that fix is not needed in OpenJDK 6 yet since we don't have the fix >>>>> for >>>>> 6940701 from hs18, as you note below. >>>>> >>>>> Approved to go back. >>>>> >>>>> >>>>> >>>>> >>>>>>> >>>>>>> b94 >>>>>>> === >>>>>>> >>>>>>> 6939182: Zero JNI handles fix >>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/0c5b3cf3c1f5 >>>>>>> >>>>>>> 6950178: Zero stack improvements >>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/348346af6676 >>>>>>> >>>>>>> 6950617: Zero/Shark interface updates >>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/6cfbdb113e52 >>>>>>> >>>>>>> 6951784: Zero deoptimizer changes >>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/22af4ce8dba1 >>>>>>> >>>>>>> >>>>>>> >>>>> >>>>> All of these are in hs19 and are approved to go back. ?The bug >>>>> >>>>> 6960550 Missing semicolon in Zero >>>>> >>>>> is "fixed" in hs19, but not yet integrated. ?At your option, you may >>>>> apply >>>>> this fix to OpenJDK 6 now too. >>>>> >>>>> >>>>> >>>> >>>> Ok, I only looked at integrated fixes. ?But this fix looks simple >>>> enough and as you approve, I've backported it too :-) >>>> >>>> I'm surprised it even builds without the semi-colon but I guess that's >>>> C++ for you ;-) >>>> >>>> >>>> >>>>>>> >>>>>>> b96 >>>>>>> === >>>>>>> >>>>>>> 6951686: Using large pages on Linux prevents zero based compressed >>>>>>> oops >>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/79bf863697eb >>>>>>> >>>>>>> Here's the webrev for those: >>>>>>> http://cr.openjdk.java.net/~andrew/zero/webrev.05/ and the previous >>>>>>> Nimbus one: http://cr.openjdk.java.net/~andrew/nimbus/webrev.07/ >>>>>>> >>>>>>> >>>>>>> >>>>> >>>>> I approve the -source 6/-target 6 changes for Nimbus; I don't think a >>>>> wholesale change to -source 6/-target 6 is necessary. >>>>> >>>>> Please use 6961536 "Nimbus code using @Override break OpenJDK/IcedBuild >>>>> on >>>>> ecj" for the push. >>>>> >>>>> >>>>> >>>>>>> >>>>>>> The following were skipped due to the referenced changesets not being >>>>>>> in OpenJDK6: >>>>>>> >>>>>>> 6939731: JSR 292 Zero build fix after 6934494 >>>>>>> 6944028: ? ? ? ? 6940701 broke Zero >>>>>>> 6949830: 6939134 broke Zero >>>>>>> >>>>>>> 6949423: remove tagged stack interpreter for Zero >>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/68d6683eaef7 >>>>>>> Depends on: >>>>>>> changeset: ? 1426:2338d41fbd81 >>>>>>> user: ? ? ? ?twisti >>>>>>> date: ? ? ? ?Fri Apr 30 08:37:24 2010 -0700 >>>>>>> summary: ? ? 6943304: remove tagged stack interpreter >>>>>>> >>>>>>> >>>>>>> >>>>> >>>>> I've checked the bug database and all the Zero fixes in hs18 and hs19 >>>>> are >>>>> somehow addressed in this email thread. >>>>> >>>>> >>>>> >>>>>>> >>>>>>> -- >>>>>>> Andrew :-) >>>>>>> >>>>>>> Free Java Software Engineer >>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>> >>>>>>> Support Free Java! >>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>> http://www.gnu.org/software/classpath >>>>>>> http://openjdk.java.net >>>>>>> >>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> Scratch 6951686; the mention of 'zero' mislead me. ?It's not a Zero >>>>>> fix. >>>>>> >>>>>> Let me know when I can push the rest, >>>>>> >>>>>> Cheers, >>>>>> >>>>>> >>>>>> >>>>> >>>>> Good to push! >>>>> >>>>> >>>>> >>>> >>>> All pushed! >>>> >>>> >>>> >>>>> >>>>> Thanks, >>>>> >>>>> -Joe >>>>> >>>>> >>>>> >>>> >>>> Thanks, >>>> >>>> >>> >>> Thanks for the pushes! >>> >>> With the integration of 6961870 "More rebranding fixes for >>> templates/gpl-*-header files," which I just pushed, I believe that is the >>> last change for b20. ?I will tag the repos accordingly pending successful >>> results from a round of sanity building and testing. >>> >>> -Joe >>> >>> >>> >> >> I don't want to drag b20 out any longer either, but I think it's >> probably worth doing a final sync of HotSpot to hs17b16, which was >> just announced: >> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001781.html >> >> If you recall, we brought in 6955813: Fix incorrect Oracle rebranding >> headers from 6941466 already so we now have hs17b15 + that fix. ?I >> think it would be better to have OpenJDK6 builds use a known HotSpot >> tag, which syncing with hs17b16 would give us. ?It actually only means >> bringing in one more real fix: 6953058: G1: A bigapp crashes with >> SIGSEGV in compiled code >> http://hg.openjdk.java.net/hsx/hsx17/master/rev/d53d91cb378c which >> sounds important. >> >> What do you think? >> > > Well, I suppose we can have *one* more sync with HotSpot for b20; you're > approved to sync hs17b15 into OpenJDK 6. > > Thanks, > > -Joe > Thanks! Done. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Thu Jun 17 01:41:41 2010 From: ahughes at redhat.com (ahughes at redhat.com) Date: Thu, 17 Jun 2010 08:41:41 +0000 Subject: hg: jdk6/jdk6/hotspot: 5 new changesets Message-ID: <20100617084154.453E247309@hg.openjdk.java.net> Changeset: d53d91cb378c Author: johnc Date: 2010-06-07 17:46 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/d53d91cb378c 6953058: G1: A bigapp crashes with SIGSEGV in compiled code Summary: In C2's G1 post write barrier, the loads of the buffer and index fields from the DirtyCardQueue structure may be moved across a safepoint. Use the current value of "control" in the C2 IR to limit how far these loads can move. Reviewed-by: never, iveresov, kvn ! src/share/vm/opto/graphKit.cpp Changeset: e835ff93bcc1 Author: trims Date: 2010-06-10 15:58 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/e835ff93bcc1 6960390: Bump the HS17 build number to 16 Summary: Update the HS17 build number to 16 Reviewed-by: jcoomes ! make/hotspot_version Changeset: 5944e4ff6d31 Author: trims Date: 2010-06-10 16:02 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/5944e4ff6d31 6960393: Fix misplaced b15 hg tag for hs17 Summary: Change where the hs17-b15 tag was placed Reviewed-by: jcoomes ! .hgtags Changeset: 47d78593b370 Author: trims Date: 2010-06-10 16:03 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/47d78593b370 Added tag hs17-b15 for changeset 193a468093fa ! .hgtags Changeset: 37bdd3bf03b3 Author: andrew Date: 2010-06-17 09:41 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/37bdd3bf03b3 Merge ! .hgtags ! make/hotspot_version ! src/share/vm/opto/graphKit.cpp From ahughes at redhat.com Thu Jun 17 02:20:32 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 17 Jun 2010 10:20:32 +0100 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> <4C129472.8060302@oracle.com> <4C16C4E2.8050202@oracle.com> <4C1820C2.90607@oracle.com> <4C19655F.3070604@oracle.com> <4C19D6B1.7070203@oracle.com> Message-ID: On 17 June 2010 09:41, Andrew John Hughes wrote: > On 17 June 2010 09:02, Joe Darcy wrote: >> Andrew John Hughes wrote: >>> >>> On 17 June 2010 00:59, Joe Darcy wrote: >>> >>>> >>>> Andrew John Hughes wrote: >>>> >>>>> >>>>> On 16 June 2010 01:54, Joe Darcy wrote: >>>>> >>>>> >>>>>> >>>>>> Hello. >>>>>> >>>>>> Andrew John Hughes wrote: >>>>>> >>>>>> >>>>>>> >>>>>>> On 15 June 2010 16:30, Andrew John Hughes wrote: >>>>>>> >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> On 15 June 2010 13:21, Andrew John Hughes wrote: >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> >>>>>>>>> On 15 June 2010 01:10, Joe Darcy wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> >>>>>>>>>> Joe Darcy wrote: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> On 11 June 2010 05:31, Joe Darcy wrote: >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> Joe Darcy wrote: >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> On 10 June 2010 02:02, Joe Darcy wrote: >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Andrew Su wrote: >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> [snip] >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> changeset: ? 2208:0137b5857c63 >>>>>>>>>>>>>>> parent: ? ? ?2183:90248595ec35 >>>>>>>>>>>>>>> user: ? ? ? ?okutsu >>>>>>>>>>>>>>> date: ? ? ? ?Wed Mar 10 14:32:47 2010 +0900 >>>>>>>>>>>>>>> summary: ? ? 6932473: (tz) javazic produces incorrect >>>>>>>>>>>>>>> SimpleTimeZone >>>>>>>>>>>>>>> parameters with Sun<=7 >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> Do these look ok? >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> Yes; also approved to go back. >>>>>>>>>>>>>> >>>>>>>>>>>>>> Since some Sun copyrighted files have leaked back in, we'll >>>>>>>>>>>>>> done >>>>>>>>>>>>>> another >>>>>>>>>>>>>> pass to clean up any such files before b20 goes final. >>>>>>>>>>>>>> >>>>>>>>>>>>>> Thanks, >>>>>>>>>>>>>> >>>>>>>>>>>>>> -Joe >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> I think only a few more changes are needed to wrap up b20: >>>>>>>>>>>>> >>>>>>>>>>>>> * The various backports identified in the earlier message in >>>>>>>>>>>>> this >>>>>>>>>>>>> thread >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> Done now. >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> * Backport of 6957375 "java/net/ResponseCache getResponseCode >>>>>>>>>>>>> and >>>>>>>>>>>>> ResponseCacheTest fail after rebranding" >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> I see this come in while I was backporting; had to merge. >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> * One more pass of the Sun -> Oracle copyright script >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> There are some new Zero bugfixes that could be backported for b20 >>>>>>>>>>>> (and >>>>>>>>>>>> would allow us to drop the local copy in IcedTea6). >>>>>>>>>>>> I've CCed Gary Benson who should be able to provide a list of bug >>>>>>>>>>>> IDs >>>>>>>>>>>> for backport. >>>>>>>>>>>> >>>>>>>>>>>> Other than that, we should be good to go with b20. >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> Being able to drop the copy of Zero in IcedTea sounds worthwhile. >>>>>>>>>>> ?After >>>>>>>>>>> looking over the bugids and a webrev, I'd expect to approve those >>>>>>>>>>> fixes >>>>>>>>>>> going back. >>>>>>>>>>> >>>>>>>>>>> The Zero fixes are the last currently planned fixes for b20. >>>>>>>>>>> >>>>>>>>>>> -Joe >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>> >>>>>>>>>> Hello. >>>>>>>>>> >>>>>>>>>> I'd like to get b20 wrapped up in the next day or two; please >>>>>>>>>> provide >>>>>>>>>> a >>>>>>>>>> list >>>>>>>>>> of the Zeros bug and I webrev so I can look them over. >>>>>>>>>> >>>>>>>>>> Thanks, >>>>>>>>>> >>>>>>>>>> -Joe >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>>> I was waiting for a response from Gary with the bug IDs, but looks >>>>>>>>> like one isn't forthcoming. ?I'll compile a list from recent >>>>>>>>> OpenJDK7 >>>>>>>>> build drops and post that shortly. >>>>>>>>> >>>>>>>>> There's also >>>>>>>>> >>>>>>>>> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001750.html >>>>>>>>> which causes build breakage with IcedTea. >>>>>>>>> -- >>>>>>>>> Andrew :-) >>>>>>>>> >>>>>>>>> Free Java Software Engineer >>>>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>>>> >>>>>>>>> Support Free Java! >>>>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>>>> http://www.gnu.org/software/classpath >>>>>>>>> http://openjdk.java.net >>>>>>>>> >>>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> b87 >>>>>>>> == >>>>>>>> >>>>>>>> 6934089 ?Zero 32-bit/64kb page fix >>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/da06d1795d84 >>>>>>>> >>>>>>>> b90 >>>>>>>> === >>>>>>>> >>>>>>>> 6939180 ?Zero locking fix >>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/747d26efc5fa >>>>>>>> >>>>>>>> b92 >>>>>>>> === >>>>>>>> >>>>>>>> 6941224: Improved stack overflow handling for Zero >>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/f9271ff9d324 >>>>>>>> >>>>>>>> 6944503: Improved Zero crash dump >>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/c544d979f886 >>>>>>>> >>>>>>>> 6944473: 6941224 misses new files >>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/aa9c266de52a >>>>>>>> >>>>>>>> >>>>>>>> >>>>>> >>>>>> These are hs18 Zero fixes. ?hs18 also includes 6944028 "6940701 broke >>>>>> Zero," >>>>>> but that fix is not needed in OpenJDK 6 yet since we don't have the fix >>>>>> for >>>>>> 6940701 from hs18, as you note below. >>>>>> >>>>>> Approved to go back. >>>>>> >>>>>> >>>>>> >>>>>> >>>>>>>> >>>>>>>> b94 >>>>>>>> === >>>>>>>> >>>>>>>> 6939182: Zero JNI handles fix >>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/0c5b3cf3c1f5 >>>>>>>> >>>>>>>> 6950178: Zero stack improvements >>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/348346af6676 >>>>>>>> >>>>>>>> 6950617: Zero/Shark interface updates >>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/6cfbdb113e52 >>>>>>>> >>>>>>>> 6951784: Zero deoptimizer changes >>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/22af4ce8dba1 >>>>>>>> >>>>>>>> >>>>>>>> >>>>>> >>>>>> All of these are in hs19 and are approved to go back. ?The bug >>>>>> >>>>>> 6960550 Missing semicolon in Zero >>>>>> >>>>>> is "fixed" in hs19, but not yet integrated. ?At your option, you may >>>>>> apply >>>>>> this fix to OpenJDK 6 now too. >>>>>> >>>>>> >>>>>> >>>>> >>>>> Ok, I only looked at integrated fixes. ?But this fix looks simple >>>>> enough and as you approve, I've backported it too :-) >>>>> >>>>> I'm surprised it even builds without the semi-colon but I guess that's >>>>> C++ for you ;-) >>>>> >>>>> >>>>> >>>>>>>> >>>>>>>> b96 >>>>>>>> === >>>>>>>> >>>>>>>> 6951686: Using large pages on Linux prevents zero based compressed >>>>>>>> oops >>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/79bf863697eb >>>>>>>> >>>>>>>> Here's the webrev for those: >>>>>>>> http://cr.openjdk.java.net/~andrew/zero/webrev.05/ and the previous >>>>>>>> Nimbus one: http://cr.openjdk.java.net/~andrew/nimbus/webrev.07/ >>>>>>>> >>>>>>>> >>>>>>>> >>>>>> >>>>>> I approve the -source 6/-target 6 changes for Nimbus; I don't think a >>>>>> wholesale change to -source 6/-target 6 is necessary. >>>>>> >>>>>> Please use 6961536 "Nimbus code using @Override break OpenJDK/IcedBuild >>>>>> on >>>>>> ecj" for the push. >>>>>> >>>>>> >>>>>> >>>>>>>> >>>>>>>> The following were skipped due to the referenced changesets not being >>>>>>>> in OpenJDK6: >>>>>>>> >>>>>>>> 6939731: JSR 292 Zero build fix after 6934494 >>>>>>>> 6944028: ? ? ? ? 6940701 broke Zero >>>>>>>> 6949830: 6939134 broke Zero >>>>>>>> >>>>>>>> 6949423: remove tagged stack interpreter for Zero >>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/68d6683eaef7 >>>>>>>> Depends on: >>>>>>>> changeset: ? 1426:2338d41fbd81 >>>>>>>> user: ? ? ? ?twisti >>>>>>>> date: ? ? ? ?Fri Apr 30 08:37:24 2010 -0700 >>>>>>>> summary: ? ? 6943304: remove tagged stack interpreter >>>>>>>> >>>>>>>> >>>>>>>> >>>>>> >>>>>> I've checked the bug database and all the Zero fixes in hs18 and hs19 >>>>>> are >>>>>> somehow addressed in this email thread. >>>>>> >>>>>> >>>>>> >>>>>>>> >>>>>>>> -- >>>>>>>> Andrew :-) >>>>>>>> >>>>>>>> Free Java Software Engineer >>>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>>> >>>>>>>> Support Free Java! >>>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>>> http://www.gnu.org/software/classpath >>>>>>>> http://openjdk.java.net >>>>>>>> >>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> Scratch 6951686; the mention of 'zero' mislead me. ?It's not a Zero >>>>>>> fix. >>>>>>> >>>>>>> Let me know when I can push the rest, >>>>>>> >>>>>>> Cheers, >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> Good to push! >>>>>> >>>>>> >>>>>> >>>>> >>>>> All pushed! >>>>> >>>>> >>>>> >>>>>> >>>>>> Thanks, >>>>>> >>>>>> -Joe >>>>>> >>>>>> >>>>>> >>>>> >>>>> Thanks, >>>>> >>>>> >>>> >>>> Thanks for the pushes! >>>> >>>> With the integration of 6961870 "More rebranding fixes for >>>> templates/gpl-*-header files," which I just pushed, I believe that is the >>>> last change for b20. ?I will tag the repos accordingly pending successful >>>> results from a round of sanity building and testing. >>>> >>>> -Joe >>>> >>>> >>>> >>> >>> I don't want to drag b20 out any longer either, but I think it's >>> probably worth doing a final sync of HotSpot to hs17b16, which was >>> just announced: >>> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001781.html >>> >>> If you recall, we brought in 6955813: Fix incorrect Oracle rebranding >>> headers from 6941466 already so we now have hs17b15 + that fix. ?I >>> think it would be better to have OpenJDK6 builds use a known HotSpot >>> tag, which syncing with hs17b16 would give us. ?It actually only means >>> bringing in one more real fix: 6953058: G1: A bigapp crashes with >>> SIGSEGV in compiled code >>> http://hg.openjdk.java.net/hsx/hsx17/master/rev/d53d91cb378c which >>> sounds important. >>> >>> What do you think? >>> >> >> Well, I suppose we can have *one* more sync with HotSpot for b20; you're >> approved to sync hs17b15 into OpenJDK 6. >> >> Thanks, >> >> -Joe >> > > Thanks! Done. > -- > Andrew :-) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 > Impressively quick reply btw -- didn't you get this about 1am over there? -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Thu Jun 17 03:32:01 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 17 Jun 2010 11:32:01 +0100 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> <4C129472.8060302@oracle.com> <4C16C4E2.8050202@oracle.com> <4C1820C2.90607@oracle.com> <4C19655F.3070604@oracle.com> <4C19D6B1.7070203@oracle.com> Message-ID: On 17 June 2010 10:20, Andrew John Hughes wrote: > On 17 June 2010 09:41, Andrew John Hughes wrote: >> On 17 June 2010 09:02, Joe Darcy wrote: >>> Andrew John Hughes wrote: >>>> >>>> On 17 June 2010 00:59, Joe Darcy wrote: >>>> >>>>> >>>>> Andrew John Hughes wrote: >>>>> >>>>>> >>>>>> On 16 June 2010 01:54, Joe Darcy wrote: >>>>>> >>>>>> >>>>>>> >>>>>>> Hello. >>>>>>> >>>>>>> Andrew John Hughes wrote: >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> On 15 June 2010 16:30, Andrew John Hughes wrote: >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> >>>>>>>>> On 15 June 2010 13:21, Andrew John Hughes wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> >>>>>>>>>> On 15 June 2010 01:10, Joe Darcy wrote: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> Joe Darcy wrote: >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> On 11 June 2010 05:31, Joe Darcy wrote: >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> Joe Darcy wrote: >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> On 10 June 2010 02:02, Joe Darcy wrote: >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> Andrew Su wrote: >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> [snip] >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> changeset: ? 2208:0137b5857c63 >>>>>>>>>>>>>>>> parent: ? ? ?2183:90248595ec35 >>>>>>>>>>>>>>>> user: ? ? ? ?okutsu >>>>>>>>>>>>>>>> date: ? ? ? ?Wed Mar 10 14:32:47 2010 +0900 >>>>>>>>>>>>>>>> summary: ? ? 6932473: (tz) javazic produces incorrect >>>>>>>>>>>>>>>> SimpleTimeZone >>>>>>>>>>>>>>>> parameters with Sun<=7 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Do these look ok? >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> Yes; also approved to go back. >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> Since some Sun copyrighted files have leaked back in, we'll >>>>>>>>>>>>>>> done >>>>>>>>>>>>>>> another >>>>>>>>>>>>>>> pass to clean up any such files before b20 goes final. >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> Thanks, >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> -Joe >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> I think only a few more changes are needed to wrap up b20: >>>>>>>>>>>>>> >>>>>>>>>>>>>> * The various backports identified in the earlier message in >>>>>>>>>>>>>> this >>>>>>>>>>>>>> thread >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> Done now. >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> * Backport of 6957375 "java/net/ResponseCache getResponseCode >>>>>>>>>>>>>> and >>>>>>>>>>>>>> ResponseCacheTest fail after rebranding" >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> I see this come in while I was backporting; had to merge. >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> * One more pass of the Sun -> Oracle copyright script >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> There are some new Zero bugfixes that could be backported for b20 >>>>>>>>>>>>> (and >>>>>>>>>>>>> would allow us to drop the local copy in IcedTea6). >>>>>>>>>>>>> I've CCed Gary Benson who should be able to provide a list of bug >>>>>>>>>>>>> IDs >>>>>>>>>>>>> for backport. >>>>>>>>>>>>> >>>>>>>>>>>>> Other than that, we should be good to go with b20. >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> Being able to drop the copy of Zero in IcedTea sounds worthwhile. >>>>>>>>>>>> ?After >>>>>>>>>>>> looking over the bugids and a webrev, I'd expect to approve those >>>>>>>>>>>> fixes >>>>>>>>>>>> going back. >>>>>>>>>>>> >>>>>>>>>>>> The Zero fixes are the last currently planned fixes for b20. >>>>>>>>>>>> >>>>>>>>>>>> -Joe >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> Hello. >>>>>>>>>>> >>>>>>>>>>> I'd like to get b20 wrapped up in the next day or two; please >>>>>>>>>>> provide >>>>>>>>>>> a >>>>>>>>>>> list >>>>>>>>>>> of the Zeros bug and I webrev so I can look them over. >>>>>>>>>>> >>>>>>>>>>> Thanks, >>>>>>>>>>> >>>>>>>>>>> -Joe >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>> >>>>>>>>>> I was waiting for a response from Gary with the bug IDs, but looks >>>>>>>>>> like one isn't forthcoming. ?I'll compile a list from recent >>>>>>>>>> OpenJDK7 >>>>>>>>>> build drops and post that shortly. >>>>>>>>>> >>>>>>>>>> There's also >>>>>>>>>> >>>>>>>>>> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001750.html >>>>>>>>>> which causes build breakage with IcedTea. >>>>>>>>>> -- >>>>>>>>>> Andrew :-) >>>>>>>>>> >>>>>>>>>> Free Java Software Engineer >>>>>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>>>>> >>>>>>>>>> Support Free Java! >>>>>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>>>>> http://www.gnu.org/software/classpath >>>>>>>>>> http://openjdk.java.net >>>>>>>>>> >>>>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>>> b87 >>>>>>>>> == >>>>>>>>> >>>>>>>>> 6934089 ?Zero 32-bit/64kb page fix >>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/da06d1795d84 >>>>>>>>> >>>>>>>>> b90 >>>>>>>>> === >>>>>>>>> >>>>>>>>> 6939180 ?Zero locking fix >>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/747d26efc5fa >>>>>>>>> >>>>>>>>> b92 >>>>>>>>> === >>>>>>>>> >>>>>>>>> 6941224: Improved stack overflow handling for Zero >>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/f9271ff9d324 >>>>>>>>> >>>>>>>>> 6944503: Improved Zero crash dump >>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/c544d979f886 >>>>>>>>> >>>>>>>>> 6944473: 6941224 misses new files >>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/aa9c266de52a >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>> >>>>>>> These are hs18 Zero fixes. ?hs18 also includes 6944028 "6940701 broke >>>>>>> Zero," >>>>>>> but that fix is not needed in OpenJDK 6 yet since we don't have the fix >>>>>>> for >>>>>>> 6940701 from hs18, as you note below. >>>>>>> >>>>>>> Approved to go back. >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>>>> >>>>>>>>> b94 >>>>>>>>> === >>>>>>>>> >>>>>>>>> 6939182: Zero JNI handles fix >>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/0c5b3cf3c1f5 >>>>>>>>> >>>>>>>>> 6950178: Zero stack improvements >>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/348346af6676 >>>>>>>>> >>>>>>>>> 6950617: Zero/Shark interface updates >>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/6cfbdb113e52 >>>>>>>>> >>>>>>>>> 6951784: Zero deoptimizer changes >>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/22af4ce8dba1 >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>> >>>>>>> All of these are in hs19 and are approved to go back. ?The bug >>>>>>> >>>>>>> 6960550 Missing semicolon in Zero >>>>>>> >>>>>>> is "fixed" in hs19, but not yet integrated. ?At your option, you may >>>>>>> apply >>>>>>> this fix to OpenJDK 6 now too. >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> Ok, I only looked at integrated fixes. ?But this fix looks simple >>>>>> enough and as you approve, I've backported it too :-) >>>>>> >>>>>> I'm surprised it even builds without the semi-colon but I guess that's >>>>>> C++ for you ;-) >>>>>> >>>>>> >>>>>> >>>>>>>>> >>>>>>>>> b96 >>>>>>>>> === >>>>>>>>> >>>>>>>>> 6951686: Using large pages on Linux prevents zero based compressed >>>>>>>>> oops >>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/79bf863697eb >>>>>>>>> >>>>>>>>> Here's the webrev for those: >>>>>>>>> http://cr.openjdk.java.net/~andrew/zero/webrev.05/ and the previous >>>>>>>>> Nimbus one: http://cr.openjdk.java.net/~andrew/nimbus/webrev.07/ >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>> >>>>>>> I approve the -source 6/-target 6 changes for Nimbus; I don't think a >>>>>>> wholesale change to -source 6/-target 6 is necessary. >>>>>>> >>>>>>> Please use 6961536 "Nimbus code using @Override break OpenJDK/IcedBuild >>>>>>> on >>>>>>> ecj" for the push. >>>>>>> >>>>>>> >>>>>>> >>>>>>>>> >>>>>>>>> The following were skipped due to the referenced changesets not being >>>>>>>>> in OpenJDK6: >>>>>>>>> >>>>>>>>> 6939731: JSR 292 Zero build fix after 6934494 >>>>>>>>> 6944028: ? ? ? ? 6940701 broke Zero >>>>>>>>> 6949830: 6939134 broke Zero >>>>>>>>> >>>>>>>>> 6949423: remove tagged stack interpreter for Zero >>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/68d6683eaef7 >>>>>>>>> Depends on: >>>>>>>>> changeset: ? 1426:2338d41fbd81 >>>>>>>>> user: ? ? ? ?twisti >>>>>>>>> date: ? ? ? ?Fri Apr 30 08:37:24 2010 -0700 >>>>>>>>> summary: ? ? 6943304: remove tagged stack interpreter >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>> >>>>>>> I've checked the bug database and all the Zero fixes in hs18 and hs19 >>>>>>> are >>>>>>> somehow addressed in this email thread. >>>>>>> >>>>>>> >>>>>>> >>>>>>>>> >>>>>>>>> -- >>>>>>>>> Andrew :-) >>>>>>>>> >>>>>>>>> Free Java Software Engineer >>>>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>>>> >>>>>>>>> Support Free Java! >>>>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>>>> http://www.gnu.org/software/classpath >>>>>>>>> http://openjdk.java.net >>>>>>>>> >>>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> Scratch 6951686; the mention of 'zero' mislead me. ?It's not a Zero >>>>>>>> fix. >>>>>>>> >>>>>>>> Let me know when I can push the rest, >>>>>>>> >>>>>>>> Cheers, >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> Good to push! >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> All pushed! >>>>>> >>>>>> >>>>>> >>>>>>> >>>>>>> Thanks, >>>>>>> >>>>>>> -Joe >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> Thanks, >>>>>> >>>>>> >>>>> >>>>> Thanks for the pushes! >>>>> >>>>> With the integration of 6961870 "More rebranding fixes for >>>>> templates/gpl-*-header files," which I just pushed, I believe that is the >>>>> last change for b20. ?I will tag the repos accordingly pending successful >>>>> results from a round of sanity building and testing. >>>>> >>>>> -Joe >>>>> >>>>> >>>>> >>>> >>>> I don't want to drag b20 out any longer either, but I think it's >>>> probably worth doing a final sync of HotSpot to hs17b16, which was >>>> just announced: >>>> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001781.html >>>> >>>> If you recall, we brought in 6955813: Fix incorrect Oracle rebranding >>>> headers from 6941466 already so we now have hs17b15 + that fix. ?I >>>> think it would be better to have OpenJDK6 builds use a known HotSpot >>>> tag, which syncing with hs17b16 would give us. ?It actually only means >>>> bringing in one more real fix: 6953058: G1: A bigapp crashes with >>>> SIGSEGV in compiled code >>>> http://hg.openjdk.java.net/hsx/hsx17/master/rev/d53d91cb378c which >>>> sounds important. >>>> >>>> What do you think? >>>> >>> >>> Well, I suppose we can have *one* more sync with HotSpot for b20; you're >>> approved to sync hs17b15 into OpenJDK 6. >>> >>> Thanks, >>> >>> -Joe >>> >> >> Thanks! Done. >> -- >> Andrew :-) >> >> Free Java Software Engineer >> Red Hat, Inc. (http://www.redhat.com) >> >> Support Free Java! >> Contribute to GNU Classpath and the OpenJDK >> http://www.gnu.org/software/classpath >> http://openjdk.java.net >> >> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >> > > Impressively quick reply btw -- didn't you get this about 1am over there? > -- > Andrew :-) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 > In comparing Zero in OpenJDK6 against the version in IcedTea, I found that a couple of Sun Microsystems copyrights have sneaked back in: src/cpu/zero/vm/stack_zero.cpp: * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. src/cpu/zero/vm/stack_zero.cpp: * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, src/cpu/zero/vm/stack_zero.inline.hpp: * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. src/cpu/zero/vm/stack_zero.inline.hpp: * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From joe.darcy at oracle.com Thu Jun 17 09:38:16 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Thu, 17 Jun 2010 09:38:16 -0700 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> <4C129472.8060302@oracle.com> <4C16C4E2.8050202@oracle.com> <4C1820C2.90607@oracle.com> <4C19655F.3070604@oracle.com> <4C19D6B1.7070203@oracle.com> Message-ID: <4C1A4F78.2040007@oracle.com> Andrew John Hughes wrote: > On 17 June 2010 10:20, Andrew John Hughes wrote: > >> On 17 June 2010 09:41, Andrew John Hughes wrote: >> >>> On 17 June 2010 09:02, Joe Darcy wrote: >>> >>>> Andrew John Hughes wrote: >>>> >>>>> On 17 June 2010 00:59, Joe Darcy wrote: >>>>> >>>>> >>>>>> Andrew John Hughes wrote: >>>>>> >>>>>> >>>>>>> On 16 June 2010 01:54, Joe Darcy wrote: >>>>>>> >>>>>>> >>>>>>> >>>>>>>> Hello. >>>>>>>> >>>>>>>> Andrew John Hughes wrote: >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> On 15 June 2010 16:30, Andrew John Hughes wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> On 15 June 2010 13:21, Andrew John Hughes wrote: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>> On 15 June 2010 01:10, Joe Darcy wrote: >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>>> Joe Darcy wrote: >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>>> On 11 June 2010 05:31, Joe Darcy wrote: >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>>> Joe Darcy wrote: >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> On 10 June 2010 02:02, Joe Darcy wrote: >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> Andrew Su wrote: >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>> [snip] >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> changeset: 2208:0137b5857c63 >>>>>>>>>>>>>>>>> parent: 2183:90248595ec35 >>>>>>>>>>>>>>>>> user: okutsu >>>>>>>>>>>>>>>>> date: Wed Mar 10 14:32:47 2010 +0900 >>>>>>>>>>>>>>>>> summary: 6932473: (tz) javazic produces incorrect >>>>>>>>>>>>>>>>> SimpleTimeZone >>>>>>>>>>>>>>>>> parameters with Sun<=7 >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> Do these look ok? >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Yes; also approved to go back. >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Since some Sun copyrighted files have leaked back in, we'll >>>>>>>>>>>>>>>> done >>>>>>>>>>>>>>>> another >>>>>>>>>>>>>>>> pass to clean up any such files before b20 goes final. >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Thanks, >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> -Joe >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>> I think only a few more changes are needed to wrap up b20: >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> * The various backports identified in the earlier message in >>>>>>>>>>>>>>> this >>>>>>>>>>>>>>> thread >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>> Done now. >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>>> * Backport of 6957375 "java/net/ResponseCache getResponseCode >>>>>>>>>>>>>>> and >>>>>>>>>>>>>>> ResponseCacheTest fail after rebranding" >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>> I see this come in while I was backporting; had to merge. >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>>> * One more pass of the Sun -> Oracle copyright script >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>> There are some new Zero bugfixes that could be backported for b20 >>>>>>>>>>>>>> (and >>>>>>>>>>>>>> would allow us to drop the local copy in IcedTea6). >>>>>>>>>>>>>> I've CCed Gary Benson who should be able to provide a list of bug >>>>>>>>>>>>>> IDs >>>>>>>>>>>>>> for backport. >>>>>>>>>>>>>> >>>>>>>>>>>>>> Other than that, we should be good to go with b20. >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>> Being able to drop the copy of Zero in IcedTea sounds worthwhile. >>>>>>>>>>>>> After >>>>>>>>>>>>> looking over the bugids and a webrev, I'd expect to approve those >>>>>>>>>>>>> fixes >>>>>>>>>>>>> going back. >>>>>>>>>>>>> >>>>>>>>>>>>> The Zero fixes are the last currently planned fixes for b20. >>>>>>>>>>>>> >>>>>>>>>>>>> -Joe >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>> Hello. >>>>>>>>>>>> >>>>>>>>>>>> I'd like to get b20 wrapped up in the next day or two; please >>>>>>>>>>>> provide >>>>>>>>>>>> a >>>>>>>>>>>> list >>>>>>>>>>>> of the Zeros bug and I webrev so I can look them over. >>>>>>>>>>>> >>>>>>>>>>>> Thanks, >>>>>>>>>>>> >>>>>>>>>>>> -Joe >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>> I was waiting for a response from Gary with the bug IDs, but looks >>>>>>>>>>> like one isn't forthcoming. I'll compile a list from recent >>>>>>>>>>> OpenJDK7 >>>>>>>>>>> build drops and post that shortly. >>>>>>>>>>> >>>>>>>>>>> There's also >>>>>>>>>>> >>>>>>>>>>> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001750.html >>>>>>>>>>> which causes build breakage with IcedTea. >>>>>>>>>>> -- >>>>>>>>>>> Andrew :-) >>>>>>>>>>> >>>>>>>>>>> Free Java Software Engineer >>>>>>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>>>>>> >>>>>>>>>>> Support Free Java! >>>>>>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>>>>>> http://www.gnu.org/software/classpath >>>>>>>>>>> http://openjdk.java.net >>>>>>>>>>> >>>>>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>> b87 >>>>>>>>>> == >>>>>>>>>> >>>>>>>>>> 6934089 Zero 32-bit/64kb page fix >>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/da06d1795d84 >>>>>>>>>> >>>>>>>>>> b90 >>>>>>>>>> === >>>>>>>>>> >>>>>>>>>> 6939180 Zero locking fix >>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/747d26efc5fa >>>>>>>>>> >>>>>>>>>> b92 >>>>>>>>>> === >>>>>>>>>> >>>>>>>>>> 6941224: Improved stack overflow handling for Zero >>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/f9271ff9d324 >>>>>>>>>> >>>>>>>>>> 6944503: Improved Zero crash dump >>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/c544d979f886 >>>>>>>>>> >>>>>>>>>> 6944473: 6941224 misses new files >>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/aa9c266de52a >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>> These are hs18 Zero fixes. hs18 also includes 6944028 "6940701 broke >>>>>>>> Zero," >>>>>>>> but that fix is not needed in OpenJDK 6 yet since we don't have the fix >>>>>>>> for >>>>>>>> 6940701 from hs18, as you note below. >>>>>>>> >>>>>>>> Approved to go back. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>>> b94 >>>>>>>>>> === >>>>>>>>>> >>>>>>>>>> 6939182: Zero JNI handles fix >>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/0c5b3cf3c1f5 >>>>>>>>>> >>>>>>>>>> 6950178: Zero stack improvements >>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/348346af6676 >>>>>>>>>> >>>>>>>>>> 6950617: Zero/Shark interface updates >>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/6cfbdb113e52 >>>>>>>>>> >>>>>>>>>> 6951784: Zero deoptimizer changes >>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/22af4ce8dba1 >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>> All of these are in hs19 and are approved to go back. The bug >>>>>>>> >>>>>>>> 6960550 Missing semicolon in Zero >>>>>>>> >>>>>>>> is "fixed" in hs19, but not yet integrated. At your option, you may >>>>>>>> apply >>>>>>>> this fix to OpenJDK 6 now too. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> Ok, I only looked at integrated fixes. But this fix looks simple >>>>>>> enough and as you approve, I've backported it too :-) >>>>>>> >>>>>>> I'm surprised it even builds without the semi-colon but I guess that's >>>>>>> C++ for you ;-) >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>>>>> b96 >>>>>>>>>> === >>>>>>>>>> >>>>>>>>>> 6951686: Using large pages on Linux prevents zero based compressed >>>>>>>>>> oops >>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/79bf863697eb >>>>>>>>>> >>>>>>>>>> Here's the webrev for those: >>>>>>>>>> http://cr.openjdk.java.net/~andrew/zero/webrev.05/ and the previous >>>>>>>>>> Nimbus one: http://cr.openjdk.java.net/~andrew/nimbus/webrev.07/ >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>> I approve the -source 6/-target 6 changes for Nimbus; I don't think a >>>>>>>> wholesale change to -source 6/-target 6 is necessary. >>>>>>>> >>>>>>>> Please use 6961536 "Nimbus code using @Override break OpenJDK/IcedBuild >>>>>>>> on >>>>>>>> ecj" for the push. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>>> The following were skipped due to the referenced changesets not being >>>>>>>>>> in OpenJDK6: >>>>>>>>>> >>>>>>>>>> 6939731: JSR 292 Zero build fix after 6934494 >>>>>>>>>> 6944028: 6940701 broke Zero >>>>>>>>>> 6949830: 6939134 broke Zero >>>>>>>>>> >>>>>>>>>> 6949423: remove tagged stack interpreter for Zero >>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/68d6683eaef7 >>>>>>>>>> Depends on: >>>>>>>>>> changeset: 1426:2338d41fbd81 >>>>>>>>>> user: twisti >>>>>>>>>> date: Fri Apr 30 08:37:24 2010 -0700 >>>>>>>>>> summary: 6943304: remove tagged stack interpreter >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>> I've checked the bug database and all the Zero fixes in hs18 and hs19 >>>>>>>> are >>>>>>>> somehow addressed in this email thread. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>>> -- >>>>>>>>>> Andrew :-) >>>>>>>>>> >>>>>>>>>> Free Java Software Engineer >>>>>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>>>>> >>>>>>>>>> Support Free Java! >>>>>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>>>>> http://www.gnu.org/software/classpath >>>>>>>>>> http://openjdk.java.net >>>>>>>>>> >>>>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> Scratch 6951686; the mention of 'zero' mislead me. It's not a Zero >>>>>>>>> fix. >>>>>>>>> >>>>>>>>> Let me know when I can push the rest, >>>>>>>>> >>>>>>>>> Cheers, >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> Good to push! >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> All pushed! >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>>> Thanks, >>>>>>>> >>>>>>>> -Joe >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> Thanks, >>>>>>> >>>>>>> >>>>>>> >>>>>> Thanks for the pushes! >>>>>> >>>>>> With the integration of 6961870 "More rebranding fixes for >>>>>> templates/gpl-*-header files," which I just pushed, I believe that is the >>>>>> last change for b20. I will tag the repos accordingly pending successful >>>>>> results from a round of sanity building and testing. >>>>>> >>>>>> -Joe >>>>>> >>>>>> >>>>>> >>>>>> >>>>> I don't want to drag b20 out any longer either, but I think it's >>>>> probably worth doing a final sync of HotSpot to hs17b16, which was >>>>> just announced: >>>>> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001781.html >>>>> >>>>> If you recall, we brought in 6955813: Fix incorrect Oracle rebranding >>>>> headers from 6941466 already so we now have hs17b15 + that fix. I >>>>> think it would be better to have OpenJDK6 builds use a known HotSpot >>>>> tag, which syncing with hs17b16 would give us. It actually only means >>>>> bringing in one more real fix: 6953058: G1: A bigapp crashes with >>>>> SIGSEGV in compiled code >>>>> http://hg.openjdk.java.net/hsx/hsx17/master/rev/d53d91cb378c which >>>>> sounds important. >>>>> >>>>> What do you think? >>>>> >>>>> >>>> Well, I suppose we can have *one* more sync with HotSpot for b20; you're >>>> approved to sync hs17b15 into OpenJDK 6. >>>> >>>> Thanks, >>>> >>>> -Joe >>>> >>>> >>> Thanks! Done. >>> -- >>> Andrew :-) >>> >>> Free Java Software Engineer >>> Red Hat, Inc. (http://www.redhat.com) >>> >>> Support Free Java! >>> Contribute to GNU Classpath and the OpenJDK >>> http://www.gnu.org/software/classpath >>> http://openjdk.java.net >>> >>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>> >>> >> Impressively quick reply btw -- didn't you get this about 1am over there? >> I keep late hours sometimes :-) (I was actually waiting for a test run on the repo without the fix to complete.) >> -- >> Andrew :-) >> >> Free Java Software Engineer >> Red Hat, Inc. (http://www.redhat.com) >> >> Support Free Java! >> Contribute to GNU Classpath and the OpenJDK >> http://www.gnu.org/software/classpath >> http://openjdk.java.net >> >> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >> >> > > In comparing Zero in OpenJDK6 against the version in IcedTea, I found > that a couple of Sun Microsystems copyrights have sneaked back in: > > src/cpu/zero/vm/stack_zero.cpp: * Copyright 2003-2007 Sun > Microsystems, Inc. All Rights Reserved. > src/cpu/zero/vm/stack_zero.cpp: * Please contact Sun Microsystems, > Inc., 4150 Network Circle, Santa Clara, > src/cpu/zero/vm/stack_zero.inline.hpp: * Copyright 2003-2007 Sun > Microsystems, Inc. All Rights Reserved. > src/cpu/zero/vm/stack_zero.inline.hpp: * Please contact Sun > Microsystems, Inc., 4150 Network Circle, Santa Clara, > Thanks for the heads up; I'll clean this up before I tag the repo. -Joe From ahughes at redhat.com Thu Jun 17 10:39:30 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 17 Jun 2010 18:39:30 +0100 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <4C1A4F78.2040007@oracle.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C1039A3.6020600@oracle.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> <4C129472.8060302@oracle.com> <4C16C4E2.8050202@oracle.com> <4C1820C2.90607@oracle.com> <4C19655F.3070604@oracle.com> <4C19D6B1.7070203@oracle.com> <4C1A4F78.2040007@oracle.com> Message-ID: On 17 June 2010 17:38, Joe Darcy wrote: > Andrew John Hughes wrote: >> >> On 17 June 2010 10:20, Andrew John Hughes wrote: >> >>> >>> On 17 June 2010 09:41, Andrew John Hughes wrote: >>> >>>> >>>> On 17 June 2010 09:02, Joe Darcy wrote: >>>> >>>>> >>>>> Andrew John Hughes wrote: >>>>> >>>>>> >>>>>> On 17 June 2010 00:59, Joe Darcy wrote: >>>>>> >>>>>> >>>>>>> >>>>>>> Andrew John Hughes wrote: >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> On 16 June 2010 01:54, Joe Darcy wrote: >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> >>>>>>>>> Hello. >>>>>>>>> >>>>>>>>> Andrew John Hughes wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> >>>>>>>>>> On 15 June 2010 16:30, Andrew John Hughes >>>>>>>>>> wrote: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> On 15 June 2010 13:21, Andrew John Hughes >>>>>>>>>>> wrote: >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> On 15 June 2010 01:10, Joe Darcy wrote: >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> Joe Darcy wrote: >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> On 11 June 2010 05:31, Joe Darcy >>>>>>>>>>>>>>> wrote: >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Joe Darcy wrote: >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> On 10 June 2010 02:02, Joe Darcy >>>>>>>>>>>>>>>>>> wrote: >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> Andrew Su wrote: >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> [snip] >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> changeset: ? 2208:0137b5857c63 >>>>>>>>>>>>>>>>>> parent: ? ? ?2183:90248595ec35 >>>>>>>>>>>>>>>>>> user: ? ? ? ?okutsu >>>>>>>>>>>>>>>>>> date: ? ? ? ?Wed Mar 10 14:32:47 2010 +0900 >>>>>>>>>>>>>>>>>> summary: ? ? 6932473: (tz) javazic produces incorrect >>>>>>>>>>>>>>>>>> SimpleTimeZone >>>>>>>>>>>>>>>>>> parameters with Sun<=7 >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> Do these look ok? >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> Yes; also approved to go back. >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> Since some Sun copyrighted files have leaked back in, we'll >>>>>>>>>>>>>>>>> done >>>>>>>>>>>>>>>>> another >>>>>>>>>>>>>>>>> pass to clean up any such files before b20 goes final. >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> Thanks, >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> -Joe >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> I think only a few more changes are needed to wrap up b20: >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> * The various backports identified in the earlier message in >>>>>>>>>>>>>>>> this >>>>>>>>>>>>>>>> thread >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> Done now. >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> * Backport of 6957375 "java/net/ResponseCache >>>>>>>>>>>>>>>> getResponseCode >>>>>>>>>>>>>>>> and >>>>>>>>>>>>>>>> ResponseCacheTest fail after rebranding" >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> I see this come in while I was backporting; had to merge. >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> * One more pass of the Sun -> Oracle copyright script >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> There are some new Zero bugfixes that could be backported for >>>>>>>>>>>>>>> b20 >>>>>>>>>>>>>>> (and >>>>>>>>>>>>>>> would allow us to drop the local copy in IcedTea6). >>>>>>>>>>>>>>> I've CCed Gary Benson who should be able to provide a list of >>>>>>>>>>>>>>> bug >>>>>>>>>>>>>>> IDs >>>>>>>>>>>>>>> for backport. >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> Other than that, we should be good to go with b20. >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> Being able to drop the copy of Zero in IcedTea sounds >>>>>>>>>>>>>> worthwhile. >>>>>>>>>>>>>> ?After >>>>>>>>>>>>>> looking over the bugids and a webrev, I'd expect to approve >>>>>>>>>>>>>> those >>>>>>>>>>>>>> fixes >>>>>>>>>>>>>> going back. >>>>>>>>>>>>>> >>>>>>>>>>>>>> The Zero fixes are the last currently planned fixes for b20. >>>>>>>>>>>>>> >>>>>>>>>>>>>> -Joe >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> Hello. >>>>>>>>>>>>> >>>>>>>>>>>>> I'd like to get b20 wrapped up in the next day or two; please >>>>>>>>>>>>> provide >>>>>>>>>>>>> a >>>>>>>>>>>>> list >>>>>>>>>>>>> of the Zeros bug and I webrev so I can look them over. >>>>>>>>>>>>> >>>>>>>>>>>>> Thanks, >>>>>>>>>>>>> >>>>>>>>>>>>> -Joe >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> I was waiting for a response from Gary with the bug IDs, but >>>>>>>>>>>> looks >>>>>>>>>>>> like one isn't forthcoming. ?I'll compile a list from recent >>>>>>>>>>>> OpenJDK7 >>>>>>>>>>>> build drops and post that shortly. >>>>>>>>>>>> >>>>>>>>>>>> There's also >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001750.html >>>>>>>>>>>> which causes build breakage with IcedTea. >>>>>>>>>>>> -- >>>>>>>>>>>> Andrew :-) >>>>>>>>>>>> >>>>>>>>>>>> Free Java Software Engineer >>>>>>>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>>>>>>> >>>>>>>>>>>> Support Free Java! >>>>>>>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>>>>>>> http://www.gnu.org/software/classpath >>>>>>>>>>>> http://openjdk.java.net >>>>>>>>>>>> >>>>>>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> b87 >>>>>>>>>>> == >>>>>>>>>>> >>>>>>>>>>> 6934089 ?Zero 32-bit/64kb page fix >>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/da06d1795d84 >>>>>>>>>>> >>>>>>>>>>> b90 >>>>>>>>>>> === >>>>>>>>>>> >>>>>>>>>>> 6939180 ?Zero locking fix >>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/747d26efc5fa >>>>>>>>>>> >>>>>>>>>>> b92 >>>>>>>>>>> === >>>>>>>>>>> >>>>>>>>>>> 6941224: Improved stack overflow handling for Zero >>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/f9271ff9d324 >>>>>>>>>>> >>>>>>>>>>> 6944503: Improved Zero crash dump >>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/c544d979f886 >>>>>>>>>>> >>>>>>>>>>> 6944473: 6941224 misses new files >>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/aa9c266de52a >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>> >>>>>>>>> These are hs18 Zero fixes. ?hs18 also includes 6944028 "6940701 >>>>>>>>> broke >>>>>>>>> Zero," >>>>>>>>> but that fix is not needed in OpenJDK 6 yet since we don't have the >>>>>>>>> fix >>>>>>>>> for >>>>>>>>> 6940701 from hs18, as you note below. >>>>>>>>> >>>>>>>>> Approved to go back. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> b94 >>>>>>>>>>> === >>>>>>>>>>> >>>>>>>>>>> 6939182: Zero JNI handles fix >>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/0c5b3cf3c1f5 >>>>>>>>>>> >>>>>>>>>>> 6950178: Zero stack improvements >>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/348346af6676 >>>>>>>>>>> >>>>>>>>>>> 6950617: Zero/Shark interface updates >>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/6cfbdb113e52 >>>>>>>>>>> >>>>>>>>>>> 6951784: Zero deoptimizer changes >>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/22af4ce8dba1 >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>> >>>>>>>>> All of these are in hs19 and are approved to go back. ?The bug >>>>>>>>> >>>>>>>>> 6960550 Missing semicolon in Zero >>>>>>>>> >>>>>>>>> is "fixed" in hs19, but not yet integrated. ?At your option, you >>>>>>>>> may >>>>>>>>> apply >>>>>>>>> this fix to OpenJDK 6 now too. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> Ok, I only looked at integrated fixes. ?But this fix looks simple >>>>>>>> enough and as you approve, I've backported it too :-) >>>>>>>> >>>>>>>> I'm surprised it even builds without the semi-colon but I guess >>>>>>>> that's >>>>>>>> C++ for you ;-) >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>>>> >>>>>>>>>>> b96 >>>>>>>>>>> === >>>>>>>>>>> >>>>>>>>>>> 6951686: Using large pages on Linux prevents zero based >>>>>>>>>>> compressed >>>>>>>>>>> oops >>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/79bf863697eb >>>>>>>>>>> >>>>>>>>>>> Here's the webrev for those: >>>>>>>>>>> http://cr.openjdk.java.net/~andrew/zero/webrev.05/ and the >>>>>>>>>>> previous >>>>>>>>>>> Nimbus one: http://cr.openjdk.java.net/~andrew/nimbus/webrev.07/ >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>> >>>>>>>>> I approve the -source 6/-target 6 changes for Nimbus; I don't think >>>>>>>>> a >>>>>>>>> wholesale change to -source 6/-target 6 is necessary. >>>>>>>>> >>>>>>>>> Please use 6961536 "Nimbus code using @Override break >>>>>>>>> OpenJDK/IcedBuild >>>>>>>>> on >>>>>>>>> ecj" for the push. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> The following were skipped due to the referenced changesets not >>>>>>>>>>> being >>>>>>>>>>> in OpenJDK6: >>>>>>>>>>> >>>>>>>>>>> 6939731: JSR 292 Zero build fix after 6934494 >>>>>>>>>>> 6944028: ? ? ? ? 6940701 broke Zero >>>>>>>>>>> 6949830: 6939134 broke Zero >>>>>>>>>>> >>>>>>>>>>> 6949423: remove tagged stack interpreter for Zero >>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/68d6683eaef7 >>>>>>>>>>> Depends on: >>>>>>>>>>> changeset: ? 1426:2338d41fbd81 >>>>>>>>>>> user: ? ? ? ?twisti >>>>>>>>>>> date: ? ? ? ?Fri Apr 30 08:37:24 2010 -0700 >>>>>>>>>>> summary: ? ? 6943304: remove tagged stack interpreter >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>> >>>>>>>>> I've checked the bug database and all the Zero fixes in hs18 and >>>>>>>>> hs19 >>>>>>>>> are >>>>>>>>> somehow addressed in this email thread. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> -- >>>>>>>>>>> Andrew :-) >>>>>>>>>>> >>>>>>>>>>> Free Java Software Engineer >>>>>>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>>>>>> >>>>>>>>>>> Support Free Java! >>>>>>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>>>>>> http://www.gnu.org/software/classpath >>>>>>>>>>> http://openjdk.java.net >>>>>>>>>>> >>>>>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>> >>>>>>>>>> Scratch 6951686; the mention of 'zero' mislead me. ?It's not a >>>>>>>>>> Zero >>>>>>>>>> fix. >>>>>>>>>> >>>>>>>>>> Let me know when I can push the rest, >>>>>>>>>> >>>>>>>>>> Cheers, >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>>> Good to push! >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> All pushed! >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> >>>>>>>>> Thanks, >>>>>>>>> >>>>>>>>> -Joe >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> Thanks, >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> Thanks for the pushes! >>>>>>> >>>>>>> With the integration of 6961870 "More rebranding fixes for >>>>>>> templates/gpl-*-header files," which I just pushed, I believe that is >>>>>>> the >>>>>>> last change for b20. ?I will tag the repos accordingly pending >>>>>>> successful >>>>>>> results from a round of sanity building and testing. >>>>>>> >>>>>>> -Joe >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> I don't want to drag b20 out any longer either, but I think it's >>>>>> probably worth doing a final sync of HotSpot to hs17b16, which was >>>>>> just announced: >>>>>> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001781.html >>>>>> >>>>>> If you recall, we brought in 6955813: Fix incorrect Oracle rebranding >>>>>> headers from 6941466 already so we now have hs17b15 + that fix. ?I >>>>>> think it would be better to have OpenJDK6 builds use a known HotSpot >>>>>> tag, which syncing with hs17b16 would give us. ?It actually only means >>>>>> bringing in one more real fix: 6953058: G1: A bigapp crashes with >>>>>> SIGSEGV in compiled code >>>>>> http://hg.openjdk.java.net/hsx/hsx17/master/rev/d53d91cb378c which >>>>>> sounds important. >>>>>> >>>>>> What do you think? >>>>>> >>>>>> >>>>> >>>>> Well, I suppose we can have *one* more sync with HotSpot for b20; >>>>> you're >>>>> approved to sync hs17b15 into OpenJDK 6. >>>>> >>>>> Thanks, >>>>> >>>>> -Joe >>>>> >>>>> >>>> >>>> Thanks! Done. >>>> -- >>>> Andrew :-) >>>> >>>> Free Java Software Engineer >>>> Red Hat, Inc. (http://www.redhat.com) >>>> >>>> Support Free Java! >>>> Contribute to GNU Classpath and the OpenJDK >>>> http://www.gnu.org/software/classpath >>>> http://openjdk.java.net >>>> >>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>> >>>> >>> >>> Impressively quick reply btw -- didn't you get this about 1am over there? >>> > > I keep late hours sometimes :-) ?(I was actually waiting for a test run on > the repo without the fix to complete.) > >>> -- >>> Andrew :-) >>> >>> Free Java Software Engineer >>> Red Hat, Inc. (http://www.redhat.com) >>> >>> Support Free Java! >>> Contribute to GNU Classpath and the OpenJDK >>> http://www.gnu.org/software/classpath >>> http://openjdk.java.net >>> >>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>> >>> >> >> In comparing Zero in OpenJDK6 against the version in IcedTea, I found >> that a couple of Sun Microsystems copyrights have sneaked back in: >> >> src/cpu/zero/vm/stack_zero.cpp: * Copyright 2003-2007 Sun >> Microsystems, Inc. ?All Rights Reserved. >> src/cpu/zero/vm/stack_zero.cpp: * Please contact Sun Microsystems, >> Inc., 4150 Network Circle, Santa Clara, >> src/cpu/zero/vm/stack_zero.inline.hpp: * Copyright 2003-2007 Sun >> Microsystems, Inc. ?All Rights Reserved. >> src/cpu/zero/vm/stack_zero.inline.hpp: * Please contact Sun >> Microsystems, Inc., 4150 Network Circle, Santa Clara, >> > > Thanks for the heads up; I'll clean this up before I tag the repo. > > -Joe > Thanks. Sorry for not catching these on their way in. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From jonathan.gibbons at oracle.com Thu Jun 17 14:32:56 2010 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Thu, 17 Jun 2010 14:32:56 -0700 Subject: Request to backport: 6795365: NetBeans projects in langtools repository are not NB6.5-friendly Message-ID: <4C1A9488.1090002@oracle.com> Joe, Here's another fix that would be good to backport to 6-open b21. Low risk. For langtools developers that use NetBeans. changeset: 196:e3930187199c user: jjg date: Fri Jan 23 11:23:10 2009 -0800 summary: 6795365: NetBeans projects in langtools repository are not NB6.5-friendly -- Jon From joe.darcy at oracle.com Thu Jun 17 14:42:44 2010 From: joe.darcy at oracle.com (joe.darcy at oracle.com) Date: Thu, 17 Jun 2010 21:42:44 +0000 Subject: hg: jdk6/jdk6/hotspot: 6962193: Rebrand some Zero files Message-ID: <20100617214246.AE0AD47329@hg.openjdk.java.net> Changeset: c963201c7fe5 Author: darcy Date: 2010-06-17 14:39 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/c963201c7fe5 6962193: Rebrand some Zero files Reviewed-by: jjg ! src/cpu/zero/vm/stack_zero.cpp ! src/cpu/zero/vm/stack_zero.inline.hpp From joe.darcy at oracle.com Thu Jun 17 16:50:46 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Thu, 17 Jun 2010 16:50:46 -0700 Subject: Request to backport: 6795365: NetBeans projects in langtools repository are not NB6.5-friendly In-Reply-To: <4C1A9488.1090002@oracle.com> References: <4C1A9488.1090002@oracle.com> Message-ID: <4C1AB4D6.5080402@oracle.com> Jonathan Gibbons wrote: > Joe, > > Here's another fix that would be good to backport to 6-open b21. Low > risk. For langtools developers that use NetBeans. > > > changeset: 196:e3930187199c > user: jjg > date: Fri Jan 23 11:23:10 2009 -0800 > summary: 6795365: NetBeans projects in langtools repository are > not NB6.5-friendly > > -- Jon > Hi Jon. This change is approved for b21. (I should get b20 tagged by June 18.) -Joe From joe.darcy at oracle.com Fri Jun 18 01:38:45 2010 From: joe.darcy at oracle.com (joe.darcy at oracle.com) Date: Fri, 18 Jun 2010 08:38:45 +0000 Subject: hg: jdk6/jdk6: Added tag jdk6-b20 for changeset 35b68789bf53 Message-ID: <20100618083845.7F57347356@hg.openjdk.java.net> Changeset: f0fe79036801 Author: darcy Date: 2010-06-18 01:18 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/rev/f0fe79036801 Added tag jdk6-b20 for changeset 35b68789bf53 ! .hgtags From joe.darcy at oracle.com Fri Jun 18 01:38:49 2010 From: joe.darcy at oracle.com (joe.darcy at oracle.com) Date: Fri, 18 Jun 2010 08:38:49 +0000 Subject: hg: jdk6/jdk6/corba: Added tag jdk6-b20 for changeset 836643e8a67d Message-ID: <20100618083850.85DE547358@hg.openjdk.java.net> Changeset: 01863f27b876 Author: darcy Date: 2010-06-18 01:17 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/corba/rev/01863f27b876 Added tag jdk6-b20 for changeset 836643e8a67d ! .hgtags From joe.darcy at oracle.com Fri Jun 18 01:38:56 2010 From: joe.darcy at oracle.com (joe.darcy at oracle.com) Date: Fri, 18 Jun 2010 08:38:56 +0000 Subject: hg: jdk6/jdk6/hotspot: Added tag jdk6-b20 for changeset c963201c7fe5 Message-ID: <20100618083858.618BC4735A@hg.openjdk.java.net> Changeset: 13f94cc87253 Author: darcy Date: 2010-06-18 01:17 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/13f94cc87253 Added tag jdk6-b20 for changeset c963201c7fe5 ! .hgtags From joe.darcy at oracle.com Fri Jun 18 01:39:10 2010 From: joe.darcy at oracle.com (joe.darcy at oracle.com) Date: Fri, 18 Jun 2010 08:39:10 +0000 Subject: hg: jdk6/jdk6/jaxp: Added tag jdk6-b20 for changeset d3984577cb78 Message-ID: <20100618083910.C84474735C@hg.openjdk.java.net> Changeset: fa2f1b0af2c4 Author: darcy Date: 2010-06-18 01:17 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxp/rev/fa2f1b0af2c4 Added tag jdk6-b20 for changeset d3984577cb78 ! .hgtags From joe.darcy at oracle.com Fri Jun 18 01:39:14 2010 From: joe.darcy at oracle.com (joe.darcy at oracle.com) Date: Fri, 18 Jun 2010 08:39:14 +0000 Subject: hg: jdk6/jdk6/jaxws: Added tag jdk6-b20 for changeset 49efd83dd6b5 Message-ID: <20100618083914.CF2FA4735E@hg.openjdk.java.net> Changeset: 8890516b8822 Author: darcy Date: 2010-06-18 01:17 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxws/rev/8890516b8822 Added tag jdk6-b20 for changeset 49efd83dd6b5 ! .hgtags From joe.darcy at oracle.com Fri Jun 18 01:39:19 2010 From: joe.darcy at oracle.com (joe.darcy at oracle.com) Date: Fri, 18 Jun 2010 08:39:19 +0000 Subject: hg: jdk6/jdk6/jdk: Added tag jdk6-b20 for changeset dfca90a1c8e3 Message-ID: <20100618083927.C48D147360@hg.openjdk.java.net> Changeset: 40ad1b388fc2 Author: darcy Date: 2010-06-18 01:18 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/40ad1b388fc2 Added tag jdk6-b20 for changeset dfca90a1c8e3 ! .hgtags From joe.darcy at oracle.com Fri Jun 18 01:40:09 2010 From: joe.darcy at oracle.com (joe.darcy at oracle.com) Date: Fri, 18 Jun 2010 08:40:09 +0000 Subject: hg: jdk6/jdk6/langtools: Added tag jdk6-b20 for changeset 51b6d8d173cd Message-ID: <20100618084010.5FF8947362@hg.openjdk.java.net> Changeset: 9fff62a8e93b Author: darcy Date: 2010-06-18 01:18 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/9fff62a8e93b Added tag jdk6-b20 for changeset 51b6d8d173cd ! .hgtags From joe.darcy at oracle.com Fri Jun 18 01:42:55 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 18 Jun 2010 01:42:55 -0700 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> <4C129472.8060302@oracle.com> <4C16C4E2.8050202@oracle.com> <4C1820C2.90607@oracle.com> <4C19655F.3070604@oracle.com> <4C19D6B1.7070203@oracle.com> <4C1A4F78.2040007@oracle.com> Message-ID: <4C1B318F.7070303@oracle.com> Andrew John Hughes wrote: > On 17 June 2010 17:38, Joe Darcy wrote: > >> Andrew John Hughes wrote: >> >>> On 17 June 2010 10:20, Andrew John Hughes wrote: >>> >>> >>>> On 17 June 2010 09:41, Andrew John Hughes wrote: >>>> >>>> >>>>> On 17 June 2010 09:02, Joe Darcy wrote: >>>>> >>>>> >>>>>> Andrew John Hughes wrote: >>>>>> >>>>>> >>>>>>> On 17 June 2010 00:59, Joe Darcy wrote: >>>>>>> >>>>>>> >>>>>>> >>>>>>>> Andrew John Hughes wrote: >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> On 16 June 2010 01:54, Joe Darcy wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> Hello. >>>>>>>>>> >>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>> On 15 June 2010 16:30, Andrew John Hughes >>>>>>>>>>> wrote: >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>>> On 15 June 2010 13:21, Andrew John Hughes >>>>>>>>>>>> wrote: >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>>> On 15 June 2010 01:10, Joe Darcy wrote: >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>>> Joe Darcy wrote: >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> On 11 June 2010 05:31, Joe Darcy >>>>>>>>>>>>>>>> wrote: >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> Joe Darcy wrote: >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> On 10 June 2010 02:02, Joe Darcy >>>>>>>>>>>>>>>>>>> wrote: >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>> Andrew Su wrote: >>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> [snip] >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> changeset: 2208:0137b5857c63 >>>>>>>>>>>>>>>>>>> parent: 2183:90248595ec35 >>>>>>>>>>>>>>>>>>> user: okutsu >>>>>>>>>>>>>>>>>>> date: Wed Mar 10 14:32:47 2010 +0900 >>>>>>>>>>>>>>>>>>> summary: 6932473: (tz) javazic produces incorrect >>>>>>>>>>>>>>>>>>> SimpleTimeZone >>>>>>>>>>>>>>>>>>> parameters with Sun<=7 >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> Do these look ok? >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> Yes; also approved to go back. >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> Since some Sun copyrighted files have leaked back in, we'll >>>>>>>>>>>>>>>>>> done >>>>>>>>>>>>>>>>>> another >>>>>>>>>>>>>>>>>> pass to clean up any such files before b20 goes final. >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> Thanks, >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> -Joe >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> I think only a few more changes are needed to wrap up b20: >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> * The various backports identified in the earlier message in >>>>>>>>>>>>>>>>> this >>>>>>>>>>>>>>>>> thread >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Done now. >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> * Backport of 6957375 "java/net/ResponseCache >>>>>>>>>>>>>>>>> getResponseCode >>>>>>>>>>>>>>>>> and >>>>>>>>>>>>>>>>> ResponseCacheTest fail after rebranding" >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> I see this come in while I was backporting; had to merge. >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> * One more pass of the Sun -> Oracle copyright script >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> There are some new Zero bugfixes that could be backported for >>>>>>>>>>>>>>>> b20 >>>>>>>>>>>>>>>> (and >>>>>>>>>>>>>>>> would allow us to drop the local copy in IcedTea6). >>>>>>>>>>>>>>>> I've CCed Gary Benson who should be able to provide a list of >>>>>>>>>>>>>>>> bug >>>>>>>>>>>>>>>> IDs >>>>>>>>>>>>>>>> for backport. >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Other than that, we should be good to go with b20. >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>> Being able to drop the copy of Zero in IcedTea sounds >>>>>>>>>>>>>>> worthwhile. >>>>>>>>>>>>>>> After >>>>>>>>>>>>>>> looking over the bugids and a webrev, I'd expect to approve >>>>>>>>>>>>>>> those >>>>>>>>>>>>>>> fixes >>>>>>>>>>>>>>> going back. >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> The Zero fixes are the last currently planned fixes for b20. >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> -Joe >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>>> >>>>>>>>>>>>>> Hello. >>>>>>>>>>>>>> >>>>>>>>>>>>>> I'd like to get b20 wrapped up in the next day or two; please >>>>>>>>>>>>>> provide >>>>>>>>>>>>>> a >>>>>>>>>>>>>> list >>>>>>>>>>>>>> of the Zeros bug and I webrev so I can look them over. >>>>>>>>>>>>>> >>>>>>>>>>>>>> Thanks, >>>>>>>>>>>>>> >>>>>>>>>>>>>> -Joe >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>> I was waiting for a response from Gary with the bug IDs, but >>>>>>>>>>>>> looks >>>>>>>>>>>>> like one isn't forthcoming. I'll compile a list from recent >>>>>>>>>>>>> OpenJDK7 >>>>>>>>>>>>> build drops and post that shortly. >>>>>>>>>>>>> >>>>>>>>>>>>> There's also >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001750.html >>>>>>>>>>>>> which causes build breakage with IcedTea. >>>>>>>>>>>>> -- >>>>>>>>>>>>> Andrew :-) >>>>>>>>>>>>> >>>>>>>>>>>>> Free Java Software Engineer >>>>>>>>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>>>>>>>> >>>>>>>>>>>>> Support Free Java! >>>>>>>>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>>>>>>>> http://www.gnu.org/software/classpath >>>>>>>>>>>>> http://openjdk.java.net >>>>>>>>>>>>> >>>>>>>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>> b87 >>>>>>>>>>>> == >>>>>>>>>>>> >>>>>>>>>>>> 6934089 Zero 32-bit/64kb page fix >>>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/da06d1795d84 >>>>>>>>>>>> >>>>>>>>>>>> b90 >>>>>>>>>>>> === >>>>>>>>>>>> >>>>>>>>>>>> 6939180 Zero locking fix >>>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/747d26efc5fa >>>>>>>>>>>> >>>>>>>>>>>> b92 >>>>>>>>>>>> === >>>>>>>>>>>> >>>>>>>>>>>> 6941224: Improved stack overflow handling for Zero >>>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/f9271ff9d324 >>>>>>>>>>>> >>>>>>>>>>>> 6944503: Improved Zero crash dump >>>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/c544d979f886 >>>>>>>>>>>> >>>>>>>>>>>> 6944473: 6941224 misses new files >>>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/aa9c266de52a >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>> These are hs18 Zero fixes. hs18 also includes 6944028 "6940701 >>>>>>>>>> broke >>>>>>>>>> Zero," >>>>>>>>>> but that fix is not needed in OpenJDK 6 yet since we don't have the >>>>>>>>>> fix >>>>>>>>>> for >>>>>>>>>> 6940701 from hs18, as you note below. >>>>>>>>>> >>>>>>>>>> Approved to go back. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>>> b94 >>>>>>>>>>>> === >>>>>>>>>>>> >>>>>>>>>>>> 6939182: Zero JNI handles fix >>>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/0c5b3cf3c1f5 >>>>>>>>>>>> >>>>>>>>>>>> 6950178: Zero stack improvements >>>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/348346af6676 >>>>>>>>>>>> >>>>>>>>>>>> 6950617: Zero/Shark interface updates >>>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/6cfbdb113e52 >>>>>>>>>>>> >>>>>>>>>>>> 6951784: Zero deoptimizer changes >>>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/22af4ce8dba1 >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>> All of these are in hs19 and are approved to go back. The bug >>>>>>>>>> >>>>>>>>>> 6960550 Missing semicolon in Zero >>>>>>>>>> >>>>>>>>>> is "fixed" in hs19, but not yet integrated. At your option, you >>>>>>>>>> may >>>>>>>>>> apply >>>>>>>>>> this fix to OpenJDK 6 now too. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> Ok, I only looked at integrated fixes. But this fix looks simple >>>>>>>>> enough and as you approve, I've backported it too :-) >>>>>>>>> >>>>>>>>> I'm surprised it even builds without the semi-colon but I guess >>>>>>>>> that's >>>>>>>>> C++ for you ;-) >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>>>> b96 >>>>>>>>>>>> === >>>>>>>>>>>> >>>>>>>>>>>> 6951686: Using large pages on Linux prevents zero based >>>>>>>>>>>> compressed >>>>>>>>>>>> oops >>>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/79bf863697eb >>>>>>>>>>>> >>>>>>>>>>>> Here's the webrev for those: >>>>>>>>>>>> http://cr.openjdk.java.net/~andrew/zero/webrev.05/ and the >>>>>>>>>>>> previous >>>>>>>>>>>> Nimbus one: http://cr.openjdk.java.net/~andrew/nimbus/webrev.07/ >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>> I approve the -source 6/-target 6 changes for Nimbus; I don't think >>>>>>>>>> a >>>>>>>>>> wholesale change to -source 6/-target 6 is necessary. >>>>>>>>>> >>>>>>>>>> Please use 6961536 "Nimbus code using @Override break >>>>>>>>>> OpenJDK/IcedBuild >>>>>>>>>> on >>>>>>>>>> ecj" for the push. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>>> The following were skipped due to the referenced changesets not >>>>>>>>>>>> being >>>>>>>>>>>> in OpenJDK6: >>>>>>>>>>>> >>>>>>>>>>>> 6939731: JSR 292 Zero build fix after 6934494 >>>>>>>>>>>> 6944028: 6940701 broke Zero >>>>>>>>>>>> 6949830: 6939134 broke Zero >>>>>>>>>>>> >>>>>>>>>>>> 6949423: remove tagged stack interpreter for Zero >>>>>>>>>>>> http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/68d6683eaef7 >>>>>>>>>>>> Depends on: >>>>>>>>>>>> changeset: 1426:2338d41fbd81 >>>>>>>>>>>> user: twisti >>>>>>>>>>>> date: Fri Apr 30 08:37:24 2010 -0700 >>>>>>>>>>>> summary: 6943304: remove tagged stack interpreter >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>> I've checked the bug database and all the Zero fixes in hs18 and >>>>>>>>>> hs19 >>>>>>>>>> are >>>>>>>>>> somehow addressed in this email thread. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>>> -- >>>>>>>>>>>> Andrew :-) >>>>>>>>>>>> >>>>>>>>>>>> Free Java Software Engineer >>>>>>>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>>>>>>> >>>>>>>>>>>> Support Free Java! >>>>>>>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>>>>>>> http://www.gnu.org/software/classpath >>>>>>>>>>>> http://openjdk.java.net >>>>>>>>>>>> >>>>>>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>> Scratch 6951686; the mention of 'zero' mislead me. It's not a >>>>>>>>>>> Zero >>>>>>>>>>> fix. >>>>>>>>>>> >>>>>>>>>>> Let me know when I can push the rest, >>>>>>>>>>> >>>>>>>>>>> Cheers, >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>> Good to push! >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> All pushed! >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> Thanks, >>>>>>>>>> >>>>>>>>>> -Joe >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> Thanks, >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> Thanks for the pushes! >>>>>>>> >>>>>>>> With the integration of 6961870 "More rebranding fixes for >>>>>>>> templates/gpl-*-header files," which I just pushed, I believe that is >>>>>>>> the >>>>>>>> last change for b20. I will tag the repos accordingly pending >>>>>>>> successful >>>>>>>> results from a round of sanity building and testing. >>>>>>>> >>>>>>>> -Joe >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> I don't want to drag b20 out any longer either, but I think it's >>>>>>> probably worth doing a final sync of HotSpot to hs17b16, which was >>>>>>> just announced: >>>>>>> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001781.html >>>>>>> >>>>>>> If you recall, we brought in 6955813: Fix incorrect Oracle rebranding >>>>>>> headers from 6941466 already so we now have hs17b15 + that fix. I >>>>>>> think it would be better to have OpenJDK6 builds use a known HotSpot >>>>>>> tag, which syncing with hs17b16 would give us. It actually only means >>>>>>> bringing in one more real fix: 6953058: G1: A bigapp crashes with >>>>>>> SIGSEGV in compiled code >>>>>>> http://hg.openjdk.java.net/hsx/hsx17/master/rev/d53d91cb378c which >>>>>>> sounds important. >>>>>>> >>>>>>> What do you think? >>>>>>> >>>>>>> >>>>>>> >>>>>> Well, I suppose we can have *one* more sync with HotSpot for b20; >>>>>> you're >>>>>> approved to sync hs17b15 into OpenJDK 6. >>>>>> >>>>>> Thanks, >>>>>> >>>>>> -Joe >>>>>> >>>>>> >>>>>> >>>>> Thanks! Done. >>>>> -- >>>>> Andrew :-) >>>>> >>>>> Free Java Software Engineer >>>>> Red Hat, Inc. (http://www.redhat.com) >>>>> >>>>> Support Free Java! >>>>> Contribute to GNU Classpath and the OpenJDK >>>>> http://www.gnu.org/software/classpath >>>>> http://openjdk.java.net >>>>> >>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>>> >>>>> >>>>> >>>> Impressively quick reply btw -- didn't you get this about 1am over there? >>>> >>>> >> I keep late hours sometimes :-) (I was actually waiting for a test run on >> the repo without the fix to complete.) >> >> >>>> -- >>>> Andrew :-) >>>> >>>> Free Java Software Engineer >>>> Red Hat, Inc. (http://www.redhat.com) >>>> >>>> Support Free Java! >>>> Contribute to GNU Classpath and the OpenJDK >>>> http://www.gnu.org/software/classpath >>>> http://openjdk.java.net >>>> >>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>> >>>> >>>> >>> In comparing Zero in OpenJDK6 against the version in IcedTea, I found >>> that a couple of Sun Microsystems copyrights have sneaked back in: >>> >>> src/cpu/zero/vm/stack_zero.cpp: * Copyright 2003-2007 Sun >>> Microsystems, Inc. All Rights Reserved. >>> src/cpu/zero/vm/stack_zero.cpp: * Please contact Sun Microsystems, >>> Inc., 4150 Network Circle, Santa Clara, >>> src/cpu/zero/vm/stack_zero.inline.hpp: * Copyright 2003-2007 Sun >>> Microsystems, Inc. All Rights Reserved. >>> src/cpu/zero/vm/stack_zero.inline.hpp: * Please contact Sun >>> Microsystems, Inc., 4150 Network Circle, Santa Clara, >>> >>> >> Thanks for the heads up; I'll clean this up before I tag the repo. >> >> -Joe >> >> > > Thanks. Sorry for not catching these on their way in. > OpenJDK 6 b20 is now tagged; source bundles, etc. will follow in due course. On to b21! -Joe From Dalibor.Topic at Sun.COM Fri Jun 18 02:16:12 2010 From: Dalibor.Topic at Sun.COM (Dalibor Topic) Date: Fri, 18 Jun 2010 11:16:12 +0200 Subject: Backporting changeset from 7 to 6 for bugfix In-Reply-To: <4C1B318F.7070303@oracle.com> References: <1030346924.356271276098250261.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <4C115674.50303@oracle.com> <4C11BC39.9020602@oracle.com> <4C129472.8060302@oracle.com> <4C16C4E2.8050202@oracle.com> <4C1820C2.90607@oracle.com> <4C19655F.3070604@oracle.com> <4C19D6B1.7070203@oracle.com> <4C1A4F78.2040007@oracle.com> <4C1B318F.7070303@oracle.com> Message-ID: <4C1B395C.7000301@sun.com> Joe Darcy wrote: > OpenJDK 6 b20 is now tagged; source bundles, etc. will follow in due > course. congrats! cheers, dalibor topic -- ******************************************************************* Dalibor Topic Tel: (+49 40) 23 646 738 Java F/OSS Ambassador AIM: robiladonaim Sun Microsystems GmbH Mobile: (+49 177) 2664 192 Nagelsweg 55 http://openjdk.java.net D-20097 Hamburg mailto:Dalibor.Topic at sun.com Sitz der Gesellschaft: Sonnenallee 1, D-85551 Kirchheim-Heimstetten Amtsgericht M?nchen: HRB 161028 Gesch?ftsf?hrer: J?rgen Kunz From jonathan.gibbons at oracle.com Fri Jun 18 11:05:06 2010 From: jonathan.gibbons at oracle.com (jonathan.gibbons at oracle.com) Date: Fri, 18 Jun 2010 18:05:06 +0000 Subject: hg: jdk6/jdk6/langtools: 5 new changesets Message-ID: <20100618180514.5B6A947391@hg.openjdk.java.net> Changeset: 748b44c7c40c Author: jjg Date: 2008-07-10 16:50 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/748b44c7c40c 6724551: Use Queues instead of Lists to link compiler phases Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java ! src/share/classes/com/sun/tools/javac/comp/Enter.java ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java ! src/share/classes/com/sun/tools/javac/util/ListBuffer.java Changeset: 7ef9dea67bb9 Author: jjg Date: 2008-07-23 19:55 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/7ef9dea67bb9 6726015: JavaCompiler: replace desugarLater by compileStates Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java ! test/tools/javac/6199662/Tree.java Changeset: 410697a6c8ef Author: mcimadamore Date: 2008-08-08 17:48 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/410697a6c8ef 6734819: Javac performs flows analysis on already translated classes Summary: Regression in JavaCompiler.desugar introduced in 6726015 Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java + test/tools/javac/6734819/T6734819a.java + test/tools/javac/6734819/T6734819a.out + test/tools/javac/6734819/T6734819b.java + test/tools/javac/6734819/T6734819b.out + test/tools/javac/6734819/T6734819c.java + test/tools/javac/6734819/T6734819c.out Changeset: daa4b9c734fb Author: jjg Date: 2010-06-16 16:23 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/daa4b9c734fb 6956638: JavacTask.generate does not generate all required files Reviewed-by: darcy Contributed-by: joshuamaurice at gmail.com + test/tools/javac/T6956638.java Changeset: 05bf914950a9 Author: jjg Date: 2010-06-18 10:53 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/05bf914950a9 Merge From jonathan.gibbons at oracle.com Fri Jun 18 11:22:58 2010 From: jonathan.gibbons at oracle.com (jonathan.gibbons at oracle.com) Date: Fri, 18 Jun 2010 18:22:58 +0000 Subject: hg: jdk6/jdk6/langtools: 2 new changesets Message-ID: <20100618182302.82FB047393@hg.openjdk.java.net> Changeset: 8b5712fa8c97 Author: jjg Date: 2010-06-16 17:15 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/8b5712fa8c97 6724327: eliminate use of shell tests for simple golden file tests Reviewed-by: darcy ! test/tools/javac/CyclicInheritance.java ! test/tools/javac/CyclicInheritance.out - test/tools/javac/CyclicInheritance.sh ! test/tools/javac/ExtendsAccess/ExtendsAccess.java ! test/tools/javac/ExtendsAccess/ExtendsAccess.out - test/tools/javac/ExtendsAccess/ExtendsAccess.sh ! test/tools/javac/FloatingPointChanges/BadConstructorModifiers.java ! test/tools/javac/FloatingPointChanges/BadConstructorModifiers.out - test/tools/javac/FloatingPointChanges/BadConstructorModifiers.sh ! test/tools/javac/InnerNamedConstant_2.java ! test/tools/javac/InnerNamedConstant_2.out - test/tools/javac/InnerNamedConstant_2.sh ! test/tools/javac/LocalClasses_2.java ! test/tools/javac/LocalClasses_2.out - test/tools/javac/LocalClasses_2.sh ! test/tools/javac/NameCollision.java ! test/tools/javac/NameCollision.out - test/tools/javac/NameCollision.sh ! test/tools/javac/NestedInnerClassNames.java ! test/tools/javac/NestedInnerClassNames.out - test/tools/javac/NestedInnerClassNames.sh ! test/tools/javac/NonStaticFieldExpr1.java ! test/tools/javac/NonStaticFieldExpr1.out - test/tools/javac/NonStaticFieldExpr1.sh ! test/tools/javac/NonStaticFieldExpr2.java ! test/tools/javac/NonStaticFieldExpr2.out - test/tools/javac/NonStaticFieldExpr2.sh ! test/tools/javac/NonStaticFieldExpr3.java ! test/tools/javac/NonStaticFieldExpr3.out - test/tools/javac/NonStaticFieldExpr3.sh ! test/tools/javac/QualifiedAccess/QualifiedAccess_1.java ! test/tools/javac/QualifiedAccess/QualifiedAccess_1.out - test/tools/javac/QualifiedAccess/QualifiedAccess_1.sh ! test/tools/javac/QualifiedAccess/QualifiedAccess_2.java ! test/tools/javac/QualifiedAccess/QualifiedAccess_2.out - test/tools/javac/QualifiedAccess/QualifiedAccess_2.sh ! test/tools/javac/QualifiedAccess/QualifiedAccess_3.java ! test/tools/javac/QualifiedAccess/QualifiedAccess_3.out - test/tools/javac/QualifiedAccess/QualifiedAccess_3.sh ! test/tools/javac/SynchronizedClass.java ! test/tools/javac/SynchronizedClass.out - test/tools/javac/SynchronizedClass.sh ! test/tools/javac/depDocComment/DeprecatedDocComment.java ! test/tools/javac/depDocComment/DeprecatedDocComment.out - test/tools/javac/depDocComment/DeprecatedDocComment.sh Changeset: 7d51140c7453 Author: jjg Date: 2010-06-18 11:13 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/7d51140c7453 Merge From sebastian at breakpoint.cc Fri Jun 18 00:41:52 2010 From: sebastian at breakpoint.cc (Sebastian Andrzej Siewior) Date: Fri, 18 Jun 2010 09:41:52 +0200 Subject: [PATCH] openjdk/zero: only use floating point if floating point available Message-ID: <20100618074152.GA5538@Chamillionaire.breakpoint.cc> Those two opcodes are not available on non-FPU machines. If we have the SPE extension we could use evldd and evstdd but this requires the address to be 64bit aligned. Signed-off-by: Sebastian Andrzej Siewior --- .../src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp index 86d3562..40fd41e 100644 --- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp +++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp @@ -33,7 +33,7 @@ // Atomically copy 64 bits of data static void atomic_copy64(volatile void *src, volatile void *dst) { -#if defined(PPC) && !defined(_LP64) +#if defined(PPC) && !defined(_LP64) && !defined(__NO_FPRS__) double tmp; asm volatile ("lfd %0, 0(%1)\n" "stfd %0, 0(%2)\n" -- 1.6.6.1 From jonathan.gibbons at oracle.com Fri Jun 18 16:42:01 2010 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Fri, 18 Jun 2010 16:42:01 -0700 Subject: Request to backport: 6595666: fix -Werror Message-ID: <4C1C0449.2040208@oracle.com> Joe, I would like to backport the following langtools changeset, to formally support -Werror in javac. changeset: 211:9d541fd2916b user: jjg date: Fri Feb 06 10:23:57 2009 -0800 summary: 6595666: fix -Werror -- Jon From jonathan.gibbons at oracle.com Fri Jun 18 16:55:16 2010 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Fri, 18 Jun 2010 16:55:16 -0700 Subject: Request to backport: 6962540: langtools Makefile sets DEV_NULL incorrectly Message-ID: <4C1C0764.4010105@oracle.com> Joe, I'd like to backport the following new changeset from tl/langtools: changeset: 582:0ba1f80b73a5 tag: tip user: jjg date: Fri Jun 18 16:45:13 2010 -0700 summary: 6962540: langtools Makefile sets DEV_NULL incorrectly -- Jon From jonathan.gibbons at oracle.com Fri Jun 18 17:16:02 2010 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Fri, 18 Jun 2010 17:16:02 -0700 Subject: Request to backport two changesets Message-ID: <4C1C0C42.7010907@oracle.com> Joe, I'd like to backport the following two tl/langtools changesets: changeset: 114:1e83972f53fb user: jjg date: Tue Sep 23 10:44:51 2008 -0700 summary: 6420151: need to improve byfile compile policy to eliminate footprint issues changeset: 250:af10262bd031 user: jjg date: Tue Mar 31 11:16:15 2009 -0700 summary: 6813059: replace use of JavaCompiler.errorCount with shouldContinue -- Jon From bradford.wetmore at oracle.com Fri Jun 18 18:09:03 2010 From: bradford.wetmore at oracle.com (Brad Wetmore) Date: Fri, 18 Jun 2010 18:09:03 -0700 Subject: bugs.openjdk.java.net is online In-Reply-To: <4BF43864.3030709@oracle.com> References: <4BEAEF5B.8050203@oracle.com> <1274265738.2583.44.camel@hermans.wildebeest.org> <4BF3C3F0.6030000@oracle.com> <4BF43864.3030709@oracle.com> Message-ID: <4C1C18AF.5000103@oracle.com> > > The system admin part has been resolved, now I just need some > > cycles to check the integrity of the bugzilla database. Bugzilla is back up and healthy again (I think). The last new patch filed was April 21, the last bug update was April 22 and our server ran out of disk space on May 8th. Before we start adding to it, I'd like you to please check your "recent" activities and see if anything seems amiss. Once we've had a few days to do some spot checks, we can start editing again. Thanks for your patience, Brad From joe.darcy at oracle.com Fri Jun 18 18:16:48 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 18 Jun 2010 18:16:48 -0700 Subject: Request to backport two changesets In-Reply-To: <4C1C0C42.7010907@oracle.com> References: <4C1C0C42.7010907@oracle.com> Message-ID: <4C1C1A80.3050807@oracle.com> Jonathan Gibbons wrote: > Joe, > > I'd like to backport the following two tl/langtools changesets: > > > changeset: 114:1e83972f53fb > user: jjg > date: Tue Sep 23 10:44:51 2008 -0700 > summary: 6420151: need to improve byfile compile policy to > eliminate footprint issues > > changeset: 250:af10262bd031 > user: jjg > date: Tue Mar 31 11:16:15 2009 -0700 > summary: 6813059: replace use of JavaCompiler.errorCount with > shouldContinue > > > -- Jon Hi Jon. Those would be fine changes for OpenJDK 6. -Joe From joe.darcy at oracle.com Fri Jun 18 18:17:06 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 18 Jun 2010 18:17:06 -0700 Subject: Request to backport: 6962540: langtools Makefile sets DEV_NULL incorrectly In-Reply-To: <4C1C0764.4010105@oracle.com> References: <4C1C0764.4010105@oracle.com> Message-ID: <4C1C1A92.5070901@oracle.com> Jonathan Gibbons wrote: > Joe, > > I'd like to backport the following new changeset from tl/langtools: > > changeset: 582:0ba1f80b73a5 > tag: tip > user: jjg > date: Fri Jun 18 16:45:13 2010 -0700 > summary: 6962540: langtools Makefile sets DEV_NULL incorrectly > > -- Jon > Approved to be backported; thanks, -Joe From denisl at openscg.com Fri Jun 18 20:04:50 2010 From: denisl at openscg.com (Lussier, Denis) Date: Fri, 18 Jun 2010 23:04:50 -0400 Subject: b20 source bundle on website Message-ID: Any word on when the b20 OpenJDK 6 source bundle will be available from http://download.java.net/openjdk/jdk6 --Denis Lussier http://openscg.org -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/jdk6-dev/attachments/20100618/8481ed64/attachment.html From jonathan.gibbons at oracle.com Fri Jun 18 21:20:43 2010 From: jonathan.gibbons at oracle.com (jonathan.gibbons at oracle.com) Date: Sat, 19 Jun 2010 04:20:43 +0000 Subject: hg: jdk6/jdk6/langtools: 6962540: langtools Makefile sets DEV_NULL incorrectly Message-ID: <20100619042046.2DE5D473AC@hg.openjdk.java.net> Changeset: 0e4ccb5a0d40 Author: jjg Date: 2010-06-18 16:45 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/0e4ccb5a0d40 6962540: langtools Makefile sets DEV_NULL incorrectly Reviewed-by: ohair ! make/Makefile From jonathan.gibbons at oracle.com Fri Jun 18 21:24:40 2010 From: jonathan.gibbons at oracle.com (jonathan.gibbons at oracle.com) Date: Sat, 19 Jun 2010 04:24:40 +0000 Subject: hg: jdk6/jdk6/langtools: 3 new changesets Message-ID: <20100619042446.40E32473AE@hg.openjdk.java.net> Changeset: e8cf1a74be06 Author: jjg Date: 2010-06-18 17:00 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/e8cf1a74be06 6420151: need to improve byfile compile policy to eliminate footprint issues Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java ! src/share/classes/com/sun/tools/javac/comp/Todo.java ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java ! src/share/classes/com/sun/tools/javadoc/JavadocTodo.java ! test/tools/javac/6734819/T6734819a.java ! test/tools/javac/6734819/T6734819b.java ! test/tools/javac/6734819/T6734819b.out ! test/tools/javac/6734819/T6734819c.java - test/tools/javac/policy/A.java - test/tools/javac/policy/B.java - test/tools/javac/policy/C.java - test/tools/javac/policy/D.java - test/tools/javac/policy/Test.java - test/tools/javac/policy/byfile.ABD.out - test/tools/javac/policy/byfile.ACD.out - test/tools/javac/policy/bytodo.ABD.out - test/tools/javac/policy/bytodo.ACD.out - test/tools/javac/policy/simple.ABD.out - test/tools/javac/policy/simple.ACD.out + test/tools/javac/policy/test1/A.java + test/tools/javac/policy/test1/B.java + test/tools/javac/policy/test1/C.java + test/tools/javac/policy/test1/D.java + test/tools/javac/policy/test1/Test1a.java + test/tools/javac/policy/test1/Test1b.java + test/tools/javac/policy/test1/byfile.ABD.out + test/tools/javac/policy/test1/byfile.ACD.out + test/tools/javac/policy/test1/bytodo.ABD.out + test/tools/javac/policy/test1/bytodo.ACD.out + test/tools/javac/policy/test1/simple.ABD.out + test/tools/javac/policy/test1/simple.ACD.out + test/tools/javac/policy/test2/A.java + test/tools/javac/policy/test2/B.java + test/tools/javac/policy/test2/Test.java + test/tools/javac/policy/test2/byfile.AB.out + test/tools/javac/policy/test2/byfile.BA.out + test/tools/javac/policy/test2/bytodo.AB.out + test/tools/javac/policy/test2/bytodo.BA.out Changeset: 08e8b05e3770 Author: jjg Date: 2009-03-31 11:16 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/08e8b05e3770 6813059: replace use of JavaCompiler.errorCount with shouldContinue Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java + test/tools/javac/policy/test3/A.java + test/tools/javac/policy/test3/Test.java Changeset: e7e6982abb38 Author: jjg Date: 2010-06-18 21:24 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/e7e6982abb38 Merge From joe.darcy at oracle.com Sat Jun 19 20:21:32 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Sat, 19 Jun 2010 20:21:32 -0700 Subject: Request to backport: 6595666: fix -Werror In-Reply-To: <4C1C0449.2040208@oracle.com> References: <4C1C0449.2040208@oracle.com> Message-ID: <4C1D893C.70303@oracle.com> Jonathan Gibbons wrote: > Joe, > > I would like to backport the following langtools changeset, to > formally support -Werror in javac. > > changeset: 211:9d541fd2916b > user: jjg > date: Fri Feb 06 10:23:57 2009 -0800 > summary: 6595666: fix -Werror > > -- Jon That would be a fine change to have in OpenJDK 6 :-) Thanks, -Joe From ahughes at redhat.com Sun Jun 20 05:36:48 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Sun, 20 Jun 2010 13:36:48 +0100 Subject: b20 source bundle on website In-Reply-To: References: Message-ID: On 19 June 2010 04:04, Lussier, Denis wrote: > Any word on when the b20 OpenJDK 6 source bundle will be available > from?http://download.java.net/openjdk/jdk6 > --Denis Lussier > ??http://openscg.org > > > Waiting for it here too to bump IcedTea6. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From joe.darcy at oracle.com Mon Jun 21 09:29:08 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Mon, 21 Jun 2010 09:29:08 -0700 Subject: b20 source bundle on website In-Reply-To: References: Message-ID: <4C1F9354.8040909@oracle.com> Andrew John Hughes wrote: > On 19 June 2010 04:04, Lussier, Denis wrote: > >> Any word on when the b20 OpenJDK 6 source bundle will be available >> from http://download.java.net/openjdk/jdk6 >> --Denis Lussier >> http://openscg.org >> >> >> >> > > Waiting for it here too to bump IcedTea6. > The bundle is in the works, but may take a few days. I'll post when it is available. -Joe From jonathan.gibbons at oracle.com Mon Jun 21 11:37:35 2010 From: jonathan.gibbons at oracle.com (jonathan.gibbons at oracle.com) Date: Mon, 21 Jun 2010 18:37:35 +0000 Subject: hg: jdk6/jdk6/langtools: 2 new changesets Message-ID: <20100621183740.0059747432@hg.openjdk.java.net> Changeset: c28b5920263c Author: jjg Date: 2010-06-18 16:56 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/c28b5920263c 6595666: fix -Werror Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java ! src/share/classes/com/sun/tools/javac/main/Main.java ! src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java ! src/share/classes/com/sun/tools/javac/resources/compiler.properties ! src/share/classes/com/sun/tools/javac/resources/javac.properties ! test/tools/javac/6304921/T6304921.out ! test/tools/javac/T6241723.out + test/tools/javac/T6595666.java ! test/tools/javac/depDocComment/DeprecatedDocComment.out Changeset: 1f8b3cc0489d Author: jjg Date: 2010-06-21 11:28 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/1f8b3cc0489d Merge ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java - test/tools/javac/policy/A.java - test/tools/javac/policy/B.java - test/tools/javac/policy/C.java - test/tools/javac/policy/D.java - test/tools/javac/policy/Test.java - test/tools/javac/policy/byfile.ABD.out - test/tools/javac/policy/byfile.ACD.out - test/tools/javac/policy/bytodo.ABD.out - test/tools/javac/policy/bytodo.ACD.out - test/tools/javac/policy/simple.ABD.out - test/tools/javac/policy/simple.ACD.out From jonathan.gibbons at oracle.com Mon Jun 21 11:43:54 2010 From: jonathan.gibbons at oracle.com (jonathan.gibbons at oracle.com) Date: Mon, 21 Jun 2010 18:43:54 +0000 Subject: hg: jdk6/jdk6/langtools: 6795365: NetBeans projects in langtools repository are not NB6.5-friendly Message-ID: <20100621184355.C6C8247434@hg.openjdk.java.net> Changeset: 7e27c39553e1 Author: jjg Date: 2010-06-21 11:43 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/7e27c39553e1 6795365: NetBeans projects in langtools repository are not NB6.5-friendly Reviewed-by: mcimadamore ! README ! make/netbeans/README - make/netbeans/apt/README - make/netbeans/apt/build.xml - make/netbeans/apt/nbproject/project.xml - make/netbeans/common/shared.xml - make/netbeans/common/standard-context-menu-items-no-javadoc.ent - make/netbeans/common/standard-context-menu-items.ent - make/netbeans/common/standard-ide-actions-no-javadoc.ent - make/netbeans/common/standard-ide-actions.ent - make/netbeans/compiler/README - make/netbeans/compiler/build.xml - make/netbeans/compiler/nbproject/project.xml - make/netbeans/doclets/README - make/netbeans/doclets/build.xml - make/netbeans/doclets/nbproject/project.xml - make/netbeans/javadoc/README - make/netbeans/javadoc/build.xml - make/netbeans/javadoc/nbproject/project.xml - make/netbeans/javah/README - make/netbeans/javah/build.xml - make/netbeans/javah/nbproject/project.xml - make/netbeans/javap/README - make/netbeans/javap/build.xml - make/netbeans/javap/nbproject/project.xml + make/netbeans/langtools/build.xml + make/netbeans/langtools/nbproject/project.xml + make/netbeans/langtools/nbproject/standard-context-menu-items.ent + make/netbeans/langtools/nbproject/standard-ide-actions.ent + make/tools/SelectTool/SelectToolTask.java From openjdk at ml.breakpoint.cc Mon Jun 21 12:50:07 2010 From: openjdk at ml.breakpoint.cc (Sebastian Andrzej Siewior) Date: Mon, 21 Jun 2010 21:50:07 +0200 Subject: [PATCH] openjdk/zero: only use FPU opcodes if FPU is available Message-ID: <20100621195007.GA8283@Chamillionaire.breakpoint.cc> Those two opcodes are not available on non-FPU machines. If we have the SPE extension we could use evldd and evstdd but this requires the address to be 64bit aligned and I'm not sure whether this guaranteed here. Signed-off-by: Sebastian Andrzej Siewior --- .../src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp index 86d3562..40fd41e 100644 --- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp +++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp @@ -33,7 +33,7 @@ // Atomically copy 64 bits of data static void atomic_copy64(volatile void *src, volatile void *dst) { -#if defined(PPC) && !defined(_LP64) +#if defined(PPC) && !defined(_LP64) && !defined(__NO_FPRS__) double tmp; asm volatile ("lfd %0, 0(%1)\n" "stfd %0, 0(%2)\n" -- 1.6.6.1 From joe.darcy at oracle.com Mon Jun 21 20:39:53 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Mon, 21 Jun 2010 20:39:53 -0700 Subject: b20 source bundle on website In-Reply-To: <4C1F9354.8040909@oracle.com> References: <4C1F9354.8040909@oracle.com> Message-ID: <4C203089.1000605@oracle.com> Joe Darcy wrote: > Andrew John Hughes wrote: >> On 19 June 2010 04:04, Lussier, Denis wrote: >> >>> Any word on when the b20 OpenJDK 6 source bundle will be available >>> from http://download.java.net/openjdk/jdk6 >>> --Denis Lussier >>> http://openscg.org >>> >>> >>> >>> >> >> Waiting for it here too to bump IcedTea6. >> > > The bundle is in the works, but may take a few days. I'll post when > it is available. > > -Joe Now available: http://download.java.net/openjdk/jdk6/promoted/b20/openjdk-6-src-b20-21_jun_2010.tar.gz Enjoy, -Joe From gbenson at redhat.com Tue Jun 22 01:47:51 2010 From: gbenson at redhat.com (Gary Benson) Date: Tue, 22 Jun 2010 09:47:51 +0100 Subject: [PATCH] openjdk/zero: only use FPU opcodes if FPU is available In-Reply-To: <20100621195007.GA8283@Chamillionaire.breakpoint.cc> References: <20100621195007.GA8283@Chamillionaire.breakpoint.cc> Message-ID: <20100622084750.GA3420@redhat.com> Hi Sebastian, I'm happy with this patch if it allows Zero to build where it otherwise wouldn't, but be aware that without this code or some equivalent it will not be possible to pass the TCK with the build. Have you signed the SCA? If so I can (or you can) make a webrev for this and submit it for inclusion. Cheers, Gary Sebastian Andrzej Siewior wrote: > Those two opcodes are not available on non-FPU machines. If we have > the SPE extension we could use evldd and evstdd but this requires > the address to be 64bit aligned and I'm not sure whether this > guaranteed here. > > Signed-off-by: Sebastian Andrzej Siewior > --- > .../src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp > index 86d3562..40fd41e 100644 > --- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp > +++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp > @@ -33,7 +33,7 @@ > > // Atomically copy 64 bits of data > static void atomic_copy64(volatile void *src, volatile void *dst) { > -#if defined(PPC) && !defined(_LP64) > +#if defined(PPC) && !defined(_LP64) && !defined(__NO_FPRS__) > double tmp; > asm volatile ("lfd %0, 0(%1)\n" > "stfd %0, 0(%2)\n" > -- > 1.6.6.1 -- http://gbenson.net/ From ahughes at redhat.com Tue Jun 22 10:33:26 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 22 Jun 2010 18:33:26 +0100 Subject: Backport for bug 6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds. In-Reply-To: <4C1928F5.9020308@oracle.com> References: <1276716696.30565.12.camel@galactica> <4C1928F5.9020308@oracle.com> Message-ID: On 16 June 2010 20:41, Joe Darcy wrote: > Mario Torre wrote: >> >> Hi all, >> >> Is it possible to integrate this fix >> >> http://hg.openjdk.java.net/jdk7/2d/jdk/rev/8b55669c7b7a >> >> To jdk6 as well? >> >> Thanks, >> Mario >> > > Hello. > > We're just about to wrap up OpenJDK 6 b20 so I think 6961732 > "FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds" > would be a fine fix for b21 after the fix has had a chance to soak in JDK 7. > > -Joe > Is it ok to push this one now? Thanks, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From joe.darcy at oracle.com Tue Jun 22 10:43:09 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Tue, 22 Jun 2010 10:43:09 -0700 Subject: Backport for bug 6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds. In-Reply-To: References: <1276716696.30565.12.camel@galactica> <4C1928F5.9020308@oracle.com> Message-ID: <4C20F62D.7060103@oracle.com> Andrew John Hughes wrote: > On 16 June 2010 20:41, Joe Darcy wrote: > >> Mario Torre wrote: >> >>> Hi all, >>> >>> Is it possible to integrate this fix >>> >>> http://hg.openjdk.java.net/jdk7/2d/jdk/rev/8b55669c7b7a >>> >>> To jdk6 as well? >>> >>> Thanks, >>> Mario >>> >>> >> Hello. >> >> We're just about to wrap up OpenJDK 6 b20 so I think 6961732 >> "FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds" >> would be a fine fix for b21 after the fix has had a chance to soak in JDK 7. >> >> -Joe >> >> > > Is it ok to push this one now? > > Thanks, > Hello. Yes, this is fine to push now. Thanks, -Joe From ahughes at redhat.com Tue Jun 22 10:48:58 2010 From: ahughes at redhat.com (ahughes at redhat.com) Date: Tue, 22 Jun 2010 17:48:58 +0000 Subject: hg: jdk6/jdk6/jdk: 6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds. Message-ID: <20100622174906.CB2F34746E@hg.openjdk.java.net> Changeset: 388276965253 Author: neugens Date: 2010-06-16 20:46 +0200 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/388276965253 6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds. Summary: Fix premature integer roundings to preserve correct height, width and descent values for fonts Reviewed-by: prr ! src/share/native/sun/font/freetypeScaler.c From ahughes at redhat.com Tue Jun 22 10:55:54 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 22 Jun 2010 18:55:54 +0100 Subject: Backport for bug 6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds. In-Reply-To: <4C20F62D.7060103@oracle.com> References: <1276716696.30565.12.camel@galactica> <4C1928F5.9020308@oracle.com> <4C20F62D.7060103@oracle.com> Message-ID: <20100622175554.GC10780@rivendell.middle-earth.co.uk> On 10:43 Tue 22 Jun , Joe Darcy wrote: > Andrew John Hughes wrote: > > On 16 June 2010 20:41, Joe Darcy wrote: > > > >> Mario Torre wrote: > >> > >>> Hi all, > >>> > >>> Is it possible to integrate this fix > >>> > >>> http://hg.openjdk.java.net/jdk7/2d/jdk/rev/8b55669c7b7a > >>> > >>> To jdk6 as well? > >>> > >>> Thanks, > >>> Mario > >>> > >>> > >> Hello. > >> > >> We're just about to wrap up OpenJDK 6 b20 so I think 6961732 > >> "FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds" > >> would be a fine fix for b21 after the fix has had a chance to soak in JDK 7. > >> > >> -Joe > >> > >> > > > > Is it ok to push this one now? > > > > Thanks, > > > > Hello. > > Yes, this is fine to push now. > > Thanks, > > -Joe > Done. Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From neugens at limasoftware.net Tue Jun 22 13:42:14 2010 From: neugens at limasoftware.net (Mario Torre) Date: Tue, 22 Jun 2010 22:42:14 +0200 Subject: Backport for bug 6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds. In-Reply-To: <20100622175554.GC10780@rivendell.middle-earth.co.uk> References: <1276716696.30565.12.camel@galactica> <4C1928F5.9020308@oracle.com> <4C20F62D.7060103@oracle.com> <20100622175554.GC10780@rivendell.middle-earth.co.uk> Message-ID: <1277239334.2920.1.camel@galactica> Il giorno mar, 22/06/2010 alle 18.55 +0100, Andrew John Hughes ha scritto: > Done. > > Thanks, Thanks Joe, Andrew! Cheers, Mario -- pgp key: http://subkeys.pgp.net/ PGP Key ID: 80F240CF Fingerprint: BA39 9666 94EC 8B73 27FA FC7C 4086 63E3 80F2 40CF Proud GNU Classpath developer: http://www.classpath.org/ Read About us at: http://planet.classpath.org OpenJDK: http://openjdk.java.net/projects/caciocavallo/ Please, support open standards: http://endsoftpatents.org/ From kelly.ohair at oracle.com Tue Jun 22 14:13:20 2010 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Tue, 22 Jun 2010 14:13:20 -0700 Subject: Need reviewers: charsets.jar fix, JarReorder changes, Poller demo change Message-ID: <9F6AA6C9-A035-459F-B4D7-CAA11B028338@oracle.com> 6933622: Duplicate class files in rt.jar and charsets.jar 6895003: JarReorder is not excluding a requested file. 6939022: Source code adjustments for parfait compilation http://cr.openjdk.java.net/~ohair/openjdk7/jar-reorder/webrev/ The first two changes are related. Excluding items with JarReorder was not working if the item was also in the ordered classlist. Now excludes apply to the ordered classlist. This JarReorder problem is an old one, one which we also ran into when javax/crypto/SecretKey.class showed up in rt.jar even when it was excluded. This utility class has been cleaned up and hopefully is considered an improved version. The third fix is a minor change to Poller.c where the C macro ## operator was used on two quoted strings, which caused the Parfait tool some problems and is unncessary. These same changes will also be applied to OpenJDK6. -kto From jonathan.gibbons at oracle.com Tue Jun 22 14:46:27 2010 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Tue, 22 Jun 2010 14:46:27 -0700 Subject: Request to backport: JavaFileManager Message-ID: <4C212F33.20000@oracle.com> Joe, I would like to backport the current JavaFileManager from JDK 7 to JDK 6. Because of all the other work in JDK7, it is not possible to automatically backport the individual changesets. Instead, I have identified all the changesets of interest (see below), copied across the filemanager code almost exactly as-is (I had to comment out some @Override annotations), and then cherry picked the necessary edits from the various changesets to make everything work. Finally, I have gone back through the original reviews done for JDK7 to make sure that no edits of interest have been omitted. Altogether, this addresses the following set of 19 issues: 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject. 6419701: DefaultFileManager clean up: URI.create 6483788: DefaultFileManager.ZipFileObject.toUri() fails to escape space characters 6501502: JSR 199: FileObject.toUri should return file:///c:/ or file:/c:/ not file://c:/ 6508981: cleanup file separator handling in JavacFileManager 6625520: javac handles missing entries on classpath badly 6705935: javac reports path name of entry in ZipFileIndex incorectly 6705945: com.sun.tools.javac.zip files do not have valid copyright 6714364: refactor javac File handling code into new javac.file package 6714365: refactor JavacFileManager to move nested classes to top level 6743107: clean up use of static caches in file manager 6794582: javadoc should read files using a FileManager 6832154: refactor Paths to be just a utility class for JavacFileManager 6838467: JSR199 FileObjects don't obey general contract of equals. 6877206: JavaFileObject.toUri returns bogus URI (win) 6877223: tests @ignored because of issues with File.toURI on Windows 6885123: JavaFileObject getName issues 6907660: stupid typo in ZipFileIndex guarantees NPE 6930076: "null" can incorrectly appear in error message compiler.err.error.reading.file The changesets in question are: changeset: 36:65a447c75d4b user: jjg date: Thu May 22 17:40:53 2008 -0700 summary: 6705935: javac reports path name of entry in ZipFileIndex incorectly changeset: 46:b9bcea8bbe24 user: jjg date: Mon Jun 16 13:28:00 2008 -0700 summary: 6714364: refactor javac File handling code into new javac.file package changeset: 47:f9a4b9e1a521 user: jjg date: Tue Jun 17 10:44:32 2008 -0700 summary: 6625520: javac handles missing entries on classpath badly changeset: 48:aa67a5da66e3 user: jjg date: Wed Jun 18 07:23:25 2008 -0700 summary: 6714365: refactor JavacFileManager to move nested classes to top level changeset: 99:e571266ae14f user: jjg date: Tue Aug 26 14:52:59 2008 -0700 summary: 6508981: cleanup file separator handling in JavacFileManager changeset: 101:ceaa6549687a user: jjg date: Wed Sep 03 10:46:25 2008 -0700 summary: 6743107: clean up use of static caches in file manager changeset: 192:1bf037016426 user: jjg date: Tue Jan 20 15:17:45 2009 -0800 summary: 6794582: javadoc should read files using a FileManager changeset: 275:4ce1c1400334 user: jjg date: Tue May 19 15:07:15 2009 -0700 summary: 6832154: refactor Paths to be just a utility class for JavacFileManager changeset: 399:35e29f51a7c3 user: jjg date: Tue Sep 08 11:12:13 2009 -0700 summary: 6419701: DefaultFileManager clean up: URI.create changeset: 411:49359d0e6a9c user: jjg date: Wed Sep 23 18:48:13 2009 -0700 summary: 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject. changeset: 420:86b773b7cb40 user: jjg date: Wed Oct 14 15:41:28 2009 -0700 summary: 6838467: JSR199 FileObjects don't obey general contract of equals. changeset: 442:ea89c5d4af08 user: jjg date: Mon Dec 07 14:35:07 2009 -0800 summary: 6907660: stupid typo in ZipFileIndex guarantees NPE changeset: 490:16b9b7f45933 user: darcy date: Wed Feb 17 14:30:17 2010 -0800 summary: 6927061: Refactor apt implemenation to use code from JSR 269 changeset: 506:72833a8a6086 user: jjg date: Fri Feb 26 15:26:58 2010 -0800 summary: 6930076: "null" can incorrectly appear in error message compiler.err.error.reading.file -- Jon From joe.darcy at oracle.com Tue Jun 22 15:00:00 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Tue, 22 Jun 2010 15:00:00 -0700 Subject: Request to backport: JavaFileManager In-Reply-To: <4C212F33.20000@oracle.com> References: <4C212F33.20000@oracle.com> Message-ID: <4C213260.1050106@oracle.com> Jonathan Gibbons wrote: > Joe, > > I would like to backport the current JavaFileManager from JDK 7 to JDK 6. > > Because of all the other work in JDK7, it is not possible to > automatically backport the individual changesets. Instead, I have > identified all the changesets of interest (see below), copied across > the filemanager code almost exactly as-is (I had to comment out some > @Override annotations), and then cherry picked the necessary edits > from the various changesets to make everything work. Finally, I have > gone back through the original reviews done for JDK7 to make sure that > no edits of interest have been omitted. > > Altogether, this addresses the following set of 19 issues: Jon, Those would be fine additions to OpenJDK 6; approved to go back. -Joe From denisl at openscg.com Tue Jun 22 15:12:19 2010 From: denisl at openscg.com (Lussier, Denis) Date: Tue, 22 Jun 2010 18:12:19 -0400 Subject: Request to backport: JavaFileManager In-Reply-To: <4C213260.1050106@oracle.com> References: <4C212F33.20000@oracle.com> <4C213260.1050106@oracle.com> Message-ID: I am NOT in any way questioning this decision. I am wondering aloud what the general policy is for this kinda stuff. Of course if the improved FileManger is in Oracle's JDK 6 then it's clearly desirable for the OpenJDK project to get the fix/improvement backported from DEV (OpenJDK7) to PROD (OpenJDK6). Is this the case here or is it some other valid case?? --Denis Lussier http://openscg.org On Tue, Jun 22, 2010 at 6:00 PM, Joe Darcy wrote: > Jonathan Gibbons wrote: > >> Joe, >> >> I would like to backport the current JavaFileManager from JDK 7 to JDK 6. >> >> Because of all the other work in JDK7, it is not possible to automatically >> backport the individual changesets. Instead, I have identified all the >> changesets of interest (see below), copied across the filemanager code >> almost exactly as-is (I had to comment out some @Override annotations), and >> then cherry picked the necessary edits from the various changesets to make >> everything work. Finally, I have gone back through the original reviews done >> for JDK7 to make sure that no edits of interest have been omitted. >> >> Altogether, this addresses the following set of 19 issues: >> > > Jon, > > Those would be fine additions to OpenJDK 6; approved to go back. > > -Joe > > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/jdk6-dev/attachments/20100622/385ce6d8/attachment.html From joe.darcy at oracle.com Tue Jun 22 15:21:33 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Tue, 22 Jun 2010 15:21:33 -0700 Subject: Request to backport: JavaFileManager In-Reply-To: References: <4C212F33.20000@oracle.com> <4C213260.1050106@oracle.com> Message-ID: <4C21376D.2030900@oracle.com> The general policy for bug fixes in OpenJDK 6 is discussed on the project's page: http://openjdk.java.net/projects/jdk6/ "[...] if a change is appropriate for every other JDK release train, it is generally appropriate for OpenJDK 6 too. Examples of such universal changes include security fixes and time zone information updates. With the above caveats, bug fixes in JDK 7 that do not involve specification changes have presumptive validity for OpenJDK 6. That is, by default such fixes are assumed to be applicable to OpenJDK 6, especially if having "soaked" in JDK 7 for a time without incident. On a related point, the fixes from the stabilized HotSpot forests (for example HotSpot Express 14 or HotSpot Express 16) are suitable for bulk porting to the OpenJDK 6 HotSpot repository without review of individual bugs." -Joe Lussier, Denis wrote: > I am NOT in any way questioning this decision. I am wondering aloud > what the general policy is for this kinda stuff. > > Of course if the improved FileManger is in Oracle's JDK 6 then it's > clearly desirable for the OpenJDK project to get the fix/improvement > backported from DEV (OpenJDK7) to PROD (OpenJDK6). Is this the case > here or is it some other valid case?? > > --Denis Lussier > http://openscg.org > > On Tue, Jun 22, 2010 at 6:00 PM, Joe Darcy > wrote: > > Jonathan Gibbons wrote: > > Joe, > > I would like to backport the current JavaFileManager from JDK > 7 to JDK 6. > > Because of all the other work in JDK7, it is not possible to > automatically backport the individual changesets. Instead, I > have identified all the changesets of interest (see below), > copied across the filemanager code almost exactly as-is (I had > to comment out some @Override annotations), and then cherry > picked the necessary edits from the various changesets to make > everything work. Finally, I have gone back through the > original reviews done for JDK7 to make sure that no edits of > interest have been omitted. > > Altogether, this addresses the following set of 19 issues: > > > Jon, > > Those would be fine additions to OpenJDK 6; approved to go back. > > -Joe > > From ahughes at redhat.com Tue Jun 22 15:26:40 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 22 Jun 2010 23:26:40 +0100 Subject: Request to backport: JavaFileManager In-Reply-To: References: <4C212F33.20000@oracle.com> <4C213260.1050106@oracle.com> Message-ID: On 22 June 2010 23:12, Lussier, Denis wrote: > I am NOT in any way questioning this decision. ?I am wondering aloud what > the general policy is for this kinda stuff. > Of course if the improved FileManger is in Oracle's JDK 6 then it's clearly > desirable for the OpenJDK project to get the fix/improvement backported from > DEV (OpenJDK7) to PROD (OpenJDK6). ?Is this the case here or is it some > other valid case?? > --Denis Lussier > ??http://openscg.org > > On Tue, Jun 22, 2010 at 6:00 PM, Joe Darcy wrote: >> >> Jonathan Gibbons wrote: >>> >>> Joe, >>> >>> I would like to backport the current JavaFileManager from JDK 7 to JDK 6. >>> >>> Because of all the other work in JDK7, it is not possible to >>> automatically backport the individual changesets. Instead, I have identified >>> all the changesets of interest (see below), copied across the filemanager >>> code almost exactly as-is (I had to comment out some @Override annotations), >>> and then cherry picked the necessary edits from the various changesets to >>> make everything work. Finally, I have gone back through the original reviews >>> done for JDK7 to make sure that no edits of interest have been omitted. >>> >>> Altogether, this addresses the following set of 19 issues: >> >> Jon, >> >> Those would be fine additions to OpenJDK 6; approved to go back. >> >> -Joe >> > > It's a fairly big change, but it's early enough in the release cycle for any issues to become apparent. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From jonathan.gibbons at oracle.com Tue Jun 22 18:30:52 2010 From: jonathan.gibbons at oracle.com (jonathan.gibbons at oracle.com) Date: Wed, 23 Jun 2010 01:30:52 +0000 Subject: hg: jdk6/jdk6/langtools: 6962236: backport JavacFileManager fixes from 7 to 6-open; ... Message-ID: <20100623013055.22B8347486@hg.openjdk.java.net> Changeset: 5c2858bccb3f Author: jjg Date: 2010-06-22 18:30 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/5c2858bccb3f 6962236: backport JavacFileManager fixes from 7 to 6-open 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject. 6419701: DefaultFileManager clean up: URI.create 6483788: DefaultFileManager.ZipFileObject.toUri() fails to escape space characters 6501502: JSR 199: FileObject.toUri should return file:///c:/ or file:/c:/ not file://c:/ 6508981: cleanup file separator handling in JavacFileManager 6625520: javac handles missing entries on classpath badly 6705935: javac reports path name of entry in ZipFileIndex incorectly 6705945: com.sun.tools.javac.zip files do not have valid copyright 6714364: refactor javac File handling code into new javac.file package 6714365: refactor JavacFileManager to move nested classes to top level 6743107: clean up use of static caches in file manager 6794582: javadoc should read files using a FileManager 6832154: refactor Paths to be just a utility class for JavacFileManager 6838467: JSR199 FileObjects don't obey general contract of equals. 6877206: JavaFileObject.toUri returns bogus URI (win) 6877223: tests @ignored because of issues with File.toURI on Windows 6885123: JavaFileObject getName issues 6907660: stupid typo in ZipFileIndex guarantees NPE 6930076: "null" can incorrectly appear in error message compiler.err.error.reading.file Reviewed-by: darcy ! src/share/classes/com/sun/tools/apt/main/JavaCompiler.java ! src/share/classes/com/sun/tools/apt/main/Main.java ! src/share/classes/com/sun/tools/apt/mirror/util/SourcePositionImpl.java ! src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourceToHTMLConverter.java ! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java ! src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java ! src/share/classes/com/sun/tools/javac/api/JavacTool.java + src/share/classes/com/sun/tools/javac/file/BaseFileObject.java + src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java + src/share/classes/com/sun/tools/javac/file/FSInfo.java + src/share/classes/com/sun/tools/javac/file/JavacFileManager.java + src/share/classes/com/sun/tools/javac/file/Paths.java + src/share/classes/com/sun/tools/javac/file/RegularFileObject.java + src/share/classes/com/sun/tools/javac/file/RelativePath.java + src/share/classes/com/sun/tools/javac/file/SymbolArchive.java + src/share/classes/com/sun/tools/javac/file/ZipArchive.java + src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java + src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java ! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java ! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java ! src/share/classes/com/sun/tools/javac/main/Main.java ! src/share/classes/com/sun/tools/javac/parser/Scanner.java ! src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java + src/share/classes/com/sun/tools/javac/util/BaseFileManager.java - src/share/classes/com/sun/tools/javac/util/BaseFileObject.java ! src/share/classes/com/sun/tools/javac/util/DiagnosticFormatter.java ! src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java - src/share/classes/com/sun/tools/javac/util/JavacFileManager.java ! src/share/classes/com/sun/tools/javac/util/Log.java - src/share/classes/com/sun/tools/javac/util/Old199.java - src/share/classes/com/sun/tools/javac/util/Paths.java - src/share/classes/com/sun/tools/javac/zip/ZipFileIndex.java - src/share/classes/com/sun/tools/javac/zip/ZipFileIndexEntry.java ! src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java ! src/share/classes/com/sun/tools/javadoc/DocEnv.java ! src/share/classes/com/sun/tools/javadoc/DocImpl.java ! src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java ! src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java ! src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java ! src/share/classes/com/sun/tools/javadoc/JavadocTool.java ! src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java ! src/share/classes/com/sun/tools/javadoc/RootDocImpl.java ! src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java ! test/tools/javac/6304921/TestLog.java + test/tools/javac/6508981/TestInferBinaryName.java + test/tools/javac/6508981/p/A.java ! test/tools/javac/6589361/T6589361.java ! test/tools/javac/T6358024.java ! test/tools/javac/T6358166.java ! test/tools/javac/T6358168.java + test/tools/javac/T6625520.java + test/tools/javac/T6705935.java ! test/tools/javac/T6725036.java ! test/tools/javac/api/6411310/T6411310.java + test/tools/javac/api/6411310/Test.java ! test/tools/javac/api/6440333/T6440333.java ! test/tools/javac/api/6440528/T6440528.java + test/tools/javac/api/6733837/T6733837.java ! test/tools/javac/api/Sibling.java ! test/tools/javac/api/T6358786.java + test/tools/javac/api/T6483788.java + test/tools/javac/api/T6501502.java + test/tools/javac/api/T6838467.java + test/tools/javac/api/T6877206.java ! test/tools/javac/api/TestResolveIdent.java ! test/tools/javac/util/filemanager/TestName.java From kelly.ohair at oracle.com Tue Jun 22 22:13:59 2010 From: kelly.ohair at oracle.com (kelly.ohair at oracle.com) Date: Wed, 23 Jun 2010 05:13:59 +0000 Subject: hg: jdk6/jdk6/jdk: 2 new changesets Message-ID: <20100623051418.C541647490@hg.openjdk.java.net> Changeset: 756f809dafab Author: ohair Date: 2010-06-22 17:34 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/756f809dafab 6939022: Source code adjustments for parfait compilation Reviewed-by: jjg ! src/solaris/demo/jni/Poller/Poller.c Changeset: 3f10b36038b2 Author: ohair Date: 2010-06-22 17:36 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/3f10b36038b2 6933622: Duplicate class files in rt.jar and charsets.jar 6895003: JarReorder is not excluding a requested file. Reviewed-by: jjg ! make/common/Release.gmk ! make/tools/src/build/tools/jarreorder/JarReorder.java ! test/ProblemList.txt From openjdk at ml.breakpoint.cc Wed Jun 23 00:21:38 2010 From: openjdk at ml.breakpoint.cc (Sebastian Andrzej Siewior) Date: Wed, 23 Jun 2010 09:21:38 +0200 Subject: [PATCH] openjdk/zero: only use FPU opcodes if FPU is available In-Reply-To: <20100622084750.GA3420@redhat.com> References: <20100621195007.GA8283@Chamillionaire.breakpoint.cc> <20100622084750.GA3420@redhat.com> Message-ID: <20100623072138.GA22204@Chamillionaire.breakpoint.cc> * Gary Benson | 2010-06-22 09:47:51 [+0100]: >Hi Sebastian, Hi Gary, >I'm happy with this patch if it allows Zero to build where it >otherwise wouldn't, but be aware that without this code or >some equivalent it will not be possible to pass the TCK with >the build. I've built the code with this patch and I saw no further problems. Can you please describe what you mean by " it will not be possible to pass the TCK with the build" ? It looks to me that it is just an optimization on s390 and powerpc (with FPU). Other Architectures like arm or mips are treated the same way. >Have you signed the SCA? If so I can (or you can) make a webrev >for this and submit it for inclusion. I haven't. >Cheers, >Gary Sebastian From gbenson at redhat.com Wed Jun 23 01:29:21 2010 From: gbenson at redhat.com (Gary Benson) Date: Wed, 23 Jun 2010 09:29:21 +0100 Subject: [PATCH] openjdk/zero: only use FPU opcodes if FPU is available In-Reply-To: <20100623072138.GA22204@Chamillionaire.breakpoint.cc> References: <20100621195007.GA8283@Chamillionaire.breakpoint.cc> <20100622084750.GA3420@redhat.com> <20100623072138.GA22204@Chamillionaire.breakpoint.cc> Message-ID: <20100623082921.GA3316@redhat.com> Sebastian Andrzej Siewior wrote: > * Gary Benson | 2010-06-22 09:47:51 [+0100]: > > I'm happy with this patch if it allows Zero to build where it > > otherwise wouldn't, but be aware that without this code or > > some equivalent it will not be possible to pass the TCK with > > the build. > > I've built the code with this patch and I saw no further > problems. Can you please describe what you mean by " it will not be > possible to pass the TCK with the build" ? It looks to me that it > is just an optimization on s390 and powerpc (with FPU). Other > Architectures like arm or mips are treated the same way. The TCK is the set of tests that checks whether or not a JVM is compatible with a specific version of Java. This little piece of assembler is there because the Java Language Specification [1] states that reads and writes of volatile long and volatile double fields must be atomic. If you remove that bit of code then what you build does not conform to the spec. It will work without it, but it's not certifyable. The reason ARM and 32-bit MIPS don't have that piece of assembler is that nobody has tried to certify them yet so nobody has written that piece of assembler for those platforms. Basically, if you just want to run stuff then it's ok to bypass that piece of assembler, but if you want to certify the builds for whatever reason then you will need to figure out some other way to do a 64-bit atomic copy. > > Have you signed the SCA? If so I can (or you can) make a webrev > > for this and submit it for inclusion. > > I haven't. Are you able to sign it? Or (for the Oracle guys) is it necessary to have an SCA on file for such a small change, or is it acceptable without? Cheers, Gary -- http://gbenson.net/ [1] http://java.sun.com/docs/books/jls/third_edition/html/memory.html#17.7 PS I'm away on vacation from 1130 UTC, 23/06/2010, back Tuesday. From Dalibor.Topic at Sun.COM Wed Jun 23 01:35:24 2010 From: Dalibor.Topic at Sun.COM (Dalibor Topic) Date: Wed, 23 Jun 2010 10:35:24 +0200 Subject: [PATCH] openjdk/zero: only use FPU opcodes if FPU is available In-Reply-To: <20100623082921.GA3316@redhat.com> References: <20100621195007.GA8283@Chamillionaire.breakpoint.cc> <20100622084750.GA3420@redhat.com> <20100623072138.GA22204@Chamillionaire.breakpoint.cc> <20100623082921.GA3316@redhat.com> Message-ID: <4C21C74C.8020902@sun.com> Gary Benson wrote: > Or (for the Oracle guys) is it necessary to have an SCA on file for > such a small change Yes. cheers, dalibor topic -- ******************************************************************* Dalibor Topic Tel: (+49 40) 23 646 738 Java F/OSS Ambassador AIM: robiladonaim Sun Microsystems GmbH Mobile: (+49 177) 2664 192 Nagelsweg 55 http://openjdk.java.net D-20097 Hamburg mailto:Dalibor.Topic at sun.com Sitz der Gesellschaft: Sonnenallee 1, D-85551 Kirchheim-Heimstetten Amtsgericht M?nchen: HRB 161028 Gesch?ftsf?hrer: J?rgen Kunz From gbenson at redhat.com Wed Jun 23 01:48:11 2010 From: gbenson at redhat.com (Gary Benson) Date: Wed, 23 Jun 2010 09:48:11 +0100 Subject: [PATCH] openjdk/zero: only use FPU opcodes if FPU is available In-Reply-To: <4C21C74C.8020902@sun.com> References: <20100621195007.GA8283@Chamillionaire.breakpoint.cc> <20100622084750.GA3420@redhat.com> <20100623072138.GA22204@Chamillionaire.breakpoint.cc> <20100623082921.GA3316@redhat.com> <4C21C74C.8020902@sun.com> Message-ID: <20100623084811.GB3316@redhat.com> Dalibor Topic wrote: > Gary Benson wrote: > > Or (for the Oracle guys) is it necessary to have an SCA on file > > for such a small change > > Yes. Ok, Sebastian, are you able to sign this? https://sca.dev.java.net/CA_signatories.htm Cheers, Gary -- http://gbenson.net/ From openjdk at ml.breakpoint.cc Wed Jun 23 02:03:05 2010 From: openjdk at ml.breakpoint.cc (Sebastian Andrzej Siewior) Date: Wed, 23 Jun 2010 11:03:05 +0200 Subject: [PATCH] openjdk/zero: only use FPU opcodes if FPU is available In-Reply-To: <20100623082921.GA3316@redhat.com> References: <20100621195007.GA8283@Chamillionaire.breakpoint.cc> <20100622084750.GA3420@redhat.com> <20100623072138.GA22204@Chamillionaire.breakpoint.cc> <20100623082921.GA3316@redhat.com> Message-ID: <20100623090305.GA23103@Chamillionaire.breakpoint.cc> * Gary Benson | 2010-06-23 09:29:21 [+0100]: >The TCK is the set of tests that checks whether or not a JVM is >compatible with a specific version of Java. > >This little piece of assembler is there because the Java Language >Specification [1] states that reads and writes of volatile long and >volatile double fields must be atomic. If you remove that bit of >code then what you build does not conform to the spec. It will >work without it, but it's not certifyable. The reason ARM and >32-bit MIPS don't have that piece of assembler is that nobody has >tried to certify them yet so nobody has written that piece of >assembler for those platforms. Okay, I understand. >Basically, if you just want to run stuff then it's ok to bypass >that piece of assembler, but if you want to certify the builds >for whatever reason then you will need to figure out some other >way to do a 64-bit atomic copy. Is it garanteed that the adress I'm reading from and writing to is properly aligned on a 64bit address boundary? >> > Have you signed the SCA? If so I can (or you can) make a webrev >> > for this and submit it for inclusion. >> >> I haven't. > >Are you able to sign it? I clicked that link but I ended somewhere at oracle.com with 404. Sebastian From gbenson at redhat.com Wed Jun 23 02:22:33 2010 From: gbenson at redhat.com (Gary Benson) Date: Wed, 23 Jun 2010 10:22:33 +0100 Subject: [PATCH] openjdk/zero: only use FPU opcodes if FPU is available In-Reply-To: <20100623090305.GA23103@Chamillionaire.breakpoint.cc> References: <20100621195007.GA8283@Chamillionaire.breakpoint.cc> <20100622084750.GA3420@redhat.com> <20100623072138.GA22204@Chamillionaire.breakpoint.cc> <20100623082921.GA3316@redhat.com> <20100623090305.GA23103@Chamillionaire.breakpoint.cc> Message-ID: <20100623092233.GC3316@redhat.com> Sebastian Andrzej Siewior wrote: > * Gary Benson | 2010-06-23 09:29:21 [+0100]: > > Basically, if you just want to run stuff then it's ok to bypass > > that piece of assembler, but if you want to certify the builds > > for whatever reason then you will need to figure out some other > > way to do a 64-bit atomic copy. > > Is it garanteed that the adress I'm reading from and writing to is > properly aligned on a 64bit address boundary? Not sure. I guess that's a question for one of the HotSpot guys: are long and double fields 64-bit aligned on 32-bit machines? Or, if not, is it possible to make them be? > > > > Have you signed the SCA? If so I can (or you can) make a > > > > webrev for this and submit it for inclusion. > > > > > > I haven't. > > > > Are you able to sign it? > > I clicked that link but I ended somewhere at oracle.com with 404. So it does. Maybe someone from Oracle could point you to the correct page? Cheers, Gary -- http://gbenson.net/ From Dalibor.Topic at Sun.COM Wed Jun 23 03:08:51 2010 From: Dalibor.Topic at Sun.COM (Dalibor Topic) Date: Wed, 23 Jun 2010 12:08:51 +0200 Subject: [PATCH] openjdk/zero: only use FPU opcodes if FPU is available In-Reply-To: <20100623092233.GC3316@redhat.com> References: <20100621195007.GA8283@Chamillionaire.breakpoint.cc> <20100622084750.GA3420@redhat.com> <20100623072138.GA22204@Chamillionaire.breakpoint.cc> <20100623082921.GA3316@redhat.com> <20100623090305.GA23103@Chamillionaire.breakpoint.cc> <20100623092233.GC3316@redhat.com> Message-ID: <4C21DD33.5030509@sun.com> Gary Benson wrote: >>>>> Have you signed the SCA? If so I can (or you can) make a >>>>> webrev for this and submit it for inclusion. >>>> I haven't. >>> Are you able to sign it? >> I clicked that link but I ended somewhere at oracle.com with 404. > > So it does. Maybe someone from Oracle could point you to the correct > page? Thanks for the bug report ;) - I'll check where it went. cheers, dalibor topic -- ******************************************************************* Dalibor Topic Tel: (+49 40) 23 646 738 Java F/OSS Ambassador AIM: robiladonaim Sun Microsystems GmbH Mobile: (+49 177) 2664 192 Nagelsweg 55 http://openjdk.java.net D-20097 Hamburg mailto:Dalibor.Topic at sun.com Sitz der Gesellschaft: Sonnenallee 1, D-85551 Kirchheim-Heimstetten Amtsgericht M?nchen: HRB 161028 Gesch?ftsf?hrer: J?rgen Kunz From gbenson at redhat.com Wed Jun 23 03:53:42 2010 From: gbenson at redhat.com (Gary Benson) Date: Wed, 23 Jun 2010 11:53:42 +0100 Subject: [PATCH] openjdk/zero: only use FPU opcodes if FPU is available In-Reply-To: <4C21DD33.5030509@sun.com> References: <20100621195007.GA8283@Chamillionaire.breakpoint.cc> <20100622084750.GA3420@redhat.com> <20100623072138.GA22204@Chamillionaire.breakpoint.cc> <20100623082921.GA3316@redhat.com> <20100623090305.GA23103@Chamillionaire.breakpoint.cc> <20100623092233.GC3316@redhat.com> <4C21DD33.5030509@sun.com> Message-ID: <20100623105342.GD3316@redhat.com> Dalibor Topic wrote: > Gary Benson wrote: > > > > > > Have you signed the SCA? If so I can (or you can) make a > > > > > > webrev for this and submit it for inclusion. > > > > > > > > > > I haven't. > > > > > > > > Are you able to sign it? > > > > > > I clicked that link but I ended somewhere at oracle.com with > > > 404. > > > > So it does. Maybe someone from Oracle could point you to the > > correct page? > > Thanks for the bug report ;) - I'll check where it went. Thanks Dalibor... Cheers, Gary -- http://gbenson.net/ From aph at redhat.com Wed Jun 23 05:32:07 2010 From: aph at redhat.com (Andrew Haley) Date: Wed, 23 Jun 2010 13:32:07 +0100 Subject: [PATCH] openjdk/zero: only use FPU opcodes if FPU is available In-Reply-To: <20100623082921.GA3316@redhat.com> References: <20100621195007.GA8283@Chamillionaire.breakpoint.cc> <20100622084750.GA3420@redhat.com> <20100623072138.GA22204@Chamillionaire.breakpoint.cc> <20100623082921.GA3316@redhat.com> Message-ID: <4C21FEC7.1020905@redhat.com> On 06/23/2010 09:29 AM, Gary Benson wrote: > Sebastian Andrzej Siewior wrote: >> * Gary Benson | 2010-06-22 09:47:51 [+0100]: >>> I'm happy with this patch if it allows Zero to build where it >>> otherwise wouldn't, but be aware that without this code or >>> some equivalent it will not be possible to pass the TCK with >>> the build. >> >> I've built the code with this patch and I saw no further >> problems. Can you please describe what you mean by " it will not be >> possible to pass the TCK with the build" ? It looks to me that it >> is just an optimization on s390 and powerpc (with FPU). Other >> Architectures like arm or mips are treated the same way. > > The TCK is the set of tests that checks whether or not a JVM is > compatible with a specific version of Java. > > This little piece of assembler is there because the Java Language > Specification [1] states that reads and writes of volatile long and > volatile double fields must be atomic. If you remove that bit of > code then what you build does not conform to the spec. It will > work without it, but it's not certifyable. The reason ARM and > 32-bit MIPS don't have that piece of assembler is that nobody has > tried to certify them yet so nobody has written that piece of > assembler for those platforms. > > Basically, if you just want to run stuff then it's ok to bypass > that piece of assembler, but if you want to certify the builds > for whatever reason then you will need to figure out some other > way to do a 64-bit atomic copy. Which is pretty easy: static void atomic_copy64(volatile void *src, volatile void *dst) { pthread_mutex_lock(&the_mutex); *dst = *src; pthread_mutex_unlock(&the_mutex); } ... assuming that's the only place volatile doubles are ever touched. Andrew. From openjdk at ml.breakpoint.cc Wed Jun 23 07:51:56 2010 From: openjdk at ml.breakpoint.cc (Sebastian Andrzej Siewior) Date: Wed, 23 Jun 2010 16:51:56 +0200 Subject: [PATCH] openjdk/zero: only use FPU opcodes if FPU is available In-Reply-To: <4C21FEC7.1020905@redhat.com> References: <20100621195007.GA8283@Chamillionaire.breakpoint.cc> <20100622084750.GA3420@redhat.com> <20100623072138.GA22204@Chamillionaire.breakpoint.cc> <20100623082921.GA3316@redhat.com> <4C21FEC7.1020905@redhat.com> Message-ID: <20100623145156.GA25814@Chamillionaire.breakpoint.cc> * Andrew Haley | 2010-06-23 13:32:07 [+0100]: >> Basically, if you just want to run stuff then it's ok to bypass >> that piece of assembler, but if you want to certify the builds >> for whatever reason then you will need to figure out some other >> way to do a 64-bit atomic copy. > >Which is pretty easy: > >static void atomic_copy64(volatile void *src, volatile void *dst) { > pthread_mutex_lock(&the_mutex); > *dst = *src; > pthread_mutex_unlock(&the_mutex); >} > >... assuming that's the only place volatile doubles are ever touched. I though about that. With this you need to grab the same mutex in every read section. >Andrew. Sebastian From aph at redhat.com Wed Jun 23 08:21:21 2010 From: aph at redhat.com (Andrew Haley) Date: Wed, 23 Jun 2010 16:21:21 +0100 Subject: [PATCH] openjdk/zero: only use FPU opcodes if FPU is available In-Reply-To: <20100623145156.GA25814@Chamillionaire.breakpoint.cc> References: <20100621195007.GA8283@Chamillionaire.breakpoint.cc> <20100622084750.GA3420@redhat.com> <20100623072138.GA22204@Chamillionaire.breakpoint.cc> <20100623082921.GA3316@redhat.com> <4C21FEC7.1020905@redhat.com> <20100623145156.GA25814@Chamillionaire.breakpoint.cc> Message-ID: <4C222671.6090508@redhat.com> On 06/23/2010 03:51 PM, Sebastian Andrzej Siewior wrote: > * Andrew Haley | 2010-06-23 13:32:07 [+0100]: > >>> Basically, if you just want to run stuff then it's ok to bypass >>> that piece of assembler, but if you want to certify the builds >>> for whatever reason then you will need to figure out some other >>> way to do a 64-bit atomic copy. >> >> Which is pretty easy: >> >> static void atomic_copy64(volatile void *src, volatile void *dst) { >> pthread_mutex_lock(&the_mutex); >> *dst = *src; >> pthread_mutex_unlock(&the_mutex); >> } >> >> ... assuming that's the only place volatile doubles are ever touched. > > I though about that. With this you need to grab the same mutex in every > read section. Mmm, but it is correct! :-) But this is fixable, if you really care about volatile long performance. Answer below... Andrew. pthread_mutex_t mutexes[SIZE]; static void atomic_copy64(volatile void *src, volatile void *dst) { uintptr_t a1 = (uintptr_t)src; uintptr_t a2 = (uintptr_t)dst; a1 %= SIZE; a2 %= SIZE; if (a1 > a2) { // swap a1 and a2; } retry: pthread_mutex_lock(mutexes[a1]); if (pthread_mutex_trylock(mutexes[a2])) { pthread_mutex_unlock(mutexes[a1]); goto retry; } else { *dst = *src; } pthread_mutex_unlock(mutexes[a2]); pthread_mutex_unlock(mutexes[a1]); } From tom.rodriguez at oracle.com Wed Jun 23 10:24:58 2010 From: tom.rodriguez at oracle.com (Tom Rodriguez) Date: Wed, 23 Jun 2010 10:24:58 -0700 Subject: [PATCH] openjdk/zero: only use FPU opcodes if FPU is available In-Reply-To: <20100623092233.GC3316@redhat.com> References: <20100621195007.GA8283@Chamillionaire.breakpoint.cc> <20100622084750.GA3420@redhat.com> <20100623072138.GA22204@Chamillionaire.breakpoint.cc> <20100623082921.GA3316@redhat.com> <20100623090305.GA23103@Chamillionaire.breakpoint.cc> <20100623092233.GC3316@redhat.com> Message-ID: <6DC2F962-042B-4481-A036-AE0D3441578C@oracle.com> On Jun 23, 2010, at 2:22 AM, Gary Benson wrote: > Sebastian Andrzej Siewior wrote: >> * Gary Benson | 2010-06-23 09:29:21 [+0100]: >>> Basically, if you just want to run stuff then it's ok to bypass >>> that piece of assembler, but if you want to certify the builds >>> for whatever reason then you will need to figure out some other >>> way to do a 64-bit atomic copy. >> >> Is it garanteed that the adress I'm reading from and writing to is >> properly aligned on a 64bit address boundary? > > Not sure. I guess that's a question for one of the HotSpot guys: > are long and double fields 64-bit aligned on 32-bit machines? Or, > if not, is it possible to make them be? Yes they are 64 bit aligned. They have to be for volatile longs and doubles to work efficiently. tom > >>>>> Have you signed the SCA? If so I can (or you can) make a >>>>> webrev for this and submit it for inclusion. >>>> >>>> I haven't. >>> >>> Are you able to sign it? >> >> I clicked that link but I ended somewhere at oracle.com with 404. > > So it does. Maybe someone from Oracle could point you to the correct > page? > > Cheers, > Gary > > -- > http://gbenson.net/ From daniel.daugherty at oracle.com Wed Jun 23 10:35:45 2010 From: daniel.daugherty at oracle.com (Daniel D. Daugherty) Date: Wed, 23 Jun 2010 11:35:45 -0600 Subject: [Fwd: Second Code Review for WeakReference leak in the Logging API (6942989)] Message-ID: <4C2245F1.8070905@oracle.com> Joe, I think you might want this one for OpenJDK6. That will allow Google to sync their fix with mine. Only two changes were made after the second round of code review: *** LogManager.java Fri Jun 18 09:51:33 2010 --- /work/shared/bug_hunt/jdk7/exp/src/share/classes/java/util/logging/LogManager.java Wed Jun 23 11:29:49 2010 *************** *** 423,430 **** // that have been GC'ed. private final ReferenceQueue loggerRefQueue = new ReferenceQueue(); ! ! // Package-level method. // Helper class for managing WeakReferences to Logger objects. // // LogManager.namedLoggers --- 423,430 ---- // that have been GC'ed. private final ReferenceQueue loggerRefQueue = new ReferenceQueue(); ! ! // Package-level inner class. // Helper class for managing WeakReferences to Logger objects. // // LogManager.namedLoggers *************** *** 454,460 **** name = logger.getName(); // save for namedLoggers cleanup } ! // dispose of this LoggerWeakRef object void dispose() { if (node != null) { --- 454,460 ---- name = logger.getName(); // save for namedLoggers cleanup } ! // dispose of this LoggerWeakRef object void dispose() { if (node != null) { jcheck caught trailing whitespace and one comment correction caught by Tony P. Let me know if you want this fix... Dan -------- Original Message -------- Subject: Second Code Review for WeakReference leak in the Logging API (6942989) Date: Fri, 18 Jun 2010 13:25:55 -0600 From: Daniel D. Daugherty Reply-To: daniel.daugherty at oracle.com To: serviceability-dev at openjdk.java.net , hotspot-runtime-dev at openjdk.java.net Greetings, I have a new version of my fix for the WeakReference leak in the Logging API done. This version uses ReferenceQueues; thanks to Eamonn McManus, Jeremy Manson and Tony Printezis for their insights on using ReferenceQueues. Here's a pointer to Tony's paper for background info: http://java.sun.com/developer/technicalArticles/javase/finalization/ This version also has limits on the number of dead Loggers that are cleaned up per call; thanks to Alan Bateman for politely pushing me in that direction. The webrev is again relative to OpenJDK7, but the bug is escalated so the fix will be backported to the JDK6-Update train. So again, I'll need a minimum of two code reviewers. Here is the URL for the webrev: http://cr.openjdk.java.net/~dcubed/6942989-webrev/1/ Thanks, in advance, for any reviews. Dan From jonathan.gibbons at oracle.com Wed Jun 23 15:18:02 2010 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Wed, 23 Jun 2010 15:18:02 -0700 Subject: Request to backport: 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly Message-ID: <4C22881A.1060703@oracle.com> Joe, I would like to backport the following changeset to 6-open. -- Jon changeset: 427:2485f5641ed0 tag: jdk7-b75 user: jjg date: Mon Oct 19 13:38:09 2009 -0700 summary: 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly From joe.darcy at oracle.com Wed Jun 23 16:04:05 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Wed, 23 Jun 2010 16:04:05 -0700 Subject: Request to backport: 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly In-Reply-To: <4C22881A.1060703@oracle.com> References: <4C22881A.1060703@oracle.com> Message-ID: <4C2292E5.2030401@oracle.com> Hi Jon. Approved to be backported. Thanks, -Joe Jonathan Gibbons wrote: > Joe, > > I would like to backport the following changeset to 6-open. > > -- Jon > > > changeset: 427:2485f5641ed0 > tag: jdk7-b75 > user: jjg > date: Mon Oct 19 13:38:09 2009 -0700 > summary: 6889255: javac MethodSymbol throws NPE if ClassReader > does not read parameter names correctly > From jonathan.gibbons at oracle.com Wed Jun 23 16:44:45 2010 From: jonathan.gibbons at oracle.com (jonathan.gibbons at oracle.com) Date: Wed, 23 Jun 2010 23:44:45 +0000 Subject: hg: jdk6/jdk6/langtools: 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly Message-ID: <20100623234448.2CC87474C3@hg.openjdk.java.net> Changeset: 27f03394a69d Author: jjg Date: 2010-06-23 16:44 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/27f03394a69d 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/code/Symbol.java ! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java + test/tools/javac/6889255/T6889255.java From joe.darcy at oracle.com Wed Jun 23 18:03:28 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Wed, 23 Jun 2010 18:03:28 -0700 Subject: [Fwd: Second Code Review for WeakReference leak in the Logging API (6942989)] In-Reply-To: <4C2245F1.8070905@oracle.com> References: <4C2245F1.8070905@oracle.com> Message-ID: <4C22AEE0.1000008@oracle.com> Hi Dan. Yes, that would be a fine fix for OpenJDK 6; approved to be pushed! The current build number is b21. Thanks, -Joe Daniel D. Daugherty wrote: > Joe, > > I think you might want this one for OpenJDK6. That will allow Google > to sync their fix with mine. > > Only two changes were made after the second round of code review: > > *** LogManager.java Fri Jun 18 09:51:33 2010 > --- > /work/shared/bug_hunt/jdk7/exp/src/share/classes/java/util/logging/LogManager.java > Wed Jun 23 11:29:49 2010 > *************** > *** 423,430 **** > // that have been GC'ed. > private final ReferenceQueue loggerRefQueue > = new ReferenceQueue(); > ! ! // Package-level method. > // Helper class for managing WeakReferences to Logger objects. > // > // LogManager.namedLoggers > --- 423,430 ---- > // that have been GC'ed. > private final ReferenceQueue loggerRefQueue > = new ReferenceQueue(); > ! > ! // Package-level inner class. > // Helper class for managing WeakReferences to Logger objects. > // > // LogManager.namedLoggers > *************** > *** 454,460 **** > > name = logger.getName(); // save for namedLoggers cleanup > } > ! // dispose of this LoggerWeakRef object > void dispose() { > if (node != null) { > --- 454,460 ---- > > name = logger.getName(); // save for namedLoggers cleanup > } > ! > // dispose of this LoggerWeakRef object > void dispose() { > if (node != null) { > > jcheck caught trailing whitespace and one comment correction caught > by Tony P. > > Let me know if you want this fix... > > Dan > > > -------- Original Message -------- > Subject: Second Code Review for WeakReference leak in the Logging > API (6942989) > Date: Fri, 18 Jun 2010 13:25:55 -0600 > From: Daniel D. Daugherty > Reply-To: daniel.daugherty at oracle.com > To: serviceability-dev at openjdk.java.net > , > hotspot-runtime-dev at openjdk.java.net > > > > Greetings, > > I have a new version of my fix for the WeakReference leak in the > Logging API done. This version uses ReferenceQueues; thanks to Eamonn > McManus, Jeremy Manson and Tony Printezis for their insights on using > ReferenceQueues. Here's a pointer to Tony's paper for background info: > > http://java.sun.com/developer/technicalArticles/javase/finalization/ > > This version also has limits on the number of dead Loggers that are > cleaned up per call; thanks to Alan Bateman for politely pushing me in > that direction. > > The webrev is again relative to OpenJDK7, but the bug is escalated so > the fix will be backported to the JDK6-Update train. So again, I'll > need a minimum of two code reviewers. > > Here is the URL for the webrev: > > http://cr.openjdk.java.net/~dcubed/6942989-webrev/1/ > > Thanks, in advance, for any reviews. > > Dan > > > From ahughes at redhat.com Thu Jun 24 08:36:18 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 24 Jun 2010 16:36:18 +0100 Subject: [Fwd: Second Code Review for WeakReference leak in the Logging API (6942989)] In-Reply-To: <4C22AEE0.1000008@oracle.com> References: <4C2245F1.8070905@oracle.com> <4C22AEE0.1000008@oracle.com> Message-ID: On 24 June 2010 02:03, Joe Darcy wrote: > Hi Dan. > > Yes, that would be a fine fix for OpenJDK 6; approved to be pushed! ?The > current build number is b21. > I thought we were supposed to allow fixes to soak in OpenJDK7 first? > Thanks, > > -Joe > > Daniel D. Daugherty wrote: >> >> Joe, >> >> I think you might want this one for OpenJDK6. That will allow Google >> to sync their fix with mine. >> >> Only two changes were made after the second round of code review: >> >> *** LogManager.java ? ? Fri Jun 18 09:51:33 2010 >> --- >> /work/shared/bug_hunt/jdk7/exp/src/share/classes/java/util/logging/LogManager.java >> ?Wed Jun 23 11:29:49 2010 >> *************** >> *** 423,430 **** >> ? ? // that have been GC'ed. >> ? ? private final ReferenceQueue loggerRefQueue >> ? ? ? ? = new ReferenceQueue(); >> ! ? ! ? ? // Package-level method. >> ? ? // Helper class for managing WeakReferences to Logger objects. >> ? ? // >> ? ? // LogManager.namedLoggers >> --- 423,430 ---- >> ? ? // that have been GC'ed. >> ? ? private final ReferenceQueue loggerRefQueue >> ? ? ? ? = new ReferenceQueue(); >> ! >> ! ? ? // Package-level inner class. >> ? ? // Helper class for managing WeakReferences to Logger objects. >> ? ? // >> ? ? // LogManager.namedLoggers >> *************** >> *** 454,460 **** >> >> ? ? ? ? ? ? name = logger.getName(); ?// save for namedLoggers cleanup >> ? ? ? ? } >> ! ? ? ? ? ? ?// dispose of this LoggerWeakRef object >> ? ? ? ? void dispose() { >> ? ? ? ? ? ? if (node != null) { >> --- 454,460 ---- >> >> ? ? ? ? ? ? name = logger.getName(); ?// save for namedLoggers cleanup >> ? ? ? ? } >> ! >> ? ? ? ? // dispose of this LoggerWeakRef object >> ? ? ? ? void dispose() { >> ? ? ? ? ? ? if (node != null) { >> >> jcheck caught trailing whitespace and one comment correction caught >> by Tony P. >> >> Let me know if you want this fix... >> >> Dan >> >> >> -------- Original Message -------- >> Subject: ? ? Second Code Review for WeakReference leak in the Logging API >> (6942989) >> Date: ? ? Fri, 18 Jun 2010 13:25:55 -0600 >> From: ? ? Daniel D. Daugherty >> Reply-To: ? ? daniel.daugherty at oracle.com >> To: ? ? serviceability-dev at openjdk.java.net >> , hotspot-runtime-dev at openjdk.java.net >> >> >> >> Greetings, >> >> I have a new version of my fix for the WeakReference leak in the >> Logging API done. This version uses ReferenceQueues; thanks to Eamonn >> McManus, Jeremy Manson and Tony Printezis for their insights on using >> ReferenceQueues. Here's a pointer to Tony's paper for background info: >> >> ? http://java.sun.com/developer/technicalArticles/javase/finalization/ >> >> This version also has limits on the number of dead Loggers that are >> cleaned up per call; thanks to Alan Bateman for politely pushing me in >> that direction. >> >> The webrev is again relative to OpenJDK7, but the bug is escalated so >> the fix will be backported to the JDK6-Update train. So again, I'll >> need a minimum of two code reviewers. >> >> Here is the URL for the webrev: >> >> ? http://cr.openjdk.java.net/~dcubed/6942989-webrev/1/ >> >> Thanks, in advance, for any reviews. >> >> Dan >> >> >> > > -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From joe.darcy at oracle.com Thu Jun 24 12:14:47 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Thu, 24 Jun 2010 12:14:47 -0700 Subject: [Fwd: Second Code Review for WeakReference leak in the Logging API (6942989)] In-Reply-To: References: <4C2245F1.8070905@oracle.com> <4C22AEE0.1000008@oracle.com> Message-ID: <4C23AEA7.60701@oracle.com> Andrew John Hughes wrote: > On 24 June 2010 02:03, Joe Darcy wrote: > >> Hi Dan. >> >> Yes, that would be a fine fix for OpenJDK 6; approved to be pushed! The >> current build number is b21. >> >> > > I thought we were supposed to allow fixes to soak in OpenJDK7 first? > That is generally true, but some fixes are better done in a more simultaneous fashion in multiple release trains. -Joe From ahughes at redhat.com Thu Jun 24 13:47:18 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 24 Jun 2010 21:47:18 +0100 Subject: Bug in html entities build In-Reply-To: References: <4C23B555.3030308@redhat.com> Message-ID: On 24 June 2010 21:46, Andrew John Hughes wrote: > On 24 June 2010 20:43, Omair Majid wrote: >> Hi, >> >> I discovered a bug in the build process: html entities are not built from >> scratch. I have filed the bug at [1] and posted a more detailed explanation. >> I would appreciate it if someone could review it. >> >> Thanks, >> Omair >> >> >> [1] http://bugs.openjdk.java.net/show_bug.cgi?id=100049 >> > > html32.bdtd was removed from OpenJDK7: > http://hg.openjdk.java.net/jdk7/swing/jdk/rev/fc1ac6ea933c > -- > Andrew :-) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 > Joe, ok to backport this fix to 6? -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From daniel.daugherty at oracle.com Fri Jun 25 22:15:13 2010 From: daniel.daugherty at oracle.com (daniel.daugherty at oracle.com) Date: Sat, 26 Jun 2010 05:15:13 +0000 Subject: hg: jdk6/jdk6/jdk: 6942989: 2/2 Memory leak of java.lang.ref.WeakReference objects Message-ID: <20100626051521.8ED424754A@hg.openjdk.java.net> Changeset: 2b1a7d4b9ac6 Author: dcubed Date: 2010-06-25 11:53 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/2b1a7d4b9ac6 6942989: 2/2 Memory leak of java.lang.ref.WeakReference objects Summary: Use ReferenceQueues to manage WeakReferences in LogManager and Logger. Reviewed-by: dholmes, alanb, emcmanus, tonyp Contributed-by: jeremymanson at google.com ! src/share/classes/java/util/logging/LogManager.java ! src/share/classes/java/util/logging/Logger.java + test/java/util/logging/AnonLoggerWeakRefLeak.java + test/java/util/logging/AnonLoggerWeakRefLeak.sh + test/java/util/logging/LoggerWeakRefLeak.java + test/java/util/logging/LoggerWeakRefLeak.sh From mstjohns at comcast.net Sun Jun 27 14:37:59 2010 From: mstjohns at comcast.net (Michael StJohns) Date: Sun, 27 Jun 2010 17:37:59 -0400 Subject: [security-dev 01547]: Re: PING: [PATCH FOR REVIEW]: 6763530: Fix breakage of NSS-based Elliptic Curve Cryptography in OpenJDK6 In-Reply-To: <7.1.0.9.2.20100121122520.06efb5c0@comcast.net> References: <17c6771e0909220318l4cdecc25v54844e73c7916708@mail.gmail.com> <4ABBAD55.7070206@sun.com> <20100120180532.909D064A2@mail.openjdk.java.net> <17c6771e1001201416m4d44ab72o58bf51ffd453827a@mail.gmail.com> <4B5805DD.8060101@primekey.se> <4B582889.6080903@sun.com> <7.1.0.9.2.20100121122520.06efb5c0@comcast.net> Message-ID: <20100627213951.698C3627C@mail.openjdk.java.net> Hi guys - I see from the Mercurial logs that this went in to both the jdk6 and jdk7 repositories. For jdk6 - it's rev 302 which looks like this should have ended up in the _19 release But all the files in lib/ext/sunpkcs11.jar for _20 are all tagged as 1 September 2009.... Is the sunpkcs11.jar provider not getting regenerated and rebundled during the release process? Mike At 01:28 PM 1/21/2010, Michael StJohns wrote: >At 05:12 AM 1/21/2010, Vincent Ryan wrote: >>I hear ya. Sorry for the delay on this. I'll push the fix for OpenJDK today. > > > >>On 21/01/2010 07:44, Tomas Gustavsson wrote: >>> >>> Now it has one more vote. >>> >>> /Tomas >>> >>> Andrew John Hughes wrote: >>>> 2010/1/20 Tomas Gustavsson : >>>>> I'll second this request. This is a critical patch and many production >>>>> installations have to live with this manually patched now. >>>>> >>>>> I know of no pkcs11 implementation that works with the current code. >>>>> >>>> >>>> It has four votes: >>>> http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6763530 >>>> I don't know how many they need to wake up and review the patch. >>>> >>>> The new release of IcedTea6 1.7 is imminent and will include the fix >>>> so it should at least be resolved on the next version shipping with >>>> most GNU/Linux distributions. >>>> >>>>> Regards, >>>>> Tomas Gustavsson >>>>> PrimeKey Solutions AB >>>>> >>>>> >>>>> On Wed, 20 Jan 2010, Michael StJohns wrote: >>>>> >>>>>> Hi - this seems to have stalled out again. Any chance of revival? >>>>>> >>>>>> Mike >>>>>> >>>>>> >>>>>> At 12:33 PM 9/24/2009, Vincent Ryan wrote: >>>>>>> Hello Andrew, >>>>>>> >>>>>>> I'll need a little more time to come up to speed on this fix. I'm >>>>>>> concerned that >>>>>>> there may be interoperability or backwards compatibility issues. >>>>>>> >>>>>>> >>>>>>> >>>>>>> Andrew John Hughes wrote: >>>>>>>> 2009/9/2 Andrew John Hughes : >>>>>>>>> 2009/9/2 Michael StJohns : >>>>>>>>>> At 09:38 PM 9/1/2009, Andrew John Hughes wrote: >>>>>>>>>>> 2009/9/2 Michael StJohns : >>>>>>>>>>>> ??? This appears to be related specifically to PKCS11.??? >>? >>>>>>>>>>>> Specifically, PKCS11 >>>>>>>>>>>> v2.20 has some ambiguity of the representation of an EC point >>>>>>>>>>>> (which >>>>>>>>>>>> is >>>>>>>>>>>> different in the text than an ASN1 ECPoint). >>>>>>>>>>>> >>>>>>>>>>>> This is being clarified in v2.30 with the unencoded point format >>>>>>>>>>>> (e.g.the >>>>>>>>>>>> format described in??? X9.62, where the first octet indicates the >>>>>>>>>>>> encoding and >>>>>>>>>>>> there are either N or 2N octets following)??? being the expected >>>>>>>>>>>> value, but >>>>>>>>>>>> with PKCS11 providers allowed - legacy - to accept either. >>>>>>>>>>>> >>>>>>>>>>>> One of the reasons for going that way was how the JDK PKCS11 >>>>>>>>>>>> provider had >>>>>>>>>>>> interpreted the issue and implemented its code. >>>>>>>>>>>> >>>>>>>>>>>> I don't support this fix - among other things, this fix only >>>>>>>>>>>> deals >>>>>>>>>>>> with 1/2 >>>>>>>>>>>> of the problem.??? The other half is related to encoding the >>>>>>>>>>>> value.??? Also, >>>>>>>>>>>> changing the code at decodePoint seems further into the stack >>>>>>>>>>>> than >>>>>>>>>>>> needed >>>>>>>>>>>> and may affect other uses of that method. >>>>>>>>>>>> >>>>>>>>>>> That's really too vague to be of much help in improving the patch. >>>>>>>>>>> You seem to be saying little more than 'I don't like it'. >>>>>>>>>> Sorry about that. My point was that your patch didn't completely >>>>>>>>>> solve the problem and that the point at where you were fixing it >>>>>>>>>> could have >>>>>>>>>> some bad side effects for anyone calling decodePoint directly. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>>> There's an existing JDK bug on this coming at it from a different >>>>>>>>>>>> direction >>>>>>>>>>>> - 6763530 ... and there may be considerations at >>>>>>>>>>>> >>>>>>>>>>>> https://bugzilla.mozilla.org/show_bug.cgi?id=480280 >>>>>>>>>>>> >>>>>>>>>>> It seems likely that's the NSS change that causes the current >>>>>>>>>>> failure. >>>>>>>>>>> The fix I submitted here is based on the way this is handle in >>>>>>>>>>> NSS. >>>>>>>>>>> In fact, the code is similar enough to suggest that one was >>>>>>>>>>> developed >>>>>>>>>>> from the other. >>>>>>>>>>>> ??? that should be looked at. >>>>>>>>>>> The JDK bug is not really 'from a different direction', it's >>>>>>>>>>> reporting >>>>>>>>>>> exactly the same error but from a less trivial example (I get the >>>>>>>>>>> same >>>>>>>>>>> failure while trying to create an example key, while this seems to >>>>>>>>>>> require specific hardware if I'm reading it correctly). >>>>>>>>>> Not exactly. You're using the NSS as a PKCS11 module - this >>>>>>>>>> problem >>>>>>>>>> would occur with any PKCS11 module that implements EC stuff. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>> Also see 6779460 which is mostly a duplicate of >>>>>>>>>>>> 6763530. >>>>>>>>>>>> >>>>>>>>>>> The patch on 6779460 seems wrong. It means that the method will >>>>>>>>>>> return a DER-encoded value where it would either have returned an >>>>>>>>>>> uncompressed value before or failed. >>>>>>>>>> My point exactly as I mentioned in the comments. :-) >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>>> It's probable that the fix I suggested at 6763530??? (in comments >>>>>>>>>>>> submitted 29 >>>>>>>>>>>> Nov 08) may be a better approach given the NSS fixes.??? I >>>>>>>>>>>> believe >>>>>>>>>>>> it will fix >>>>>>>>>>>> the keytool problem noted in the original message. >>>>>>>>>>>> >>>>>>>>>>> Ok, I can see the logic in the fix and it would appear to work, >>>>>>>>>>> though >>>>>>>>>>> I haven't tested it. >>>>>>>>>>> Given the patch was written nine months ago, why has it not been >>>>>>>>>>> applied? If it had, it would have saved me hours having to debug >>>>>>>>>>> this >>>>>>>>>>> same issue again. >>>>>>>>>> Yup. I did do a search for PKCS11 related bugs when I >>>>>>>>>> encountered the >>>>>>>>>> same problem and did find the original error. >>>>>>>>>> >>>>>>>>>>> Do you have an SCA with Sun? If so, I'll create a webrev based on >>>>>>>>>>> your >>>>>>>>>>> patch and we can finally get this fixed. Without it, NSS >>>>>>>>>>> support is >>>>>>>>>>> completely broken in OpenJDK6 which makes me wonder why this is >>>>>>>>>>> a low >>>>>>>>>>> priority bug! >>>>>>>>>> I do have an SCA on file. Note that the recommendation from the >>>>>>>>>> NSS >>>>>>>>>> guys was to raise the priority. >>>>>>>>>> >>>>>>>>>> The reason I haven't submitted this is because I submitted a >>>>>>>>>> different >>>>>>>>>> EC fix https://bugs.openjdk.java.net/show_bug.cgi?id=100048 per >>>>>>>>>> the >>>>>>>>>> documented process >>>>>>>>>> and was waiting on progress there before continuing. I've got a >>>>>>>>>> number of EC and PKCS11 related fixes I'd like to submit, but I >>>>>>>>>> was trying >>>>>>>>>> for a worked example before proceeding. And then I got busy >>>>>>>>>> with some other >>>>>>>>>> things... >>>>>>>>>> >>>>>>>>>> Mike >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>>> Mike >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> At 04:39 PM 9/1/2009, Joe Darcy wrote: >>>>>>>>>>>> >>>>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>>>> >>>>>>>>>>>> 2009/8/28 Andrew John Hughes : >>>>>>>>>>>> >>>>>>>>>>>> In OpenJDK6, the elliptic curve cryptography algorithms are >>>>>>>>>>>> available >>>>>>>>>>>> if the PKCS11 provider is configured to point to NSS. See: >>>>>>>>>>>> >>>>>>>>>>>> http://blogs.sun.com/andreas/entry/the_java_pkcs_11_provider >>>>>>>>>>>> >>>>>>>>>>>> If NSS is configured as specified in this blog, keytool can be >>>>>>>>>>>> used >>>>>>>>>>>> to >>>>>>>>>>>> generate a key as follows: >>>>>>>>>>>> >>>>>>>>>>>> Hello. >>>>>>>>>>>> >>>>>>>>>>>> Allowing keytool and friends to work in more cases if the >>>>>>>>>>>> provider >>>>>>>>>>>> is >>>>>>>>>>>> capable seems fine to me. >>>>>>>>>>>> >>>>>>>>>>>> Security team, do you have concerns about this patch? >>>>>>>>>>>> >>>>>>>>>>>> Thanks, >>>>>>>>>>>> >>>>>>>>>>>> -Joe >>>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> -- >>>>>>>>>>> Andrew :-) >>>>>>>>>>> >>>>>>>>>>> Free Java Software Engineer >>>>>>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>>>>>> >>>>>>>>>>> Support Free Java! >>>>>>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>>>>>> http://www.gnu.org/software/classpath >>>>>>>>>>> http://openjdk.java.net >>>>>>>>>>> >>>>>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>>>>>>>> >>>>>>>>> Ok here is a new webrev: >>>>>>>>> >>>>>>>>> http://cr.openjdk.java.net/~andrew/6763530/webrev.02/ >>>>>>>>> >>>>>>>>> with a slightly revised version of your change (you can't throw a >>>>>>>>> PKCS11Exception which only takes a long ID from the native code, >>>>>>>>> so I >>>>>>>>> changed this to an IllegalArgumentException). >>>>>>>>> >>>>>>>>> Security team, does this look ok to push? >>>>>>>>> -- >>>>>>>>> Andrew :-) >>>>>>>>> >>>>>>>>> Free Java Software Engineer >>>>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>>>> >>>>>>>>> Support Free Java! >>>>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>>>> http://www.gnu.org/software/classpath >>>>>>>>> http://openjdk.java.net >>>>>>>>> >>>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>>>>>>> >>>>>>>> Ping! Security developers, any thoughts on this patch: >>>>>>>> >>>>>>>> http://cr.openjdk.java.net/~andrew/6763530/webrev.02/ >>>>>>>> >>>>>>>> Does it look ok to push? >>>>>>>> >>>>>>>> Thanks, >>>> >>>> >>>> From mstjohns at comcast.net Sun Jun 27 15:45:04 2010 From: mstjohns at comcast.net (Michael StJohns) Date: Sun, 27 Jun 2010 18:45:04 -0400 Subject: [security-dev 01547]: Re: PING: [PATCH FOR REVIEW]: 6763530: Fix breakage of NSS-based Elliptic Curve Cryptography in OpenJDK6 In-Reply-To: <7.1.0.9.2.20100627173049.006b4098@comcast.net> References: <17c6771e0909220318l4cdecc25v54844e73c7916708@mail.gmail.com> <4ABBAD55.7070206@sun.com> <20100120180532.909D064A2@mail.openjdk.java.net> <17c6771e1001201416m4d44ab72o58bf51ffd453827a@mail.gmail.com> <4B5805DD.8060101@primekey.se> <4B582889.6080903@sun.com> <7.1.0.9.2.20100121122520.06efb5c0@comcast.net> <7.1.0.9.2.20100627173049.006b4098@comcast.net> Message-ID: <20100627224513.4467C62AD@mail.openjdk.java.net> PS - I know this is the openjdk list - but I thought this one was getting back ported. Mike At 05:37 PM 6/27/2010, Michael StJohns wrote: >Hi guys - > >I see from the Mercurial logs that this went in to both the jdk6 and jdk7 repositories. For jdk6 - it's rev 302 which looks like this should have ended up in the _19 release > >But all the files in lib/ext/sunpkcs11.jar for _20 are all tagged as 1 September 2009.... > >Is the sunpkcs11.jar provider not getting regenerated and rebundled during the release process? > >Mike > > > >At 01:28 PM 1/21/2010, Michael StJohns wrote: >>At 05:12 AM 1/21/2010, Vincent Ryan wrote: >>>I hear ya. Sorry for the delay on this. I'll push the fix for OpenJDK today. >> >> >> >>>On 21/01/2010 07:44, Tomas Gustavsson wrote: >>>> >>>> Now it has one more vote. >>>> >>>> /Tomas >>>> >>>> Andrew John Hughes wrote: >>>>> 2010/1/20 Tomas Gustavsson : >>>>>> I'll second this request. This is a critical patch and many production >>>>>> installations have to live with this manually patched now. >>>>>> >>>>>> I know of no pkcs11 implementation that works with the current code. >>>>>> >>>>> >>>>> It has four votes: >>>>> http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6763530 >>>>> I don't know how many they need to wake up and review the patch. >>>>> >>>>> The new release of IcedTea6 1.7 is imminent and will include the fix >>>>> so it should at least be resolved on the next version shipping with >>>>> most GNU/Linux distributions. >>>>> >>>>>> Regards, >>>>>> Tomas Gustavsson >>>>>> PrimeKey Solutions AB >>>>>> >>>>>> >>>>>> On Wed, 20 Jan 2010, Michael StJohns wrote: >>>>>> >>>>>>> Hi - this seems to have stalled out again. Any chance of revival? >>>>>>> >>>>>>> Mike >>>>>>> >>>>>>> >>>>>>> At 12:33 PM 9/24/2009, Vincent Ryan wrote: >>>>>>>> Hello Andrew, >>>>>>>> >>>>>>>> I'll need a little more time to come up to speed on this fix. I'm >>>>>>>> concerned that >>>>>>>> there may be interoperability or backwards compatibility issues. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> Andrew John Hughes wrote: >>>>>>>>> 2009/9/2 Andrew John Hughes : >>>>>>>>>> 2009/9/2 Michael StJohns : >>>>>>>>>>> At 09:38 PM 9/1/2009, Andrew John Hughes wrote: >>>>>>>>>>>> 2009/9/2 Michael StJohns : >>>>>>>>>>>>> ??? This appears to be related specifically to PKCS11.??? >>>? >>>>>>>>>>>>> Specifically, PKCS11 >>>>>>>>>>>>> v2.20 has some ambiguity of the representation of an EC point >>>>>>>>>>>>> (which >>>>>>>>>>>>> is >>>>>>>>>>>>> different in the text than an ASN1 ECPoint). >>>>>>>>>>>>> >>>>>>>>>>>>> This is being clarified in v2.30 with the unencoded point format >>>>>>>>>>>>> (e.g.the >>>>>>>>>>>>> format described in??? X9.62, where the first octet indicates the >>>>>>>>>>>>> encoding and >>>>>>>>>>>>> there are either N or 2N octets following)??? being the expected >>>>>>>>>>>>> value, but >>>>>>>>>>>>> with PKCS11 providers allowed - legacy - to accept either. >>>>>>>>>>>>> >>>>>>>>>>>>> One of the reasons for going that way was how the JDK PKCS11 >>>>>>>>>>>>> provider had >>>>>>>>>>>>> interpreted the issue and implemented its code. >>>>>>>>>>>>> >>>>>>>>>>>>> I don't support this fix - among other things, this fix only >>>>>>>>>>>>> deals >>>>>>>>>>>>> with 1/2 >>>>>>>>>>>>> of the problem.??? The other half is related to encoding the >>>>>>>>>>>>> value.??? Also, >>>>>>>>>>>>> changing the code at decodePoint seems further into the stack >>>>>>>>>>>>> than >>>>>>>>>>>>> needed >>>>>>>>>>>>> and may affect other uses of that method. >>>>>>>>>>>>> >>>>>>>>>>>> That's really too vague to be of much help in improving the patch. >>>>>>>>>>>> You seem to be saying little more than 'I don't like it'. >>>>>>>>>>> Sorry about that. My point was that your patch didn't completely >>>>>>>>>>> solve the problem and that the point at where you were fixing it >>>>>>>>>>> could have >>>>>>>>>>> some bad side effects for anyone calling decodePoint directly. >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>>>> There's an existing JDK bug on this coming at it from a different >>>>>>>>>>>>> direction >>>>>>>>>>>>> - 6763530 ... and there may be considerations at >>>>>>>>>>>>> >>>>>>>>>>>>> https://bugzilla.mozilla.org/show_bug.cgi?id=480280 >>>>>>>>>>>>> >>>>>>>>>>>> It seems likely that's the NSS change that causes the current >>>>>>>>>>>> failure. >>>>>>>>>>>> The fix I submitted here is based on the way this is handle in >>>>>>>>>>>> NSS. >>>>>>>>>>>> In fact, the code is similar enough to suggest that one was >>>>>>>>>>>> developed >>>>>>>>>>>> from the other. >>>>>>>>>>>>> ??? that should be looked at. >>>>>>>>>>>> The JDK bug is not really 'from a different direction', it's >>>>>>>>>>>> reporting >>>>>>>>>>>> exactly the same error but from a less trivial example (I get the >>>>>>>>>>>> same >>>>>>>>>>>> failure while trying to create an example key, while this seems to >>>>>>>>>>>> require specific hardware if I'm reading it correctly). >>>>>>>>>>> Not exactly. You're using the NSS as a PKCS11 module - this >>>>>>>>>>> problem >>>>>>>>>>> would occur with any PKCS11 module that implements EC stuff. >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>>> Also see 6779460 which is mostly a duplicate of >>>>>>>>>>>>> 6763530. >>>>>>>>>>>>> >>>>>>>>>>>> The patch on 6779460 seems wrong. It means that the method will >>>>>>>>>>>> return a DER-encoded value where it would either have returned an >>>>>>>>>>>> uncompressed value before or failed. >>>>>>>>>>> My point exactly as I mentioned in the comments. :-) >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>>>> It's probable that the fix I suggested at 6763530??? (in comments >>>>>>>>>>>>> submitted 29 >>>>>>>>>>>>> Nov 08) may be a better approach given the NSS fixes.??? I >>>>>>>>>>>>> believe >>>>>>>>>>>>> it will fix >>>>>>>>>>>>> the keytool problem noted in the original message. >>>>>>>>>>>>> >>>>>>>>>>>> Ok, I can see the logic in the fix and it would appear to work, >>>>>>>>>>>> though >>>>>>>>>>>> I haven't tested it. >>>>>>>>>>>> Given the patch was written nine months ago, why has it not been >>>>>>>>>>>> applied? If it had, it would have saved me hours having to debug >>>>>>>>>>>> this >>>>>>>>>>>> same issue again. >>>>>>>>>>> Yup. I did do a search for PKCS11 related bugs when I >>>>>>>>>>> encountered the >>>>>>>>>>> same problem and did find the original error. >>>>>>>>>>> >>>>>>>>>>>> Do you have an SCA with Sun? If so, I'll create a webrev based on >>>>>>>>>>>> your >>>>>>>>>>>> patch and we can finally get this fixed. Without it, NSS >>>>>>>>>>>> support is >>>>>>>>>>>> completely broken in OpenJDK6 which makes me wonder why this is >>>>>>>>>>>> a low >>>>>>>>>>>> priority bug! >>>>>>>>>>> I do have an SCA on file. Note that the recommendation from the >>>>>>>>>>> NSS >>>>>>>>>>> guys was to raise the priority. >>>>>>>>>>> >>>>>>>>>>> The reason I haven't submitted this is because I submitted a >>>>>>>>>>> different >>>>>>>>>>> EC fix https://bugs.openjdk.java.net/show_bug.cgi?id=100048 per >>>>>>>>>>> the >>>>>>>>>>> documented process >>>>>>>>>>> and was waiting on progress there before continuing. I've got a >>>>>>>>>>> number of EC and PKCS11 related fixes I'd like to submit, but I >>>>>>>>>>> was trying >>>>>>>>>>> for a worked example before proceeding. And then I got busy >>>>>>>>>>> with some other >>>>>>>>>>> things... >>>>>>>>>>> >>>>>>>>>>> Mike >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>>>> Mike >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> At 04:39 PM 9/1/2009, Joe Darcy wrote: >>>>>>>>>>>>> >>>>>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>>>>> >>>>>>>>>>>>> 2009/8/28 Andrew John Hughes : >>>>>>>>>>>>> >>>>>>>>>>>>> In OpenJDK6, the elliptic curve cryptography algorithms are >>>>>>>>>>>>> available >>>>>>>>>>>>> if the PKCS11 provider is configured to point to NSS. See: >>>>>>>>>>>>> >>>>>>>>>>>>> http://blogs.sun.com/andreas/entry/the_java_pkcs_11_provider >>>>>>>>>>>>> >>>>>>>>>>>>> If NSS is configured as specified in this blog, keytool can be >>>>>>>>>>>>> used >>>>>>>>>>>>> to >>>>>>>>>>>>> generate a key as follows: >>>>>>>>>>>>> >>>>>>>>>>>>> Hello. >>>>>>>>>>>>> >>>>>>>>>>>>> Allowing keytool and friends to work in more cases if the >>>>>>>>>>>>> provider >>>>>>>>>>>>> is >>>>>>>>>>>>> capable seems fine to me. >>>>>>>>>>>>> >>>>>>>>>>>>> Security team, do you have concerns about this patch? >>>>>>>>>>>>> >>>>>>>>>>>>> Thanks, >>>>>>>>>>>>> >>>>>>>>>>>>> -Joe >>>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> -- >>>>>>>>>>>> Andrew :-) >>>>>>>>>>>> >>>>>>>>>>>> Free Java Software Engineer >>>>>>>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>>>>>>> >>>>>>>>>>>> Support Free Java! >>>>>>>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>>>>>>> http://www.gnu.org/software/classpath >>>>>>>>>>>> http://openjdk.java.net >>>>>>>>>>>> >>>>>>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>>>>>>>>> >>>>>>>>>> Ok here is a new webrev: >>>>>>>>>> >>>>>>>>>> http://cr.openjdk.java.net/~andrew/6763530/webrev.02/ >>>>>>>>>> >>>>>>>>>> with a slightly revised version of your change (you can't throw a >>>>>>>>>> PKCS11Exception which only takes a long ID from the native code, >>>>>>>>>> so I >>>>>>>>>> changed this to an IllegalArgumentException). >>>>>>>>>> >>>>>>>>>> Security team, does this look ok to push? >>>>>>>>>> -- >>>>>>>>>> Andrew :-) >>>>>>>>>> >>>>>>>>>> Free Java Software Engineer >>>>>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>>>>> >>>>>>>>>> Support Free Java! >>>>>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>>>>> http://www.gnu.org/software/classpath >>>>>>>>>> http://openjdk.java.net >>>>>>>>>> >>>>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>>>>>>>>> >>>>>>>>> Ping! Security developers, any thoughts on this patch: >>>>>>>>> >>>>>>>>> http://cr.openjdk.java.net/~andrew/6763530/webrev.02/ >>>>>>>>> >>>>>>>>> Does it look ok to push? >>>>>>>>> >>>>>>>>> Thanks, >>>>> >>>>> >>>>> From ahughes at redhat.com Sun Jun 27 16:17:03 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Mon, 28 Jun 2010 00:17:03 +0100 Subject: [security-dev 01547]: Re: PING: [PATCH FOR REVIEW]: 6763530: Fix breakage of NSS-based Elliptic Curve Cryptography in OpenJDK6 In-Reply-To: <20100627224513.47E6D62AE@mail.openjdk.java.net> References: <17c6771e0909220318l4cdecc25v54844e73c7916708@mail.gmail.com> <4ABBAD55.7070206@sun.com> <20100120180532.909D064A2@mail.openjdk.java.net> <17c6771e1001201416m4d44ab72o58bf51ffd453827a@mail.gmail.com> <4B5805DD.8060101@primekey.se> <4B582889.6080903@sun.com> <7.1.0.9.2.20100121122520.06efb5c0@comcast.net> <7.1.0.9.2.20100627173049.006b4098@comcast.net> <20100627224513.47E6D62AE@mail.openjdk.java.net> Message-ID: On 27 June 2010 23:45, Michael StJohns wrote: > PS - I know this is the openjdk list - but I thought this one was getting back ported. > > Mike > > > At 05:37 PM 6/27/2010, Michael StJohns wrote: >>Hi guys - >> >>I see from the Mercurial logs that this went in to both the jdk6 and jdk7 repositories. ?For jdk6 - it's rev 302 which looks like this should have ended up in the _19 release >> >>But all the files in lib/ext/sunpkcs11.jar ?for _20 are all tagged as 1 September 2009.... >> >>Is the sunpkcs11.jar provider not getting regenerated and rebundled during the release process? >> >>Mike >> >> >> >>At 01:28 PM 1/21/2010, Michael StJohns wrote: >>>At 05:12 AM 1/21/2010, Vincent Ryan wrote: >>>>I hear ya. Sorry for the delay on this. I'll push the fix for OpenJDK today. >>> >>> >>> >>>>On 21/01/2010 07:44, Tomas Gustavsson wrote: >>>>> >>>>> Now it has one more vote. >>>>> >>>>> /Tomas >>>>> >>>>> Andrew John Hughes wrote: >>>>>> 2010/1/20 Tomas Gustavsson : >>>>>>> I'll second this request. This is a critical patch and many production >>>>>>> installations have to live with this manually patched now. >>>>>>> >>>>>>> I know of no pkcs11 implementation that works with the current code. >>>>>>> >>>>>> >>>>>> It has four votes: >>>>>> http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6763530 >>>>>> I don't know how many they need to wake up and review the patch. >>>>>> >>>>>> The new release of IcedTea6 1.7 is imminent and will include the fix >>>>>> so it should at least be resolved on the next version shipping with >>>>>> most GNU/Linux distributions. >>>>>> >>>>>>> Regards, >>>>>>> Tomas Gustavsson >>>>>>> PrimeKey Solutions AB >>>>>>> >>>>>>> >>>>>>> On Wed, 20 Jan 2010, Michael StJohns wrote: >>>>>>> >>>>>>>> Hi - this seems to have stalled out again. ?Any chance of revival? >>>>>>>> >>>>>>>> Mike >>>>>>>> >>>>>>>> >>>>>>>> At 12:33 PM 9/24/2009, Vincent Ryan wrote: >>>>>>>>> Hello Andrew, >>>>>>>>> >>>>>>>>> I'll need a little more time to come up to speed on this fix. I'm >>>>>>>>> concerned that >>>>>>>>> there may be interoperability or backwards compatibility issues. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>> 2009/9/2 Andrew John Hughes : >>>>>>>>>>> 2009/9/2 Michael StJohns : >>>>>>>>>>>> At 09:38 PM 9/1/2009, Andrew John Hughes wrote: >>>>>>>>>>>>> 2009/9/2 Michael StJohns : >>>>>>>>>>>>>> ??? This appears to be related specifically to PKCS11.??? >>>>? >>>>>>>>>>>>>> ?Specifically, PKCS11 >>>>>>>>>>>>>> v2.20 has some ambiguity of the representation of an EC point >>>>>>>>>>>>>> (which >>>>>>>>>>>>>> is >>>>>>>>>>>>>> different in the text than an ASN1 ECPoint). >>>>>>>>>>>>>> >>>>>>>>>>>>>> This is being clarified in v2.30 with the unencoded point format >>>>>>>>>>>>>> (e.g.the >>>>>>>>>>>>>> format described in??? ?X9.62, where the first octet indicates the >>>>>>>>>>>>>> encoding and >>>>>>>>>>>>>> there are either N or 2N octets following)??? ?being the expected >>>>>>>>>>>>>> value, but >>>>>>>>>>>>>> with PKCS11 providers allowed - legacy - to accept either. >>>>>>>>>>>>>> >>>>>>>>>>>>>> One of the reasons for going that way was how the JDK PKCS11 >>>>>>>>>>>>>> provider had >>>>>>>>>>>>>> interpreted the issue and implemented its code. >>>>>>>>>>>>>> >>>>>>>>>>>>>> I don't support this fix - among other things, this fix only >>>>>>>>>>>>>> deals >>>>>>>>>>>>>> with 1/2 >>>>>>>>>>>>>> of the problem.??? ?The other half is related to encoding the >>>>>>>>>>>>>> value.??? ?Also, >>>>>>>>>>>>>> changing the code at decodePoint seems further into the stack >>>>>>>>>>>>>> than >>>>>>>>>>>>>> needed >>>>>>>>>>>>>> and may affect other uses of that method. >>>>>>>>>>>>>> >>>>>>>>>>>>> That's really too vague to be of much help in improving the patch. >>>>>>>>>>>>> You seem to be saying little more than 'I don't like it'. >>>>>>>>>>>> Sorry about that. ?My point was that your patch didn't completely >>>>>>>>>>>> solve the problem and that the point at where you were fixing it >>>>>>>>>>>> could have >>>>>>>>>>>> some bad side effects for anyone calling decodePoint directly. >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>>>> There's an existing JDK bug on this coming at it from a different >>>>>>>>>>>>>> direction >>>>>>>>>>>>>> - 6763530 ... and there may be considerations at >>>>>>>>>>>>>> >>>>>>>>>>>>>> https://bugzilla.mozilla.org/show_bug.cgi?id=480280 >>>>>>>>>>>>>> >>>>>>>>>>>>> It seems likely that's the NSS change that causes the current >>>>>>>>>>>>> failure. >>>>>>>>>>>>> The fix I submitted here is based on the way this is handle in >>>>>>>>>>>>> NSS. >>>>>>>>>>>>> In fact, the code is similar enough to suggest that one was >>>>>>>>>>>>> developed >>>>>>>>>>>>> from the other. >>>>>>>>>>>>>> ??? that should be looked at. >>>>>>>>>>>>> The JDK bug is not really 'from a different direction', it's >>>>>>>>>>>>> reporting >>>>>>>>>>>>> exactly the same error but from a less trivial example (I get the >>>>>>>>>>>>> same >>>>>>>>>>>>> failure while trying to create an example key, while this seems to >>>>>>>>>>>>> require specific hardware if I'm reading it correctly). >>>>>>>>>>>> Not exactly. ?You're using the NSS as a PKCS11 module - this >>>>>>>>>>>> problem >>>>>>>>>>>> would occur with any PKCS11 module that implements EC stuff. >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>>> Also see 6779460 which is mostly a duplicate of >>>>>>>>>>>>>> 6763530. >>>>>>>>>>>>>> >>>>>>>>>>>>> The patch on 6779460 seems wrong. ?It means that the method will >>>>>>>>>>>>> return a DER-encoded value where it would either have returned an >>>>>>>>>>>>> uncompressed value before or failed. >>>>>>>>>>>> My point exactly as I mentioned in the comments. ?:-) >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>>>> It's probable that the fix I suggested at 6763530??? ?(in comments >>>>>>>>>>>>>> submitted 29 >>>>>>>>>>>>>> Nov 08) may be a better approach given the NSS fixes.??? ?I >>>>>>>>>>>>>> believe >>>>>>>>>>>>>> it will fix >>>>>>>>>>>>>> the keytool problem noted in the original message. >>>>>>>>>>>>>> >>>>>>>>>>>>> Ok, I can see the logic in the fix and it would appear to work, >>>>>>>>>>>>> though >>>>>>>>>>>>> I haven't tested it. >>>>>>>>>>>>> Given the patch was written nine months ago, why has it not been >>>>>>>>>>>>> applied? ?If it had, it would have saved me hours having to debug >>>>>>>>>>>>> this >>>>>>>>>>>>> same issue again. >>>>>>>>>>>> Yup. ?I did do a search for PKCS11 related bugs when I >>>>>>>>>>>> encountered the >>>>>>>>>>>> same problem and did find the original error. >>>>>>>>>>>> >>>>>>>>>>>>> Do you have an SCA with Sun? If so, I'll create a webrev based on >>>>>>>>>>>>> your >>>>>>>>>>>>> patch and we can finally get this fixed. ?Without it, NSS >>>>>>>>>>>>> support is >>>>>>>>>>>>> completely broken in OpenJDK6 which makes me wonder why this is >>>>>>>>>>>>> a low >>>>>>>>>>>>> priority bug! >>>>>>>>>>>> I do have an SCA on file. ?Note that the recommendation from the >>>>>>>>>>>> NSS >>>>>>>>>>>> guys was to raise the priority. >>>>>>>>>>>> >>>>>>>>>>>> The reason I haven't submitted this is because I submitted a >>>>>>>>>>>> different >>>>>>>>>>>> EC fix ?https://bugs.openjdk.java.net/show_bug.cgi?id=100048 per >>>>>>>>>>>> the >>>>>>>>>>>> documented process >>>>>>>>>>>> ?and was waiting on progress there before continuing. ?I've got a >>>>>>>>>>>> number of EC and PKCS11 related fixes I'd like to submit, but I >>>>>>>>>>>> was trying >>>>>>>>>>>> for a worked example before proceeding. ?And then I got busy >>>>>>>>>>>> with some other >>>>>>>>>>>> things... >>>>>>>>>>>> >>>>>>>>>>>> Mike >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>> >>>>>>>>>>>>>> Mike >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> >>>>>>>>>>>>>> At 04:39 PM 9/1/2009, Joe Darcy wrote: >>>>>>>>>>>>>> >>>>>>>>>>>>>> Andrew John Hughes wrote: >>>>>>>>>>>>>> >>>>>>>>>>>>>> 2009/8/28 Andrew John Hughes : >>>>>>>>>>>>>> >>>>>>>>>>>>>> In OpenJDK6, the elliptic curve cryptography algorithms are >>>>>>>>>>>>>> available >>>>>>>>>>>>>> if the PKCS11 provider is configured to point to NSS. See: >>>>>>>>>>>>>> >>>>>>>>>>>>>> http://blogs.sun.com/andreas/entry/the_java_pkcs_11_provider >>>>>>>>>>>>>> >>>>>>>>>>>>>> If NSS is configured as specified in this blog, keytool can be >>>>>>>>>>>>>> used >>>>>>>>>>>>>> to >>>>>>>>>>>>>> generate a key as follows: >>>>>>>>>>>>>> >>>>>>>>>>>>>> Hello. >>>>>>>>>>>>>> >>>>>>>>>>>>>> Allowing keytool and friends to work in more cases if the >>>>>>>>>>>>>> provider >>>>>>>>>>>>>> is >>>>>>>>>>>>>> capable seems fine to me. >>>>>>>>>>>>>> >>>>>>>>>>>>>> Security team, do you have concerns about this patch? >>>>>>>>>>>>>> >>>>>>>>>>>>>> Thanks, >>>>>>>>>>>>>> >>>>>>>>>>>>>> -Joe >>>>>>>>>>>>>> >>>>>>>>>>>>> >>>>>>>>>>>>> -- >>>>>>>>>>>>> Andrew :-) >>>>>>>>>>>>> >>>>>>>>>>>>> Free Java Software Engineer >>>>>>>>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>>>>>>>> >>>>>>>>>>>>> Support Free Java! >>>>>>>>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>>>>>>>> http://www.gnu.org/software/classpath >>>>>>>>>>>>> http://openjdk.java.net >>>>>>>>>>>>> >>>>>>>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>>>>>>>>> >>>>>>>>>>> Ok here is a new webrev: >>>>>>>>>>> >>>>>>>>>>> http://cr.openjdk.java.net/~andrew/6763530/webrev.02/ >>>>>>>>>>> >>>>>>>>>>> with a slightly revised version of your change (you can't throw a >>>>>>>>>>> PKCS11Exception which only takes a long ID from the native code, >>>>>>>>>>> so I >>>>>>>>>>> changed this to an IllegalArgumentException). >>>>>>>>>>> >>>>>>>>>>> Security team, does this look ok to push? >>>>>>>>>>> -- >>>>>>>>>>> Andrew :-) >>>>>>>>>>> >>>>>>>>>>> Free Java Software Engineer >>>>>>>>>>> Red Hat, Inc. (http://www.redhat.com) >>>>>>>>>>> >>>>>>>>>>> Support Free Java! >>>>>>>>>>> Contribute to GNU Classpath and the OpenJDK >>>>>>>>>>> http://www.gnu.org/software/classpath >>>>>>>>>>> http://openjdk.java.net >>>>>>>>>>> >>>>>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >>>>>>>>>>> >>>>>>>>>> Ping! Security developers, any thoughts on this patch: >>>>>>>>>> >>>>>>>>>> http://cr.openjdk.java.net/~andrew/6763530/webrev.02/ >>>>>>>>>> >>>>>>>>>> Does it look ok to push? >>>>>>>>>> >>>>>>>>>> Thanks, >>>>>> >>>>>> >>>>>> > > > It has been: $ hg log -R jdk -k 6763530 changeset: 302:82b80660cac3 user: vinnie date: Thu Jan 21 23:59:41 2010 +0000 summary: 6763530: Cannot decode PublicKey (Proider SunPKCS11, curve prime256v1) and certainly is present on IcedTea6's builds. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From mstjohns at comcast.net Sun Jun 27 17:05:50 2010 From: mstjohns at comcast.net (Michael StJohns) Date: Sun, 27 Jun 2010 20:05:50 -0400 Subject: [security-dev 01547]: Re: PING: [PATCH FOR REVIEW]: 6763530: Fix breakage of NSS-based Elliptic Curve Cryptography in OpenJDK6 In-Reply-To: References: <17c6771e0909220318l4cdecc25v54844e73c7916708@mail.gmail.com> <4ABBAD55.7070206@sun.com> <20100120180532.909D064A2@mail.openjdk.java.net> <17c6771e1001201416m4d44ab72o58bf51ffd453827a@mail.gmail.com> <4B5805DD.8060101@primekey.se> <4B582889.6080903@sun.com> <7.1.0.9.2.20100121122520.06efb5c0@comcast.net> <7.1.0.9.2.20100627173049.006b4098@comcast.net> <20100627224513.47E6D62AE@mail.openjdk.java.net> Message-ID: <20100628000619.8B0DC62E5@mail.openjdk.java.net> Hi Andrew - I really need to work on fleshing out my emails... :-/ The _20 release of the normal (non-OpenJDK) is missing this update. I had thought that this fix was supposed to be back-ported to the closed JDK 6 release. I've got the OpenJDK built on my local machine, but the folks I'm working with would rather use the pre-packaged Windows version etc etc etc... *sigh*. Thanks - Mike At 07:17 PM 6/27/2010, Andrew John Hughes wrote: >> At 05:37 PM 6/27/2010, Michael StJohns wrote: >>>Hi guys - >>> >>>I see from the Mercurial logs that this went in to both the jdk6 and jdk7 repositories. ? For jdk6 - it's rev 302 which looks like this should have ended up in the _19 release >>> >>>But all the files in lib/ext/sunpkcs11.jar ? for _20 are all tagged as 1 September 2009.... >>> >>>Is the sunpkcs11.jar provider not getting regenerated and rebundled during the release process? >>> >>>Mike > >It has been: > >$ hg log -R jdk -k 6763530 >changeset: 302:82b80660cac3 >user: vinnie >date: Thu Jan 21 23:59:41 2010 +0000 >summary: 6763530: Cannot decode PublicKey (Proider SunPKCS11, >curve prime256v1) > >and certainly is present on IcedTea6's builds. >-- >Andrew :-) > >Free Java Software Engineer >Red Hat, Inc. (http://www.redhat.com) > >Support Free Java! >Contribute to GNU Classpath and the OpenJDK >http://www.gnu.org/software/classpath >http://openjdk.java.net > >PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Sun Jun 27 17:09:55 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Mon, 28 Jun 2010 01:09:55 +0100 Subject: [security-dev 01547]: Re: PING: [PATCH FOR REVIEW]: 6763530: Fix breakage of NSS-based Elliptic Curve Cryptography in OpenJDK6 In-Reply-To: <20100628000619.8E0AC62E6@mail.openjdk.java.net> References: <17c6771e0909220318l4cdecc25v54844e73c7916708@mail.gmail.com> <4ABBAD55.7070206@sun.com> <20100120180532.909D064A2@mail.openjdk.java.net> <17c6771e1001201416m4d44ab72o58bf51ffd453827a@mail.gmail.com> <4B5805DD.8060101@primekey.se> <4B582889.6080903@sun.com> <7.1.0.9.2.20100121122520.06efb5c0@comcast.net> <7.1.0.9.2.20100627173049.006b4098@comcast.net> <20100627224513.47E6D62AE@mail.openjdk.java.net> <20100628000619.8E0AC62E6@mail.openjdk.java.net> Message-ID: On 28 June 2010 01:05, Michael StJohns wrote: > Hi Andrew - > > I really need to work on fleshing out my emails... :-/ > > The _20 release of the normal (non-OpenJDK) is missing this update. ?I had thought that this fix was supposed to be back-ported to the closed JDK 6 release. ?I've got the OpenJDK built on my local machine, but the folks I'm working with would rather use the pre-packaged Windows version etc etc etc... *sigh*. > By its very nature, we don't know what's in the proprietary JDK. That's an issue you need to take up with Oracle. The bug is fixed in OpenJDK6 and 7. > Thanks - Mike > > > At 07:17 PM 6/27/2010, Andrew John Hughes wrote: >>> At 05:37 PM 6/27/2010, Michael StJohns wrote: >>>>Hi guys - >>>> >>>>I see from the Mercurial logs that this went in to both the jdk6 and jdk7 repositories. ? For jdk6 - it's rev 302 which looks like this should have ended up in the _19 release >>>> >>>>But all the files in lib/ext/sunpkcs11.jar ? for _20 are all tagged as 1 September 2009.... >>>> >>>>Is the sunpkcs11.jar provider not getting regenerated and rebundled during the release process? >>>> >>>>Mike >> >>It has been: >> >>$ hg log -R jdk -k 6763530 >>changeset: ? 302:82b80660cac3 >>user: ? ? ? ?vinnie >>date: ? ? ? ?Thu Jan 21 23:59:41 2010 +0000 >>summary: ? ? 6763530: Cannot decode PublicKey (Proider SunPKCS11, >>curve prime256v1) >> >>and certainly is present on IcedTea6's builds. >>-- >>Andrew :-) >> >>Free Java Software Engineer >>Red Hat, Inc. (http://www.redhat.com) >> >>Support Free Java! >>Contribute to GNU Classpath and the OpenJDK >>http://www.gnu.org/software/classpath >>http://openjdk.java.net >> >>PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 > > > -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From mstjohns at comcast.net Sun Jun 27 17:13:31 2010 From: mstjohns at comcast.net (Michael StJohns) Date: Sun, 27 Jun 2010 20:13:31 -0400 Subject: [security-dev 01547]: Re: PING: [PATCH FOR REVIEW]: 6763530: Fix breakage of NSS-based Elliptic Curve Cryptography in OpenJDK6 In-Reply-To: References: <17c6771e0909220318l4cdecc25v54844e73c7916708@mail.gmail.com> <4ABBAD55.7070206@sun.com> <20100120180532.909D064A2@mail.openjdk.java.net> <17c6771e1001201416m4d44ab72o58bf51ffd453827a@mail.gmail.com> <4B5805DD.8060101@primekey.se> <4B582889.6080903@sun.com> <7.1.0.9.2.20100121122520.06efb5c0@comcast.net> <7.1.0.9.2.20100627173049.006b4098@comcast.net> <20100627224513.47E6D62AE@mail.openjdk.java.net> <20100628000619.8E0AC62E6@mail.openjdk.java.net> Message-ID: <20100628001338.3D34262F5@mail.openjdk.java.net> At 08:09 PM 6/27/2010, Andrew John Hughes wrote: >On 28 June 2010 01:05, Michael StJohns wrote: >> Hi Andrew - >> >> I really need to work on fleshing out my emails... :-/ >> >> The _20 release of the normal (non-OpenJDK) is missing this update. ? I had thought that this fix was supposed to be back-ported to the closed JDK 6 release. ? I've got the OpenJDK built on my local machine, but the folks I'm working with would rather use the pre-packaged Windows version etc etc etc... *sigh*. >> > >By its very nature, we don't know what's in the proprietary JDK. >That's an issue you need to take up with Oracle. The bug is fixed in >OpenJDK6 and 7. Yes but - the RP/committer for this was Vincent - part of the Sun crowd.. No worries. If they can't answer, I'll reopen the bug and see what's what. Thanks - Mike >> Thanks - Mike >> >> >> At 07:17 PM 6/27/2010, Andrew John Hughes wrote: >>>> At 05:37 PM 6/27/2010, Michael StJohns wrote: >>>>>Hi guys - >>>>> >>>>>I see from the Mercurial logs that this went in to both the jdk6 and jdk7 repositories. ?? For jdk6 - it's rev 302 which looks like this should have ended up in the _19 release >>>>> >>>>>But all the files in lib/ext/sunpkcs11.jar ?? for _20 are all tagged as 1 September 2009.... >>>>> >>>>>Is the sunpkcs11.jar provider not getting regenerated and rebundled during the release process? >>>>> >>>>>Mike >>> >>>It has been: >>> >>>$ hg log -R jdk -k 6763530 >>>changeset: ? 302:82b80660cac3 >>>user: ? ? ? ? vinnie >>>date: ? ? ? ? Thu Jan 21 23:59:41 2010 +0000 >>>summary: ? ? 6763530: Cannot decode PublicKey (Proider SunPKCS11, >>>curve prime256v1) >>> >>>and certainly is present on IcedTea6's builds. >>>-- >>>Andrew :-) >>> >>>Free Java Software Engineer >>>Red Hat, Inc. (http://www.redhat.com) >>> >>>Support Free Java! >>>Contribute to GNU Classpath and the OpenJDK >>>http://www.gnu.org/software/classpath >>>http://openjdk.java.net >>> >>>PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>Fingerprint: F8EF F1EA 401E 2E60 15FA ? 7927 142C 2591 94EF D9D8 >> >> >> > > > >-- >Andrew :-) > >Free Java Software Engineer >Red Hat, Inc. (http://www.redhat.com) > >Support Free Java! >Contribute to GNU Classpath and the OpenJDK >http://www.gnu.org/software/classpath >http://openjdk.java.net > >PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From erik.trimble at oracle.com Sun Jun 27 17:40:06 2010 From: erik.trimble at oracle.com (Erik Trimble) Date: Sun, 27 Jun 2010 17:40:06 -0700 Subject: [security-dev 01547]: Re: PING: [PATCH FOR REVIEW]: 6763530: Fix breakage of NSS-based Elliptic Curve Cryptography in OpenJDK6 In-Reply-To: <20100628001338.3D34262F5@mail.openjdk.java.net> References: <17c6771e0909220318l4cdecc25v54844e73c7916708@mail.gmail.com> <4ABBAD55.7070206@sun.com> <20100120180532.909D064A2@mail.openjdk.java.net> <17c6771e1001201416m4d44ab72o58bf51ffd453827a@mail.gmail.com> <4B5805DD.8060101@primekey.se> <4B582889.6080903@sun.com> <7.1.0.9.2.20100121122520.06efb5c0@comcast.net> <7.1.0.9.2.20100627173049.006b4098@comcast.net> <20100627224513.47E6D62AE@mail.openjdk.java.net> <20100628000619.8E0AC62E6@mail.openjdk.java.net> <20100628001338.3D34262F5@mail.openjdk.java.net> Message-ID: <4C27EF66.5010305@oracle.com> As of right now, I show it fixed in openjdk6 b19, and openjdk7 b84. However, I don't see any open CR for it to be fixed in an Oracle JDK 6 release. You'd have to ask our Sustaining folks about what the schedule would be (or if it's even on the schedule), as I don't have any visibility thereof. I see a related CR in the form of 6830224: pkcs11 should be able to accept DER encoded CKA_EC_POINT That one hasn't been touched in over a year.* *-Erik On 6/27/2010 5:13 PM, Michael StJohns wrote: > At 08:09 PM 6/27/2010, Andrew John Hughes wrote: > >> On 28 June 2010 01:05, Michael StJohns wrote: >> >>> Hi Andrew - >>> >>> I really need to work on fleshing out my emails... :-/ >>> >>> The _20 release of the normal (non-OpenJDK) is missing this update. ? I had thought that this fix was supposed to be back-ported to the closed JDK 6 release. ? I've got the OpenJDK built on my local machine, but the folks I'm working with would rather use the pre-packaged Windows version etc etc etc... *sigh*. >>> >>> >> By its very nature, we don't know what's in the proprietary JDK. >> That's an issue you need to take up with Oracle. The bug is fixed in >> OpenJDK6 and 7. >> > Yes but - the RP/committer for this was Vincent - part of the Sun crowd.. > > No worries. If they can't answer, I'll reopen the bug and see what's what. > > Thanks - Mike > > > >>> Thanks - Mike >>> >>> >>> At 07:17 PM 6/27/2010, Andrew John Hughes wrote: >>> >>>>> At 05:37 PM 6/27/2010, Michael StJohns wrote: >>>>> >>>>>> Hi guys - >>>>>> >>>>>> I see from the Mercurial logs that this went in to both the jdk6 and jdk7 repositories. ?, For jdk6 - it's rev 302 which looks like this should have ended up in the _19 release >>>>>> >>>>>> But all the files in lib/ext/sunpkcs11.jar ?, for _20 are all tagged as 1 September 2009.... >>>>>> >>>>>> Is the sunpkcs11.jar provider not getting regenerated and rebundled during the release process? >>>>>> >>>>>> Mike >>>>>> >>>> It has been: >>>> >>>> $ hg log -R jdk -k 6763530 >>>> changeset: ? 302:82b80660cac3 >>>> user: ? ? ? ? vinnie >>>> date: ? ? ? ? Thu Jan 21 23:59:41 2010 +0000 >>>> summary: ? ? 6763530: Cannot decode PublicKey (Proider SunPKCS11, >>>> curve prime256v1) >>>> >>>> and certainly is present on IcedTea6's builds. >>>> -- >>>> Andrew :-) >>>> >>>> Free Java Software Engineer >>>> Red Hat, Inc. (http://www.redhat.com) >>>> >>>> Support Free Java! >>>> Contribute to GNU Classpath and the OpenJDK >>>> http://www.gnu.org/software/classpath >>>> http://openjdk.java.net >>>> >>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ? 7927 142C 2591 94EF D9D8 >>>> >>> >>> >>> >> >> >> -- >> Andrew :-) >> >> Free Java Software Engineer >> Red Hat, Inc. (http://www.redhat.com) >> >> Support Free Java! >> Contribute to GNU Classpath and the OpenJDK >> http://www.gnu.org/software/classpath >> http://openjdk.java.net >> >> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >> > > -- Erik Trimble Java System Support Mailstop: usca22-123 Phone: x17195 Santa Clara, CA -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/jdk6-dev/attachments/20100627/4ba30b75/attachment.html From valerie.peng at oracle.com Mon Jun 28 10:36:47 2010 From: valerie.peng at oracle.com (Valerie (Yu-Ching) Peng) Date: Mon, 28 Jun 2010 10:36:47 -0700 Subject: [security-dev 01547]: Re: PING: [PATCH FOR REVIEW]: 6763530: Fix breakage of NSS-based Elliptic Curve Cryptography in OpenJDK6 In-Reply-To: <20100628001338.816F962F6@mail.openjdk.java.net> References: <17c6771e0909220318l4cdecc25v54844e73c7916708@mail.gmail.com> <4ABBAD55.7070206@sun.com> <20100120180532.909D064A2@mail.openjdk.java.net> <17c6771e1001201416m4d44ab72o58bf51ffd453827a@mail.gmail.com> <4B5805DD.8060101@primekey.se> <4B582889.6080903@sun.com> <7.1.0.9.2.20100121122520.06efb5c0@comcast.net> <7.1.0.9.2.20100627173049.006b4098@comcast.net> <20100627224513.47E6D62AE@mail.openjdk.java.net> <20100628000619.8E0AC62E6@mail.openjdk.java.net> <20100628001338.816F962F6@mail.openjdk.java.net> Message-ID: <4C28DDAF.7010304@oracle.com> Vinnie is on vacation, so I'll take a shot of answering this. According to the bug record, the fix for 6763530 is in jdk7, openjdk6 and not in Oracle's jdk6 update release. Not all bugs are backported, it's subject to RE's discretion. I've opened a subCR against this particular release train and Vinnie can decide what to do w/ this once he returns from vacation. Regards, Valerie On 06/27/10 17:13, Michael StJohns wrote: > At 08:09 PM 6/27/2010, Andrew John Hughes wrote: > >> On 28 June 2010 01:05, Michael StJohns wrote: >> >>> Hi Andrew - >>> >>> I really need to work on fleshing out my emails... :-/ >>> >>> The _20 release of the normal (non-OpenJDK) is missing this update. ? I had thought that this fix was supposed to be back-ported to the closed JDK 6 release. ? I've got the OpenJDK built on my local machine, but the folks I'm working with would rather use the pre-packaged Windows version etc etc etc... *sigh*. >>> >>> >> By its very nature, we don't know what's in the proprietary JDK. >> That's an issue you need to take up with Oracle. The bug is fixed in >> OpenJDK6 and 7. >> > > Yes but - the RP/committer for this was Vincent - part of the Sun crowd.. > > No worries. If they can't answer, I'll reopen the bug and see what's what. > > Thanks - Mike > > > >>> Thanks - Mike >>> >>> >>> At 07:17 PM 6/27/2010, Andrew John Hughes wrote: >>> >>>>> At 05:37 PM 6/27/2010, Michael StJohns wrote: >>>>> >>>>>> Hi guys - >>>>>> >>>>>> I see from the Mercurial logs that this went in to both the jdk6 and jdk7 repositories. ?, For jdk6 - it's rev 302 which looks like this should have ended up in the _19 release >>>>>> >>>>>> But all the files in lib/ext/sunpkcs11.jar ?, for _20 are all tagged as 1 September 2009.... >>>>>> >>>>>> Is the sunpkcs11.jar provider not getting regenerated and rebundled during the release process? >>>>>> >>>>>> Mike >>>>>> >>>> It has been: >>>> >>>> $ hg log -R jdk -k 6763530 >>>> changeset: ? 302:82b80660cac3 >>>> user: ? ? ? ? vinnie >>>> date: ? ? ? ? Thu Jan 21 23:59:41 2010 +0000 >>>> summary: ? ? 6763530: Cannot decode PublicKey (Proider SunPKCS11, >>>> curve prime256v1) >>>> >>>> and certainly is present on IcedTea6's builds. >>>> -- >>>> Andrew :-) >>>> >>>> Free Java Software Engineer >>>> Red Hat, Inc. (http://www.redhat.com) >>>> >>>> Support Free Java! >>>> Contribute to GNU Classpath and the OpenJDK >>>> http://www.gnu.org/software/classpath >>>> http://openjdk.java.net >>>> >>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>> Fingerprint: F8EF F1EA 401E 2E60 15FA ? 7927 142C 2591 94EF D9D8 >>>> >>> >>> >> >> -- >> Andrew :-) >> >> Free Java Software Engineer >> Red Hat, Inc. (http://www.redhat.com) >> >> Support Free Java! >> Contribute to GNU Classpath and the OpenJDK >> http://www.gnu.org/software/classpath >> http://openjdk.java.net >> >> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >> > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/jdk6-dev/attachments/20100628/421c5830/attachment-0001.html From mstjohns at comcast.net Mon Jun 28 12:28:02 2010 From: mstjohns at comcast.net (Michael StJohns) Date: Mon, 28 Jun 2010 15:28:02 -0400 Subject: [security-dev 01547]: Re: PING: [PATCH FOR REVIEW]: 6763530: Fix breakage of NSS-based Elliptic Curve Cryptography in OpenJDK6 In-Reply-To: <4C28DDAF.7010304@oracle.com> References: <17c6771e0909220318l4cdecc25v54844e73c7916708@mail.gmail.com> <4ABBAD55.7070206@sun.com> <20100120180532.909D064A2@mail.openjdk.java.net> <17c6771e1001201416m4d44ab72o58bf51ffd453827a@mail.gmail.com> <4B5805DD.8060101@primekey.se> <4B582889.6080903@sun.com> <7.1.0.9.2.20100121122520.06efb5c0@comcast.net> <7.1.0.9.2.20100627173049.006b4098@comcast.net> <20100627224513.47E6D62AE@mail.openjdk.java.net> <20100628000619.8E0AC62E6@mail.openjdk.java.net> <20100628001338.816F962F6@mail.openjdk.java.net> <4C28DDAF.7010304@oracle.com> Message-ID: <20100628192811.BD0236645@mail.openjdk.java.net> Thanks Valerie - that answers the question. Mike At 01:36 PM 6/28/2010, Valerie (Yu-Ching) Peng wrote: >Vinnie is on vacation, so I'll take a shot of answering this. >According to the bug record, the fix for 6763530 is in jdk7, openjdk6 and not in Oracle's jdk6 update release. >Not all bugs are backported, it's subject to RE's discretion. >I've opened a subCR against this particular release train and Vinnie can decide what to do w/ this once he returns from vacation. > >Regards, >Valerie > >On 06/27/10 17:13, Michael StJohns wrote: >> >>At 08:09 PM 6/27/2010, Andrew John Hughes wrote: >> >>> >>>On 28 June 2010 01:05, Michael StJohns wrote: >>> >>>> >>>>Hi Andrew - >>>> >>>>I really need to work on fleshing out my emails... :-/ >>>> >>>>The _20 release of the normal (non-OpenJDK) is missing this update. ? I had thought that this fix was supposed to be back-ported to the closed JDK 6 release. ? I've got the OpenJDK built on my local machine, but the folks I'm working with would rather use the pre-packaged Windows version etc etc etc... *sigh*. >>>> >>>> >>> >>>By its very nature, we don't know what's in the proprietary JDK. >>>That's an issue you need to take up with Oracle. The bug is fixed in >>>OpenJDK6 and 7. >>> >> >> >>Yes but - the RP/committer for this was Vincent - part of the Sun crowd.. >> >>No worries. If they can't answer, I'll reopen the bug and see what's what. >> >>Thanks - Mike >> >> >> >>>> >>>>Thanks - Mike >>>> >>>> >>>>At 07:17 PM 6/27/2010, Andrew John Hughes wrote: >>>> >>>>>> >>>>>>At 05:37 PM 6/27/2010, Michael StJohns wrote: >>>>>> >>>>>>> >>>>>>>Hi guys - >>>>>>> >>>>>>>I see from the Mercurial logs that this went in to both the jdk6 and jdk7 repositories. ?? For jdk6 - it's rev 302 which looks like this should have ended up in the _19 release >>>>>>> >>>>>>>But all the files in lib/ext/sunpkcs11.jar ?? for _20 are all tagged as 1 September 2009.... >>>>>>> >>>>>>>Is the sunpkcs11.jar provider not getting regenerated and rebundled during the release process? >>>>>>> >>>>>>>Mike >>>>>>> >>>>> >>>>>It has been: >>>>> >>>>>$ hg log -R jdk -k 6763530 >>>>>changeset: ? 302:82b80660cac3 >>>>>user: ? ? ? ? vinnie >>>>>date: ? ? ? ? Thu Jan 21 23:59:41 2010 +0000 >>>>>summary: ? ? 6763530: Cannot decode PublicKey (Proider SunPKCS11, >>>>>curve prime256v1) >>>>> >>>>>and certainly is present on IcedTea6's builds. >>>>>-- >>>>>Andrew :-) >>>>> >>>>>Free Java Software Engineer >>>>>Red Hat, Inc. (http://www.redhat.com) >>>>> >>>>>Support Free Java! >>>>>Contribute to GNU Classpath and the OpenJDK >>>>>http://www.gnu.org/software/classpath >>>>>http://openjdk.java.net >>>>> >>>>>PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>>>Fingerprint: F8EF F1EA 401E 2E60 15FA ? 7927 142C 2591 94EF D9D8 >>>>> >>>> >>>> >>>> >>>> >>> >>> >>> >>>-- >>>Andrew :-) >>> >>>Free Java Software Engineer >>>Red Hat, Inc. (http://www.redhat.com) >>> >>>Support Free Java! >>>Contribute to GNU Classpath and the OpenJDK >>>http://www.gnu.org/software/classpath >>>http://openjdk.java.net >>> >>>PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>> >> >> >> >> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/jdk6-dev/attachments/20100628/f007a8d4/attachment.html From chris.hegarty at oracle.com Mon Jun 28 13:04:42 2010 From: chris.hegarty at oracle.com (Chris Hegarty) Date: Mon, 28 Jun 2010 21:04:42 +0100 Subject: 6-open putback request: 6935199: java/net regression tests failing with Assertions Message-ID: <4C29005A.9070305@oracle.com> Joe, This is a straight forward fix to two regression tests that have incorrect assertions in them. -Chris. See: Changeset: f88f6f8ddd21 Author: chegar Date: 2010-03-16 10:05 +0000 URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/f88f6f8ddd21 6934923: test/java/net/ipv6tests/TcpTest.java hangs on Solaris 10 Reviewed-by: alanb ! test/java/net/ipv6tests/TcpTest.java ! test/java/net/ipv6tests/Tests.java From joe.darcy at oracle.com Mon Jun 28 13:13:29 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Mon, 28 Jun 2010 13:13:29 -0700 Subject: 6-open putback request: 6935199: java/net regression tests failing with Assertions In-Reply-To: <4C29005A.9070305@oracle.com> References: <4C29005A.9070305@oracle.com> Message-ID: <4C290269.9040902@oracle.com> Chris Hegarty wrote: > Joe, > > This is a straight forward fix to two regression tests that have > incorrect assertions in them. Approved to be backported for OpenJDK 6. Thanks, -Joe > > -Chris. > > See: > > Changeset: f88f6f8ddd21 > Author: chegar > Date: 2010-03-16 10:05 +0000 > URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/f88f6f8ddd21 > > 6934923: test/java/net/ipv6tests/TcpTest.java hangs on Solaris 10 > Reviewed-by: alanb > > ! test/java/net/ipv6tests/TcpTest.java > ! test/java/net/ipv6tests/Tests.java From chris.hegarty at oracle.com Mon Jun 28 13:16:06 2010 From: chris.hegarty at oracle.com (Chris Hegarty) Date: Mon, 28 Jun 2010 21:16:06 +0100 Subject: 6-open putback request: 6935199: java/net regression tests failing with Assertions In-Reply-To: <4C290269.9040902@oracle.com> References: <4C29005A.9070305@oracle.com> <4C290269.9040902@oracle.com> Message-ID: <4C290306.5000605@oracle.com> Thanks Joe, I apologize for the confusion, but for correctness here is the correct changeset details for this CR 6935199. Changeset: 895a1211b2e1 Author: chegar Date: 2010-03-16 14:31 +0000 URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/895a1211b2e1 6935199: java/net regression tests failing with Assertions Reviewed-by: michaelm ! test/ProblemList.txt ! test/java/net/CookieHandler/TestHttpCookie.java ! test/java/net/URLClassLoader/closetest/CloseTest.java I make a separate request for 6934923. -Chris. P.S. I should stop trying to work and watch Brazil! Joe Darcy wrote: > Chris Hegarty wrote: >> Joe, >> >> This is a straight forward fix to two regression tests that have >> incorrect assertions in them. > > Approved to be backported for OpenJDK 6. > > Thanks, > > -Joe > >> >> -Chris. >> >> See: >> >> Changeset: f88f6f8ddd21 >> Author: chegar >> Date: 2010-03-16 10:05 +0000 >> URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/f88f6f8ddd21 >> >> 6934923: test/java/net/ipv6tests/TcpTest.java hangs on Solaris 10 >> Reviewed-by: alanb >> >> ! test/java/net/ipv6tests/TcpTest.java >> ! test/java/net/ipv6tests/Tests.java > From joe.darcy at oracle.com Mon Jun 28 13:22:56 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Mon, 28 Jun 2010 13:22:56 -0700 Subject: 6-open putback request: 6935199: java/net regression tests failing with Assertions In-Reply-To: <4C290306.5000605@oracle.com> References: <4C29005A.9070305@oracle.com> <4C290269.9040902@oracle.com> <4C290306.5000605@oracle.com> Message-ID: <4C2904A0.3020503@oracle.com> Chris Hegarty wrote: > Thanks Joe, > > I apologize for the confusion, but for correctness here is the correct > changeset details for this CR 6935199. Also approved for OpenJDK 6. Thanks, -Joe > > Changeset: 895a1211b2e1 > Author: chegar > Date: 2010-03-16 14:31 +0000 > URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/895a1211b2e1 > > 6935199: java/net regression tests failing with Assertions > Reviewed-by: michaelm > > ! test/ProblemList.txt > ! test/java/net/CookieHandler/TestHttpCookie.java > ! test/java/net/URLClassLoader/closetest/CloseTest.java > > I make a separate request for 6934923. > > -Chris. > > P.S. I should stop trying to work and watch Brazil! > > > Joe Darcy wrote: >> Chris Hegarty wrote: >>> Joe, >>> >>> This is a straight forward fix to two regression tests that have >>> incorrect assertions in them. >> >> Approved to be backported for OpenJDK 6. >> >> Thanks, >> >> -Joe >> >>> >>> -Chris. >>> >>> See: >>> >>> Changeset: f88f6f8ddd21 >>> Author: chegar >>> Date: 2010-03-16 10:05 +0000 >>> URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/f88f6f8ddd21 >>> >>> 6934923: test/java/net/ipv6tests/TcpTest.java hangs on Solaris 10 >>> Reviewed-by: alanb >>> >>> ! test/java/net/ipv6tests/TcpTest.java >>> ! test/java/net/ipv6tests/Tests.java >> From openjdk at ml.breakpoint.cc Wed Jun 30 08:30:51 2010 From: openjdk at ml.breakpoint.cc (Sebastian Andrzej Siewior) Date: Wed, 30 Jun 2010 17:30:51 +0200 Subject: openjdk/zero: use double code for atomic64 on powerpc Message-ID: <20100630153051.GA29468@Chamillionaire.breakpoint.cc> this cute C code does the same thing on powerpc as the assembly code that was here before. If the compiler was built with the SPE extensions instead of traditional FPU and double operations are performed in HW then we are one step further: The compiler turns this into evldd & evstdd. Voila :) This C code could also be activated on s390. The compiler turns this into a single mvc instruction which does the copy operation. I don't know if mvc's copy ability is atomic _or_ not and therefore I leave it as it. Signed-off-by: Sebastian Andrzej Siewior Index: openjdk-6-6b18-1.8/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp =================================================================== --- openjdk-6-6b18-1.8.orig/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2010-06-30 16:55:28.000000000 +0200 +++ openjdk-6-6b18-1.8/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2010-06-30 17:08:49.000000000 +0200 @@ -22,6 +22,15 @@ * have any questions. * */ +#if defined(PPC) && !defined(_LP64) +#ifndef __NO_FPRS__ +#define ATOMIC64_COPY_THROUGH_DOUBLE 1 + +#elif defined(__SPE__) && !defined(_SOFT_DOUBLE) +#define ATOMIC64_COPY_THROUGH_DOUBLE 1 + +#endif +#endif static void setup_fpu() {} @@ -33,12 +42,23 @@ // Atomically copy 64 bits of data static void atomic_copy64(volatile void *src, volatile void *dst) { -#if defined(PPC) && !defined(_LP64) - double tmp; - asm volatile ("lfd %0, 0(%1)\n" - "stfd %0, 0(%2)\n" - : "=f"(tmp) - : "b"(src), "b"(dst)); +#if ATOMIC64_COPY_THROUGH_DOUBLE + /* + * In order to copy 8 bytes atomicly we rely on the trick that some + * architectures can load and store a double as a single operation. + * gcc picks the correct opcode here and with optimization turned on + * all temporary assignments are gone. - bigeasy + */ + union { + double *d; + volatile void *v; + } s, d; + + s.v = src; + d.v = dst; + + *d.d = *s.d; + #elif defined(S390) && !defined(_LP64) double tmp; asm volatile ("ld %0, 0(%1)\n" From aph at redhat.com Wed Jun 30 08:35:38 2010 From: aph at redhat.com (Andrew Haley) Date: Wed, 30 Jun 2010 16:35:38 +0100 Subject: openjdk/zero: use double code for atomic64 on powerpc In-Reply-To: <20100630153051.GA29468@Chamillionaire.breakpoint.cc> References: <20100630153051.GA29468@Chamillionaire.breakpoint.cc> Message-ID: <4C2B644A.5040403@redhat.com> On 06/30/2010 04:30 PM, Sebastian Andrzej Siewior wrote: > this cute C code does the same thing on powerpc as the assembly code that > was here before. If the compiler was built with the SPE extensions instead > of traditional FPU and double operations are performed in HW then we are > one step further: The compiler turns this into evldd & evstdd. Voila :) > > This C code could also be activated on s390. The compiler turns this into > a single mvc instruction which does the copy operation. I don't know if > mvc's copy ability is atomic _or_ not and therefore I leave it as it. I don't quite understand this. Is it guaranteed that double stores on ppc are atomic? Andrew. From gbenson at redhat.com Wed Jun 30 09:10:51 2010 From: gbenson at redhat.com (Gary Benson) Date: Wed, 30 Jun 2010 17:10:51 +0100 Subject: openjdk/zero: use double code for atomic64 on powerpc In-Reply-To: <4C2B644A.5040403@redhat.com> References: <20100630153051.GA29468@Chamillionaire.breakpoint.cc> <4C2B644A.5040403@redhat.com> Message-ID: <20100630161051.GD3321@redhat.com> Andrew Haley wrote: > On 06/30/2010 04:30 PM, Sebastian Andrzej Siewior wrote: > > this cute C code does the same thing on powerpc as the assembly > > code that was here before. If the compiler was built with the SPE > > extensions instead of traditional FPU and double operations are > > performed in HW then we are one step further: The compiler turns > > this into evldd & evstdd. Voila :) > > > > This C code could also be activated on s390. The compiler turns > > this into a single mvc instruction which does the copy > > operation. I don't know if mvc's copy ability is atomic _or_ not > > and therefore I leave it as it. > > I don't quite understand this. Is it guaranteed that double stores > on ppc are atomic? No, but it does seem to work. The same trick is used in the kernel to write to flash drives IIRC. Cheers, Gary -- http://gbenson.net/ From aph at redhat.com Wed Jun 30 09:58:00 2010 From: aph at redhat.com (Andrew Haley) Date: Wed, 30 Jun 2010 17:58:00 +0100 Subject: openjdk/zero: use double code for atomic64 on powerpc In-Reply-To: <20100630161051.GD3321@redhat.com> References: <20100630153051.GA29468@Chamillionaire.breakpoint.cc> <4C2B644A.5040403@redhat.com> <20100630161051.GD3321@redhat.com> Message-ID: <4C2B7798.2040509@redhat.com> On 06/30/2010 05:10 PM, Gary Benson wrote: > Andrew Haley wrote: >> On 06/30/2010 04:30 PM, Sebastian Andrzej Siewior wrote: >>> this cute C code does the same thing on powerpc as the assembly >>> code that was here before. If the compiler was built with the SPE >>> extensions instead of traditional FPU and double operations are >>> performed in HW then we are one step further: The compiler turns >>> this into evldd & evstdd. Voila :) >>> >>> This C code could also be activated on s390. The compiler turns >>> this into a single mvc instruction which does the copy >>> operation. I don't know if mvc's copy ability is atomic _or_ not >>> and therefore I leave it as it. >> >> I don't quite understand this. Is it guaranteed that double stores >> on ppc are atomic? > > No, but it does seem to work. The same trick is used in the kernel > to write to flash drives IIRC. I hope to goodness that it as atomic, then. The problem here is that we risk silently generating incorrect code. Andrew.