hg: jdk7/tl/langtools: 7015482: jtreg test tools/javac/diags/MessageInfo.java fails when test/ dir is not in langtools repo

2011-01-28 Thread jim . holmlund
Changeset: 92ab09ed59fd
Author:jjh
Date:  2011-01-28 00:09 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/92ab09ed59fd

7015482: jtreg test tools/javac/diags/MessageInfo.java fails when test/ dir is 
not in langtools repo
Summary: Don't fail if the needed file isn't present, if running under jtreg.
Reviewed-by: jjg

! test/tools/javac/diags/MessageInfo.java



hg: jdk7/tl/langtools: 3 new changesets

2011-01-28 Thread maurizio . cimadamore
Changeset: 2088e674f0e0
Author:mcimadamore
Date:  2011-01-28 12:01 +
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/2088e674f0e0

6910550: javac 1.5.0_17 fails with incorrect error message
Summary: multiple clashing members declared in same class should be added to 
the class' scope in order to avoid downstream spurious diagnostics
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Flags.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
+ test/tools/javac/generics/6910550/T6910550a.java
+ test/tools/javac/generics/6910550/T6910550a.out
+ test/tools/javac/generics/6910550/T6910550b.java
+ test/tools/javac/generics/6910550/T6910550b.out
+ test/tools/javac/generics/6910550/T6910550c.java
+ test/tools/javac/generics/6910550/T6910550c.out
+ test/tools/javac/generics/6910550/T6910550d.java
+ test/tools/javac/generics/6910550/T6910550d.out
+ test/tools/javac/generics/6910550/T6910550e.java
+ test/tools/javac/generics/6910550/T6910550e.out

Changeset: 5a43b245aed1
Author:mcimadamore
Date:  2011-01-28 12:03 +
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/5a43b245aed1

6313164: javac generates code that fails byte code verification for the varargs 
feature
Summary: method applicability check should fail if formal varargs element type 
is not accessible
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/Infer.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! test/tools/javac/diags/examples.not-yet.txt
+ 
test/tools/javac/diags/examples/InaccessibleVarargsType/InaccessibleVarargsType.java
+ test/tools/javac/diags/examples/InaccessibleVarargsType/p1/A.java
+ test/tools/javac/diags/examples/InaccessibleVarargsType/p1/B.java
! test/tools/javac/generics/inference/6638712/T6638712c.out
! test/tools/javac/generics/inference/6638712/T6638712d.out
+ test/tools/javac/varargs/6313164/T6313164.java
+ test/tools/javac/varargs/6313164/T6313164.out
+ test/tools/javac/varargs/6313164/p1/A.java
+ test/tools/javac/varargs/6313164/p1/B.java
+ test/tools/javac/varargs/6313164/p1/C.java

Changeset: 17bafae67e9d
Author:mcimadamore
Date:  2011-01-28 12:06 +
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/17bafae67e9d

6838943: inference: javac is not handling type-variable substitution properly
Summary: free type-variables are being replaced with type-variables bound to 
forall type leading to unsoundness
Reviewed-by: jjg, dlsmith

! src/share/classes/com/sun/tools/javac/code/Types.java
+ test/tools/javac/generics/inference/6838943/T6838943.java
+ test/tools/javac/generics/inference/6838943/T6838943.out



hg: jdk7/tl/jdk: 2 new changesets

2011-01-28 Thread alan . bateman
Changeset: 236e3f2d0a6b
Author:alanb
Date:  2011-01-28 09:28 +
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
! 

hg: jdk7/tl/langtools: 2 new changesets

2011-01-28 Thread alan . bateman
Changeset: babf86a1ac92
Author:alanb
Date:  2011-01-28 09:25 +
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/babf86a1ac92

7006126: (fs) Updates to file system API (1/2011)
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
! src/share/classes/com/sun/tools/javac/nio/PathFileObject.java
! test/tools/javac/nio/compileTest/CompileTest.java

Changeset: df3394337b04
Author:alanb
Date:  2011-01-28 12:36 +
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/df3394337b04

Merge




hg: jdk7/tl/jdk: 7015410: test/java/net/Socks/SocksProxyVersion.java needs to be updated due to 7013420

2011-01-28 Thread alan . bateman
Changeset: dea360853f8b
Author:alanb
Date:  2011-01-28 13:26 +
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/dea360853f8b

7015410: test/java/net/Socks/SocksProxyVersion.java needs to be updated due to 
7013420
Reviewed-by: chegar

! test/java/net/Socks/SocksProxyVersion.java



hg: jdk7/tl/jdk: 7015156: Remove JSR 308 changes from core libraries

2011-01-28 Thread joe . darcy
Changeset: d21a1ce074a7
Author:darcy
Date:  2011-01-28 17:09 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/d21a1ce074a7

7015156: Remove JSR 308 changes from core libraries
Reviewed-by: mduigou

! src/share/classes/java/lang/SuppressWarnings.java
! src/share/classes/java/lang/annotation/ElementType.java