From huizhe.wang at oracle.com Wed Sep 1 12:16:06 2010 From: huizhe.wang at oracle.com (Joe Wang) Date: Wed, 01 Sep 2010 12:16:06 -0700 Subject: request to integrate jaxp 1.4.4 Message-ID: <4C7EA676.6050001@oracle.com> Hi, We are working on jaxp 1.4.4 release and would like to know if you would approve integrating it into OpenJDK6. For details, please see attached release notes and changelog. Thanks, Joe -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/jdk6-dev/attachments/20100901/b000d4e3/attachment-0002.html -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/jdk6-dev/attachments/20100901/b000d4e3/attachment-0003.html From huizhe.wang at oracle.com Wed Sep 1 12:30:17 2010 From: huizhe.wang at oracle.com (Joe Wang) Date: Wed, 01 Sep 2010 12:30:17 -0700 Subject: request to integrate jaxp 1.4.4 Message-ID: <4C7EA9C9.3080604@oracle.com> Hi, We're working on jaxp 1.4.4 release and would like to know if you would approve integrating it into OpenJDK6. Here are links to jaxp 1.4.4 source bundle for JDK6 and 7: Source bundle: https://jaxp.dev.java.net/files/documents/913/152561/jaxp-1_4_4.zip Unit tests: https://jaxp.dev.java.net/files/documents/913/152562/jaxp-unittests-1_4_4.zip For details, see release notes and changelog below. Thanks, Joe * Java API for XML Processing Release Notes* Specification Version: 1.4 Reference Implementation (RI) Version: 1.4.4 Aug. 24, 2010 The drivers of this release are several regressions from JDK 6 Update Release 18 and customer escalations. This release will be integrated into JDK6 Update release 23 as well as the current JDK7 development branch. Please read below for details on the change log. Changes and bug fixes in the release: 1.Regressions Before JDK6 Update 18, bug fixes and improvements in JAXP were selectively integrated into JDK6 update releases. During update 18, there was a complete synchronization between the JDK and JAXP. Due to the number of changes made and the age of these changes, there were several regressions found in the release. All of the currently-identified regressions have been fixed in this release. 2.Customer escalations Customer escaltions are generally provided through revision releases immediately after they are fixed. The inclusion here is a recount and serves as a record for JDK7 integration. 3.Performance improvements There have been continued effort in performance improvements as a result of SPECjvm2008 benchmark tests and analysis. 4.Apache Update JAXP 1.4 is based on Xerces 2.7.1 and Xalan 2.7. Starting from this release, JAXP 1.4.4, we will sync up to Xerces 2.10.0 and Xalan 2.7.1 over a period of releases in phases. In the first phase of this sync-up, all blockers and critical fixes from Xerces and Xalan are integrated. ?For all changes and fixes made in the JAXP 1.4.4 release, please refer to: The JAXP 1.4.4 Change Log Changes Made and Bugs Fixed in JAXP 1.4.4 Nr Category ID Synopsis/Description 1 JAXP/SAX/Error Handling 6921075 FactoryConfigurationError is not chaining the exception properly 2 JAXP/XSLT/Performance 6922044 XSLTC performance regression in 1.6.0_18 3 JAXP/XSLT 6689809 Jaxp Issue 60: XSLT transformer ignores XPath predicates in xsl:key elements 4 JAXP/Validation 6925531 A validation of a SAXSource always fails if SecurityManager is set 5 JAXP/XSLT 6928198 reset() method in the Transformer does not reset to its original state, causes the memory to grow. 6 JAXP/DOM 6909336 OpenJDK Issue 100123: XMLDOMWriterImpl throws ArrayIndexOutOfBoundsException 7 JAXP/Doc 6653982 Wrong link in javadoc for XMLConstants and DatatypeFactory 8 JAXP/Performance 6935738 Jaxp Issue 61 and 62: Perf. optimization for QName.equals(...) 9 JAXP/Validation 6936624 sharing cached schema causing cvc-complex-type.2.4.b error 10 JAXP/Performance 6938276 lock contention reduction in jaxp XSComplexTypeDecl.getContentModel(CMBuilder cmBuilder) 11 JAXP/XSLT/Regression(6u18) 6940416 Regression in 6u18 wrt XSL/T processing 12 JAXP/XSLT 6941869 XSL : Xalan transformer fails to process semicolumn symbol in a count() function correctly 13 JAXP/SAX/Regression 6946312 XML parser omits characters callback to ContentHandler since 6u18 14 JAXP/SAX 6949607 Jaxp Issue 63 : attribute is accessible with invalid namespace 15 JAXP/Conformance 6937964 XML Duration do not conform to W3C specifications 16 JAXP/SAX 6954755 The setXIncludeAware method in SAXParserFactory throws obscure error message 17 JAXP/XSLT/Regression 6957215 JDK6u18 XSLT regression: xsl:copy-of failing to copy generated attributes 18 JAXP/Performance 6908123 refactor com.sun.org.apache.xalan.internal.xsltc.runtime.BasicLibrary.substringF() variants 19 JAXP/StAX 6846133 StAX XMLEventReader DTD issues 20 JAXP/SAX 6925410 XMLReaderFactory.createXMLReader is very slow 21 JAXP/StAX 6756677 [StAX] XMLInputFactory.newInstance(String factoryId, ...) treats property name as a property value 22 JAXP/Validation 6954738 StackOverflowError during XML schema validation Apache Blockers and Critical Fixes Nr Key Synopsis/Description 1 XERCESJ-1094 Xerces in infinite loop validating wrongly encoded XML 1.1 documents 2 XERCESJ-773 Poor performance when processing schemas with high values of maxOccurs 3 XERCESJ-682 Comination of fields in acts as 4 XERCESJ-506 warn-on-undeclared-element feature not recognized 5 XERCESJ-206 Stack overflow when using a schema validation. 6 XERCESJ-1357 pattern causes the parser to hang 7 XERCESJ-1174 PSVIElementNSImpl.getNil() 8 XERCESJ-1101 Validating DocumentBuilder instance fails to parse more than one XML document. 9 XERCESJ-1326 StackOverflowException when parsing against a schema with a pattern 10 XERCESJ-1456 Regular expression is incorrectly handled in pattern facet 11 XERCESJ-1389 RegEx matching: range not computed correctly 12 XERCESJ-1388 RegEx matching: when computing backreferences, "\dd" must match group "dd" if group exists 13 XERCESJ-1377 Thread safety problem in RegularExpression 14 XERCESJ-1061 Regex "$" and "^" characters treated as special chars in conflict with XML Schema spec 15 XERCESJ-1265 E2-67 not fully implemented; rejecting regular expressions like ~[-], ~[^-] 16 XERCESJ-1336 Add a new property for setting the locale used for reporting error messages. 17 XALANJ-2290 ArrayIndexOutOfBoundsException when xsl:varaible storing RTF result 18 XALANJ-2204 Function Count on variable modifies number of nodes in variable. 19 XALANJ-2199 Xalan 2.7.0 Error parsing XPath expression 20 XALANJ-2285 count function applied to union as test of node identity is broken 21 XALANJ-2184 cp850, cp860 serialization fails 22 XALANJ-2083 Data corrupted in Parallel XSL execution 23 XALANJ-2324 XPath function last() gives wrong result when select has a predicate -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/jdk6-dev/attachments/20100901/92822b97/attachment-0001.html From joe.darcy at oracle.com Wed Sep 1 13:12:18 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Wed, 01 Sep 2010 13:12:18 -0700 Subject: request to integrate jaxp 1.4.4 In-Reply-To: <4C7EA9C9.3080604@oracle.com> References: <4C7EA9C9.3080604@oracle.com> Message-ID: <4C7EB3A2.3030109@oracle.com> Hello. As part of a coordinated effort to update jaxp in the JDK, I approve this change going into OpenJDK 6 build 21. Thanks, -Joe Joe Wang wrote: > Hi, > > We're working on jaxp 1.4.4 release and would like to know if you > would approve integrating it into OpenJDK6. Here are links to jaxp > 1.4.4 source bundle for JDK6 and 7: > Source bundle: > https://jaxp.dev.java.net/files/documents/913/152561/jaxp-1_4_4.zip > Unit tests: > https://jaxp.dev.java.net/files/documents/913/152562/jaxp-unittests-1_4_4.zip > > For details, see release notes and changelog below. > > Thanks, > Joe > * > Java API for XML Processing Release Notes* > Specification Version: 1.4 > Reference Implementation (RI) Version: 1.4.4 > Aug. 24, 2010 > > The drivers of this release are several regressions from JDK 6 Update > Release 18 and customer escalations. This release will be integrated > into JDK6 Update release 23 as well as the current JDK7 development > branch. Please read below for details on the change log. > > Changes and bug fixes in the release: > > 1.Regressions > Before JDK6 Update 18, bug fixes and improvements in JAXP were > selectively integrated into JDK6 update releases. During update 18, > there was a complete synchronization between the JDK and JAXP. Due to > the number of changes made and the age of these changes, there were > several regressions found in the release. All of the > currently-identified regressions have been fixed in this release. > > > 2.Customer escalations > Customer escaltions are generally provided through revision releases > immediately after they are fixed. The inclusion here is a recount and > serves as a record for JDK7 integration. > > 3.Performance improvements > There have been continued effort in performance improvements as a > result of SPECjvm2008 benchmark tests and analysis. > > 4.Apache Update > JAXP 1.4 is based on Xerces 2.7.1 and Xalan 2.7. Starting from this > release, JAXP 1.4.4, we will sync up to Xerces 2.10.0 and Xalan 2.7.1 > over a period of releases in phases. In the first phase of this > sync-up, all blockers and critical fixes from Xerces and Xalan are > integrated. > > > ?For all changes and fixes made in the JAXP 1.4.4 release, please > refer to: > > The JAXP 1.4.4 Change Log > > Changes Made and Bugs Fixed in JAXP 1.4.4 > > Nr Category ID Synopsis/Description > 1 JAXP/SAX/Error Handling 6921075 FactoryConfigurationError is not > chaining the exception properly > 2 JAXP/XSLT/Performance 6922044 XSLTC performance regression in 1.6.0_18 > 3 JAXP/XSLT 6689809 Jaxp Issue 60: XSLT transformer ignores XPath > predicates in xsl:key elements > 4 JAXP/Validation 6925531 A validation of a SAXSource always fails if > SecurityManager is set > 5 JAXP/XSLT 6928198 reset() method in the Transformer does not reset > to its original state, causes the memory to grow. > 6 JAXP/DOM 6909336 OpenJDK Issue 100123: XMLDOMWriterImpl throws > ArrayIndexOutOfBoundsException > 7 JAXP/Doc 6653982 Wrong link in javadoc for XMLConstants and > DatatypeFactory > 8 JAXP/Performance 6935738 Jaxp Issue 61 and 62: Perf. optimization > for QName.equals(...) > 9 JAXP/Validation 6936624 sharing cached schema causing > cvc-complex-type.2.4.b error > 10 JAXP/Performance 6938276 lock contention reduction in jaxp > XSComplexTypeDecl.getContentModel(CMBuilder cmBuilder) > 11 JAXP/XSLT/Regression(6u18) 6940416 Regression in 6u18 wrt XSL/T > processing > 12 JAXP/XSLT 6941869 XSL : Xalan transformer fails to process > semicolumn symbol in a count() function correctly > 13 JAXP/SAX/Regression 6946312 XML parser omits characters callback to > ContentHandler since 6u18 > 14 JAXP/SAX 6949607 Jaxp Issue 63 : attribute is accessible with > invalid namespace > 15 JAXP/Conformance 6937964 XML Duration do not conform to W3C > specifications > 16 JAXP/SAX 6954755 The setXIncludeAware method in SAXParserFactory > throws obscure error message > 17 JAXP/XSLT/Regression 6957215 JDK6u18 XSLT regression: xsl:copy-of > failing to copy generated attributes > 18 JAXP/Performance 6908123 refactor > com.sun.org.apache.xalan.internal.xsltc.runtime.BasicLibrary.substringF() > variants > 19 JAXP/StAX 6846133 StAX XMLEventReader DTD issues > 20 JAXP/SAX 6925410 XMLReaderFactory.createXMLReader is very slow > 21 JAXP/StAX 6756677 [StAX] XMLInputFactory.newInstance(String > factoryId, ...) treats property name as a property value > 22 JAXP/Validation 6954738 StackOverflowError during XML schema > validation > > Apache Blockers and Critical Fixes > > Nr Key Synopsis/Description > 1 XERCESJ-1094 Xerces in infinite loop validating wrongly encoded XML > 1.1 documents > 2 XERCESJ-773 Poor performance when processing schemas with high > values of maxOccurs > 3 XERCESJ-682 Comination of fields in acts as > 4 XERCESJ-506 warn-on-undeclared-element feature not recognized > 5 XERCESJ-206 Stack overflow when using a schema validation. > 6 XERCESJ-1357 pattern causes the parser to hang > 7 XERCESJ-1174 PSVIElementNSImpl.getNil() > 8 XERCESJ-1101 Validating DocumentBuilder instance fails to parse more > than one XML document. > 9 XERCESJ-1326 StackOverflowException when parsing against a schema > with a pattern > 10 XERCESJ-1456 Regular expression is incorrectly handled in pattern > facet > 11 XERCESJ-1389 RegEx matching: range not computed correctly > 12 XERCESJ-1388 RegEx matching: when computing backreferences, "\dd" > must match group "dd" if group exists > 13 XERCESJ-1377 Thread safety problem in RegularExpression > 14 XERCESJ-1061 Regex "$" and "^" characters treated as special chars > in conflict with XML Schema spec > 15 XERCESJ-1265 E2-67 not fully implemented; rejecting regular > expressions like ~[-], ~[^-] > 16 XERCESJ-1336 Add a new property for setting the locale used for > reporting error messages. > 17 XALANJ-2290 ArrayIndexOutOfBoundsException when xsl:varaible > storing RTF result > 18 XALANJ-2204 Function Count on variable modifies number of nodes in > variable. > 19 XALANJ-2199 Xalan 2.7.0 Error parsing XPath expression > 20 XALANJ-2285 count function applied to union as test of node > identity is broken > 21 XALANJ-2184 cp850, cp860 serialization fails > 22 XALANJ-2083 Data corrupted in Parallel XSL execution > 23 XALANJ-2324 XPath function last() gives wrong result when select > has a predicate > From huizhe.wang at oracle.com Wed Sep 1 13:13:48 2010 From: huizhe.wang at oracle.com (Joe Wang) Date: Wed, 01 Sep 2010 13:13:48 -0700 Subject: request to integrate jaxp 1.4.4 In-Reply-To: <4C7EB3A2.3030109@oracle.com> References: <4C7EA9C9.3080604@oracle.com> <4C7EB3A2.3030109@oracle.com> Message-ID: <4C7EB3FC.7040706@oracle.com> Thanks! On 9/1/2010 1:12 PM, Joe Darcy wrote: > Hello. > > As part of a coordinated effort to update jaxp in the JDK, I approve > this change going into OpenJDK 6 build 21. > > Thanks, > > -Joe > > Joe Wang wrote: >> Hi, >> >> We're working on jaxp 1.4.4 release and would like to know if you >> would approve integrating it into OpenJDK6. Here are links to jaxp >> 1.4.4 source bundle for JDK6 and 7: >> Source bundle: >> https://jaxp.dev.java.net/files/documents/913/152561/jaxp-1_4_4.zip >> Unit tests: >> https://jaxp.dev.java.net/files/documents/913/152562/jaxp-unittests-1_4_4.zip >> >> >> For details, see release notes and changelog below. >> >> Thanks, >> Joe >> * >> Java API for XML Processing Release Notes* >> Specification Version: 1.4 >> Reference Implementation (RI) Version: 1.4.4 >> Aug. 24, 2010 >> >> The drivers of this release are several regressions from JDK 6 Update >> Release 18 and customer escalations. This release will be integrated >> into JDK6 Update release 23 as well as the current JDK7 development >> branch. Please read below for details on the change log. >> >> Changes and bug fixes in the release: >> >> 1.Regressions >> Before JDK6 Update 18, bug fixes and improvements in JAXP were >> selectively integrated into JDK6 update releases. During update 18, >> there was a complete synchronization between the JDK and JAXP. Due to >> the number of changes made and the age of these changes, there were >> several regressions found in the release. All of the >> currently-identified regressions have been fixed in this release. >> >> >> 2.Customer escalations >> Customer escaltions are generally provided through revision releases >> immediately after they are fixed. The inclusion here is a recount and >> serves as a record for JDK7 integration. >> >> 3.Performance improvements >> There have been continued effort in performance improvements as a >> result of SPECjvm2008 benchmark tests and analysis. >> >> 4.Apache Update >> JAXP 1.4 is based on Xerces 2.7.1 and Xalan 2.7. Starting from this >> release, JAXP 1.4.4, we will sync up to Xerces 2.10.0 and Xalan 2.7.1 >> over a period of releases in phases. In the first phase of this >> sync-up, all blockers and critical fixes from Xerces and Xalan are >> integrated. >> >> >> ?For all changes and fixes made in the JAXP 1.4.4 release, please >> refer to: >> >> The JAXP 1.4.4 Change Log >> >> Changes Made and Bugs Fixed in JAXP 1.4.4 >> >> Nr Category ID Synopsis/Description >> 1 JAXP/SAX/Error Handling 6921075 FactoryConfigurationError is not >> chaining the exception properly >> 2 JAXP/XSLT/Performance 6922044 XSLTC performance regression in 1.6.0_18 >> 3 JAXP/XSLT 6689809 Jaxp Issue 60: XSLT transformer ignores XPath >> predicates in xsl:key elements >> 4 JAXP/Validation 6925531 A validation of a SAXSource always fails if >> SecurityManager is set >> 5 JAXP/XSLT 6928198 reset() method in the Transformer does not reset >> to its original state, causes the memory to grow. >> 6 JAXP/DOM 6909336 OpenJDK Issue 100123: XMLDOMWriterImpl throws >> ArrayIndexOutOfBoundsException >> 7 JAXP/Doc 6653982 Wrong link in javadoc for XMLConstants and >> DatatypeFactory >> 8 JAXP/Performance 6935738 Jaxp Issue 61 and 62: Perf. optimization >> for QName.equals(...) >> 9 JAXP/Validation 6936624 sharing cached schema causing >> cvc-complex-type.2.4.b error >> 10 JAXP/Performance 6938276 lock contention reduction in jaxp >> XSComplexTypeDecl.getContentModel(CMBuilder cmBuilder) >> 11 JAXP/XSLT/Regression(6u18) 6940416 Regression in 6u18 wrt XSL/T >> processing >> 12 JAXP/XSLT 6941869 XSL : Xalan transformer fails to process >> semicolumn symbol in a count() function correctly >> 13 JAXP/SAX/Regression 6946312 XML parser omits characters callback >> to ContentHandler since 6u18 >> 14 JAXP/SAX 6949607 Jaxp Issue 63 : attribute is accessible with >> invalid namespace >> 15 JAXP/Conformance 6937964 XML Duration do not conform to W3C >> specifications >> 16 JAXP/SAX 6954755 The setXIncludeAware method in SAXParserFactory >> throws obscure error message >> 17 JAXP/XSLT/Regression 6957215 JDK6u18 XSLT regression: xsl:copy-of >> failing to copy generated attributes >> 18 JAXP/Performance 6908123 refactor >> com.sun.org.apache.xalan.internal.xsltc.runtime.BasicLibrary.substringF() >> variants >> 19 JAXP/StAX 6846133 StAX XMLEventReader DTD issues >> 20 JAXP/SAX 6925410 XMLReaderFactory.createXMLReader is very slow >> 21 JAXP/StAX 6756677 [StAX] XMLInputFactory.newInstance(String >> factoryId, ...) treats property name as a property value >> 22 JAXP/Validation 6954738 StackOverflowError during XML schema >> validation >> >> Apache Blockers and Critical Fixes >> >> Nr Key Synopsis/Description >> 1 XERCESJ-1094 Xerces in infinite loop validating wrongly encoded XML >> 1.1 documents >> 2 XERCESJ-773 Poor performance when processing schemas with high >> values of maxOccurs >> 3 XERCESJ-682 Comination of fields in acts as >> 4 XERCESJ-506 warn-on-undeclared-element feature not recognized >> 5 XERCESJ-206 Stack overflow when using a schema validation. >> 6 XERCESJ-1357 pattern causes the parser to hang >> 7 XERCESJ-1174 PSVIElementNSImpl.getNil() >> 8 XERCESJ-1101 Validating DocumentBuilder instance fails to parse >> more than one XML document. 9 XERCESJ-1326 StackOverflowException >> when parsing against a schema with a pattern >> 10 XERCESJ-1456 Regular expression is incorrectly handled in pattern >> facet >> 11 XERCESJ-1389 RegEx matching: range not computed correctly >> 12 XERCESJ-1388 RegEx matching: when computing backreferences, "\dd" >> must match group "dd" if group exists >> 13 XERCESJ-1377 Thread safety problem in RegularExpression >> 14 XERCESJ-1061 Regex "$" and "^" characters treated as special chars >> in conflict with XML Schema spec 15 XERCESJ-1265 E2-67 not fully >> implemented; rejecting regular expressions like ~[-], ~[^-] >> 16 XERCESJ-1336 Add a new property for setting the locale used for >> reporting error messages. >> 17 XALANJ-2290 ArrayIndexOutOfBoundsException when xsl:varaible >> storing RTF result >> 18 XALANJ-2204 Function Count on variable modifies number of nodes in >> variable. >> 19 XALANJ-2199 Xalan 2.7.0 Error parsing XPath expression >> 20 XALANJ-2285 count function applied to union as test of node >> identity is broken 21 XALANJ-2184 cp850, cp860 serialization fails 22 >> XALANJ-2083 Data corrupted in Parallel XSL execution 23 XALANJ-2324 >> XPath function last() gives wrong result when select has a predicate >> > From kelly.ohair at oracle.com Thu Sep 2 10:58:47 2010 From: kelly.ohair at oracle.com (kelly.ohair at oracle.com) Date: Thu, 02 Sep 2010 17:58:47 +0000 Subject: hg: jdk6/jdk6/jaxp: 6981408: Upgrade jaxp to 1.4.4 Message-ID: <20100902175847.BC0E34767B@hg.openjdk.java.net> Changeset: e83211607595 Author: ohair Date: 2010-09-01 13:26 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxp/rev/e83211607595 6981408: Upgrade jaxp to 1.4.4 Reviewed-by: darcy Contributed-by: Joe Wang ! jaxp.properties From omajid at redhat.com Tue Sep 7 07:10:14 2010 From: omajid at redhat.com (Omair Majid) Date: Tue, 07 Sep 2010 10:10:14 -0400 Subject: Backporting 6675802 and 6691503 to OpenJDK6 In-Reply-To: <4C780802.9050307@oracle.com> References: <4C77DB3A.5010500@redhat.com> <4C780802.9050307@oracle.com> Message-ID: <4C8647C6.5010605@redhat.com> Hi, On 08/27/2010 02:46 PM, Joe Darcy wrote: > Hello. > > Omair Majid wrote: >> Hi, >> >> I would like permission to backport the following two changesets from >> OpenJDK7 to OpenJDK6: >> >> changeset: 190:dd66920b2d51 >> user: mlapshin >> date: Fri Apr 18 18:21:02 2008 +0400 >> summary: 6675802: Regression: heavyweight popups cause >> SecurityExceptions in applets >> >> changeset: 191:40414219305f >> user: mlapshin >> date: Wed Apr 23 18:06:34 2008 +0400 >> summary: 6691503: Malicious applet can show always-on-top popup menu >> which has whole screen size >> >> Together, the changesets allow heavyweight popups to display when >> using applets. >> >> Thanks, >> Omair >> > > Approved to be backported if the merges are clean and if the new files > include the rebranded Oracle copyrights. > Sorry about the delay, but I was a bit busy with other stuff. The changes to src/share/classes/javax/swing/Popup.java are clean but the new test files will need to be modified to include the updated copyright headers. Is it still OK to backport with the additional modifications? Also, given that mlapshin is responsible for the actual code changes, what is the best way to credit him for this patch? Thanks, Omair From omajid at redhat.com Tue Sep 7 07:12:06 2010 From: omajid at redhat.com (Omair Majid) Date: Tue, 07 Sep 2010 10:12:06 -0400 Subject: Backport for 6632959: swing html parser doesn't know € or › In-Reply-To: <4C697BDA.6070103@redhat.com> References: <4C697BDA.6070103@redhat.com> Message-ID: <4C864836.7020308@redhat.com> On 08/16/2010 01:56 PM, Omair Majid wrote: > I would like to backport > http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/fc1ac6ea933c to jdk6. This > adds a number of missing html entities back to swing. > Any thoughts or objections? Cheers, Omair From ahughes at redhat.com Tue Sep 7 07:45:09 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 7 Sep 2010 15:45:09 +0100 Subject: Backport for 6632959: swing html parser doesn't know € or › In-Reply-To: <4C864836.7020308@redhat.com> References: <4C697BDA.6070103@redhat.com> <4C864836.7020308@redhat.com> Message-ID: <20100907144509.GD12529@bree.middle-earth.co.uk> On 10:12 Tue 07 Sep , Omair Majid wrote: > On 08/16/2010 01:56 PM, Omair Majid wrote: > > I would like to backport > > http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/fc1ac6ea933c to jdk6. This > > adds a number of missing html entities back to swing. > > > > Any thoughts or objections? > > Cheers, > Omair Has this been added to 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 ahughes at redhat.com Tue Sep 7 07:48:28 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 7 Sep 2010 15:48:28 +0100 Subject: Backporting 6675802 and 6691503 to OpenJDK6 In-Reply-To: <4C8647C6.5010605@redhat.com> References: <4C77DB3A.5010500@redhat.com> <4C780802.9050307@oracle.com> <4C8647C6.5010605@redhat.com> Message-ID: <20100907144827.GE12529@bree.middle-earth.co.uk> On 10:10 Tue 07 Sep , Omair Majid wrote: > Hi, > > On 08/27/2010 02:46 PM, Joe Darcy wrote: > > Hello. > > > > Omair Majid wrote: > >> Hi, > >> > >> I would like permission to backport the following two changesets from > >> OpenJDK7 to OpenJDK6: > >> > >> changeset: 190:dd66920b2d51 > >> user: mlapshin > >> date: Fri Apr 18 18:21:02 2008 +0400 > >> summary: 6675802: Regression: heavyweight popups cause > >> SecurityExceptions in applets > >> > >> changeset: 191:40414219305f > >> user: mlapshin > >> date: Wed Apr 23 18:06:34 2008 +0400 > >> summary: 6691503: Malicious applet can show always-on-top popup menu > >> which has whole screen size > >> > >> Together, the changesets allow heavyweight popups to display when > >> using applets. > >> > >> Thanks, > >> Omair > >> > > > > Approved to be backported if the merges are clean and if the new files > > include the rebranded Oracle copyrights. > > > > Sorry about the delay, but I was a bit busy with other stuff. The > changes to src/share/classes/javax/swing/Popup.java are clean but the > new test files will need to be modified to include the updated copyright > headers. Is it still OK to backport with the additional modifications? > Also, given that mlapshin is responsible for the actual code changes, > what is the best way to credit him for this patch? > > Thanks, > Omair The updated headers should already be in the current OpenJDK7 version of the files so you can just copy it over, once imported into OpenJDK6. For accreditation, I keep the same user as the original commit. This happens automatically in unchanged cases where you can do hg export x | hg import -, but in cases like this (and these copyright changes will now produce a lot of them, sigh) you can use --user for the commit. -- 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 omajid at redhat.com Tue Sep 7 07:58:22 2010 From: omajid at redhat.com (Omair Majid) Date: Tue, 07 Sep 2010 10:58:22 -0400 Subject: Backport for 6632959: swing html parser doesn't know € or › In-Reply-To: <20100907144509.GD12529@bree.middle-earth.co.uk> References: <4C697BDA.6070103@redhat.com> <4C864836.7020308@redhat.com> <20100907144509.GD12529@bree.middle-earth.co.uk> Message-ID: <4C86530E.2000308@redhat.com> On 09/07/2010 10:45 AM, Dr Andrew John Hughes wrote: > On 10:12 Tue 07 Sep , Omair Majid wrote: >> On 08/16/2010 01:56 PM, Omair Majid wrote: >>> I would like to backport >>> http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/fc1ac6ea933c to jdk6. This >>> adds a number of missing html entities back to swing. >>> >> >> Any thoughts or objections? >> >> Cheers, >> Omair > > Has this been added to IcedTea6? No; I just checked and IcedTea6 still shows "€" literally. Omair From omajid at redhat.com Tue Sep 7 08:22:11 2010 From: omajid at redhat.com (omajid at redhat.com) Date: Tue, 07 Sep 2010 15:22:11 +0000 Subject: hg: jdk6/jdk6/jdk: 2 new changesets Message-ID: <20100907152227.BA3654779B@hg.openjdk.java.net> Changeset: 13ad7a024dfc Author: mlapshin Date: 2008-04-18 18:21 +0400 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/13ad7a024dfc 6675802: Regression: heavyweight popups cause SecurityExceptions in applets Summary: The problem code in Popup class is surrounded by AccessController.doPrivileged() Reviewed-by: alexp ! src/share/classes/javax/swing/Popup.java + test/javax/swing/JPopupMenu/6675802/bug6675802.java Changeset: e091dd1776d0 Author: mlapshin Date: 2008-04-23 18:06 +0400 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/e091dd1776d0 6691503: Malicious applet can show always-on-top popup menu which has whole screen size Summary: The fix for 6675802 is replaced by a try-catch clause that catches SequrityExceptions for applets. Reviewed-by: alexp ! src/share/classes/javax/swing/Popup.java + test/javax/swing/JPopupMenu/6691503/bug6691503.java From omajid at redhat.com Tue Sep 7 08:24:31 2010 From: omajid at redhat.com (Omair Majid) Date: Tue, 07 Sep 2010 11:24:31 -0400 Subject: Backporting 6675802 and 6691503 to OpenJDK6 In-Reply-To: <20100907144827.GE12529@bree.middle-earth.co.uk> References: <4C77DB3A.5010500@redhat.com> <4C780802.9050307@oracle.com> <4C8647C6.5010605@redhat.com> <20100907144827.GE12529@bree.middle-earth.co.uk> Message-ID: <4C86592F.10700@redhat.com> On 09/07/2010 10:48 AM, Dr Andrew John Hughes wrote: > On 10:10 Tue 07 Sep , Omair Majid wrote: >> Hi, >> >> On 08/27/2010 02:46 PM, Joe Darcy wrote: >>> Hello. >>> >>> Omair Majid wrote: >>>> Hi, >>>> >>>> I would like permission to backport the following two changesets from >>>> OpenJDK7 to OpenJDK6: >>>> >>>> changeset: 190:dd66920b2d51 >>>> user: mlapshin >>>> date: Fri Apr 18 18:21:02 2008 +0400 >>>> summary: 6675802: Regression: heavyweight popups cause >>>> SecurityExceptions in applets >>>> >>>> changeset: 191:40414219305f >>>> user: mlapshin >>>> date: Wed Apr 23 18:06:34 2008 +0400 >>>> summary: 6691503: Malicious applet can show always-on-top popup menu >>>> which has whole screen size >>>> >>>> Together, the changesets allow heavyweight popups to display when >>>> using applets. >>>> >>>> Thanks, >>>> Omair >>>> >>> >>> Approved to be backported if the merges are clean and if the new files >>> include the rebranded Oracle copyrights. >>> >> >> Sorry about the delay, but I was a bit busy with other stuff. The >> changes to src/share/classes/javax/swing/Popup.java are clean but the >> new test files will need to be modified to include the updated copyright >> headers. Is it still OK to backport with the additional modifications? >> Also, given that mlapshin is responsible for the actual code changes, >> what is the best way to credit him for this patch? >> >> Thanks, >> Omair > > The updated headers should already be in the current OpenJDK7 version of the files > so you can just copy it over, once imported into OpenJDK6. > > For accreditation, I keep the same user as the original commit. This happens automatically > in unchanged cases where you can do hg export x | hg import -, but in cases like this > (and these copyright changes will now produce a lot of them, sigh) you can use --user for the > commit. Thanks. I have pushed the changesets as follows: Changeset: 13ad7a024dfc Author: mlapshin Date: 2008-04-18 18:21 +0400 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/13ad7a024dfc 6675802: Regression: heavyweight popups cause SecurityExceptions in applets Summary: The problem code in Popup class is surrounded by AccessController.doPrivileged() Reviewed-by: alexp ! src/share/classes/javax/swing/Popup.java + test/javax/swing/JPopupMenu/6675802/bug6675802.java Changeset: e091dd1776d0 Author: mlapshin Date: 2008-04-23 18:06 +0400 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/e091dd1776d0 6691503: Malicious applet can show always-on-top popup menu which has whole screen size Summary: The fix for 6675802 is replaced by a try-catch clause that catches SequrityExceptions for applets. Reviewed-by: alexp ! src/share/classes/javax/swing/Popup.java + test/javax/swing/JPopupMenu/6691503/bug6691503.java Cheers, Omair From joe.darcy at oracle.com Tue Sep 7 09:39:44 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Tue, 07 Sep 2010 09:39:44 -0700 Subject: Backporting 6675802 and 6691503 to OpenJDK6 In-Reply-To: <4C86592F.10700@redhat.com> References: <4C77DB3A.5010500@redhat.com> <4C780802.9050307@oracle.com> <4C8647C6.5010605@redhat.com> <20100907144827.GE12529@bree.middle-earth.co.uk> <4C86592F.10700@redhat.com> Message-ID: <4C866AD0.3040007@oracle.com> Omair Majid wrote: > On 09/07/2010 10:48 AM, Dr Andrew John Hughes wrote: >> On 10:10 Tue 07 Sep , Omair Majid wrote: >>> Hi, >>> >>> On 08/27/2010 02:46 PM, Joe Darcy wrote: >>>> Hello. >>>> >>>> Omair Majid wrote: >>>>> Hi, >>>>> >>>>> I would like permission to backport the following two changesets from >>>>> OpenJDK7 to OpenJDK6: >>>>> >>>>> changeset: 190:dd66920b2d51 >>>>> user: mlapshin >>>>> date: Fri Apr 18 18:21:02 2008 +0400 >>>>> summary: 6675802: Regression: heavyweight popups cause >>>>> SecurityExceptions in applets >>>>> >>>>> changeset: 191:40414219305f >>>>> user: mlapshin >>>>> date: Wed Apr 23 18:06:34 2008 +0400 >>>>> summary: 6691503: Malicious applet can show always-on-top popup menu >>>>> which has whole screen size >>>>> >>>>> Together, the changesets allow heavyweight popups to display when >>>>> using applets. >>>>> >>>>> Thanks, >>>>> Omair >>>>> >>>> >>>> Approved to be backported if the merges are clean and if the new files >>>> include the rebranded Oracle copyrights. >>>> >>> >>> Sorry about the delay, but I was a bit busy with other stuff. The >>> changes to src/share/classes/javax/swing/Popup.java are clean but the >>> new test files will need to be modified to include the updated >>> copyright >>> headers. Is it still OK to backport with the additional modifications? >>> Also, given that mlapshin is responsible for the actual code changes, >>> what is the best way to credit him for this patch? >>> >>> Thanks, >>> Omair >> >> The updated headers should already be in the current OpenJDK7 version >> of the files >> so you can just copy it over, once imported into OpenJDK6. >> >> For accreditation, I keep the same user as the original commit. This >> happens automatically >> in unchanged cases where you can do hg export x | hg import -, but in >> cases like this >> (and these copyright changes will now produce a lot of them, sigh) >> you can use --user for the >> commit. > > Thanks. I have pushed the changesets as follows: > > Changeset: 13ad7a024dfc > Author: mlapshin > Date: 2008-04-18 18:21 +0400 > URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/13ad7a024dfc > > 6675802: Regression: heavyweight popups cause SecurityExceptions in > applets > Summary: The problem code in Popup class is surrounded by > AccessController.doPrivileged() > Reviewed-by: alexp > > ! src/share/classes/javax/swing/Popup.java > + test/javax/swing/JPopupMenu/6675802/bug6675802.java > > Changeset: e091dd1776d0 > Author: mlapshin > Date: 2008-04-23 18:06 +0400 > URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/e091dd1776d0 > > 6691503: Malicious applet can show always-on-top popup menu which has > whole screen size > Summary: The fix for 6675802 is replaced by a try-catch clause that > catches SequrityExceptions for applets. > Reviewed-by: alexp > > ! src/share/classes/javax/swing/Popup.java > + test/javax/swing/JPopupMenu/6691503/bug6691503.java > > Cheers, > Omair > > Thanks, -Joe From joe.darcy at oracle.com Wed Sep 8 16:28:57 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Wed, 08 Sep 2010 16:28:57 -0700 Subject: Backport for 6632959: swing html parser doesn't know € or › In-Reply-To: <4C864836.7020308@redhat.com> References: <4C697BDA.6070103@redhat.com> <4C864836.7020308@redhat.com> Message-ID: <4C881C39.4040802@oracle.com> Omair Majid wrote: > On 08/16/2010 01:56 PM, Omair Majid wrote: >> I would like to backport >> http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/fc1ac6ea933c to jdk6. This >> adds a number of missing html entities back to swing. >> > > Any thoughts or objections? > > Cheers, > Omair Omair, sorry for the belated reply. Peter, do you see any issues with this change being ported to OpenJDK 6? In in the absence of any complications, I'm inclined to approve the backport. Thanks, -Joe From Peter.Zhelezniakov at oracle.com Thu Sep 9 05:54:02 2010 From: Peter.Zhelezniakov at oracle.com (Peter Zhelezniakov) Date: Thu, 09 Sep 2010 16:54:02 +0400 Subject: Backport for 6632959: swing html parser doesn't know € or › In-Reply-To: <4C881C39.4040802@oracle.com> References: <4C697BDA.6070103@redhat.com> <4C864836.7020308@redhat.com> <4C881C39.4040802@oracle.com> Message-ID: <4C88D8EA.90901@oracle.com> On 09/09/10 03:28, Joe Darcy wrote: > Omair Majid wrote: >> On 08/16/2010 01:56 PM, Omair Majid wrote: >>> I would like to backport >>> http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/fc1ac6ea933c to jdk6. This >>> adds a number of missing html entities back to swing. > > Peter, do you see any issues with this change being ported to OpenJDK 6? I'm fine with a backport. We don't need bdtd. Thanks! -- Peter | x33066 | location: SPB04 | timezone: GMT+03 From joe.darcy at oracle.com Thu Sep 9 10:03:38 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Thu, 09 Sep 2010 10:03:38 -0700 Subject: Backport for 6632959: swing html parser doesn't know € or › In-Reply-To: <4C88D8EA.90901@oracle.com> References: <4C697BDA.6070103@redhat.com> <4C864836.7020308@redhat.com> <4C881C39.4040802@oracle.com> <4C88D8EA.90901@oracle.com> Message-ID: <4C89136A.7080306@oracle.com> Peter Zhelezniakov wrote: > On 09/09/10 03:28, Joe Darcy wrote: >> Omair Majid wrote: >>> On 08/16/2010 01:56 PM, Omair Majid wrote: >>>> I would like to backport >>>> http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/fc1ac6ea933c to jdk6. >>>> This >>>> adds a number of missing html entities back to swing. >> >> Peter, do you see any issues with this change being ported to OpenJDK 6? > > I'm fine with a backport. We don't need bdtd. > > Thanks! With that, the fix is approved to be backported! Thanks, -Joe From omajid at redhat.com Thu Sep 9 12:02:26 2010 From: omajid at redhat.com (omajid at redhat.com) Date: Thu, 09 Sep 2010 19:02:26 +0000 Subject: hg: jdk6/jdk6/jdk: 6632959: swing html parser doesn't know € or › Message-ID: <20100909190243.CCC0E4785B@hg.openjdk.java.net> Changeset: 8d4365dc25d4 Author: peterz Date: 2010-05-26 20:22 +0400 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/8d4365dc25d4 6632959: swing html parser doesn't know € or › Reviewed-by: alexp ! make/javax/swing/FILES.gmk ! make/javax/swing/Makefile - src/share/classes/javax/swing/text/html/parser/html32.bdtd From omajid at redhat.com Thu Sep 9 12:06:30 2010 From: omajid at redhat.com (Omair Majid) Date: Thu, 09 Sep 2010 15:06:30 -0400 Subject: Backport for 6632959: swing html parser doesn't know € or › In-Reply-To: <4C89136A.7080306@oracle.com> References: <4C697BDA.6070103@redhat.com> <4C864836.7020308@redhat.com> <4C881C39.4040802@oracle.com> <4C88D8EA.90901@oracle.com> <4C89136A.7080306@oracle.com> Message-ID: <4C893036.7060109@redhat.com> Hi, On 09/09/2010 01:03 PM, Joe Darcy wrote: > Peter Zhelezniakov wrote: >> On 09/09/10 03:28, Joe Darcy wrote: >>> Omair Majid wrote: >>>> On 08/16/2010 01:56 PM, Omair Majid wrote: >>>>> I would like to backport >>>>> http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/fc1ac6ea933c to jdk6. >>>>> This >>>>> adds a number of missing html entities back to swing. >>> >>> Peter, do you see any issues with this change being ported to OpenJDK 6? >> >> I'm fine with a backport. We don't need bdtd. >> >> Thanks! > > With that, the fix is approved to be backported! > Pushed as changeset 8d4365dc25d4. Thanks! Omair From sbasalaev at gmail.com Thu Sep 9 12:23:25 2010 From: sbasalaev at gmail.com (Serguey Basalaev) Date: Fri, 10 Sep 2010 02:23:25 +0700 Subject: Russian translations for OpenJDK-6 Message-ID: Hello, I've made Russian translations of translatable OpenJDK items. How can I get them into the project? From ptisnovs at redhat.com Fri Sep 10 09:11:31 2010 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 10 Sep 2010 18:11:31 +0200 Subject: Please review change in regression test javax/swing/plaf/synth/Test6933784.java Message-ID: <4C8A58B3.7020207@redhat.com> Hi, can anybody please review change in regression test javax/swing/plaf/synth/Test6933784.java? Webrev is available here: http://cr.openjdk.java.net/~ptisnovs/Test6933784/ I changed just the code which tries to initialize Nimbus look and feel. Original code works in OpenJDK7 but not in OpenJDK6 because the location of the Nimbus package changed between the 6u10 and JDK7 releases (additionally I think it is not recommended to set Nimbus look and feel explicitly). Cheers Pavel T. From ahughes at redhat.com Fri Sep 10 09:58:42 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 10 Sep 2010 17:58:42 +0100 Subject: javac failure Message-ID: <20100910165842.GC14990@rivendell.middle-earth.co.uk> When running the attached test case (thanks to Deepak Bhole) through javac, we found it fails with: Test.java:14: incompatible types; inferred type argument(s) java.lang.Object do not conform to bounds of type variable(s) T found : java.util.ArrayList required: java.util.ArrayList ArrayList l = test(new ArrayList()); ^ 1 error On both the proprietary Oracle JDK and OpenJDK7, this file compiles. By backporting the following changesets: changeset: 298:22872b24d38c user: mcimadamore date: Tue Jun 16 10:46:37 2009 +0100 summary: 6638712: Inference with wildcard types causes selection of inapplicable method changeset: 395:dda7e13f09fb user: mcimadamore date: Tue Sep 01 14:53:39 2009 +0100 summary: 6650759: Inference of formal type parameter (unused in formal parameters) is not performed (6650759 is dependent on the changes in 6638712) we managed to get the file to compile. A webrev of 6638712 is available at: http://cr.openjdk.java.net/~andrew/6638712/webrev.01/ and 6650759 will follow if appropriate. The following minor changes had to be made to 6638712 to work with current OpenJDK javac: * The use of Types.createErrorType was replaced with Types.errType as in other cases in that file. This avoids the need to backport: changeset: 109:91eea580fbe9 parent: 106:5a9b808557b6 user: jjg date: Tue Sep 09 10:28:21 2008 -0700 summary: 6557752: Original type of an AST should be made available even if it is replaced with an ErrorType but that can be done too if necessary. * The final variable invalidInstanceException was initialised. * The test case output was changed to match that output by patched OpenJDK6 (which is similar but not identical). * The test case code files were updated as in: changeset: 383:ed31953ca025 user: jjg date: Thu Aug 27 11:08:27 2009 -0700 summary: 6875336: some tests should use /nodynamiccopyright/ so as to avoid introducing Sun copyright headers. Ok to push this backport to OpenJDK6? Or do you have a simpler solution for fixing this issue? 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 -------------- next part -------------- A non-text attachment was scrubbed... Name: Test.java Type: text/x-java Size: 303 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/jdk6-dev/attachments/20100910/7b77fcbc/attachment.bin From jonathan.gibbons at oracle.com Fri Sep 10 10:06:50 2010 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Fri, 10 Sep 2010 10:06:50 -0700 Subject: javac failure In-Reply-To: <20100910165842.GC14990@rivendell.middle-earth.co.uk> References: <20100910165842.GC14990@rivendell.middle-earth.co.uk> Message-ID: <4C8A65AA.5050902@oracle.com> cc: compiler-dev -- Jon On 09/10/2010 09:58 AM, Dr Andrew John Hughes wrote: > When running the attached test case (thanks to Deepak Bhole) through javac, we found it fails with: > > Test.java:14: incompatible types; inferred type argument(s) java.lang.Object do not conform to bounds of type variable(s) T > found :java.util.ArrayList > required: java.util.ArrayList > ArrayList l = test(new ArrayList()); > ^ > 1 error > > On both the proprietary Oracle JDK and OpenJDK7, this file compiles. > > By backporting the following changesets: > > changeset: 298:22872b24d38c > user: mcimadamore > date: Tue Jun 16 10:46:37 2009 +0100 > summary: 6638712: Inference with wildcard types causes selection of inapplicable method > > changeset: 395:dda7e13f09fb > user: mcimadamore > date: Tue Sep 01 14:53:39 2009 +0100 > summary: 6650759: Inference of formal type parameter (unused in formal parameters) is not performed > > (6650759 is dependent on the changes in 6638712) > > we managed to get the file to compile. > > A webrev of 6638712 is available at: > > http://cr.openjdk.java.net/~andrew/6638712/webrev.01/ > > and 6650759 will follow if appropriate. > > The following minor changes had to be made to 6638712 to work with current OpenJDK javac: > > * The use of Types.createErrorType was replaced with Types.errType as in other cases in that file. > This avoids the need to backport: > > changeset: 109:91eea580fbe9 > parent: 106:5a9b808557b6 > user: jjg > date: Tue Sep 09 10:28:21 2008 -0700 > summary: 6557752: Original type of an AST should be made available even if it is replaced with an ErrorType > > but that can be done too if necessary. > > * The final variable invalidInstanceException was initialised. > * The test case output was changed to match that output by patched OpenJDK6 (which is similar but not identical). > * The test case code files were updated as in: > > changeset: 383:ed31953ca025 > user: jjg > date: Thu Aug 27 11:08:27 2009 -0700 > summary: 6875336: some tests should use /nodynamiccopyright/ > > so as to avoid introducing Sun copyright headers. > > Ok to push this backport to OpenJDK6? Or do you have a simpler solution for fixing this issue? > > Thanks, > From omajid at redhat.com Mon Sep 13 08:11:54 2010 From: omajid at redhat.com (Omair Majid) Date: Mon, 13 Sep 2010 11:11:54 -0400 Subject: request to backport 6721088: Bad window size calculation after using pack() Message-ID: <4C8E3F3A.8070904@redhat.com> Hi, I would like to backport 6721088: Bad window size calculation after using pack() from OpenJDK7 to OpenJDK6: changeset: 885:9fa2e56c8a30 user: art date: Thu Jan 29 14:58:12 2009 +0300 summary: 6721088: Bad window size calculation after using pack() http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/9fa2e56c8a30 Thanks, Omair From joe.darcy at oracle.com Tue Sep 14 09:58:43 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Tue, 14 Sep 2010 09:58:43 -0700 Subject: request to backport 6721088: Bad window size calculation after using pack() In-Reply-To: <4C8E3F3A.8070904@redhat.com> References: <4C8E3F3A.8070904@redhat.com> Message-ID: <4C8FA9C3.3030203@oracle.com> Omair Majid wrote: > Hi, > > I would like to backport 6721088: Bad window size calculation after > using pack() from OpenJDK7 to OpenJDK6: > > changeset: 885:9fa2e56c8a30 > user: art > date: Thu Jan 29 14:58:12 2009 +0300 > summary: 6721088: Bad window size calculation after using pack() > > http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/9fa2e56c8a30 > > Thanks, > Omair Approved to be backported. Thanks, -Joe From joe.darcy at oracle.com Tue Sep 14 10:06:55 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Tue, 14 Sep 2010 10:06:55 -0700 Subject: Russian translations for OpenJDK-6 In-Reply-To: References: Message-ID: <4C8FABAF.6090902@oracle.com> Serguey Basalaev wrote: > Hello, I've made Russian translations of translatable OpenJDK items. > How can I get them into the project? > Hello. In general, a precondition to contributing to the OpenJDK project is agreeing to the contributor agreement: http://openjdk.java.net/contribute/ However, for this sort of change, I'd be hesitant to accept back the translations due to on going maintenance concerns. Thanks, -Joe From joe.darcy at oracle.com Tue Sep 14 16:58:45 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Tue, 14 Sep 2010 16:58:45 -0700 Subject: Please review change in regression test javax/swing/plaf/synth/Test6933784.java In-Reply-To: <4C8A58B3.7020207@redhat.com> References: <4C8A58B3.7020207@redhat.com> Message-ID: <4C900C35.8090509@oracle.com> Pavel Tisnovsky wrote: > Hi, > > can anybody please review change in regression test > javax/swing/plaf/synth/Test6933784.java? Webrev is available here: > > http://cr.openjdk.java.net/~ptisnovs/Test6933784/ > > I changed just the code which tries to initialize Nimbus look and feel. > > Original code works in OpenJDK7 but not in OpenJDK6 because the location > of the Nimbus package changed between the 6u10 and JDK7 releases > (additionally I think it is not recommended to set Nimbus look and feel > explicitly). > > Cheers > Pavel T. > Hello. Approved to go back into OpenJDK 6 on the assumption of successfully running! Do you need a bug id to push this? Thanks, -Joe From ptisnovs at redhat.com Wed Sep 15 02:48:57 2010 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Wed, 15 Sep 2010 11:48:57 +0200 Subject: Please review change in regression test javax/swing/plaf/synth/Test6933784.java In-Reply-To: <4C900C35.8090509@oracle.com> References: <4C8A58B3.7020207@redhat.com> <4C900C35.8090509@oracle.com> Message-ID: <4C909689.9030008@redhat.com> Joe Darcy wrote: > Pavel Tisnovsky wrote: >> Hi, >> >> can anybody please review change in regression test >> javax/swing/plaf/synth/Test6933784.java? Webrev is available here: >> >> http://cr.openjdk.java.net/~ptisnovs/Test6933784/ >> >> I changed just the code which tries to initialize Nimbus look and feel. >> >> Original code works in OpenJDK7 but not in OpenJDK6 because the location >> of the Nimbus package changed between the 6u10 and JDK7 releases >> (additionally I think it is not recommended to set Nimbus look and feel >> explicitly). >> >> Cheers >> Pavel T. >> > Hello. > > Approved to go back into OpenJDK 6 on the assumption of successfully > running! Thank you. I've successfully ran it on RHEL5 and F13. > > Do you need a bug id to push this? Yes please. Should I wait for approval from another Oracle developer? > > Thanks, > > -Joe From omajid at redhat.com Wed Sep 15 07:41:26 2010 From: omajid at redhat.com (omajid at redhat.com) Date: Wed, 15 Sep 2010 14:41:26 +0000 Subject: hg: jdk6/jdk6/jdk: 6721088: Bad window size calculation after using pack() Message-ID: <20100915144149.ADF2E479C3@hg.openjdk.java.net> Changeset: 4d6c88bce53e Author: art Date: 2009-01-29 14:58 +0300 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/4d6c88bce53e 6721088: Bad window size calculation after using pack() Reviewed-by: anthony Contributed-by: Omair Majid ! src/solaris/classes/sun/awt/X11/WindowDimensions.java ! src/solaris/classes/sun/awt/X11/XDecoratedPeer.java + test/java/awt/Frame/FrameSize/TestFrameSize.java From omajid at redhat.com Wed Sep 15 08:40:56 2010 From: omajid at redhat.com (Omair Majid) Date: Wed, 15 Sep 2010 11:40:56 -0400 Subject: request to backport 6721088: Bad window size calculation after using pack() In-Reply-To: <4C8FA9C3.3030203@oracle.com> References: <4C8E3F3A.8070904@redhat.com> <4C8FA9C3.3030203@oracle.com> Message-ID: <4C90E908.1020309@redhat.com> On 09/14/2010 12:58 PM, Joe Darcy wrote: > Omair Majid wrote: >> Hi, >> >> I would like to backport 6721088: Bad window size calculation after >> using pack() from OpenJDK7 to OpenJDK6: >> >> changeset: 885:9fa2e56c8a30 >> user: art >> date: Thu Jan 29 14:58:12 2009 +0300 >> summary: 6721088: Bad window size calculation after using pack() >> >> http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/9fa2e56c8a30 >> >> Thanks, >> Omair > > Approved to be backported. > Thanks Joe. I have pushed the changeset. Cheers, Omair From ahughes at redhat.com Wed Sep 15 13:14:07 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 15 Sep 2010 21:14:07 +0100 Subject: hs19 import Message-ID: <20100915201407.GE673@rivendell.middle-earth.co.uk> I notice that new repositories have appeared for a hs19 stable branch: http://hg.openjdk.java.net/hsx/hsx19/master/ Shall we start looking at this with regards to importing it for b21? -- 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 Wed Sep 15 21:37:59 2010 From: erik.trimble at oracle.com (Erik Trimble) Date: Wed, 15 Sep 2010 21:37:59 -0700 Subject: hs19 import In-Reply-To: <20100915201407.GE673@rivendell.middle-earth.co.uk> References: <20100915201407.GE673@rivendell.middle-earth.co.uk> Message-ID: <4C919F27.6090607@oracle.com> On 9/15/2010 1:14 PM, Dr Andrew John Hughes wrote: > I notice that new repositories have appeared for a hs19 stable branch: > > http://hg.openjdk.java.net/hsx/hsx19/master/ > > Shall we start looking at this with regards to importing it for b21? Go ahead. We've officially forked HS19 now (the JDK7 repos are now starting with Hotspot 20). I would consider the hsx19 repos to be stable. There *may* be additional development in them, but if so (and I'm not specifically promising anything), such development will be stabilization only. New feature development is now in HS20 over in the main JDK7 repos. HS19 is now in stabilization (bugfix-only) stage, and is suitable for work to begin on importing into OpenJDK 6. -- Erik Trimble Java System Support Mailstop: usca22-123 Phone: x17195 Santa Clara, CA Timezone: US/Pacific (GMT-0800) From ptisnovs at redhat.com Fri Sep 17 00:55:01 2010 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 17 Sep 2010 09:55:01 +0200 Subject: Backport change in in regression test sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java] Message-ID: <4C931ED5.6070202@redhat.com> Hi all, is it possible to backport this change to OpenJDK6 too please? Or may I create another webrev? Pavel On 9/14/2010 12:36 PM, Pavel Tisnovsky wrote: > Hi Artem, > > could you please create a bug id so I'll be able to push this change to tl? 6984543: Test sun/java2d/DirectX/OnScreenRenderingResizeTest fails on GNOME It will be available at bugs.sun.com in a few hours/days. Thanks, Artem > Thank you in advance > Pavel > > Artem Ananiev wrote: >> Hi, Pavel, >> >> indeed, the names are confusing. Your changes look correct. >> >> Thanks, >> >> Artem >> >> On 9/10/2010 2:12 PM, Pavel Tisnovsky wrote: >>> Hi, >>> >>> can anybody please review the simple change in regression test >>> sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java? >>> >>> >>> Webrev containing this change is available here: >>> http://cr.openjdk.java.net/~ptisnovs/OnScreenRenderingResizeTest/ >>> >>> I replaced the call of a method Point.move() by Point.translate() >>> because this test did not work correctly in those cases when the top >>> (and probably left) screen area is occupied by a toolbar/panel (which is >>> the default settings for GNOME for example). >>> >>> I've successfully tested this changed regression test on RHEL5 with >>> GNOME installed (with and without top panel). >>> >>> Cheers >>> Pavel T. >>> >>> PS: the name of the method Point.move() is a bit confusing for me as I >>> (and probably also author of the test) have thought it is similar to >>> Point.translate() ;-) From joe.darcy at oracle.com Sun Sep 19 15:28:54 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Sun, 19 Sep 2010 15:28:54 -0700 Subject: Please review change in regression test javax/swing/plaf/synth/Test6933784.java In-Reply-To: <4C909689.9030008@redhat.com> References: <4C8A58B3.7020207@redhat.com> <4C900C35.8090509@oracle.com> <4C909689.9030008@redhat.com> Message-ID: <4C968EA6.8050706@oracle.com> Pavel Tisnovsky wrote: > Joe Darcy wrote: > >> Pavel Tisnovsky wrote: >> >>> Hi, >>> >>> can anybody please review change in regression test >>> javax/swing/plaf/synth/Test6933784.java? Webrev is available here: >>> >>> http://cr.openjdk.java.net/~ptisnovs/Test6933784/ >>> >>> I changed just the code which tries to initialize Nimbus look and feel. >>> >>> Original code works in OpenJDK7 but not in OpenJDK6 because the location >>> of the Nimbus package changed between the 6u10 and JDK7 releases >>> (additionally I think it is not recommended to set Nimbus look and feel >>> explicitly). >>> >>> Cheers >>> Pavel T. >>> >>> >> Hello. >> >> Approved to go back into OpenJDK 6 on the assumption of successfully >> running! >> > Thank you. I've successfully ran it on RHEL5 and F13. > >> Do you need a bug id to push this? >> > Yes please. Please use 6985992 Fix test/javax/swing/plaf/synth/Test6933784.java for OpenJDK 6 > Should I wait for approval from another Oracle developer? > In this case, my review is sufficient. Thanks, -Joe From ptisnovs at redhat.com Mon Sep 20 05:00:48 2010 From: ptisnovs at redhat.com (ptisnovs at redhat.com) Date: Mon, 20 Sep 2010 12:00:48 +0000 Subject: hg: jdk6/jdk6/jdk: 6985992 Fix test/javax/swing/plaf/synth/Test6933784.java for OpenJDK 6 Message-ID: <20100920120100.23F4A47AEE@hg.openjdk.java.net> Changeset: bf87d5af4361 Author: ptisnovs Date: 2010-09-20 13:59 +0200 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/bf87d5af4361 6985992 Fix test/javax/swing/plaf/synth/Test6933784.java for OpenJDK 6 Summary: Testcase correction Reviewed-by: darcy ! test/javax/swing/plaf/synth/Test6933784.java From ahughes at redhat.com Mon Sep 20 11:39:06 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 20 Sep 2010 19:39:06 +0100 Subject: hs19 import In-Reply-To: <4C919F27.6090607@oracle.com> References: <20100915201407.GE673@rivendell.middle-earth.co.uk> <4C919F27.6090607@oracle.com> Message-ID: <20100920183906.GM16943@rivendell.middle-earth.co.uk> On 21:37 Wed 15 Sep , Erik Trimble wrote: > On 9/15/2010 1:14 PM, Dr Andrew John Hughes wrote: > > I notice that new repositories have appeared for a hs19 stable branch: > > > > http://hg.openjdk.java.net/hsx/hsx19/master/ > > > > Shall we start looking at this with regards to importing it for b21? > > Go ahead. We've officially forked HS19 now (the JDK7 repos are now > starting with Hotspot 20). > > I would consider the hsx19 repos to be stable. There *may* be additional > development in them, but if so (and I'm not specifically promising > anything), such development will be stabilization only. New feature > development is now in HS20 over in the main JDK7 repos. > > HS19 is now in stabilization (bugfix-only) stage, and is suitable for > work to begin on importing into OpenJDK 6. > Thanks for the quick reply, Erik. I've started work on the merge, which is taking a while because of the orthogonal copyright header changes in OpenJDK6 and HotSpot :-( One thing I have noticed is that some headers in hs19 don't have a trailing comma before 'Oracle' and this is also true of the header template: --- make/templates/gpl-cp-header 2010-09-20 19:34:32.605298269 +0100 +++ ../../hs19/make/templates/gpl-cp-header 2010-09-16 13:01:36.601792981 +0100 @@ -1,4 +1,4 @@ -Copyright %YEARS%, Oracle and/or its affiliates. All rights reserved. +Copyright %YEARS% Oracle and/or its affiliates. All rights reserved. DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. Is HotSpot 19 correct or OpenJDK6? > > -- > Erik Trimble > Java System Support > Mailstop: usca22-123 > Phone: x17195 > Santa Clara, CA > Timezone: US/Pacific (GMT-0800) > -- 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 Mon Sep 20 20:56:06 2010 From: erik.trimble at oracle.com (Erik Trimble) Date: Mon, 20 Sep 2010 20:56:06 -0700 Subject: hs19 import In-Reply-To: <20100920183906.GM16943@rivendell.middle-earth.co.uk> References: <20100915201407.GE673@rivendell.middle-earth.co.uk> <4C919F27.6090607@oracle.com> <20100920183906.GM16943@rivendell.middle-earth.co.uk> Message-ID: <4C982CD6.2050405@oracle.com> On 9/20/2010 11:39 AM, Dr Andrew John Hughes wrote: > On 21:37 Wed 15 Sep , Erik Trimble wrote: >> On 9/15/2010 1:14 PM, Dr Andrew John Hughes wrote: >>> I notice that new repositories have appeared for a hs19 stable branch: >>> >>> http://hg.openjdk.java.net/hsx/hsx19/master/ >>> >>> Shall we start looking at this with regards to importing it for b21? >> Go ahead. We've officially forked HS19 now (the JDK7 repos are now >> starting with Hotspot 20). >> >> I would consider the hsx19 repos to be stable. There *may* be additional >> development in them, but if so (and I'm not specifically promising >> anything), such development will be stabilization only. New feature >> development is now in HS20 over in the main JDK7 repos. >> >> HS19 is now in stabilization (bugfix-only) stage, and is suitable for >> work to begin on importing into OpenJDK 6. >> > Thanks for the quick reply, Erik. > > I've started work on the merge, which is taking a while because of the orthogonal > copyright header changes in OpenJDK6 and HotSpot :-( > > One thing I have noticed is that some headers in hs19 don't have a trailing comma before 'Oracle' > and this is also true of the header template: > > --- make/templates/gpl-cp-header 2010-09-20 19:34:32.605298269 +0100 > +++ ../../hs19/make/templates/gpl-cp-header 2010-09-16 13:01:36.601792981 +0100 > @@ -1,4 +1,4 @@ > -Copyright %YEARS%, Oracle and/or its affiliates. All rights reserved. > +Copyright %YEARS% Oracle and/or its affiliates. All rights reserved. > DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. > > Is HotSpot 19 correct or OpenJDK6? I think it's both. :-) That is, the correct format for an explicitly stated copyright should be Copyright 2000, Oracle and/or .... AND Copyright 2000, 2003, Oracle and/or ... There should be a comma after each date (the second instance implies a date range between the two years). For the %YEARS% substitution in the templates, I don't think it matters whether there is a comma. It won't be right after a substitution no matter what we do. :-) If you find instances of the the first case where there isn't a proper comma inserted, PLEASE let me know. I need to fix it. -- Erik Trimble Java System Support Mailstop: usca22-123 Phone: x17195 Santa Clara, CA From joe.darcy at oracle.com Tue Sep 21 08:51:37 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Tue, 21 Sep 2010 08:51:37 -0700 Subject: hs19 import In-Reply-To: <4C982CD6.2050405@oracle.com> References: <20100915201407.GE673@rivendell.middle-earth.co.uk> <4C919F27.6090607@oracle.com> <20100920183906.GM16943@rivendell.middle-earth.co.uk> <4C982CD6.2050405@oracle.com> Message-ID: <4C98D489.4080009@oracle.com> Erik Trimble wrote: > On 9/20/2010 11:39 AM, Dr Andrew John Hughes wrote: >> On 21:37 Wed 15 Sep , Erik Trimble wrote: >>> On 9/15/2010 1:14 PM, Dr Andrew John Hughes wrote: >>>> I notice that new repositories have appeared for a hs19 stable branch: >>>> >>>> http://hg.openjdk.java.net/hsx/hsx19/master/ >>>> >>>> Shall we start looking at this with regards to importing it for b21? >>> Go ahead. We've officially forked HS19 now (the JDK7 repos are now >>> starting with Hotspot 20). >>> >>> I would consider the hsx19 repos to be stable. There *may* be >>> additional >>> development in them, but if so (and I'm not specifically promising >>> anything), such development will be stabilization only. New feature >>> development is now in HS20 over in the main JDK7 repos. >>> >>> HS19 is now in stabilization (bugfix-only) stage, and is suitable for >>> work to begin on importing into OpenJDK 6. >>> >> Thanks for the quick reply, Erik. >> >> I've started work on the merge, which is taking a while because of >> the orthogonal >> copyright header changes in OpenJDK6 and HotSpot :-( >> >> One thing I have noticed is that some headers in hs19 don't have a >> trailing comma before 'Oracle' >> and this is also true of the header template: >> >> --- make/templates/gpl-cp-header 2010-09-20 19:34:32.605298269 +0100 >> +++ ../../hs19/make/templates/gpl-cp-header 2010-09-16 >> 13:01:36.601792981 +0100 >> @@ -1,4 +1,4 @@ >> -Copyright %YEARS%, Oracle and/or its affiliates. All rights reserved. >> +Copyright %YEARS% Oracle and/or its affiliates. All rights reserved. >> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. >> >> Is HotSpot 19 correct or OpenJDK6? > > I think it's both. :-) > > > That is, the correct format for an explicitly stated copyright should be > > > Copyright 2000, Oracle and/or .... > > AND > > Copyright 2000, 2003, Oracle and/or ... > > > There should be a comma after each date (the second instance implies a > date range between the two years). > > For the %YEARS% substitution in the templates, I don't think it > matters whether there is a comma. It won't be right after a > substitution no matter what we do. :-) > > > If you find instances of the the first case where there isn't a proper > comma inserted, PLEASE let me know. I need to fix it. > Erik, Back during the big rebranding push, the GPL templates got updated a few times: 6943119: Rebrand source copyright notices 6961870: More rebranding fixes for templates/gpl-*-header files At the time, I didn't update the templates in the HotSpot repo in an attempt to avoid future merge issues. However, the templates in HS should match the templates in the jdk and root repository which now read as Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved. -Joe From daniel.daugherty at oracle.com Tue Sep 21 13:34:18 2010 From: daniel.daugherty at oracle.com (Daniel D. Daugherty) Date: Tue, 21 Sep 2010 14:34:18 -0600 Subject: need code review for Logging API JavaDoc change (6949710) Message-ID: <4C9916CA.1090901@oracle.com> Greetings, I'm in need of a couple of code reviews for a JavaDoc change in the Logging APIs. Here is the URL for the OpenJDK6 version: http://cr.openjdk.java.net/~dcubed/6949710-webrev/1-openjdk6/ The OpenJDK6 version of the fix exactly matches the JDK6_23 version of the fix that I sent to the confidential aliases earlier. Here is the URL for the OpenJDK7 version: http://cr.openjdk.java.net/~dcubed/6949710-webrev/1-openjdk7/ The OpenJDK7 version of the fix has one less wording addition because the affected paragraph was removed in OpenJDK7; the paragraph was virtually identical to another paragraph a little later in the same class. Thanks, in advance, for any comments. Dan From ahughes at redhat.com Tue Sep 21 15:46:24 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 21 Sep 2010 23:46:24 +0100 Subject: hs19 import In-Reply-To: <4C98D489.4080009@oracle.com> References: <20100915201407.GE673@rivendell.middle-earth.co.uk> <4C919F27.6090607@oracle.com> <20100920183906.GM16943@rivendell.middle-earth.co.uk> <4C982CD6.2050405@oracle.com> <4C98D489.4080009@oracle.com> Message-ID: <20100921224624.GA9599@rivendell.middle-earth.co.uk> On 08:51 Tue 21 Sep , Joe Darcy wrote: > Erik Trimble wrote: > > On 9/20/2010 11:39 AM, Dr Andrew John Hughes wrote: > >> On 21:37 Wed 15 Sep , Erik Trimble wrote: > >>> On 9/15/2010 1:14 PM, Dr Andrew John Hughes wrote: > >>>> I notice that new repositories have appeared for a hs19 stable branch: > >>>> > >>>> http://hg.openjdk.java.net/hsx/hsx19/master/ > >>>> > >>>> Shall we start looking at this with regards to importing it for b21? > >>> Go ahead. We've officially forked HS19 now (the JDK7 repos are now > >>> starting with Hotspot 20). > >>> > >>> I would consider the hsx19 repos to be stable. There *may* be > >>> additional > >>> development in them, but if so (and I'm not specifically promising > >>> anything), such development will be stabilization only. New feature > >>> development is now in HS20 over in the main JDK7 repos. > >>> > >>> HS19 is now in stabilization (bugfix-only) stage, and is suitable for > >>> work to begin on importing into OpenJDK 6. > >>> > >> Thanks for the quick reply, Erik. > >> > >> I've started work on the merge, which is taking a while because of > >> the orthogonal > >> copyright header changes in OpenJDK6 and HotSpot :-( > >> > >> One thing I have noticed is that some headers in hs19 don't have a > >> trailing comma before 'Oracle' > >> and this is also true of the header template: > >> > >> --- make/templates/gpl-cp-header 2010-09-20 19:34:32.605298269 +0100 > >> +++ ../../hs19/make/templates/gpl-cp-header 2010-09-16 > >> 13:01:36.601792981 +0100 > >> @@ -1,4 +1,4 @@ > >> -Copyright %YEARS%, Oracle and/or its affiliates. All rights reserved. > >> +Copyright %YEARS% Oracle and/or its affiliates. All rights reserved. > >> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. > >> > >> Is HotSpot 19 correct or OpenJDK6? > > > > I think it's both. :-) > > > > > > That is, the correct format for an explicitly stated copyright should be > > > > > > Copyright 2000, Oracle and/or .... > > > > AND > > > > Copyright 2000, 2003, Oracle and/or ... > > > > > > There should be a comma after each date (the second instance implies a > > date range between the two years). > > > > For the %YEARS% substitution in the templates, I don't think it > > matters whether there is a comma. It won't be right after a > > substitution no matter what we do. :-) > > > > > > If you find instances of the the first case where there isn't a proper > > comma inserted, PLEASE let me know. I need to fix it. > > > > Erik, > > Back during the big rebranding push, the GPL templates got updated a few > times: > > 6943119: Rebrand source copyright notices > 6961870: More rebranding fixes for templates/gpl-*-header files > > At the time, I didn't update the templates in the HotSpot repo in an > attempt to avoid future merge issues. However, the templates in HS > should match the templates in the jdk and root repository which now read as > > Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved. > > -Joe > This webrev (against the current hotspot-rt tree) fixes the copyright issues, including the template files Joe mentions and the missing trailing commas as well as providing some copyright year updates present in OpenJDK6 but not HotSpot. http://cr.openjdk.java.net/~andrew/copyright/webrev.01/ Erik, feel free to assign this a bug ID and push it through JPRT if it helps. Joe, a webrev for the OpenJDK6 hs19 merge is at: http://cr.openjdk.java.net/~andrew/jdk6-hs19-merge/webrev.01/ Please let me know if I can push this. 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 Tue Sep 21 15:51:57 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 21 Sep 2010 23:51:57 +0100 Subject: need code review for Logging API JavaDoc change (6949710) In-Reply-To: <4C9916CA.1090901@oracle.com> References: <4C9916CA.1090901@oracle.com> Message-ID: <20100921225157.GC9599@rivendell.middle-earth.co.uk> On 14:34 Tue 21 Sep , Daniel D. Daugherty wrote: > Greetings, > > I'm in need of a couple of code reviews for a JavaDoc change > in the Logging APIs. > > Here is the URL for the OpenJDK6 version: > > http://cr.openjdk.java.net/~dcubed/6949710-webrev/1-openjdk6/ > > The OpenJDK6 version of the fix exactly matches the JDK6_23 > version of the fix that I sent to the confidential aliases > earlier. > > Here is the URL for the OpenJDK7 version: > > http://cr.openjdk.java.net/~dcubed/6949710-webrev/1-openjdk7/ > > The OpenJDK7 version of the fix has one less wording addition > because the affected paragraph was removed in OpenJDK7; the > paragraph was virtually identical to another paragraph a little > later in the same class. > > Thanks, in advance, for any comments. > > Dan > Both look ok to me. -- 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 Tue Sep 21 16:10:45 2010 From: daniel.daugherty at oracle.com (Daniel D. Daugherty) Date: Tue, 21 Sep 2010 17:10:45 -0600 Subject: need code review for Logging API JavaDoc change (6949710) In-Reply-To: <20100921225157.GC9599@rivendell.middle-earth.co.uk> References: <4C9916CA.1090901@oracle.com> <20100921225157.GC9599@rivendell.middle-earth.co.uk> Message-ID: <4C993B75.9050804@oracle.com> On 9/21/2010 4:51 PM, Dr Andrew John Hughes wrote: > On 14:34 Tue 21 Sep , Daniel D. Daugherty wrote: > >> Greetings, >> >> I'm in need of a couple of code reviews for a JavaDoc change >> in the Logging APIs. >> >> Here is the URL for the OpenJDK6 version: >> >> http://cr.openjdk.java.net/~dcubed/6949710-webrev/1-openjdk6/ >> >> The OpenJDK6 version of the fix exactly matches the JDK6_23 >> version of the fix that I sent to the confidential aliases >> earlier. >> >> Here is the URL for the OpenJDK7 version: >> >> http://cr.openjdk.java.net/~dcubed/6949710-webrev/1-openjdk7/ >> >> The OpenJDK7 version of the fix has one less wording addition >> because the affected paragraph was removed in OpenJDK7; the >> paragraph was virtually identical to another paragraph a little >> later in the same class. >> >> Thanks, in advance, for any comments. >> >> Dan >> >> > > Both look ok to me. > Thanks! I'm pretty sure I need a thumbs up from Joe for the OpenJDK6 version... Dan From unmesh_joshi at hotmail.com Wed Sep 22 00:32:21 2010 From: unmesh_joshi at hotmail.com (Unmesh joshi) Date: Wed, 22 Sep 2010 07:32:21 +0000 Subject: Understanding thread dump Message-ID: Hi, I was looking at the following thread dump Full thread dump Java HotSpot(TM) Server VM (11.0-b16 mixed mode): "pool-3-thread-1428" prio=10 tid=0x72b83800 nid=0x60ef waiting on condition [0x73318000..0x73318fb0] java.lang.Thread.State: TIMED_WAITING (parking) at sun.misc.Unsafe.park(Native Method) - parking to wait for <0x98983260> (a java.util.concurrent.SynchronousQueue$TransferStack) at java.util.concurrent.locks.LockSupport.parkNanos(LockSupport.java:198) at java.util.concurrent.SynchronousQueue$TransferStack.awaitFulfill(SynchronousQueue.java:424) at java.util.concurrent.SynchronousQueue$TransferStack.transfer(SynchronousQueue.java:323) at java.util.concurrent.SynchronousQueue.poll(SynchronousQueue.java:874) at java.util.concurrent.ThreadPoolExecutor.getTask(ThreadPoolExecutor.java:945) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:907) at java.lang.Thread.run(Thread.java:619) "MergeTask" daemon prio=10 tid=0x09454c00 nid=0x60e7 waiting for monitor entry [0x65106000..0x65106f30] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.log4j.Category.callAppenders(Category.java:201) - waiting to lock <0x96d90bb8> (a org.apache.log4j.spi.RootLogger) at org.apache.log4j.Category.forcedLog(Category.java:388) at org.apache.log4j.Category.log(Category.java:853) at sun.reflect.GeneratedMethodAccessor55.invoke(Unknown Source) I can see that 0x98983260 and 0x96d90bb8 are memory addresses of condition object and lock object respectively (I hope ti. But I was puzzled with [0x73318000..0x73318fb0] and [0x65106000..0x65106f30].What do these memory ranges indicate? Is there any documentation related to thread dump? In OpenJDK source code I can see following comment. But I did not understand what it means. // print guess for valid stack memory region (assume 4K pages); helps lock debugging st->print_cr("[" INTPTR_FORMAT "]", (intptr_t)last_Java_sp() & ~right_n_bits(12)); Thanks,Unmesh -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/jdk6-dev/attachments/20100922/928815d9/attachment.html From ahughes at redhat.com Wed Sep 22 05:27:33 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 22 Sep 2010 13:27:33 +0100 Subject: need code review for Logging API JavaDoc change (6949710) In-Reply-To: <4C993B75.9050804@oracle.com> References: <4C9916CA.1090901@oracle.com> <20100921225157.GC9599@rivendell.middle-earth.co.uk> <4C993B75.9050804@oracle.com> Message-ID: <20100922122733.GB5611@bree.middle-earth.co.uk> On 17:10 Tue 21 Sep , Daniel D. Daugherty wrote: > On 9/21/2010 4:51 PM, Dr Andrew John Hughes wrote: > > On 14:34 Tue 21 Sep , Daniel D. Daugherty wrote: > > > >> Greetings, > >> > >> I'm in need of a couple of code reviews for a JavaDoc change > >> in the Logging APIs. > >> > >> Here is the URL for the OpenJDK6 version: > >> > >> http://cr.openjdk.java.net/~dcubed/6949710-webrev/1-openjdk6/ > >> > >> The OpenJDK6 version of the fix exactly matches the JDK6_23 > >> version of the fix that I sent to the confidential aliases > >> earlier. > >> > >> Here is the URL for the OpenJDK7 version: > >> > >> http://cr.openjdk.java.net/~dcubed/6949710-webrev/1-openjdk7/ > >> > >> The OpenJDK7 version of the fix has one less wording addition > >> because the affected paragraph was removed in OpenJDK7; the > >> paragraph was virtually identical to another paragraph a little > >> later in the same class. > >> > >> Thanks, in advance, for any comments. > >> > >> Dan > >> > >> > > > > Both look ok to me. > > > > Thanks! I'm pretty sure I need a thumbs up from Joe > for the OpenJDK6 version... > No problem! You're right, you do need Joe's approval for 6, but you can push it to 7 with me as reviewer. > Dan > 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 daniel.daugherty at oracle.com Wed Sep 22 06:36:01 2010 From: daniel.daugherty at oracle.com (Daniel D. Daugherty) Date: Wed, 22 Sep 2010 07:36:01 -0600 Subject: need code review for Logging API JavaDoc change (6949710) In-Reply-To: <20100922122733.GB5611@bree.middle-earth.co.uk> References: <4C9916CA.1090901@oracle.com> <20100921225157.GC9599@rivendell.middle-earth.co.uk> <4C993B75.9050804@oracle.com> <20100922122733.GB5611@bree.middle-earth.co.uk> Message-ID: <4C9A0641.9030100@oracle.com> On 9/22/2010 6:27 AM, Dr Andrew John Hughes wrote: > On 17:10 Tue 21 Sep , Daniel D. Daugherty wrote: > >> On 9/21/2010 4:51 PM, Dr Andrew John Hughes wrote: >> >>> On 14:34 Tue 21 Sep , Daniel D. Daugherty wrote: >>> >>> >>>> Greetings, >>>> >>>> I'm in need of a couple of code reviews for a JavaDoc change >>>> in the Logging APIs. >>>> >>>> Here is the URL for the OpenJDK6 version: >>>> >>>> http://cr.openjdk.java.net/~dcubed/6949710-webrev/1-openjdk6/ >>>> >>>> The OpenJDK6 version of the fix exactly matches the JDK6_23 >>>> version of the fix that I sent to the confidential aliases >>>> earlier. >>>> >>>> Here is the URL for the OpenJDK7 version: >>>> >>>> http://cr.openjdk.java.net/~dcubed/6949710-webrev/1-openjdk7/ >>>> >>>> The OpenJDK7 version of the fix has one less wording addition >>>> because the affected paragraph was removed in OpenJDK7; the >>>> paragraph was virtually identical to another paragraph a little >>>> later in the same class. >>>> >>>> Thanks, in advance, for any comments. >>>> >>>> Dan >>>> >>>> >>>> >>> Both look ok to me. >>> >>> >> Thanks! I'm pretty sure I need a thumbs up from Joe >> for the OpenJDK6 version... >> >> > > No problem! > > You're right, you do need Joe's approval for 6, I'll ping him shortly. > but you can push it to 7 with me as reviewer. > Agreed and will do so shortly... Dan From daniel.daugherty at oracle.com Wed Sep 22 07:51:25 2010 From: daniel.daugherty at oracle.com (Daniel D. Daugherty) Date: Wed, 22 Sep 2010 08:51:25 -0600 Subject: need code review for Logging API JavaDoc change (6949710) In-Reply-To: <20100922122733.GB5611@bree.middle-earth.co.uk> References: <4C9916CA.1090901@oracle.com> <20100921225157.GC9599@rivendell.middle-earth.co.uk> <4C993B75.9050804@oracle.com> <20100922122733.GB5611@bree.middle-earth.co.uk> Message-ID: <4C9A17ED.1000407@oracle.com> Joe, Do you want this JavaDoc fix in OpenJDK6? Andrew has reviewed it for OpenJDK6 and OpenJDK7. (David Holmes reviewed it for JDK6_23). Dan On 9/22/2010 6:27 AM, Dr Andrew John Hughes wrote: > On 17:10 Tue 21 Sep , Daniel D. Daugherty wrote: > >> On 9/21/2010 4:51 PM, Dr Andrew John Hughes wrote: >> >>> On 14:34 Tue 21 Sep , Daniel D. Daugherty wrote: >>> >>> >>>> Greetings, >>>> >>>> I'm in need of a couple of code reviews for a JavaDoc change >>>> in the Logging APIs. >>>> >>>> Here is the URL for the OpenJDK6 version: >>>> >>>> http://cr.openjdk.java.net/~dcubed/6949710-webrev/1-openjdk6/ >>>> >>>> The OpenJDK6 version of the fix exactly matches the JDK6_23 >>>> version of the fix that I sent to the confidential aliases >>>> earlier. >>>> >>>> Here is the URL for the OpenJDK7 version: >>>> >>>> http://cr.openjdk.java.net/~dcubed/6949710-webrev/1-openjdk7/ >>>> >>>> The OpenJDK7 version of the fix has one less wording addition >>>> because the affected paragraph was removed in OpenJDK7; the >>>> paragraph was virtually identical to another paragraph a little >>>> later in the same class. >>>> >>>> Thanks, in advance, for any comments. >>>> >>>> Dan >>>> >>>> >>>> >>> Both look ok to me. >>> >>> >> Thanks! I'm pretty sure I need a thumbs up from Joe >> for the OpenJDK6 version... >> >> > > No problem! > > You're right, you do need Joe's approval for 6, but you can push it to 7 with me as reviewer. > > >> Dan >> >> > > Thanks, > From joe.darcy at oracle.com Wed Sep 22 09:50:02 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Wed, 22 Sep 2010 09:50:02 -0700 Subject: need code review for Logging API JavaDoc change (6949710) In-Reply-To: <4C9A17ED.1000407@oracle.com> References: <4C9916CA.1090901@oracle.com> <20100921225157.GC9599@rivendell.middle-earth.co.uk> <4C993B75.9050804@oracle.com> <20100922122733.GB5611@bree.middle-earth.co.uk> <4C9A17ED.1000407@oracle.com> Message-ID: <4C9A33BA.1060400@oracle.com> Hi Dan. Approved to go back; current build is b21. Thanks, -Joe Daniel D. Daugherty wrote: > Joe, > > Do you want this JavaDoc fix in OpenJDK6? Andrew has reviewed it > for OpenJDK6 and OpenJDK7. (David Holmes reviewed it for JDK6_23). > > Dan > > > On 9/22/2010 6:27 AM, Dr Andrew John Hughes wrote: >> On 17:10 Tue 21 Sep , Daniel D. Daugherty wrote: >> >>> On 9/21/2010 4:51 PM, Dr Andrew John Hughes wrote: >>> >>>> On 14:34 Tue 21 Sep , Daniel D. Daugherty wrote: >>>> >>>>> Greetings, >>>>> >>>>> I'm in need of a couple of code reviews for a JavaDoc change >>>>> in the Logging APIs. >>>>> >>>>> Here is the URL for the OpenJDK6 version: >>>>> >>>>> http://cr.openjdk.java.net/~dcubed/6949710-webrev/1-openjdk6/ >>>>> >>>>> The OpenJDK6 version of the fix exactly matches the JDK6_23 >>>>> version of the fix that I sent to the confidential aliases >>>>> earlier. >>>>> >>>>> Here is the URL for the OpenJDK7 version: >>>>> >>>>> http://cr.openjdk.java.net/~dcubed/6949710-webrev/1-openjdk7/ >>>>> >>>>> The OpenJDK7 version of the fix has one less wording addition >>>>> because the affected paragraph was removed in OpenJDK7; the >>>>> paragraph was virtually identical to another paragraph a little >>>>> later in the same class. >>>>> >>>>> Thanks, in advance, for any comments. >>>>> >>>>> Dan >>>>> >>>>> >>>> Both look ok to me. >>>> >>> Thanks! I'm pretty sure I need a thumbs up from Joe >>> for the OpenJDK6 version... >>> >>> >> >> No problem! >> >> You're right, you do need Joe's approval for 6, but you can push it >> to 7 with me as reviewer. >> >> >>> Dan >>> >>> >> >> Thanks, >> From daniel.daugherty at oracle.com Wed Sep 22 09:51:01 2010 From: daniel.daugherty at oracle.com (Daniel D. Daugherty) Date: Wed, 22 Sep 2010 10:51:01 -0600 Subject: need code review for Logging API JavaDoc change (6949710) In-Reply-To: <4C9A33BA.1060400@oracle.com> References: <4C9916CA.1090901@oracle.com> <20100921225157.GC9599@rivendell.middle-earth.co.uk> <4C993B75.9050804@oracle.com> <20100922122733.GB5611@bree.middle-earth.co.uk> <4C9A17ED.1000407@oracle.com> <4C9A33BA.1060400@oracle.com> Message-ID: <4C9A33F5.9060207@oracle.com> Thanks Joe! Dan On 9/22/2010 10:50 AM, Joe Darcy wrote: > Hi Dan. > > Approved to go back; current build is b21. > > Thanks, > > -Joe > > Daniel D. Daugherty wrote: >> Joe, >> >> Do you want this JavaDoc fix in OpenJDK6? Andrew has reviewed it >> for OpenJDK6 and OpenJDK7. (David Holmes reviewed it for JDK6_23). >> >> Dan >> >> >> On 9/22/2010 6:27 AM, Dr Andrew John Hughes wrote: >>> On 17:10 Tue 21 Sep , Daniel D. Daugherty wrote: >>> >>>> On 9/21/2010 4:51 PM, Dr Andrew John Hughes wrote: >>>> >>>>> On 14:34 Tue 21 Sep , Daniel D. Daugherty wrote: >>>>> >>>>>> Greetings, >>>>>> >>>>>> I'm in need of a couple of code reviews for a JavaDoc change >>>>>> in the Logging APIs. >>>>>> >>>>>> Here is the URL for the OpenJDK6 version: >>>>>> >>>>>> http://cr.openjdk.java.net/~dcubed/6949710-webrev/1-openjdk6/ >>>>>> >>>>>> The OpenJDK6 version of the fix exactly matches the JDK6_23 >>>>>> version of the fix that I sent to the confidential aliases >>>>>> earlier. >>>>>> >>>>>> Here is the URL for the OpenJDK7 version: >>>>>> >>>>>> http://cr.openjdk.java.net/~dcubed/6949710-webrev/1-openjdk7/ >>>>>> >>>>>> The OpenJDK7 version of the fix has one less wording addition >>>>>> because the affected paragraph was removed in OpenJDK7; the >>>>>> paragraph was virtually identical to another paragraph a little >>>>>> later in the same class. >>>>>> >>>>>> Thanks, in advance, for any comments. >>>>>> >>>>>> Dan >>>>>> >>>>>> >>>>> Both look ok to me. >>>>> >>>> Thanks! I'm pretty sure I need a thumbs up from Joe >>>> for the OpenJDK6 version... >>>> >>>> >>> >>> No problem! >>> >>> You're right, you do need Joe's approval for 6, but you can push it >>> to 7 with me as reviewer. >>> >>> >>>> Dan >>>> >>>> >>> >>> Thanks, >>> > From daniel.daugherty at oracle.com Wed Sep 22 09:58:04 2010 From: daniel.daugherty at oracle.com (daniel.daugherty at oracle.com) Date: Wed, 22 Sep 2010 16:58:04 +0000 Subject: hg: jdk6/jdk6/jdk: 6949710: 3/3 the GC'able nature of Logging objects needs to be made brutally clear Message-ID: <20100922165821.4E6E347B65@hg.openjdk.java.net> Changeset: 8dfe14917105 Author: dcubed Date: 2010-09-22 09:57 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/8dfe14917105 6949710: 3/3 the GC'able nature of Logging objects needs to be made brutally clear Summary: Add words in more places to make it clear that Logger objects are GC'able unless there is a strong reference. Reviewed-by: dholmes, andrew, minqi ! src/share/classes/java/util/logging/LogManager.java ! src/share/classes/java/util/logging/Logger.java From joe.darcy at oracle.com Thu Sep 23 09:46:30 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Thu, 23 Sep 2010 09:46:30 -0700 Subject: hs19 import In-Reply-To: <20100921224624.GA9599@rivendell.middle-earth.co.uk> References: <20100915201407.GE673@rivendell.middle-earth.co.uk> <4C919F27.6090607@oracle.com> <20100920183906.GM16943@rivendell.middle-earth.co.uk> <4C982CD6.2050405@oracle.com> <4C98D489.4080009@oracle.com> <20100921224624.GA9599@rivendell.middle-earth.co.uk> Message-ID: <4C9B8466.8040304@oracle.com> Dr Andrew John Hughes wrote: > On 08:51 Tue 21 Sep , Joe Darcy wrote: > >> Erik Trimble wrote: >> >>> On 9/20/2010 11:39 AM, Dr Andrew John Hughes wrote: >>> >>>> On 21:37 Wed 15 Sep , Erik Trimble wrote: >>>> >>>>> On 9/15/2010 1:14 PM, Dr Andrew John Hughes wrote: >>>>> >>>>>> I notice that new repositories have appeared for a hs19 stable branch: >>>>>> >>>>>> http://hg.openjdk.java.net/hsx/hsx19/master/ >>>>>> >>>>>> Shall we start looking at this with regards to importing it for b21? >>>>>> >>>>> Go ahead. We've officially forked HS19 now (the JDK7 repos are now >>>>> starting with Hotspot 20). >>>>> >>>>> I would consider the hsx19 repos to be stable. There *may* be >>>>> additional >>>>> development in them, but if so (and I'm not specifically promising >>>>> anything), such development will be stabilization only. New feature >>>>> development is now in HS20 over in the main JDK7 repos. >>>>> >>>>> HS19 is now in stabilization (bugfix-only) stage, and is suitable for >>>>> work to begin on importing into OpenJDK 6. >>>>> >>>>> >>>> Thanks for the quick reply, Erik. >>>> >>>> I've started work on the merge, which is taking a while because of >>>> the orthogonal >>>> copyright header changes in OpenJDK6 and HotSpot :-( >>>> >>>> One thing I have noticed is that some headers in hs19 don't have a >>>> trailing comma before 'Oracle' >>>> and this is also true of the header template: >>>> >>>> --- make/templates/gpl-cp-header 2010-09-20 19:34:32.605298269 +0100 >>>> +++ ../../hs19/make/templates/gpl-cp-header 2010-09-16 >>>> 13:01:36.601792981 +0100 >>>> @@ -1,4 +1,4 @@ >>>> -Copyright %YEARS%, Oracle and/or its affiliates. All rights reserved. >>>> +Copyright %YEARS% Oracle and/or its affiliates. All rights reserved. >>>> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. >>>> >>>> Is HotSpot 19 correct or OpenJDK6? >>>> >>> I think it's both. :-) >>> >>> >>> That is, the correct format for an explicitly stated copyright should be >>> >>> >>> Copyright 2000, Oracle and/or .... >>> >>> AND >>> >>> Copyright 2000, 2003, Oracle and/or ... >>> >>> >>> There should be a comma after each date (the second instance implies a >>> date range between the two years). >>> >>> For the %YEARS% substitution in the templates, I don't think it >>> matters whether there is a comma. It won't be right after a >>> substitution no matter what we do. :-) >>> >>> >>> If you find instances of the the first case where there isn't a proper >>> comma inserted, PLEASE let me know. I need to fix it. >>> >>> >> Erik, >> >> Back during the big rebranding push, the GPL templates got updated a few >> times: >> >> 6943119: Rebrand source copyright notices >> 6961870: More rebranding fixes for templates/gpl-*-header files >> >> At the time, I didn't update the templates in the HotSpot repo in an >> attempt to avoid future merge issues. However, the templates in HS >> should match the templates in the jdk and root repository which now read as >> >> Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved. >> >> -Joe >> >> > > This webrev (against the current hotspot-rt tree) fixes the copyright issues, > including the template files Joe mentions and the missing trailing commas as well as > providing some copyright year updates present in OpenJDK6 but not HotSpot. > > http://cr.openjdk.java.net/~andrew/copyright/webrev.01/ > > Erik, feel free to assign this a bug ID and push it through JPRT if it helps. > > Joe, a webrev for the OpenJDK6 hs19 merge is at: > > http://cr.openjdk.java.net/~andrew/jdk6-hs19-merge/webrev.01/ > > Please let me know if I can push this. > > Thanks, > Hi Andrew. I won't get a chance to look at this until after JavaOne. Thanks, -Joe From ahughes at redhat.com Thu Sep 23 12:48:17 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 23 Sep 2010 20:48:17 +0100 Subject: hs19 import In-Reply-To: <4C9B8466.8040304@oracle.com> References: <20100915201407.GE673@rivendell.middle-earth.co.uk> <4C919F27.6090607@oracle.com> <20100920183906.GM16943@rivendell.middle-earth.co.uk> <4C982CD6.2050405@oracle.com> <4C98D489.4080009@oracle.com> <20100921224624.GA9599@rivendell.middle-earth.co.uk> <4C9B8466.8040304@oracle.com> Message-ID: <20100923194817.GK23441@rivendell.middle-earth.co.uk> On 09:46 Thu 23 Sep , Joe Darcy wrote: > Dr Andrew John Hughes wrote: > > On 08:51 Tue 21 Sep , Joe Darcy wrote: > > > >> Erik Trimble wrote: > >> > >>> On 9/20/2010 11:39 AM, Dr Andrew John Hughes wrote: > >>> > >>>> On 21:37 Wed 15 Sep , Erik Trimble wrote: > >>>> > >>>>> On 9/15/2010 1:14 PM, Dr Andrew John Hughes wrote: > >>>>> > >>>>>> I notice that new repositories have appeared for a hs19 stable branch: > >>>>>> > >>>>>> http://hg.openjdk.java.net/hsx/hsx19/master/ > >>>>>> > >>>>>> Shall we start looking at this with regards to importing it for b21? > >>>>>> > >>>>> Go ahead. We've officially forked HS19 now (the JDK7 repos are now > >>>>> starting with Hotspot 20). > >>>>> > >>>>> I would consider the hsx19 repos to be stable. There *may* be > >>>>> additional > >>>>> development in them, but if so (and I'm not specifically promising > >>>>> anything), such development will be stabilization only. New feature > >>>>> development is now in HS20 over in the main JDK7 repos. > >>>>> > >>>>> HS19 is now in stabilization (bugfix-only) stage, and is suitable for > >>>>> work to begin on importing into OpenJDK 6. > >>>>> > >>>>> > >>>> Thanks for the quick reply, Erik. > >>>> > >>>> I've started work on the merge, which is taking a while because of > >>>> the orthogonal > >>>> copyright header changes in OpenJDK6 and HotSpot :-( > >>>> > >>>> One thing I have noticed is that some headers in hs19 don't have a > >>>> trailing comma before 'Oracle' > >>>> and this is also true of the header template: > >>>> > >>>> --- make/templates/gpl-cp-header 2010-09-20 19:34:32.605298269 +0100 > >>>> +++ ../../hs19/make/templates/gpl-cp-header 2010-09-16 > >>>> 13:01:36.601792981 +0100 > >>>> @@ -1,4 +1,4 @@ > >>>> -Copyright %YEARS%, Oracle and/or its affiliates. All rights reserved. > >>>> +Copyright %YEARS% Oracle and/or its affiliates. All rights reserved. > >>>> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. > >>>> > >>>> Is HotSpot 19 correct or OpenJDK6? > >>>> > >>> I think it's both. :-) > >>> > >>> > >>> That is, the correct format for an explicitly stated copyright should be > >>> > >>> > >>> Copyright 2000, Oracle and/or .... > >>> > >>> AND > >>> > >>> Copyright 2000, 2003, Oracle and/or ... > >>> > >>> > >>> There should be a comma after each date (the second instance implies a > >>> date range between the two years). > >>> > >>> For the %YEARS% substitution in the templates, I don't think it > >>> matters whether there is a comma. It won't be right after a > >>> substitution no matter what we do. :-) > >>> > >>> > >>> If you find instances of the the first case where there isn't a proper > >>> comma inserted, PLEASE let me know. I need to fix it. > >>> > >>> > >> Erik, > >> > >> Back during the big rebranding push, the GPL templates got updated a few > >> times: > >> > >> 6943119: Rebrand source copyright notices > >> 6961870: More rebranding fixes for templates/gpl-*-header files > >> > >> At the time, I didn't update the templates in the HotSpot repo in an > >> attempt to avoid future merge issues. However, the templates in HS > >> should match the templates in the jdk and root repository which now read as > >> > >> Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved. > >> > >> -Joe > >> > >> > > > > This webrev (against the current hotspot-rt tree) fixes the copyright issues, > > including the template files Joe mentions and the missing trailing commas as well as > > providing some copyright year updates present in OpenJDK6 but not HotSpot. > > > > http://cr.openjdk.java.net/~andrew/copyright/webrev.01/ > > > > Erik, feel free to assign this a bug ID and push it through JPRT if it helps. > > > > Joe, a webrev for the OpenJDK6 hs19 merge is at: > > > > http://cr.openjdk.java.net/~andrew/jdk6-hs19-merge/webrev.01/ > > > > Please let me know if I can push this. > > > > Thanks, > > > > Hi Andrew. > > I won't get a chance to look at this until after JavaOne. > Yeah, it's okay, I kinda guessed :-D There's no rush, we're already testing it in IcedTea. Enjoy the conference! > 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 erik.trimble at oracle.com Thu Sep 23 15:20:23 2010 From: erik.trimble at oracle.com (Erik Trimble) Date: Thu, 23 Sep 2010 15:20:23 -0700 Subject: hs19 import In-Reply-To: <20100923194817.GK23441@rivendell.middle-earth.co.uk> References: <20100915201407.GE673@rivendell.middle-earth.co.uk> <4C919F27.6090607@oracle.com> <20100920183906.GM16943@rivendell.middle-earth.co.uk> <4C982CD6.2050405@oracle.com> <4C98D489.4080009@oracle.com> <20100921224624.GA9599@rivendell.middle-earth.co.uk> <4C9B8466.8040304@oracle.com> <20100923194817.GK23441@rivendell.middle-earth.co.uk> Message-ID: <4C9BD2A7.7000705@oracle.com> [On 9/23/2010 12:48 PM, Dr Andrew John Hughes wrote: > On 09:46 Thu 23 Sep , Joe Darcy wrote: >> Dr Andrew John Hughes wrote: >>> On 08:51 Tue 21 Sep , Joe Darcy wrote: >>> >>>> Erik Trimble wrote: >>>> >>>>> On 9/20/2010 11:39 AM, Dr Andrew John Hughes wrote: >>>>> >>>>>> On 21:37 Wed 15 Sep , Erik Trimble wrote: >>>>>> >>>>>>> On 9/15/2010 1:14 PM, Dr Andrew John Hughes wrote: >>>>>>> >>>>>>>> I notice that new repositories have appeared for a hs19 stable branch: >>>>>>>> >>>>>>>> http://hg.openjdk.java.net/hsx/hsx19/master/ >>>>>>>> >>>>>>>> Shall we start looking at this with regards to importing it for b21? >>>>>>>> >>>>>>> Go ahead. We've officially forked HS19 now (the JDK7 repos are now >>>>>>> starting with Hotspot 20). >>>>>>> >>>>>>> I would consider the hsx19 repos to be stable. There *may* be >>>>>>> additional >>>>>>> development in them, but if so (and I'm not specifically promising >>>>>>> anything), such development will be stabilization only. New feature >>>>>>> development is now in HS20 over in the main JDK7 repos. >>>>>>> >>>>>>> HS19 is now in stabilization (bugfix-only) stage, and is suitable for >>>>>>> work to begin on importing into OpenJDK 6. >>>>>>> >>>>>>> >>>>>> Thanks for the quick reply, Erik. >>>>>> >>>>>> I've started work on the merge, which is taking a while because of >>>>>> the orthogonal >>>>>> copyright header changes in OpenJDK6 and HotSpot :-( >>>>>> >>>>>> One thing I have noticed is that some headers in hs19 don't have a >>>>>> trailing comma before 'Oracle' >>>>>> and this is also true of the header template: >>>>>> >>>>>> --- make/templates/gpl-cp-header 2010-09-20 19:34:32.605298269 +0100 >>>>>> +++ ../../hs19/make/templates/gpl-cp-header 2010-09-16 >>>>>> 13:01:36.601792981 +0100 >>>>>> @@ -1,4 +1,4 @@ >>>>>> -Copyright %YEARS%, Oracle and/or its affiliates. All rights reserved. >>>>>> +Copyright %YEARS% Oracle and/or its affiliates. All rights reserved. >>>>>> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. >>>>>> >>>>>> Is HotSpot 19 correct or OpenJDK6? >>>>>> >>>>> I think it's both. :-) >>>>> >>>>> >>>>> That is, the correct format for an explicitly stated copyright should be >>>>> >>>>> >>>>> Copyright 2000, Oracle and/or .... >>>>> >>>>> AND >>>>> >>>>> Copyright 2000, 2003, Oracle and/or ... >>>>> >>>>> >>>>> There should be a comma after each date (the second instance implies a >>>>> date range between the two years). >>>>> >>>>> For the %YEARS% substitution in the templates, I don't think it >>>>> matters whether there is a comma. It won't be right after a >>>>> substitution no matter what we do. :-) >>>>> >>>>> >>>>> If you find instances of the the first case where there isn't a proper >>>>> comma inserted, PLEASE let me know. I need to fix it. >>>>> >>>>> >>>> Erik, >>>> >>>> Back during the big rebranding push, the GPL templates got updated a few >>>> times: >>>> >>>> 6943119: Rebrand source copyright notices >>>> 6961870: More rebranding fixes for templates/gpl-*-header files >>>> >>>> At the time, I didn't update the templates in the HotSpot repo in an >>>> attempt to avoid future merge issues. However, the templates in HS >>>> should match the templates in the jdk and root repository which now read as >>>> >>>> Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved. >>>> >>>> -Joe >>>> >>>> >>> This webrev (against the current hotspot-rt tree) fixes the copyright issues, >>> including the template files Joe mentions and the missing trailing commas as well as >>> providing some copyright year updates present in OpenJDK6 but not HotSpot. >>> >>> http://cr.openjdk.java.net/~andrew/copyright/webrev.01/ >>> >>> Erik, feel free to assign this a bug ID and push it through JPRT if it helps. >>> >>> Joe, a webrev for the OpenJDK6 hs19 merge is at: >>> >>> http://cr.openjdk.java.net/~andrew/jdk6-hs19-merge/webrev.01/ >>> >>> Please let me know if I can push this. >>> >>> Thanks, >>> >> Hi Andrew. >> >> I won't get a chance to look at this until after JavaOne. >> > Yeah, it's okay, I kinda guessed :-D > There's no rush, we're already testing it in IcedTea. > > Enjoy the conference! > >> Thanks, >> >> -Joe I'll do this tomorrow. It should get fixed a couple of different places, so I'll have to create a CR for it. -- Erik Trimble Java System Support Mailstop: usca22-123 Phone: x17195 Santa Clara, CA From erik.trimble at oracle.com Fri Sep 24 00:39:17 2010 From: erik.trimble at oracle.com (Erik Trimble) Date: Fri, 24 Sep 2010 00:39:17 -0700 Subject: hs19 import In-Reply-To: <4C9BD2A7.7000705@oracle.com> References: <20100915201407.GE673@rivendell.middle-earth.co.uk> <4C919F27.6090607@oracle.com> <20100920183906.GM16943@rivendell.middle-earth.co.uk> <4C982CD6.2050405@oracle.com> <4C98D489.4080009@oracle.com> <20100921224624.GA9599@rivendell.middle-earth.co.uk> <4C9B8466.8040304@oracle.com> <20100923194817.GK23441@rivendell.middle-earth.co.uk> <4C9BD2A7.7000705@oracle.com> Message-ID: <4C9C55A5.3070205@oracle.com> On 9/23/2010 3:20 PM, Erik Trimble wrote: > [On 9/23/2010 12:48 PM, Dr Andrew John Hughes wrote: >> On 09:46 Thu 23 Sep , Joe Darcy wrote: >>> Dr Andrew John Hughes wrote: >>>> On 08:51 Tue 21 Sep , Joe Darcy wrote: >>>> >>>>> Erik Trimble wrote: >>>>> >>>>>> On 9/20/2010 11:39 AM, Dr Andrew John Hughes wrote: >>>>>> >>>>>>> On 21:37 Wed 15 Sep , Erik Trimble wrote: >>>>>>> >>>>>>>> On 9/15/2010 1:14 PM, Dr Andrew John Hughes wrote: >>>>>>>> >>>>>>>>> I notice that new repositories have appeared for a hs19 stable >>>>>>>>> branch: >>>>>>>>> >>>>>>>>> http://hg.openjdk.java.net/hsx/hsx19/master/ >>>>>>>>> >>>>>>>>> Shall we start looking at this with regards to importing it >>>>>>>>> for b21? >>>>>>>>> >>>>>>>> Go ahead. We've officially forked HS19 now (the JDK7 repos are now >>>>>>>> starting with Hotspot 20). >>>>>>>> >>>>>>>> I would consider the hsx19 repos to be stable. There *may* be >>>>>>>> additional >>>>>>>> development in them, but if so (and I'm not specifically promising >>>>>>>> anything), such development will be stabilization only. New >>>>>>>> feature >>>>>>>> development is now in HS20 over in the main JDK7 repos. >>>>>>>> >>>>>>>> HS19 is now in stabilization (bugfix-only) stage, and is >>>>>>>> suitable for >>>>>>>> work to begin on importing into OpenJDK 6. >>>>>>>> >>>>>>>> >>>>>>> Thanks for the quick reply, Erik. >>>>>>> >>>>>>> I've started work on the merge, which is taking a while because of >>>>>>> the orthogonal >>>>>>> copyright header changes in OpenJDK6 and HotSpot :-( >>>>>>> >>>>>>> One thing I have noticed is that some headers in hs19 don't have a >>>>>>> trailing comma before 'Oracle' >>>>>>> and this is also true of the header template: >>>>>>> >>>>>>> --- make/templates/gpl-cp-header 2010-09-20 >>>>>>> 19:34:32.605298269 +0100 >>>>>>> +++ ../../hs19/make/templates/gpl-cp-header 2010-09-16 >>>>>>> 13:01:36.601792981 +0100 >>>>>>> @@ -1,4 +1,4 @@ >>>>>>> -Copyright %YEARS%, Oracle and/or its affiliates. All rights >>>>>>> reserved. >>>>>>> +Copyright %YEARS% Oracle and/or its affiliates. All rights >>>>>>> reserved. >>>>>>> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. >>>>>>> >>>>>>> Is HotSpot 19 correct or OpenJDK6? >>>>>>> >>>>>> I think it's both. :-) >>>>>> >>>>>> >>>>>> That is, the correct format for an explicitly stated copyright >>>>>> should be >>>>>> >>>>>> >>>>>> Copyright 2000, Oracle and/or .... >>>>>> >>>>>> AND >>>>>> >>>>>> Copyright 2000, 2003, Oracle and/or ... >>>>>> >>>>>> >>>>>> There should be a comma after each date (the second instance >>>>>> implies a >>>>>> date range between the two years). >>>>>> >>>>>> For the %YEARS% substitution in the templates, I don't think it >>>>>> matters whether there is a comma. It won't be right after a >>>>>> substitution no matter what we do. :-) >>>>>> >>>>>> >>>>>> If you find instances of the the first case where there isn't a >>>>>> proper >>>>>> comma inserted, PLEASE let me know. I need to fix it. >>>>>> >>>>>> >>>>> Erik, >>>>> >>>>> Back during the big rebranding push, the GPL templates got updated >>>>> a few >>>>> times: >>>>> >>>>> 6943119: Rebrand source copyright notices >>>>> 6961870: More rebranding fixes for templates/gpl-*-header files >>>>> >>>>> At the time, I didn't update the templates in the HotSpot repo in an >>>>> attempt to avoid future merge issues. However, the templates in HS >>>>> should match the templates in the jdk and root repository which >>>>> now read as >>>>> >>>>> Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights >>>>> reserved. >>>>> >>>>> -Joe >>>>> >>>>> >>>> This webrev (against the current hotspot-rt tree) fixes the >>>> copyright issues, >>>> including the template files Joe mentions and the missing trailing >>>> commas as well as >>>> providing some copyright year updates present in OpenJDK6 but not >>>> HotSpot. >>>> >>>> http://cr.openjdk.java.net/~andrew/copyright/webrev.01/ >>>> >>>> Erik, feel free to assign this a bug ID and push it through JPRT if >>>> it helps. >>>> >>>> Joe, a webrev for the OpenJDK6 hs19 merge is at: >>>> >>>> http://cr.openjdk.java.net/~andrew/jdk6-hs19-merge/webrev.01/ >>>> >>>> Please let me know if I can push this. >>>> >>>> Thanks, >>>> >>> Hi Andrew. >>> >>> I won't get a chance to look at this until after JavaOne. >>> >> Yeah, it's okay, I kinda guessed :-D >> There's no rush, we're already testing it in IcedTea. >> >> Enjoy the conference! >> >>> Thanks, >>> >>> -Joe > > > I'll do this tomorrow. It should get fixed a couple of different > places, so I'll have to create a CR for it. > OK, I just looked at this. I've cloned the whole JDK7 forest, and did this: [et151817 at foundation jdk-forest]$ ggrep -r '%YEARS' . ./make/templates/gpl-header:Copyright %YEARS% Sun Microsystems, Inc. All Rights Reserved. ./make/templates/gpl-cp-header:Copyright %YEARS% Sun Microsystems, Inc. All Rights Reserved. ./make/templates/bsd-header:Copyright %YEARS% Sun Microsystems, Inc. All Rights Reserved. ./jdk/make/templates/gpl-header:Copyright %YEARS% Sun Microsystems, Inc. All Rights Reserved. ./jdk/make/templates/gpl-cp-header:Copyright %YEARS% Sun Microsystems, Inc. All Rights Reserved. ./jdk/make/templates/bsd-header:Copyright %YEARS% Sun Microsystems, Inc. All Rights Reserved. ./hotspot/make/templates/bsd-header:Copyright %YEARS% Oracle and/or its affiliates. All rights reserved. ./hotspot/make/templates/gpl-cp-header:Copyright %YEARS% Oracle and/or its affiliates. All rights reserved. ./hotspot/make/templates/gpl-header:Copyright %YEARS% Oracle and/or its affiliates. All rights reserved. This applies in the full jdk6/jdk6 forest, the full jdk7/jdk7 forest, and the abbreviated hsx/hsx19 forests. I will be changing the hotspot/make/templates files to be this: Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved. I'll then push it to the jdk7 and hsx19 repos. Joe or Kelly - can you fix the line in the jdk/make/templates and make/templates directories? -- Erik Trimble Java System Support Mailstop: usca22-123 Phone: x17195 Santa Clara, CA From ahughes at redhat.com Mon Sep 27 06:01:21 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 27 Sep 2010 14:01:21 +0100 Subject: hs19 import In-Reply-To: <4C9C55A5.3070205@oracle.com> References: <20100915201407.GE673@rivendell.middle-earth.co.uk> <4C919F27.6090607@oracle.com> <20100920183906.GM16943@rivendell.middle-earth.co.uk> <4C982CD6.2050405@oracle.com> <4C98D489.4080009@oracle.com> <20100921224624.GA9599@rivendell.middle-earth.co.uk> <4C9B8466.8040304@oracle.com> <20100923194817.GK23441@rivendell.middle-earth.co.uk> <4C9BD2A7.7000705@oracle.com> <4C9C55A5.3070205@oracle.com> Message-ID: <20100927130121.GM23441@rivendell.middle-earth.co.uk> On 00:39 Fri 24 Sep , Erik Trimble wrote: > On 9/23/2010 3:20 PM, Erik Trimble wrote: > > [On 9/23/2010 12:48 PM, Dr Andrew John Hughes wrote: > >> On 09:46 Thu 23 Sep , Joe Darcy wrote: > >>> Dr Andrew John Hughes wrote: > >>>> On 08:51 Tue 21 Sep , Joe Darcy wrote: > >>>> > >>>>> Erik Trimble wrote: > >>>>> > >>>>>> On 9/20/2010 11:39 AM, Dr Andrew John Hughes wrote: > >>>>>> > >>>>>>> On 21:37 Wed 15 Sep , Erik Trimble wrote: > >>>>>>> > >>>>>>>> On 9/15/2010 1:14 PM, Dr Andrew John Hughes wrote: > >>>>>>>> > >>>>>>>>> I notice that new repositories have appeared for a hs19 stable > >>>>>>>>> branch: > >>>>>>>>> > >>>>>>>>> http://hg.openjdk.java.net/hsx/hsx19/master/ > >>>>>>>>> > >>>>>>>>> Shall we start looking at this with regards to importing it > >>>>>>>>> for b21? > >>>>>>>>> > >>>>>>>> Go ahead. We've officially forked HS19 now (the JDK7 repos are now > >>>>>>>> starting with Hotspot 20). > >>>>>>>> > >>>>>>>> I would consider the hsx19 repos to be stable. There *may* be > >>>>>>>> additional > >>>>>>>> development in them, but if so (and I'm not specifically promising > >>>>>>>> anything), such development will be stabilization only. New > >>>>>>>> feature > >>>>>>>> development is now in HS20 over in the main JDK7 repos. > >>>>>>>> > >>>>>>>> HS19 is now in stabilization (bugfix-only) stage, and is > >>>>>>>> suitable for > >>>>>>>> work to begin on importing into OpenJDK 6. > >>>>>>>> > >>>>>>>> > >>>>>>> Thanks for the quick reply, Erik. > >>>>>>> > >>>>>>> I've started work on the merge, which is taking a while because of > >>>>>>> the orthogonal > >>>>>>> copyright header changes in OpenJDK6 and HotSpot :-( > >>>>>>> > >>>>>>> One thing I have noticed is that some headers in hs19 don't have a > >>>>>>> trailing comma before 'Oracle' > >>>>>>> and this is also true of the header template: > >>>>>>> > >>>>>>> --- make/templates/gpl-cp-header 2010-09-20 > >>>>>>> 19:34:32.605298269 +0100 > >>>>>>> +++ ../../hs19/make/templates/gpl-cp-header 2010-09-16 > >>>>>>> 13:01:36.601792981 +0100 > >>>>>>> @@ -1,4 +1,4 @@ > >>>>>>> -Copyright %YEARS%, Oracle and/or its affiliates. All rights > >>>>>>> reserved. > >>>>>>> +Copyright %YEARS% Oracle and/or its affiliates. All rights > >>>>>>> reserved. > >>>>>>> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. > >>>>>>> > >>>>>>> Is HotSpot 19 correct or OpenJDK6? > >>>>>>> > >>>>>> I think it's both. :-) > >>>>>> > >>>>>> > >>>>>> That is, the correct format for an explicitly stated copyright > >>>>>> should be > >>>>>> > >>>>>> > >>>>>> Copyright 2000, Oracle and/or .... > >>>>>> > >>>>>> AND > >>>>>> > >>>>>> Copyright 2000, 2003, Oracle and/or ... > >>>>>> > >>>>>> > >>>>>> There should be a comma after each date (the second instance > >>>>>> implies a > >>>>>> date range between the two years). > >>>>>> > >>>>>> For the %YEARS% substitution in the templates, I don't think it > >>>>>> matters whether there is a comma. It won't be right after a > >>>>>> substitution no matter what we do. :-) > >>>>>> > >>>>>> > >>>>>> If you find instances of the the first case where there isn't a > >>>>>> proper > >>>>>> comma inserted, PLEASE let me know. I need to fix it. > >>>>>> > >>>>>> > >>>>> Erik, > >>>>> > >>>>> Back during the big rebranding push, the GPL templates got updated > >>>>> a few > >>>>> times: > >>>>> > >>>>> 6943119: Rebrand source copyright notices > >>>>> 6961870: More rebranding fixes for templates/gpl-*-header files > >>>>> > >>>>> At the time, I didn't update the templates in the HotSpot repo in an > >>>>> attempt to avoid future merge issues. However, the templates in HS > >>>>> should match the templates in the jdk and root repository which > >>>>> now read as > >>>>> > >>>>> Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights > >>>>> reserved. > >>>>> > >>>>> -Joe > >>>>> > >>>>> > >>>> This webrev (against the current hotspot-rt tree) fixes the > >>>> copyright issues, > >>>> including the template files Joe mentions and the missing trailing > >>>> commas as well as > >>>> providing some copyright year updates present in OpenJDK6 but not > >>>> HotSpot. > >>>> > >>>> http://cr.openjdk.java.net/~andrew/copyright/webrev.01/ > >>>> > >>>> Erik, feel free to assign this a bug ID and push it through JPRT if > >>>> it helps. > >>>> > >>>> Joe, a webrev for the OpenJDK6 hs19 merge is at: > >>>> > >>>> http://cr.openjdk.java.net/~andrew/jdk6-hs19-merge/webrev.01/ > >>>> > >>>> Please let me know if I can push this. > >>>> > >>>> Thanks, > >>>> > >>> Hi Andrew. > >>> > >>> I won't get a chance to look at this until after JavaOne. > >>> > >> Yeah, it's okay, I kinda guessed :-D > >> There's no rush, we're already testing it in IcedTea. > >> > >> Enjoy the conference! > >> > >>> Thanks, > >>> > >>> -Joe > > > > > > I'll do this tomorrow. It should get fixed a couple of different > > places, so I'll have to create a CR for it. > > > > > OK, I just looked at this. > > I've cloned the whole JDK7 forest, and did this: > > [et151817 at foundation jdk-forest]$ ggrep -r '%YEARS' . > ./make/templates/gpl-header:Copyright %YEARS% Sun Microsystems, Inc. > All Rights Reserved. > ./make/templates/gpl-cp-header:Copyright %YEARS% Sun Microsystems, Inc. > All Rights Reserved. > ./make/templates/bsd-header:Copyright %YEARS% Sun Microsystems, Inc. > All Rights Reserved. > ./jdk/make/templates/gpl-header:Copyright %YEARS% Sun Microsystems, > Inc. All Rights Reserved. > ./jdk/make/templates/gpl-cp-header:Copyright %YEARS% Sun Microsystems, > Inc. All Rights Reserved. > ./jdk/make/templates/bsd-header:Copyright %YEARS% Sun Microsystems, > Inc. All Rights Reserved. > ./hotspot/make/templates/bsd-header:Copyright %YEARS% Oracle and/or its > affiliates. All rights reserved. > ./hotspot/make/templates/gpl-cp-header:Copyright %YEARS% Oracle and/or > its affiliates. All rights reserved. > ./hotspot/make/templates/gpl-header:Copyright %YEARS% Oracle and/or its > affiliates. All rights reserved. > > > This applies in the full jdk6/jdk6 forest, the full jdk7/jdk7 forest, > and the abbreviated hsx/hsx19 forests. > The jdk6/jdk6/hotspot ones should be correct. At least, that's why I spotted this to begin with. > > > I will be changing the hotspot/make/templates files to be this: > > > Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved. > > > I'll then push it to the jdk7 and hsx19 repos. > > > > Joe or Kelly - can you fix the line in the jdk/make/templates and > make/templates directories? > > > > -- > > Erik Trimble > Java System Support > Mailstop: usca22-123 > Phone: x17195 > Santa Clara, CA > -- 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