DatagramSocket.java, [...]: Use gnu.java.net.Plain*SocketImpl instead of java.net.PlainSocketImpl.

2003-09-10  Michael Koch  <konqueror@gmx.de>

	* java/net/DatagramSocket.java,
	java/net/MulticastSocket.java,
	java/net/ServerSocket.java,
	java/net/Socket.java:
	Use gnu.java.net.Plain*SocketImpl instead of
	java.net.PlainSocketImpl.
	* java/net/PlainDatagramSocketImpl.java,
	java/net/PlainSocketImpl.java,
	java/net/SocketInputStream.java,
	java/net/SocketOutputStream.java,
	java/net/natPlainDatagramSocketImplNoNet.cc,
	java/net/natPlainDatagramSocketImplPosix.cc,
	java/net/natPlainDatagramSocketImplWin32.cc,
	java/net/natPlainSocketImplNoNet.cc,
	java/net/natPlainSocketImplPosix.cc,
	java/net/natPlainSocketImplWin32.cc:
	Removed.
	* gnu/java/net/PlainDatagramSocketImpl.java,
	gnu/java/net/PlainSocketImpl.java,
	gnu/java/net/SocketInputStream.java,
	gnu/java/net/SocketOutputStream.java,
	gnu/java/net/natPlainDatagramSocketImplNoNet.cc,
	gnu/java/net/natPlainDatagramSocketImplPosix.cc,
	gnu/java/net/natPlainDatagramSocketImplWin32.cc,
	gnu/java/net/natPlainSocketImplNoNet.cc,
	gnu/java/net/natPlainSocketImplPosix.cc,
	gnu/java/net/natPlainSocketImplWin32.cc:
	New files (moved from java/net).
	* configure.in: Create links for gnu/java/net/natPlain*SocketImpl.cc
	instead of java/net/natPlain*SocketImpl.cc.
	* configure: Regenerated.
	* Makefile.am: Moved files from java/net to gnu/java/net.
	* Makefile.in: Regenerated.

From-SVN: r71274

libjava/ChangeLog

+2003-09-10  Michael Koch  <konqueror@gmx.de>
+
+	* java/net/DatagramSocket.java,
+	java/net/MulticastSocket.java,
+	java/net/ServerSocket.java,
+	java/net/Socket.java:
+	Use gnu.java.net.Plain*SocketImpl instead of
+	java.net.PlainSocketImpl.
+	* java/net/PlainDatagramSocketImpl.java,
+	java/net/PlainSocketImpl.java,
+	java/net/SocketInputStream.java,
+	java/net/SocketOutputStream.java,
+	java/net/natPlainDatagramSocketImplNoNet.cc,
+	java/net/natPlainDatagramSocketImplPosix.cc,
+	java/net/natPlainDatagramSocketImplWin32.cc,
+	java/net/natPlainSocketImplNoNet.cc,
+	java/net/natPlainSocketImplPosix.cc,
+	java/net/natPlainSocketImplWin32.cc:
+	Removed.
+	* gnu/java/net/PlainDatagramSocketImpl.java,
+	gnu/java/net/PlainSocketImpl.java,
+	gnu/java/net/SocketInputStream.java,
+	gnu/java/net/SocketOutputStream.java,
+	gnu/java/net/natPlainDatagramSocketImplNoNet.cc,
+	gnu/java/net/natPlainDatagramSocketImplPosix.cc,
+	gnu/java/net/natPlainDatagramSocketImplWin32.cc,
+	gnu/java/net/natPlainSocketImplNoNet.cc,
+	gnu/java/net/natPlainSocketImplPosix.cc,
+	gnu/java/net/natPlainSocketImplWin32.cc:
+	New files (moved from java/net).
+	* configure.in: Create links for gnu/java/net/natPlain*SocketImpl.cc
+	instead of java/net/natPlain*SocketImpl.cc.
+	* configure: Regenerated.
+	* Makefile.am: Moved files from java/net to gnu/java/net.
+	* Makefile.in: Regenerated.
+
 2003-09-09  Alan Modra  <amodra@bigpond.net.au>
 
 	* configure: Regenerate.

libjava/Makefile.am

@@ -2136,6 +2136,8 @@ gnu/java/locale/LocaleInformation_zh_HK.java \
 gnu/java/locale/LocaleInformation_zh_SG.java \
 gnu/java/locale/LocaleInformation_zh_TW.java \
 gnu/java/math/MPN.java \
+gnu/java/net/PlainDatagramSocketImpl.java \
+gnu/java/net/PlainSocketImpl.java \
 gnu/java/nio/DatagramChannelImpl.java \
 gnu/java/nio/FileLockImpl.java \
 gnu/java/nio/PipeImpl.java \
@@ -2232,8 +2234,6 @@ java/net/NetPermission.java \
 java/net/NetworkInterface.java \
 java/net/NoRouteToHostException.java \
 java/net/PasswordAuthentication.java \
-java/net/PlainDatagramSocketImpl.java \
-java/net/PlainSocketImpl.java \
 java/net/PortUnreachableException.java \
 java/net/ProtocolException.java	\
 java/net/ServerSocket.java \
@@ -2604,6 +2604,8 @@ gnu/gcj/runtime/natStackTrace.cc \
 gnu/gcj/runtime/natStringBuffer.cc \
 gnu/gcj/runtime/natVMClassLoader.cc \
 gnu/java/awt/natEmbeddedWindow.cc \
+gnu/java/net/natPlainDatagramSocketImpl.cc \
+gnu/java/net/natPlainSocketImpl.cc \
 gnu/java/nio/natFileLockImpl.cc \
 gnu/java/nio/natSelectorImpl.cc \
 java/io/natFile.cc \
@@ -2632,8 +2634,6 @@ java/lang/reflect/natMethod.cc \
 java/lang/reflect/natProxy.cc \
 java/net/natNetworkInterface.cc \
 java/net/natInetAddress.cc \
-java/net/natPlainDatagramSocketImpl.cc \
-java/net/natPlainSocketImpl.cc \
 java/nio/natDirectByteBufferImpl.cc \
 java/nio/channels/natFileChannelImpl.cc \
 java/text/natCollator.cc \

libjava/Makefile.in

@@ -1891,6 +1891,8 @@ gnu/java/locale/LocaleInformation_zh_HK.java \
 gnu/java/locale/LocaleInformation_zh_SG.java \
 gnu/java/locale/LocaleInformation_zh_TW.java \
 gnu/java/math/MPN.java \
+gnu/java/net/PlainDatagramSocketImpl.java \
+gnu/java/net/PlainSocketImpl.java \
 gnu/java/nio/DatagramChannelImpl.java \
 gnu/java/nio/FileLockImpl.java \
 gnu/java/nio/PipeImpl.java \
@@ -1987,8 +1989,6 @@ java/net/NetPermission.java \
 java/net/NetworkInterface.java \
 java/net/NoRouteToHostException.java \
 java/net/PasswordAuthentication.java \
-java/net/PlainDatagramSocketImpl.java \
-java/net/PlainSocketImpl.java \
 java/net/PortUnreachableException.java \
 java/net/ProtocolException.java	\
 java/net/ServerSocket.java \
@@ -2358,6 +2358,8 @@ gnu/gcj/runtime/natStackTrace.cc \
 gnu/gcj/runtime/natStringBuffer.cc \
 gnu/gcj/runtime/natVMClassLoader.cc \
 gnu/java/awt/natEmbeddedWindow.cc \
+gnu/java/net/natPlainDatagramSocketImpl.cc \
+gnu/java/net/natPlainSocketImpl.cc \
 gnu/java/nio/natFileLockImpl.cc \
 gnu/java/nio/natSelectorImpl.cc \
 java/io/natFile.cc \
@@ -2386,8 +2388,6 @@ java/lang/reflect/natMethod.cc \
 java/lang/reflect/natProxy.cc \
 java/net/natNetworkInterface.cc \
 java/net/natInetAddress.cc \
-java/net/natPlainDatagramSocketImpl.cc \
-java/net/natPlainSocketImpl.cc \
 java/nio/natDirectByteBufferImpl.cc \
 java/nio/channels/natFileChannelImpl.cc \
 java/text/natCollator.cc \
@@ -2535,20 +2535,21 @@ gnu/gcj/runtime/natFinalizerThread.lo gnu/gcj/runtime/natFirstThread.lo \
 gnu/gcj/runtime/natNameFinder.lo gnu/gcj/runtime/natSharedLibLoader.lo \
 gnu/gcj/runtime/natStackTrace.lo gnu/gcj/runtime/natStringBuffer.lo \
 gnu/gcj/runtime/natVMClassLoader.lo gnu/java/awt/natEmbeddedWindow.lo \
-gnu/java/nio/natFileLockImpl.lo gnu/java/nio/natSelectorImpl.lo \
-java/io/natFile.lo java/io/natFileDescriptor.lo \
-java/io/natObjectInputStream.lo java/io/natVMObjectStreamClass.lo \
-java/lang/natCharacter.lo java/lang/natClass.lo \
-java/lang/natClassLoader.lo java/lang/natConcreteProcess.lo \
-java/lang/natDouble.lo java/lang/natFloat.lo java/lang/natMath.lo \
-java/lang/natObject.lo java/lang/natRuntime.lo java/lang/natString.lo \
+gnu/java/net/natPlainDatagramSocketImpl.lo \
+gnu/java/net/natPlainSocketImpl.lo gnu/java/nio/natFileLockImpl.lo \
+gnu/java/nio/natSelectorImpl.lo java/io/natFile.lo \
+java/io/natFileDescriptor.lo java/io/natObjectInputStream.lo \
+java/io/natVMObjectStreamClass.lo java/lang/natCharacter.lo \
+java/lang/natClass.lo java/lang/natClassLoader.lo \
+java/lang/natConcreteProcess.lo java/lang/natDouble.lo \
+java/lang/natFloat.lo java/lang/natMath.lo java/lang/natObject.lo \
+java/lang/natRuntime.lo java/lang/natString.lo \
 java/lang/natStringBuffer.lo java/lang/natSystem.lo \
 java/lang/natThread.lo java/lang/natVMSecurityManager.lo \
 java/lang/ref/natReference.lo java/lang/reflect/natArray.lo \
 java/lang/reflect/natConstructor.lo java/lang/reflect/natField.lo \
 java/lang/reflect/natMethod.lo java/lang/reflect/natProxy.lo \
 java/net/natNetworkInterface.lo java/net/natInetAddress.lo \
-java/net/natPlainDatagramSocketImpl.lo java/net/natPlainSocketImpl.lo \
 java/nio/natDirectByteBufferImpl.lo \
 java/nio/channels/natFileChannelImpl.lo java/text/natCollator.lo \
 java/util/natResourceBundle.lo java/util/natTimeZone.lo \
@@ -3008,7 +3009,11 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/gnu/java/locale/LocaleInformation_zh_HK.P \
 .deps/gnu/java/locale/LocaleInformation_zh_SG.P \
 .deps/gnu/java/locale/LocaleInformation_zh_TW.P \
-.deps/gnu/java/math/MPN.P .deps/gnu/java/nio/DatagramChannelImpl.P \
+.deps/gnu/java/math/MPN.P .deps/gnu/java/net/PlainDatagramSocketImpl.P \
+.deps/gnu/java/net/PlainSocketImpl.P \
+.deps/gnu/java/net/natPlainDatagramSocketImpl.P \
+.deps/gnu/java/net/natPlainSocketImpl.P \
+.deps/gnu/java/nio/DatagramChannelImpl.P \
 .deps/gnu/java/nio/FileLockImpl.P .deps/gnu/java/nio/PipeImpl.P \
 .deps/gnu/java/nio/SelectionKeyImpl.P .deps/gnu/java/nio/SelectorImpl.P \
 .deps/gnu/java/nio/SelectorProviderImpl.P \
@@ -3508,8 +3513,6 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/net/NetPermission.P .deps/java/net/NetworkInterface.P \
 .deps/java/net/NoRouteToHostException.P \
 .deps/java/net/PasswordAuthentication.P \
-.deps/java/net/PlainDatagramSocketImpl.P \
-.deps/java/net/PlainSocketImpl.P \
 .deps/java/net/PortUnreachableException.P \
 .deps/java/net/ProtocolException.P .deps/java/net/ServerSocket.P \
 .deps/java/net/Socket.P .deps/java/net/SocketAddress.P \
@@ -3525,9 +3528,7 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/net/UnknownHostException.P \
 .deps/java/net/UnknownServiceException.P \
 .deps/java/net/natInetAddress.P .deps/java/net/natNetworkInterface.P \
-.deps/java/net/natPlainDatagramSocketImpl.P \
-.deps/java/net/natPlainSocketImpl.P .deps/java/nio/Buffer.P \
-.deps/java/nio/BufferOverflowException.P \
+.deps/java/nio/Buffer.P .deps/java/nio/BufferOverflowException.P \
 .deps/java/nio/BufferUnderflowException.P .deps/java/nio/ByteBuffer.P \
 .deps/java/nio/ByteBufferImpl.P .deps/java/nio/ByteOrder.P \
 .deps/java/nio/CharBuffer.P .deps/java/nio/CharBufferImpl.P \

libjava/configure.in

@@ -272,13 +272,16 @@ test -d java/lang || mkdir java/lang
 AC_LINK_FILES(java/lang/${PLATFORM}Process.java, java/lang/ConcreteProcess.java)
 AC_LINK_FILES(java/lang/nat${PLATFORM}Process.cc, java/lang/natConcreteProcess.cc)
 
-dnl Likewise for natInetAddress.cc, natNetworkInterface.cc, natPlainSocketImpl.cc
-dnl and natPlainDatagramSocketImpl.cc
+dnl Likewise for natInetAddress.cc and natNetworkInterface.cc.
 test -d java/net || mkdir java/net
 AC_LINK_FILES(java/net/natInetAddress${PLATFORMNET}.cc, java/net/natInetAddress.cc)
 AC_LINK_FILES(java/net/natNetworkInterface${PLATFORMNET}.cc, java/net/natNetworkInterface.cc)
-AC_LINK_FILES(java/net/natPlainSocketImpl${PLATFORMNET}.cc, java/net/natPlainSocketImpl.cc)
-AC_LINK_FILES(java/net/natPlainDatagramSocketImpl${PLATFORMNET}.cc, java/net/natPlainDatagramSocketImpl.cc)
+
+dnl Likewise for natPlainSocketImpl.cc and natPlainDatagramSocketImpl.ca.c
+test -d gnu/java || mkdir gnu/java
+test -d gnu/java/net || mkdir gnu/java/net
+AC_LINK_FILES(gnu/java/net/natPlainSocketImpl${PLATFORMNET}.cc, gnu/java/net/natPlainSocketImpl.cc)
+AC_LINK_FILES(gnu/java/net/natPlainDatagramSocketImpl${PLATFORMNET}.cc, gnu/java/net/natPlainDatagramSocketImpl.cc)
 
 case "${host}" in
     *mingw*)

libjava/java/net/PlainDatagramSocketImpl.java → libjava/gnu/java/net/PlainDatagramSocketImpl.java

 /* PlainDatagramSocketImpl.java -- Default DatagramSocket implementation
-   Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -36,9 +36,17 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 
-package java.net;
+package gnu.java.net;
 
 import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocketImpl;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.NetworkInterface;
+import java.net.SocketAddress;
+import java.net.SocketOptions;
+import java.net.SocketException;
 import gnu.classpath.Configuration;
 
 /**
@@ -55,7 +63,7 @@ import gnu.classpath.Configuration;
  * @author Aaron M. Renn <arenn@urbanophile.com>
  * @author Warren Levy <warrenl@cygnus.com>
  */
-class PlainDatagramSocketImpl extends DatagramSocketImpl
+public final class PlainDatagramSocketImpl extends DatagramSocketImpl
 {
   // Static initializer to load native library
   static

libjava/java/net/PlainSocketImpl.java → libjava/gnu/java/net/PlainSocketImpl.java

 /* PlainSocketImpl.java -- Default socket implementation
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -36,11 +36,17 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 
-package java.net;
+package gnu.java.net;
 
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.net.SocketException;
+import java.net.SocketImpl;
+import java.net.SocketOptions;
 import gnu.classpath.Configuration;
 
 /**
@@ -59,7 +65,7 @@ import gnu.classpath.Configuration;
  * @author Nic Ferrier <nferrier@tapsellferrier.co.uk>
  * @author Aaron M. Renn <arenn@urbanophile.com>
  */
-class PlainSocketImpl extends SocketImpl
+public final class PlainSocketImpl extends SocketImpl
 {
   // Static initializer to load native library.
   static

libjava/java/net/SocketInputStream.java → libjava/gnu/java/net/SocketInputStream.java

@@ -36,7 +36,7 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 
-package java.net;
+package gnu.java.net;
 
 import java.io.InputStream;
 import java.io.IOException;

libjava/java/net/SocketOutputStream.java → libjava/gnu/java/net/SocketOutputStream.java

@@ -35,7 +35,8 @@ 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.net;
+
+package gnu.java.net;
 
 import java.io.OutputStream;
 import java.io.IOException;

libjava/java/net/natPlainDatagramSocketImplNoNet.cc → libjava/gnu/java/net/natPlainDatagramSocketImplNoNet.cc

@@ -9,111 +9,111 @@ details.  */
 #include <config.h>
 #include <platform.h>
 
+#include <gnu/java/net/PlainDatagramSocketImpl.h>
 #include <java/io/IOException.h>
 #include <java/lang/Object.h>
 #include <java/net/BindException.h>
 #include <java/net/DatagramPacket.h>
 #include <java/net/InetAddress.h>
 #include <java/net/NetworkInterface.h>
-#include <java/net/PlainDatagramSocketImpl.h>
 #include <java/net/SocketException.h>
 
 void
-java::net::PlainDatagramSocketImpl::create ()
+gnu::java::net::PlainDatagramSocketImpl::create ()
 {
-  throw new SocketException (
+  throw new ::java::net::SocketException (
     JvNewStringLatin1 ("DatagramSocketImpl.create: unimplemented"));
 }
 
 void
-java::net::PlainDatagramSocketImpl::bind (jint, java::net::InetAddress *)
+gnu::java::net::PlainDatagramSocketImpl::bind (jint, ::java::net::InetAddress *)
 {
-  throw new BindException (
+  throw new ::java::net::BindException (
     JvNewStringLatin1 ("DatagramSocketImpl.bind: unimplemented"));
 }
 
 void
-java::net::PlainDatagramSocketImpl::connect (java::net::InetAddress *, jint)
+gnu::java::net::PlainDatagramSocketImpl::connect (::java::net::InetAddress *, jint)
 {
-  throw new SocketException (
+  throw new ::java::net::SocketException (
     JvNewStringLatin1 ("DatagramSocketImpl.connect: unimplemented"));
 }
 
 void
-java::net::PlainDatagramSocketImpl::disconnect ()
+gnu::java::net::PlainDatagramSocketImpl::disconnect ()
 {
-  throw new SocketException (
+  throw new ::java::net::SocketException (
     JvNewStringLatin1 ("DatagramSocketImpl.disconnect: unimplemented"));
 }
 
 jint
-java::net::PlainDatagramSocketImpl::peek (java::net::InetAddress *)
+gnu::java::net::PlainDatagramSocketImpl::peek (::java::net::InetAddress *)
 {
-  throw new java::io::IOException (
+  throw new ::java::io::IOException (
     JvNewStringLatin1 ("DatagramSocketImpl.peek: unimplemented"));
 }
 
 jint
-java::net::PlainDatagramSocketImpl::peekData(java::net::DatagramPacket *)
+gnu::java::net::PlainDatagramSocketImpl::peekData (::java::net::DatagramPacket *)
 {
-  throw new java::io::IOException (
+  throw new ::java::io::IOException (
     JvNewStringLatin1 ("DatagramSocketImpl.peekData: unimplemented"));
 }
 
 void
-java::net::PlainDatagramSocketImpl::close ()
+gnu::java::net::PlainDatagramSocketImpl::close ()
 {
-  throw new java::io::IOException (
+  throw new ::java::io::IOException (
     JvNewStringLatin1 ("DatagramSocketImpl.close: unimplemented"));
 }
 
 void
-java::net::PlainDatagramSocketImpl::send (java::net::DatagramPacket *)
+gnu::java::net::PlainDatagramSocketImpl::send (::java::net::DatagramPacket *)
 {
-  throw new java::io::IOException (
+  throw new ::java::io::IOException (
     JvNewStringLatin1 ("DatagramSocketImpl.send: unimplemented"));
 }
 
 void
-java::net::PlainDatagramSocketImpl::receive (java::net::DatagramPacket *)
+gnu::java::net::PlainDatagramSocketImpl::receive (::java::net::DatagramPacket *)
 {
-  throw new java::io::IOException (
+  throw new ::java::io::IOException (
     JvNewStringLatin1 ("DatagramSocketImpl.receive: unimplemented"));
 }
 
 void
-java::net::PlainDatagramSocketImpl::setTimeToLive (jint)
+gnu::java::net::PlainDatagramSocketImpl::setTimeToLive (jint)
 {
-  throw new java::io::IOException (
+  throw new ::java::io::IOException (
     JvNewStringLatin1 ("DatagramSocketImpl.setTimeToLive: unimplemented"));
 }
 
 jint
-java::net::PlainDatagramSocketImpl::getTimeToLive ()
+gnu::java::net::PlainDatagramSocketImpl::getTimeToLive ()
 {
-  throw new java::io::IOException (
+  throw new ::java::io::IOException (
     JvNewStringLatin1 ("DatagramSocketImpl.getTimeToLive: unimplemented"));
 }
 
 void
-java::net::PlainDatagramSocketImpl::mcastGrp (java::net::InetAddress *,
-                                              java::net::NetworkInterface *,
+gnu::java::net::PlainDatagramSocketImpl::mcastGrp (::java::net::InetAddress *,
+                                              ::java::net::NetworkInterface *,
 					      jboolean)
 {
-  throw new java::io::IOException (
+  throw new ::java::io::IOException (
     JvNewStringLatin1 ("DatagramSocketImpl.mcastGrp: unimplemented"));
 }
 
 void
-java::net::PlainDatagramSocketImpl::setOption (jint, java::lang::Object *)
+gnu::java::net::PlainDatagramSocketImpl::setOption (jint, ::java::lang::Object *)
 {
-  throw new SocketException (
+  throw new ::java::net::SocketException (
     JvNewStringLatin1 ("DatagramSocketImpl.setOption: unimplemented"));
 }
 
-java::lang::Object *
-java::net::PlainDatagramSocketImpl::getOption (jint)
+::java::lang::Object *
+gnu::java::net::PlainDatagramSocketImpl::getOption (jint)
 {
-  throw new SocketException (
+  throw new ::java::net::SocketException (
     JvNewStringLatin1 ("DatagramSocketImpl.getOption: unimplemented"));
 }

libjava/java/net/natPlainSocketImplNoNet.cc → libjava/gnu/java/net/natPlainSocketImplNoNet.cc

@@ -9,120 +9,120 @@ details.  */
 #include <config.h>
 #include <platform.h>
 
+#include <gnu/java/net/PlainSocketImpl.h>
 #include <java/io/IOException.h>
 #include <java/net/BindException.h>
 #include <java/net/ConnectException.h>
-#include <java/net/PlainSocketImpl.h>
 #include <java/net/SocketException.h>
 
 void
-java::net::PlainSocketImpl::create (jboolean)
+gnu::java::net::PlainSocketImpl::create (jboolean)
 {
-  throw new java::io::IOException (
+  throw new ::java::io::IOException (
     JvNewStringLatin1 ("SocketImpl.create: unimplemented"));
 }
 
 void
-java::net::PlainSocketImpl::bind (java::net::InetAddress *, jint)
+gnu::java::net::PlainSocketImpl::bind (::java::net::InetAddress *, jint)
 {
-  throw new BindException (
+  throw new ::java::net::BindException (
     JvNewStringLatin1 ("SocketImpl.bind: unimplemented"));
 }
 
 void
-java::net::PlainSocketImpl::connect (java::net::SocketAddress *, jint)
+gnu::java::net::PlainSocketImpl::connect (::java::net::SocketAddress *, jint)
 {
-  throw new ConnectException (
+  throw new ::java::net::ConnectException (
     JvNewStringLatin1 ("SocketImpl.connect: unimplemented"));
 }
 
 void
-java::net::PlainSocketImpl::listen (jint)
+gnu::java::net::PlainSocketImpl::listen (jint)
 {
-  throw new java::io::IOException (
+  throw new ::java::io::IOException (
     JvNewStringLatin1 ("SocketImpl.listen: unimplemented"));
 }
 
 void
-java::net::PlainSocketImpl::accept (java::net::PlainSocketImpl *)
+gnu::java::net::PlainSocketImpl::accept (gnu::java::net::PlainSocketImpl *)
 {
-  throw new java::io::IOException (
+  throw new ::java::io::IOException (
     JvNewStringLatin1 ("SocketImpl.accept: unimplemented"));
 }
 
 void
-java::net::PlainSocketImpl::setOption (jint, java::lang::Object *)
+gnu::java::net::PlainSocketImpl::setOption (jint, ::java::lang::Object *)
 {
-  throw new SocketException (
+  throw new ::java::net::SocketException (
     JvNewStringLatin1 ("SocketImpl.setOption: unimplemented"));
 }
 
-java::lang::Object *
-java::net::PlainSocketImpl::getOption (jint)
+::java::lang::Object *
+gnu::java::net::PlainSocketImpl::getOption (jint)
 {
-  throw new SocketException (
+  throw new ::java::net::SocketException (
     JvNewStringLatin1 ("SocketImpl.getOption: unimplemented"));
 }
 
 jint
-java::net::PlainSocketImpl::read(void)
+gnu::java::net::PlainSocketImpl::read(void)
 {
-  throw new SocketException (
+  throw new ::java::net::SocketException (
     JvNewStringLatin1 ("SocketImpl.read: unimplemented"));
 }
 
 jint
-java::net::PlainSocketImpl::read(jbyteArray buffer, jint offset, jint count)
+gnu::java::net::PlainSocketImpl::read(jbyteArray buffer, jint offset, jint count)
 {
-  throw new SocketException (
+  throw new ::java::net::SocketException (
     JvNewStringLatin1 ("SocketImpl.read: unimplemented"));
 }
 
 void
-java::net::PlainSocketImpl::write(jint b)
+gnu::java::net::PlainSocketImpl::write(jint b)
 {
-  throw new SocketException (
+  throw new ::java::net::SocketException (
     JvNewStringLatin1 ("SocketImpl.write: unimplemented"));
 }
 
 void
-java::net::PlainSocketImpl::write(jbyteArray b, jint offset, jint len)
+gnu::java::net::PlainSocketImpl::write(jbyteArray b, jint offset, jint len)
 {
-  throw new SocketException (
+  throw new ::java::net::SocketException (
     JvNewStringLatin1 ("SocketImpl.write: unimplemented"));
 }
 
 void
-java::net::PlainSocketImpl::sendUrgentData(jint data)
+gnu::java::net::PlainSocketImpl::sendUrgentData(jint data)
 {
-  throw new SocketException (
+  throw new ::java::net::SocketException (
     JvNewStringLatin1 ("SocketImpl.sendUrgentData: unimplemented"));
 }
 
 jint
-java::net::PlainSocketImpl::available(void)
+gnu::java::net::PlainSocketImpl::available(void)
 {
-  throw new SocketException (
+  throw new ::java::net::SocketException (
     JvNewStringLatin1 ("SocketImpl.available: unimplemented"));
 }
 
 void
-java::net::PlainSocketImpl::close(void)
+gnu::java::net::PlainSocketImpl::close(void)
 {
-  throw new SocketException (
+  throw new ::java::net::SocketException (
     JvNewStringLatin1 ("SocketImpl.close: unimplemented"));
 }
 
 void
-java::net::PlainSocketImpl::shutdownInput (void)
+gnu::java::net::PlainSocketImpl::shutdownInput (void)
 {
-  throw new SocketException (
+  throw new ::java::net::SocketException (
     JvNewStringLatin1 ("SocketImpl.shutdownInput: unimplemented"));
 }
 
 void
-java::net::PlainSocketImpl::shutdownOutput (void)
+gnu::java::net::PlainSocketImpl::shutdownOutput (void)
 {
-  throw new SocketException (
+  throw new ::java::net::SocketException (
     JvNewStringLatin1 ("SocketImpl.shutdownOutput: unimplemented"));
 }

libjava/java/net/DatagramSocket.java

@@ -35,8 +35,10 @@ 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.net;
 
+import gnu.java.net.PlainDatagramSocketImpl;
 import java.io.IOException;
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.IllegalBlockingModeException;
@@ -266,38 +268,30 @@ public class DatagramSocket
    */
   public InetAddress getLocalAddress()
   {
-    // FIXME: JCL p. 510 says this should call checkConnect.  But what
-    // string should be used as the hostname?  Maybe this is just a side
-    // effect of calling InetAddress.getLocalHost.
-    //
-    // And is getOption with SO_BINDADDR the right way to get the address?
-    // Doesn't seem to be since this method doesn't throw a SocketException
-    // and SO_BINADDR can throw one.
-    //
-    // Also see RETURNS section in JCL p. 510 about returning any local
-    // addr "if the current execution context is not allowed to connect to
-    // the network interface that is actually bound to this datagram socket."
-    // How is that done?  via InetAddress.getLocalHost?  But that throws
-    // an UnknownHostException and this method doesn't.
-    //
-    // if (s != null)
-    //   s.checkConnect("localhost", -1);
+    if (impl == null
+	|| closed)
+      return null;
+    
+    InetAddress result;
+    
     try
       {
-        return (InetAddress)impl.getOption(SocketOptions.SO_BINDADDR);
-      }
-    catch (SocketException ex)
-      {
-      }
+        result = (InetAddress) impl.getOption (SocketOptions.SO_BINDADDR);
 
-    try
+	SecurityManager s = System.getSecurityManager();
+	if (s != null)
+	  s.checkConnect (result.getHostName(), -1);
+      }
+    catch (SecurityException e)
       {
-        return InetAddress.getLocalHost();
+	result = InetAddress.ANY_IF;
       }
-    catch (UnknownHostException ex)
+    catch (SocketException e)
       {
-        return null;
+	result = InetAddress.ANY_IF;
       }
+
+    return result;
   }
 
   /**

libjava/java/net/MulticastSocket.java

@@ -36,8 +36,10 @@ 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.net;
 
+import gnu.java.net.PlainDatagramSocketImpl;
 import java.io.IOException;
 import java.util.Enumeration;
 

libjava/java/net/ServerSocket.java

 /* ServerSocket.java -- Class for implementing server side sockets
-   Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,8 +35,10 @@ 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.net;
 
+import gnu.java.net.PlainSocketImpl;
 import java.io.IOException;
 import java.nio.channels.IllegalBlockingModeException;
 import java.nio.channels.ServerSocketChannel;

libjava/java/net/Socket.java

 /* Socket.java -- Client socket implementation
-   Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,8 +35,10 @@ 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.net;
 
+import gnu.java.net.PlainSocketImpl;
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.OutputStream;