Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1755
diff -u -b -B -r1.1755 ChangeLog
--- ChangeLog 6 Jan 2004 10:07:59 -0000 1.1755
+++ ChangeLog 6 Jan 2004 11:32:33 -0000
@@ -1,5 +1,12 @@
2004-01-06 Michael Koch
+ * include/Makefile.am: Generate gnu_java_nio_NIOServerSocket.h.
+ * include/gnu_java_nio_NIOServerSocket.h,
+ native/jni/java-nio/gnu_java_nio_NIOServerSocket.c: New files.
+ * native/jni/java-nio/Makefile.am: Compile
+ gnu_java_nio_NIOServerSocket.c.
+2004-01-06 Michael Koch
+
* gnu/java/net/protocol/file/Connection.java
(Connection): Don't re-initialize doOutput with the default value.
* java/net/JarURLConnection.java
Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.7
diff -u -b -B -r1.7 Makefile.am
--- include/Makefile.am 27 Dec 2003 16:38:43 -0000 1.7
+++ include/Makefile.am 6 Jan 2004 11:32:33 -0000
@@ -35,6 +35,7 @@
$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h \
$(top_srcdir)/include/gnu_java_net_PlainDatagramSocketImpl.h \
$(top_srcdir)/include/gnu_java_net_PlainSocketImpl.h \
+$(top_srcdir)/include/gnu_java_nio_NIOServerSocket.h \
$(top_srcdir)/include/java_io_FileDescriptor.h \
$(top_srcdir)/include/java_io_File.h \
$(top_srcdir)/include/java_io_ObjectInputStream.h \
@@ -120,6 +121,8 @@
$(JAVAH) -o $@ gnu.java.net.PlainDatagramSocketImpl
$(top_srcdir)/include/gnu_java_net_PlainSocketImpl.h: $(top_srcdir)/gnu/java/net/PlainSocketImpl.java
$(JAVAH) -o $@ gnu.java.net.PlainSocketImpl
+$(top_srcdir)/include/gnu_java_nio_NIOServerSocket.h: $(top_srcdir)/gnu/java/nio/NIOServerSocket.java
+ $(JAVAH) -o $@ gnu.java.nio.NIOServerSocket
$(top_srcdir)/include/java_io_FileDescriptor.h: $(top_srcdir)/java/io/FileDescriptor.java
$(JAVAH) -o $@ java.io.FileDescriptor
$(top_srcdir)/include/java_io_File.h: $(top_srcdir)/java/io/File.java
Index: include/gnu_java_nio_NIOServerSocket.h
===================================================================
RCS file: include/gnu_java_nio_NIOServerSocket.h
diff -N include/gnu_java_nio_NIOServerSocket.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ include/gnu_java_nio_NIOServerSocket.h 6 Jan 2004 11:32:33 -0000
@@ -0,0 +1,19 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_nio_NIOServerSocket__
+#define __gnu_java_nio_NIOServerSocket__
+
+#include
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+extern JNIEXPORT jobject JNICALL Java_gnu_java_nio_NIOServerSocket_getPlainSocketImpl (JNIEnv *env, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gnu_java_nio_NIOServerSocket__ */
Index: native/jni/java-nio/gnu_java_nio_NIOServerSocket.c
===================================================================
RCS file: native/jni/java-nio/gnu_java_nio_NIOServerSocket.c
diff -N native/jni/java-nio/gnu_java_nio_NIOServerSocket.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ native/jni/java-nio/gnu_java_nio_NIOServerSocket.c 6 Jan 2004 11:32:33 -0000
@@ -0,0 +1,52 @@
+/* gnu_java_nio_NIOServerSocket.c - Native methods for NIOServerSocket class
+ Copyright (C) 2003 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. */
+
+#include
+#include
+
+#include
+#include
+
+#include "gnu_java_nio_NIOServerSocket.h"
+
+#define IO_EXCEPTION "java/io/IOException"
+
+JNIEXPORT jobject JNICALL
+Java_gnu_java_nio_NIOServerSocket_getPlainSocketImpl (JNIEnv *env, jclass class)
+{
+ JCL_ThrowException (env, IO_EXCEPTION, "gnu.java.nio.NIOServerSocket.getPlainSocketImpl(): not implemented");
+}
Index: native/jni/java-nio/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/Makefile.am,v
retrieving revision 1.1
diff -u -b -B -r1.1 Makefile.am
--- native/jni/java-nio/Makefile.am 2 Jul 2003 09:16:52 -0000 1.1
+++ native/jni/java-nio/Makefile.am 6 Jan 2004 11:32:33 -0000
@@ -1,6 +1,7 @@
pkglib_LTLIBRARIES = libjavanio.la
-libjavanio_la_SOURCES = java_nio_DirectByteBufferImpl.c \
+libjavanio_la_SOURCES = gnu_java_nio_NIOServerSocket.c \
+ java_nio_DirectByteBufferImpl.c \
java_nio_FileChannelImpl.c \
java_nio_FileLockImpl.c