classpath-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[cp-patches] Patch: RFA: javax.security.sasl -vs- 1.5


From: Tom Tromey
Subject: [cp-patches] Patch: RFA: javax.security.sasl -vs- 1.5
Date: 15 Sep 2005 17:11:06 -0600

I wanted some feedback on this one before checking it in.

This updates javax.security.sasl to be 1.5 compliant.
However, this is odd because this package is (afaik) new in
1.5... was it written against some earlier version of the spec or
something?  (I couldn't think of why else I would be removing
'throws' clauses... though maybe it is just a plain old bug.)

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>
        * 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.

Index: javax/security/sasl/AuthenticationException.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/security/sasl/AuthenticationException.java,v
retrieving revision 1.3
diff -u -r1.3 AuthenticationException.java
--- javax/security/sasl/AuthenticationException.java 2 Jul 2005 20:32:46 -0000 
1.3
+++ javax/security/sasl/AuthenticationException.java 15 Sep 2005 23:14:28 -0000
@@ -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 @@
  * 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
 {
Index: javax/security/sasl/AuthorizeCallback.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/security/sasl/AuthorizeCallback.java,v
retrieving revision 1.3
diff -u -r1.3 AuthorizeCallback.java
--- javax/security/sasl/AuthorizeCallback.java 2 Jul 2005 20:32:46 -0000 1.3
+++ javax/security/sasl/AuthorizeCallback.java 15 Sep 2005 23:14:28 -0000
@@ -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,18 +38,22 @@
 
 package javax.security.sasl;
 
+import java.io.Serializable;
 import javax.security.auth.callback.Callback;
 
 /**
  * This callback is used by address@hidden 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;
Index: javax/security/sasl/RealmCallback.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/security/sasl/RealmCallback.java,v
retrieving revision 1.3
diff -u -r1.3 RealmCallback.java
--- javax/security/sasl/RealmCallback.java 2 Jul 2005 20:32:46 -0000 1.3
+++ javax/security/sasl/RealmCallback.java 15 Sep 2005 23:14:28 -0000
@@ -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 @@
 /**
  * This callback is used by address@hidden SaslClient} and address@hidden 
SaslServer} to
  * retrieve realm information.
+ *
+ * @since 1.5
  */
 public class RealmCallback extends TextInputCallback
 {
Index: javax/security/sasl/RealmChoiceCallback.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/security/sasl/RealmChoiceCallback.java,v
retrieving revision 1.3
diff -u -r1.3 RealmChoiceCallback.java
--- javax/security/sasl/RealmChoiceCallback.java 2 Jul 2005 20:32:46 -0000 1.3
+++ javax/security/sasl/RealmChoiceCallback.java 15 Sep 2005 23:14:28 -0000
@@ -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 @@
 /**
  * This callback is used by address@hidden SaslClient} and address@hidden 
SaslServer} to obtain
  * a realm given a list of realm choices.
+ *
+ * @since 1.5
  */
 public class RealmChoiceCallback extends ChoiceCallback
 {
Index: javax/security/sasl/Sasl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/security/sasl/Sasl.java,v
retrieving revision 1.6
diff -u -r1.6 Sasl.java
--- javax/security/sasl/Sasl.java 26 Jul 2005 22:35:42 -0000 1.6
+++ javax/security/sasl/Sasl.java 15 Sep 2005 23:14:28 -0000
@@ -74,6 +74,8 @@
  *      Sasl.createSaslServer(mechanism, protocol, serverName, props,
  *                            callbackHandler);
  * </pre>
+ *
+ * @since 1.5
  */
 public class Sasl
 {
Index: javax/security/sasl/SaslClient.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/security/sasl/SaslClient.java,v
retrieving revision 1.4
diff -u -r1.4 SaslClient.java
--- javax/security/sasl/SaslClient.java 2 Jul 2005 20:32:46 -0000 1.4
+++ javax/security/sasl/SaslClient.java 15 Sep 2005 23:14:28 -0000
@@ -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 @@
  *
  * @see Sasl
  * @see SaslClientFactory
+ *
+ * @since 1.5
  */
 public interface SaslClient
 {
@@ -216,7 +218,7 @@
    * @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
Index: javax/security/sasl/SaslClientFactory.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/security/sasl/SaslClientFactory.java,v
retrieving revision 1.4
diff -u -r1.4 SaslClientFactory.java
--- javax/security/sasl/SaslClientFactory.java 2 Jul 2005 20:32:46 -0000 1.4
+++ javax/security/sasl/SaslClientFactory.java 15 Sep 2005 23:14:28 -0000
@@ -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 @@
  *
  * @see SaslClient
  * @see Sasl
+ *
+ * @since 1.5
  */
 public interface SaslClientFactory
 {
Index: javax/security/sasl/SaslException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/security/sasl/SaslException.java,v
retrieving revision 1.4
diff -u -r1.4 SaslException.java
--- javax/security/sasl/SaslException.java 2 Jul 2005 20:32:46 -0000 1.4
+++ javax/security/sasl/SaslException.java 15 Sep 2005 23:14:28 -0000
@@ -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,12 +45,16 @@
 
 /**
  * This class represents an error that has occurred when using SASL.
+ *
+ * @since 1.5
  */
 public class SaslException extends IOException implements Serializable
 {
 
   // Constants and variables
   // -------------------------------------------------------------------------
+
+  private static final long serialVersionUID = 4579784287983423626L;
 
   /**
    * @serial The possibly null root cause exception.
Index: javax/security/sasl/SaslServer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/security/sasl/SaslServer.java,v
retrieving revision 1.4
diff -u -r1.4 SaslServer.java
--- javax/security/sasl/SaslServer.java 2 Jul 2005 20:32:46 -0000 1.4
+++ javax/security/sasl/SaslServer.java 15 Sep 2005 23:14:28 -0000
@@ -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 @@
  *
  * @see Sasl
  * @see SaslServerFactory
+ *
+ * @since 1.5
  */
 public interface SaslServer
 {
@@ -211,7 +213,7 @@
    * @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
Index: javax/security/sasl/SaslServerFactory.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/security/sasl/SaslServerFactory.java,v
retrieving revision 1.5
diff -u -r1.5 SaslServerFactory.java
--- javax/security/sasl/SaslServerFactory.java 2 Jul 2005 20:32:46 -0000 1.5
+++ javax/security/sasl/SaslServerFactory.java 15 Sep 2005 23:14:28 -0000
@@ -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 @@
  *
  * @see SaslServer
  * @see Sasl
+ *
+ * @since 1.5
  */
 public interface SaslServerFactory
 {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]