/hg/icedtea6: Use IT_JAVACFLAGS and don't hardcode source/target...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Mar 29 18:48:13 PDT 2010
changeset 433756a5db2c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=433756a5db2c
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Mar 30 02:47:58 2010 +0100
Use IT_JAVACFLAGS and don't hardcode source/target options in javac
script. Move to Perl javac.in, as in IcedTea7.
2010-03-29 Andrew John Hughes <ahughes at redhat.com>
* .hgignore: Use a regular expression to match
openjdk to avoid matching patches/openjdk.
* Makefile.am: (NETX_BOOTSTRAP_CLASSES): Classes required to
bootstrap NetX (only partial so far).
(ICEDTEA_BOOTSTRAP_CLASSES): Include NETX_BOOTSTRAP_CLASSES.
(IT_LANGUAGE_SOURCE_VERSION): Source version to compile as.
(IT_CLASS_TARGET_VERSION): Class file version to target.
(IT_JAVACFLAGS): Add above flags to javac compilation.
(ICEDTEA_PATCHES): Add 6873059 source/target fixes from OpenJDK7.
(liveconnect.stamp): Use ICEDTEA_RT on classpath instead of system
rt.jar and lib/rt. (netx.stamp): Likewise. (extra-
class-files.stamp): Use ICEDTEA_RT as bootclasspath. Use
standard IT_JAVACFLAGS options. (pulse-java-jar.stamp):
Remove unneeded conditional. (pulse-java-class.stamp): Use
IT_JAVACFLAGS and ICEDTEA_RT on bootclasspath.
(rewriter.stamp): Use IT_JAVACFLAGS. (plugin-tests.stamp):
Likewise. (jtreg.stamp): Likewise. (rt-class-
files.stamp): Likewise. (rt.stamp): Include org.classpath
classes in rt.jar if NIO2 is enabled.
* generated/org/classpath/icedtea/java/nio/channels/AcceptPendingExcep
tion.java,
* generated/org/classpath/icedtea/java/nio/channels/IllegalChannelGrou
pException.java,
* generated/org/classpath/icedtea/java/nio/channels/InterruptedByTimeo
utException.java,
* generated/org/classpath/icedtea/java/nio/channels/ReadPendingExcepti
on.java,
* generated/org/classpath/icedtea/java/nio/channels/ShutdownChannelGro
upException.java,
* generated/org/classpath/icedtea/java/nio/channels/WritePendingExcept
ion.java,
* generated/sun/nio/fs/UnixConstants.java: Add generated files
needed for NIO2.
* javac.in: Move to OpenJDK7 Perl version so that flag duplication
avoidance works correctly.
* patches/ecj/icedtea-hotspot.patch: Regenerated.
* patches/openjdk/6873059-javac-versioning-corba.patch,
* patches/openjdk/6873059-javac-versioning-hotspot.patch,
* patches/openjdk/6873059-javac-versioning-jdk.patch:
Backported from OpenJDK7.
* THANKYOU: Add C. K. Jester-Young who created the initial
Perl version of javac.in.
diffstat:
16 files changed, 834 insertions(+), 75 deletions(-)
.hgignore | 10
ChangeLog | 66 ++
Makefile.am | 66 +-
THANKYOU | 1
generated/org/classpath/icedtea/java/nio/channels/AcceptPendingException.java | 51 ++
generated/org/classpath/icedtea/java/nio/channels/IllegalChannelGroupException.java | 51 ++
generated/org/classpath/icedtea/java/nio/channels/InterruptedByTimeoutException.java | 51 ++
generated/org/classpath/icedtea/java/nio/channels/ReadPendingException.java | 51 ++
generated/org/classpath/icedtea/java/nio/channels/ShutdownChannelGroupException.java | 52 ++
generated/org/classpath/icedtea/java/nio/channels/WritePendingException.java | 51 ++
generated/sun/nio/fs/UnixConstants.java | 79 +++
javac.in | 79 +--
patches/ecj/icedtea-hotspot.patch | 18
patches/openjdk/6873059-javac-versioning-corba.patch | 23
patches/openjdk/6873059-javac-versioning-hotspot.patch | 245 ++++++++++
patches/openjdk/6873059-javac-versioning-jdk.patch | 15
diffs (truncated from 1122 to 500 lines):
diff -r 7284d32445e4 -r 433756a5db2c .hgignore
--- a/.hgignore Mon Mar 29 13:29:04 2010 +0100
+++ b/.hgignore Tue Mar 30 02:47:58 2010 +0100
@@ -7,7 +7,6 @@ cacao
cacao
netbeans
visualvm
-openjdk
bootstrap
debian
lib
@@ -38,13 +37,16 @@ test/jtreg.jar
test/jtreg.jar
test/jtreg/classes
test/jtreg-summary.log
-test/check-.*log
+test/check-*.log
generated/sun/awt/X11/generator/sizer.32.orig
pulseaudio/bin
-pulseaudio/.*\.o
+pulseaudio/*.o
pulseaudio/src/native/org_.*.h
-pulseaudio/.*jar
+pulseaudio/*.jar
pulse-java.jar
hotspot.tar.gz
ports/hotspot/src/cpu/zero/vm/bytecodes_arm.s
plugin/tests/LiveConnect/*jar
+
+syntax: regexp
+^openjdk
diff -r 7284d32445e4 -r 433756a5db2c ChangeLog
--- a/ChangeLog Mon Mar 29 13:29:04 2010 +0100
+++ b/ChangeLog Tue Mar 30 02:47:58 2010 +0100
@@ -1,3 +1,69 @@ 2010-03-25 Matthias Klose <doko at ubuntu
+2010-03-29 Andrew John Hughes <ahughes at redhat.com>
+
+ * .hgignore:
+ Use a regular expression to match openjdk
+ to avoid matching patches/openjdk.
+ * Makefile.am:
+ (NETX_BOOTSTRAP_CLASSES): Classes required to
+ bootstrap NetX (only partial so far).
+ (ICEDTEA_BOOTSTRAP_CLASSES): Include
+ NETX_BOOTSTRAP_CLASSES.
+ (IT_LANGUAGE_SOURCE_VERSION): Source version to compile as.
+ (IT_CLASS_TARGET_VERSION): Class file version to target.
+ (IT_JAVACFLAGS): Add above flags to javac compilation.
+ (ICEDTEA_PATCHES): Add 6873059 source/target fixes from OpenJDK7.
+ (liveconnect.stamp): Use ICEDTEA_RT on classpath instead of system rt.jar and lib/rt.
+ (netx.stamp): Likewise.
+ (extra-class-files.stamp): Use ICEDTEA_RT as bootclasspath.
+ Use standard IT_JAVACFLAGS options.
+ (pulse-java-jar.stamp): Remove unneeded conditional.
+ (pulse-java-class.stamp): Use IT_JAVACFLAGS and ICEDTEA_RT on bootclasspath.
+ (rewriter.stamp): Use IT_JAVACFLAGS.
+ (plugin-tests.stamp): Likewise.
+ (jtreg.stamp): Likewise.
+ (rt-class-files.stamp): Likewise.
+ (rt.stamp): Include org.classpath classes in rt.jar if NIO2 is enabled.
+ * generated/org/classpath/icedtea/java/nio/channels/AcceptPendingException.java,
+ * generated/org/classpath/icedtea/java/nio/channels/IllegalChannelGroupException.java,
+ * generated/org/classpath/icedtea/java/nio/channels/InterruptedByTimeoutException.java,
+ * generated/org/classpath/icedtea/java/nio/channels/ReadPendingException.java,
+ * generated/org/classpath/icedtea/java/nio/channels/ShutdownChannelGroupException.java,
+ * generated/org/classpath/icedtea/java/nio/channels/WritePendingException.java,
+ * generated/sun/nio/fs/UnixConstants.java:
+ Add generated files needed for NIO2.
+ * javac.in: Move to OpenJDK7 Perl version so that flag duplication avoidance
+ works correctly.
+ * patches/ecj/icedtea-hotspot.patch: Regenerated.
+ * patches/openjdk/6873059-javac-versioning-corba.patch,
+ * patches/openjdk/6873059-javac-versioning-hotspot.patch,
+ * patches/openjdk/6873059-javac-versioning-jdk.patch:
+ Backported from OpenJDK7.
+ * THANKYOU: Add C. K. Jester-Young who created
+ the initial Perl version of javac.in.
+
+2009-08-21 Andrew John Hughes <ahughes at redhat.com>
+
+ * javac.in:
+ Remove 1.7 setting. Add ecj_parms so same
+ parameters are used for all ecj invocations.
+
+2009-07-21 Andrew John Hughes <ahughes at redhat.com>
+
+ * javac.in:
+ Move ecj opt generation to a subroutine so it is only
+ performed when needed.
+
+2008-11-10 Andrew John Hughes <ahughes at redhat.com>
+
+ * javac.in:
+ Update with native ecj changes.
+
+2008-09-18 C. K. Jester-Young <cky944 at gmail.com>
+
+ * javac.in:
+ Convert to Perl script to avoid
+ quoting errors.
+
2010-03-25 Matthias Klose <doko at ubuntu.com>
* configure.ac: Bump version to 1.9pre.
diff -r 7284d32445e4 -r 433756a5db2c Makefile.am
--- a/Makefile.am Mon Mar 29 13:29:04 2010 +0100
+++ b/Makefile.am Tue Mar 30 02:47:58 2010 +0100
@@ -88,18 +88,29 @@ ICEDTEA_BOOTSTRAP_DIRS = \
$(LANGTOOLS)/com/sun/mirror \
$(LANGTOOLS)/com/sun/tools/apt
+# PR43578 - java.security.CodeSource.getCodeSigners() missing
+# PR43582 - Missing javax.swing.JTable.setFillsViewportHeight
+# PR43585 - java.security.KeyStore.TrustedCertificateEntry class missing
+NETX_BOOTSTRAP_CLASSES = \
+ $(SHARE)/java/security/CodeSource.java \
+ $(SHARE)/javax/swing/JTable.java \
+ $(SHARE)/java/security/KeyStore.java
+
# PR42003 - javax.swing.plaf.basic.BasicDirectoryModel
# PR43389 - javax.management.StandardMBean
ICEDTEA_BOOTSTRAP_CLASSES = \
$(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java \
- $(SHARE)/javax/management/StandardMBean.java
+ $(SHARE)/javax/management/StandardMBean.java \
+ $(NETX_BOOTSTRAP_CLASSES)
# FIXME (javac): Settings for javac go here
# Flags
IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
-IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS)
+IT_LANGUAGE_SOURCE_VERSION=6
+IT_CLASS_TARGET_VERSION=6
+IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
# Conditional defintions
@@ -299,7 +310,10 @@ ICEDTEA_PATCHES = \
patches/extensions/netx.patch \
patches/extensions/netx-dist.patch \
patches/extensions/netx-umask.patch \
- patches/icedtea-jtreg-httpTest.patch
+ patches/icedtea-jtreg-httpTest.patch \
+ patches/openjdk/6873059-javac-versioning-corba.patch \
+ patches/openjdk/6873059-javac-versioning-hotspot.patch \
+ patches/openjdk/6873059-javac-versioning-jdk.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -379,7 +393,6 @@ ICEDTEA_ECJ_PATCHES = patches/ecj/icedte
patches/ecj/bootver.patch \
patches/ecj/getannotation-cast.patch \
patches/ecj/override.patch
-
if DTDTYPE_QNAME
ICEDTEA_ECJ_PATCHES += \
patches/ecj/icedtea-jaxws-getdtdtype.patch
@@ -1546,7 +1559,7 @@ stamps/liveconnect.stamp: liveconnect-so
mkdir -p $(abs_top_builddir)/liveconnect && \
$(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(abs_top_builddir)/liveconnect \
- -classpath $(abs_top_builddir)/lib/rt:$(abs_top_builddir)/netx.build:$(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
+ -classpath $(abs_top_builddir)/netx.build:$(ICEDTEA_RT) \
-sourcepath $(SOURCEPATH_DIRS) \
-bootclasspath \'\' \
@liveconnect-source-files.txt ; \
@@ -1584,9 +1597,8 @@ stamps/netx.stamp: netx-source-files.txt
mkdir -p $(abs_top_builddir)/netx.build
$(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(abs_top_builddir)/netx.build \
- -classpath $(abs_top_builddir)/lib/rt:$(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
-sourcepath $(NETX_SRCDIR):$(SOURCEPATH_DIRS) \
- -bootclasspath \'\' \
+ -classpath $(ICEDTEA_RT) -bootclasspath \'\' \
@netx-source-files.txt
cp -r $(NETX_RESOURCE_DIR) $(abs_top_builddir)/netx.build/net/sourceforge/jnlp
mkdir -p stamps
@@ -1618,10 +1630,9 @@ stamps/extra-class-files.stamp: $(INITIA
stamps/extra-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) \
extra-source-files.txt stamps/netx.stamp
mkdir -p extra-lib
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
- -source 1.5 \
- -sourcepath extra -cp netx.build:$(ICEDTEA_RT) \
- -bootclasspath \'\' @extra-source-files.txt
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d extra-lib \
+ -sourcepath extra -cp netx.build \
+ -bootclasspath $(ICEDTEA_RT) @extra-source-files.txt
cp -r $(NETX_EXTRA_DIR) extra-lib/net/sourceforge/jnlp/about
mkdir -p stamps
touch $@
@@ -1659,20 +1670,15 @@ stamps/pulse-java.stamp: stamps/pulse-ja
stamps/pulse-java-jar.stamp: stamps/pulse-java-class.stamp
mkdir -p $(PULSE_JAVA_CLASS_DIR);
- if ! test -d $(ICEDTEA_BOOT_DIR) ; \
- then \
- $(JAR) cf pulse-java.jar -C $(PULSE_JAVA_CLASS_DIR) .; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf pulse-java.jar -C $(PULSE_JAVA_CLASS_DIR) .; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf pulse-java.jar -C $(PULSE_JAVA_CLASS_DIR) .;
mkdir -p stamps
touch stamps/pulse-java-jar.stamp
stamps/pulse-java-class.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
mkdir -p $(PULSE_JAVA_CLASS_DIR)
(cd $(PULSE_JAVA_JAVA_SRCDIR); \
- $(ICEDTEA_BOOT_DIR)/bin/javac -g -d $(PULSE_JAVA_CLASS_DIR) \
- -bootclasspath '$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar' \
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d $(PULSE_JAVA_CLASS_DIR) \
+ -bootclasspath $(ICEDTEA_RT) \
org/classpath/icedtea/pulseaudio/*.java \
)
cp -r $(PULSE_JAVA_JAVA_SRCDIR)/META-INF $(PULSE_JAVA_CLASS_DIR)
@@ -1710,7 +1716,7 @@ if WITH_RHINO
if WITH_RHINO
mkdir -p $(abs_top_builddir)/rewriter
(cd $(abs_top_srcdir)/rewriter ; \
- $(ICEDTEA_BOOT_DIR)/bin/javac -g \
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(abs_top_builddir)/rewriter $(REWRITER_SRCS) \
)
endif
@@ -1953,10 +1959,10 @@ stamps/plugin-tests.stamp: $(INITIAL_BOO
stamps/plugin-tests.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) $(PLUGIN_TEST_SRCS) \
stamps/plugin.stamp
mkdir -p plugin/tests/LiveConnect
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d plugin/tests/LiveConnect \
-classpath liveconnect/lib/classes.jar \
- -source 1.5 $(PLUGIN_TEST_SRCS) ;
+ $(PLUGIN_TEST_SRCS) ;
$(ICEDTEA_BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
plugin/tests/LiveConnect/*.class ;
cp -a $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} plugin/tests/LiveConnect ;
@@ -1970,7 +1976,7 @@ stamps/jtreg.stamp: stamps/icedtea-again
stamps/jtreg.stamp: stamps/icedtea-against-icedtea.stamp
rm -rf test/jtreg/classes
mkdir -p test/jtreg/classes
- $(ICEDTEA_BOOT_DIR)/bin/javac -g -d test/jtreg/classes -source 1.5 \
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d test/jtreg/classes \
-encoding iso-8859-1 `find $(abs_top_srcdir)/test/jtreg/com -name '*.java'`
(cd $(abs_top_srcdir)/test/jtreg; \
$(ICEDTEA_BOOT_DIR)/bin/jar cfm $(abs_top_builddir)/test/jtreg.jar \
@@ -2069,11 +2075,10 @@ rt-source-files.txt: $(OPENJDK_ECJ_TREE)
stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt
mkdir -p lib/rt
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
- -source 1.5 \
- -sourcepath $(SOURCEPATH_DIRS) \
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d lib/rt \
+ -sourcepath $(SOURCEPATH_DIRS) -bootclasspath \'\' \
-classpath $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
- -bootclasspath \'\' @rt-source-files.txt ;
+ @rt-source-files.txt ;
mkdir -p stamps
touch stamps/rt-class-files.stamp
@@ -2089,7 +2094,12 @@ stamps/rt.stamp: stamps/rt-class-files.s
mkdir -p stamps
if LACKS_SUN_AWT_TOOLKIT
$(ICEDTEA_BOOT_DIR)/bin/jar uf $(ICEDTEA_RT) -C lib/rt com -C lib/rt java \
- -C lib/rt javax -C lib/rt sun ;
+ -C lib/rt javax -C lib/rt sun
+if ENABLE_NIO2
+ if [ -e lib/rt/org/classpath ] ; then \
+ $(ICEDTEA_BOOT_DIR)/bin/jar uf $(ICEDTEA_RT) -C lib/rt org/classpath ; \
+ fi
+endif
endif
touch stamps/rt.stamp
diff -r 7284d32445e4 -r 433756a5db2c THANKYOU
--- a/THANKYOU Mon Mar 29 13:29:04 2010 +0100
+++ b/THANKYOU Tue Mar 30 02:47:58 2010 +0100
@@ -5,3 +5,4 @@ us know. Please keep this list in alphab
us know. Please keep this list in alphabetic order.
Alon Bar-Lev (alon.barlev at gmail.com)
+C. K. Jester-Young (cky944 at gmail.com)
diff -r 7284d32445e4 -r 433756a5db2c generated/org/classpath/icedtea/java/nio/channels/AcceptPendingException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/generated/org/classpath/icedtea/java/nio/channels/AcceptPendingException.java Tue Mar 30 02:47:58 2010 +0100
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2000-2007 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.
+ *
+ */
+
+// -- This file was mechanically generated: Do not edit! -- //
+
+package org.classpath.icedtea.java.nio.channels;
+
+
+/**
+ * Unchecked exception thrown when an attempt is made to initiate an accept
+ * operation on a channel and a previous accept operation has not completed.
+ *
+ * @since 1.7
+ */
+
+public class AcceptPendingException
+ extends IllegalStateException
+{
+
+ private static final long serialVersionUID = 2721339977965416421L;
+
+ /**
+ * Constructs an instance of this class.
+ */
+ public AcceptPendingException() { }
+
+}
diff -r 7284d32445e4 -r 433756a5db2c generated/org/classpath/icedtea/java/nio/channels/IllegalChannelGroupException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/generated/org/classpath/icedtea/java/nio/channels/IllegalChannelGroupException.java Tue Mar 30 02:47:58 2010 +0100
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2000-2007 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.
+ *
+ */
+
+// -- This file was mechanically generated: Do not edit! -- //
+
+package org.classpath.icedtea.java.nio.channels;
+
+
+/**
+ * Unchecked exception thrown when an attempt is made to open a channel
+ * in a group that was not created by the same provider.
+ *
+ * @since 1.7
+ */
+
+public class IllegalChannelGroupException
+ extends IllegalArgumentException
+{
+
+ private static final long serialVersionUID = -2495041211157744253L;
+
+ /**
+ * Constructs an instance of this class.
+ */
+ public IllegalChannelGroupException() { }
+
+}
diff -r 7284d32445e4 -r 433756a5db2c generated/org/classpath/icedtea/java/nio/channels/InterruptedByTimeoutException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/generated/org/classpath/icedtea/java/nio/channels/InterruptedByTimeoutException.java Tue Mar 30 02:47:58 2010 +0100
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2000-2007 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.
+ *
+ */
+
+// -- This file was mechanically generated: Do not edit! -- //
+
+package org.classpath.icedtea.java.nio.channels;
+
+
+/**
+ * Checked exception received by a thread when a timeout elapses before an
+ * asynchronous operation completes.
+ *
+ * @since 1.7
+ */
+
+public class InterruptedByTimeoutException
+ extends java.io.IOException
+{
+
+ private static final long serialVersionUID = -4268008601014042947L;
+
+ /**
+ * Constructs an instance of this class.
+ */
+ public InterruptedByTimeoutException() { }
+
+}
diff -r 7284d32445e4 -r 433756a5db2c generated/org/classpath/icedtea/java/nio/channels/ReadPendingException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/generated/org/classpath/icedtea/java/nio/channels/ReadPendingException.java Tue Mar 30 02:47:58 2010 +0100
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2000-2007 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.
+ *
+ */
+
+// -- This file was mechanically generated: Do not edit! -- //
+
+package org.classpath.icedtea.java.nio.channels;
+
+
+/**
+ * Unchecked exception thrown when an attempt is made to read from an
+ * asynchronous socket channel and a previous read has not completed.
+ *
+ * @since 1.7
+ */
+
+public class ReadPendingException
+ extends IllegalStateException
+{
+
+ private static final long serialVersionUID = 1986315242191227217L;
+
+ /**
More information about the distro-pkg-dev
mailing list