[jboss-cvs] JBossAS SVN: r82692 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/ejb and 1 other directories.

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

Author: alex.loubyansky at jboss.com
Date: 2009-01-08 06:27:34 -0500 (Thu, 08 Jan 2009)
New Revision: 82692

Added:
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testRunAsPrincipal.xml
Modified:
   projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
Log:
JBMETA-162

Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd	2009-01-08 11:12:59 UTC (rev 82691)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd	2009-01-08 11:27:34 UTC (rev 82692)
@@ -735,7 +735,7 @@
          <!-- ejb-jar_3_0 -->
          <xsd:element name="description" type="javaee:descriptionType"
             minOccurs="0" maxOccurs="unbounded" />
-         <xsd:choice>
+         <xsd:choice minOccurs="0">
             <xsd:element name="use-caller-identity"
                type="javaee:emptyType">
                <xsd:annotation>

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2009-01-08 11:12:59 UTC (rev 82691)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2009-01-08 11:27:34 UTC (rev 82692)
@@ -1026,6 +1026,18 @@
       assertEquals("org.jboss.metadata.test.SessionJndiBindingPolicy", ejb.getJndiBindingPolicy());
    }
 
+   public void testRunAsPrincipal() throws Exception
+   {
+      JBossMetaData result = unmarshal();
+      JBossEnterpriseBeanMetaData bean = result.getEnterpriseBean("ServiceSix");
+      assertNotNull(bean);
+      SecurityIdentityMetaData secid = bean.getSecurityIdentity();
+      assertNotNull(secid);
+      assertNull(secid.getUseCallerIdentity());
+      assertNull(secid.getRunAs());
+      assertEquals("run as principal", secid.getRunAsPrincipal());
+   }
+   
    private <T> Set<T> toSet(T ... obj)
    {
       Set<T> set = new HashSet<T>();

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testRunAsPrincipal.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testRunAsPrincipal.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testRunAsPrincipal.xml	2009-01-08 11:27:34 UTC (rev 82692)
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<jboss
+        xmlns="http://www.jboss.com/xml/ns/javaee"
+        xmlns:jee="http://java.sun.com/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
+                            http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+        version="3.0">
+   <enterprise-beans>
+      <service>
+         <ejb-name>ServiceSix</ejb-name>
+         <security-identity>
+            <run-as-principal>run as principal</run-as-principal>
+         </security-identity>
+      </service>
+   </enterprise-beans>
+</jboss>