Updated bulk of java.nio to OpenJDK 7.

1 files changed, 166 insertions, 142 deletions

diff --git a/openjdk/allsources.lst b/openjdk/allsources.lst
index c565ec2f..f51e3854 100644
--- a/openjdk/allsources.lst
+++ b/openjdk/allsources.lst
@@ -187,6 +187,7 @@ sun/net/www/protocol/file/Handler.java
 sun/net/www/protocol/file/FileURLConnection.java
 sun/net/www/protocol/jar/JarFileFactory.java
 sun/nio/ch/DatagramChannelImpl.java
+sun/nio/ch/DefaultAsynchronousChannelProvider.java
 sun/nio/ch/DefaultSelectorProvider.java
 sun/nio/ch/DotNetSelectorImpl.java
 sun/nio/ch/FileChannelImpl.java
@@ -194,8 +195,8 @@ sun/nio/ch/FileKey.java
 sun/nio/ch/IOUtil.java
 sun/nio/ch/Net.java
 sun/nio/ch/SelectionKeyImpl.java
-sun/nio/ch/ServerSocketChannelImpl.java
-sun/nio/ch/SocketChannelImpl.java
+sun/nio/ch/SocketDispatcher.java
+sun/nio/ch/SocketOptionRegistry.java
 sun/nio/ch/Util.java
 sun/nio/cs/StandardCharsets.java
 sun/nio/fs/DefaultFileSystemProvider.java
@@ -355,104 +356,111 @@ sun/security/jgss/wrapper/SunNativeProvider.java
 @OPENJDK7@/build/linux-amd64/gensrc/java/lang/CharacterDataLatin1.java
 @OPENJDK7@/build/linux-amd64/gensrc/java/lang/CharacterDataPrivateUse.java
 @OPENJDK7@/build/linux-amd64/gensrc/java/lang/CharacterDataUndefined.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/BufferOverflowException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/BufferUnderflowException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBuffer.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsCharBufferB.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsCharBufferL.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsCharBufferRB.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsCharBufferRL.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsDoubleBufferB.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsDoubleBufferL.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsDoubleBufferRB.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsDoubleBufferRL.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsFloatBufferB.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsFloatBufferL.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsFloatBufferRB.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsFloatBufferRL.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsIntBufferB.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsIntBufferL.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsIntBufferRB.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsIntBufferRL.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsLongBufferB.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsLongBufferL.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsLongBufferRB.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsLongBufferRL.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsShortBufferB.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsShortBufferL.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsShortBufferRB.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ByteBufferAsShortBufferRL.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/AlreadyConnectedException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/AsynchronousCloseException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/CancelledKeyException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/ClosedByInterruptException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/ClosedChannelException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/ClosedSelectorException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/ConnectionPendingException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/FileLockInterruptionException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/IllegalBlockingModeException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/IllegalSelectorException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/NoConnectionPendingException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/NonReadableChannelException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/NonWritableChannelException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/NotYetBoundException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/NotYetConnectedException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/OverlappingFileLockException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/UnresolvedAddressException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/channels/UnsupportedAddressTypeException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/CharBuffer.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/BufferOverflowException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/BufferUnderflowException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBuffer.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsCharBufferB.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsCharBufferL.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsCharBufferRB.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsCharBufferRL.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsDoubleBufferB.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsDoubleBufferL.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsDoubleBufferRB.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsDoubleBufferRL.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsFloatBufferB.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsFloatBufferL.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsFloatBufferRB.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsFloatBufferRL.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsIntBufferB.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsIntBufferL.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsIntBufferRB.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsIntBufferRL.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsLongBufferB.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsLongBufferL.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsLongBufferRB.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsLongBufferRL.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsShortBufferB.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsShortBufferL.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsShortBufferRB.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ByteBufferAsShortBufferRL.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/AcceptPendingException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/AlreadyBoundException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/AlreadyConnectedException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/AsynchronousCloseException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/CancelledKeyException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/ClosedByInterruptException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/ClosedChannelException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/ClosedSelectorException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/ConnectionPendingException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/FileLockInterruptionException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/IllegalBlockingModeException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/IllegalChannelGroupException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/IllegalSelectorException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/InterruptedByTimeoutException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/NoConnectionPendingException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/NonReadableChannelException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/NonWritableChannelException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/NotYetBoundException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/NotYetConnectedException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/OverlappingFileLockException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/ReadPendingException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/ShutdownChannelGroupException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/UnresolvedAddressException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/UnsupportedAddressTypeException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/channels/WritePendingException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/CharBuffer.java
 @OPENJDK7@/build/linux-amd64/gensrc/java/nio/charset/CharacterCodingException.java
 @OPENJDK7@/build/linux-amd64/gensrc/java/nio/charset/CharsetDecoder.java
 @OPENJDK7@/build/linux-amd64/gensrc/java/nio/charset/CharsetEncoder.java
 @OPENJDK7@/build/linux-amd64/gensrc/java/nio/charset/IllegalCharsetNameException.java
 @OPENJDK7@/build/linux-amd64/gensrc/java/nio/charset/UnsupportedCharsetException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectByteBuffer.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectByteBufferR.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectCharBufferRS.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectCharBufferRU.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectCharBufferS.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectCharBufferU.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectDoubleBufferRS.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectDoubleBufferRU.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectDoubleBufferS.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectDoubleBufferU.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectFloatBufferRS.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectFloatBufferRU.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectFloatBufferS.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectFloatBufferU.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectIntBufferRS.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectIntBufferRU.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectIntBufferS.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectIntBufferU.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectLongBufferRS.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectLongBufferRU.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectLongBufferS.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectLongBufferU.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectShortBufferRS.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectShortBufferRU.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectShortBufferS.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DirectShortBufferU.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/DoubleBuffer.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/FloatBuffer.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/HeapByteBuffer.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/HeapByteBufferR.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/HeapCharBuffer.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/HeapCharBufferR.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/HeapDoubleBuffer.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/HeapDoubleBufferR.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/HeapFloatBuffer.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/HeapFloatBufferR.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/HeapIntBuffer.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/HeapIntBufferR.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/HeapLongBuffer.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/HeapLongBufferR.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/HeapShortBuffer.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/HeapShortBufferR.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/IntBuffer.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/InvalidMarkException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/LongBuffer.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ReadOnlyBufferException.java
-@OPENJDK6@/build/linux-amd64/gensrc/java/nio/ShortBuffer.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectByteBuffer.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectByteBufferR.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectCharBufferRS.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectCharBufferRU.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectCharBufferS.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectCharBufferU.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectDoubleBufferRS.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectDoubleBufferRU.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectDoubleBufferS.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectDoubleBufferU.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectFloatBufferRS.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectFloatBufferRU.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectFloatBufferS.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectFloatBufferU.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectIntBufferRS.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectIntBufferRU.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectIntBufferS.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectIntBufferU.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectLongBufferRS.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectLongBufferRU.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectLongBufferS.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectLongBufferU.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectShortBufferRS.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectShortBufferRU.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectShortBufferS.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DirectShortBufferU.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/DoubleBuffer.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/FloatBuffer.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/HeapByteBuffer.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/HeapByteBufferR.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/HeapCharBuffer.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/HeapCharBufferR.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/HeapDoubleBuffer.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/HeapDoubleBufferR.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/HeapFloatBuffer.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/HeapFloatBufferR.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/HeapIntBuffer.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/HeapIntBufferR.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/HeapLongBuffer.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/HeapLongBufferR.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/HeapShortBuffer.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/HeapShortBufferR.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/IntBuffer.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/InvalidMarkException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/LongBuffer.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ReadOnlyBufferException.java
+@OPENJDK7@/build/linux-amd64/gensrc/java/nio/ShortBuffer.java
 @OPENJDK6@/build/linux-amd64/gensrc/sun/awt/resources/awt.java
 @OPENJDK6@/build/linux-amd64/gensrc/sun/awt/resources/awt_de.java
 @OPENJDK6@/build/linux-amd64/gensrc/sun/awt/resources/awt_es.java
@@ -475,8 +483,6 @@ sun/security/jgss/wrapper/SunNativeProvider.java
 @OPENJDK6@/build/linux-amd64/gensrc/sun/management/resources/agent_zh_CN.java
 @OPENJDK6@/build/linux-amd64/gensrc/sun/management/resources/agent_zh_HK.java
 @OPENJDK6@/build/linux-amd64/gensrc/sun/management/resources/agent_zh_TW.java
-@OPENJDK6@/build/linux-amd64/gensrc/sun/nio/ch/AlreadyBoundException.java
-@OPENJDK7@/build/linux-amd64/gensrc/sun/nio/ch/SocketOptionRegistry.java
 @OPENJDK7@/build/linux-amd64/gensrc/sun/nio/cs/IBM437.java
 @OPENJDK7@/build/linux-amd64/gensrc/sun/nio/cs/IBM737.java
 @OPENJDK7@/build/linux-amd64/gensrc/sun/nio/cs/IBM775.java
@@ -8898,37 +8904,47 @@ sun/security/jgss/wrapper/SunNativeProvider.java
 @OPENJDK7@/jdk/src/share/classes/java/net/URLEncoder.java
 @OPENJDK7@/jdk/src/share/classes/java/net/URLStreamHandler.java
 @OPENJDK7@/jdk/src/share/classes/java/net/URLStreamHandlerFactory.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/Buffer.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/ByteOrder.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/Buffer.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/ByteOrder.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/AsynchronousByteChannel.java
 @OPENJDK7@/jdk/src/share/classes/java/nio/channels/AsynchronousChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java
 @OPENJDK7@/jdk/src/share/classes/java/nio/channels/AsynchronousFileChannel.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/ByteChannel.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/Channel.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/Channels.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/AsynchronousSocketChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/ByteChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/Channel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/Channels.java
 @OPENJDK7@/jdk/src/share/classes/java/nio/channels/CompletionHandler.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/DatagramChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/CompletionHandler.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/DatagramChannel.java
 @OPENJDK7@/jdk/src/share/classes/java/nio/channels/FileChannel.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/FileLock.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/GatheringByteChannel.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/InterruptibleChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/FileLock.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/GatheringByteChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/InterruptibleChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/MembershipKey.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/MulticastChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/NetworkChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/package-info.java
 @OPENJDK7@/jdk/src/share/classes/java/nio/channels/MembershipKey.java
 @OPENJDK7@/jdk/src/share/classes/java/nio/channels/MulticastChannel.java
 @OPENJDK7@/jdk/src/share/classes/java/nio/channels/NetworkChannel.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/Pipe.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/ReadableByteChannel.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/ScatteringByteChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/Pipe.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/ReadableByteChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/ScatteringByteChannel.java
 @OPENJDK7@/jdk/src/share/classes/java/nio/channels/SeekableByteChannel.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/SelectableChannel.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/SelectionKey.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/Selector.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/ServerSocketChannel.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/SocketChannel.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/spi/AbstractSelectionKey.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/spi/AbstractSelector.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/spi/SelectorProvider.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/channels/WritableByteChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/SelectableChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/SelectionKey.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/Selector.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/ServerSocketChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/SocketChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/spi/AbstractSelectionKey.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/spi/AbstractSelector.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/spi/SelectorProvider.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/channels/WritableByteChannel.java
 @OPENJDK7@/jdk/src/share/classes/java/nio/charset/Charset.java
 @OPENJDK7@/jdk/src/share/classes/java/nio/charset/CoderMalfunctionError.java
 @OPENJDK7@/jdk/src/share/classes/java/nio/charset/CoderResult.java
@@ -9013,8 +9029,8 @@ sun/security/jgss/wrapper/SunNativeProvider.java
 @OPENJDK7@/jdk/src/share/classes/java/nio/file/spi/FileSystemProvider.java
 @OPENJDK7@/jdk/src/share/classes/java/nio/file/spi/FileTypeDetector.java
 @OPENJDK7@/jdk/src/share/classes/java/nio/file/spi/package-info.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/MappedByteBuffer.java
-@OPENJDK6@/jdk/src/share/classes/java/nio/StringCharBuffer.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/MappedByteBuffer.java
+@OPENJDK7@/jdk/src/share/classes/java/nio/StringCharBuffer.java
 @OPENJDK6@/jdk/src/share/classes/java/rmi/AccessException.java
 @OPENJDK6@/jdk/src/share/classes/java/rmi/activation/Activatable.java
 @OPENJDK6@/jdk/src/share/classes/java/rmi/activation/ActivateFailedException.java
@@ -11841,24 +11857,31 @@ sun/security/jgss/wrapper/SunNativeProvider.java
 @OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/mailto/MailToURLConnection.java
 @OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/netdoc/Handler.java
 @OPENJDK7@/jdk/src/share/classes/sun/net/www/URLConnection.java
-@OPENJDK6@/jdk/src/share/classes/sun/nio/ByteBuffered.java
-@OPENJDK6@/jdk/src/share/classes/sun/nio/ch/ChannelInputStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
-@OPENJDK6@/jdk/src/share/classes/sun/nio/ch/DirectBuffer.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ByteBuffered.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/AllocatedNativeObject.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/ChannelInputStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/DirectBuffer.java
 @OPENJDK7@/jdk/src/share/classes/sun/nio/ch/ExtendedSocketOption.java
-@OPENJDK6@/jdk/src/share/classes/sun/nio/ch/FileLockImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/nio/ch/Interruptible.java
-@OPENJDK6@/jdk/src/share/classes/sun/nio/ch/IOStatus.java
-@OPENJDK6@/jdk/src/share/classes/sun/nio/ch/OptionAdaptor.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/FileLockImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/FileLockTable.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/Interruptible.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/IOStatus.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/MembershipKeyImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/MembershipRegistry.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/NativeDispatcher.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/NativeObject.java
 @OPENJDK7@/jdk/src/share/classes/sun/nio/ch/OptionKey.java
-@OPENJDK6@/jdk/src/share/classes/sun/nio/ch/Reflect.java
-@OPENJDK6@/jdk/src/share/classes/sun/nio/ch/SelChImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/nio/ch/SelectorImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/nio/ch/SelectorProviderImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java
-@OPENJDK6@/jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java
-@OPENJDK6@/jdk/src/share/classes/sun/nio/ch/SocketOpts.java
-@OPENJDK6@/jdk/src/share/classes/sun/nio/ch/SocketOptsImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/Reflect.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/SelChImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/SelectorImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/SelectorProviderImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java
+@OPENJDK7@/jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java
 @OPENJDK7@/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java
 @OPENJDK7@/jdk/src/share/classes/sun/nio/cs/ArrayDecoder.java
 @OPENJDK7@/jdk/src/share/classes/sun/nio/cs/ArrayEncoder.java
@@ -13190,10 +13213,11 @@ sun/security/jgss/wrapper/SunNativeProvider.java
 @OPENJDK7@/jdk/src/windows/classes/java/util/prefs/WindowsPreferences.java
 @OPENJDK7@/jdk/src/windows/classes/java/util/prefs/WindowsPreferencesFactory.java
 @OPENJDK7@/jdk/src/windows/classes/sun/net/NetHooks.java
-@OPENJDK6@/jdk/src/windows/classes/sun/nio/ch/NativeThread.java
-@OPENJDK6@/jdk/src/windows/classes/sun/nio/ch/PipeImpl.java
-@OPENJDK6@/jdk/src/windows/classes/sun/nio/ch/SinkChannelImpl.java
-@OPENJDK6@/jdk/src/windows/classes/sun/nio/ch/SourceChannelImpl.java
+@OPENJDK7@/jdk/src/windows/classes/sun/nio/ch/NativeThread.java
+@OPENJDK7@/jdk/src/windows/classes/sun/nio/ch/PipeImpl.java
+@OPENJDK7@/jdk/src/windows/classes/sun/nio/ch/PollArrayWrapper.java
+@OPENJDK7@/jdk/src/windows/classes/sun/nio/ch/SinkChannelImpl.java
+@OPENJDK7@/jdk/src/windows/classes/sun/nio/ch/SourceChannelImpl.java
 @OPENJDK6@/jdk/src/windows/classes/sun/print/Win32MediaTray.java
 @OPENJDK7@/jdk/src/windows/classes/sun/security/krb5/internal/tools/Kinit.java
 @OPENJDK7@/jdk/src/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java