[jboss-cvs] JBossAS SVN: r109051 - in projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message: callback and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 1 13:27:39 EDT 2010
Author: smcgowan at redhat.com
Date: 2010-11-01 13:27:39 -0400 (Mon, 01 Nov 2010)
New Revision: 109051
Modified:
projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/MessagePolicy.java
projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/callback/PrivateKeyCallback.java
projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfig.java
projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigFactory.java
projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigProvider.java
Log:
JBEE-39 - more fixes for signature compliance
Modified: projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/MessagePolicy.java
===================================================================
--- projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/MessagePolicy.java 2010-11-01 17:27:24 UTC (rev 109050)
+++ projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/MessagePolicy.java 2010-11-01 17:27:39 UTC (rev 109051)
@@ -35,7 +35,7 @@
*/
public class MessagePolicy
{
- protected TargetPolicy[] targetPolicies = null;
+ private TargetPolicy[] targetPolicies = null;
private boolean mandatory;
/**
@@ -118,8 +118,8 @@
public static class TargetPolicy
{
- protected ProtectionPolicy protectionPolicy;
- protected Target[] targets;
+ private ProtectionPolicy protectionPolicy;
+ private Target[] targets;
/**
*
@@ -168,19 +168,20 @@
public static interface ProtectionPolicy
{
/**
- * A URI fragment that represents a recipient entity authentication policy AUTHENTICATE_RECIPIENT_CONTENT
+ * The identifer for a ProtectionPolicy that indicates that the sending entity is to be authenticated.
*/
- public static final String AUTHENTICATE_SENDER = "http://jboss.org/security/auth/container/auth_sender";
+ public static final String AUTHENTICATE_SENDER = "#authenticateSender";
/**
- * A URI fragment that represents a source entity authentication policy AUTHENTICATE_SOURCE_CONTENT
+ * The identifer for a ProtectionPolicy that indicates that the message recipient is to be authenticated.
*/
- public static final String AUTHENTICATE_RECIPIENT = "http://jboss.org/security/auth/container/auth_recipient";
+ public static final String AUTHENTICATE_RECIPIENT = "#authenticateRecipient";
/**
- * A URI fragment that represents a data origin authentication policy
+ * The identifer for a ProtectionPolicy that indicates that the origin of data within the message is to be
+ * authenticated. That is, the message is to be protected such that its recipients can establish who defined the message content
*/
- public static final String AUTHENTICATE_CONTENT = "http://jboss.org/security/auth/container/auth_content";
+ public static final String AUTHENTICATE_CONTENT = "#authenticateContent";
/**
* Get the ProtectionPolicy identifier. An identifier may represent a
Modified: projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/callback/PrivateKeyCallback.java
===================================================================
--- projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/callback/PrivateKeyCallback.java 2010-11-01 17:27:24 UTC (rev 109050)
+++ projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/callback/PrivateKeyCallback.java 2010-11-01 17:27:39 UTC (rev 109051)
@@ -151,7 +151,7 @@
/**
* Request type for private keys that are identified using a certificate digest or thumbprint.
*/
- public static class DigestRequest
+ public static class DigestRequest implements Request
{
private byte[] theDigest;
private String theAlgorithm;
Modified: projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfig.java
===================================================================
--- projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfig.java 2010-11-01 17:27:24 UTC (rev 109050)
+++ projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfig.java 2010-11-01 17:27:39 UTC (rev 109051)
@@ -65,5 +65,5 @@
* @throws SecurityException if the caller does not have permission to refresh
* the configuration object.
*/
- void refresh() throws AuthException, SecurityException;
+ void refresh();
}
Modified: projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigFactory.java
===================================================================
--- projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigFactory.java 2010-11-01 17:27:24 UTC (rev 109050)
+++ projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigFactory.java 2010-11-01 17:27:39 UTC (rev 109051)
@@ -83,12 +83,11 @@
public abstract class AuthConfigFactory
{
private static AuthConfigFactory _factory = null;
- private static final String FACTORY_PROP = "authconfigprovider.factory";
+ public static final String DEFAULT_FACTORY_SECURITY_PROPERTY = "authconfigprovider.factory";
+
+ /* The default AuthConfigFactory implementation */
+ private static final String FACTORY_IMPL = "org.jboss.security.auth.message.config.JBossAuthConfigFactory";
- /** The default AuthConfigFactory implementation */
- static final String DEFAULT_FACTORY_SECURITY_PROPERTY =
- "org.jboss.security.auth.message.config.JBossAuthConfigFactory";
-
public AuthConfigFactory()
{
}
@@ -231,10 +230,10 @@
public abstract String[] getRegistrationIDs(AuthConfigProvider provider);
- public abstract void refresh() throws AuthException, SecurityException;
+ public abstract void refresh();
public abstract String registerConfigProvider( String className, Map properties,String layer,
- String appContext, String description) throws AuthException, SecurityException;
+ String appContext, String description);
public abstract java.lang.String registerConfigProvider(AuthConfigProvider provider,
String layer, String appContext, String description);
@@ -294,11 +293,11 @@
public Object run()
throws Exception
{
- name = System.getProperty(FACTORY_PROP);
+ name = System.getProperty(DEFAULT_FACTORY_SECURITY_PROPERTY);
if( name == null )
{
// Use the default factory impl
- name = DEFAULT_FACTORY_SECURITY_PROPERTY;
+ name = FACTORY_IMPL;
}
ClassLoader loader = Thread.currentThread().getContextClassLoader();
Class factoryClass = loader.loadClass(name);
Modified: projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigProvider.java
===================================================================
--- projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigProvider.java 2010-11-01 17:27:24 UTC (rev 109050)
+++ projects/specs/trunk/jboss-jaspi-api_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigProvider.java 2010-11-01 17:27:39 UTC (rev 109051)
@@ -135,5 +135,5 @@
* @throws SecurityException if the caller does not have permission to
* refresh the provider.
*/
- void refresh() throws AuthException, SecurityException;
+ void refresh();
}
More information about the jboss-cvs-commits
mailing list