[jboss-cvs] JBossAS SVN: r65936 - projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers.

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

Author: anil.saldhana at jboss.com
Date: 2007-10-08 15:59:11 -0400 (Mon, 08 Oct 2007)
New Revision: 65936

Modified:
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/DeploymentRolesMappingProvider.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/PolicyContextIdRoleMappingProvider.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java
Log:
SECURITY-82: mapping result

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/DeploymentRolesMappingProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/DeploymentRolesMappingProvider.java	2007-10-08 19:58:39 UTC (rev 65935)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/DeploymentRolesMappingProvider.java	2007-10-08 19:59:11 UTC (rev 65936)
@@ -32,6 +32,7 @@
 import org.jboss.security.SimpleGroup;
 import org.jboss.security.SimplePrincipal; 
 import org.jboss.security.mapping.MappingProvider;
+import org.jboss.security.mapping.MappingResult;
 
 //$Id$
 
@@ -47,9 +48,16 @@
 {
    private static Logger log = Logger.getLogger(DeploymentRolesMappingProvider.class);
    private boolean trace = log.isTraceEnabled();
+   
+   private MappingResult<Group> result;
 
    public void init(Map options)
    { 
+   } 
+
+   public void setMappingResult(MappingResult res)
+   { 
+      result = res;
    }
 
    /**
@@ -83,6 +91,7 @@
          }
          mappedObject = MappingProviderUtil.replacePrincipals(mappedObject, newRoles);  
       } 
+      result.setMappedObject(mappedObject);
    } 
    
    /**

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java	2007-10-08 19:58:39 UTC (rev 65935)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java	2007-10-08 19:59:11 UTC (rev 65936)
@@ -15,6 +15,7 @@
 
 import org.jboss.logging.Logger;
 import org.jboss.security.mapping.MappingProvider;
+import org.jboss.security.mapping.MappingResult;
 
 
 /**
@@ -32,6 +33,8 @@
    private static final String REPLACE_ROLES_STRING = "replaceRoles";
    private static final String ROLES_MAP = "rolesMap";
    
+   private MappingResult<Group> result;
+
    private Map options = null;
    
    private Properties roleMapProperties = null;
@@ -56,7 +59,12 @@
         } 
      } 
    }
-
+   
+   public void setMappingResult(MappingResult res)
+   { 
+      result = res;
+   }
+   
    public void performMapping(Map contextMap, Group mappedObject)
    { 
       ArrayList<Principal> removeMembers = new ArrayList<Principal>();
@@ -91,6 +99,7 @@
       {
          mappedObject.addMember(p);
       }
- 
+      
+      result.setMappedObject(mappedObject);
    }   
-}
+}
\ No newline at end of file

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/PolicyContextIdRoleMappingProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/PolicyContextIdRoleMappingProvider.java	2007-10-08 19:58:39 UTC (rev 65935)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/PolicyContextIdRoleMappingProvider.java	2007-10-08 19:59:11 UTC (rev 65936)
@@ -35,6 +35,7 @@
 import org.jboss.logging.Logger;
 import org.jboss.security.SecurityConstants;
 import org.jboss.security.mapping.MappingProvider;
+import org.jboss.security.mapping.MappingResult;
 
 //$Id$
 
@@ -50,7 +51,8 @@
    private static Logger log = Logger.getLogger(PolicyContextIdRoleMappingProvider.class);
    private boolean trace = log.isTraceEnabled();
    
-   private Map options = null;
+   private Map options = null; 
+   private MappingResult<Group> result;
    
    private Properties policyContextIdToFileNameProps = new Properties();
    
@@ -85,6 +87,11 @@
       }
    }
 
+   public void setMappingResult(MappingResult res)
+   { 
+      result = res;
+   }
+   
    public void performMapping(Map contextMap, Group mappedObject)
    { 
       ArrayList <Principal> tempPrincipalList = new ArrayList<Principal>(); 
@@ -142,6 +149,7 @@
               log.trace("Exception:",e);
         }
       }   
+      result.setMappedObject(mappedObject);
    } 
    
    private Properties loadProperties(String filename) throws IOException
@@ -151,4 +159,4 @@
       props.load(tcl.getResourceAsStream(filename));
       return props;
    }
-}
+}
\ No newline at end of file

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java	2007-10-08 19:58:39 UTC (rev 65935)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java	2007-10-08 19:59:11 UTC (rev 65936)
@@ -30,6 +30,7 @@
 import org.jboss.logging.Logger;
 import org.jboss.security.SecurityConstants;
 import org.jboss.security.mapping.MappingProvider;
+import org.jboss.security.mapping.MappingResult;
 
 
 /**
@@ -46,6 +47,7 @@
    private static final String PRINCIPAL_ROLES_MAP = "principalRolesMap";
 
    private Map options = null;
+   private MappingResult<Group> result;
 
    private Properties principalRoleMapProperties = null;
  
@@ -62,6 +64,11 @@
          } 
       } 
    }
+   
+   public void setMappingResult(MappingResult res)
+   { 
+      result = res;
+   }
 
    public void performMapping(Map contextMap, Group mappedObject)
    { 
@@ -82,5 +89,6 @@
             mappedObject.addMember(MappingProviderUtil.instantiatePrincipal(p.getClass(),tokens[i]));
          }
       }   
+      result.setMappedObject(mappedObject);
    }  
-}
+}
\ No newline at end of file