[jboss-cvs] JBossAS SVN: r67349 - projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas.

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

Author: scott.stark at jboss.org
Date: 2007-11-21 13:01:25 -0500 (Wed, 21 Nov 2007)
New Revision: 67349

Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java
Log:
Fix the merged view

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-21 17:57:08 UTC (rev 67348)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java	2007-11-21 18:01:25 UTC (rev 67349)
@@ -33,6 +33,7 @@
 import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.spec.AnnotationMergedView;
 import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
 import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
 import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
@@ -88,30 +89,20 @@
             InterMediate.class
       };
       List<Class<?>> classes = Arrays.asList(beanClasses);
-      MetaData scopeMetaData = createMetaDataFromAnnotations("ejb0.jar", classes);
+      AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
+      EjbJar30Creator creator = new EjbJar30Creator(finder);
+      EjbJar30MetaData metaData = creator.create(classes);
+      EjbJarMetaData specMetaData = unmarshal("ejb-jar.xml", EjbJarMetaData.class, null);
+      EjbJarMetaData specMerged = new EjbJar30MetaData();
+      AnnotationMergedView.merge(specMerged, specMetaData, metaData);
    
       JBossMetaData xmlMetaData = unmarshal("jboss.xml", JBossMetaData.class, null);
-      EjbJarMetaData specMetaData = unmarshal("ejb-jar.xml", EjbJarMetaData.class, null);
       JBossMetaData mergedData = new JBossMetaData();
+      mergedData.merge(xmlMetaData, specMerged);
 
       // Validate the proxy view
       JBossEnterpriseBeanMetaData InterMediateBean = mergedData.getEnterpriseBean("InterMediateBean");
       assertNotNull(InterMediateBean);
    }
 
-   protected MetaData createMetaDataFromAnnotations(String jarName, Collection<Class<?>> classes)
-   {
-      ScopeKey jarKey = new ScopeKey(CommonLevels.DEPLOYMENT, jarName);
-      MemoryMetaDataLoader loader = new MemoryMetaDataLoader(jarKey);
-      repository.addMetaDataRetrieval(loader);
-   
-      AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
-      EjbJar30Creator creator = new EjbJar30Creator(finder);
-      EjbJar30MetaData metaData = creator.create(classes);
-      loader.addMetaData(metaData, EjbJarMetaData.class);
-      repository.addMetaDataRetrieval(loader);      
-      MetaData keyMetaData = repository.getMetaData(jarKey);
-      return keyMetaData;
-   }
-
 }