[jboss-cvs] JBossAS SVN: r74272 - in trunk: security/src/main/org/jboss/security/plugins and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jun 6 14:46:21 EDT 2008
Author: anil.saldhana at jboss.com
Date: 2008-06-06 14:46:21 -0400 (Fri, 06 Jun 2008)
New Revision: 74272
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
trunk/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java
Log:
JBAS-5250: security 2.0.2.CR3
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-06-06 18:28:31 UTC (rev 74271)
+++ trunk/component-matrix/pom.xml 2008-06-06 18:46:21 UTC (rev 74272)
@@ -46,7 +46,7 @@
<version.org.jboss.integration>5.0.0.Beta5</version.org.jboss.integration>
<version.org.jboss.man>2.0.0.Beta14</version.org.jboss.man>
<version.org.jboss.microcontainer>2.0.0.Beta15</version.org.jboss.microcontainer>
- <version.org.jboss.security>2.0.2.CR2</version.org.jboss.security>
+ <version.org.jboss.security>2.0.2.CR3</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>
@@ -1534,12 +1534,6 @@
<dependency>
<groupId>org.jboss.security</groupId>
- <artifactId>authorization-spi</artifactId>
- <version>${version.org.jboss.security}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.security</groupId>
<artifactId>jbosssx</artifactId>
<version>${version.org.jboss.security}</version>
</dependency>
@@ -1557,18 +1551,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi-bare</artifactId>
- <version>${version.org.jboss.security}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>identity-impl</artifactId>
- <version>${version.org.jboss.security}</version>
- </dependency>
-
- <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi_R4_compendium</artifactId>
<version>1.0</version>
Modified: trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManager.java
===================================================================
--- trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManager.java 2008-06-06 18:28:31 UTC (rev 74271)
+++ trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManager.java 2008-06-06 18:46:21 UTC (rev 74272)
@@ -27,8 +27,7 @@
import java.util.Set;
import javax.security.auth.Subject;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.message.MessageInfo;
+import javax.security.auth.callback.CallbackHandler;
import org.jboss.security.AuthenticationManager;
import org.jboss.security.RealmMapping;
@@ -151,25 +150,8 @@
Subject activeSubject)
{
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-06-06 18:28:31 UTC (rev 74271)
+++ trunk/security/src/main/org/jboss/security/propertyeditor/SecurityDomainEditor.java 2008-06-06 18:46:21 UTC (rev 74272)
@@ -31,11 +31,10 @@
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;
import org.jboss.logging.Logger;
+import org.jboss.security.AuthenticationManager;
+import org.jboss.security.SecurityDomain;
/** A property editor for org.jboss.security.SecurityDomain types. This editor
* transforms a jndi name string to a SecurityDomain by looking up the binding.
@@ -171,19 +170,6 @@
return delegate.isValid(principal, credential, activeSubject);
}
- public boolean isValid(MessageInfo messageInfo, Subject activeSubject, String layer)
- {
- initDelegate();
- 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();
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java 2008-06-06 18:28:31 UTC (rev 74271)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java 2008-06-06 18:46:21 UTC (rev 74272)
@@ -21,14 +21,15 @@
*/
package org.jboss.test.security.test;
-import java.lang.reflect.Method;
-import java.io.Serializable;
import java.io.IOException;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.security.KeyStore;
import java.security.MessageDigest;
import java.security.Principal;
-import java.security.KeyStore;
-import java.security.cert.X509Certificate;
import java.security.acl.Group;
+import java.security.cert.X509Certificate;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
@@ -38,36 +39,35 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import java.net.URL;
+
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+import javax.management.ObjectName;
import javax.naming.InitialContext;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.TrustManagerFactory;
+import javax.resource.spi.security.PasswordCredential;
import javax.security.auth.Subject;
import javax.security.auth.login.AppConfigurationEntry;
-import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.Configuration;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
-import javax.security.auth.message.MessageInfo;
import javax.sql.DataSource;
-import javax.resource.spi.security.PasswordCredential;
-import javax.management.MBeanServerFactory;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.TrustManagerFactory;
import junit.framework.TestSuite;
-
+
import org.jboss.crypto.CryptoUtil;
import org.jboss.logging.Logger;
-import org.jboss.security.SimpleGroup;
-import org.jboss.security.SimplePrincipal;
+import org.jboss.security.AuthenticationManager;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SecurityDomain;
-import org.jboss.security.plugins.JaasSecurityDomain;
-import org.jboss.security.auth.callback.UsernamePasswordHandler;
+import org.jboss.security.SimpleGroup;
+import org.jboss.security.SimplePrincipal;
import org.jboss.security.auth.callback.SecurityAssociationHandler;
-import org.jboss.security.auth.spi.UsernamePasswordLoginModule;
-import org.jboss.test.JBossTestCase;
+import org.jboss.security.auth.callback.UsernamePasswordHandler;
+import org.jboss.security.auth.spi.UsernamePasswordLoginModule;
+import org.jboss.security.plugins.JaasSecurityDomain;
+import org.jboss.test.JBossTestCase;
/** Tests of the LoginModule classes.
@@ -469,15 +469,6 @@
{
return false;
}
-
- public boolean isValid(MessageInfo messageInfo, Subject clientSubject, String layer)
- {
- return false;
- }
- public boolean isValid(MessageInfo messageInfo, Subject clientSubject, String layer, CallbackHandler cbh)
- {
- return false;
- }
public Principal getPrincipal(Principal principal)
{
More information about the jboss-cvs-commits
mailing list