hg: jdk7/tl/jdk: 2 new changesets

[alan.bateman at oracle.com]

Changeset: dc497a55daa1
Author:    alanb
Date:      2011-05-09 18:45 +0100
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/dc497a55daa1

7042979: Rename StandardSocketOption and StandardWatchEventKind
Reviewed-by: forax, chegar

! make/com/sun/nio/sctp/FILES_java.gmk
! make/java/nio/FILES_java.gmk
! src/share/classes/com/sun/nio/sctp/MessageInfo.java
! src/share/classes/com/sun/nio/sctp/SctpChannel.java
! src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java
! src/share/classes/com/sun/nio/sctp/SctpServerChannel.java
! src/share/classes/com/sun/nio/sctp/SctpSocketOption.java
- src/share/classes/com/sun/nio/sctp/SctpStandardSocketOption.java
+ src/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java
! src/share/classes/java/net/SocketOption.java
- src/share/classes/java/net/StandardSocketOption.java
+ src/share/classes/java/net/StandardSocketOptions.java
! src/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
! src/share/classes/java/nio/channels/AsynchronousSocketChannel.java
! src/share/classes/java/nio/channels/DatagramChannel.java
! src/share/classes/java/nio/channels/MulticastChannel.java
! src/share/classes/java/nio/channels/NetworkChannel.java
! src/share/classes/java/nio/channels/ServerSocketChannel.java
! src/share/classes/java/nio/channels/SocketChannel.java
! src/share/classes/java/nio/file/Path.java
- src/share/classes/java/nio/file/StandardWatchEventKind.java
+ src/share/classes/java/nio/file/StandardWatchEventKinds.java
! src/share/classes/java/nio/file/WatchEvent.java
! src/share/classes/java/nio/file/WatchService.java
! src/share/classes/java/nio/file/Watchable.java
! src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
! src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
! src/share/classes/sun/nio/ch/DatagramChannelImpl.java
! src/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
! src/share/classes/sun/nio/ch/ExtendedSocketOption.java
! src/share/classes/sun/nio/ch/Net.java
! src/share/classes/sun/nio/ch/ServerSocketAdaptor.java
! src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
! src/share/classes/sun/nio/ch/SocketAdaptor.java
! src/share/classes/sun/nio/ch/SocketChannelImpl.java
! src/share/classes/sun/nio/fs/AbstractPoller.java
! src/share/classes/sun/nio/fs/AbstractWatchKey.java
! src/share/classes/sun/nio/fs/PollingWatchService.java
! src/share/native/sun/nio/ch/genSocketOptionRegistry.c
! src/share/sample/nio/chatserver/ChatServer.java
! src/share/sample/nio/file/WatchDir.java
! src/share/sample/nio/multicast/Reader.java
! src/share/sample/nio/multicast/Sender.java
! src/solaris/classes/sun/nio/ch/SctpChannelImpl.java
! src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java
! src/solaris/classes/sun/nio/ch/SctpNet.java
! src/solaris/classes/sun/nio/ch/SctpServerChannelImpl.java
! src/solaris/classes/sun/nio/fs/LinuxWatchService.java
! src/solaris/classes/sun/nio/fs/SolarisWatchService.java
! src/windows/classes/sun/nio/fs/WindowsWatchService.java
! test/com/sun/nio/sctp/SctpChannel/SocketOptionTests.java
! test/com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java
! test/java/nio/channels/AsynchronousServerSocketChannel/Basic.java
! test/java/nio/channels/AsynchronousSocketChannel/Basic.java
! test/java/nio/channels/DatagramChannel/BasicMulticastTests.java
! test/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java
! test/java/nio/channels/DatagramChannel/SocketOptionTests.java
! test/java/nio/channels/ServerSocketChannel/SocketOptionTests.java
! test/java/nio/channels/SocketChannel/Shutdown.java
! test/java/nio/channels/SocketChannel/SocketOptionTests.java
! test/java/nio/file/Files/CheckPermissions.java
! test/java/nio/file/WatchService/Basic.java
! test/java/nio/file/WatchService/FileTreeModifier.java
! test/java/nio/file/WatchService/LotsOfEvents.java
! test/java/nio/file/WatchService/SensitivityModifier.java
! test/java/nio/file/WatchService/WithSecurityManager.java

Changeset: dec7961ff53f
Author:    alanb
Date:      2011-05-09 18:53 +0100
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/dec7961ff53f

Merge