summaryrefslogtreecommitdiffstats
path: root/libjava/classpath/javax/security/sasl
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/classpath/javax/security/sasl')
-rw-r--r--libjava/classpath/javax/security/sasl/AuthenticationException.java4
-rw-r--r--libjava/classpath/javax/security/sasl/AuthorizeCallback.java10
-rw-r--r--libjava/classpath/javax/security/sasl/RealmCallback.java4
-rw-r--r--libjava/classpath/javax/security/sasl/RealmChoiceCallback.java4
-rw-r--r--libjava/classpath/javax/security/sasl/Sasl.java2
-rw-r--r--libjava/classpath/javax/security/sasl/SaslClient.java6
-rw-r--r--libjava/classpath/javax/security/sasl/SaslClientFactory.java4
-rw-r--r--libjava/classpath/javax/security/sasl/SaslException.java6
-rw-r--r--libjava/classpath/javax/security/sasl/SaslServer.java8
-rw-r--r--libjava/classpath/javax/security/sasl/SaslServerFactory.java4
10 files changed, 38 insertions, 14 deletions
diff --git a/libjava/classpath/javax/security/sasl/AuthenticationException.java b/libjava/classpath/javax/security/sasl/AuthenticationException.java
index 12a8fe0529b..0f674645dc0 100644
--- a/libjava/classpath/javax/security/sasl/AuthenticationException.java
+++ b/libjava/classpath/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/libjava/classpath/javax/security/sasl/AuthorizeCallback.java b/libjava/classpath/javax/security/sasl/AuthorizeCallback.java
index bf1b8470d31..fa3b29a3d92 100644
--- a/libjava/classpath/javax/security/sasl/AuthorizeCallback.java
+++ b/libjava/classpath/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/libjava/classpath/javax/security/sasl/RealmCallback.java b/libjava/classpath/javax/security/sasl/RealmCallback.java
index 12d834054a4..7cb36433fe6 100644
--- a/libjava/classpath/javax/security/sasl/RealmCallback.java
+++ b/libjava/classpath/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/libjava/classpath/javax/security/sasl/RealmChoiceCallback.java b/libjava/classpath/javax/security/sasl/RealmChoiceCallback.java
index d16e61f6afd..7068a504bce 100644
--- a/libjava/classpath/javax/security/sasl/RealmChoiceCallback.java
+++ b/libjava/classpath/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/libjava/classpath/javax/security/sasl/Sasl.java b/libjava/classpath/javax/security/sasl/Sasl.java
index 058e4f6e1b6..dbe4cc8c2ae 100644
--- a/libjava/classpath/javax/security/sasl/Sasl.java
+++ b/libjava/classpath/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/libjava/classpath/javax/security/sasl/SaslClient.java b/libjava/classpath/javax/security/sasl/SaslClient.java
index 544ab17d6a8..58eb5e298b6 100644
--- a/libjava/classpath/javax/security/sasl/SaslClient.java
+++ b/libjava/classpath/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/libjava/classpath/javax/security/sasl/SaslClientFactory.java b/libjava/classpath/javax/security/sasl/SaslClientFactory.java
index d6e8cd5ffd1..ae36171c56e 100644
--- a/libjava/classpath/javax/security/sasl/SaslClientFactory.java
+++ b/libjava/classpath/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/libjava/classpath/javax/security/sasl/SaslException.java b/libjava/classpath/javax/security/sasl/SaslException.java
index 13113e6bcda..89764bb18f0 100644
--- a/libjava/classpath/javax/security/sasl/SaslException.java
+++ b/libjava/classpath/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/libjava/classpath/javax/security/sasl/SaslServer.java b/libjava/classpath/javax/security/sasl/SaslServer.java
index f5a04975d53..d30b8f6ba14 100644
--- a/libjava/classpath/javax/security/sasl/SaslServer.java
+++ b/libjava/classpath/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/libjava/classpath/javax/security/sasl/SaslServerFactory.java b/libjava/classpath/javax/security/sasl/SaslServerFactory.java
index 0fff32fa43b..fc43fb636e9 100644
--- a/libjava/classpath/javax/security/sasl/SaslServerFactory.java
+++ b/libjava/classpath/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
{
OpenPOWER on IntegriCloud