hg: jdk7/tl/jdk: 2 new changesets
alan.bateman at oracle.com
alan.bateman at oracle.com
Fri Jan 28 12:28:58 UTC 2011
Changeset: 236e3f2d0a6b
Author: alanb
Date: 2011-01-28 09:28 +0000
URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/236e3f2d0a6b
7006126: (fs) Updates to file system API (1/2011)
Reviewed-by: chegar, sherman
! make/java/java/FILES_java.gmk
! make/java/nio/FILES_java.gmk
! make/mkdemo/Makefile
! src/share/classes/java/io/BufferedReader.java
! src/share/classes/java/io/BufferedWriter.java
! src/share/classes/java/io/File.java
! src/share/classes/java/io/FileInputStream.java
! src/share/classes/java/io/FileOutputStream.java
! src/share/classes/java/io/FilePermission.java
! src/share/classes/java/io/SerialCallbackContext.java
- src/share/classes/java/io/TempFileHelper.java
! src/share/classes/java/nio/channels/FileChannel.java
! src/share/classes/java/nio/channels/SeekableByteChannel.java
! src/share/classes/java/nio/file/AccessMode.java
+ src/share/classes/java/nio/file/CopyMoveHelper.java
! src/share/classes/java/nio/file/CopyOption.java
! src/share/classes/java/nio/file/DirectoryStream.java
- src/share/classes/java/nio/file/FileRef.java
! src/share/classes/java/nio/file/FileStore.java
! src/share/classes/java/nio/file/FileSystem.java
! src/share/classes/java/nio/file/FileSystems.java
! src/share/classes/java/nio/file/FileTreeWalker.java
! src/share/classes/java/nio/file/FileVisitor.java
! src/share/classes/java/nio/file/Files.java
! src/share/classes/java/nio/file/LinkOption.java
! src/share/classes/java/nio/file/LinkPermission.java
! src/share/classes/java/nio/file/OpenOption.java
! src/share/classes/java/nio/file/Path.java
! src/share/classes/java/nio/file/PathMatcher.java
! src/share/classes/java/nio/file/Paths.java
! src/share/classes/java/nio/file/SecureDirectoryStream.java
+ src/share/classes/java/nio/file/TempFileHelper.java
! src/share/classes/java/nio/file/WatchEvent.java
! src/share/classes/java/nio/file/WatchKey.java
! src/share/classes/java/nio/file/WatchService.java
! src/share/classes/java/nio/file/attribute/AclEntry.java
! src/share/classes/java/nio/file/attribute/AclFileAttributeView.java
- src/share/classes/java/nio/file/attribute/Attributes.java
! src/share/classes/java/nio/file/attribute/BasicFileAttributeView.java
! src/share/classes/java/nio/file/attribute/BasicFileAttributes.java
! src/share/classes/java/nio/file/attribute/DosFileAttributeView.java
! src/share/classes/java/nio/file/attribute/DosFileAttributes.java
! src/share/classes/java/nio/file/attribute/FileAttribute.java
! src/share/classes/java/nio/file/attribute/FileAttributeView.java
! src/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributeView.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributes.java
! src/share/classes/java/nio/file/attribute/FileTime.java
! src/share/classes/java/nio/file/attribute/PosixFileAttributeView.java
! src/share/classes/java/nio/file/attribute/PosixFileAttributes.java
! src/share/classes/java/nio/file/attribute/PosixFilePermission.java
! src/share/classes/java/nio/file/attribute/PosixFilePermissions.java
! src/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java
! src/share/classes/java/nio/file/attribute/package-info.java
! src/share/classes/java/nio/file/package-info.java
! src/share/classes/java/nio/file/spi/FileSystemProvider.java
! src/share/classes/java/nio/file/spi/FileTypeDetector.java
! src/share/classes/java/util/Scanner.java
! src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java
! src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java
+ src/share/classes/sun/nio/fs/AbstractFileSystemProvider.java
! src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java
! src/share/classes/sun/nio/fs/AbstractPath.java
! src/share/classes/sun/nio/fs/AbstractPoller.java
! src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java
! src/share/classes/sun/nio/fs/AbstractWatchKey.java
! src/share/classes/sun/nio/fs/AbstractWatchService.java
! src/share/classes/sun/nio/fs/DynamicFileAttributeView.java
! src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java
! src/share/classes/sun/nio/fs/PollingWatchService.java
! src/share/classes/sun/security/provider/SeedGenerator.java
! src/share/classes/sun/tools/jar/Main.java
! src/share/sample/nio/file/AclEdit.java
! src/share/sample/nio/file/Chmod.java
! src/share/sample/nio/file/Copy.java
! src/share/sample/nio/file/DiskUsage.java
! src/share/sample/nio/file/FileType.java
! src/share/sample/nio/file/WatchDir.java
! src/share/sample/nio/file/Xdd.java
! src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java
! src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java
! src/solaris/classes/sun/nio/fs/LinuxFileSystem.java
! src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java
! src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java
! src/solaris/classes/sun/nio/fs/LinuxWatchService.java
! src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java
! src/solaris/classes/sun/nio/fs/SolarisFileSystem.java
! src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java
! src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java
! src/solaris/classes/sun/nio/fs/SolarisWatchService.java
! src/solaris/classes/sun/nio/fs/UnixCopyFile.java
! src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java
! src/solaris/classes/sun/nio/fs/UnixFileAttributes.java
! src/solaris/classes/sun/nio/fs/UnixFileStore.java
! src/solaris/classes/sun/nio/fs/UnixFileSystem.java
! src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java
! src/solaris/classes/sun/nio/fs/UnixPath.java
! src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java
! src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java
! src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java
! src/windows/classes/sun/nio/fs/WindowsFileCopy.java
! src/windows/classes/sun/nio/fs/WindowsFileStore.java
! src/windows/classes/sun/nio/fs/WindowsFileSystem.java
! src/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java
! src/windows/classes/sun/nio/fs/WindowsPath.java
! src/windows/classes/sun/nio/fs/WindowsPathParser.java
! src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java
! src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java
! src/windows/classes/sun/nio/fs/WindowsWatchService.java
! test/demo/zipfs/basic.sh
! test/java/io/File/IsHidden.java
! test/java/io/File/SetAccess.java
! test/java/io/File/SymLinks.java
! test/java/io/FileInputStream/LargeFileAvailable.java
! test/java/nio/channels/FileChannel/AtomicAppend.java
! test/java/nio/channels/FileChannel/Transfer.java
! test/java/nio/file/DirectoryStream/Basic.java
! test/java/nio/file/DirectoryStream/DriveLetter.java
! test/java/nio/file/DirectoryStream/SecureDS.java
! test/java/nio/file/FileStore/Basic.java
+ test/java/nio/file/Files/BytesAndLines.java
+ test/java/nio/file/Files/CheckPermissions.java
- test/java/nio/file/Files/ContentType.java
+ test/java/nio/file/Files/CopyAndMove.java
- test/java/nio/file/Files/CreateFileTree.java
+ test/java/nio/file/Files/DeleteOnClose.java
+ test/java/nio/file/Files/FileAttributes.java
- test/java/nio/file/Files/ForceLoad.java
+ test/java/nio/file/Files/InterruptCopy.java
+ test/java/nio/file/Files/Links.java
- test/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector
- test/java/nio/file/Files/MaxDepth.java
! test/java/nio/file/Files/Misc.java
+ test/java/nio/file/Files/PassThroughFileSystem.java
- test/java/nio/file/Files/PrintFileTree.java
+ test/java/nio/file/Files/SBC.java
- test/java/nio/file/Files/SimpleFileTypeDetector.java
- test/java/nio/file/Files/SkipSiblings.java
+ test/java/nio/file/Files/TemporaryFiles.java
- test/java/nio/file/Files/TerminateWalk.java
- test/java/nio/file/Files/WalkWithSecurity.java
+ test/java/nio/file/Files/delete_on_close.sh
- test/java/nio/file/Files/denyAll.policy
- test/java/nio/file/Files/grantAll.policy
- test/java/nio/file/Files/grantTopOnly.policy
+ test/java/nio/file/Files/probeContentType/Basic.java
+ test/java/nio/file/Files/probeContentType/ForceLoad.java
+ test/java/nio/file/Files/probeContentType/META-INF/services/java.nio.file.spi.FileTypeDetector
+ test/java/nio/file/Files/probeContentType/SimpleFileTypeDetector.java
+ test/java/nio/file/Files/walkFileTree/CreateFileTree.java
+ test/java/nio/file/Files/walkFileTree/MaxDepth.java
+ test/java/nio/file/Files/walkFileTree/Nulls.java
+ test/java/nio/file/Files/walkFileTree/PrintFileTree.java
+ test/java/nio/file/Files/walkFileTree/SkipSiblings.java
+ test/java/nio/file/Files/walkFileTree/TerminateWalk.java
+ test/java/nio/file/Files/walkFileTree/WalkWithSecurity.java
+ test/java/nio/file/Files/walkFileTree/denyAll.policy
+ test/java/nio/file/Files/walkFileTree/grantAll.policy
+ test/java/nio/file/Files/walkFileTree/grantTopOnly.policy
+ test/java/nio/file/Files/walkFileTree/walk_file_tree.sh
- test/java/nio/file/Files/walk_file_tree.sh
- test/java/nio/file/Path/CheckPermissions.java
- test/java/nio/file/Path/CopyAndMove.java
- test/java/nio/file/Path/DeleteOnClose.java
- test/java/nio/file/Path/FileAttributes.java
- test/java/nio/file/Path/InterruptCopy.java
- test/java/nio/file/Path/Links.java
! test/java/nio/file/Path/Misc.java
- test/java/nio/file/Path/PassThroughFileSystem.java
! test/java/nio/file/Path/PathOps.java
- test/java/nio/file/Path/SBC.java
- test/java/nio/file/Path/TemporaryFiles.java
- test/java/nio/file/Path/delete_on_close.sh
! test/java/nio/file/TestUtil.java
! test/java/nio/file/WatchService/Basic.java
! test/java/nio/file/WatchService/FileTreeModifier.java
! test/java/nio/file/WatchService/LotsOfEvents.java
! test/java/nio/file/WatchService/SensitivityModifier.java
! test/java/nio/file/attribute/AclFileAttributeView/Basic.java
! test/java/nio/file/attribute/BasicFileAttributeView/Basic.java
! test/java/nio/file/attribute/DosFileAttributeView/Basic.java
- test/java/nio/file/attribute/FileStoreAttributeView/Basic.java
! test/java/nio/file/attribute/FileTime/Basic.java
! test/java/nio/file/attribute/PosixFileAttributeView/Basic.java
! test/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java
! test/java/nio/file/spi/SetDefaultProvider.java
! test/java/nio/file/spi/TestProvider.java
Changeset: 60d347deb54d
Author: alanb
Date: 2011-01-28 09:31 +0000
URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/60d347deb54d
Merge
- src/share/classes/java/io/TempFileHelper.java
- src/share/classes/java/nio/file/FileRef.java
- src/share/classes/java/nio/file/attribute/Attributes.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributeView.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributes.java
! test/demo/zipfs/basic.sh
- test/java/nio/file/Files/ContentType.java
- test/java/nio/file/Files/CreateFileTree.java
- test/java/nio/file/Files/ForceLoad.java
- test/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector
- test/java/nio/file/Files/MaxDepth.java
- test/java/nio/file/Files/PrintFileTree.java
- test/java/nio/file/Files/SimpleFileTypeDetector.java
- test/java/nio/file/Files/SkipSiblings.java
- test/java/nio/file/Files/TerminateWalk.java
- test/java/nio/file/Files/WalkWithSecurity.java
- test/java/nio/file/Files/denyAll.policy
- test/java/nio/file/Files/grantAll.policy
- test/java/nio/file/Files/grantTopOnly.policy
- test/java/nio/file/Files/walk_file_tree.sh
- test/java/nio/file/Path/CheckPermissions.java
- test/java/nio/file/Path/CopyAndMove.java
- test/java/nio/file/Path/DeleteOnClose.java
- test/java/nio/file/Path/FileAttributes.java
- test/java/nio/file/Path/InterruptCopy.java
- test/java/nio/file/Path/Links.java
- test/java/nio/file/Path/PassThroughFileSystem.java
- test/java/nio/file/Path/SBC.java
- test/java/nio/file/Path/TemporaryFiles.java
- test/java/nio/file/Path/delete_on_close.sh
- test/java/nio/file/attribute/FileStoreAttributeView/Basic.java
More information about the security-dev
mailing list