Sync'ing up jdk7 at b50

[Andrew John Hughes]

2009/3/6 Alan Bateman <Alan.Bateman at sun.com>:
> Nothing to worry about, comments inline.
>
> Andrew John Hughes wrote:
>>
>> :
>> In b50 of JDK7, there seem to be a few files missing that were in b99 of
>> NIO2:
>>
>> jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipEntryInfo.java
>> jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStore.java
>> jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystem.java
>>
>> jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipHeaderConstants.java
>>
>> jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributes.java
>> jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarEntryInfo.java
>>
>> jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributeView.java
>> jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipPathParser.java
>> jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFilePath.java
>>
>> jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributeView.java
>>
>> jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributes.java
>>
>> jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributes.java
>> jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStream.java
>>
>> jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystemProvider.java
>> jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipUtils.java
>>
>> jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributeView.java
>> jdk/src/share/demo/nio/ZipFileSystem/README.txt
>>
>> jdk/src/share/demo/nio/ZipFileSystem/META-INF/services/java.nio.file.spi.FileSystemProvider
>>
>
> The zip provider was contributed by Rajendra from our quality group. He's
> been busy with other tasks for the last few months and hasn't had cycles to
> keep it up to date. We would like to have it in the JDK as a demo provider
> but it needs a bit of work before that can happen. Volunteers?
>
>> jdk/src/share/sample/nio/aio/EchoServer.java
>>
>
> Sample code is very important which is why there are quite a few samples in
> the nio/file directory. I'm hoping we can do the sample for the Asynchronous
> I/O API but they aren't there yet, which is why the trivial EchoServer
> didn't go in.
>
>> jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java
>>
>
> ???. This isn't in the nio/nio/jdk repository. Are you diff'ing jdk7-b50 vs.
> nio-b99? Any chance your working directory isn't at nio2-b99?
>

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.

>> jdk/src/share/classes/sun/nio/fs/AbstractNamedAttributeView.java
>>
>
> This was renamed in b99 so maybe your working directory isn't at nio2-b99?
>

Same as above, I spotted this change myself when diffing the files
between the two versions.

>> jdk/src/share/classes/java/io/Inputs.java
>> jdk/src/share/classes/java/io/Outputs.java
>>
>
> These are just still very much experimental and need more work before they
> are ready.
>
>> jdk/src/share/classes/java/nio/file/attribute/NamedAttributeView.java
>> jdk/src/solaris/classes/sun/nio/fs/LinuxNamedAttributeView.java
>> jdk/src/solaris/classes/sun/nio/fs/SolarisNamedAttributeView.java
>> jdk/src/windows/classes/sun/nio/fs/WindowsNamedAttributeView.java
>>
>
> Related to the rename above.
>
>> jdk/make/mkdemo/nio/Makefile
>> jdk/make/mkdemo/nio/ZipFileSystem/Makefile
>> jdk/make/mksample/nio/aio/Makefile
>>
>
> Related to the demo stuff above.
>
>> jdk/test/java/io/Inputs/Basic.java
>>
>
> Related to Inputs/Outputs above.
>
>> The main thing is the ZIP FS demo, but I was surprised that some of
>> the other files were missing.  Should this be the case?
>>
>>
>
> Yes, intended and I'm kinda surprised anyone noticed.
>

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

> If you are diff'ing then you'll also see that
> src/share/classes/java/nio/channels/{Socket,ServerSocket,Datagram}Channel.java
> and spi.SelectorProvider aren't identical between nio2-b99 and jdk7-50. The
> difference relates to default implementation of new methods added to
> existing classes. This also requires further work.
>

Yes, I've seen this.  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.

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?

> -Alan.
>
>
>
>

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