[jboss-cvs] JBossAS SVN: r67882 - trunk/server/src/main/org/jboss/ejb/deployers.

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

Author: wolfc
Date: 2007-12-04 09:34:09 -0500 (Tue, 04 Dec 2007)
New Revision: 67882

Modified:
   trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java
Log:
JBAS-4506: new metadata

Modified: trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java	2007-12-04 14:28:21 UTC (rev 67881)
+++ trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java	2007-12-04 14:34:09 UTC (rev 67882)
@@ -29,6 +29,7 @@
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.spec.AnnotationMergedView;
 import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
+import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
 import org.jboss.metadata.ejb.spec.EjbJarMetaData;
 
 /**
@@ -69,13 +70,13 @@
 
       // Check for an annotated view
       String key = AnnotationMetaDataDeployer.EJB_ANNOTATED_ATTACHMENT_NAME;
-      EjbJarMetaData annotatedMetaData = unit.getAttachment(key, EjbJarMetaData.class);
+      EjbJar3xMetaData annotatedMetaData = unit.getAttachment(key, EjbJar3xMetaData.class);
       if(annotatedMetaData != null)
       {
          if(specMetaData != null)
          {
-            EjbJarMetaData specMerged = new EjbJar30MetaData();
-            AnnotationMergedView.merge(specMerged, specMetaData, annotatedMetaData);
+            EjbJar3xMetaData specMerged = new EjbJar30MetaData();
+            AnnotationMergedView.merge(specMerged, (EjbJar3xMetaData) specMetaData, annotatedMetaData);
             specMetaData = specMerged;
          }
          else