geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r768352 - in /geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message: ./ callback/ config/
Date Fri, 24 Apr 2009 16:26:02 GMT
Author: djencks
Date: Fri Apr 24 16:26:01 2009
New Revision: 768352

URL: http://svn.apache.org/viewvc?rev=768352&view=rev
Log:
fix signature test problems

Modified:
    geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/MessagePolicy.java
    geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/callback/PrivateKeyCallback.java
    geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/callback/SecretKeyCallback.java
    geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfig.java
    geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigFactory.java
    geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigProvider.java

Modified: geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/MessagePolicy.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/MessagePolicy.java?rev=768352&r1=768351&r2=768352&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/MessagePolicy.java
(original)
+++ geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/MessagePolicy.java
Fri Apr 24 16:26:01 2009
@@ -45,9 +45,9 @@
 
     public static interface ProtectionPolicy {
 
-        static String AUTHENTICATE_CONTENT = "javax.security.auth.message.AUTHENTICATE_CONTENT";
-        static String AUTHENTICATE_RECIPIENT = "javax.security.auth.message.AUTHENTICATE_RECIPIENT";
-        static String AUTHENTICATE_SENDER = "javax.security.auth.message.AUTHENTICATE_SENDER";
+        static String AUTHENTICATE_CONTENT = "#authenticateContent";
+        static String AUTHENTICATE_RECIPIENT = "#authenticateRecipient";
+        static String AUTHENTICATE_SENDER = "#authenticateSender";
 
         String getID();
     }

Modified: geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/callback/PrivateKeyCallback.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/callback/PrivateKeyCallback.java?rev=768352&r1=768351&r2=768352&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/callback/PrivateKeyCallback.java
(original)
+++ geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/callback/PrivateKeyCallback.java
Fri Apr 24 16:26:01 2009
@@ -18,6 +18,7 @@
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.x500.X500Principal;
+
 import java.math.BigInteger;
 import java.security.PrivateKey;
 import java.security.cert.Certificate;
@@ -51,7 +52,7 @@
         return key;
     }
 
-    void setKey(PrivateKey key, Certificate[] chain) {
+    public void setKey(PrivateKey key, Certificate[] chain) {
         this.key = key;
         this.chain = chain;
     }

Modified: geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/callback/SecretKeyCallback.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/callback/SecretKeyCallback.java?rev=768352&r1=768351&r2=768352&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/callback/SecretKeyCallback.java
(original)
+++ geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/callback/SecretKeyCallback.java
Fri Apr 24 16:26:01 2009
@@ -22,7 +22,7 @@
 /**
  * A callback enabling an authentication module to request a secret key from the runtime,
by supplying an alias.
  * Other request types may also be supported.
- * 
+ *
  * @version $Rev$ $Date$
  */
 public class SecretKeyCallback implements Callback {
@@ -49,7 +49,7 @@
     public static interface Request {
     }
 
-    public class AliasRequest implements Request {
+    public static class AliasRequest implements Request {
 
         private final String alias;
 

Modified: geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfig.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfig.java?rev=768352&r1=768351&r2=768352&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfig.java
(original)
+++ geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfig.java
Fri Apr 24 16:26:01 2009
@@ -32,5 +32,5 @@
 
     boolean isProtected();
 
-    void refresh() throws AuthException, SecurityException;
+    void refresh();
 }

Modified: geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigFactory.java?rev=768352&r1=768351&r2=768352&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigFactory.java
(original)
+++ geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigFactory.java
Fri Apr 24 16:26:01 2009
@@ -35,51 +35,51 @@
 
     static {
         contextClassLoader = (ClassLoader) java.security.AccessController
-                        .doPrivileged(new java.security.PrivilegedAction() {
-                            public Object run() {
-                                return Thread.currentThread().getContextClassLoader();
-                            }
-                        });
+                .doPrivileged(new java.security.PrivilegedAction() {
+                    public Object run() {
+                        return Thread.currentThread().getContextClassLoader();
+                    }
+                });
     }
-    
-    public static AuthConfigFactory getFactory() throws AuthException, SecurityException
{
+
+    public static AuthConfigFactory getFactory() {
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
             sm.checkPermission(new AuthPermission("getAuthConfigFactory"));
         }
         if (factory == null) {
             String className = (String) java.security.AccessController
-                            .doPrivileged(new java.security.PrivilegedAction() {
-                                public Object run() {
-                                    return java.security.Security.getProperty("DEFAULT_FACTORY_SECURITY_PROPERTY");
-                                }
-                            });
+                    .doPrivileged(new java.security.PrivilegedAction() {
+                        public Object run() {
+                            return java.security.Security.getProperty("DEFAULT_FACTORY_SECURITY_PROPERTY");
+                        }
+                    });
             if (className == null) {
                 className = DEFAULT_JASPI_AUTHCONFIGFACTORYIMPL;
             }
             try {
                 final String finalClassName = className;
                 factory = (AuthConfigFactory) java.security.AccessController
-                                .doPrivileged(new java.security.PrivilegedExceptionAction()
{
-                                    public Object run() throws ClassNotFoundException, InstantiationException,
-                                                    IllegalAccessException {
-                                        return Class.forName(finalClassName, true, contextClassLoader).newInstance();
-                                    }
-                                });
+                        .doPrivileged(new java.security.PrivilegedExceptionAction() {
+                            public Object run() throws ClassNotFoundException, InstantiationException,
+                                    IllegalAccessException {
+                                return Class.forName(finalClassName, true, contextClassLoader).newInstance();
+                            }
+                        });
             } catch (PrivilegedActionException e) {
                 Exception inner = e.getException();
                 if (inner instanceof InstantiationException) {
-                    throw (AuthException) new AuthException("AuthConfigFactory error:"
-                                    + inner.getCause().getMessage()).initCause(inner.getCause());
+                    throw (SecurityException) new SecurityException("AuthConfigFactory error:"
+                            + inner.getCause().getMessage()).initCause(inner.getCause());
                 } else {
-                    throw (AuthException) new AuthException("AuthConfigFactory error: " +
inner).initCause(inner);
+                    throw (SecurityException) new SecurityException("AuthConfigFactory error:
" + inner).initCause(inner);
                 }
             }
         }
         return factory;
     }
 
-    public static void setFactory(AuthConfigFactory factory) throws SecurityException {
+    public static void setFactory(AuthConfigFactory factory) {
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
             sm.checkPermission(new AuthPermission("setAuthConfigFactory"));
@@ -88,10 +88,10 @@
     }
 
 
-    protected AuthConfigFactory() {
+    public AuthConfigFactory() {
     }
 
-    public abstract String[] detachListener(RegistrationListener listener, String layer,
String appContext) throws SecurityException;
+    public abstract String[] detachListener(RegistrationListener listener, String layer,
String appContext);
 
     public abstract AuthConfigProvider getConfigProvider(String layer, String appContext,
RegistrationListener listener);
 
@@ -99,13 +99,13 @@
 
     public abstract String[] getRegistrationIDs(AuthConfigProvider provider);
 
-    public abstract void refresh() throws AuthException, SecurityException;
+    public abstract void refresh();
 
-    public abstract String registerConfigProvider(AuthConfigProvider provider, String layer,
String appContext, String description) throws AuthException, SecurityException;
+    public abstract String registerConfigProvider(AuthConfigProvider provider, String layer,
String appContext, String description);
 
-    public abstract String registerConfigProvider(String className, Map properties, String
layer, String appContext, String description) throws AuthException, SecurityException;
+    public abstract String registerConfigProvider(String className, Map properties, String
layer, String appContext, String description);
 
-    public abstract boolean removeRegistration(String registrationID) throws SecurityException;
+    public abstract boolean removeRegistration(String registrationID);
 
     public static interface RegistrationContext {
 
@@ -116,7 +116,7 @@
         String getMessageLayer();
 
         boolean isPersistent();
-        
+
     }
 
 }

Modified: geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigProvider.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigProvider.java?rev=768352&r1=768351&r2=768352&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigProvider.java
(original)
+++ geronimo/specs/trunk/geronimo-jaspi_1.0_spec/src/main/java/javax/security/auth/message/config/AuthConfigProvider.java
Fri Apr 24 16:26:01 2009
@@ -28,5 +28,6 @@
 
     ServerAuthConfig getServerAuthConfig(String layer, String appContext, CallbackHandler
handler) throws AuthException, SecurityException;
 
-    void refresh() throws AuthException, SecurityException;
+    void refresh();
 }
+



Mime
View raw message