changeset in /hg/icedtea: * configure.ac (enable-nio2): Removed.
Mark Wielaard
mark at klomp.org
Sun May 31 06:28:44 PDT 2009
changeset e9bd43d303d1 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e9bd43d303d1
description:
* configure.ac (enable-nio2): Removed.
* Makefile.am (ICEDTEA_PATCHES): Remove patches/icedtea-nio2.patch.
(stamps/overlay.stamp): Don't copy overlays/nio2.
* patches/icedtea-nio2.patch: Removed.
* overlays/nio2/*: Removed.
diffstat:
31 files changed, 8 insertions(+), 5213 deletions(-)
ChangeLog | 8
Makefile.am | 7
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/src/share/classes/java/io/Inputs.java | 385 ---
overlays/nio2/openjdk/jdk/src/share/classes/java/io/Outputs.java | 357 ---
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 | 300 --
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/sample/nio/aio/EchoServer.java | 165 -
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/java/io/Inputs/Basic.java | 218 --
patches/icedtea-nio2.patch | 35
diffs (truncated from 5368 to 500 lines):
diff -r d6a26e712b1a -r e9bd43d303d1 ChangeLog
--- a/ChangeLog Fri May 29 17:46:17 2009 +0100
+++ b/ChangeLog Sun May 31 15:29:57 2009 +0200
@@ -1,3 +1,11 @@ 2009-05-27 Andrew John Hughes <ahughes
+2009-05-30 Mark Wielaard <mark at klomp.org>
+
+ * configure.ac (enable-nio2): Removed.
+ * Makefile.am (ICEDTEA_PATCHES): Remove patches/icedtea-nio2.patch.
+ (stamps/overlay.stamp): Don't copy overlays/nio2.
+ * patches/icedtea-nio2.patch: Removed.
+ * overlays/nio2/*: Removed.
+
2009-05-27 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r d6a26e712b1a -r e9bd43d303d1 Makefile.am
--- a/Makefile.am Fri May 29 17:46:17 2009 +0100
+++ b/Makefile.am Sun May 31 15:29:57 2009 +0200
@@ -2113,10 +2113,6 @@ ICEDTEA_PATCHES += \
patches/icedtea-javafiles.patch
endif
-if ENABLE_NIO2
-ICEDTEA_PATCHES += patches/icedtea-nio2.patch
-endif
-
if ENABLE_SYSTEMTAP
ICEDTEA_PATCHES += patches/icedtea-systemtap.patch
endif
@@ -2436,9 +2432,6 @@ stamps/overlay.stamp: stamps/patch.stamp
sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \
openjdk/jdk/make/common/shared/Defs.gmk; \
cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/
-if ENABLE_NIO2
- cp -r $(abs_top_srcdir)/overlays/nio2/openjdk/* openjdk/
-endif
chmod -R ug+w openjdk
touch stamps/overlay.stamp
diff -r d6a26e712b1a -r e9bd43d303d1 configure.ac
--- a/configure.ac Fri May 29 17:46:17 2009 +0100
+++ b/configure.ac Sun May 31 15:29:57 2009 +0200
@@ -194,14 +194,6 @@ AC_ARG_ENABLE([xrender],
[ENABLE_XRENDER="${enableval}"], [ENABLE_XRENDER='yes'])
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([--disable-nio2],
- [Disable inclusion of backported NIO2])],
- [ENABLE_NIO2="${enableval}"], [ENABLE_NIO2='yes'])
-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],
diff -r d6a26e712b1a -r e9bd43d303d1 overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile
--- a/overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile Fri May 29 17:46:17 2009 +0100
+++ /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 d6a26e712b1a -r e9bd43d303d1 overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile
--- a/overlays/nio2/openjdk/jdk/make/mkdemo/nio/ZipFileSystem/Makefile Fri May 29 17:46:17 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +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.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/nio
-DEMONAME = ZipFileSystem
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/nio/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_MAINCLASS = $(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/nio/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff -r d6a26e712b1a -r e9bd43d303d1 overlays/nio2/openjdk/jdk/make/mksample/nio/aio/Makefile
--- a/overlays/nio2/openjdk/jdk/make/mksample/nio/aio/Makefile Fri May 29 17:46:17 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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 the nio/aio sample code
-#
-
-BUILDDIR = ../../..
-
-PRODUCT = java
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SAMPLE_SRC_DIR = $(SHARE_SRC)/sample/nio/aio
-SAMPLE_DST_DIR = $(SAMPLEDIR)/nio/aio
-
-SAMPLE_FILES = \
- $(SAMPLE_DST_DIR)/EchoServer.java
-
-all build: $(SAMPLE_FILES)
-
-$(SAMPLE_DST_DIR)/%: $(SAMPLE_SRC_DIR)/%
- $(install-file)
-
-clean clobber:
- $(RM) -r $(SAMPLE_DST_DIR)
-
-.PHONY: all build clean clobber
diff -r d6a26e712b1a -r e9bd43d303d1 overlays/nio2/openjdk/jdk/src/share/classes/java/io/Inputs.java
--- a/overlays/nio2/openjdk/jdk/src/share/classes/java/io/Inputs.java Fri May 29 17:46:17 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,385 +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 conne02110-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.
- */
-
-package java.io;
-
-import java.nio.charset.Charset;
-import java.nio.charset.UnsupportedCharsetException;
-import java.nio.file.FileRef;
-import java.nio.file.attribute.Attributes;
-import java.nio.channels.Channels;
-import java.util.Scanner;
-import java.util.Collections;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * {@note experimental}
- * This class consists exclusively of static methods that operate on input
- * sources.
- *
- * <p> The methods to read lines of text defined by this class recognize the
- * following as Unicode line terminators:
- * <ul>
- * <li> <code>\u000D</code> followed by <code>\u000A</code>,
- * CARRIAGE RETURN followed by LINE FEED </li>
- * <li> <code>\u000A</code>, LINE FEED </li>
- * <li> <code>\u000D</code>, CARRIAGE RETURN </li>
- * <li> <code>\u2028</code>, LINE SEPARATOR </li>
- * <li> <code>\u2029</code>, PARAGRAPH SEPARATOR </li>
- * <li> <code>\u0085</code>, NEXT LINE (NEL)</li>
- * </ul>
- *
- * @since 1.7
- */
-
-public final class Inputs {
- private Inputs() { }
-
- // initial buffer size when reading (or writing)
- private static final int INITIAL_BUFFER_SIZE = 8192;
-
- // checks that charset is supported
- private static void ensureCharsetIsSupported(String csn) {
- if (csn == null)
- throw new NullPointerException("'csn' is null");
- if (!Charset.isSupported(csn))
- throw new UnsupportedCharsetException(csn);
- }
-
- /**
- * Closes the given data source by invoking its {@link Closeable#close close}
- * method. If the {@code close} method throws an {@code IOException} then it
- * is silently ignored. If the source is already closed then invoking this
- * method has no effect.
- *
- * <p> This method should not be used to close destinations or output
- * streams that may be buffered. An I/O error may occur when flushing
- * buffered data.
- *
- * @param source
- * The data source
- */
- public static void closeUnchecked(Closeable source) {
- try {
- source.close();
- } catch (IOException ignore) { }
- }
-
- /**
- * Read all bytes from the specified file. When all bytes have been read, or
- * an I/O error occurs, then the file is closed.
- *
- * @param source
- * The data source
- *
- * @return A byte array containing the bytes read from the file
- *
- * @throws IOException
- * If an I/O error occurs
- * @throws OutOfMemoryError
- * If the required array size is too large
- */
- public static byte[] readAllBytes(FileRef source) throws IOException {
- long size = Attributes.readBasicFileAttributes(source).size();
- if (size > (long)Integer.MAX_VALUE)
- throw new OutOfMemoryError("Required array size too large");
- InputStream in = Channels.newInputStream(source.newByteChannel());
- try {
- return implReadAllBytes(in, Math.min((int)size, INITIAL_BUFFER_SIZE));
- } finally {
- in.close();
- }
- }
-
- /**
- * Read all bytes from the specified file. When all bytes have been read, or
- * an I/O error occurs, then the file is closed.
- *
- * @param source
- * The data source
- *
- * @return A byte array containing the bytes read from the file
- *
- * @throws IOException
- * If an I/O error occurs
- * @throws OutOfMemoryError
- * If the required array size is too large
- */
- public static byte[] readAllBytes(File source) throws IOException {
- InputStream in = new FileInputStream(source);
- try {
- return implReadAllBytes(in, INITIAL_BUFFER_SIZE);
- } finally {
- in.close();
- }
- }
-
- /**
- * Read all bytes from the specified input stream.
- *
- * <p> <b>Usage Example:</b>
- * Suppose we want to open a connection to a resource identified by a URI,
- * and read all bytes:
- * <pre>
- * byte[] content;
- * InputStream in = uri.toURL().openStream();
- * try {
- * content = Inputs.readAllBytes(in);
- * } finally {
- * Inputs.closeUnchecked(in);
- * }
- * </pre>
- *
- * <p> On return, the input stream will be at end of stream.
- *
- * @param source
- * The data source
- *
- * @return A byte array containing the bytes read from the source
- *
- * @throws IOException
- * If an I/O error occurs
- * @throws OutOfMemoryError
- * If the required array size is too large
- */
- public static byte[] readAllBytes(InputStream source) throws IOException {
- return implReadAllBytes(source, INITIAL_BUFFER_SIZE);
- }
-
- private static byte[] implReadAllBytes(InputStream source, int initialSize)
- throws IOException
- {
- byte[] buf = new byte[initialSize];
- int nread = 0;
- int rem = buf.length;
- int n;
- while ((n = source.read(buf, nread, rem)) > 0) {
- nread += n;
- rem -= n;
- if (rem <= 0) {
- int newSize = buf.length << 1;
- if (newSize <= buf.length) {
- if (buf.length == Integer.MAX_VALUE)
- throw new OutOfMemoryError("Required array size too large");
- newSize = Integer.MAX_VALUE;
- }
- rem = newSize - buf.length;
- buf = Arrays.copyOf(buf, newSize);
- }
- }
- return (buf.length == nread) ? buf : Arrays.copyOf(buf, nread);
- }
-
- /**
- * Read all lines from the specified file. Bytes from the file are
- * converted into characters using the specified charset. When all lines
- * have been read, or an I/O error occurs, then the file is closed.
- *
- * @param source
- * The data source
- * @param csn
- * The name of the charset to be used
- *
- * @throws java.nio.charset.UnsupportedCharsetException
- * If no support for the named charset is available
- * in this instance of the Java virtual machine
- * @throws java.nio.charset.MalformedInputException
- * If the file contains a byte sequence that is not legal for the
- * charset
- * @throws IOException
- * If an I/O error occurs
- */
- public static List<String> readAllLines(FileRef source, String csn)
- throws IOException
- {
- ensureCharsetIsSupported(csn);
- Scanner s = new Scanner(source, csn);
- try {
- return implReadAllLines(s);
- } finally {
- s.close();
- }
- }
-
- /**
- * Read all lines from the specified file. Bytes from the file are
- * converted into characters using the underlying platform's {@linkplain
- * java.nio.charset.Charset#defaultCharset() default charset}. When all lines
- * have been read, or an I/O error occurs, then the file is closed.
- *
- * @param source
- * The data source
- *
- * @throws java.nio.charset.MalformedInputException
- * If the file contains a byte sequence that is not legal for the
- * default charset
- * @throws IOException
- * If an I/O error occurs
- */
- public static List<String> readAllLines(FileRef source) throws IOException {
- Scanner s = new Scanner(source);
- try {
- return implReadAllLines(s);
- } finally {
- s.close();
- }
- }
-
- /**
- * Read all lines from the specified file. Bytes from the file are
- * converted into characters using the specified charset. When all lines
- * have been read, or an I/O error occurs, then the file is closed.
- *
- * @param source
- * The data source
- * @param csn
- * The name of the charset to be used
- *
- * @throws UnsupportedCharsetException
- * If no support for the named charset is available
- * in this instance of the Java virtual machine
- * @throws java.nio.charset.MalformedInputException
- * If the file contains a byte sequence that is not legal for the
- * charset
- * @throws IOException
- * If an I/O error occurs
- */
- public static List<String> readAllLines(File source, String csn)
- throws IOException
- {
- ensureCharsetIsSupported(csn);
- Scanner s = new Scanner(source, csn);
- try {
- return implReadAllLines(s);
- } finally {
- s.close();
- }
- }
-
- /**
- * Read all lines from the specified file. Bytes from the file are
- * converted into characters using the underlying platform's {@linkplain
- * Charset#defaultCharset() default charset}. When all lines have been read,
- * or an I/O error occurs, then the file is closed.
- *
- * @param source
- * The data source
- * @throws java.nio.charset.MalformedInputException
- * If the file contains a byte sequence that is not legal for the
- * default charset
- * @throws IOException
- * If an I/O error occurs
- */
- public static List<String> readAllLines(File source) throws IOException {
- Scanner s = new Scanner(source);
- try {
- return implReadAllLines(s);
More information about the distro-pkg-dev
mailing list