Merge

61 files changed, 182 insertions, 64 deletions

diff --git a/src/share/classes/java/io/CharConversionException.java b/src/share/classes/java/io/CharConversionException.java
index 9e4b0ad0a..d3a79e80f 100644
--- a/src/share/classes/java/io/CharConversionException.java
+++ b/src/share/classes/java/io/CharConversionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-1999 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 java.io;
 public class CharConversionException
     extends java.io.IOException
 {
+    private static final long serialVersionUID = -8680016352018427031L;
+
     /**
      * This provides no detailed message.
      */
diff --git a/src/share/classes/java/io/EOFException.java b/src/share/classes/java/io/EOFException.java
index d91ecf627..6094837f5 100644
--- a/src/share/classes/java/io/EOFException.java
+++ b/src/share/classes/java/io/EOFException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2000 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
@@ -41,6 +41,8 @@ package java.io;
  */
 public
 class EOFException extends IOException {
+    private static final long serialVersionUID = 6433858223774886977L;
+
     /**
      * Constructs an <code>EOFException</code> with <code>null</code>
      * as its error detail message.
diff --git a/src/share/classes/java/io/FileNotFoundException.java b/src/share/classes/java/io/FileNotFoundException.java
index 18ed3f18c..198bbba81 100644
--- a/src/share/classes/java/io/FileNotFoundException.java
+++ b/src/share/classes/java/io/FileNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1999 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
@@ -41,6 +41,7 @@ package java.io;
  */
 
 public class FileNotFoundException extends IOException {
+    private static final long serialVersionUID = -897856973823710492L;
 
     /**
      * Constructs a <code>FileNotFoundException</code> with
diff --git a/src/share/classes/java/io/InterruptedIOException.java b/src/share/classes/java/io/InterruptedIOException.java
index 41cedf6b8..054fe2bb1 100644
--- a/src/share/classes/java/io/InterruptedIOException.java
+++ b/src/share/classes/java/io/InterruptedIOException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2000 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
@@ -41,6 +41,8 @@ package java.io;
  */
 public
 class InterruptedIOException extends IOException {
+    private static final long serialVersionUID = 4020568460727500567L;
+
     /**
      * Constructs an <code>InterruptedIOException</code> with
      * <code>null</code> as its error detail message.
diff --git a/src/share/classes/java/io/SyncFailedException.java b/src/share/classes/java/io/SyncFailedException.java
index b2583ad2b..b08c8d97d 100644
--- a/src/share/classes/java/io/SyncFailedException.java
+++ b/src/share/classes/java/io/SyncFailedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-1999 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.io;
  * @since   JDK1.1
  */
 public class SyncFailedException extends IOException {
+    private static final long serialVersionUID = -2353342684412443330L;
+
     /**
      * Constructs an SyncFailedException with a detail message.
      * A detail message is a String that describes this particular exception.
diff --git a/src/share/classes/java/io/UTFDataFormatException.java b/src/share/classes/java/io/UTFDataFormatException.java
index bb89c1645..2f789a019 100644
--- a/src/share/classes/java/io/UTFDataFormatException.java
+++ b/src/share/classes/java/io/UTFDataFormatException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2004 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
@@ -44,6 +44,8 @@ package java.io;
  */
 public
 class UTFDataFormatException extends IOException {
+    private static final long serialVersionUID = 420743449228280612L;
+
     /**
      * Constructs a <code>UTFDataFormatException</code> with
      * <code>null</code> as its error detail message.
diff --git a/src/share/classes/java/io/UnsupportedEncodingException.java b/src/share/classes/java/io/UnsupportedEncodingException.java
index 2ee9cb647..9ccdd2ee6 100644
--- a/src/share/classes/java/io/UnsupportedEncodingException.java
+++ b/src/share/classes/java/io/UnsupportedEncodingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-1999 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 java.io;
 public class UnsupportedEncodingException
     extends IOException
 {
+    private static final long serialVersionUID = -4274276298326136670L;
+
     /**
      * Constructs an UnsupportedEncodingException without a detail message.
      */
diff --git a/src/share/classes/java/lang/AbstractMethodError.java b/src/share/classes/java/lang/AbstractMethodError.java
index 15dcb96a7..a8f11e7ab 100644
--- a/src/share/classes/java/lang/AbstractMethodError.java
+++ b/src/share/classes/java/lang/AbstractMethodError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-2005 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
@@ -37,6 +37,8 @@ package java.lang;
  */
 public
 class AbstractMethodError extends IncompatibleClassChangeError {
+    private static final long serialVersionUID = -1654391082989018462L;
+
     /**
      * Constructs an <code>AbstractMethodError</code> with no detail  message.
      */
diff --git a/src/share/classes/java/lang/ArithmeticException.java b/src/share/classes/java/lang/ArithmeticException.java
index a90cda11c..a51d95db8 100644
--- a/src/share/classes/java/lang/ArithmeticException.java
+++ b/src/share/classes/java/lang/ArithmeticException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1997 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 @@ package java.lang;
  */
 public
 class ArithmeticException extends RuntimeException {
+    private static final long serialVersionUID = 2256477558314496007L;
+
     /**
      * Constructs an <code>ArithmeticException</code> with no detail
      * message.
diff --git a/src/share/classes/java/lang/ArrayIndexOutOfBoundsException.java b/src/share/classes/java/lang/ArrayIndexOutOfBoundsException.java
index 5c96020bf..cc51bdd04 100644
--- a/src/share/classes/java/lang/ArrayIndexOutOfBoundsException.java
+++ b/src/share/classes/java/lang/ArrayIndexOutOfBoundsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1997 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 @@ package java.lang;
  */
 public
 class ArrayIndexOutOfBoundsException extends IndexOutOfBoundsException {
+    private static final long serialVersionUID = -5116101128118950844L;
+
     /**
      * Constructs an <code>ArrayIndexOutOfBoundsException</code> with no
      * detail message.
diff --git a/src/share/classes/java/lang/ArrayStoreException.java b/src/share/classes/java/lang/ArrayStoreException.java
index 9aa4f7a98..af24f1ac2 100644
--- a/src/share/classes/java/lang/ArrayStoreException.java
+++ b/src/share/classes/java/lang/ArrayStoreException.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
@@ -39,6 +39,8 @@ package java.lang;
  */
 public
 class ArrayStoreException extends RuntimeException {
+    private static final long serialVersionUID = -4522193890499838241L;
+
     /**
      * Constructs an <code>ArrayStoreException</code> with no detail message.
      */
diff --git a/src/share/classes/java/lang/AssertionError.java b/src/share/classes/java/lang/AssertionError.java
index 0e6e45c21..b64b7cbae 100644
--- a/src/share/classes/java/lang/AssertionError.java
+++ b/src/share/classes/java/lang/AssertionError.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
@@ -43,6 +43,8 @@ package java.lang;
  * @since   1.4
  */
 public class AssertionError extends Error {
+    private static final long serialVersionUID = -5013299493970297370L;
+
     /**
      * Constructs an AssertionError with no detail message.
      */
diff --git a/src/share/classes/java/lang/ClassCastException.java b/src/share/classes/java/lang/ClassCastException.java
index 057b55bb5..310c87f94 100644
--- a/src/share/classes/java/lang/ClassCastException.java
+++ b/src/share/classes/java/lang/ClassCastException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1997 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
@@ -39,6 +39,8 @@ package java.lang;
  */
 public
 class ClassCastException extends RuntimeException {
+    private static final long serialVersionUID = -9223365651070458532L;
+
     /**
      * Constructs a <code>ClassCastException</code> with no detail message.
      */
diff --git a/src/share/classes/java/lang/ClassCircularityError.java b/src/share/classes/java/lang/ClassCircularityError.java
index 5d522626d..27d5dfbf0 100644
--- a/src/share/classes/java/lang/ClassCircularityError.java
+++ b/src/share/classes/java/lang/ClassCircularityError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2007 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
@@ -33,6 +33,8 @@ package java.lang;
  * @since      JDK1.0
  */
 public class ClassCircularityError extends LinkageError {
+    private static final long serialVersionUID = 1054362542914539689L;
+
     /**
      * Constructs a {@code ClassCircularityError} with no detail message.
      */
diff --git a/src/share/classes/java/lang/ClassFormatError.java b/src/share/classes/java/lang/ClassFormatError.java
index d2e61a4e2..75a042118 100644
--- a/src/share/classes/java/lang/ClassFormatError.java
+++ b/src/share/classes/java/lang/ClassFormatError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1997 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 @@ package java.lang;
  */
 public
 class ClassFormatError extends LinkageError {
+    private static final long serialVersionUID = -8420114879011949195L;
+
     /**
      * Constructs a <code>ClassFormatError</code> with no detail message.
      */
diff --git a/src/share/classes/java/lang/CloneNotSupportedException.java b/src/share/classes/java/lang/CloneNotSupportedException.java
index d3b7b3373..cfa643fc4 100644
--- a/src/share/classes/java/lang/CloneNotSupportedException.java
+++ b/src/share/classes/java/lang/CloneNotSupportedException.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
@@ -43,6 +43,8 @@ package java.lang;
 
 public
 class CloneNotSupportedException extends Exception {
+    private static final long serialVersionUID = 5195511250079656443L;
+
     /**
      * Constructs a <code>CloneNotSupportedException</code> with no
      * detail message.
diff --git a/src/share/classes/java/lang/EnumConstantNotPresentException.java b/src/share/classes/java/lang/EnumConstantNotPresentException.java
index c09a91296..4807691b2 100644
--- a/src/share/classes/java/lang/EnumConstantNotPresentException.java
+++ b/src/share/classes/java/lang/EnumConstantNotPresentException.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
@@ -33,6 +33,8 @@ package java.lang;
  * @since   1.5
  */
 public class EnumConstantNotPresentException extends RuntimeException {
+    private static final long serialVersionUID = -6046998521960521108L;
+
     /**
      * The type of the missing enum constant.
      */
diff --git a/src/share/classes/java/lang/IllegalAccessError.java b/src/share/classes/java/lang/IllegalAccessError.java
index 58812dbff..959c94219 100644
--- a/src/share/classes/java/lang/IllegalAccessError.java
+++ b/src/share/classes/java/lang/IllegalAccessError.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 @@ package java.lang;
  * @since   JDK1.0
  */
 public class IllegalAccessError extends IncompatibleClassChangeError {
+    private static final long serialVersionUID = -8988904074992417891L;
+
     /**
      * Constructs an <code>IllegalAccessError</code> with no detail message.
      */
diff --git a/src/share/classes/java/lang/IllegalAccessException.java b/src/share/classes/java/lang/IllegalAccessException.java
index 8f3ca8677..19b51b90f 100644
--- a/src/share/classes/java/lang/IllegalAccessException.java
+++ b/src/share/classes/java/lang/IllegalAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2000 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
@@ -57,6 +57,8 @@ package java.lang;
  * @since   JDK1.0
  */
 public class IllegalAccessException extends Exception {
+    private static final long serialVersionUID = 6616958222490762034L;
+
     /**
      * Constructs an <code>IllegalAccessException</code> without a
      * detail message.
diff --git a/src/share/classes/java/lang/IllegalMonitorStateException.java b/src/share/classes/java/lang/IllegalMonitorStateException.java
index b719afa0f..6375a10b2 100644
--- a/src/share/classes/java/lang/IllegalMonitorStateException.java
+++ b/src/share/classes/java/lang/IllegalMonitorStateException.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
@@ -40,6 +40,8 @@ package java.lang;
  */
 public
 class IllegalMonitorStateException extends RuntimeException {
+    private static final long serialVersionUID = 3713306369498869069L;
+
     /**
      * Constructs an <code>IllegalMonitorStateException</code> with no
      * detail message.
diff --git a/src/share/classes/java/lang/IllegalThreadStateException.java b/src/share/classes/java/lang/IllegalThreadStateException.java
index 7f76da0dd..56ced227a 100644
--- a/src/share/classes/java/lang/IllegalThreadStateException.java
+++ b/src/share/classes/java/lang/IllegalThreadStateException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1997 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
@@ -37,6 +37,8 @@ package java.lang;
  * @since   JDK1.0
  */
 public class IllegalThreadStateException extends IllegalArgumentException {
+    private static final long serialVersionUID = -7626246362397460174L;
+
     /**
      * Constructs an <code>IllegalThreadStateException</code> with no
      * detail message.
diff --git a/src/share/classes/java/lang/IncompatibleClassChangeError.java b/src/share/classes/java/lang/IncompatibleClassChangeError.java
index a2688c0c1..a92a18b7a 100644
--- a/src/share/classes/java/lang/IncompatibleClassChangeError.java
+++ b/src/share/classes/java/lang/IncompatibleClassChangeError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1997 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 @@ package java.lang;
  */
 public
 class IncompatibleClassChangeError extends LinkageError {
+    private static final long serialVersionUID = -4914975503642802119L;
+
     /**
      * Constructs an <code>IncompatibleClassChangeError</code> with no
      * detail message.
diff --git a/src/share/classes/java/lang/IndexOutOfBoundsException.java b/src/share/classes/java/lang/IndexOutOfBoundsException.java
index 72a8b67f0..1375204df 100644
--- a/src/share/classes/java/lang/IndexOutOfBoundsException.java
+++ b/src/share/classes/java/lang/IndexOutOfBoundsException.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 @@ package java.lang;
  */
 public
 class IndexOutOfBoundsException extends RuntimeException {
+    private static final long serialVersionUID = 234122996006267687L;
+
     /**
      * Constructs an <code>IndexOutOfBoundsException</code> with no
      * detail message.
diff --git a/src/share/classes/java/lang/InstantiationError.java b/src/share/classes/java/lang/InstantiationError.java
index 4824b3d43..9724fc487 100644
--- a/src/share/classes/java/lang/InstantiationError.java
+++ b/src/share/classes/java/lang/InstantiationError.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
@@ -40,6 +40,8 @@ package java.lang;
 
 public
 class InstantiationError extends IncompatibleClassChangeError {
+    private static final long serialVersionUID = -4885810657349421204L;
+
     /**
      * Constructs an <code>InstantiationError</code> with no detail  message.
      */
diff --git a/src/share/classes/java/lang/InstantiationException.java b/src/share/classes/java/lang/InstantiationException.java
index ab008ab6b..ace382ae4 100644
--- a/src/share/classes/java/lang/InstantiationException.java
+++ b/src/share/classes/java/lang/InstantiationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2005 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
@@ -44,6 +44,8 @@ package java.lang;
  */
 public
 class InstantiationException extends Exception {
+    private static final long serialVersionUID = -8441929162975509110L;
+
     /**
      * Constructs an {@code InstantiationException} with no detail message.
      */
diff --git a/src/share/classes/java/lang/InternalError.java b/src/share/classes/java/lang/InternalError.java
index d712af5e2..b49f7d755 100644
--- a/src/share/classes/java/lang/InternalError.java
+++ b/src/share/classes/java/lang/InternalError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1997 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 @@ package java.lang;
  */
 public
 class InternalError extends VirtualMachineError {
+    private static final long serialVersionUID = -9062593416125562365L;
+
     /**
      * Constructs an <code>InternalError</code> with no detail message.
      */
diff --git a/src/share/classes/java/lang/InterruptedException.java b/src/share/classes/java/lang/InterruptedException.java
index d57bb62d5..d8ddd3654 100644
--- a/src/share/classes/java/lang/InterruptedException.java
+++ b/src/share/classes/java/lang/InterruptedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2005 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
@@ -48,6 +48,8 @@ package java.lang;
  */
 public
 class InterruptedException extends Exception {
+    private static final long serialVersionUID = 6700697376100628473L;
+
     /**
      * Constructs an <code>InterruptedException</code> with no detail  message.
      */
diff --git a/src/share/classes/java/lang/LinkageError.java b/src/share/classes/java/lang/LinkageError.java
index 237188f36..39d094678 100644
--- a/src/share/classes/java/lang/LinkageError.java
+++ b/src/share/classes/java/lang/LinkageError.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 @@ package java.lang;
  */
 public
 class LinkageError extends Error {
+    private static final long serialVersionUID = 3579600108157160122L;
+
     /**
      * Constructs a <code>LinkageError</code> with no detail message.
      */
diff --git a/src/share/classes/java/lang/NegativeArraySizeException.java b/src/share/classes/java/lang/NegativeArraySizeException.java
index 64b763546..903409b82 100644
--- a/src/share/classes/java/lang/NegativeArraySizeException.java
+++ b/src/share/classes/java/lang/NegativeArraySizeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1997 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
@@ -33,6 +33,8 @@ package java.lang;
  */
 public
 class NegativeArraySizeException extends RuntimeException {
+    private static final long serialVersionUID = -8960118058596991861L;
+
     /**
      * Constructs a <code>NegativeArraySizeException</code> with no
      * detail message.
diff --git a/src/share/classes/java/lang/NoClassDefFoundError.java b/src/share/classes/java/lang/NoClassDefFoundError.java
index a8a1273e1..c9cf97671 100644
--- a/src/share/classes/java/lang/NoClassDefFoundError.java
+++ b/src/share/classes/java/lang/NoClassDefFoundError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-2000 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
@@ -40,6 +40,8 @@ package java.lang;
  */
 public
 class NoClassDefFoundError extends LinkageError {
+    private static final long serialVersionUID = 9095859863287012458L;
+
     /**
      * Constructs a <code>NoClassDefFoundError</code> with no detail message.
      */
diff --git a/src/share/classes/java/lang/NoSuchFieldError.java b/src/share/classes/java/lang/NoSuchFieldError.java
index 5dc7f9c1b..8b77c71b1 100644
--- a/src/share/classes/java/lang/NoSuchFieldError.java
+++ b/src/share/classes/java/lang/NoSuchFieldError.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
@@ -38,6 +38,8 @@ package java.lang;
  */
 public
 class NoSuchFieldError extends IncompatibleClassChangeError {
+    private static final long serialVersionUID = -3456430195886129035L;
+
     /**
      * Constructs a <code>NoSuchFieldException</code> with no detail  message.
      */
diff --git a/src/share/classes/java/lang/NoSuchFieldException.java b/src/share/classes/java/lang/NoSuchFieldException.java
index c75113a8c..b44fb173e 100644
--- a/src/share/classes/java/lang/NoSuchFieldException.java
+++ b/src/share/classes/java/lang/NoSuchFieldException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-1999 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
@@ -32,6 +32,8 @@ package java.lang;
  * @since   JDK1.1
  */
 public class NoSuchFieldException extends Exception {
+    private static final long serialVersionUID = -6143714805279938260L;
+
     /**
      * Constructor.
      */
diff --git a/src/share/classes/java/lang/NoSuchMethodError.java b/src/share/classes/java/lang/NoSuchMethodError.java
index 5f3a79814..74de82f3c 100644
--- a/src/share/classes/java/lang/NoSuchMethodError.java
+++ b/src/share/classes/java/lang/NoSuchMethodError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1998 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
@@ -39,6 +39,8 @@ package java.lang;
  */
 public
 class NoSuchMethodError extends IncompatibleClassChangeError {
+    private static final long serialVersionUID = -3765521442372831335L;
+
     /**
      * Constructs a <code>NoSuchMethodError</code> with no detail message.
      */
diff --git a/src/share/classes/java/lang/NoSuchMethodException.java b/src/share/classes/java/lang/NoSuchMethodException.java
index 0fc7113ad..720fbfcbb 100644
--- a/src/share/classes/java/lang/NoSuchMethodException.java
+++ b/src/share/classes/java/lang/NoSuchMethodException.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
@@ -33,6 +33,8 @@ package java.lang;
  */
 public
 class NoSuchMethodException extends Exception {
+    private static final long serialVersionUID = 5034388446362600923L;
+
     /**
      * Constructs a <code>NoSuchMethodException</code> without a detail message.
      */
diff --git a/src/share/classes/java/lang/NullPointerException.java b/src/share/classes/java/lang/NullPointerException.java
index 68fef23ac..15e899cf0 100644
--- a/src/share/classes/java/lang/NullPointerException.java
+++ b/src/share/classes/java/lang/NullPointerException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1997 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
@@ -46,6 +46,8 @@ package java.lang;
  */
 public
 class NullPointerException extends RuntimeException {
+    private static final long serialVersionUID = 5162710183389028792L;
+
     /**
      * Constructs a <code>NullPointerException</code> with no detail message.
      */
diff --git a/src/share/classes/java/lang/OutOfMemoryError.java b/src/share/classes/java/lang/OutOfMemoryError.java
index 3ab19d240..842b5c60d 100644
--- a/src/share/classes/java/lang/OutOfMemoryError.java
+++ b/src/share/classes/java/lang/OutOfMemoryError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1997 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 @@ package java.lang;
  */
 public
 class OutOfMemoryError extends VirtualMachineError {
+    private static final long serialVersionUID = 8228564086184010517L;
+
     /**
      * Constructs an <code>OutOfMemoryError</code> with no detail message.
      */
diff --git a/src/share/classes/java/lang/StackOverflowError.java b/src/share/classes/java/lang/StackOverflowError.java
index 00cd783b4..992a395f2 100644
--- a/src/share/classes/java/lang/StackOverflowError.java
+++ b/src/share/classes/java/lang/StackOverflowError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1997 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 @@ package java.lang;
  */
 public
 class StackOverflowError extends VirtualMachineError {
+    private static final long serialVersionUID = 8609175038441759607L;
+
     /**
      * Constructs a <code>StackOverflowError</code> with no detail message.
      */
diff --git a/src/share/classes/java/lang/StringIndexOutOfBoundsException.java b/src/share/classes/java/lang/StringIndexOutOfBoundsException.java
index 35bf7b4c6..a23862056 100644
--- a/src/share/classes/java/lang/StringIndexOutOfBoundsException.java
+++ b/src/share/classes/java/lang/StringIndexOutOfBoundsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-2000 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
@@ -37,6 +37,8 @@ package java.lang;
  */
 public
 class StringIndexOutOfBoundsException extends IndexOutOfBoundsException {
+    private static final long serialVersionUID = -6762910422159637258L;
+
     /**
      * Constructs a <code>StringIndexOutOfBoundsException</code> with no
      * detail message.
diff --git a/src/share/classes/java/lang/ThreadDeath.java b/src/share/classes/java/lang/ThreadDeath.java
index 1cab26699..6a3460236 100644
--- a/src/share/classes/java/lang/ThreadDeath.java
+++ b/src/share/classes/java/lang/ThreadDeath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2007 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
@@ -46,4 +46,6 @@ package java.lang;
  * @since   JDK1.0
  */
 
-public class ThreadDeath extends Error {}
+public class ThreadDeath extends Error {
+    private static final long serialVersionUID = -4417128565033088268L;
+}
diff --git a/src/share/classes/java/lang/TypeNotPresentException.java b/src/share/classes/java/lang/TypeNotPresentException.java
index 445703490..d7fa0d6bd 100644
--- a/src/share/classes/java/lang/TypeNotPresentException.java
+++ b/src/share/classes/java/lang/TypeNotPresentException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-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
@@ -40,6 +40,8 @@ package java.lang;
  * @since 1.5
  */
 public class TypeNotPresentException extends RuntimeException {
+    private static final long serialVersionUID = -5101214195716534496L;
+
     private String typeName;
 
     /**
diff --git a/src/share/classes/java/lang/UnknownError.java b/src/share/classes/java/lang/UnknownError.java
index 966b33445..437441d46 100644
--- a/src/share/classes/java/lang/UnknownError.java
+++ b/src/share/classes/java/lang/UnknownError.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
@@ -34,6 +34,8 @@ package java.lang;
  */
 public
 class UnknownError extends VirtualMachineError {
+    private static final long serialVersionUID = 2524784860676771849L;
+
     /**
      * Constructs an <code>UnknownError</code> with no detail message.
      */
diff --git a/src/share/classes/java/lang/UnsatisfiedLinkError.java b/src/share/classes/java/lang/UnsatisfiedLinkError.java
index 70426b4eb..8ffe6cc73 100644
--- a/src/share/classes/java/lang/UnsatisfiedLinkError.java
+++ b/src/share/classes/java/lang/UnsatisfiedLinkError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1997 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 @@ package java.lang;
  */
 public
 class UnsatisfiedLinkError extends LinkageError {
+    private static final long serialVersionUID = -4019343241616879428L;
+
     /**
      * Constructs an <code>UnsatisfiedLinkError</code> with no detail message.
      */
diff --git a/src/share/classes/java/lang/UnsupportedClassVersionError.java b/src/share/classes/java/lang/UnsupportedClassVersionError.java
index a36bdb79b..ec846508f 100644
--- a/src/share/classes/java/lang/UnsupportedClassVersionError.java
+++ b/src/share/classes/java/lang/UnsupportedClassVersionError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-1999 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-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.lang;
  */
 public
 class UnsupportedClassVersionError extends ClassFormatError {
+    private static final long serialVersionUID = -7123279212883497373L;
+
     /**
      * Constructs a <code>UnsupportedClassVersionError</code>
      * with no detail message.
diff --git a/src/share/classes/java/lang/VerifyError.java b/src/share/classes/java/lang/VerifyError.java
index 46f2b10dc..a24d34bfc 100644
--- a/src/share/classes/java/lang/VerifyError.java
+++ b/src/share/classes/java/lang/VerifyError.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 @@ package java.lang;
  */
 public
 class VerifyError extends LinkageError {
+    private static final long serialVersionUID = 7001962396098498785L;
+
     /**
      * Constructs an <code>VerifyError</code> with no detail message.
      */
diff --git a/src/share/classes/java/lang/annotation/AnnotationFormatError.java b/src/share/classes/java/lang/annotation/AnnotationFormatError.java
index 1ec3d457a..0bc2fd151 100644
--- a/src/share/classes/java/lang/annotation/AnnotationFormatError.java
+++ b/src/share/classes/java/lang/annotation/AnnotationFormatError.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
@@ -33,6 +33,8 @@ package java.lang.annotation;
  * @since   1.5
  */
 public class AnnotationFormatError extends Error {
+    private static final long serialVersionUID = -4256701562333669892L;
+
     /**
      * Constructs a new <tt>AnnotationFormatError</tt> with the specified
      * detail message.
diff --git a/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java b/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java
index 3af297dca..c4cb7534c 100644
--- a/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java
+++ b/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-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.lang.reflect.Method;
  * @since 1.5
  */
 public class AnnotationTypeMismatchException extends RuntimeException {
+    private static final long serialVersionUID = 8125925355765570191L;
+
     /**
      * The <tt>Method</tt> object for the annotation element.
      */
diff --git a/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java b/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java
index abea0ac33..04070a1bb 100644
--- a/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java
+++ b/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-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 @@ package java.lang.annotation;
  * @since 1.5
  */
 public class IncompleteAnnotationException extends RuntimeException {
+    private static final long serialVersionUID = 8445097402741811912L;
+
     private Class annotationType;
     private String elementName;
 
diff --git a/src/share/classes/java/lang/instrument/IllegalClassFormatException.java b/src/share/classes/java/lang/instrument/IllegalClassFormatException.java
index 94c4933e4..5594165fb 100644
--- a/src/share/classes/java/lang/instrument/IllegalClassFormatException.java
+++ b/src/share/classes/java/lang/instrument/IllegalClassFormatException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-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
@@ -40,6 +40,8 @@ package java.lang.instrument;
  * @since   1.5
  */
 public class IllegalClassFormatException extends Exception {
+    private static final long serialVersionUID = -3841736710924794009L;
+
     /**
      * Constructs an <code>IllegalClassFormatException</code> with no
      * detail message.
diff --git a/src/share/classes/java/lang/instrument/UnmodifiableClassException.java b/src/share/classes/java/lang/instrument/UnmodifiableClassException.java
index 418ad7b3a..d754fb2bb 100644
--- a/src/share/classes/java/lang/instrument/UnmodifiableClassException.java
+++ b/src/share/classes/java/lang/instrument/UnmodifiableClassException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2006 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
@@ -34,6 +34,8 @@ package java.lang.instrument;
  * @since   1.5
  */
 public class UnmodifiableClassException extends Exception {
+    private static final long serialVersionUID = 1716652643585309178L;
+
     /**
      * Constructs an <code>UnmodifiableClassException</code> with no
      * detail message.
diff --git a/src/share/classes/java/lang/management/ManagementPermission.java b/src/share/classes/java/lang/management/ManagementPermission.java
index 5330e7539..7eeadd5c5 100644
--- a/src/share/classes/java/lang/management/ManagementPermission.java
+++ b/src/share/classes/java/lang/management/ManagementPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-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
@@ -83,6 +83,7 @@ at the permission allows, and associated risks">
  */
 
 public final class ManagementPermission extends java.security.BasicPermission {
+    private static final long serialVersionUID = 1897496590799378737L;
 
     /**
      * Constructs a ManagementPermission with the specified name.
diff --git a/src/share/classes/java/lang/reflect/GenericSignatureFormatError.java b/src/share/classes/java/lang/reflect/GenericSignatureFormatError.java
index 6ecdd3b24..717bc8bde 100644
--- a/src/share/classes/java/lang/reflect/GenericSignatureFormatError.java
+++ b/src/share/classes/java/lang/reflect/GenericSignatureFormatError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-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,4 +33,6 @@ package java.lang.reflect;
  *
  * @since 1.5
  */
-public class GenericSignatureFormatError extends ClassFormatError{}
+public class GenericSignatureFormatError extends ClassFormatError {
+    private static final long serialVersionUID = 6709919147137911034L;
+}
diff --git a/src/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java b/src/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
index 6089687ec..0ed0b399f 100644
--- a/src/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
+++ b/src/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-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,4 +34,6 @@ package java.lang.reflect;
  *
  * @since 1.5
  */
-public class MalformedParameterizedTypeException extends RuntimeException{}
+public class MalformedParameterizedTypeException extends RuntimeException {
+    private static final long serialVersionUID = -5696557788586220964L;
+}
diff --git a/src/share/classes/java/util/ConcurrentModificationException.java b/src/share/classes/java/util/ConcurrentModificationException.java
index 19a302865..fbe9282dc 100644
--- a/src/share/classes/java/util/ConcurrentModificationException.java
+++ b/src/share/classes/java/util/ConcurrentModificationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-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
@@ -67,6 +67,8 @@ package java.util;
  * @since   1.2
  */
 public class ConcurrentModificationException extends RuntimeException {
+    private static final long serialVersionUID = -3666751008965953603L;
+
     /**
      * Constructs a ConcurrentModificationException with no
      * detail message.
diff --git a/src/share/classes/java/util/EmptyStackException.java b/src/share/classes/java/util/EmptyStackException.java
index 0bdaa2ee2..09ba39b0e 100644
--- a/src/share/classes/java/util/EmptyStackException.java
+++ b/src/share/classes/java/util/EmptyStackException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1998 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 @@ package java.util;
  */
 public
 class EmptyStackException extends RuntimeException {
+    private static final long serialVersionUID = 5084686378493302095L;
+
     /**
      * Constructs a new <code>EmptyStackException</code> with <tt>null</tt>
      * as its error message string.
diff --git a/src/share/classes/java/util/InputMismatchException.java b/src/share/classes/java/util/InputMismatchException.java
index 87b0c60bf..ff1729c21 100644
--- a/src/share/classes/java/util/InputMismatchException.java
+++ b/src/share/classes/java/util/InputMismatchException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-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 @@ package java.util;
  */
 public
 class InputMismatchException extends NoSuchElementException {
+    private static final long serialVersionUID = 8811230760997066428L;
+
     /**
      * Constructs an <code>InputMismatchException</code> with <tt>null</tt>
      * as its error message string.
diff --git a/src/share/classes/java/util/NoSuchElementException.java b/src/share/classes/java/util/NoSuchElementException.java
index 9750122cb..e4cbe8eef 100644
--- a/src/share/classes/java/util/NoSuchElementException.java
+++ b/src/share/classes/java/util/NoSuchElementException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994-1998 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
@@ -37,6 +37,8 @@ package java.util;
  */
 public
 class NoSuchElementException extends RuntimeException {
+    private static final long serialVersionUID = 6769829250639411880L;
+
     /**
      * Constructs a <code>NoSuchElementException</code> with <tt>null</tt>
      * as its error message string.
diff --git a/src/share/classes/java/util/TooManyListenersException.java b/src/share/classes/java/util/TooManyListenersException.java
index f7778a5ed..c9feb9571 100644
--- a/src/share/classes/java/util/TooManyListenersException.java
+++ b/src/share/classes/java/util/TooManyListenersException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-1999 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
@@ -48,6 +48,7 @@ package java.util;
  */
 
 public class TooManyListenersException extends Exception {
+    private static final long serialVersionUID = 5074640544770687831L;
 
     /**
      * Constructs a TooManyListenersException with no detail message.
diff --git a/src/share/classes/java/util/jar/JarException.java b/src/share/classes/java/util/jar/JarException.java
index a8c66b692..a28bbcc5b 100644
--- a/src/share/classes/java/util/jar/JarException.java
+++ b/src/share/classes/java/util/jar/JarException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-1999 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-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.util.jar;
  */
 public
 class JarException extends java.util.zip.ZipException {
+    private static final long serialVersionUID = 7159778400963954473L;
+
     /**
      * Constructs a JarException with no detail message.
      */
diff --git a/src/share/classes/java/util/regex/PatternSyntaxException.java b/src/share/classes/java/util/regex/PatternSyntaxException.java
index 093b6a398..404756ed6 100644
--- a/src/share/classes/java/util/regex/PatternSyntaxException.java
+++ b/src/share/classes/java/util/regex/PatternSyntaxException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-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
@@ -40,6 +40,7 @@ import sun.security.action.GetPropertyAction;
 public class PatternSyntaxException
     extends IllegalArgumentException
 {
+    private static final long serialVersionUID = -3864639126226059218L;
 
     private final String desc;
     private final String pattern;
diff --git a/src/share/classes/java/util/zip/DataFormatException.java b/src/share/classes/java/util/zip/DataFormatException.java
index db884f21e..08730b875 100644
--- a/src/share/classes/java/util/zip/DataFormatException.java
+++ b/src/share/classes/java/util/zip/DataFormatException.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
@@ -32,6 +32,8 @@ package java.util.zip;
  */
 public
 class DataFormatException extends Exception {
+    private static final long serialVersionUID = 2219632870893641452L;
+
     /**
      * Constructs a DataFormatException with no detail message.
      */
diff --git a/src/share/classes/java/util/zip/ZipException.java b/src/share/classes/java/util/zip/ZipException.java
index 467a51c9b..a5dbc12a1 100644
--- a/src/share/classes/java/util/zip/ZipException.java
+++ b/src/share/classes/java/util/zip/ZipException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2001 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;
 
 public
 class ZipException extends IOException {
+    private static final long serialVersionUID = 8000196834066748623L;
+
     /**
      * Constructs an <code>ZipException</code> with <code>null</code>
      * as its error detail message.