aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2002-09-13 09:02:23 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2002-09-13 09:02:23 +0000
commit8764acde96192cbe2a6a720dd94afdfcfb82ec5b (patch)
treedae5e5e6b7dc8d9e9cdb6218cc9c40b948ab574f
parenta1edfd70e859d582a1fcec38bc34c91fdd078d31 (diff)
downloadgcc-8764acde96192cbe2a6a720dd94afdfcfb82ec5b.zip
gcc-8764acde96192cbe2a6a720dd94afdfcfb82ec5b.tar.gz
gcc-8764acde96192cbe2a6a720dd94afdfcfb82ec5b.tar.bz2
DatagramChannel.java, [...]: New dummy files to make java.net fully JDK 1.4 compatible
2002-09-13 Michael Koch <konqueror@gmx.de> * java/nio/channels/DatagramChannel.java, java/nio/channels/ServerSocketChannel.java java/nio/channels/SocketChannel.java: New dummy files to make java.net fully JDK 1.4 compatible * Makefile.am (ordinary_java_source_files): Added java/net/DatagramSocketImplFactory.java (long forgotten), java/nio/SocketChannel.java, java/nio/ServerSocketChannel.java, java/nio/DatagramChannel.java * Makefile.in: Regenrated. From-SVN: r57101
-rw-r--r--libjava/ChangeLog15
-rw-r--r--libjava/Makefile.am4
-rw-r--r--libjava/Makefile.in17
-rw-r--r--libjava/java/nio/channels/DatagramChannel.java44
-rw-r--r--libjava/java/nio/channels/ServerSocketChannel.java42
-rw-r--r--libjava/java/nio/channels/SocketChannel.java42
6 files changed, 158 insertions, 6 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index cf111d0..aa1fc76 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,6 +1,19 @@
+2002-09-13 Michael Koch <konqueror@gmx.de>
+
+ * java/nio/channels/DatagramChannel.java,
+ java/nio/channels/ServerSocketChannel.java
+ java/nio/channels/SocketChannel.java:
+ New dummy files to make java.net fully JDK 1.4 compatible
+ * Makefile.am (ordinary_java_source_files): Added
+ java/net/DatagramSocketImplFactory.java (long forgotten),
+ java/nio/SocketChannel.java,
+ java/nio/ServerSocketChannel.java,
+ java/nio/DatagramChannel.java
+ * Makefile.in: Regenrated.
+
2002-09-12 Michael Koch <konqueror@gmx.de>
- * java/net/DatagramSocketImpl.jav
+ * java/net/DatagramSocketImpl.java
(peekData): New method.
* java/net/PlainDatagramSocketImpl.java
(peekData): New method.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index e3cfaea..7e44757 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -1885,6 +1885,7 @@ java/net/ContentHandlerFactory.java \
java/net/DatagramPacket.java \
java/net/DatagramSocket.java \
java/net/DatagramSocketImpl.java \
+java/net/DatagramSocketImplFactory.java \
java/net/FileNameMap.java \
java/net/HttpURLConnection.java \
java/net/InetAddress.java \
@@ -1918,6 +1919,9 @@ java/net/URLStreamHandler.java \
java/net/URLStreamHandlerFactory.java \
java/net/UnknownHostException.java \
java/net/UnknownServiceException.java \
+java/nio/channels/DatagramChannel.java \
+java/nio/channels/ServerSocketChannel.java \
+java/nio/channels/SocketChannel.java \
java/security/AccessControlContext.java \
java/security/AccessControlException.java \
java/security/AccessController.java \
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 91edd98..e962a24 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -1647,6 +1647,7 @@ java/net/ContentHandlerFactory.java \
java/net/DatagramPacket.java \
java/net/DatagramSocket.java \
java/net/DatagramSocketImpl.java \
+java/net/DatagramSocketImplFactory.java \
java/net/FileNameMap.java \
java/net/HttpURLConnection.java \
java/net/InetAddress.java \
@@ -1680,6 +1681,9 @@ java/net/URLStreamHandler.java \
java/net/URLStreamHandlerFactory.java \
java/net/UnknownHostException.java \
java/net/UnknownServiceException.java \
+java/nio/channels/DatagramChannel.java \
+java/nio/channels/ServerSocketChannel.java \
+java/nio/channels/SocketChannel.java \
java/security/AccessControlContext.java \
java/security/AccessControlException.java \
java/security/AccessController.java \
@@ -2865,9 +2869,9 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/java/net/ConnectException.P .deps/java/net/ContentHandler.P \
.deps/java/net/ContentHandlerFactory.P .deps/java/net/DatagramPacket.P \
.deps/java/net/DatagramSocket.P .deps/java/net/DatagramSocketImpl.P \
-.deps/java/net/FileNameMap.P .deps/java/net/HttpURLConnection.P \
-.deps/java/net/InetAddress.P .deps/java/net/InetSocketAddress.P \
-.deps/java/net/JarURLConnection.P \
+.deps/java/net/DatagramSocketImplFactory.P .deps/java/net/FileNameMap.P \
+.deps/java/net/HttpURLConnection.P .deps/java/net/InetAddress.P \
+.deps/java/net/InetSocketAddress.P .deps/java/net/JarURLConnection.P \
.deps/java/net/MalformedURLException.P .deps/java/net/MulticastSocket.P \
.deps/java/net/NetPermission.P .deps/java/net/NoRouteToHostException.P \
.deps/java/net/PasswordAuthentication.P \
@@ -2889,8 +2893,11 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/java/net/UnknownServiceException.P \
.deps/java/net/natInetAddress.P \
.deps/java/net/natPlainDatagramSocketImpl.P \
-.deps/java/net/natPlainSocketImpl.P .deps/java/rmi/AccessException.P \
-.deps/java/rmi/AlreadyBoundException.P \
+.deps/java/net/natPlainSocketImpl.P \
+.deps/java/nio/channels/DatagramChannel.P \
+.deps/java/nio/channels/ServerSocketChannel.P \
+.deps/java/nio/channels/SocketChannel.P \
+.deps/java/rmi/AccessException.P .deps/java/rmi/AlreadyBoundException.P \
.deps/java/rmi/ConnectException.P .deps/java/rmi/ConnectIOException.P \
.deps/java/rmi/MarshalException.P .deps/java/rmi/MarshalledObject.P \
.deps/java/rmi/Naming.P .deps/java/rmi/NoSuchObjectException.P \
diff --git a/libjava/java/nio/channels/DatagramChannel.java b/libjava/java/nio/channels/DatagramChannel.java
new file mode 100644
index 0000000..e1a0b1f
--- /dev/null
+++ b/libjava/java/nio/channels/DatagramChannel.java
@@ -0,0 +1,44 @@
+/* DatagramChannel.java --
+ Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+package java.nio.channels;
+
+public class DatagramChannel
+{
+}
+
+
diff --git a/libjava/java/nio/channels/ServerSocketChannel.java b/libjava/java/nio/channels/ServerSocketChannel.java
new file mode 100644
index 0000000..d033384
--- /dev/null
+++ b/libjava/java/nio/channels/ServerSocketChannel.java
@@ -0,0 +1,42 @@
+/* ServerSocketChannel.java --
+ Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+package java.nio.channels;
+
+public class ServerSocketChannel
+{
+}
diff --git a/libjava/java/nio/channels/SocketChannel.java b/libjava/java/nio/channels/SocketChannel.java
new file mode 100644
index 0000000..857c394
--- /dev/null
+++ b/libjava/java/nio/channels/SocketChannel.java
@@ -0,0 +1,42 @@
+/* SocketChannel.java --
+ Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+package java.nio.channels;
+
+public class SocketChannel
+{
+}