/hg/icedtea6: 2 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Fri Jan 6 06:19:58 PST 2012


changeset e1a19f0d4c1f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e1a19f0d4c1f
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jan 06 09:43:52 2012 +0000

	Fix NEWS formatting.

	2012-01-06 Andrew John Hughes <ahughes at redhat.com>

	 * NEWS: Fix formatting.


changeset 9e2ccd629e7b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9e2ccd629e7b
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jan 06 14:17:21 2012 +0000

	Remove outdated NIO2 backport. NIO2 users should use the 2.x
	series.

	2012-01-06 Andrew John Hughes <ahughes at redhat.com>

	 Remove outdated NIO2 backport.
		* overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile,
		* overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile,
		* overlays/nio2/openjdk/jdk/make/mksample/nio/aio/Makefile,
		* overlays/nio2/openjdk/jdk/make/mksample/nio/file/Makefile,
		* overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/Extende
	dCopyOption.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/Extende
	dOpenOption.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/Extende
	dWatchEventModifier.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/io/File.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/io/FilePermission.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/io/Inputs.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/io/Outputs.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/net/ProtocolFamily.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/net/SocketOption.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/net/StandardProtocolFamily.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/net/StandardSocketOption.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/AsynchronousByteChannel.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/AsynchronousChannel.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/AsynchronousChannelGroup.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/AsynchronousDatagramChannel.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/AsynchronousFileChannel.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/AsynchronousServerSocketChannel.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/AsynchronousSocketChannel.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/Channels.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/CompletionHandler.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/DatagramChannel.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/FileChannel.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/FileLock.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/MembershipKey.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/MulticastChannel.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/NetworkChannel.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/SeekableByteChannel.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/exceptions,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/package-info.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/spi/AsynchronousChannelProvider.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/spi/SelectorProvider.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/channels/spi/package.html,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/AccessDeniedException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/AccessMode.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/AtomicMoveNotSupportedException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/ClosedDirectoryStreamException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/ClosedFileSystemException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/ClosedWatchServiceException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/CopyOption.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/DirectoryNotEmptyException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/DirectoryStream.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/DirectoryStreamFilters.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/FileAction.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/FileAlreadyExistsException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/FileRef.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/FileStore.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/FileSystem.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/FileSystemAlreadyExistsException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/FileSystemException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/FileSystemNotFoundException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/FileSystems.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/FileTreeWalker.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/FileVisitOption.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/FileVisitResult.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/FileVisitor.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/Files.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/InvalidPathException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/LinkOption.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/LinkPermission.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/NoSuchFileException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/NotDirectoryException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/NotLinkException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/OpenOption.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/Path.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/PathMatcher.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/Paths.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/ProviderMismatchException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/ProviderNotFoundException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/ReadOnlyFileSystemException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/SecureDirectoryStream.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/SimpleFileVisitor.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/StandardCopyOption.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/StandardOpenOption.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/StandardWatchEventKind.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/WatchEvent.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/WatchKey.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/WatchService.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/Watchable.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/AclEntry.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/AclEntryFlag.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/AclEntryPermission.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/AclEntryType.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/AclFileAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/AttributeView.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/Attributes.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/BasicFileAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/BasicFileAttributes.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/DosFileAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/DosFileAttributes.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/FileAttribute.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/FileAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/FileOwnerAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/FileStoreAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/FileStoreSpaceAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/FileStoreSpaceAttributes.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/GroupPrincipal.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/NamedAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/PosixFileAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/PosixFileAttributes.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/PosixFilePermission.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/PosixFilePermissions.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/UserPrincipal.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/UserPrincipalLookupService.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/UserPrincipalNotFoundException.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/attribute/package-info.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/package-info.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/spi/AbstractPath.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/spi/FileSystemProvider.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/spi/FileTypeDetector.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/nio/file/spi/package-info.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/util/Scanner.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/ja
	va/util/concurrent/ScheduledThreadPoolExecutor.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/mi
	sc/JavaIODeleteOnExitAccess.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/mi
	sc/JavaNetGetIndexAccess.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/mi
	sc/JavaUtilConcurrentThreadPoolExecutorAccess.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/mi
	sc/SharedSecrets.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AbstractFutur
	e.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousC
	hannelGroupImpl.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousF
	ileChannelImpl.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousF
	ileLockImpl.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousS
	erverSocketChannelImpl.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousS
	ocketChannelImpl.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Cancellable.j
	ava,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/CompletedFutu
	re.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ExtendedSocke
	tOption.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/FileLockTable
	.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Groupable.jav
	a,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Invoker.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipKey
	Impl.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipReg
	istry.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/OptionKey.jav
	a,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/PendingFuture
	.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchr
	onousDatagramChannelImpl.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchr
	onousFileChannelImpl.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ThreadPool.ja
	va,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractAclFi
	leAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractBasic
	FileAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileS
	toreSpaceAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileT
	ypeDetector.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractNamed
	AttributeView.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractPolle
	r.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatch
	Key.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatch
	Service.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Cancellable.j
	ava,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/FileOwnerAttr
	ibuteViewImpl.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Globs.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/MimeType.java
	,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffer.
	java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffers
	.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchS
	ervice.java,
		* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Reflect.java,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/META-
	INF/services/java.nio.file.spi.FileSystemProvider,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/README.tx
	t,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n
	io/zipfs/JarEntryInfo.java,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n
	io/zipfs/JarFileAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n
	io/zipfs/JarFileAttributes.java,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n
	io/zipfs/ZipEntryInfo.java,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n
	io/zipfs/ZipFileAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n
	io/zipfs/ZipFileAttributes.java,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n
	io/zipfs/ZipFileBasicAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n
	io/zipfs/ZipFileBasicAttributes.java,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n
	io/zipfs/ZipFilePath.java,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n
	io/zipfs/ZipFileStore.java,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n
	io/zipfs/ZipFileStream.java,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n
	io/zipfs/ZipFileSystem.java,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n
	io/zipfs/ZipFileSystemProvider.java,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n
	io/zipfs/ZipHeaderConstants.java,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n
	io/zipfs/ZipPathParser.java,
		* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/n
	io/zipfs/ZipUtils.java,
		* overlays/nio2/openjdk/jdk/src/share/native/sun/nio/ch/genSocketOptio
	nRegistry.c,
		* overlays/nio2/openjdk/jdk/src/share/sample/nio/aio/EchoServer.java,
		* overlays/nio2/openjdk/jdk/src/share/sample/nio/file/AclEdit.java,
		* overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Chmod.java,
		* overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Copy.java,
		* overlays/nio2/openjdk/jdk/src/share/sample/nio/file/DiskUsage.java,
		* overlays/nio2/openjdk/jdk/src/share/sample/nio/file/FileType.java,
		* overlays/nio2/openjdk/jdk/src/share/sample/nio/file/WatchDir.java,
		* overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Xdd.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultAsyn
	chronousChannelProvider.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/EPollPort.j
	ava,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/LinuxAsynch
	ronousChannelProvider.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/Port.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisAsyn
	chronousChannelProvider.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisEven
	tPort.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchr
	onousServerSocketChannelImpl.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchr
	onousSocketChannelImpl.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFile
	SystemProvider.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFile
	TypeDetector.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/GnomeFileTy
	peDetector.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFil
	eAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSt
	ore.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSy
	stem.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSy
	stemProvider.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedA
	ttributeView.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNative
	Dispatcher.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchS
	ervice.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisAclF
	ileAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFile
	Store.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFile
	System.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFile
	SystemProvider.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisName
	dAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNati
	veDispatcher.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisWatc
	hService.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixChannel
	Factory.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixCopyFil
	e.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixDirecto
	ryStream.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixExcepti
	on.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAtt
	ributeViews.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAtt
	ributes.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileKey
	.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileMod
	eAttribute.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSto
	re.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSto
	reAttributes.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSys
	tem.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSys
	temProvider.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixMountEn
	try.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixNativeD
	ispatcher.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixPath.ja
	va,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixSecureD
	irectoryStream.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUriUtil
	s.java,
		* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUserPri
	ncipals.java,
		* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/EPollPort.c,
		* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/SolarisEvent
	Port.c,
		* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchro
	nousServerSocketChannelImpl.c,
		* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchro
	nousSocketChannelImpl.c,
		* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/GnomeFileTyp
	eDetector.c,
		* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeD
	ispatcher.c,
		* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxWatchSe
	rvice.c,
		* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisNativ
	eDispatcher.c,
		* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisWatch
	Service.c,
		* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixCopyFile
	.c,
		* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDi
	spatcher.c,
		* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genSolarisCo
	nstants.c,
		* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genUnixConst
	ants.c,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultAsyn
	chronousChannelProvider.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/Iocp.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/PendingIoCa
	che.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsyn
	chronousChannelProvider.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsyn
	chronousFileChannelImpl.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsyn
	chronousServerSocketChannelImpl.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsyn
	chronousSocketChannelImpl.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFile
	SystemProvider.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFile
	TypeDetector.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/RegistryFil
	eTypeDetector.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsAclF
	ileAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsChan
	nelFactory.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsCons
	tants.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsDire
	ctoryStream.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsExce
	ption.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile
	AttributeViews.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile
	Attributes.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile
	Copy.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile
	Store.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile
	System.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFile
	SystemProvider.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsLink
	Support.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsName
	dAttributeView.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNati
	veDispatcher.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPath
	.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPath
	Parser.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPath
	Type.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecu
	rity.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecu
	rityDescriptor.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUriS
	upport.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUser
	Principals.java,
		* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsWatc
	hService.java,
		* overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/Iocp.c,
		* overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsync
	hronousFileChannelImpl.c,
		* overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsync
	hronousServerSocketChannelImpl.c,
		* overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsync
	hronousSocketChannelImpl.c,
		* overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/RegistryFile
	TypeDetector.c,
		* overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/WindowsNativ
	eDispatcher.c,
		* overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/Sanity.java,
		* overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/sanity.sh,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/io/Inputs/
	Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousChannelGroup/AsExecutor.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousChannelGroup/Attack.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousChannelGroup/Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousChannelGroup/GroupOfOne.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousChannelGroup/Identity.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousChannelGroup/PrivilegedThreadFactory.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousChannelGroup/Restart.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousChannelGroup/Unbounded.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousChannelGroup/run_any_task.sh,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousDatagramChannel/Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousFileChannel/Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousFileChannel/CustomThreadPool.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousFileChannel/Lock.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousFileChannel/MyThreadFactory.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousServerSocketChannel/Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousServerSocketChannel/WithSecurityManager.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousServerSocketChannel/java.policy.allow,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousServerSocketChannel/java.policy.deny,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousSocketChannel/Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/AsynchronousSocketChannel/Leaky.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/Channels/Basic2.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/spi/AsynchronousChannelProvider/CheckProvider.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/spi/AsynchronousChannelProvider/META-
	INF/services/java.nio.channels.spi.AsynchronousChannelProvider,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/spi/AsynchronousChannelProvider/Provider1.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/spi/AsynchronousChannelProvider/Provider2.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channe
	ls/spi/AsynchronousChannelProvider/custom_provider.sh,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/D
	irectoryStream/Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/D
	irectoryStream/Filters.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/D
	irectoryStream/SecureDS.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F
	ileStore/Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F
	ileSystem/Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F
	iles/ContentType.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F
	iles/CreateFileTree.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F
	iles/ForceLoad.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F
	iles/META-INF/services/java.nio.file.spi.FileTypeDetector,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F
	iles/Misc.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F
	iles/PrintFileTree.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F
	iles/SimpleFileTypeDetector.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F
	iles/SkipSiblings.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F
	iles/TerminateWalk.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F
	iles/content_type.sh,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/F
	iles/walk_file_tree.sh,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P
	ath/CopyAndMove.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P
	ath/DeleteOnClose.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P
	ath/InterruptCopy.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P
	ath/Links.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P
	ath/Misc.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P
	ath/PathOps.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P
	ath/SBC.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P
	ath/TemporaryFiles.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P
	ath/UriImportExport.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P
	ath/delete_on_close.sh,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P
	ath/temporary_files.sh,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/P
	athMatcher/Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/T
	estUtil.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W
	atchService/Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W
	atchService/FileTreeModifier.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W
	atchService/WithSecurityManager.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W
	atchService/denyAll.policy,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W
	atchService/grantDirAndOneLevel.policy,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W
	atchService/grantDirAndTree.policy,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/W
	atchService/grantDirOnly.policy,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a
	ttribute/AclFileAttributeView/Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a
	ttribute/Attributes/Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a
	ttribute/BasicFileAttributeView/Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a
	ttribute/DosFileAttributeView/Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a
	ttribute/FileStoreAttributeView/Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a
	ttribute/NamedAttributeView/Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/a
	ttribute/PosixFileAttributeView/Basic.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/s
	pi/SetDefaultProvider.java,
		* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/s
	pi/TestProvider.java: Removed.
		* patches/nio2.patch: Dropped.
		* Makefile.am: Remove ENABLE_NIO2 conditional blocks from
	overlays, patch and rt.
		* configure.ac: Remove --enable-nio2 option.
		* NEWS: Mention removal.


diffstat:

 ChangeLog                                                                                                                                                                  |   365 +
 Makefile.am                                                                                                                                                                |    12 -
 NEWS                                                                                                                                                                       |    11 +-
 configure.ac                                                                                                                                                               |     8 -
 overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile                                                                                                                         |    37 -
 overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile                                                                                                           |    40 -
 overlays/nio2/openjdk/jdk/make/mksample/nio/aio/Makefile                                                                                                                   |    50 -
 overlays/nio2/openjdk/jdk/make/mksample/nio/file/Makefile                                                                                                                  |    56 -
 overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedCopyOption.java                                                                                       |    43 -
 overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedOpenOption.java                                                                                       |    50 -
 overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java                                                                               |    43 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/File.java                                                                                        |   450 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/FilePermission.java                                                                              |   852 ---
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/Inputs.java                                                                                      |   391 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/Outputs.java                                                                                     |   362 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/ProtocolFamily.java                                                                             |    40 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/SocketOption.java                                                                               |    56 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardProtocolFamily.java                                                                     |    46 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardSocketOption.java                                                                       |   370 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousByteChannel.java                                                           |   206 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousChannel.java                                                               |   118 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup.java                                                          |   317 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel.java                                                       |   707 --
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel.java                                                           |   777 --
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel.java                                                   |   305 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel.java                                                         |   672 --
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/Channels.java                                                                          |   214 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/CompletionHandler.java                                                                 |    78 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/DatagramChannel.java                                                                   |   223 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java                                                                       |   404 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileLock.java                                                                          |   321 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/MembershipKey.java                                                                     |   183 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/MulticastChannel.java                                                                  |   216 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/NetworkChannel.java                                                                    |   165 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/SeekableByteChannel.java                                                               |   170 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/exceptions                                                                             |    68 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/package-info.java                                                                      |   293 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider.java                                                   |   284 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/SelectorProvider.java                                                              |   199 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/package.html                                                                       |    45 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AccessDeniedException.java                                                                 |    69 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AccessMode.java                                                                            |    50 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AtomicMoveNotSupportedException.java                                                       |    57 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedDirectoryStreamException.java                                                        |    46 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedFileSystemException.java                                                             |    44 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedWatchServiceException.java                                                           |    44 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/CopyOption.java                                                                            |    42 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryNotEmptyException.java                                                            |    50 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryStream.java                                                                       |   139 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryStreamFilters.java                                                                |   211 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileAction.java                                                                            |    65 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileAlreadyExistsException.java                                                            |    64 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileRef.java                                                                               |   425 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileStore.java                                                                             |   173 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystem.java                                                                            |   426 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemAlreadyExistsException.java                                                      |    54 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemException.java                                                                   |   126 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemNotFoundException.java                                                           |    53 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystems.java                                                                           |   415 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileTreeWalker.java                                                                        |   247 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitOption.java                                                                       |    46 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitResult.java                                                                       |    63 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitor.java                                                                           |   177 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Files.java                                                                                 |   405 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/InvalidPathException.java                                                                  |   131 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/LinkOption.java                                                                            |    44 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/LinkPermission.java                                                                        |   108 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NoSuchFileException.java                                                                   |    64 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NotDirectoryException.java                                                                 |    50 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NotLinkException.java                                                                      |    64 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/OpenOption.java                                                                            |    46 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Path.java                                                                                  |  1575 -----
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/PathMatcher.java                                                                           |    50 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Paths.java                                                                                 |   126 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ProviderMismatchException.java                                                             |    54 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ProviderNotFoundException.java                                                             |    53 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ReadOnlyFileSystemException.java                                                           |    44 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/SecureDirectoryStream.java                                                                 |   327 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/SimpleFileVisitor.java                                                                     |   123 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardCopyOption.java                                                                    |    48 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardOpenOption.java                                                                    |   126 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardWatchEventKind.java                                                                |    95 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchEvent.java                                                                            |   117 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchKey.java                                                                              |   138 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchService.java                                                                          |   179 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Watchable.java                                                                             |   128 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntry.java                                                                    |   395 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryFlag.java                                                                |    66 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryPermission.java                                                          |   131 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryType.java                                                                |    57 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView.java                                                        |   211 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AttributeView.java                                                               |   119 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/Attributes.java                                                                  |   714 --
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView.java                                                      |   185 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributes.java                                                         |   164 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView.java                                                        |   180 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributes.java                                                           |    85 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileAttribute.java                                                               |    51 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileAttributeView.java                                                           |    44 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileOwnerAttributeView.java                                                      |   102 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView.java                                                      |    39 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreSpaceAttributeView.java                                                 |    94 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreSpaceAttributes.java                                                    |    67 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/GroupPrincipal.java                                                              |    43 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView.java                                                          |   231 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributeView.java                                                      |   196 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributes.java                                                         |    78 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFilePermission.java                                                         |    87 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFilePermissions.java                                                        |   190 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipal.java                                                               |    55 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipalLookupService.java                                                  |   105 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipalNotFoundException.java                                              |    65 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/package-info.java                                                                |   120 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/package-info.java                                                                          |   116 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/AbstractPath.java                                                                      |   542 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/FileSystemProvider.java                                                                |   441 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/FileTypeDetector.java                                                                  |   102 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/package-info.java                                                                      |    39 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/util/Scanner.java                                                                                   |  2657 ---------
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/util/concurrent/ScheduledThreadPoolExecutor.java                                                    |  1371 ----
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaIODeleteOnExitAccess.java                                                                       |    43 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaNetGetIndexAccess.java                                                                          |    46 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaUtilConcurrentThreadPoolExecutorAccess.java                                                     |    58 -
 overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/SharedSecrets.java                                                                                  |   102 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AbstractFuture.java                                                                                                 |    64 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java                                                                                   |   359 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java                                                                                    |   169 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java                                                                                       |    68 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java                                                                            |   222 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java                                                                                  |   546 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Cancellable.java                                                                                                    |    39 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/CompletedFuture.java                                                                                                |   114 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ExtendedSocketOption.java                                                                                           |    44 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/FileLockTable.java                                                                                                  |   287 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Groupable.java                                                                                                      |    35 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Invoker.java                                                                                                        |   274 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipKeyImpl.java                                                                                              |   224 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipRegistry.java                                                                                             |   132 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/OptionKey.java                                                                                                      |    48 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/PendingFuture.java                                                                                                  |   259 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java                                                                          |   425 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java                                                                              |   437 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ThreadPool.java                                                                                                     |   168 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java                                                                                   |   113 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java                                                                                 |   210 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileStoreSpaceAttributeView.java                                                                            |   121 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java                                                                                       |    70 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractNamedAttributeView.java                                                                                     |   125 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java                                                                                                 |   296 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatchKey.java                                                                                               |   179 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatchService.java                                                                                           |   166 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Cancellable.java                                                                                                    |   137 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java                                                                                     |   116 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Globs.java                                                                                                          |   155 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/MimeType.java                                                                                                       |    73 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffer.java                                                                                                   |    87 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffers.java                                                                                                  |   140 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java                                                                                            |   454 -
 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Reflect.java                                                                                                        |    63 -
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/META-INF/services/java.nio.file.spi.FileSystemProvider                                                          |     1 -
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/README.txt                                                                                                      |    29 -
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarEntryInfo.java                                                                             |    44 -
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributeView.java                                                                     |    76 -
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributes.java                                                                        |    57 -
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipEntryInfo.java                                                                             |    76 -
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributeView.java                                                                     |   154 -
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributes.java                                                                        |    93 -
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributeView.java                                                                |   187 -
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributes.java                                                                   |   125 -
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFilePath.java                                                                              |  1027 ---
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStore.java                                                                             |   230 -
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStream.java                                                                            |   166 -
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystem.java                                                                            |   319 -
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystemProvider.java                                                                    |   243 -
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipHeaderConstants.java                                                                       |    75 -
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipPathParser.java                                                                            |   308 -
 overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipUtils.java                                                                                 |   481 -
 overlays/nio2/openjdk/jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c                                                                                            |   129 -
 overlays/nio2/openjdk/jdk/src/share/sample/nio/aio/EchoServer.java                                                                                                         |   165 -
 overlays/nio2/openjdk/jdk/src/share/sample/nio/file/AclEdit.java                                                                                                           |   301 -
 overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Chmod.java                                                                                                             |   363 -
 overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Copy.java                                                                                                              |   227 -
 overlays/nio2/openjdk/jdk/src/share/sample/nio/file/DiskUsage.java                                                                                                         |    78 -
 overlays/nio2/openjdk/jdk/src/share/sample/nio/file/FileType.java                                                                                                          |    62 -
 overlays/nio2/openjdk/jdk/src/share/sample/nio/file/WatchDir.java                                                                                                          |   204 -
 overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Xdd.java                                                                                                               |   119 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java                                                                           |    57 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/EPollPort.java                                                                                                    |   362 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java                                                                             |   100 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/Port.java                                                                                                         |   170 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java                                                                           |   103 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java                                                                                             |   243 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java                                                                      |   320 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java                                                                            |   685 --
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java                                                                                    |    74 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileTypeDetector.java                                                                                      |    36 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java                                                                                        |    99 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java                                                                                    |   300 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java                                                                                               |   102 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java                                                                                              |   186 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java                                                                                      |    41 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedAttributeView.java                                                                                      |   344 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java                                                                                        |   126 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java                                                                                            |   469 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java                                                                                  |   408 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileStore.java                                                                                             |   102 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java                                                                                            |   178 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java                                                                                    |    41 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNamedAttributeView.java                                                                                    |   293 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java                                                                                      |    56 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisWatchService.java                                                                                          |   771 --
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixChannelFactory.java                                                                                           |   289 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixCopyFile.java                                                                                                 |   615 --
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java                                                                                          |   270 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixException.java                                                                                                |   117 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java                                                                                       |   401 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java                                                                                           |   312 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileKey.java                                                                                                  |    60 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileModeAttribute.java                                                                                        |    86 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java                                                                                                |   289 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileStoreAttributes.java                                                                                      |    59 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystem.java                                                                                               |   375 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java                                                                                       |   151 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixMountEntry.java                                                                                               |    82 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java                                                                                         |   556 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java                                                                                                     |  1201 ----
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java                                                                                    |   664 --
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUriUtils.java                                                                                                 |   216 -
 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java                                                                                           |   179 -
 overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/EPollPort.c                                                                                                        |   173 -
 overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/SolarisEventPort.c                                                                                                 |   155 -
 overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.c                                                                          |    47 -
 overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c                                                                                |    53 -
 overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c                                                                                            |   205 -
 overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c                                                                                            |   160 -
 overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c                                                                                                |   156 -
 overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisNativeDispatcher.c                                                                                          |    70 -
 overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisWatchService.c                                                                                              |   141 -
 overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixCopyFile.c                                                                                                     |    85 -
 overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c                                                                                             |  1059 ---
 overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genSolarisConstants.c                                                                                              |   104 -
 overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c                                                                                                 |   129 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java                                                                           |    43 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/Iocp.java                                                                                                         |   435 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/PendingIoCache.java                                                                                               |   161 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java                                                                           |    96 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java                                                                           |   736 --
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java                                                                   |   367 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java                                                                         |   911 ---
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java                                                                                    |    38 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java                                                                                      |    36 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java                                                                                     |    82 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java                                                                                  |   226 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsChannelFactory.java                                                                                        |   348 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java                                                                                             |   191 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java                                                                                       |   225 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsException.java                                                                                             |   109 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java                                                                                    |   296 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributes.java                                                                                        |   296 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileCopy.java                                                                                              |   527 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileStore.java                                                                                             |   324 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java                                                                                            |   318 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java                                                                                    |   148 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsLinkSupport.java                                                                                           |   466 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNamedAttributeView.java                                                                                    |   342 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java                                                                                      |  1131 ----
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java                                                                                                  |  1312 ----
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPathParser.java                                                                                            |   225 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPathType.java                                                                                              |    38 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecurity.java                                                                                              |   123 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java                                                                                    |   392 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUriSupport.java                                                                                            |   167 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUserPrincipals.java                                                                                        |   169 -
 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsWatchService.java                                                                                          |   581 --
 overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/Iocp.c                                                                                                             |   144 -
 overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousFileChannelImpl.c                                                                               |   132 -
 overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.c                                                                       |   142 -
 overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c                                                                             |   222 -
 overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/RegistryFileTypeDetector.c                                                                                         |    62 -
 overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c                                                                                          |  1328 ----
 overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/Sanity.java                                                                                                          |   168 -
 overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/sanity.sh                                                                                                            |    71 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/io/Inputs/Basic.java                                                                                             |   218 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java                                                            |    84 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Attack.java                                                                |    63 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Basic.java                                                                 |   261 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java                                                            |   137 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Identity.java                                                              |   167 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/PrivilegedThreadFactory.java                                               |    50 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Restart.java                                                               |   134 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Unbounded.java                                                             |   120 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh                                                            |    52 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel/Basic.java                                                              |   377 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Basic.java                                                                  |   585 --
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java                                                       |    67 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Lock.java                                                                   |   340 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/MyThreadFactory.java                                                        |    49 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/Basic.java                                                          |   136 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java                                            |    76 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow                                                   |     3 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny                                                    |     3 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Basic.java                                                                |   805 --
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Leaky.java                                                                |   104 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/Channels/Basic2.java                                                                                |   172 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/CheckProvider.java                                                  |    38 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/META-INF/services/java.nio.channels.spi.AsynchronousChannelProvider |     1 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java                                                      |    62 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java                                                      |    62 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh                                                  |    71 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/Basic.java                                                                              |   153 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/Filters.java                                                                            |   241 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/SecureDS.java                                                                           |   370 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/FileStore/Basic.java                                                                                    |    79 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/FileSystem/Basic.java                                                                                   |    82 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/ContentType.java                                                                                  |    91 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/CreateFileTree.java                                                                               |    96 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/ForceLoad.java                                                                                    |    38 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector                                              |     1 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/Misc.java                                                                                         |   126 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/PrintFileTree.java                                                                                |    78 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/SimpleFileTypeDetector.java                                                                       |    47 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/SkipSiblings.java                                                                                 |    85 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/TerminateWalk.java                                                                                |    70 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/content_type.sh                                                                                   |    70 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/walk_file_tree.sh                                                                                 |    86 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/CopyAndMove.java                                                                                   |   983 ---
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/DeleteOnClose.java                                                                                 |    77 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/InterruptCopy.java                                                                                 |   119 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/Links.java                                                                                         |   143 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/Misc.java                                                                                          |   349 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/PathOps.java                                                                                       |   646 --
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/SBC.java                                                                                           |   468 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/TemporaryFiles.java                                                                                |    76 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/UriImportExport.java                                                                               |    80 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/delete_on_close.sh                                                                                 |    61 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/temporary_files.sh                                                                                 |    65 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/PathMatcher/Basic.java                                                                                  |   163 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/TestUtil.java                                                                                           |   117 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/Basic.java                                                                                 |   493 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/FileTreeModifier.java                                                                      |   148 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/WithSecurityManager.java                                                                   |    83 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/denyAll.policy                                                                             |     3 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirAndOneLevel.policy                                                                 |     5 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirAndTree.policy                                                                     |     5 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirOnly.policy                                                                        |     4 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView/Basic.java                                                               |   166 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/Attributes/Basic.java                                                                         |   254 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView/Basic.java                                                             |   150 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView/Basic.java                                                               |   155 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView/Basic.java                                                             |   170 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView/Basic.java                                                                 |   273 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributeView/Basic.java                                                             |   398 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/spi/SetDefaultProvider.java                                                                             |    44 -
 overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/spi/TestProvider.java                                                                                   |   128 -
 patches/nio2.patch                                                                                                                                                         |  2792 ----------
 355 files changed, 369 insertions(+), 79029 deletions(-)

diffs (truncated from 80889 to 500 lines):

diff -r 72b7e37e64a5 -r 9e2ccd629e7b ChangeLog
--- a/ChangeLog	Fri Jan 06 09:30:37 2012 +0000
+++ b/ChangeLog	Fri Jan 06 14:17:21 2012 +0000
@@ -1,3 +1,368 @@
+2012-01-06  Andrew John Hughes  <ahughes at redhat.com>
+
+	Remove outdated NIO2 backport.
+	* overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile,
+	* overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile,
+	* overlays/nio2/openjdk/jdk/make/mksample/nio/aio/Makefile,
+	* overlays/nio2/openjdk/jdk/make/mksample/nio/file/Makefile,
+	* overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedCopyOption.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedOpenOption.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/File.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/FilePermission.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/Inputs.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/io/Outputs.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/ProtocolFamily.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/SocketOption.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardProtocolFamily.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardSocketOption.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousByteChannel.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousChannel.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/Channels.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/CompletionHandler.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/DatagramChannel.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileLock.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/MembershipKey.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/MulticastChannel.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/NetworkChannel.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/SeekableByteChannel.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/exceptions,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/package-info.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/SelectorProvider.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/spi/package.html,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AccessDeniedException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AccessMode.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/AtomicMoveNotSupportedException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedDirectoryStreamException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedFileSystemException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ClosedWatchServiceException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/CopyOption.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryNotEmptyException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryStream.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/DirectoryStreamFilters.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileAction.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileAlreadyExistsException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileRef.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileStore.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystem.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemAlreadyExistsException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystemNotFoundException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileSystems.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileTreeWalker.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitOption.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitResult.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/FileVisitor.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Files.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/InvalidPathException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/LinkOption.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/LinkPermission.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NoSuchFileException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NotDirectoryException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/NotLinkException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/OpenOption.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Path.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/PathMatcher.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Paths.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ProviderMismatchException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ProviderNotFoundException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/ReadOnlyFileSystemException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/SecureDirectoryStream.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/SimpleFileVisitor.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardCopyOption.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardOpenOption.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/StandardWatchEventKind.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchEvent.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchKey.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/WatchService.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/Watchable.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntry.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryFlag.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryPermission.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclEntryType.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/AttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/Attributes.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributes.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributes.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileAttribute.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileOwnerAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreSpaceAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/FileStoreSpaceAttributes.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/GroupPrincipal.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributes.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFilePermission.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/PosixFilePermissions.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipal.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipalLookupService.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/UserPrincipalNotFoundException.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/attribute/package-info.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/package-info.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/AbstractPath.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/FileSystemProvider.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/FileTypeDetector.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/file/spi/package-info.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/util/Scanner.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/util/concurrent/ScheduledThreadPoolExecutor.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaIODeleteOnExitAccess.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaNetGetIndexAccess.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaUtilConcurrentThreadPoolExecutorAccess.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/SharedSecrets.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AbstractFuture.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Cancellable.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/CompletedFuture.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ExtendedSocketOption.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/FileLockTable.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Groupable.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/Invoker.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipKeyImpl.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/MembershipRegistry.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/OptionKey.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/PendingFuture.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/ThreadPool.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileStoreSpaceAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractNamedAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatchKey.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractWatchService.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Cancellable.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Globs.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/MimeType.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffer.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/NativeBuffers.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java,
+	* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/Reflect.java,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/META-INF/services/java.nio.file.spi.FileSystemProvider,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/README.txt,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarEntryInfo.java,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/JarFileAttributes.java,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipEntryInfo.java,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileAttributes.java,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileBasicAttributes.java,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFilePath.java,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStore.java,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileStream.java,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystem.java,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystemProvider.java,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipHeaderConstants.java,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipPathParser.java,
+	* overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipUtils.java,
+	* overlays/nio2/openjdk/jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c,
+	* overlays/nio2/openjdk/jdk/src/share/sample/nio/aio/EchoServer.java,
+	* overlays/nio2/openjdk/jdk/src/share/sample/nio/file/AclEdit.java,
+	* overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Chmod.java,
+	* overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Copy.java,
+	* overlays/nio2/openjdk/jdk/src/share/sample/nio/file/DiskUsage.java,
+	* overlays/nio2/openjdk/jdk/src/share/sample/nio/file/FileType.java,
+	* overlays/nio2/openjdk/jdk/src/share/sample/nio/file/WatchDir.java,
+	* overlays/nio2/openjdk/jdk/src/share/sample/nio/file/Xdd.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/EPollPort.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/Port.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileTypeDetector.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileStore.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNamedAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisWatchService.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixChannelFactory.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixCopyFile.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixException.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileKey.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileModeAttribute.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileStoreAttributes.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystem.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixMountEntry.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUriUtils.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java,
+	* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/EPollPort.c,
+	* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/SolarisEventPort.c,
+	* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.c,
+	* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c,
+	* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c,
+	* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c,
+	* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c,
+	* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisNativeDispatcher.c,
+	* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/SolarisWatchService.c,
+	* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixCopyFile.c,
+	* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c,
+	* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genSolarisConstants.c,
+	* overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/Iocp.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/PendingIoCache.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsChannelFactory.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsException.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributes.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileCopy.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileStore.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsLinkSupport.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNamedAttributeView.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPathParser.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsPathType.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecurity.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUriSupport.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsUserPrincipals.java,
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsWatchService.java,
+	* overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/Iocp.c,
+	* overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousFileChannelImpl.c,
+	* overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.c,
+	* overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c,
+	* overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/RegistryFileTypeDetector.c,
+	* overlays/nio2/openjdk/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c,
+	* overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/Sanity.java,
+	* overlays/nio2/openjdk/jdk/test/demo/nio/ZipFileSystem/sanity.sh,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/io/Inputs/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Attack.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Identity.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/PrivilegedThreadFactory.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Restart.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/Unbounded.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousDatagramChannel/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/Lock.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousFileChannel/MyThreadFactory.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/AsynchronousSocketChannel/Leaky.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/Channels/Basic2.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/CheckProvider.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/META-INF/services/java.nio.channels.spi.AsynchronousChannelProvider,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/Filters.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/DirectoryStream/SecureDS.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/FileStore/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/FileSystem/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/ContentType.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/CreateFileTree.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/ForceLoad.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/Misc.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/PrintFileTree.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/SimpleFileTypeDetector.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/SkipSiblings.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/TerminateWalk.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/content_type.sh,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Files/walk_file_tree.sh,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/CopyAndMove.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/DeleteOnClose.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/InterruptCopy.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/Links.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/Misc.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/PathOps.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/SBC.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/TemporaryFiles.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/UriImportExport.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/delete_on_close.sh,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/temporary_files.sh,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/PathMatcher/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/TestUtil.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/FileTreeModifier.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/WithSecurityManager.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/denyAll.policy,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirAndOneLevel.policy,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirAndTree.policy,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/WatchService/grantDirOnly.policy,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/AclFileAttributeView/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/Attributes/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/BasicFileAttributeView/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/DosFileAttributeView/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/FileStoreAttributeView/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/PosixFileAttributeView/Basic.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/spi/SetDefaultProvider.java,
+	* overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/spi/TestProvider.java:
+	Removed.
+	* patches/nio2.patch: Dropped.
+	* Makefile.am:
+	Remove ENABLE_NIO2 conditional blocks from
+	overlays, patch and rt.
+	* configure.ac: Remove --enable-nio2 option.
+	* NEWS: Mention removal.
+
+2012-01-06  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS: Fix formatting.
+
 2012-01-06  Andrew John Hughes  <ahughes at redhat.com>
 
 	* NEWS:
diff -r 72b7e37e64a5 -r 9e2ccd629e7b Makefile.am
--- a/Makefile.am	Fri Jan 06 09:30:37 2012 +0000
+++ b/Makefile.am	Fri Jan 06 14:17:21 2012 +0000
@@ -434,10 +434,6 @@
 	patches/openjdk/7018387-xrender_gc_leak.patch
 endif
 
-if ENABLE_NIO2
-ICEDTEA_PATCHES += patches/nio2.patch
-endif
-
 if ENABLE_SYSTEMTAP
 ICEDTEA_PATCHES += patches/systemtap.patch \
 	patches/systemtap-gcc-4.5.patch \
@@ -1205,9 +1201,6 @@
 	cp -a $(abs_top_srcdir)/overlays overlays.build
 	chmod -R ug+rwX overlays.build
 	cp -a overlays.build/openjdk/* openjdk/
-if ENABLE_NIO2
-	cp -a overlays.build/nio2/openjdk/* openjdk/
-endif
 	cp -a overlays.build/jpeg/openjdk/* openjdk/
 	rm -rf overlays.build
 	touch stamps/overlay.stamp
@@ -2266,11 +2259,6 @@
 if BOOTSTRAPPING
 	$(BOOT_DIR)/bin/jar uf $(RUNTIME) -C lib/rt com -C lib/rt java \
 	  -C lib/rt javax -C lib/rt sun 
-if ENABLE_NIO2
-	if [ -e lib/rt/org/classpath ] ; then \
-	    $(BOOT_DIR)/bin/jar uf $(RUNTIME) -C lib/rt org/classpath ; \
-	fi
-endif
 endif
 	touch stamps/rt.stamp
 
diff -r 72b7e37e64a5 -r 9e2ccd629e7b NEWS
--- a/NEWS	Fri Jan 06 09:30:37 2012 +0000
+++ b/NEWS	Fri Jan 06 14:17:21 2012 +0000
@@ -13,6 +13,7 @@
 New in release 1.11 (2011-XX-XX):
 
 * Use HotSpot 20 as the default virtual machine.
+* Drop the outdated NIO2 backport.  Users who want NIO2 should use IcedTea 2.x.
 * Bug fixes
   - PR637: make check should exit with an error code if any regression test failed.
   - PR752: ImageFormatException extends Exception not RuntimeException
@@ -393,14 +394,10 @@
   - ARM: Remove hack for return value in float registers.
   - ARM: Fixed use of uninitialized variable.
   - ARM: removed unused ICMD_GETSTATIC branch.
-  - ARM: Designate function labels as such;
-    required for thumb interworking.
-  - src/vm/javaobjects.cpp (java_lang_reflect_Method::invoke): [OPENJDK] stack
-    index of caller was off by one, causing many apt
-    (Annotation Processing Tool) failures.
+  - ARM: Designate function labels as such; required for thumb interworking.
+  - src/vm/javaobjects.cpp (java_lang_reflect_Method::invoke): stack index of caller was off by one, causing apt failures.
   - Set thread to RUNNABLE during Thread.start.
-  - Removed state-setting function call that would be done by the thread itself,
-    creating a nasty race.
+  - Removed state-setting function call that would be done by the thread itself, creating a nasty race.
   - Threadlist & threadobject improvements.
 * JamVM
   - PR772: jtreg LocalOnlyTest sends SIGQUIT to all processes on exit.
diff -r 72b7e37e64a5 -r 9e2ccd629e7b configure.ac
--- a/configure.ac	Fri Jan 06 09:30:37 2012 +0000
+++ b/configure.ac	Fri Jan 06 14:17:21 2012 +0000
@@ -112,14 +112,6 @@
 AM_CONDITIONAL([ENABLE_XRENDER], [test x$ENABLE_XRENDER = xyes])
 AC_MSG_RESULT(${ENABLE_XRENDER})
 
-AC_MSG_CHECKING([whether to include NIO2 support])
-AC_ARG_ENABLE([nio2],
-	      [AS_HELP_STRING([--enable-nio2],
-	      		      [Enable inclusion of backported NIO2])],
-	      [ENABLE_NIO2="${enableval}"], [ENABLE_NIO2='no'])
-AM_CONDITIONAL([ENABLE_NIO2], [test x$ENABLE_NIO2 = xyes])
-AC_MSG_RESULT(${ENABLE_NIO2})
-
 AC_MSG_CHECKING([whether to include SystemTap tracing support])
 AC_ARG_ENABLE([systemtap],
 	      [AS_HELP_STRING([--enable-systemtap],
diff -r 72b7e37e64a5 -r 9e2ccd629e7b overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile
--- a/overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile	Fri Jan 06 09:30:37 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-# Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Sun designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Sun in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
-#
-
-#
-# Makefile for building the NIO demo(s)
-#
-
-BUILDDIR = ../..
-PRODUCT = demos
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = ZipFileSystem
-
-all build clean clobber::
-	$(SUBDIRS-loop)
diff -r 72b7e37e64a5 -r 9e2ccd629e7b overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile
--- a/overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile	Fri Jan 06 09:30:37 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@



More information about the distro-pkg-dev mailing list