[jboss-cvs] JBossAS SVN: r69052 - trunk/server/src/main/org/jboss/deployment.

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

Author: wolfc
Date: 2008-01-16 17:13:25 -0500 (Wed, 16 Jan 2008)
New Revision: 69052

Modified:
   trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java
Log:
JBAS-5136: EjbJarMetaData is the authority on metadata complete

Modified: trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java	2008-01-16 21:47:12 UTC (rev 69051)
+++ trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java	2008-01-16 22:13:25 UTC (rev 69052)
@@ -40,8 +40,8 @@
 import org.jboss.metadata.client.jboss.JBossClientMetaData;
 import org.jboss.metadata.client.spec.ApplicationClient5MetaData;
 import org.jboss.metadata.client.spec.ApplicationClientMetaData;
-import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
+import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
 import org.jboss.metadata.ejb.spec.EjbJarMetaData;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.metadata.web.spec.Web25MetaData;
@@ -110,9 +110,14 @@
    {
       // Ignore any metadata complete deployments
       boolean isComplete = metaDataCompleteIsDefault;
+      /* Since we haven't merged yet, JBossMetaData is not the authority on isMetadataComplete
       JBossMetaData jbossMetaData = unit.getAttachment(JBossMetaData.class);
       if(jbossMetaData != null)
          isComplete &= jbossMetaData.isMetadataComplete();
+      */
+      EjbJarMetaData ejbJarMetaData = unit.getAttachment(EjbJarMetaData.class);
+      if(ejbJarMetaData != null && ejbJarMetaData instanceof EjbJar3xMetaData)
+         isComplete &= ((EjbJar3xMetaData) ejbJarMetaData).isMetadataComplete();
       JBossWebMetaData jbossWebMetaData = unit.getAttachment(JBossWebMetaData.class);
       if(jbossWebMetaData != null)
          isComplete &= jbossWebMetaData.isMetadataComplete();