[jboss-cvs] JBossAS SVN: r73233 - in trunk: security/src/main/org/jboss/security/plugins and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2008-05-09 14:20:04 -0400 (Fri, 09 May 2008)
New Revision: 73233

Modified:
   trunk/component-matrix/pom.xml
   trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManager.java
   trunk/security/src/main/org/jboss/security/propertyeditor/SecurityDomainEditor.java
Log:
JBAS-5250: security at 2.0.2.CR1

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-05-09 17:26:43 UTC (rev 73232)
+++ trunk/component-matrix/pom.xml	2008-05-09 18:20:04 UTC (rev 73233)
@@ -45,7 +45,7 @@
     <version.org.jboss.integration>5.0.0.Beta4</version.org.jboss.integration>
     <version.org.jboss.man>2.0.0.Beta12</version.org.jboss.man>
     <version.org.jboss.microcontainer>2.0.0.Beta14</version.org.jboss.microcontainer>
-    <version.org.jboss.security>2.0.2.Beta7</version.org.jboss.security>
+    <version.org.jboss.security>2.0.2.CR1</version.org.jboss.security>
     <version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
     <version.suffix.org.jboss.javaee>.CR1</version.suffix.org.jboss.javaee>
     <version.org.springframework>2.0</version.org.springframework>

Modified: trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManager.java
===================================================================
--- trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManager.java	2008-05-09 17:26:43 UTC (rev 73232)
+++ trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManager.java	2008-05-09 18:20:04 UTC (rev 73233)
@@ -153,11 +153,23 @@
       return delegate.isValid(principal, credential, activeSubject); 
    }
    
+   /**
+    * @see AuthenticationManager#isValid(MessageInfo, Subject, String)
+    */
    public boolean isValid(MessageInfo requestMessage, Subject clientSubject, String layer)
    {
       return delegate.isValid(requestMessage, clientSubject, layer);
    }
 
+   /**
+    * @see AuthenticationManager#isValid(MessageInfo, Subject, String, CallbackHandler)
+    */
+   public boolean isValid(MessageInfo requestMessage, Subject clientSubject, String layer,
+         CallbackHandler cbh)
+   {
+      return delegate.isValid(requestMessage, clientSubject, layer, cbh);
+   }
+   
    /** Map the argument principal from the deployment environment principal
     to the developer environment. This is called by the EJB context
     getCallerPrincipal() to return the Principal as described by

Modified: trunk/security/src/main/org/jboss/security/propertyeditor/SecurityDomainEditor.java
===================================================================
--- trunk/security/src/main/org/jboss/security/propertyeditor/SecurityDomainEditor.java	2008-05-09 17:26:43 UTC (rev 73232)
+++ trunk/security/src/main/org/jboss/security/propertyeditor/SecurityDomainEditor.java	2008-05-09 18:20:04 UTC (rev 73233)
@@ -31,6 +31,7 @@
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.TrustManagerFactory;
 import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.message.MessageInfo;
 
 import org.jboss.security.SecurityDomain; 
@@ -176,6 +177,13 @@
             return delegate.isValid(messageInfo, activeSubject, layer);
       }
 
+      public boolean isValid(MessageInfo messageInfo, Subject activeSubject, String layer,
+            CallbackHandler cbh)
+      {
+            initDelegate();
+            return delegate.isValid(messageInfo, activeSubject, layer, cbh);
+      }
+      
       public Subject getActiveSubject()
       {
          initDelegate();