hs19 import

Tue Oct 12 14:53:18 PDT 2010

Dr Andrew John Hughes wrote:
> On 12:18 Fri 08 Oct     , Joe Darcy wrote:
>   
>> 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.
>>>>
>>>> Thanks,
>>>>
>>>> -Joe
>>>>     
>>>>         
>>> Hi Joe,
>>>
>>> Any progress on this?
>>>   
>>>       
>> Hello.
>>
>> Sorry of the delay.
>>     
>
> Sorry, missed this mail for some reason.
>
>   
>>  I'm a bit confused with the contents of
>>
>> http://cr.openjdk.java.net/~andrew/jdk6-hs19-merge/webrev.01/
>>
>> Why are the Sun -> Oracle copyright changes present here since both HS19 
>> and OpenJDK 6 HS repos have already had the rebranding done?
>>
>> The copyright changes look correct to me.
>>
>>     
>
> I don't think that webrevs are the clearest thing for these merges.
> Suggestions welcome :-)
>
> Indeed, hs19 does have the copyright changes.  And so they are part of
> the series of changesets between the tip of the hs19 master repository
> and what was in OpenJDK6 previously (hs17).  So the rebranding was
> applied again to the OpenJDK6 repository, causing lots of lovely
> conflicts due to orthogonal copyright changes.  This is what allowed
> me to catch the discrepancies between the two runs I mentioned to
> Erik.
>
> What you're seeing in the webrev is the HotSpot copyright update.
>
> changeset:   1772:c18cbe5936b8
> user:        trims
> date:        Thu May 27 19:08:38 2010 -0700
> summary:     6941466: Oracle rebranding changes for Hotspot repositories
>
> This is then merged into OpenJDK6 in the merge changeset.
>
>   

[snip]

Understood.

Your current hs19 merge is approved to go back into OpenJDK 6 b21.

Note that you may have noticed some more recent bug fixing activity 
going on in hs19.  In principle those changes can go back too, but I'd 
prefer they be done after the current work is merged in.

Thanks,

-Joe