[jboss-cvs] JBossAS SVN: r74021 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/ear and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 3 16:51:59 EDT 2008
Author: anil.saldhana at jboss.com
Date: 2008-06-03 16:51:59 -0400 (Tue, 03 Jun 2008)
New Revision: 74021
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5xEverything_testEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion50.xml
Log:
JBMETA-51: get the principal versus roles map stored in SecurityRolesMetaData via the Jboss bean meta data
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2008-06-03 20:50:51 UTC (rev 74020)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2008-06-03 20:51:59 UTC (rev 74021)
@@ -24,6 +24,7 @@
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -78,6 +79,7 @@
import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.TransactionManagementTypeAdapter;
@@ -1376,6 +1378,21 @@
else
return assemblyDescriptor.getSecurityRolePrincipals(roleName);
}
+
+ /**
+ * Get the Principal versus roles map stored in the security roles
+ * @return
+ */
+ @XmlTransient
+ public Map<String,Set<String>> getSecurityRolesPrincipalVersusRolesMap()
+ {
+ JBossAssemblyDescriptorMetaData assemblyDescriptor = getJBossMetaDataWithCheck().getAssemblyDescriptor();
+ if (assemblyDescriptor == null)
+ return null;
+
+ SecurityRolesMetaData securityRolesMetaData = assemblyDescriptor.getSecurityRoles();
+ return securityRolesMetaData != null ? securityRolesMetaData.getPrincipalVersusRolesMap() : null;
+ }
/**
* Get the methods permissions
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xEverythingUnitTestCase.java 2008-06-03 20:50:51 UTC (rev 74020)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xEverythingUnitTestCase.java 2008-06-03 20:51:59 UTC (rev 74021)
@@ -22,16 +22,8 @@
package org.jboss.test.metadata.ear;
-import java.util.List;
-
import junit.framework.Test;
-import org.jboss.annotation.javaee.Description;
-import org.jboss.annotation.javaee.Descriptions;
-import org.jboss.annotation.javaee.DisplayName;
-import org.jboss.annotation.javaee.DisplayNames;
-import org.jboss.annotation.javaee.Icon;
-import org.jboss.annotation.javaee.Icons;
import org.jboss.metadata.ear.jboss.JBoss50AppMetaData;
import org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
@@ -41,18 +33,13 @@
import org.jboss.metadata.ear.spec.Ear14MetaData;
import org.jboss.metadata.ear.spec.Ear50MetaData;
import org.jboss.metadata.ear.spec.Ear5xMetaData;
-import org.jboss.metadata.ear.spec.EarMetaData;
import org.jboss.metadata.ear.spec.EjbModuleMetaData;
import org.jboss.metadata.ear.spec.JavaModuleMetaData;
import org.jboss.metadata.ear.spec.ModuleMetaData;
import org.jboss.metadata.ear.spec.ModulesMetaData;
import org.jboss.metadata.ear.spec.WebModuleMetaData;
-import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
-import org.jboss.metadata.javaee.spec.DescriptionImpl;
-import org.jboss.metadata.javaee.spec.DisplayNameImpl;
-import org.jboss.metadata.javaee.spec.IconImpl;
-import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
@@ -141,6 +128,12 @@
assertEquals("security-role1", role1.getId());
assertEquals("role1", role1.getName());
assertEquals("The 1 security role", role1.getDescriptions().value()[0].value());
+ if(hasJBossAppOverride)
+ {
+ assertTrue("1 principal in role0", role0.getPrincipals().size() == 1);
+ assertEquals("principal0", role0.getPrincipals().toArray()[0]);
+ assertEquals("principal1", role1.getPrincipals().toArray()[0]);
+ }
}
protected void assertLibraryDirectory(JBossAppMetaData ear)
{
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java 2008-06-03 20:50:51 UTC (rev 74020)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java 2008-06-03 20:51:59 UTC (rev 74021)
@@ -24,24 +24,11 @@
import junit.framework.Test;
-import org.jboss.annotation.javaee.Description;
-import org.jboss.annotation.javaee.Descriptions;
-import org.jboss.annotation.javaee.DisplayName;
-import org.jboss.annotation.javaee.DisplayNames;
-import org.jboss.annotation.javaee.Icon;
-import org.jboss.annotation.javaee.Icons;
import org.jboss.metadata.ear.jboss.JBoss50AppMetaData;
import org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.metadata.ear.spec.Ear13DTDMetaData;
-import org.jboss.metadata.ear.spec.Ear14MetaData;
-import org.jboss.metadata.ear.spec.EarMetaData;
import org.jboss.metadata.ear.spec.ModuleMetaData;
import org.jboss.metadata.ear.spec.ModulesMetaData;
-import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
-import org.jboss.metadata.javaee.spec.DescriptionImpl;
-import org.jboss.metadata.javaee.spec.DisplayNameImpl;
-import org.jboss.metadata.javaee.spec.IconImpl;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2008-06-03 20:50:51 UTC (rev 74020)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2008-06-03 20:51:59 UTC (rev 74021)
@@ -508,6 +508,10 @@
assertFalse(session.isConcurrent());
assertJndiRefs(prefix, 2, session.getJndiRefs(), mode);
+
+ //Ensure that we can see the principal versus role map
+ Map<String, Set<String>> principalVsRolesMap = session.getSecurityRolesPrincipalVersusRolesMap();
+ assertTrue("Keys size > 0", principalVsRolesMap.keySet().size() > 0);
}
private void assertNullSessionBean(String prefix, JBossMetaData jbossMetaData)
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5xEverything_testEverything.xml 2008-06-03 20:50:51 UTC (rev 74020)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5xEverything_testEverything.xml 2008-06-03 20:51:59 UTC (rev 74021)
@@ -30,10 +30,12 @@
<security-role id="security-role0">
<description>The 0 security role</description>
<role-name>role0</role-name>
+ <principal-name>principal0</principal-name>
</security-role>
<security-role id="security-role1">
<description>The 1 security role</description>
<role-name>role1</role-name>
+ <principal-name>principal1</principal-name>
</security-role>
<library-directory>jboss-app-lib0</library-directory>
</jboss-app>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion50.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion50.xml 2008-06-03 20:50:51 UTC (rev 74020)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion50.xml 2008-06-03 20:51:59 UTC (rev 74021)
@@ -17,11 +17,11 @@
</module>
<security-role id="security-role0">
<description>The 0 security role</description>
- <role-name>role0</role-name>
+ <role-name>role0</role-name>
</security-role>
<security-role id="security-role1">
<description>The 1 security role</description>
- <role-name>role1</role-name>
+ <role-name>role1</role-name>
</security-role>
<library-directory>jboss-app-lib0</library-directory>
</jboss-app>
More information about the jboss-cvs-commits
mailing list