[jboss-cvs] JBossAS SVN: r79640 - in projects/security/security-jboss-sx/trunk/jbosssx/src: tests/org/jboss/test/security/config and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2008-10-17 10:43:09 -0400 (Fri, 17 Oct 2008)
New Revision: 79640

Modified:
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/config/MappingConfigEntryHolder.java
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/config/MappingModuleEntry.java
   projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/security/config/SecurityConfigurationUnitTestCase.java
Log:
SECURITY-288: use mapping type enum

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/config/MappingConfigEntryHolder.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/config/MappingConfigEntryHolder.java	2008-10-17 14:28:55 UTC (rev 79639)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/config/MappingConfigEntryHolder.java	2008-10-17 14:43:09 UTC (rev 79640)
@@ -27,6 +27,7 @@
 import javax.xml.namespace.QName;
 
 import org.jboss.security.config.ModuleOption;
+import org.jboss.security.mapping.MappingType;
 import org.jboss.xb.binding.GenericValueContainer;
 
 //$Id: MappingConfigEntryHolder.java 46201 2006-07-11 17:51:23Z asaldhana $
@@ -41,7 +42,7 @@
 {
    private final Map<String,Object> moduleOptions = new HashMap<String,Object>();
    String moduleName = null;  
-   String type = "role";
+   String type = MappingType.ROLE.name();
    
    public void addChild(QName name, Object value)
    {
@@ -81,4 +82,4 @@
       return MappingModuleEntry.class;
    }
    
-}
+}
\ No newline at end of file

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/config/MappingModuleEntry.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/config/MappingModuleEntry.java	2008-10-17 14:28:55 UTC (rev 79639)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/config/MappingModuleEntry.java	2008-10-17 14:43:09 UTC (rev 79640)
@@ -25,6 +25,7 @@
 import java.util.Map;
 
 import org.jboss.security.config.ModuleOption;
+import org.jboss.security.mapping.MappingType;
 
 // $Id: MappingModuleEntry.java 45985 2006-06-29 20:56:57Z asaldhana $
 
@@ -61,7 +62,7 @@
     */
    public MappingModuleEntry(String name, Map<String, Object> options)
    {
-      this(name, options, "role");
+      this(name, options, MappingType.ROLE.name());
    }
 
    /**

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/security/config/SecurityConfigurationUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/security/config/SecurityConfigurationUnitTestCase.java	2008-10-17 14:28:55 UTC (rev 79639)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/security/config/SecurityConfigurationUnitTestCase.java	2008-10-17 14:43:09 UTC (rev 79640)
@@ -51,6 +51,7 @@
 import org.jboss.security.config.PolicyConfig;
 import org.jboss.security.config.SecurityConfiguration;
 import org.jboss.security.identitytrust.config.IdentityTrustModuleEntry;
+import org.jboss.security.mapping.MappingType;
 import org.jboss.security.mapping.config.MappingModuleEntry;
 import org.jboss.test.AbstractJBossSXTest;
 import org.jboss.xb.binding.Unmarshaller;
@@ -233,7 +234,7 @@
       Assert.assertEquals("value4", options.get("aclOption4"));
 
       // Mapping
-      MappingInfo mappingInfo = completeConfig.getMappingInfo("principal");
+      MappingInfo mappingInfo = completeConfig.getMappingInfo(MappingType.PRINCIPAL.name());
       assertNotNull("MappingInfo is not null", mappingInfo);
       MappingModuleEntry[] mappingEntries = mappingInfo.getMappingModuleEntry();
       assertEquals("Invalid number of entries", 1, mappingEntries.length);
@@ -245,7 +246,7 @@
       assertEquals("value1", mappingOptions.get("option1"));
 
       // Role Mapping
-      mappingInfo = completeConfig.getMappingInfo("role");
+      mappingInfo = completeConfig.getMappingInfo(MappingType.ROLE.name());
       assertNotNull("MappingInfo is not null", mappingInfo);
       MappingModuleEntry[] mmearr = mappingInfo.getMappingModuleEntry();
       assertEquals("Mapping entry length=1", 1, mmearr.length);
@@ -301,20 +302,20 @@
       assertEquals("Unexpected number of acl modules", 3, aclInfo.getModuleEntries().size());
 
       // Role Mapping
-      MappingInfo mappingInfo = completeConfig.getMappingInfo("role");
+      MappingInfo mappingInfo = completeConfig.getMappingInfo(MappingType.ROLE.name());
       assertNotNull("MappingInfo is not null", mappingInfo);
       // we expect 2 modules because one has been configured as a mapping of type "role"
       assertEquals("2 map modules", 2, mappingInfo.getModuleEntries().size());
 
       // Mapping
-      mappingInfo = completeConfig.getMappingInfo("principal");
+      mappingInfo = completeConfig.getMappingInfo(MappingType.PRINCIPAL.name());
       assertNotNull("MappingInfo is not null", mappingInfo);
       MappingModuleEntry[] mappingEntries = mappingInfo.getMappingModuleEntry();
       assertEquals("Invalid number of entries", 2, mappingEntries.length);
       assertEquals("org.jboss.test.mapping.MappingModule1", mappingEntries[0].getMappingModuleName());
       assertEquals("org.jboss.test.mapping.MappingModule3", mappingEntries[1].getMappingModuleName());
       // same test as above: we expect 2 role-mapping modules: 1 from rolemapping and 1 from mapping with type "role".
-      mappingInfo = completeConfig.getMappingInfo("role");
+      mappingInfo = completeConfig.getMappingInfo(MappingType.ROLE.name());
       assertNotNull("MappingInfo is not null", mappingInfo);
       mappingEntries = mappingInfo.getMappingModuleEntry();
       assertEquals("Invalid number of entries", 2, mappingEntries.length);