Imported GNU Classpath 0.90

       * scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
       * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
       * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
       * java/lang/Math.java: New override file.
       * java/lang/Character.java: Merged from Classpath.
       (start, end): Now 'int's.
       (canonicalName): New field.
       (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
       (UnicodeBlock): Added argument.
       (of): New overload.
       (forName): New method.
       Updated unicode blocks.
       (sets): Updated.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111942 138bc75d-0d04-0410-961f-82ee72b054a4

42 files changed, 120 insertions, 42 deletions

diff --git a/libjava/classpath/javax/naming/AuthenticationException.java b/libjava/classpath/javax/naming/AuthenticationException.java
index f332561e49b..1a6ade93055 100644
--- a/libjava/classpath/javax/naming/AuthenticationException.java
+++ b/libjava/classpath/javax/naming/AuthenticationException.java
@@ -1,5 +1,5 @@
 /* AuthenticationException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class AuthenticationException extends NamingSecurityException
 {
+  private static final long serialVersionUID = 3678497619904568096L;
+
   public AuthenticationException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/AuthenticationNotSupportedException.java b/libjava/classpath/javax/naming/AuthenticationNotSupportedException.java
index 52b133a5cf5..a1e811b44dc 100644
--- a/libjava/classpath/javax/naming/AuthenticationNotSupportedException.java
+++ b/libjava/classpath/javax/naming/AuthenticationNotSupportedException.java
@@ -1,5 +1,5 @@
 /* AuthenticationNotSupportedException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,6 +42,8 @@ package javax.naming;
 public class AuthenticationNotSupportedException
   extends NamingSecurityException
 {
+  private static final long serialVersionUID = - 7149033933259492300L;
+
   public AuthenticationNotSupportedException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/Binding.java b/libjava/classpath/javax/naming/Binding.java
index 91c0d95f7d5..9d6608ababe 100644
--- a/libjava/classpath/javax/naming/Binding.java
+++ b/libjava/classpath/javax/naming/Binding.java
@@ -1,5 +1,5 @@
 /* Binding.java --
-   Copyright (C) 2001, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,6 +44,8 @@ package javax.naming;
  */
 public class Binding extends NameClassPair
 {
+  private static final long serialVersionUID = 8839217842691845890L;
+
   public Binding (String name, Object obj)
   {
     super (name, null);
diff --git a/libjava/classpath/javax/naming/CannotProceedException.java b/libjava/classpath/javax/naming/CannotProceedException.java
index 3a69cd3819c..27868e21ea2 100644
--- a/libjava/classpath/javax/naming/CannotProceedException.java
+++ b/libjava/classpath/javax/naming/CannotProceedException.java
@@ -1,5 +1,5 @@
 /* CannotProceedException.java --
-   Copyright (C) 2001, 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,6 +47,8 @@ import java.util.Hashtable;
 
 public class CannotProceedException extends NamingException
 {
+  private static final long serialVersionUID = 1219724816191576813L;
+
   // Serialized fields.
   protected Name remainingNewName;
   protected Hashtable environment;
diff --git a/libjava/classpath/javax/naming/CommunicationException.java b/libjava/classpath/javax/naming/CommunicationException.java
index c780387cf05..7b11b5fac81 100644
--- a/libjava/classpath/javax/naming/CommunicationException.java
+++ b/libjava/classpath/javax/naming/CommunicationException.java
@@ -1,5 +1,5 @@
 /* CommunicationException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class CommunicationException extends NamingException
 {
+  private static final long serialVersionUID = 3618507780299986611L;
+
   public CommunicationException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/ConfigurationException.java b/libjava/classpath/javax/naming/ConfigurationException.java
index 196654865b8..1f4002aa465 100644
--- a/libjava/classpath/javax/naming/ConfigurationException.java
+++ b/libjava/classpath/javax/naming/ConfigurationException.java
@@ -1,5 +1,5 @@
 /* ConfigurationException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class ConfigurationException extends NamingException
 {
+  private static final long serialVersionUID = - 2535156726228855704L;
+
   public ConfigurationException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/ContextNotEmptyException.java b/libjava/classpath/javax/naming/ContextNotEmptyException.java
index c6fe5e81c39..acbd46bffc4 100644
--- a/libjava/classpath/javax/naming/ContextNotEmptyException.java
+++ b/libjava/classpath/javax/naming/ContextNotEmptyException.java
@@ -1,5 +1,5 @@
 /* ContextNotEmptyException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class ContextNotEmptyException extends NamingException
 {
+  private static final long serialVersionUID = 1090963683348219877L;
+
   public ContextNotEmptyException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/InsufficientResourcesException.java b/libjava/classpath/javax/naming/InsufficientResourcesException.java
index bcb9fe577f8..7a9ebe0370c 100644
--- a/libjava/classpath/javax/naming/InsufficientResourcesException.java
+++ b/libjava/classpath/javax/naming/InsufficientResourcesException.java
@@ -1,5 +1,5 @@
 /* InsufficientResourcesException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class InsufficientResourcesException extends NamingException
 {
+  private static final long serialVersionUID = 6227672693037844532L;
+
   public InsufficientResourcesException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/InterruptedNamingException.java b/libjava/classpath/javax/naming/InterruptedNamingException.java
index 8cdf30d4e4c..90d6e5ec052 100644
--- a/libjava/classpath/javax/naming/InterruptedNamingException.java
+++ b/libjava/classpath/javax/naming/InterruptedNamingException.java
@@ -1,5 +1,5 @@
 /* InterruptedNamingException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class InterruptedNamingException extends NamingException
 {
+  private static final long serialVersionUID = 6404516648893194728L;
+
   public InterruptedNamingException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/InvalidNameException.java b/libjava/classpath/javax/naming/InvalidNameException.java
index a3b99e1f69f..286f0455dba 100644
--- a/libjava/classpath/javax/naming/InvalidNameException.java
+++ b/libjava/classpath/javax/naming/InvalidNameException.java
@@ -1,5 +1,5 @@
 /* InvalidNameException.java -- Exception indicating an invalid component/name
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,6 +47,8 @@ package javax.naming;
  */
 public class InvalidNameException extends NamingException
 {
+  private static final long serialVersionUID = - 8370672380823801105L;
+
   /**
    * Creates a new exception without setting any of its fields.
    */
diff --git a/libjava/classpath/javax/naming/LimitExceededException.java b/libjava/classpath/javax/naming/LimitExceededException.java
index 7e7af81c76b..8c005ac2c5d 100644
--- a/libjava/classpath/javax/naming/LimitExceededException.java
+++ b/libjava/classpath/javax/naming/LimitExceededException.java
@@ -1,5 +1,5 @@
 /* LimitExceededException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class LimitExceededException extends NamingException
 {
+  private static final long serialVersionUID = - 776898738660207856L;
+
   public LimitExceededException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/LinkException.java b/libjava/classpath/javax/naming/LinkException.java
index 2c3c507113c..8f5df8b03bf 100644
--- a/libjava/classpath/javax/naming/LinkException.java
+++ b/libjava/classpath/javax/naming/LinkException.java
@@ -1,5 +1,5 @@
 /* LinkException.java --
-   Copyright (C) 2001, 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,6 +46,8 @@ package javax.naming;
 
 public class LinkException extends NamingException
 {
+  private static final long serialVersionUID = - 7967662604076777712L;
+
   // Serialized fields.
   protected Name linkResolvedName;
   protected Object linkResolvedObj;
diff --git a/libjava/classpath/javax/naming/LinkLoopException.java b/libjava/classpath/javax/naming/LinkLoopException.java
index 9c00dbeb622..0c68e01bff3 100644
--- a/libjava/classpath/javax/naming/LinkLoopException.java
+++ b/libjava/classpath/javax/naming/LinkLoopException.java
@@ -1,5 +1,5 @@
 /* LinkLoopException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class LinkLoopException extends LinkException
 {
+  private static final long serialVersionUID = - 3119189944325198009L;
+
   public LinkLoopException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/MalformedLinkException.java b/libjava/classpath/javax/naming/MalformedLinkException.java
index 5422b90946f..db0753ded6c 100644
--- a/libjava/classpath/javax/naming/MalformedLinkException.java
+++ b/libjava/classpath/javax/naming/MalformedLinkException.java
@@ -1,5 +1,5 @@
 /* MalformedLinkException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class MalformedLinkException extends LinkException
 {
+  private static final long serialVersionUID = - 3066740437737830242L;
+
   public MalformedLinkException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/NameAlreadyBoundException.java b/libjava/classpath/javax/naming/NameAlreadyBoundException.java
index 4b2fb0e74f9..5ddd7d8ba88 100644
--- a/libjava/classpath/javax/naming/NameAlreadyBoundException.java
+++ b/libjava/classpath/javax/naming/NameAlreadyBoundException.java
@@ -1,5 +1,5 @@
 /* NameAlreadyBoundException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class NameAlreadyBoundException extends NamingException
 {
+  private static final long serialVersionUID = - 8491441000356780586L;
+
   public NameAlreadyBoundException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/NameClassPair.java b/libjava/classpath/javax/naming/NameClassPair.java
index 4e260513171..127730af4ef 100644
--- a/libjava/classpath/javax/naming/NameClassPair.java
+++ b/libjava/classpath/javax/naming/NameClassPair.java
@@ -1,5 +1,5 @@
 /* NameClassPair.java --
-   Copyright (C) 2001, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,6 +46,8 @@ import java.io.Serializable;
  */
 public class NameClassPair implements Serializable
 {
+  private static final long serialVersionUID = 5620776610160863339L;
+
   public NameClassPair (String name, String className)
   {
     this (name, className, true);
diff --git a/libjava/classpath/javax/naming/NameNotFoundException.java b/libjava/classpath/javax/naming/NameNotFoundException.java
index b533b041261..b7c24a62927 100644
--- a/libjava/classpath/javax/naming/NameNotFoundException.java
+++ b/libjava/classpath/javax/naming/NameNotFoundException.java
@@ -1,5 +1,5 @@
 /* NameNotFoundException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class NameNotFoundException extends NamingException
 {
+  private static final long serialVersionUID = - 8007156725367842053L;
+
   public NameNotFoundException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/NamingException.java b/libjava/classpath/javax/naming/NamingException.java
index ad3923326db..dbe1e3792a7 100644
--- a/libjava/classpath/javax/naming/NamingException.java
+++ b/libjava/classpath/javax/naming/NamingException.java
@@ -223,7 +223,7 @@ public class NamingException extends Exception
   /**
    * Gets the message given to the constructor or null if no message was given.
    *
-   * @see Throwable#getMessage();
+   * @see Throwable#getMessage()
    */
   public String getExplanation()
   {
diff --git a/libjava/classpath/javax/naming/NoInitialContextException.java b/libjava/classpath/javax/naming/NoInitialContextException.java
index d12dfcb7b27..5e4f6df0e16 100644
--- a/libjava/classpath/javax/naming/NoInitialContextException.java
+++ b/libjava/classpath/javax/naming/NoInitialContextException.java
@@ -1,5 +1,5 @@
 /* NoInitialContextException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class NoInitialContextException extends NamingException
 {
+  private static final long serialVersionUID = - 3413733186901258623L;
+
   public NoInitialContextException()
   {
     super();
diff --git a/libjava/classpath/javax/naming/NoPermissionException.java b/libjava/classpath/javax/naming/NoPermissionException.java
index ddc43937ce8..02764a991f2 100644
--- a/libjava/classpath/javax/naming/NoPermissionException.java
+++ b/libjava/classpath/javax/naming/NoPermissionException.java
@@ -1,5 +1,5 @@
 /* NoPermissionException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class NoPermissionException extends NamingSecurityException
 {
+  private static final long serialVersionUID = 8395332708699751775L;
+
   public NoPermissionException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/NotContextException.java b/libjava/classpath/javax/naming/NotContextException.java
index b3d02cfbb4e..a27f10f182d 100644
--- a/libjava/classpath/javax/naming/NotContextException.java
+++ b/libjava/classpath/javax/naming/NotContextException.java
@@ -1,5 +1,5 @@
 /* NotContextException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class NotContextException extends NamingException
 {
+  private static final long serialVersionUID = 849752551644540417L;
+
   public NotContextException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/OperationNotSupportedException.java b/libjava/classpath/javax/naming/OperationNotSupportedException.java
index a4a4945af55..d813403ded5 100644
--- a/libjava/classpath/javax/naming/OperationNotSupportedException.java
+++ b/libjava/classpath/javax/naming/OperationNotSupportedException.java
@@ -1,5 +1,5 @@
 /* OperationNotSupportedException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,6 +40,8 @@ package javax.naming;
 
 public class OperationNotSupportedException extends NamingException
 {
+  private static final long serialVersionUID = 5493232822427682064L;
+
   public OperationNotSupportedException()
   {
     super();
diff --git a/libjava/classpath/javax/naming/PartialResultException.java b/libjava/classpath/javax/naming/PartialResultException.java
index 32f389d1335..61660781f68 100644
--- a/libjava/classpath/javax/naming/PartialResultException.java
+++ b/libjava/classpath/javax/naming/PartialResultException.java
@@ -1,5 +1,5 @@
 /* PartialResultException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class PartialResultException extends NamingException
 {
+  private static final long serialVersionUID = 2572144970049426786L;
+
   public PartialResultException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/Reference.java b/libjava/classpath/javax/naming/Reference.java
index 6cc4d15708b..5b9883aecd4 100644
--- a/libjava/classpath/javax/naming/Reference.java
+++ b/libjava/classpath/javax/naming/Reference.java
@@ -1,5 +1,5 @@
 /* Reference.java --
-   Copyright (C) 2000, 2001, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,6 +48,8 @@ import java.util.Vector;
  */
 public class Reference implements Cloneable, Serializable
 {
+  private static final long serialVersionUID = - 1673475790065791735L;
+
   public Reference (String className)
   {
     this.className = className;
diff --git a/libjava/classpath/javax/naming/ServiceUnavailableException.java b/libjava/classpath/javax/naming/ServiceUnavailableException.java
index 678eb132866..ddb154f9e77 100644
--- a/libjava/classpath/javax/naming/ServiceUnavailableException.java
+++ b/libjava/classpath/javax/naming/ServiceUnavailableException.java
@@ -1,5 +1,5 @@
 /* ServiceUnavailableException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class ServiceUnavailableException extends NamingException
 {
+  private static final long serialVersionUID = - 4996964726566773444L;
+
   public ServiceUnavailableException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/SizeLimitExceededException.java b/libjava/classpath/javax/naming/SizeLimitExceededException.java
index e23f4d2da09..3ca9a23b7b1 100644
--- a/libjava/classpath/javax/naming/SizeLimitExceededException.java
+++ b/libjava/classpath/javax/naming/SizeLimitExceededException.java
@@ -1,5 +1,5 @@
 /* SizeLimitExceededException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class SizeLimitExceededException extends LimitExceededException
 {
+  private static final long serialVersionUID = 7129289564879168579L;
+
   public SizeLimitExceededException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/TimeLimitExceededException.java b/libjava/classpath/javax/naming/TimeLimitExceededException.java
index f4be6759b49..e3456f5bbe8 100644
--- a/libjava/classpath/javax/naming/TimeLimitExceededException.java
+++ b/libjava/classpath/javax/naming/TimeLimitExceededException.java
@@ -1,5 +1,5 @@
 /* TimeLimitExceededException.java --
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package javax.naming;
  
 public class TimeLimitExceededException extends LimitExceededException
 {
+  private static final long serialVersionUID = - 3597009011385034696L;
+
   public TimeLimitExceededException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/directory/AttributeInUseException.java b/libjava/classpath/javax/naming/directory/AttributeInUseException.java
index 46614245282..9be25c9a967 100644
--- a/libjava/classpath/javax/naming/directory/AttributeInUseException.java
+++ b/libjava/classpath/javax/naming/directory/AttributeInUseException.java
@@ -1,5 +1,5 @@
 /* AttributeInUseException.java --
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,6 +42,8 @@ import javax.naming.NamingException;
 
 public class AttributeInUseException extends NamingException
 {
+  private static final long serialVersionUID = 4437710305529322564L;
+
   public AttributeInUseException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/directory/AttributeModificationException.java b/libjava/classpath/javax/naming/directory/AttributeModificationException.java
index 4ef6fc20b66..9614bac1333 100644
--- a/libjava/classpath/javax/naming/directory/AttributeModificationException.java
+++ b/libjava/classpath/javax/naming/directory/AttributeModificationException.java
@@ -1,5 +1,5 @@
 /* AttributeModificationException.java --
-   Copyright (C) 2001, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,6 +47,7 @@ import javax.naming.NamingException;
 
 public class AttributeModificationException extends NamingException
 {
+  private static final long serialVersionUID = 8060676069678710186L;
   // Serialized fields.
   private ModificationItem[] unexecs;
 
diff --git a/libjava/classpath/javax/naming/directory/InvalidAttributeIdentifierException.java b/libjava/classpath/javax/naming/directory/InvalidAttributeIdentifierException.java
index af1a8c7a27f..afd9a902b5a 100644
--- a/libjava/classpath/javax/naming/directory/InvalidAttributeIdentifierException.java
+++ b/libjava/classpath/javax/naming/directory/InvalidAttributeIdentifierException.java
@@ -1,5 +1,5 @@
 /* InvalidAttributeIdentifierException.java --
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,6 +42,8 @@ import javax.naming.NamingException;
 
 public class InvalidAttributeIdentifierException extends NamingException
 {
+  private static final long serialVersionUID = - 9036920266322999923L;
+
   public InvalidAttributeIdentifierException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/directory/InvalidAttributeValueException.java b/libjava/classpath/javax/naming/directory/InvalidAttributeValueException.java
index b667fa9a732..a18adbfa2fe 100644
--- a/libjava/classpath/javax/naming/directory/InvalidAttributeValueException.java
+++ b/libjava/classpath/javax/naming/directory/InvalidAttributeValueException.java
@@ -1,5 +1,5 @@
 /* InvalidAttributeValueException.java --
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,6 +42,8 @@ import javax.naming.NamingException;
 
 public class InvalidAttributeValueException extends NamingException
 {
+  private static final long serialVersionUID = 8720050295499275011L;
+
   public InvalidAttributeValueException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/directory/InvalidAttributesException.java b/libjava/classpath/javax/naming/directory/InvalidAttributesException.java
index ad7f7c1c111..ac540e2d0b0 100644
--- a/libjava/classpath/javax/naming/directory/InvalidAttributesException.java
+++ b/libjava/classpath/javax/naming/directory/InvalidAttributesException.java
@@ -1,5 +1,5 @@
 /* InvalidAttributesException.java --
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,6 +42,8 @@ import javax.naming.NamingException;
 
 public class InvalidAttributesException extends NamingException
 {
+  private static final long serialVersionUID = 2607612850539889765L;
+
   public InvalidAttributesException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/directory/InvalidSearchControlsException.java b/libjava/classpath/javax/naming/directory/InvalidSearchControlsException.java
index 594e5d1bfe5..9c716fa0f05 100644
--- a/libjava/classpath/javax/naming/directory/InvalidSearchControlsException.java
+++ b/libjava/classpath/javax/naming/directory/InvalidSearchControlsException.java
@@ -1,5 +1,5 @@
 /* InvalidSearchControlsException.java --
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,6 +42,8 @@ import javax.naming.NamingException;
 
 public class InvalidSearchControlsException extends NamingException
 {
+  private static final long serialVersionUID = - 5124108943352665777L;
+
   public InvalidSearchControlsException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/directory/InvalidSearchFilterException.java b/libjava/classpath/javax/naming/directory/InvalidSearchFilterException.java
index 127b381ea6d..21843cc01e1 100644
--- a/libjava/classpath/javax/naming/directory/InvalidSearchFilterException.java
+++ b/libjava/classpath/javax/naming/directory/InvalidSearchFilterException.java
@@ -1,5 +1,5 @@
 /* InvalidSearchFilterException.java --
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,6 +42,8 @@ import javax.naming.NamingException;
 
 public class InvalidSearchFilterException extends NamingException
 {
+  private static final long serialVersionUID = 2902700940682875441L;
+
   public InvalidSearchFilterException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/directory/ModificationItem.java b/libjava/classpath/javax/naming/directory/ModificationItem.java
index f0a69f56a8c..56a5ae60958 100644
--- a/libjava/classpath/javax/naming/directory/ModificationItem.java
+++ b/libjava/classpath/javax/naming/directory/ModificationItem.java
@@ -1,5 +1,5 @@
 /* ModificationItem.java --
-   Copyright (C) 2001, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,6 +47,7 @@ import java.io.Serializable;
 
 public class ModificationItem implements Serializable
 {
+  private static final long serialVersionUID = 7573258562534746850L;
   // Serialized fields.
   private int mod_op;
   private Attribute attr;
diff --git a/libjava/classpath/javax/naming/directory/NoSuchAttributeException.java b/libjava/classpath/javax/naming/directory/NoSuchAttributeException.java
index cff9f95b7e5..8eb5e95704f 100644
--- a/libjava/classpath/javax/naming/directory/NoSuchAttributeException.java
+++ b/libjava/classpath/javax/naming/directory/NoSuchAttributeException.java
@@ -1,5 +1,5 @@
 /* NoSuchAttributeException.java --
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,6 +42,8 @@ import javax.naming.NamingException;
 
 public class NoSuchAttributeException extends NamingException
 {
+  private static final long serialVersionUID = 4836415647935888137L;
+
   public NoSuchAttributeException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/directory/SchemaViolationException.java b/libjava/classpath/javax/naming/directory/SchemaViolationException.java
index a11e50f2002..f60f32aad54 100644
--- a/libjava/classpath/javax/naming/directory/SchemaViolationException.java
+++ b/libjava/classpath/javax/naming/directory/SchemaViolationException.java
@@ -1,5 +1,5 @@
 /* SchemaViolationException.java --
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,6 +42,8 @@ import javax.naming.NamingException;
 
 public class SchemaViolationException extends NamingException
 {
+  private static final long serialVersionUID = - 3041762429525049663L;
+
   public SchemaViolationException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/directory/SearchControls.java b/libjava/classpath/javax/naming/directory/SearchControls.java
index 4cc789d52e1..5ba488bf78f 100644
--- a/libjava/classpath/javax/naming/directory/SearchControls.java
+++ b/libjava/classpath/javax/naming/directory/SearchControls.java
@@ -1,5 +1,5 @@
 /* SearchControls.java --
-   Copyright (C) 2001, 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,6 +47,7 @@ import java.io.Serializable;
 
 public class SearchControls implements Serializable
 {
+  private static final long serialVersionUID = - 2480540967773454797L;
   public static final int OBJECT_SCOPE = 0;
   public static final int ONELEVEL_SCOPE = 1;
   public static final int SUBTREE_SCOPE = 2;
diff --git a/libjava/classpath/javax/naming/directory/SearchResult.java b/libjava/classpath/javax/naming/directory/SearchResult.java
index a6d5490df99..ce6bfed6ed2 100644
--- a/libjava/classpath/javax/naming/directory/SearchResult.java
+++ b/libjava/classpath/javax/naming/directory/SearchResult.java
@@ -1,5 +1,5 @@
 /* SearchResult.java --
-   Copyright (C) 2001, 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,6 +47,7 @@ import javax.naming.Binding;
 
 public class SearchResult extends Binding
 {
+  private static final long serialVersionUID = - 9158063327699723172L;
   // Serialized fields.
   private Attributes attrs;
 
diff --git a/libjava/classpath/javax/naming/event/NamingEvent.java b/libjava/classpath/javax/naming/event/NamingEvent.java
index a121b8e13d3..1bf381a4467 100644
--- a/libjava/classpath/javax/naming/event/NamingEvent.java
+++ b/libjava/classpath/javax/naming/event/NamingEvent.java
@@ -1,5 +1,5 @@
 /* NamingEvent.java --
-   Copyright (C) 2001, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,6 +48,8 @@ import javax.naming.Binding;
  */
 public class NamingEvent extends EventObject
 {
+  private static final long serialVersionUID = - 7126752885365133499L;
+
   public static final int OBJECT_ADDED = 0;
   public static final int OBJECT_REMOVED = 1;
   public static final int OBJECT_RENAMED = 2;
diff --git a/libjava/classpath/javax/naming/event/NamingExceptionEvent.java b/libjava/classpath/javax/naming/event/NamingExceptionEvent.java
index 07896d48d45..3a9de21f5d0 100644
--- a/libjava/classpath/javax/naming/event/NamingExceptionEvent.java
+++ b/libjava/classpath/javax/naming/event/NamingExceptionEvent.java
@@ -1,5 +1,5 @@
 /* NamingExceptionEvent.java --
-   Copyright (C) 2001, 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -49,6 +49,8 @@ import javax.naming.NamingException;
 
 public class NamingExceptionEvent extends EventObject
 {
+  private static final long serialVersionUID = - 4877678086134736336L;
+
   // Serialized fields.
   private NamingException exception;
 
diff --git a/libjava/classpath/javax/naming/spi/ResolveResult.java b/libjava/classpath/javax/naming/spi/ResolveResult.java
index 72a101ec567..07e2df3c01c 100644
--- a/libjava/classpath/javax/naming/spi/ResolveResult.java
+++ b/libjava/classpath/javax/naming/spi/ResolveResult.java
@@ -1,5 +1,5 @@
 /* ResolveResult.java --
-   Copyright (C) 2001, 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -51,6 +51,8 @@ import javax.naming.Name;
 
 public class ResolveResult implements Serializable
 {
+  private static final long serialVersionUID = - 4552108072002407559L;
+
   // Serialized fields.
   protected Object resolvedObj;
   protected Name remainingName;