* javax/security/sasl/SaslServerFactory.java: Updated javadoc.

	* javax/security/sasl/Sasl.java: Updated javadoc.
	* javax/security/sasl/SaslClientFactory.java: Updated javadoc.
	* javax/security/sasl/RealmChoiceCallback.java: Updated javadoc.
	* javax/security/sasl/RealmCallback.java: Updated javadoc.
	* javax/security/sasl/AuthenticationException.java: Updated
	javadoc.
	* javax/security/sasl/SaslServer.java (getNegotiatedProperty):
	Don't throw SaslException.
	* javax/security/sasl/SaslClient.java (getNegotiatedProperty):
	Don't throw SaslException.
	* javax/security/sasl/SaslException.java (serialVersionUID): New
	field.
	* javax/security/sasl/AuthorizeCallback.java (AuthorizeCallback):
	Implements Serializable.
	(serialVersionUID): New field.

11 files changed, 57 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e2d0aa9f..ba1c00ea6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2005-09-25  Tom Tromey  <tromey@redhat.com>
+
+	* javax/security/sasl/SaslServerFactory.java: Updated javadoc.
+	* javax/security/sasl/Sasl.java: Updated javadoc.
+	* javax/security/sasl/SaslClientFactory.java: Updated javadoc.
+	* javax/security/sasl/RealmChoiceCallback.java: Updated javadoc.
+	* javax/security/sasl/RealmCallback.java: Updated javadoc.
+	* javax/security/sasl/AuthenticationException.java: Updated
+	javadoc.
+	* javax/security/sasl/SaslServer.java (getNegotiatedProperty):
+	Don't throw SaslException.
+	* javax/security/sasl/SaslClient.java (getNegotiatedProperty):
+	Don't throw SaslException.
+	* javax/security/sasl/SaslException.java (serialVersionUID): New
+	field.
+	* javax/security/sasl/AuthorizeCallback.java (AuthorizeCallback):
+	Implements Serializable.
+	(serialVersionUID): New field.
+
 2005-09-25  Casey Marshall  <csm@gnu.org>
 
 	* gnu/java/security/provider/Gnu.java
diff --git a/javax/security/sasl/AuthenticationException.java b/javax/security/sasl/AuthenticationException.java
index 12a8fe052..0f674645d 100644
--- a/javax/security/sasl/AuthenticationException.java
+++ b/javax/security/sasl/AuthenticationException.java
@@ -1,5 +1,5 @@
 /* AuthenticationException.java --
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -49,6 +49,8 @@ package javax.security.sasl;
  * instead of <code>AuthenticationException</code> if it is unable to determine
  * the nature of the failure, or if does not want to disclose the nature of the
  * failure, for example, due to security reasons.</p>
+ *
+ * @since 1.5
  */
 public class AuthenticationException extends SaslException
 {
diff --git a/javax/security/sasl/AuthorizeCallback.java b/javax/security/sasl/AuthorizeCallback.java
index bf1b8470d..fa3b29a3d 100644
--- a/javax/security/sasl/AuthorizeCallback.java
+++ b/javax/security/sasl/AuthorizeCallback.java
@@ -1,5 +1,5 @@
 /* AuthorizeCallback.java --
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,19 +38,23 @@ exception statement from your version. */
 
 package javax.security.sasl;
 
+import java.io.Serializable;
 import javax.security.auth.callback.Callback;
 
 /**
  * This callback is used by {@link SaslServer} to determine whether one entity
  * (identified by an authenticated authentication ID) can act on behalf of
  * another entity (identified by an authorization ID).
+ *
+ * @since 1.5
  */
-public class AuthorizeCallback implements Callback
+public class AuthorizeCallback implements Callback, Serializable
 {
-
   // Constants and variables
   // -------------------------------------------------------------------------
 
+  private static final long serialVersionUID = -2353344186490470805L;
+
   /** @serial The (authenticated) authentication id to check. */
   private String authenticationID = null;
 
diff --git a/javax/security/sasl/RealmCallback.java b/javax/security/sasl/RealmCallback.java
index 12d834054..7cb36433f 100644
--- a/javax/security/sasl/RealmCallback.java
+++ b/javax/security/sasl/RealmCallback.java
@@ -1,5 +1,5 @@
 /* RealmCallback.java --
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,6 +43,8 @@ import javax.security.auth.callback.TextInputCallback;
 /**
  * This callback is used by {@link SaslClient} and {@link SaslServer} to
  * retrieve realm information.
+ *
+ * @since 1.5
  */
 public class RealmCallback extends TextInputCallback
 {
diff --git a/javax/security/sasl/RealmChoiceCallback.java b/javax/security/sasl/RealmChoiceCallback.java
index d16e61f6a..7068a504b 100644
--- a/javax/security/sasl/RealmChoiceCallback.java
+++ b/javax/security/sasl/RealmChoiceCallback.java
@@ -1,5 +1,5 @@
 /* RealmChoiceCallback.java --
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,6 +43,8 @@ import javax.security.auth.callback.ChoiceCallback;
 /**
  * This callback is used by {@link SaslClient} and {@link SaslServer} to obtain
  * a realm given a list of realm choices.
+ *
+ * @since 1.5
  */
 public class RealmChoiceCallback extends ChoiceCallback
 {
diff --git a/javax/security/sasl/Sasl.java b/javax/security/sasl/Sasl.java
index 058e4f6e1..dbe4cc8c2 100644
--- a/javax/security/sasl/Sasl.java
+++ b/javax/security/sasl/Sasl.java
@@ -74,6 +74,8 @@ import javax.security.auth.callback.CallbackHandler;
  *      Sasl.createSaslServer(mechanism, protocol, serverName, props,
  *                            callbackHandler);
  * </pre>
+ *
+ * @since 1.5
  */
 public class Sasl
 {
diff --git a/javax/security/sasl/SaslClient.java b/javax/security/sasl/SaslClient.java
index 544ab17d6..58eb5e298 100644
--- a/javax/security/sasl/SaslClient.java
+++ b/javax/security/sasl/SaslClient.java
@@ -1,5 +1,5 @@
 /* SaslClient.java --
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -102,6 +102,8 @@ package javax.security.sasl;
  *
  * @see Sasl
  * @see SaslClientFactory
+ *
+ * @since 1.5
  */
 public interface SaslClient
 {
@@ -216,7 +218,7 @@ public interface SaslClient
    * @throws IllegalStateException if this authentication exchange has not
    * completed.
    */
-  Object getNegotiatedProperty(String propName) throws SaslException;
+  Object getNegotiatedProperty(String propName);
 
   /**
    * Disposes of any system resources or security-sensitive information the
diff --git a/javax/security/sasl/SaslClientFactory.java b/javax/security/sasl/SaslClientFactory.java
index d6e8cd5ff..ae36171c5 100644
--- a/javax/security/sasl/SaslClientFactory.java
+++ b/javax/security/sasl/SaslClientFactory.java
@@ -1,5 +1,5 @@
 /* SaslClientFactory.java
-   Copyright (C) 2003, Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -55,6 +55,8 @@ import javax.security.auth.callback.CallbackHandler;
  *
  * @see SaslClient
  * @see Sasl
+ *
+ * @since 1.5
  */
 public interface SaslClientFactory
 {
diff --git a/javax/security/sasl/SaslException.java b/javax/security/sasl/SaslException.java
index 13113e6bc..89764bb18 100644
--- a/javax/security/sasl/SaslException.java
+++ b/javax/security/sasl/SaslException.java
@@ -1,5 +1,5 @@
 /* SaslException.java
-   Copyright (C) 2003, Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -45,6 +45,8 @@ import java.io.Serializable;
 
 /**
  * This class represents an error that has occurred when using SASL.
+ *
+ * @since 1.5
  */
 public class SaslException extends IOException implements Serializable
 {
@@ -52,6 +54,8 @@ public class SaslException extends IOException implements Serializable
   // Constants and variables
   // -------------------------------------------------------------------------
 
+  private static final long serialVersionUID = 4579784287983423626L;
+
   /**
    * @serial The possibly null root cause exception.
    */
diff --git a/javax/security/sasl/SaslServer.java b/javax/security/sasl/SaslServer.java
index f5a04975d..d30b8f6ba 100644
--- a/javax/security/sasl/SaslServer.java
+++ b/javax/security/sasl/SaslServer.java
@@ -1,5 +1,5 @@
-/* SasServer.java
-   Copyright (C) 2003, Free Software Foundation, Inc.
+/* SaslServer.java
+   Copyright (C) 2003, 2005, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -92,6 +92,8 @@ package javax.security.sasl;
  *
  * @see Sasl
  * @see SaslServerFactory
+ *
+ * @since 1.5
  */
 public interface SaslServer
 {
@@ -211,7 +213,7 @@ public interface SaslServer
    * @throws IllegalStateException if this authentication exchange has not
    * completed.
    */
-  Object getNegotiatedProperty(String propName) throws SaslException;
+  Object getNegotiatedProperty(String propName);
 
   /**
    * Disposes of any system resources or security-sensitive information the
diff --git a/javax/security/sasl/SaslServerFactory.java b/javax/security/sasl/SaslServerFactory.java
index 0fff32fa4..fc43fb636 100644
--- a/javax/security/sasl/SaslServerFactory.java
+++ b/javax/security/sasl/SaslServerFactory.java
@@ -1,5 +1,5 @@
 /* SaslServerFactory.java
-   Copyright (C) 2003, Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -55,6 +55,8 @@ import javax.security.auth.callback.CallbackHandler;
  *
  * @see SaslServer
  * @see Sasl
+ *
+ * @since 1.5
  */
 public interface SaslServerFactory
 {