changeset in /hg/icedtea6: Fix remaining Java files and backport...
Andrew John Hughes
gnu_andrew at member.fsf.org
Tue Feb 3 04:13:59 PST 2009
changeset 050b48f42fb3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=050b48f42fb3
description:
Fix remaining Java files and backport Net.c and RESTARTABLE macro.
2009-01-26 Andrew John Hughes <ahughes at redhat.com>
* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java,
* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchService.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/LinuxFileSystem.java,
* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedAttributeView.java,
* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.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:
Fix imports.
* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java:
Fix imports and use of varargs.
* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.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/UnixFileSystem.java,
* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java,
* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java:
Fix imports.
* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java:
Fix imports and use of varargs.
* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java:
Fix imports.
* patches/icedtea-nio2.patch:
(FileChannelImpl): Fix imports.
(Net.c): Patch to new version with new functions.
(nio_util.h): Add RESTARTABLE macro.
diffstat:
22 files changed, 898 insertions(+), 47 deletions(-)
ChangeLog | 75 -
overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java | 1
overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java | 15
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java | 3
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java | 4
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java | 10
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedAttributeView.java | 6
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java | 7
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixChannelFactory.java | 9
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixCopyFile.java | 9
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java | 1
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixException.java | 6
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java | 13
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java | 3
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileModeAttribute.java | 4
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java | 13
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystem.java | 11
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java | 15
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java | 32
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java | 20
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java | 4
patches/icedtea-nio2.patch | 684 ++++++++++
diffs (truncated from 1408 to 500 lines):
diff -r 721c79ccc804 -r 050b48f42fb3 ChangeLog
--- a/ChangeLog Tue Jan 20 09:44:16 2009 +0000
+++ b/ChangeLog Mon Jan 26 23:09:32 2009 +0000
@@ -1,4 +1,36 @@ 2009-01-19 Andrew John Hughes <gnu_and
-2009-01-19 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2009-01-26 Andrew John Hughes <ahughes at redhat.com>
+
+ * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java,
+ * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchService.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/LinuxFileSystem.java,
+ * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedAttributeView.java,
+ * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.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:
+ Fix imports.
+ * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java:
+ Fix imports and use of varargs.
+ * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.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/UnixFileSystem.java,
+ * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java,
+ * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java:
+ Fix imports.
+ * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java:
+ Fix imports and use of varargs.
+ * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java:
+ Fix imports.
+ * patches/icedtea-nio2.patch:
+ (FileChannelImpl): Fix imports.
+ (Net.c): Patch to new version with new functions.
+ (nio_util.h): Add RESTARTABLE macro.
+
+2009-01-19 Andrew John Hughes <ahughes at redhat.com>
* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaNetGetIndexAccess.java:
(getByIndex(int)): New method.
@@ -75,6 +107,7 @@ 2009-01-19 Andrew John Hughes <gnu_and
(FileDispatcher.release0(FileDescriptor, long, long)): Likewise.
2009-01-19 Deepak Bhole <dbhole at redhat.com>
+
* IcedTeaPlugin.cc: Add "Java" in the plugin description string.
* plugin/icedtea/sun/applet/PluginAppletViewer.java: Change the way the
image was searched locally.
@@ -107,7 +140,7 @@ 2009-01-19 Deepak Bhole <dbhole at redhat
* rt/net/sourceforge/jnlp/tools/JarSigner.java: Implement the new
CertVerifier verifier interface.
-2009-01-19 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2009-01-19 Andrew John Hughes <ahughes at redhat.com>
* generated/sun/nio/ch/SocketOptionRegistry.java:
* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/DatagramChannel.java:
@@ -158,7 +191,7 @@ 2009-01-15 Gary Benson <gbenson at redhat
* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp
(StackShadowPages): Increase for 64-bit builds.
-2009-01-14 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2009-01-14 Andrew John Hughes <ahughes at redhat.com>
* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java:
Extend java.nio.channels.FileChannel to minimise code.
@@ -184,13 +217,13 @@ 2009-01-13 Omair Majid <omajid at redhat.
(getVersionedResourceURL): New function. Constructs a URL with a
version-id as the query.
-2009-01-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2009-01-13 Andrew John Hughes <ahughes at redhat.com>
* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaIODeleteOnExitAccess.java,
* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/SharedSecrets.java:
Add missing SharedSecrets files.
-2009-01-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2009-01-13 Andrew John Hughes <ahughes at redhat.com>
* 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:
@@ -231,7 +264,7 @@ 2009-01-13 Andrew John Hughes <gnu_and
Patch ThreadPoolExecutor to allow access to private variables, add missing files to
nio/FILES_java.gmk
-2009-01-12 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2009-01-12 Andrew John Hughes <ahughes at redhat.com>
* 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,
@@ -290,7 +323,7 @@ 2009-01-13 Gary Benson <gbenson at redhat
* contrib/jck/compile-native-code.sh: Build with -m32 or -m64.
-2009-01-12 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2009-01-12 Andrew John Hughes <ahughes at redhat.com>
Initial import of NIO2 code.
* patches/ecj/icedtea-pr261.patch: Moved to general patches.
@@ -750,13 +783,13 @@ 2008-12-19 Andrew Haley <aph at redhat.co
(stamps/extract.stamp): Use AWK here rather than cut.
* hotspot.map: Add md5sum for 14.0b08.
-2008-12-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2008-12-17 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
(FIND_RHINO_JAR): Check for js.jar
in Gentoo install location too.
-2008-12-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2008-12-17 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
No need to check again that SYSTEM_GCJ_DIR exists.
@@ -769,7 +802,7 @@ 2008-12-17 Andrew John Hughes <gnu_and
More --with-x-home options to macros in acinclude.m4.
Remove redundant erroneous use of GCC_OLD.
-2008-12-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2008-12-17 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
Remove use of LIBGCJ_JAR, replacing with
@@ -783,7 +816,7 @@ 2008-12-17 Andrew John Hughes <gnu_and
* javac.in:
Use SYSTEM_GCJ_DIR/jre/lib/rt.jar not LIBGCJ_JAR.
-2008-12-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2008-12-17 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
Remove the HotSpot directory while extracting
@@ -855,7 +888,7 @@ 2008-12-10 Deepak Bhole <dbhole at redhat.
* rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Provide new
cacheable param to JARDesc constructor.
-2008-12-09 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2008-12-09 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
Support use of HGREV.
@@ -864,14 +897,14 @@ 2008-12-09 Andrew John Hughes <gnu_and
* configure.ac:
Call AC_CHECK_WITH_HG_REVISION.
-2008-12-09 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2008-12-09 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
Properly support --with-openjdk-src-dir.
* acinclude.m4:
Correct the define for OPENJDK_SRC_DIR.
-2008-12-09 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2008-12-09 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
Support downloading from the Mercurial repository.
@@ -880,7 +913,7 @@ 2008-12-09 Andrew John Hughes <gnu_and
* configure.ac:
Check for --enable-hg.
-2008-12-09 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2008-12-09 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
Make XRender patch wildcard work where
@@ -888,7 +921,7 @@ 2008-12-09 Andrew John Hughes <gnu_and
* configure.ac:
Capitalise 'XRender' in configure option.
-2008-12-09 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2008-12-09 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
Don't use find to locate the hotspot directory,
@@ -957,7 +990,7 @@ 2008-12-04 Matthias Klose <doko at ubuntu
lost chunks from icedtea-sparc.patch, fix build failure with gcc-4.3.
* Makefile.am (ICEDTEA_PATCHES): Apply new patch.
-2008-12-04 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2008-12-04 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
Prefix the call to uname -m with
@@ -965,7 +998,7 @@ 2008-12-04 Andrew John Hughes <gnu_and
* acinclude.m4:
Apply linux32 on s390 as well.
-2008-12-04 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2008-12-04 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
Prefix make invocations with
@@ -1081,7 +1114,7 @@ 2008-12-02 Omair Majid <omajid at redhat.
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamSampleSpecification.java:
Make class package-private.
-2008-12-03 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2008-12-03 Andrew John Hughes <ahughes at redhat.com>
Create hierarchical patch space.
* patches/icedtea-4486841.patch,
@@ -1263,7 +1296,7 @@ 2008-12-02 Lillian Angel <langel at redha
patches/icedtea-6755943.patch,
patches/icedtea-6766136.patch: New files.
-2008-12-02 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2008-12-02 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-bytecodeInterpreter.patch,
* patches/icedtea-hotspot7-build-fixes.patch:
@@ -1282,7 +1315,7 @@ 2008-12-02 Andrew John Hughes <gnu_and
* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp:
Updated using IcedTea7 versions for 14.0b08.
-2008-12-01 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2008-12-01 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-hotspot-params-cast-size_t.patch,
* patches/icedtea-hotspot-use-idx_t.patch,
diff -r 721c79ccc804 -r 050b48f42fb3 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java
--- a/overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java Tue Jan 20 09:44:16 2009 +0000
+++ b/overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java Mon Jan 26 23:09:32 2009 +0000
@@ -27,6 +27,7 @@ package sun.nio.ch;
package sun.nio.ch;
import java.io.IOException;
+import java.nio.channels.Channel;
import java.nio.channels.ClosedChannelException;
import java.nio.channels.FileChannel;
diff -r 721c79ccc804 -r 050b48f42fb3 overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java
--- a/overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java Tue Jan 20 09:44:16 2009 +0000
+++ b/overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java Mon Jan 26 23:09:32 2009 +0000
@@ -25,14 +25,25 @@
package sun.nio.fs;
-import java.nio.file.*;
-import java.nio.file.attribute.*;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
import java.security.PrivilegedActionException;
import java.io.IOException;
import java.util.*;
+
+import org.classpath.icedtea.java.nio.file.ClosedWatchServiceException;
+import org.classpath.icedtea.java.nio.file.DirectoryStream;
+import org.classpath.icedtea.java.nio.file.FileRef;
+import org.classpath.icedtea.java.nio.file.LinkOption;
+import org.classpath.icedtea.java.nio.file.NotDirectoryException;
+import org.classpath.icedtea.java.nio.file.Path;
+import org.classpath.icedtea.java.nio.file.StandardWatchEventKind;
+import org.classpath.icedtea.java.nio.file.WatchEvent;
+import org.classpath.icedtea.java.nio.file.WatchKey;
+
+import org.classpath.icedtea.java.nio.file.attribute.Attributes;
+import org.classpath.icedtea.java.nio.file.attribute.BasicFileAttributes;
/**
* Simple WatchService implementation that uses background thread to poll
diff -r 721c79ccc804 -r 050b48f42fb3 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java
--- a/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java Tue Jan 20 09:44:16 2009 +0000
+++ b/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java Mon Jan 26 23:09:32 2009 +0000
@@ -25,10 +25,11 @@
package sun.nio.fs;
-import java.nio.file.FileRef;
import java.io.IOException;
import java.security.AccessController;
import java.security.PrivilegedAction;
+
+import org.classpath.icedtea.java.nio.file.FileRef;
/**
* File type detector that uses the GNOME I/O library or the deprecated
diff -r 721c79ccc804 -r 050b48f42fb3 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java
--- a/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java Tue Jan 20 09:44:16 2009 +0000
+++ b/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java Mon Jan 26 23:09:32 2009 +0000
@@ -30,6 +30,8 @@ import java.io.IOException;
import java.io.IOException;
import sun.misc.Unsafe;
+import org.classpath.icedtea.java.nio.file.attribute.BasicFileAttributes;
+import org.classpath.icedtea.java.nio.file.attribute.DosFileAttributes;
import org.classpath.icedtea.java.nio.file.attribute.DosFileAttributeView;
import static sun.nio.fs.UnixNativeDispatcher.*;
@@ -105,7 +107,7 @@ class LinuxDosFileAttributeView
}
- public Map<String,?> readAttributes(String first, String[] rest)
+ public Map<String,?> readAttributes(String first, String... rest)
throws IOException
{
AttributesBuilder builder = AttributesBuilder.create(first, rest);
diff -r 721c79ccc804 -r 050b48f42fb3 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java
--- a/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java Tue Jan 20 09:44:16 2009 +0000
+++ b/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java Mon Jan 26 23:09:32 2009 +0000
@@ -25,13 +25,19 @@
package sun.nio.fs;
-import java.nio.file.*;
-import java.nio.file.attribute.*;
import java.io.IOException;
import java.util.*;
import java.security.AccessController;
import sun.security.action.GetPropertyAction;
import static sun.nio.fs.LinuxNativeDispatcher.*;
+
+import org.classpath.icedtea.java.nio.file.FileStore;
+import org.classpath.icedtea.java.nio.file.LinkOption;
+import org.classpath.icedtea.java.nio.file.WatchService;
+
+import org.classpath.icedtea.java.nio.file.attribute.DosFileAttributeView;
+import org.classpath.icedtea.java.nio.file.attribute.FileAttributeView;
+import org.classpath.icedtea.java.nio.file.attribute.NamedAttributeView;
/**
* Linux implementation of FileSystem
diff -r 721c79ccc804 -r 050b48f42fb3 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedAttributeView.java
--- a/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedAttributeView.java Tue Jan 20 09:44:16 2009 +0000
+++ b/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedAttributeView.java Mon Jan 26 23:09:32 2009 +0000
@@ -25,11 +25,15 @@
package sun.nio.fs;
-import java.nio.file.*;
import java.nio.ByteBuffer;
import java.io.IOException;
import java.util.*;
import sun.misc.Unsafe;
+
+import org.classpath.icedtea.java.nio.channels.AsynchronousFileChannel;
+import org.classpath.icedtea.java.nio.channels.FileChannel;
+
+import org.classpath.icedtea.java.nio.file.FileSystemException;
import static sun.nio.fs.UnixConstants.*;
import static sun.nio.fs.LinuxNativeDispatcher.*;
diff -r 721c79ccc804 -r 050b48f42fb3 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java
--- a/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java Tue Jan 20 09:44:16 2009 +0000
+++ b/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java Mon Jan 26 23:09:32 2009 +0000
@@ -25,12 +25,17 @@
package sun.nio.fs;
-import java.nio.file.*;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.*;
import java.io.IOException;
import sun.misc.Unsafe;
+
+import org.classpath.icedtea.java.nio.file.NotDirectoryException;
+import org.classpath.icedtea.java.nio.file.Path;
+import org.classpath.icedtea.java.nio.file.StandardWatchEventKind;
+import org.classpath.icedtea.java.nio.file.WatchEvent;
+import org.classpath.icedtea.java.nio.file.WatchKey;
import static sun.nio.fs.UnixNativeDispatcher.*;
import static sun.nio.fs.UnixConstants.*;
diff -r 721c79ccc804 -r 050b48f42fb3 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixChannelFactory.java
--- a/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixChannelFactory.java Tue Jan 20 09:44:16 2009 +0000
+++ b/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixChannelFactory.java Mon Jan 26 23:09:32 2009 +0000
@@ -25,8 +25,6 @@
package sun.nio.fs;
-import java.nio.file.*;
-import java.nio.channels.*;
import java.io.FileDescriptor;
import java.util.Set;
@@ -35,6 +33,13 @@ import sun.nio.ch.SimpleAsynchronousFile
import sun.nio.ch.SimpleAsynchronousFileChannelImpl;
import sun.misc.SharedSecrets;
import sun.misc.JavaIOFileDescriptorAccess;
+
+import org.classpath.icedtea.java.nio.channels.AsynchronousFileChannel;
+import org.classpath.icedtea.java.nio.channels.FileChannel;
+
+import org.classpath.icedtea.java.nio.file.LinkOption;
+import org.classpath.icedtea.java.nio.file.OpenOption;
+import org.classpath.icedtea.java.nio.file.StandardOpenOption;
import static sun.nio.fs.UnixNativeDispatcher.*;
import static sun.nio.fs.UnixConstants.*;
diff -r 721c79ccc804 -r 050b48f42fb3 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixCopyFile.java
--- a/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixCopyFile.java Tue Jan 20 09:44:16 2009 +0000
+++ b/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixCopyFile.java Mon Jan 26 23:09:32 2009 +0000
@@ -25,12 +25,19 @@
package sun.nio.fs;
-import java.nio.file.*;
import java.io.IOException;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.concurrent.ExecutionException;
import com.sun.nio.file.ExtendedCopyOption;
+
+import org.classpath.icedtea.java.nio.file.AtomicMoveNotSupportedException;
+import org.classpath.icedtea.java.nio.file.CopyOption;
+import org.classpath.icedtea.java.nio.file.DirectoryNotEmptyException;
+import org.classpath.icedtea.java.nio.file.FileAlreadyExistsException;
+import org.classpath.icedtea.java.nio.file.LinkOption;
+import org.classpath.icedtea.java.nio.file.LinkPermission;
+import org.classpath.icedtea.java.nio.file.StandardCopyOption;
import static sun.nio.fs.UnixNativeDispatcher.*;
import static sun.nio.fs.UnixConstants.*;
diff -r 721c79ccc804 -r 050b48f42fb3 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java
--- a/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java Tue Jan 20 09:44:16 2009 +0000
+++ b/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java Mon Jan 26 23:09:32 2009 +0000
@@ -32,6 +32,7 @@ import java.io.IOException;
import java.io.IOException;
import static sun.nio.fs.UnixNativeDispatcher.*;
+import org.classpath.icedtea.java.nio.file.ClosedDirectoryStreamException;
import org.classpath.icedtea.java.nio.file.DirectoryStream;
import org.classpath.icedtea.java.nio.file.Path;
diff -r 721c79ccc804 -r 050b48f42fb3 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixException.java
--- a/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixException.java Tue Jan 20 09:44:16 2009 +0000
+++ b/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixException.java Mon Jan 26 23:09:32 2009 +0000
@@ -25,8 +25,12 @@
package sun.nio.fs;
-import java.nio.file.*;
import java.io.IOException;
+
+import org.classpath.icedtea.java.nio.file.AccessDeniedException;
+import org.classpath.icedtea.java.nio.file.FileAlreadyExistsException;
+import org.classpath.icedtea.java.nio.file.FileSystemException;
+import org.classpath.icedtea.java.nio.file.NoSuchFileException;
/**
* Internal exception thrown by native methods when error detected.
diff -r 721c79ccc804 -r 050b48f42fb3 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java
--- a/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java Tue Jan 20 09:44:16 2009 +0000
+++ b/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java Mon Jan 26 23:09:32 2009 +0000
@@ -29,7 +29,16 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeUnit;
import java.io.IOException;
+import org.classpath.icedtea.java.nio.file.ProviderMismatchException;
+
+import org.classpath.icedtea.java.nio.file.attribute.BasicFileAttributes;
+import org.classpath.icedtea.java.nio.file.attribute.BasicFileAttributeView;
+import org.classpath.icedtea.java.nio.file.attribute.FileOwnerAttributeView;
+import org.classpath.icedtea.java.nio.file.attribute.GroupPrincipal;
+import org.classpath.icedtea.java.nio.file.attribute.PosixFileAttributes;
import org.classpath.icedtea.java.nio.file.attribute.PosixFileAttributeView;
+import org.classpath.icedtea.java.nio.file.attribute.PosixFilePermission;
+import org.classpath.icedtea.java.nio.file.attribute.UserPrincipal;
import static sun.nio.fs.UnixNativeDispatcher.*;
@@ -199,7 +208,7 @@ class UnixFileAttributeViews {
}
- public Map<String,?> readAttributes(String first, String[] rest)
+ public Map<String,?> readAttributes(String first, String... rest)
throws IOException
{
AttributesBuilder builder = AttributesBuilder.create(first, rest);
@@ -349,7 +358,7 @@ class UnixFileAttributeViews {
}
- public Map<String,?> readAttributes(String first, String[] rest)
+ public Map<String,?> readAttributes(String first, String... rest)
throws IOException
{
AttributesBuilder builder = AttributesBuilder.create(first, rest);
diff -r 721c79ccc804 -r 050b48f42fb3 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java
--- a/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java Tue Jan 20 09:44:16 2009 +0000
+++ b/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java Mon Jan 26 23:09:32 2009 +0000
@@ -31,6 +31,9 @@ import java.util.HashSet;
import org.classpath.icedtea.java.nio.file.attribute.BasicFileAttributes;
import org.classpath.icedtea.java.nio.file.attribute.PosixFileAttributes;
+import org.classpath.icedtea.java.nio.file.attribute.PosixFilePermission;
+import org.classpath.icedtea.java.nio.file.attribute.GroupPrincipal;
+import org.classpath.icedtea.java.nio.file.attribute.UserPrincipal;
/**
* Unix implementation of PosixFileAttributes.
diff -r 721c79ccc804 -r 050b48f42fb3 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileModeAttribute.java
More information about the distro-pkg-dev
mailing list