diff --git a/jdk/make/sun/net/spi/Makefile b/jdk/make/sun/net/spi/Makefile index 20583bc4eb7..f969b87992a 100644 --- a/jdk/make/sun/net/spi/Makefile +++ b/jdk/make/sun/net/spi/Makefile @@ -23,10 +23,6 @@ # have any questions. # -# -# Makefile for building com/sun -# - BUILDDIR = ../../.. include $(BUILDDIR)/common/Defs.gmk diff --git a/jdk/make/sun/net/spi/nameservice/Makefile b/jdk/make/sun/net/spi/nameservice/Makefile index b6593c71d55..b0ff374de3d 100644 --- a/jdk/make/sun/net/spi/nameservice/Makefile +++ b/jdk/make/sun/net/spi/nameservice/Makefile @@ -23,10 +23,6 @@ # have any questions. # -# -# Makefile for building com/sun -# - BUILDDIR = ../../../.. include $(BUILDDIR)/common/Defs.gmk diff --git a/jdk/make/sun/net/spi/nameservice/dns/Makefile b/jdk/make/sun/net/spi/nameservice/dns/Makefile index a882eada97a..daf35125d11 100644 --- a/jdk/make/sun/net/spi/nameservice/dns/Makefile +++ b/jdk/make/sun/net/spi/nameservice/dns/Makefile @@ -24,7 +24,7 @@ # # -# Makefile for building JNDI service provider toolkit +# Makefile for building JNDI DNS name service provider # BUILDDIR = ../../../../.. diff --git a/jdk/src/share/classes/java/net/BindException.java b/jdk/src/share/classes/java/net/BindException.java index 9ea95d6f72b..b2975e52d48 100644 --- a/jdk/src/share/classes/java/net/BindException.java +++ b/jdk/src/share/classes/java/net/BindException.java @@ -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 @@ package java.net; */ public class BindException extends SocketException { + private static final long serialVersionUID = -5945005768251722951L; /** * Constructs a new BindException with the specified detail diff --git a/jdk/src/share/classes/java/net/ConnectException.java b/jdk/src/share/classes/java/net/ConnectException.java index 29b46ab6642..ed97e6b91bb 100644 --- a/jdk/src/share/classes/java/net/ConnectException.java +++ b/jdk/src/share/classes/java/net/ConnectException.java @@ -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 @@ package java.net; * @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. diff --git a/jdk/src/share/classes/java/net/HttpRetryException.java b/jdk/src/share/classes/java/net/HttpRetryException.java index d6f336e3e7c..5e75dc94ab7 100644 --- a/jdk/src/share/classes/java/net/HttpRetryException.java +++ b/jdk/src/share/classes/java/net/HttpRetryException.java @@ -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 @@ import java.io.IOException; */ public class HttpRetryException extends IOException { + private static final long serialVersionUID = -9186022286469111381L; private int responseCode; private String location; diff --git a/jdk/src/share/classes/java/net/MalformedURLException.java b/jdk/src/share/classes/java/net/MalformedURLException.java index c38cd542cb2..b8f3b6fb5ec 100644 --- a/jdk/src/share/classes/java/net/MalformedURLException.java +++ b/jdk/src/share/classes/java/net/MalformedURLException.java @@ -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 @@ import java.io.IOException; * @since JDK1.0 */ public class MalformedURLException extends IOException { + private static final long serialVersionUID = -182787522200415866L; + /** * Constructs a MalformedURLException with no detail message. */ diff --git a/jdk/src/share/classes/java/net/NoRouteToHostException.java b/jdk/src/share/classes/java/net/NoRouteToHostException.java index 8bfc3de72ad..e6db581a222 100644 --- a/jdk/src/share/classes/java/net/NoRouteToHostException.java +++ b/jdk/src/share/classes/java/net/NoRouteToHostException.java @@ -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 @@ package java.net; * @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. diff --git a/jdk/src/share/classes/java/net/PortUnreachableException.java b/jdk/src/share/classes/java/net/PortUnreachableException.java index cf8f24d23a9..e4491d89132 100644 --- a/jdk/src/share/classes/java/net/PortUnreachableException.java +++ b/jdk/src/share/classes/java/net/PortUnreachableException.java @@ -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 @@ package java.net; */ public class PortUnreachableException extends SocketException { + private static final long serialVersionUID = 8462541992376507323L; /** * Constructs a new PortUnreachableException with a diff --git a/jdk/src/share/classes/java/net/ProtocolException.java b/jdk/src/share/classes/java/net/ProtocolException.java index 3eef7d5382b..b0567f2e573 100644 --- a/jdk/src/share/classes/java/net/ProtocolException.java +++ b/jdk/src/share/classes/java/net/ProtocolException.java @@ -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 @@ import java.io.IOException; */ public class ProtocolException extends IOException { + private static final long serialVersionUID = -6098449442062388080L; + /** * Constructs a new ProtocolException with the * specified detail message. diff --git a/jdk/src/share/classes/java/net/SocketException.java b/jdk/src/share/classes/java/net/SocketException.java index 6b40c3c832d..6e6f60d340e 100644 --- a/jdk/src/share/classes/java/net/SocketException.java +++ b/jdk/src/share/classes/java/net/SocketException.java @@ -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 @@ import java.io.IOException; */ public class SocketException extends IOException { + private static final long serialVersionUID = -5935874303556886934L; + /** * Constructs a new SocketException with the * specified detail message. diff --git a/jdk/src/share/classes/java/net/SocketTimeoutException.java b/jdk/src/share/classes/java/net/SocketTimeoutException.java index b4499595956..fab3a5810a5 100644 --- a/jdk/src/share/classes/java/net/SocketTimeoutException.java +++ b/jdk/src/share/classes/java/net/SocketTimeoutException.java @@ -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 @@ package java.net; */ public class SocketTimeoutException extends java.io.InterruptedIOException { + private static final long serialVersionUID = -8846654841826352300L; /** * Constructs a new SocketTimeoutException with a detail diff --git a/jdk/src/share/classes/java/net/URISyntaxException.java b/jdk/src/share/classes/java/net/URISyntaxException.java index e1882be40fe..17a6bbb72d0 100644 --- a/jdk/src/share/classes/java/net/URISyntaxException.java +++ b/jdk/src/share/classes/java/net/URISyntaxException.java @@ -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 @@ package java.net; public class URISyntaxException extends Exception { + private static final long serialVersionUID = 2137979680897488891L; + private String input; private int index; diff --git a/jdk/src/share/classes/java/net/UnknownHostException.java b/jdk/src/share/classes/java/net/UnknownHostException.java index b6df3be5d8d..860b847d6aa 100644 --- a/jdk/src/share/classes/java/net/UnknownHostException.java +++ b/jdk/src/share/classes/java/net/UnknownHostException.java @@ -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 @@ import java.io.IOException; */ public class UnknownHostException extends IOException { + private static final long serialVersionUID = -4639126076052875403L; + /** * Constructs a new UnknownHostException with the * specified detail message. diff --git a/jdk/src/share/classes/java/net/UnknownServiceException.java b/jdk/src/share/classes/java/net/UnknownServiceException.java index 9e3e7fd3520..d006e3af23c 100644 --- a/jdk/src/share/classes/java/net/UnknownServiceException.java +++ b/jdk/src/share/classes/java/net/UnknownServiceException.java @@ -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 @@ import java.io.IOException; * @since JDK1.0 */ public class UnknownServiceException extends IOException { + private static final long serialVersionUID = -4169033248853639508L; + /** * Constructs a new UnknownServiceException with no * detail message. diff --git a/jdk/src/share/classes/sun/net/ConnectionResetException.java b/jdk/src/share/classes/sun/net/ConnectionResetException.java index 095ba913398..69202945d4d 100644 --- a/jdk/src/share/classes/sun/net/ConnectionResetException.java +++ b/jdk/src/share/classes/sun/net/ConnectionResetException.java @@ -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 @@ import java.net.SocketException; /** * 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); diff --git a/jdk/src/share/classes/sun/net/ProgressEvent.java b/jdk/src/share/classes/sun/net/ProgressEvent.java index ee4ec018d22..cba1007e32e 100644 --- a/jdk/src/share/classes/sun/net/ProgressEvent.java +++ b/jdk/src/share/classes/sun/net/ProgressEvent.java @@ -32,6 +32,7 @@ import java.net.URL; * * @author Stanley Man-Kit Ho */ +@SuppressWarnings("serial") // never serialized public class ProgressEvent extends EventObject { // URL of the stream private URL url; diff --git a/jdk/src/share/classes/sun/net/TelnetProtocolException.java b/jdk/src/share/classes/sun/net/TelnetProtocolException.java index 4cf4e72db69..8400d13ba99 100644 --- a/jdk/src/share/classes/sun/net/TelnetProtocolException.java +++ b/jdk/src/share/classes/sun/net/TelnetProtocolException.java @@ -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 @@ import java.io.*; */ public class TelnetProtocolException extends IOException { + private static final long serialVersionUID = 8509127047257111343L; + public TelnetProtocolException(String s) { super(s); } diff --git a/jdk/src/share/classes/sun/net/ftp/FtpLoginException.java b/jdk/src/share/classes/sun/net/ftp/FtpLoginException.java index 55cf34ffe10..0d37a8706ce 100644 --- a/jdk/src/share/classes/sun/net/ftp/FtpLoginException.java +++ b/jdk/src/share/classes/sun/net/ftp/FtpLoginException.java @@ -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 @@ import java.io.*; * @author Jonathan Payne */ public class FtpLoginException extends FtpProtocolException { + private static final long serialVersionUID = 2218162403237941536L; + FtpLoginException(String s) { super(s); } diff --git a/jdk/src/share/classes/sun/net/ftp/FtpProtocolException.java b/jdk/src/share/classes/sun/net/ftp/FtpProtocolException.java index 9745f9eb999..6afbe215e0f 100644 --- a/jdk/src/share/classes/sun/net/ftp/FtpProtocolException.java +++ b/jdk/src/share/classes/sun/net/ftp/FtpProtocolException.java @@ -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 @@ import java.io.*; * @author Jonathan Payne */ public class FtpProtocolException extends IOException { + private static final long serialVersionUID = 5978077070276545054L; + FtpProtocolException(String s) { super(s); } diff --git a/jdk/src/share/classes/sun/net/httpserver/HttpError.java b/jdk/src/share/classes/sun/net/httpserver/HttpError.java index a6dd066aa88..77dca7ed57d 100644 --- a/jdk/src/share/classes/sun/net/httpserver/HttpError.java +++ b/jdk/src/share/classes/sun/net/httpserver/HttpError.java @@ -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 @@ package sun.net.httpserver; * A Http error */ class HttpError extends RuntimeException { + private static final long serialVersionUID = 8769596371344178179L; + public HttpError (String msg) { super (msg); } diff --git a/jdk/src/share/classes/sun/net/httpserver/StreamClosedException.java b/jdk/src/share/classes/sun/net/httpserver/StreamClosedException.java index 0fc2c6d5039..09295fdc1f9 100644 --- a/jdk/src/share/classes/sun/net/httpserver/StreamClosedException.java +++ b/jdk/src/share/classes/sun/net/httpserver/StreamClosedException.java @@ -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 @@ package sun.net.httpserver; import java.io.*; class StreamClosedException extends IOException { + private static final long serialVersionUID = -4485921499356327937L; } diff --git a/jdk/src/share/classes/sun/net/smtp/SmtpProtocolException.java b/jdk/src/share/classes/sun/net/smtp/SmtpProtocolException.java index 0550eea738e..e52563dbdce 100644 --- a/jdk/src/share/classes/sun/net/smtp/SmtpProtocolException.java +++ b/jdk/src/share/classes/sun/net/smtp/SmtpProtocolException.java @@ -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 @@ import java.io.IOException; * an SMTP session. */ public class SmtpProtocolException extends IOException { + private static final long serialVersionUID = -7547136771133814908L; + SmtpProtocolException(String s) { super(s); } diff --git a/jdk/src/share/classes/sun/net/www/ApplicationLaunchException.java b/jdk/src/share/classes/sun/net/www/ApplicationLaunchException.java index 3b346d5bea5..fe4370690a1 100644 --- a/jdk/src/share/classes/sun/net/www/ApplicationLaunchException.java +++ b/jdk/src/share/classes/sun/net/www/ApplicationLaunchException.java @@ -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 @@ package sun.net.www; */ public class ApplicationLaunchException extends Exception { + private static final long serialVersionUID = -4782286141289536883L; + public ApplicationLaunchException(String reason) { super(reason); } diff --git a/jdk/src/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java b/jdk/src/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java index 7eea3194cc1..ec149197f0c 100644 --- a/jdk/src/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java +++ b/jdk/src/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java @@ -43,6 +43,7 @@ import java.security.PrivilegedAction; * @author Chris Hegarty */ +@SuppressWarnings("serial") // never serialized public class KeepAliveStreamCleaner extends LinkedBlockingQueue implements Runnable { // maximum amount of remaining data that we will try to cleanup diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java b/jdk/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java index 7720640a04b..8ddaa4d87d3 100644 --- a/jdk/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java +++ b/jdk/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java @@ -59,6 +59,8 @@ class DigestAuthentication extends AuthenticationInfo { // 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; diff --git a/jdk/src/solaris/classes/sun/net/www/protocol/http/NTLMAuthentication.java b/jdk/src/solaris/classes/sun/net/www/protocol/http/NTLMAuthentication.java index 9130be50d84..4c5c6c84795 100644 --- a/jdk/src/solaris/classes/sun/net/www/protocol/http/NTLMAuthentication.java +++ b/jdk/src/solaris/classes/sun/net/www/protocol/http/NTLMAuthentication.java @@ -64,6 +64,7 @@ import java.net.*; */ class NTLMAuthentication extends AuthenticationInfo { + private static final long serialVersionUID = -2403849171106437142L; static char NTLM_AUTH = 'N';