[jboss-cvs] JBossAS SVN: r71162 - trunk/ejb3/src/main/org/jboss/ejb3/deployers.

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

Author: anil.saldhana at jboss.com
Date: 2008-03-21 16:11:19 -0400 (Fri, 21 Mar 2008)
New Revision: 71162

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
Log:
EJBTHREE-1233: ejb3 deployer should depend on the metadata created by the merging deployer

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2008-03-21 19:06:45 UTC (rev 71161)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2008-03-21 20:11:19 UTC (rev 71162)
@@ -30,6 +30,7 @@
 import org.jboss.deployers.vfs.spi.deployer.AbstractVFSRealDeployer;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.deployment.security.JaccPolicyUtil;
+import org.jboss.ejb.deployers.MergedJBossMetaDataDeployer;
 import org.jboss.ejb3.DeploymentScope;
 import org.jboss.ejb3.Ejb3Deployment;
 import org.jboss.ejb3.cache.CacheFactoryRegistry;
@@ -76,9 +77,7 @@
    
    public Ejb3Deployer()
    {
-      // TODO: when the annotation scanner deployer comes on, we will always have JBossMetaData
-      //super(JBossMetaData.class);
-      addInput(JBossMetaData.class);
+      addInput(MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME);
       // TODO: PersistenceUnits will have it's own component deployer
       addInput(PersistenceUnitsMetaData.class);
       // TODO: should we really output this