[jboss-cvs] JBossAS SVN: r67479 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/annotation/ejb3/runas and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2007-11-27 01:48:05 -0500 (Tue, 27 Nov 2007)
New Revision: 67479

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java
Log:
Change the test to properly validate xml parsing followed by a merge with an annotation based model

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2007-11-27 06:44:34 UTC (rev 67478)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2007-11-27 06:48:05 UTC (rev 67479)
@@ -721,7 +721,9 @@
                // Update the run-as indentity to use the principal name
                if (ejbXmlRunAs == null)
                {
-                  throw new IllegalStateException("run-as-principal: " + principalName + " found in jboss.xml but there was no run-as in ejb-jar.xml");
+                  // Can't make this check since the name may come from an annotation
+                  //throw new IllegalStateException("run-as-principal: " + principalName + " found in jboss.xml but there was no run-as in ejb-jar.xml");
+                  ejbXmlRunAs = "anonymous";
                }
                // See if there are any additional roles for this principal
                Set<String> extraRoles = null;

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java	2007-11-27 06:44:34 UTC (rev 67478)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java	2007-11-27 06:48:05 UTC (rev 67479)
@@ -79,7 +79,7 @@
    }
 
    /**
-    * 
+    * Validate 
     * @throws Exception
     */
    public void testXmlAnnotationMerge()
@@ -95,11 +95,15 @@
       EjbJarMetaData specMetaData = unmarshal("ejb-jar.xml", EjbJarMetaData.class, null);
       EjbJarMetaData specMerged = new EjbJar30MetaData();
       AnnotationMergedView.merge(specMerged, specMetaData, metaData);
-   
+
+      // First parse the jboss xml and merge with the spec xml
       JBossMetaData xmlMetaData = unmarshal("jboss.xml", JBossMetaData.class, null);
       JBossMetaData mergedData = new JBossMetaData();
-      mergedData.merge(xmlMetaData, specMerged);
+      mergedData.merge(xmlMetaData, specMetaData);
 
+      // Now merge with the annotation data
+      mergedData.merge(null, specMerged);
+
       // Validate the proxy view
       JBossEnterpriseBeanMetaData InterMediateBean = mergedData.getEnterpriseBean("InterMediateBean");
       assertNotNull(InterMediateBean);