Sync'ing up jdk7 at b50

[Andrew John Hughes]

2009/3/6 Alan Bateman <Alan.Bateman at sun.com>:
> Andrew John Hughes wrote:
>>
>> :
>> Sorry, I misremembered which build drop we synced against last.  It
>> was actually b98, so my diffs will be a combination of the changes
>> from b98->b99 and b99->OJ7-b50.
>>
>
> No problem!
>>
>> :
>> As I mentioned in a previous mail, we provide the option of NIO2
>> support in the IcedTea6 and IcedTea7 repositories.  With bumping
>> IcedTea7 to b50, I've been comparing what we have (b98) with what's in
>> b50, and dropping most of our local copy in favour of the upstream b50
>> version.  Once this work is complete, the version in 6 will also be
>> bumped to the b50 version (which is trickier, as the version for 6
>> moves to the classes to an alternate namespace to retain
>> compatibility).
>>
>
> Yes, this will be tricky (esp. the socket-channel area).
>

It was :)

>
>> :
>> Interestingly, every file has changed in some
>> way between b98 and the b50 OpenJDK7 drop, bar a few ancillary
>> property and policy files in the test tree.
>>
>
> In most cases it will be just the date range in the header. There isn't a
> lot of "code" changes.
>

Yes, I spotted this - most of the changes are these or rewordings of
documentation.

>> Are the changes between b99 and b50 in the NIO2 repository yet? Is
>> there a public version of the change request that allowed it to go
>> into the main 7 tree?
>>
>
> I'll sync up the nio/nio forest later today. I meant to do that earlier this
> week but didn't get a chance.
>

Thanks.

> I'm not sure I understand what you mean by "change request" here - do you
> mean the "changeset"? If so, here it is:
>  http://hg.openjdk.java.net/jdk7/tl/jdk/rev/f06f30b29f36
> Tim will have pushed that to jdk7/tl/jdk when pushing all bits for b50. If
> you mean the change requests (or bug IDs as we used to know them by) then
> they are in the change-set message.
>

Maybe I used the wrong term.  I presume there was some review
process/webrev for this code going into the main tree, which resulted
in some of the changes, and I was wondering if this was public.
I saw the changeset itself when it was pushed, but it includes the
whole of NIO2.  I was hoping for something showing just the changes
made in moving the code from the NIO2 tree to tl.  Hopefully your
merge will show this.

> -Alan.
>



-- 
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