[jboss-cvs] JBossAS SVN: r103484 - projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators.

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

Author: anil.saldhana at jboss.com
Date: 2010-04-02 15:20:02 -0400 (Fri, 02 Apr 2010)
New Revision: 103484

Modified:
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/AbstractJBossPolicyLocator.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/JBossPolicyLocator.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/JBossPolicySetLocator.java
Log:
SECURIY-492: consolidate the locators for policy

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/AbstractJBossPolicyLocator.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/AbstractJBossPolicyLocator.java	2010-04-02 17:53:29 UTC (rev 103483)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/AbstractJBossPolicyLocator.java	2010-04-02 19:20:02 UTC (rev 103484)
@@ -21,6 +21,7 @@
   */
 package org.jboss.security.xacml.locators;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -31,6 +32,7 @@
 import org.jboss.security.xacml.interfaces.PolicyLocator;
 import org.jboss.security.xacml.interfaces.XACMLPolicy;
 import org.jboss.security.xacml.jaxb.Option;
+import org.jboss.security.xacml.sunxacml.finder.PolicyFinderModule;
 
 
 /**
@@ -46,6 +48,8 @@
    protected Map<String, Object> map = new HashMap<String, Object>();
 
    protected Set<XACMLPolicy> policies;
+   
+   protected List<PolicyFinderModule> pfml = new ArrayList<PolicyFinderModule>();
 
    /**
     * @see PolicyLocator#setOptions(List)

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/JBossPolicyLocator.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/JBossPolicyLocator.java	2010-04-02 17:53:29 UTC (rev 103483)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/JBossPolicyLocator.java	2010-04-02 19:20:02 UTC (rev 103484)
@@ -21,15 +21,12 @@
   */
 package org.jboss.security.xacml.locators;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;
 
 import org.jboss.security.xacml.bridge.WrapperPolicyFinderModule;
 import org.jboss.security.xacml.interfaces.XACMLConstants;
 import org.jboss.security.xacml.interfaces.XACMLPolicy;
 import org.jboss.security.xacml.sunxacml.Policy;
-import org.jboss.security.xacml.sunxacml.finder.PolicyFinderModule;
 
 /**
  *  Policy Locator for plain XACML Policy instances
@@ -38,9 +35,7 @@
  *  @version $Revision$
  */
 public class JBossPolicyLocator extends AbstractJBossPolicyLocator
-{
-   private List<PolicyFinderModule> pfml = new ArrayList<PolicyFinderModule>();
-
+{ 
    public JBossPolicyLocator()
    {
    }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/JBossPolicySetLocator.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/JBossPolicySetLocator.java	2010-04-02 17:53:29 UTC (rev 103483)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/JBossPolicySetLocator.java	2010-04-02 19:20:02 UTC (rev 103484)
@@ -26,9 +26,11 @@
 import java.util.Set;
 
 import org.jboss.security.xacml.bridge.PolicySetFinderModule;
+import org.jboss.security.xacml.bridge.WrapperPolicyFinderModule;
 import org.jboss.security.xacml.interfaces.XACMLConstants;
 import org.jboss.security.xacml.interfaces.XACMLPolicy;
-import org.jboss.security.xacml.sunxacml.AbstractPolicy; 
+import org.jboss.security.xacml.sunxacml.AbstractPolicy;
+import org.jboss.security.xacml.sunxacml.Policy;
 import org.jboss.security.xacml.sunxacml.PolicySet;
 
 /**
@@ -38,9 +40,7 @@
  *  @version $Revision$
  */
 public class JBossPolicySetLocator extends AbstractJBossPolicyLocator
-{
-   private List<PolicySetFinderModule> pfml = new ArrayList<PolicySetFinderModule>();
-
+{  
    public JBossPolicySetLocator()
    {
    }
@@ -60,6 +60,12 @@
          {
             pfml.add(getPopulatedPolicySetFinderModule(xp));
          }
+         else if (xp.getType() == XACMLPolicy.POLICY)
+         {
+            Policy p = xp.get(XACMLConstants.UNDERLYING_POLICY);
+            WrapperPolicyFinderModule wpfm = new WrapperPolicyFinderModule(p);
+            pfml.add(wpfm);
+         }
       }
       this.map.put(XACMLConstants.POLICY_FINDER_MODULE, pfml);
    }
@@ -88,6 +94,5 @@
          if (p instanceof PolicySet)
             this.recursivePopulate(xp, policies, psfm);
       }
-
    }
-}
+}
\ No newline at end of file