18 files changed, 19 insertions, 501 deletions
diff --git a/libjava/java/net/MulticastSocket.java b/libjava/java/net/MulticastSocket.java
index e24b1947731..efd66b3d51c 100644
--- a/libjava/java/net/MulticastSocket.java
+++ b/libjava/java/net/MulticastSocket.java
@@ -1,5 +1,5 @@
 /* MulticastSocket.java -- Class for using multicast sockets
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2007
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -338,7 +338,7 @@ public class MulticastSocket extends DatagramSocket
 
   /**
    * Sets the "Time to Live" value for a socket.  The value must be between
-   * 1 and 255.
+   * 0 and 255, inclusive.
    *
    * @param ttl The new TTL value
    *
@@ -351,7 +351,7 @@ public class MulticastSocket extends DatagramSocket
     if (isClosed())
       throw new SocketException("socket is closed");
 
-    if (ttl <= 0 || ttl > 255)
+    if (ttl < 0 || ttl > 255)
       throw new IllegalArgumentException("Invalid ttl: " + ttl);
 
     getImpl().setTimeToLive(ttl);
diff --git a/libjava/java/net/ServerSocket.h b/libjava/java/net/ServerSocket.h
index af51cb6d864..98c77c61ba8 100644
--- a/libjava/java/net/ServerSocket.h
+++ b/libjava/java/net/ServerSocket.h
@@ -9,6 +9,16 @@
 #include <java/lang/Object.h>
 extern "Java"
 {
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace net
+      {
+          class PlainSocketImpl;
+      }
+    }
+  }
   namespace java
   {
     namespace net
@@ -35,7 +45,7 @@ class java::net::ServerSocket : public ::java::lang::Object
 {
 
 public: // actually package-private
-  ServerSocket(::java::net::SocketImpl *);
+  ServerSocket(::gnu::java::net::PlainSocketImpl *);
   virtual ::java::net::SocketImpl * getImpl();
 public:
   ServerSocket();
diff --git a/libjava/java/net/Socket.h b/libjava/java/net/Socket.h
index bb0bf38b000..776d6fc473a 100644
--- a/libjava/java/net/Socket.h
+++ b/libjava/java/net/Socket.h
@@ -91,6 +91,7 @@ public:
 public: // actually package-private
   static ::java::net::SocketImplFactory * factory;
   ::java::net::SocketImpl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) impl;
+  jboolean implCreated;
   jboolean bound;
 private:
   jboolean inputShutdown;
diff --git a/libjava/java/net/URL$1.h b/libjava/java/net/URL$1.h
index d81ebe4bc0d..7e2875e5814 100644
--- a/libjava/java/net/URL$1.h
+++ b/libjava/java/net/URL$1.h
@@ -24,6 +24,7 @@ class java::net::URL$1 : public ::java::lang::Object
 public: // actually package-private
   URL$1();
 public:
+  ::java::lang::ClassLoader * URL$1$run();
   ::java::lang::Object * run();
   static ::java::lang::Class class$;
 };
diff --git a/libjava/java/net/URLClassLoader$1.h b/libjava/java/net/URLClassLoader$1.h
index d7f57791125..a7fb5505b2b 100644
--- a/libjava/java/net/URLClassLoader$1.h
+++ b/libjava/java/net/URLClassLoader$1.h
@@ -31,6 +31,7 @@ class java::net::URLClassLoader$1 : public ::java::lang::Object
 public: // actually package-private
   URLClassLoader$1(::java::net::URLClassLoader *, ::java::lang::String *, JArray< jbyte > *, ::java::security::CodeSource *);
 public:
+  ::java::lang::Class * URLClassLoader$1$run();
   ::java::lang::Object * run();
 public: // actually package-private
   ::java::net::URLClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
diff --git a/libjava/java/net/URLClassLoader$2.h b/libjava/java/net/URLClassLoader$2.h
index 274d4c33a1e..c7222d3f7d0 100644
--- a/libjava/java/net/URLClassLoader$2.h
+++ b/libjava/java/net/URLClassLoader$2.h
@@ -13,6 +13,7 @@ extern "Java"
   {
     namespace net
     {
+        class URLClassLoader;
         class URLClassLoader$2;
     }
   }
@@ -24,6 +25,7 @@ class java::net::URLClassLoader$2 : public ::java::lang::Object
 public: // actually package-private
   URLClassLoader$2(::java::lang::ClassLoader *, ::java::lang::Object *);
 public:
+  ::java::net::URLClassLoader * URLClassLoader$2$run();
   ::java::lang::Object * run();
 private:
   ::java::lang::ClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$parent;
diff --git a/libjava/java/net/URLClassLoader$CoreResource.h b/libjava/java/net/URLClassLoader$CoreResource.h
deleted file mode 100644
index ff3314a33bf..00000000000
--- a/libjava/java/net/URLClassLoader$CoreResource.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$CoreResource__
-#define __java_net_URLClassLoader$CoreResource__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$Resource.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-        class Core;
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader$CoreResource;
-        class URLClassLoader$CoreURLLoader;
-    }
-  }
-}
-
-class java::net::URLClassLoader$CoreResource : public ::java::net::URLClassLoader$Resource
-{
-
-public: // actually package-private
-  URLClassLoader$CoreResource(::java::net::URLClassLoader$CoreURLLoader *, ::java::lang::String *, ::gnu::gcj::Core *);
-  ::java::io::InputStream * getInputStream();
-public:
-  jint getLength();
-  ::java::net::URL * getURL();
-private:
-  ::gnu::gcj::Core * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$Resource)))) core;
-  ::java::lang::String * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$CoreResource__
diff --git a/libjava/java/net/URLClassLoader$CoreURLLoader.h b/libjava/java/net/URLClassLoader$CoreURLLoader.h
deleted file mode 100644
index 3c701cddf3a..00000000000
--- a/libjava/java/net/URLClassLoader$CoreURLLoader.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$CoreURLLoader__
-#define __java_net_URLClassLoader$CoreURLLoader__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$URLLoader.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLClassLoader$CoreURLLoader;
-        class URLClassLoader$Resource;
-    }
-  }
-}
-
-class java::net::URLClassLoader$CoreURLLoader : public ::java::net::URLClassLoader$URLLoader
-{
-
-public: // actually package-private
-  URLClassLoader$CoreURLLoader(::java::net::URLClassLoader *, ::java::net::URL *);
-  ::java::net::URLClassLoader$Resource * getResource(::java::lang::String *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$URLLoader)))) dir;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$CoreURLLoader__
diff --git a/libjava/java/net/URLClassLoader$FileResource.h b/libjava/java/net/URLClassLoader$FileResource.h
deleted file mode 100644
index a98e9bf223a..00000000000
--- a/libjava/java/net/URLClassLoader$FileResource.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$FileResource__
-#define __java_net_URLClassLoader$FileResource__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$Resource.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader$FileResource;
-        class URLClassLoader$FileURLLoader;
-    }
-  }
-}
-
-class java::net::URLClassLoader$FileResource : public ::java::net::URLClassLoader$Resource
-{
-
-public: // actually package-private
-  URLClassLoader$FileResource(::java::net::URLClassLoader$FileURLLoader *, ::java::io::File *);
-  ::java::io::InputStream * getInputStream();
-public:
-  jint getLength();
-  ::java::net::URL * getURL();
-public: // actually package-private
-  ::java::io::File * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$Resource)))) file;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$FileResource__
diff --git a/libjava/java/net/URLClassLoader$FileURLLoader.h b/libjava/java/net/URLClassLoader$FileURLLoader.h
deleted file mode 100644
index ff0b7dc7ce6..00000000000
--- a/libjava/java/net/URLClassLoader$FileURLLoader.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$FileURLLoader__
-#define __java_net_URLClassLoader$FileURLLoader__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$URLLoader.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLClassLoader$FileURLLoader;
-        class URLClassLoader$Resource;
-    }
-  }
-}
-
-class java::net::URLClassLoader$FileURLLoader : public ::java::net::URLClassLoader$URLLoader
-{
-
-public: // actually package-private
-  URLClassLoader$FileURLLoader(::java::net::URLClassLoader *, ::java::net::URL *, ::java::net::URL *);
-  ::java::net::URLClassLoader$Resource * getResource(::java::lang::String *);
-  ::java::io::File * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$URLLoader)))) dir;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$FileURLLoader__
diff --git a/libjava/java/net/URLClassLoader$JarURLLoader.h b/libjava/java/net/URLClassLoader$JarURLLoader.h
deleted file mode 100644
index f1a36153a2c..00000000000
--- a/libjava/java/net/URLClassLoader$JarURLLoader.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$JarURLLoader__
-#define __java_net_URLClassLoader$JarURLLoader__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$URLLoader.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLClassLoader$JarURLLoader;
-        class URLClassLoader$Resource;
-    }
-  }
-}
-
-class java::net::URLClassLoader$JarURLLoader : public ::java::net::URLClassLoader$URLLoader
-{
-
-public:
-  URLClassLoader$JarURLLoader(::java::net::URLClassLoader *, ::java::net::URL *, ::java::net::URL *);
-public: // actually package-private
-  ::java::net::URLClassLoader$Resource * getResource(::java::lang::String *);
-  ::java::util::jar::Manifest * getManifest();
-  ::java::util::Vector * getClassPath();
-  ::java::util::jar::JarFile * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$URLLoader)))) jarfile;
-  ::java::net::URL * baseJarURL;
-  ::java::util::Vector * classPath;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$JarURLLoader__
diff --git a/libjava/java/net/URLClassLoader$JarURLResource.h b/libjava/java/net/URLClassLoader$JarURLResource.h
deleted file mode 100644
index 0db0fdeec99..00000000000
--- a/libjava/java/net/URLClassLoader$JarURLResource.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$JarURLResource__
-#define __java_net_URLClassLoader$JarURLResource__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$Resource.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader$JarURLLoader;
-        class URLClassLoader$JarURLResource;
-    }
-    namespace security
-    {
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::net::URLClassLoader$JarURLResource : public ::java::net::URLClassLoader$Resource
-{
-
-public: // actually package-private
-  URLClassLoader$JarURLResource(::java::net::URLClassLoader$JarURLLoader *, ::java::lang::String *, ::java::util::jar::JarEntry *);
-  ::java::io::InputStream * getInputStream();
-  jint getLength();
-  JArray< ::java::security::cert::Certificate * > * getCertificates();
-  ::java::net::URL * getURL();
-private:
-  ::java::util::jar::JarEntry * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$Resource)))) entry;
-  ::java::lang::String * name;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$JarURLResource__
diff --git a/libjava/java/net/URLClassLoader$RemoteResource.h b/libjava/java/net/URLClassLoader$RemoteResource.h
deleted file mode 100644
index 10d2622c9fe..00000000000
--- a/libjava/java/net/URLClassLoader$RemoteResource.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$RemoteResource__
-#define __java_net_URLClassLoader$RemoteResource__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$Resource.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader$RemoteResource;
-        class URLClassLoader$RemoteURLLoader;
-    }
-  }
-}
-
-class java::net::URLClassLoader$RemoteResource : public ::java::net::URLClassLoader$Resource
-{
-
-public: // actually package-private
-  URLClassLoader$RemoteResource(::java::net::URLClassLoader$RemoteURLLoader *, ::java::lang::String *, ::java::net::URL *, ::java::io::InputStream *, jint);
-  ::java::io::InputStream * getInputStream();
-public:
-  jint getLength();
-  ::java::net::URL * getURL();
-private:
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$Resource)))) url;
-  ::java::io::InputStream * stream;
-  jint length;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$RemoteResource__
diff --git a/libjava/java/net/URLClassLoader$RemoteURLLoader.h b/libjava/java/net/URLClassLoader$RemoteURLLoader.h
deleted file mode 100644
index 7c2876b4ef6..00000000000
--- a/libjava/java/net/URLClassLoader$RemoteURLLoader.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$RemoteURLLoader__
-#define __java_net_URLClassLoader$RemoteURLLoader__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$URLLoader.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLClassLoader$RemoteURLLoader;
-        class URLClassLoader$Resource;
-    }
-  }
-}
-
-class java::net::URLClassLoader$RemoteURLLoader : public ::java::net::URLClassLoader$URLLoader
-{
-
-public: // actually package-private
-  URLClassLoader$RemoteURLLoader(::java::net::URLClassLoader *, ::java::net::URL *);
-  ::java::net::URLClassLoader$Resource * getResource(::java::lang::String *);
-private:
-  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$URLLoader)))) protocol;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$RemoteURLLoader__
diff --git a/libjava/java/net/URLClassLoader$Resource.h b/libjava/java/net/URLClassLoader$Resource.h
deleted file mode 100644
index 7fc102a9224..00000000000
--- a/libjava/java/net/URLClassLoader$Resource.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$Resource__
-#define __java_net_URLClassLoader$Resource__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader$Resource;
-        class URLClassLoader$URLLoader;
-    }
-    namespace security
-    {
-        class CodeSource;
-      namespace cert
-      {
-          class Certificate;
-      }
-    }
-  }
-}
-
-class java::net::URLClassLoader$Resource : public ::java::lang::Object
-{
-
-public: // actually package-private
-  URLClassLoader$Resource(::java::net::URLClassLoader$URLLoader *);
-  virtual ::java::security::CodeSource * getCodeSource();
-  virtual JArray< ::java::security::cert::Certificate * > * getCertificates();
-  virtual ::java::net::URL * getURL() = 0;
-  virtual jint getLength() = 0;
-  virtual ::java::io::InputStream * getInputStream() = 0;
-  ::java::net::URLClassLoader$URLLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) loader;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$Resource__
diff --git a/libjava/java/net/URLClassLoader$SoResource.h b/libjava/java/net/URLClassLoader$SoResource.h
deleted file mode 100644
index dce7601125f..00000000000
--- a/libjava/java/net/URLClassLoader$SoResource.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$SoResource__
-#define __java_net_URLClassLoader$SoResource__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$Resource.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader$SoResource;
-        class URLClassLoader$SoURLLoader;
-    }
-  }
-}
-
-class java::net::URLClassLoader$SoResource : public ::java::net::URLClassLoader$Resource
-{
-
-public: // actually package-private
-  URLClassLoader$SoResource(::java::net::URLClassLoader$SoURLLoader *, ::java::net::URL *);
-  ::java::io::InputStream * getInputStream();
-public:
-  jint getLength();
-  ::java::net::URL * getURL();
-public: // actually package-private
-  ::java::net::URL * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$Resource)))) url;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$SoResource__
diff --git a/libjava/java/net/URLClassLoader$SoURLLoader.h b/libjava/java/net/URLClassLoader$SoURLLoader.h
deleted file mode 100644
index 85d2d2e991a..00000000000
--- a/libjava/java/net/URLClassLoader$SoURLLoader.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$SoURLLoader__
-#define __java_net_URLClassLoader$SoURLLoader__
-
-#pragma interface
-
-#include <java/net/URLClassLoader$URLLoader.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace gcj
-    {
-      namespace runtime
-      {
-          class SharedLibHelper;
-      }
-    }
-  }
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLClassLoader$Resource;
-        class URLClassLoader$SoURLLoader;
-    }
-  }
-}
-
-class java::net::URLClassLoader$SoURLLoader : public ::java::net::URLClassLoader$URLLoader
-{
-
-public: // actually package-private
-  URLClassLoader$SoURLLoader(::java::net::URLClassLoader *, ::java::net::URL *);
-  URLClassLoader$SoURLLoader(::java::net::URLClassLoader *, ::java::net::URL *, ::java::net::URL *);
-  ::java::lang::Class * getClass(::java::lang::String *);
-  ::java::net::URLClassLoader$Resource * getResource(::java::lang::String *);
-  ::gnu::gcj::runtime::SharedLibHelper * __attribute__((aligned(__alignof__( ::java::net::URLClassLoader$URLLoader)))) helper;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$SoURLLoader__
diff --git a/libjava/java/net/URLClassLoader$URLLoader.h b/libjava/java/net/URLClassLoader$URLLoader.h
deleted file mode 100644
index f205d74b3db..00000000000
--- a/libjava/java/net/URLClassLoader$URLLoader.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __java_net_URLClassLoader$URLLoader__
-#define __java_net_URLClassLoader$URLLoader__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-        class URLClassLoader;
-        class URLClassLoader$Resource;
-        class URLClassLoader$URLLoader;
-    }
-    namespace security
-    {
-        class CodeSource;
-    }
-  }
-}
-
-class java::net::URLClassLoader$URLLoader : public ::java::lang::Object
-{
-
-public: // actually package-private
-  URLClassLoader$URLLoader(::java::net::URLClassLoader *, ::java::net::URL *);
-  URLClassLoader$URLLoader(::java::net::URLClassLoader *, ::java::net::URL *, ::java::net::URL *);
-  virtual ::java::lang::Class * getClass(::java::lang::String *);
-  virtual ::java::net::URLClassLoader$Resource * getResource(::java::lang::String *) = 0;
-  virtual ::java::util::jar::Manifest * getManifest();
-  virtual ::java::util::Vector * getClassPath();
-  ::java::net::URLClassLoader * __attribute__((aligned(__alignof__( ::java::lang::Object)))) classloader;
-  ::java::net::URL * baseURL;
-  ::java::security::CodeSource * noCertCodeSource;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __java_net_URLClassLoader$URLLoader__