[jboss-cvs] JBossAS SVN: r65893 - in projects/security/security-jboss-sx/trunk: src/main/org/jboss/security/identitytrust and 1 other directories.

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

Author: anil.saldhana at jboss.com
Date: 2007-10-05 13:46:17 -0400 (Fri, 05 Oct 2007)
New Revision: 65893

Modified:
   projects/security/security-jboss-sx/trunk/.classpath
   projects/security/security-jboss-sx/trunk/pom.xml
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/identitytrust/JBossIdentityTrustContext.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/identitytrust/JBossIdentityTrustManager.java
Log:
SECURITY-81: consider security domain also

Modified: projects/security/security-jboss-sx/trunk/.classpath
===================================================================
--- projects/security/security-jboss-sx/trunk/.classpath	2007-10-05 17:11:34 UTC (rev 65892)
+++ projects/security/security-jboss-sx/trunk/.classpath	2007-10-05 17:46:17 UTC (rev 65893)
@@ -9,9 +9,9 @@
 	<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
 	<classpathentry kind="var" path="M2_REPO/sun-xacml/sun-xacml/2.0/sun-xacml-2.0.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0-SNAPSHOT/jbossxb-2.0.0-SNAPSHOT.jar"/>
-	<classpathentry kind="var" path="M2_REPO/jboss/jboss-security-spi/2.0.1-BETA1/jboss-security-spi-2.0.1-BETA1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/jboss/jboss-javaee/5.0.0-SNAPSHOT/jboss-javaee-5.0.0-SNAPSHOT.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0-SNAPSHOT/jboss-jaspi-api-1.0-SNAPSHOT.jar"/>
+	<classpathentry kind="var" path="M2_REPO/jboss/jboss-security-spi/2.0.1-BETA2/jboss-security-spi-2.0.1-BETA2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-javaee/5.0.0.Beta3/jboss-javaee-5.0.0.Beta3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0-BETA1/jboss-jaspi-api-1.0-BETA1.jar"/>
 	<classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar"/>
 	<classpathentry kind="var" path="M2_REPO/sun-xacml/sunxacml-support/2.0/sunxacml-support-2.0.jar"/>
 	<classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/>

Modified: projects/security/security-jboss-sx/trunk/pom.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/pom.xml	2007-10-05 17:11:34 UTC (rev 65892)
+++ projects/security/security-jboss-sx/trunk/pom.xml	2007-10-05 17:46:17 UTC (rev 65893)
@@ -241,7 +241,7 @@
       <dependency>
          <groupId>jboss</groupId>
          <artifactId>jboss-security-spi</artifactId>
-         <version>2.0.1-BETA1</version>
+         <version>2.0.1-BETA2</version>
          <scope>compile</scope>
       </dependency>
       <dependency>

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/identitytrust/JBossIdentityTrustContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/identitytrust/JBossIdentityTrustContext.java	2007-10-05 17:11:34 UTC (rev 65892)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/identitytrust/JBossIdentityTrustContext.java	2007-10-05 17:46:17 UTC (rev 65893)
@@ -47,8 +47,9 @@
 { 
    protected Logger log = Logger.getLogger(JBossIdentityTrustContext.class); 
    
-   public JBossIdentityTrustContext(SecurityContext sc)
+   public JBossIdentityTrustContext(String secDomain, SecurityContext sc)
    {
+      this.securityDomain = secDomain;
       this.securityContext = sc;
    }
    
@@ -97,7 +98,6 @@
    {
       //Clear the modules
       modules.clear();
-      String securityDomain = this.securityContext.getSecurityDomain();
       //Get the Configuration
       ApplicationPolicy aPolicy = SecurityConfiguration.getApplicationPolicy( securityDomain);
       if(aPolicy == null)

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/identitytrust/JBossIdentityTrustManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/identitytrust/JBossIdentityTrustManager.java	2007-10-05 17:11:34 UTC (rev 65892)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/identitytrust/JBossIdentityTrustManager.java	2007-10-05 17:46:17 UTC (rev 65893)
@@ -62,7 +62,7 @@
       if(securityContext == null)
          throw new IllegalArgumentException("Security Context is null");
       if(this.identityTrustContext == null)
-         this.identityTrustContext = new JBossIdentityTrustContext(securityContext);
+         this.identityTrustContext = new JBossIdentityTrustContext(securityDomain, securityContext);
       TrustDecision td = TrustDecision.NotApplicable;
       if(this.identityTrustContext == null)
          throw new IllegalStateException("IdentityTrustContext is null");