--- a/jdk/make/sun/net/spi/Makefile	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/make/sun/net/spi/Makefile	Fri Sep 19 15:14:53 2008 +0100
@@ -23,10 +23,6 @@
 # have any questions.
 #
 
-#
-# Makefile for building com/sun
-#
-
 BUILDDIR = ../../..
 include $(BUILDDIR)/common/Defs.gmk
 

--- a/jdk/make/sun/net/spi/nameservice/Makefile	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/make/sun/net/spi/nameservice/Makefile	Fri Sep 19 15:14:53 2008 +0100
@@ -23,10 +23,6 @@
 # have any questions.
 #
 
-#
-# Makefile for building com/sun
-#
-
 BUILDDIR = ../../../..
 include $(BUILDDIR)/common/Defs.gmk
 

--- a/jdk/make/sun/net/spi/nameservice/dns/Makefile	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/make/sun/net/spi/nameservice/dns/Makefile	Fri Sep 19 15:14:53 2008 +0100
@@ -24,7 +24,7 @@
 #
 
 #
-# Makefile for building JNDI service provider toolkit
+# Makefile for building JNDI DNS name service provider
 #
 
 BUILDDIR = ../../../../..

--- a/jdk/src/share/classes/java/net/BindException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/java/net/BindException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-1997 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1996-2008 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
@@ -34,6 +34,7 @@
  */
 
 public class BindException extends SocketException {
+    private static final long serialVersionUID = -5945005768251722951L;
 
     /**
      * Constructs a new BindException with the specified detail

--- a/jdk/src/share/classes/java/net/ConnectException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/java/net/ConnectException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-1997 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1996-2008 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
@@ -34,6 +34,8 @@
  * @since   JDK1.1
  */
 public class ConnectException extends SocketException {
+    private static final long serialVersionUID = 3831404271622369215L;
+
     /**
      * Constructs a new ConnectException with the specified detail
      * message as to why the connect error occurred.

--- a/jdk/src/share/classes/java/net/HttpRetryException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/java/net/HttpRetryException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2008 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
@@ -37,6 +37,7 @@
  */
 public
 class HttpRetryException extends IOException {
+    private static final long serialVersionUID = -9186022286469111381L;
 
     private int responseCode;
     private String location;

--- a/jdk/src/share/classes/java/net/MalformedURLException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/java/net/MalformedURLException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-1997 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1995-2008 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
@@ -36,6 +36,8 @@
  * @since   JDK1.0
  */
 public class MalformedURLException extends IOException {
+    private static final long serialVersionUID = -182787522200415866L;
+
     /**
      * Constructs a <code>MalformedURLException</code> with no detail message.
      */

--- a/jdk/src/share/classes/java/net/NoRouteToHostException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/java/net/NoRouteToHostException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-1997 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1996-2008 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
@@ -34,6 +34,8 @@
  * @since   JDK1.1
  */
 public class NoRouteToHostException extends SocketException {
+    private static final long serialVersionUID = -1897550894873493790L;
+
     /**
      * Constructs a new NoRouteToHostException with the specified detail
      * message as to why the remote host cannot be reached.

--- a/jdk/src/share/classes/java/net/PortUnreachableException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/java/net/PortUnreachableException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 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
@@ -33,6 +33,7 @@
  */
 
 public class PortUnreachableException extends SocketException {
+    private static final long serialVersionUID = 8462541992376507323L;
 
     /**
      * Constructs a new <code>PortUnreachableException</code> with a

--- a/jdk/src/share/classes/java/net/ProtocolException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/java/net/ProtocolException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-1997 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1995-2008 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
@@ -36,6 +36,8 @@
  */
 public
 class ProtocolException extends IOException {
+    private static final long serialVersionUID = -6098449442062388080L;
+
     /**
      * Constructs a new <code>ProtocolException</code> with the
      * specified detail message.

--- a/jdk/src/share/classes/java/net/SocketException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/java/net/SocketException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1995-2008 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
@@ -35,6 +35,8 @@
  */
 public
 class SocketException extends IOException {
+    private static final long serialVersionUID = -5935874303556886934L;
+
     /**
      * Constructs a new <code>SocketException</code> with the
      * specified detail message.

--- a/jdk/src/share/classes/java/net/SocketTimeoutException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/java/net/SocketTimeoutException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2008 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
@@ -32,6 +32,7 @@
  */
 
 public class SocketTimeoutException extends java.io.InterruptedIOException {
+    private static final long serialVersionUID = -8846654841826352300L;
 
     /**
      * Constructs a new SocketTimeoutException with a detail

--- a/jdk/src/share/classes/java/net/URISyntaxException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/java/net/URISyntaxException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2008 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
@@ -38,6 +38,8 @@
 public class URISyntaxException
     extends Exception
 {
+    private static final long serialVersionUID = 2137979680897488891L;
+
     private String input;
     private int index;
 

--- a/jdk/src/share/classes/java/net/UnknownHostException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/java/net/UnknownHostException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-1997 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1995-2008 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
@@ -35,6 +35,8 @@
  */
 public
 class UnknownHostException extends IOException {
+    private static final long serialVersionUID = -4639126076052875403L;
+
     /**
      * Constructs a new <code>UnknownHostException</code> with the
      * specified detail message.

--- a/jdk/src/share/classes/java/net/UnknownServiceException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/java/net/UnknownServiceException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-1997 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1995-2008 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
@@ -37,6 +37,8 @@
  * @since   JDK1.0
  */
 public class UnknownServiceException extends IOException {
+    private static final long serialVersionUID = -4169033248853639508L;
+
     /**
      * Constructs a new <code>UnknownServiceException</code> with no
      * detail message.

--- a/jdk/src/share/classes/sun/net/ConnectionResetException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/sun/net/ConnectionResetException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2002-2008 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
@@ -30,10 +30,11 @@
 /**
  * Thrown to indicate a connection reset.
  *
- * @since   1.4
+ * @since   1.4.1
  */
 public
 class ConnectionResetException extends SocketException {
+    private static final long serialVersionUID = -7633185991801851556L;
 
     public ConnectionResetException(String msg) {
         super(msg);

--- a/jdk/src/share/classes/sun/net/ProgressEvent.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/sun/net/ProgressEvent.java	Fri Sep 19 15:14:53 2008 +0100
@@ -32,6 +32,7 @@
  *
  * @author Stanley Man-Kit Ho
  */
+@SuppressWarnings("serial")  // never serialized
 public class ProgressEvent extends EventObject  {
     // URL of the stream
     private URL url;

--- a/jdk/src/share/classes/sun/net/TelnetProtocolException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/sun/net/TelnetProtocolException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1995 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1994-2008 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
@@ -35,6 +35,8 @@
  */
 
 public class TelnetProtocolException extends IOException {
+    private static final long serialVersionUID = 8509127047257111343L;
+
     public TelnetProtocolException(String s) {
         super(s);
     }

--- a/jdk/src/share/classes/sun/net/ftp/FtpLoginException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/sun/net/ftp/FtpLoginException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1995 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1994-2008 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
@@ -34,6 +34,8 @@
  * @author      Jonathan Payne
  */
 public class FtpLoginException extends FtpProtocolException {
+    private static final long serialVersionUID = 2218162403237941536L;
+
     FtpLoginException(String s) {
         super(s);
     }

--- a/jdk/src/share/classes/sun/net/ftp/FtpProtocolException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/sun/net/ftp/FtpProtocolException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1995 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1994-2008 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
@@ -34,6 +34,8 @@
  * @author      Jonathan Payne
  */
 public class FtpProtocolException extends IOException {
+    private static final long serialVersionUID = 5978077070276545054L;
+
     FtpProtocolException(String s) {
         super(s);
     }

--- a/jdk/src/share/classes/sun/net/httpserver/HttpError.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/sun/net/httpserver/HttpError.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2008 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
@@ -29,6 +29,8 @@
  * A Http error
  */
 class HttpError extends RuntimeException {
+    private static final long serialVersionUID = 8769596371344178179L;
+
     public HttpError (String msg) {
         super (msg);
     }

--- a/jdk/src/share/classes/sun/net/httpserver/StreamClosedException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/sun/net/httpserver/StreamClosedException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2008 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
@@ -28,4 +28,5 @@
 import java.io.*;
 
 class StreamClosedException extends IOException {
+    private static final long serialVersionUID = -4485921499356327937L;
 }

--- a/jdk/src/share/classes/sun/net/smtp/SmtpProtocolException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/sun/net/smtp/SmtpProtocolException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1995-2008 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
@@ -32,6 +32,8 @@
  * an SMTP session.
  */
 public class SmtpProtocolException extends IOException {
+    private static final long serialVersionUID = -7547136771133814908L;
+
     SmtpProtocolException(String s) {
         super(s);
     }

--- a/jdk/src/share/classes/sun/net/www/ApplicationLaunchException.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/sun/net/www/ApplicationLaunchException.java	Fri Sep 19 15:14:53 2008 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1996-2008 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
@@ -33,6 +33,8 @@
  */
 
 public class ApplicationLaunchException extends Exception {
+    private static final long serialVersionUID = -4782286141289536883L;
+
     public ApplicationLaunchException(String reason) {
         super(reason);
     }

--- a/jdk/src/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java	Fri Sep 19 15:14:53 2008 +0100
@@ -43,6 +43,7 @@
  * @author Chris Hegarty
  */
 
+@SuppressWarnings("serial")  // never serialized
 public class KeepAliveStreamCleaner extends LinkedBlockingQueue<KeepAliveCleanerEntry> implements Runnable
 {
     // maximum amount of remaining data that we will try to cleanup

--- a/jdk/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java	Fri Sep 19 15:14:53 2008 +0100
@@ -59,6 +59,8 @@
     // instances as a result of a single authorization (for multiple domains)
 
     static class Parameters implements java.io.Serializable {
+        private static final long serialVersionUID = -3584543755194526252L;
+
         private boolean serverQop; // server proposed qop=auth
         private String opaque;
         private String cnonce;

--- a/jdk/src/solaris/classes/sun/net/www/protocol/http/NTLMAuthentication.java	Fri Sep 19 14:03:04 2008 +0100
+++ b/jdk/src/solaris/classes/sun/net/www/protocol/http/NTLMAuthentication.java	Fri Sep 19 15:14:53 2008 +0100
@@ -64,6 +64,7 @@
  */
 
 class NTLMAuthentication extends AuthenticationInfo {
+    private static final long serialVersionUID = -2403849171106437142L;
 
     static char NTLM_AUTH = 'N';